gentoo auto-resync : 25:05:2023 - 09:05:36

author: V3n3RiX <venerix@koprulu.sector> 2023-05-25 09:05:36 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-05-25 09:05:36 +0100
commit: 070db046876f2e8d5f83cb7b380ae857d06e493a (patch)
tree: 81c82d9b296b94b64dd8aea6ad369ea43f40bc14 /dev-python
parent: 4bc145ba9c79d57abcafc9b97c72bd5addd3e833 (diff)
78 files changed, 512 insertions, 282 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 900c2a20782f..e4703f29c79f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 72c204359c14..2e6abf1f352e 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -5,6 +5,7 @@ DIST ansible-compat-4.0.1.tar.gz 63728 BLAKE2B 51b6956059394e1e29d416113f6a92403
 DIST ansible-compat-4.0.2.tar.gz 63771 BLAKE2B bcf66825c52de63172f7d36b696e136cc203201743e482d1aa78033664de49120a1304c6397e28dc56205fbe1b5f382f86852bc735cd879151df1db3ebaa1c1b SHA512 6332e12dc123bea6307a5306bb44357507e8c60f5699e8a09a39f9cfe44c649cfd8150b3a4687b47bc62bd95a7bdc4801cac01e10870df451f23ac2e278414e5
 DIST ansible-compat-4.0.4.tar.gz 65116 BLAKE2B 3f96e052cb9ba0352884fe1cfeacf9a1e5a7bbee715d08c054df49112966751067eb08f32b0598a8559e200fa9c3a619b58b854699342b6185bd9579bc75cbf2 SHA512 b13bc3d7a29b2caebfddb7a2311bfb8ad94062019238ed5a8a22fe9de1c00d25426694755cdbf289094db7fdfd88248fcf3e17e9aef9601046ef33c25d6894e6
 DIST ansible-compat-4.0.5.tar.gz 65711 BLAKE2B f40e87012dba936ba8b6f204559484ff089034123da4c355f997d7cec857efc64adcd0a4ec9abe021a428f61c692b13a3e3146f78a1896689c61764286e03719 SHA512 c08bbbcbef7e49001009cbd691dc226626f1392dfc5a5be89166da0be91c8d5794a2e6a158b11787320a1dcbe24c85eedee28596b0fc27d0a3c2a499286f5efc
+DIST ansible-compat-4.1.0.tar.gz 66781 BLAKE2B ce0da545e4a81798ee9376129b9f9e8c0cfd7ca641086ae55516406b73f89472a1fc44384e3728207be76cb2b8d1b724c55ff5dcf72e88a0f971ccd59aea8a8d SHA512 15b40622a00bb3b4ac3c8ed5ef05e0a65b867fbe9579352fbcbff8113d46e8da5fb5c36e0092387da4509b33244c8d27c0c08de76ff8dd78fd19e465824078c5
 EBUILD ansible-compat-3.0.1.ebuild 1527 BLAKE2B 96e2661ff15393733d6b14ec2c3a3e80a1088c6091c4c18ae890e63209c89da545c9dd6ce43a758d7657172bc99ed337b7cd9854932b1ed5f90c5b1a846e0f01 SHA512 e00b04aae139353bac04b38ca8af9831aa20cba91ca222b7f729079f620f1dcbab67d67b7a55c183ba0908ad9bf2d502cfbe2d934db4ac2075d480c6b37d770e
 EBUILD ansible-compat-3.0.2.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
 EBUILD ansible-compat-4.0.0.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
@@ -12,4 +13,5 @@ EBUILD ansible-compat-4.0.1.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5
 EBUILD ansible-compat-4.0.2.ebuild 1527 BLAKE2B 96e2661ff15393733d6b14ec2c3a3e80a1088c6091c4c18ae890e63209c89da545c9dd6ce43a758d7657172bc99ed337b7cd9854932b1ed5f90c5b1a846e0f01 SHA512 e00b04aae139353bac04b38ca8af9831aa20cba91ca222b7f729079f620f1dcbab67d67b7a55c183ba0908ad9bf2d502cfbe2d934db4ac2075d480c6b37d770e
 EBUILD ansible-compat-4.0.4.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
 EBUILD ansible-compat-4.0.5.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
+EBUILD ansible-compat-4.1.0.ebuild 1528 BLAKE2B fb819f9adeec567dbbd6c0a19a0fcbf5ac8def5e27f74a7817c76b693307955dffa8ec19c77aab9cd2805446bb15ec2190f88459468c065ac19c5b2707a5146c SHA512 bc9ff6367d7808adf885ebe207a0660adbe09b9a5623fe4a9c596838fb90e78a63fb49efd8c0b8b953f6c19317a1d00cd42f41ed6019373b0f049e075eb0508c
 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
