Adding metadata

86 files changed, 567 insertions, 167 deletions

diff --git a/dev-python/a2wsgi/a2wsgi-1.10.7-r1.ebuild b/dev-python/a2wsgi/a2wsgi-1.10.7-r1.ebuild
index 71d93799ad21..14ee0aca7aa3 100644
--- a/dev-python/a2wsgi/a2wsgi-1.10.7-r1.ebuild
+++ b/dev-python/a2wsgi/a2wsgi-1.10.7-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/a2wsgi/a2wsgi-1.10.7.ebuild b/dev-python/a2wsgi/a2wsgi-1.10.7.ebuild
deleted file mode 100644
index dc2edc71e1b9..000000000000
--- a/dev-python/a2wsgi/a2wsgi-1.10.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Convert WSGI app to ASGI app or ASGI app to WSGI app"
-HOMEPAGE="
-	https://github.com/abersheeran/a2wsgi/
-	https://pypi.org/project/a2wsgi/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		<dev-python/asgiref-4[${PYTHON_USEDEP}]
-		>=dev-python/asgiref-3.2.7[${PYTHON_USEDEP}]
-		<dev-python/httpx-1[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires baize
-		tests/test_asgi.py::test_baize_stream_response
-		# requires starlette
-		tests/test_asgi.py::test_starlette_stream_response
-		tests/test_asgi.py::test_starlette_base_http_middleware
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio
-}
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index b055721cd817..cdd5bcb586ed 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,3 +1,4 @@
 DIST aiohttp-3.10.10.tar.gz 7542993 BLAKE2B edc9808937892e2915b591a3d5b9e2be8401a67e6421ada8c49e27cfa1ee67283465d17e3c3a77f7579d4ed45df39884a2f9e336429ef7d64adf351ce7507a85 SHA512 c6928d989c110c323347b6f5b0a90c42e17924b4121455a240f5a15d87f939580640ba0f8d576f8254e484e5b631ec4562a2fb4e6c86402924b1892a6d72aff8
 DIST aiohttp-3.11.0b4.tar.gz 7618792 BLAKE2B ec809ddfac1c4dd70a84e4ec03e58e20d8f52af6311dc4712cc54321a6d34d551fe13bcc507e293e5a14afbb42dd4beb8544941fbc749fa4c3241a732aaed03e SHA512 2790e9ee096c5825210b98ea18b0119e29b40203e7f62092afc637463e58c8d4036eea7ef4aef7eb58a5bb5fb677ed1251665d70b0ab37f4961de928eb381aec
 DIST aiohttp-3.11.0b5.tar.gz 7621335 BLAKE2B 79fb393009c197f46b096fffa164c3da2380c711c3e28aec8d745c1af3776ea95c097a050943cc4c431c026ac5349c30728c363aa84de50a81162c817af8b319 SHA512 27ac64085317308e9281d8ac047e940f3dc86d4c871c3125b951ed190445623750a3c75745cf01d93739ea1c55126a5b5a56d59fd359ed89f17eaa9792a216a2
