Adding metadata

57 files changed, 467 insertions, 731 deletions

diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index 851f59158144..aa650d57609b 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1 +1,2 @@
 DIST ansi2html-1.9.1.tar.gz 44288 BLAKE2B ff83d2a9fe74766324515e7ccde5c6d157f836d655c6c55a07f0b9c4ab5df9c8a840f0c35e752a3e24f3e12fbd73565c2906382d77c2daf5951e861e18bdcb46 SHA512 1ffeffdd4f861b809c424b5b9e7d07212aaf1b5ef483a2820f128f815002628c823b5701652b0770ed182f0585052f040b55fca5db31e4690be86c49553105b3
+DIST ansi2html-1.9.2.tar.gz 44300 BLAKE2B 6c39a9525a5fe0c7f02b45f56ea515e6b07280cb74a88d54db5e33c77fb679f6ebb446edf50add3d68832ea877ed8861bc1a9f2116ab1214d2a6b3acfbfae19a SHA512 c465259d4c9ea82725bcd8cd286246b806b1bfde06f89b52b1cc3cd5c514be92a19ffcfd147417d64ce6da6627678baabc7ff05226ed392343cdb0496bd375eb
diff --git a/dev-python/ansi2html/ansi2html-1.9.2.ebuild b/dev-python/ansi2html/ansi2html-1.9.2.ebuild
new file mode 100644
index 000000000000..07667e7259d0
--- /dev/null
+++ b/dev-python/ansi2html/ansi2html-1.9.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Convert text with ANSI color codes to HTML"
+HOMEPAGE="
+	https://pypi.org/project/ansi2html/
+	https://github.com/pycontribs/ansi2html/
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+BDEPEND="
+	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 5fd9b132c51b..f1ed8c21b0a0 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,3 +1 @@
-DIST ansible-compat-24.6.0.gh.tar.gz 74286 BLAKE2B e61b9501aad867e738d128397f4b37e1299f4bc249e4217def60a704dd470886d269b2b61b738a644300085c4d46793bd32982c470de7a26590990c14eab4810 SHA512 217faed3354e459d9541962778f455b34b4ddf1c9b8141752645b25fd68747305de5d08d65b01c8168907e70c1dc31aeb2099420bf1e3553cd7f41627a12f0da
 DIST ansible-compat-24.6.1.gh.tar.gz 74317 BLAKE2B d79471cfb150720bec8daa037df400005184b023ad55389c3424db55c2be87f57dd22934d133fc76b97e15ee3f80d78d1865c7feef0168793efa9b5738bff85e SHA512 203dd95dac7f55f21ebda069fd3e460f09a5434805529843880efe7137a55ba9d9c4eca72074bba7786b2cf0d032cd4a9a63d78d6e4c36811ec818340dd96ce4
