gentoo auto-resync : 15:06:2023 - 13:38:09

154 files changed, 3538 insertions, 111 deletions

diff --git a/dev-python/GitPython/GitPython-3.1.31.ebuild b/dev-python/GitPython/GitPython-3.1.31.ebuild
index 2ecd169efe75..965792916bee 100644
--- a/dev-python/GitPython/GitPython-3.1.31.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.31.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 pypi
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index bd3786ed2ad0..1ac256cade49 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -2,5 +2,5 @@ DIST GitPython-3.1.31.gitbundle 9820824 BLAKE2B 47becdf80c8047c3de74f3ad2308f200
 DIST GitPython-3.1.31.tar.gz 195822 BLAKE2B c5644a811e33da4e2983d5b41dc5e223bff23bb817027485fd24598163dc515d1823e8abc5f871a9ad4334827f097dbe7856cf618940cd3ddbe507728253ea2c SHA512 80d5f73db589e239dead268c99092b2429c4d0602e4f9a1e77cce5c68f2eade1651e3da9de68fd485021565f3a2d9b980c286b0d302c58e60011a443b4361e71
 DIST gitdb-4.0.10.gitbundle 1485461 BLAKE2B 5a217c609a402cd7888da1502b25d217812503cd703cda8bce3c7159732c59d7f4bcd52688a5da457f43fde1645a6db79588a6fc8cc8dff5c58e9dcbaef79b9a SHA512 98dba48f75e28eaded791f91c611e07bef73c28a7f8ac58889b05d04f4b3699a85a5be1c829ea3e2f380507a9009f35bc552bb4260564127e2863807f9b4712a
 DIST smmap-5.0.0_p1.gitbundle 324544 BLAKE2B 69098c7644abaec7f32226cad7ff3008e49d94c9f7349d0b815223249c20bfd2b51a50474e51864821f30c98f5982e5c35ce9217145a1e5d11326492c41faecc SHA512 4f36ca2c94ddfeb949c880fb52c3b1905d144dd59b95f2f05c93ed7b694dcb128218a2800ca23b721fbeff9a1920e8c3326675098e2ef0361ff6e90c8c2850ba
-EBUILD GitPython-3.1.31.ebuild 2268 BLAKE2B 5796e27cd3a99ba0294ebeec0300db362c21ec96dbb12975dd373265d67c91563d5b37e1a04a74739aa5b9b64e1c9bfa63e87ac3ee14949fe967d81fdd1e36de SHA512 d6e950d7bbd7667501e44c37291dc75ddc77dc4c7aab44fb038a0d4a3648f02891d79329be534d505783551124c8d9164b064018598083514e0d17637acb5faf
+EBUILD GitPython-3.1.31.ebuild 2269 BLAKE2B 72c76c3549fe1f7919b582af494621de467468aca72113bc650f71c1b857b10b6b8ee1c3e29c766e85edfca7f8a83668e7e7c05517b4852f69e7ca4b5f8308cf SHA512 9cdd279b2f2f554b59e4956199171095b3bfc5bb6c5d4e67692433ec69bc2d700fcb537b2885c232687104349e9eec58bc24ecf5ec205466b44b6e2f19855827
 MISC metadata.xml 407 BLAKE2B 49fd8d520d575be1489c299f22595120fad882f055b9cf2d02b87382c6d8f0ff38af694e5584b4da579aa84b82c2f1032e4afb64cafd9f4fe9212a6d67b4a752 SHA512 1bebe1e134eb86a4745cf7e297d45118a2bdd3d8a71d0034294b5c799a9cee763c63b61b34c6707c52f61058f727f4b827dd020d285fc297712b29eb7c1129ef
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 2e0c1408c420..372cf2458a92 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt6-WebEngine/Manifest b/dev-python/PyQt6-WebEngine/Manifest
index 8db686642353..92ab919b9c27 100644
--- a/dev-python/PyQt6-WebEngine/Manifest
+++ b/dev-python/PyQt6-WebEngine/Manifest
@@ -1,3 +1,3 @@
 DIST PyQt6_WebEngine-6.5.0.tar.gz 31349 BLAKE2B 80ab4ad292107e5ca57c5b27f2af3747f9c28ebf2c1afe0f32fe1fbd6897dd701d7f46bda8f08c5f0048d4efef4c3c0087854acbc58a319163e328f74177b05c SHA512 bafa26cc800ec031fe9bb1e309832df79b41c5f43a6cdc8ecc2bc4b09c59b60975a67ede6190726db887689305e7a6012f705eb9b83c3e0c82a23f3f1c3880ff
-EBUILD PyQt6-WebEngine-6.5.0.ebuild 1727 BLAKE2B f21a13b9e75ba7c6b652f141eb39b1b51ab755d3abb2e68699c0e2c300d83b5db965004dc81d85a5536b1132d983b087f97b6e5aae6c98334d368bd1aa10a524 SHA512 b298d0c414bd961d5aded22cf36cabd492fc12c13cd3aef4bbdc9f734cd85328623496ca1a212dedf5fe86a6ab34f9fe4f75943d0468e85c6f19afa08d35cefd
+EBUILD PyQt6-WebEngine-6.5.0.ebuild 1727 BLAKE2B 7113bdd58cbe6960c6bf14f5d4996493f63829a1b3475a5922c08747b4ce55d8e7225324c466227b86e0d9c871520539da7e50bc667b8f91dd3fb2ba17783300 SHA512 e4837c62ec318d00a24852042d7c6bee0bb6ded783f0344b694ce277f75e1419518d88ed017c4be38eb277e194aac9389fa632302046631769463b14643bc26b
 MISC metadata.xml 572 BLAKE2B d0c911bf7d8f4f33e30daabfafe3447367045dce444dda4d8600ea47a844842996989ee7c64ccee6ce77a033bdbd1e7c58136e16ddd5f76a7b5688681f791d2c SHA512 11a8b7ab3fe9fa8e8a7160658aac5b8148a60f30b49bcba92cb08eee6d8f5021e4d117632dcddab98c9a0ebbbecd256ce09fbbe43f05105f7429355f9120e42f
diff --git a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild
index 99f5984f7a52..c14617c05118 100644
--- a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild
+++ b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=sip
 PYPI_NO_NORMALIZE=1
 PYPI_PN=${PN/-/_}
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
 
 QT_PV="$(ver_cut 1-2):6"