+DIST aiohttp-3.11.0rc0.tar.gz 7621610 BLAKE2B a7ef4a7d373bd87155519bd71c396e24224120efeb07dbb173081e034411f4d1e694015d3599d30856e0a80a4d5d43b8d8ee6cdec1d6d19f2dc2940f7271c910 SHA512 3f34c54683b75a0727dd541a1a01a0621aba52f235b32490ccec6656ffbde39224b38b99e58cd62d4e64e43b378e87424a2f9c146f8c6f158ecb226f0e91aae1
diff --git a/dev-python/aiohttp/aiohttp-3.11.0_rc0.ebuild b/dev-python/aiohttp/aiohttp-3.11.0_rc0.ebuild
new file mode 100644
index 000000000000..4a10c19005b4
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.11.0_rc0.ebuild
@@ -0,0 +1,131 @@
+# 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_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="HTTP client/server for asyncio"
+HOMEPAGE="
+	https://github.com/aio-libs/aiohttp/
+	https://pypi.org/project/aiohttp/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions test-rust"
+
+RDEPEND="
+	>=dev-python/aiodns-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohappyeyeballs-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/propcache-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.17.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		<dev-python/async-timeout-6[${PYTHON_USEDEP}]
+		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	native-extensions? (
+		dev-python/cython[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		test-rust? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# increase the timeout a little
+	sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die
+	# xfail_strict fails on py3.10
+	sed -i -e '/--cov/d' -e '/pytest_cov/d' -e '/xfail_strict/d' setup.cfg || die
+	sed -i -e 's:-Werror::' Makefile || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	if [[ ! -d tools && ${EPYTHON} != pypy3 ]] && use native-extensions
+	then
+		# workaround missing files
+		mkdir tools || die
+		> requirements/cython.txt || die
+		> tools/gen.py || die
+		chmod +x tools/gen.py || die
+		# force rehashing first
+		emake requirements/.hash/cython.txt.hash
+		> .update-pip || die
+		> .install-cython || die
+		emake cythonize
+	fi
+}
+
+python_compile() {
+	# implicitly disabled for pypy3
+	if ! use native-extensions; then
+		local -x AIOHTTP_NO_EXTENSIONS=1
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# proxy is not packaged
+		tests/test_proxy_functional.py
+		# python_on_whales is not packaged
+		tests/autobahn/test_autobahn.py
+		# benchmarks
+		tests/test_benchmarks_client.py
+		tests/test_benchmarks_client_request.py
+		tests/test_benchmarks_client_ws.py
+		tests/test_benchmarks_cookiejar.py
+		tests/test_benchmarks_http_websocket.py
+		tests/test_benchmarks_http_writer.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_client_session.py::test_client_session_timeout_zero
+		# broken by irrelevant deprecation warnings
+		tests/test_circular_imports.py::test_no_warnings
+	)
+
+	# upstream unconditionally blocks building C extensions
+	# on PyPy3 but the test suite needs an explicit switch
+	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
+		local -x AIOHTTP_NO_EXTENSIONS=1
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin
+	rm -rf aiohttp || die
+	epytest -m "not internal and not dev_mode" \
+		-p rerunfailures --reruns=5
+}
diff --git a/dev-python/betterproto/betterproto-2.0.0_beta6.ebuild b/dev-python/betterproto/betterproto-2.0.0_beta6.ebuild
index 0df692094ca8..472d2bdc8b1b 100644
--- a/dev-python/betterproto/betterproto-2.0.0_beta6.ebuild
+++ b/dev-python/betterproto/betterproto-2.0.0_beta6.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	>=dev-python/black-23.1.0[${PYTHON_USEDEP}]
 	>=dev-python/grpclib-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/isort-5.11.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.0.3[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.8[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/betterproto/betterproto-2.0.0_beta7.ebuild b/dev-python/betterproto/betterproto-2.0.0_beta7.ebuild
index 76ec4cba37e5..4e3b90b2b33a 100644
--- a/dev-python/betterproto/betterproto-2.0.0_beta7.ebuild
+++ b/dev-python/betterproto/betterproto-2.0.0_beta7.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	>=dev-python/black-23.1.0[${PYTHON_USEDEP}]
 	>=dev-python/grpclib-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/isort-5.11.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.0.3[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.8[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/cython/cython-3.0.11.ebuild b/dev-python/cython/cython-3.0.11.ebuild
index 6035b42cf3b7..abcc879eff44 100644
--- a/dev-python/cython/cython-3.0.11.ebuild
+++ b/dev-python/cython/cython-3.0.11.ebuild
@@ -46,7 +46,7 @@ PATCHES=(
 )
 
 distutils_enable_sphinx docs \
-	dev-python/jinja \
+	dev-python/jinja2 \
 	dev-python/sphinx-issues \
 	dev-python/sphinx-tabs
 
diff --git a/dev-python/django/django-4.2.16.ebuild b/dev-python/django/django-4.2.16.ebuild
index 52736d5661b2..8017af3404f1 100644
--- a/dev-python/django/django-4.2.16.ebuild
+++ b/dev-python/django/django-4.2.16.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 		$(python_gen_impl_dep sqlite)
 		${RDEPEND}
 		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/jinja2[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[webp,${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-5.0.9.ebuild b/dev-python/django/django-5.0.9.ebuild
index 6eabd2b614b1..86a3c450fcf9 100644
--- a/dev-python/django/django-5.0.9.ebuild
+++ b/dev-python/django/django-5.0.9.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 		$(python_gen_impl_dep sqlite)
 		${RDEPEND}
 		>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
-		>=dev-python/jinja-2.11.0[${PYTHON_USEDEP}]
+		>=dev-python/jinja2-2.11.0[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[webp,${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-5.1.2.ebuild b/dev-python/django/django-5.1.2.ebuild
index ca6b1c0d0514..9a7146ee38d9 100644
--- a/dev-python/django/django-5.1.2.ebuild
+++ b/dev-python/django/django-5.1.2.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 		$(python_gen_impl_dep sqlite)
 		${RDEPEND}
 		>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
-		>=dev-python/jinja-2.11.0[${PYTHON_USEDEP}]
+		>=dev-python/jinja2-2.11.0[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[webp,${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-5.1.3.ebuild b/dev-python/django/django-5.1.3.ebuild
index 60766d7371f6..d8c96c59b6e3 100644
--- a/dev-python/django/django-5.1.3.ebuild
+++ b/dev-python/django/django-5.1.3.ebuild
@@ -42,7 +42,7 @@ BDEPEND="
 		$(python_gen_impl_dep sqlite)
 		${RDEPEND}
 		>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
-		>=dev-python/jinja-2.11.0[${PYTHON_USEDEP}]
+		>=dev-python/jinja2-2.11.0[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[webp,${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/dulwich/dulwich-0.22.5-r1.ebuild b/dev-python/dulwich/dulwich-0.22.5-r1.ebuild
index c7a55c2f65d3..c645f4bb9949 100644
--- a/dev-python/dulwich/dulwich-0.22.5-r1.ebuild
+++ b/dev-python/dulwich/dulwich-0.22.5-r1.ebuild
@@ -74,21 +74,15 @@ distutils_enable_sphinx docs
 
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/dulwich/_.*.so"
 
-src_unpack() {
-	cargo_src_unpack
+pkg_setup() {
+	# avoid rust_pkg_setup which will die when there's no Rust found
+	if use native-extensions ; then
+		rust_pkg_setup  # implicitly inherited through cargo
+	fi
 }
 
-src_prepare() {
-	default
-
-	if use !native-extensions; then
-		# avoid hard dep on rust via setuptools_rust
-		# https://github.com/jelmer/dulwich/issues/1405
-		sed -i \
-			-e '/from setuptools_rust/d' \
-			-e '/^rust_extensions = \[/,/^\]/d' \
-			setup.py || die
-	fi
+src_unpack() {
+	cargo_src_unpack
 }
 
 python_compile() {
diff --git a/dev-python/ecdsa/ecdsa-0.19.0.ebuild b/dev-python/ecdsa/ecdsa-0.19.0.ebuild
index ab8c6db2f853..c4cdd9282121 100644
--- a/dev-python/ecdsa/ecdsa-0.19.0.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.19.0.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~ppc-macos ~x64
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/gmpy2[${PYTHON_USEDEP}]
 	' 'python*')
 	dev-python/six[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/flask-babel/flask-babel-4.0.0.ebuild b/dev-python/flask-babel/flask-babel-4.0.0.ebuild
index 94fc627f0937..da64ed503302 100644
--- a/dev-python/flask-babel/flask-babel-4.0.0.ebuild
+++ b/dev-python/flask-babel/flask-babel-4.0.0.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 RDEPEND="
 	>=dev-python/Babel-2.12[${PYTHON_USEDEP}]
 	>=dev-python/flask-2.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2022.7[${PYTHON_USEDEP}]
 	dev-python/werkzeug[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/flask-debug/flask-debug-0.4.3-r2.ebuild b/dev-python/flask-debug/flask-debug-0.4.3-r2.ebuild
index db7c1cac831d..673f9eba85e1 100644
--- a/dev-python/flask-debug/flask-debug-0.4.3-r2.ebuild
+++ b/dev-python/flask-debug/flask-debug-0.4.3-r2.ebuild
@@ -29,7 +29,7 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 RDEPEND="
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/inflection[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/flask/flask-3.0.3.ebuild b/dev-python/flask/flask-3.0.3.ebuild
index 574afcedb384..ccf2c1d50e32 100644
--- a/dev-python/flask/flask-3.0.3.ebuild
+++ b/dev-python/flask/flask-3.0.3.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-python/blinker-1.6.2[${PYTHON_USEDEP}]
 	>=dev-python/click-8.1.3[${PYTHON_USEDEP}]
 	>=dev-python/itsdangerous-2.1.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1.2[${PYTHON_USEDEP}]
 	>=dev-python/werkzeug-3.0.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy2/Manifest
index 0438447f5105..0438447f5105 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy2/Manifest
diff --git a/dev-python/gmpy/gmpy-2.2.1.ebuild b/dev-python/gmpy2/gmpy2-2.2.1.ebuild
index ec8117acb34d..ec8117acb34d 100644
--- a/dev-python/gmpy/gmpy-2.2.1.ebuild
+++ b/dev-python/gmpy2/gmpy2-2.2.1.ebuild
diff --git a/dev-python/gmpy/metadata.xml b/dev-python/gmpy2/metadata.xml
index 7ea98e9c2775..7ea98e9c2775 100644
--- a/dev-python/gmpy/metadata.xml
+++ b/dev-python/gmpy2/metadata.xml
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index 2971801b6913..d2a06b91b38d 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1 +1,2 @@
 DIST hatch-hatchling-v1.25.0.gh.tar.gz 5276942 BLAKE2B 76de1a824086889370a996945ad031179132dc74f4ef8a79da29913fc587c85210db49e89f400f4db2533d6706452cd4c67b87ff4ca97be0c3dc1879cf2bd77e SHA512 54f4e5f9383e846a9192e47b61f5147d4c48f20c41df752898dc5e22dd0bf196ea60fe4866dd04dc09c763aac67f7c047c40d978398e910878eb772af887d607
+DIST hatch-hatchling-v1.26.1.gh.tar.gz 5276205 BLAKE2B 135dff9ee6a56d15a2a8019452b3b9b3b78bc1c7501ccd3d6b85769e12348d582f974f9337b87e24f09add877a835b7d40076e79b2a0636ea12dc3e66085eb98 SHA512 e05c0f464604119deac12b176ebe257a7c00eb550570292bb179a7a6a648fa589db59b029f2c795bd465e580fbc258f3e302d6cce8a934b708d0674a00f89458
diff --git a/dev-python/hatchling/hatchling-1.26.1.ebuild b/dev-python/hatchling/hatchling-1.26.1.ebuild
new file mode 100644
index 000000000000..e738cde5d735
--- /dev/null
+++ b/dev-python/hatchling/hatchling-1.26.1.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_{9,10,11,12,13} 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 ~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-24.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.10.16[${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/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 06aef2f8eb67..713cc6ee6d81 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,3 +4,4 @@ DIST hypothesis-6.115.6.gh.tar.gz 9479927 BLAKE2B ddfeaebaa4e3687be1cab03fa85173
 DIST hypothesis-6.116.0.gh.tar.gz 9480480 BLAKE2B 350abfd8bad65a33669345a71c3df9737e4defcfc12cd81a1d9ecb5603310372e039d1a148c2223a71f37f0ad485ca892ba322f9404e6d873016193b7f864f88 SHA512 5ae6848f16c21b9012d15eb71715df1fc9448b70264d18453d13e61fd71b84623150ce32c9b50ea4ce95494b0df21907368d0f6fabaa8cb8b26c71e474885703
 DIST hypothesis-6.118.0.gh.tar.gz 9481630 BLAKE2B 691be7d387d61ce7e65b998cebfc11977bc3727537424e8594c6514d6ea9fae532fb203e65a4f014e74db0656946cb2920868c4d211801a1472046640a3bcdaf SHA512 740ebebc297043aed197bd848489661fa7252a1b63933b1abb17085550cc300b0bbc9217261bb2de28c9c1ae0dfda836cd4e325806f52560a1b5935ec6ec7356
 DIST hypothesis-6.118.3.gh.tar.gz 9484146 BLAKE2B 2cac4089ba76431588640777a6fea2b2681ca3530ac9d48775174799715b82f5d9f31540c1c4677abae13bf9c84502bbe086e0a76f5c5a650792e6b17c2e4b81 SHA512 9b12c1ba83f4b0ce4e3b1ae6c3c6616d502f44d458a421e7938b1c8a58c20dd1bdfb0b7ed8f1690c795cd0723874becbd06ef8771ef8d8bd36950e1f0d1cabef
+DIST hypothesis-6.118.7.gh.tar.gz 9486197 BLAKE2B 1247665e4cc6c10ff6f628f4ef312ce90e1f791ea853a2c22fffec5f57af182e423e97b392535b569fc19889a1e7176905ba6b933e8ca69ae693c8845dd9c89f SHA512 b33a1cdcc56301fde6bd7176caed2c34b43a2a7a5e21590b0fac2cf734332ed9e626f9114f7b6f6c06b67926b5a59649a7de6008a256b7a7655d8acb8b482f0f
diff --git a/dev-python/hypothesis/hypothesis-6.118.7.ebuild b/dev-python/hypothesis/hypothesis-6.118.7.ebuild
new file mode 100644
index 000000000000..902ce1505c8b
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.118.7.ebuild
@@ -0,0 +1,103 @@
+# 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=( python3_{9,10,11,12,13} )
+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-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+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= 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/insipid-sphinx-theme/insipid-sphinx-theme-0.4.2.ebuild b/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.2.ebuild
index d67c12bfdddd..2c916b09c350 100644
--- a/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.2.ebuild
+++ b/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
 	>=dev-python/docutils-0.18[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 04a4fd273b51..b87014e34a78 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,3 +1,4 @@
 DIST django-stubs-fd057010f6cbf176f57d1099e82be46d39b99cb9.tar.gz 183312 BLAKE2B a68f6139903f5001db994ee0d881f40ab74932e81c3e2c3a0c22dc56e6be681d0fb42ce837603b21e4d0d448ccb25884ef0f69039305f309e82603267cee9f6a SHA512 506322c132f94e6a1e88cdbde6027a566387731fa6ad59934f95c3511f49d90eff2a3138363811be648b096407d418cd1f801df0bc35b1e464ef181e4076ada1
+DIST jedi-0.19.2.gh.tar.gz 475890 BLAKE2B e68a6245b0887e50e97f490b15b3f21865250cb954fb7aaa825755c54489aab6543256a4941feb41570cf0cc747f929634e0323aad57a13c0f4273de2af0e3de SHA512 5146e804b7b1b9f9dff2e372c4e3384c15dc05643b399d0aaab797451e9ef43a84914cc5fd4b130c9b4a9d2eff5ab917b3956f4fc6b71394d8e6c8a39467a4ad
 DIST jedi-82d1902f382ddac5b0e6647646b72f28a3181ec3.gh.tar.gz 475311 BLAKE2B bb525951a57fd979f4b5dfc49c536b79e3713deb479062abaf668cadc005da98b3d921c48fd5e2d2e8a6ab62dbcae76fcf9cb9e7e26f94cb7d95c363e89c5b5b SHA512 bcfd6b676370363cd9568cf25775bc8a5b0362b04247e2cf5cba828f2578f4b16bb1550fd3bcf227bc6b80601b3de3074d32ea59a1c97673787dad098cc8afbe
 DIST typeshed-ae9d4f4b21bb5e1239816c301da7b1ea904b44c3.tar.gz 602044 BLAKE2B 53298918a7e9a1163e76d4c70ad2a2117ee90b49329aa82d82b2aaaeaf000c971872f83ed283af6dc4be068b813876760c8b1b4acb4131865572a4aed3ea9230 SHA512 b3b9da66b6c6e03e0b262b3262df31215a5e080468ca9ebf4332ed53d715cd3956db7067fad3ec267042ff704f81ac665c703ef2fd0c5b445d440bd8e52bf1aa
diff --git a/dev-python/jedi/jedi-0.19.2.ebuild b/dev-python/jedi/jedi-0.19.2.ebuild
new file mode 100644
index 000000000000..7dd47ca65742
--- /dev/null
+++ b/dev-python/jedi/jedi-0.19.2.ebuild
@@ -0,0 +1,85 @@
+# 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_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1
+
+TYPESHED_P="typeshed-ae9d4f4b21bb5e1239816c301da7b1ea904b44c3"
+DJANGO_STUBS_P="django-stubs-fd057010f6cbf176f57d1099e82be46d39b99cb9"
+EGIT_COMMIT="82d1902f382ddac5b0e6647646b72f28a3181ec3"
+
+DESCRIPTION="Autocompletion library for Python"
+HOMEPAGE="
+	https://github.com/davidhalter/jedi/
+	https://pypi.org/project/jedi/
+"
+SRC_URI="
+	https://github.com/davidhalter/jedi/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://github.com/davidhalter/typeshed/archive/${TYPESHED_P#typeshed-}.tar.gz
+		-> ${TYPESHED_P}.tar.gz
+	https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
+		-> ${DJANGO_STUBS_P/v/}.tar.gz
+"
+
+LICENSE="
+	MIT
+	test? ( Apache-2.0 )
+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	<dev-python/parso-0.9[${PYTHON_USEDEP}]
+	>=dev-python/parso-0.8.3[${PYTHON_USEDEP}]
+"
+
+# RDEPEND needed because of an import jedi inside conf.py
+distutils_enable_sphinx docs \
+	dev-python/parso \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# upstream includes these as submodules ...
+	rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
+	mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
+		"${S}/jedi/third_party/django-stubs" || die
+	mv "${WORKDIR}/${TYPESHED_P}" \
+		"${S}/jedi/third_party/typeshed" || die
+
+	# test_complete_expanduser relies on $HOME not being empty
+	> "${HOME}"/somefile || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# fragile
+		test/test_speed.py
+		# assumes pristine virtualenv
+		test/test_inference/test_imports.py::test_duplicated_import
+		test/test_inference/test_imports.py::test_os_issues
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				test/test_api/test_api.py::test_preload_modules
+				test/test_api/test_interpreter.py::test_param_infer_default
+				test/test_inference/test_compiled.py::test_next_docstr
+				test/test_inference/test_compiled.py::test_time_docstring
+			)
+			;;
+	esac
+
+	# some plugin breaks case-insensitivity on completions
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# django and pytest tests are very version dependent
+	epytest -o addopts= -k "not django and not pytest"
+}
diff --git a/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild b/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild
index eb04f98c2c84..82ab4248a1d6 100644
--- a/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild
+++ b/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/arrow[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja2/Manifest
index bfa1bf69488e..bfa1bf69488e 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja2/Manifest
diff --git a/dev-python/jinja/files/jinja-3.1.4-py313.patch b/dev-python/jinja2/files/jinja2-3.1.4-py313.patch
index b68091e5397a..b68091e5397a 100644
--- a/dev-python/jinja/files/jinja-3.1.4-py313.patch
+++ b/dev-python/jinja2/files/jinja2-3.1.4-py313.patch
diff --git a/dev-python/jinja/jinja-3.1.4.ebuild b/dev-python/jinja2/jinja2-3.1.4.ebuild
index 4f5f57dfb7b7..4f5f57dfb7b7 100644
--- a/dev-python/jinja/jinja-3.1.4.ebuild
+++ b/dev-python/jinja2/jinja2-3.1.4.ebuild
diff --git a/dev-python/jinja/metadata.xml b/dev-python/jinja2/metadata.xml
index 165a8c47fed5..165a8c47fed5 100644
--- a/dev-python/jinja/metadata.xml
+++ b/dev-python/jinja2/metadata.xml
diff --git a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0-r1.ebuild b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0-r1.ebuild
index 16e4740006cc..13ed20be590a 100644
--- a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0-r1.ebuild
+++ b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/inflect[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests unittest
diff --git a/dev-python/jsonpickle/jsonpickle-3.3.0.ebuild b/dev-python/jsonpickle/jsonpickle-3.3.0.ebuild
index bf8aa02603dd..2219d399483d 100644
--- a/dev-python/jsonpickle/jsonpickle-3.3.0.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-3.3.0.ebuild
@@ -26,7 +26,7 @@ BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/feedparser[${PYTHON_USEDEP}]
-		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/gmpy2[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
 			dev-python/pandas[${PYTHON_USEDEP}]
@@ -51,7 +51,7 @@ python_test() {
 		tests/bson_test.py
 	)
 
-	if ! has_version "dev-python/gmpy[${PYTHON_USEDEP}]"; then
+	if ! has_version "dev-python/gmpy2[${PYTHON_USEDEP}]"; then
 		EPYTEST_IGNORE+=( jsonpickle/ext/gmpy.py )
 	fi
 	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
diff --git a/dev-python/jsonpickle/jsonpickle-3.4.2.ebuild b/dev-python/jsonpickle/jsonpickle-3.4.2.ebuild
index 4c1c93924566..9efc7bc7d89c 100644
--- a/dev-python/jsonpickle/jsonpickle-3.4.2.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-3.4.2.ebuild
@@ -26,7 +26,7 @@ BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/feedparser[${PYTHON_USEDEP}]
-		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/gmpy2[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
 		dev-python/simplejson[${PYTHON_USEDEP}]
@@ -49,7 +49,7 @@ python_test() {
 		tests/bson_test.py
 	)
 
-	if ! has_version "dev-python/gmpy[${PYTHON_USEDEP}]"; then
+	if ! has_version "dev-python/gmpy2[${PYTHON_USEDEP}]"; then
 		EPYTEST_IGNORE+=( jsonpickle/ext/gmpy.py )
 	fi
 	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
diff --git a/dev-python/jupyter-server/jupyter-server-2.14.2.ebuild b/dev-python/jupyter-server/jupyter-server-2.14.2.ebuild
index 46aec609f9f6..613bdfa13ae6 100644
--- a/dev-python/jupyter-server/jupyter-server-2.14.2.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.14.2.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/argon2-cffi-21.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.0.3[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-server-terminals-0.4.4[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.27.3.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.27.3.ebuild
index 402c1236b249..034ba046aad4 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.27.3.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.27.3.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.10[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.0.3[${PYTHON_USEDEP}]
 	>=dev-python/json5-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.18.0[${PYTHON_USEDEP}]
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild b/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild
index 58b5a07c2efd..356c8cf5a226 100644
--- a/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-python/async-lru[${PYTHON_USEDEP}]
 	>=dev-python/httpx-0.25.0[${PYTHON_USEDEP}]
 	>=dev-python/ipykernel-6.5.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.0.3[${PYTHON_USEDEP}]
 	dev-python/jupyter-core[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/logbook/logbook-1.7.0.ebuild b/dev-python/logbook/logbook-1.7.0.ebuild
index af3247190b09..1a30a39c1ca1 100644
--- a/dev-python/logbook/logbook-1.7.0.ebuild
+++ b/dev-python/logbook/logbook-1.7.0.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 	test? (
 		app-arch/brotli[${PYTHON_USEDEP},python]
 		>=dev-python/execnet-1.0.9[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/jinja2[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		dev-python/pyzmq[${PYTHON_USEDEP}]
diff --git a/dev-python/logbook/logbook-1.8.0.ebuild b/dev-python/logbook/logbook-1.8.0.ebuild
index e7fea3b534ae..07b2ce1a9bbb 100644
--- a/dev-python/logbook/logbook-1.8.0.ebuild
+++ b/dev-python/logbook/logbook-1.8.0.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 	test? (
 		app-arch/brotli[${PYTHON_USEDEP},python]
 		>=dev-python/execnet-1.0.9[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/jinja2[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		dev-python/pyzmq[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-macros-plugin/mkdocs-macros-plugin-1.0.5.ebuild b/dev-python/mkdocs-macros-plugin/mkdocs-macros-plugin-1.0.5.ebuild
index 5e5435b67045..f8e1f8e4e8df 100644
--- a/dev-python/mkdocs-macros-plugin/mkdocs-macros-plugin-1.0.5.ebuild
+++ b/dev-python/mkdocs-macros-plugin/mkdocs-macros-plugin-1.0.5.ebuild
@@ -24,7 +24,7 @@ RESTRICT="test"
 
 RDEPEND="
 	>=dev-python/mkdocs-0.17[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.42.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.42.ebuild
index b29d9c6ec471..67573d18b3dc 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.42.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.42.ebuild
@@ -33,7 +33,7 @@ IUSE="social"
 RDEPEND="
 	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
 	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
 	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.43.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.43.ebuild
index 30ab9a0405c7..53cfcef57ba4 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.43.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.43.ebuild
@@ -33,7 +33,7 @@ IUSE="social"
 RDEPEND="
 	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
 	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
 	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.44.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.44.ebuild
index 30ab9a0405c7..53cfcef57ba4 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.44.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.44.ebuild
@@ -33,7 +33,7 @@ IUSE="social"
 RDEPEND="
 	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
 	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
 	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs/mkdocs-1.6.0.ebuild b/dev-python/mkdocs/mkdocs-1.6.0.ebuild
index 39e15715c9c8..62b9c5ee1588 100644
--- a/dev-python/mkdocs/mkdocs-1.6.0.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.6.0.ebuild
@@ -39,7 +39,7 @@ KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 RDEPEND="
 	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-2.11.1[${PYTHON_USEDEP}]
 	>=dev-python/markdown-3.3.6[${PYTHON_USEDEP}]
 	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs/mkdocs-1.6.1.ebuild b/dev-python/mkdocs/mkdocs-1.6.1.ebuild
index 39e15715c9c8..62b9c5ee1588 100644
--- a/dev-python/mkdocs/mkdocs-1.6.1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.6.1.ebuild
@@ -39,7 +39,7 @@ KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 RDEPEND="
 	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-2.11.1[${PYTHON_USEDEP}]
 	>=dev-python/markdown-3.3.6[${PYTHON_USEDEP}]
 	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocstrings/mkdocstrings-0.26.2.ebuild b/dev-python/mkdocstrings/mkdocstrings-0.26.2.ebuild
index f70eedb0d291..43773a54cc2c 100644
--- a/dev-python/mkdocstrings/mkdocstrings-0.26.2.ebuild
+++ b/dev-python/mkdocstrings/mkdocstrings-0.26.2.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-2.11.1[${PYTHON_USEDEP}]
 	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
 	>=dev-python/markupsafe-1.1[${PYTHON_USEDEP}]
 	>=dev-python/mkdocs-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.2.14.ebuild b/dev-python/moto/moto-4.2.14.ebuild
index 7a48074f3baa..f80eef9ac521 100644
--- a/dev-python/moto/moto-4.2.14.ebuild
+++ b/dev-python/moto/moto-4.2.14.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/cookies[${PYTHON_USEDEP}]
 	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
 	dev-python/boto3[${PYTHON_USEDEP}]
 	dev-python/botocore[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-5.0.18.ebuild b/dev-python/moto/moto-5.0.18.ebuild
index e00b2c82fde7..1fe2fee8c9cb 100644
--- a/dev-python/moto/moto-5.0.18.ebuild
+++ b/dev-python/moto/moto-5.0.18.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-cors[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
 	dev-python/jsonpath-ng[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-5.0.19.ebuild b/dev-python/moto/moto-5.0.19.ebuild
index 8c5a3a2d7b7f..8719b3f88517 100644
--- a/dev-python/moto/moto-5.0.19.ebuild
+++ b/dev-python/moto/moto-5.0.19.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-cors[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
 	dev-python/jsonpath-ng[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-5.0.20.ebuild b/dev-python/moto/moto-5.0.20.ebuild
index dd296447dade..15cdc4754e1c 100644
--- a/dev-python/moto/moto-5.0.20.ebuild
+++ b/dev-python/moto/moto-5.0.20.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-cors[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
 	dev-python/jsonpath-ng[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
diff --git a/dev-python/mpmath/mpmath-1.4.0_alpha2.ebuild b/dev-python/mpmath/mpmath-1.4.0_alpha2.ebuild
index 641bdd157495..633803bd5760 100644
--- a/dev-python/mpmath/mpmath-1.4.0_alpha2.ebuild
+++ b/dev-python/mpmath/mpmath-1.4.0_alpha2.ebuild
@@ -29,7 +29,7 @@ BDEPEND="
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
-			dev-python/gmpy[${PYTHON_USEDEP}]
+			dev-python/gmpy2[${PYTHON_USEDEP}]
 		' 'python3*')
 		!mips? (
 			dev-python/ipython[${PYTHON_USEDEP}]
@@ -73,6 +73,6 @@ python_test() {
 }
 
 pkg_postinst() {
-	optfeature "gmp support" dev-python/gmpy
+	optfeature "gmp support" dev-python/gmpy2
 	optfeature "matplotlib support" dev-python/matplotlib
 }
diff --git a/dev-python/myst-parser/myst-parser-4.0.0.ebuild b/dev-python/myst-parser/myst-parser-4.0.0.ebuild
index 026f1c850406..24cbae54f81b 100644
--- a/dev-python/myst-parser/myst-parser-4.0.0.ebuild
+++ b/dev-python/myst-parser/myst-parser-4.0.0.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390
 
 RDEPEND="
 	>=dev-python/docutils-0.18[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	<dev-python/markdown-it-py-4[${PYTHON_USEDEP}]
 	>=dev-python/markdown-it-py-3.0[${PYTHON_USEDEP}]
 	<dev-python/mdit-py-plugins-0.5[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-7.16.4.ebuild b/dev-python/nbconvert/nbconvert-7.16.4.ebuild
index 998e6af89b3f..697655483a39 100644
--- a/dev-python/nbconvert/nbconvert-7.16.4.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.16.4.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/bleach[${PYTHON_USEDEP}]
 	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
 	dev-python/jupyterlab-pygments[${PYTHON_USEDEP}]
 	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/nbdime-4.0.2.ebuild b/dev-python/nbdime/nbdime-4.0.2.ebuild
index 7b82b0abd9e5..54284c4cfc58 100644
--- a/dev-python/nbdime/nbdime-4.0.2.ebuild
+++ b/dev-python/nbdime/nbdime-4.0.2.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
 	dev-python/GitPython[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	dev-python/jupyter-server[${PYTHON_USEDEP}]
 	dev-python/jupyter-server-mathjax[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
diff --git a/dev-python/nbsphinx/nbsphinx-0.9.5.ebuild b/dev-python/nbsphinx/nbsphinx-0.9.5.ebuild
index df3c5524bf3e..66fe2f58f4d4 100644
--- a/dev-python/nbsphinx/nbsphinx-0.9.5.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.9.5.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/docutils-0.18.1[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-5.5[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index 80b537a6134e..3ea703c83398 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,2 +1 @@
-DIST pallets_sphinx_themes-2.1.3.tar.gz 20124 BLAKE2B c66fac3aa625812c48aceee75a8296d272a1c5819463b41c2892aeefef4633da1d74c781b1669dbe87aa7af302169469fb04b7cc0492970156efcc53271e8c0f SHA512 2b11d05af4023b54b6bb3f1edda509648458542b9ff255b709cc01797551755d80851612259f460e3d17e4a3b5da0833e12c15bf5df11b38641c4d34007dc12e
 DIST pallets_sphinx_themes-2.3.0.tar.gz 21029 BLAKE2B 0f0abb334beb70ddb6f6d85164914e6eac3b4e938d085c81a62c8f33a7e6eb8b599dc0b2ff7d164124797cd781e2eb23b0a9ae502a28bf8720c2d5464213cf78 SHA512 9c76ab7e8e2cecaaecab7ccc621bac685b28394d16e4d35d79b8dc7745ceff88cba23b04efeb1faf0b6a987cf173c9fc77364a7306bfe5029e5129fed791b5a8
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.1.3.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.1.3.ebuild
deleted file mode 100644
index 427e4972460e..000000000000
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYPI_PN=Pallets-Sphinx-Themes
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx themes for Pallets and related projects"
-HOMEPAGE="
-	https://github.com/pallets/pallets-sphinx-themes/
-	https://pypi.org/project/Pallets-Sphinx-Themes/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.3.0.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.3.0.ebuild
index 0e96c83ec2ce..cf8e0ed1aec1 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.3.0.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.3.0.ebuild
@@ -17,10 +17,10 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-3[${PYTHON_USEDEP}]
 	dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/pandas-2.2.2-r1.ebuild b/dev-python/pandas/pandas-2.2.2-r1.ebuild
index 14e0b614ef61..620f461a3999 100644
--- a/dev-python/pandas/pandas-2.2.2-r1.ebuild
+++ b/dev-python/pandas/pandas-2.2.2-r1.ebuild
@@ -37,7 +37,7 @@ OPTIONAL_DEPEND="
 	>=dev-python/beautifulsoup4-4.11.1[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1.2[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.8.0[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-3.6.1[${PYTHON_USEDEP}]
 	>=dev-python/openpyxl-3.0.7[${PYTHON_USEDEP}]
@@ -223,7 +223,7 @@ pkg_postinst() {
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
 	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja2
 	optfeature "Plotting support" dev-python/matplotlib
 	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.10" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
 	optfeature "necessary for HDF5-based storage" ">=dev-python/tables-3.7.0"
diff --git a/dev-python/pandas/pandas-2.2.2.ebuild b/dev-python/pandas/pandas-2.2.2.ebuild
index a5284af8ba92..d0d02c061221 100644
--- a/dev-python/pandas/pandas-2.2.2.ebuild
+++ b/dev-python/pandas/pandas-2.2.2.ebuild
@@ -37,7 +37,7 @@ OPTIONAL_DEPEND="
 	>=dev-python/beautifulsoup4-4.11.1[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1.2[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.8.0[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-3.6.1[${PYTHON_USEDEP}]
 	>=dev-python/openpyxl-3.0.7[${PYTHON_USEDEP}]
@@ -207,7 +207,7 @@ pkg_postinst() {
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
 	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja2
 	optfeature "Plotting support" dev-python/matplotlib
 	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.10" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
 	optfeature "necessary for HDF5-based storage" ">=dev-python/tables-3.7.0"
diff --git a/dev-python/pandas/pandas-2.2.3.ebuild b/dev-python/pandas/pandas-2.2.3.ebuild
index a6ee1ad4fe78..561432c7da5b 100644
--- a/dev-python/pandas/pandas-2.2.3.ebuild
+++ b/dev-python/pandas/pandas-2.2.3.ebuild
@@ -37,7 +37,7 @@ OPTIONAL_DEPEND="
 	>=dev-python/beautifulsoup4-4.11.1[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1.2[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.8.0[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-3.6.1[${PYTHON_USEDEP}]
 	>=dev-python/openpyxl-3.0.7[${PYTHON_USEDEP}]
@@ -218,7 +218,7 @@ pkg_postinst() {
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
 	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja2
 	optfeature "Plotting support" dev-python/matplotlib
 	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.10" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
 	optfeature "necessary for HDF5-based storage" ">=dev-python/tables-3.7.0"
diff --git a/dev-python/pplpy/pplpy-0.8.10.ebuild b/dev-python/pplpy/pplpy-0.8.10.ebuild
index cfefcdcf6c28..6839d3f602f3 100644
--- a/dev-python/pplpy/pplpy-0.8.10.ebuild
+++ b/dev-python/pplpy/pplpy-0.8.10.ebuild
@@ -25,7 +25,7 @@ IUSE="doc"
 DEPEND="
 	dev-libs/ppl
 	dev-python/cysignals[${PYTHON_USEDEP}]
-	>=dev-python/gmpy-2.1.0_beta1[${PYTHON_USEDEP}]
+	>=dev-python/gmpy2-2.1.0_beta1[${PYTHON_USEDEP}]
 "
 RDEPEND="
 	${DEPEND}
diff --git a/dev-python/protobuf-python/protobuf-python-5.28.0.ebuild b/dev-python/protobuf-python/protobuf-python-5.28.0.ebuild
index 6299c70742ef..ee3d87ad4fba 100644
--- a/dev-python/protobuf-python/protobuf-python-5.28.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-5.28.0.ebuild
@@ -27,4 +27,4 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
diff --git a/dev-python/pypugjs/pypugjs-5.11.0.ebuild b/dev-python/pypugjs/pypugjs-5.11.0.ebuild
index 076727432154..e7e2fc478f2d 100644
--- a/dev-python/pypugjs/pypugjs-5.11.0.ebuild
+++ b/dev-python/pypugjs/pypugjs-5.11.0.ebuild
@@ -30,7 +30,7 @@ BDEPEND="
 	test? (
 		>=dev-python/django-4.0.6[${PYTHON_USEDEP}]
 		>=dev-python/flask-2.1.1[${PYTHON_USEDEP}]
-		>=dev-python/jinja-3.1.1[${PYTHON_USEDEP}]
+		>=dev-python/jinja2-3.1.1[${PYTHON_USEDEP}]
 		>=dev-python/mako-1.1.3[${PYTHON_USEDEP}]
 		>=dev-python/pytest-asyncio-0.19.0[${PYTHON_USEDEP}]
 		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
@@ -47,7 +47,7 @@ src_prepare() {
 
 pkg_postinst() {
 	optfeature "converting to Django output" dev-python/django
-	optfeature "converting to Jinja2 output" dev-python/jinja
+	optfeature "converting to Jinja2 output" dev-python/jinja2
 	optfeature "converting to Mako output" dev-python/mako
 	optfeature "converting to Tornado output" dev-python/tornado
 }
diff --git a/dev-python/pysmi/pysmi-1.5.0.ebuild b/dev-python/pysmi/pysmi-1.5.0.ebuild
index 3d2e61d69c14..9a942d9393ce 100644
--- a/dev-python/pysmi/pysmi-1.5.0.ebuild
+++ b/dev-python/pysmi/pysmi-1.5.0.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc ~sparc x86"
 
 RDEPEND="
-	>=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1.3[${PYTHON_USEDEP}]
 	>=dev-python/ply-3.11[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/pysmi/pysmi-1.5.6.ebuild b/dev-python/pysmi/pysmi-1.5.6.ebuild
index a30c82e1cea3..f988b5f77aa6 100644
--- a/dev-python/pysmi/pysmi-1.5.6.ebuild
+++ b/dev-python/pysmi/pysmi-1.5.6.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1.3[${PYTHON_USEDEP}]
 	>=dev-python/ply-3.11[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/pysmi/pysmi-1.5.7.ebuild b/dev-python/pysmi/pysmi-1.5.7.ebuild
index a30c82e1cea3..f988b5f77aa6 100644
--- a/dev-python/pysmi/pysmi-1.5.7.ebuild
+++ b/dev-python/pysmi/pysmi-1.5.7.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1.3[${PYTHON_USEDEP}]
 	>=dev-python/ply-3.11[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/pysmi/pysmi-1.5.9.ebuild b/dev-python/pysmi/pysmi-1.5.9.ebuild
index 8cd67cbc731a..c59ae2e90e82 100644
--- a/dev-python/pysmi/pysmi-1.5.9.ebuild
+++ b/dev-python/pysmi/pysmi-1.5.9.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1.3[${PYTHON_USEDEP}]
 	>=dev-python/ply-3.11[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild b/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild
index 9dc1f75a15ed..476714de67d8 100644
--- a/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild
+++ b/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mpl/pytest-mpl-0.17.0.ebuild b/dev-python/pytest-mpl/pytest-mpl-0.17.0.ebuild
index 42932485e1b8..6dc904f12822 100644
--- a/dev-python/pytest-mpl/pytest-mpl-0.17.0.ebuild
+++ b/dev-python/pytest-mpl/pytest-mpl-0.17.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/dev-python/python-multipart/python-multipart-0.0.17.ebuild b/dev-python/python-multipart/python-multipart-0.0.17.ebuild
index e30a8926b657..1014160be7d0 100644
--- a/dev-python/python-multipart/python-multipart-0.0.17.ebuild
+++ b/dev-python/python-multipart/python-multipart-0.0.17.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/quart/quart-0.19.8.ebuild b/dev-python/quart/quart-0.19.8.ebuild
index 5cd840e14547..c092e5bbd582 100644
--- a/dev-python/quart/quart-0.19.8.ebuild
+++ b/dev-python/quart/quart-0.19.8.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-python/flask-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/hypercorn-0.11.2[${PYTHON_USEDEP}]
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	>=dev-python/werkzeug-3.0.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.5.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.5.ebuild
index 0830934a2fc7..1a515972d4fa 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.5.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.5.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
-	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-2.9[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/rpy/rpy-3.5.14.ebuild b/dev-python/rpy/rpy-3.5.14.ebuild
index 93b21b7b2c0c..ef0effaa5e22 100644
--- a/dev-python/rpy/rpy-3.5.14.ebuild
+++ b/dev-python/rpy/rpy-3.5.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	>=dev-lang/R-4.0
 	dev-python/cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/tzlocal[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.3.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.3.ebuild
index 888a73ecfd0f..578ec2d8256f 100644
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.3.ebuild
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.3.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/astroid-3.0.0[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-6.1.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-1.0.4.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-1.0.4.ebuild
index 23550c615c58..fceff03bdc87 100644
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-1.0.4.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-1.0.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/sphinx-8.0.2.ebuild b/dev-python/sphinx/sphinx-8.0.2.ebuild
index da8ecec94de4..d59b8b26f4df 100644
--- a/dev-python/sphinx/sphinx-8.0.2.ebuild
+++ b/dev-python/sphinx/sphinx-8.0.2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	<dev-python/docutils-0.22[${PYTHON_USEDEP}]
 	>=dev-python/docutils-0.20[${PYTHON_USEDEP}]
 	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1[${PYTHON_USEDEP}]
 	>=dev-python/packaging-23.0[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/sphinx-8.1.3.ebuild b/dev-python/sphinx/sphinx-8.1.3.ebuild
index 749f58f3ee36..b031fbd8481e 100644
--- a/dev-python/sphinx/sphinx-8.1.3.ebuild
+++ b/dev-python/sphinx/sphinx-8.1.3.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	<dev-python/docutils-0.22[${PYTHON_USEDEP}]
 	>=dev-python/docutils-0.20[${PYTHON_USEDEP}]
 	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1[${PYTHON_USEDEP}]
 	>=dev-python/packaging-23.0[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild
index 92d8a74ce604..3156edd9da9e 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
 "
 # avoid circular dependency with sphinx
diff --git a/dev-python/starlette/starlette-0.39.2-r1.ebuild b/dev-python/starlette/starlette-0.39.2-r1.ebuild
index dfd9bbe57e89..719e1a94a370 100644
--- a/dev-python/starlette/starlette-0.39.2-r1.ebuild
+++ b/dev-python/starlette/starlette-0.39.2-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	<dev-python/python-multipart-0.0.12-r100[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/starlette/starlette-0.41.2.ebuild b/dev-python/starlette/starlette-0.41.2.ebuild
index d6971f531a67..4f1cd4338826 100644
--- a/dev-python/starlette/starlette-0.41.2.ebuild
+++ b/dev-python/starlette/starlette-0.41.2.ebuild
@@ -24,14 +24,14 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
 	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	>=dev-python/python-multipart-0.0.13[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/towncrier/towncrier-24.8.0.ebuild b/dev-python/towncrier/towncrier-24.8.0.ebuild
index d89d3faa5534..37c1f65e6e14 100644
--- a/dev-python/towncrier/towncrier-24.8.0.ebuild
+++ b/dev-python/towncrier/towncrier-24.8.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-python/click[${PYTHON_USEDEP}]
 	dev-python/click-default-group[${PYTHON_USEDEP}]
 	dev-python/incremental[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
 	' 3.10)
diff --git a/dev-python/xmlschema/xmlschema-3.4.2.ebuild b/dev-python/xmlschema/xmlschema-3.4.2.ebuild
index 503429f83379..459ff8652ccb 100644
--- a/dev-python/xmlschema/xmlschema-3.4.2.ebuild
+++ b/dev-python/xmlschema/xmlschema-3.4.2.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/jinja2[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/xmlschema/xmlschema-3.4.3.ebuild b/dev-python/xmlschema/xmlschema-3.4.3.ebuild
index 5a26dd588ce7..0dcef6b2f943 100644
--- a/dev-python/xmlschema/xmlschema-3.4.3.ebuild
+++ b/dev-python/xmlschema/xmlschema-3.4.3.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/jinja2[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 0dd75f3568fb..30352f28b4d2 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1 +1,2 @@
 DIST zipp-3.20.2.tar.gz 24199 BLAKE2B 4014ad897ce248a1ae29a1ca79fbc9c9c40c1bd261dbfbe86b205f3b43bc2bfa0e3edd3573e85b7940307950a5b73ac99e797897ebdb923b38cf2d6f9b75638f SHA512 a8a625d36d75df879284ac9c61760c8320da927e119b27a1b04e60500233ed698439558d56a792b3da94080e78cc57c15c2e62ec8af466aa3f79de4cf4818c77
+DIST zipp-3.21.0.tar.gz 24545 BLAKE2B 3a21098768c54efb1bcb049f25a7b04a16d5f02eacc6e2107dfbc358ec3e595478b407e78fa0d831f5a8f2dadd92287812bc1259db925859aeedc1174378ab2d SHA512 f57489283d979dbeb3234f66f5b6b298876209ba79cf0d7a2562f0ce4747a87fd1494d26a35734c6729620d1edfa3bf8f56769de2ae9576ac9cff074caa39331
diff --git a/dev-python/zipp/zipp-3.21.0.ebuild b/dev-python/zipp/zipp-3.21.0.ebuild
new file mode 100644
index 000000000000..9f04f6a8aee9
--- /dev/null
+++ b/dev-python/zipp/zipp-3.21.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="
+	https://github.com/jaraco/zipp/
+	https://pypi.org/project/zipp/
+"
+
+LICENSE="MIT"
+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"
+
+# big_o is only used in test_complexity, that we ignore
+BDEPEND="
+	test? (
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
+		dev-python/jaraco-test[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# performance tests are flaky by design
+	tests/test_complexity.py
+)
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "zipp"
+		version = "${PV}"
+		description = "Backport of pathlib-compatible object wrapper for zip files"
+	EOF
+}