gentoo auto-resync : 12:11:2024 - 03:02:41

144 files changed, 710 insertions, 256 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index dcbcda1262e2..5a6a17ec2d7f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/a2wsgi/Manifest b/dev-python/a2wsgi/Manifest
index 203847703917..87217fe1d638 100644
--- a/dev-python/a2wsgi/Manifest
+++ b/dev-python/a2wsgi/Manifest
@@ -1,4 +1,3 @@
 DIST a2wsgi-1.10.7.tar.gz 18669 BLAKE2B a29f294cd3d31ad3859d190a2e187bbb0b667fe6d29068793163aa0cf6429ff03fc408613c772c5efcbb1c961820664304c118f1036e4c9c567fc3e06ce55214 SHA512 49075f6cac08f1a5ae3e4ac1d1510a33394912e7e973771b8db2643792e7d875daa1db9e87a69062697cd3001533ddb7e13388edf4d963cd23f5bb84db141095
-EBUILD a2wsgi-1.10.7-r1.ebuild 1071 BLAKE2B b915c1c37fd6dcf9c6ed921d6e437369e9827badada0e95d812f09550cd1d91bc92f816f9160a80c3accea7b04ef43484c64ad27caa6345ddf1b364dd7a84e7b SHA512 3c305a237fbc66f9844be8817a44d4601df6df468191b9aad409f6bf75b9cf93e15a946d1496f735d617973b700e76863e05475ef5d3a85431d12efdbfeacd35
-EBUILD a2wsgi-1.10.7.ebuild 1171 BLAKE2B 695915b6d46f8d3364cdf4afbdb93afa479c35c0518ee74f64034d88994fe5b056fc97a46516c2a8fb96bfd9f3d0bc1894436b562e65031f4e102a3fa359204c SHA512 aed63553342757c59b3fd2f3ef5d88297f7e36b75b9292b6d4827f5a8a04d6665bc18d43fe4bda3d66c00300281180376210a6aba8791bdaa2dcb46e102945e5
+EBUILD a2wsgi-1.10.7-r1.ebuild 1078 BLAKE2B d5a4c146c88b5038bb08634bcd39bf1d66685d632427c639c52f232c5b89b47c020a599483821bb17dcb231b95abc7b768f75ccae50469b6314cd98190573a49 SHA512 ecd97a0acad13a9c49e3c64f8c5b77cddb680dfa835ed54a36331d03474b34381469684d11d3dbc0a9f64f957a102c20da004fd65d6c6b3d65ee94010f45aad2
 MISC metadata.xml 392 BLAKE2B 17f9cfa46eeac0752f6e27d004a04173528f5033dee30ba31bb9b0d86231b3311937e0765cba3cae0fcc8b9653654c9b53bbc009f15140db0b38496856b9c27e SHA512 828436206a1e9b01df9da1546ffc8e6bc614e71708ad8a806dda9ab2dad80c86e539c37496a0c2525f0370e9ead3131bbde69f235da83331cd5097985981006e
diff --git a/dev-python/a2wsgi/a2wsgi-1.10.7-r1.ebuild b/dev-python/a2wsgi/a2wsgi-1.10.7-r1.ebuild
index a39653de96e7..8dc5787a598f 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 a34f49830abf..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=( pypy3 python3_{10..13} )
-
-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 a6d0fb810d76..099dcf4a0d3c 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,7 +1,9 @@
 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
 EBUILD aiohttp-3.10.10.ebuild 3228 BLAKE2B 9460d28a9b9d85addbb378a77575cbeadec2c40f4a172aa16955fe2676bc2cea291e7019dd9480a30afc3c8957f69d05a83f6d6151a187ea8f6e9a59e9de6acc SHA512 0fdc8696e8aae4f3e3a0d7636f135bc6268b18299886df364c7dcff536b6817cd82ed93898065770c7791428e984a657f1ab87472eeac10f639350eea34ee0ab
 EBUILD aiohttp-3.11.0_beta4.ebuild 3530 BLAKE2B 2898f25a2ced303720d238aa12827cfe5c8146edd36f60ae79bdb716cb6bb0f7672702288cbfae21b28d0217fcef885faa3ecb8be806dc4e28b2901ee730d8ad SHA512 5eb2983e0e489768ea0141b52c1816515d631e754e7f3bf096d78742633dbac5fbf26966edb424e44f2f31083226111081545d4beda2aa2a7121f04ecd3f2f55
 EBUILD aiohttp-3.11.0_beta5.ebuild 3549 BLAKE2B 2169ec81c8dae03fa993e9ec327bc2ef2b9878d545c11dd49f130ca541bdacbbb2c3aba8623f2f5e820a5e281ecd4bacd490dccd6ae0fd43ec1769c994ae59d0 SHA512 d134edb55e4a8f932f4f883395da2f7217274d0a6070e8b96533da0b20cf7ea6e468ba99dbe93c084d4739fc0861bef79200e50cb9e3619aad03d52ebf8eeff1