-DIST ansible-compat-4.1.12.gh.tar.gz 67966 BLAKE2B 3c665eb2cb87e184042da78ed1c41e7ca2b437c5151ba21bdd609104b44fa28c5f03247d275c58cfdf04a8e9ed328947cb0c2670603218798e3a484861274af2 SHA512 c9b2c340dc2b1ffb6f6db76017f7537e20307a7519a4df2dfb31811180cd647e39812bc433db51bd94d42f4c52a6c2f729d81edadcd615a5e0d23566969d8911
diff --git a/dev-python/ansible-compat/ansible-compat-24.6.0.ebuild b/dev-python/ansible-compat/ansible-compat-24.6.0.ebuild
deleted file mode 100644
index af8c76a4eb7e..000000000000
--- a/dev-python/ansible-compat/ansible-compat-24.6.0.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_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-# We normally use PyPI here but 4.1.12 has never been uploaded there for some reason
-SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.14[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.4.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-	# pip, failing due to internets
-	test/test_runtime_scan_path.py::test_scan_sys_path
-	# internets?
-	test/test_runtime.py::test_runtime_has_playbook
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-24.6.1.ebuild b/dev-python/ansible-compat/ansible-compat-24.6.1.ebuild
index af8c76a4eb7e..15d08ea146f1 100644
--- a/dev-python/ansible-compat/ansible-compat-24.6.1.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-24.6.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 RDEPEND="
 	>=app-admin/ansible-core-2.14[${PYTHON_USEDEP}]
diff --git a/dev-python/ansible-compat/ansible-compat-4.1.12.ebuild b/dev-python/ansible-compat/ansible-compat-4.1.12.ebuild
deleted file mode 100644
index f6cbb37eceaa..000000000000
--- a/dev-python/ansible-compat/ansible-compat-4.1.12.ebuild
+++ /dev/null
@@ -1,56 +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
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-# We normally use PyPI here but 4.1.12 has never been uploaded there for some reason
-SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.12[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.4.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-	# pip, failing due to internets
-	test/test_runtime_scan_path.py::test_scan_sys_path
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/cbor2/cbor2-5.6.4.ebuild b/dev-python/cbor2/cbor2-5.6.4.ebuild
index 1367fdfca6ba..117456a39d5b 100644
--- a/dev-python/cbor2/cbor2-5.6.4.ebuild
+++ b/dev-python/cbor2/cbor2-5.6.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 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 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+native-extensions"
 
 BDEPEND="
diff --git a/dev-python/cftime/Manifest b/dev-python/cftime/Manifest
index 5a8469ce6ea2..c350d91bcc6f 100644
--- a/dev-python/cftime/Manifest
+++ b/dev-python/cftime/Manifest
@@ -1,2 +1 @@
-DIST cftime-1.6.3.tar.gz 53256 BLAKE2B 8875c368e6811487960fb240ed5320ab1dcc24f3678e9663e67b7c49ab8cc1f12a0030670760fcd1a15938b57f3860d5c9c9b30a3e5a0e1755fcd0c7b8deaf5f SHA512 0bcb8dcf7a840e500d7cc0f784f960b4972803f353fcffbf36dc30b2169b6864aea1fd8cab2d60e7908a063db55f2cfa3639c51fea84692b2dfe2d83b954c0ae
 DIST cftime-1.6.4.tar.gz 54615 BLAKE2B a986c3bc5eb1d45a31fcad849f621c9299f72c305fe29d75b50ff8c8be97e71032f306d1d33d29d4b58e8a31adfb23c552ed990026ea30ee4f34f3e2b4698dec SHA512 8b27859680a9fb1d3acc3bd95faab040b4571de40a07b327ea161a0dfad022a6c27008f74a4070c314c05e7237fd8574075e0c92d863dbcc81cd7f7d34e01399
diff --git a/dev-python/cftime/cftime-1.6.3.ebuild b/dev-python/cftime/cftime-1.6.3.ebuild
deleted file mode 100644
index c1aec07a5945..000000000000
--- a/dev-python/cftime/cftime-1.6.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020-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="Time-handling functionality from netcdf4-python"
-HOMEPAGE="
-	https://github.com/Unidata/cftime/
-	https://pypi.org/project/cftime/
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv ~s390 x86"
-
-DEPEND="
-	>=dev-python/numpy-1.26.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-python/cython-0.29.20[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -e "/--cov/d" -i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cftime/cftime-1.6.4.ebuild b/dev-python/cftime/cftime-1.6.4.ebuild
index 9d66b23b6185..c1aec07a5945 100644
--- a/dev-python/cftime/cftime-1.6.4.ebuild
+++ b/dev-python/cftime/cftime-1.6.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm64 ~loong ~riscv ~s390 x86"
 
 DEPEND="
 	>=dev-python/numpy-1.26.0[${PYTHON_USEDEP}]
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 96d66627ae48..fd43c1eda6fc 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,3 @@
 DIST coverage-7.4.4.tar.gz 783727 BLAKE2B e7d7af92ddcb3d7b5857cc83d8e14bb16ea2bde720eba63b082d35358934047ef7285ac70a6cd8fcb4720a9ddea5c22cf4cb14404ac2800794c49650ff5a1dd4 SHA512 26d4715ce69556ca12d1b65db5f21807c08733810b4398750280184812ebfb698e7b424b9e30f55e7524323861a22d4581db0524e9e285ca858132359fd24d28
-DIST coverage-7.5.0.tar.gz 798314 BLAKE2B 6f7b80d1a46fb88f92571bc23fa2e061680e4e72e6339332f135ace6072570776abbfdce7654d34599ccd1dff920fb1d7cbdc7039a341d10e130408d554e6f83 SHA512 1332f630e6f6ed9a2445f93a3826f22151cf4eff2491163a6d01ef1ce468928a52871ee71aeeb716e8e4f04542524ae25213a37bdb874c4a663cbc581482530d
-DIST coverage-7.5.1.tar.gz 784825 BLAKE2B 4dd659d170b026aa868a066fedc9ab0cfa16b5ac2cb90a45578528f2733b7a01b7d3546836b908412d81a7ff21645b0ceebcf27d3414a99d474a7fd44d2539f4 SHA512 db9fe405c52e30e2aa673caf0cc8a02b5f62fd53b969003d231b52cf9463afc22924d5c29859447d6139be9c6642036f3cbc690ae4055d250a73c9dcd1f805a2
-DIST coverage-7.5.2.tar.gz 786030 BLAKE2B b6b3ce47893db399c6e6e34d78cdf7da5735dce14fef3740098bb41df697770fd8910d2f4df1831a214690024c722808f3684e82f4d27bb08b84eb0c0170ff4f SHA512 14a8b239a71558ae9b11a72e2040979ef3d9d446ccb1339d2858736cf550d7ccacf31ce1288f30cbe064d747f506e3afcb09fe2d9d8a0946aad6e488fb9ea7c2
 DIST coverage-7.5.3.tar.gz 786184 BLAKE2B 014a21273bf302a7e10d3239edda1a95b99674abd0b7b769a688a4e576d0b9e5ce9189ee38e8c53b0cbd5ea7bd2c7f7583704455f6842c9a19e77cc19aae3de1 SHA512 6c72525b19b0efbf6a23b8a2860e056613c8119a5306978a67bc11b8598bac693e7541a9ca206bb9394511c9a84097a7f450ebf38e7c1c40e914fd71cf7546ce
+DIST coverage-7.5.4.tar.gz 793238 BLAKE2B a53967307ce9cbb72d89810575574a7a1358c988e5e02cfa2a982ba8e68e7efd477c2d902c2037c67f18309c54777f3422db845b7753da49ccb69855289c13de SHA512 363658864f9a5116e49bd10a45a8ceeb0bb62c70458e0c0ce7ae90f3ddea0659d67af1a35a44a47e673b256cdad8ea0963339110dabfd7031d6b98ba483f3606
diff --git a/dev-python/coverage/coverage-7.5.1.ebuild b/dev-python/coverage/coverage-7.5.1.ebuild
deleted file mode 100644
index 838a273e543e..000000000000
--- a/dev-python/coverage/coverage-7.5.1.ebuild
+++ /dev/null
@@ -1,98 +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 )
-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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..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
-	)
-	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.5.2.ebuild b/dev-python/coverage/coverage-7.5.2.ebuild
deleted file mode 100644
index 8f7e197a5950..000000000000
--- a/dev-python/coverage/coverage-7.5.2.ebuild
+++ /dev/null
@@ -1,98 +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 )
-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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..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
-	)
-	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.5.0.ebuild b/dev-python/coverage/coverage-7.5.4.ebuild
index 8f7e197a5950..8f7e197a5950 100644
--- a/dev-python/coverage/coverage-7.5.0.ebuild
+++ b/dev-python/coverage/coverage-7.5.4.ebuild
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 003c77a24d9f..1a1efe264714 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,3 +1,4 @@
 DIST filelock-3.14.0.tar.gz 15401 BLAKE2B afa95a941189cd73767684016502fba6972541a8a0f16bed0a4acc6452700224d511a17e6882b1c680fa6b20621b617704a7e9d3aff8ae883ede56f40acb5de3 SHA512 51eda6394fcac86a12887fe1974022b9da921fb96a61887f7a91c5b15f083a4c9186600ec61b4e93b91b8c4799c50ca4b6c418416c6bf2b422ea3b41715258e4
 DIST filelock-3.15.1.tar.gz 17564 BLAKE2B 5a4b7a02697318023bb555900c4ee8d486c62a7177fd35c374c13d03a1f03cd3bd36c40b2511112b098f0185e20c936251a9bc16373b2f3c3c61b8f154436f08 SHA512 cf8ef1cc68697ab04725057c186f6df8100ac480b727932be80b2ca655230861f5ae65f6957b992dcd4350433f90d958c9513f684685efb9080d0c506d730cbe
 DIST filelock-3.15.3.tar.gz 17982 BLAKE2B 802601805a247cfa5ef90e6fc6c919adbf04a77f4bbe571a09e1656101e340981ab3fe8716071b52476bea0e690d84541f5443af64609cabb042af9b8e9705c5 SHA512 b4519a911ac90ba3e1b8b6cdfcd3d31eb6024f94cc6794c5ce1beeaeac10692a6bdef16f09aaf4c579d383b89862fd94b1bc6ccbec079232e4f9553f65bd7b1f