@@ -49,8 +49,8 @@ python_configure_all() {
 
 	DISTUTILS_ARGS=(
 		--jobs=$(makeopts_jobs)
-		--qmake="$(type -P qmake6 || die)"
-		--qmake-setting="$(qt5_get_qmake_args)"
+		--qmake="$(qt6_get_bindir)"/qmake
+		--qmake-setting="$(qt6_get_qmake_args)"
 		--verbose
 
 		--enable=QtWebEngineCore
diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest
index f703dad4d906..79cb8883957f 100644
--- a/dev-python/PyQt6/Manifest
+++ b/dev-python/PyQt6/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt6-6.5.0.tar.gz 1033399 BLAKE2B a22ad07813c50d6b626b95aa168996ab51f9714fbf3bf3d6e41a233ec2edb8c8e2cb7edcf3b036bc4f69f0a8f1e6549cde512562a420c0809f84a0e04cfb9368 SHA512 c73d4c253245d2ccc776544bc651d47ea67067f57b49c3f820100701af4d79385ef4cabe9f65098f35daeba5f2921a566606be4f237e567f6f56360cc760f548
 DIST PyQt6-6.5.1.tar.gz 1036776 BLAKE2B e8e9ac2222de1864386d1fddb75414cf600e380e584e274cfcffbdeb1451cde9e199a43ad4c66cfc8a006cabc833904fe177ccf9dda85ac683f9c8e4f6f87e53 SHA512 8c1135ec48906fe842f0cb50e253a0325b478dd43a7f313b925aaf1d3c148f5462a3e96142470ab0efc0f24fcc8b15704242401cab9f8ec9c3c424e922c49681
 EBUILD PyQt6-6.5.0.ebuild 4813 BLAKE2B c30ffdd14a34213429e338dde537f38ef3ca47110980d4d2c00d35dc2b72953ed7464dbbb9f45330ca2a044923a28969d377290c9264e417ee566dcd7cc36dc5 SHA512 dfac5353ae1882f2399c7ef44a891b0e785d2268fd45bda86fabea9b3fc20cf33e213a0ad82729f1b145505ecbdb34d89bc3be6ee8152122597e8518899d857c
-EBUILD PyQt6-6.5.1.ebuild 5041 BLAKE2B 6999c919aa868ae85617ffbca52e8ab7b2820b33dd431d9a7e848eb1a9f3290d646e1396008dc7de13c52af0ef6a99e84fe0730e792fb0516b70d43dca29e298 SHA512 fed9f3911cfb99a8b8ca32ff9f49066836f7b8ef73cfb787f3a346d8bfc1b105c6270f39c6e540659cb82bb855e18d5dccb032fca550f717765221343e9d3cdb
+EBUILD PyQt6-6.5.1.ebuild 5041 BLAKE2B 128d32c70ce75d18a1b7a8f109c8fb92fc40405f8807d205b7eea597cddb821986079b69b07207f83554e5e5067683888ba1f75539ace0281369f333c60825b9 SHA512 79da1c1a6d1da1d838021975f6b70a74b50fe6ce480172970193b077fc5097e64f94e1d0b97d7ab333ed31313bb90197c2df29aec627cb5828bccb4df883d102
 MISC metadata.xml 1995 BLAKE2B 8fda7f9c4a21ad6264b77b4bb9dc76698082e3272647911c7a0afa138c48cde16d18c9d282caa49ce3ffa36b211c51e865af87fc9caf739de106fb3cb6ff6896 SHA512 2ab635404dd6b1be94cad9c5ee424939ded0f26a7415dc766d823ad5b0ede1beae09a90bb519ba82e0b2ffb638c5abc7841c4d1f0c7481a112cef5a56fc96e84
diff --git a/dev-python/PyQt6/PyQt6-6.5.1.ebuild b/dev-python/PyQt6/PyQt6-6.5.1.ebuild
index 3b1efa1e76b0..dcf60aee78e0 100644
--- a/dev-python/PyQt6/PyQt6-6.5.1.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.5.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=sip
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
 
 # 'can' work with older Qt depending on features, but keeping it simple
@@ -91,8 +91,8 @@ python_configure_all() {
 
 	DISTUTILS_ARGS=(
 		--jobs=$(makeopts_jobs)
-		--qmake="$(type -P qmake6 || die)"
-		--qmake-setting="$(qt5_get_qmake_args)"
+		--qmake="$(qt6_get_bindir)"/qmake
+		--qmake-setting="$(qt6_get_qmake_args)"
 		--verbose
 		--confirm-license
 
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 66ba36ec2653..94c6a8ea26e9 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,5 +1,7 @@
 DIST autobahn-23.1.2.tar.gz 480717 BLAKE2B cc92dc114ef0931be72fa9bf06cfb5646d8dac7a8da3ed3b8d28c4dad67c47465ba3fb03008b70b81ad36210ee014a148f69e5f13b74ef4993b344f9e6887374 SHA512 cd69d901ad7ec8c5f995ca15d803d1de1985294b48707bc0edabfc37733295c3bf9fd7965f930e8b4fa1c7c12c6e02dcbf2ff169edf464eadc774ae6f9185175
 DIST autobahn-23.6.1.tar.gz 476460 BLAKE2B ee7cd664ac578f61376936560f65e45a3c46c1fdcb042932a1457f5c66bd6748c882bfe5e20a84bf7feb4bce8fbad720867ff5828fc4904e891c5a1e306313c5 SHA512 d621d747494e66b9ab503519b16ca38046c7e166cd6e7883bcac219c63700ee0795a76d836ea3d8a2b3d983a4937464cbb716ccbcd40f3f54f20f089d25dc803
-EBUILD autobahn-23.1.2.ebuild 3640 BLAKE2B 3a78f98ef6613a868c788a11bc3a1449950621b012b516804420b7faac30856c94830da17e0ae949332c2e305c7f20d8b444441942fa036697c7f7ada9e4fabc SHA512 fae2e7b4df2d4fdf4ed9b9b02e1bc5912a15135c56564dbe18d67dbc0f6acbbce65e4c95c0306ffb6b3dbbf42b99e30a1d2d3bf2681871534a4fb9f8fe831d6e
-EBUILD autobahn-23.6.1.ebuild 3645 BLAKE2B 002ed88d866b02b3971ea1366b5fe8f67f9c951372d86561974e888b775082fa40644744cb647709bbfebf6b67d3df139d5527913bb863c02cf71e7190a237bd SHA512 aa63d2f4c69067e4d9850cb7706d2f5effa017cc1b224206da11c7ca6cb52f9672323ce26897d7b756c4e56cdaebb22537fca45f0b3844160b8b4be20588a9a2
+DIST autobahn-23.6.2.tar.gz 480814 BLAKE2B fb4a2e8510a51e2e70289d98eb54b3b06aba6e011eb8ad4ac2fb6e706d7be313f60a785a8366ff47500a6ad58f5645eedbeb4c831087ab531d8650129ec08c45 SHA512 5935203277d17aab3f80e6edf700ff173fe7e23622b9d2617f91e080f56b078f947f907289f008b5eb21b1346142274616baad4a36629f49dafe409d6fdb931a
+EBUILD autobahn-23.1.2.ebuild 3640 BLAKE2B 3648a7f079716110c0da590a19683a081dc5f345a02959cb828c6d7beea8fc22ba675af1b9a8c03237ca1487143c7b6c396dd3131f06149ad08b22c8a7abb159 SHA512 9e1dff9df6cbbfe01412fd6637806380a6e980bde114af1097ea87b5ffd0eebaa2da7807a8b3194c30bb1e584391b90c9ca6f9b6e08d47c3425e12e1ac671305
+EBUILD autobahn-23.6.1.ebuild 3645 BLAKE2B 2ba357c0edc60df1398d39dfdaadd7d1c3289a54db9591f03f590c243ca852777a333f3182e5d4b51ed6ba6085533f0617113745b85c3303b3866082fc4240fa SHA512 077407efd8911deb804a80e49bcf9f665f45527d49b12a370c6643e578ade17120266ccee29311ce9c12241b7ff284597f4d8136e15786e5e1795e6acaa485f7
+EBUILD autobahn-23.6.2.ebuild 3645 BLAKE2B 2ba357c0edc60df1398d39dfdaadd7d1c3289a54db9591f03f590c243ca852777a333f3182e5d4b51ed6ba6085533f0617113745b85c3303b3866082fc4240fa SHA512 077407efd8911deb804a80e49bcf9f665f45527d49b12a370c6643e578ade17120266ccee29311ce9c12241b7ff284597f4d8136e15786e5e1795e6acaa485f7
 MISC metadata.xml 596 BLAKE2B 07cc4fbcb4c6fde6b1bb49a0a30fa8d2ef7ff4424397e29053a6ac89d87acd9fa7b1897c5381910d53f590192945a89a5b987fcdb9595e42f67f23333010a0ba SHA512 4d4cecf09593ec201711b13de1820e59f007f745b41611471ec737da4d679323787ac06a3a987cede9bf2c8dff71c9dbcb197e6a9c9109cf4d3a34d9247f9962
diff --git a/dev-python/autobahn/autobahn-23.1.2.ebuild b/dev-python/autobahn/autobahn-23.1.2.ebuild
index 9151e5606158..089eb0da61b2 100644
--- a/dev-python/autobahn/autobahn-23.1.2.ebuild
+++ b/dev-python/autobahn/autobahn-23.1.2.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
 		>=dev-python/flatbuffers-22.12.06[${PYTHON_USEDEP}]
 		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
 		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
 		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
@@ -103,7 +103,7 @@ pkg_postinst() {
 	optfeature "accelerated WAMP serialization support" \
 		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
 	optfeature "TLS transport encryption" \
-		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/qrcode dev-python/service_identity"
+		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/qrcode dev-python/service-identity"
 	optfeature "WAMP-SCRAM authentication" \
 		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
 	optfeature "native SIMD acceleration" "dev-python/cffi"
diff --git a/dev-python/autobahn/autobahn-23.6.1.ebuild b/dev-python/autobahn/autobahn-23.6.1.ebuild
index ee9d53b4652b..c08bf3dc62a7 100644
--- a/dev-python/autobahn/autobahn-23.6.1.ebuild
+++ b/dev-python/autobahn/autobahn-23.6.1.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
 		>=dev-python/flatbuffers-22.12.06[${PYTHON_USEDEP}]
 		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
 		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
 		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
@@ -103,7 +103,7 @@ pkg_postinst() {
 	optfeature "accelerated WAMP serialization support" \
 		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
 	optfeature "TLS transport encryption" \
-		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/qrcode dev-python/service_identity"
+		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/qrcode dev-python/service-identity"
 	optfeature "WAMP-SCRAM authentication" \
 		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
 	optfeature "native SIMD acceleration" "dev-python/cffi"
diff --git a/dev-python/autobahn/autobahn-23.6.2.ebuild b/dev-python/autobahn/autobahn-23.6.2.ebuild
new file mode 100644
index 000000000000..c08bf3dc62a7
--- /dev/null
+++ b/dev-python/autobahn/autobahn-23.6.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 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..11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="
+	https://crossbar.io/autobahn/
+	https://github.com/crossbario/autobahn-python/
+	https://pypi.org/project/autobahn/
+"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+IUSE="test xbr"
+RESTRICT="!test? ( test )"
+
+# The order of deps is based on their appearance in setup.py
+# All extra deps should be included in test and in optfeature
+RDEPEND="
+	>=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/python-snappy-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
+		>=dev-python/flatbuffers-22.12.06[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
+		>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
+		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
+		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
+
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	if use xbr ; then
+		eerror "***************"
+		eerror "Required xbr dependencies are incomplete in Gentoo."
+		eerror "So this functionality will not yet work"
+		eerror "Please file a bug if this feature is needed"
+		eerror "***************"
+	else
+		# remove xbr components
+		export AUTOBAHN_STRIP_XBR="True"
+	fi
+
+	# avoid useless rust dependency
+	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
+
+	# remove twisted plugin cache regen in setup.py
+	# to fix tinderbox sandbox issue
+	sed -e '/import/s:reactor:__importmustfail__:' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	rm -rf autobahn || die
+
+	einfo "Testing all, cryptosign using twisted"
+	local -x USE_TWISTED=true
+	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
+	unset USE_TWISTED
+
+	einfo "RE-testing cryptosign and component_aio using asyncio"
+	local -x USE_ASYNCIO=true
+	epytest --pyargs autobahn.wamp.test.test_wamp_{cryptosign,component_aio}
+	unset USE_ASYNCIO
+
+	rm -f twisted/plugins/dropin.cache || die
+}
+
+pkg_postinst() {
+	optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
+	optfeature "non-standard WebSocket compression support" \
+		"dev-python/python-snappy"
+	optfeature "accelerated WAMP serialization support" \
+		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
+	optfeature "TLS transport encryption" \
+		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/qrcode dev-python/service-identity"
+	optfeature "WAMP-SCRAM authentication" \
+		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
+	optfeature "native SIMD acceleration" "dev-python/cffi"
+
+	python_foreach_impl twisted-regen-cache
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 6e1f95fd9a6a..392f8880dc1a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,12 @@
 DIST boto3-1.26.142.gh.tar.gz 655602 BLAKE2B e9d5671308e71bb43a97953407f4aba5b78594ed39b26c3c992af9db8864e3c363ab874a66b5b015083c4a18fe7415bb1761137367783a70ff22564ada8a8842 SHA512 c2eabdb47898aa26fc8ba8a8ebfa43a86153188af1f1600bfa741bd3af1ce68a8692e461aecb5a29df94885e1c977b06c3cd009f1cec52a2e7a9dc853a2c3942
 DIST boto3-1.26.146.gh.tar.gz 658035 BLAKE2B 29104a4ebd16ca8b2a0631bb747ed8b5af9fd6a5c86927937e6fc3ded14857c5244dc3ae4db1aec880f845b32d505edb1ef652a29f9f4d48f8a935a3ff239dbd SHA512 910c49bfdca0f39e089eab50ca24f9cfa3c75cae8c33d53155f0df2dd4c6ae1729dc235bfb3f5880cd50bdeeb60327490bf2372ca2cc14600d24dc90b51d6120
 DIST boto3-1.26.151.gh.tar.gz 661732 BLAKE2B 8adc42757d828414dd4bde9f460bc9fd6781131de5c8a5648fd1b6888ad4ff656db4075aeb2855493823290c5239ea6364aedd531197206c540b126bd466c379 SHA512 51359a351ed023de6b7c84e6d3e2bd5fc28f1ddc39e71af61bc6880002ed9478150e87e4237032d0ff9110792fcfbc09a62ee23f89d7d417730a88abccda0517
+DIST boto3-1.26.152.gh.tar.gz 662874 BLAKE2B 31866c0c3244cdb868fadaf985410e5577d8d75f37387ee44f6ce879ae06c282a4e85e262da4bab3e588918b126110c10b5a64bf7764f076baf495a4382cd225 SHA512 3d496da055172bbc840a3a6f8bd7df6f24bbb1f2f5dbacbbc0e337d4bd15d1355b9fd2e5dbb9e611aa1e415d11dc32bd0b61428a0d0ce7e2d55bb143a0cf1491
+DIST boto3-1.26.153.gh.tar.gz 663859 BLAKE2B 6c5a04fcaa6dde09a09552c2687a2ad1a780ce703cc60eda84c2fa6ad9061dd5f0a4aa0c8f7a7d15f73da2abd9f28d12f8f3d4f859a552cc355bde16f9b306aa SHA512 70117de2475d82f4bb94be2033b7ba18447290f767334d3ea11c60807619d76846003868439f1d025b396df12b91e126f4935f7438d649ca2ee7d629f0a499f4
 EBUILD boto3-1.26.142.ebuild 1508 BLAKE2B 42be8b915da646a7afe6dfc988542d3d79b5dbdc565d2e738d210e3f77b7c5ba6dfbac45e46b9cc3cc4770611cbc0c155abc7f1807ff0cb8e6033f927bea4048 SHA512 06404c0363c0c7c0d378d1c2b91073c137a1685d2d846d98c655e6d001df5cde0eb51bf6e160879af2b56321a02e84146ce634855f70c7c3fbbd1adbb9b8ef8e
 EBUILD boto3-1.26.146.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.151.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+EBUILD boto3-1.26.152.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+EBUILD boto3-1.26.153.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-9999.ebuild 1514 BLAKE2B 5d31d27ac50ed037fb8be61559bac03bd2a8c63f3220ac93ecc864c0e3cbd34763b9b70761a9f364cbc85a0edd84c6f6eeff614292f31473b4935e5bb86fae7b SHA512 26bd2959c745f0e423d683d2fedeab9a438d215fa9b28b403d0cea81caac7436f05382b2a91a183bc1095f3b205e3b2115f931cd7803e0b9838c2a507562da5c
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.152.ebuild b/dev-python/boto3/boto3-1.26.152.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.152.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/boto3/boto3-1.26.153.ebuild b/dev-python/boto3/boto3-1.26.153.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.153.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 39ab8174be42..df2f3edc691e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,8 +1,12 @@
 DIST botocore-1.29.142.gh.tar.gz 11528069 BLAKE2B 860a5ab68d26424702006b221e62e29cfe21ba93593be61e4ef7e89ab50c6afb4b305f2ef3b2d80fd428cf7791933e43b20e1d4934d330653290a7b2aa16f6c4 SHA512 f408175054095bdd3094dd789de333e4e669cee72fdbc5b03551fc006cbcda5cf69eaa6daa2eb3bf09b30524f50d4b7b334d7b18051e55eca12caa16529b41bf
 DIST botocore-1.29.146.gh.tar.gz 11553866 BLAKE2B 7b5b060480de459af9045be8724272fb876c8663b39b1a1ea3575cee83d233dc4e04735682f7eac9299ae0219a5995ddd3379d75c6d2e1bece565e2294b3cc23 SHA512 e786137deaac49fa9db7c8c4df1ff8be195dd400432fbb2e6a23608181161234fa5c3a81a293b4ae1133d1a40e0341b3a081f0d845672e8d0c604fdffc2bc1b5
 DIST botocore-1.29.151.gh.tar.gz 11618833 BLAKE2B cac8007e6177c029b97e288c244668657da6b20d3ea1b4e5b1b93e65bf7dec1206c5bccdc70094e14b02a3937a10f12868a3ea9b85cf6fbcb6e7a6c71155170a SHA512 960a5a62e467a3057e89f1f7d2700b67a1aff442b85a7b89b7da6a403deb2d706e9d6297392ef74a5569d90cd3123fa0474d40f378f0756012d88665c0214aa4
+DIST botocore-1.29.152.gh.tar.gz 11624895 BLAKE2B f6b8596548ab8ff5cbf401d98ebf90cd0425f0363f9be1b71f58649a98dd6c69a859deb80467621bcdc5c15ebe151df7960880ebc013d5834d5310e80a89e948 SHA512 f51f8e00e61ed51d39ec9e51a08cf0f57d29f5e1d4e77460cf28ed296f062cf9df2b5761a30d8a78b6bc4ca8a971032150929cb84147d099e45f8e0112a717e5
+DIST botocore-1.29.153.gh.tar.gz 11665559 BLAKE2B 82a51ba87753e4f241776652f846db39e5d3748997c635af960dfa389786f3abe3b622f2415abba1aaef81d12aee8b7197f1dea9e71a34e6fc18e1712a79eed5 SHA512 84f774eae433b8efecbc4ccf4990435cfa2f9a5fa1a6d29d94bbc57a75b6f3fd4c0b8392672a7d06a00ad7b5f0f4c3fcf66aa893ad655e3a1409083d8731df78
 EBUILD botocore-1.29.142.ebuild 2478 BLAKE2B 12b452c39c98b793a4f15b9a8e8b082ba77dcf677a7c529d2d4b8b81d729403597e071da7d2c98e5e4ed65778e19ea881c6993cf3405e7f80ad20a078fa18a63 SHA512 5118842311b8971e9d2b9f03a45f496caef3b95cfa79334f77097430d569cab7ac1261dcab3fe13236ecad3907936ae49eea87620a12304ae6cf6798639deb47
 EBUILD botocore-1.29.146.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-1.29.151.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
+EBUILD botocore-1.29.152.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
+EBUILD botocore-1.29.153.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-9999.ebuild 1736 BLAKE2B 6ca7ea14855f5f8db2d166ba1f29835d4c994a0a8fa38f3852406289a4465c091909562ac678f1c0bf7e640a594731b0d4319efc0f34f6bc640fbae06746c4bc SHA512 f891bf0eded88d9af3b87fc7c9ee4c6a129d263e672821f3b9654d43bb3bcac41305b834192088d15b50f3f9d36ea95374180cf13e1cb67149595ec63e4cc155
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.152.ebuild b/dev-python/botocore/botocore-1.29.152.ebuild
new file mode 100644
index 000000000000..3ced99abe4ff
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.152.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+		# urllib3-2 compatibility, mock relies on implementation details
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_no_response_from_server
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_returned
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_sends_307
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_sends_connection_header
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_handles_expect_100_with_different_reason_phrase
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_state_reset_on_connection_close
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.29.153.ebuild b/dev-python/botocore/botocore-1.29.153.ebuild
new file mode 100644
index 000000000000..3ced99abe4ff
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.153.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+		# urllib3-2 compatibility, mock relies on implementation details
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_no_response_from_server
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_returned
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_sends_307
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_sends_connection_header
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_handles_expect_100_with_different_reason_phrase
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_state_reset_on_connection_close
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/btrfs/Manifest b/dev-python/btrfs/Manifest
new file mode 100644
index 000000000000..c95e1dd0bfa2
--- /dev/null
+++ b/dev-python/btrfs/Manifest
@@ -0,0 +1,9 @@
+AUX 13-001-docs-do-not-monkey-patch-for-sphinx-4.patch 6013 BLAKE2B d7a7417aac3a4f1fbcc912f364677db4c1ee9d6d2796a115cfafb09f6442847375d2bd85316828c6cd50b7e6337c9ca93f30d99e59c2068bcc7223f794fd157f SHA512 62341e810f10794d3fd9ac1b6ce790d18dfde9b97f83b44af1d1c5392bc6159ada273917f713037c994f5ee9bf1fbc009369e59a20d7b255652dc210b86ba3a6
+AUX 13-002-show_file_csum-fix-vaddr-computation.patch 1350 BLAKE2B 3bd4de4ca86e0b3cef8ce0d9df6acc2577f596c8424945c64a948ee4eed3a039c7bf44bc4c869056dc985049e3e0ba9e789df90b45a07cf9acde745098f744a5 SHA512 ae3d1a08da45ffbb9cb0ce8052708a7190706ff77413fbd39ab45ddffc4476fed278de29acef8e0ad830e9d4951482e699d0275afa0305277bd878dcf0da3566
+AUX 13-003-ioctl-fix-documentation-error-in-FeatureFlags.patch 854 BLAKE2B 5a9c6e6daa265e62cf28cb0ffe6dc2ecd07ce1ce374cfc0ea0c1c23d081b8260b7c35b4b980d913eb014a1b392a27fac03dea0b8fdf3a022bb15533329093d6e SHA512 9a6a51a6d56a15ed1664ce201acbf3cc2726dbba0b3ac10b1cc57e49586bcf32b89b524861a8af78a863d6ec82af03495785bbdb70715420f7363180786febd2
+AUX 13-004-add-Block-Group-Tree.patch 4651 BLAKE2B 252ffe525a631e5c389bbe35c584f20e5ad3a36a1edc7e9c285419b4df02b4d5f5d3a171d1635a35585d9957bae1a1ceb6830295ec7787c8b92c547a4ae76e5c SHA512 0d0a9fd972d5fbda9f73f123b37420425d35e5b8bbf46949be55d95a340f142154c1fd976e4285b0718fc1a5f75d7885d1ed39e5c0160dac3b3ff031d7f37ad2
+AUX 13-005-ctree-FileSystem-add-block_groups-function.patch 2932 BLAKE2B dc339882fb5a915fdbff9059068851505e52c5e713eba6da7b080684dbcea1ef7e18f0041c8c3af71d3a28088c4cb29b7105c8edc3016ec8a726837b09e1c6fe SHA512 2cbea237bc903cd5a5df3b2a50e7fedb07cd6f5dfdc6fea9fb70a4d13bf2aeff683d08a354b21fbf36239a2a8ac7bdb90575c17b932d33370daf2ab046213ad2
+AUX 13-006-btrfs-search-metadata-use-FileSystem-block_groups.patch 1074 BLAKE2B 4d3f138cc303dc3ab95d48e5af3e531be09648fcdb969b39f59cd58e631544449f6cc870218973f730141cfc4383d1e0964b9010ade354c9d832b899486e676b SHA512 806709ecda13f40865f2155a2535bd08ab463fcef7cc4c7f5e416a7ee4bbe63f5a28d5f6520f5cbe66d4bcb8907a360758c166df1dd533f137d2b79214f89c0b
+DIST btrfs-13.gh.tar.gz 93110 BLAKE2B 286e5d1d9aa66ce5072f2fe144b2da6bbcde65dd90eb21efe1eb69b9aaa3230d76e8b8baffcfd269ce5d53e1004b5fc6c5546125bc1a5c26413ba8abc66f068a SHA512 5117b9c6542fe191eccbed56a15bb5d8eadc2d3c0edd986a3e1a33d0b63f58c3db5e7f6d234c43a83d1cc74eea3e106c5882a92926c3087601edc36e6672721f
+EBUILD btrfs-13.ebuild 1085 BLAKE2B 9ac0baa6267fd1d75e49f5d4e15ccbe4407b8a29875722c035239225ba20364ee83d9e097f3c5cacac4e9a838c31b75dcae2c006b431f67401fb423020eecff5 SHA512 9158cbee95b98a4c26df82b81a54b5e4d8276eb58fc3fb12d693e7c0c9019c6b2242c48e3ab68afce8d42f61b6964ef6789451f7759bbfd649dc1bf103c5d679
+MISC metadata.xml 539 BLAKE2B acb8e113ac621f8fe2a27ee1b0295f23f722cfd6b2bd84492cb35c28fe5a6f96598f7fdd9f64beaea802c3087aa2011dbc4b50697cd5ab0b164b0d2631bbd3e7 SHA512 862b5cfbe0b6536d6cc6b1c344703e0420224baef68b81b62541f757f3a9d92c873a00b3e14d1f8379c7e3fd1c14d0dd65a252d6cdbe5d0dff7d562f50adf9ef
diff --git a/dev-python/btrfs/btrfs-13.ebuild b/dev-python/btrfs/btrfs-13.ebuild
new file mode 100644
index 000000000000..4d688620e0b6
--- /dev/null
+++ b/dev-python/btrfs/btrfs-13.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to inspect btrfs filesystems"
+HOMEPAGE="https://github.com/knorrie/python-btrfs"
+SRC_URI="https://github.com/knorrie/python-${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+S="${WORKDIR}/python-${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-001-docs-do-not-monkey-patch-for-sphinx-4.patch
+	"${FILESDIR}"/${PV}-002-show_file_csum-fix-vaddr-computation.patch
+	"${FILESDIR}"/${PV}-003-ioctl-fix-documentation-error-in-FeatureFlags.patch
+	"${FILESDIR}"/${PV}-004-add-Block-Group-Tree.patch
+	"${FILESDIR}"/${PV}-005-ctree-FileSystem-add-block_groups-function.patch
+	"${FILESDIR}"/${PV}-006-btrfs-search-metadata-use-FileSystem-block_groups.patch
+)
+
+python_install_all() {
+	if use examples; then
+		# skip symlink meant for development
+		rm examples/btrfs
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/btrfs/files/13-001-docs-do-not-monkey-patch-for-sphinx-4.patch b/dev-python/btrfs/files/13-001-docs-do-not-monkey-patch-for-sphinx-4.patch
new file mode 100644
index 000000000000..f74d1502aa66
--- /dev/null
+++ b/dev-python/btrfs/files/13-001-docs-do-not-monkey-patch-for-sphinx-4.patch
@@ -0,0 +1,146 @@
+
+Patch from:
+https://github.com/knorrie/python-btrfs/commit/892bc3d8882d62bf91df5de9a11569b6cffec3cd
+
+From 892bc3d8882d62bf91df5de9a11569b6cffec3cd Mon Sep 17 00:00:00 2001
+From: Hans van Kranenburg <hans@knorrie.org>
+Date: Sun, 8 Aug 2021 16:40:41 +0200
+Subject: [PATCH] docs: don't monkey patch for sphinx >= 4
+
+There's a really long existing bug in sphinx that causes it to generate
+cross references in places where it really should not:
+  https://github.com/sphinx-doc/sphinx/issues/2549
+
+In docs/source/conf.py there's a monkey patch for this, from line 363
+and further.
+
+It looks like a fix for this was implemented in v4:
+  https://github.com/sphinx-doc/sphinx/pull/8638/commits
+
+    -$ git tag --contains 918086b5590763663c1627578085e528f1358384
+    v4.0.0
+    [...]
+
+The function that is replaced while applying the workaround has been
+changed recently, causing breakage (TypeError: patched_make_field() got
+an unexpected keyword argument 'inliner').
+
+    -$ git tag --contains 4534d2d1a5755c8cbc9ef4327eab7e34a85a7de8
+    v4.1.0
+    [...]
+
+So, combining this information, it seems that when the major version
+number of the sphinx lib being used is >= 4, the monkey patch part
+should be skipped.
+
+Fixes: https://github.com/knorrie/python-btrfs/issues/31
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -359,54 +359,56 @@ def get_version():
+ 
+ autodoc_member_order = 'bysource'
+ 
+-
+-from docutils import nodes
+-from sphinx.util.docfields import TypedField
+-from sphinx import addnodes
+-
+-
+-def patched_make_field(self,
+-                       types,     # type: Dict[unicode, List[nodes.Node]]
+-                       domain,    # type: unicode
+-                       items,     # type: Tuple
+-                       env=None,  # type: BuildEnvironment
+-                       ):
+-    # type: (...) -> nodes.field
+-    def handle_item(fieldarg, content):
+-        # type: (unicode, unicode) -> nodes.paragraph
+-        par = nodes.paragraph()
+-        # Adding the next line, and taking out the one after should prevent
+-        # ivars from getting incorrect cross-references.
+-        par += addnodes.literal_strong('', fieldarg)
+-        #par.extend(self.make_xrefs(self.rolename, domain, fieldarg,
+-        #                           addnodes.literal_strong, env=env))
+-        if fieldarg in types:
+-            par += nodes.Text(' (')
+-            # NOTE: using .pop() here to prevent a single type node to be
+-            # inserted twice into the doctree, which leads to
+-            # inconsistencies later when references are resolved
+-            fieldtype = types.pop(fieldarg)
+-            if len(fieldtype) == 1 and isinstance(fieldtype[0], nodes.Text):
+-                typename = u''.join(n.astext() for n in fieldtype)
+-                par.extend(self.make_xrefs(self.typerolename, domain, typename,
+-                                           addnodes.literal_emphasis, env=env))
+-            else:
+-                par += fieldtype
+-            par += nodes.Text(')')
+-        par += nodes.Text(' -- ')
+-        par += content
+-        return par
+-
+-    fieldname = nodes.field_name('', self.label)
+-    if len(items) == 1 and self.can_collapse:
+-        fieldarg, content = items[0]
+-        bodynode = handle_item(fieldarg, content)
+-    else:
+-        bodynode = self.list_type()
+-        for fieldarg, content in items:
+-            bodynode += nodes.list_item('', handle_item(fieldarg, content))
+-    fieldbody = nodes.field_body('', bodynode)
+-    return nodes.field('', fieldname, fieldbody)
+-
+-
+-TypedField.make_field = patched_make_field
++import sphinx
++
++if int(sphinx.__version__.split('.')[0]) < 4:
++    from docutils import nodes
++    from sphinx.util.docfields import TypedField
++    from sphinx import addnodes
++
++
++    def patched_make_field(self,
++                           types,     # type: Dict[unicode, List[nodes.Node]]
++                           domain,    # type: unicode
++                           items,     # type: Tuple
++                           env=None,  # type: BuildEnvironment
++                           ):
++        # type: (...) -> nodes.field
++        def handle_item(fieldarg, content):
++            # type: (unicode, unicode) -> nodes.paragraph
++            par = nodes.paragraph()
++            # Adding the next line, and taking out the one after should prevent
++            # ivars from getting incorrect cross-references.
++            par += addnodes.literal_strong('', fieldarg)
++            #par.extend(self.make_xrefs(self.rolename, domain, fieldarg,
++            #                           addnodes.literal_strong, env=env))
++            if fieldarg in types:
++                par += nodes.Text(' (')
++                # NOTE: using .pop() here to prevent a single type node to be
++                # inserted twice into the doctree, which leads to
++                # inconsistencies later when references are resolved
++                fieldtype = types.pop(fieldarg)
++                if len(fieldtype) == 1 and isinstance(fieldtype[0], nodes.Text):
++                    typename = u''.join(n.astext() for n in fieldtype)
++                    par.extend(self.make_xrefs(self.typerolename, domain, typename,
++                                               addnodes.literal_emphasis, env=env))
++                else:
++                    par += fieldtype
++                par += nodes.Text(')')
++            par += nodes.Text(' -- ')
++            par += content
++            return par
++
++        fieldname = nodes.field_name('', self.label)
++        if len(items) == 1 and self.can_collapse:
++            fieldarg, content = items[0]
++            bodynode = handle_item(fieldarg, content)
++        else:
++            bodynode = self.list_type()
++            for fieldarg, content in items:
++                bodynode += nodes.list_item('', handle_item(fieldarg, content))
++        fieldbody = nodes.field_body('', bodynode)
++        return nodes.field('', fieldname, fieldbody)
++
++
++    TypedField.make_field = patched_make_field
diff --git a/dev-python/btrfs/files/13-002-show_file_csum-fix-vaddr-computation.patch b/dev-python/btrfs/files/13-002-show_file_csum-fix-vaddr-computation.patch
new file mode 100644
index 000000000000..dcf81c7566de
--- /dev/null
+++ b/dev-python/btrfs/files/13-002-show_file_csum-fix-vaddr-computation.patch
@@ -0,0 +1,27 @@
+
+Patch from:
+https://github.com/knorrie/python-btrfs/commit/8ebe99f77b5e4da38d8e9322bb5a7c4688c98b4a
+
+From 8ebe99f77b5e4da38d8e9322bb5a7c4688c98b4a Mon Sep 17 00:00:00 2001
+From: Cebtenzzre <cebtenzzre@gmail.com>
+Date: Sun, 28 Nov 2021 14:46:39 -0500
+Subject: [PATCH] examples/show_file_csum: Fix vaddr computation
+
+extent.logical_offset is relative to the start of the file, whereas
+extent.offset is relative to the start of the extent data on disk.
+--- a/examples/show_file_csum.py
++++ b/examples/show_file_csum.py
+@@ -90,11 +90,11 @@ def first_regular_file_extent(inum, tree):
+          "inside a data extent at vaddr {}.".format(
+              extent.logical_offset, extent.num_bytes, extent.offset, extent.disk_bytenr))
+ 
+-vaddr = extent.disk_bytenr + extent.logical_offset
++vaddr = extent.disk_bytenr + extent.offset
+ 
+ wraprint("Now, we first look up the checksum value for one block ({} bytes) "
+          "of data at vaddr {} ({} + {}).".format(
+-             fs.sectorsize, vaddr, extent.disk_bytenr, extent.logical_offset))
++             fs.sectorsize, vaddr, extent.disk_bytenr, extent.offset))
+ wraprint("If we're lucky, the checksum tree has a key at {}. "
+          "If not, we have to try searching back a bit to find the csum object that "
+          "holds information about our data block. Searching back is done in a very clumsy "
diff --git a/dev-python/btrfs/files/13-003-ioctl-fix-documentation-error-in-FeatureFlags.patch b/dev-python/btrfs/files/13-003-ioctl-fix-documentation-error-in-FeatureFlags.patch
new file mode 100644
index 000000000000..24403089bd70
--- /dev/null
+++ b/dev-python/btrfs/files/13-003-ioctl-fix-documentation-error-in-FeatureFlags.patch
@@ -0,0 +1,21 @@
+
+Patch from:
+https://github.com/knorrie/python-btrfs/commit/9f1698ce16b6ae15bf7b3f9f414e9f08dd052b79
+
+From 9f1698ce16b6ae15bf7b3f9f414e9f08dd052b79 Mon Sep 17 00:00:00 2001
+From: Hans van Kranenburg <hans@knorrie.org>
+Date: Sun, 21 May 2023 17:44:15 +0200
+Subject: [PATCH] ioctl: Fix documentation error in FeatureFlags
+
+The free_space_tree flag is located in compat_ro_flags.
+--- a/btrfs/ioctl.py
++++ b/btrfs/ioctl.py
+@@ -1410,7 +1410,7 @@ class FeatureFlags(object):
+         incompat_flags: mixed_backref|default_subvol|compress_lzo|big_metadata|extended_iref
+         >>> features.incompat_flags & btrfs.ioctl.FEATURE_INCOMPAT_MIXED_GROUPS
+         0
+-        >>> features.incompat_flags & btrfs.ioctl.FEATURE_COMPAT_RO_FREE_SPACE_TREE
++        >>> features.compat_ro_flags & btrfs.ioctl.FEATURE_COMPAT_RO_FREE_SPACE_TREE
+         1
+ 
+     .. note::
diff --git a/dev-python/btrfs/files/13-004-add-Block-Group-Tree.patch b/dev-python/btrfs/files/13-004-add-Block-Group-Tree.patch
new file mode 100644
index 000000000000..8e21581237bc
--- /dev/null
+++ b/dev-python/btrfs/files/13-004-add-Block-Group-Tree.patch
@@ -0,0 +1,110 @@
+
+Patch from:
+https://github.com/knorrie/python-btrfs/commit/7d8dca5bf1211843d8fd5c02b118afddaa53bee8
+
+From 7d8dca5bf1211843d8fd5c02b118afddaa53bee8 Mon Sep 17 00:00:00 2001
+From: Hans van Kranenburg <hans@knorrie.org>
+Date: Sun, 21 May 2023 17:46:06 +0200
+Subject: [PATCH] WIP ctree,ioctl,utils: Add Block Group Tree
+
+When the block_group_tree feature is enabled on a filesystem, we have to
+look up Block Group metadata items in the new Block Group Tree, instead
+of the Extent Tree, where they always were located before.
+
+WIP: We don't want to call the get_features ioctl *every* time we look
+up 1 block group object, but we also cannot just cache the result of it,
+since some feature flags can change while the fs is mounted.
+
+So, this needs some extra work in the features department first to make
+this more nice.
+--- a/btrfs/ctree.py
++++ b/btrfs/ctree.py
+@@ -91,6 +91,7 @@ def _struct_format(s):
+ QUOTA_TREE_OBJECTID = 8  #: Quota tree
+ UUID_TREE_OBJECTID = 9  #: Subvolume UUID tree
+ FREE_SPACE_TREE_OBJECTID = 10  #: Free space tree
++BLOCK_GROUP_TREE_OBJECTID = 11  #: Block group tree
+ 
+ DEV_STATS_OBJECTID = 0  #: Object ID of device statistics in the Device tree.
+ BALANCE_OBJECTID = ULL(-4)  #: Object ID to store balance status. (-4)
+@@ -346,6 +347,7 @@ def _qgroup_objectid(level, subvid):
+     QUOTA_TREE_OBJECTID: 'QUOTA_TREE',
+     UUID_TREE_OBJECTID: 'UUID_TREE',
+     FREE_SPACE_TREE_OBJECTID: 'FREE_SPACE_TREE',
++    BLOCK_GROUP_TREE_OBJECTID: 'BLOCK_GROUP_TREE',
+     BALANCE_OBJECTID: 'BALANCE',
+     ORPHAN_OBJECTID: 'ORPHAN',
+     TREE_LOG_OBJECTID: 'TREE_LOG',
+@@ -765,6 +767,11 @@ def __init__(self, path):
+         self.fsid = _fs_info.fsid
+         self.nodesize = _fs_info.nodesize
+         self.sectorsize = _fs_info.sectorsize
++        # TEMP cached feature flag for block_group_tree TEMP
++        _features = self.features()
++        self._block_group_tree = self.features().compat_ro_flags & \
++                btrfs.ioctl.FEATURE_COMPAT_RO_BLOCK_GROUP_TREE != 0
++        # TEMP cached feature flag for block_group_tree TEMP
+ 
+     def __enter__(self):
+         return self
+@@ -870,7 +877,10 @@ def block_group(self, vaddr, length=None):
+         :raises: :class:`ItemNotFoundError` if no Block Group Item can be found
+             at the address.
+         """
+-        tree = EXTENT_TREE_OBJECTID
++        if not self._block_group_tree:
++            tree = EXTENT_TREE_OBJECTID
++        else:
++            tree = BLOCK_GROUP_TREE_OBJECTID
+         min_offset = length if length is not None else 0
+         max_offset = length if length is not None else ULLONG_MAX
+         min_key = Key(vaddr, BLOCK_GROUP_ITEM_KEY, min_offset)
+@@ -1240,11 +1250,14 @@ class BlockGroupItem(ItemData):
+     The `Block Group` has a 1 to 1 relationship with a `Chunk` and tracks some
+     usage information about a range of virtual address space.
+ 
+-    * Tree: `EXTENT_TREE_OBJECTID` (2)
++    * Tree: `EXTENT_TREE_OBJECTID` (2) or `BLOCK_GROUP_TREE_OBJECTID` (11)
+     * Key objectid: Virtual address.
+     * Key type: `BLOCK_GROUP_ITEM_KEY` (192)
+     * Key offset: Block Group length.
+ 
++    If the block_group_tree feature is enabled on the filesystem, these items
++    can be found inside the Block Group Tree instead of the Extent Tree.
++
+     :ivar int vaddr: Virtual address where the Bock Group starts (taken from
+         the objectid field of the item key).
+     :ivar int length: Block Group length in bytes (taken from the offset field
+--- a/btrfs/ioctl.py
++++ b/btrfs/ioctl.py
+@@ -1325,10 +1325,12 @@ def _compat_flags_str(flags):
+ 
+ FEATURE_COMPAT_RO_FREE_SPACE_TREE = 1 << 0
+ FEATURE_COMPAT_RO_FREE_SPACE_TREE_VALID = 1 << 1
++FEATURE_COMPAT_RO_BLOCK_GROUP_TREE = 1 << 3
+ 
+ _feature_compat_ro_str_map = {
+     FEATURE_COMPAT_RO_FREE_SPACE_TREE: 'free_space_tree',
+     FEATURE_COMPAT_RO_FREE_SPACE_TREE_VALID: 'free_space_tree_valid',
++    FEATURE_COMPAT_RO_BLOCK_GROUP_TREE : 'block_group_tree',
+ }
+ 
+ 
+@@ -1383,6 +1385,7 @@ class FeatureFlags(object):
+ 
+     - FEATURE_COMPAT_RO_FREE_SPACE_TREE
+     - FEATURE_COMPAT_RO_FREE_SPACE_TREE_VALID
++    - FEATURE_COMPAT_RO_BLOCK_GROUP_TREE
+ 
+     Known incompat_flags (available as attribute of this module) are:
+ 
+--- a/btrfs/utils.py
++++ b/btrfs/utils.py
+@@ -436,6 +436,7 @@ def embedded_text_for_str(text):
+     'quota': btrfs.ctree.QUOTA_TREE_OBJECTID,
+     'uuid': btrfs.ctree.UUID_TREE_OBJECTID,
+     'free_space': btrfs.ctree.FREE_SPACE_TREE_OBJECTID,
++    'block_group': btrfs.ctree.BLOCK_GROUP_TREE_OBJECTID,
+     'tree_log': btrfs.ctree.TREE_LOG_OBJECTID,
+     'tree_log_fixup': btrfs.ctree.TREE_LOG_FIXUP_OBJECTID,
+     'tree_reloc': btrfs.ctree.TREE_RELOC_OBJECTID,
diff --git a/dev-python/btrfs/files/13-005-ctree-FileSystem-add-block_groups-function.patch b/dev-python/btrfs/files/13-005-ctree-FileSystem-add-block_groups-function.patch
new file mode 100644
index 000000000000..a6aae613a59d
--- /dev/null
+++ b/dev-python/btrfs/files/13-005-ctree-FileSystem-add-block_groups-function.patch
@@ -0,0 +1,58 @@
+
+Patch from:
+https://github.com/knorrie/python-btrfs/commit/be867c10e30b7d8e4d3cfd939a433cc19f362966
+
+From be867c10e30b7d8e4d3cfd939a433cc19f362966 Mon Sep 17 00:00:00 2001
+From: Hans van Kranenburg <hans@knorrie.org>
+Date: Sun, 21 May 2023 18:40:28 +0200
+Subject: [PATCH] WIP ctree: FileSystem: add block_groups function
+
+In the past, I did not really want to add this helper function, since
+it's not just translating some function parameters to another function
+call, but, to get all Block Group objects, we needed to search the Chunk
+tree and get all of them individually. So, to make it more explicit to
+the user of the library that it was a bit weird inefficient process, I
+let the user do that little dance.
+
+Now, with the new Block Group Tree, we can actually just to a cheap
+lookup of a Block Group range! So, well, let's add the convenience
+function now, and let it handle both the old and new case.
+
+Note that the difference in behaviour between error handling for looking
+up a range or a single items stays the same. block_groups(...) will
+return an iterator which has no objects to produce, and block_group(...)
+will throw the ItemNotFoundError.
+--- a/btrfs/ctree.py
++++ b/btrfs/ctree.py
+@@ -866,6 +866,31 @@ def dev_extents(self, min_devid=1, max_devid=ULLONG_MAX):
+         for header, data in btrfs.ioctl.search_v2(self.fd, tree, min_key, max_key):
+             yield DevExtent(header, data)
+ 
++    def block_groups(self, min_vaddr=0, max_vaddr=ULLONG_MAX, nr_items=None):
++        """
++        :param int min_vaddr: Lowest virtual address to search for.
++        :param int max_vaddr: Highest virtual address to search for.
++        :param int nr_items: Maximum amount of items to return. Defaults to no limit.
++        :returns: Block Group items from the Extent Tree or Block Group Tree
++        :rtype: Iterator[:class:`~btrfs.ctree.BlockGroupItem`]
++        """
++        if not self._block_group_tree:
++            for chunk in self.chunks(min_vaddr, max_vaddr, nr_items):
++                try:
++                    yield self.block_group(chunk.vaddr, chunk.length)
++                except btrfs.ctree.ItemNotFoundError:
++                    # This is simply to prevent the program from aborting when a block
++                    # group is removed in between doing the chunks lookup and the block
++                    # group item lookup.
++                    pass
++        else:
++            tree = BLOCK_GROUP_TREE_OBJECTID
++            min_key = Key(min_vaddr, BLOCK_GROUP_ITEM_KEY, 0)
++            max_key = Key(max_vaddr, BLOCK_GROUP_ITEM_KEY, ULLONG_MAX)
++            for header, data in btrfs.ioctl.search_v2(self.fd, tree, min_key, max_key,
++                                                      nr_items=nr_items):
++                yield BlockGroupItem(header, data)
++
+     def block_group(self, vaddr, length=None):
+         """
+         :param int vaddr: Starting virtual address of the block group.
diff --git a/dev-python/btrfs/files/13-006-btrfs-search-metadata-use-FileSystem-block_groups.patch b/dev-python/btrfs/files/13-006-btrfs-search-metadata-use-FileSystem-block_groups.patch
new file mode 100644
index 000000000000..286282f73822
--- /dev/null
+++ b/dev-python/btrfs/files/13-006-btrfs-search-metadata-use-FileSystem-block_groups.patch
@@ -0,0 +1,30 @@
+
+Patch from:
+https://github.com/knorrie/python-btrfs/commit/59c8daca3a05f86001b1dc36b2ab2e5961bf7bc0
+
+From 59c8daca3a05f86001b1dc36b2ab2e5961bf7bc0 Mon Sep 17 00:00:00 2001
+From: Hans van Kranenburg <hans@knorrie.org>
+Date: Sun, 21 May 2023 18:48:55 +0200
+Subject: [PATCH] btrfs-search-metadata: use FileSystem block_groups
+
+Now that we have a helper for looking up Block Groups, let's use it, so
+that it can deal with Block Groups in either Extent or Block Group Tree
+automagically.
+--- a/bin/btrfs-search-metadata
++++ b/bin/btrfs-search-metadata
+@@ -37,14 +37,7 @@ def get_chunks(fs, **kwargs):
+ 
+ 
+ def get_block_groups(fs, **kwargs):
+-    for chunk in fs.chunks():
+-        try:
+-            yield fs.block_group(chunk.vaddr, chunk.length)
+-        except btrfs.ctree.ItemNotFoundError:
+-            # This is simply to prevent the program from aborting when a block
+-            # group is removed in between doing the chunks lookup and the block
+-            # group item lookup.
+-            pass
++    return fs.block_groups()
+ 
+ 
+ def get_dev_extents(fs, **kwargs):
diff --git a/dev-python/btrfs/metadata.xml b/dev-python/btrfs/metadata.xml
new file mode 100644
index 000000000000..0167c381ec56
--- /dev/null
+++ b/dev-python/btrfs/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>holger@applied-asynchrony.com</email>
+		<name>Holger Hoffstätte</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">knorrie/python-btrfs</remote-id>
+		<remote-id type="pypi">btrfs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 6a5b64fe80eb..e0f5584a53cc 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,7 +1,11 @@
 DIST cfn-lint-0.77.5.tar.gz 3513226 BLAKE2B edff62682027d87fc4f0934aba83ca1cbd83773fbf85246eecfe1d1908b8ba0f6df413b2dbc8976770f7eefaec78bde1cd7017ed36ffac849687436364a42f2d SHA512 e80231e8539735d0a114c6de81f9c52714a1886dbeb070b78bba3c9dd2798399bbb6eb41b3917b5c826b4d3d571f2d9996a5eeaebd7a48a9b774135fb0966372
 DIST cfn-lint-0.77.6.tar.gz 3554363 BLAKE2B abd496cdb72e1032c92a6489da12a4ffb4f83bba994067f9e2d333e55a13ea22d07db880dd3acca208f9b8328c17fe98540cec2847dac32ad87b2662aa0047e4 SHA512 b36c781dbd3294d6f2cfe43f617832170e47c9c9502845a551e6a9263e28dc6de99c77abd998699a2fcb6f08535daff615b17072c3ad1fe9c10853890a71989f
 DIST cfn-lint-0.77.7.tar.gz 3554332 BLAKE2B b669b9f97523933eb5549f7b2d67a132aef2236301b24094a0b74e9198d49121d4ec173c99d74b554b77eee2765b4ceb97126f2ccfab121393bc68e34cfb8147 SHA512 124ab4b96963f4971a25535852290ee71b5eed82e85a4101b3aa0469213b1006bfe8ae3d384f1acf236a0fa9915a24999b00f31f0d6ddbedbdaba123bfbb823b
+DIST cfn-lint-0.77.8.tar.gz 3578363 BLAKE2B 33fbc0dd76a025425453bf39da0cd1c9ffc15b057735e2add0a54fe387377824839ab34fb37216db4fe0cc05f60878b4ac828aceecd888d510612d9c44d8473f SHA512 7fc71965d33df29557de996e2ba0e911e681b5d220e69346a26448c1e04f3cd40f7e17b933cde695ad5aa6170d46981834efa19103e50d6690b4d476d13f82ba
+DIST cfn-lint-0.77.9.tar.gz 3477918 BLAKE2B dd575c9610289b5fd256b7ddd11985a6b5790706d2d8d79409bea4b3c6600d680931893ce8f9b38724c14348fbb6023bd43dbd932c822547d923f5eaa43552bc SHA512 f861fb4b6e8c95e6ac9cda564b9f65c639696a1df16408500fab9a07c317e4663a1bbde87e245536b555a664f325441bd802a703ede7cd51f16be473afe34966
 EBUILD cfn-lint-0.77.5.ebuild 2011 BLAKE2B 9380625c02bbfa616e3d71e5b7688325852b6976863ee5d666b770e999c7faa3cf9c613ec366f800ca09db208c590986d942d506b27539539910885df506e8e0 SHA512 8985e25ab09102e75e67aa318db1b8652f048fdc3432370a6ca0308422c61a3afa3044e4098ae40be10c22f260e7d4bf81372a41192ba0cbae7576a8f67bdbf6
 EBUILD cfn-lint-0.77.6.ebuild 2013 BLAKE2B 3cbbb5b1e9f9717a84876064211232df223d4cf58699d2a585dfbb6169337e4f903994d729a25a3249c19c473e59cca6aae6901e8397353aecae9f79395e2bed SHA512 032f30d7105fd8d5d69c634d56dc4c87dacaf3c98d86b1cbe1fe860fbed3c4b5e51f63e717953d41009e0c92c1564d284306bd602f1de7ef91401abbb8de38d1
 EBUILD cfn-lint-0.77.7.ebuild 2013 BLAKE2B 3cbbb5b1e9f9717a84876064211232df223d4cf58699d2a585dfbb6169337e4f903994d729a25a3249c19c473e59cca6aae6901e8397353aecae9f79395e2bed SHA512 032f30d7105fd8d5d69c634d56dc4c87dacaf3c98d86b1cbe1fe860fbed3c4b5e51f63e717953d41009e0c92c1564d284306bd602f1de7ef91401abbb8de38d1
+EBUILD cfn-lint-0.77.8.ebuild 2013 BLAKE2B 3cbbb5b1e9f9717a84876064211232df223d4cf58699d2a585dfbb6169337e4f903994d729a25a3249c19c473e59cca6aae6901e8397353aecae9f79395e2bed SHA512 032f30d7105fd8d5d69c634d56dc4c87dacaf3c98d86b1cbe1fe860fbed3c4b5e51f63e717953d41009e0c92c1564d284306bd602f1de7ef91401abbb8de38d1
+EBUILD cfn-lint-0.77.9.ebuild 2013 BLAKE2B 3cbbb5b1e9f9717a84876064211232df223d4cf58699d2a585dfbb6169337e4f903994d729a25a3249c19c473e59cca6aae6901e8397353aecae9f79395e2bed SHA512 032f30d7105fd8d5d69c634d56dc4c87dacaf3c98d86b1cbe1fe860fbed3c4b5e51f63e717953d41009e0c92c1564d284306bd602f1de7ef91401abbb8de38d1
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.77.8.ebuild b/dev-python/cfn-lint/cfn-lint-0.77.8.ebuild
new file mode 100644
index 000000000000..6f296e7c5910
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.77.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.68.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/cfn-lint/cfn-lint-0.77.9.ebuild b/dev-python/cfn-lint/cfn-lint-0.77.9.ebuild
new file mode 100644
index 000000000000..6f296e7c5910
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.77.9.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.68.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/cjkwrap/Manifest b/dev-python/cjkwrap/Manifest
index abb7971ffba1..58eacd7fc5bf 100644
--- a/dev-python/cjkwrap/Manifest
+++ b/dev-python/cjkwrap/Manifest
@@ -1,3 +1,3 @@
 DIST cjkwrap-2.2.tar.gz 20995 BLAKE2B 35604e2d1aa24a75e1de0f0b17ba592e7588aade42d43e98864f5d83fe598eaa0ca566682cb7c7af566e66f79c9696ba2ae86b1579681688d6cd31469c07a3ff SHA512 c72ce67b10af46018f7aa5d65af030373e8889a28f533a59d55668e5c90a759ad7cb31708dd6ff35561f9e62115edef5bc0facc74b6a6e122d7399d9dc950624
-EBUILD cjkwrap-2.2-r2.ebuild 478 BLAKE2B 4bef34137d767b6a400ef436b7d11e265789a388463e92a29702f8218a1e558d0077ab9fd015ccf246f5b961c7d6938b0f64377074e2a6e97b8d56c9993121e8 SHA512 add54c65c116234076d448d653323dab09a9cfd239a807e8d8f8a8d43598f15b5e241914337de7e729c48272a4c672b231c4e23b8a9ab63a0bc81cf32b88ba4e
+EBUILD cjkwrap-2.2-r2.ebuild 478 BLAKE2B 80eef5929e60521f3e827bd10c8a5849f8bfa978c780be09df09182df3907ef7f6f9e8ba0eac43f7a7c0d2e9791b40305193a77ea0c956ab06bdad4d1490cf2d SHA512 1bea36a2acc118882125ed86c36347c9f9343dab36988172420843d251dbff7bc2e82bd89504f3314f2ae3b2087e53a2bde94e5615a114533cb64679260b775a
 MISC metadata.xml 413 BLAKE2B 6ba9b74fece1e3cc8080bb2c7839338623e42f7eb642c2c8af87adc54b6f183e6bc7d5fad8e489759e06b1c6c65891d9202e04f60bd15cc1842c10273d5be978 SHA512 87750744c4564723a681ea6a66c9b2e1b54df404efd4d062ecb168c0475f59e42fd2d964fb8dc8f7961219de397e2acea74284838d1544b668b684ba697ad0f7
diff --git a/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild b/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild
index 8d55afebb79a..c02bd2be4850 100644
--- a/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild
+++ b/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 inherit distutils-r1
 
 DESCRIPTION="A library for wrapping and filling UTF-8 CJK text"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index d2bbfbc14b05..79756477a4e4 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,11 +4,13 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.5.src.tar.xz 118000368 BLAKE2B 9f84e6bab450dc8d6379771afbca5cddc6fbad6c9728726f7158f290ab87d464ff657e89e1c8fc3c474362cc865ff13c5d55ef758c848ea3e660d732cb2fdefa SHA512 7008e7e9c8c2246fe98ba3f0c0fa91e41c88c4da427bf1cfdcce7ef57e5ea838efe7c58c523a7d1708e70d64a4338afe16d06fba2fc7ac5a6c19ca3d6ee41e99
 DIST llvm-project-16.0.5.src.tar.xz.sig 566 BLAKE2B 4c96f294f350e0086f8504a54c3387308c60efb573c8def40aec45b1918d43e36c44bafb0823625b6cefa5d99b3aacd7823d6c92c7a64a737653d5b51839a924 SHA512 4550c7c6a1b6ea603d1499aba5aca746f3948a00e7567604f5e7dc3b215a34357bad382a7ebea1f6cd7952841cb75a0dfbe2c278a8c6fcb630a5035b3e16e869
+DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
+DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-62c0bdabfa32f6e32b17b45425b15309db340dfb.tar.gz 190948645 BLAKE2B f41d8ea32e189ef4641e42628fb516e307c9a6fcf65af537eb9fc0d3186591b062c5e85c9e935511ef706f28c6994a774a4e3f36ff54d79aaac7b293a6168625 SHA512 55a4cbfec3a496c1918aa614e5bdee368e4d0b6641c946d8bf8b828ab4bf4d9b29dbe96401a172079d70f924f5e513428fe990c65b556a0a860802cb13f5e3a0
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 0452806a0baf8641d44d86c91b95958fe3bdef74fe62c32e6cb90c90ee8718c61fe9649d2f9ac17b127d65c64cba9093adee742f455be720ca2bf558131cee05 SHA512 5179df9990802cfcedcd59b8a38a6198cdfddb511fb872872c2e4cfc95531f114acb6bb43395c74659c6b46a42da32213e8312e2ed71b6e317a7270a12cfa214
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
 EBUILD clang-python-16.0.5.ebuild 1204 BLAKE2B 7147fb79338449b0a955f7f5010e8fdba34848f9fb84b9df9ceefbcc9c1829def49d7157054ef2f707225d2bff673b67d37b82b2fb373b75355583a205db6b50 SHA512 e99332305557a698a231391bad9ba6c1677c7cf13ab64d9c79e6900029f373face1b89acc55321305b12ab6cd70b946609d6352318467c0c11ea1c5d2efff425
-EBUILD clang-python-16.0.6.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
+EBUILD clang-python-16.0.6.ebuild 1204 BLAKE2B 7147fb79338449b0a955f7f5010e8fdba34848f9fb84b9df9ceefbcc9c1829def49d7157054ef2f707225d2bff673b67d37b82b2fb373b75355583a205db6b50 SHA512 e99332305557a698a231391bad9ba6c1677c7cf13ab64d9c79e6900029f373face1b89acc55321305b12ab6cd70b946609d6352318467c0c11ea1c5d2efff425
 EBUILD clang-python-17.0.0.9999.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
 EBUILD clang-python-17.0.0_pre20230609.ebuild 1182 BLAKE2B 887254f4c5f628032b6b4a9726c73866a42466c39cef8acaa1fd4a61ef52f08d2b5401b22f29147ba8dd9e0684d07bb647ebd568faffec5e278053adffaa64e2 SHA512 8686f41136e59de9ad26d6af6bf66fab789ea8023cb2cddf5ce1210dcd2ef19e649dfb8dd87f2d91947f4f2e16d818507c56835ba62e50747063ba004cfc1e5f
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-16.0.6.9999.ebuild b/dev-python/clang-python/clang-python-16.0.6.ebuild
index 5ec556a2ca20..83f4d804e310 100644
--- a/dev-python/clang-python/clang-python-16.0.6.9999.ebuild
+++ b/dev-python/clang-python/clang-python-16.0.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/contourpy/Manifest b/dev-python/contourpy/Manifest
index b1e2c26262b0..ca8e360d0d1b 100644
--- a/dev-python/contourpy/Manifest
+++ b/dev-python/contourpy/Manifest
@@ -1,3 +1,5 @@
 DIST contourpy-1.0.7.gh.tar.gz 13357940 BLAKE2B 740214d68eb95c2d80dfb4008fbf82ae1bbd7135476a7f1a45863e2fd88331c959e80dd56afde67789e95325fe4613a6404c24d4deafebacfabbdebc0b199dfe SHA512 64edcfc911b3d7af9b422058d1f595c05d64f7fca8511ea199d30fa52854aee53a7c7dd95e2f47964f57e7764ce6b7b05c8ccee5ed0309eb5daa822d488ce0ff
+DIST contourpy-1.1.0.gh.tar.gz 13413711 BLAKE2B 020bf7f63dbe304e71b66249cdfa86047598a3f8352657f7c179bc068869bf7659fb7c821749a0be33a8a04ec02dc642ac7a9ed14f5fd73d4a1e9f20c3606ee2 SHA512 aeb60db039aa14aed29a31dcf6091708daf7e65589964dd7682dc28e085d584103abb872e607685408eaefd4947adeba966c9a0d93cb1f827805189e498c67d8
 EBUILD contourpy-1.0.7.ebuild 1096 BLAKE2B c3317bcfe470279d63620caecf219d03b281ad4a7c194bb3ed701324f9fa3cdc0bb61b9fadd59334af923ad97f9146317a271c15b885897ef0344de5b8a51486 SHA512 f6e416ba0d6382842484d1f88183d5f50b49663c9b1f7157359973b8dcc7b25e7912b3c793f68671a6e52390f5168ef37c95af40621b114ec91803023f94da2a
+EBUILD contourpy-1.1.0.ebuild 958 BLAKE2B 61e31cef6094af272b0010dabf476ed711fa433b55f80f8febe887e7b54bea48115b088c960a37b2be938b629688b7ec78519d68c441cf0ca5430a688c8f0847 SHA512 9366f1990218e7d46ebd699f6f599afc4d1f6c75e4426727d9c045216f8128a983a24738abbc4ab3d4f5e98fdfa10355ad4b859a711ddcc13b87fd8c1fa4610c
 MISC metadata.xml 372 BLAKE2B de3d6cc9d8727bf43be63fdbb8aa2ad375667d189019e189be262e39d028acab98a21e200798c2d5c5c72521aa7d38202e3e235dd44de9b43a7dc9e045d50c47 SHA512 e692f94d805d7f56fc895a4c76dfbacf2f068d687b9191482b946445baa3bd0a685eda7a1b0aec2aaf9a02e6f23d87f0bf22d90f42e3c21d930724c635ff859a
diff --git a/dev-python/contourpy/contourpy-1.1.0.ebuild b/dev-python/contourpy/contourpy-1.1.0.ebuild
new file mode 100644
index 000000000000..b62d02738e9e
--- /dev/null
+++ b/dev-python/contourpy/contourpy-1.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for calculating contours in 2D quadrilateral grids"
+HOMEPAGE="
+	https://pypi.org/project/contourpy/
+	https://github.com/contourpy/contourpy/
+"
+SRC_URI="
+	https://github.com/contourpy/contourpy/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pybind11-2.6[${PYTHON_USEDEP}]
+	test? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/wurlitzer[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# linters
+		tests/test_codebase.py
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index a5ee99d99c9a..f8bbe1bc5526 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1,5 +1,7 @@
 DIST django-cors-headers-3.14.0.gh.tar.gz 29634 BLAKE2B 08ec6811b8608feecbdaadcc6ce220b1574a4bf16823f939f93eda4ece9df0430b015edc1d0909b980996ff143e036858ca81f524e8d270846881a9c0af25fac SHA512 5ff390bd2fba1b3dff3cea08b10021d0fd100497000b2eaef788fe32c1b8584f1954e470f4aa15cbcf9e4342265633a658b8736de08962bfe0ea9e2068521379
 DIST django-cors-headers-4.0.0.gh.tar.gz 29641 BLAKE2B 20ff68bfb02d6992777967db35696a33afb91b264be1ebb3b67c15a9e2a51e0df948dae78b107bce16bc6eab2679d3ba910a9be89c8d7d137b64f7997fd2a400 SHA512 250ff2f9876d1d965611f495e0b67d4f93da9f05e0804bb8c02ec8390923eb1b7c775e4c76df8acf7d43d0f1401267f3795bc29fa7c5c8936a7aee1dae7336e5
+DIST django-cors-headers-4.1.0.gh.tar.gz 30733 BLAKE2B f3214008c51d656022c58bd0eb012200e07a29ec4052a4d3b75b2c52b4aee0e96b3ef8b30857dddc528cda609f691f0a9ef4f791837d1962ab561f42b840f814 SHA512 a4a1a39ab658968d5384a40a6aaf2e5c9a9047e43edc2ef7d4b9ea82a4e6cac6e69eb5e0b3736b9731442ff4efbe249ee56c7a3d05808e3fa0b45f6dee25999a
 EBUILD django-cors-headers-3.14.0.ebuild 709 BLAKE2B 27cff0452ff6c9ca21044ec70208bb7b2d182a9c3201737f82fa461861691df8e3ec08817e1587226d7b2183c33511e0abd221c01b9ce30743c04c84f2c21e03 SHA512 aa3a488d3bacec0d498f6ced40fbf7f909cea05751293c7e31d6ddf9b26db46c67b29cbae56e90f5ed0b2b2eb2c69833c0513733f6f6c57657d805c82a650eb1
 EBUILD django-cors-headers-4.0.0.ebuild 709 BLAKE2B 27cff0452ff6c9ca21044ec70208bb7b2d182a9c3201737f82fa461861691df8e3ec08817e1587226d7b2183c33511e0abd221c01b9ce30743c04c84f2c21e03 SHA512 aa3a488d3bacec0d498f6ced40fbf7f909cea05751293c7e31d6ddf9b26db46c67b29cbae56e90f5ed0b2b2eb2c69833c0513733f6f6c57657d805c82a650eb1
+EBUILD django-cors-headers-4.1.0.ebuild 710 BLAKE2B d27682950f263c894080837f9e79cd4b5b687bfc455691a2cc76c2aeda93836bd01a646588d68dff786fcd12ca998c7e7c049b7df7e40a8d7d5b89a66400b363 SHA512 bfc2ad2be0fa8659d8023ebb86998e78241ef6c388c63a6e915a45e245aeb345f369182aad2e4d355b39d5816cfcd98419d278ca3b9fab6a632693f507ace18f
 MISC metadata.xml 393 BLAKE2B bfe5bf69a5cdf23648e6058016fa53d402db8141ebf97a8471b3335f13eb0adb3ac328c2a013bea02529ee012b00e77fbf43284500cc9e58937fae16d3a2d743 SHA512 b028f371bae9e3bb8e0e94890ee2a5a8c2d93a774eac7cccd6a1ff91886a82ed52ae4fb93442de89034cdbf4ca9d4186dad29b014b989690020db00c492fed04
diff --git a/dev-python/django-cors-headers/django-cors-headers-4.1.0.ebuild b/dev-python/django-cors-headers/django-cors-headers-4.1.0.ebuild
new file mode 100644
index 000000000000..f88ae7b6888a
--- /dev/null
+++ b/dev-python/django-cors-headers/django-cors-headers-4.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
+HOMEPAGE="
+	https://github.com/adamchainz/django-cors-headers/
+	https://pypi.org/project/django-cors-headers/
+"
+SRC_URI="
+	https://github.com/adamchainz/django-cors-headers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/django-3.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 17a19a8b271c..6dc05aa76ff0 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -9,8 +9,8 @@ DIST Django-4.2.1.checksum.txt 2548 BLAKE2B 4d20462ad292d01544a60f9fac13a5220476
 DIST Django-4.2.1.tar.gz 10420051 BLAKE2B 7d657155f45bea0bfce964e74222edd742b2f4db1d23b91baac1021aebceef5d8e553767e1da32507832047e8d62e525783ddeed31f86f80ad7ea9a4962b5c6c SHA512 eaa3f633f380e9a215e52bd40c2f7c7aed9f0a6122f5c9c07d954904dcb8ccc9ae8ed2e988742e2b1b3b32e626cf754ab4e0d2b4ed06f3b81ef7a38f0bd047ee
 DIST Django-4.2.2.checksum.txt 2569 BLAKE2B ff89a4ea9ed88ebe1c2a0ea2d8b9945986c550a53ad2ccb68754cb41e39766181c9605290c23c893083ee40e4544d486d7be86d5e096c4ea49837a367a22ff05 SHA512 226dbdda2e3b2898428ec90229ea043d3b568ebac6e6371cc56ef9b5d401fd9b73ef97788760cac44450d9b579743f9471228638a43a14ece7a25fc02dea4aee
 DIST Django-4.2.2.tar.gz 10390518 BLAKE2B f5fd69d814947aadf7654c8863826524f4fed2d0c086af47d8009ada4fc2f40f7e23550ee14e09003788eca09b0d45835dd98be11bda5b8970e54a4fc2a01815 SHA512 68b88f79a784c0bcb80338e9c3497443716d02dfaebab1d8d87974393bd12d4d322cd61a05297e776966497a736962835c0ca73defc663fb13342a5d74863a5b
-EBUILD django-3.2.19.ebuild 3037 BLAKE2B bcfa08f5ea3d9339d97cd67d620b1e8b023f0a8b246c76957670ddc7191f543745e59483c04799804db08def83fdb610dabaeb7b82cfdd53679cb37bf24926da SHA512 c1dceb8e6696eba044cae59a653a27e89ae341b5d995d1a489ce8ed9a41c5cdf315dfbf1cf7b0e151135f476931b5b84e5a4a5a5c7ce32661bd2a2b923c9f863
-EBUILD django-4.1.9.ebuild 2813 BLAKE2B 779d753e3e8895d80f71ba9faed0d6d2506164bab2638d1bc17abe2b55e73a04cb3164a8bb6e00f0bd6d75014891aa7052c1e6b0055cd615e1eeeb5e3c7c407b SHA512 d14ee12f776505861becdcc4810403d020b7c485bf47fa00280d80110486926030b44f6aba0aec827e1f1fa0b85df90d0778e20b63f41850a065231f3742201b
-EBUILD django-4.2.1.ebuild 2730 BLAKE2B 24b453e9d70265cddf0f942f3a6d52ac61b0b16b432b41f142a25bbaae1e9fac3e59b47a210578bd26c22d09782d7ed12f8bde8c196cbe206ee960573624a9e8 SHA512 674a5f42a6ea7ffc48a15d13a710668c17a8d815b559ff226e5e969881fd466f53ed9111c7e16783d9efc946d7aedf2cd134dd0bcfa4c6e4f1831ecf05527b3d
-EBUILD django-4.2.2.ebuild 2735 BLAKE2B dffd0a4c47cbb8d54457e799fcbc913dfacac19b1f58670bcc8ad304c8bbad25d106769f2ff24076c04d5050fdb769d5045dd0cda7e09324ea82701589769bbf SHA512 362c998f3f5935f752828ab8a4aa6c36d430652f5cfbd901352b70c00e8beeef2e0f6555c9bf608c32b2277a4ca036d7f7a65839607dbfdde63e2922c0f26591
+EBUILD django-3.2.19.ebuild 2954 BLAKE2B e37bc4d50bc4ccd5d2c525485de6f563400c7661b752345af01eda9a8fb2491d1c9d1903d64d3f660f42bc2e312474b4475a26a9b76417caaa9e73e071db8513 SHA512 f1d35ec16520ca15cf3b0ac809f2078665035cdf0111d5730debfae8c893fb415b1669a8fc6ba8bfdf58c912a239f36cd52ca12aa0ea82fea925ce2772f94539
+EBUILD django-4.1.9.ebuild 2730 BLAKE2B 59f2065f0236c9b1d644962b4743542841c509a58fe1a7a5299d1c60f665a45ef1368f0fff0896946ae9b4dd939f78ef42686d0b5aaffc3135af65a8386bd22d SHA512 3eb00735249896bfb1c0e5b9b3f7720a1cbb2e37732c1cf326dfe64df222450ec80bda19e83c036f99ac565d580cadd609ef82f710a80ad2108b7bf422e685ed
+EBUILD django-4.2.1.ebuild 2647 BLAKE2B 6ffc3ebf7ae9470f8b995c53edbd8341c1082124ac09f92ffcc92a96099b709273c78fef6a5635ac929d0e5d4dff183324e2318307b45fda70baeedc9035f990 SHA512 2722a2a44256e9d243eb62162886a614729fa5c6807bb53471910ceb71d0a61a99ef4008614a1a029e41ca21f144673019c52adbc41e6e22485a8e49a2003c25
+EBUILD django-4.2.2.ebuild 2652 BLAKE2B dba17f470d703c878a3694d668036288a5b57e716297081a788862814defc5ea57e9e5ecbe0b94020913cdc7afed6da106a9d0048498e292c4094734ac9f02ca SHA512 373690924d88596f32c0681316b506d26faed93d1e6c08d46d386fce7a6134f001b72099df94df26ad6ffb4b5f6c003bd3f8863afdbc3eb9d1e3a6e96b3c4dee
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-3.2.19.ebuild b/dev-python/django/django-3.2.19.ebuild
index 897c8b62a8a4..6eb96efab948 100644
--- a/dev-python/django/django-3.2.19.ebuild
+++ b/dev-python/django/django-3.2.19.ebuild
@@ -104,5 +104,4 @@ pkg_postinst() {
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
 	optfeature "ImageField Support" dev-python/pillow
 	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
 }
diff --git a/dev-python/django/django-4.1.9.ebuild b/dev-python/django/django-4.1.9.ebuild
index 31f2a0fb13c2..37a7a59f7ec1 100644
--- a/dev-python/django/django-4.1.9.ebuild
+++ b/dev-python/django/django-4.1.9.ebuild
@@ -97,5 +97,4 @@ pkg_postinst() {
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
 	optfeature "ImageField Support" dev-python/pillow
 	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
 }
diff --git a/dev-python/django/django-4.2.1.ebuild b/dev-python/django/django-4.2.1.ebuild
index 80f9a0a6a206..95df54b22e9c 100644
--- a/dev-python/django/django-4.2.1.ebuild
+++ b/dev-python/django/django-4.2.1.ebuild
@@ -94,5 +94,4 @@ pkg_postinst() {
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
 	optfeature "ImageField Support" dev-python/pillow
 	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
 }
diff --git a/dev-python/django/django-4.2.2.ebuild b/dev-python/django/django-4.2.2.ebuild
index 4a4a1596b332..e93ec1cd4c77 100644
--- a/dev-python/django/django-4.2.2.ebuild
+++ b/dev-python/django/django-4.2.2.ebuild
@@ -94,5 +94,4 @@ pkg_postinst() {
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
 	optfeature "ImageField Support" dev-python/pillow
 	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
 }
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 08d5a1d9cb5e..77d8fdb6ce53 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,5 +1,7 @@
 DIST filelock-3.12.0.tar.gz 11839 BLAKE2B 3c363e7e7ca39ddf21a6c86ed4e98eff170c3be6d4c8429a641403dd7d90058a6f15330457f01217b994959514ad297aa5ae8807b0f1d6359455cf5776be8b90 SHA512 4bd5d9df76499e2a4f9dd9274fcc8bd507813446fa8e5852cef6c674d34d3db2313e4b79ac98eae07d6a9fe953de4ee6390baa4c9d5ab6a005c96324dd5904e8
 DIST filelock-3.12.1.tar.gz 12445 BLAKE2B 7f4a115e6b50976935fee917ca7ebcba13129ad1494f8f536502c4f34335aee1f83a18393b01707195b362f83246d6ba86bd26859846540fb6de12c416f6a43c SHA512 c08768d230cad4407f21b23578a009da61858f347d3ca189756b1da32b61b70c187029786f00e286f76f026b561beb270e87b19fc1caf3fdeaea5eb96c208ae8
+DIST filelock-3.12.2.tar.gz 12441 BLAKE2B a54eb7841bd037caf537144829818ab25acf7b5a916c6fc2a296a937f36a36b7846cce3b35e751041ccc1dfc5c5c4be1b6031a261927c152657f968bb465915b SHA512 0753743338c4937f57176ef2291f44a919d949c7b3aa73e3210572d670949a60a9ad3efaaaeff198704e1308c169807655bb90d399c1158e4f5c9aae4adcd486
 EBUILD filelock-3.12.0.ebuild 683 BLAKE2B f0e85c259ec8b176b44fe2347055a84a4871a6ee42f1ca1a117a1316f7e4e7e2e86baf1070bceefc7ec14a82cae0149de57645e40103f9dcba13fc53e3718389 SHA512 b281ace5c7094b407fa528d99635cac7dbc40776ea4fa671dabc3084857abc8e53507a529352a489b0f039a72bc8d6929ffddc69bbb036e4185ad3f49a5abac3
 EBUILD filelock-3.12.1.ebuild 692 BLAKE2B ec0ce29a36299a31009ffcf0e1f0888016c94b1477c1c71e4ec1b0f70f03c49cb669fd3d5bcd9c9d796b532217c3e416cc4459f74f2b15db9ad1c4584bf5e9dc SHA512 c6c41cb482de22c55ec5d8aeff5022de19254b3f60cae996e7adf7b009d72461c6c7ef9e81360eec3f763d6d1af2d4de27d2660fc04dff7137e3a3e7c497c22c
+EBUILD filelock-3.12.2.ebuild 692 BLAKE2B ec0ce29a36299a31009ffcf0e1f0888016c94b1477c1c71e4ec1b0f70f03c49cb669fd3d5bcd9c9d796b532217c3e416cc4459f74f2b15db9ad1c4584bf5e9dc SHA512 c6c41cb482de22c55ec5d8aeff5022de19254b3f60cae996e7adf7b009d72461c6c7ef9e81360eec3f763d6d1af2d4de27d2660fc04dff7137e3a3e7c497c22c
 MISC metadata.xml 373 BLAKE2B 8923cea15313a2a4cad1af3e5e6c5623ac9855d3de37b6e43ff5249504d2bf07e1e334ce6ea8d9c397e03e3a05585cec0233e841a0a9f6c30d43eaa26b488933 SHA512 c114595146c326243756d0053476677b8b8c7541a253a0c739827e9b0f93c2a695d7289ee5a17c4a1a79639c02bf1396d2df4d8e20aaac9402c9d80f55be2f7b
diff --git a/dev-python/filelock/filelock-3.12.2.ebuild b/dev-python/filelock/filelock-3.12.2.ebuild
new file mode 100644
index 000000000000..5395bafa0b35
--- /dev/null
+++ b/dev-python/filelock/filelock-3.12.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="
+	https://github.com/tox-dev/py-filelock/
+	https://pypi.org/project/filelock/
+"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index ce1942ef8b04..6f3d3fdf2e36 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,3 +1,5 @@
 DIST fonttools-4.39.4.gh.tar.gz 3710610 BLAKE2B f4d75ae71c7b8ec752eee3820129719583072c8e1e68d54b3443c192e7c6732e7db7adfaec32145b87eccd23b1720a748e70682d58a1628d93f89890d3ddc274 SHA512 4be7c19022ccfbb182edb7d80ec50ff2aa91eae3dd4328c1023e65a293e079edd4c1ae0a8b2260e35fa940417e7b03dc96bd7a6d6ec4234bc4c4257187b24758
+DIST fonttools-4.40.0.gh.tar.gz 3726926 BLAKE2B c14cf10baeca50f6a70dc210de40f46b24effa66efdaded0a2706539af659b7fea276064b352fbe2f412028912658dc3f215409c3975bd773a7bd789986a65a1 SHA512 03daecfb2c48e13f22255872dd9dca47aaca9fc71139f2d5876cdb74fa8560d697344845d870742da00d3734043e36f143efe5d2048b884a5f7ed924435aa2f0
 EBUILD fonttools-4.39.4.ebuild 1570 BLAKE2B 4581bd4dedf3a27f3f8e930104407915e5a6dd4e94bc0c4983276ce30de804f291d8f2885cf3951b88c214f5bf0943437e3375eaf15bf783231d3f9b004e733d SHA512 150fabfaaf2207eeca50d560b6ddb33525f69e3912916c582f8296b659cdd570d943933f463e52fa1a84558d1286ad34578869fb3633c6c635ec73c72ebc261c
+EBUILD fonttools-4.40.0.ebuild 1579 BLAKE2B 06f380e9c6e0dbda1372e4682d463db25d8a50559c89278d01d93c31d9bf667456c1020f698aa392b9f3c9129a6a0f602464974959706afd018fe269a5fa296f SHA512 4697c367d166b30830a9e60e1cc7a5cefa6c08d7d7dd401c16c60c0b9e89bc22ef37cdd7038326266d45b53c8e807fd17a50d91a0ef03dd769b7a296dbde60cc
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.40.0.ebuild b/dev-python/fonttools/fonttools-4.40.0.ebuild
new file mode 100644
index 000000000000..317802fa12f7
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.40.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 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..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="
+	https://github.com/fonttools/fonttools/
+	https://pypi.org/project/fonttools/
+"
+SRC_URI="
+	https://github.com/fonttools/fonttools/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	export FONTTOOLS_WITH_CYTHON=1
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index 17a7417903b2..775249ab41a7 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,3 +1,3 @@
 DIST gitdb-4.0.10.tar.gz 394284 BLAKE2B f5a00dd3a27a17781df4c53c268c92101838ce53efcb3796a72a79f8109540912f86d746cad169ef34af2575cfb242e90cb450b658699512d37956f6902e14ed SHA512 6cfb58db322f1b18fd25d0c6537e5b24b2eb2f7a7222c1511cdee8dff39fb1249bf12691b9cb1a5d653131b8c3c57c1de2bb42139a2c8da6014332b4f1c6c03b
-EBUILD gitdb-4.0.10.ebuild 1139 BLAKE2B 3e06b9a1eef7f664f0c54661b458a619e9288c05c2562804b05b1fe3bb1773c14a19a29614873303863e0b68bed08050d819376519edced47b913b503214631c SHA512 6f393371d8a08bfda50a75d42553266a99999f22ac96a493602d61d5469519751567ead8e311ad6e9ff5460e1f7d25c02547788c8c7359ea2f4082c73f8c7027
+EBUILD gitdb-4.0.10.ebuild 1140 BLAKE2B c6fceafb2d0c07773f4283f7d8e98729c1890b2dc2b3f438588807bd2de08470005dd5b514cee9b83ee50225830d2bf245725b2c56de92e9ec75e78a289d8ff0 SHA512 dd0f508cd7690f29165f52fc736f232c0e087ef3268d4c1a75a6073c6574926ca7b92c602a5fa28203ffcca74c3793e0eda20e9fcc8f3755e0e462b353e61823
 MISC metadata.xml 412 BLAKE2B 102f815a0eee2ea04a3c77b8b26f08760bbd64ee1f0b6b2523164f3b3fb576003865198574529332c2da8f6548f232b4cbc1bbc2e93fd7a437fe77dbde934ca7 SHA512 1f94c86c4366e0be10f89e3dbf935025bbf51d547b0ba65d99d2e97da0590de0d05fbe05e0277b0177fb1b2a9cea55cf824d332a224336d71cd49b0257fc31da
diff --git a/dev-python/gitdb/gitdb-4.0.10.ebuild b/dev-python/gitdb/gitdb-4.0.10.ebuild
index 1403ab782a06..1fbb39e1a6ae 100644
--- a/dev-python/gitdb/gitdb-4.0.10.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.10.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 944c059d3c4a..190f747e2568 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,3 +1,5 @@
 DIST python-api-core-2.11.0.gh.tar.gz 187535 BLAKE2B e8029b6344b572e1dcc8455b95f3ee63c8d3684f0c8807793e4e6ba2dd0179c939f183144085c2b94a29b8a1ae0e39aeffceb632988702806665ec39c51e3ce5 SHA512 798ff3970027d7ce60dcb62a88d395ebf00454f902fda4f272fc240b9ec104af112dd9de479fb6761990c48931c8ccd8c5223a1b2b5fa44823cabac862efdba8
+DIST python-api-core-2.11.1.gh.tar.gz 187982 BLAKE2B 095b96b50f0723543acf32e4db092a8b24eccf68088229668f7f36aa0d29f66905ea8c43d7ca4a4ee4179664b6bb63c45e4619d621a99f8c2a81a4b3dd61c25e SHA512 a2ca8a2a136fd29999662201af462b45da07c0e4d124649bba12d0564c595ebf02bd398354394d7eb4116c875b2c72b29280ee5a770a6773254accc979eacbbe
 EBUILD google-api-core-2.11.0-r1.ebuild 2117 BLAKE2B e4a4cce4198f25721ec6b262f386b73f9e9c64862f91da492d1398c16fc1ef298cef9d000db05f266be6dc68894d03dac63c32b4c96f317d6afab227836b6051 SHA512 287b3692ec1732efbfbf37e3fe2e9e754bc4532eca6f812ed4cd94e96e58ce997a39f1b56ce4916b0d060682cebf4bf1c6598dc1dab8d5bc14bee67c6f679993
+EBUILD google-api-core-2.11.1.ebuild 2148 BLAKE2B adcaf01ff1d3f5487c07286c8e16ec9436a012afe4f8ab0e4d423f17a7a1845d4359d9f29910d9e5c1a4399f87d38db037777d311b6e828976be77d526292ca4 SHA512 2f19647743d720fb0ed774cabb2850fb384051ec381c6bd5c3322d560e8d8185584a1a65fac1db619106a5492dbe575ba40a3947ea598df0fb15f4f39e21e920
 MISC metadata.xml 519 BLAKE2B bf6ee9b3f0f7fe5fbfa5461aabf7872c803bd0483938da629ed6468017d82ac5b8736a52ef325374d7948a752ff1cfa6006aca2e833721f5a4a47f4adc5d8630 SHA512 d56b0312f5e5b5ba909c84af358bbfea98ea4098fbdd0ab562e0669a87a492facc05644d13fc38a196e1300f4cc1638b28cdcd10f412d753d71f8cf20a7fec62
diff --git a/dev-python/google-api-core/google-api-core-2.11.1.ebuild b/dev-python/google-api-core/google-api-core-2.11.1.ebuild
new file mode 100644
index 000000000000..31097fa5f234
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.11.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=python-api-core-${PV}
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-core/
+	https://pypi.org/project/google-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html
+"
+SRC_URI="
+	https://github.com/googleapis/python-api-core/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/proto-plus[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing due to missing grpcio-status
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
+	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+src_test() {
+	rm -r google || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	distutils_write_namespace google
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p asyncio tests
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index d3f8776e60b1..a9173fc1d880 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,7 +1,9 @@
 DIST google-api-python-client-2.86.0.tar.gz 10767816 BLAKE2B 532b86d49dfec724237a07c6d6c4dccbdf7a4f9d8c6a1c7f96548708c55e5851bca3e1f0f28da65edbde68a6d760498af8936be177ce5c0dda3e6809db218188 SHA512 2d1aea4a6735aeffbc4aba05affaa3c4389e2f9f121185d5a5d47e818e33ae3506bebf2748d7a14b374310531c7c3a34325524c5c48df3c882c6b2a4ce579e8d
 DIST google-api-python-client-2.87.0.tar.gz 10933794 BLAKE2B 702eef338d1b976219587a24b70adc513edd47bc03e7e17dd865424542d8ca61979073ea9d474c60e765f0cd4cfdd67ae2aac7f915b2be46a8c4cfc1bd4bd975 SHA512 55c8f90e4dbd74de6570f078341cb26b90d1a0ff7f20fb5ac2b94f8100ffdc12e49a9beeea5432d0c5f5cf0d0cb7834f8c2cb398be83b1c98305e5a07e2c81f6
 DIST google-api-python-client-2.88.0.tar.gz 10943608 BLAKE2B c82dd6af36d93d6fa4c0da31ec5a2d2371a9d960efb4f5a31dc63c268578234d12553f8604478e4bde5d43dcf51a738cd622f05aae0af9a405c9fc9bcde4b156 SHA512 059f49d16a6b55ca6106f779ac08aeb47a11af73022ecdac25817922207333540ea5cea4fe61dbbaea38ae0f07317144fbc0c9a5f05ba4eb8c03bbc661b94803
+DIST google-api-python-client-2.89.0.tar.gz 10965040 BLAKE2B 819c9f0837b86acc693158830c54e48778a1c8ef1fb549a4fbbe100827d0a269b435c4c29d8683c674981ef7817a0489e1cd6639adb7c9b09951c05b8fcf3aef SHA512 e3541f7e6b151ade5feb6e50f22c26b63b85304c4254929be5776c44c6cd80a4c2660d62fc052777033705d3c6a7e8dcd1a69f7f5d3dd5dc49549237a2ce6a5f
 EBUILD google-api-python-client-2.86.0.ebuild 1314 BLAKE2B 4b94f53adfddc78245531b7528b46e0f22ea97b1c3a2f856657d9239308e302abb13d95c75f7118e12c459f8350c035cea63691a55db8c9c089345bb1353e67e SHA512 ea3465da7f85594297f735b66d1e2378e2b2eceb530da38dda71ef2ff0ab26f5abddc8c0cfaafbd34abb040e114c67e55c71aa9a3e84fcede68ee298b1f32fbe
 EBUILD google-api-python-client-2.87.0.ebuild 1316 BLAKE2B d6d158b0cdd8c45d8d79dbc2977291d7e3342c7f53da3adcb227708ae8f3161413381d971dddf63b941a32b94133a6cd4c661d7b76863a5d3162db0495fdceaa SHA512 762a1b2c0e8c06f60e01fd9045abc4255999039a97e86145bdbe8ea7727d2bbfd3defd6c6e932a726f0efe001cb0364d1640f2a808c531ff57ec66d8740d9d13
 EBUILD google-api-python-client-2.88.0.ebuild 1316 BLAKE2B d6d158b0cdd8c45d8d79dbc2977291d7e3342c7f53da3adcb227708ae8f3161413381d971dddf63b941a32b94133a6cd4c661d7b76863a5d3162db0495fdceaa SHA512 762a1b2c0e8c06f60e01fd9045abc4255999039a97e86145bdbe8ea7727d2bbfd3defd6c6e932a726f0efe001cb0364d1640f2a808c531ff57ec66d8740d9d13
+EBUILD google-api-python-client-2.89.0.ebuild 1316 BLAKE2B d6d158b0cdd8c45d8d79dbc2977291d7e3342c7f53da3adcb227708ae8f3161413381d971dddf63b941a32b94133a6cd4c661d7b76863a5d3162db0495fdceaa SHA512 762a1b2c0e8c06f60e01fd9045abc4255999039a97e86145bdbe8ea7727d2bbfd3defd6c6e932a726f0efe001cb0364d1640f2a808c531ff57ec66d8740d9d13
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.89.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.89.0.ebuild
new file mode 100644
index 000000000000..0194f9640998
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.89.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 5b2382dbf734..cc9c1b5f8b81 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,5 +1,8 @@
+AUX google-auth-2.20.0-urllib3-2.patch 2690 BLAKE2B 416a0d93b862cb9bdc695dfd2a301c872204b82623b2c19f2e06d1cbe65690ea44ac5bd3bf8122cbfee5cd9b028441466a03ae4b1c8f0112ed24c49b98a033b2 SHA512 c55afab7de1bad940478a45cd4b12cfe0fbe430dff01d56d7ddfe0ff32d0ac7306ad2b7d44f3f54584875f5092ca84decc9d73d7c71841e15e87f8b14229ea0b
 DIST google-auth-2.18.1.tar.gz 224714 BLAKE2B 2fa63ed18d4dfa4940c93e5f3fb099a6892a16148e5161c3e52980cdee80b7b153a60c005bd3d1d856476f85678b88315d3f4b639f693d292abbf8133dee9397 SHA512 34e53a1c0cf42ab600281d815f259bb252987f163925e357dc2e636c945fd4b74c1f4168bf7d90a6e352fe1d7343767b68bf94fdbb1bc90a92c7067b0e2f2f8f
 DIST google-auth-2.19.1.tar.gz 230290 BLAKE2B c7f76e1bd936d4d76c81e19fbf6bb50dfe700666d8eb234f762253547fd670d1d26a97a7fe4457bdb719712d32e28e3c8f9adc82c475ee6830f5fd2af994bb3a SHA512 8a8106abb1a0966254caa2e568fe9a9c887601b19e5309f4d43e1b07f3e3280ad358cf8999e34719d6f23473b263d128a2d0321f0ff184c4e188b0b5cf88a6ee
+DIST google-auth-2.20.0.tar.gz 229669 BLAKE2B 547cb99cb72a4a5b224fdfff2bf156effe1cce5d7b4316b16530b1a3bbe50ab24dc54520fce3206fb2cea3fde1ca0c35f7bf5920e5128a5ed1bed13883fc75e5 SHA512 e13471f4452bd5c69c2ca9d1ff145431b160805e4ab2d3a70c35cad78c6e3e4f4bc789dfe99f55a0e60e5f335f9983529eabbfb0fc50794b62dfa7eeb70882b1
 EBUILD google-auth-2.18.1.ebuild 1502 BLAKE2B 2584d825075581b0185e33536a49f232989211770e62ba26bd89c7cb8be4f7df68dfde860418c8ab4b8e0b93972d9e1015bebe0eb44a30ea532464f53c55c0f9 SHA512 63c7d81173b43acd8543c6dd14bb6ee55ff3b583ee42f7389a0557f053fe519bd6e065e2ac9923b54d05d15c7a56114461d1d35b8b0c81c417ba77f47875c82e
 EBUILD google-auth-2.19.1.ebuild 1504 BLAKE2B e981f35bb9fcebd5b8dd729bb7708d5956951cf9328d679914134a00a2a6d5f92be54c83d52016634612e351d8ccaccc6744ccbd52d4dbd773748df803225537 SHA512 68cb3d305941f1aca108d1c795ee75305ebdbb1bd60c1cf4d352257929240901b332d94135a37b1407e67e3ba35ca6f3538582e5bb2451c608c1f0d96eec0032
+EBUILD google-auth-2.20.0.ebuild 1638 BLAKE2B 71ce7027198f2fc6987ad7db9da0c572baed35616807f12eeb913c19dc012bacab80bd57c8cf48406837eb36699c3dbc393ccdc8698dfcec8c1063c27f4f763c SHA512 64fbe0810cff2ed43359b60672db8ccdccffbff61e1e5c6d5a19cf74c4f21a6f316c8adcab9d29a5b20df56b44f7dae162cf1053be140253d08de561328a5439
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/files/google-auth-2.20.0-urllib3-2.patch b/dev-python/google-auth/files/google-auth-2.20.0-urllib3-2.patch
new file mode 100644
index 000000000000..791edeed09cf
--- /dev/null
+++ b/dev-python/google-auth/files/google-auth-2.20.0-urllib3-2.patch
@@ -0,0 +1,68 @@
+From 9ed006d02d7c9de3e6898ee819648c2fd3367c1d Mon Sep 17 00:00:00 2001
+From: Daniel Garcia Moreno <daniel.garcia@suse.com>
+Date: Wed, 10 May 2023 09:18:57 +0200
+Subject: [PATCH] Support urllib3 >= 2.0.0
+
+The urllib3.request.RequestMethods has been moved to
+urllib3._request_methods.RequestMethods.
+
+This patch changes the usage to continue working with the latest
+release, but now it's a "private" class in a "private" module, so maybe
+it's worth to start to think about updating this code to use the public
+API.
+
+https://urllib3.readthedocs.io/en/stable/changelog.html#removed
+---
+ google/auth/transport/urllib3.py | 11 ++++++-----
+ setup.py                         |  2 +-
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/google/auth/transport/urllib3.py b/google/auth/transport/urllib3.py
+index 4abc26b52..f1dd35320 100644
+--- a/google/auth/transport/urllib3.py
++++ b/google/auth/transport/urllib3.py
+@@ -95,8 +95,8 @@ class Request(transport.Request):
+         credentials.refresh(request)
+ 
+     Args:
+-        http (urllib3.request.RequestMethods): An instance of any urllib3
+-            class that implements :class:`~urllib3.request.RequestMethods`,
++        http (urllib3._request_methods.RequestMethods): An instance of any urllib3
++            class that implements :class:`~urllib3._request_methods.RequestMethods`,
+             usually :class:`urllib3.PoolManager`.
+ 
+     .. automethod:: __call__
+@@ -184,7 +184,7 @@ def _make_mutual_tls_http(cert, key):
+     return http
+ 
+ 
+-class AuthorizedHttp(urllib3.request.RequestMethods):
++class AuthorizedHttp(urllib3._request_methods.RequestMethods):
+     """A urllib3 HTTP class with credentials.
+ 
+     This class is used to perform requests to API endpoints that require
+@@ -197,8 +197,9 @@ class AuthorizedHttp(urllib3.request.RequestMethods):
+         response = authed_http.request(
+             'GET', 'https://www.googleapis.com/storage/v1/b')
+ 
+-    This class implements :class:`urllib3.request.RequestMethods` and can be
+-    used just like any other :class:`urllib3.PoolManager`.
++    This class implements
++    :class:`urllib3._request_methods.RequestMethods` and can be used
++    just like any other :class:`urllib3.PoolManager`.
+ 
+     The underlying :meth:`urlopen` implementation handles adding the
+     credentials' headers to the request and refreshing credentials as needed.
+diff --git a/setup.py b/setup.py
+index e45512a02..cfb3b504f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -29,7 +29,7 @@
+     # install enum34 to support 2.7. enum34 only works up to python version 3.3.
+     'enum34>=1.1.10; python_version < "3.4"',
+     "six>=1.9.0",
+-    "urllib3<2.0",
++    "urllib3>=2.0",
+ )
+ 
+ extras = {
diff --git a/dev-python/google-auth/google-auth-2.20.0.ebuild b/dev-python/google-auth/google-auth-2.20.0.ebuild
new file mode 100644
index 000000000000..fae7f6b53c35
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.20.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/urllib3-2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/googleapis/google-auth-library-python/pull/1290
+	"${FILESDIR}"/google-auth-2.20.0-urllib3-2.patch
+)
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-i18n-address/Manifest b/dev-python/google-i18n-address/Manifest
index 069e8d5fa2d0..6d5d02fce5e2 100644
--- a/dev-python/google-i18n-address/Manifest
+++ b/dev-python/google-i18n-address/Manifest
@@ -1,3 +1,5 @@
 DIST google-i18n-address-2.5.2.gh.tar.gz 724067 BLAKE2B 1ec13e99216e263985d04ceb3efd6708041a91be2cc6d4531c099d1599bfa55e21ebbc785d94bda245304bc904778e906c036b2bf0235c9e7c26c8439a69ad07 SHA512 3e9a583cee35af2c045c41fbdafea8dab2897354422a4d2df96834d56443499442a62fb19be42d06cd8974fac677936cb34713730b1c3c18c9a041a7ae46c5cb
+DIST google-i18n-address-3.1.0.gh.tar.gz 726728 BLAKE2B ef41b285aecea0b3e11b08c0815d57a2c3816c59fe01fab64fd75913b0f870e42fbcd0ed76b201c6cd47e4b249c03689b54c648468c3a2cf3d3cb67e2be7ab03 SHA512 b47b5eeaf214a04614ed0976055d25fbce2d298c45db4bfe31b369cd27dc1e097b14d4fae62b5f8dd95be5693d2fda12d0b618029dc1f3ed2784e28b60c43ef9
 EBUILD google-i18n-address-2.5.2.ebuild 627 BLAKE2B 5a92e668e2a3260d7774f451e14c9356e228a37c8230f5296fe3b066e7fff9a937b5d692e584cc51734a55d7469d3b4daab62eb237d1d9ce619e599fa42ca007 SHA512 cc7951fd854c116364abcdd54df64a5c3cfccf3d84fccac719dbc604b36f332197797a767b9ae8e84394e710f0d31d02d917037ed468628f5628e63a82561acf
+EBUILD google-i18n-address-3.1.0.ebuild 627 BLAKE2B 53a56b925f1f665105de65d413883471a0eda275cda28c88675daa6f560e25796e382dd25aabc5280203850f87c03d8a6bd9f74b3f57abe45a03bed395f45415 SHA512 af9f3417a7b7b4612d0b8c1349903ba056d879d0ec191b6b8b7209744c80cb9bad6c6a973b6a2215b4911edde0f448c048c57d08541c3bb4e54b0ba20e1319f9
 MISC metadata.xml 498 BLAKE2B 0a06e46935f90688ffec111afb963e29f192847f1511fb81cfcc2588076bf8d2e335bf7a8138da44fd9452b0f13c6496762682695bf5dbddc615d91656bd3322 SHA512 5f4ffa9b5247d8be2352ec3e9e325fb24c50a7f341f78e3a0a81c51c76dd46d3c1922954f27606a6720a9d3cbf330c556a56bf35d824e27b151b8174387df48f
diff --git a/dev-python/google-i18n-address/google-i18n-address-3.1.0.ebuild b/dev-python/google-i18n-address/google-i18n-address-3.1.0.ebuild
new file mode 100644
index 000000000000..514b69a1c503
--- /dev/null
+++ b/dev-python/google-i18n-address/google-i18n-address-3.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google's i18n address metadata repository"
+HOMEPAGE="
+	https://github.com/mirumee/google-i18n-address/
+	https://pypi.org/project/google-i18n-address/
+"
+# Using the github release, as it contains the tests (unlike the pypi artifact).
+SRC_URI="
+	https://github.com/mirumee/google-i18n-address/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index dd36e1676bce..0968dc6dd7aa 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,3 +1,5 @@
 DIST googleapis-common-protos-1.59.0.tar.gz 117558 BLAKE2B cd566fd57f9a3e783389aa31ee9c148efa267b727c134ef870c3a3da8d43caf7a55b0623f26810b7fa24ec3f828d8e517ffe76eedf6c80eac677b4b982e74a07 SHA512 7699f818f30f2938a6c701b41e84cd0cefd652c6004169532461b5c435270ea42806271032ff5b3cc8cae04b9a8568795aa0786dc362f190fe3e1eeee0a0cda7
+DIST googleapis-common-protos-1.59.1.tar.gz 118520 BLAKE2B e9f1b9f0b02465552aca8df83d12eb4ff2db9cdab27c0359b6b8c402c19afe77fed9c715179669e1029bee864edaa6fd744f307f9b3275170677e282c955faca SHA512 e977382da5880ef9097af7ff653768902a2c6c00927847cb2b9e601072f226509539226a82c98a9e4f38354b05e246f0f9c9c87ed008cb9c0a5976eae1863bd3
 EBUILD googleapis-common-protos-1.59.0.ebuild 794 BLAKE2B 29857d0dda37d3abec64e1cf2afd4f56e0045afaf3cbb8774ea9e6e0efe0ec0230597ffa8432b830ba0f70a47826fd63d927c376fa3ede0f74010e1b40aee358 SHA512 f4e25d543ffeeaad460aba7ca7e1b33b0895d67cd7cf3631871281142eeae1edfab5293790da067a7bda55532a0292af7f57587bbc61f321fa6f2d9d5acc9d71
+EBUILD googleapis-common-protos-1.59.1.ebuild 797 BLAKE2B aa978c63b63fbe4bd0b608815bf84c3ea18b755c2148b9e6fa97be993ccd67d50bcf9ceaa2a6db051c285ddf2df045f608c4371bad0dd6f0bc01ec91e67f2e8d SHA512 c5222738764f39cd759710976af2042fddffb1bd36e9fa6fa6d628220eb816ad8005cdbbe9ac03c7f751166f90973c71e7905798d1e810c7c0b1b117a761ea25
 MISC metadata.xml 537 BLAKE2B 7b81f41f34a3c0fa53340ad298440f67727eb1830009899ffa10835485f66e727844735a88bed94b8a0bba14fa01a78d8a04f5ca3edf48a72781c7e1a797459e SHA512 6013da3540915e13a0cc60336bbefada12fbf71c04d4f40634f24015ada732d0d8b86600401bdadb2c7df2ea84f7097669f4efe6cf176ccca5efe46e9a3869d9
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.59.1.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.59.1.ebuild
new file mode 100644
index 000000000000..173ea3bc4900
--- /dev/null
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.59.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python classes generated from the common protos in the googleapis repository"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-common-protos/
+	https://pypi.org/project/googleapis-common-protos/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+# no tests as this is all generated code
diff --git a/dev-python/gssapi/Manifest b/dev-python/gssapi/Manifest
index ab4f7df6432e..2628c2d1390c 100644
--- a/dev-python/gssapi/Manifest
+++ b/dev-python/gssapi/Manifest
@@ -1,3 +1,3 @@
 DIST gssapi-1.8.2.gh.tar.gz 112521 BLAKE2B d7e14c73c346066a58ae3b3cf1faeec2ef7df3d4da3f2c9e3198928225d81d99466185a9dfa06a59ae50beeeed58d4e73f8a668e1ac605e5b9806ed7a0019831 SHA512 6587f1947dc396bf608ba71e77388e6f7d161753005b9b82ea9f3b174c898bb18409a27e9aa035fc782e15fcd2efe7ca5c497d4687d69023034cea59d6a003df
-EBUILD gssapi-1.8.2.ebuild 913 BLAKE2B de205cfbf8f48dae806d1541bfc3822dcfb294790751e024c4a672fd453a495c0fd67bcb5fdd9d310c321529fe55ed29ce1036bd99de7708a7ca750b91e04d41 SHA512 43b20869d377ea49abd354d61e2c688edbe4b45fd94f5927928e580617bc0075d50b1d4c5a0069ed383613ae108b1511b859e63d905bbd7cc49729a9d89737b8
+EBUILD gssapi-1.8.2-r1.ebuild 921 BLAKE2B 1e83d2d68cd57d30c3b295c30a334be76c9b11115425aacbb14526714dadd3a5e11cd44643d9a597aa3f6875efbae91c53930f0702ab9617e72f3d369c6dcde3 SHA512 13124d68368d66fd5a93eed0eda0237849dfa0e2bf591ef3e002b9d6d85163eef90f3d6951ff63ec1206f0a8b2b07493888ee3f23ea4247c46c9e8ac54c8664f
 MISC metadata.xml 508 BLAKE2B 546d1ff6df79f22a0cde8d19a5718f834301630cda7700c73f2e6943c1634662bb216f79e290d6efe681e96f24f791785e104a2fbfe4af4d7632899db33edde4 SHA512 3ed7272bbd046d2ca4f8e0b67d005a7a676e4998acba2f7fe70d8f9022d3bb0bdc3c845ed666db3c23e4bd118fb4d762af21d94b47ae664de568fb277b7da033
diff --git a/dev-python/gssapi/gssapi-1.8.2.ebuild b/dev-python/gssapi/gssapi-1.8.2-r1.ebuild
index f74d273ba3b1..365265a2a1dd 100644
--- a/dev-python/gssapi/gssapi-1.8.2.ebuild
+++ b/dev-python/gssapi/gssapi-1.8.2-r1.ebuild
@@ -10,7 +10,10 @@ PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
 
 DESCRIPTION="Low and high level wrappers around the GSSAPI C libraries"
-HOMEPAGE="https://github.com/pythongssapi/python-gssapi https://pypi.org/project/gssapi/"
+HOMEPAGE="
+	https://github.com/pythongssapi/python-gssapi/
+	https://pypi.org/project/gssapi/
+"
 SRC_URI="
 	https://github.com/pythongssapi/python-gssapi/releases/download/v${PV}/python-${P}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -27,7 +30,7 @@ RDEPEND="
 "
 
 BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
+	<dev-python/cython-3[${PYTHON_USEDEP}]
 	virtual/krb5
 	test? (
 		dev-python/k5test[${PYTHON_USEDEP}]
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index 41a41086f349..911019b19dd0 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,5 +1,7 @@
 DIST hatch-hatchling-v1.17.0.gh.tar.gz 383013 BLAKE2B 469d0d3e017d2dadcfdf9e2b4975f9e484739737a5c2d8fca9c55a4e519cf2e12b1ee44b3e26160476b3b990b15219a7075e692b58dcc4104b76b57395d8b0d1 SHA512 3649f2932c9963184deda5aac91726dad30ed88db2230377dc303714e0cdfd148b2fefc174ddeffff5cd95033bd984a35e3d297da02c29e4bfb7a6fb42f12dbd
 DIST hatch-hatchling-v1.17.1.gh.tar.gz 383218 BLAKE2B be31190492af5904aa9d8d10fa7f204d664599fc9543a6c3b5a3781bdc68a3f5f3fd2eabbd21e34e21ed8367c8253ed280b6aa5c6387268534799de4b75efa35 SHA512 2a9b163d10834b021f6ebd35484ebff01f22a7addbb2c472ec21dcc7a389e617d955935820bd7247d33fe79c4009e0e368a898b29fa0a3c7fff232f3bd7c424e
+DIST hatch-hatchling-v1.18.0.gh.tar.gz 386992 BLAKE2B 9597d139ca0d59b82862a4b89208bf61ceb0859ed37e2f62c14f7f26550638716cd375082cae6ce0e233f92297b97015af5587144c2d801ecacdb15a07f32cf2 SHA512 e71e51fdace9b9aa276c2efba3a81a030ed934c21283057f83a6ce4a09f8feed8cd4386088280c9fe1381dd92e574daeda8c845a6a2cf6a015708126ca9788d7
 EBUILD hatchling-1.17.0.ebuild 2489 BLAKE2B c76ead3c546eaf1d822617ff5eb49e03b9a50337b43c791a7e6cd2c9c583e4d8913556933fe06c8311c1199f7ce8153fcef2b041a4d77dbd39139c6027a88f2a SHA512 9c56601089415491831489b087edab4dbc56410b9f1753d9859c1736f99c1990aa3de5c03c2499f9b986b5bac5737ff6a8a4d4a1e103e43bc1823f23dec05573
 EBUILD hatchling-1.17.1.ebuild 2497 BLAKE2B 36e510d58f217f9cf18d9010f72f17db4b9b86a1e9418f80ff05e9673fcf8ba9481fb941771f2c14d7cace67e19afc851f1815fc577e207bd6f80c8b31db72ee SHA512 ee2fb50b019c9a6e1f0a0a542069d44cc2d2e3d4c093f99023b8fd9ed9b1673add82203f462148db1740becb47b695221d5e3e186644186ca91c8374b2433e73
+EBUILD hatchling-1.18.0.ebuild 2612 BLAKE2B a3f1c021fa931d9e7a6cfcd30d724fd66f3fe0f27fa6fb32feb6ba2f70c0ac05df50af620a6b256c1c3271036d9db9400d3c97511a4a351754854b797b1ac24f SHA512 ad360730c637e92ccd778fc1451423faf6b3d3c22894f3efc7fa530fcdb4e3b19507e827f64f70309e313cdf63eadd4662e7ba9cd9bf877ed0b6f4679f4021c8
 MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
diff --git a/dev-python/hatchling/hatchling-1.18.0.ebuild b/dev-python/hatchling/hatchling-1.18.0.ebuild
new file mode 100644
index 000000000000..fe5722f26b02
--- /dev/null
+++ b/dev-python/hatchling/hatchling-1.18.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1
+
+TAG=${P/-/-v}
+MY_P=hatch-${TAG}
+DESCRIPTION="Modern, extensible Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/hatchling/
+	https://github.com/pypa/hatch/
+"
+SRC_URI="
+	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/backend
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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
+RDEPEND="
+	>=dev-python/editables-0.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${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.8 3.9 3.10)
+	dev-python/trove-classifiers[${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
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local -x EPYTEST_DESELECT=(
+		# these run pip to install stuff
+		tests/backend/dep/test_core.py::test_dependency_found
+		tests/backend/dep/test_core.py::test_extra_met
+		tests/backend/dep/test_core.py::test_extra_no_dependencies
+		tests/backend/dep/test_core.py::test_extra_unmet
+		tests/backend/dep/test_core.py::test_unknown_extra
+		tests/backend/dep/test_core.py::test_version_unmet
+		# broken if CARGO is set
+		tests/backend/builders/test_app.py::TestBuildBootstrap::test_no_cargo
+	)
+
+	# top-level "tests" directory contains tests both for hatch
+	# and hatchling
+	cd "${WORKDIR}/${MY_P}" || die
+	local -x PYTHONPATH="src:${PYTHONPATH}"
+	# sigh; standalone test suites are overrated, right?
+	echo "__version__ = '${PV}'" > src/hatch/_version.py || die
+	# 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
+	epytest tests/backend
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 7eafa1dbf137..0cd62184c902 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -6,6 +6,7 @@ DIST hypothesis-6.75.9.gh.tar.gz 9372102 BLAKE2B 9588536fade56f4f87f54a0dfd7c911
 DIST hypothesis-6.76.0.gh.tar.gz 9373576 BLAKE2B ed580296f163f9808597aa3a7b2ceaf1ea43431a9049ffdba229dc0f7886c8ee42829c45c98cc8ec0aae7d1f41f455f7ffd818beb1a956498ac4d676cd72b678 SHA512 2e46762a3bcc595c92eb57e65b2c7ef07062df1c393033efd2cb6b3c774ecbbe41f672e7b6c63ca0e8afb732c0f5308dddd6908bc2f43eab5c0713a6d688d5f4
 DIST hypothesis-6.77.0.gh.tar.gz 9376438 BLAKE2B 2c80427a43481fbc837042c8481e56f1186fa9026c15902f489b1d26cda216f33df6da2025e37d8b37676047d7a8be1f0aea686ec0d2d18178d14e5e8f08f24c SHA512 17c1a0d1b00c0bd9a4373c5cafa7f58f4f6c85a85a107f4afff7064b52280a21210502c555291a580c81c1085f7c5fdd9db91391b29b2af6e476c83f4838fe1a
 DIST hypothesis-6.78.1.gh.tar.gz 9376599 BLAKE2B c0998212067e947af71f17aa5f76609ed71cf57cf4d71418329ec92ca663b202bc3c8d09936e147304744d81d01f9ba0ae5f5cf369fe04cbcb95c351a3a6cd06 SHA512 5491dfce1a8a25288aca345a6a6f8b88557b3dc2a08773ee2aa10d133d9b44b9bddb4d7584ac99046a006f3d9fb85713b6b38f5cc635ddc437c8fb4bbe58a866
+DIST hypothesis-6.78.2.gh.tar.gz 9376858 BLAKE2B 8bbc6e373a9dd67b47922c4ba9f938f90d154a945f7142d07304db11b5b4e4d53b21605e4f7be24fb413153a2edf9c54bec01409a72abfb8fb31b43c87836ede SHA512 65ea4396365a3f4f1740d61cbcdf0eb380f99c133d582b56ee3e557bcc4da0d329ac832b38dad64c5e5fb7afcace55a17cc22fbb15ea1751508488983a1d7cef
 EBUILD hypothesis-6.75.3.ebuild 3332 BLAKE2B f8f40533ab1e341d563093f901fb42bbe290927d1579c201389e5c210d58dd883f5a9cd5819829b76c9cde8c6e0031a8a0234c99d0465855dd699e59b72d6a02 SHA512 f9fb85e22f3d7df7e5eeb0d6e09b5b4f294e281e222e7ddc80b0b92b92b7a6cd80a3eb4e6ee3eaa6b5ef1a2bd7248291e160c584b3d11b5b0a5649f01baca079
 EBUILD hypothesis-6.75.5.ebuild 3392 BLAKE2B fb6424f2cc03ef7ae8806ba24f845896c3af5dbb55a52ff60e423f97bf9811a2cf1aca9568260ff75901595a8a8423cae319205c4c6a750510f4751e5019d178 SHA512 3d3ca613a80fb92cec796a1dbcfa3c7d3b1974d9efb7dd268f09a67de4835a6962e82ab88840da75025cea10123ae31807a4497a7523612b6483b78086538e4d
 EBUILD hypothesis-6.75.6.ebuild 2729 BLAKE2B 3d6ec95c344df3c3cdec79154e841feda590af529b846eebc27004200f79dc6a3ef8bf4fa6536f4db23253dd85acd9447fd720f8f25e2afdb940ddc375e2a3da SHA512 da23784648e0b2d3e99f015b1812c8da6085dcc9f74132f0cc2beca59cacaf4466ef97327571bbe5f17133e890c4919499fba402e73bf9a4fb71afa2e1afc09d
@@ -14,4 +15,5 @@ EBUILD hypothesis-6.75.9.ebuild 2919 BLAKE2B a2ac6f16eead88aef808d3dcfc8f0c81f8b
 EBUILD hypothesis-6.76.0.ebuild 3054 BLAKE2B bf986d67fe5bd3a4ef72229835f97404c73f7beef0b112a45ba958c4385c6197d5567fb8c154d83cb80912c51995106f5d3ed430288776ee0c01bc4e21f8713c SHA512 bd251c47b821ad6eb9ab1e68f08c2542e58724e4cce3384b0ad476b83577fe6135fa0d0abe5494b3c89af38962ba458d53f1e07018dcf04bed15881f26dcd7be
 EBUILD hypothesis-6.77.0.ebuild 3054 BLAKE2B bf986d67fe5bd3a4ef72229835f97404c73f7beef0b112a45ba958c4385c6197d5567fb8c154d83cb80912c51995106f5d3ed430288776ee0c01bc4e21f8713c SHA512 bd251c47b821ad6eb9ab1e68f08c2542e58724e4cce3384b0ad476b83577fe6135fa0d0abe5494b3c89af38962ba458d53f1e07018dcf04bed15881f26dcd7be
 EBUILD hypothesis-6.78.1.ebuild 3054 BLAKE2B bf986d67fe5bd3a4ef72229835f97404c73f7beef0b112a45ba958c4385c6197d5567fb8c154d83cb80912c51995106f5d3ed430288776ee0c01bc4e21f8713c SHA512 bd251c47b821ad6eb9ab1e68f08c2542e58724e4cce3384b0ad476b83577fe6135fa0d0abe5494b3c89af38962ba458d53f1e07018dcf04bed15881f26dcd7be
+EBUILD hypothesis-6.78.2.ebuild 3054 BLAKE2B bf986d67fe5bd3a4ef72229835f97404c73f7beef0b112a45ba958c4385c6197d5567fb8c154d83cb80912c51995106f5d3ed430288776ee0c01bc4e21f8713c SHA512 bd251c47b821ad6eb9ab1e68f08c2542e58724e4cce3384b0ad476b83577fe6135fa0d0abe5494b3c89af38962ba458d53f1e07018dcf04bed15881f26dcd7be
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.78.2.ebuild b/dev-python/hypothesis/hypothesis-6.78.2.ebuild
new file mode 100644
index 000000000000..e338c8f52ddf
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.78.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_12 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.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/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.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,pytest_forked,_hypothesis_pytestplugin
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_IGNORE=()
+	local EPYTEST_DESELECT=(
+		# these tests can randomly fail with RecursionError when run
+		# in parallel
+		# https://github.com/HypothesisWorks/hypothesis/issues/3671
+		hypothesis-python/tests/cover/test_lookup.py::test_resolving_mutually_recursive_types
+		hypothesis-python/tests/cover/test_lookup.py::test_resolving_mutually_recursive_types_with_defaults
+	)
+	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
+			)
+			;;
+		python3.12)
+			EPYTEST_DESELECT+=(
+				hypothesis-python/tests/cover/test_lookup.py
+				hypothesis-python/tests/cover/test_type_lookup.py
+				hypothesis-python/tests/cover/test_type_lookup_forward_ref.py
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
+		tests/cover tests/pytest tests/quality
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${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/ijson/Manifest b/dev-python/ijson/Manifest
index 7cc232bdee71..5b519ab4ca02 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,5 +1,7 @@
 AUX ijson-3.2.0_p0-py312.patch 1213 BLAKE2B 757619c8d4ecca674a1f211aba2430659585fdcd9229ce4f6525b4c70a17d06a72fc4c85d317740ab576409f6f3247d777095860e873f5dbe50ed8bfb70bde97 SHA512 70b79da91ba42369b43d6a3719fbaaaa8ddc907ef54a256b36af875e9f4fafb0e8a1adc2eb3c7a756c521d3c8861061cc8162e6361a5e1ce3666aad887fb7484
 DIST ijson-3.2.0.post0.gh.tar.gz 127558 BLAKE2B 38e06039bb177c43e4744f145fed2159e317a0b8da628b85a62215cdfe6693b271c39629811513d2e563b532244950616b9105134916bc577446a0b5e5ce25f7 SHA512 b926253a3d6a070e2ac27c61542d340e4a1498de7642957dbe59e9fd3c53d700ed4e8ee71c83efcb90b2c302d15b0d268c38054c10728bbb436521aa5b42050b
+DIST ijson-3.2.1.gh.tar.gz 127577 BLAKE2B 1b3c8ce6d8b01d0cf4af4d8995bcc33d879321ed5b89c4b6baa84ef10cd311a1e66254113a17229c228c26e2b996a52c4b0629b42dbd830f296fd4903b603468 SHA512 2bd3a978016fbbd3f5aca6644778d19478a561f40729206eaa4f14e30fde4ff3b92c8aa33c928cb9e81c678a5a84fa59ab68e747421d725e77c79a9c987e4536
 EBUILD ijson-3.2.0_p0-r1.ebuild 769 BLAKE2B 64eb16600741a1371448b80c6851a2efb6fc731b974bd4f64af5718730c048be8113b678fc4d6d0a027b7c61af72157bbb99dfb11c480d9286ec6e23be103e96 SHA512 d1c912ed65e140f2f8e53a532b94e33ca68b40a48dde1c716686c34deb85d7a39353f73b021faed5288c6fc07bbe08b66e39dc54c96305b5c197b73dedea9f49
 EBUILD ijson-3.2.0_p0.ebuild 639 BLAKE2B 5da344583890ba2d5845b2643c30a68db23b347b42c840d67b6fdc8e35adba630fe2e6d301211a8d047c863816096bc33a3396d06dfcaaaf84a98807ba98df5a SHA512 1879d0c2ca6f3b8c592682b6e41a821c5152dc18634eb3650a790a86e20ce07dd66488b153e73a5438043813606a57b455449d3d778ce00292c2e089c0dfff69
+EBUILD ijson-3.2.1.ebuild 726 BLAKE2B 308b995e1e775a1905fe10bf9bfad6014451884755bee3b44207b921a32888f93737b22c56028ece6291302d579e0452095fb1ba615d682a0121594192834255 SHA512 9cff031c2b22fbeee6e5331747ad61567f664774a43ad61ead17e2b3dd0836ebb649ce3598db31c84d3805f3423067bf525c421e518fe7aa5a4e85f9485e4539
 MISC metadata.xml 372 BLAKE2B 9fd70113a6731ca09979bacb2153df2c26db31ef9cb2a95cc2de2201aeb5348a6344fa6dab27a0880a9d70cb4498d39a4ef9cbcff6127932d5af3c534e21b5c2 SHA512 5f3747561e4c802300860b9d2f27b08acea3979e8cac48bf6145c4cbeeb3ec0b3d765399d0ed8fe01947860d78dea0faa0839cb393e066ec0aaffa2ab2661398
diff --git a/dev-python/ijson/ijson-3.2.1.ebuild b/dev-python/ijson/ijson-3.2.1.ebuild
new file mode 100644
index 000000000000..e0e41874669d
--- /dev/null
+++ b/dev-python/ijson/ijson-3.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+# _yajl2 extension is known to be broken
+# https://github.com/ICRAR/ijson/issues/98
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1
+
+MY_P="${P//_p/.post}"
+DESCRIPTION="Iterative JSON parser with a Pythonic interface"
+HOMEPAGE="
+	https://github.com/ICRAR/ijson/
+	https://pypi.org/project/ijson/
+"
+SRC_URI="
+	https://github.com/ICRAR/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	dev-libs/yajl
+"
+RDEPEND="
+	${DEPEND}
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 448f6ca08996..07cbc2900ec8 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,7 @@
 DIST ipykernel-6.23.0.tar.gz 151969 BLAKE2B c41aac053b27a2e3618831f8d6458b21877b4510062019576fe98f921b9485fe180f2bced09c0a8ddd930af5a386a09d4d13a2ffbb78e58d71bb7a7cea1c91c1 SHA512 d852742bd858639d150864d343da23ee915c2034b8fbad7875755ea580be80b5faf553c16af65c50001f214979cd4a80c89fe08e4db7198754b554de0101a1d1
 DIST ipykernel-6.23.1.tar.gz 153370 BLAKE2B 654998d46851bcc55d3c0c9c6134f3fcf8c81c2552d5af6dcdbd791e1ac98ed223a59aafc9b7b4260345f8730d243d3c82d4e19e03935a368a0a0154de547cb0 SHA512 8f3921789c837f7c046eed4ffdaade2273b6491cfd97b9a192a256966a66d58c1ad93cbfa69a5e933e052fa35c2c7a4671a652ee9f2bb2cca5a156c79df0f14f
+DIST ipykernel-6.23.2.tar.gz 154126 BLAKE2B 75289aed8e3eff98519fc309a802e440b4486a89f8f62717facb85c04fa03405bb0b1200f5c61e07dc6c96e4efda67473a50cc677fc438b7ec8f72157f084859 SHA512 f3c05d145aea0ada4a11486357895b9938d64cbebc4a7265a6bd1246dfbe0a3cba1ad4ef1de900115ce24d6a0bdfda71eb6d7a06980366f41c410e22f73ebdec
 EBUILD ipykernel-6.23.0.ebuild 2304 BLAKE2B 1b483c39af4a5c097b3694bd9b9d8ca75641206f4c209522475fd76dc5d5c68f299e6f6d9f458a2811734c2d31b14c3288be0af60ad49341e6a1a005f90b76c5 SHA512 4b50e459e4ad311f7c74fe1ada9f4be0091a881f0f1409b749a29d17d0c282067ad305d8637d1d0ebde420751c0aeb8425fbcd9251ed92f3a24a1137372ac50b
 EBUILD ipykernel-6.23.1.ebuild 2312 BLAKE2B 9713aa23c05d561f240fdb1a92162f14b7861fb977d45e4cbe7c8ae280b9143775cedda780e78d03e0d9a7480934b9b1eb78c989a0920d8b56ac452ebfc323fa SHA512 ce4d9d500bb46d60283ea645ee80df8444149984eb38fd8b9b1d1c14ca11fda32e578c68e2e44f824d714d780b3c8152cc9f222a61dc11c6960631ef34c2c10c
+EBUILD ipykernel-6.23.2.ebuild 2312 BLAKE2B 9713aa23c05d561f240fdb1a92162f14b7861fb977d45e4cbe7c8ae280b9143775cedda780e78d03e0d9a7480934b9b1eb78c989a0920d8b56ac452ebfc323fa SHA512 ce4d9d500bb46d60283ea645ee80df8444149984eb38fd8b9b1d1c14ca11fda32e578c68e2e44f824d714d780b3c8152cc9f222a61dc11c6960631ef34c2c10c
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.23.2.ebuild b/dev-python/ipykernel/ipykernel-6.23.2.ebuild
new file mode 100644
index 000000000000..3ae331be622c
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.23.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="
+	https://github.com/ipython/ipykernel/
+	https://pypi.org/project/ipykernel/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-8[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-20[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
+
+src_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		ipykernel/tests/test_debugger.py::test_attach_debug
+		ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+		ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+		ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+		ipykernel/tests/test_debugger.py::test_set_breakpoints
+		ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+		ipykernel/tests/test_debugger.py::test_copy_to_globals
+		# hangs?
+		ipykernel/tests/test_eventloop.py::test_tk_loop
+	)
+
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/jsonschema-spec/Manifest b/dev-python/jsonschema-spec/Manifest
index f8100e82806d..02e8be8a4a72 100644
--- a/dev-python/jsonschema-spec/Manifest
+++ b/dev-python/jsonschema-spec/Manifest
@@ -2,8 +2,10 @@ DIST jsonschema-spec-0.1.4.gh.tar.gz 30903 BLAKE2B eae7ba8b811dfd14d9b2e33d3355b
 DIST jsonschema-spec-0.1.5.gh.tar.gz 36035 BLAKE2B 4e6019fb1c7f5e85a03488e00ef080798bc6e3e06999d9c9c931072c640fd74b5125882e43dca26bad1acc3bdacb06a26f2c95dff25339e3f8b785d759085a49 SHA512 c76b15a3ead9498696c80cf7a378a675194837f04cd88d81be5213a38cde8177d5e8f7866d007648b7013db74d1057b700b027a79bcd893b0d493269abcd621d
 DIST jsonschema-spec-0.1.6.gh.tar.gz 36043 BLAKE2B e85cad336d6b5ed11d6a51c8fab2c28826f6a9836ad50d2423b23bef047c338307d3e9430f1d151dbaf7a92574c9899dbfd016c570456996250e8d7634373313 SHA512 78ea06a78fd25006d270e2c5033645133ee79b0f45cbfc54e250d4225a36beac59cf9aa92f15fd51bd101fac20fee990d693ab91d8343cd6a298d71735c80884
 DIST jsonschema-spec-0.2.0.gh.tar.gz 37210 BLAKE2B 44892638371f8ed9074c997e0590594a55a4a00bb0f88bbe535021726f1de6b961825a710c7f1ed63081c5ee7d252bc4f5bcc2cb462ded71ecb492625876c811 SHA512 6bc9f50f9132a72243df1a20d16d049ca1413904fba5403fb780663c0819ae3be8dfd51efada84118e34e157e95475e375df9c6ce1e1930c72c6d45dc71d4d04
+DIST jsonschema-spec-0.2.1.gh.tar.gz 37242 BLAKE2B 8e1b2c4e44052fba0e78cefdf0a60a1e14adbe9f0027464d87e635bac7bb2ce1aefe65c92a1224877128ee23505402f199aca119cd48769d9149d57b5f9ec7ea SHA512 1d1769e301f60c2b2a1e7b413e5d1081f3e069bf29ad12d5e3c4b0c91094c8e78f44b01642a9a58f229e5efe69db14276cf067d9dad37d53c8a35368bd62d6d6
 EBUILD jsonschema-spec-0.1.4.ebuild 883 BLAKE2B e87ea592fc33a139f5331187ac1481eca4e882b0ed127c03a872fdb5de35d7f99248730c662facfc5b04e2f8a64d4dd7e55723302173c6e810c047dface884e1 SHA512 274cab96825ee1f5c000ed31628ba3512bb86b349fa284aba43b24f2981bc62118b9ec1174d7357d100ee752763d82695c032fbadad57f5945b52f9788c23591
 EBUILD jsonschema-spec-0.1.5.ebuild 974 BLAKE2B cd30e483f2ddcf21db668eef5511054d89e2f850e0f7831210801da88ea953e833150824d818ce7bea87291b732e044f26585d72406064f5cff6ee40110fa794 SHA512 50d9f89d3d151bf32b07c06537061be5f16a1b7e3c33fc630ab2c11526401edb92e3fbad71d293facc3e96c939db91d6d29bd280d2c47e73ad383e150bc6119b
 EBUILD jsonschema-spec-0.1.6.ebuild 886 BLAKE2B 1cef95edd89d5ea9c713e597afd2f0a53f8d9cab8836f7663807681144396684999c4ea244b3be9259e2a1504fed5c3ad7837b4f3b87e1ff5a8bc3be728c04dc SHA512 26697d6b1ed19e27a38eb54fa00cee2201c7751dbc5ade49ad213f56159ddac21e79073024902e9c7be14862d241a4fa615312628a90aa221551fe07a13674ed
-EBUILD jsonschema-spec-0.2.0.ebuild 934 BLAKE2B 55113a9be2e5492c72ed09b1dc2bbd4374ac980ed4238a900f8fc8f242e482eb9dfc1e76a214c1d5345ac113aba979e8212f8b96189ff8d1c072254ae2b32ec1 SHA512 aa1fd05c04a496611d4bec7f60ecc7aa819ef990036f3f18bd35291651fb7359143cded5a18820612c9dc23e5f630732ef5299ca910d568bb86cd9c18f768b44
+EBUILD jsonschema-spec-0.2.0.ebuild 1000 BLAKE2B e61835a677a8edbf1437e6a33b4bb57250270235f22bfdc6dad156d47e6899d265b68e1ef0443c4f697ac8b22cb6586da215c73da4a00b91d08ef20c68e7710e SHA512 40cd61bbad36cf89a056dbabfbab1973237f3be5a5d376f9c3279a0bb183da78324ddfba892a60f22b2838886c96e2b61718b2e12ec784dd21b2dd38c9ab87f1
+EBUILD jsonschema-spec-0.2.1.ebuild 1026 BLAKE2B 282992422fe38617ed50968d33d1ef024e182e9f2557e35bc2d2abc4e4fd0faf230ad4be95e50e9cd4d08f35298f926698fe70e67a9acbce24b49e7ba9786bfe SHA512 fdb5f98aa04356a7499b4f2c5aaf2af38e6bf4cd864ec76a709165685b2307a2474a5650cf21e5a93271ca9c2b5fd6f8e91412f8f8b9b92ac80db61178892b8d
 MISC metadata.xml 404 BLAKE2B 2e76fe1eb441114cff26e2e60d36d2d38da053ca524a29f568d2b4af325021ab560545da43cdd0d5d3404e73ebcdb9b534da0b7de52c2acee5d3f2ed6511ee4e SHA512 58238e60fc20d210167afe2abcfdbbd826a693b5d587953437294c2c0e1ea9161486e2c583d29a7e2a0c8343e70e7688213ed011eacd155c53e232b336986701
diff --git a/dev-python/jsonschema-spec/jsonschema-spec-0.2.0.ebuild b/dev-python/jsonschema-spec/jsonschema-spec-0.2.0.ebuild
index 616ded180470..175114048014 100644
--- a/dev-python/jsonschema-spec/jsonschema-spec-0.2.0.ebuild
+++ b/dev-python/jsonschema-spec/jsonschema-spec-0.2.0.ebuild
@@ -29,6 +29,12 @@ RDEPEND="
 	>=dev-python/jsonschema-specifications-2023.3.4[${PYTHON_USEDEP}]
 "
 
+BDEPEND="
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
 distutils_enable_tests pytest
 
 src_prepare() {
diff --git a/dev-python/jsonschema-spec/jsonschema-spec-0.2.1.ebuild b/dev-python/jsonschema-spec/jsonschema-spec-0.2.1.ebuild
new file mode 100644
index 000000000000..b787a5095c32
--- /dev/null
+++ b/dev-python/jsonschema-spec/jsonschema-spec-0.2.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="JSONSchema Spec with object-oriented paths"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema-spec/
+	https://github.com/p1c2u/jsonschema-spec/
+"
+SRC_URI="
+	https://github.com/p1c2u/jsonschema-spec/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=dev-python/pathable-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/referencing-0.28.1[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-specifications-2023.3.4[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	# remove random pins due to caret operator
+	sed -i -e 's:\^:>=:' -e 's:,<[0-9.]*::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/jsonschema-specifications/Manifest b/dev-python/jsonschema-specifications/Manifest
index a0917c28b00f..16d91a07e265 100644
--- a/dev-python/jsonschema-specifications/Manifest
+++ b/dev-python/jsonschema-specifications/Manifest
@@ -1,3 +1,3 @@
 DIST jsonschema_specifications-2023.5.2.tar.gz 12581 BLAKE2B 74029c066e3c620126ed0ed7e70a9b63c017aeab827b0187f8c8c5964c2e1ef68a83489f4646d79653c38fcec45bc001189fc09295ac1f569ed288f2dc469459 SHA512 222a70e3c1673c6f3d27f5d6561d4ba192c61a8a6f86e726939d1e29843eeca82de306a889540ab352a5c2332cf30d810db956aa5094f2a6bc6607b7169513fd
-EBUILD jsonschema-specifications-2023.5.2.ebuild 611 BLAKE2B 358ccb57fd1d930903d513aa9f86fc04817cc2d526e7b66e465a3d86b0939462d6ac8a9f23ab88d8200a2018820e74d2cd367fa122bdd5ae07105c0406e92b7a SHA512 f2969ba5d08a2b680a41bdc2d10b64ca6b896d9e511c02853e20c4abae000f55c0a04a13a6cac4922a0cd93888b4aedfb10b931916c13a653617b996eb136ade
+EBUILD jsonschema-specifications-2023.5.2.ebuild 618 BLAKE2B 1e07cc9b380f661c3e6254eef681188984768c097f0a7e3336e2cac2b348ae206ec92d2534764850b91117d4cdb078f392599baff7c31214b8c6e73264a20de7 SHA512 5d96c71d00debce415811193c7acf144659236926fc1ea65a6ca655642ed709de873353de0362335f651d05af5e07dd157589fcbe9dc703463abb94f2f1b2b9d
 MISC metadata.xml 414 BLAKE2B bc0046f51a008fe67f4937f8e9eb2663c868a41fed9371301575f74fb10c38f10b21a380d865981b317189f8c25e3ef6fe18423a169cda92b1d2b1a14dab8948 SHA512 e50f0eed8995fce7e207cb5c15106f3980ebb9c3d9d0042d33c4843be231f90aa652e59e1f83335f336d9b906a38252a229c1562f25142604048497608d29794
diff --git a/dev-python/jsonschema-specifications/jsonschema-specifications-2023.5.2.ebuild b/dev-python/jsonschema-specifications/jsonschema-specifications-2023.5.2.ebuild
index 83bff223f462..46d56e086c48 100644
--- a/dev-python/jsonschema-specifications/jsonschema-specifications-2023.5.2.ebuild
+++ b/dev-python/jsonschema-specifications/jsonschema-specifications-2023.5.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	>=dev-python/referencing-0.28.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab-server/Manifest b/dev-python/jupyterlab-server/Manifest
index 8830a4f706ba..5abf921c10f1 100644
--- a/dev-python/jupyterlab-server/Manifest
+++ b/dev-python/jupyterlab-server/Manifest
@@ -1,5 +1,7 @@
 DIST jupyterlab_server-2.22.0.tar.gz 71374 BLAKE2B da27d6fb6d22db4aacd4c6c7a96ca748c5ba95d6b357fb45aa3383642b23bff7b61298eb01b8a80073080248e06fae35e04b1a7e4144018e84a6b548937ad0e6 SHA512 96484afe03a23f4aa6492b15e64b3f874b144af371d65c94693b708f9152e2762f98f0dea2b7464f8240740f4be56b2cd61a8869ef001521bbb4748dd0fc7005
 DIST jupyterlab_server-2.22.1.tar.gz 71443 BLAKE2B 37273cb3251f358607936bb723e4c9b7d15aa9c6c0193d9cc14b5cf2ed07a5a50d8588b42c243193e3efb30cf0e000c6ea19f725e0f2c943eaf56d3b161dcbd9 SHA512 01d223b59ac906b4bfd5cc46db375abe67ffd518422625cae06e08266bee908dcf34b4544ff8f12aa45c9ac00a6473e164735423a9c55290f922a0e2d930eaa9
+DIST jupyterlab_server-2.23.0.tar.gz 71812 BLAKE2B 4d1cd379e9864f16a463f630b2b30aa18b88c9e71ea591d396b15834b08d567b3dbd0e6de637f975d230e17987f49eac3917ce2cf951dfd493ee75e612b3b46e SHA512 cb5ae1125487c79fa9d54201e0512fac9ff3f95022eafacd0bf46cb853bbeafe74eff767137ecb5559713cd8baf721f7fbc41869dde9ef28c480197a4158967a
 EBUILD jupyterlab-server-2.22.0.ebuild 1962 BLAKE2B 02abc58b2676bb4e6917f33bfdda52bff3ee9fa50409f585ececb1d9ba4ef3491fbecea0e4a3befb8a93cec1a4aea1fb0fc019f679e185229db8b4ac8e2c42ef SHA512 f836776b3c0dbadaf416b1903472c052eab9fd6d2d14da99fbab6bb27f30b6ad70174e8d67cbbdcb65ad17fc502396fe5887069fc81382c043b80f4e4e7a729b
 EBUILD jupyterlab-server-2.22.1.ebuild 1962 BLAKE2B 02abc58b2676bb4e6917f33bfdda52bff3ee9fa50409f585ececb1d9ba4ef3491fbecea0e4a3befb8a93cec1a4aea1fb0fc019f679e185229db8b4ac8e2c42ef SHA512 f836776b3c0dbadaf416b1903472c052eab9fd6d2d14da99fbab6bb27f30b6ad70174e8d67cbbdcb65ad17fc502396fe5887069fc81382c043b80f4e4e7a729b
+EBUILD jupyterlab-server-2.23.0.ebuild 1963 BLAKE2B 1295fc2e33539a0bc16e168fad6339f609a21df65d12937fa288f761946c49cdf3eca3836a0de9ee7b557697df3be190174f22aa3d3106ecd42d6caaec9072a5 SHA512 ba3094e8d970dc468779cded20d00886d2b07cd9c389975cb2649178606fee8a97ba49340f5f2601aff5d000eccae5dcfe1ba1475e57174bcea28cdbc92e9458
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.23.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.23.0.ebuild
new file mode 100644
index 000000000000..63248e77a9e3
--- /dev/null
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.23.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=hatchling
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyterlab/jupyterlab_server/
+	https://pypi.org/project/jupyterlab-server/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/Babel-2.10[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/json5-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.28[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
+	' 3.9)
+"
+
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/jupyter-server[${PYTHON_USEDEP}]
+		<dev-python/openapi-core-0.17[${PYTHON_USEDEP}]
+		>=dev-python/openapi-core-0.16.1[${PYTHON_USEDEP}]
+		<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
+		>=dev-python/openapi-spec-validator-0.5.1[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# TODO: package autodoc_traits
+#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst-parser
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		tests/test_translation_api.py
+	)
+
+	EPYTEST_DESELECT=(
+		# Fails if terminal not available
+		tests/test_labapp.py::test_page_config
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_tornasync.plugin
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 4536f44fff55..e9944a50c7c9 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,11 +4,13 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.5.src.tar.xz 118000368 BLAKE2B 9f84e6bab450dc8d6379771afbca5cddc6fbad6c9728726f7158f290ab87d464ff657e89e1c8fc3c474362cc865ff13c5d55ef758c848ea3e660d732cb2fdefa SHA512 7008e7e9c8c2246fe98ba3f0c0fa91e41c88c4da427bf1cfdcce7ef57e5ea838efe7c58c523a7d1708e70d64a4338afe16d06fba2fc7ac5a6c19ca3d6ee41e99
 DIST llvm-project-16.0.5.src.tar.xz.sig 566 BLAKE2B 4c96f294f350e0086f8504a54c3387308c60efb573c8def40aec45b1918d43e36c44bafb0823625b6cefa5d99b3aacd7823d6c92c7a64a737653d5b51839a924 SHA512 4550c7c6a1b6ea603d1499aba5aca746f3948a00e7567604f5e7dc3b215a34357bad382a7ebea1f6cd7952841cb75a0dfbe2c278a8c6fcb630a5035b3e16e869
+DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
+DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-62c0bdabfa32f6e32b17b45425b15309db340dfb.tar.gz 190948645 BLAKE2B f41d8ea32e189ef4641e42628fb516e307c9a6fcf65af537eb9fc0d3186591b062c5e85c9e935511ef706f28c6994a774a4e3f36ff54d79aaac7b293a6168625 SHA512 55a4cbfec3a496c1918aa614e5bdee368e4d0b6641c946d8bf8b828ab4bf4d9b29dbe96401a172079d70f924f5e513428fe990c65b556a0a860802cb13f5e3a0
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B ff939004df0d10a698e942c99ecf3bb11fe8e0c035e3dfb0ac495f2368d83bb89cccb11de0878b3555c4047b8d0e4b969e5cec8aef8891aabf2d16a550696870 SHA512 7be9e5f983bffabf30c954e45ede8fb6b30013b84cbd50f66fa3a2185b0223b4ede7466d40376453283e9ca806da1ae80afe6e6fee001ede95b78226bcc7267d
 EBUILD lit-15.0.7.ebuild 913 BLAKE2B 38afb1ee0c64d7480ccf1c84c6c1ae0e1ff5f75a0b52272b68d50717a338f143214329245bd650e107d8091ffe1bef6b29293a4b47d147122ea6cea64b448b92 SHA512 fc58e9f0ba65f388830a4e935f448126eb61f2dcf6fa40750e6feaf8a5943fb259bd3c1db3877767e4ba9ade75f6204de8a33c14630176a34fa097e522a0a051
-EBUILD lit-16.0.5.ebuild 927 BLAKE2B 2fcc513071d5701cddfeeca945e109b6ea676c4cb8f8c6aa18ed6d1d196c44a118b2c78248ced457dbdd9301c8455247f2eef8df2675fe910fd342a6755354fd SHA512 eebce40ed9c187f89439dca4216a681c8d4bfc6c1f36abcbb73dca3c1a61033ae7967b68e4d2c36ae5c8f37bd352654401eca9b47135200f090bc9d7617c6b2f
-EBUILD lit-16.0.6.9999.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
+EBUILD lit-16.0.5.ebuild 926 BLAKE2B 9b574490b1ac69cb86ecce69ba0e0f7ee8b702102b0c7cc48bcda180ac10f3a4c716358a9d4afad87aecc7cbaa826de8df968b62b84ea17ec105629471c89aa3 SHA512 0a2e477e55819db17215c692fad07224676733b10e0bfd3bc2eb4a8cacee20ec93a517ceb9da22e70d12b9fadf3427520a34856a64ae567b8f7a3ae6ecb661ba
+EBUILD lit-16.0.6.ebuild 927 BLAKE2B 2fcc513071d5701cddfeeca945e109b6ea676c4cb8f8c6aa18ed6d1d196c44a118b2c78248ced457dbdd9301c8455247f2eef8df2675fe910fd342a6755354fd SHA512 eebce40ed9c187f89439dca4216a681c8d4bfc6c1f36abcbb73dca3c1a61033ae7967b68e4d2c36ae5c8f37bd352654401eca9b47135200f090bc9d7617c6b2f
 EBUILD lit-17.0.0.9999.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
 EBUILD lit-17.0.0_pre20230609.ebuild 872 BLAKE2B 9b327b6c517b40793c67fe91d5210862709bc34c193c0a43feced53083e4a400e550671250cc4538bc7d82a9b4e8d6ca4319491520838914056e0c0501a96c87 SHA512 a0bda5a79a6cddbe4d81ad2bf2e317dba0470cd731b427a6b342617b92c32f94bb5784dbd4c4a67cc6d3c30b28a76b7e805d92b277d320b88f366b5a4c9004ea
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-16.0.5.ebuild b/dev-python/lit/lit-16.0.5.ebuild
index 4275151b428c..c1938fa8df53 100644
--- a/dev-python/lit/lit-16.0.5.ebuild
+++ b/dev-python/lit/lit-16.0.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-16.0.6.9999.ebuild b/dev-python/lit/lit-16.0.6.ebuild
index a1f25977a11a..4275151b428c 100644
--- a/dev-python/lit/lit-16.0.6.9999.ebuild
+++ b/dev-python/lit/lit-16.0.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 llvm.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index c24aabc108eb..f996fe788113 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,3 +1,3 @@
 DIST meson-python-0.13.1.gh.tar.gz 69434 BLAKE2B c3442eb1c066772b80efe4e41764897df85a3581c94f9d958951af04e9ad7a01c646c7ed7f0104fbe957567e16b80c6e3744ab23b6b66a8df3cc920cb68c852f SHA512 037825eabcaec5bdb73890114ecfcfb05373bcb5e2806a8d38e4afeeecea42aa14f9c8cf0bec151bd231e2984c64608b28a1ec79640485933cd57c8895b6a305
-EBUILD meson-python-0.13.1.ebuild 1354 BLAKE2B 27f76fed127c482600d33bb1900142f6a66784de51a87d80169cbddf0e2b98f61e31de2d94f0d56a28b73358f51bae265f674220cceb5fe9590b7431e9f614d9 SHA512 0f4002c2302ce14cb5335796fc445af1d3e6de2d0a08197dda957f46fcd5e1f28d7b580382f7d58337285ff1ff45d244aaaeca8577704e3499c884edc0eca288
+EBUILD meson-python-0.13.1.ebuild 1355 BLAKE2B 34e4e0425f890c6e951bd9ade3d8c810f18396d14df1d8acdfd89a8503e07b20e7b3da4f8c0854f7968756d9afb2eaf94ce2c3dc63737bc420ee7eab4d8ed854 SHA512 ac8417492f3426b091958fbfa6c588d99aabf77b787aa17fab226322c0e3dcf2a80a1090dd5dca462e954021499bbf9de86ed88af875fa62f4bb4a7ea98bc622
 MISC metadata.xml 357 BLAKE2B c2b5fd8c6ad39e92970a5e6c1db8950b4850660c9a95a84063504ab75e5dd69e3ab844fcef23cb51f33493b7e522a6d26227ff48dd893c92c422badc70f3c962 SHA512 1402ace4da543de7320a1d97f44177593807d5be9f1891d8a53190581877569508c46fe6b4ce63516c7fee2d2165d59d39f44343dde18438570883da3f4ad28c
diff --git a/dev-python/meson-python/meson-python-0.13.1.ebuild b/dev-python/meson-python/meson-python-0.13.1.ebuild
index c05309ecfada..34fc8b4454e3 100644
--- a/dev-python/meson-python/meson-python-0.13.1.ebuild
+++ b/dev-python/meson-python/meson-python-0.13.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/myst-parser/Manifest b/dev-python/myst-parser/Manifest
index 13d0b074d73a..9db65d8d18e0 100644
--- a/dev-python/myst-parser/Manifest
+++ b/dev-python/myst-parser/Manifest
@@ -1,3 +1,5 @@
 DIST MyST-Parser-1.0.0.gh.tar.gz 813309 BLAKE2B 03bc080e0a5103b9fb239cfbea991012b1fb5f411a5a6a121b2113ad7172a1130bf8b77d20ce84a8aade4148ffba36788eb95b15ecd28c53ed321226ae8600f2 SHA512 1f0ecffd2c84b0db5d251dbc771457cdf52a8e6e540d3acde563115af24ce30d43e01223f172b3e72b2c81862052bb05ea5d7c6091f933afbda0a859d1b86e83
+DIST MyST-Parser-2.0.0.gh.tar.gz 815453 BLAKE2B 8f5dd823c3c79d843b45a7a4819d5677b51a12f78db2c1ce9700eb6faa8c4f0bc167fb1d8cd947e89ffab85aec947ab527b67dc73ef4db97a393f700a4331738 SHA512 c47bdd773565e93c4714d318a70f9a8adab1be6e2a63c23175667fc4afb5da4d66b84e11176782c8202e9fd68883e74d444911ddfb0b91356c2ba07fa65f7ea4
 EBUILD myst-parser-1.0.0.ebuild 1617 BLAKE2B 19e6bf03c24c2b8087e762fd1438f1abca2b594b3f89d40d45d0334cdd02eb6087bcd09c047bc14808dd62cbf8264ed9ffd10e1977fd128f953edf93fca3a857 SHA512 99f884a276a6900fe7ad9c407cb172f2cc934fedf184bcc97cfe05a332c8e2030cf05a27f0a700366232de39512a3d63c43e7eb3f44cd72713e2be1548d218de
+EBUILD myst-parser-2.0.0.ebuild 1665 BLAKE2B ad2f266e3bdd76bedf1031c517b397f2162045796c610fe5bd7f87bcf2dcb1999634f68237ccda8a4626e3cee4ea2c18b97552bd7a239fba6fc99fd9c246a191 SHA512 119b167484c6dd05ffcbc659e2a055803c3d5305e9cfefe25216150476cb09b2f491639f6d4976ce3b701bc5eaf8782ac8ff48ba67f6bd160472d8bad806d173
 MISC metadata.xml 406 BLAKE2B d8a974be3dd4fef4800958dcb1eef3124dc8e3ec49e6678d0db7d6096ef290019aa025796c4f7c38bc11b750d1667ba97d4429b64e7271009da707cd945e113f SHA512 acdc27a39e068c487306002342b9c0c5910d61ed34a7b62878272054ea458d5aad46fe24095a52666ed77ffcb6e703687cc83de0c9e2cef395a1decf9003d918
diff --git a/dev-python/myst-parser/myst-parser-2.0.0.ebuild b/dev-python/myst-parser/myst-parser-2.0.0.ebuild
new file mode 100644
index 000000000000..78026de7bf09
--- /dev/null
+++ b/dev-python/myst-parser/myst-parser-2.0.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1
+
+MY_P=MyST-Parser-${PV}
+DESCRIPTION="Extended commonmark compliant parser, with bridges to Sphinx"
+HOMEPAGE="
+	https://github.com/executablebooks/MyST-Parser/
+	https://pypi.org/project/myst-parser/
+"
+SRC_URI="
+	https://github.com/executablebooks/MyST-Parser/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/docutils-0.21[${PYTHON_USEDEP}]
+	dev-python/jinja[${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}]
+	>=dev-python/mdit-py-plugins-0.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/sphinx-8[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		<dev-python/linkify-it-py-3[${PYTHON_USEDEP}]
+		>=dev-python/linkify-it-py-2.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+		dev-python/pytest-param-files[${PYTHON_USEDEP}]
+		dev-python/sphinx-pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	false && [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		# bad test relying on exact exception messages
+		"tests/test_renderers/test_include_directive.py::test_errors[9-Non-existent path:]"
+	)
+
+	epytest
+}
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index 873306290b45..40ebb1d1b745 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -1,3 +1,3 @@
 DIST nbval-0.10.0.tar.gz 62727 BLAKE2B 5b8d2815ec38481da1c0b3b5b62f809a231c4d136499b73ef13dba6a5214c87a5d4f77db1d81488e1bf13bd3ff365414e75760763a56a3cc28e752dd316ac009 SHA512 3e0e495db40aa4969e03ed1359f0c509b7470a54b3d8b6a85731601af5da0407bd44b3f069178f1a6b3aca7bf243747aaeaca4cb2332912e917e360f705eae61
-EBUILD nbval-0.10.0-r1.ebuild 1039 BLAKE2B 445a4dda0a7504c1b928ebd28a016d29e3b134da1c2f0b27ebf0fa5d352a245be94967eea92e0ab2a016aedebc57291c64ea435ed1d5802696d6d241049d39de SHA512 8e6ff51e1c8ec8d1fe5caa86cb082089f5fedd9e18e48cfe861dee5e879cf753bd63074da034cb7173bf7f62fc87c4ba01b52f4933594fd014e7a7b9a8fd48be
+EBUILD nbval-0.10.0-r1.ebuild 1045 BLAKE2B fc44c7767fdf1b391da778d84088759b17f1bd26f7ea73c9b3c7e7408db83036c899086159d6be673847742336cff4895dda899e1f61a73debac2f9a39fbb541 SHA512 1d834d39801dfde10f9b31921c66fd2e6984d00a404b9c184218bc32076d232e43e2243497c25b942e23190d7e886eb947bc6358630be88d88a9122d14cf768d
 MISC metadata.xml 984 BLAKE2B 1f5a69806d70ed9aa5c0cf2a7f3466afc76e8b5078923142d10aa8ac5a68ab41dc54cd2345cef061236b7b68fc13fc76ff7a072b9fec8697eae259272a32aefc SHA512 13284c08e700976e1da78dbfe0038c2cca1d1e3f286726c4096ad53ded3b6ebbaabd51e105f70781be57293a46d8e2de3116e406cee4ac35d2dc80f1a165a7f8
diff --git a/dev-python/nbval/nbval-0.10.0-r1.ebuild b/dev-python/nbval/nbval-0.10.0-r1.ebuild
index 08f869b90924..a141902adfab 100644
--- a/dev-python/nbval/nbval-0.10.0-r1.ebuild
+++ b/dev-python/nbval/nbval-0.10.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/computationalmodelling/nbval"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 12797b5d7807..73dcccf5d71a 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -2,5 +2,5 @@ AUX notebook-6.4.11-no-mathjax.patch 1527 BLAKE2B ccd6d1af303eccdd0eacb760d1b741
 DIST notebook-6.4.12.tar.gz 14389641 BLAKE2B 1cda6a1eb1f4e7ccce964153bdce8de243588ffd4abcc5ab6687ba0ea347d68c5dd239c2af5bf93809409d850747db28df72be5c2ec03bfd06b725976ae1c599 SHA512 1314cfebe97ddada61e1013fdfd606bed08908c06b58e59f2fda6e63c43a1158eeed6a93a5cddbb609ecad0347bf80ee3a74747104fd29942629734c1ea749f0
 DIST notebook-6.5.4.tar.gz 5785832 BLAKE2B 28845c51c244d08b12e6a2853d3407a2af9e351f1501db8e76ff4f069e656d9bf27c3d2893b38f3f2bb51cedf38658219be3843a3397a588046d55bf445d3222 SHA512 72bf4efa4d553a6265c72e188ad0ee085accbbc05b0af182531c892303149d83f38f6d410f1bcb2c835071f713cb4267d58324b982b4087caabf9b46b8d77cfa
 EBUILD notebook-6.4.12.ebuild 3072 BLAKE2B 699c9b0bfca4584085ed1cc0b78eef14d90fb68a977e272dcba45b3f30db56ceae9611a4b366f75ef503ee0538e59bd65a9fa40b12cca19e7002d1b563db9d3b SHA512 bd434524ecfa0951f11167c0833ac0cc9207ca28078c29d678727a32aa245505f443f7095d59af24d8c1747d1d56b5d0deb91f1279cef86d591e1c53352ca2b8
-EBUILD notebook-6.5.4.ebuild 2852 BLAKE2B 590f25570879860ac71a1879edbcd34337bd005bac78b6c199d8a0b6f87f251e503bc2222016eb2cfa9b6a9001a29c0ed9b2efb5f16e38fec278afe10ab312d0 SHA512 2414f491624a745cb44b2cbca6141d9a5cd45263951650caffeb6e18e06046f4861127fed18b24ba779e5a946c9f0b915d88899fbf9cc2d2cd35fab08c4cfd95
+EBUILD notebook-6.5.4.ebuild 2858 BLAKE2B c30ce60901402b7b603ff3982bae0e12b7c560f2aca30e38c475738167c7da430b7b4c8de761ccb981d46679b89f83ff72c0de7ffa5efcc9e3342bf582d1aec3 SHA512 a987751e7c1c14365504feda6459da32801cdce59c4fb64bb4e5f3916f1aaaa91ad2660a9baf2309c0f9af9312637c6e33f49c045dd9414f260bc3c93a874cb6
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-6.5.4.ebuild b/dev-python/notebook/notebook-6.5.4.ebuild
index 4df44da4ffb2..c18d835b4c9d 100644
--- a/dev-python/notebook/notebook-6.5.4.ebuild
+++ b/dev-python/notebook/notebook-6.5.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://jupyter.org"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.7.4
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 12432c0367b8..730a3391da63 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,5 +1,5 @@
 DIST openapi-core-0.16.6.gh.tar.gz 104008 BLAKE2B bb1bdac98dfc5aef0961624488074363568f53a6c44cb0730be0d103d891d24bed86659f640e0d07da4072edc233c904c0ddcfd9e8b3960ace1af078c0d745e5 SHA512 556636a4698dcd7db6c656333849077abacdac1a440fe58210ad8f02c1f0220e46dea29962346dfb3f89d164ebc986ec750c184840be9a34a5e1dd98fbf8ef98
 DIST openapi_core-0.17.1.tar.gz 85686 BLAKE2B f18b42fc496eaf4d6b82c15f66dd9c2eb9240402590b5a8e1f0e7b1e804c90aeef2db96d19683e9fea5846e776e95981ac52a38c47e2b56e6b5fd63d072b61f7 SHA512 0e2c673dbbfcce87ae7fbca6ec6c283d94c36376b1e17191d0bfa6c7001c62913381169b4614b5cd6131eaa67b729365036be3f1eb7641f634c0f3228de54897
-EBUILD openapi-core-0.16.6.ebuild 1846 BLAKE2B 73ce79257fb849664a63d4f0db159582f2926139119b1715498845b623f10b9acaeceafc0b6e95bf3631d02e3120c8f44e0d83e9b8eb76a5895531e848d4f8e9 SHA512 bdf757cf5d152b2bd0e56c1ff30f23293794e1f89a227b2ce322865d39fafe8068ae114e24ef59bc9467d73ab14486e237b4bb9e4fe059d529cfd1f4b2558066
+EBUILD openapi-core-0.16.6-r1.ebuild 1897 BLAKE2B f910a6c1de5df6257a1fd24a497300bd5b9e028d60759eea8951ed0d88de59a28bf8c9e4ee89bf918d75a87dbde132ba7c61e186b989fab9ee6c9d19e2d89e16 SHA512 8076c86388eeae59523f10a016a79c652053224a003965ab5669de8b206f1cb935ba9b4b86c48d93bafc39e6ebc455de032550c7f14583cef948e3b7088c93e6
 EBUILD openapi-core-0.17.1.ebuild 1752 BLAKE2B 74de1a7c442f51ccea2099da31ba88496455bfc9636b7c6fa1c966b1ffc035199f1f33f5b449ac244281c066c5102e327ce94e2e19228f9451541d2aed4d1243 SHA512 33e3f1a9b16c20ed4f4e8360969c7e327c6501e2e6aa36baf2e8af1f8763b8814df59d39a3ed43e91da94e1c7711658925dbac55a635a1e3e6475ac46b0ff5da
 MISC metadata.xml 385 BLAKE2B a19f5b70529b6f0575e1196f3ffe0a7f38595fe7b01b43119f0f89c41a9ab5d6992f424a10f345a7407d279736a6091918b9ba1ead0daa92c9d244e4b27e4a18 SHA512 a8a39c8958ad11de5eb6896a74b3bfcb27e95c74a984a362032e4703d86f2831b6559a96a8eef80a7ef89f4687da325b3748f36b1df649cd29c2acb1ea0c9969
diff --git a/dev-python/openapi-core/openapi-core-0.16.6.ebuild b/dev-python/openapi-core/openapi-core-0.16.6-r1.ebuild
index 34f3bb300c13..3edd26663f3c 100644
--- a/dev-python/openapi-core/openapi-core-0.16.6.ebuild
+++ b/dev-python/openapi-core/openapi-core-0.16.6-r1.ebuild
@@ -25,6 +25,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	>=dev-python/pathable-0.4.0[${PYTHON_USEDEP}]
 	dev-python/isodate[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-spec-0.2[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
 	dev-python/parse[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index 4c2c5317c9b3..cc21e3641ef8 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -1,3 +1,5 @@
 DIST openapi_schema_validator-0.4.4.tar.gz 11626 BLAKE2B e4247f07476d472761f46c98d9259383e960641b910334d967e61f55c63b855c752176e7217f8870016ec3767b0c1c45e8863ca600e354eb5aaa62bcacbe8d51 SHA512 273e3d7080c794ff277170e55e67e32d65211469642652437e59f985a002b20bd2cc8643d2b0214dc232980dd69c2f87ea748537552c66999a110b2e4be2125c
+DIST openapi_schema_validator-0.5.0.tar.gz 11996 BLAKE2B 91f4c51c1d44e363b5f4ca8c69c7836a6df3927d2db5f255b1cc81b97b2056b409becc6f5fb44c0fb82a11fb6a6de398ae49930fdcf77cdb1d88c998b75bf00f SHA512 4db13d63641f375d809501ca7f6efecbbdcc46e74fff1d06657e0c509e6e182c9b97a83031b7a9251e9897f5dd5620a29ddf932f7b8e191c3f78fd2adba5bc68
 EBUILD openapi-schema-validator-0.4.4.ebuild 735 BLAKE2B b44d989a36ecb1a999a95e9ba92fd86f734a2747d7f54888dfb12a76a1f056e25f12055f114d574ee3d7d05c79383dc934d98eeae9529af018afe4c41077892f SHA512 bff32e9144e33b9ca29dca235a3d49590b45e3aa7df0043c0c8422d361d611f8bcf7c599355ca2daa0a459bafbb9969c9072e981bc5a71447b2aa1c894fe7a24
+EBUILD openapi-schema-validator-0.5.0.ebuild 737 BLAKE2B bf1970331c18d002527ac037188e0c7eace752ab6ac82c02c2a513a6d5c593d90f7dbe76da5d6a4c233528ece2f511c6363c832704c414b2b82826e373360ca4 SHA512 c8fddf96938b61af53fb182b29698380d0e48cabe69c4a682da3a5b4ac7a0b1e84accb897bb9f6bc3ee7f0480502260b233efd1016416020e1a517b4ae8edd9d
 MISC metadata.xml 409 BLAKE2B 601169266922e87a4fddde77d3528759d1f8470f28b865733ef6be57551f01675c9d5d694cfe9e7823dc9b360b9354c0bb74fb57a962e4f7155775e26b9fe3d7 SHA512 e4a29fd3c48b7b317b52354a64c7906f2ae87b1ebab275ec992bbfee421d677ea23a3310b1f9de44b75bf131738a308ce2a6d28712ea493b21c9760b43efe569
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.5.0.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.5.0.ebuild
new file mode 100644
index 000000000000..038f831c7904
--- /dev/null
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="OpenAPI schema validation for Python"
+HOMEPAGE="
+	https://github.com/python-openapi/openapi-schema-validator/
+	https://pypi.org/project/openapi-schema-validator/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	<dev-python/jsonschema-4.18[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/--cov/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 0e7cb11cd97c..67bc6654961a 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
 DIST python-phonenumbers-8.13.11.gh.tar.gz 4910723 BLAKE2B 270ded8f0c009feb0ffe70bdcec089f400d1ea18ae24e3837b8f3a659657b82fb5912577eba22cb7c28a297dcbb55d402213c576857c514eb08c241af8bc1e4e SHA512 688b5440538cd6d636b645474dff51e4ba9a080708e4d3a9bdd5560701a9effbb26b9a669c632917101ea2e27a6f2ebe1f468fc0a881625ef33a4e30885ae30b
 DIST python-phonenumbers-8.13.13.gh.tar.gz 4912623 BLAKE2B 7b030b15861150564dbc640d3ee40f8db360b79427d5ca6ebd33ff350cde2505c592455722463e94a609b4487a6908b9a5359059b83a3a4fe4212483bbf9f2fe SHA512 fe2e2aae730b5df6f1b150d45b6e3cb5225327b653243fece186d22b1f4685d796f91c3dc462d3c2239d976b249d4756590f72c8ff4d007826e46b86f0acc36e
+DIST python-phonenumbers-8.13.14.gh.tar.gz 4912846 BLAKE2B 0d4bc37280e863a97a4b235db6c8ab2681bf4aac1ec18a7c6f4505ddf0143fd97685772c554e8270f6243e5a80548b0b0005ef27073f7d16f88a56442c0862aa SHA512 c6e07538f6a5c61f2d8d2bbbf26722af3548eff5aadd0b35898ad7eee62be010bca0386494b77cfcdcff414bafdb382d52944996d2b4a539c0ff3a572bf8d675
 EBUILD phonenumbers-8.13.11.ebuild 808 BLAKE2B 68bf5867fe33d7bf194dd170c9cb30dac10bc0886d9656936d691e046fc72025e8205214b14c350e95720de49876f376ee1a17965e3ae2f2aff592536a60af38 SHA512 720fe4917947d28d3c32a4ac9fb41d0c9be99bb213b9ed45e9dfff277d65a693cbe2b711f54856e7874254a742bca4ec7571c400eabbeb77f31a1af64bd93673
 EBUILD phonenumbers-8.13.13.ebuild 811 BLAKE2B 1d4dcc2dbe737922778bc641cc10c251ede9bc5326991c779ab1276a593e25d1063d89ceed33180eecfd4eab02aae129134795b79a753a3a41985b2450223a7c SHA512 f6a3c534c716e062039636dc3fe79b871ffefc567716d186346bc0655c0064c473c072e029142e0c4a9fea9f5fa833baea1aee2fa3a95af9a3a73e58cd8f3f83
+EBUILD phonenumbers-8.13.14.ebuild 811 BLAKE2B 1d4dcc2dbe737922778bc641cc10c251ede9bc5326991c779ab1276a593e25d1063d89ceed33180eecfd4eab02aae129134795b79a753a3a41985b2450223a7c SHA512 f6a3c534c716e062039636dc3fe79b871ffefc567716d186346bc0655c0064c473c072e029142e0c4a9fea9f5fa833baea1aee2fa3a95af9a3a73e58cd8f3f83
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.14.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.14.ebuild
new file mode 100644
index 000000000000..61f15b7f6118
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.13.14.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index b1597117eace..f5eee04c31c0 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -6,5 +6,5 @@ DIST pygame-2.4.0.gh.tar.gz 6602242 BLAKE2B 27335b2bff6ed20cedc07bd76d50b8cc36c3
 EBUILD pygame-2.1.3.ebuild 1975 BLAKE2B 9d8d7ebb593c89452536e91989833bae2d208a151450f331033e08c9389ad41221f064371d9dd71732f46d059f797185bf94b473164d9525baf6c425e5465674 SHA512 1380ffd43c772136ebf8216ffcf16febdd3d12065792021052f35b2d282130c7fde6dcc09906ccb97eb2247c519c4517b1bf726c5d26cc9d54ae396039fc100c
 EBUILD pygame-2.2.0.ebuild 1912 BLAKE2B 31fdebb9c749217a33ba81ae930e5dfd27d5d1b7df75cb2874640ec7ce1c8610871ff72687b0f4e0fd1d5f4e494c5f7106a6307a1762329e4244030f15986390 SHA512 ddef31ada30a32e9ae3c57c0fe05ebba44b226bffe186728f5b5759fbe8340625a9494b3e3f77cdceeb60a39faffdd73041f5cadfc6a5eda0044164b93c5018f
 EBUILD pygame-2.3.0.ebuild 1912 BLAKE2B 31fdebb9c749217a33ba81ae930e5dfd27d5d1b7df75cb2874640ec7ce1c8610871ff72687b0f4e0fd1d5f4e494c5f7106a6307a1762329e4244030f15986390 SHA512 ddef31ada30a32e9ae3c57c0fe05ebba44b226bffe186728f5b5759fbe8340625a9494b3e3f77cdceeb60a39faffdd73041f5cadfc6a5eda0044164b93c5018f
-EBUILD pygame-2.4.0.ebuild 1928 BLAKE2B 3e21821bd71cae750923f39c6fece178cd250369f3ecf295efb0576269d821d785d37f1b9110ba6fc570901277e63873a608163ce7d20ac5ecd4b9f1fef6b0c6 SHA512 b4e01431a8da89d37685964da4b81353d97067ccb1456ba56e1a03e78674d94e729b5abe051c3fb518311e8416598805e542b4f0be6accbe672678ef233f8a1f
+EBUILD pygame-2.4.0.ebuild 1927 BLAKE2B 351ede9d9dc8e37c7ffd271f3fa073f3edc30aec65f6249c5bc07430e0a26af6c6fa32e3c1f931233dfa57f1e7ce4951fd607dc1a54a6c2c129ad7845a8b4dac SHA512 8ccbb7ce883e767c50efd0918fef576d921db956a40f969ba5031215c913e47492958ab8b42c7ad4d6b01d58bd56023df7c5bfa9a4c593ef99b7f6d7f80f7efe
 MISC metadata.xml 363 BLAKE2B a942b91aded22ec850a7b075703ce4037af9f0a61155717ac455f7d2b7779cb6f5f953b2ad8d61d7cc5254307951a20dd3edb9853e21d907e1999f7570a6b821 SHA512 15403754c9b13f9b2d8c5e7615ae0ca9359b5079e22eb5a7049424e414ebbdd8a06f6324c31594636324414e35ca34bec977b7dded9f9ea14027497b5097b060
diff --git a/dev-python/pygame/pygame-2.4.0.ebuild b/dev-python/pygame/pygame-2.4.0.ebuild
index 818f4756fb9b..ae4fa4216d23 100644
--- a/dev-python/pygame/pygame-2.4.0.ebuild
+++ b/dev-python/pygame/pygame-2.4.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pylint-venv/Manifest b/dev-python/pylint-venv/Manifest
index 2719ce4f43a8..53fa161c36b4 100644
--- a/dev-python/pylint-venv/Manifest
+++ b/dev-python/pylint-venv/Manifest
@@ -1,3 +1,5 @@
 DIST pylint-venv-3.0.1.gh.tar.gz 14901 BLAKE2B e41a0782fe1bdf83b0019c035cb80416838b71924a1574189aa8936a22fce689523984a277305beba49559d0bcdbde9c8b4ac6a9cb12e1a3853a9a3f287a7a57 SHA512 7b6e7be85dd5552c99d620550e602eb908fccb1ef0982e1734276e14f882261ad7c13309ac796e657865544484a275016981e9b75ef31d17d4c01454b7e091a8
+DIST pylint-venv-3.0.2.gh.tar.gz 15046 BLAKE2B 3c07e00739541c4b9b7c28c9b6cf91e8dee27885adcac8ec88b347f6c580ee0a0c905271eb5b5256ccf0ea975604bf98560ce271a27cbfd2d5790d1143ba6af4 SHA512 716491ffbb5e6642cd61cee62c720a594d85b4cf44feb2d53d3e120dbdea813234776a95341ac10acbdd64354cc3875659f1d3bbc5f45a87ac5232e1e7f89473
 EBUILD pylint-venv-3.0.1.ebuild 917 BLAKE2B f443a4e7e6841de84b0d5332f1c840efbf81654ffa46374eb7ff3a2384b1add349187e610fcbbf9fa12c0af7b5e58b8300e1f35343d4dec84116149e35b7de80 SHA512 992bc66055bd4f1ee4e959ed48f54073b3d180c80553a784353e517fc17692722780591fb747e832a7782dc6b343d24fc7683c30223f28ab9dbec8d391f6ed8c
+EBUILD pylint-venv-3.0.2.ebuild 918 BLAKE2B f48ac18775a4d4f1fda88f53023288cc3877d656a9012aa24981faa4d545eb0a14bbacab706215b5022d509c37478e33d15a1162824752839234a3624f5e0440 SHA512 ec9f890f8a683186cf1c387fefe6086f294b389d2990f74d708ba197abd620f088a619675122a101d0fc0392161c2bd812fd533fba9d4f57b3982062b391d3e4
 MISC metadata.xml 412 BLAKE2B 8dc1e28ad5e2b21a9483906e776a96d598e294fbc4dbf669ecea9357055b1a7439e0046353ab39b3c2bfaab7924f43a89c309db735e44a00838dd1bed2f5c088 SHA512 4e7963aa4cdcc168bd4755f21cb58cb084c185e1c71ef9fdfe168feb1ec65fc4848c99801e449f253e420b9e34d49aab396d2e02bb60a7cbd3733dd2a899c6cd
diff --git a/dev-python/pylint-venv/pylint-venv-3.0.2.ebuild b/dev-python/pylint-venv/pylint-venv-3.0.2.ebuild
new file mode 100644
index 000000000000..02d3f783d513
--- /dev/null
+++ b/dev-python/pylint-venv/pylint-venv-3.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Init-hook to use the same Pylint with different virtual environments"
+HOMEPAGE="
+	https://pypi.org/project/pylint-venv/
+	https://github.com/jgosmann/pylint-venv/
+"
+SRC_URI="
+	https://github.com/jgosmann/pylint-venv/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pylint-2.14.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pylint-2.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	# we need to set PYTHONPATH explicitly since the test runs installed
+	# pylint (i.e. starts outside the test venv)
+	local -x PYTHONPATH=${S}:${PYTHONPATH}
+	bash test/test.sh || die "Test failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index ffa93e883bef..5f2e6d2c6bf3 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,3 +1,5 @@
 DIST pyproj-3.5.0.gh.tar.gz 237380 BLAKE2B e401998418efb79be496bf11be904191fa43e004331867415524508c8766ca9f4ae390ade1341ab6508e6d7d92c8875357bad2b1af159b642345065f8c28ebf8 SHA512 64d1eab54fc5e39d6403fcb0ae3e0b5283303471431894fa6fa94c118374c4ca1a9a418a7d0d1d8bbd2a6a96a5a2dbaf3d067417d6335174c8911db796fbd0a9
+DIST pyproj-3.6.0.gh.tar.gz 238966 BLAKE2B 441904a343b7abab19e9d17a1bcb053d4f5606886b1325cfadcdd8456b61871bee4d13c49802008aea5c5864c40ef15a4a7681969890368a1991ba696b76ab78 SHA512 e713de94331022112049e76f7f56d24439a0dee339e8419acf8b023b3234a7c2ba468bed880749036fca2a93b289575ebb74854ba178f3b6debae8aa53befcf7
 EBUILD pyproj-3.5.0.ebuild 1134 BLAKE2B 1bd285f435a1253abbc4f42d277fc8338cc73538947a6d4703041ea65422f9f694c864a2eca80330120d163f0ca2796df093697fc501fa7823aa22caaf47282c SHA512 dc3c59fde10642cfed3b96a2f7dfc5f83329b812d469621fa0cd6952a7f4fa76eb46a072d49a109cc15eeccbb939cfbf9d6bb28fffdcd2cbd13775a38fe2fe54
+EBUILD pyproj-3.6.0.ebuild 1135 BLAKE2B bb34c883afeda866688c900dd59fd69430981b5d4feac274597cb980eb8e23cf31a09897d1221fa4d6bc64f96f313a365cbbec4062f412925eba9fd564400686 SHA512 fabf701034278045a17ca6b629eb9ccffb8f5a6191e3b0f937b45eafffa0a6a2c46cca25dfe5aac4f1e551cc01e4f979eb39fc9b07f843db22037ce7d273c3ff
 MISC metadata.xml 415 BLAKE2B 4f3ab70bc72ca97a428c357257d3a59591b410f12276a42e141cd0a43072b79107529c95c6a313906129e8893c75b63a6ef11ddc2f3842a7f5e5e7f7349ec38e SHA512 7ca8a01534471dff67c42a96c524d166278e26da309b2c4d766045e38086cc0e52ccc990881ebed7ca81219d705d9e4a9c16e86b052a50867bb032457e354903
diff --git a/dev-python/pyproj/pyproj-3.6.0.ebuild b/dev-python/pyproj/pyproj-3.6.0.ebuild
new file mode 100644
index 000000000000..a93be8121b0f
--- /dev/null
+++ b/dev-python/pyproj/pyproj-3.6.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 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..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to the PROJ library"
+HOMEPAGE="
+	https://github.com/pyproj4/pyproj/
+	https://pypi.org/project/pyproj/
+"
+SRC_URI="
+	https://github.com/pyproj4/pyproj/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+DEPEND="
+	>=sci-libs/proj-9.0.0:=
+"
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/shapely[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	# Avoid greedily trying -L/usr/lib, etc
+	# https://github.com/pyproj4/pyproj/blob/main/setup.py#L76
+	export PROJ_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+	export PROJ_INCDIR="${ESYSROOT}/usr/include"
+}
+
+python_test() {
+	rm -rf pyproj || die
+	epytest -m "not network" test
+}
diff --git a/dev-python/pyproject-api/Manifest b/dev-python/pyproject-api/Manifest
index d07cad1ebcdd..b1e6ee93b513 100644
--- a/dev-python/pyproject-api/Manifest
+++ b/dev-python/pyproject-api/Manifest
@@ -1,3 +1,5 @@
 DIST pyproject_api-1.5.1.tar.gz 22081 BLAKE2B 53ee778b4e04cac2f16ecd054adc7fd86373d6402f80d485fe22457252684f774b6a5df23d08cf6c6b1f96964d6dc1b1cc9014415f3d9105ffbb09421f69a11e SHA512 31936d242861027ea892e86219f430371aae18631c92893cefc8fb8fc02315906857ee57e5412eed62bf584e0bd24cca7ba82471c0ac6a72c71e8e93b8285a3e
+DIST pyproject_api-1.5.2.tar.gz 21926 BLAKE2B 337fa749273273e0d4c761876ac1b9ec25c02ad206dd222790717dde44ad82409d5200b94c2b5d35984116b1c88cfa10b93c699e684ff51b3235b936e35fe0ee SHA512 ee12ec0dccce0130bca703886c40ac21802f58fb7683370592f9dabbf83366939f5032d7f55c6b712cfa4fa0cf34d88fc37a05eae9d811b34fe9c7377886b8d7
 EBUILD pyproject-api-1.5.1.ebuild 985 BLAKE2B 3b235a0314648a3476517867904108de45abf42a13c5234370f3c3702240615270518a5b45f26bbc65f4455c7298d567b0110736ef80a7905fb1b617698aab5f SHA512 e48785c79bc3080d9fcc43650adae1fe29c4338a7163a61c673e8997f8fbac1f4000986314644f8f586ee99baafbd486d4bbd452ba1cf50425a708eb8b3305c7
+EBUILD pyproject-api-1.5.2.ebuild 990 BLAKE2B fc7eb993df5178afa9ed4282adba13e6d2f06e2ce8e587838701a4947f6e117da9591cb6129baf2d9231bcbbc013539cdd9b58423007b955c837066926b35ef4 SHA512 71246b64fabfc1dc149979330a3c6685b450413b32a06eda42e12f86251c9a12ce4b030ec08f0f9c7a4057f7fc1f8f64de0e2207cc037c1448eb158efd143e73
 MISC metadata.xml 378 BLAKE2B f7bb92a50d3be540f9ef686045a6950a6bd26679df183dcce4af9ddd4f203090023309ad4e5e43a9f769ed40ef6269f64fb628ed0acfef9fe9fc36b9f67704b7 SHA512 f3840464571b9893548e778d5eef88c64b614ec8994b1ff1348aed1795cce740b2a32b46df1e654e0a9072e8e059214ca1487421fb1316b4160a1bff4202d475
diff --git a/dev-python/pyproject-api/pyproject-api-1.5.2.ebuild b/dev-python/pyproject-api/pyproject-api-1.5.2.ebuild
new file mode 100644
index 000000000000..3bc4973c1714
--- /dev/null
+++ b/dev-python/pyproject-api/pyproject-api-1.5.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="API to interact with the python pyproject.toml based projects"
+HOMEPAGE="
+	https://github.com/tox-dev/pyproject-api/
+	https://pypi.org/project/pyproject-api/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.{8..10})
+"
+BDEPEND="
+	>=dev-python/hatch-vcs-0.3.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
+		>=dev-python/wheel-0.40[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires Python 2 installed
+	tests/test_frontend.py::test_can_build_on_python_2
+)
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 703444890319..dde17e7c2e87 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,6 +1,6 @@
 AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f
-DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
+DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2
 DIST pyside-setup-opensource-src-5.15.9.tar.xz 3581660 BLAKE2B 65d5317f9ea55385bbe093cf43c214655effd877feed6409acc4f6f65768dcde8c94c4f29157f8d7dcb36d442c649290764706834885b08ecf9934b383b3e2a4 SHA512 cc63d64b909f1fd98b64a0bba61b278b1a5b60059168287546ee36204ede2df4317eb4ce5638a268d387e6db40fec203631fc4a48e4116a6b4a30d675bf876d3
-EBUILD pyside2-tools-5.15.8.ebuild 1653 BLAKE2B adbbbd888e4785543ae175f285f32b34a6d392b6d8f85ef9576968a700cb7284859e13f3b4b75e6e77a8544676ba0779870bab3c33f8ae9f66bad285dcb2a6f2 SHA512 6016c3ab4144ea89672e8981a337ea8a83f892ad5b713b6a79d2a08bf1137de240ad9193b8d1a07b9ccbfd83587f0304579e2fe308d158cea065f1700fb160dc
-EBUILD pyside2-tools-5.15.9.ebuild 1656 BLAKE2B 473740bc6392674185a1ce05176cd37d7a534a5ca4cf6418587d8297f0598c27ddcb823f774ca5ce1fa89cd393e7ebdce572596baa59275f250576da2b23689b SHA512 a3bac308f16fdcb61116aafdea5d74894e93cd62ffe041acbe2a2e7125dff3924f30579a54f45c94e8f0e20c1ba7f178583948d6e3d94fc5ce9b2a12ca23e7ca
-MISC metadata.xml 512 BLAKE2B e06bacf79750f6cc22b41ade8840a01636793100a85cc469c19af1b4273ef33adb3dec755947057a892e88de4ac68e665fa0ccb265457dd09a502964bd991749 SHA512 d201e34b2d73fb308c6b5f14b2d0d292b453b5ef05c820efe429fcfa7259b23f17bc015c08b8f938a2df75f5b654cc1357632a786abfb555479e3f172feee3fd
+EBUILD pyside2-tools-5.15.10.ebuild 1656 BLAKE2B 473740bc6392674185a1ce05176cd37d7a534a5ca4cf6418587d8297f0598c27ddcb823f774ca5ce1fa89cd393e7ebdce572596baa59275f250576da2b23689b SHA512 a3bac308f16fdcb61116aafdea5d74894e93cd62ffe041acbe2a2e7125dff3924f30579a54f45c94e8f0e20c1ba7f178583948d6e3d94fc5ce9b2a12ca23e7ca
+EBUILD pyside2-tools-5.15.9.ebuild 1653 BLAKE2B adbbbd888e4785543ae175f285f32b34a6d392b6d8f85ef9576968a700cb7284859e13f3b4b75e6e77a8544676ba0779870bab3c33f8ae9f66bad285dcb2a6f2 SHA512 6016c3ab4144ea89672e8981a337ea8a83f892ad5b713b6a79d2a08bf1137de240ad9193b8d1a07b9ccbfd83587f0304579e2fe308d158cea065f1700fb160dc
+MISC metadata.xml 402 BLAKE2B 28348df442d189eadb56e04dfda71c1d5a56868aae85611a7d77ecdc7651e34ce02563c8da1270aad55758e2dd4301de44434e0bbdb010ef484e240068602ede SHA512 a54866110e38c24d67d60286c64b63dc0b537c55eb201b84b9173b47710b6e8a840d9072ca46fbef969bf481e43e1d8824b20655d7fe6b300cfd5333c3f74a41
diff --git a/dev-python/pyside2-tools/metadata.xml b/dev-python/pyside2-tools/metadata.xml
index 37022f30bb61..5ddb82c75a77 100644
--- a/dev-python/pyside2-tools/metadata.xml
+++ b/dev-python/pyside2-tools/metadata.xml
@@ -9,8 +9,4 @@
 		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>fordfrog@gentoo.org</email>
-		<name>Miroslav Šulc</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild
index bc841956419f..81180b8926ab 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/sources/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.9.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.9.ebuild
index 81180b8926ab..bc841956419f 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.9.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.9.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/sources/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 332529600bf7..281ecc96a74f 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,8 +1,8 @@
 AUX pyside2-5.15.2-python310.patch 508 BLAKE2B bdfc33975d1dd0c9eb73d1bae3ec2aff8c1ab1eace10dbde18b467c451605ef5e8c278965043d3cf19dfa8dc80f3fe4bdc1caadd15119303c3e134e364ed5098 SHA512 69a8691d452472f3ae8a58eadd1c1d69cef186192f9fe8311ae65419c94a9efc0331e9446b97f688777f3d5c7ef5a0100bed2e4ce3956b2a4aacfad0b95c1c75
 AUX pyside2-5.15.2-python311-fixups.patch 1962 BLAKE2B 37d91352ea09eaef6d36c600165e4fea74145b0fa05620e739254d3983acc501455154fc51ce3448aa4f60a00cd377f0896cb3dc14f1a921d6948dc53c500784 SHA512 39e999c80ed2717eaf59b47c12e64208d1b54d3d61daacf7a8ebeb4586f3b7312dd5db3fc53d4d2f3c426d80729e5d655e9b612153c704b40b7d261ddd57e580
 AUX pyside2-5.15.2-python311.patch 1777 BLAKE2B 1afa7c39755c4f91b4b4c951f59e1a3190f924d8b20cf2140ad5342c2fa046ff7e6bec540bea9d7652116894e0cb7f5fa5ea73067212ca5b631382e7139d7786 SHA512 b88f300e4944cbb9adc8ac887e263e74e088a1b291000c86f6677a01241939e612fa5eebba3807fb2318477e68de241914832cc92ed0470726804d3098486120
-DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
+DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2
 DIST pyside-setup-opensource-src-5.15.9.tar.xz 3581660 BLAKE2B 65d5317f9ea55385bbe093cf43c214655effd877feed6409acc4f6f65768dcde8c94c4f29157f8d7dcb36d442c649290764706834885b08ecf9934b383b3e2a4 SHA512 cc63d64b909f1fd98b64a0bba61b278b1a5b60059168287546ee36204ede2df4317eb4ce5638a268d387e6db40fec203631fc4a48e4116a6b4a30d675bf876d3
-EBUILD pyside2-5.15.8-r1.ebuild 9272 BLAKE2B 98d7773364fa7babc64361541e4feefa5aec3330a3c64b799ed7fb0fcd71fa40a9dd2239acb1e9cccd124cd7095a8136e619d9c9649385ed7bfc3466127fc1dd SHA512 760dfe9959a8e4f92fe522317c79b3b8009e11439b5264256230e1d565efb5922ef82fee0bfdb30a8ff17a4222f85893ea8e44ff53066e6b8439b3c154c0eecc
-EBUILD pyside2-5.15.9.ebuild 9270 BLAKE2B 582b5be82eee0435d775555a3d47f8568fd360b4d166abc8ccfef3166e4408fd3b76963367cd85e39df3920c94e2bd0ac07f53c6d47b92ef1e1fa47ff551fe7c SHA512 032c37366def172f8b7c6aa31661c91ccabd4159b6c77d89d46e142e5b20417f5b450bf4f0477346195b821b99111c963d26b16e0c38399bccbf87a4f1262f53
+EBUILD pyside2-5.15.10.ebuild 9270 BLAKE2B 582b5be82eee0435d775555a3d47f8568fd360b4d166abc8ccfef3166e4408fd3b76963367cd85e39df3920c94e2bd0ac07f53c6d47b92ef1e1fa47ff551fe7c SHA512 032c37366def172f8b7c6aa31661c91ccabd4159b6c77d89d46e142e5b20417f5b450bf4f0477346195b821b99111c963d26b16e0c38399bccbf87a4f1262f53
+EBUILD pyside2-5.15.9.ebuild 9267 BLAKE2B b9214b8fb76e94bd8d702aff74419a9b53f9be0d9100b02d4c89007a11c380317a893bc8ba06bfb5cb436fd7b29934401989309cf590e881b148c9a0e06a3b66 SHA512 d963e54b9f27ba8f54474bd795f063234c3b68566f5da3d17b8f49669c89213d4c408ce1abd020c858636f3b3a0bbd75df943f4d28baae291d3f60aa6351be9b
 MISC metadata.xml 2255 BLAKE2B 00982d17109b327ce063f5ba53474603cc73ffb013268ec9f6b751a73792a790f56de285291e70ad12147c27ba97b516be1318df312483d67d72509f8e8d8655 SHA512 830f9510f5e141422cbbab356d34a34b631f948eea14bcc96badbef65ce10f56c648748edc4ddf06be77b1c597a7d12d4552bde122937eb4cda01b304a3193c7
diff --git a/dev-python/pyside2/pyside2-5.15.8-r1.ebuild b/dev-python/pyside2/pyside2-5.15.10.ebuild
index d82265de986e..e995b1d18b6f 100644
--- a/dev-python/pyside2/pyside2-5.15.8-r1.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.10.ebuild
@@ -37,7 +37,7 @@ S="${WORKDIR}/${MY_P}/sources/pyside2"
 # x11extras (for X)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="
 	3d charts +concurrent datavis designer gles2-only +gui help location
 	multimedia +network positioning +printsupport qml quick script scripttools
@@ -222,5 +222,5 @@ src_install() {
 	#     https://bugreports.qt.io/browse/PYSIDE-1053
 	#     https://github.com/leycec/raiagent/issues/74
 	sed -i -e 's~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)/cmake/PySide2-${PV}/PySide2Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
+		"${ED}/usr/$(get_libdir)"/cmake/PySide2*/PySide2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
 }
diff --git a/dev-python/pyside2/pyside2-5.15.9.ebuild b/dev-python/pyside2/pyside2-5.15.9.ebuild
index e995b1d18b6f..556f5068114e 100644
--- a/dev-python/pyside2/pyside2-5.15.9.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.9.ebuild
@@ -37,7 +37,7 @@ S="${WORKDIR}/${MY_P}/sources/pyside2"
 # x11extras (for X)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="
 	3d charts +concurrent datavis designer gles2-only +gui help location
 	multimedia +network positioning +printsupport qml quick script scripttools
diff --git a/dev-python/pyside6-tools/Manifest b/dev-python/pyside6-tools/Manifest
index 2ed4600f9317..b70edd4e90e8 100644
--- a/dev-python/pyside6-tools/Manifest
+++ b/dev-python/pyside6-tools/Manifest
@@ -1,3 +1,5 @@
 DIST pyside-setup-everywhere-src-6.5.0.tar.xz 13566572 BLAKE2B 2eb038b08755ced2dee34a309bbb18d47b40ef0b19bbf42901695bfdd4fccf35e09bb939ae9d7049e6477436c11dc1424376d8f1cbbd8fdaa2cd978114eedb9e SHA512 4a1f88d18d7276182c83b6deff8d57c4c40914292b61dcea76975de5506d7fffa4db7b783161373585ff90dc96a2acc6fed98d06a6a35fff6e92864f2699ea7f
+DIST pyside-setup-everywhere-src-6.5.1.1.tar.xz 13565304 BLAKE2B 55b221142f5e112a39c0b5df7f7b200f65cfd30da2884340b9bef5e7cb1bcfe2e8ed7aeb0cf7ef5f894f43f6ad582b35e649b7c6430bdba8719e70cca3c29c2d SHA512 fe99ad09b4e0b238175594bbff94453a84c56f21b004477fdab2a2435b4b4148b0b99b26e1b1e1671b71656f4cfb03c3913aa6d85084e3eb8200ff906535a5eb
 EBUILD pyside6-tools-6.5.0.ebuild 1380 BLAKE2B c80b111d63f3f6c4de373534328c85f8f36d9b754aef72c3e272d9f89c0b62d7cc16784744c9225a2b828fc2df419c0f0d9bf84b915ab3f30bb1cdd05e719aa5 SHA512 e98c7feebd5c0133d5e2e4ec99452df1c1df08c697842c4c86482f601ce94d07408fe8a211ad7973cc13d77c96374b65987846fd29444d670207be56a03874bf
+EBUILD pyside6-tools-6.5.1.1.ebuild 1380 BLAKE2B 7924867247c00a4e0e0457a14d9979be11e1ad17fb6c0195da46dbead27083ff570867cafb177843cbcadad553e3734a9d8320b4a5bb8834edc0228e013fdada SHA512 10388c9f9372fd8cb3d5ebc676919570b374eefe6bd246f8b2c32d4ef08d84ffc5336c3e3b4b0a2d6c7394955e7d0286707b29de1bb930154ef1db8176adae5c
 MISC metadata.xml 402 BLAKE2B 28348df442d189eadb56e04dfda71c1d5a56868aae85611a7d77ecdc7651e34ce02563c8da1270aad55758e2dd4301de44434e0bbdb010ef484e240068602ede SHA512 a54866110e38c24d67d60286c64b63dc0b537c55eb201b84b9173b47710b6e8a840d9072ca46fbef969bf481e43e1d8824b20655d7fe6b300cfd5333c3f74a41
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.5.1.1.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.5.1.1.ebuild
new file mode 100644
index 000000000000..ed40d74f1f17
--- /dev/null
+++ b/dev-python/pyside6-tools/pyside6-tools-6.5.1.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{9..11} )
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake python-r1
+
+MY_PN="pyside-setup-everywhere-src"
+
+DESCRIPTION="PySide development tools (pyside6-lupdate with support for Python)"
+HOMEPAGE="https://wiki.qt.io/PySide6"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
+S="${WORKDIR}/${MY_PN}-$(ver_cut 1-3)/sources/pyside-tools"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-python/pyside6-${PV}[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	pyside-tools_configure() {
+		local mycmakeargs=(
+			# the tools conflict with tools from Qt
+			-DNO_QT_TOOLS=yes
+		)
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
+	}
+
+	python_foreach_impl pyside-tools_configure
+}
+
+src_compile() {
+	pyside-tools_compile() {
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
+	}
+
+	python_foreach_impl pyside-tools_compile
+}
+
+src_install() {
+	pyside-tools_install() {
+		python_doexe "${BUILD_DIR}/"*.py
+	}
+
+	python_foreach_impl pyside-tools_install
+
+	einstalldocs
+}
diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest
index b2f87ec61199..92d83fec8065 100644
--- a/dev-python/pyside6/Manifest
+++ b/dev-python/pyside6/Manifest
@@ -1,5 +1,7 @@
 AUX pyside6-6.3.1-fix-designer-plugin-install-location.patch 685 BLAKE2B 2f3b3873f4f1f46b737ae85467798b25fd1634a15a391cd7fa04a1c391a56cd57a68ec4f98b51460cd805fc75cc0ee50b9addc4a757520429f6b7e66101ed609 SHA512 76ca097b42b47d3b290966fe805b1b4f58e04ab05d8e5420dfa1014e3399452a0326d964d2304068c78a6a82bcea2883d5c9e6a51b383a7f96a7520cfebdfcad
 AUX pyside6-6.3.1-no-strip.patch 953 BLAKE2B f88bac603a584213a864fcfc7c528f1d236ebdbfb653c3877316cd0b95c30c2f7288b1c81c6a90a3e4228536da4aa63552991fefa952f450b0b852b3e2aed94a SHA512 2920075a26fc059bdebc8eb5fa7c15de74729b7f8d1eb59197f7426afa7a65f1f78a8ebb76e946b2dfaf5817dbf090744bafaed2f2156f2d1548c2932a7ce61a
 DIST pyside-setup-everywhere-src-6.5.0.tar.xz 13566572 BLAKE2B 2eb038b08755ced2dee34a309bbb18d47b40ef0b19bbf42901695bfdd4fccf35e09bb939ae9d7049e6477436c11dc1424376d8f1cbbd8fdaa2cd978114eedb9e SHA512 4a1f88d18d7276182c83b6deff8d57c4c40914292b61dcea76975de5506d7fffa4db7b783161373585ff90dc96a2acc6fed98d06a6a35fff6e92864f2699ea7f
+DIST pyside-setup-everywhere-src-6.5.1.1.tar.xz 13565304 BLAKE2B 55b221142f5e112a39c0b5df7f7b200f65cfd30da2884340b9bef5e7cb1bcfe2e8ed7aeb0cf7ef5f894f43f6ad582b35e649b7c6430bdba8719e70cca3c29c2d SHA512 fe99ad09b4e0b238175594bbff94453a84c56f21b004477fdab2a2435b4b4148b0b99b26e1b1e1671b71656f4cfb03c3913aa6d85084e3eb8200ff906535a5eb
 EBUILD pyside6-6.5.0.ebuild 9149 BLAKE2B e1bf3836b19fcb9d7d3bf541b8e16a0825e6b6aa907679654d06adec4221d968f8fbc056dcf7c3018f3b4fb8f149e6a3a941ec1e23046ca9eaaf84a181cda42c SHA512 d6f34369514a860a28626c0b54f58e813a0153ba7266410c3124075a56f3df7a785d80bcf4758f83a8c4c63aaf820e7f3ebd66a0f5a748368cf99672a1f407b2
+EBUILD pyside6-6.5.1.1.ebuild 9149 BLAKE2B c42047649cdd5bb42357288fa8a3195b4a1852eecc07976464fb521fa52d2a648ddc517a7a8a180d1ac0ad076787d0b2d0bb713c2a0cb446924f961304e32f4f SHA512 d5271b0730e49807eaa797e81b49165a41578e5473330f714b632b3a4311d18ee0faa78908223dd8c8cab19efff7c792879ad9e04ff89a0eaed893fe04b97303
 MISC metadata.xml 1830 BLAKE2B fe8b0657824ef49182b8a5ac334539e10ff88d56f1d0ff517ce9247f0ec1c8b82158688fefde8e01c99fadcb0268e6e0109fef49830ffdec821e803e2ad23517 SHA512 4b49ec54b699673da2c9173f849f70e2a42321608c2893fa9d161a2ff51a917864042b3c0421c3723b98bcbde0d53e78e8c832f25a689dc7e3499d05446a014b
diff --git a/dev-python/pyside6/pyside6-6.5.1.1.ebuild b/dev-python/pyside6/pyside6-6.5.1.1.ebuild
new file mode 100644
index 000000000000..210891c3043a
--- /dev/null
+++ b/dev-python/pyside6/pyside6-6.5.1.1.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-r1 virtualx
+
+# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
+# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
+# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
+# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
+# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
+# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
+# that the "PySide6/QtGui/CMakeLists.txt" and
+# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
+# testing whether the "Qt5::Gui" list property defined by
+# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
+# time contains the substring "opengles2". Since cmake does not permit
+# properties to be overridden from the command line, these files must instead
+# be conditionally patched to avoid these tests. An issue should be filed with
+# upstream requesting a CLI-settable variable to control this.
+
+MY_PN="pyside-setup-everywhere-src"
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://wiki.qt.io/PySide6"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
+S="${WORKDIR}/${MY_PN}-$(ver_cut 1-3)/sources/pyside6"
+
+# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details.
+# Shall we allow essential modules to be disabled? They are:
+# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
+# x11extras (for X)
+LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="
+	+dbus charts +concurrent designer gles2-only +gui help multimedia
+	+network network-auth +opengl positioning +printsupport qml quick
+	quick3d serialport +sql svg test +testlib webchannel webengine
+	websockets +widgets +xml
+"
+
+# Manually reextract these requirements on version bumps by running the
+# following one-liner from within "${S}":
+#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
+# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	charts? ( gui widgets )
+	designer? ( widgets )
+	gles2-only? ( gui )
+	gui? ( dbus opengl )
+	help? ( network sql widgets )
+	multimedia? ( gui network )
+	network-auth? ( network )
+	opengl? ( gui )
+	printsupport? ( widgets )
+	qml? ( network )
+	quick? ( gui network opengl qml )
+	quick3d? ( gui network opengl qml quick )
+	sql? ( widgets )
+	svg? ( gui )
+	testlib? ( widgets )
+	webchannel? ( qml )
+	webengine? ( network gui printsupport quick webchannel )
+	websockets? ( network )
+	widgets? ( gui )
+"
+
+# Tests fail pretty bad and I'm not fixing them right now
+RESTRICT="test"
+
+# Minimal supported version of Qt.
+QT_PV="$(ver_cut 1-2)*:6"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
+	=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
+	charts? ( =dev-qt/qtcharts-${QT_PV} )
+	designer? ( =dev-qt/qttools-${QT_PV}[designer] )
+	gui? (
+		=dev-qt/qtbase-${QT_PV}[gui,jpeg]
+		x11-libs/libxkbcommon
+	)
+	help? ( =dev-qt/qttools-${QT_PV}[assistant] )
+	multimedia? ( =dev-qt/qtmultimedia-${QT_PV} )
+	network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
+	positioning? ( =dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
+	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
+	serialport? ( =dev-qt/qtserialport-${QT_PV} )
+	svg? ( =dev-qt/qtsvg-${QT_PV} )
+	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
+	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
+	webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] )
+	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
+"
+# testlib is toggled by the gui flag on qtbase
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
+	"${FILESDIR}/${PN}-6.3.1-fix-designer-plugin-install-location.patch"
+)
+
+src_configure() {
+	# See collect_module_if_found macros in PySideHelpers.cmake
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
+		# try to avoid pre-stripping
+		-DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes
+		-DQFP_NO_STRIP=yes
+
+	)
+
+	pyside6_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
+			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
+		)
+		cmake_src_configure
+	}
+	python_foreach_impl pyside6_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE
+	python_foreach_impl virtx cmake_src_test
+}
+
+src_install() {
+	pyside6_install() {
+		cmake_src_install
+		python_optimize
+
+		# Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig
+		# file for the current Python target. See also:
+		#     https://github.com/leycec/raiagent/issues/73
+		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
+			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
+
+		# Uniquify the PySide6 pkgconfig file for the current Python target,
+		# preserving an unversioned "pyside6.pc" file arbitrarily associated
+		# with the last Python target. (See the previously linked issue.)
+		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+	}
+	python_foreach_impl pyside6_install
+
+	# CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing
+	# downstream consumers (e.g., pyside6-tools) to target one
+	# "libpyside6-*.so" library linked to one Python interpreter. See also:
+	#     https://bugreports.qt.io/browse/PYSIDE-1053
+	#     https://github.com/leycec/raiagent/issues/74
+	sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \
+		"${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
+}
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index 0c5c4e75d623..6b7854839ed0 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,3 +1,5 @@
 DIST pyspnego-0.9.0.tar.gz 233612 BLAKE2B 62047b84c5bcc5085e75abe167c6909f0a34a403c182f9bb03994e8e78768c4f1859e68b0e25d27271c6f686565c68d090a8825c0136a18e3443f734bee2f4db SHA512 4fa03d54ee47441a7255fb8b93b4616937ce96c76de4d8255ff48e60fff0112d6cd802458e151d4cf92f3710f7c415ea5499c460fb2f291155b3a1820ba37623
+DIST pyspnego-0.9.1.tar.gz 233824 BLAKE2B c36d2ee697ed9dcb7a3c7d3a3ec2bc58b88ac6ba5a020c852b4ba7d0a01d3dd4a3801d91a9456f3f4710684df16a3a4c7d449cfa58e141ae5085bef0f0fe6f21 SHA512 6c516cae43bff523ec19b6ef52e7691a688bada027a183b98e0121bdd4f44f887a5fa87f3ab173dff1e18d84a7886a2a04de80dbd6873cc1dafb1d7369a9d932
 EBUILD pyspnego-0.9.0.ebuild 914 BLAKE2B f23a5faeae4b1c5d6103b1160c59c115d83660a69c1af73326a557b453c43942b3a89711a5c55636c3d1ba8cd0bff8ffa435925510ddfd23502763675089a0ec SHA512 32e6f6e5a43a16c981fc3d2a129619a424ce35b52819a50abbc838a04b5be440834adc5d3663400b3c9018d7adff13b87c51d250e71443510f680d13844ad045
+EBUILD pyspnego-0.9.1.ebuild 917 BLAKE2B 18123ad603638f00f9cc2238b73368a4b3877999e98ea7ec0822e589e3f6c6b3841b2702e892affa337b10f88b24dd8455f3c70ac60419a7dc3419b43b8f67b6 SHA512 dbeab118664219364f95d2e97958731ffeb0428088a7ec0a58870514b42374aab277bf62befaa899aa171b661f8c64e40bc71b1d0534b2bb968f0283880bec57
 MISC metadata.xml 445 BLAKE2B 2d30af32987aa7118331cb4c199b44069f6a6efc62d73eab62a31b29308848b7f7e56e026327af6c2197ee31c05fbe1885524bba7b6a84cdc0d97cc58c5fb43b SHA512 c7bbe6f161ce61409f6865f998fb4c8bd77c39011f5bbd148379912e31805773a41451163517cb7ebef99a57d6abe8f13dcdc568408ce182c0def6adf35afc9c
diff --git a/dev-python/pyspnego/pyspnego-0.9.1.ebuild b/dev-python/pyspnego/pyspnego-0.9.1.ebuild
new file mode 100644
index 000000000000..814c28e01ada
--- /dev/null
+++ b/dev-python/pyspnego/pyspnego-0.9.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
+HOMEPAGE="
+	https://github.com/jborean93/pyspnego/
+	https://pypi.org/project/pyspnego/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gssapi[${PYTHON_USEDEP}]
+		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
+	optfeature "YAML output support" "dev-python/ruamel-yaml"
+}
diff --git a/dev-python/python-rtmidi/Manifest b/dev-python/python-rtmidi/Manifest
index 29aeaefa886c..0f7dca712c9c 100644
--- a/dev-python/python-rtmidi/Manifest
+++ b/dev-python/python-rtmidi/Manifest
@@ -1,4 +1,8 @@
 AUX python-rtmidi-1.4.9-unbundle_rtmidi.patch 2137 BLAKE2B b27c438fa93c00fd458fd8083302838ad0ca96c09c89f0993c6fdc09681f8eccddca53445925c1b437860faa488115d2bc33076a202a5dd730f44cef298c9831 SHA512 6d42f2fe1d533d85ae7ac32b903fc087d4932904905fd778e1979aaed3d4dd6e45db4a49ab87089d67a68ac24b724ef0c7e52eb815badb98d972d3de8cd70677
+AUX python-rtmidi-1.5.1-build_backend.patch 770 BLAKE2B 3c5a9d3774f182287ad45a8075682f685345b37064c6c7bd9a2bb7c54954105c84fd8740a5eea88cf0270fc4f726a6d7119d196cdb792f13d2db2fbbb7903fe4 SHA512 5fc2daecd2b02e4c4fd5a370710e0280eebfbf5423ea23036a1b938a095c4a27a8ccd70723bd3e51e33ca76af878d9a5788b54a146a08570f7bb06fc0a5cb514
+AUX python-rtmidi-1.5.1-unbundle_rtmidi.patch 1455 BLAKE2B 2cc76ace5758131a069194e9d30c8288ed93a261d41a2b4cf0294e2b4fc7ebee9e0c43b4377143ae8074a03dcc2abf13fd85fdebeebd321efce00e25e43057b1 SHA512 92c11d878018ded30dffa0d06006f8471054321af8d9f58268d4d899121dac66712ddc3a53285c19293fb2d52d4d054b0d803c559e9c01cb8c8f161ce5f2c734
 DIST python-rtmidi-1.4.9.tar.gz 251238 BLAKE2B dda4052e893839f88a6756306f8ff4e89ee66ad9716d374efbb7b92a8e9074e98c8d5df0cc82aa3c6e0c77a78fe9b997079623a5147c03eeea9128dfb7605215 SHA512 91c5a0f807549fbe9d87df6e40b8c3db0f9be753616ba51804900195d02120cd972e39c69dd99e60e4ea1b1d9831d0b956b64ce71b2fe03422efc57bccf5cb70
+DIST python-rtmidi-1.5.1.tar.gz 331487 BLAKE2B fafa56132c54c20a702bcdc7dbe87b9eb3384ecf1e53ee76926866ba6f6fb601f55f4525f6b12f477f8659e4da8138940c5037ac0a4f31f472261089f0d25b03 SHA512 656690f397983834a719be6b58db66db066469b356ef00ff8d62666af9b5e3ef572e541cf38e082b2122a31d8895fd52c0392ed6bdec387baf3f5827de411254
 EBUILD python-rtmidi-1.4.9.ebuild 1147 BLAKE2B 7a49aced93d0a8aad757f57d91790f49fe61d78bafbd06685f96fcb76ad4b3499ebc4bf36188867a221f4e240d0212f89da47a6b23f498aa18085bec705ac819 SHA512 fb429d92746f974c6b23ac275389b00a331685e89ff4d76c85535f4e4967bf9b5752688b4cb7020197647bf43eb7d02d9c1796bb614b39a4ca6b96c72c7e817d
+EBUILD python-rtmidi-1.5.1.ebuild 1196 BLAKE2B 12ec251f41ebb76a71f3b12e501db06c7f795689b2a6b1c15c82fa9c25e300ac8c266de979bac08f34e06f1e606eb650c158f394445827759a6db1bbe93ae418 SHA512 704f631581a9e641ebbba2484811efa56bc6851659aa17c4e468fea95bbc55bcd7ad11563b9326f7bcf95552733d49b5829f320efd638cb62ff5a6295e066b5d
 MISC metadata.xml 388 BLAKE2B b1bce0f609aae5a298c26c80c3dc3aa33eadf32c9de9da22f4a4f808d1cfd8c769b095d12f2264cf9dd04cdbec8a0fb7202b10c04bb43f9112146023aadd398d SHA512 012ad743d364b9266bef852d159235f27b172ec7fceff43737fe8a67478f991dc53532b021c02d8ffc2eea19cdc568046cf90e440afefb46dcdad275a33f71e3
diff --git a/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-build_backend.patch b/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-build_backend.patch
new file mode 100644
index 000000000000..fdb2a14b7c7d
--- /dev/null
+++ b/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-build_backend.patch
@@ -0,0 +1,33 @@
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,14 +1,14 @@
+ [build-system]
+-# https://thiblahute.gitlab.io/mesonpep517/
+-build-backend = "mesonpep517.buildapi"
++build-backend = "mesonpy"
+ requires = [
+     "cython",
+     "wheel",
+-    "mesonpep517 @ git+https://gitlab.com/SpotlightKid/mesonpep517.git@rtmidi",
++    "meson-python",
+     "ninja"
+ ]
+ 
+ [project]
++name = "python-rtmidi"
+ description = "A Python binding for the RtMidi C++ library implemented using Cython."
+ authors = [
+     { name="Christopher Arndt", email="info@chrisarndt.de" },
+@@ -41,12 +41,6 @@
+     "music",
+     "rtmidi",
+ ]
+-meson-python-option-name = "python"
+-meson-options = [
+-    "-Dwheel=true",
+-    "-Dverbose=true",
+-    "--buildtype=plain"
+-]
+ 
+ [project.license]
+ file = "LICENSE.md"
diff --git a/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-unbundle_rtmidi.patch b/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-unbundle_rtmidi.patch
new file mode 100644
index 000000000000..1501a46738d4
--- /dev/null
+++ b/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-unbundle_rtmidi.patch
@@ -0,0 +1,55 @@
+--- a/meson.build
++++ b/meson.build
+@@ -11,6 +11,8 @@
+ 
+ cpp = meson.get_compiler('cpp')
+ 
++rtmidi_dep = dependency('rtmidi')
++
+ # Jack API (portable)
+ jack2_dep = dependency('jack', version: '>=1.9.11', required: false)
+ jack1_dep = dependency('jack', version: ['>=0.125.0', '<1.0'], required: false)
+--- a/rtmidi/meson.build
++++ b/rtmidi/meson.build
+@@ -1,7 +1,7 @@
+ # https://mesonbuild.com/Python-module.html
+ 
+ defines = []
+-dependencies = [python.dependency()]
++dependencies = [python.dependency(), rtmidi_dep]
+ link_args = []
+ 
+ if host_machine.system() == 'darwin' and coremidi_dep.found() and get_option('coremidi')
+@@ -47,11 +47,10 @@
+ # Build and install the extension module
+ module = python.extension_module(
+     '_rtmidi',
+-    [rtmidi_cython, rtmidi_sources],
++    [rtmidi_cython],
+     dependencies: dependencies,
+     cpp_args: defines,
+     link_args: link_args,
+-    include_directories: rtmidi_inc,
+     install: true,
+     subdir: 'rtmidi',
+ )
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -1,9 +1,5 @@
+ fs = import('fs')
+ 
+-rtmidi_sources = files([
+-    'rtmidi/RtMidi.cpp',
+-])
+-rtmidi_inc = include_directories('.', 'rtmidi')
+ rtmidi_mod_pyx = '_rtmidi.pyx'
+ rtmidi_mod_cpp = '_rtmidi.cpp'
+ 
+@@ -16,7 +12,6 @@
+         'rtmidi_cython',
+         output: rtmidi_mod_cpp,
+         input: rtmidi_mod_pyx,
+-        depend_files: [rtmidi_sources],
+         command: [cython, '-3', '--cplus', '-o', '@OUTPUT@', '@INPUT@'],
+     )
+ else
diff --git a/dev-python/python-rtmidi/python-rtmidi-1.5.1.ebuild b/dev-python/python-rtmidi/python-rtmidi-1.5.1.ebuild
new file mode 100644
index 000000000000..ed64baccc94b
--- /dev/null
+++ b/dev-python/python-rtmidi/python-rtmidi-1.5.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=meson-python
+PYPI_NO_NORMALIZE=1
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python bindings for media-libs/rtmidi implemented using Cython"
+HOMEPAGE="
+	https://pypi.org/project/python-rtmidi/
+	https://spotlightkid.github.io/python-rtmidi/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+alsa jack"
+
+# Most of these tests do not play nicely with the sandbox, some only
+# work with exactly the same version of rtmidi as the bundled one, and
+# several fail even with disabled sandbox unless there are actual MIDI
+# I/O devices present.
+RESTRICT="test"
+
+DEPEND="media-libs/rtmidi[alsa?,jack?]"
+RDEPEND="${DEPEND}"
+BDEPEND="<dev-python/cython-2.99[${PYTHON_USEDEP}]
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-build_backend.patch
+	"${FILESDIR}"/${PN}-1.5.1-unbundle_rtmidi.patch
+)
+
+distutils_enable_sphinx docs
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Just in case
+	rm -r src/rtmidi || die
+	rm src/_rtmidi.cpp || die
+}
+
+python_test() {
+	cd "${T}" || die
+	eunittest "${S}"/tests
+}
diff --git a/dev-python/referencing/Manifest b/dev-python/referencing/Manifest
index 4fc1a63e0ccd..f53a29d008a9 100644
--- a/dev-python/referencing/Manifest
+++ b/dev-python/referencing/Manifest
@@ -1,4 +1,4 @@
 DIST referencing-0.29.0.tar.gz 34963 BLAKE2B 88fa71124eeb8dd83b62e4f42299acaa55af33265dd474594efb7f71d522b276e8ed0a12dfa5822c9cc1c42acc0fd21d74400ef866c127bbdab85f9d03bfee96 SHA512 69b20b89e65fa58524aeb1bd38305edefcf61d65f785a090b21bcbd48524be45ae39dd7e3d70f403948b27fdb7e43660b7bd2a438ad26f397f5ca2021dd087e2
 DIST referencing-suite-f6fa54deec2ba3ae7326e6c292b2d7c4c20e9eb4.gh.tar.gz 18311 BLAKE2B 69f6a3059842f6ff3438760240126a2033d5287ba6daaff5f9d72e7eee8eb8ac3c72fb0be92c5daf33bf06a54621332c7042e6c8cf11ddbd328e347c9315e224 SHA512 9a7a9c9f8f75391a1589751a83ba5c8153ac41de20ecb2f02fc230ec94b313619bdcf58c5aab580f7825555df68a6d5626b77a92b958b77ebf1fdc16a0b87dd0
-EBUILD referencing-0.29.0.ebuild 991 BLAKE2B defbef73dfdd57128b907835e749966414848690d84d6973ea78dd44f1e20a243a36cd2e7d4207b59555b519ce2bc14b247b5907218afc424d5fd7f7bca7d6d6 SHA512 3b74ab50e1826f0beae3845ac3753e7163ef36d9cc122ea4b7d974df591fd951568a6c415091b2a83c6ffa43c7ebfff27665ba477e5afc123d55545d322f4cbc
+EBUILD referencing-0.29.0.ebuild 998 BLAKE2B cef22d0b37736a5c6760936b51e865f88a1603006a32d7398715e6de1e48009cefa8928d40caf85823c7bc3df0263d2c1b5b9428c9b539cd77c37b14c20b1fa2 SHA512 552de0188ffb5006753a7eb282c56883d271b7b7251dfa74fc864eeda701e36d85a9b5b9fcb12408c6b4c334d7076108d22ee4e76cdf2af081b0d201191e0f37
 MISC metadata.xml 408 BLAKE2B c91390d4742f1bf907ddcc7ba538bdba92c86cc4fadd812dd08161b88b0b8a2e255ace51c83b80256726378b264eb479de0d1cc76a539da72fdf559fc71f60ae SHA512 e54b9a8cd4967343ca43eb6998c57b6248739e8777aa75cf27fdd5027a4656ea4a6f0d8c1928dbc4ed9d9bedbc64d769c88e4cbacc99832f68176191b0d467da
diff --git a/dev-python/referencing/referencing-0.29.0.ebuild b/dev-python/referencing/referencing-0.29.0.ebuild
index 9350b4f52960..94196ba1c444 100644
--- a/dev-python/referencing/referencing-0.29.0.ebuild
+++ b/dev-python/referencing/referencing-0.29.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index fd2098d0be30..4953c273b44a 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,5 +1,7 @@
 DIST rich-13.3.4.gh.tar.gz 15059899 BLAKE2B f0ca78bf4cdec19136f9372e541ea90713e55acf4dc6f709b8edba9c8dc56da9ac534c6f32b05b634a970e4c02b1f08bfcb5ff949889d6f7bfaa104a1ca6b1cd SHA512 ab3b2ef30ede12f0959671baeff299621303e09750c245b3b3d7b8f1dbd3b7465410400b39668791de57d6027fe24a0a17d5b7284eea162d819c4cb6b9535f81
 DIST rich-13.4.1.gh.tar.gz 15062357 BLAKE2B b5e0067f378910b6a93f0ec40ff47a4ce26298055fba694441962ec2443f9bb76a8ba34ffe43a05abdc077ea8b1d26bbf6294c9d2370baf724045be043c29544 SHA512 655252e9f34da17df6bc7ce74560667f4472da4df6ed699d4302a02301857543ba8756153f48ea8d5a2df5e627ed3c4c8ab732b2b2b27baf66a10c798795a885
+DIST rich-13.4.2.gh.tar.gz 15063000 BLAKE2B f65079440bc7d89a3ff03be01fa71e076493ae50f22ae8781be2448a7ff2769c174d6654db3a835d34720c34cd8cbecfdd6b13e3064cf7fdcade71806563309d SHA512 17052a9fb0e1d89b31a00d8a719214719891d048fd805185b2d4258c8766130f44bf2280c9567bc162f3b34d9bf2eb7d747d6a37d910c81cd53d3003b51f70bd
 EBUILD rich-13.3.4.ebuild 1790 BLAKE2B b448ad02d1e41999de4a1a928a223df97f6c035752b8d8dbbb4931e306816743809fb895c15c6bf2b271bdfbdfdaa01cc7e8500d7e1ccc14f55aa8e7a5657e82 SHA512 d5770a6ef16151d6e937903a12795db31b1f929cf65e5415266408e888bfad950d2882c5460788a0a616cbd5bcda1b064b2c3649c2bdb0f3a3ae4a165eff84d1
 EBUILD rich-13.4.1.ebuild 1931 BLAKE2B 0f9b7756960b9c76bb7445a400f2aab4b2d3a31355b171a898cbfa7e964f8779f51ed3c0a4fdd3c24bb7b515e946ed93411638890d6482e68568296678a66f45 SHA512 2861a9626918bfec2ea1709984a07c0428c1826b5458860b4b7fa3e54735c32ea5b897d372bc2a4ef803e370c736e0dbe4c2f36ff470dc4892ddb6dfc74044c4
+EBUILD rich-13.4.2.ebuild 1826 BLAKE2B 3832659e8426cfcc314e2accb575ce6e1e461ac3c0c2f75ca9364f9e81cc126336abb76d189ee08b583b4281548a7fce81da1bac61a3f95b26930c125d1daf68 SHA512 41bacd4fc78f2e38bccc6e379840ea2a783e348f0fcb5cce8cf7e65afcc8c36796f164627db520a1d203b61ea7c1a8d268c6139daf514b5ee0cca32ba50d0ded
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-13.4.2.ebuild b/dev-python/rich/rich-13.4.2.ebuild
new file mode 100644
index 000000000000..53279bd88b2a
--- /dev/null
+++ b/dev-python/rich/rich-13.4.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
+HOMEPAGE="
+	https://github.com/Textualize/rich/
+	https://pypi.org/project/rich/
+"
+SRC_URI="
+	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	>=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x COLUMNS=80
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
+		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
+		# pygments?
+		tests/test_syntax.py::test_python_render_simple_indent_guides
+		tests/test_syntax.py::test_python_render_line_range_indent_guides
+	)
+	# version-specific output -- the usual deal
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# pypy3.10, to be more precise
+				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
+			)
+			;;
+		python3.12)
+			EPYTEST_DESELECT+=(
+				tests/test_inspect.py::test_inspect_builtin_function_except_python311
+				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
+				tests/test_inspect.py::test_inspect_integer_with_methods_python311_and_above
+				tests/test_pretty.py::test_attrs_broken
+			)
+			;;
+	esac
+	epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rpds-py/Manifest b/dev-python/rpds-py/Manifest
index faa34ff4ecc3..593bd341666a 100644
--- a/dev-python/rpds-py/Manifest
+++ b/dev-python/rpds-py/Manifest
@@ -35,5 +35,5 @@ DIST windows_i686_msvc-0.42.1.crate 722583 BLAKE2B e03978daa0ac95d7bd9f594b28360
 DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54eb6473070c5722c9ec791dc4077efe2d774d51f8b3d06b3321f8f21cc49764f44d54b3432ee7a0d9376925b422b197f5d557e SHA512 f4c16b587fe407dee1f39df029c52302a0fbd5f519816a8d974fe9c2f928043b14037c701c0f3c9cf2e5c765e82430fd4b71615fe63a66a88159f7b15506f892
 DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
 DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
-EBUILD rpds-py-0.7.1.ebuild 1480 BLAKE2B 190e91d9eaf8a87ae78d8f97b26486d89cfafe5327a3adf25a368ada39e73fa5051923ac11db3042dbf29bd7057df5c46889887332d47776a7c3014e9f32d966 SHA512 fc98d9783d0a4efd8318b6ddfebeec4f64f5110d9b5988305778c24844241c98c2509ff666d059752d4de75c46d3b139add9afc8906a636a0c54e549a5a9e3ac
+EBUILD rpds-py-0.7.1.ebuild 1487 BLAKE2B bf4ee0a5cf2f102d7fef7152f135acb062416db675992c9ff29036df32e858304c377a3ab95780e6659c66fef70812cfaf17359b3a7c6920a11b8567e718d2be SHA512 239e51140b81600e47622bbfff16948a33b0c2c8a9bd3f8b7c2499846fa8e8e2be42158b85e8d329299ac6636eff332a6f08b84f65f7e8b6ed9e7ff5daa8ea68
 MISC metadata.xml 364 BLAKE2B 33dc27885605ddf91618cb855a4039c3d978dda6ef80fc1ccbf810d354ad9a8eac78ae5854a3897de0058d63b79ae5075c47f7111150237390f863aa6be67d19 SHA512 5757331989615512c24c0a9276a525a9e5d718ab474f22ff9e81d93568b0be5c95265898ce16442dafcbc3d9a76c83407d1bd460190ba04ace9b45259d19019c
diff --git a/dev-python/rpds-py/rpds-py-0.7.1.ebuild b/dev-python/rpds-py/rpds-py-0.7.1.ebuild
index a055da859c46..270d1cffeabf 100644
--- a/dev-python/rpds-py/rpds-py-0.7.1.ebuild
+++ b/dev-python/rpds-py/rpds-py-0.7.1.ebuild
@@ -64,7 +64,7 @@ LICENSE+="
 	Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/semver/Manifest b/dev-python/semver/Manifest
index eb429c162e42..37379b79a4f4 100644
--- a/dev-python/semver/Manifest
+++ b/dev-python/semver/Manifest
@@ -1,3 +1,5 @@
 DIST semver-3.0.0.tar.gz 204359 BLAKE2B 93aedd2e1884147546c064f6d0cf96d6a26c1591974bcefc0318eda90e01a73a99111babb9e6dc7f2b5c12b3cad94329dde7454c87891c9364d1fdbed5dee30a SHA512 b8b4299172f5a4325a309c686e5fee7339083fe2cba3852b69ff5ca355646d092d30ec1a3fe107ecb2f86c8845d4189d3d2c6f668c9df86ede69e995dcec93bb
+DIST semver-3.0.1.tar.gz 205762 BLAKE2B f2dbe25d321938bbfe32a21ad23ae62d4033a29c0155b138586e1b9e6d32c0c90e5859dbee0705f0726f616dda10a48b69201f1b7b26cfb4cecdbf3733d7a17d SHA512 93dd23a884eb9d64aca6285840f5fd6d7fe5e21abab37ca77a35118efba1fcca67b424a86db03dc32ae355a8593c184a4b0eb3f807ff35373b84c63dd823eb3d
 EBUILD semver-3.0.0.ebuild 503 BLAKE2B e1831e7ee13076f83f229781e8eab9e577bd40e4870b7acdf260c0cc0c73c42b3dc87b0af39ccf23aa0adafc9e4ae967fbfe9406e979e595282666a20546eb1a SHA512 0d2494c7a9fd8c44dfb6c8c854cd17e9d61f089c31066132e05367f4edacbdf062f8ccd4f36c5822456dd3e108a0fe736517a856a53c458dd4970b6580beb029
+EBUILD semver-3.0.1.ebuild 503 BLAKE2B e1831e7ee13076f83f229781e8eab9e577bd40e4870b7acdf260c0cc0c73c42b3dc87b0af39ccf23aa0adafc9e4ae967fbfe9406e979e595282666a20546eb1a SHA512 0d2494c7a9fd8c44dfb6c8c854cd17e9d61f089c31066132e05367f4edacbdf062f8ccd4f36c5822456dd3e108a0fe736517a856a53c458dd4970b6580beb029
 MISC metadata.xml 388 BLAKE2B acaeaf260073c58d5bac6d2c59228301009c59492fd03d51ec0127229e2bbdead1d14dc716f100cd2543be8e50020f06299d6dbad125514756f7dd659b8119ae SHA512 97533f8b2877e780da67de9a47dbc87de751b4ea3831cbc44b345ba434736f584ab3e937c472f62c57410764facf76d6c8ab31857f9fd8e66626072c032a2714
diff --git a/dev-python/semver/semver-3.0.1.ebuild b/dev-python/semver/semver-3.0.1.ebuild
new file mode 100644
index 000000000000..22f6eaf65f78
--- /dev/null
+++ b/dev-python/semver/semver-3.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python module for semantic versioning"
+HOMEPAGE="
+	https://github.com/python-semver/python-semver/
+	https://pypi.org/project/semver/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -o addopts=
+}
diff --git a/dev-python/service-identity/Manifest b/dev-python/service-identity/Manifest
new file mode 100644
index 000000000000..01bfd1f5f123
--- /dev/null
+++ b/dev-python/service-identity/Manifest
@@ -0,0 +1,5 @@
+DIST service-identity-21.1.0.gh.tar.gz 35326 BLAKE2B c6c985db990f9a93b2954a596817b476e178fd5949a683aebe7506e56ed90a19f872f6c5caa5a7219c162cfd43924e0a3cdb36a666aca01b28736f0927ae72b2 SHA512 6375bc5e8329118b2beb163ffffecc1479839e4e98173576e4737deebcc4c057ac357315976d3f53a280defd4e2c1f6b74e9604ec1aa94144240c2fb4bf07461
+DIST service_identity-23.1.0.tar.gz 39840 BLAKE2B d4445cce42e9dba3ae192b05b3f66daab72cefe521c299837a73af84ff2705060580e3a052af01ba9abad820d3d252804050d8e3b2220dad48252832db8a90fa SHA512 bc53f563050811a2b40dbfcf1e0a1b1b5677e2b48ed4e94e37d29735baea49ed7a7099d656444c0054fa2c23ae96026e67919cf24b01a3ae6b3549fd25dfe4d1
+EBUILD service-identity-21.1.0-r1.ebuild 932 BLAKE2B a51c8117324513de6dd8467212a554b24be2fb97ae06fa1ab079b36947e9444f6f8cb43fec0a04ce13929ad368e487cf374edc264062edca0166b49227ec6f38 SHA512 846b112bab3c2f3dae1a9a29be0cb9e9faab353ebfa26eb35f53d2eaab87a64041a5caadc04ff50a45ad0bd4dcaabc09c7f44fefcb7d663f39b772da390ba65f
+EBUILD service-identity-23.1.0.ebuild 776 BLAKE2B d46a855cae4a2d40c0eeccbc60bda0439de02bff815d16a5d762293dd03028aada5a5fa81eaf2ade6d54b66d3b4f8a1a1c5b9e2dd8940ffb640cc200b1ee038b SHA512 93232000716e330ff1a8049387556d4fd6c3b90558fae0a04e3877cec3e9733497270e2248c2cc2851a5a1ca2ec8d28a729d53892db8e38f3513d4aaaec992f8
+MISC metadata.xml 405 BLAKE2B 6cbc25ff47728a28c25dc7c28670486dc3eeb488931fcf3883bd278f72d7f7fcd5834087c811cbeab32fd85f4dc04afd7b6fd50571283b2e88df3cc5b36dbc3e SHA512 db97cac52d30f9e01f40b4e1629b7602f643bbc0947db6ad8d4112a158a2e1caa2200438354e903d6986219a782de131b1a0ad7ad05203242b31faef9fb242f3
diff --git a/dev-python/service_identity/metadata.xml b/dev-python/service-identity/metadata.xml
index 7331b1a5a602..7331b1a5a602 100644
--- a/dev-python/service_identity/metadata.xml
+++ b/dev-python/service-identity/metadata.xml
diff --git a/dev-python/service_identity/service_identity-21.1.0-r1.ebuild b/dev-python/service-identity/service-identity-21.1.0-r1.ebuild
index 7c722dbd8a65..9beb3883a776 100644
--- a/dev-python/service_identity/service_identity-21.1.0-r1.ebuild
+++ b/dev-python/service-identity/service-identity-21.1.0-r1.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
+MY_P=${P/_/-}
 DESCRIPTION="Service identity verification for pyOpenSSL"
 HOMEPAGE="
 	https://github.com/pyca/service-identity/
@@ -15,9 +16,9 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/pyca/service-identity/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
-S=${WORKDIR}/${P/_/-}
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/service-identity/service-identity-23.1.0.ebuild b/dev-python/service-identity/service-identity-23.1.0.ebuild
new file mode 100644
index 000000000000..58c88dc59216
--- /dev/null
+++ b/dev-python/service-identity/service-identity-23.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Service identity verification for pyOpenSSL"
+HOMEPAGE="
+	https://github.com/pyca/service-identity/
+	https://pypi.org/project/service-identity/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	>=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
deleted file mode 100644
index 62ff87058528..000000000000
--- a/dev-python/service_identity/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST service_identity-21.1.0.gh.tar.gz 35326 BLAKE2B c6c985db990f9a93b2954a596817b476e178fd5949a683aebe7506e56ed90a19f872f6c5caa5a7219c162cfd43924e0a3cdb36a666aca01b28736f0927ae72b2 SHA512 6375bc5e8329118b2beb163ffffecc1479839e4e98173576e4737deebcc4c057ac357315976d3f53a280defd4e2c1f6b74e9604ec1aa94144240c2fb4bf07461
-EBUILD service_identity-21.1.0-r1.ebuild 916 BLAKE2B 0998586542f7b5f95a507ccd25e3298baa776718c7792298641b58d7321b745ce25a74f12ee3fc4396848606ce66c6c38737ae8b78dbbc268ead3b3cc19afba4 SHA512 7d794f4034a7d53388dee372a6c48845e1bf845f26efb580781b9d0f01fd51b620a65331e51eec4779a0497dac76ffa9fec88e73258c3bf069436cc3d9772622
-MISC metadata.xml 405 BLAKE2B 6cbc25ff47728a28c25dc7c28670486dc3eeb488931fcf3883bd278f72d7f7fcd5834087c811cbeab32fd85f4dc04afd7b6fd50571283b2e88df3cc5b36dbc3e SHA512 db97cac52d30f9e01f40b4e1629b7602f643bbc0947db6ad8d4112a158a2e1caa2200438354e903d6986219a782de131b1a0ad7ad05203242b31faef9fb242f3
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index 61cb00eb872b..e5ffe9e49bbc 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -4,8 +4,10 @@ AUX shiboken2-5.15.5-python311-2.patch 2056 BLAKE2B c93be29e31b0fa6ce28a29de0dc4
 AUX shiboken2-5.15.5-python311-3.patch 2363 BLAKE2B 84521be2008dda0fc9398dac2c6e235d0d976c3219f7ecf50f28938a7cce6952ec41795c2c86d0f71ccd94210661dc22a471adb2f879a133e11a3148923fd708 SHA512 540ff5afbfebcc00f20c43993f67458013f4655c06505fdf23bc26085bd2c621863dd9c28be1a20dca299113aee828974f853b145818fdb11d59fc12d0bb8c14
 AUX shiboken2-5.15.6-fix-pyside2-compile.patch 422 BLAKE2B bdb66c4ef26fccf4b9f4bc4586fb7ffdd8dfed80bf6315a70c86882f98250e42235ff27265b6c3a4e65e8dd7b233b61201a33808985ffb50e929bc8b5deb864f SHA512 4f608eb93fb72f81a9327699b14d4451261831f5079fac12aa88ce17ac30fc846bd9b461b8f6a4780727507b388f675a116f55ef1c240ced33d941315af4d21c
 AUX shiboken2-5.15.8-py-limited-api.patch 527 BLAKE2B a27886393ff917dbf3b1318d44d998e574e87ce79dbcc694dedb2dc9da7c173c87b40eb8d6296d2f1f7d6bd3ccffa2e5ae9a11e97a2f4e436d4902b2a447513c SHA512 579b88892e05b2e313f14adebaf62e399fd3f9981955e15a762196ca405b0dccc254edfd941727f777ea97709272475c8df239991d2aa7491e200c61dd66a583
+DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2
 DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
 DIST pyside-setup-opensource-src-5.15.9.tar.xz 3581660 BLAKE2B 65d5317f9ea55385bbe093cf43c214655effd877feed6409acc4f6f65768dcde8c94c4f29157f8d7dcb36d442c649290764706834885b08ecf9934b383b3e2a4 SHA512 cc63d64b909f1fd98b64a0bba61b278b1a5b60059168287546ee36204ede2df4317eb4ce5638a268d387e6db40fec203631fc4a48e4116a6b4a30d675bf876d3
+EBUILD shiboken2-5.15.10.ebuild 6634 BLAKE2B b12c70233571b9c483c00b02386c71ca22fd5b8602a3f6a4bbf273598bccf2602ba550c8b62454def4a2a24320a450385361874b66d801ac493679bfdbc31b9d SHA512 324c1e1583bac46f1615306de3da679a795521c2bccf9254f9f4a15ef44f7f1e91f840e7cd0b8ef5c8c96c15cba97594faeaf033d59a3a5ed99df66667332e67
 EBUILD shiboken2-5.15.8.ebuild 6739 BLAKE2B fd67d3f2035cdf39bba9d463a6ffa38b36095d7a80cd412d95df9d051e299624ac83c6dfe94016017feb3985a6f5793a25931781e0fc420347e9f9db2e94a46e SHA512 46f005dad362e9fa1f91ae71155379402d02c5680a8d5e295f932579ae290d0eec98def094e898c81f57af08d78c7bb714c74543c06f195a5d965c105a771fd6
 EBUILD shiboken2-5.15.9.ebuild 6734 BLAKE2B c73908fb4de247c194658d413b65bba5de8e5b165381e968a55ec86bbfd752049f6f435ab464b5202830ffae75b27a5ef408c23aca2026c04426e0f741469436 SHA512 80931441a77a052ba4bb549b8ec1213ae793dcdc3bd721a90fb4cf7bb3804e881a1beebac1781144093201959e44d9e0ff5aea8a1a65fc15912e97df499040ca
 MISC metadata.xml 730 BLAKE2B 803b825adb9fcd4379b1e3fba57d6b1916a81ced12f3b3c7d3ddcd68a0c03e85fcf31d5b07a70deebe073f267fe93a0529f7ffb4b1a9508a2223894883044f3b SHA512 5a462077fee2bd3ac87ab79274be0a718fd9b273fca4946d2d2734cefdf5817e6b4dc478a828b3bc783c63e64a62a6662b482d61eefe57386c15f9703a57fb24
diff --git a/dev-python/shiboken2/shiboken2-5.15.10.ebuild b/dev-python/shiboken2/shiboken2-5.15.10.ebuild
new file mode 100644
index 000000000000..9ec68bef9d5c
--- /dev/null
+++ b/dev-python/shiboken2/shiboken2-5.15.10.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Split the "/usr/bin/shiboken2" binding generator from the
+# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former
+# requires everything (including Clang) at runtime; the latter only requires
+# Qt and Python at runtime. Note that "pip" separates these two as well. See:
+# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
+# Once split, the PySide2 ebuild should be revised to require
+# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime.
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake llvm python-r1 toolchain-funcs
+
+MY_P=pyside-setup-opensource-src-${PV}
+
+DESCRIPTION="Python binding generator for C++ libraries"
+HOMEPAGE="https://wiki.qt.io/PySide2"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}/sources/shiboken2"
+
+# The "sources/shiboken2/libshiboken" directory is triple-licensed under the
+# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
+# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be
+# arbitrarily relicensed. (TODO)
+LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+docstrings numpy test vulkan"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests fail pretty bad and I'm not fixing them right now
+RESTRICT="test"
+
+# Minimal supported version of Qt.
+QT_PV="$(ver_cut 1-2)*:5"
+
+# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
+LLVM_MAX_SLOT=15
+RDEPEND="${PYTHON_DEPS}
+	=dev-qt/qtcore-${QT_PV}
+	<sys-devel/clang-16:=
+	<sys-devel/clang-runtime-16:=
+	docstrings? (
+		>=dev-libs/libxml2-2.6.32
+		>=dev-libs/libxslt-1.1.19
+		=dev-qt/qtxml-${QT_PV}
+		=dev-qt/qtxmlpatterns-${QT_PV}
+	)
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	vulkan? ( dev-util/vulkan-headers )
+"
+DEPEND="${RDEPEND}
+	test? (	=dev-qt/qttest-${QT_PV}	)
+"
+
+DOCS=( AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.15.5-python311-1.patch
+	"${FILESDIR}"/${PN}-5.15.5-python311-2.patch
+	"${FILESDIR}"/${PN}-5.15.5-python311-3.patch
+	"${FILESDIR}"/${PN}-5.15.5-add-numpy-1.23-compatibility.patch
+)
+
+# Ensure the path returned by get_llvm_prefix() contains clang as well.
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+	# TODO: File upstream issue requesting a sane way to disable NumPy support.
+	if ! use numpy; then
+		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
+			libshiboken/CMakeLists.txt || die
+	fi
+
+	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
+	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
+	if use vulkan; then
+		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
+			ApiExtractor/clangparser/compilersupport.cpp || die
+	fi
+
+	# Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
+	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
+	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
+	# the largest version specifier that exists under the "/usr/lib/clang/"
+	# subdirectory. This assumption is false in edge cases, including when
+	# users downgrade from newer Clang versions but fail to remove those
+	# versions with "emerge --depclean". See also:
+	#     https://github.com/leycec/raiagent/issues/85
+	#
+	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
+	# eclass are defective, returning nonsensical placeholder strings if the
+	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
+	# PySide2 does *NOT* care whether the end user has done so or not, as
+	# PySide2 unconditionally requires Clang in either case. See also:
+	#     https://bugs.gentoo.org/619490
+	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
+		ApiExtractor/clangparser/compilersupport.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Minimal tests for now, 2 failing with the extended version
+	# FIXME Subscripted generics cannot be used with class and instance checks
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
+	)
+
+	shiboken2_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
+		)
+		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
+		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+		cmake_src_configure
+	}
+	python_foreach_impl shiboken2_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+src_install() {
+	shiboken2_install() {
+		cmake_src_install
+		python_optimize
+
+		# Uniquify the "shiboken2" executable for the current Python target,
+		# preserving an unversioned "shiboken2" file arbitrarily associated
+		# with the last Python target.
+		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
+
+		# Uniquify the Shiboken2 pkgconfig file for the current Python target,
+		# preserving an unversioned "shiboken2.pc" file arbitrarily associated
+		# with the last Python target. See also:
+		#     https://github.com/leycec/raiagent/issues/73
+		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+	}
+	python_foreach_impl shiboken2_install
+
+	# CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing
+	# downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so"
+	# library and one "shiboken2" executable linked to one Python interpreter.
+	# See also:
+	#     https://bugreports.qt.io/browse/PYSIDE-1053
+	#     https://github.com/leycec/raiagent/issues/74
+	sed -i \
+		-e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
+		-e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
+		"${ED}/usr/$(get_libdir)"/cmake/Shiboken2*/Shiboken2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
+
+	# Remove the broken "shiboken_tool.py" script. By inspection, this script
+	# reduces to a noop. Moreover, this script raises the following exception:
+	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
+	rm "${ED}"/usr/bin/shiboken_tool.py || die
+}
diff --git a/dev-python/shiboken6/Manifest b/dev-python/shiboken6/Manifest
index 2c3b82761c2a..738ceb0bc3a0 100644
--- a/dev-python/shiboken6/Manifest
+++ b/dev-python/shiboken6/Manifest
@@ -1,4 +1,6 @@
 AUX shiboken6-6.3.1-no-strip.patch 1001 BLAKE2B c486f9423d4934c2305e8f3109f017dbebd568573469a2fced8da895fbc61ef07a80e0d1c846e7a57988801d6ec4be05b86b46a8039e6702d667129a899fc137 SHA512 1f3e5b082a978e3ab8d8f4d9a5a0a661b8c063e2ece0221440abe342fbd45d566a384d588dbf00a1e469687f82da3728cd53e35d02077ce6a748d3747de3cec2
 DIST pyside-setup-everywhere-src-6.5.0.tar.xz 13566572 BLAKE2B 2eb038b08755ced2dee34a309bbb18d47b40ef0b19bbf42901695bfdd4fccf35e09bb939ae9d7049e6477436c11dc1424376d8f1cbbd8fdaa2cd978114eedb9e SHA512 4a1f88d18d7276182c83b6deff8d57c4c40914292b61dcea76975de5506d7fffa4db7b783161373585ff90dc96a2acc6fed98d06a6a35fff6e92864f2699ea7f
+DIST pyside-setup-everywhere-src-6.5.1.1.tar.xz 13565304 BLAKE2B 55b221142f5e112a39c0b5df7f7b200f65cfd30da2884340b9bef5e7cb1bcfe2e8ed7aeb0cf7ef5f894f43f6ad582b35e649b7c6430bdba8719e70cca3c29c2d SHA512 fe99ad09b4e0b238175594bbff94453a84c56f21b004477fdab2a2435b4b4148b0b99b26e1b1e1671b71656f4cfb03c3913aa6d85084e3eb8200ff906535a5eb
 EBUILD shiboken6-6.5.0.ebuild 6471 BLAKE2B 192393129d4e781456c611cdd9b31bfb9e9a8ed347e2f2a06c8fd449efe798e4a55c04cee911b65cc5c8383426b1b109c0401bead811336dea6f4d1847557121 SHA512 7994ef754f449fafd22db3f0d5576752e2c95d6ae79fb743b648bd8b8ca6821c05c390246b6468afd7d8834b1193667ac9f738f8519f669ef3329256953e00a5
+EBUILD shiboken6-6.5.1.1.ebuild 6471 BLAKE2B 62b8a64ee17d0ccfb4605e5f85e6d272090df69834daf51621921b622cc0d74dff442690989b90f68f88a87f35d4b5aa437c54402ba83b6ab8253aec07b29d85 SHA512 d0943869d958a5ae80c40b4f0dfa2f519c310b38865c66b8246bd203ee570d8465359075bbdc0fff4e98f6c0158752f5432d817f1f36ef38785f2fbf140c0e5c
 MISC metadata.xml 730 BLAKE2B 33e7e589d02ec0517e134aa50407ecb97c6800be3ab7b69174d65776f62c1f25c2b2209d51299d9e0110b5f5e9322ee2c0b43dc89e6b12c40ea322ca9bc8eb3f SHA512 cc4ecdd9bc86ce59c2027c6f87307d32bd76d5d2cd8c07edb6c60cc5317ea52a96136c7597a179d75f1632db2999300d8b8f0567679ba3fc562804774fcdcc98
diff --git a/dev-python/shiboken6/shiboken6-6.5.1.1.ebuild b/dev-python/shiboken6/shiboken6-6.5.1.1.ebuild
new file mode 100644
index 000000000000..d7d5a598c11e
--- /dev/null
+++ b/dev-python/shiboken6/shiboken6-6.5.1.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Split the "/usr/bin/shiboken6" binding generator from the
+# "/usr/lib64/libshiboken6-*.so" family of shared libraries. The former
+# requires everything (including Clang) at runtime; the latter only requires
+# Qt and Python at runtime. Note that "pip" separates these two as well. See:
+# https://doc.qt.io/qtforpython/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
+# Once split, the PySide6 ebuild should be revised to require
+# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime.
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake llvm python-r1 toolchain-funcs
+
+MY_PN="pyside-setup-everywhere-src"
+
+DESCRIPTION="Python binding generator for C++ libraries"
+HOMEPAGE="https://wiki.qt.io/PySide6"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
+S="${WORKDIR}/${MY_PN}-$(ver_cut 1-3)/sources/shiboken6"
+
+# The "sources/shiboken6/libshiboken" directory is triple-licensed under the
+# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
+# with version 1.0 of a Qt-specific exception enabling shiboken6 output to be
+# arbitrarily relicensed. (TODO)
+LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+docstrings numpy test vulkan"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests fail pretty bad and I'm not fixing them right now
+RESTRICT="test"
+
+# Minimal supported version of Qt.
+QT_PV="$(ver_cut 1-2)*:6"
+
+# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
+LLVM_MAX_SLOT=15
+RDEPEND="${PYTHON_DEPS}
+	=dev-qt/qtbase-${QT_PV}
+	<sys-devel/clang-16:=
+	<sys-devel/clang-runtime-16:=
+	docstrings? (
+		>=dev-libs/libxml2-2.6.32
+		>=dev-libs/libxslt-1.1.19
+	)
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	vulkan? ( dev-util/vulkan-headers )
+"
+DEPEND="${RDEPEND}
+	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
+"
+# testlib is toggled by the gui flag on qtbase
+
+DOCS=( AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
+)
+
+# Ensure the path returned by get_llvm_prefix() contains clang as well.
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+	# TODO: File upstream issue requesting a sane way to disable NumPy support.
+	if ! use numpy; then
+		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
+			libshiboken/CMakeLists.txt || die
+	fi
+
+	# Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include"
+	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
+	if use vulkan; then
+		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
+			ApiExtractor/clangparser/compilersupport.cpp || die
+	fi
+
+	# Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
+	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
+	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
+	# the largest version specifier that exists under the "/usr/lib/clang/"
+	# subdirectory. This assumption is false in edge cases, including when
+	# users downgrade from newer Clang versions but fail to remove those
+	# versions with "emerge --depclean". See also:
+	#     https://github.com/leycec/raiagent/issues/85
+	#
+	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
+	# eclass are defective, returning nonsensical placeholder strings if the
+	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
+	# PySide6 does *NOT* care whether the end user has done so or not, as
+	# PySide6 unconditionally requires Clang in either case. See also:
+	#     https://bugs.gentoo.org/619490
+	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
+		ApiExtractor/clangparser/compilersupport.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Minimal tests for now, 2 failing with the extended version
+	# FIXME Subscripted generics cannot be used with class and instance checks
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
+	)
+
+	shiboken6_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
+		)
+		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
+		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+		cmake_src_configure
+	}
+	python_foreach_impl shiboken6_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+src_install() {
+	shiboken6_install() {
+		cmake_src_install
+		python_optimize
+
+		# Uniquify the "shiboken6" executable for the current Python target,
+		# preserving an unversioned "shiboken6" file arbitrarily associated
+		# with the last Python target.
+		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
+
+		# Uniquify the Shiboken6 pkgconfig file for the current Python target,
+		# preserving an unversioned "shiboken6.pc" file arbitrarily associated
+		# with the last Python target. See also:
+		#     https://github.com/leycec/raiagent/issues/73
+		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+	}
+	python_foreach_impl shiboken6_install
+
+	# CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing
+	# downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so"
+	# library and one "shiboken6" executable linked to one Python interpreter.
+	# See also:
+	#     https://bugreports.qt.io/browse/PYSIDE-1053
+	#     https://github.com/leycec/raiagent/issues/74
+	sed -i \
+		-e 's~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
+		-e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
+		"${ED}/usr/$(get_libdir)"/cmake/Shiboken6/Shiboken6Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
+
+	# Remove the broken "shiboken_tool.py" script. By inspection, this script
+	# reduces to a noop. Moreover, this script raises the following exception:
+	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
+	rm "${ED}"/usr/bin/shiboken_tool.py || die
+}
diff --git a/dev-python/sphinx_lv2_theme/Manifest b/dev-python/sphinx_lv2_theme/Manifest
index 3ee0d9338124..bc7d9dab1cac 100644
--- a/dev-python/sphinx_lv2_theme/Manifest
+++ b/dev-python/sphinx_lv2_theme/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx_lv2_theme-v1.2.2.tar.bz2 10221 BLAKE2B ff4c4f2e0f359b73bc63684b9120454741aafaaaad5b521a5a3bdec904f0fb390fb1e132317607f8559bd7991847dfcf2506b5462b00335a2d003835a9b33075 SHA512 94013784d1ce75ff872eb868b7cd20ef9351facf95d684bd49a4b0dfb8155aab19914dd03b5fe7c11cf42cd972ba6af6f377c8c6e2a3993622a911e9845da1cf
 DIST sphinx_lv2_theme-v1.4.0.tar.bz2 10368 BLAKE2B c4ef7bb51965ebecb193d13b6d3866db6234bec8387c9e532550cafb14bf404711715f60831912770998e4cd9feb21a7d3ea1d8e987e276ec644ce51f63e6be6 SHA512 fba7af83bbc7e47a3a87e7b819cd83009b4b2e04e6280efe56b0f7bc348f784a85f004b7124a5c3704329be95a0432ca690f9675e6b9330ecf493994258ddc8c
-EBUILD sphinx_lv2_theme-1.2.2.ebuild 594 BLAKE2B 984ad02e8a1ea532b961cd9906728038beaaff341b2193cecce8f03a66fabc1630af9a8a3975f1dd81aa8a4d136a427053e8430414ca3d74264226fad28360ed SHA512 372a2f70b52761bd32f993c5fb737a0643a95f3b438fd102884f689389e618e8e264b4e5393b9b752e6c6c851f28340db3ddbf3b8c313fd7d218674f7447a89c
-EBUILD sphinx_lv2_theme-1.4.0.ebuild 601 BLAKE2B f5b465e7d506984390e500fc47fa6c19e6e583078f81a84be7b33452b21365f158fe56dd46dbf32908fbc8eb815ed6607b33c845e912578bde1be7b549f1f51c SHA512 645f04adef886a9f925179da12973644951115d1d7d37287608c9023076f130998daf4a18f5186c9ddbdc5b5d51eb40ec17d305b37c652c0b0bf965f8a65bea3
+EBUILD sphinx_lv2_theme-1.4.0.ebuild 594 BLAKE2B 984ad02e8a1ea532b961cd9906728038beaaff341b2193cecce8f03a66fabc1630af9a8a3975f1dd81aa8a4d136a427053e8430414ca3d74264226fad28360ed SHA512 372a2f70b52761bd32f993c5fb737a0643a95f3b438fd102884f689389e618e8e264b4e5393b9b752e6c6c851f28340db3ddbf3b8c313fd7d218674f7447a89c
 MISC metadata.xml 429 BLAKE2B b4e7eb03faabacbb5a7b41f1b0b04ae1580f7a00959b0d0e575577cf0b93f1551773c492826c7635c6cfd18af0e608a23e7fceedb76ef99920c1f09fcd51ee17 SHA512 ac2b159c1a66cf08d5d4990150b0e930b40bfe8ab7f016e3b7d0d479110c0b8c402f33b46175dc31b56e6136a26fc84223e82fe5bdd87cf3de1a6b175254c62a
diff --git a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.2.2.ebuild b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.2.2.ebuild
deleted file mode 100644
index 516adbe9e52f..000000000000
--- a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.2.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Minimal pure-CSS Sphinx theme using the LV2 plugin documentation style"
-HOMEPAGE="
-	https://gitlab.com/lv2/sphinx_lv2_theme/
-	https://pypi.org/project/sphinx-lv2-theme/
-"
-SRC_URI="https://gitlab.com/lv2/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
diff --git a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.4.0.ebuild b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.4.0.ebuild
index bfa821ec3007..516adbe9e52f 100644
--- a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.4.0.ebuild
+++ b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.4.0.ebuild
@@ -18,4 +18,4 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 0b15058878ca..e55c1360bb34 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,3 +1,5 @@
 DIST translate-3.8.6.gh.tar.gz 1158560 BLAKE2B 127083188e3f25551e1a55b4499fb2247e7fb7c751d813f6a78491ec2f1e457e0c18d3416cf05533d11e36201b36814054f4eaf94693d04351a0928a0347fa98 SHA512 271b34ac44835af2e50537ec5a6a5d4dff497fd3358fe53c92e800109a347206d544f71bee7181ec335736a462578913262ddfbb27d4bcef39f247338bc99134
+DIST translate-3.9.1.gh.tar.gz 1175717 BLAKE2B 4d41b3de15de1f1611f5fbe05448c21943a5be3756af7594bd18a1f2da1c231dd2697d62a074cd6fec078a5178fb1116e359c720aa585fdb982b3f17afad62db SHA512 d38912046d522f0910149cea9a620f4378978bdff1366372681fa143f23764cf7c4d287fbc8713169d56f5d95c7048cfd34ab0ec560ca6dafbd18b45284d75eb
 EBUILD translate-toolkit-3.8.6-r1.ebuild 2295 BLAKE2B a8e851122065cfc5053ed8d50aa09d1afebbe1b3a0ba4b7a9f4129aaa0400ee77b4c4619aaa7f83488f691e141b1504e5cc8d082fbf832a3c6e2c052bfd78506 SHA512 feb37807713d699ac2b0b2bd4e9d44b070cfbf4ffab61a15553866b7c79c6939cbeb4cad3b7d6cbf96ff5b33b4dd4340fca9a0bbd88f1ecb25c20756cea9a5d5
+EBUILD translate-toolkit-3.9.1.ebuild 3157 BLAKE2B 3fc67f1433d432c15cefd6bfab0a892993e5c54b73d8490f83caaa8e8dd88da311ef1a38eb00f41543fa34101228f1c972f85ce4e96d119b60e9fa6e1151391b SHA512 fbffa1c2b3ed79388fc1c8114754597d45a121a96275cd73afd159c10f81d7215919c1c828187dc46b551d4503c59b9084f0b28a8c1631e449aecea7c03183b2
 MISC metadata.xml 756 BLAKE2B 06f64f258d362954f99f7e9eee241eb3dddc6b00b9069df2ad977d28b5cf06f9c8ee2246ee5958600b5ac86297968d7aaced6b6420dca4ed507c441c58c61ca9 SHA512 80374c40513ca450f97e3930929c1450e7438ea15830e60937952a6fccfd999675f2ca2056c5aa4e287ba256c6ec08a09d8f7adb8b2c5af8ca0cd595f34acd85
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.9.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.9.1.ebuild
new file mode 100644
index 000000000000..2f01db02ab4e
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.9.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MY_P=translate-${PV}
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="
+	https://github.com/translate/translate/
+	https://pypi.org/project/translate-toolkit/
+"
+SRC_URI="
+	https://github.com/translate/translate/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+html +ical +ini +subtitles +yaml"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	dev-python/cheroot[${PYTHON_USEDEP}]
+	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
+	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
+	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+# Technically, the test suite also has undeclared dependency
+# on dev-python/snapshottest but all the tests using it are broken
+# anyway, so we skip them.
+BDEPEND="
+	test? (
+		dev-python/phply[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# unfortunately, this bad quality package doesn't support XDG_DATA_DIRS
+	# correctly, so we need to reassemble all data files in a single directory
+	local -x XDG_DATA_HOME=${T}/share
+	cp -r translate/share "${T}/" || die
+	cp -r "${ESYSROOT}/usr/share"/gaupol "${XDG_DATA_HOME}"/ || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Fails with network-sandbox (and even with it off but w/ softer fail)
+		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
+		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+		# all tests based on snapshottest are broken and I'm too tired
+		# to figure this out
+		translate/tools/test_pocount.py::test_cases
+		translate/tools/test_pocount.py::test_output
+		translate/tools/test_junitmsgfmt.py::test_output
+	)
+	local EPYTEST_IGNORE=(
+		# unpackaged fluent.*
+		translate/storage/test_fluent.py
+		# changes directory and does not change it back, sigh
+		tests/odf_xliff/test_odf_xliff.py
+	)
+
+	if ! use ini; then
+		EPYTEST_IGNORE+=(
+			translate/convert/test_ini2po.py
+			translate/convert/test_po2ini.py
+		)
+	fi
+
+	if ! use subtitles; then
+		EPYTEST_IGNORE+=(
+			translate/storage/test_subtitles.py
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr
+	doins -r translate/share
+
+	if ! use html; then
+		rm "${ED}"/usr/bin/{html2po,po2html} || die
+	fi
+	if ! use ical; then
+		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
+	fi
+	if ! use ini; then
+		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
+	fi
+	if ! use subtitles; then
+		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
+	fi
+}
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index e5551987ba8a..31da9b49f776 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,3 @@
 DIST trustme-1.0.0.tar.gz 29567 BLAKE2B d57049d5d72b0aca85911a39f1eed2388829ab7e6833a2f8cb7fccf6d743e99fdc7e2917382f1397787c70763bf2ea49210337021054fc549e7e95377f88dc52 SHA512 4315290b5c7341ede5037ece01608ab0e8e07427c8053e058fb5db23f59b0be63b44fda83d83d0755f44c2a0d595b193ca77050c5f908038be071c18d759756a
-EBUILD trustme-1.0.0.ebuild 777 BLAKE2B 2718a79c861db254d2ee233d1541a36a07d5f3029921cdd56db8c04a2005cbf8ec3f78682ec6f016c479e969e1105cfbf0b4dc138d8159cbb82ada798982203a SHA512 d19f5bb637e5175f1fe61fb16833da48abd3379da2470b9b33cb6ab0157d2f1a9616f2f4ed980c7f31f64a4c4393177fa3c1f41d1717eefcc07ae69b695ed1d1
+EBUILD trustme-1.0.0.ebuild 777 BLAKE2B b33e449bd3d346f60b02ec73d4896f48a2c94a45b0ab2aa9e0163c3c4b78559c7029953cfd57314dcdcd6556e7c899978b03df9b85e031eccea497e789166781 SHA512 ac038b29c1b2c65cd5f088ea132f8403aa54e8c175622c78058814169e0a3610cd652995b31409f0244ff2aedd130be396a3890f44aadc840aef0f34d7662199
 MISC metadata.xml 503 BLAKE2B f9759fc8612b385d57ad6734f363b0d03a7a354c4486ebe98ee855c35d0ca11d54be27cb78b21b56178350bc5520908d2efa8345ecb060fc87bc784303325f2d SHA512 477a6d3a46f72e9a813c04102556742545798868dc526376f90dcc43cfd7675479271f5b0cc4a718e35c74e663a3f99db939202e771f2ff731adf871b161df00
diff --git a/dev-python/trustme/trustme-1.0.0.ebuild b/dev-python/trustme/trustme-1.0.0.ebuild
index 61fc083b723c..ff56d9299371 100644
--- a/dev-python/trustme/trustme-1.0.0.ebuild
+++ b/dev-python/trustme/trustme-1.0.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/service-identity[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 2a2e1efc9b37..78195e3049ce 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -6,6 +6,6 @@ AUX twisted-22.10.0-sendmail.patch 1045 BLAKE2B 4566f4fcecd6d79d43af52bfba4b9953
 AUX twisted-22.10.0-time.patch 4275 BLAKE2B d8f4f79163aba42494c4f753f915df2611b3fd3f0dd26448087e9bc0b56be0fd1047a0a4e518e07846a6bbae14529590f057411528e8ca8464d122c6b5b08684 SHA512 e92be2938aca686e4cf2557d05287bf1b52cc4f57290ebc4d1942ad6894d148f7dd3072158b6249a0952b4bbb8ec221150ff81d162bd797a97eabde8b5f047b6
 DIST twisted-22.10.0.gh.tar.gz 3512714 BLAKE2B 2fd36ec6922f428e959ce0169bb9a3592b8b3e43aff8d34872883ecf0fad8d0fff01a52f06b54df3dc377f4fc1a488b6d66f9287b108b4749bb7d3c749b96061 SHA512 cf9ed96430376d499ae9627a7d0656c05cb99bc9e9b15a8f4166355363818f090bc3c2b383ed4cf19e1e38fb569e8618d35a0ddde2a90a06f3c9a4ea769837e4
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-22.10.0-r1.ebuild 4786 BLAKE2B 82ef65fd95abe13ae8cb4c6f534a2c731eb5d8fba5aa40548bb9b923b1c3b468db112fce2f979f5f4ad4bd4b85c8c0348d431ad93cf6fb5730fe9fce09061022 SHA512 7e4ef8650e84394de44086d6ca594ee89b45ed975e6665c6934e08c8ec8b00e782edc1e9b3b52da420e6cef90250f07a80779c39d855b4a1807dc0549da39162
-EBUILD twisted-22.10.0-r3.ebuild 4938 BLAKE2B d380f57f4cb156006418c08aa379f2b0efb02bafeb66843c67612a20d4dc045867c66c790cd45ede5a717e08d07212c55ff663ca34f97a1d64fa753afcd5c310 SHA512 5d4bcb18d8bfbe8930c065aa10a7ee2023f9b3393376cbf31f0f4a1d1b6ade342465b4c89c211991d3469554855e2ec5a0638475e53e07c2a3c39c58b6b65c18
+EBUILD twisted-22.10.0-r1.ebuild 4786 BLAKE2B c8e38c998613aa0e22c6b8e3253d336d02c8290cdbce55fe0e561ed021ad575fdd235df6601e10446893f46c1731dc923f58afd03359e673eef3fed54694ebc4 SHA512 d6bc65f955c3cb9228b8bd7bc84bca51f99e614680eb5d34cf99939af1fc696be11c04cee6766dce7d0a6475c12f2fd82d0a2a084c73e25380c823a6b71263ae
+EBUILD twisted-22.10.0-r3.ebuild 4938 BLAKE2B c60a5afb2d6f3527535a73543770d080b4a0882ae083322f914426df3bd74c1011ea7fea3e6e6aa06961c9a326dcaa4eed325ac4c8f788222fd2ff55cda7e12d SHA512 4b88b3a9fe6650063c1bc1d46ea05a355f103ab3d07e49308c19e20e18e464cb02acfe8535ed51e21b9a76c052cfb307cbad099f1ae602d6bc651abe647bd1a2
 MISC metadata.xml 1407 BLAKE2B e0cbf18212ca69f9dfc8c593e82be28caef297f245587824276d0a6c1fce09f31d4fa7497ea7e7b2c365e2ea7ca2301bd05ff2022237db1e11d10cb5ce9ed7a5 SHA512 a57b5d63bdd457d4c15b31451ced824933d67b1932af027a3abf3eef7e009eef24484565c6f543c7bafeb1380145bc9f895c78abb1a97f3c02219f6ed2af8fdd
diff --git a/dev-python/twisted/twisted-22.10.0-r1.ebuild b/dev-python/twisted/twisted-22.10.0-r1.ebuild
index db9b7ce789a2..2857f4759871 100644
--- a/dev-python/twisted/twisted-22.10.0-r1.ebuild
+++ b/dev-python/twisted/twisted-22.10.0-r1.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 	)
 	ssl? (
 		>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
 		>=dev-python/idna-2.4[${PYTHON_USEDEP}]
 	)
 "
@@ -71,7 +71,7 @@ BDEPEND="
 			)
 			ssl? (
 				>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
-				>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+				>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
 			)
 		' python3_{8..10} pypy3)
 		$(python_gen_cond_dep '
diff --git a/dev-python/twisted/twisted-22.10.0-r3.ebuild b/dev-python/twisted/twisted-22.10.0-r3.ebuild
index 0b7893704b48..a2ad74a4b2c5 100644
--- a/dev-python/twisted/twisted-22.10.0-r3.ebuild
+++ b/dev-python/twisted/twisted-22.10.0-r3.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
 	)
 	ssl? (
 		>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
 		>=dev-python/idna-2.4[${PYTHON_USEDEP}]
 	)
 "
@@ -72,7 +72,7 @@ BDEPEND="
 			)
 			ssl? (
 				>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
-				>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+				>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
 			)
 		' "${PYTHON_TESTED[@]}")
 		$(python_gen_cond_dep '
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 7a3591a7d9d5..7517bc8d6c70 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,3 +1,5 @@
 DIST ubelt-1.2.4.gh.tar.gz 337670 BLAKE2B 4c8b1c05cbed0f28e69b43445f12881e4c619be4a513b9263a6eb4d674e56b0a869d1e78072e1e89a505a12b3b40dddbb48424bccdcfbae1a7eabf7746bc79d0 SHA512 5fbe36598a035d1504b24a06e8f0fcd1c9d0ccc238f81bfad582288aced9ebc8323e7acf2705d47e60f36513cbf665051f554cce122d75d55247b5fc122af419
+DIST ubelt-1.3.0.gh.tar.gz 345051 BLAKE2B f7019311fa432e8c520b42261cc2cf1a494029bbb627c1b868364d4f816bc6a5c55c22e9755c4302f81f5984947bb7ada07b4d0137c1fee9be99e404c744ca54 SHA512 cd63501092d63426fa6169ab87d8224342f6ad59b1d9a41f36c53fda57057a10f8d20db26502bdbcc13c803eff3054cd2da67509308cc0930e1f765fe5f1281a
 EBUILD ubelt-1.2.4.ebuild 1024 BLAKE2B 96a8aca73668d4903a5aab51fe6f6f38d7c865c9083016d6c9477fea42805c9caa690d0780e87b813e57f53bea701832b9e2d6cfe72e924dabf7d1d3be92618e SHA512 c9186dfe2ee83ea51219c57b6b1b8e85acc9eab9370710aefc6af088c5a65a2f493e0232891766c6fce829bdcdc4fb8da2e121a525c458002fd39b070434eb20
+EBUILD ubelt-1.3.0.ebuild 1025 BLAKE2B 13557d3474c0b5c50f2e2ac2631bdf0485d8ab7cff66e6b12e0b0df8bd5e0ad01ec2fdb3ec85e2751fb0769a3971e0f2850a2dbf07e7256786cc15c0260c12e4 SHA512 dcf074152fb66584b571c3f570faa591aea39ed7b491458eb40fb18b4b89e1ce0c9bc524870233a6b9ce789d88781a957eee81916c0343d9d6057ea84c4c6bbc
 MISC metadata.xml 477 BLAKE2B 6fed6e411576ba35dd7e10ba964f3a5edb97a44c3e1794f841a4e5e91b554c74f7065bdb7dc697df5b280494d24aec7cd21511793cdb180775e809df1c8ff1b3 SHA512 aa5d2dea34583835caeffde7a8abf42bb2d154818675e210b96c9f152582224d9eb101771f3e00a67be143298eca4075fade67c6f47b5c19dd18e78df62e2adb
diff --git a/dev-python/ubelt/ubelt-1.3.0.ebuild b/dev-python/ubelt/ubelt-1.3.0.ebuild
new file mode 100644
index 000000000000..71a8a3a0bb6c
--- /dev/null
+++ b/dev-python/ubelt/ubelt-1.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="
+	https://github.com/Erotemic/ubelt/
+	https://pypi.org/project/ubelt/
+"
+SRC_URI="
+	https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+		dev-python/xdoctest[${PYTHON_USEDEP}]
+		>=dev-python/xxhash-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/test_editable_modules.py::test_import_of_editable_install
+	# relies on passwd home being equal to ${HOME}
+	ubelt/util_path.py::userhome:0
+)
diff --git a/dev-python/wurlitzer/Manifest b/dev-python/wurlitzer/Manifest
index e3f1bcc03322..a995cc9ad46c 100644
--- a/dev-python/wurlitzer/Manifest
+++ b/dev-python/wurlitzer/Manifest
@@ -1,3 +1,3 @@
 DIST wurlitzer-3.0.3.tar.gz 10171 BLAKE2B bf0ab15aaf0b693df64e0e9db38309ad1dad117aa97c1f380021ca81153eaf08ef742a97cf7451e72cc3473a2824fe142d8d8cd7ea1b28a367ed5761527c8d6a SHA512 6914ca77af8540bd949b74dfffe58b6ff9de603474e42e973b712f91a11dc906d7753f769932d26106c0543e98f42929741ed4de9ae14601eeadbd0dc5bfca35
-EBUILD wurlitzer-3.0.3.ebuild 461 BLAKE2B f5bea81c112da575f6fd0e7a38cfc173e0abd52859b46f7b879cda1d15f8c49bd84819342cbe28338b1c9d87f75e11debe8df2ad2c0eab1190b5b485970d85ea SHA512 caf8ea82feea9f22bfba87c1c81e22c301372f4e534e08a5936c1f7664421742a63882486d50160fb02fc763618683d7a3f7fbded23954723b1bfba8fe960d2e
+EBUILD wurlitzer-3.0.3.ebuild 474 BLAKE2B 1213c2838e696d57dfb7117b0b93b485497ad2e972be2565f0fb62b9e1f61ab2f3f5ba6fd7a672f627aed8b8362ac66b560d022707f4b9ebebfdfa87d5d7fe6a SHA512 218a935092ce3976203028bfa3af75f0c833dd6e17aacdbce84988f9af5f111f2c8c7039740dc61c39da47d669907e702b17a719a977b089ead7271b3a93467f
 MISC metadata.xml 511 BLAKE2B edeba987bc614b3c48f4bb8bc8535ad345b48e2fe4fd9efae19ed6df05c04188ca4a046d821941a7f6bd6284beb7a5c3281b5e9ebe6c3ad325e8707c1120baba SHA512 4e641fff5a9a209bbf65b7170bdc65f94d88d3bc4720ca5e105850671ebb286627c3fc2d90d8a8c25097c50f2be92cb29f1d61f4eb1d482b9baa3a80b79e6e60
diff --git a/dev-python/wurlitzer/wurlitzer-3.0.3.ebuild b/dev-python/wurlitzer/wurlitzer-3.0.3.ebuild
index 9a9f2345f3ef..14fed14bf3a0 100644
--- a/dev-python/wurlitzer/wurlitzer-3.0.3.ebuild
+++ b/dev-python/wurlitzer/wurlitzer-3.0.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ia64 ~riscv x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 280c4ab18649..44202a4681c1 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,7 @@
 DIST xmlschema-2.2.3.tar.gz 493444 BLAKE2B 64b8cbc27fe0378cc0a90e110f5c816a25f8b67b61b12363b200035cdc60ba1492923589a8b2b8d3c8a20ecaef85c6acb3c448a377d793efe87f7ad7a6a95bc3 SHA512 978f48d1d79cc8c4f3eab22fd2396da24abd42ea5d36439b72a7783d59e17863b647039a3a058513efd170e78c340705d5729dabd28aa8c26b0c4b2133a67222
 DIST xmlschema-2.3.0.tar.gz 494204 BLAKE2B 96daf1753ec8430fd2be892086a2b7cbb730729e407723845b6fc94175e1a6137df660fce0282ff0940903fe14d87dfbc14a4822ee8bd505861c142fadcc6cff SHA512 1e5a0f36e4e456ac49d808aa3480a68aa269296780a6d1dfa9e2cc8b3616971ba06abf632c1ff51eee0d6f0654d22ba5d1fa805fda81c6e3cfaa33fbc6301267
+DIST xmlschema-2.3.1.tar.gz 494834 BLAKE2B 2438a57f0b07aa5b0f9871bd6a4f64a90a7946ef3deb89b8e12736c52f185a3f4406ff5e894cd7b330600f82e55f6470a32769ed06e4ce85e914dc9808d5091c SHA512 6a08db7cc8f719f2b6d2b8c8478aa35b4fae72bd3c595a2ac9d39c6be6f75a3cdbf696f9e7424d3122d618a4bffc6bfddd5600daa8e0a64db5474fe95659c706
 EBUILD xmlschema-2.2.3.ebuild 829 BLAKE2B 2c93bc26b9b0ec48645d3068d7c6f397a7706aa3ebfb5fce74d55819a74b221b93ed53e639f2381d2960d4567622a5b7d3f8b9ef1c3dad6f22a130f0e1a83a9b SHA512 b95d73901c8ed6fa992d2d47d0bdf1f5cb9aa57a4066d3f90fec8d0a771d649c7fc3b34f6da043556006e949cb35507ee9f5b1e46f27a512d71d4156cfeb8cc6
 EBUILD xmlschema-2.3.0.ebuild 838 BLAKE2B 6abdef9582d368d34f7b3afe58699b8c4adba1c9442b8fc70ed92b14dc75ecdc1037327f0f847398d895716b2503b859d01c4f62c69ec3cca1432054795876ca SHA512 c70cdfe12eba8f9f3b1c06092c22451604ae999e916a65b6b03b1882c6505c50c972769eeebd144a1fcb61fbf29b94a1fb7e9ee1a6621ead6ee1e8f5dd57c140
+EBUILD xmlschema-2.3.1.ebuild 838 BLAKE2B 6abdef9582d368d34f7b3afe58699b8c4adba1c9442b8fc70ed92b14dc75ecdc1037327f0f847398d895716b2503b859d01c4f62c69ec3cca1432054795876ca SHA512 c70cdfe12eba8f9f3b1c06092c22451604ae999e916a65b6b03b1882c6505c50c972769eeebd144a1fcb61fbf29b94a1fb7e9ee1a6621ead6ee1e8f5dd57c140
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-2.3.1.ebuild b/dev-python/xmlschema/xmlschema-2.3.1.ebuild
new file mode 100644
index 000000000000..82c073a207c8
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-2.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="
+	https://github.com/sissaschool/xmlschema/
+	https://pypi.org/project/xmlschema/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/elementpath-5[${PYTHON_USEDEP}]
+	>=dev-python/elementpath-4.1.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 42986a0efe56..d845e5a0f142 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -2,8 +2,10 @@ DIST zeroconf-0.62.0.tar.gz 141269 BLAKE2B 17efd98394155e415cc9b9b6ff7b2ec6d7026
 DIST zeroconf-0.63.0.tar.gz 141580 BLAKE2B 22267e2be9118c91b5d7638843e89de0a2838eb1ebca2c233038fc202b8648256193fd8d61523960e1fce110ef7e3c3c06190f5369f700c02cbd047a036a362e SHA512 b899838ddae288b0f0483ca6950871d88ee387769507fe803a68df1cd5657bf9eee2aeecfc2e7685ded5327e70e04cfe445b564f16e3e9191112ddaae7deda18
 DIST zeroconf-0.64.0.tar.gz 142520 BLAKE2B b26c728519b7962c9620f857654e9bd347b1dcd98642a2305f4102ce8fe76cf2f24a934a7a65c355e1dbeaf2152c31f43b529f922b2c3fceec09dbc3f106c6ff SHA512 b85fab86150e88ab4aec8c5f5d338c962ad071140f5ee472b7f3ba8f196a96976e4dc9c1c99b2bd8040d486d0f79c966d45ee2ba58f7724cdbc3345811b9ebc9
 DIST zeroconf-0.64.1.tar.gz 142617 BLAKE2B 100243491aa85b9be8a7664ad9de6f1b202d02fbc2fd3be6116cf1c00c8885ad9fa00c784a036b27338ddb09f6a29b59a056fc610bcf9283cb9fce79110fa07b SHA512 9fa217811bea4b8597bfa4cdca40afd9fdd6920a6499d5b7f61fe78ff09106662f3cbc2381dfbfb541a330ecfa21a751e4bf455f19ba7433b0ebf43da1f21cce
+DIST zeroconf-0.66.0.tar.gz 142962 BLAKE2B 7cc625ea71e00a4e1f47589de1e8168c6299396f1f50d5ba6b530040a0d97ce40b1e858bb76eaaa3e8796c5cc793d819f0b31d693340f2ba5f26cf17d8db3f28 SHA512 544bccaf1acf2a3861c3e0131836f4ccd5d5aadc7222cf34f02ccae61abf32cf7430925698f13d14cf16a62ea9875df6e37fc5e93abfb02dbed79cb1e2e47fe3
 EBUILD zeroconf-0.62.0.ebuild 1580 BLAKE2B 471598ca1de5fe876c4d1a721ab0175586940cf97a47d86a5cb14e8ec4a8dab7561f6fd3cd083b1ebf35bfc124321f4eb898bd30931c5d60f79eb5651e3bbdc3 SHA512 658ca971fc4d5500d8cd3b76be9b33198fedff5b955cb1e3fde602c0733850b441d3a729814e454b4be24b55f3d6e9d18c906fb342bc6e89a2ce0ba9ac65faed
 EBUILD zeroconf-0.63.0.ebuild 1582 BLAKE2B bbafe742557ce0e6e843f7bcc9db9f8c8cb9d53f0027c384403c41b967ca522fe54c9645a1c458cbb4a681f22ad0d39e543372ea63a7a4b18872de4329df23a0 SHA512 2fcb6a753a03bc5b6931801515fc72e2d0fdabd224aa185b6af810955a42fd0da19baea2cc348acaf156e888a452cf425dde975c96784809f35bbec3e7131e71
 EBUILD zeroconf-0.64.0.ebuild 1393 BLAKE2B 78813d0b162fc37c63d4641f6fc5540690ee748aa1d455fa517ef4a4b39326ee7577e4e49eda53bcddbcc0c2005e4c5f469e7db27148aa7928971cc76f34042d SHA512 693ab85e111855611fbcc564c5ba1a073d6814f088ae93f0a7df963de5612c95184faacaf4fdeadfd5effef1c22411472b469e6ba180ded427489fdc93fd2d87
-EBUILD zeroconf-0.64.1.ebuild 1393 BLAKE2B 78813d0b162fc37c63d4641f6fc5540690ee748aa1d455fa517ef4a4b39326ee7577e4e49eda53bcddbcc0c2005e4c5f469e7db27148aa7928971cc76f34042d SHA512 693ab85e111855611fbcc564c5ba1a073d6814f088ae93f0a7df963de5612c95184faacaf4fdeadfd5effef1c22411472b469e6ba180ded427489fdc93fd2d87
+EBUILD zeroconf-0.64.1.ebuild 1533 BLAKE2B 8ea0107d0789fb0d1f51804a022f8d299e45f78a43245b13c6f0a1cb2f10f622a89b8ef60cc5bd35f6697b6e7868a8965a20ec18c81876e118969f3c8712b2e7 SHA512 e4d0f8efd6b6ba189fe7e547735aef30f1eb23fde92706e8e423da0fbf637292433e0c6bd2766af5aabfaf4f80b39e806234df35a3c8e4d15c6869a8e681197e
+EBUILD zeroconf-0.66.0.ebuild 1533 BLAKE2B 8ea0107d0789fb0d1f51804a022f8d299e45f78a43245b13c6f0a1cb2f10f622a89b8ef60cc5bd35f6697b6e7868a8965a20ec18c81876e118969f3c8712b2e7 SHA512 e4d0f8efd6b6ba189fe7e547735aef30f1eb23fde92706e8e423da0fbf637292433e0c6bd2766af5aabfaf4f80b39e806234df35a3c8e4d15c6869a8e681197e
 MISC metadata.xml 395 BLAKE2B e1ce7a8fbd6d50fd59fbce671a535a3af2fde79dcc98f146c4e361759e61ce6d7e4e241866262fcd78744c673212d1946830c3d7628956b498a98d0af36d4c3d SHA512 544cb62da7212926b63c4e19467fc3e3f7c8210320a8096dc913a846d392e9a09c2b9860312f88effc8ad7a54e0329149a68012b08c674663af5779957e037f9
diff --git a/dev-python/zeroconf/zeroconf-0.64.1.ebuild b/dev-python/zeroconf/zeroconf-0.64.1.ebuild
index 417165c9efb4..50486a2e065a 100644
--- a/dev-python/zeroconf/zeroconf-0.64.1.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.64.1.ebuild
@@ -27,7 +27,9 @@ RDEPEND="
 "
 # the build system uses custom build script that uses distutils to build
 # C extensions, sigh
+# Cython-3: https://github.com/python-zeroconf/python-zeroconf/issues/1183
 BDEPEND="
+	<dev-python/cython-3[${PYTHON_USEDEP}]
 	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
 	test? (
@@ -37,6 +39,8 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+export REQUIRE_CYTHON=1
+
 python_test() {
 	local -x SKIP_IPV6=1
 	local EPYTEST_DESELECT=(
diff --git a/dev-python/zeroconf/zeroconf-0.66.0.ebuild b/dev-python/zeroconf/zeroconf-0.66.0.ebuild
new file mode 100644
index 000000000000..50486a2e065a
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.66.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/python-zeroconf/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
+	' 3.{9..10})
+"
+# the build system uses custom build script that uses distutils to build
+# C extensions, sigh
+# Cython-3: https://github.com/python-zeroconf/python-zeroconf/issues/1183
+BDEPEND="
+	<dev-python/cython-3[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export REQUIRE_CYTHON=1
+
+python_test() {
+	local -x SKIP_IPV6=1
+	local EPYTEST_DESELECT=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+
+		# fragile to timeouts (?)
+		tests/services/test_browser.py::test_service_browser_expire_callbacks
+		tests/utils/test_asyncio.py::test_run_coro_with_timeout
+	)
+
+	epytest -o addopts=
+}