+EBUILD aiohttp-3.11.0_rc0.ebuild 3549 BLAKE2B 2169ec81c8dae03fa993e9ec327bc2ef2b9878d545c11dd49f130ca541bdacbbb2c3aba8623f2f5e820a5e281ecd4bacd490dccd6ae0fd43ec1769c994ae59d0 SHA512 d134edb55e4a8f932f4f883395da2f7217274d0a6070e8b96533da0b20cf7ea6e468ba99dbe93c084d4739fc0861bef79200e50cb9e3619aad03d52ebf8eeff1
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
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..2d93058de5ea
--- /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_{10..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/Manifest b/dev-python/betterproto/Manifest
index 866414987ce3..58aee459ce48 100644
--- a/dev-python/betterproto/Manifest
+++ b/dev-python/betterproto/Manifest
@@ -4,6 +4,6 @@ DIST python-betterproto-v.2.0.0b6.gh.tar.gz 158969 BLAKE2B ddf269dbef6d0ed4098ec
 DIST python-betterproto-v.2.0.0b6.tests.tar.xz 34560 BLAKE2B 873641e90c381a88115762ef8f89c8d89ee32992a504d5fb463adf39ec999ae17aeb16e634ce48b34e0b969346e842cffa16a6698ba293a77e705cdd23ffb615 SHA512 7ef91456575a2c2bae5c41145541f8a0737bd5029931d1b38ae5a709b94522bbd6eb05f09d53761854f23e804c3a4aa2eb4f987b8990e837e0442b2f0089365d
 DIST python-betterproto-v.2.0.0b7.gh.tar.gz 217820 BLAKE2B 2ede4c7b106c8c01279e1e57bc34c13c4e274215f077ae1d294108f40b6043682276c31703b1443bac5ab072a761141de306ff95cb34653180a9ee5bebe29b86 SHA512 4ca16c1cd09d76cde69848e6691be6f5716f730b7107f72e4a006c9b5881c815f4f24f9941861a972405d6d08bb47425900428886d1f8a2e37ace370c4514fbe
 DIST python-betterproto-v.2.0.0b7.tests.tar.xz 36328 BLAKE2B 43bb385c6e6746602b210fdf10a94bb4508366230461823d96fbdbeb868b1e0952cb1a3a596bfa4bbaa2e71b643e17cabeb4e11546c5eedf47d632e07d4078aa SHA512 a8b090d04e89a57dc8ff3b7775756cbf7d07bb317e47f76e12704cd41583b32a4f5f106a72af8c66f63e6def9bfc22ad93b4c39169b06b92b47a9f386326dfa7
-EBUILD betterproto-2.0.0_beta6.ebuild 1894 BLAKE2B 705d96508c4efe6598c439c3696da12f3d8b9bda089d85e164f344e035ce22d6691d06ef1087408c76232acb4a8e7ab18f04ef15a3f23c13c322535a930d1891 SHA512 0c298d0b9db87d00dbdc58a40239ac33f5af25b4b5b80e32224381097327496448cf71e8165a00945c46490f544c57f1d7eedeed3e2ab953156a5f6c11c9c03a
-EBUILD betterproto-2.0.0_beta7.ebuild 1729 BLAKE2B 00aeab4dd25e308bfdd0e635dd3b85c154b1dff61fe79951211ebe0e777bcdf63d7940798e6c579217f29cb6eef4a61d0270ae617c381d2425057b60b1d23c54 SHA512 2d6495a8832f18bfbf2cd18d6a735f129ec449b635bc1030c2c4ee50b606bf2ed6dcecb38adf8c2339fccc868306ba9d557351ecedce9aeeecca0717237139ba
+EBUILD betterproto-2.0.0_beta6.ebuild 1895 BLAKE2B 5e9dee06510242550f0810534ac524e24a8571297f43b684eec26cbeb991b6f7f39044d8ed43a0f9d2f8c3ad15357685234892c44a683e66b74cd834f62a5aaf SHA512 70d5fe2ac2ac98a826b2acba5773e8eb354baff69ed2ac9851ebe3986ad1b96c8875991aa92c37b7e323033bb3541821eb4bcfd3566cce18df883e92a22174e3
+EBUILD betterproto-2.0.0_beta7.ebuild 1730 BLAKE2B 5d15418214fb8bf72362dbe8e456878f37587ea1e3df00535a5aeb81b79c5c7fa8f6d76f9419c74d40ea251e9f2f510bafb34e102923d9ddff1a03696cd326e3 SHA512 8a8d2c43d2f0cdce03e8ebfb1efe810e38ba9b470175c9ded9359695029ca4eca2b7a118d6ec2896f270d3787c7085b605f036133c3ba00f73bf8b4743d8fd72
 MISC metadata.xml 389 BLAKE2B d8de77106339bf6c5c7d3441249208ca1bcc9b4ce612f1b5b8b367f371b7a8e2c9f803d153e11f1de6c3162bd7ac13d855d345befb7601a9b73ea258f37f84b8 SHA512 b36e88c2a53d3f48e601fb571cb1a638a8571eca1cca1afc8087d50d9fd60b5e3706fbdc6d053ab0c40630d9611f0b7ed0ad979f1ff51a048e1a6470b5f3f08c
diff --git a/dev-python/betterproto/betterproto-2.0.0_beta6.ebuild b/dev-python/betterproto/betterproto-2.0.0_beta6.ebuild
index ec4764c75881..fc9686694c9c 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 8ae0bd22a427..0eadf4d211d9 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/blake3/Manifest b/dev-python/blake3/Manifest
index 4664279ca236..7d3f23d60708 100644
--- a/dev-python/blake3/Manifest
+++ b/dev-python/blake3/Manifest
@@ -46,5 +46,5 @@ DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1d
 DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
-EBUILD blake3-0.4.1-r1.ebuild 2671 BLAKE2B e8a0e281aec152866250f2def3ef54c6c4daa4db80db7f16c101828253f18343c4bb4493d15c0abea12252ee5e8d7220a588691113f07b1a61bacff153ee78e7 SHA512 615c35fa70dd809cf26b9cbe16a521ca82b47d535dd41ca6532c58d8482f6e99b167cb58ca918c2c1559d36e95c1392407f98d869d11159a65bef7183b51a14f
+EBUILD blake3-0.4.1-r1.ebuild 2712 BLAKE2B 3d0617139ce92ab591e9deab3415434e00db150a43500a8e31ca2146db670443517373ba29e9740275b84080d341973a85d56d1ca7bc659de76e0f74352bbdad SHA512 cb7b34e711ce3d8872b2efa10dadb929118127ed234397a3a0f8443d3a363bd48995954ac6e540ff2aae06e32b7aa923e1a0e6b737d4f7c1197fc3fa6d99c885
 MISC metadata.xml 520 BLAKE2B ce0ade2fa2cfcc2a4d9139c7394b7af0c1b2289fef2586c3834b6f8a937ecb6cf0a70ebcf68a56dc77ee40e13c3d7f7fd0bf225d306b216eb4938a42d8968585 SHA512 1d54955a5a465d28d671b92eb3511b34959b1f49a0b083c16726c03bb8d36c4ab615415c47c42e1a5a2502a3731d5f3da253cd933da3ca7b8b773d1cac949ed9
diff --git a/dev-python/blake3/blake3-0.4.1-r1.ebuild b/dev-python/blake3/blake3-0.4.1-r1.ebuild
index c09028b90ccb..56a207480f01 100644
--- a/dev-python/blake3/blake3-0.4.1-r1.ebuild
+++ b/dev-python/blake3/blake3-0.4.1-r1.ebuild
@@ -109,12 +109,13 @@ QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/blake3/blake3.*.so"
 distutils_enable_tests pytest
 
 pkg_setup() {
-	distutils-r1_pkg_setup
-	use rust && cargo_pkg_setup
+	use rust && rust_pkg_setup
 }
 
 src_unpack() {
-	use rust && cargo_src_unpack
+	# Do this unconditionally as it has sensible behaviour even
+	# w/ USE=-rust.
+	cargo_src_unpack
 }
 
 src_prepare() {
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 41e0fa46d183..51db2c8dbb9f 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -33,5 +33,5 @@ DIST target-lexicon-0.12.15.crate 26384 BLAKE2B d1ba50aa9d50647c6f778df86b35db1a
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
-EBUILD cryptography-43.0.3-r1.ebuild 2878 BLAKE2B b0ea4f208319e25eecd60b3bb7d09eec3f06bf4cdda7213f70bcbfee235614b92d9cd9ba1ca2ca9517704757b17ada5cc6c5c274dd58ce1f34fa7fada5df3268 SHA512 3701e17c739d503c5af281777c62dcbd364a77e7aedd1ba7615d56ab612c02b0ff8dc7fbbdc121e3f8399de121306fc866c18d5d4b2fe9f41b5382d74f482ae0
+EBUILD cryptography-43.0.3-r1.ebuild 2894 BLAKE2B 47a38f459787a70b102585f50f8bf7f44336f0b8637ae72a6b6966c7e1be6b307ee9e95eb8821703b8472ca5253d63b7ab7a604cbd17e24530c49964e5099fc7 SHA512 a25365071307e4cba513d8055642eaef6eebf936efe7b3d3d99c6c830862ad76258bc8775930ecabecad7d1a4b43e32a7657c4120b3b23789410439a9293b426
 MISC metadata.xml 464 BLAKE2B 96c0bd97b83c9718910d129260402fdc37e88a96ac6002c8f6dd19fb21d6daf31211b83ff7423036811e27954811ebdc810c8328f18c620682bd9428f42ba1f9 SHA512 2f36a186bb195a8cbafe1d8dd6630fadf0ea56b22906ebaf3c90954adb8b66e1017f599169e2b1ca386e1113c1a6b834fff90f2bec527bed53f62985120732d6
diff --git a/dev-python/cryptography/cryptography-43.0.3-r1.ebuild b/dev-python/cryptography/cryptography-43.0.3-r1.ebuild
index d2d62f9acef7..1b96eff2c30f 100644
--- a/dev-python/cryptography/cryptography-43.0.3-r1.ebuild
+++ b/dev-python/cryptography/cryptography-43.0.3-r1.ebuild
@@ -79,6 +79,7 @@ DEPEND="
 "
 
 BDEPEND="
+	${RUST_DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 5bf1717b4f8c..e5a3c5de33eb 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -2,5 +2,5 @@ AUX cython-0.29.22-spawn-multiprocessing.patch 963 BLAKE2B ebbc3f6f4fa88e7e08232
 AUX cython-0.29.23-pythran-parallel-install.patch 874 BLAKE2B 39286ee98427260ce6ec077a750e0a1412445343fd11be9d96d8ab65b7d9789c5f1864cb9a1b3565ee3f51e117ecc854ebacc39dc32917fc72f36340c2d7f0a1 SHA512 8b78755288d3f165d962a5a1be9492d609a8e3dab10197b271c84ed0c4b7006053038e68f18bbb4204e6acba83e3f72ffeabf57ffa03f4a08f28b65db3cfd854
 AUX cython-0.29.23-test_exceptions-py310.patch 656 BLAKE2B 6c650c85d01b8bf367528d144cd967fa9def94634e35763e2e7a1c3e5afa2b01d0c84694024dde6e45577eee223f6464b5f88ab971d207d35892edf347a0c08f SHA512 d8f7f770a0b3303552deec0e7d3f9258de1edcd384f4b2c3881634fd21ce847a3d974e9142d1ed2fbe3a549e65292c6690be3a36ab4de52d0593d9831dc2f7ce
 DIST cython-3.0.11.gh.tar.gz 2775463 BLAKE2B f5f53c328a1b48b04548f1ee7be3988451d2a8e339b785285e2d973e63b37dabc6021f32ba1691ae8dbe9ee7706a5feda399b071b4893a3be4fe4afcd608f46b SHA512 8f7982af5be1db1072b1090257a9d487dc341d79522f442f4608303d18b388349a7d586ec74e66fbffd0ce88c00ca622202729907fe7cefef71828cfd3f68fe6
-EBUILD cython-3.0.11.ebuild 2006 BLAKE2B 4549c132bd029a27be92f8f37f6ba17292d215c98b76dd9ff55439a3aed7d691465d1059ef30ae35928390da259713a5d094873a3f1da51e802fe2f12abb027e SHA512 4a9f18956783a4a77582da0cc0f3007be0a6d63168d10e947c2700f83dcce4ae9d3bec61348daba8b10d66bd8b746437c3ee7e9052c2f58ebc4972d9fb942a55
+EBUILD cython-3.0.11.ebuild 2007 BLAKE2B aa528d44b15e92bc746eb29387aea7dde61401fe8328b1cb405fbeb1e0676f11c49a09cf4cf7ee3eb2b5c47542045e06214aeb5d28b088bb05d49ac7b03ef7bf SHA512 ed9a1faffa38775384595260ea77fcd2fd613c74c75f66d4dab354979187d30305df7b9f7ff6af17fc8eb97ef47325669c3a2e3dfb4317bb27f368196cc833e9
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-3.0.11.ebuild b/dev-python/cython/cython-3.0.11.ebuild
index 7a001ddaedf3..bf364b2787e2 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/Manifest b/dev-python/django/Manifest
index a77eae383368..2e78f99763ba 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -11,8 +11,8 @@ DIST Django-5.1.3.checksum.txt 2553 BLAKE2B dd8f2e988f51210594b0d16d55c9ec7dbe9d
 DIST Django-5.1.3.tar.gz 10698518 BLAKE2B 409702f8e80d3a60dafce5c92c24a723c7ca3b0121d32f8a4a1e2a22fed7fe8e66aeef5c5c5eab9773020c98f601723f940bbd782245de4d1489f2421dc203e3 SHA512 43c7c196c8d34c2354d2c0c3a1e1d4a816841dcdf60ec6277567acce23aae125c502f1afa354838fc4722fd3e665587878e2c57caa056ad5a6130bb5643991be
 DIST django-4.2.8-pypy3.patch.xz 5900 BLAKE2B b7dc5c5fc162817a218ee6d025ed8a65559b80e4506e49ac393428c26e2621f9e7c5010b36f2412dea8194a9f1086ab21f97286eabd696c6a786285eb07393cf SHA512 f953b5adbd1364f1d84dde55087ccb493256b1327701275fd2fe99f3cd41751d18e002b6e21afc96892e1671428a6b8f3c2e4b88252c3c278f1a79e286bb73e3
 DIST django-5.0-pypy3.patch.xz 6124 BLAKE2B 7eba7cc70b30743cf4e186a2c5b0f27c13f49114a7a80bcaa2b25fdd7a959583c115a302c9bc6da97c32f6401cf8f3616818ba759190d317c5b033a0f0088766 SHA512 c550e2b2c1243d13cd1f4908f4b6df606355d1491e3bf72042e4b4777a4474306ff0f67b1c2eb4ab4d137cc85bde52dcdbd54bec245d2ba2e092545be8a2993b
-EBUILD django-4.2.16.ebuild 2937 BLAKE2B 8eb01973edeb43f968efbce8c905682962ee846c6619b72fb95065f094788c77af5b7b310fb18149ee427d88a87cb3efe516b052abefca168576cf67f790cc72 SHA512 3b852ed8ea22dea59632cb0116a59d8afa1e6bff4aff96a76df150f7c0a5a58e05004c5c4b306f5e172459b0af7fe257008fdda2cc91222ceda1d8a285737796
-EBUILD django-5.0.9.ebuild 3095 BLAKE2B c5b806d9d776e5b1ee15bdccb006996e8ea435d1f6234b7992bea3758a2aecf703269fe7b87a5f8ac569172849ec86c7873b6625b33f4f7883e4b2ab58265e90 SHA512 e30c201e54738639bdb5da312e7986691ba7bdd4479663986e247afd4e7a3c4c56faea9963ba02b315c8fe4c01ed193821762bb8c3c1201ed07e82c74983faa8
-EBUILD django-5.1.2.ebuild 2844 BLAKE2B 87f664252d2c37f030e75bb88dc4479f3e0e060ef4b4aed7e51a3af8d274b285d2fdec094d664dd32aabe8ebce386b1fc7a7d4556c65f1cdcc44876354fc9600 SHA512 ee37df805f2db380a6747bc19889e8cebecdab9b1aa77fad80cc815c008420c77724aaca1826c40caf3cf4fc574c0cbb27fa8b76069235a6b85d2f2fb0b37e51
-EBUILD django-5.1.3.ebuild 2781 BLAKE2B 274ec31875a78ac31b1df65f889caf933d3b49697aeea991fe6237c0ed99ae03c44418cbc5ac34f8f14b153a5554ba17416b187e021a719be677b51089a9df77 SHA512 a31621fbb6875f210335621772e825d825c4f80c43f1577730fd80f18ff395a3246446d3bac01f8c0f30ac40d409ceeb004423ac6e588a5d31a76e8a7534ff92
+EBUILD django-4.2.16.ebuild 2938 BLAKE2B a1f866bc5bd823cd2a2221f3ba47c6bb3dd936605139c92aac2ac91e1090edda4815400a6768e3731643f049c21852d108b6812f5adfeee7bdd4c1e79adc7972 SHA512 fae89991ec147aa502ea68ff175b1caead2cec76de893eb835e6dfd5f678430b5bab688cc1c2e4b270351d6e97f101b42d61ea4bd78f3fe6ec57999e344a39ee
+EBUILD django-5.0.9.ebuild 3096 BLAKE2B 4e2ba7bb5b75173d5d5b2d58a0e9a8d676bd7b95f187d8c04dcedad5ca9c554f61af2d0089f25c5389f8999c12a08c58ff507cc394a065c3b0d953ec0e753e0d SHA512 559a5fa005f2de2cf40dd842285df18fd902857fea3c69caa4b03aa58e7bb01abf2131b5ae5280d32a989edeeba4b1a344549e1967413b83e8e583086df30c0f
+EBUILD django-5.1.2.ebuild 2845 BLAKE2B f5a5313bb706f93a53a864c753d3af0b1e891d3623ed7c623de74f7cc8cacd19136dbcfe35961604bf51e4fee5b708166de22a62f15667e8b2797af62e78ce7c SHA512 c9df9ace60bf04846527535d5b9c33f4fb59357973e93a25d46bddf23c47c9138dece29bf2c88eeb44dc217010b6e3e381b7450301056ed67efe008c1e78006a
+EBUILD django-5.1.3.ebuild 2782 BLAKE2B 78d93c728622137daa0d45dc08d09c43a082c15b3720cb2d1080bf2a6d555ed5bc01d36f502acb3565acaeec7fec9c5914337dbcd63f02855aac856532bd907a SHA512 360c236263c89639b9de78d7586996ff5fbf2b7921a1f827d84717510a306976e4bd3ac0b2492f65f9e788d584a550836a7f6dc1670d8b2a6bb01546c0e21610
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-4.2.16.ebuild b/dev-python/django/django-4.2.16.ebuild
index 0d0c1e3d6c0f..ec6432be35f8 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 d557d9aec904..c5a3d39928b0 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 997662074f12..25f505f4ea56 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 e78879bb7558..c69f4a749bee 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/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 9c2569f30dab..2223f2a6caf6 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,3 +1,3 @@
 DIST ecdsa-0.19.0.tar.gz 197791 BLAKE2B bcf8cead08bb9354c91a788e7bf03c9c8befa03f6fcbd65de0ba4442353a68683e7e100cef307387b270eb525c9f7778492f43b83929648866e6c0b5fc09b40f SHA512 7fa90c810800f453ffcdf1872f9a8448cb6081478980cc3d7f282284b4e5483c3a86dc7b1ad6c3a4f46102479e9c8493a9d16903c462383ebf09f9021c0f3217
-EBUILD ecdsa-0.19.0.ebuild 702 BLAKE2B 3a1fe62163c02e4fb5ac2f625ccaec9eff8adcb94c47e27e113ef296862ff310d7ec0471d58e12e4d9d74f8ad3410c81b159d86d110220d2df812bb7ce9b1818 SHA512 c2b6164ebec456766a4140c6aa6436ebbf480d5c0b37f3344728a247d222eec9ab4cf6c61301057e72873677ffcfc0cac3dc4f74a06cb998c6b770849975b6a8
+EBUILD ecdsa-0.19.0.ebuild 703 BLAKE2B 01dc6c1e47086d2acb41eddd7152393881cce3133f9fd0bab43053f1b1a59eac34fa63e8c5ee69d6445dc700e72ce4d512c5db1aa6217f852da066becd5e3019 SHA512 56aa999e70a6a865a71d08c4cca4b836ebb4959e38adc955ea9b6539aa65715822fe6a69ea42c3530ef4caf97c7d25f2cc0bd5cc06602f35e07fff1b3c4403ec
 MISC metadata.xml 408 BLAKE2B c3ccca8cd48352945025d466f06c143e78923085d82bc219087e1015c3e8219ff5f397739420e588a57a47136da6c4adb905d12fad8d06803b2f33688150b1fc SHA512 12f542d7bf34cf1cd3334cb076490ed04b3a484f0aed3896fd02fd049f371a46f11e078253b3f8d4a3165c8893692e4fcc496b61a9aadbaad570e7f194bee22a
diff --git a/dev-python/ecdsa/ecdsa-0.19.0.ebuild b/dev-python/ecdsa/ecdsa-0.19.0.ebuild
index 2232a0f7a08f..1c3ef83d6d79 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/Manifest b/dev-python/flask-babel/Manifest
index 6f5e2ab79482..c1ff6a7166dc 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,3 +1,3 @@
 DIST flask-babel-4.0.0.gh.tar.gz 20777 BLAKE2B 60c43fde9a2c131672fa7d97dbfe8cc1c69117e60b3616a2f4d19b5693ff79937537cf7563de2fcf26c3380dd51166fd1bc965a1c583dc33fb340da609070503 SHA512 c2ac57e4ebde67114d535e57eb8b4094c8e3af865ea3076cd8d0ae30ff4a189037b7481280faaf7a4742bbbddca1513b3c408e198d1156c1e61a7b90c05bfe6f
-EBUILD flask-babel-4.0.0.ebuild 976 BLAKE2B ac36c518b16faa4d90f5a91613f69b3fb751099f4ab7af37913a71efd920006728d27b61efceabbf96df9f3635af4f256f6cfeb8a79190693aede957fcb34085 SHA512 0b6108fbcbc989713238fbdecff5998ee2a2a6a068309a1b3c8aa95877d6d18767f7e3181775ae47908196134dddc2b38c104896fd657c12f835c49ef390e9b9
+EBUILD flask-babel-4.0.0.ebuild 977 BLAKE2B a6185954694ede3f2317fbbb31cb2b1de2f65a68f457bad813515da4d4c5f41e84672e98d0b92b2242fe83fc1556b9e42e01fb91616097b1c5d860b8b32db0e0 SHA512 9c17717735bc028566ec90ad6ea31c564a154e90f100f5b858b4593944791ec31af6706c7f8b8c96cb357588950a65f2e0466a6e2eebfb842213453ca87c9967
 MISC metadata.xml 475 BLAKE2B 4c2f62351a8c1c7d90b9089b0dd4257519c3b284b1c3af4209083be77a5d8c0e1f537aeaa51da44bd367c2a691046de5e30fcfb0ae7702cff3c4687d7e22c2eb SHA512 4f5365d5da849e7f7a083e5813f6c89b16b6241ad3a5c9b4873c76a952c0684387df9b9abcd8cbcda3905ea4bc41cfc3847dac41b5ab318300bc8b5da2149918
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 58d44d689e08..df1062629d34 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/Manifest b/dev-python/flask-debug/Manifest
index 9325b7c8b6c7..85fb15a2fb06 100644
--- a/dev-python/flask-debug/Manifest
+++ b/dev-python/flask-debug/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Debug-0.4.3.gh.tar.gz 9148 BLAKE2B 9263a4df08f1a9518a42a025a14a89b902c62ab08b25d79b3dfffb25675a47785d0bf9075290190ee4622a30a89e190a465a87986b47ceed7d724ce0b59ad218 SHA512 7bc1cf9f88f28e2ca5a24c1454dcdb4e2a450eff3c00329f299c3840032e0803079f565652974f4c3a0e5aac443365ce47a3d2c2fee8e21e2e0c7150367e8816
-EBUILD flask-debug-0.4.3-r2.ebuild 867 BLAKE2B f83bb1d71be46f9c3695386281181171acc9ea62e1586c9a4d57c97d5239c30c7c4ea6f9591e136a4a48e0d949d1daffab2d9872734410fd6278eae40b9d96a0 SHA512 73e59b7d6363f73553a294f062d0ad0faa2fe9211e5f53ec55b34d4b1ab588afb19283b8747dc57905c64809e5fadb5861dadca9ca0db24e1e4a4450a067e81b
+EBUILD flask-debug-0.4.3-r2.ebuild 868 BLAKE2B 22728c1761692a19c1bfda5c35efd4e3a6cb1fab3d5b8b8fc6027d158374168279accaa28e9dfe2e54b6209d8de09fcac93edfcf01580216ab911025107c5ab4 SHA512 f7ff46c2eaa739b4246eaa468724d370a6357505b30f7f84213404804a0fda78d5b471efc0dd9aedf1de70b257eae086bd962919b280333eea1e8e31188cf05f
 MISC metadata.xml 462 BLAKE2B 766aeb5c3f3aad794c58f7e1ccaa8d1a93be155b2aaf0776811a8a9826a39184e34cce07279977bc97b37299e1e42622fce0c0bc020b27567f0fad209ed7a267 SHA512 7f6ed7da309f34b9860db04d5fffd1fe330bd1997d157411b840c6fee6ce65c61441d9add8ccd93a9ad0109788807448fd29df48508378d594911c5383534d1b
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 180ad7d17fad..a0c00e8eba7a 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/Manifest b/dev-python/flask/Manifest
index 5d60de5e8836..84d08346413b 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,3 +1,3 @@
 DIST flask-3.0.3.tar.gz 676315 BLAKE2B 19013ff4588dc057febe2720eadcfcadb0e1854731c2c9e391449696549106da930c11f94782610424ea40c1377e9b8aa52ca39fedc6ad0c98c9a70a56d01514 SHA512 977c0e5fd2d496fae8e34a035f211118642dc6518a14dc5f6c175b72c6a76407aeb9ff0ed1f5db636370a9aa7e0d36baa783713ea7bdabd7f28c8c2b94643cd1
-EBUILD flask-3.0.3.ebuild 1362 BLAKE2B b0f81bb551651a896baa9c9c6758bed5f0f66025be9ab251146fdffe846e058adc678cc8bc2ada04b86f123b1b62021ef5a59002a0576ee763994be7900ad04f SHA512 8970104b8a442954d557cc0b4fdc0345b774a17d5c336ab04724bb3744284c99223414926c0d41bfb29ecf949c6fc7d8a7c2c59ca913b28d09ed480ede6b77a2
+EBUILD flask-3.0.3.ebuild 1363 BLAKE2B 00dcab623a0d0faa486e3699b676757a3e56517023010e79dc635076377f74828ab354977bd198198d0c5e0668049c1ec6576a773737bd049f24d4a9602ce404 SHA512 150e0ba03050f530d3a060b97320d46123a1e674ba591358dfea73cc069a52eb72a81d2e05896d8af649b6b6c8eae1f14ca8e834c0e377f14399050c2d6a4cf7
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
diff --git a/dev-python/flask/flask-3.0.3.ebuild b/dev-python/flask/flask-3.0.3.ebuild
index 20be2f6ac303..8a89c521696a 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 d359d8ca043e..af85e2289d04 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy2/Manifest
@@ -1,3 +1,3 @@
 DIST gmpy2-2.2.1.tar.gz 234228 BLAKE2B 80188c6abd30ee5b5ebc4d233d3d97dd78be7f9d21d0649429e87b23d3e6d8b5b9269c792d481f24bd3b43d28e012bdd64ee6bb5d0137e3ac759742c845186c1 SHA512 2a3dc011295a373e10455e1f133aa3063cff24cdac0151cee9f29ce5855c3e44c3e3aab61bf13c11c9df1147b9183c6c387db1cb4dcb270b9dce1a9cb521f5dc
-EBUILD gmpy-2.2.1.ebuild 863 BLAKE2B cb0868402c629fbb38949ac28a61d788aa1ac0f68e8d1882b9a5fe5996b2946c72c3be3a423aff319061cc376eb34e0edaed57b457c5ee0a27160273285a586d SHA512 e2fc52d05c5023e6d6d4e70464b22e5007d45404e518b44264679b166cd1f0cdc9f137b15b11a79143ece70751242110000af693c051e15229ede3f676fb52ab
+EBUILD gmpy2-2.2.1.ebuild 863 BLAKE2B cb0868402c629fbb38949ac28a61d788aa1ac0f68e8d1882b9a5fe5996b2946c72c3be3a423aff319061cc376eb34e0edaed57b457c5ee0a27160273285a586d SHA512 e2fc52d05c5023e6d6d4e70464b22e5007d45404e518b44264679b166cd1f0cdc9f137b15b11a79143ece70751242110000af693c051e15229ede3f676fb52ab
 MISC metadata.xml 687 BLAKE2B 9cf9e1c3dad11819000600a2ce28b5f140101cfa37553df7bf07edeb8513d7b8d80b15d561e37ca960a23d3470fc7f83608f9163d46b54fe7c41782302c53963 SHA512 eb1aacdf09d56ac73a1ce37d4562987c900f658bc517ccb6bd34cafefdf9a790d0e0d4318f70b57d68c5ec0c2832d0960b2bd619002fe690f484cd2702b77f79
diff --git a/dev-python/gmpy/gmpy-2.2.1.ebuild b/dev-python/gmpy2/gmpy2-2.2.1.ebuild
index 86006d0213be..86006d0213be 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 f81f2196a2bb..f81f2196a2bb 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 b692ef895a8c..44c54cbb0715 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD hatchling-1.25.0-r1.ebuild 2929 BLAKE2B 1bbc2c8610b4321b52d5d294f6e9d2416413f225d1da074c8186cabe04c34a4d51bd616178a721bf957fc8dbb4f2518317ec7a611fa537c4f82ea6705376bffa SHA512 39bbb54331926eeed7596c36cc202050e4cfb4c40340d6c3a1879e45fbad2ee683ac40d819de67ddf692759d4eaecc4105a87594942adf5552094569463446ef
+EBUILD hatchling-1.26.1.ebuild 2937 BLAKE2B 1f98caa7502063824bc9060244ec8160ffa673348aeb262d26ffe4e8dd015eb531e552b98a91f2986627f0f3220ef8271f2fd11440760474652c304ad46e2d7f SHA512 0f0a648793ce338d564a5b9a6baff8821a4add1187df2e457a535e31f6155ece652d700c87b4a661ef40e690aadf68ea47241f827c8bcefddec0e68ba1ac4ac6
 MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
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..e5f6cb572bc7
--- /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=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t )
+
+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 37f02e9c5f89..f36c0a6cbcad 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,10 +4,12 @@ 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
 EBUILD hypothesis-6.114.1.ebuild 2579 BLAKE2B 9d6bf7e5080cf4e503d590b3f152648bcadc5ae6926aa64b112bcb60656b0c48b70be622a17a01b451ffe8d78853e3dbdc2e12ec12fd52abfbe4e46fc361828f SHA512 6377325432166d2539b3d71e24c802d1aad13b2617d8c2f2281c8ba4a6ee101f1d1f4ed890c7cd893f96a078f67880aecfa72cc56490dfe7a429f7f92932079c
 EBUILD hypothesis-6.115.5.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
 EBUILD hypothesis-6.115.6.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
 EBUILD hypothesis-6.116.0.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
 EBUILD hypothesis-6.118.0.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
 EBUILD hypothesis-6.118.3.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
+EBUILD hypothesis-6.118.7.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
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..f3d89f9d71ea
--- /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=( "${CLI_COMPAT[@]}" )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-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/inline-snapshot/Manifest b/dev-python/inline-snapshot/Manifest
index 069c3ba966bc..8b8a60ff6d7a 100644
--- a/dev-python/inline-snapshot/Manifest
+++ b/dev-python/inline-snapshot/Manifest
@@ -1,3 +1,5 @@
 DIST inline_snapshot-0.13.4.tar.gz 215264 BLAKE2B 911bb7007fd35c68e0e42fb915e284394e45b7b510de875827282fc6dadf7f467a6da1efa626e9b2c348750709aea0399bcd7869dc181ab7a2121f76206404a8 SHA512 724d72984399712611c0eea5129b86b6650bdce1a4331255cf30b806ae6f03a33aa51de9f6353e84ae09ec8f6738372964f380a622481b5bf1db1e9baaa5bf00
+DIST inline_snapshot-0.14.0.tar.gz 209662 BLAKE2B 9bea11df88aab049af61146cb40c8afaa7607f8812c800ee7dffc7de94403029e4ae1d1ed49921f624e5327171650210744962559786e45586ae929830f81819 SHA512 32855dcd098c3e9b6a046752a3fc03c18b0df85e2cf338a928eadcd0e63bb784bdaca6855c954974ec7561e602ff3dd95ccdadb0c4f7dd1075d9d84245c171ef
 EBUILD inline-snapshot-0.13.4.ebuild 1490 BLAKE2B 0a4f2f867af7c141a8d974f00ae57b868d173754414036784ffcb6ac7f047ca2817bea0b089993915bec153f6f3bd351bc92127f1747bd9e58776c37884040fa SHA512 d26865210d55ff182da7810286620cc4162496d6b95863777d8fc846509479741b50a682bb72e46d9a5b861b046db4f6cc9947b8a5a02bf17760cd5f80c223e7
+EBUILD inline-snapshot-0.14.0.ebuild 1541 BLAKE2B 028f368918951464c40534e4b7a72f5f908b95e11e739cc6a39222428db268a07a8b9434fd719aeac98a55134d69b2c8951a003578cd0f2631719c7624aa71a2 SHA512 1092c7cc6f5eeaf62e8feffcc4473cb199e8b57a69f48da9b2ca47c17d081a434253d479279c5668dec1366e580900073f34617989b935cfd9e45951f9c39a26
 MISC metadata.xml 384 BLAKE2B 37af14f95875416431210b572e9c5e96437d773cf53174dec247a9006ad24940f17ae9803a750dd2e1e73f63675f594b326f880bf7d5cb29ff09a8aae4959e60 SHA512 173bd013e023443c9dac349fab3deea6b5e9c2f054052d3362757cc0c46dd89309c509eb6a0f5a5774a7d8acbc55578b629039615a0cb31d74001a8d0db8b680
diff --git a/dev-python/inline-snapshot/inline-snapshot-0.14.0.ebuild b/dev-python/inline-snapshot/inline-snapshot-0.14.0.ebuild
new file mode 100644
index 000000000000..62d796d87b09
--- /dev/null
+++ b/dev-python/inline-snapshot/inline-snapshot-0.14.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Create and update inline snapshots in your Python tests"
+HOMEPAGE="
+	https://15r10nk.github.io/inline-snapshot/
+	https://github.com/15r10nk/inline-snapshot/
+	https://pypi.org/project/inline-snapshot/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/asttokens-2.0.5[${PYTHON_USEDEP}]
+	>=dev-python/black-23.3.0[${PYTHON_USEDEP}]
+	>=dev-python/click-8.1.4[${PYTHON_USEDEP}]
+	>=dev-python/executing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-python/dirty-equals-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.75.5[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/mypy[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/pydantic[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezer-0.4.8[${PYTHON_USEDEP}]
+		>=dev-python/pytest-subtests-0.11.0[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires pyright
+		'tests/test_typing.py::test_typing[pyright]'
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=inline_snapshot.pytest_plugin,pytest_freezer,pytest_subtests.plugin,xdist.plugin
+	local -x PYTHONPATH=${S}/src
+	epytest
+}
diff --git a/dev-python/insipid-sphinx-theme/Manifest b/dev-python/insipid-sphinx-theme/Manifest
index ae89fb69abbc..a01f67a788d7 100644
--- a/dev-python/insipid-sphinx-theme/Manifest
+++ b/dev-python/insipid-sphinx-theme/Manifest
@@ -1,3 +1,3 @@
 DIST insipid-sphinx-theme-0.4.2.tar.gz 73415 BLAKE2B 0f17fc5fec19926ec6e134b716ef36617e0be66d771c76237923b3f77508b1fc1fb39b790d5ac72c1cff61e4f7a484b42bd6b0eec954afac1d758284cc073ed3 SHA512 934208afcc88a72b188c64f147ff0bc6508ad1b8aa5ee061620ec53725d2a9781ea503a16fb42db3f2bcd45774d3a9f611de251f71ca0b6162cf0d6653a1a058
-EBUILD insipid-sphinx-theme-0.4.2.ebuild 667 BLAKE2B f28202eb85e4d809e985174ad3dd6e3ff0e9889e9564255b95280eda5344dceeffa5ecbc8f20816191bfcea54d4a62fa0778eb637c7541505ee400127a6a7c41 SHA512 7c051b8763bf31a95d88e2ab9963647a75a524632b0c7329893d5deef5c87469952c225581d00796b4c4512994eb653fbfa70d28bf33b5f5c781f45fb984023b
+EBUILD insipid-sphinx-theme-0.4.2.ebuild 668 BLAKE2B 1ae2110a3199fe60764307129d785a1ffc745d6b14d7392beb2dd21e1eea8c917ca162236da473e24fe33a80aba662bcca5e1e29adcebe904c95e3dc1c319c26 SHA512 5c31e41f4d98ccdb137ca5d4ea9d803575103df90ce08e718dc46a919136421a23a3ab6e5cf6cb2dc997eebdabfc57f45a863c55bede846dd082e050162c6d1b
 MISC metadata.xml 451 BLAKE2B faf29e2d04c0800c87b8fd4349fe464f06f2b1aa69d8e97768c1d77c17a5867c5eeb23fc871926458d24f07e606ab825e89aa291bdc91177a9d12b4c5e17c82d SHA512 0ae1cd84860aaedcc9e8be5a310834194fee89048da4441f143cde06eafae7aaf986826b81e5c71b325d545757f4318b016b20ba9a2d46e6a0e013de2d49e216
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 11fec16ffe77..9ca84b985351 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 c0a918baff16..fe1e2e25d250 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD jedi-0.19.1_p20240706.ebuild 2431 BLAKE2B 9f0e135956eea56bcb9387b809eeb4fa415397e1f707739f515e9e128e7ada36d1524e51c568652c7b0e8a10e0706fcc34fe7b96ff318e0b59299c1f67d6cdee SHA512 49d245465f9eaa382faefec64600425a0322211452fdc599dbc7708639e85b12877dc7d582c055c6973898293788a5fb36acec94d5e11c0d528794554938350b
+EBUILD jedi-0.19.2.ebuild 2439 BLAKE2B 99cc94027299252f66fbb5b4b7d4600bf7b23a3322f6c9a81cfdaec0bfbd03ea8012a88b7f31d861d99178c9263bce25749e47a14b6773d98c1227f5803dda8b SHA512 0119701dca13f3db7d7d501b4d2628950f6f56ec63bb9ac10a8e21d5b909ca6e9911d3ed34a5b38c631d7292d229fde854fd2c779e19b12713e44f295d587f26
 MISC metadata.xml 401 BLAKE2B c540d55ee88ab5a7be9ec902059a766a754da42ba5c1836c990d0d64edfec91fa33e8a745b9a15ce4a97831259150e0298fe2a5ed4c21993be73d9fd7af3d865 SHA512 6af98463225428333ec509b334014bd307569ce852f640a1f1c1e18f7551185d8db9b7c80822012c14f3c6ca1cf79ff24f289df3cd42803759d012a1a73ac07c
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..fdda7dbe9eea
--- /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=( pypy3 python3_{10..13} )
+
+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/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index a69a733e3a82..4ee32c074fde 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -37,5 +37,5 @@ DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e42
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c
 DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
-EBUILD jellyfish-1.1.0-r1.ebuild 1591 BLAKE2B d915fb714af402c3149a2c47ce399ff20cdc9ae57172a5d36bf1a9c6bc2a7445f93fd72fd7ef47bf751a6d51ed4ba02a5a0cc844f0d6913b788130f507a5fbfe SHA512 991bc4a0dff6979443f38aeb6e6ce087a87408fbc472a97fe00773ea74dcc82980daa2f11e40c5381aae77b4069d3009a1cafe1e78ae4f9c9709f6457a93b342
+EBUILD jellyfish-1.1.0-r1.ebuild 1531 BLAKE2B 5b81ae5baa18efa16280365f9f8868a7f4002cc11d2f5b102f44c9b170df7c2b44a42e4c34d524dca016f8798627936153f67d94508ca443295556656dcde13a SHA512 eb44d4a2dedbbc51457dbc112022118529bfa5bf6ead2b5171029712de6a0417c91e2031d04bb6934afdaa50840b09a06eb4abc3068f66203e156b4c79fbebd4
 MISC metadata.xml 504 BLAKE2B 65ba00e0a27d233e6850c5606eac6eacf7d1684bfeb64155c52cee5a196e54a0454465df8c310a91cf30d696b4812fa23014e3a8a483b197e8955a4ad751ee61 SHA512 51396a920abaed74a87aca55c00ee46404b4ed1773a4443eebe19b2e7b64b258b5b526a97bd4afc7e7aa495d7989192e3658105b69efba0bf280f57b52299738
diff --git a/dev-python/jellyfish/jellyfish-1.1.0-r1.ebuild b/dev-python/jellyfish/jellyfish-1.1.0-r1.ebuild
index da3d699aea29..e3bcd852ea94 100644
--- a/dev-python/jellyfish/jellyfish-1.1.0-r1.ebuild
+++ b/dev-python/jellyfish/jellyfish-1.1.0-r1.ebuild
@@ -74,11 +74,6 @@ distutils_enable_tests pytest
 
 export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
 
-pkg_setup() {
-	distutils-r1_pkg_setup
-	cargo_src_prepare
-}
-
 python_test_all() {
 	cargo_src_test
 }
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
deleted file mode 100644
index 595152a8ffcf..000000000000
--- a/dev-python/jinja/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jinja-3.1.4-py313.patch 2365 BLAKE2B 554b37e4f874060a6c2758426a08cad61b752913535f607d065e7a648fa5db272abd85615ba7734df3b2775320318da58040db08aa56c195d4b11e8e242adaec SHA512 3470db6a936c4a921ee3d5a8f7443f0dac9e2416be0332cb80c0c5cd6e1a80186a372a9f7034f5609202b93186c7c3e0e2bcddef209187043b2ebd4d9c796fe3
-DIST jinja2-3.1.4.tar.gz 240245 BLAKE2B cb70699cea93ddf53b7c8876b9006cc70599d49f8c64ab615759a53db6829cab7b55ac673777bc4c8dc5dfc68efada29d37f47fe7cf449044721f659fe6a654d SHA512 d07d68a2687af68c705d3b7f5a2c67aca7b9d125316b15085888b9d0d6e769981af76f6f524728b89b5501bd671d518fcb2638f9ae112e57ca2bf2a53482cd89
-EBUILD jinja-3.1.4.ebuild 1191 BLAKE2B c71fe43da8e4b25f74ec0b2e91d4d1d37ecbf71ae9ff6daf1e042eda289ba346298f0af4c80a4208c1bcdb687830e4d433c4fcadf11ffeadfe5ca443ce220241 SHA512 a9df44616a31489fd17543ade813cb5ec9c9788352357917dffc7e0b64501df5b273b1b993665398314dc096209065b76ece6a19f51046614bd0718cdefae47e
-MISC metadata.xml 467 BLAKE2B 5cba0288a395e281e76810639b6e74153f1fe7532addb41ab9ff1e7e3d23616f2cd6cce9ef266ec3545fe6694fb3e25457f9ad383d5de3e2612dedd5609f2a6f SHA512 04f6f784b771602d2ad23afba5d8c9d10fb44b68873ea20a92904f0350081265852c9e4874866e8684c6a163e99f88053b5ea367357fd74790861f6e7d9cb1e3
diff --git a/dev-python/jinja2-time/Manifest b/dev-python/jinja2-time/Manifest
index 9756efcd60b0..74789768afef 100644
--- a/dev-python/jinja2-time/Manifest
+++ b/dev-python/jinja2-time/Manifest
@@ -1,4 +1,4 @@
 AUX jinja2-time-0.2.0-arrow-compat.patch 1655 BLAKE2B 7285125450d338d4e4c927761b5eb93778f51bd5b260fcdf1ac720006d61faaee2b928a869337cd6f9e7905140810ebe6047fd3c954501c86e1185f85f1517d3 SHA512 0286a608702bb445cf29da7900ec04f5b1f64d1e9658b84f9a90018adf5fce5cc959832abff73fa017afcaf0a0f6be85060e52a79038bf770b8b37d8c96a5e7d
 DIST jinja2-time-0.2.0.tar.gz 5701 BLAKE2B 370318000b1c91bc3460861d389da667f6d7e840c4f9d9d1661491c9bf1b422b8ecff12d1da2467e7a9596d12832790e314c3298672d70b38b92a53198df0156 SHA512 8ac4686312cde689f7a431001833d5d477030c4f5e9470d949bd07a40fcb9521f6ddcde37a72468093121ff9451e352a0bb43d20a796d7a204cf94e8a7545f2c
-EBUILD jinja2-time-0.2.0-r1.ebuild 672 BLAKE2B c9b83785ae8cc79ebe775e9d4b2814b88c4e3150d2581477bff157b812645fc2c7c72ec096e00bb632719a9c58b9dc814058cf75e67e9ee37f1b9b704ee18405 SHA512 ef1a82ff9d26e022f9a4c7d4f2518a89764c7a05fcea6481fa135a2d913417fc179a67db10a49281a97eddc40ef501a25cb0f8a7cd0f5346fd9999569593d927
+EBUILD jinja2-time-0.2.0-r1.ebuild 673 BLAKE2B 83c63cac2b4c3ac69ac2170663534c9b5dc12d8ef43be4404507adfd754b55527cd20126d9acab78d5b734bb9c55ffd64c9520ae15622a8a3858c9a290fb422f SHA512 dad15bb03b998808abf1b6792222668d06f0196955a9a9b2be21d85d3eb3329c0b887fa9b9759ba39344ca3d12cbfbd79672409a1d3026249678b497b162d744
 MISC metadata.xml 400 BLAKE2B 1b41d34e0d32e03e8a012358f02460f7090d0f70fab1be6af4f91e55a22a35deceac8078d5f2723676171b4641594ea4fe58b614948dd9b7bf60bf6889b68ab3 SHA512 decfcdeeb4705a9f62c6fdd9a249b5a7363988faffc5758d9cd50da9db909bf792da78ba044bfbada5b6429a6a8139c833b12ccb8e0d7cb7bfbae4f8d16664c1
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 69621700ac1b..1d461da02479 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/jinja2/Manifest b/dev-python/jinja2/Manifest
new file mode 100644
index 000000000000..3fd8ab020035
--- /dev/null
+++ b/dev-python/jinja2/Manifest
@@ -0,0 +1,4 @@
+AUX jinja2-3.1.4-py313.patch 2365 BLAKE2B 554b37e4f874060a6c2758426a08cad61b752913535f607d065e7a648fa5db272abd85615ba7734df3b2775320318da58040db08aa56c195d4b11e8e242adaec SHA512 3470db6a936c4a921ee3d5a8f7443f0dac9e2416be0332cb80c0c5cd6e1a80186a372a9f7034f5609202b93186c7c3e0e2bcddef209187043b2ebd4d9c796fe3
+DIST jinja2-3.1.4.tar.gz 240245 BLAKE2B cb70699cea93ddf53b7c8876b9006cc70599d49f8c64ab615759a53db6829cab7b55ac673777bc4c8dc5dfc68efada29d37f47fe7cf449044721f659fe6a654d SHA512 d07d68a2687af68c705d3b7f5a2c67aca7b9d125316b15085888b9d0d6e769981af76f6f524728b89b5501bd671d518fcb2638f9ae112e57ca2bf2a53482cd89
+EBUILD jinja2-3.1.4.ebuild 1191 BLAKE2B c71fe43da8e4b25f74ec0b2e91d4d1d37ecbf71ae9ff6daf1e042eda289ba346298f0af4c80a4208c1bcdb687830e4d433c4fcadf11ffeadfe5ca443ce220241 SHA512 a9df44616a31489fd17543ade813cb5ec9c9788352357917dffc7e0b64501df5b273b1b993665398314dc096209065b76ece6a19f51046614bd0718cdefae47e
+MISC metadata.xml 467 BLAKE2B 5cba0288a395e281e76810639b6e74153f1fe7532addb41ab9ff1e7e3d23616f2cd6cce9ef266ec3545fe6694fb3e25457f9ad383d5de3e2612dedd5609f2a6f SHA512 04f6f784b771602d2ad23afba5d8c9d10fb44b68873ea20a92904f0350081265852c9e4874866e8684c6a163e99f88053b5ea367357fd74790861f6e7d9cb1e3
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 b89e94804438..b89e94804438 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 7dfbf7b05fcf..7dfbf7b05fcf 100644
--- a/dev-python/jinja/metadata.xml
+++ b/dev-python/jinja2/metadata.xml
diff --git a/dev-python/jinja2_pluralize/Manifest b/dev-python/jinja2_pluralize/Manifest
index c2aa64bda888..e6d47062b6b0 100644
--- a/dev-python/jinja2_pluralize/Manifest
+++ b/dev-python/jinja2_pluralize/Manifest
@@ -1,3 +1,3 @@
 DIST jinja2_pluralize-0.3.0.tar.gz 12638 BLAKE2B bb7399d287cf0d1bfed5398c0ad7e6994dfe1d8e942d82190570d0b40d8bec4939d497cb2d9d4415c913f3f3f9c11b017035941755219effa8d92a6ef188dac9 SHA512 8830c01ff82befa353302cadc305147a950038fdf3808632f22dfce9a564a6ba7967781f579a2d94fecb1b5bb01f80d2a53ff082332b94c6e6e3f5f4106e7313
-EBUILD jinja2_pluralize-0.3.0-r1.ebuild 523 BLAKE2B 8997575c698082ea790e618277e5efb691bd191ebe37879db4c73a624302eac2cec75ddcd2cfdd1e4296cedb21cd06e2eed4ba6308740036491e7684376eea24 SHA512 99c8e18046b279eb47eb928a78a6d832d7c63d0f9400a48962dddae49082814e2e7124caf4b07b7fb823c33a60f03a0aa7b454e0312b4a5c9cb865274e8061c7
+EBUILD jinja2_pluralize-0.3.0-r1.ebuild 524 BLAKE2B 3e65960b2012f0085b057bb3fa65bab75bbfdac6426431e2e01052c3d95c3da62c4e7650fb6944dca24ed55cddb3bb6e9a8e26783e14000bdebb0d6fcd8fc6a4 SHA512 1209d6a3547ce842267f0038297158fb456ef0a3927f4830c8dbb60263156458bac9cca1b1fc65b5cdf531d639d8f9377ca69fdf4a2c7a209f5f75eb391ab45d
 MISC metadata.xml 495 BLAKE2B 92432500add47e3e65573cf3d6ce69f97ed5765c16190fb102d77829e34cec938c8e587b39fcc95dee157fa8b8048eae0708147ad79431eb9bc3aa0214b926c0 SHA512 7bd616c66dcd43150b63203ff1b069b216eb721222103df46ddb459ecf521c342820c4dde2d386d2b0621d4c17e64c7c0b8edb9509b87cc032010ced34752252
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 06212623a6f4..a6d950e2fda0 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/Manifest b/dev-python/jsonpickle/Manifest
index c29e73846413..1d985e5a18ae 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,5 +1,5 @@
 DIST jsonpickle-3.3.0.gh.tar.gz 324099 BLAKE2B e2c922df65f497b80ae78258024342de763d7585ce391f076e9e8a2f1da73e5c755b977be069a9778c85721b2fdcfcde70034374c7f38f001486a41742e9a488 SHA512 b796c2263ccb38e9e9191d9519ac044defa5df8a2b34bc8002f4de59397056048e037ae12f3e5ca46061febb81a7b35cfec11335926c893357f0c22e9b1b6d85
 DIST jsonpickle-3.4.2.gh.tar.gz 307391 BLAKE2B 30be4460787349a7359062e5ebb14a4fbf3139f12b6bc388d903a419aa7e1a0bed93202aecacf5b43379de9335938b9948dc79f46b73791212b1623c972be0de SHA512 745a1355fa171224b48466590e1dd210d25cda41b8d9a9dfbafebf3b4fe17ca2b5e19b2c3c63d4fd3d5e70a800418f4da95404c3ce86fdfef163deb9b0d3ba46
-EBUILD jsonpickle-3.3.0.ebuild 1672 BLAKE2B ebfc9eb20a2b60d2c27a2142e5937bcbd1eee93333f85c855e6157793f12591e80998b116d029a34b3997bba05ccacc4e4930cf8e61621dd2ff2271a1bd7a788 SHA512 c3de375db8b1f532b8780d574de3ab148bd9cdc1fe80575072abc93b6c9f0066f6125b3e752c38339ceeaa12a3ed4e56bd8d6dba2b2392115466dd60fe02c18d
-EBUILD jsonpickle-3.4.2.ebuild 1632 BLAKE2B c48615d87dbcacde7da8da125293ced1d9a4d94f9fe3179d8ec7fbe827566323d38d052616625d8e3c6bdd8d7e1ac9740f1a6c4b77dbd0dbda52573b404ebe7a SHA512 12b82c7eb55a9f7736c5fae9b58127abe7c800b00a504f801a075f0e76626ccc6d1ef3c80e41239c5306242c1e2e2bb6eb516150be6394119e09a1296ed1aa55
+EBUILD jsonpickle-3.3.0.ebuild 1674 BLAKE2B f203cfcc5cc4c4dd508b94208bb278af288d8b2b1534f5f34a5563f2e128b7499c3bebc5006fbaa037ec52b984223d89593268ccdb404613410cf136720e14f1 SHA512 3f9b9cae4c80b6b425a5920b01b45513e1462b3567def2795623c6726a02d5f0094797b6b29d517524b63115d8de359b460a4b275fe44fd28edd14c358d6a042
+EBUILD jsonpickle-3.4.2.ebuild 1634 BLAKE2B dd4b485d56e7e2fdcaa444adc47aba3cf24aaf8d65974abdb8274a33047d5a6249d1a85e52d4727acaf3b3a69a53a9a3df7912170fe3151168c3bc0faed84cbb SHA512 6b37bcf3ef639428d17faa2f8e5c85b1eec268d35abaafb4b94b97f0bf759c6078dceed0a4495e2ea19a6b9f8db18221bbdcc144ef4821f46956b2a24e35e9ca
 MISC metadata.xml 412 BLAKE2B a7e746abd8b45415ecdbccbde1b65ba9f1fa9fe7ce353411681c2a3de046878e990aad20849ee561a56ad3208bd5071d7b5e5b3c767fd71b7c44d2e8412d349b SHA512 dc52df78fdfe9024e695aae3d2bf22bed7162e1f2a528a288056b68022ebbc400b0a3a2f3e9c2155ee57e66d77a4f7a3f6f67188fb13ee15f200212ac6809a31
diff --git a/dev-python/jsonpickle/jsonpickle-3.3.0.ebuild b/dev-python/jsonpickle/jsonpickle-3.3.0.ebuild
index 2be3bd6e680a..d5d325a3c553 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 e800bef59187..971fe8e5ffc6 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/Manifest b/dev-python/jupyter-server/Manifest
index ab3757b99374..ae2e1ffdb84e 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server-2.14.2.tar.gz 719933 BLAKE2B 2d8a8a283b394ceaabde14b2a997fc71d7dccc80a284ef7770d948634e48c8689c8393c77992d685abd7d8766b8608cfd279a47b5cc9569b6f6c98d416f284c8 SHA512 ea8fbf93c1bafcdb77c95cc65e2e7c6e9d010add7fb8b2b1d4538f415c4b39a89cf18a58795da05dd41a838fc1057fadde3f68d9bc73d532aec76ae5cab357a7
-EBUILD jupyter-server-2.14.2.ebuild 2424 BLAKE2B 49d44873d973177ade99dbaf10b5cc799cf13af997a1072c375f00405d81c77add32364e6f0edc2b316a483ef9bc9d71d0794ee63b1113571b01eddaa78502df SHA512 5dc36169a547ab13eeba956697a040daee3d5e8aa6571c153d7904081ca7c334fffebf58daeaf3e579acaad0041d8745861bc82d4fc866b4363d776192a8daa7
+EBUILD jupyter-server-2.14.2.ebuild 2425 BLAKE2B fc16f8ac0829c3025a1c675be434cba9aabe612cd7090549ad766a7ee425dce5e7f97093acc6c1e1a0d396d350b4716ec842058154fca4b444e2bb77ea799c7d SHA512 52ab1fb879a050a057c82f78acca2c62d47fb424d1fa24b9ed5e1ed7675abd551cdf62a7487fa3aff03ca622c6bc30d6581efd6f584993ae94c8ea0052b956e8
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
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 d9c36c44ae83..37faf06b7dc6 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/Manifest b/dev-python/jupyterlab-server/Manifest
index 281a468165b3..cc8f286c1fbf 100644
--- a/dev-python/jupyterlab-server/Manifest
+++ b/dev-python/jupyterlab-server/Manifest
@@ -1,3 +1,3 @@
 DIST jupyterlab_server-2.27.3.tar.gz 76173 BLAKE2B 628947c066f432148e52726439743379f36c78da29d0b7596402f3ea619bc8c03a36017c130cf4700c1659a6e2ba25c28b02aaf529fc071291252dbbee3615fc SHA512 b4d2e91da8c92896958bb2adcb844d8a48f1b8df1ab8c3ff81511d0f3488c27f70f67c9f8731181fbc27836652e805efa869123ccb4d59d1098cd283a4fbcd10
-EBUILD jupyterlab-server-2.27.3.ebuild 1805 BLAKE2B 1f0f93970fec36dd96774918bfd1cf68d0831dde7ea18b533525997bc0245f77c94f40b5fc20445420686642575f5abc982ba0af17a629628c449d749ac0e958 SHA512 e84eb3f057116a0195b5ef642add4fd0b2a8663002ad81407bbdd1034b0efd2c4499e623a72aac9f27780f613745ea28b0fdd8e1610316ad37b61b0e6165297a
+EBUILD jupyterlab-server-2.27.3.ebuild 1806 BLAKE2B b0d4d0e4c481d678461f718a0f8d044ddd8e2a775b97e9c36fc39492b3699659c55bfd562c48e9d45534c2b1ca7a42159a7eadaa106c1793e1b8af86e5ccfe9e SHA512 dc946154e163bb611a96f30b48212b3f496a76c5ce67c98010b5454f9c0f80602c3f68a888dae28ad429dfed09bd4654cde491adf6c11d1be90292ee6f150fb6
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
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 ed3bbf45c01d..bbd19e18f583 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/Manifest b/dev-python/jupyterlab/Manifest
index a6dc015316ef..abd1210cbe16 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,3 +1,3 @@
 DIST jupyterlab-4.2.5.tar.gz 21508698 BLAKE2B 9222972e40e60549360d80221b97806e47b70592ffa9a63b3cb030e4b4ad061a8f8eadf295d76ae0302efb3bbf854cde9f5dfcacb6df3c6ad1994bf6ab66d1cc SHA512 7c5c3aab1bf86da0e49742630ece8a311ec351be99bfce3e35b5e92e06e858296e882a47f7a1abe9ab1c63cc92062f21d557f4f6237846a3c8377fc6288bf298
-EBUILD jupyterlab-4.2.5.ebuild 2760 BLAKE2B e5f0a51d2c22bd4feece54cefe493e5d2dee0de04f768e18c056f35009abdfa01b0f1d117f4d2a5620a8e64e7238342f8bbb59f56e42429cef8d12dd6e8dbfef SHA512 b91b9d7d4fc1e19a7a2b28f9cc34f1de3a533771ef51bf396fc9134d6e6002282f75a1e6d0343558becc8867a33c797e3f92d1317de34fa5008e623d17ba54b8
+EBUILD jupyterlab-4.2.5.ebuild 2761 BLAKE2B 1790fad4e737b686bfba5d2ecfb4093ce8d7746912debec0a94f7fa87e7d34bf7f34c977da74e51bc1c0e1a9d69002df915e0cb4042c4d21bdbaf24123047db2 SHA512 062b8d986c027db40e09d41024aa5901b6f25cd86b5322c00f2ca2c68e8957fe83c8c7782d0294af8643fdaa29369889b049994c6593a2c377737b864aef3e3f
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild b/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild
index 81ef015903dd..5fb4ebcb62a0 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/libcst/Manifest b/dev-python/libcst/Manifest
index f6f515dfc150..c7c24a8b7333 100644
--- a/dev-python/libcst/Manifest
+++ b/dev-python/libcst/Manifest
@@ -116,5 +116,5 @@ DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9
 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST winnow-0.6.18.crate 163357 BLAKE2B 7a43eba294c43b187211c6eabc449775081f44405045ec4786c5f10290639e18d002e872f9db14caa94e26fd99079c7ce2f99e70dcb20d842c0886ac203d8ca8 SHA512 3a146d9dc8fe3fcc855f7766852cd69c49a28f9048d553d3952d7722d49216cb44652d98b15ae1ddee99b2bbc3caefb107a9b85c309242dac943deeca65a81dc
-EBUILD libcst-1.5.0-r1.ebuild 4015 BLAKE2B fd04c1084255872b009617167092bf3f2726cb72bbf4f7670d525201ecf6e6773ce5c75c5ebffeb16a02e8a3e6804540ec21229abd575d2554957ea2fd18bfd2 SHA512 13815a6d54d45d3149a92b4ebad205ffec01c4e4709ebb8dbd06b344724e2464994d85a36cf926e234196e9d1619055daa0333eb4602bb20c0a229a21ef49497
+EBUILD libcst-1.5.0-r1.ebuild 3958 BLAKE2B 2f5c5801bf8ccdd300745f1eaa4f36a0c91f2d72672b22ec91428c315784c61732462c2c155107d0a8da3a05f50e42eb763cd6e8c345137eb07939d7f4a834ad SHA512 40eeca896263ac96bd20799a99378bfa61b8489a4ece232a00a40d114f336b89a9521ec88ab6b2e2eae4dd3363dc4f38adfef019654aff9146e46399db64af52
 MISC metadata.xml 344 BLAKE2B 1dee439ab8e2c5e4e69c38cbdf2d6730844f73882e27dcf6dbbeaac5fb1e256eab39c854d3d0de8d91728b84b707aeec5b9bd9fe2d399baa1b4b61d9a5c33686 SHA512 9ec25b8e81d2c30502b71d33767331a5704aa708ffc5e1c36b5b91f82ad0acc0bd0f0e431d62d4e42eea9ecb30d021e5ee514f630aa6ccd7667bfecf4b4837ec
diff --git a/dev-python/libcst/libcst-1.5.0-r1.ebuild b/dev-python/libcst/libcst-1.5.0-r1.ebuild
index ef97ae4e765b..2eb6ef190406 100644
--- a/dev-python/libcst/libcst-1.5.0-r1.ebuild
+++ b/dev-python/libcst/libcst-1.5.0-r1.ebuild
@@ -160,11 +160,6 @@ distutils_enable_tests pytest
 
 QA_FLAGS_IGNORED="usr/lib/py.*/site-packages/libcst/native.*"
 
-pkg_setup() {
-	distutils_r1_pkg_setup
-	rust_pkg_setup
-}
-
 python_test() {
 	local EPYTEST_DESELECT=(
 		# TODO
diff --git a/dev-python/logbook/Manifest b/dev-python/logbook/Manifest
index e508c9e00d3c..096deb2480cd 100644
--- a/dev-python/logbook/Manifest
+++ b/dev-python/logbook/Manifest
@@ -1,5 +1,5 @@
 DIST logbook-1.7.0.gh.tar.gz 364752 BLAKE2B a801c2ec55a257250336748007bdb95206372cf8cf3492785c5c50829e3e3c467de564401ed6f758f3e6b14d708d889860a4bb93da5119fc134df5167976bebb SHA512 50b52f54e894be303a7e910602cfbbceee04280cb134ad89f32f0a79c21d509ae0f6ae83beac9a9e22726d1c394e9893eea884ff43b56aae9dbad6dd1221d96f
 DIST logbook-1.8.0.gh.tar.gz 364862 BLAKE2B 1b245223ab9d3b026967b626e1cba2fed3d03b5abc745be238f76c2ddebf8e0909597acdad3a3e70738b8c9b9e6350f4d23d5e02c8f1b1d8ff6ec5f6509d2b9f SHA512 73e4d9170af6c4db6eadf27e84419927136658c786b173e5eae91dc9499d3c374fe5a4a7e8f7bc463194b19648aee23aceba0cce9a63fd25a6ee0a53b1dbe8f9
-EBUILD logbook-1.7.0.ebuild 1285 BLAKE2B 9129e06c76703e53719313bbb74cfe6a80b1851fa5f41a51058e210dcadc383367bf5ff4d2385408753e4e9472bb10dccdf46e6fb761dfad1cecbdc431a82dd8 SHA512 090b8a4c30410c4b1d4f5a0c4d09d301440c23bac2fd3303833e2284b62f7c5e81c4355adbc69e64e8d762d8aeb76e4424dcbc40dc7c3fdbcf65aa16f97d499f
-EBUILD logbook-1.8.0.ebuild 1234 BLAKE2B a7c795f7c842f2a9fca9bf6eeec92fa1cfe0ae51c9b43a5763c16b99c7b7da6bd3e851f893afce7a902a592e767bc224977b33681f099606f12d8a5549813b92 SHA512 8fe567212158498b3c07839c118b564115fdf15621173fef38ac51f56e21bb00ffbdbf96d8e36c733ab13776dd9cbd4bc2225b9aa84b2a47cf05d1c97b5b2552
+EBUILD logbook-1.7.0.ebuild 1286 BLAKE2B a3ca666ca3aac0be37383cef224b93c1c939501e0210a1fc1edceb4cad82dcc5f1e5dac4e72d6ae3de08bfae999faa21e4ee5aee6916f67abae62f4813aece54 SHA512 9774963c7e62260cf4c401532e7138740d572eea6229a54786176e51e5e9b189d247c018bc45fcc5d260862375cb2b02ee983e29754b43d073c330e7b1951751
+EBUILD logbook-1.8.0.ebuild 1235 BLAKE2B 956d5638a101b432a8f37c4658fed0af4825de44d8271ec625972ef2d827a2c750e5f447f0eebdcda9a22c9de31ce5fa27929aec150dfdd5410e62507ff1845d SHA512 9db680b148520af6723a091e09e9375fc18fbd0249f8a1885f6a8c2c65bc639c0d8e0d262277d1a143ffba021e40bce9dc07ba73c4255c7c57316722bac7e73f
 MISC metadata.xml 519 BLAKE2B 552fa368fac398134dcd21eb8ee58f8b87ea14bfa505e778d2963d73d99a4d0e6565306c121fe6daa6cd47f442f185adf8d12468caf18e1b3a6c7cdfc848a43f SHA512 182d50afcf20b64e54add31c8e0ae1ca9489e334c36909846bcb34ad9da01a890f9ee69ca55e5d55006b88648a6a9103d08cd0fbf0fb034d39d492c64b63be77
diff --git a/dev-python/logbook/logbook-1.7.0.ebuild b/dev-python/logbook/logbook-1.7.0.ebuild
index 3e935b81ead4..7ed72f63cedf 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 74e014bd7ee9..c8021a9a60bb 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/Manifest b/dev-python/mkdocs-macros-plugin/Manifest
index a0faa32db28b..a3831bcb05d7 100644
--- a/dev-python/mkdocs-macros-plugin/Manifest
+++ b/dev-python/mkdocs-macros-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-macros-plugin-1.0.5.tar.gz 566013 BLAKE2B f984cced060f09060bd63c7c204799dd9b318fa98229b2a86b034165190a76ccac7c8d37bf084c56ba0673105a818c0a0d210121d01e6b677349488aa0730160 SHA512 38fa2f2522f08b418ef8dc8fd222ba6b0feb2cb81bcaed98017e9641b66f249e77d93334850a6e6e8dcb91f2d3cfc16e3348b5a1f0103bb93512465a8b095f35
-EBUILD mkdocs-macros-plugin-1.0.5.ebuild 833 BLAKE2B 3df6ea54074b37e480c0a2b3d92c643725a0f47c7a449755f77eea90ddb63165b5563f6ccf08ac2eb212c244e84de23eadbe0db11506046bba85340f2e64ccb1 SHA512 d2fa889d20342291814d9dc3d09da0f128211ba87cdd119a884bd15b309c6ad8feed14996b997be89176d974f62dc2b5056895281809fe497913acdc0314023b
+EBUILD mkdocs-macros-plugin-1.0.5.ebuild 834 BLAKE2B ed0d08407abdc3419d3232e2285766dbfcfaea9a175b746c70135f66e273755a14b9f2909e6a259a807aac77ae74f72a9ab4826b1e0c4cb0b0193d4d82e69a41 SHA512 77a822e32cb44414db51e5e1630fc78b754a875e98b5346c2c1cb5adc01e2114f81055a80377e90d3f7bd59b463c281b843c339ed54943813a3a83d0195530ab
 MISC metadata.xml 342 BLAKE2B 13de055c134b3aa22f3b35674ef09635ad2d4524d6df938dec8574f6a535f5ee623bc5502acc6bc88eca3228e45ff644e94695b9acbd21c02daea9c5282d4193 SHA512 0edcbfc2a15cf873a2194b86194c590b44ed36cc4e391e09127dcbec5b9d074dbbcfe44eed78059bb68572f2b8200fc7bc6d0d70df893117ee9ec8f97ba4df66
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 83f8ce26363b..dcf45a0576a4 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/Manifest b/dev-python/mkdocs-material/Manifest
index 7b3b7fada507..1d4c099c4111 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -2,7 +2,7 @@ AUX mkdocs-material-8.5.7-simplify-build.patch 529 BLAKE2B 60a246940983ca713b370
 DIST mkdocs-material-9.5.42.gh.tar.gz 14763147 BLAKE2B 3f45a3d40e77ef822c0a661ca3b8234d7098029f5a259cde631484aa92311c417b628a2b532e8df88d08d116dec7520b2c49219e5e6f6c0db7491bf260cc46c5 SHA512 96e5c8db3dcb047a9eb0df1c686f38238807f44c22554311eb86ac17dca5c6243996b2b8d5bc2745a611a6ca21da0657b5010889fbcc3a038311c816eaf846f5
 DIST mkdocs-material-9.5.43.gh.tar.gz 14762388 BLAKE2B 49e5591aa3669c7bc8a8cd1969d3a54c7575958303742d5169023dd0e8c42ea6beabaa730b388e144d06dd402be7edac92a51d26ee40c2e90c2d19b8779afb6a SHA512 f7930ebcecb2cb37ec9a462f7a1a68351e73f745db36a85bac4c07797582e0a64a28936ccb85f0125ff5d3940768627f5b51c425b2d3b886663e904c607ae629
 DIST mkdocs-material-9.5.44.gh.tar.gz 14764147 BLAKE2B e0aaed852abd060eee0b9049798a327a4ddc5969a84289b8aa983b0dfbe926b2e0dfd13525593c2783106bca882adfcfad7961c2eb0363a1f4a4131c364c42c8 SHA512 9a0c8d4a52c8b44b9c8e84b57839d5ddc3080eaa136cb6effc3da8eb9d08a2ef0c0898ff875afabc1783ea548653a9b00f00db67ceb48d52f323a93795529465
-EBUILD mkdocs-material-9.5.42.ebuild 1794 BLAKE2B 982474c0246f3a60db2c86bd493db20aa8d9ffaf16eb2ee93ea34ded0bf9459a7caf3ba8b420ffdc45629731d8ce99eb2b8934918762a35eae6d26f0be3169db SHA512 459700ca251fceff5be81e2e6a9ccd24ab68612d0bbcabf9e033054adfaf99b6f24b80113067fe63e50c4c24752b1af44c3a2bcb2ca49c826431afc3bbda9b73
-EBUILD mkdocs-material-9.5.43.ebuild 1797 BLAKE2B fa861d360d346729982c800cdcc403f0b07d0d3c7efbb1045b4d9b7407f2c7cef8b8286852235ccbc94dab1232efdf4292afca6b49a4ae26dd59f61571b57272 SHA512 10ac8d052814441231b0ef46bdd65101f5260a7f1d5c341126f2226301facf4fc90936123b33bccbfde60042ff2a7f2e225fa44fd841782fea49d1f2fc8bc5db
-EBUILD mkdocs-material-9.5.44.ebuild 1797 BLAKE2B fa861d360d346729982c800cdcc403f0b07d0d3c7efbb1045b4d9b7407f2c7cef8b8286852235ccbc94dab1232efdf4292afca6b49a4ae26dd59f61571b57272 SHA512 10ac8d052814441231b0ef46bdd65101f5260a7f1d5c341126f2226301facf4fc90936123b33bccbfde60042ff2a7f2e225fa44fd841782fea49d1f2fc8bc5db
+EBUILD mkdocs-material-9.5.42.ebuild 1795 BLAKE2B d40d456ef9179a103d8cb796cff20423c5c8f17bd036e9d47fe8afbf54ae8b187c5da92b7d3cb58325bd713e0aa8588e815d34653d3fcd361f3b6bddd96c5a25 SHA512 33821bf437ceb16c01028223d98b111b02f1d128a52763b32f13c15cd5f2bdf2d976fa353b98233ef5bf40e2043e3b954be2f8eec46d98cfea39c550ab70b529
+EBUILD mkdocs-material-9.5.43.ebuild 1798 BLAKE2B 732691faf3be1adef90d241b9a1477e69a5b0331a53afa1b3b396ac93f573aa1d9f0790b1abeec3b4f8596ae1eebd07bef6590260823356f1150168fa7785394 SHA512 0648cd95360d3104f3211c358bc977446f25eeef327d104ecb40d2bbff3a35c1c718e65ed662a3933377b82eaea407d537f3ccab857d9d1cacc5911bedae915d
+EBUILD mkdocs-material-9.5.44.ebuild 1798 BLAKE2B 732691faf3be1adef90d241b9a1477e69a5b0331a53afa1b3b396ac93f573aa1d9f0790b1abeec3b4f8596ae1eebd07bef6590260823356f1150168fa7785394 SHA512 0648cd95360d3104f3211c358bc977446f25eeef327d104ecb40d2bbff3a35c1c718e65ed662a3933377b82eaea407d537f3ccab857d9d1cacc5911bedae915d
 MISC metadata.xml 1146 BLAKE2B c9eb031eb40f303fdcc39f891cdd2d4317075deb030d0f8374f874ecd63bf73960427eb3ee485b5b28515f58689b1e1bf977ee7b565bf8f9275b115853044f2c SHA512 01db399842cb09af4823278f84fcf8c51ed42609a2e61d8e64964e1759e14d22ed2f32ec0565f19184575089a218dad4939337798cd3a5b39f5be55f5f7edb69
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 d79902da91b8..654bfdf48051 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 0aabdac3ae43..8f658065d0a2 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 0aabdac3ae43..8f658065d0a2 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/Manifest b/dev-python/mkdocs/Manifest
index cf5b88b1e27c..7008c39bd40a 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,5 +1,5 @@
 DIST mkdocs-1.6.0.gh.tar.gz 4494411 BLAKE2B 2a0d55c54509827fcff39c04812be6cff6b1ccbf823cc05a48fa154745a49aed08d811147fc5f64db138ede952dc89241b156f8e0e01e42a468f73309eece0fb SHA512 330dfb7cd390b320ca9c2bfd2dc248d877b95713ec3c1d2c9d5b28be52a42276c58412bc77527a492e4b1b31608e3093dbad2a983bfe6396577ec7464e274609
 DIST mkdocs-1.6.1.gh.tar.gz 4495216 BLAKE2B f04b038482a4d1469dcff2db263135764d7c4d6e34e01675899fc0763da698027116ca738fc0d3ffbf71bbb7ba7a3d48dd41bdcb0d62a69546a30abccfcca490 SHA512 e37bcefc87fecba9329001a45f712c205b7a2fba8584a40fbe44409c06547602c104551481d42503358bbb22ba85d4371c0f1934d4d01fc9ff1ec2559222eac6
-EBUILD mkdocs-1.6.0.ebuild 2414 BLAKE2B 49ff9d0d6ddafb3382699d98a4501be2fab00fc999cc6f517db778c8f32260e3b0c3dda2a3ef81e1339d66e78140af1a9af2a23e3a6b58609668be83d5574704 SHA512 1f7ae5d92363783cecbbf42648122406b7a5fff628f2e9d6eb6392b558dd1f141554601e6c0aa5d26a0d3005359cc58ea1ab078684e1f73b498b52319a781e8a
-EBUILD mkdocs-1.6.1.ebuild 2414 BLAKE2B 49ff9d0d6ddafb3382699d98a4501be2fab00fc999cc6f517db778c8f32260e3b0c3dda2a3ef81e1339d66e78140af1a9af2a23e3a6b58609668be83d5574704 SHA512 1f7ae5d92363783cecbbf42648122406b7a5fff628f2e9d6eb6392b558dd1f141554601e6c0aa5d26a0d3005359cc58ea1ab078684e1f73b498b52319a781e8a
+EBUILD mkdocs-1.6.0.ebuild 2415 BLAKE2B 7ff0fe8ae70f86962250beeb25d43187d877feb8c2a9775827fa0c7b17cfd21182055a03adc3bd0e120f97c30d60ccfa6b99127bfbd313e884416601d3a2c33f SHA512 586b7db1ef55b59755d25b96abab37d3af6b1d04317e307278af995be47f2cff5217f44a4c990a1248947672a9fca00bb020f878450cc0f1e86a2e4b6ee2a5b7
+EBUILD mkdocs-1.6.1.ebuild 2415 BLAKE2B 7ff0fe8ae70f86962250beeb25d43187d877feb8c2a9775827fa0c7b17cfd21182055a03adc3bd0e120f97c30d60ccfa6b99127bfbd313e884416601d3a2c33f SHA512 586b7db1ef55b59755d25b96abab37d3af6b1d04317e307278af995be47f2cff5217f44a4c990a1248947672a9fca00bb020f878450cc0f1e86a2e4b6ee2a5b7
 MISC metadata.xml 405 BLAKE2B de9dd789fea13afc3622c6961674d046806db1025e9d0475c0ff8bfe1c6d91a741b6112ccaafb46cb19b9dac971c50095ac89b13353c7c0e1571961a19a90387 SHA512 7a19785dbacb67aa5679d6e7c9617b52b25f724430fa3471b645e31df04157efc4060dbd4fccbfc37b5709138164d8ec89c2e94cddfd727b3ee4c705ddd38dcf
diff --git a/dev-python/mkdocs/mkdocs-1.6.0.ebuild b/dev-python/mkdocs/mkdocs-1.6.0.ebuild
index 46c0d5058326..d89092d77623 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 46c0d5058326..d89092d77623 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/Manifest b/dev-python/mkdocstrings/Manifest
index db7a4f6d8497..a687bebb9bf6 100644
--- a/dev-python/mkdocstrings/Manifest
+++ b/dev-python/mkdocstrings/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocstrings-0.26.2.tar.gz 92512 BLAKE2B e2ca2ba4d5a8916cdb77efb0db6c0fdc5f8969b27f4b0b5b199873a62c85150b5a0dde45797b48d297e08f9e082c9c5329084feb15379ae0a16821ac11aa3fed SHA512 7ea34df4204ae82faa19ddaf81a073152c57d9ef7f55f8935c1eb1b244ebc6ed749d853c72fd28e69ee5e1aa12ae7a2e4b6fff4f9965856a837d15dd0e2cc11e
-EBUILD mkdocstrings-0.26.2.ebuild 1675 BLAKE2B 5262f3e60a31f89a0a6db319015057e97f217cea34b2dcc3370433309739291b41c3966c9d0163cbb4f37ede5f135511cbb7b42a8c23c43951325379f25493ae SHA512 e9c73d67494d8393e5662bfad6c4f23b212c986151a2e46b307dc1bd60bc4aa12314f1f1db818b037f06cb53ebac27be8dd377f52089260b6d5517f3162f1268
+EBUILD mkdocstrings-0.26.2.ebuild 1676 BLAKE2B dce05b83eafd22709969faeb32c5b37ea7a5839f74e4b1c9ec41f6f7f9074e32e92de52624e538ffa294cab0d5781ea6f26eb59261fb046c6fcd14ab65d405cd SHA512 19bcf4c1d99666640e30a993e17e0a253671e81272050827d2483c38599e2d21b5cd72d82ba03886c174c7c9294f33235c216fee7d0ad7c3eec78675e4433383
 MISC metadata.xml 405 BLAKE2B cd4fbf980873ef6e1ed8da7d608da6a97a9f46324521542a4d5943c4dd6e6d926ee7316cde0725c890fc7b4bbe3e6f1c694c00574cfcac94f6306c645fab1521 SHA512 37e403dff85ba044fd0a00e34c0d139f348933500466417577ff202a0ca425c9532df1fad8a15a97f524d720ae1297d653663b28f07fe7d01a39adc675ff9b8a
diff --git a/dev-python/mkdocstrings/mkdocstrings-0.26.2.ebuild b/dev-python/mkdocstrings/mkdocstrings-0.26.2.ebuild
index 0738246d3fd9..3ddb7f3d4a52 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/Manifest b/dev-python/moto/Manifest
index a50334dd4a06..29cf96baf6d9 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -2,8 +2,8 @@ DIST moto-4.2.14.tar.gz 4933741 BLAKE2B 4c50a808dc8f27cfbcd0ba234d268084ee9a32f3
 DIST moto-5.0.18.tar.gz 5509110 BLAKE2B 0e56aabc053184121608f08e9d0489fe20c51450d500cb35557d65222b60bb3b6e0aa5e3900a22fe8f6008c751524b1bd946e0994fcddf0e82c058ecf106e115 SHA512 805a100aaa0a1164fff3baf80baec868d12c7f94ec345640272ed284e2c982b6c0c092ffa5e0b28a26d547b9eb48485ed660e06170c1e26ec03590c35695e44f
 DIST moto-5.0.19.tar.gz 6203233 BLAKE2B 792d540a6ba44350e9fb4c85848e60daf704eb1a866e30e2cdd910dcf7bd7846f4da6c5b1a3e3b72663efb85574845508bc5eb3f70b0e948554ef19fe2970ebe SHA512 593965dcc821f0fdc8495e4ee72330ab1808e0bbbb491906eb204d2dc4b68af036b2065f5640c264c868207ceace967ca9d6efa741b3f9132427c0918aa2dcd7
 DIST moto-5.0.20.tar.gz 6203061 BLAKE2B 0e2126c72eb7a0afbe5ef29251527e7e4822d125e7e107217e6a702e2c51aa274f7181cdd6dd1b0c724315f89e58415e1e89fdb96db6777fac79a85bc0f53421 SHA512 d7a2c4311cc0518761226d200c8691fa70871b779f5f01cf573e0f92e4677a6f9ab5b77b2005b36346b199f3f0f2921df9879d13b1bed95c363537b01a9ef47e
-EBUILD moto-4.2.14.ebuild 6506 BLAKE2B dca88183bb8c0d935869b2293abf55c4c1687b79faa305fa971cffbd52e987cd0eee4ab92b837125625898b6c083a88a682cfe04a3438536268bac87ac659a0e SHA512 aa0e668f2566e657a19d22c4fff4ef213b47837ed9b2a833eb6594c5b6261230ee675151a0c6d4f8d13764b028c0f3f55094b30cc33f025df3bf8ecb1d719105
-EBUILD moto-5.0.18.ebuild 5194 BLAKE2B 91db54b8496768a00f9ea1d0d7343f45a1155a393c93e1b1b9b25fce9d93db593d626fe333bea9cf2f4d36f8d3b4ee2e68d2baf11174ca0feb39e61d475f8e6c SHA512 f1ab3b311bc8ce3fd4cfe9f4240da97d6f3e5ef2dd76df460b8c6070a391b8a72aa3aa1b0b58a7024880bc1099728fa4a8415944e2d2bb51e3fca53b2e8c3705
-EBUILD moto-5.0.19.ebuild 5316 BLAKE2B c00910e2779dd365a88779e099c5402910049754649c2b3f6aafe1d021378381ee75815a21ce3865d356d442ec150c3c6814220295242335fae9c5dac83cc6d7 SHA512 dec90a38c36154f2d75bdcdf96d9f6fb422e2ecfdb9e001741b7626cf7cb458811174a455d2ddf03766dcd063ea1804996d4c6579dddb8dd12c8cd01f182afaa
-EBUILD moto-5.0.20.ebuild 5285 BLAKE2B 8faa4fbf5335379a6aa73b7b8f4714e639a94d54c2881e79e9337eca7fc12d16b750cdad8695f24732ac5864968e2c86f29da1a0cf66e0b23a652d53f4085ad8 SHA512 7884c0f5e45f6ce8706631d9505feaa22ea7bc369f4e64a9b39bfbbc9d133d627f4e42befcb15b5450727d064916fa512d955860c902995f947de78fb7f33568
+EBUILD moto-4.2.14.ebuild 6507 BLAKE2B 4b1e22f10011ddf1b62996ad7d2efb5181843f958705ce1816f223bc3892f8515429f37c24403b03774c72f7d334a544e5688818e0e31f527b39c12979628ecc SHA512 ad9705a1f4c495c7fc9cec848d97a8f0f4d39d81848cb9c6d56788c083aabf120d4c89e8d59518fac93bcdee8561ce1fe8eff89eb277cb29921285899dd2ed97
+EBUILD moto-5.0.18.ebuild 5195 BLAKE2B 7710aebc97d52bf65cb5ec441d3bf8e8855d9eaa82b2b5006b177a4a9f743fdccd9ef20b1145cd8ad7d331e310ba384952183d56f024964cca30e3b06d9e2ed1 SHA512 774c3b11987b67b2bdf3184b87bb6df340aa62a107d01d7afb260deac7651b55d7acb2d82c80384cecc37b1724782080ea3537381a8f2549e4af6e486525af1f
+EBUILD moto-5.0.19.ebuild 5317 BLAKE2B 9d64fc94c393ffc44e857155d0ea3520d9281cb855bf15305e964fe75a3d24b6f35cbaba0b78171f28847476b194bb5cab9c889c21b2e51baa6995e824bd6151 SHA512 93643e001c6f8f65d426f9fc3e6ebdf92f8ebde1e813602a4a4e5abbcffb4ca51a7300436c8d07fcf0f894223d4332acd0dac24290ae1ba3ab9db57b365648d6
+EBUILD moto-5.0.20.ebuild 5286 BLAKE2B 061c43d93eef821e5d7942532a9032689f192396a6dd47c2a0b812f0573f2a92890f5b52a87441c066f6d16dbecdfcfc8b35e4d055a2f0d1630c2b44b64403fa SHA512 90e383a2c1fe195cd34fdf4821d69997d0c435fc7dc3d65dde018362d5e0ee0b133514046bc0037fca909762683783f20f807b80eed0b693c65837a33c71957a
 MISC metadata.xml 553 BLAKE2B 1669d17d3e655aa3fb41a489229a5fbfa6a9cfb23c667e98fbbef931992c7e9645581b9ea12011601093586cba491a5557d68e5256edb9f387c4db362346edf9 SHA512 48ae3bd9be8c3bfb68f7022d0e7bb422c2a06157967809be302067facf91db825023859d18ccea89109931538b0e93181d54a31fcc967628df61a9a3112edd3d
diff --git a/dev-python/moto/moto-4.2.14.ebuild b/dev-python/moto/moto-4.2.14.ebuild
index bba938f523cc..da16cf94b727 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 bb8d6ae62e6c..e3ae4f1dfdfc 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 04061b5e533e..a4e4412f8048 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 6dd5d5d03730..6b7e14c1d8c7 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/Manifest b/dev-python/mpmath/Manifest
index 700e3cbead98..66da1665e8dc 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,4 +1,4 @@
 AUX mpmath-1.4.0_alpha2-before-numpy-2.patch 917 BLAKE2B 82ca24da1dd51102192c71a1ac780619dab2e465c10bfb8cc316451449c834a1abf0a1ed5cf8c199da0c06e7c72527f722b736f44cc337a043be3c7942720b00 SHA512 ad6fe4a61896000801b8b03cbd01ce7dcae343297539cd8219f9a95dbfcff82b810b33d4ac6f3f80c55fb3f48ecb73d3453a92308d81b1d5626ae08d3e8db115
 DIST mpmath-1.4.0a2.tar.gz 2079112 BLAKE2B 9d2d99dddd4e800b3860f38ef1955b7d803c928d54a7e5d7b07386a127c5a6477818e3ac5c9f679f596c7a2c21bbf430f0bb2348c70ab77d6a888cfb19c6a218 SHA512 523775f3e7d96fd9e0d2c5e4caf855f62d0b683ac00df9dce4fd50d8764bfcf77282fdb34afb51bc53bb303178e7f0e8b6d72700e530d3ca11e3d365b09fc4de
-EBUILD mpmath-1.4.0_alpha2.ebuild 2006 BLAKE2B 37f76f6010e066ccb9ce25c5f84fe97c77908ec860d756f3c03686201775c1a1a78ec6314fee3073b4fdaa9217189abf17c03f2eb301d5c75ed34a1eb79d4f87 SHA512 cd6d9c8830a9b62fe99739275eb1f474e301b31dd8922234e10b84363bb34541cab353f2f63e6a24e32e89c7347dbc5a987f03790430721f870a8c984125d3f1
+EBUILD mpmath-1.4.0_alpha2.ebuild 2008 BLAKE2B 2ef42d92584f6ac46177ac4dbae0e31038227d51d07b38dabce8217b97dbb65565dbdd9c8062b622364f1c59ba118e13557de13ba0eb4914055e67dffbc9cd19 SHA512 6c386658eeb5e7489d2f49364fd1391f12a7df5df37988c39dbb9e2b06ca4f9bb25358ff6c4ff2e83ec3188e43da05ee33e62e6681190aa60e3f8e00b6945ca1
 MISC metadata.xml 645 BLAKE2B b56183cb416aee2fb297686aaceb2f90e3f6ec0f820200737b6866dfd725fb82f378b1163a377819396ba44c87c3f44b74cf18d086653ed0e08366f6c2aee3c0 SHA512 a8a75c7e0b0fedfc55daff459b745b1b25362fe6bd1439ea1bde60b06f6d689848d6bc2d5f0f57d691a4f41ad3ef0c5f96e12361ec6725abb887ac2373f67615
diff --git a/dev-python/mpmath/mpmath-1.4.0_alpha2.ebuild b/dev-python/mpmath/mpmath-1.4.0_alpha2.ebuild
index 520d08f83513..c31b4093a4cc 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/Manifest b/dev-python/myst-parser/Manifest
index 18afe4819909..573ce0b0e006 100644
--- a/dev-python/myst-parser/Manifest
+++ b/dev-python/myst-parser/Manifest
@@ -1,3 +1,3 @@
 DIST MyST-Parser-4.0.0.gh.tar.gz 825843 BLAKE2B 60361e72014fc4428e026f6b93f91878824a0cd46bbe128b04c0ab9e9578c252fea6ece23dfbee0b1652d5529e411669d7cdab3ffebe8128e791ebdd26b950cd SHA512 82a8c642d839133413577fd85b5668a6b4d3869f60b7c7c64f98ec6cf52f33b28abd33ee7ddbbf8e286a3f233a152878802e6a8091c88f63844ac774c88ebd62
-EBUILD myst-parser-4.0.0.ebuild 1599 BLAKE2B 6d223f870f25b7e088196ec40ea597253e76f9eeb5b0ded4798688b20dc62ed051250abe6783e74a64173712072a61074a636bc50e5a4501d3aa662934489bc2 SHA512 c7bec3b8e3a20729e045d5fd67e4783a63b8b5b3df9a1ac5efabf593cd37ab39b4257137436b6634245fb39726bf742d74097c56fedded411646cc36a8ffe876
+EBUILD myst-parser-4.0.0.ebuild 1600 BLAKE2B ec53d40a65a0868634fcbf222284b347898384f41feabc63a6f2722e977c3d7181bf489dd8a09b8206148eb30b186d5d89275aea0b605f07f272fe0b5b7a39a1 SHA512 4991497c6e779de02853f144a37b98ea221ef5e107d502be421262516f0f4cc374e622e94d0e81e2633c75aba7c976fff61c1ab83bf29b2b4d314486ff3beae6
 MISC metadata.xml 406 BLAKE2B d8a974be3dd4fef4800958dcb1eef3124dc8e3ec49e6678d0db7d6096ef290019aa025796c4f7c38bc11b750d1667ba97d4429b64e7271009da707cd945e113f SHA512 acdc27a39e068c487306002342b9c0c5910d61ed34a7b62878272054ea458d5aad46fe24095a52666ed77ffcb6e703687cc83de0c9e2cef395a1decf9003d918
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 bb311427b05d..531bc98c1d01 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/Manifest b/dev-python/nbconvert/Manifest
index 4098050ad38c..9a85358ddb29 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,3 +1,3 @@
 DIST nbconvert-7.16.4.tar.gz 854422 BLAKE2B f04a8fbffde70e08736d13a3db3278c9248f742b27688eb56760b9ff46c58aec63aa05a4cff256e5929009c3f76d760ce71209f3c49b40af374f06b073ddd661 SHA512 f9793ce89f18530492e1e9aeba3759ac6ae8aa8e0459be52928689a58b0d816128d275bdf9061ec9f33a047e0b6c8d4d83e5a81da556700e0add48374f15fcd8
-EBUILD nbconvert-7.16.4.ebuild 2129 BLAKE2B 62595f30e8ac1b2007d521243ce9159287566abd0385056b6e2733a191ba1c44de9a8ce48b1e8744d88adfae8c9d9b56fd4daf47c259c4e71d9a01c09ec2221c SHA512 79937a03f6c7b8cc3d40ff046756552624b7d84ed552fb49645606d978b4216d838ddb8f61361bfe4bb30167f4dbc70288769d06a84e6560f72be6665b73fbb6
+EBUILD nbconvert-7.16.4.ebuild 2130 BLAKE2B 716924ba76421a6441c001634605410515b18392b109042752bc81d583953a83d5599ec6bbc623a80b2c2e8d2f96a30ad469771bf2037d3691c00f2081499e43 SHA512 356ac88a9c743cbc5463e95b2514ded545aeea707229166945d9b36bb34a11a863f4533f0b8e2226cd80e98abe850651ff612723a8c179bb526ae88447e71d8d
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-7.16.4.ebuild b/dev-python/nbconvert/nbconvert-7.16.4.ebuild
index f77311345756..b5e899e39320 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/Manifest b/dev-python/nbdime/Manifest
index 8d403e580054..860f1e2398ef 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,3 +1,3 @@
 DIST nbdime-4.0.2.tar.gz 9452967 BLAKE2B c9c390f9165d0b8b3277c7bd93e5a90f4ac23cf0d084ed8ba166254bfbfe9cc0e9f0bc35c2a86b39d84167e78639cb2ed69f6cda5da02bb113f7323a86d745a6 SHA512 1e923b7f719d6a33f1dc06e06511a6d48bb8bfef7d8f7676da2520edd2914014eb88f70eaaeec27af6b03f1cefbd9a3e6854a7c0dec7f76f211d750b3fd90894
-EBUILD nbdime-4.0.2.ebuild 1539 BLAKE2B 139d9c28638cad3e3f69421c3fafd26bbf3657ddb987f324dc3685e689841099a4aef7ebdabe512c3fce8fb72e1459fcca55353216d7c443054d533f84040b5c SHA512 5444e973956d0018166ffb168029ab6aad499e551e5339eda3eecbd4f16aad96f3403618d018bbde1877026f678b9a62ba36ed38755f44506ecd7723606179c8
+EBUILD nbdime-4.0.2.ebuild 1540 BLAKE2B 71aee7139554faabfdc01c906c0d6f46c7113f993f2a6c8510cdfb2843c878a6095eba9a593b1ddf6d027761eeb241444726511251809cc3a4baece6d90fa056 SHA512 c733c4cb5af6e72d5981a0714fd6fe6bf4ae9d56859cdd056f2b11b2645295e6aec400ea4cb88a092608c114f201d632498b4a3619cbe40e20a3407989d8dd10
 MISC metadata.xml 414 BLAKE2B 9951da7227d2b6628d68aeef19d236a17e9011c62f6318ff274f7979b0db4e7e84be7dfcaecb32c82069a761a743efe6c8b27cfbac421274c39e417cdcaaebf7 SHA512 7fe4193e5844adc4d403c8673acf55bd9c7322c484374072239dbb266e0312bdd9e7b18e0f338e45e602003c89f1cbf50090ae9fca2e38833e17d41dfe4e131e
diff --git a/dev-python/nbdime/nbdime-4.0.2.ebuild b/dev-python/nbdime/nbdime-4.0.2.ebuild
index 1c23a9c53c73..5eb81a703f01 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/Manifest b/dev-python/nbsphinx/Manifest
index e995ef22e1a5..c99623a49022 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,3 +1,3 @@
 DIST nbsphinx-0.9.5.tar.gz 179599 BLAKE2B ca7ec2a4b9665fe189c5c8020c345abbf60cff72b7434365359bf6ae1f569570bfb0928072a6d01227f685cc837d9fc75b31b1a2361788c6fa45a075c9d1f23c SHA512 2b1a1575af9ad462888992f3bc6792c014536e7abba5c4b20a1e36da385eae87b23a79e74d9e02cb122dfccfb93e15a817b794565371b5d69d857ca19d163a9c
-EBUILD nbsphinx-0.9.5.ebuild 706 BLAKE2B e8d2634c3138ad6522125190325d991ecf9af3b6e723b3417a76c11e181319adada58951f9893ba60fd2dd9b3ef95a4487c7e143e254096950fc37ef2d041e74 SHA512 720bbe36c0a9978c9345d120246ab91d177db41e1363f4128652ce99e449f6a8cfb69425604494b9bed89eaaa2a310487aab6cea6f3b4212c8a3a2faa57324e8
+EBUILD nbsphinx-0.9.5.ebuild 707 BLAKE2B d7d2044fe83131f4a050c13f648f2ac4ac002d35055612fe07f87be2051a7e9dd73f93f918ca55aed6e51d1e68effada2f8cd2cafdfa40eb788b977973364f4d SHA512 6fc43377dfd6a62cd8e2ac28519d61476e718976a8165c92b88aff8e1102b790825258d56b3736989f83c65ef0d51ad849ced2617521f0cc1b319d963a7f77c8
 MISC metadata.xml 835 BLAKE2B a3a10c9fb26688d90ad6f4e2ddb8b174eae9fdc2637d4aabdb86f63093982c7c9a42c4eaa3b2adee6ddb12ba2d537aec79d324c0a3c7355424a4255cea90eda6 SHA512 9ac5cebe164b19f80e0eb07f7c4fb5cb2cf5251af1f81290931f8fd01223261cb6224500387c131c7bc8738d7bb07eb790fd9ea426a295d0688489510e58d55c
diff --git a/dev-python/nbsphinx/nbsphinx-0.9.5.ebuild b/dev-python/nbsphinx/nbsphinx-0.9.5.ebuild
index 31c5a6eb5d22..024bb2e92abc 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 cff69900bbac..4ea75959c833 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD pallets-sphinx-themes-2.1.3.ebuild 650 BLAKE2B a12e721bb8db13d154836a8f99c71cc8931d6f2245d62d4673a42ce63a3dc5d83076cce42cf3d20391634cd5326040a50e2f565e7163c1739569cbdfb32f9658 SHA512 1196d8921ae15df71a8cd784cd74cbd4a0c9d202ab2a127c84d7c24ba8e681262da7e174f70fb51aaf7a24149c12b1b0583ec3c54f7033c30ea770fe045b8d12
-EBUILD pallets-sphinx-themes-2.3.0.ebuild 694 BLAKE2B da9fca77848620ca9ffd3226f306b51b2ec307816f62f177230b74124449e3d2e59e931cff00c6308f25180d66526fa6e278c1efe6a3294934b23c43d1ae4dfe SHA512 b93f5b3fbb74e40f362c6c5c4791d5ec521cf5bba482ec4e3a330895745608c90274774c2ccba4d8c8ae4a7222e86833c078421d944d6fd75a1221a2a0d4b8e1
+EBUILD pallets-sphinx-themes-2.3.0.ebuild 702 BLAKE2B 12d7c6489572e043b80b1e3216efe988d0831d0b224b737a5237e59f1c5abeb1af7a076f0cd7f138cf6278e54e8314681392c254e93b845ac5d4ef9c92371082 SHA512 1745eec9c0a0f6b402548f0f7c210c27db22291d999e9efdaf431e3e99aace424c737b7c7e53de052d7a405a31010a1f38d70e39a1eafa893a74cfc7e417c3cf
 MISC metadata.xml 418 BLAKE2B dd644619949598d5675c600fbc5c740dc9882042bd04c8ead4b81de2ebc2f3a3e88d79d1e4cbd710b953cae7b116b1cb09012af913914db5a652a1ba2b5f4970 SHA512 537261ae9194a004752e90e3b4972763f9e22c27d18a7655f4ca4005d2999402b46ca7408d0811e44d3b0a12cb6cac506508c89ae5edd245f15bda13da91f216
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 c48537cdd9fd..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_{10..12} 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 cc42c2e879eb..71c66b03e103 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
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=flit
 PYPI_PN=Pallets-Sphinx-Themes
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
 
 inherit distutils-r1 pypi
 
@@ -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/Manifest b/dev-python/pandas/Manifest
index eb85191bfb49..b18d3243304f 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,7 +1,7 @@
 AUX pandas-2.2.2-py313.patch 4927 BLAKE2B f6704f593f87e3095ff2c70b28a1142d62b4e78b51c3e259803184cb51a7dd900bf975d46613e9c844ce114203871471ef032c28011038641abdd08d5dcc8f21 SHA512 3765a7e00926f7cbf53d66c8e501d3bc30e9bf4f7459aa7d8153d58d66a75cf430854259eb2e81377e21ef4187a459964b87e91e1626754fcdafc53bbb86370d
 DIST pandas-2.2.2.tar.gz 4398391 BLAKE2B 6b723d85c500abaca4d833e4fb329d9a495e3e8ae51c74632111b139ed38ca9e26087ba43ecc40d68f66613352dc140bb2f1b0cbb92915bb027548886072fc79 SHA512 85b006f96bd6400aeea2ec29df3557ea6c4bfee0a7aebb172547a43171dc0e7682d15f798081846a4f464559ab83f579cfe06d66d4b5c0cb0fb2975c2ef98f9c
 DIST pandas-2.2.3.tar.gz 4399213 BLAKE2B eca6d31b21f6385c606b3c6f8f4eedc5871719ad5e039e99c01cc16e335a493c2159d208c2d88b573b661adbeaf1172ea1296d13d51b60602966cbc344dc367b SHA512 9bbff5cf51d7fe5e53b207b3593ba92560dabb15294d6509c5be55e0c2a737fad156ca46e56a7e0bfba7d791edfbcbdf885d6f82e2e1a48b2d5e0fc0ef5e56f5
-EBUILD pandas-2.2.2-r1.ebuild 10131 BLAKE2B 88d22b9ed5b67cfc7c1d993229df5a70ae22cc8f73da1235b3c68208f71d22c90d2386e6f00825c03e651547b70c8c41ae8af20e6d4da9b125c856ef0f804a6e SHA512 63d726321ffe24298f277595e9ec7b3fa333a60ba214e6accf47d93360f1cba15f1211730e09c19c206ee1a896bbb7b1b251b56a06f863f9f5851ba658891eeb
-EBUILD pandas-2.2.2.ebuild 9236 BLAKE2B f85c90f215e84d87b4bc5c42b8593645900acea5dc2f717ae24aa0d2e6f8251cf04893069ad5174afa472c477b709c6db61f82bdae7cb4c0060227a3b314e544 SHA512 ca0d35c759c86cbf6856ee3cb95167d3fee4dce79f3b83f675a28a049b4705bd8aa5de29e2c4bbc9c07036d2b546107f542e645383c73ed0e6018cb804cf2b27
-EBUILD pandas-2.2.3.ebuild 10035 BLAKE2B 1950aca9942353e451b11d021936f18ec199d0e9c5e85a1d67f24e3b2eeb93f9c2d3173724a1aba8e1a78df00568de3e998f96c89057724558a27da915bce070 SHA512 59fc752204d57d8a4878b20a8e7ee4ef2370c8b1719770d262ba81fe179a862f8e13dde77d08386def764750995dfc88cdf91e9a779da17f7c45930b8f1ac897
+EBUILD pandas-2.2.2-r1.ebuild 10133 BLAKE2B eaea08d8948b01c8ae9e855e7812b955592c564dd12b110f98103a374aeb390718fc8b3c771db9890e6e3284257a6fc229d081c0db8b7788b26cae0b69ccff84 SHA512 90e585de69022387a8b749903301c56dd88504842a661b751fa5b6c30c6c2db062e2ba26b34312c17e4c9abfbb6080b6ffde2cdea9bba6bf285afc735aa78376
+EBUILD pandas-2.2.2.ebuild 9238 BLAKE2B ca60f8477c9fb14b448d4dd96c02f1e839e01dda4c700d3213eb0c13f0d67ec0afe670333757ff38429f514be9960de81cad01659f6d7aeae2b056aba2728e3a SHA512 d4318603e7059b14b686790d6da88cd2e8a501dab4e4319bcbb3a39c36a633e87f91bc69a98eefc1907f81f269d7b0f0aaba71d8da534f59e4e8575b8cd11906
+EBUILD pandas-2.2.3.ebuild 10037 BLAKE2B 1960bc928f6e1ea459a40f38779e0ea13f4b628d3b42d513e92f81b53c0a95834b6f4b3f19f6efb6b48a0c7fe835b1210e669f43cfb4d5c626d7dbb75bac053a SHA512 f657df081533b5320b264cb5298bf90c4190c68f665c12857c2765a4c393425e148e054388e5066a4656fd1cee89a79630bc336aa86441320c901342e9803635
 MISC metadata.xml 920 BLAKE2B d6bd854acdd851d578038657d91adaedf4f220dbdc5905ebba5e35e74437c6d5bc2384061f7796a6f359aa128c526485635debfd0e1a9646d09daed740167c87 SHA512 dcd949e89cae9df918acb3cf8be5ad8c396ee5e646d2179aa2b646fafa15ffc11e9ccf853df8d7fdcc787f88ce7063639d8d87715aaba943774edc8ad98b540a
diff --git a/dev-python/pandas/pandas-2.2.2-r1.ebuild b/dev-python/pandas/pandas-2.2.2-r1.ebuild
index 1bad7a54d7a1..7dcc2aa767aa 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 c24498c084d4..f63a26eb7ea7 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 db1b1d4fe679..7fce5aab107a 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/Manifest b/dev-python/pplpy/Manifest
index 517f119b40a2..8d1a30823498 100644
--- a/dev-python/pplpy/Manifest
+++ b/dev-python/pplpy/Manifest
@@ -1,3 +1,3 @@
 DIST pplpy-0.8.10.tar.gz 64203 BLAKE2B b0735722a051ef33b7415528147a84a163ac49bf5d07e2f6599a7bbf004140abf5e6a09b7f0555ac57b55614a1c059bba20cc7ac7fe47a83f429e33d7f0dd1bc SHA512 982d36291cd0108786e47cb1ff73127ba2b2a619edc697e28360a87ace743e7fc6dd04e32aab38d41724d455de4861065f9ac3d409fd2f68114b07f4d1328c23
-EBUILD pplpy-0.8.10.ebuild 995 BLAKE2B f259941567ec23778a6c6f420f0e501ac0c8f179db067cd87ec453467d82ae4a2aadc563b8d1994cf49df3a57b5617bfdbead8cea449db011146e59e0a8e41c3 SHA512 402c2035ae07ec09849921fcc5b9d7535e4716edbd1d8fd4db7798f9627af643528171fefd37cf852970fd01c2f1c5b107830c23b227b54295abd86afec97081
+EBUILD pplpy-0.8.10.ebuild 996 BLAKE2B 37b07e2300d2b2b5b4b1a40377ccc94f260602878157ec68d9cab8023f3af8589b70e4c036bd96ac80e92858693cb5b60b6fdbcdd02a5003bc3f177921513953 SHA512 66cd7cb384016f5415d35ceec487ee7b36abe1085353fe51530333a118a55883795aa37ccc1e8b06635860a3856aa4542afeae7139b4ca45c45a2b7717764ff0
 MISC metadata.xml 759 BLAKE2B 0c4fcc6e475fae1a8565c392dd82261d796b96aad68d614790e07271057b46eec4b4f89fe3be2185bc9793e828568a85df488ce568daf84555638e0516898086 SHA512 773f95dbb5635a1ffcbff57d00e6af93e173945738e67deb79bb4c628abde3793488b889bb96e9a74832d0b8c42e7274edb479c64e726ddde10ef5297be979a7
diff --git a/dev-python/pplpy/pplpy-0.8.10.ebuild b/dev-python/pplpy/pplpy-0.8.10.ebuild
index 4cadab58c1f5..132a03801a98 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/Manifest b/dev-python/protobuf-python/Manifest
index 072e870480eb..6f8e5d61a3ed 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -16,5 +16,5 @@ EBUILD protobuf-python-4.23.3.ebuild 1673 BLAKE2B cec3e11a0f348852ec2fbaa3929736
 EBUILD protobuf-python-4.25.4.ebuild 808 BLAKE2B bcb6657f5ab95426831a18e022a1697c6d7f29f1464dd75f6d43fe2942769a16cabacf0a91f3eab7c0e155e192e546a966e2f9ed2fef43f9d5c777ab3abe2725 SHA512 a638b900c2477cd085b95c62420a5755f6c467c5d9b6840acf53611a183840cebe31b6e723f7f3be1b98c1ea59356683185d94e6064e2a00eb0ca66eacc8c43e
 EBUILD protobuf-python-5.27.2.ebuild 803 BLAKE2B 980880710a5e8b2a42e2d6fe09ff2d502bde7a5a1e960ae93109b2d24c73b5dc0b6398dec291460c37f608f288266b47742721e117b9938cfca514a1ac9fc461 SHA512 ef2b68f4a52b3db77807768b2d0ef017a39d4330fcf4ca9fcea42d39fd4eee49a074762dd9b15cf074f9b8f84c88c633748357aef48fff6b55712c07fe9b5b5f
 EBUILD protobuf-python-5.27.4.ebuild 803 BLAKE2B 980880710a5e8b2a42e2d6fe09ff2d502bde7a5a1e960ae93109b2d24c73b5dc0b6398dec291460c37f608f288266b47742721e117b9938cfca514a1ac9fc461 SHA512 ef2b68f4a52b3db77807768b2d0ef017a39d4330fcf4ca9fcea42d39fd4eee49a074762dd9b15cf074f9b8f84c88c633748357aef48fff6b55712c07fe9b5b5f
-EBUILD protobuf-python-5.28.0.ebuild 804 BLAKE2B 13be2c6863c6fbbb41c69044382820958cfa3592f7b9d6da5f72dea40941f9f2de6702656b9bcbd7f0651e3188e9cdf3d5a0c7531be09849502c4fb8225e2aa9 SHA512 9ba3247716e745077f2bd5ee16edb8064b2761f87d8893ba81d2cf4e4ffb291391a25ce7f022e8852471b7c74a2ccb39efe3c405f016676dbd7fcac0905aa846
+EBUILD protobuf-python-5.28.0.ebuild 803 BLAKE2B 980880710a5e8b2a42e2d6fe09ff2d502bde7a5a1e960ae93109b2d24c73b5dc0b6398dec291460c37f608f288266b47742721e117b9938cfca514a1ac9fc461 SHA512 ef2b68f4a52b3db77807768b2d0ef017a39d4330fcf4ca9fcea42d39fd4eee49a074762dd9b15cf074f9b8f84c88c633748357aef48fff6b55712c07fe9b5b5f
 MISC metadata.xml 379 BLAKE2B 633742f2c32c646e3c7f065d269b5d17fc99b3adcae725493ca612cd9ce6bda0f2521274619c3433f68227428aad897e783ac4b91dbd983216c0355619015197 SHA512 7d3a14e66af994e2fae5509b7d84012b0004d124021f3eae1a1c112ad0e2a83f622de9d2c7a614f19bac8a15ba889fe1b4136c93c57b9dd910511587d3d09af9
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 94b062ab0e6d..aadd835eb2b9 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/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index ba5d0cfa7b54..ab0caf5a2492 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -120,5 +120,5 @@ DIST zerovec-derive-0.10.3.crate 19438 BLAKE2B 9f7df8a4e4a0b62ab25aed967b26509db
 EBUILD pydantic-core-2.23.4-r1.ebuild 3490 BLAKE2B 96ba2a7936efbbfe0657376db51e9cc58d722bcac72f8b858dbf84bdcee7b5dfc3bc14641a570ac243213ef38c07b68055986c0796e03702eee75329c9628cbc SHA512 2e8b491fef446bf256a909a09409a581b65745e38633bff28083532d250d86f0e2ee7e4a45774d35063be53dcf5319fa5bf7b9819930af88008c3dff87926d3b
 EBUILD pydantic-core-2.25.0-r1.ebuild 3497 BLAKE2B 47db3e78dee14aabbedf71f94e6ad759e6de19cc7fe58dc511aaa3405172260950aa703af90a434fd04dcd1510cce1fb2ad99e848b5078b1db91d31506f904fb SHA512 413cfb011f4871b9c8a24270eddf4aed1bc9278f3c717b5147ff5f1bdeb03b10527b1a152408dfafaa95638f6fecd00355b3a846a1e34873e1b2d94855fd8264
 EBUILD pydantic-core-2.25.1-r1.ebuild 3497 BLAKE2B 1d42ce3578677de1169b8b97aa995fb2de13025cba576143520a2a0c3c38c3a62ae94df654989c44cf0f6284e33c1e282a0e8acdc78dbec73dcc1d124c6c844c SHA512 34c505723d971d0081cda398d731befcbbe025dc705302b470a9d5f0327e1f50b5f885244f38212b76b316a3cab43b5740e0d94ea1deec5e9b7e8261730c0e8a
-EBUILD pydantic-core-2.26.0-r1.ebuild 3675 BLAKE2B c3c84c21a9e9a22e8cfb1e1d153e04596ebc2de7302297dddf5c3b5b34e55a20edb88b92238ca13a8da4f238c98442b68a1465330d2a3e441fc9b962b14c625c SHA512 1cb691344d286d71a53c7f98cc6dca8cf70b384decdb3390238c7670e840301b0c5eb45a156a19807400efe076f7dd28c00b615b89ce084589d0304e82f4db0a
+EBUILD pydantic-core-2.26.0-r1.ebuild 3491 BLAKE2B 467518dc7d970105a78959db3dd66c73847e41a2280f867ea9b78d5a14da7834edbd39f8d9b43f00fff91516106afaf580b2740c08f79d02b8d3682f1934270f SHA512 0cb4ed3d1b00edc3a88a3f63656b305f3afb045513cd213eb2d5e058d11232becaf9bbb52ad7ec8de563780f13e015b13e8bf1cefa6abde5eba09db2b6109830
 MISC metadata.xml 379 BLAKE2B ac0fa1abd0aac6436f234dfbfdb1517cdef2f7636c019a16257619d1a1a95a31b67061daa6606b47b68332d03bd213fa9bf67017b0e4af9733a26ab4828cf206 SHA512 7e3b5785628be025efc5360924e31a5a5becab941c9db255357b966dd5d3aca733e96485e92e78533bcde95379c59c36a601d4b407550c5ff1c649f09c3a21a6
diff --git a/dev-python/pydantic-core/pydantic-core-2.26.0-r1.ebuild b/dev-python/pydantic-core/pydantic-core-2.26.0-r1.ebuild
index 35a5f2977d0d..d1e5a61830d3 100644
--- a/dev-python/pydantic-core/pydantic-core-2.26.0-r1.ebuild
+++ b/dev-python/pydantic-core/pydantic-core-2.26.0-r1.ebuild
@@ -133,9 +133,7 @@ BDEPEND="
 	test? (
 		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/inline-snapshot-0.13.3[${PYTHON_USEDEP}]
-		' 'python*')
+		>=dev-python/inline-snapshot-0.13.3[${PYTHON_USEDEP}]
 		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
 		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
@@ -161,12 +159,6 @@ python_test() {
 		tests/serializers/test_functions.py::test_recursive_call
 	)
 
-	if ! has_version "dev-python/inline-snapshot[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/validators/test_allow_partial.py
-		)
-	fi
-
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	rm -rf pydantic_core || die
 	# tests link to libpython, so they fail to link on pypy3
diff --git a/dev-python/pypugjs/Manifest b/dev-python/pypugjs/Manifest
index 77456aa2c07d..b01ac6ff6200 100644
--- a/dev-python/pypugjs/Manifest
+++ b/dev-python/pypugjs/Manifest
@@ -1,3 +1,3 @@
 DIST pypugjs-5.11.0.gh.tar.gz 57259 BLAKE2B 666b37a68f9faa7131424aba895fd6ffd893a92b1d565f343c25cc126bf37f2b1794eb0c32c3475533ade810b2d9d09a4299ec8bac5da63b1303d60900226507 SHA512 208946c6709398b21ab5728f290b814330db647200c1f649bceb6b5596c5bac710dedeed4dad56330b4c97236b6793251575fb2638b7bf63bf32239114758033
-EBUILD pypugjs-5.11.0.ebuild 1337 BLAKE2B bfa602b54e1a8587f8510b088bb935bd78e8b1cc1d3e8263ac6fc5de96eaefda5f73a669e6c178ad76eb874c0cff4edeaa4b94079681cabe1d750ddca4c26742 SHA512 cd4369c85207dd185a4b4081e0a2d972da1f8c3a1a0a7df24f20f06491f409860cfec940616b3322f8acf1dadcd9703592f60868b5188ca7af9a798c4365eaff
+EBUILD pypugjs-5.11.0.ebuild 1339 BLAKE2B dee5cb2595279ad8dbb2bb34303688429c0a97aab2cdc29034eeaecadc001723dffa304318ea4aa705889623f85eec445bb54d828f5286b5845af14f5f146de9 SHA512 b0f45708b7da36e5b4f70cf83cadd7079989f141b6202cfef977dfdf9319df47d9be2cd1e20da1a35d83b98f4d587b1538405087e472d718d261cc41ed7035d0
 MISC metadata.xml 750 BLAKE2B 235bda5af5c2da77dd882e0b785384e4921d04a851d337af69a3392669616436187f7729f6fdb1ff7b61278e48787583d5f23e354cc79dd5dec734b4d88b035c SHA512 54eba3b0cc1f45b09c253370d95ae9e096ecd881c8c3407e2286e09911fe8588708a282e4f03e996aeaf51e15ec5162f303b3b9c70cbf1e49d132f8196ede643
diff --git a/dev-python/pypugjs/pypugjs-5.11.0.ebuild b/dev-python/pypugjs/pypugjs-5.11.0.ebuild
index 58f9328c3f27..8361aac39da6 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/Manifest b/dev-python/pysmi/Manifest
index 76a443f846a4..7f6946f9802e 100644
--- a/dev-python/pysmi/Manifest
+++ b/dev-python/pysmi/Manifest
@@ -3,8 +3,8 @@ DIST pysmi-1.5.0.tar.gz 124064 BLAKE2B 763501b0fd575e356944372f0f173857d8a982a1c
 DIST pysmi-1.5.6.tar.gz 123690 BLAKE2B bd5ca7b8bb5e9eaa3e16f59e4c32eed3cc80a0d17e7834fd0512271ea1b24dfc473d3b63943c4e621d6ba4e469eb5005fe1855387bed831e314e1e349a655d84 SHA512 86522b72726cd6f279a8259ed1037f23b2c03b302c0981e6a89f5a7e93b602a65b2bc8e3a264dea738f10710280a618b93f24563c89e66a30cc0661a90e79549
 DIST pysmi-1.5.7.tar.gz 128727 BLAKE2B b53e5c3992bafe66052550b92a2e835773c1f6549135466ab541d1cbc04b96fdbe240276561f41d88651f7f3debedd3505166129efcbe230c28bb98e79ae95be SHA512 80eab0c3c685da1ab46a8a7945ad7e31df0b2d7b089bb00e0df5445b4df9ab6ba3d244c69878a5e078cfb9f660307c0261e73c09b7e0e1b1acec157cafa6eaf6
 DIST pysmi-1.5.9.tar.gz 131529 BLAKE2B d3ef2a848815b1d33f9f545a002c2e7a04ddf97979974c53dad4e6b7372369820c011a3996592ed3ad8625b306cc35bafb5fb9230d6155a64ecc53803e5db973 SHA512 3f580b96d677acd5ca5b107186269ee0ef6673326746cc3f09d8fb5fe549fa1456783f33c5213c288c783190220ae30ef2cfb71e9947804abbee38d5792bfa09
-EBUILD pysmi-1.5.0.ebuild 970 BLAKE2B 5959f351947871cf379564dc91b8b19611ec63f866160248714958b1ee0c3e0c49ba3f038de5b76e54bc9395edffc257dfe0a06f646991f99a1cb807d21732c2 SHA512 836cb0e629d5faf63102e6d63ef416d86c35cb5f48ff92b43ac58401219d04470920b3e0371210cca6194a3669acd3b49ee8befea938b61d6cafa43866ac081c
-EBUILD pysmi-1.5.6.ebuild 933 BLAKE2B 4dc31a73eadc00f69139b47c1301329b97b33c89d710decea5c9588712345c2bc61d210257a3984a2ae4b89421c3027ed0f30ba0fa6ce7a9e565d14df740c55f SHA512 f888489bb47bfbbc5220a1d354b710350c2dc637657b62c47085e52647b7f93f9b0f2e40d2ab2aedc06f44d7205349cdfc3c52cd7ac75cc1d4f3bff90f95e4ca
-EBUILD pysmi-1.5.7.ebuild 933 BLAKE2B 4dc31a73eadc00f69139b47c1301329b97b33c89d710decea5c9588712345c2bc61d210257a3984a2ae4b89421c3027ed0f30ba0fa6ce7a9e565d14df740c55f SHA512 f888489bb47bfbbc5220a1d354b710350c2dc637657b62c47085e52647b7f93f9b0f2e40d2ab2aedc06f44d7205349cdfc3c52cd7ac75cc1d4f3bff90f95e4ca
-EBUILD pysmi-1.5.9.ebuild 934 BLAKE2B f53bc57e5501b855dfeec99b6ab95c8d80fc520d82d2021e9501920c200fdc84806035fbb87721a5f0b1633f2660d6857b9752da0c059ff98d90828f15dd5497 SHA512 bfad63552ff0c28d28a424a836124215660543ef4116feb381b68b9dae144a0c9be5147e82a7b33d7bd3705517d39320c84f854eeac61b9a642ebc2c51a9822a
+EBUILD pysmi-1.5.0.ebuild 971 BLAKE2B 294a3028a2125a8a9f5817e9e22cfaf35436327ffb84f03f3cc31f56b009800c9f5cba75f3461b82f1de8de5010e2f38d24b1d3e91b26c112050407f84092fa9 SHA512 9384d42a13fc693a917e069a4cd3c83f05b3fcd028c178217846fe6579a32a173e1e8958e0db9fd92b48e99930cb7fd11c62be637cfed2b08dfc4ddacba53c69
+EBUILD pysmi-1.5.6.ebuild 934 BLAKE2B d496649b1b7ba66facb791b1f381c3b1c738b5160b2eece79efa005ab0264a9ce6d4ad01fdeaf80a02d38427c2e1486ececaf849ddcf86bd9b5c9e379815e2ee SHA512 5a231c3b9f28a7695625ad22cf8d415799886e50e9207ab56fdd944be0e557ee18a3067bfc0a456387f3ef739fa5da30f4b05d8c5e349d7587cfa7e08569f8a9
+EBUILD pysmi-1.5.7.ebuild 934 BLAKE2B d496649b1b7ba66facb791b1f381c3b1c738b5160b2eece79efa005ab0264a9ce6d4ad01fdeaf80a02d38427c2e1486ececaf849ddcf86bd9b5c9e379815e2ee SHA512 5a231c3b9f28a7695625ad22cf8d415799886e50e9207ab56fdd944be0e557ee18a3067bfc0a456387f3ef739fa5da30f4b05d8c5e349d7587cfa7e08569f8a9
+EBUILD pysmi-1.5.9.ebuild 935 BLAKE2B 23d9fd984e8da2c5a76ff54e97ff6972ff4fdf5b61ce5fbe5c5406215bf937837ed879fff36ebbae5a65d8dd20da1754eda3d87d7fa79c62fecb303874ba400e SHA512 e2da250e82ac59a892c10d657a8c42900da56e687d080a213f0d97adb8476ccdbf4fa8f1845d855d479f78d9d54353a2dee5c86fcc4a6d531ce157658b6086f9
 MISC metadata.xml 387 BLAKE2B 3435c6cc7ebd04242a6529a751eeacc132dbdf473c3b5f68558e97457376e81175f51e3bee10b315b4bbf4c5ac0ddc31ed16ee6a7e8ef92ac1f5b51ce70c11b0 SHA512 15561667591496522b4662368bc9db35327bd7483e3d7411fb4d227129b02f67e042299af44203baea4a1bbd4ba3fe6c74aabb4a598a748788f2077a51571f14
diff --git a/dev-python/pysmi/pysmi-1.5.0.ebuild b/dev-python/pysmi/pysmi-1.5.0.ebuild
index db4d3d89768a..5bb3da00f263 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 8dc08d8ad203..a81946c4bdf1 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 8dc08d8ad203..a81946c4bdf1 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 72d69ec64ebd..3ccc6c84a329 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/Manifest b/dev-python/pytest-mpl/Manifest
index 7f3b5ce6c5d9..68778647dbdf 100644
--- a/dev-python/pytest-mpl/Manifest
+++ b/dev-python/pytest-mpl/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-mpl-0.16.1.tar.gz 663585 BLAKE2B aad171260a10417aab15e7e55115c2fe02aa33dcf8336634281e1a1dad4d1c5ff08293fd9a67be025ec6cbb18c42bc9eb7ccb86275c0fcc7f4bf33a035fc0927 SHA512 64c1689f1698f9223082bc5c6817a1d4f9b413cb193894c23b1e0302254a6358cb3e354ac92ec47677acf460a41d05b2b527c834fd0fbbde04c070b0af8f46e1
 DIST pytest-mpl-0.17.0.tar.gz 885613 BLAKE2B d1a6d4551052eeeb7ecbf9722c782796aa74215a3241d1c037fca98972777dd35d7616ec8ef2bd4f00b6428f5dea516243244b61f56ec38d72a4805a75c91a50 SHA512 968397b1d75482729ad73f4844970c3c335c009e689f4163bd5a028c84627455a7d20563e62c6940b27c62229e5744496bec36c2440d402c0aee0a7853550f9b
-EBUILD pytest-mpl-0.16.1.ebuild 798 BLAKE2B 5ec6c49d7e8beab008bf083e44145bf24562b8c4cd97afa097ebbd0209623ad4e2155976854baadea6927dc214da86b5a4ee277ce4f6ed2cf4af1761bb5af036 SHA512 da140b6eca2f8f5658ddb06752e6b99025d8acb3300d46b9a5f3048a5fbf7c4f9382701516699a2a356a4a7b1c35f63dd7b4f26abe08cdc51c93df974122a21a
-EBUILD pytest-mpl-0.17.0.ebuild 970 BLAKE2B 96b753ad8ccf30023db407907db37c78d04b0761bd0689d355ed8fa5ead0059a13839dda348420654c63b394241217ec9db68b4e71e205b64d273cf745f20603 SHA512 a4706765e881a8918c50d5c1d2610c5dfcebbb05e8bd4fc7ce8d9c6ea7b9bf6f3c2eb324320c6d26c67d745948748597e575f102bb22e0b22c35ee0f19468e4e
+EBUILD pytest-mpl-0.16.1.ebuild 799 BLAKE2B 0ab2f74467b1c5f73a210908243a91f4c6b9e1ecc988e7e44657f48e087755a9f0bbfed997c18b41dcc9a2c47d94806ed71d2184eb0bdec63eef49aa389a1119 SHA512 961f8e87d1faa58ed70e7af405e607a632b85e38930563789bddad8b6848dfb769af9ac9f91b172ec1629672b51dc5154dcaa62d56883f2bcb18b57cbe3c58a9
+EBUILD pytest-mpl-0.17.0.ebuild 971 BLAKE2B d2f28418b27260512e38b8ffe8429b23567bb4a92631fbb37d3981f39b162a4ddeb4d7af079a9d2ad4379cfe9259edd817999be53196b0288476cb522667da0a SHA512 7b5ae7b9028e19baee752ed1fb4cebe98cc87e84c1ebaef95966f61a0e2b4deeb82e320f35a825a0df7b256f5e2d3bca2c3ee485c360564e3c024cdc5ae1447e
 MISC metadata.xml 399 BLAKE2B b2dd8993ce1e55737997ac3e6c0d26edecad7721c319073b8bc12117b1387dd3b6a1049837b5f97d97f5539d1253bf888f00caca6f0bbb46a73292ee6bd08f0f SHA512 5e3c8b4c47771acf6fe345f3e1d1ae59e66a2bd028ff57969cd3a93aef971b7103a7b0d847f1e53af54075603f9868d5c09895f4ea3a1d93009b07449496d317
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 aad7b6b35f10..b5cf7dfe71a3 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 f2e06c02aa48..7e134c37c359 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/Manifest b/dev-python/python-multipart/Manifest
index 379e2dda0bec..1ad04037118f 100644
--- a/dev-python/python-multipart/Manifest
+++ b/dev-python/python-multipart/Manifest
@@ -1,5 +1,5 @@
 DIST python-multipart-0.0.12.gh.tar.gz 92904 BLAKE2B 25076627fdcb3a4bfc9eda74218f9d6d30ea18517da00c312f50c9d3ae156894b29e83bd38d4e11d7d06732999ae9640243e660d2a037253b9f511772a6c737b SHA512 271ed29f3025be5c058a56ec56ce373348dc27b4c8130c17609bd48d73fc975b2ac8387d4989be578e1be01a618aad87c1d3ec3a37dbe73dc45813ec961842d0
 DIST python-multipart-0.0.17.gh.tar.gz 94416 BLAKE2B daf9f5e2a94d804216fbf18778295cec3270139d5912ace80ab84d57d32115d7a53563d429f81fd2f0f55b9fe30b58f62ef1d095414f7bfe6bd3951dbb9d9e89 SHA512 52b5d5b154a18a2ae34ce7931076278b5a5edb2cbca5350c6898fd675fb57755cefc97642b2edae7e7d9903d877430da85f73347b9fcaaf1c20fa09dc12799fd
 EBUILD python-multipart-0.0.12.ebuild 658 BLAKE2B 4aab8ec01549b29855d383a393bf52c7dabd0b8ad9e291f1c89832653aa42b6d3abef5a6578f32c71d5aeca0b0f2ecfcd8da96749c1f7e413e6b95a8e6ef6f83 SHA512 68d1364a63b5a674d71d9142b712375f64cbbe84710c0495b5166966b9d43201b537b8a5ea0ce7b51c7320d55e26f5f35e4e74544120aeb77c4ffa8d61ba70c6
-EBUILD python-multipart-0.0.17.ebuild 901 BLAKE2B bdc3db056434c4a994b01c9042f3c2f533c5bb7945e5096673186ad3dfeeb705ecc5cf7b9e6175f6a7c241334cf9dc20d0d713e14507363d215674018d73aa49 SHA512 e6fc8e0833532531920e4c0721a078573177ffc506ce01d6e49f42cfa3adff0a1f5bffd4c1335ef9783426ca573a8d6615893b1d41b05c91f2c932fc21f7a1ff
+EBUILD python-multipart-0.0.17.ebuild 908 BLAKE2B eb50291f00f8a6e2cc56dccba99cb41e329e7e66a85c970ce2a6822209a9a23e0cd458c203b4b0a26ecb4f2e2bc6042d97ba927df627d9a7bca41e813799d220 SHA512 ce3ccb1f4e8aae96bb571e9c27168c15a7f07a18473e102b81b968b7841dbce3ba483de4f28046c36c49783089ad83f1fb6987e523496cd55a30204053f8a76e
 MISC metadata.xml 407 BLAKE2B 506414856dda2ccb7c2da00c350f73dcff5a3d9ea5897b96a7acf8973462c564b217c42cb922587378ca8c0e78f8a5a6a5aabb12bd93ca202bb29e377a6ad143 SHA512 4b61836d4f1834b8abe4c5a0e1620cefbee79665ffbd14326dc9b9b43252b519e2d3cd392c40b7356f3be705e3a38da565416e7294d02fb1817cda0e8b72a115
diff --git a/dev-python/python-multipart/python-multipart-0.0.17.ebuild b/dev-python/python-multipart/python-multipart-0.0.17.ebuild
index 200957eb33c4..5f4588cbad96 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/Manifest b/dev-python/quart/Manifest
index 34603f63a961..c3263e267c92 100644
--- a/dev-python/quart/Manifest
+++ b/dev-python/quart/Manifest
@@ -1,3 +1,3 @@
 DIST quart-0.19.8.gh.tar.gz 747979 BLAKE2B 434c5493f01a1ea0cdd223145f52327229af0fd4ddf5739628847c4f78f1b8d76dcb827370446a50227b1afa96d829a47304efed3d017b405632c15c01034292 SHA512 658384387f064f3d0d9af3f79588ab88d28ed7a0922417cf809d2c0ce2e5d4de3c11649368ed57ba3739f88ac2fb8753be31a2e740d052773129a421a38e2115
-EBUILD quart-0.19.8.ebuild 1267 BLAKE2B 092f9f616af2d7cf6d198a4ec8b67ba793b2fdcadb489cfd2d66a6ddc8b24745d41d4cf6aa11b96bb3797abc78677c1e01dedf7105f542a9b7889c6818a010ec SHA512 ec64d6c3d677b8d01a86fd28994d08a7be04b54ba6b5b2845cd45b670b47ad71cbaf5e85640d3f22cbcd16b1e8f5ce46c3d1fcd678af2a3f340202f731b7618b
+EBUILD quart-0.19.8.ebuild 1268 BLAKE2B c717d6448b52822657e140c43a166a709b16cfbacf77f9196edd553be94f1b116f03955b31f064bceb04871cc8e958ad34fd7c5ec0f06c57f896ac38cff986f4 SHA512 e4c46278b07b2d310772b017e251e25822a61d067b686a9f32c023cb6789649c1ba17e767c5d35ac6e102817711aaeea43a57edf3ffffe21f0a5e8b677522780
 MISC metadata.xml 364 BLAKE2B 207d3328ae2624ec61834adc055ca2b01ee1a587c2b6ef8cfde8c72d7370f4bb912dbc5fefdb5432959dcf273b9ebabc394dfd163dab7be00413daa85a0b6162 SHA512 8fc752b94e06ea29021c7e73c67a488f17fbbd6b8dab79c58f8647989e9c613071b539e626bf122e6693b8b670cc57bea115581801d57d3212c037d0f91df7d2
diff --git a/dev-python/quart/quart-0.19.8.ebuild b/dev-python/quart/quart-0.19.8.ebuild
index 83ff4b6ee802..8ee917f1f2d3 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/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 0aeee4de50f2..7759edcbce60 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,3 +1,3 @@
 DIST readthedocs-sphinx-ext-2.2.5.tar.gz 12303 BLAKE2B 55e67a96b8e5c4fef9d0768a4e514da924969628349d210b1cba6d8167c288bb4b6792486a80176fb01df7f8889b3f7b59ff30cb4ea487943e4bfe0d6942488f SHA512 d096803bb3d065236502d790ddd9efbf281854177dee7043f8bf2292cb124aea636b0d036e23ea3f23643484faaf2fd5e1b8636a2ed7973674cf5d5584f39bf3
-EBUILD readthedocs-sphinx-ext-2.2.5.ebuild 792 BLAKE2B b159a3352a4bf8ec46c8532211526054a19a3165d8dc56ed1395b29db33c9b4b1ae7a989ca400daba089bd60148c94a3305de4707a88dfef9dae5257a6d74a8f SHA512 fcf3437e452b3f6f83ad2c36cf7f22fe343cfa2224c9cb0440b5ce096aa41e45ab5cbe13168db06184d9a8561cce57faeccf21ee4ac53509b284a6cce78ce899
+EBUILD readthedocs-sphinx-ext-2.2.5.ebuild 793 BLAKE2B 14e6e01a5795dd051e0475032792907f15438630c5721ae6c0ddd90893ca26d4e363414362dcb8542092aabee0825d0d80d37bf0844e62fec709ce9f2b565110 SHA512 f6558c4871a34af9f2f111d03dfe9ef3c1b3df1d3547fadf4e91af22a86b462e65fc1a16c48dd460db4fbc4aebf81ca44c36fb7c38d37a52cbd00987fb8906dd
 MISC metadata.xml 424 BLAKE2B 2aa51699a12054e082cac4af9797ed81f3b9725cf8e91782736264584613b0181edf6d6207a4278b313781ce1140b33893d3504682ae8ebdc96ce13e4c7c64b5 SHA512 3df29949e8a74f2907bcdb7aa75fd2846b0a69c1ade03f2db64177cea45834f531a1d290fd0e562c29391b248d5b1a8bd1992d1f57ce5ec4c46b55a8c43e6a81
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 8a2d56c40656..faf23fd1f175 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/Manifest b/dev-python/rpy/Manifest
index 673469cd8cc3..b8bd2acec1b1 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,3 +1,3 @@
 DIST rpy2-3.5.14.tar.gz 219268 BLAKE2B 167284d4974710121475d83aada49e128566f075276f5f641096f6ce94c236c315617df2847504e0e3ca804090e1f422fa1b53a4a37b60f1c5bcdba8c0b059ff SHA512 d02454fb41c946a0a92547f8a5dba3c614741bec8e293984116b34dfbe97574a655b7066fd75d34fee4c0f604c41c8b672d6a2c3b4194cba30a37c95da6578dd
-EBUILD rpy-3.5.14.ebuild 1070 BLAKE2B 02f83e0ec3475ca505802ae91035d35f5ca6074483690d90013d73959f8c811c380332da96a607fdbb23c22041ea2d528de0a97c9237bb74efcef0f476bab1c9 SHA512 47bfbe709c4c587ca19a70030888110551bfef477d3a4386c787dde26440247bf458f3acf235c0cd615189db1b90a241d63ab2bb9809c81dd80c11df8e2c05a1
+EBUILD rpy-3.5.14.ebuild 1071 BLAKE2B 6ce33946108cc8a35fbc04c567011802bd168a8b46262ae6fb5dd5aa75f25d0f288b06f5d0d0a3d1ac2f579800100b42b076e1325817fde661aa094e5aebbd12 SHA512 ad976f9763eb3737fa65a18998ffa6c539f836efe26af739c30f030b332c3a92fdeda4caae3fcb24e7fc387774568de71d2058606ee17cb212c7f2a6940e9e25
 MISC metadata.xml 695 BLAKE2B 9c98bf8cc9a517042e16e22b2d853cc0b760eeffdf966a61a2779726aa71a76d4f2e37c3fb1e4e493f2b58ebe5d922d6f10e1d05ee0354466f60e999f5312d0d SHA512 1a2ed1a51b3857507b6bc853905db9a5d3638fb9f4440e98f52a128d3739e59f900853587c6ca5715b0bb3c1cb1b8f81866df3eb76253aecf7913aa71ea3dbdd
diff --git a/dev-python/rpy/rpy-3.5.14.ebuild b/dev-python/rpy/rpy-3.5.14.ebuild
index dfffe5235fa0..0aa15c9b861d 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/Manifest b/dev-python/sphinx-autoapi/Manifest
index 8ebfd9375ce6..a93b580bacf3 100644
--- a/dev-python/sphinx-autoapi/Manifest
+++ b/dev-python/sphinx-autoapi/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-autoapi-3.3.3.gh.tar.gz 72123 BLAKE2B 85b7c8f1eae4d9366f8e8afd526bdb5e6c0e3f14de44c9e94f4922e021bd15f31117942dc1c542a903c1fa4b3f138e0eacbfaccc744bf28c211283acbfc4268c SHA512 c6de80ceb7b394627ca19dbd59e8f7361ff1d14b5ab401134d149131b69f6be05348189ae97dcc6daa6e99276a99072d62990a8594be653d449659b556d86655
-EBUILD sphinx-autoapi-3.3.3.ebuild 1230 BLAKE2B 9d0144723dd7ce5190a49e09e1a69891d1f0bdb273b46becf3752ab75874e9b65f8bf545b65fa3530ddd3432fd55a2bc91d46290b5fa0efa20d8bcf265815130 SHA512 d070428db1db7e6c25e22743370e24d8c7e4cefb771b11f93a674a84c0ab52d95fa0d8df4a6bb8d88635d0ebbe93814b834b526b511da3a83dd9c445fc078fe7
+EBUILD sphinx-autoapi-3.3.3.ebuild 1231 BLAKE2B e481a82bfdc8edbb641cc0f18b3281022db2c4fc15399c7546542c35d5d69d40fec71a7f975349f1b14c425ececa404b766abcca536d7ab7b0e0d17a3068d975 SHA512 9ef420c1ec42b8b998fe70dbd5fd0bc28102eb7b25dec5d2649b0c21cd981ddb006cc8da3ba64d296a5e6bdf50becdebd62d0015697f3600de8a851187a762c5
 MISC metadata.xml 769 BLAKE2B 6f85e487a2d2def289bb54a6addc2338bb8af85b323ec1c95851945f9c407ec22bfadd8079ac8b6e00cfbc85caa0e2b09d82329f1f87a365fc44b69c7bcd9a20 SHA512 68f02a5f98234c2a5cb15aa04ce90077b154a7e3a7a69dc0a1d0a6b5c7b42c60624878a7e2fff1576c8b586fc15e7ef042942274d4e8473835bb3d8bfdbd8393
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 040236ef2564..7c47968ac320 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/Manifest b/dev-python/sphinx-notfound-page/Manifest
index dbdc1c647667..0d60959fe536 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-notfound-page-1.0.4.gh.tar.gz 544117 BLAKE2B f8155167183fa3d6487cfd9f93eff8a99dd3253ed7f44632ca822b9da3d0b409a6897edd4f972fc9535b4759c2ef976c5f66daf85249ba9de4c83ae96ff65d7a SHA512 d6643e29768b31834c73302f8995cd92c052b2a51a4ecffc997f4ea4d15cf830c17a2f538fec637b1a3a7e187fa787252652b5ab8ce0ab92f44996a63669b504
-EBUILD sphinx-notfound-page-1.0.4.ebuild 1364 BLAKE2B 17ab6871ade45526543362f296467b26c24bbe44958177fc12cfd1dc651c98d73e019a74cb8d34bda671ae43e0ed2ccb7c9bc5c27f18f84ed2e17ab862ed24ba SHA512 5ad7057111a95940002a78260a10efe1da387da58a106d420b7cd21d43937d833476ef6424b7acb5e798c5cab9554cd43c3bbd3315fcd81eeb8a46399f408769
+EBUILD sphinx-notfound-page-1.0.4.ebuild 1371 BLAKE2B b84e59cab13b6d6d43ce3f7ccd9bcbae7f8aba2eb418df408aef17c6d9a553ac501b16320493e481dce6efbb38c0f3cb5d94be693fe856533fd38147ccac32df SHA512 fcece41ab826dc2b691e3cbfe3a0102588c7592236e39e0e2847063e0c30c027743382fff1062a53f81c753eba6c89e497b3419ded003999aa0635cd18105fe7
 MISC metadata.xml 651 BLAKE2B 7b4c1c58782b6a1e6118744d4933d8bfc1391fef578350f9622dddfb911a4319be8fc2cd2a297d5ac84bb97249d520a1cb740ed00d6314cb3cbf1dce5c119dfd SHA512 4b531fde722c6f0f0709405669efe61cfe2fd14e52f627ee67001b81d5268444b226630f55c6dc6a149ea86699379289368826429754abbad6cdaf36f1f4a673
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 16ec2cf30bf5..b3c8ad0821d7 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/Manifest b/dev-python/sphinx/Manifest
index cf5d5ca0c5ec..7f5e6c470cb0 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -2,6 +2,6 @@ AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe8
 AUX sphinx-4.3.2-doc-link.patch 745 BLAKE2B 94f190d63168be99c4719a917f0a1210c56284c278c3909d9de34a319b4d5afa2337133509c06f87e53d5ae488efd88b0f79542719e8870c137f160732c25189 SHA512 aed97412a49212856ea6ccb392c2aa210862ec25d49c4b81a7ff17bd2d0cfe4811d80f4047622f7b23473e31aad968c34098b590045c1d0592b19f4cb6ec8b3c
 DIST sphinx-8.0.2.gh.tar.gz 8264835 BLAKE2B ed6e321a1e58341609d88993c418ec1a0a580683ed28895077322fdba839d5c158007d65d5349d4d53c5e3b49ae823142cc6eb0203812580ebbb5b95247bf157 SHA512 5e9f38af91d7a80b6a80a80ab26adbebc1c3303996182a58eed9120ed896c5bfde022616e116e8cb8195fe03741e93fd97dcacccf492912ab147c5bfcb79213d
 DIST sphinx-8.1.3.gh.tar.gz 8245194 BLAKE2B 43e0b2bc3214e01c55da356144c7e2e27dd8202b5c2dda6f6e1768c4ba4fa968180ff97f41c3b97e3cbeff1dad1199cd19385ae34dc0cb4250af60e157b3bd1f SHA512 b1d0fe9586b11083103449a04443884d06d2dcab2d0bcf66d07ef97543b5e92da60e3c02e6f8ba9e04a6d7bdd62c75ef9d3f790411753fcda2a67e0fbf6a2d86
-EBUILD sphinx-8.0.2.ebuild 5294 BLAKE2B 72c01188cacbdb2b981aa9391e6d048e3dd03c8da85d97739b3ed2f4bf1a9607baf8163ba1893a14591c6141b9d602f219b1a729ff6f1eb8e176b99125e18222 SHA512 ddce068009c8c3cff24f83892a7df0864aa26eb1b9e42785f8c65852c154f46df6082625b4d90816f11c07becf5c4eb313c0a7e6c1dd4c1b0f0451532cf8d1ec
-EBUILD sphinx-8.1.3.ebuild 5326 BLAKE2B f5477325dd2672a55db33ddaa8f295e8df0d8ab50e8bf4de7c07fc4c2b8096f68c48d892a86fdcb78471a191456e4a05bb22e7991882b2d31be08814bbf5febd SHA512 1210f90a40c15a7e8ac54d0a6afe67d9d391aa207cccf6db5366d5178515f42bfa99b268bd4b84660e5bb9169973cddf72d314cf2cab9a1dedf89e142e7ededf
+EBUILD sphinx-8.0.2.ebuild 5295 BLAKE2B 26740559855bb31267e26ee3a57c1abef0ea7ae00fccebec07dcc7b4f913d1c4647999d5dd0460f91f2d09755b2dc37776fa9f9c03652504cff46d96f45869c0 SHA512 59ff1f41bbf97f79ee522a2bf7a25a7e22560a75a823f0971b1e72d4ace99a14f276e5d70d68ffe87d8b3a201c95121ed899d065ea64aa7fc816f4505828f7d0
+EBUILD sphinx-8.1.3.ebuild 5327 BLAKE2B 3ef1119a775cef9544925708b20e63ccc399480804032d3e6615f25e7a9643f4a7fb900058386d07d028c27013a8e9c7bca4102b71534c20b54b0f1e1ef0c9e0 SHA512 4ce28aded6a7077d0a85374562a4f9178e1b7019a1af34ba5783519a34201529ce1eee7895fe0c555486cf5a3efb3c0ed6211d020fcc2ccaa20344748f47a2b1
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/sphinx-8.0.2.ebuild b/dev-python/sphinx/sphinx-8.0.2.ebuild
index 6d6097321d2e..fb6cdac980da 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 b81ff47d69b6..a3546d6b8768 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-log-cabinet/Manifest b/dev-python/sphinxcontrib-log-cabinet/Manifest
index 35cb860149dc..07d651060352 100644
--- a/dev-python/sphinxcontrib-log-cabinet/Manifest
+++ b/dev-python/sphinxcontrib-log-cabinet/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-log-cabinet-1.0.1.tar.gz 4072 BLAKE2B 6e237bee5ddcd13dfa0cf5151446a1d3924534009cf8c4b11c064dc454e0687ed03e9b09052332bf8c299d340a3522718704d65ac0fd7bd5eb22d18403b3b369 SHA512 c8529872c4ee783330738babd5027e64a813698ed38fbc693b23e65e5bfa2be815a7e6acfae42bbe003e542002d7d298ee446cab5dcebb3b65d2a25691bde18a
-EBUILD sphinxcontrib-log-cabinet-1.0.1-r1.ebuild 675 BLAKE2B 668b0e8ab7410464b59414a880e3deadb27493f6fe575be668ede443c2edfccede28f53adb3d30cdf03a15e830776c57605a9728e3538a11a02549da2ff1e1a2 SHA512 5e79b43c1f543280f20f9ddccfa5c2f91a1c082f31e38d4146cddb15756895613bb9988ffd2c04d39365fa09a49f99d016cb655762a14e8b1a6c3d5d906b14fb
+EBUILD sphinxcontrib-log-cabinet-1.0.1-r1.ebuild 675 BLAKE2B cfd38e0a5272ab16d65d68c1067661a81b5a1a3934834ed9eb40fc85d1e309cbd9a6ee8af68b1b67c86ce4d6ceaac4cc96dc4e4fe389328a0beb3dbddab98a7e SHA512 db371265b52a3bcbe174b34d94b17528178f759775b2d65fd2734cc402f62de88a91f82a6efcf14705da2074995258f2c22da5859872203802a59b7cd9f2e897
 MISC metadata.xml 427 BLAKE2B 0eb6089bfd52a11b5ba031d7e6808283a373543844809bde35eab1a8320ab885531d516a09793c39993bebb03c1cd9bc6fb0bb40d2d425a0f213d9b6e5db76f6 SHA512 a58d1124d0153095c17bf1a1e002d7f3b25267abbe82b8fc7830fba79be8a01fbb83b708145672459f92b144fbcf71cc754f1990327feee1ce28dce48d32a8e9
diff --git a/dev-python/sphinxcontrib-log-cabinet/sphinxcontrib-log-cabinet-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-log-cabinet/sphinxcontrib-log-cabinet-1.0.1-r1.ebuild
index ac05583f37dc..478b5dd66d72 100644
--- a/dev-python/sphinxcontrib-log-cabinet/sphinxcontrib-log-cabinet-1.0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-log-cabinet/sphinxcontrib-log-cabinet-1.0.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index b88e8b268385..ac0216286764 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib_websupport-1.2.7.tar.gz 599362 BLAKE2B 544e77a739e0ecd9391893f56eeec2df4d5ddc6840a30e9a92e84e35e9ed0a765d4190790a13e329621ba045ee46b5e01d4d0825b6f37e9848953f9e796ae8af SHA512 daa5ecf6fd3fb6df6a9a3b60668d42d50d93454dc3c2703a1dd43d75220b326e90c5e0ae2cca27afe62e41ae03e7144e6b4cfe70096b857af74c8981fadba9ca
-EBUILD sphinxcontrib-websupport-1.2.7.ebuild 1079 BLAKE2B 5ba32a71d8c99baaee8c645da46ca5af19a6939a913344db427aa8013199a08b51f9275143f15ec2a16f5638c55c13e05da93827db0a7b90a4d1c1dd03baaefc SHA512 cbbf44b5cf441d6360bfa229b6ebe84a957c6afe0974ce7c9ffc00576254857927a3aa7ad2842f56165b0413710edce370a848decbf38563063536fcf77d898e
+EBUILD sphinxcontrib-websupport-1.2.7.ebuild 1080 BLAKE2B 60ba353bd2ace438bf2b908d581e745afe93d2dd36b649050f3b8b4f05e12bb8ab46c3f261700ce8886b28d9ae0864db0697b108b07b244350b3bc6a045282e9 SHA512 c3dfda1cdebbd3526e35d0bf607ba75f616b2738996cb5dd816a6c15fc6aaa4854d2c08805decfef5a37704c270145806acdbf5bcab2e84dc50f500847e29680
 MISC metadata.xml 614 BLAKE2B 4029475965c4514884e0ca09ca1ba257806fa222367acdc77caf7878d8564f46a6050a06e7f43a5483d9c855e746818c037dd80889fba245c3626537722281d0 SHA512 014e0efd914a7fc32fbb8bb432efd5d7e4b2efd6e189ec33da2c409281e67529de574f7708c9963723d314d45d1daefd33eeabb9f25e5af389ac0d0ed6f37d51
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 3fec1bac6f29..b07d49a1cc59 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/Manifest b/dev-python/starlette/Manifest
index d6965d6e156a..8799b60b7d89 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,5 +1,5 @@
 DIST starlette-0.39.2.gh.tar.gz 2573134 BLAKE2B e6cd3bd3e2c2fac96d8b145ffae3a680d775a7668d9baf4db09ab81036985c8c0f5cdc6505f6db56f51126013118568c75d6f0dd6c28ea330baf575a5ff7c004 SHA512 2e81e61451136802449baafd152bf6db9cdad9a111713efb16ccef419aeb9a99b004167cd890509bad613df12d300cb5531197867c594c2b755220a1dae7bf14
 DIST starlette-0.41.2.gh.tar.gz 2573909 BLAKE2B 387665e21586ec43a3683f30c111fe77ad71a7f1c8dfea13f50fae9a9315e6a00ede22f5a1c55cd05210e4996a834b2d3d60c001899905a002e11cb09b5e60c8 SHA512 7ef590fdd7bebcae54f203acf57cf086a85653b0286aa7dc5eac92c67f846e04961680234234cfd2a6d57c12678b2ce76763c39e96caed984a1220558090303c
-EBUILD starlette-0.39.2-r1.ebuild 1302 BLAKE2B 7f150c89855f8db22dbe9a04e4320908b14ee33b650c570ab2a747035f7fa53e913bcc3105ce4e196ba9465eb75c7b657ad31e36b59b5b9b984d2a50b7af4cb7 SHA512 77fff2cacbce29df3898af7b8cb96d6b7ac6258418419d4ccedcb31c287a754d8af14643389dac9a8c9878c39f51d5d2b284828cead9e2b54e4af97c80fd9bf0
-EBUILD starlette-0.41.2.ebuild 1312 BLAKE2B 74f96cdae922330ea4ce6e2afa1538c00ecd02e4b9a037d6393f8cb43856d2eea4af5e46c3592400580b0a2e97ee79e5640d59a3fd2c2bd754ea3d11b62b88c2 SHA512 a1c0ea2d42a9a07555274676cf7064fdfd9aaf3eb73534358908977bb1e8d81353af0ba76e92fa5f755fc7ce2ad4eb8258c6259f664373447d382ea4e7722d08
+EBUILD starlette-0.39.2-r1.ebuild 1303 BLAKE2B d16dddd6d95f67e2a2810fbad700bd2c4760683b42ccd5670d68172b655303efb8e230009f76572e495ac7eb3e9c9b9933b35fbe83dd2e4adb6e9340485a400b SHA512 78a77f05c1c87dd610b2866324a4d269cc2534b669ad6c02d29a83922f7cf5382210913e0ae1e39ddc9fa344f17558bd8a008870663b8f0a85288e47956b223d
+EBUILD starlette-0.41.2.ebuild 1320 BLAKE2B 851f6ba7695fd336fdffa71d29b7a8daae4b9486b90ba59559d06e56ebd90d96811974ea22c649bfe21539d86e11bff625114aae18eab9afdfe39b13a0da650e SHA512 da5a556c75e5311ead839ec11cbc023e0d53e0421f74c859fe14255383923faa872464c727e145f4a0e7c0e228e1b6513383e1676a796c509f9d42e0cb84f5f2
 MISC metadata.xml 371 BLAKE2B 0ccaa4659e63162b565359a1cae05764bea66d708a5f4af1a4716ba9ba23faa39ab4f5a806c0a9783f3f42282ee9b98e22a92f2b308b8dfe97bbf9c770a8add1 SHA512 0fc326941861260becd4129c8a351e89ba0f98f9a3ce9b5d50812f0eaf667743ab0d403889aa1b0a2d9fcedbe0212ba879d165ec8edd115686d4768e6b1326ca
diff --git a/dev-python/starlette/starlette-0.39.2-r1.ebuild b/dev-python/starlette/starlette-0.39.2-r1.ebuild
index 1655334bc377..6324c0843497 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 a7637ab5fa89..f037f2049020 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/Manifest b/dev-python/towncrier/Manifest
index 94e8cab8e259..997a308705c5 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,3 +1,3 @@
 DIST towncrier-24.8.0.gh.tar.gz 74612 BLAKE2B 257ce077a212648177514f87f15274415a343fd16105dd2d94935b86ff53552b47554584efcc73810ac5ccc0f67196845838ee83b6f43580dd9d9a4eee782da7 SHA512 6e4db4713aa35d7daee2296433ee1c1093ef6a56831128f3b068ea5c7be167c9ba83a97e1ea17e94bd3ef80ec1c715c0a57484f4159538de6105052830798698
-EBUILD towncrier-24.8.0.ebuild 1312 BLAKE2B 2794fff9e36507c50cf94d13a4ca4b135b11653ea9e48f6ce13c967286f9476821d439d0a363ebab0ea8973ce01707402e42a9fb385482a4c430d1d33560ad2f SHA512 a308c120f380b808da05d32a53986e81a87801b9f84a4513adf4069e848063d30ccee74f00f7c6b51499c13141481471c6b712d59dae59057c36f71c7ab2a872
+EBUILD towncrier-24.8.0.ebuild 1313 BLAKE2B d870e05edf3610dc2c43fac7cccd539c0d2c99c3aedaa90d5ad39bdc711189fa97fc49ccbb7674d909777b6f92e317f34aa68bc58aa8a4271e81db67000af759 SHA512 641cfc6917314d20063776150be434eeae66c65fb24a19d4f5d9e5ed7f1a35355a0a37f21c3f70ddfb01b7d87ec56f5013272c22f429843b72366fa0caeef52e
 MISC metadata.xml 394 BLAKE2B 52e7e94b46ca173b3bcb91b6a5733304c367783f45fb60beaf775a35cfbd3e1f3a7558de3c79fa96681b684998c9a9d51ba064839824f8e35ff7d86e32dcd477 SHA512 23aa7a3a20c418e6a6b06502cfc2c6a8c8a0556118a6c4a995ea3c95e49c6ef31ec8daf6ad66e69471f1e7eaba1607b8bd0a0950c70efdd735d2141be852fee3
diff --git a/dev-python/towncrier/towncrier-24.8.0.ebuild b/dev-python/towncrier/towncrier-24.8.0.ebuild
index c3587830dca9..5a654cc83b26 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/Manifest b/dev-python/xmlschema/Manifest
index c139cd2f828a..10420f4cff42 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,5 @@
 DIST xmlschema-3.4.2.tar.gz 584249 BLAKE2B 82c01c295932e0e0a503d89b878cd7972550b531edc2aa162b9e6139cf3657890d3b5fe15a8bd667e5adc24ab29b6458f095ad55f9a88b7cd9bca93eed200200 SHA512 fd8c3df89f1768a8670e8bfdb34eaf93b80e191afe6ee15904269f0e3ab728aaeca5c56e046893708aba0c7763421a50b085bd03ec8aba1326f6608b39871b03
 DIST xmlschema-3.4.3.tar.gz 585144 BLAKE2B e93ed5fed2f108f9a067b2c96aff884bda4980d57ad0efedacb7c0302cb7cebc99ce49d98e4272a50f6c6bc79a401218c75cbde682028558bbe6e815b6aeaad3 SHA512 7645ea820ec6f469e560ffaba10948b185d9dcfc7a5d4cde1a5062f20b904cb97ffbc7f57893768879a192cbb63208a5c6f79775d09be650d24a54b1bb7e9176
-EBUILD xmlschema-3.4.2.ebuild 830 BLAKE2B 92de18666c0d4e244dcd19605b401ec936b3a52fa9a79504bb2868e06a49ed4bce29051abd4722619cd766d85e381dfd05e5688afd5e50db1a7b5b1192560879 SHA512 6df68ddd025be02909d3d02353c7d85b8c408fa106d533abcd8911d440ab976b5242c0bda34903353f485fa4c665a6b516a158dd3c43deb9981bf3a76548df96
-EBUILD xmlschema-3.4.3.ebuild 838 BLAKE2B 2529b948ae53e4db100efb6899e8d791045e960fc37a2d5966904e277ca791c45a826e67cbe2e041ffdd293bbd6c07bc39e01b6a14a9e2742797a38fe177a9a3 SHA512 af167dba4af40638b59eb9276af8619351481a6d059c610e84e4eb667a6cee710636f6726cab3d53325e573c5c9d23f90a8a979c1f81b72fc96afc2053577129
+EBUILD xmlschema-3.4.2.ebuild 831 BLAKE2B 325dd47ddba2f28fda4f0f6a5d3498a37964ddf3e4626122de86996dada2d18687f814faf9cdc1cafb761e04c89875ac98b373ce23706b00b5ad89501ab950bc SHA512 5c934c964f3664e0d2200b6c8b944efce2acd33308d49769595feca310ea1b00ed9bf0efc7b2c80022d5f99d9521cba4688c06e73f09625b186f16c7b81531dc
+EBUILD xmlschema-3.4.3.ebuild 839 BLAKE2B bc97f7d695106f6405d1a37c4d0eda7d518a170c7155be5643e9903045ba2074d978cd46ea8644d975dafcdb8e61eead7218897a71d0f4d863c9443abb902f00 SHA512 bf47f64eaf499a45819b42f802121726bbdf94be874d27fc0157d38238350e10ca71dee1b447be641b30f031140731ea93c505374ae3a6b44804541e7e21a12a
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-3.4.2.ebuild b/dev-python/xmlschema/xmlschema-3.4.2.ebuild
index b88838aeb210..b0a589f7e3d7 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 ffac0df6b109..389d9a4873d4 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 46ffaf810568..ae32d008c8f2 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,3 +1,5 @@
 DIST zipp-3.20.2.tar.gz 24199 BLAKE2B 4014ad897ce248a1ae29a1ca79fbc9c9c40c1bd261dbfbe86b205f3b43bc2bfa0e3edd3573e85b7940307950a5b73ac99e797897ebdb923b38cf2d6f9b75638f SHA512 a8a625d36d75df879284ac9c61760c8320da927e119b27a1b04e60500233ed698439558d56a792b3da94080e78cc57c15c2e62ec8af466aa3f79de4cf4818c77
+DIST zipp-3.21.0.tar.gz 24545 BLAKE2B 3a21098768c54efb1bcb049f25a7b04a16d5f02eacc6e2107dfbc358ec3e595478b407e78fa0d831f5a8f2dadd92287812bc1259db925859aeedc1174378ab2d SHA512 f57489283d979dbeb3234f66f5b6b298876209ba79cf0d7a2562f0ce4747a87fd1494d26a35734c6729620d1edfa3bf8f56769de2ae9576ac9cff074caa39331
 EBUILD zipp-3.20.2.ebuild 1426 BLAKE2B 5174a89266f73da01ef2db80277e9acd53baaa58a8d99e3db2a363e86ab7937aa8fb3d924ed058892608b08b81bfb0b1a61ead66a7fecaac0e6feb3e652c7049 SHA512 0f96fd34263d615019b6c647ab98003ac287d685760ebe91e18d6c8c41c324411c5274324beb3338558ce49975a22e0db5efbeaf35cd36b2aa8fcc92c9deec2c
+EBUILD zipp-3.21.0.ebuild 1434 BLAKE2B 64d2cf8017333128f5b18132b5da46a8a1d8346c1ed9907fde43f74d484ada4b392ed56e14c45def6cd7adefb9dcec7a0c208b893de5b6d909ab2b5bd8835d1b SHA512 59451c3b7d37d5785e93c0a222f978a9fe1f7181a6ba5b4905a47fee3fdbfe10da5ad6dc69f81577a0f2ef2572edd0c2dde4699fb9cf1ec485a4b51fb89c4cbb
 MISC metadata.xml 442 BLAKE2B f16ae43bab98bfc1f62cb9d4f117ed5c01874bd856781e80a273ff200c2d4de285181d99205d82b714fbc06cdb31625d0e70c0ff8333aa985099fcf8e2e7b795 SHA512 a75626c96d34c020b591e0207d2407f76d766c85b1d2f7e76477c21f309d2c9557ed5156d40940b41d073b3f80a71d25270e08f3baadba3cd6b159806af0ab32
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..985c6d5df2e4
--- /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=( pypy3 python3_{10..13} )
+
+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
+}