+DIST filelock-3.15.4.tar.gz 18007 BLAKE2B bf64d43b189453c8c1fcf258edefb2df340d20578d942d147197423c433cd6629d5e73615201d7ef84857450d7a4cf1375d0dfc69a422c4319a76f2dc157442f SHA512 d809df84f321ab9d99f46609cc664af2d9b73161906308e1a9f949c745694577901def228c40a860c606d652f9ecefe9014159eeea92266f94e981eecc4fe103
diff --git a/dev-python/filelock/filelock-3.15.4.ebuild b/dev-python/filelock/filelock-3.15.4.ebuild
new file mode 100644
index 000000000000..7b9616073426
--- /dev/null
+++ b/dev-python/filelock/filelock-3.15.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2018-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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="
+	https://github.com/tox-dev/filelock/
+	https://pypi.org/project/filelock/
+"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fonttools/fonttools-4.53.0.ebuild b/dev-python/fonttools/fonttools-4.53.0.ebuild
index e9da193aa661..db1de0e514dc 100644
--- a/dev-python/fonttools/fonttools-4.53.0.ebuild
+++ b/dev-python/fonttools/fonttools-4.53.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 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 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/fs/fs-2.4.16.ebuild b/dev-python/fs/fs-2.4.16.ebuild
index b1c9b12a2025..77c05db3b6dd 100644
--- a/dev-python/fs/fs-2.4.16.ebuild
+++ b/dev-python/fs/fs-2.4.16.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/hatchling/Manifest b/dev-python/hatchling/Manifest
index 14b2a55a964a..8deef9cdd807 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1 +1,2 @@
 DIST hatch-hatchling-v1.24.2.gh.tar.gz 1054297 BLAKE2B b2da7dc3f3d58998b57d6ee625a2b7e890afc078c0d8f6cb9c332480df561090bb8bc255e3e60d5d25fa55001869429f822014891fe1cec0098b61fbe02efe52 SHA512 e83f57089707a267685c9cac7f29cd5862adec62f6346097aa62bd5b3b9f7222621b2ea71004dd52f62798dab71bcf05c33a2c43dbe39d1bbc5f4a4f99f28c40