diff --git a/dev-python/ansible-compat/ansible-compat-4.1.0.ebuild b/dev-python/ansible-compat/ansible-compat-4.1.0.ebuild
new file mode 100644
index 000000000000..bbea175e5664
--- /dev/null
+++ b/dev-python/ansible-compat/ansible-compat-4.1.0.ebuild
@@ -0,0 +1,52 @@
+# 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="Contains functions that facilitate working with various versions of Ansible"
+HOMEPAGE="
+	https://pypi.org/project/ansible-compat/
+	https://github.com/ansible/ansible-compat/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=app-admin/ansible-core-2.12[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/subprocess-tee-0.4.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-plus[${PYTHON_USEDEP}]
+	)
+"
+
+# All these tests attempt to connect to galaxy.ansible.com
+EPYTEST_DESELECT=(
+	test/test_runtime.py::test_install_collection
+	test/test_runtime.py::test_install_collection_dest
+	test/test_runtime.py::test_prepare_environment_with_collections
+	test/test_runtime.py::test_prerun_reqs_v1
+	test/test_runtime.py::test_prerun_reqs_v2
+	test/test_runtime.py::test_require_collection_no_cache_dir
+	test/test_runtime.py::test_require_collection_wrong_version
+	test/test_runtime.py::test_require_collection
+	test/test_runtime.py::test_upgrade_collection
+	test/test_runtime_example.py::test_runtime
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 5d1e72fa940f..4c5857dfff17 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,5 +1,7 @@
 DIST asgiref-3.6.0.tar.gz 32748 BLAKE2B ce3facb2d026551df31ab28a3d9c4bb22be6828664d3b341369eb5dffaec1f2a519ab84356ec89dcfe112a96430be66c70c53d7e36586a3b2f4ee1db61a9d617 SHA512 b74d71e3a5d129117293512ed93e06a9ac0f681766abfc074be6c8deec7160995dee23947da861715fa47e2b9921669b6b5bf247f8d895ffbea7007ea956b9d6
 DIST asgiref-3.7.0.tar.gz 33247 BLAKE2B 512d497d57e45b2ea8d0db1d7bd12ebd850087291698067b050988137e4795eb784796ac8ec6cfcce3a67d9cbf11fb88d4a441e5dfd4e9d177400efe979837e9 SHA512 f4672a1ec652e4f05114caf19e1036a6bc71b137af48214292d5f5348340563a450e13520424aae74d75a58c9dbae7acf4f2debf54acbf5c24310e6bf911ac3f
+DIST asgiref-3.7.1.tar.gz 33273 BLAKE2B 9c06694ea69874224d062819582689ff541356697933508c93354a3850f9c5c7668fd49a500417c7ad832511b1d647ad199928d4811abbf9d8ee31263a81e12d SHA512 9d9563e50c4e0998d169975d6477f1dd2fb953921eafb54cf42aa36fe6a62f5df6b1f7b562491ffa8587d3c3a716d79858bf314aeae7379ccd0efcf59f330d61
 EBUILD asgiref-3.6.0.ebuild 603 BLAKE2B 97da6157959bb23d3aa8a6f2686c719f7f62903447dc83fba5ca7baf57bebc80f23d7974fb3dfc2867039768f394ab999a6049111fd3235d33dc2796dcc1c2d4 SHA512 ea7546c349e6c544854fd3a007b21aee727a753979d42dc37ed00a3f08bd6994193162831b1d6f263a4a34a34b8de3eb4927db00a26ba147f86200fd0b224cc8
 EBUILD asgiref-3.7.0.ebuild 712 BLAKE2B aff27da56189581615b0b3219b0c5cecc4c9078e6d288ec65d2f29987a479ef0d4707d1e48ff570e0923d8af7391fa85ac781321a1fff8eac8bbaf1886df137e SHA512 694ca7c3acbbb0365df45efe92bc983a5a17db1fddc5a3c86a7cf9bff2f4e66dc9336e6039dfbb395a12075b9a9f5c42327faf587e05b158f9468d7852a9fb74
+EBUILD asgiref-3.7.1.ebuild 712 BLAKE2B f286ba376f275ea49e77285b01a2857c5372a6a4393dede788bbfa7b10f17fc990c89db019326fb1ea2f1942bd60cb652b5c490ad3e06be5ca559ac71a28c6a1 SHA512 2e292ae245eb615ee79f581ef8f262e79facaf451d9faa6e4263b5c0f8e46b8dad5c7532a9fc9c3d42fade8ebcd9e45d344b36e0e25d8948cea6faaab1ae95b2
 MISC metadata.xml 389 BLAKE2B 312af34b9583dc413f5a5d69c9677ebc2d3fb1d10c192f2b537d8cd057122086009d9c6846f9177fa6b1b96b6fa7641a3d833f4db34ef74db93e73f19042eaa2 SHA512 d35649849ab02fc46837b408ef7de3e45057517c472198b86a1619911bdb451ffffadb26f8dae864f194a1e5c6f424cc904ba342a8f8e84c69fe9fe75286e867
diff --git a/dev-python/asgiref/asgiref-3.7.1.ebuild b/dev-python/asgiref/asgiref-3.7.1.ebuild
new file mode 100644
index 000000000000..550697b5cace
--- /dev/null
+++ b/dev-python/asgiref/asgiref-3.7.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
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="ASGI utilities (successor to WSGI)"
+HOMEPAGE="
+	https://asgi.readthedocs.io/en/latest/
+	https://github.com/django/asgiref/
+	https://pypi.org/project/asgiref/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.{9..10})
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/boltons/Manifest b/dev-python/boltons/Manifest
index 94aa471ee53a..0968e125981c 100644
--- a/dev-python/boltons/Manifest
+++ b/dev-python/boltons/Manifest
@@ -1,3 +1,3 @@
 DIST boltons-23.0.0.gh.tar.gz 243426 BLAKE2B 94913e31611d844404df9514e3449ec8142c142c3e3fc223d912a5e6ab22e5a502ebf1594e3ea9143eb57d80745e34d5e19080bb24e1ad9b42b52cc544c608d4 SHA512 f8e2ed488dbdf0dfa4090aac8c6ee97c382fdf8a2728567e2a5542f46bb00932f3b9498865d45a718216d5f9355e419a228c624844c25f89df458e00bc9e2e83
-EBUILD boltons-23.0.0.ebuild 819 BLAKE2B 5c7f6443cc7439c4d098f8c557b0b9aa1ed51b5865b67d95d9214b596ac1b0d48d3dd8b60cc54404a5760b25ee77d785bb0e13acc27bf0f7ff52d6bdd55c7f51 SHA512 b753e5ba26a6133e4886b1f84ee7f0bcc31b8abce71de26b708debab088847875eecd2798d5b9dda459e9fd46486a671b22b8df230b2e4a28aaf5f59b422097e
+EBUILD boltons-23.0.0.ebuild 820 BLAKE2B 27d6d69b41240aa1330053af4580b5f31a28652737056864237dcafd2990278b163785fb57e435841021ae5bff5224667144f9a52d56ea3f0df16367c6b336f7 SHA512 f67d897ae84d948b502a671d010cc84e288bfa2558084f473411c8f2e0d262377a5c0bd6d9f884205f6346bbdeaf0cbfb33a23198750dd00f21d6096fcf85a82
 MISC metadata.xml 395 BLAKE2B 6ed304f1dced75dfd795b9fe582ec669bf1c8ba5fefeb9e753b11aa20de8fc0966fc9a8a0ed40e460dd23a67ef0e5721a8dae27b3d799a4be629537bb18f54c9 SHA512 fb73041a95df230153dc686e21a88d91bb06367ae8c22a20777c4a0f13202cbaf59396f4ed2630265d331d6461a6da85f57ba62cc432c4d9105b8404753b383b
diff --git a/dev-python/boltons/boltons-23.0.0.ebuild b/dev-python/boltons/boltons-23.0.0.ebuild
index 42f739787b4b..681e3b1576d6 100644
--- a/dev-python/boltons/boltons-23.0.0.ebuild
+++ b/dev-python/boltons/boltons-23.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
 inherit distutils-r1
 
 DESCRIPTION="Pure-python utilities in the same spirit as the standard library"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 695d2fe33a97..691b96370c9a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,10 +3,12 @@ DIST boto3-1.26.133.gh.tar.gz 648114 BLAKE2B 97c71216d92baffb9e07f9c112590a1fc78
 DIST boto3-1.26.137.gh.tar.gz 650777 BLAKE2B e4a7d02ccefbda53b33558dc107457eaa1df0871bb2fc548b348246192cfdd6760bc43a6e6861622de6376244b80a94a387bbb827be2f5b749bccf6b8ff5af58 SHA512 de5d29a4139650f0527e93a9e223b7d41b285b6c263a5bc7ec9ebad1eee19373b1f2093c03414f7b575f8a7402734b4076cfaf0fa5be34ff54b55d8960e9c836
 DIST boto3-1.26.138.gh.tar.gz 651104 BLAKE2B 58c7c71c97567b167d9c0afc376161b60155ce31984e2b9e0d72a152fe8825fe50258ea2b917489d7b041ada1212c6516ed5176e61fa9fc900a1ae9306fe382c SHA512 81c3873afca46cfcc60559236ec61db92a9d040fb7e192c2aa0c663416ff954740d2aea2ab5d8e417fc2909413fed6dd3684d7e0b05c863bbed9abac4d02a1d8
 DIST boto3-1.26.139.gh.tar.gz 651459 BLAKE2B ba1c0c45c0cd78622ca34bcbfb3c8961c0555ed9fa16d8cb89363880d8cf6911183758ed7e4f44a098413b47d2d6b3c1ee4e57f05561947d7660a969e4e7be2d SHA512 971ce067318642e2f4a13cb77b29410d97b5c8e7cff28e76d7983f95bb5f593697bebc6d744517b5c7e760b5b30980370befe86a97d1162882a13428833b0a5b
+DIST boto3-1.26.140.gh.tar.gz 651805 BLAKE2B 2b58cee4e5c199af29e359790abfbb6eb536be3ded95aead640fdf179a0150875753cc9d066b70b08b0f9db6ef12d9fd3e5dbc4d9c481872f894c24a5f279f5f SHA512 f73fddf2674ee0bdbca37b6231d9b512286c73f5e815573eadb1f8ae855749a58492eed20fd03a2494392b7f146c86ba355ed2381aefbc5251fcae366749c277
 EBUILD boto3-1.26.129.ebuild 1508 BLAKE2B 42be8b915da646a7afe6dfc988542d3d79b5dbdc565d2e738d210e3f77b7c5ba6dfbac45e46b9cc3cc4770611cbc0c155abc7f1807ff0cb8e6033f927bea4048 SHA512 06404c0363c0c7c0d378d1c2b91073c137a1685d2d846d98c655e6d001df5cde0eb51bf6e160879af2b56321a02e84146ce634855f70c7c3fbbd1adbb9b8ef8e
 EBUILD boto3-1.26.133.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.137.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.138.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.139.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+EBUILD boto3-1.26.140.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.140.ebuild b/dev-python/boto3/boto3-1.26.140.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.140.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 889df0a9e331..34bb7a31f00f 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,10 +3,12 @@ DIST botocore-1.29.133.gh.tar.gz 11484789 BLAKE2B ce1acc51ffada796e594090e7b4d73
 DIST botocore-1.29.137.gh.tar.gz 11508178 BLAKE2B 2f74fd2f3923672a4fcd501f1c5ba48cd09965ea0f70689bd6559a4c4a6fe8921f783ef86f28ac57893c8b1366d8fca2fc79f0216747e04142ed33880f07fe39 SHA512 b800a1b73170b5fcbbf1b17477bb8f04b19f5f250a68bbb3b993b0e058d8df870eddf932f79d94eaa3255b976ce136adbdd5b359757cd79f2cfe2a16b3cfa2f4
 DIST botocore-1.29.138.gh.tar.gz 11516247 BLAKE2B eb8195ff412de996fcdd9cb2f44f20476b1418f328016721099ed7dc2a7159a5bbc819f752ea2188c46edb0d701a0481f7823cb50d0da5712d61f7b9a5f0799e SHA512 02bf92e2481aa27796186f8c457ce1e3d833bcf5d647dab3fe6347760106ccc8f73a3c7d55700ad72fc0210e8229c905e617a8d65a63542eaadab01e1c798bb3
 DIST botocore-1.29.139.gh.tar.gz 11517015 BLAKE2B 4c765477aae729788325fef1a7f13bc5ed641883f5d0bfa423bfa942a229c15a8d3e87a7670ffae673fec5dcd25416d9f77072bda41af9e18a9784668aea54a8 SHA512 374054ff9006c2deaf1b7d5c796ca0d1473bd6313402bcbb9b2d1ae25fe97b5d3d02e015952fb9d9dfdda3aaedae02359e943dbb8b0f9acb50595a98ca20b8b6
+DIST botocore-1.29.140.gh.tar.gz 11521020 BLAKE2B 9d7ed6713b9005285bb94dc3cf69d622d70042feb6a306bb7aab06bed2f7d2c4f316f830dc18befb73c0c77d0502f592f29c2cf86eab8a6e6426adca25cf11e4 SHA512 243d58f8f2c61402f2b84e3a62076579a03e278d8a4c8d42e80106e23a3c72e73f666c617834717fee9bb22cf0ad45ec0f8e622a20a8165a269659b6d305fbe7
 EBUILD botocore-1.29.129.ebuild 1827 BLAKE2B d9e353ffebf3b77bdb5b034da339f9f3cf95937e288fa522fcc40f88a4752c58ae085406bfefa595c3738ec118712cdb4ee0509c1dee7a00e2c76cd2a657009c SHA512 f0d3e81726bd65bf4c097b63e8673881949970e29d976de53c1facbccf8cd1d214fea9153f4820a5889f1892979342a0255e110b243ba613d4e803a940d46602
 EBUILD botocore-1.29.133.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.137.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-1.29.138.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-1.29.139.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
+EBUILD botocore-1.29.140.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.140.ebuild b/dev-python/botocore/botocore-1.29.140.ebuild
new file mode 100644
index 000000000000..3ced99abe4ff
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.140.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/cffi/Manifest b/dev-python/cffi/Manifest
index 854526c0cef7..8b53df295118 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -3,5 +3,5 @@ AUX cffi-1.15.1-hppa.patch 2097 BLAKE2B 2cd3a1b155b71bcb3d70e3659950c45c36959f0c
 AUX cffi-1.15.1-python3.11-tests.patch 3023 BLAKE2B e25bd9d22b81187b0eab65073930980a2975eec3086462396cfc4796fd5273edab9af2324884c2e55880825ddd046b7ebc5054adfe57574ee691f0fa2145dcd2 SHA512 4d202f8c943bf33ea359f47aa3e53e007bc3dbeb3320a6efa302b1b1ec309b2dde72f6cfe1a591c594f3321ed5c65d61e9f79a03ba3107cd7008699686719497
 DIST cffi-1.15.1-drop-deprecated-py.patch.xz 31244 BLAKE2B 7c8a6ca1166335fbd385de35ebb636f21049a4dd9c52171ec58da08a61dc64c271b4afa2d69bf8b877a8c9747dfae6a8529615bbed69f5a8ab30ba5fc99c61f4 SHA512 9aba4b172b070a1a1719de2c35667abe4c7b27208b8ca3ecbf90bf168ed694f4524154e69fada5ff6f141a94b8a438db16239ba353fa9914b318b77e41dfd920
 DIST cffi-1.15.1.tar.gz 508501 BLAKE2B accc317385d9af7dbed3397afde63fbab63bfc935376d951802055c63796863ed102a940f192789924480b9b16751c8cf3d21caf9b262c479c61ffc977aac83c SHA512 e99cafcb029076abc29e435b490fa0573ee2856f4051b7ca8a5b38cd125d56dd9dae8b189f59ceb3d728a675da8ee83239e09e19f8b0feeddea4b186ab5173a5
-EBUILD cffi-1.15.1-r2.ebuild 1928 BLAKE2B 0016ab9d4a118d543ccc095b9e262bfa2343516471ad96206a0dd0d3c6e1896b5d53cb594cd2060b0022b17507bc0907d510b5ee87ba0561c95b004df6c0a93c SHA512 6160329bbc8645f3f7fdb1ea4e962b7309a34c08d85c31fd56041fce8c363b87744a04ae2993491ce482e810ca08d4dd926fb4de6940442edf850024c5a9db21
+EBUILD cffi-1.15.1-r2.ebuild 1982 BLAKE2B 0fe3a09a1e4388327db392a51ae0eb52cd0fec26c806b0b540d93b262a8d15d3916de9225e223cd935cf48ce35e3d30923315427b135e250b8e84583fc43298b SHA512 1920d4fc9393a68633e4ee76d82b3af5010e37588d016a3c6ae6c1345d4b7023fb33d9a6ebee77057a98e4ecb729556cd99c82370516ae96b6d3fc3b43735949
 MISC metadata.xml 318 BLAKE2B f914459fac4ae3d8ac9273fb721c52494513b932676f570f02cc4cfb2283705d8cfc761806ffed23c6f31c95a967398edee01c1536547c1830def5ca4144c003 SHA512 ec451f8c535f0d01dc7bcd248c002745947982cd469a02ac247d0d34f4d7a33374fa10c28d8f074932f0548dc500c3270b499dd08b18acbb9d308777bcc7e4f0
diff --git a/dev-python/cffi/cffi-1.15.1-r2.ebuild b/dev-python/cffi/cffi-1.15.1-r2.ebuild
index 4527c8c3a950..0244359a8521 100644
--- a/dev-python/cffi/cffi-1.15.1-r2.ebuild
+++ b/dev-python/cffi/cffi-1.15.1-r2.ebuild
@@ -5,8 +5,9 @@
 EAPI=7
 
 # no py3.12 yet because of:
-# 1. https://foss.heptapod.net/pypy/cffi/-/issues/563
-# 2. https://foss.heptapod.net/pypy/cffi/-/issues/562
+# 1. https://foss.heptapod.net/pypy/cffi/-/issues/562
+# 2. https://foss.heptapod.net/pypy/cffi/-/issues/563
+# 3. https://foss.heptapod.net/pypy/cffi/-/issues/564
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 # DO NOT ADD pypy to PYTHON_COMPAT
diff --git a/dev-python/clint/Manifest b/dev-python/clint/Manifest
index 8a3a01454f6a..d031b31299bc 100644
--- a/dev-python/clint/Manifest
+++ b/dev-python/clint/Manifest
@@ -1,4 +1,4 @@
 AUX clint-0.5.1-disable-args-dependency.patch 417 BLAKE2B 182c61c55e2d0d573ab62bcefaa6c31a43e9c6ca11c1fd4a2a36ff7917198b90e09016d877d368bddb6234996bb85d3517825d4bbd8b0a48e594d3e987e71ce7 SHA512 294e21ce515bbaf2949cf0da5c1c89e2dc9a1c4556a52c2a2d3ed360cbcd22891cfa103ed97abc59f5498e08f38995c3986b42dcbc7e548b87076d7e3dc574cb
 DIST clint-0.5.1.gh.tar.gz 81140 BLAKE2B 5b42e7d46321f0416d3ffb51edf66c53476d3e4a211e971f36cab54a412f6b0f0ec26486c2b95871956ab09e7e4adf68e8329dd7e9e3c7ed1adb3f8a0dd2a728 SHA512 3ad8bfc587acb1322c7d7c3e73756a07c98f3b4215a3d4dc409b5a2067bc70dce2dd98d19250b8122b319b7bcf5e2859251de2829780345de06f93b35447c4e8
-EBUILD clint-0.5.1-r4.ebuild 861 BLAKE2B 7c35eb792ccd42697171c2a8a2ed452944b5adf630fc128594486c15cdfc5bfe9497964692f19ccfae97df2f2678c6fd7b9942bf44819bf9cd1b15db032b2e5e SHA512 968f0da07d6196f12efe110dc29a1481fb8ce829ce217145da75998977b4e30fa6cc865765ad55af6fc9c5cca32601dc45697a7a55f4129af1b2d4513adf6229
+EBUILD clint-0.5.1-r4.ebuild 862 BLAKE2B bd151efa520e796c0ecadebd05f8a6872955afa52d668e91fe12cb2c56e2678d4256bc73945d1c8615977be97eace446cdbfc8e0a18f4dfda9a4ee27f0d4a55c SHA512 3a17b4db81482127ccf6bfb540b07a2f4c396157edb0b03bdd781afea168fa64bba5b1872d88a2a5bcd41926545196bf1493dd871be7c7cfe905c84335d94dc7
 MISC metadata.xml 324 BLAKE2B 96cb02534a971154fce81db1dcad8f20fec610bcd95abba085be701ccbc3bb2703b22da5ec4f0c830ba7b25a25253614b9ef35ad970c285327ddb216c8de78d4 SHA512 95daeb03a0adfc3a6a0152e2b28bb7d28ea3684b6910d980019cb3025ec9d7abff3552058b21e38a7dafc71d71c1a75921fbd6e931cf2b9fd32a1338c2ce74b8
diff --git a/dev-python/clint/clint-0.5.1-r4.ebuild b/dev-python/clint/clint-0.5.1-r4.ebuild
index 96a0aaf538c7..99459869f5f3 100644
--- a/dev-python/clint/clint-0.5.1-r4.ebuild
+++ b/dev-python/clint/clint-0.5.1-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index 88cf1783bb03..edb960a85218 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect-1.2.0.gh.tar.gz 40878 BLAKE2B 951b33ee65d73ba14594f8475c764ae132a44ed7a6bb6effbcf445aa956e5390595b1f1139747331bfdd42d56ecb6d4aba3c88ceb2a103c456423543c41af95e SHA512 439f83e37c381f962abcfca0b83050372cbad44179e876591d8504abc2da1d4fe80891c8c8e1763341cf152525259565dc5e80038fa7c14e8c69f22a11f83d94
-EBUILD cssselect-1.2.0.ebuild 754 BLAKE2B e5d96da7236981b29f357863c54d2482e5aa5bf92f5d73eb02b3ad50686b49dc72c0e7cb03672bc8086e22c0afa1387d5c908eb7f2e37ef1f710452bb48e527d SHA512 f0d28ea9e53aac6597124e2451474f358b47c9b8e25afc72b5c47cee8f22e7ea41ae18978946e81d375ae36e989b3a22f76860364d724330692d9540c697d574
+EBUILD cssselect-1.2.0.ebuild 755 BLAKE2B b383f46b332b01d31d60142c9a98130695605e0b7352a122a664e863c0cbe3b62754a9cc708283a55d8d44e7a04c967786585a573316803b3ac230e66454c356 SHA512 fd6bec6d949f20df4a37a8e3b95aceb6c696ccc407378675d7ecbfca44d783e7c7b4babcb98c04b54c7e63d311a779368776fada220081597a946fb881743c2a
 MISC metadata.xml 393 BLAKE2B dceb62643e3249ad34ada4085344bd9cc2c23aa753826a1e4f89e2876123c7b38b4b88fd5b90520423dc4ca88b5e79900db0554f66586c6ad4327e73f6bb7711 SHA512 de723a2756f71733d018c97d6f8bce62f78f1817a7c8a9302e793914207564377a7b8f07dfc8c3dddef58791f0394791280da5055af0d4c499fe033e199b42b1
diff --git a/dev-python/cssselect/cssselect-1.2.0.ebuild b/dev-python/cssselect/cssselect-1.2.0.ebuild
index 72e25b62b728..0f8742d158b6 100644
--- a/dev-python/cssselect/cssselect-1.2.0.ebuild
+++ b/dev-python/cssselect/cssselect-1.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index f538517d7655..6a39a9d5413a 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -10,7 +10,7 @@ DIST cython-3.0.0b3.gh.tar.gz 2688784 BLAKE2B 933bb48b2bf5169c973a36c877a36eae28
 EBUILD cython-0.29.33-r1.ebuild 2057 BLAKE2B fffda6b31cd868ed0715b69c740f1b1ce596010158b9d45d61c2e71ea05c26b5a908d88bd14796a93eb0f3532b6c8fce941e8cd6e119ba5690f448061d34e38d SHA512 9cede1645c54f46de990db9fb98cd01392bdba02423ece1308d2ecde03cc5f482aaaae2879a17037237652d99d8e2ad5e91b4c52440124f4768fe6abd2040440
 EBUILD cython-0.29.33.ebuild 1989 BLAKE2B 7b79573395da08202ec7fb63d8a248534f498f708ff35b61f2215072e62f5c431d4e6bef65bcd1f6d66f4444a8b32949bc5f7bcb02cb1e9241e6d9f06c119cbe SHA512 52185f39ae9f7eaa7d9706d06942b0e83d5837326a4697ea7426d11018c8c8674d365554f2304d73a59f2dbb58b300b420101eccdbbd5c2f4cfb5d72a49ba390
 EBUILD cython-0.29.34.ebuild 2067 BLAKE2B 31161725c4d30a9a86ed68021f2941a691d9d75008fd6671beb1d5682b4da4ab4bc17bf7b5b0bc91abf9c26e58b4aef99ae830885a35344a7b14d83326ebbe4e SHA512 c5c9fe17350fef1b3692d9ee13ff13b0c07cf7d95701f7043044c4833ebd722d63cf3b7adfd4b1dd145276686d371d178b3f29dbcea03badd1f6e592331b80ef
-EBUILD cython-0.29.35.ebuild 2102 BLAKE2B 5ba662b634a3583f27628b1adb744e304ee853a89d49dd04a443e168753682ecd5d9d948a2d4ebeeef75f0a82b933b5f9d3f9d342f48d34b91e9828c0d391712 SHA512 c369692985c13f2a77b6ee954fb61ba8acb6f37d86077070c183c33c9d6c160fb287acb783efcad6116d4a7f38cb824470fca7008af1d62271cf2eea46f64e6a
+EBUILD cython-0.29.35.ebuild 2247 BLAKE2B 8f2cbfd1229bf7d699fb6eb56c5ef44d768d82d1ae55e3ff0b593a5afe98fef583e30c2f59a988ac6c3fcc5ebc537e432e7d86e9c40d04e12e9155d62bb81ad6 SHA512 78abcd2bba338df46ed5e47c20cbe8613f84c5080e264ca6421efdf48423f8486c1cc163581cab8d4001c5b2f78ba1f191268f6dacab6689f555d22083afc9b9
 EBUILD cython-3.0.0_beta2.ebuild 1833 BLAKE2B 84975273ffbeefa024cc1e7c4acd507f980063892f67390f854c061126fc79d11fd077aa28845990e7d6283014b56e586c7ca916db3f42ac3d59a8c73fac9989 SHA512 f754b1579bf5fc2a9c68a87e98bedad17304d9a9fc329b264ab3071d85a5d250830f72d2c96cf5f9ffd48eeaa79caad47d1b1d59bfa8290dd11c5fe5e4699757
-EBUILD cython-3.0.0_beta3.ebuild 1833 BLAKE2B 84975273ffbeefa024cc1e7c4acd507f980063892f67390f854c061126fc79d11fd077aa28845990e7d6283014b56e586c7ca916db3f42ac3d59a8c73fac9989 SHA512 f754b1579bf5fc2a9c68a87e98bedad17304d9a9fc329b264ab3071d85a5d250830f72d2c96cf5f9ffd48eeaa79caad47d1b1d59bfa8290dd11c5fe5e4699757
+EBUILD cython-3.0.0_beta3.ebuild 1906 BLAKE2B 46457002e552540164bee06f7ab08237fa4827009571b3e8c44f2e7b2c94c3d59f3224a08e644b5ea218b0d82fcb203903b79ce5655ba939136d67a26d45a9f2 SHA512 d72db53f41dcc21cd20b87c22a0a919ff80efcc4dab9fce0d170903a6e2699dd006b53fa869dfe2a2009b73f83f63983631a4f9c40640a8f8af3310f95a839b6
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-0.29.35.ebuild b/dev-python/cython/cython-0.29.35.ebuild
index cad4a983b39e..8bfbbd5b5663 100644
--- a/dev-python/cython/cython-0.29.35.ebuild
+++ b/dev-python/cython/cython-0.29.35.ebuild
@@ -5,7 +5,9 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_TESTED=( python3_{10..11} )
+# 3.12 not tested yet for https://github.com/cython/cython/issues/5285.
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 multiprocessing toolchain-funcs elisp-common
@@ -61,7 +63,7 @@ python_compile_all() {
 }
 
 python_test() {
-	if has "${EPYTHON}" pypy3; then
+	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
 		einfo "Skipping tests on ${EPYTHON} (xfail)"
 		return
 	fi
diff --git a/dev-python/cython/cython-3.0.0_beta3.ebuild b/dev-python/cython/cython-3.0.0_beta3.ebuild
index 2feae328980f..a2f0df6de0ce 100644
--- a/dev-python/cython/cython-3.0.0_beta3.ebuild
+++ b/dev-python/cython/cython-3.0.0_beta3.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_TESTED=( python3_{10..11} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 multiprocessing toolchain-funcs
@@ -57,7 +58,7 @@ python_compile() {
 }
 
 python_test() {
-	if has "${EPYTHON}" pypy3; then
+	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
 		einfo "Skipping tests on ${EPYTHON} (xfail)"
 		return
 	fi
diff --git a/dev-python/django-prometheus/Manifest b/dev-python/django-prometheus/Manifest
index 0eef6d8bff61..1cfe27d55d23 100644
--- a/dev-python/django-prometheus/Manifest
+++ b/dev-python/django-prometheus/Manifest
@@ -1,5 +1,5 @@
 DIST django-prometheus-2.2.0.tar.gz 24995 BLAKE2B db79cbed99d4d5cb7d9ce22dfee69914a63373417b176b4311406f9a1fdcada16447d6ec8cb19ebd14789f520aa1d5755aace824e5462611f81a0cc688566f19 SHA512 a72c8345f220799ad0709e0e73912229267b5e01fc67ae7f647e53ccf7c7e170ad2456c81070a002dc411e840b1129d55719a7aa891b4dabe262837c8c7b3db5
 DIST django-prometheus-2.3.1.tar.gz 24718 BLAKE2B a20f140736107e1c959fed33ff9a736cbc3266189598924e5d285c44a9fd1f16b7e41ba85829a2526cd49116523e1da3d1f96c9a1d73f84db18557cee3254982 SHA512 523cfa7023e1e8921c687bd010a4c6384e1e4142fb702887d1d0bd60194b5111e92e53fec07df89eaea07cd7aa806edef79ab303a67d866d18eacde257db3c03
-EBUILD django-prometheus-2.2.0-r1.ebuild 680 BLAKE2B cb65f8676c5a24d164e1d920fc0fd48b4f4c96c8ac6581d93aa1559cb98d2f71ff062cc66c92df54739c0007992a84b233232c088fd0387e04018b137a90c6d2 SHA512 c7e33b9b85f76794e1f9e2b294ee9876437f7a0a73f6170d881bb4e7f914e6a0cd63c106e9a57f811e8c883b1b8a448f3e1dbf4d231d220970bf4f07c55f8199
-EBUILD django-prometheus-2.3.1.ebuild 680 BLAKE2B cb65f8676c5a24d164e1d920fc0fd48b4f4c96c8ac6581d93aa1559cb98d2f71ff062cc66c92df54739c0007992a84b233232c088fd0387e04018b137a90c6d2 SHA512 c7e33b9b85f76794e1f9e2b294ee9876437f7a0a73f6170d881bb4e7f914e6a0cd63c106e9a57f811e8c883b1b8a448f3e1dbf4d231d220970bf4f07c55f8199
+EBUILD django-prometheus-2.2.0-r1.ebuild 680 BLAKE2B ee0522d273d59b10c95333d81deb14791af4c8f676fe4c160844f79ad16bea40433282532e28045622f92d99ecb057971b6a3c2018e42e8eec0fbab78098e2ff SHA512 90c71141fd07aa7e26b173e7d8635bdb8c7e3cb182ac128a8cf5980dde159e2d79f55fd59de3a388b5de7bb2d078ccf548b6f141c83cdff8c77b81120b6beffb
+EBUILD django-prometheus-2.3.1.ebuild 680 BLAKE2B ee0522d273d59b10c95333d81deb14791af4c8f676fe4c160844f79ad16bea40433282532e28045622f92d99ecb057971b6a3c2018e42e8eec0fbab78098e2ff SHA512 90c71141fd07aa7e26b173e7d8635bdb8c7e3cb182ac128a8cf5980dde159e2d79f55fd59de3a388b5de7bb2d078ccf548b6f141c83cdff8c77b81120b6beffb
 MISC metadata.xml 410 BLAKE2B 6b5b85e5b774a6d8d742adc093cf341ff11beff43974c0ba68c9c45cffccfba923e9358cb102b3e64e765a91d851bf7bfa51a1a2875909327a9056c6c1c5b805 SHA512 7a6fe4b02c4ac912f34bba301a723e4c16036236b4e9f3c5e1916512d6a49a4af7b2607e96a86a43d69a4ee4ba08b6db9595235250bc52da8c9147dff054370d
diff --git a/dev-python/django-prometheus/django-prometheus-2.2.0-r1.ebuild b/dev-python/django-prometheus/django-prometheus-2.2.0-r1.ebuild
index 680ccac5129a..12308447e035 100644
--- a/dev-python/django-prometheus/django-prometheus-2.2.0-r1.ebuild
+++ b/dev-python/django-prometheus/django-prometheus-2.2.0-r1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	dev-python/django[${PYTHON_USEDEP}]
-	>=dev-python/prometheus_client-0.7[${PYTHON_USEDEP}]
+	>=dev-python/prometheus-client-0.7[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/django-prometheus/django-prometheus-2.3.1.ebuild b/dev-python/django-prometheus/django-prometheus-2.3.1.ebuild
index 680ccac5129a..12308447e035 100644
--- a/dev-python/django-prometheus/django-prometheus-2.3.1.ebuild
+++ b/dev-python/django-prometheus/django-prometheus-2.3.1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	dev-python/django[${PYTHON_USEDEP}]
-	>=dev-python/prometheus_client-0.7[${PYTHON_USEDEP}]
+	>=dev-python/prometheus-client-0.7[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index ccf3dd30cbf5..752079c7819c 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,3 +1,5 @@
 DIST emoji-2.2.0.gh.tar.gz 293134 BLAKE2B 4f6d8cf297c36a688b7f5e2f4afceb7e55102b23507fcac95799b6a6ab82521c55fcec884dcb2270e8290516942b7ef923de99b4e8da9241ce5828256b991653 SHA512 51150605c7b20fdb9a62746df098995814fb3b5b6c6b79dc65fb35dd8036c95b150b63c6af37f1baaf5dfab521c41ff7d0360864ffa77f696ba2465c50e1da79
+DIST emoji-2.4.0.gh.tar.gz 408557 BLAKE2B 9011ea74aad358a7e6b60771684538587ea34db601dac745663f1229db8b97b790092b2a3e6d83f274c7c3227504c8c3588701fe2c63d9c8147adc34979ee611 SHA512 5d52b4f70b4b10c2ac48e8170eff81e7e90ab8483bd76b38ba1a66f5ab33bbe8434ee30cace0e6251522a235384c9a5c4fdb9bc289c4a0a17d9a4f1331968e69
 EBUILD emoji-2.2.0.ebuild 491 BLAKE2B d81ffc27fd2aad67baa11937634a53434677e1118b44e797cf1c5a8f3f07f2390711a2c645f58df96a6e7defbbe307d103dd9488cb3291b181ad86499e009756 SHA512 5538bdd7f53bae8cdb4f0b3aa59fcaa7605c82d2c90746d1597f5b91d2fbd5a8b64ccc047ddd5df7d827c1b506a43c9e49034f566830b3b48c5bbf80f917521d
+EBUILD emoji-2.4.0.ebuild 492 BLAKE2B a510f356ad8afb0c6c401ab1fda8976867dbfc8132e8b4867a85cada11584af0a58d48ade5cf617bede718b823949a7417ece44e94975c3fe7e8d80642efd6fe SHA512 876ad65da9597ab1f727dd63eecb91915f8564f4419c24d830cd0a5cb60371927cd2794fcf0ce1fe3e2864beb892f7212ba88a1979c806cdc899fddedf9587bd
 MISC metadata.xml 497 BLAKE2B 9aed8cad26be7f372b19349aeae8e7916b75444e32f0d60e589ae27fb324d0cbab86cfb827ce6cfd1f9002338a7bed44f7ed297e64199af0a00c6d5e07fa992b SHA512 e938bbe18a83243acc1d2614100282b913115fa7f91ad30f05833fbe73f711ef80b14e974c8c0e0c03454c216145e8f7d10c4a952a609486a3da95cf72756208
diff --git a/dev-python/emoji/emoji-2.4.0.ebuild b/dev-python/emoji/emoji-2.4.0.ebuild
new file mode 100644
index 000000000000..9cf0bc5fde70
--- /dev/null
+++ b/dev-python/emoji/emoji-2.4.0.ebuild
@@ -0,0 +1,25 @@
+# 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..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Emoji for Python"
+HOMEPAGE="
+	https://github.com/carpedm20/emoji/
+	https://pypi.org/project/emoji/
+"
+SRC_URI="
+	https://github.com/carpedm20/emoji/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index 40babfd55c07..6ceed2086fa4 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,4 +1,4 @@
 DIST execnet-1.9.0-pytest-7.2.patch 11177 BLAKE2B 6d6d0c76de606305ed0ca4f0f52d5ccc0cc3ab99d795ac2f4d39d3804cd5c0191f75704ee5eafcd135dc9854eef99a59dbd9cf57a8455b6b9cd45f2612fbcdba SHA512 ae16b3127545efe77a49392836a8940a053967e530a6288660a39edba9b35b448d0061ac7ac751c3be68de2cf5410655c2db55d344519f69db7c9ed4f7ca0003
 DIST execnet-1.9.0.tar.gz 173884 BLAKE2B 622a1f47365bdea97ba53aee908faf990ef847e3641ab0590073cdd6eac3413d1517f16e8e5b73b56884f02aebb3142691ecf6113e14f9c49c9b0fef3ee3247c SHA512 d425e7b6f3708efecb5dfa2c36a837cb55f2c32cf2ec0c1dc11cd1ca6ea614d119d04908b84dd5a3593c87db35e71fee202f843665c853ac3538479f60c83d60
 EBUILD execnet-1.9.0-r1.ebuild 1444 BLAKE2B 79dacce4b2d6141748a9cc53010d507c6a0999626927a942a1c8701ac51e45129bbb9ea1bb0124f7abc9e18833989d09211fd3e9ada5818906b876ce58d75878 SHA512 34b78e051b2ca6f47a62adb17248cc768433e84fce77632285236f46bbbc6794bd7403b8c7e768bc83aa6f4510e456712b417247a8395f6fd468500515792322
-MISC metadata.xml 442 BLAKE2B 4f920c4eee254e4fc68e6ac69344dc0da43058d9e2920d17dbe9c2e17bc2fc5eb5b9fe5f65d8edee0a91158c380f4c2635aa6ed01d726d1a332fc39bb567dd9b SHA512 3d4070a50e199f18305638a485c2e0031e88a662b8fbd9025bf76f84a8e3db0603a217a13b1ea50be724f9162b2eb1ef4a2722832a4769a785d40bc4e8f01dc0
+MISC metadata.xml 500 BLAKE2B 56db909a3d278407df77dd3bdf0bc213d181342773f6c703004b2680ea69dda18632cbecb267653dbbe0dde924eb2171ee6701b8587e6c6cba8e0f2285c9e313 SHA512 c27f05cf4d9510a746f1dfc70f8e758437f43bd6c5265b80bfdc3c338d5b38b1b73406cb572af04a26034933ccf04f3bfdd97227b54b026776849d5a9a217cd1
diff --git a/dev-python/execnet/metadata.xml b/dev-python/execnet/metadata.xml
index 4a31a3170925..64dc04edc3ab 100644
--- a/dev-python/execnet/metadata.xml
+++ b/dev-python/execnet/metadata.xml
@@ -12,5 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">execnet</remote-id>
+		<remote-id type="github">pytest-dev/execnet</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index cb9a0f2b3098..9e4cb8ddda2f 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,5 @@
 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
 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
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.87.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.87.0.ebuild
new file mode 100644
index 000000000000..0194f9640998
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.87.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/hkdf/Manifest b/dev-python/hkdf/Manifest
deleted file mode 100644
index 32b1525ea419..000000000000
--- a/dev-python/hkdf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hkdf-0.0.3.tar.gz 3959 BLAKE2B 25786395ad7f87db5420adb4891821adf52e5eaf8098ca502aad16a69c75bbc5dedc2b8dfddee76a545e91f4900c1a0bfbe94d79822cd529e72474c65ee194d6 SHA512 c58f9310c151f8d710998d019221713ec71ac8083c42300f5e77326c7b35be341263c40fb485402937c381a6435cbd9899c8d32846a50d1d1e6a4d3e61f58c7d
-EBUILD hkdf-0.0.3.ebuild 495 BLAKE2B bfa697c58105e9ce8416fce995fd95a9243ce9b61f4c6d8a13fd901c63a2f08ee6924d401d7c5a3e843d212f2e9f0586fe45366d4393ff227f2bbdcecd022981 SHA512 2ce2458aad428c6c544d94af509d7b3cc2d88ef1f43c8f99633f243454203f8872444025403458b337158d59348d92b42c9e589a3a411c4564608cce94efcc56
-MISC metadata.xml 399 BLAKE2B 4172401161574756b94123bed650461a80124324474a17b6670e08220c939f36a6dc98f2fa4a1321b8ba4be69043ae24f5de18df37fc494821caf6021b97fb21 SHA512 e56409f4de1986df5b52f98a6ea2aa4ab5d8e08a57bdf3b7930cd13892f7c28c413002581a0a3d4cc4358a7efc238f1e01b3c7b026034c274e84ef29e0033c15
diff --git a/dev-python/hkdf/hkdf-0.0.3.ebuild b/dev-python/hkdf/hkdf-0.0.3.ebuild
deleted file mode 100644
index 2627a25fb0e9..000000000000
--- a/dev-python/hkdf/hkdf-0.0.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"
-HOMEPAGE="https://pypi.org/project/hkdf"
-SRC_URI="https://files.pythonhosted.org/packages/c3/be/327e072850db181ce56afd51e26ec7aa5659b18466c709fa5ea2548c935f/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/hkdf/metadata.xml b/dev-python/hkdf/metadata.xml
deleted file mode 100644
index 499864299082..000000000000
--- a/dev-python/hkdf/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">hkdf</remote-id>
-		<remote-id type="github">casebeer/python-hkdf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/jq/Manifest b/dev-python/jq/Manifest
index 47d9a502f0cb..778f64851918 100644
--- a/dev-python/jq/Manifest
+++ b/dev-python/jq/Manifest
@@ -1,3 +1,3 @@
 DIST jq.py-1.4.1.gh.tar.gz 2648592 BLAKE2B b1413a07ba03f61d3b2e8cfa3f2c646408e24139f76fb9637d23968d953fa78f82b1dd04c355d5a6e6c6761095a4814d8cfd1f012382ca810ad5a44e007c7878 SHA512 03924793e8cab8041b4b2ecb8ef45bafdf31f14b4502170358ddecc027ead7cc17eda37fc04743eeef073e29144d2f7e6c4428e2a92f1bb8aa859100dce4521b
-EBUILD jq-1.4.1.ebuild 763 BLAKE2B cb42c27813105e7fe696ad90bf548d4174b4aa99f5bc9e2cabccc67ad5719e81e9e6657baca0288288ec6c4413ec8f64d1c2e6b618b5584b426309e2e2793ac0 SHA512 1cab315080d073e6ae6179559131ead75b62c397585897fef53746584c08520b5c7c6fe04344a14c25f4ae4b8d184d476d7a9bcd6dadc74caf70456dc81a7a5d
+EBUILD jq-1.4.1.ebuild 764 BLAKE2B c94bf046b6191d42f3ef13d6b700403fb4f2fa4bd427185bee28727d4008cee707a354da270a3dc1aedb65e0015876a3a50ab8b3c6c7d4cd655b43b3960b30db SHA512 d21b6d0c2908ffd5c1138952b3cd3024727c7872475fa6cf3cd3219c6c0924359bb79eb080c3233dcc498715172c7219a613b2e46e9a7e18c2c26d1f86f591e0
 MISC metadata.xml 367 BLAKE2B b17eb2d9c460774d98ba18faf8a09d1c9c711433d0dfcff08df4f769411db66fdb2241d12ebc706664cdef98d9dbeb290614446112f53ecede571f77aa085174 SHA512 399b63613673deaef747fd380d6bdc086a4e4b57c5509b15fd6e031ea613ccf59641c95064fc7dbbf61f8d879fe03faf7e8298e4e8792a8a0b7a2bb3225e77c9
diff --git a/dev-python/jq/jq-1.4.1.ebuild b/dev-python/jq/jq-1.4.1.ebuild
index 6250d463e35c..da88a3e3d6b6 100644
--- a/dev-python/jq/jq-1.4.1.ebuild
+++ b/dev-python/jq/jq-1.4.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest
index cba0312b38b0..901e64d55480 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,4 +1,4 @@
 AUX jupyter-server-2.0.1-skip-npm.patch 698 BLAKE2B f037094e4ba041f112e6b2b08693186c9414fee1dbb9a25be94bc7ec75be09888c2b147329ef9c4b2bdcefd54c44cbadfb658983f97537e5b277eb0fc9ae4cc4 SHA512 d20cfdc71c1c58a7c3126db80d30d34ec8f188f6b5da82accd9e02c91cb14ce750123be443d0c85b18357ae1d22117912c4605e0ee74d9dbf226c739faa17297
 DIST jupyter_server-2.5.0.tar.gz 694029 BLAKE2B bea1082709653617c812124378e1e2a639e90b1e0d7fedacd98628c415adad2daa5343b57a19a776c41820e6665c8591c8d2a652f8c791b605bc3a4b65400ef3 SHA512 7145f60a73bf3d9aceff37aaf56b3b3a54c94fd9f13f06659387909cb1727759a082d11e983df4e687cc508461d5afb6e552f3ac09e30bebb1eb5e863992ad14
-EBUILD jupyter-server-2.5.0.ebuild 2174 BLAKE2B 37e779787c9ef5ef9f502704272071f3f850d105c0be55a4acab1d96beff831764935118dddf63be6749755f6960d5010deb87297ff3ca972a21191b685e7a59 SHA512 7112d90c675357408ae451a4632201a644fb9b037a179bcdb7f316375d711c609c7522b5d3c131c5a18c96cc58d6f4bfcac61aeefe123ba445fbb0ad1c028944
+EBUILD jupyter-server-2.5.0.ebuild 2174 BLAKE2B 3709aee8e4c9098acf78a058d36d6a85aca1cb18daed02e74ffe2996b678e11942810abcd6ebfc97ef3feaf26847b4e894311d409435fe789b5386eb9700555e SHA512 98c2d98d8cd0bc856e63210c144e697230d6a32072af3c9fba38c48eb9c8381493526fa3fc41eec6cbe1e66a6056f4e02ebd3523cb92c4f5999d14dc755e7018
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
index 4dd97b7b6f98..0964f173e0e0 100644
--- a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	dev-python/prometheus-client[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
 	dev-python/send2trash[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 3bb093338c87..2da3d2ae601e 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,4 +1,5 @@
 AUX lxml-4.6.0-tests-pypy.patch 18051 BLAKE2B 99d97fa2e874c9bec4a866c3303b54ea2ab1e6abddf148d142cb66ee035b1eab1e05eed924d34451c5db38dc37f77104539cbfc2fe45815c17445b6359dcb857 SHA512 f6c6c2b00a49e6ca19d8b9123c364003a682c2e8df0c42d8600085d1cb094ba5cedd162bfc794e7d9acfff93aac771953dca5a879c3b957af1e2e8bd1db05515
+AUX lxml-4.9.2-py3.12-drop-deprecated-imp.patch 1985 BLAKE2B af705cb2092d6468ae556d79c14ca96d8491cf7a96dc1699d0f3e70113637f724876adaa051545c6a434ee9f54a1784ab5e24eefcf7eef61edfdca88980c0f62 SHA512 088428b9a9e103b4476f8bb45f318032126571f518cbeeb2e04e78289f5bd69ce59b7b058abe3957b59b5077160ef4e67cbb5005da92572437f1c27a6e497d83
 DIST lxml-4.9.2.gh.tar.gz 957365 BLAKE2B 201b3977da90386e413f1b89a4b7ee1e44d6bbea05e622e92feb1d67c637ce46ebf746f0648f034ed3bccd609233ccf7d8a7ee456f13b8d9ca8587ddf1ebd32a SHA512 816b2fe2eef2a97a0df66cbc39850c6dc3d6470e4033cc73edb40c80c0afbbe6c084d042d7c98b29497926e76f648caa42e1ebe5d83060af08af6972316077b0
-EBUILD lxml-4.9.2.ebuild 2897 BLAKE2B c7240964f193e4ab4452ddca0a9d51574fc63938a1081a0cb4f55dec8f5f0c9bf67bd0815414d8fcf37610a01b268864cfa118a4bfa55e8b68f1e0b1f1d4060e SHA512 b18d3732a9a6849e1be3726dc1a0273882b70d4341de521237c89416519d2050fa6a3e287f64556e4130a54d48be670ec79637833aea119267e15f51396c8096
+EBUILD lxml-4.9.2.ebuild 2951 BLAKE2B 46254e287ba600118fd7a24e64ffab54bca80e807ba5a5727b6b241350cd6dcf3c4ce91a6357b7ce5c4bd32412a799ea4deb261c53e9e7fd9bbccd1571d42e01 SHA512 a414622312e60d90d22496badcbbd37b9c7802e6439c6932a2d275807d77c38d6791c581f880c29bad850da87bea33b5dab8c4ad498d12766c907cdb6bd4f004
 MISC metadata.xml 463 BLAKE2B 9bcd092b61568f5d467230617b101f36245c41078e6a66c7ff63b22a6b4095de2ba3a59e48ce8b7842ce58d1255fa293995652daa3fab4c3af988498eaa30e97 SHA512 2ba5e340b59e0de4e472380e9c19b1f6f573e86e5c3c2e075f6151d369e94eea70e3ce36bfb5ece4da3fa69459e3ff83368f1df8302aa5754ae52f13c8f2312e
diff --git a/dev-python/lxml/files/lxml-4.9.2-py3.12-drop-deprecated-imp.patch b/dev-python/lxml/files/lxml-4.9.2-py3.12-drop-deprecated-imp.patch
new file mode 100644
index 000000000000..a59a60e74822
--- /dev/null
+++ b/dev-python/lxml/files/lxml-4.9.2-py3.12-drop-deprecated-imp.patch
@@ -0,0 +1,49 @@
+https://github.com/lxml/lxml/commit/07db761f9f027d1814a43686cda6fca26e37a931
+https://github.com/lxml/lxml/commit/c6b7e621e4696c02bf8f6ea423ffbbf2109748ab
+
+From 07db761f9f027d1814a43686cda6fca26e37a931 Mon Sep 17 00:00:00 2001
+From: Stefan Behnel <stefan_ml@behnel.de>
+Date: Thu, 11 May 2023 10:29:02 +0200
+Subject: [PATCH] Avoid using the deprecated "imp" module.
+
+Closes https://bugs.launchpad.net/lxml/+bug/2018137
+--- a/src/lxml/html/tests/test_html5parser.py
++++ b/src/lxml/html/tests/test_html5parser.py
+@@ -1,5 +1,4 @@
+ import os
+-import imp
+ try:
+     from StringIO import StringIO
+ except ImportError:                     # python 3
+@@ -45,7 +44,10 @@ def find_module(self, fullname, path=None):
+             return None
+ 
+         def load_module(self, fullname):
+-            mod = sys.modules.setdefault(fullname, imp.new_module(fullname))
++            fake_module = object()
++            fake_module.__qualname__ = fullname
++            fake_module.__name__ = fullname.rsplit('.', 1)[-1]
++            mod = sys.modules.setdefault(fullname, fake_module)
+             mod.__file__, mod.__loader__, mod.__path__ = "<dummy>", self, []
+             mod.__dict__.update(self.mocks[fullname])
+             return mod
+
+From c6b7e621e4696c02bf8f6ea423ffbbf2109748ab Mon Sep 17 00:00:00 2001
+From: Stefan Behnel <stefan_ml@behnel.de>
+Date: Thu, 11 May 2023 10:30:15 +0200
+Subject: [PATCH] Avoid using the deprecated "imp" module.
+
+Closes https://bugs.launchpad.net/lxml/+bug/2018137
+--- a/src/lxml/html/tests/test_html5parser.py
++++ b/src/lxml/html/tests/test_html5parser.py
+@@ -44,7 +44,8 @@ def find_module(self, fullname, path=None):
+             return None
+ 
+         def load_module(self, fullname):
+-            fake_module = object()
++            class Cls: pass
++            fake_module = Cls()
+             fake_module.__qualname__ = fullname
+             fake_module.__name__ = fullname.rsplit('.', 1)[-1]
+             mod = sys.modules.setdefault(fullname, fake_module)
+
diff --git a/dev-python/lxml/lxml-4.9.2.ebuild b/dev-python/lxml/lxml-4.9.2.ebuild
index b7b3efc9de22..aed3280a3b2c 100644
--- a/dev-python/lxml/lxml-4.9.2.ebuild
+++ b/dev-python/lxml/lxml-4.9.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1 optfeature toolchain-funcs
 
@@ -54,6 +54,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
+	"${FILESDIR}"/${P}-py3.12-drop-deprecated-imp.patch
 )
 
 python_check_deps() {
diff --git a/dev-python/magic-wormhole-mailbox-server/Manifest b/dev-python/magic-wormhole-mailbox-server/Manifest
deleted file mode 100644
index d6f0ef76c278..000000000000
--- a/dev-python/magic-wormhole-mailbox-server/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST magic-wormhole-mailbox-server-0.4.1.gh.tar.gz 68402 BLAKE2B 4bf6bc9fa6dacaafb532d9d0ee069bb89ba63feb790f0f9c0d1117b1de4f075eb9dd3bf5c72a9df472e9dedc31dcd9292dc1820da770738fd9d0d29cb3bcf68a SHA512 d174d1bf901e7d21d7cb77ceffd6b9c7aa3c15433e11862365883d93437225c7c655b8338a5cad7bd5c60d7dd7d3dd017ef7e26213b535c043ce75000a540597
-EBUILD magic-wormhole-mailbox-server-0.4.1.ebuild 606 BLAKE2B e7b6ae787d97e1b77ff0165499d8783d732534aa540d4f37992a001ecf1b316f397ee7ffa3cf9de8c8cce42659028c88fbf5e409ce83317926c6e3fe9f39da06 SHA512 4e0327a28ffd3912e9eed1335ecb7e99d57bdf5bce824d3f51db2d9ee95a6d7b87037784c1c09fbc2ee5a13057668a4d080d1eb3d4d3991082a8b5234079cb39
-MISC metadata.xml 448 BLAKE2B 8f2c4215876c801058fcbe35e67d9f7e4645e0a03d5b2078a91d4c0f7b3c0afbdcf5a52a60a793a5f45ae111db856dad3903c21aebced71ba1404243c8ec140a SHA512 c11199eefe7aaae2197fa16744f4a0223e880f3d45f22b7e235d21c55be729e7723a43c24d8b7b80fbaefcb1ae54142e989fc958a7f5e098376721ec57dc4d72
diff --git a/dev-python/magic-wormhole-mailbox-server/magic-wormhole-mailbox-server-0.4.1.ebuild b/dev-python/magic-wormhole-mailbox-server/magic-wormhole-mailbox-server-0.4.1.ebuild
deleted file mode 100644
index 43d7e5d3d7e1..000000000000
--- a/dev-python/magic-wormhole-mailbox-server/magic-wormhole-mailbox-server-0.4.1.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
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Mailbox server for magic-wormhole"
-HOMEPAGE="https://magic-wormhole.readthedocs.io/en/latest/ https://pypi.org/project/magic-wormhole-mailbox-server/"
-SRC_URI="https://github.com/magic-wormhole/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/autobahn[${PYTHON_USEDEP}]
-	dev-python/twisted[ssl,${PYTHON_USEDEP}]"
diff --git a/dev-python/magic-wormhole-mailbox-server/metadata.xml b/dev-python/magic-wormhole-mailbox-server/metadata.xml
deleted file mode 100644
index 728440f94096..000000000000
--- a/dev-python/magic-wormhole-mailbox-server/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">magic-wormhole-mailbox-server</remote-id>
-		<remote-id type="github">magic-wormhole/magic-wormhole-mailbox-server</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/magic-wormhole-transit-relay/Manifest b/dev-python/magic-wormhole-transit-relay/Manifest
deleted file mode 100644
index 4a32ad3ed408..000000000000
--- a/dev-python/magic-wormhole-transit-relay/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST magic-wormhole-transit-relay-0.2.1.gh.tar.gz 45936 BLAKE2B ffb05c716a35e688801150c3fd6de28cf557ed346091400f9eeb9335b6815425624e70d61f54be8f0a1e8bb15e874528f7cfcef1e8f0a2f8d3cd4285adb1db3a SHA512 dcc309de800d9023ff106ea7b67da4814006ee50e517570c046f2dff20573306b3d5f7c4e227186b2b6f8ff7cb71e02e41499766badf299d859a0e5628066162
-EBUILD magic-wormhole-transit-relay-0.2.1.ebuild 572 BLAKE2B de9ec961ef660dcdcb3b1fcb946f664fdd0c67b074f3e950e4096c90c9faf3fcdbc196703cd15e159b0aa414178ad653593a9d5820a204dc0cf8faa3504402db SHA512 6d7e9b1f628335454766d6492c9324b66a13b08e4bda26bfd38c667dba5105200407dae3390db273e907d6298fe5c61b139d265044b89ee88ea96d39a510027d
-MISC metadata.xml 446 BLAKE2B 88fa3d71e7112501e2191db9b0732319120794aa1e54ee254a53f586c3f09ce1fa83c6ff3db972743bcc5fbf6d82b2a8eeeaabb1cd37165caecaff1b52c13152 SHA512 3804952a6724e4905a1ae823089ec2624ae193724324184bdbe2e9ec62b0f82d929036e1ba245035670dc53cc4a007149ee033ad8b4d2788bf406a56f5367cc2
diff --git a/dev-python/magic-wormhole-transit-relay/magic-wormhole-transit-relay-0.2.1.ebuild b/dev-python/magic-wormhole-transit-relay/magic-wormhole-transit-relay-0.2.1.ebuild
deleted file mode 100644
index 47e05dd6380a..000000000000
--- a/dev-python/magic-wormhole-transit-relay/magic-wormhole-transit-relay-0.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Transit relay server for magic-wormhole"
-HOMEPAGE="https://magic-wormhole.readthedocs.io/en/latest/ https://pypi.org/project/magic-wormhole-transit-relay/"
-SRC_URI="https://github.com/magic-wormhole/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/twisted[ssl,${PYTHON_USEDEP}]"
diff --git a/dev-python/magic-wormhole-transit-relay/metadata.xml b/dev-python/magic-wormhole-transit-relay/metadata.xml
deleted file mode 100644
index ddffeecb78a5..000000000000
--- a/dev-python/magic-wormhole-transit-relay/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">magic-wormhole-transit-relay</remote-id>
-		<remote-id type="github">magic-wormhole/magic-wormhole-transit-relay</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/magic-wormhole/Manifest b/dev-python/magic-wormhole/Manifest
deleted file mode 100644
index 030929f27b14..000000000000
--- a/dev-python/magic-wormhole/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST magic-wormhole-0.12.0.tar.gz 274063 BLAKE2B 6a0cddd285169373926de9da26125b34457c76e456b1bfd910baed74090900a663435b0df78e5521fd91274b111d8fad56e923832cdd430b2eb27c31d8b510e3 SHA512 141244e746b0718f2c9417e8f7de6a714b0feb051aea8c7950ea0d1bc5d2e24e922bed29544fe76aa61b06aa2ce2b5f330824017af8c6030813415e6c004c716
-EBUILD magic-wormhole-0.12.0.ebuild 967 BLAKE2B 9be2b65796abbe2228d25a3fba6d3cec1b564a40ee8a86168a7ea3695fb43497df46e6437a1d43f0c1384bb3f9a1ef5a0322630925994118c49f7ddf1a2d2d0d SHA512 93ae9913edf3c5dbe360a361e86bb57ff1b54814b70660e74f82ce6bb6797218cfc0a32b39b414993ecc403a2853a948a12b93dc7b9e8746215158e95ccb6dd0
-MISC metadata.xml 418 BLAKE2B 9f9b20483a6ce46113cc6307621122f2a5d36355ca9c8290af95b88c6ed6bb9320810da1eccf9c53d310fd8faea3796094b1c1260032406aa9adff37dc95ce51 SHA512 ef39741b0b041bf889d138efea1f784453dce8cf982d170dbfe26ace415bb186672a7bf56b1c4a586c0820997522a45f92fa40b37936f4c90ec731498c3c7b69
diff --git a/dev-python/magic-wormhole/magic-wormhole-0.12.0.ebuild b/dev-python/magic-wormhole/magic-wormhole-0.12.0.ebuild
deleted file mode 100644
index d6a97bafd884..000000000000
--- a/dev-python/magic-wormhole/magic-wormhole-0.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Get Things From One Computer To Another, Safely"
-HOMEPAGE="https://magic-wormhole.readthedocs.io/en/latest/ https://pypi.org/project/magic-wormhole/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/autobahn[${PYTHON_USEDEP}]
-	dev-python/automat[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/humanize[${PYTHON_USEDEP}]
-	dev-python/pynacl[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/spake2[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	dev-python/twisted[ssl,${PYTHON_USEDEP}]
-	dev-python/txtorcon[${PYTHON_USEDEP}]"
diff --git a/dev-python/magic-wormhole/metadata.xml b/dev-python/magic-wormhole/metadata.xml
deleted file mode 100644
index c0b4cfe14855..000000000000
--- a/dev-python/magic-wormhole/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">magic-wormhole</remote-id>
-		<remote-id type="github">magic-wormhole/magic-wormhole</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index 9d2696cccb94..830a8394a453 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,7 +1,7 @@
 DIST nbclassic-0.5.5.tar.gz 20200594 BLAKE2B 43de88221af5461e2814f7d8963d7f9f675463f116092d1fb40648a8a14065aa5888ad207b1d845884f9b5b6d6a65a8f6197e94661b7a255c84d5b34ea0c5c99 SHA512 54e22ee41a2cb497c3792b74213c13dfbcef7a8a6fb42e48a06aa6969987cec39bf0cfa835e24062e8181bd732cf6b6855f9e834a586b15c584b47df06455b34
 DIST nbclassic-0.5.6.tar.gz 20201214 BLAKE2B 07643a35e0167af860ce382212685b988e8ec979cfe6e3436998e467f36a1f4381343c7e2513bc3a08d3cd384d6e6369cae20f77c9b0636559ce8f66b4ee2f63 SHA512 e259edb862a870c2b992c6c2c2d8ead64fc69f98298bd1830d63f1db001f8b36ab9509a693b5e425dcc2a43eb72b256f1082b1f0c66757bdbf35968175eb58c7
 DIST nbclassic-1.0.0.tar.gz 20201455 BLAKE2B 8d87668cdf2347c6d9dcc7f335d9bf346c1622217b71c18a91f7703f90ab5d2c71830f9743d6b408033ab153fe7180a9f07edc016704b9d0469bbf15c1641ef8 SHA512 fc80cd6311ab9cac9e0fdcf4d37cffc383c90327da8c27901239b84486e4afe23372665b0e1464ec78845816e829c4f3cf8672b4a0ad7e396fdb962b2f4f5a1b
-EBUILD nbclassic-0.5.5.ebuild 2201 BLAKE2B e6fb66a873e68ed6416fc97a0ba3eeb1d7256873177fedf5860b6137ffb9343f64e8167f6565a3e8e4a2dd41f8b184ca88830719a1d908e279e8cb8baf53e03c SHA512 55db41a064911376933a77e2252ee67973175faf77a1a99843a335e0d24acb1584fffcec69004ada904b297d09f27ed2b69782547d9d6de8290c568fa81ac028
-EBUILD nbclassic-0.5.6.ebuild 2209 BLAKE2B 4e607fba134274965030856e1c00ee692f1d08dd8ebb3a6f660217307e41af5c68d4e014ab0a74f3d73caa4141a5f90399be85f60c1f45cf5d0a1be346998b38 SHA512 6b73c1f00e3989518121605ee28b74fcd16a42c6c636e6879357f3a892ab82a962e8494d0d511ff8faf5a876a56327ce432e783645c3b4110db8d73ae8ac1809
-EBUILD nbclassic-1.0.0.ebuild 2209 BLAKE2B 4e607fba134274965030856e1c00ee692f1d08dd8ebb3a6f660217307e41af5c68d4e014ab0a74f3d73caa4141a5f90399be85f60c1f45cf5d0a1be346998b38 SHA512 6b73c1f00e3989518121605ee28b74fcd16a42c6c636e6879357f3a892ab82a962e8494d0d511ff8faf5a876a56327ce432e783645c3b4110db8d73ae8ac1809
+EBUILD nbclassic-0.5.5.ebuild 2201 BLAKE2B 97f5e1e384d8162fbc3c3115f3cc815ed0c00d8eb2b96317f89a8497940e0b9d529617f85c6ad522118b5edde3091e39d7cbca78cc9673513104acbf5fb0b03f SHA512 e7fba5552a6d3820cc5fe3817b710f0582ff89e1336edd558a5630da9e35673508cf21e27a867d180015586469b783b9ab7ebb17f0d7895d754b377b52e3f30d
+EBUILD nbclassic-0.5.6.ebuild 2209 BLAKE2B 8c6068522598bdc99670c3d7d5d172af52b58d5b0c60126ed65dc91a7941783b19ae4c4857fa92af1e1040687cc60168eadce9e435e4d1e4d689d301de46943d SHA512 3cea13895e7bac793228bbac91e4d6d477fb075916d089e42f9b63f3985878115b96266edd3211183213aae41f3887c1f91c6200ae1f6ae0b7cce954cbc5553f
+EBUILD nbclassic-1.0.0.ebuild 2209 BLAKE2B 8c6068522598bdc99670c3d7d5d172af52b58d5b0c60126ed65dc91a7941783b19ae4c4857fa92af1e1040687cc60168eadce9e435e4d1e4d689d301de46943d SHA512 3cea13895e7bac793228bbac91e4d6d477fb075916d089e42f9b63f3985878115b96266edd3211183213aae41f3887c1f91c6200ae1f6ae0b7cce954cbc5553f
 MISC metadata.xml 407 BLAKE2B 8be751d3f2e0e1e2952c39cd1846285ebb994d833022767dde609294ee9f98044b1189934e7d27c3134b1f06c95705687491dbf52739bdd0bc17f06cfdff53cf SHA512 6cc07376da4e55e5df153fdb0f43371ed415bed6db1bce2f67dd113d1e0f1994974dd6bee746021efb2d8c36ca2ca534109227c541d38b37b652a68b9642f2cb
diff --git a/dev-python/nbclassic/nbclassic-0.5.5.ebuild b/dev-python/nbclassic/nbclassic-0.5.5.ebuild
index ca32e945287e..3802f02fd04c 100644
--- a/dev-python/nbclassic/nbclassic-0.5.5.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.5.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
 	>=dev-python/notebook-shim-0.1.0[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	dev-python/prometheus-client[${PYTHON_USEDEP}]
 	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
 	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclassic/nbclassic-0.5.6.ebuild b/dev-python/nbclassic/nbclassic-0.5.6.ebuild
index dbd9a062a219..3ce153399977 100644
--- a/dev-python/nbclassic/nbclassic-0.5.6.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.6.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
 	>=dev-python/notebook-shim-0.2.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	dev-python/prometheus-client[${PYTHON_USEDEP}]
 	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
 	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclassic/nbclassic-1.0.0.ebuild b/dev-python/nbclassic/nbclassic-1.0.0.ebuild
index dbd9a062a219..3ce153399977 100644
--- a/dev-python/nbclassic/nbclassic-1.0.0.ebuild
+++ b/dev-python/nbclassic/nbclassic-1.0.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
 	>=dev-python/notebook-shim-0.2.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	dev-python/prometheus-client[${PYTHON_USEDEP}]
 	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
 	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 69ff99f635fe..98fca51aa41b 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,3 +1,5 @@
 DIST nbsphinx-0.9.1.tar.gz 171587 BLAKE2B 38796379102f7488b58e0a4ca720b6800edc11477935c782dbd9124d96fb8587f5cd51b01f95f60f1372bafc5177e68a61a61c9d20261078a8421001e6936196 SHA512 d18c3da6b202c22dfdbb9ddfbb5b61af97200aaf75712f0e6a0221089c155faac9bca61cb0d552c231456e095f3303c59a9f23a99405dacf4b99117b929e6196
+DIST nbsphinx-0.9.2.tar.gz 171754 BLAKE2B 6bb73034b7f24c39c2d79e9beab623c46c07d9dd583a71920b83a6561e7f2899474db3edbb7b64386f4f41e1fb7960e942ea8327387ef2e0f1d3745627a3ade4 SHA512 b5e371e3177f03e72d87059d0c06cb4787afe255926e9f2440ea0c753f5457974535f42c98bd5bb289752151400612f28de98e1b36e6865b26790e56d1f78b80
 EBUILD nbsphinx-0.9.1.ebuild 696 BLAKE2B 126e958e9e301ee398c691fceea15647c414f6265db4ff8cd5ab47f6eb92a8f8d201ade3419deccf6ea864d8c2fdc6540f386fbb21eeb847eef646ff4028573a SHA512 cabafc26df2bd636d586a2750607ec8dc9531ccc697650c706caa0a79166b3c8e82bcb179e9fcddf9398e024a57bc09683c77a5c331671c9be93b47027dc58ef
+EBUILD nbsphinx-0.9.2.ebuild 699 BLAKE2B 7962b89be246fa864b5a903b329a9c9a50a5d0ba641989965a9b8bf5da2fe77a99d501603d1ebcee880d9f7a6d8ab05cf310cdfe27e70115d48f15b222c6b443 SHA512 e2b76cbc91db72143d175b4cff1c9206712fb1257058df857dbe86f44fedd0d3f00a1b84a6898622bf9bcebe9e01dd28b66d3ebc025a6253a9a5b176e9bd1b2d
 MISC metadata.xml 835 BLAKE2B a3a10c9fb26688d90ad6f4e2ddb8b174eae9fdc2637d4aabdb86f63093982c7c9a42c4eaa3b2adee6ddb12ba2d537aec79d324c0a3c7355424a4255cea90eda6 SHA512 9ac5cebe164b19f80e0eb07f7c4fb5cb2cf5251af1f81290931f8fd01223261cb6224500387c131c7bc8738d7bb07eb790fd9ea426a295d0688489510e58d55c
diff --git a/dev-python/nbsphinx/nbsphinx-0.9.2.ebuild b/dev-python/nbsphinx/nbsphinx-0.9.2.ebuild
new file mode 100644
index 000000000000..a29963c7e93e
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.9.2.ebuild
@@ -0,0 +1,28 @@
+# 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 pypi
+
+DESCRIPTION="Jupyter Notebook Tools for Sphinx"
+HOMEPAGE="
+	https://github.com/spatialaudio/nbsphinx/
+	https://pypi.org/project/nbsphinx/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index a153281f023c..12797b5d7807 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,6 +1,6 @@
 AUX notebook-6.4.11-no-mathjax.patch 1527 BLAKE2B ccd6d1af303eccdd0eacb760d1b741b11354fa19c46b4d96c04da150793ea9e825cbf0922e152c7eac010ac4ef95d4fd16057092967a12873744fe45e6fbc4b6 SHA512 eb72afff71ab2589afafc735dff50651f9bd55aa8bda520d6d9ed8769373db8b557f79d69e4f2a0d95863e3c9f4d83e09a3a915390e6ad89d6d3bc558101a44e
 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 aac5121118c0cc18da90027b730c182ed9be52ebddc8a143586d207c36e85ee2f90ec2e4b42dc0d1c845f44986844f93537e7e2640de31664354481319de3588 SHA512 c7e923028015c98043e1a81d0baa9e7d6d9b81518291712f9f679ca58c9cf9f760dc58c1fcd57c9089f022eee4e591ce9d935982249184bb0777d621cd67418e
-EBUILD notebook-6.5.4.ebuild 2852 BLAKE2B 84d01cdc616b976fa4f0d7e220698c0126e9ee69741a7eec6ac719f4b5d00c244ec7db8ec7618427ee5bc82f28581b1c036595225f39cdcb336560fc8abab751 SHA512 b3110d159fa551f2fc31ebbfeb18d744183b61603c29a6fee0b3b952dfd6f556c66ce11ed6f3bd090379c8a99e130e85c0e41eb60c4e899fc9094761ff35d4e1
+EBUILD notebook-6.4.12.ebuild 3072 BLAKE2B 699c9b0bfca4584085ed1cc0b78eef14d90fb68a977e272dcba45b3f30db56ceae9611a4b366f75ef503ee0538e59bd65a9fa40b12cca19e7002d1b563db9d3b SHA512 bd434524ecfa0951f11167c0833ac0cc9207ca28078c29d678727a32aa245505f443f7095d59af24d8c1747d1d56b5d0deb91f1279cef86d591e1c53352ca2b8
+EBUILD notebook-6.5.4.ebuild 2852 BLAKE2B 590f25570879860ac71a1879edbcd34337bd005bac78b6c199d8a0b6f87f251e503bc2222016eb2cfa9b6a9001a29c0ed9b2efb5f16e38fec278afe10ab312d0 SHA512 2414f491624a745cb44b2cbca6141d9a5cd45263951650caffeb6e18e06046f4861127fed18b24ba779e5a946c9f0b915d88899fbf9cc2d2cd35fab08c4cfd95
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-6.4.12.ebuild b/dev-python/notebook/notebook-6.4.12.ebuild
index d3487026e7dd..0367b35c25b6 100644
--- a/dev-python/notebook/notebook-6.4.12.ebuild
+++ b/dev-python/notebook/notebook-6.4.12.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+	dev-python/prometheus-client[${PYTHON_USEDEP}]"
 
 BDEPEND="
 	>=dev-python/jupyter-packaging-0.9[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/notebook-6.5.4.ebuild b/dev-python/notebook/notebook-6.5.4.ebuild
index 323bc55deae1..4df44da4ffb2 100644
--- a/dev-python/notebook/notebook-6.5.4.ebuild
+++ b/dev-python/notebook/notebook-6.5.4.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/nbclassic-0.4.7[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	dev-python/prometheus-client[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index b276d931b72d..3bad3ddb7cb6 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,7 +1,7 @@
 DIST openstacksdk-1.0.1.tar.gz 1118637 BLAKE2B d4677a3a5595bf871fc0b380f1cadfd56ebba14bc2255fcc6a6a4813c5c79807a1a0a76263844728f256704b2966b82be9bd6e968de9e7e85f411402f428cb78 SHA512 9871a262113b4396b3a5181e93d2e00312c5a80933c3ff6efa501a4b4d7d145985f54203eeb6e1f50c5593ba491b13a631b9293759e0615bf0eda393c247a4d3
 DIST openstacksdk-1.1.0.tar.gz 1141513 BLAKE2B f4c052ffa1efc36dfb355b50853d75ceddc5a3a361a8a8749bc51d55530dba465df451c7bf7154081130ca4d2d798e8c96b7230d4317bb9ebb96a9add410b501 SHA512 3c91a6a797c966bbf08dc51f013004c8ab9148dcd3a6fad4584fb40c256696a7ea02f241bc7ea1a3fbc56a7ec790dfd1900c0da54081c3d64f5077273d4e0835
 DIST openstacksdk-1.2.0.tar.gz 1160015 BLAKE2B d3ed5b9415715faf6d9cae225e2a8e7c3bd69907599fd2683f53e2070513a1f27aaae2d2f4aa40ada26ff819b5f8238c09e208243197165aa52f19776e53fc7c SHA512 4ce118b8b19b495f333f76cb416d2b4cc2c9ea835979cf67e83f6f7f40df13d29e19ed054a2f3ee469e6c5496da4a7a11193e4815b20195b28ba4c48263b6c1c
-EBUILD openstacksdk-1.0.1.ebuild 2635 BLAKE2B 2b40af12289fddb05740019b0d11499dbe91983e60b4a3a979c0e61bd2f91582d89a8427976e9417dbe893973cc4dd3686078be9517db30c200c7b2da5647ada SHA512 58c2f1a65318f976da006ea77dc00d1ba4cbb6dadec8738972d21dec668f8d943c088e4cf5d64719b21a4cf37600155595af2fc1a1d26abf1173de211b8bdbe2
-EBUILD openstacksdk-1.1.0.ebuild 2638 BLAKE2B a1cad5693465aa4443b2287ab29af73ba29efed52dc8c39585517c271cdcd98539ad2cd0fb99b0d12c9088bf0df48728bbc29a2f8a9a3d6a069e2297a4a6f752 SHA512 149d32aa43ac1f53d046f5fcbb571f011cd763353aeb70ab31a8c0b672bbe56fd7829e2a75c3bc5eb442fc895791381c123c30e24e28d209b4af98eb2eaefe54
-EBUILD openstacksdk-1.2.0.ebuild 2639 BLAKE2B 0aa52ac5abb1138d22589fd5c8b006602261a2f0943251e56c6dd7ed377c67d101940d10db43bb09874aa1517b94617b87a66090144940401c80949d558434ee SHA512 bc5cdd9151dbdeedb42cbb71ff82941549544dac0704585c1e7e4043f52f03e9169a30118d67e372fa4f3e39b236c9228316c968022a770e7ddf258ce4c24a8f
+EBUILD openstacksdk-1.0.1.ebuild 2635 BLAKE2B c884731c3c3b99362fcab7f180d4b2dfbcbf7b2a2f897e9be191b828611d03ca10f5af3d3a924c1c123c166f9e6cc09682cc90f5a20167ca0345b6a47bb6705b SHA512 271fb81e7040e08196b4c70f180d8d614c70bbe4d7a7eb4b584ad93c365f1603be90134a4338d8693477ef3d94dcfa4aca54df0f2fa8db0991695b0a1c01c2b3
+EBUILD openstacksdk-1.1.0.ebuild 2638 BLAKE2B 4365c3ccf1044ef1af93ce590e3edb088d021b55a378b45387d2e597d557233762fda154d88de664c9463892a40ff09e1f91bfd9fec330f5c6ba91a975d594b0 SHA512 2c6a571ce78aa11c15b0373f4d02111c4a8f428c9dacbb765f2d99d791a40da7844556dca7125a0a2c811e192ab64437096e3ff1d7f63b18403e72792a61017d
+EBUILD openstacksdk-1.2.0.ebuild 2639 BLAKE2B 3595fb952e7feb35c7f0c17ca7938d0efe485f8c7bf258c808f9cd3be1d77c730537888cbd0bbbcaa1ce0463c9edf493fba211f753314aaa4750a09f49779ab5 SHA512 be2a6a910e8dd0272d5c4d383ff7c6ab44b08c20152f600fc0e8cd49a37f8966a23bf69d1a973dd2f27e838024c4b5d9138a85c78e49c113f0bc304ffa946600
 MISC metadata.xml 517 BLAKE2B 661ad1e9eae06e7b36a5ff753e73bd4434042966cff3fd6fbc11bf70a1acc3eb8de29ad2a033d6d715e1152a5454d84077e99db3b588199b317f925864dc1403 SHA512 e6dbfbb3546c2a62b204b33ebb3bb33611079698212f098bd4da072200fe43e3bb350cc998b255ec4a15aa2ff3a04c89a9553dd7930db48e658dbcaff78526d6
diff --git a/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild b/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
index 8bc3e8779f00..a4ac5fec7faa 100644
--- a/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/openstacksdk-1.1.0.ebuild b/dev-python/openstacksdk/openstacksdk-1.1.0.ebuild
index 022d330fdfe8..85400b39c990 100644
--- a/dev-python/openstacksdk/openstacksdk-1.1.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-1.1.0.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/openstacksdk-1.2.0.ebuild b/dev-python/openstacksdk/openstacksdk-1.2.0.ebuild
index 8bdeebd5a490..e7d4c515009f 100644
--- a/dev-python/openstacksdk/openstacksdk-1.2.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-1.2.0.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 807af2a0d6a3..13e45182c852 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,4 +1,4 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
 DIST os-client-config-2.1.0.tar.gz 48257 BLAKE2B c88d2c9c34103abfa60c3d983ed50309a2a552cf275f48e3c1dde9837b98849d09062546c5bc096d978a059afbae54eed9eadb8aa53375aae67f409bf3cf3e05 SHA512 31f53e5bafced1d7d57ac8818a7b889506b45347655ee41db6d5d9c0a6f2ead2a6d820553aec4a6ad9fd817abf9d6b666938a24ba85ab3745e06bb10b312e33a
-EBUILD os-client-config-2.1.0-r2.ebuild 1089 BLAKE2B 109c8d36d3ea72966ea1fc01f34b691180f8abaf7ec2c85076b2e33166c3fdd8188fa273671c2d2b44e0b59ab24a3d1b103a03d81aa3b3abe9031df5e810c3be SHA512 8d7777e373f0885462e3586b922b554ca2d6040a2f0b20f8d0939e033e19f30c617afd3a8971a045037d2424671dc482e352e2b362d42e1a08da1a4a884331c9
+EBUILD os-client-config-2.1.0-r2.ebuild 1089 BLAKE2B 72d68359252f8fbe3484a172ca912b15d2b7b9972aa3a78c577772df7bdf7f37d41c21be2f9e3ed27ddb7019d6731b9364e360e12567263700b153b41b037b6c SHA512 2bce3ffa456773848ff248f423636202f08d791b4e2e8ae7ebf712ed5bc4eca546351ea740d48c49547b5e5963dee1fb3fc3fb78090bf08bebfd2a6e1ae3b4fe
 MISC metadata.xml 476 BLAKE2B 5522345b88cd6cb95631c8b391617d6c42ec4c32ccb78321caa7cfb6649d30dc20710ab0ff15d976b3cd3439483c08c44b354c44e2ea2f9e9dbbb72812f89975 SHA512 30b3055b7e24c72808c5c196e42eb755c9cf48e0be6ecd808c0725118c5de54634c36ff7d2972df59c240aaa129fa3032f8a1a5c372b1ef68f71fa2263211774
diff --git a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
index c00b60280766..04e12131b425 100644
--- a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
+++ b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
 	test? (
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
 		dev-python/python-glanceclient[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/prometheus-client/Manifest b/dev-python/prometheus-client/Manifest
new file mode 100644
index 000000000000..41b1c3ae10b2
--- /dev/null
+++ b/dev-python/prometheus-client/Manifest
@@ -0,0 +1,5 @@
+DIST prometheus_client-0.16.0.tar.gz 117546 BLAKE2B 6b4e6600b352f17620e432edd976c2d26ef71326018bd1fa81f6bf4842f1599b06b11036a3b71c641698ad3d1e2f4422812133b51a34ecc70ec0606e9ea2478c SHA512 12d22963a22511872fbd170e112a743fac02ab1a569934eef5d97f53a292281ef3f589e852f245d083d8555c5cda51c6210fe48e1211431c8fe00b47d571eaf4
+DIST prometheus_client-0.17.0.tar.gz 90650 BLAKE2B 04bc44e930c94edc9fb0ceb5cc5be71cbec23435d271ec63acacbb10b42b192170ed7f92c767a575a08a8140d9cfc28b591c49ad9af2e6d931990daba45637ba SHA512 da9a27a514dca0ae2721eaa607c5adfa86686553eebc0c4eb4323d0866d03b520de5085b8e39560df0525ef3bbbbc7996271b64136f60a427fb14fb8851e595f
+EBUILD prometheus-client-0.16.0.ebuild 579 BLAKE2B f53d39c9a9d09d8361c661a4921d8aefa977efbb9401455f70f26319e55e4b1fbada7232643a6fd602e1879cf1c6c5917caa243a1b773c6d8908f59a350da90c SHA512 d12eb90cadca85b9695757a5a0d97d4c9125a622973f076814f847faa9b1468201c154591d28d046c09ecdec60caf978f2dfa4a2b32dd7a023aab9c6326d46b5
+EBUILD prometheus-client-0.17.0.ebuild 588 BLAKE2B 1e895149c3683e802370f92b5e851a00ce0655bd519535c3d9b12ec5ec52f2eaa45725d4a4403c50f37bcbbaefd57062bf90365493b4af8936b414d701225dab SHA512 faf2bb551a83b8cffbfa1e2f13b17b0521435ad4fd8b613fe722f0c64ef27abbcc64a3b750b1cecd29cb01109a4de0cfd5819bb50be728df2be750a1b0158080
+MISC metadata.xml 409 BLAKE2B 900f1046ec87679dabe88792bfea55cdf6dbbc1f332260e5487628530a1e5b2e07a1b5776313c484ed2355c205dea165547628297da3fd3e0d9e7c352f4f7a54 SHA512 beee1bb3823aa235e8c2667b18157254335777dbf1169beaee54190d41819dd0e82c58a8ea09c4981740370d7e5463ce11d327e02bf411093dfb653a557077ff
diff --git a/dev-python/prometheus_client/metadata.xml b/dev-python/prometheus-client/metadata.xml
index 705228750c76..705228750c76 100644
--- a/dev-python/prometheus_client/metadata.xml
+++ b/dev-python/prometheus-client/metadata.xml
diff --git a/dev-python/prometheus_client/prometheus_client-0.16.0.ebuild b/dev-python/prometheus-client/prometheus-client-0.16.0.ebuild
index a644f25e8f12..d13ab19b83f7 100644
--- a/dev-python/prometheus_client/prometheus_client-0.16.0.ebuild
+++ b/dev-python/prometheus-client/prometheus-client-0.16.0.ebuild
@@ -6,18 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python client for the Prometheus monitoring system"
 HOMEPAGE="
 	https://github.com/prometheus/client_python/
 	https://pypi.org/project/prometheus-client/
 "
-SRC_URI="
-	https://github.com/prometheus/client_python/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/client_python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/prometheus-client/prometheus-client-0.17.0.ebuild b/dev-python/prometheus-client/prometheus-client-0.17.0.ebuild
new file mode 100644
index 000000000000..587c0a11e8cc
--- /dev/null
+++ b/dev-python/prometheus-client/prometheus-client-0.17.0.ebuild
@@ -0,0 +1,25 @@
+# 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 pypi
+
+DESCRIPTION="Python client for the Prometheus monitoring system"
+HOMEPAGE="
+	https://github.com/prometheus/client_python/
+	https://pypi.org/project/prometheus-client/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/twisted[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
deleted file mode 100644
index 74d00a3e48b2..000000000000
--- a/dev-python/prometheus_client/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST prometheus_client-0.16.0.gh.tar.gz 82473 BLAKE2B bf285f52ce3de4c55f681871b814fe0be8dbdf61ed3031570983325e193a9b34cafbc8526f545801ac8711cc8331cf3b0c8f157394feb9ad827ac97872397341 SHA512 511936758026b6d6f48f52d27b1cb964a03668054d7a3c5c82c4fa20800be3812150fca74ab46dad11ca12f2c9ce1a6951a82ae2bacf91b3761f7bf7ce75e0d2
-EBUILD prometheus_client-0.16.0.ebuild 708 BLAKE2B 40c500f74ef923242300070e6db14a07e5c124f78df9e95142f24a76927dc1b529c086f68de720e4e67ec73f0b2579063b811fabfa3f6648651a114ce05d92e7 SHA512 7deb4baef947fad7beee77792c6e5e187ca1934c9bd3705e666c3dd6cefeaa52f168c68f054693d67b1cf9b887b3cfa89faff53151a18eeb7bc115fc0eb9247c
-MISC metadata.xml 409 BLAKE2B 900f1046ec87679dabe88792bfea55cdf6dbbc1f332260e5487628530a1e5b2e07a1b5776313c484ed2355c205dea165547628297da3fd3e0d9e7c352f4f7a54 SHA512 beee1bb3823aa235e8c2667b18157254335777dbf1169beaee54190d41819dd0e82c58a8ea09c4981740370d7e5463ce11d327e02bf411093dfb653a557077ff
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index f7de8574e2da..490f11294876 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,3 +1,3 @@
 DIST pyyaml-6.0.gh.tar.gz 119855 BLAKE2B 286678ac81f2e6c252d285d2f98dab98894787e3aa164a29a697986f56200c7b71b0a768edf6d50e61065efcd054078673270872162a4975409928d7dd67aacc SHA512 cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad
-EBUILD pyyaml-6.0-r1.ebuild 1012 BLAKE2B a14fbadd740065377c273d377964fd33a66b117334a2d5869a50e636cfbe9c09d72a5aa89bdc5fe7a170291b789c5aca315683f9d63ca359ec1076157d3d7441 SHA512 9c52f5490fe38812c04ec98b8fdd130d8902ce9b4efd23ee80330c0c252c8d06d59f5befe2b8397cc593d360a7f2131d689c6e3b1331bd2df4a3d7421e5b6b1d
+EBUILD pyyaml-6.0-r1.ebuild 1013 BLAKE2B b3e4bcbcd48e635854f7f6ce34bd4bec54a16eac354466041b53aafe4d5842e2a53a73c5e64b5c1d1380cf9aa64279f71cfd4a5052e64649bf26da173e01e34e SHA512 ce3b67e481388f7c6b78a49971b1f5dca1f235fa701cd7f29ae03e0f90b0a10a41d226e11e1d3b6c85ebb9147360941c9d4ffa2f61d04fac5a052e0a4c1a52dc
 MISC metadata.xml 426 BLAKE2B 6216e38c3e79e811aced6c777b49779953abf4f1b0a1185947f6a6fdc851fdf4cc973092024a6cb2d76bf06863feb49742c7a6892a8761b48a5e74902757a610 SHA512 f549b70fcf1588625fcc2bc33ad0c41faa267ad5bb84d564f5502dee1ad2340a663d1a2b92cf9fdeed827a5f7cebdbe76d59166e89de6d03e7933141029c051d
diff --git a/dev-python/pyyaml/pyyaml-6.0-r1.ebuild b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
index be15962675c7..549af76ad3ca 100644
--- a/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/spake2/Manifest b/dev-python/spake2/Manifest
deleted file mode 100644
index d153a15128ea..000000000000
--- a/dev-python/spake2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST spake2-0.8.gh.tar.gz 62425 BLAKE2B 64215362af26fff0785fdabf4282f7111a4cc917750827075b616f009cb1fa6373fc2325382c26b43c051aa5b94e414ca2a5223d9ab666289eb2d04723b15cb5 SHA512 908c377c831f4a11551973ca917b113d51a66c533d35fd19b2692fdb7e575ed2a5045d9b632bc55c37b68ad092f01dff5da191e9dfbfb5599b72844788438d68
-EBUILD spake2-0.8.ebuild 559 BLAKE2B 19dde835446cf7568157684ed7c17af156b6ca23b48ad1981be5a94d3de0563bd4bec2a377a150916eb1083663805f963bfc5cb78351ff1ee39daeb2a5ec8555 SHA512 8b0037d4a53028345db60ace5b8b47d95a1df0d378ba1ae74d99ffd8b0701409c3ecce924e4c1a5f347fd2be6af76d4685af1a6b2eba8c776d775fead9d96e9e
-MISC metadata.xml 401 BLAKE2B a80b9d771ec1251af6e16f012257a7d1150644cdba64052ff5b70d282c6f27fa57685f675409a3edf30b2c2bc24c85f74b3dd8460999f8497a72e93653183abc SHA512 ecfbcd80d35348bbb1a5469bcca1b06a86ca6fe736d443707e00859400318e5c9bb399e5acf2faaf2771301518741ec93124277f6bf1834454b4406392cf0ea4
diff --git a/dev-python/spake2/metadata.xml b/dev-python/spake2/metadata.xml
deleted file mode 100644
index 2041ad286cee..000000000000
--- a/dev-python/spake2/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">spake2</remote-id>
-		<remote-id type="github">warner/python-spake2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/spake2/spake2-0.8.ebuild b/dev-python/spake2/spake2-0.8.ebuild
deleted file mode 100644
index 25d38c02d8b0..000000000000
--- a/dev-python/spake2/spake2-0.8.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
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of SPAKE2 password-authenticated key exchange algorithm"
-HOMEPAGE="https://pypi.org/project/spake2/"
-SRC_URI="https://github.com/warner/python-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/python-${P}"
-
-RDEPEND="
-	dev-python/hkdf[${PYTHON_USEDEP}]"
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index ecdec92936fd..83299e4084d5 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,5 +1,7 @@
 DIST trove-classifiers-2023.5.2.tar.gz 15835 BLAKE2B 788c6e05c498dcaa21cc51f0bfbcd5e3637b56c5cb0f481b9c9c746caa092f578ff7b8947f620518bdbca8a7fbbe67b8806b0c56c219a9b25d2f44647dbb0f60 SHA512 6f1e9e31a40ddd701048613c128b765a6b920480f5f3f2f678102277ac0b230ecd9dc135f9dda5ed115abbdacc3098ac2d75564004df0e8cae04b12335b309bb
 DIST trove-classifiers-2023.5.22.tar.gz 15853 BLAKE2B b7170a53287ffa6086aa5223128a9d66cb9cc6d7a3b76f8b47cb5cab835d9f47cb98cfd1436ba8bbe057043751e5685899dfda9fdd61c6a14e4d04f00789b227 SHA512 c665b2255afc2e9acc537a7d650648d34ab3438baaf33bb0c9a535942ee8750c0795fda89fa28d29f5232e62e957795947b0d908fc7e06bbdce2cc7dd1cc26bf
+DIST trove-classifiers-2023.5.24.tar.gz 15856 BLAKE2B 37184092e2ec7c068a73d47f0708124b92d54abd4015da5ccbe2b914699f7f93ffaaf1422b84745c0c76aa377adab9c4759348789c55300772c80892afc5c6da SHA512 6017d32ffb63f8ac85d616c55a9317aa8f3cecbddcdfaabffbd6ba98a60f964ceeb28424881f2cebdf891aad2b6d7d1ade78202ca6e9bec697ce446647d09897
 EBUILD trove-classifiers-2023.5.2.ebuild 763 BLAKE2B 31589a8b767f650d7f57575b42b461d6bb33a40fb2057b92c49661a6e46923a3868dc864bbf8bc250b6d9c4468767d6303e7cefc0b233dba16e30aca72ceb785 SHA512 ab86c09fb3ba1d8cf6d8a00426edb7f7bd70261376a607faec576fd27b68a87edf67a0b1d72744d1c2904639fa069353ee162ad6a6ab61d064d8798bc5f00c11
 EBUILD trove-classifiers-2023.5.22.ebuild 772 BLAKE2B 108097e8d335bffaa7c1262b906295da308034e1f760e63ed5afc5bb04cbdfecee95f917367dfc3201d8c5b6980defdb3a77080a44b334193ec747e3a063411b SHA512 31288efc5ab6988979c5795c2a4c22ffd537d856874211fec2b28095984be5a4a2972bd1f88209ab566f91f8339ca5382b82950d1bf039ac79007757e1992a8a
+EBUILD trove-classifiers-2023.5.24.ebuild 772 BLAKE2B 108097e8d335bffaa7c1262b906295da308034e1f760e63ed5afc5bb04cbdfecee95f917367dfc3201d8c5b6980defdb3a77080a44b334193ec747e3a063411b SHA512 31288efc5ab6988979c5795c2a4c22ffd537d856874211fec2b28095984be5a4a2972bd1f88209ab566f91f8339ca5382b82950d1bf039ac79007757e1992a8a
 MISC metadata.xml 385 BLAKE2B 0d679ace6575dab100af9918e8b6dbde2f70cbf556c23ee667d68f69c6dd07887e43a513a73e60849a7a4b88cb26d4cd85b4cb905b926ee3832161c663adc9c0 SHA512 977bc86d4fb2dfcc887fd8d4038b8ac76cb0f4783424d3ab0857256afaf5dacf4e45c0d2a9166daa854be1dc8faba4a10c4718c557b983a1c7bb0a33fcd61f41
diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.5.24.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.5.24.ebuild
new file mode 100644
index 000000000000..24ce94ad7835
--- /dev/null
+++ b/dev-python/trove-classifiers/trove-classifiers-2023.5.24.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-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=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
+HOMEPAGE="
+	https://github.com/pypa/trove-classifiers/
+	https://pypi.org/project/trove-classifiers/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+
+BDEPEND="
+	dev-python/calver[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest
+	"${EPYTHON}" -m tests.lib || die
+}
diff --git a/dev-python/txtorcon/Manifest b/dev-python/txtorcon/Manifest
deleted file mode 100644
index e42c5c39dd1a..000000000000
--- a/dev-python/txtorcon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST txtorcon-23.5.0.gh.tar.gz 394188 BLAKE2B ee63d2815a9b697aa37d27697ef6085dc91e750ba0cad854c8610eed7afcfec9b50cf5aead24f75676e2b0ee39167c50fbebc43a51911a3ebe17eb784b18d31e SHA512 33610c043084273f5dc06b797fff11bb0fccaae14229dbd07286e13e40ebc199594f6e52c64b87e4060e37bcb44bd90ccf7ff7217d923fdb33a581fb95144d56
-EBUILD txtorcon-23.5.0.ebuild 593 BLAKE2B c8bbbaaba1936e9b6621dd194078ea0eb309e3ba074ee5aba58a24e74c3ba5399d2cc80b2ffc0856b559529d2a90db1354997113c5f83ffda1c3919167830b4e SHA512 52a4043023eb9f1f69307d8b17efcc6b2578101c944ba0127c0404f31b79ffa605d828949221e71760f2ef9bbb3a3bfcea8e6ea26bbf26c8665eee46c1416be1
-MISC metadata.xml 398 BLAKE2B 5cff75ef9af25e3c3d1ef95de2d272d6f79c06a0e1101062d06bbc463010dcbf54d0ab2a94eaa049ba5050d53a703039fcf64de9ebc4c704bdc1bb25f909a3c8 SHA512 8c638e5e0e762bd5f2129f0a2696d50c91c304efecc627b4bc15e5f3e4fe811ca7bdfb20ca67546b2d9056cee80e7adbf1489c061df4dd85c94a08005b5acbbc
diff --git a/dev-python/txtorcon/metadata.xml b/dev-python/txtorcon/metadata.xml
deleted file mode 100644
index 41f36acb77d0..000000000000
--- a/dev-python/txtorcon/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">txtorcon</remote-id>
-		<remote-id type="github">meejah/txtorcon</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/txtorcon/txtorcon-23.5.0.ebuild b/dev-python/txtorcon/txtorcon-23.5.0.ebuild
deleted file mode 100644
index 5222bc094733..000000000000
--- a/dev-python/txtorcon/txtorcon-23.5.0.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
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Twisted-based Tor controller client, with state-tracking abstractions"
-HOMEPAGE="https://txtorcon.readthedocs.org https://pypi.org/project/txtorcon/"
-SRC_URI="https://github.com/meejah/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/automat[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]"
author	V3n3RiX <venerix@koprulu.sector>	2023-05-25 09:05:36 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-05-25 09:05:36 +0100
commit	070db046876f2e8d5f83cb7b380ae857d06e493a (patch)
tree	81c82d9b296b94b64dd8aea6ad369ea43f40bc14 /dev-python
parent	4bc145ba9c79d57abcafc9b97c72bd5addd3e833 (diff)