+DIST hatch-hatchling-v1.25.0.gh.tar.gz 5276942 BLAKE2B 76de1a824086889370a996945ad031179132dc74f4ef8a79da29913fc587c85210db49e89f400f4db2533d6706452cd4c67b87ff4ca97be0c3dc1879cf2bd77e SHA512 54f4e5f9383e846a9192e47b61f5147d4c48f20c41df752898dc5e22dd0bf196ea60fe4866dd04dc09c763aac67f7c047c40d978398e910878eb772af887d607
diff --git a/dev-python/hatchling/hatchling-1.25.0.ebuild b/dev-python/hatchling/hatchling-1.25.0.ebuild
new file mode 100644
index 000000000000..20e357d01e84
--- /dev/null
+++ b/dev-python/hatchling/hatchling-1.25.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1
+
+TAG=${P/-/-v}
+MY_P=hatch-${TAG}
+DESCRIPTION="Modern, extensible Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/hatchling/
+	https://github.com/pypa/hatch/
+"
+SRC_URI="
+	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/backend
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+# deps are listed in backend/src/hatchling/ouroboros.py
+# editables are optional but required for editable installs
+RDEPEND="
+	>=dev-python/editables-0.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-23.2[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
+	$(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.3.25[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/atomicwrites[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+			dev-python/httpx[${PYTHON_USEDEP}]
+			dev-python/platformdirs[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/rich[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# top-level "tests" directory contains tests both for hatch
+	# and hatchling
+	cd "${WORKDIR}/${MY_P}" || die
+
+	# sigh; standalone test suites are overrated, right?
+	echo "__version__ = '${PV}'" > src/hatch/_version.py || die
+	local -x PYTHONPATH="src:${PYTHONPATH}"
+
+	# do not require uv for portability, sigh
+	mkdir "${T}/bin" || die
+	cat > "${T}/bin/uv" <<-EOF || die
+		#!/bin/sh
+		exit 127
+	EOF
+	chmod +x "${T}/bin/uv" || die
+	local -x PATH=${T}/bin:${PATH}
+
+	# tests mock cargo subprocess call but the backend raises if CARGO
+	# is not set and shutil.which() can't find it
+	local -x CARGO=cargo
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local -x EPYTEST_DESELECT=(
+		# most of these run uv to install stuff
+		# the few remaining tests aren't worth running
+		tests/backend/dep/test_core.py
+		# broken if CARGO is set
+		tests/backend/builders/test_binary.py::TestBuildBootstrap::test_no_cargo
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock tests/backend
+}
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index ba569433523e..76200d550012 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,2 +1 @@
-DIST ijson-3.2.3.tar.gz 57596 BLAKE2B e85465829f8319e2e227b7b72633b65e7e77a8cd24fee877aded1f50383ffbbaddd82e5e3942c0b3f637a8e601c5101aa390889e8509ee2c61b6f3c9cf9a7249 SHA512 ca72ed08c7804611d7f9c5218d217087fe17358859d080741726b42072df1407afcf1f701e30d33f3f615e8c78ba247a3cc45e8e7e373f1d3168a63f397fd6eb
 DIST ijson-3.3.0.tar.gz 60079 BLAKE2B 53c92015c30ed285acec1f9e811521eeb9d22b2011b0398b23e44c1b0fff2b97e87b48b9058733db6002222913ebeb1a304763e7c5f8fe6c2d872f791d80ce39 SHA512 9517919b98904608f81ee0292968e9c8951e3e96cdec286d945eebcd94ae6322c08a878ebfabce3e226646bf04488710274563b1f48048707bc78e51941b5d23
diff --git a/dev-python/ijson/ijson-3.2.3.ebuild b/dev-python/ijson/ijson-3.2.3.ebuild
deleted file mode 100644
index 186ccdfd83bb..000000000000
--- a/dev-python/ijson/ijson-3.2.3.ebuild
+++ /dev/null
@@ -1,36 +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 pypi
-
-DESCRIPTION="Iterative JSON parser with a Pythonic interface"
-HOMEPAGE="
-	https://github.com/ICRAR/ijson/
-	https://pypi.org/project/ijson/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-DEPEND="
-	dev-libs/yajl
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests pytest
-
-export IJSON_BUILD_YAJL2C=1
-
-python_test() {
-	rm -rf ijson || die
-	epytest
-}
diff --git a/dev-python/ijson/ijson-3.3.0.ebuild b/dev-python/ijson/ijson-3.3.0.ebuild
index 540ef53f0046..032cdfe26bf4 100644
--- a/dev-python/ijson/ijson-3.3.0.ebuild
+++ b/dev-python/ijson/ijson-3.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 DEPEND="
 	dev-libs/yajl:=
diff --git a/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild b/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild
index 6e6fe5a28ff1..ed38fada5708 100644
--- a/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~riscv x86"
 
 RDEPEND="
 	>=dev-python/comm-0.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.11.ebuild b/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.11.ebuild
index b7df5d019acb..4d9e30122431 100644
--- a/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.11.ebuild
+++ b/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.11.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~riscv x86"
 
 BDEPEND="
 	>=dev-python/jupyterlab-4.1.8[${PYTHON_USEDEP}]
diff --git a/dev-python/munkres/munkres-1.1.4-r1.ebuild b/dev-python/munkres/munkres-1.1.4-r1.ebuild
index 2e6677d8f935..43de957b51ad 100644
--- a/dev-python/munkres/munkres-1.1.4-r1.ebuild
+++ b/dev-python/munkres/munkres-1.1.4-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/nbxmpp/Manifest b/dev-python/nbxmpp/Manifest
index 79fb592b6398..23b509216d1f 100644
--- a/dev-python/nbxmpp/Manifest
+++ b/dev-python/nbxmpp/Manifest
@@ -1,2 +1,3 @@
 DIST python-nbxmpp-4.5.4.tar.bz2 138170 BLAKE2B 00a4919032dd29828dc735695afe9c0814a8fe2ec765a534257768896d9f27bc3a395275d546ad717bdd16c97161e8f0a8acaf43cdb7bd9404e40bc72f2c3da5 SHA512 fcaedae519d8cd2d52cc65721ab1e743569ba1cf7c29f2db41ed5671ba0f2c5b47f1f6d9521e1614e89e21512a4575c6788316cdb86936f0c4886d54c3831bb3
 DIST python-nbxmpp-5.0.0.tar.bz2 142680 BLAKE2B 9e54ad931ad5145c743f07e888eca519707b9179ece95d740c2209068cc02ee56b8af41bf18cf690ddb703485fab5f532b5bcf33eb74f022b0701c9421e3cd96 SHA512 0797e20dbdfaebbeb0a274786cb615cd0e57b26ec876ce94e5d66beb077510f8b38a97e0d0b151e2e069b10d1fe10b755d6531a4c676d7292675335314e4c214
+DIST python-nbxmpp-5.0.1.tar.bz2 142702 BLAKE2B 5459da538e3c05959c382e70fe8348b566333f4f68e76775b7bc8760f294ecc3bdb999124d1124bd5d7874af209f699eb4ffa1a15ce61ad70f98f235c70e98dd SHA512 eb20df090ec61013e6f26288798aeb2f2d61eab493cb4a52d5097a85d6dab8c45f033f2064583af5bf3ed920be33107419a958b65df2cf13fcd8ea6ae3297adf
diff --git a/dev-python/nbxmpp/nbxmpp-5.0.1.ebuild b/dev-python/nbxmpp/nbxmpp-5.0.1.ebuild
new file mode 100644
index 000000000000..30663972e64a
--- /dev/null
+++ b/dev-python/nbxmpp/nbxmpp-5.0.1.ebuild
@@ -0,0 +1,35 @@
+# 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=python-nbxmpp-${PV}
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="
+	https://dev.gajim.org/gajim/python-nbxmpp/
+	https://pypi.org/project/nbxmpp/
+"
+SRC_URI="
+	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${MY_P}.tar.bz2
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	net-libs/libsoup:3.0[introspection]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/precis-i18n-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.42[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index 839e2f8a2ec6..bfa3c2fa37ce 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,3 +1 @@
-DIST nodeenv-1.8.0.gh.tar.gz 36750 BLAKE2B e75217bb0c468649cbc29688f29d62450008816fb07e4decf1b28dada8b820c2d6f70eb65444e06a8c64b8a816c0cc98f7d179e770eaefe93e87c0cda05e1f85 SHA512 96dce219e00d3837b2b0083af9fe6d94ed4e3cd029e3da564263ad8656dcb9c52440c2df6a6954095e5cacd03e44437f08695603dea82c28122713045183014f
-DIST nodeenv-1.9.0.gh.tar.gz 37002 BLAKE2B a8db26f893816c30c8ff5e86d98b23106b1a3b74dd5f58dd51f423836b070851a5b761fca5221b9b8510a427cae2e36732841ad9fea0a9728aae8d303ca5f40d SHA512 d24612372f7fb6d909ce164f6b980086581b53ee8234c6ec14003a79418d7798481275e87589ade47c0502a4b396fa7b07fcfbb99174f1331f65dd6e7a1e0fd7
 DIST nodeenv-1.9.1.gh.tar.gz 37158 BLAKE2B 73cdc56f7e8b55b8f0f6a4ab20fe91957f2ed40c6f58b9f17b13fbadc1f15305566018ffe7731dd930560f6d46ba67572bd4bb4bf4ba0419fd54760bac909dd0 SHA512 28fa814b57323dd996764d754f9c614c9dfd668c85ab21c23d0f9aeebb669ba3933f7b0b9ccbf0c808b5f15783eb3afdf3801f293952f3c4945729dee6ecb20b
diff --git a/dev-python/nodeenv/files/nodeenv-1.8.0-which-hunt.patch b/dev-python/nodeenv/files/nodeenv-1.8.0-which-hunt.patch
deleted file mode 100644
index 58d3275e9568..000000000000
--- a/dev-python/nodeenv/files/nodeenv-1.8.0-which-hunt.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://github.com/ekalinin/nodeenv/issues/333
-https://github.com/ekalinin/nodeenv/pull/346
-
-From 0d3ebaf7e13175e2871f59856f29d880a4cb3acf Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 13 Dec 2023 04:13:24 +0000
-Subject: [PATCH] Remove usage of non-portable `which`
-
-* Use Python's shutil.which() instead of shelling out to `which` to find Python 2
-* Use `command -v` instead of `which` in README
-
-Fixes: https://github.com/ekalinin/nodeenv/issues/333
----
- README.rst    | 2 +-
- README.ru.rst | 2 +-
- nodeenv.py    | 8 ++------
- 3 files changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/README.rst b/README.rst
-index c9e130b..3459572 100644
---- a/README.rst
-+++ b/README.rst
-@@ -211,7 +211,7 @@ environment::
- 
-     $ workon my_env
-     $ npm install -g coffee-script
--    $ which coffee
-+    $ command -v coffee
-     /home/monty/virtualenvs/my_env/bin/coffee
-     
- Creating a virtual environment with a custom prompt:
-diff --git a/README.ru.rst b/README.ru.rst
-index c3eb130..2cc821e 100644
---- a/README.ru.rst
-+++ b/README.ru.rst
-@@ -155,7 +155,7 @@ python'а::
- 
-     $ workon my_env
-     $ npm install -g coffee-script
--    $ which coffee
-+    $ command -v coffee
-     /home/monty/virtualenvs/my_env/bin/coffee
- 
- 
-diff --git a/nodeenv.py b/nodeenv.py
-index 9d5dd06..183ded2 100644
---- a/nodeenv.py
-+++ b/nodeenv.py
-@@ -707,12 +707,8 @@ def build_node_from_src(env_dir, src_dir, node_src_dir, args):
-         # Currently, the node.js build scripts are using python2.*,
-         # therefore we need to temporarily point python exec to the
-         # python 2.* version in this case.
--        try:
--            _, which_python2_output = callit(
--                ['which', 'python2'], args.verbose, True, node_src_dir, env
--            )
--            python2_path = which_python2_output[0]
--        except (OSError, IndexError):
-+        python2_path = shutil.which('python2')
-+        if not python2_path:
-             raise OSError(
-                 'Python >=3.0 virtualenv detected, but no python2 '
-                 'command (required for building node.js) was found'
-
diff --git a/dev-python/nodeenv/nodeenv-1.8.0-r1.ebuild b/dev-python/nodeenv/nodeenv-1.8.0-r1.ebuild
deleted file mode 100644
index 64eec7f1028a..000000000000
--- a/dev-python/nodeenv/nodeenv-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,33 +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
-
-DESCRIPTION="Node.js virtual environment builder"
-HOMEPAGE="
-	https://github.com/ekalinin/nodeenv/
-	https://pypi.org/project/nodeenv/
-"
-SRC_URI="
-	https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 x86"
-
-# requires network access
-RESTRICT="test"
-PROPERTIES="test_network"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.0-which-hunt.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/nodeenv/nodeenv-1.9.0.ebuild b/dev-python/nodeenv/nodeenv-1.9.0.ebuild
deleted file mode 100644
index 548c1e89f759..000000000000
--- a/dev-python/nodeenv/nodeenv-1.9.0.ebuild
+++ /dev/null
@@ -1,34 +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="Node.js virtual environment builder"
-HOMEPAGE="
-	https://github.com/ekalinin/nodeenv/
-	https://pypi.org/project/nodeenv/
-"
-SRC_URI="
-	https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-
-# requires network access
-RESTRICT="test"
-PROPERTIES="test_network"
-
-PATCHES=(
-	# https://github.com/ekalinin/nodeenv/pull/355
-	"${FILESDIR}/${P}-which-hunt.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/nodeenv/nodeenv-1.9.1.ebuild b/dev-python/nodeenv/nodeenv-1.9.1.ebuild
index 7427b5112a8c..9dbb929fdada 100644
--- a/dev-python/nodeenv/nodeenv-1.9.1.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.9.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 x86"
 
 # requires network access
 RESTRICT="test"
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 7219f612f82f..b09433284302 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1 @@
-DIST python-phonenumbers-8.13.37.gh.tar.gz 4915690 BLAKE2B b0d325c5f5aca2bcfcc98bab4e5654f4cb21908b41c32b498543186e037b1f2d425ed265c1a3d2bec87fc8ae913257fc455169c91929bfbba3e44bcedffaf0dc SHA512 ac55e8cb2bad7e1e70afb13c49cdd1f73fc840cad6e10f4f9a6c817043729aaf3bdfddae0c9ab3d19f9d4de8cdff949c0bddd94de63e1c42e6c55e0445c69d6c
-DIST python-phonenumbers-8.13.38.gh.tar.gz 4915409 BLAKE2B 26bf7179466468ed0b682c0928e1e3190885dc4bc5969c97be5f3ecbdc1a81640e42133ae52db69e277b74c35e2d62cbb45af421c557cfc31f5102bcf281aeb8 SHA512 9b929193b0667cf560e7cce86db844761de8dffeca2e244d91e42e9ad83dbc819cb33a738432f9f53761d0c241aa011a38fc14ae2265c6f351144107430360cb
 DIST python-phonenumbers-8.13.39.gh.tar.gz 4915365 BLAKE2B 998a45240717e3beedf3e319ce4e114062acd33129d916483041f6b51c410b2a058ef85236b3bf2db190100332fc39942b60615488366c08e54e296289d57a1a SHA512 a9de957e256d00fe7793646eaf0213ccbb452dbf89625e47e1ee47901014529cc48a30ef1cb48e2f929ae0083c89e584de149d9532691fb52c0ee44675234d74
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.37.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.37.ebuild
deleted file mode 100644
index 778607a083c5..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.37.ebuild
+++ /dev/null
@@ -1,39 +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=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.38.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.38.ebuild
deleted file mode 100644
index 062c56c77784..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.38.ebuild
+++ /dev/null
@@ -1,39 +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=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.39.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.39.ebuild
index 062c56c77784..778607a083c5 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.39.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.39.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pikepdf/pikepdf-9.0.0.ebuild b/dev-python/pikepdf/pikepdf-9.0.0.ebuild
index 785dc5b35862..6644fa2cb275 100644
--- a/dev-python/pikepdf/pikepdf-9.0.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-9.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="big-endian"
 
 # Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
diff --git a/dev-python/pkgcraft/Manifest b/dev-python/pkgcraft/Manifest
index 46d87a4c79f0..5fe3431bf1c8 100644
--- a/dev-python/pkgcraft/Manifest
+++ b/dev-python/pkgcraft/Manifest
@@ -1 +1,2 @@
+DIST pkgcraft-0.0.10.tar.gz 452861 BLAKE2B f7f52e8c7c917701b08540cc8da8ee1f1ff7157b02e61d5cfa1b4ca6850ae8aac171dfdefe6ac611ce4971aff27d63614d4914178bf86c8a389e437d5fb43ba9 SHA512 1c3878256bfbeae05ceb9e7445e100a8e6601649aae634b02bdd00494075056fad014b724e2cfd76325dd06c664c1c90343f49f186c0b61bfe2d92bbed14abe4
 DIST pkgcraft-0.0.9.tar.gz 431872 BLAKE2B 6c6ed1677c891c0e5579c7e28342876c2d7cbe03f2fcf3f8ad9f994302570d1d2398d2b4a55ec1a2fd82bbea518a4d2f76e9cabe760f0d9779b8d55170c1d940 SHA512 13988ff6822a5f9b715f3a9e8593a21d6ac530a91ca98790bd8a1c3e5958c97e440ce0610d25ed518f6d485837c9aded2ba145facf98e217325802777a33b3a7
diff --git a/dev-python/pkgcraft/pkgcraft-0.0.10.ebuild b/dev-python/pkgcraft/pkgcraft-0.0.10.ebuild
new file mode 100644
index 000000000000..aa7220a40bea
--- /dev/null
+++ b/dev-python/pkgcraft/pkgcraft-0.0.10.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2023-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
+
+DESCRIPTION="Python bindings for pkgcraft"
+HOMEPAGE="
+	https://pypi.org/project/pkgcraft/
+	https://github.com/pkgcraft/pkgcraft-python/
+"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft-python.git"
+	inherit git-r3
+
+	PKGCRAFT_VERSION_MAX="99999" # extra 9 here or 9999 isn't mergable per DEPEND below
+	PKGCRAFT_VERSION_MIN="9999"
+else
+	SRC_URI="https://github.com/pkgcraft/pkgcraft-python/releases/download/v${PV}/${P/-python}.tar.gz"
+	S="${WORKDIR}"/${P/-python}
+
+	KEYWORDS="~amd64 ~arm64"
+
+	PKGCRAFT_VERSION_MAX="9999"
+	PKGCRAFT_VERSION_MIN="0.0.15"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+examples"
+
+DEPEND="
+	<sys-libs/pkgcraft-${PKGCRAFT_VERSION_MAX}
+	>=sys-libs/pkgcraft-${PKGCRAFT_VERSION_MIN}:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-python/cython-3[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	if [[ ${PV} != 9999 ]] ; then
+		local actual_pkgcraft_min=$(sed -En '/^MIN_VERSION =/{s/[^0-9.]//gp}' setup.py || die)
+		if [[ ${actual_pkgcraft_min} != ${PKGCRAFT_VERSION_MIN} ]] ; then
+			eerror "Expected minimum pkgcraft-c version: ${PKGCRAFT_VERSION_MIN}"
+			eerror "Actual minimum pkgcraft-c version: ${actual_pkgcraft_min}"
+			die "Mismatch between setup.py's MIN_VERSION and ebuild!"
+		fi
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+python_install() {
+	# Conditional because these aren't installed officially right now
+	# and the naming is just for convenience.
+	if use examples ; then
+		while IFS= read -r -d '' file ; do
+			python_newexe "${S}"/examples/${file##*/} pkgcraft-${file##*/}
+		done < <(find "${S}"/examples -type f -executable -print0 || die)
+	fi
+
+	distutils-r1_python_install
+}
diff --git a/dev-python/pkgcraft/pkgcraft-9999.ebuild b/dev-python/pkgcraft/pkgcraft-9999.ebuild
index 898b4fc511ec..aa7220a40bea 100644
--- a/dev-python/pkgcraft/pkgcraft-9999.ebuild
+++ b/dev-python/pkgcraft/pkgcraft-9999.ebuild
@@ -28,7 +28,7 @@ else
 	KEYWORDS="~amd64 ~arm64"
 
 	PKGCRAFT_VERSION_MAX="9999"
-	PKGCRAFT_VERSION_MIN="0.0.14"
+	PKGCRAFT_VERSION_MIN="0.0.15"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/pooch/Manifest b/dev-python/pooch/Manifest
index 1c68480c019b..fbc3e5db92fc 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1,2 +1 @@
-DIST pooch-1.8.1.tar.gz 59614 BLAKE2B ff30e6f1a1cc71091d5e822eb0eeda59fb1ff8f53d2dd6dc67dccc955d28f3fa485d03615d544096fdae7786c181a3395b62e3c59212f80b977755e3df0addf0 SHA512 9e78da7839deb443340c925622d5e9b1d7a3f14fdac3eae2528fb91ebf86f88715e8737e869057fe7c703e8423303e15379c07e5d11a7bebd3da63b1ac06ae3f
 DIST pooch-1.8.2.tar.gz 59353 BLAKE2B 88b80665ad2af13bebeee9a6864c054eb1bfd5881a6e185b8025ce69896302093637f2a5e3ad58ad8a9af8c6161a30f04074081bfe562b83034b8fd4d36533c7 SHA512 e81c343c0f40f90ecaf347408818ff4b6924404adcaa9572deb55adf6c7bb40c8d91bef69461cc4407dfdba69b35bcfaeacf0070fdd18124008f11532bf7affc
diff --git a/dev-python/pooch/pooch-1.8.1.ebuild b/dev-python/pooch/pooch-1.8.1.ebuild
deleted file mode 100644
index cab0065e380d..000000000000
--- a/dev-python/pooch/pooch-1.8.1.ebuild
+++ /dev/null
@@ -1,59 +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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Manage your Python library's sample data files"
-HOMEPAGE="
-	https://github.com/fatiando/pooch/
-	https://pypi.org/project/pooch/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.5.0[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/tqdm[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# Needs network
-	pooch/tests/test_core.py::test_check_availability_invalid_downloader
-	pooch/tests/test_core.py::test_load_registry_from_doi
-	pooch/tests/test_core.py::test_load_registry_from_doi_zenodo_with_slash
-	# dev-python/pytest-localftpserver -> dev-python/pyftpdlib has py3.12 issues
-	# https://github.com/giampaolo/pyftpdlib/issues/560#issuecomment-971377238
-	pooch/tests/test_core.py::test_check_availability_on_ftp
-	pooch/tests/test_downloaders.py::test_invalid_doi_repository
-	pooch/tests/test_downloaders.py::test_doi_url_not_found
-	pooch/tests/test_downloaders.py::test_figshare_url_file_not_found
-	pooch/tests/test_downloaders.py::test_doi_downloader
-)
-
-### docs no included in pypi tarball
-# distutils_enable_sphinx doc \
-#	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_httpserver -k "not network"
-}
diff --git a/dev-python/pooch/pooch-1.8.2.ebuild b/dev-python/pooch/pooch-1.8.2.ebuild
index d2bdccb3a823..41a22c47ec07 100644
--- a/dev-python/pooch/pooch-1.8.2.ebuild
+++ b/dev-python/pooch/pooch-1.8.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
diff --git a/dev-python/portalocker/Manifest b/dev-python/portalocker/Manifest
index 2b7cb69b59db..0ed34571e8a2 100644
--- a/dev-python/portalocker/Manifest
+++ b/dev-python/portalocker/Manifest
@@ -1 +1,2 @@
+DIST portalocker-2.10.0.gh.tar.gz 34084 BLAKE2B 9efb130859002a4a6bb4c18b2fad293b6cfe3344402b7442be4d4d1b17ff837ff45a39ebb5e50db09ce2dcc7c902b72fa9d9f64625e772be1150d5659f2eafaa SHA512 79b60472ca589e6e696203f829eae2d66c11fca4ee2c7280aad91395f2cc2db6a1c7ae131d7a4945b2a2455ad62829a8a3163c628a74ec46a0f1564ea27d50e7
 DIST portalocker-2.8.2.gh.tar.gz 32382 BLAKE2B d953165d4e64d4bf5d084a9d5563b6e53515abbddeb7f9a4a49ea3358ff3bafc9631f38322e4a7ff1ab702aff4813eb52b4a7c431f411d767afd0647347d37af SHA512 3772ea6d15ee80d284c7fc7e88bdc9ab7714b460fdca39c2a288e0375c16f430bf9362da06227084dc2e56bd7342bd2d59823a94daf52ca51366e69fe6456236
diff --git a/dev-python/portalocker/portalocker-2.10.0.ebuild b/dev-python/portalocker/portalocker-2.10.0.ebuild
new file mode 100644
index 000000000000..d622866547a9
--- /dev/null
+++ b/dev-python/portalocker/portalocker-2.10.0.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 optfeature
+
+DESCRIPTION="A library for Python file locking"
+HOMEPAGE="
+	https://github.com/WoLpH/portalocker/
+	https://portalocker.readthedocs.io/
+	https://pypi.org/project/portalocker/
+"
+SRC_URI="
+	https://github.com/WoLpH/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/redis[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-6.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	# Disable code coverage in tests.
+	sed -i '/^ *--cov.*$/d' pytest.ini || die
+}
+
+pkg_postinst() {
+	optfeature "redis support" dev-python/redis
+}
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 5fba8e6d3153..0285d4720969 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1 +1,2 @@
 DIST scikit_build-0.17.6.tar.gz 272208 BLAKE2B 9e3f908041eca89182f798c54a1a248934dc026816f7cd041a8debc97be27096942dda42a0ae63e87b9337304a478d6f520edcd5ea7a45aae6a195d1f769eed2 SHA512 92b97146f40d8222bd8415ef8439497d5075b72e5bafc40aba0a3e2911d269a118f2f7d41f468f7add8949f550b1fd7d5a9113d249e42dfac431108182ca9198
+DIST scikit_build-0.18.0.tar.gz 273824 BLAKE2B 2eac991ea22948e900c4485783f5bcbb8b87bd5858bbe7ade99b2a67c16a9a035e04c53b2d9b94422a5eff36f33c11cf297198bce520ba818b7355386977a8a1 SHA512 a374f86c69a288ddcfe8e8d95b594b2bf94365b4d6d4d25a7912cf871f12dfb1866b1d74694c919ef8e4fef3d166b7afe9de3b32b56add33173840a9bb917c71
diff --git a/dev-python/scikit-build/scikit-build-0.18.0.ebuild b/dev-python/scikit-build/scikit-build-0.18.0.ebuild
new file mode 100644
index 000000000000..f095e4479f56
--- /dev/null
+++ b/dev-python/scikit-build/scikit-build-0.18.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
+HOMEPAGE="
+	https://github.com/scikit-build/scikit-build/
+	https://pypi.org/project/scikit-build/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-42.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+	>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/build-0.7[${PYTHON_USEDEP}]
+		>=dev-python/cython-0.25.1[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.10.4[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme \
+	dev-python/sphinx-issues
+# note: tests are unstable with xdist
+distutils_enable_tests pytest
+
+src_prepare() {
+	# not packaged
+	sed -i -e '/cmakedomain/d' docs/conf.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# no "library" in (our install of) pypy3
+				tests/test_cmaker.py::test_get_python_library
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock \
+		-m "not isolated and not nosetuptoolsscm" \
+		-o tmp_path_retention_count=1
+	rm -r "${BUILD_DIR}/install$(python_get_sitedir)"/{easy-install.pth,*.egg,*.egg-link} || die
+}
diff --git a/dev-python/shtab/shtab-1.7.1.ebuild b/dev-python/shtab/shtab-1.7.1.ebuild
index 3f25ee830bd5..4171861a621f 100644
--- a/dev-python/shtab/shtab-1.7.1.ebuild
+++ b/dev-python/shtab/shtab-1.7.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 
 BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index ca75b172dff1..e63f1106e457 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,4 +1,4 @@
 DIST sip-6.8.3.gh.tar.gz 585528 BLAKE2B 2a58edba0f7ca9da02399df9fe71f152ef8446c38886ca2a21c00ef3ac65e0a82493a6047120d6f786e5b26f974c9cac24a329f1a52d9c47f9669afe2f0789b4 SHA512 6ff5fa59a55d71a3303553d2c53879fc9ccc01b9db34da149a7b81e252613327c7390c5a2edeaec03381dbc36ed38aa4ce44d69560c277ecc3875a57e7d75a60
 DIST sip-6.8.3.tar.gz 987656 BLAKE2B 57cc4010aae64eec7e0f338d9653463c7381b639aa8efca978a3f3296550a37b3a09b52933a2c2cd354a65155841952d7ca045b0b774945a382c29a8d597951e SHA512 8a0ff1c16ead4c2b1c53963a015fb3d149362f649eeec2523e6b243945493f28f5ecf29aabbf5cee5f7909ded40d64a1f469d2d0c1b3c33244e6213ab23ec733
-DIST sip-6.8.4.gh.tar.gz 514574 BLAKE2B da112fb77160e8e4be703dbeb2199e6a8c7b2ad3d878873f834c742c5a8cf9904e0caf8615e75de64d3df468529f1e543f90befbf0582d1e4100fe251a4bfab9 SHA512 4e3ea827e06e59cb4663328c307958cfc33d42206980152b134c5161dcfd949a5062f3322ffd102834df8da2f91af59b1ef1c4d2e8917c87a9a214ac34846e0c
-DIST sip-6.8.4.tar.gz 420104 BLAKE2B a4b212f520b4bd53bd207519f6399b7c86ff84975a12d9c153458d6a115467d17dd58ea420ee3554a843cf0eb7e8572ad620568792123b66336e1a55c2dedcb4 SHA512 ea71e43a81a1b9a9fec45ddd4fb24347940b904f5b46649c1bd8283b4cdaee0abb7a60a0c02a75641762a13c41232b995c6e8ac4a2328b44309e285daddac084
+DIST sip-6.8.5.gh.tar.gz 514702 BLAKE2B 82b41f87991a9c8dd5416a948d5fd356d8d815fef007bcca7089d8b942f6287b9609d5813368afbca924f563873eea025462d83ba9b36d910004115fa81f289e SHA512 de5a5a134ef8a4a8dfeb97ca00cdd6d7c8a297e67aa046f003c883d14fe4cf1f009f6443712b78bc0f693e30b89fab3f76d5ef8ee18e9620f161c1933b2db513
+DIST sip-6.8.5.tar.gz 420177 BLAKE2B 274df04ef21298fbc7559166e5d3b8830a10db900ee0c52001bc6f328e23dd691f092df560cd93e76a3ca17bbd89de88ab3370719dd6c9346e9ba3f3b7570e5c SHA512 eeb1e51624d95bc36e72f5d1949793b647c2b97d5bd13ea80d9a2a901698b4d7336e6812421b0f346af248350061c02db5a8c13aeb33ec31d8bd6dbea967a282
diff --git a/dev-python/sip/sip-6.8.4.ebuild b/dev-python/sip/sip-6.8.5.ebuild
index 1cee88a689ad..1cee88a689ad 100644
--- a/dev-python/sip/sip-6.8.4.ebuild
+++ b/dev-python/sip/sip-6.8.5.ebuild
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 338977f69b23..0a6c24ec8af8 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,3 +1,4 @@
 DIST sphinx_autodoc_typehints-2.1.0.tar.gz 39386 BLAKE2B ccf6b618fc3db2a576a2d9a36a575087cdc3c7c5cf59a6057a956478a12715b1623dc4bc1ae3f7c30deab317a15fa187faf19f9d050fa61c293dc20bee41effd SHA512 59c5b4c682fadc1d0ec62a5aa639bb87d6e4710db89793824c348c7598d73b144f0b083ce6462ea32d958b1ed7fd2fb96c2a92780267adef03b625e64c08c412
 DIST sphinx_autodoc_typehints-2.2.0.tar.gz 39603 BLAKE2B 42286d62684a3fdb9949f9e4af56aece11b93b8b5e78be06df03389ceec7fdb99f4baa1ddd46facaa8cb85900655ddae08056fef44a73dc21f29fd87540dacfc SHA512 24c2cc40c56656cc85006e96341d57d46228a67524f4cbc13724fdbd1c0a5a2c41b08e170e217ac5198330fb70539514735b60c34eb84ea15717c38bb95b0adf
 DIST sphinx_autodoc_typehints-2.2.1.tar.gz 39845 BLAKE2B 8ed9ce0ad5db9504f783f739319026ff72520ecf706eeeeccf486001e2bbfbaca851e3a2b2593759214bb31d19f140bc6708e6861f6b835ed60a3c610508727b SHA512 fd364809c9ba3a4ad1ffeedcb55de2e57ecaa15235a4cfc0e97131071cd08c4b7af298e6f975d102aa30500984625cee6df2f690ddbf6e80ba280cc4b4f6cd2e
+DIST sphinx_autodoc_typehints-2.2.2.tar.gz 40324 BLAKE2B 113a3ce262ca5c1bab60d388080ce33559dc24388c0690b9db8413825b136830015afd70cfa0c95464d6bdc4824fb8b511a22579eb2ab0fec267405ce953ace9 SHA512 11996f0cf916ccf7f630bbdad7e4b4f0e0969c97c5714c71a08a2c0eda3c1e36a27843048cf44c42b1a71e7d50b4353d94cf3c201bf2356ded2f305709bd1b1e
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.2.2.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.2.2.ebuild
new file mode 100644
index 000000000000..8c125375fd3a
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.2.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-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 pypi
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension"
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/sphinx-7.1.2[${PYTHON_USEDEP}]
+"
+# skipping optional test dep on dev-python/nptyping as that package
+# is horribly broken and on its way out
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/sphobjinv-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# this package is addicted to Internet
+		tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/tornado/tornado-6.4.1.ebuild b/dev-python/tornado/tornado-6.4.1.ebuild
index 67f6fe8d22d0..b72b854ac4e4 100644
--- a/dev-python/tornado/tornado-6.4.1.ebuild
+++ b/dev-python/tornado/tornado-6.4.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 90cd25486d32..4291f32939e7 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,3 +1,2 @@
-DIST weasyprint-62.1.tar.gz 475687 BLAKE2B 80e5f24c2a52f60baada23239427cc80f34d9885d7decca172dcb420bcb76cdc49a4d15e21d4328e86bf9c7f9228f9a01da1244eba21f35a90f80a8e358b74bc SHA512 8eaee6daa610accd7594141102aecaf1b5debecbae196c442c32d522d4dcb54c411a215b77956b6e66deeb0abda66cb36d0e081d5d3fd69a8bf5a82716209aeb
 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.1.ebuild b/dev-python/weasyprint/weasyprint-62.1.ebuild
deleted file mode 100644
index 819b3a396878..000000000000
--- a/dev-python/weasyprint/weasyprint-62.1.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/weasyprint/weasyprint-62.2.ebuild b/dev-python/weasyprint/weasyprint-62.2.ebuild
index b138d743eaae..819b3a396878 100644
--- a/dev-python/weasyprint/weasyprint-62.2.ebuild
+++ b/dev-python/weasyprint/weasyprint-62.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]