Adding metadata

85 files changed, 645 insertions, 248 deletions

diff --git a/dev-python/Faker/Faker-18.9.0.ebuild b/dev-python/Faker/Faker-18.9.0.ebuild
index 9fd3af59256e..41983d44a636 100644
--- a/dev-python/Faker/Faker-18.9.0.ebuild
+++ b/dev-python/Faker/Faker-18.9.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 3383b893df0c..8a6411da33d4 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -5,3 +5,4 @@ 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
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..76d0733e4c31
--- /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_{7,8,9,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 83a75d400228..b30d4dac595f 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,2 +1,3 @@
 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
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..5ab2e33234ef
--- /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_{7,8,9,10,11} 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/boto3/Manifest b/dev-python/boto3/Manifest
index ffc2416a62b8..b1ab440fa518 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ 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
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..03c610b184f7
--- /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_{7,8,9,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 8db5f957a77f..1b1fad5229c0 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ 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
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..509d06dedf97
--- /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_{7,8,9,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/cffi-1.15.1-r2.ebuild b/dev-python/cffi/cffi-1.15.1-r2.ebuild
index eece3b167ce6..98f041b46fa8 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/cython/cython-0.29.35.ebuild b/dev-python/cython/cython-0.29.35.ebuild
index c78e97279d17..517f70a2fa32 100644
--- a/dev-python/cython/cython-0.29.35.ebuild
+++ b/dev-python/cython/cython-0.29.35.ebuild
@@ -5,6 +5,8 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{7,8,9,10,11} )
+# 3.12 not tested yet for https://github.com/cython/cython/issues/5285.
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
@@ -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 d988e055fe7c..f9d0556fff70 100644
--- a/dev-python/cython/cython-3.0.0_beta3.ebuild
+++ b/dev-python/cython/cython-3.0.0_beta3.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{7,8,9,10,11} )
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
@@ -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/django-prometheus-2.2.0-r1.ebuild b/dev-python/django-prometheus/django-prometheus-2.2.0-r1.ebuild
index 4970ee119d13..d1346bb5e796 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 4970ee119d13..d1346bb5e796 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 159e79ca8a9d..6926ff043570 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1 +1,2 @@
 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
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..7bd518f5e675
--- /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_{7,8,9,10,11} )
+
+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/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 7be401274c05..dd999eb66dfb 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1 +1,2 @@
 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
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..0c85e8ca1676
--- /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_{7,8,9,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/griffe/Manifest b/dev-python/griffe/Manifest
index d93642537020..6e0e2a6231c0 100644
--- a/dev-python/griffe/Manifest
+++ b/dev-python/griffe/Manifest
@@ -1,2 +1,2 @@
 DIST griffe-0.27.4.gh.tar.gz 154404 BLAKE2B 40c3a67b47561eeaf846a53ee678e3473a4064ab58c1a07b823b914e2fcfda15e43de9dc6bac074eeb238838d27a9c14f4314a481590c83df1e83dcce320525f SHA512 bb927d956b289048950343d087da5be057fbef8e38feff345ce5f46ca1edfeb87a6fe94b8be18d7c76beef84c69dc97a3972177aac69429a4633f1543906b8e5
-DIST griffe-0.28.1.gh.tar.gz 156723 BLAKE2B e7a60b39557ca5b0809c4f17555b00177c3ae6b5af8452156833c4a0c81c472be949bfd677b532d9b6c2c75f7c9362178926854088c908343e299d7b3aa9b7ab SHA512 de4981ef20bdf9777e6f59e63e2a762c85d3945a25254bfeab43652e6130961764ed40fd90d3d806aa67667e54664aec960833ace076f7a0f9b3cc5ab389e880
+DIST griffe-0.28.2.gh.tar.gz 157261 BLAKE2B 284e63ffcb507233b5965b6e3931036703c9577c7e34149a27f24ffbd54f48f11ed873c690b931886fc043848cfca71c6d94638f0c1073428a1df17f04a33b58 SHA512 8c79fc3a0126cb34f7b13d7407aee5f63c926564da03cf13c5a053b79e3cd736d609f88bb83142ba9baf1fac00e3c8a392ee19c72fa6b0f32a4b383183f5a828
diff --git a/dev-python/griffe/griffe-0.28.1.ebuild b/dev-python/griffe/griffe-0.28.2.ebuild
index fd575b3c619a..fd575b3c619a 100644
--- a/dev-python/griffe/griffe-0.28.1.ebuild
+++ b/dev-python/griffe/griffe-0.28.2.ebuild
diff --git a/dev-python/guidata/Manifest b/dev-python/guidata/Manifest
index 226ef09b7272..a800ab419052 100644
--- a/dev-python/guidata/Manifest
+++ b/dev-python/guidata/Manifest
@@ -1 +1 @@
-DIST guidata-2.3.0.tar.gz 520106 BLAKE2B 6f2997082bef75e6fe73b5ab757984ad8209ca4dc51a3e675ffb9d3670806659f59429d67ddf661e4efd741103be56301e503842512d5642593c2087721c2791 SHA512 f9d11d79f1adba0100d94c6a6db3301201eef890e1ab18523ffbab2d5cce98b7fbe858d87cb8193b152b9b9ef9e55773989a030ed1e349647d0b0a7edb3f034e
+DIST guidata-2.3.1.tar.gz 504812 BLAKE2B 4b2e5e07ee76bbeb95a9a55a4cde1d409d2438fe5273a0f154d34e8beb9934f810b29a33ef508009e38c589d57402aef55d346b93856fc744e7a8236748f5e86 SHA512 7488ca8c761394dfd9d58a8ac3c96dc963adab6df278823fb1a7d9132febc16e275908034ef48381d696668add43f62438fab1ba22f70f5e08f33b14a81082c5
diff --git a/dev-python/guidata/guidata-2.3.0.ebuild b/dev-python/guidata/guidata-2.3.1.ebuild
index 0e27e665ea34..ca51ffd17d20 100644
--- a/dev-python/guidata/guidata-2.3.0.ebuild
+++ b/dev-python/guidata/guidata-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/guppy3/files/guppy3-3.1.3-py311-refcount-assert.patch b/dev-python/guppy3/files/guppy3-3.1.3-py311-refcount-assert.patch
new file mode 100644
index 000000000000..8a8840d553fe
--- /dev/null
+++ b/dev-python/guppy3/files/guppy3-3.1.3-py311-refcount-assert.patch
@@ -0,0 +1,44 @@
+From 71f3455f73eedef78ccf79c17ed5adbb36d11eeb Mon Sep 17 00:00:00 2001
+From: YiFei Zhu <zhuyifei1999@gmail.com>
+Date: Mon, 22 May 2023 15:54:24 -0700
+Subject: [PATCH] nodegraph: Fix refcount sanity assertion for Python 3.11
+
+Python 3.11 created immortal objects whose initial refcount is
+999999999, larger than 0xa000000. This breaks the assertin here.
+
+Caught by https://bugs.gentoo.org/906937
+
+Fortunately I don't seem to need to do a new release with this fix
+because the wheels are built with -DNDEBUG.
+---
+ src/heapy/nodegraph.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/heapy/nodegraph.c b/src/heapy/nodegraph.c
+index 2fd9c83..765f5ee 100644
+--- a/src/heapy/nodegraph.c
++++ b/src/heapy/nodegraph.c
+@@ -148,8 +148,18 @@ NyNodeGraph_AddEdge(NyNodeGraphObject *ng, PyObject *src, PyObject *tgt)
+         ng->edges[ng->used_size-1].tgt == tgt)
+         return 0;
+ 
+-    assert(Py_REFCNT(src) < 0xa000000 && (Py_uintptr_t)Py_TYPE(src) > 0x1000);
+-    assert(Py_REFCNT(tgt) < 0xa000000 && (Py_uintptr_t)Py_TYPE(tgt) > 0x1000);
++#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 11
++    /* Py >= 3.11 _PyObject_IMMORTAL_INIT sets initial refcount of 999999999 */
++    assert((Py_uintptr_t)Py_TYPE(src) > 0x1000 &&
++            (Py_REFCNT(src) < 0xa000000 ||
++             (Py_REFCNT(src) >= 999999999 && Py_REFCNT(src) < 999999999 + 0xa000000)));
++    assert((Py_uintptr_t)Py_TYPE(tgt) > 0x1000 &&
++            (Py_REFCNT(tgt) < 0xa000000 ||
++             (Py_REFCNT(tgt) >= 999999999 && Py_REFCNT(tgt) < 999999999 + 0xa000000)));
++#else
++    assert((Py_uintptr_t)Py_TYPE(src) > 0x1000 && Py_REFCNT(src) < 0xa000000);
++    assert((Py_uintptr_t)Py_TYPE(tgt) > 0x1000 && Py_REFCNT(tgt) < 0xa000000);
++#endif
+ 
+     if (ng->used_size >= ng->allo_size) {
+         Py_ssize_t allo = roundupsize(ng->used_size + 1);
+-- 
+2.40.1
+
diff --git a/dev-python/guppy3/guppy3-3.1.3.ebuild b/dev-python/guppy3/guppy3-3.1.3-r1.ebuild
index f23ad5e227a7..9bd54832fca5 100644
--- a/dev-python/guppy3/guppy3-3.1.3.ebuild
+++ b/dev-python/guppy3/guppy3-3.1.3-r1.ebuild
@@ -18,6 +18,10 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+PATCHES=(
+	"${FILESDIR}"/guppy3-3.1.3-py311-refcount-assert.patch
+)
+
 python_test() {
 	cd "${T}" || die
 	"${EPYTHON}" "${S}"/guppy/heapy/test/test_all.py || die
diff --git a/dev-python/hkdf/Manifest b/dev-python/hkdf/Manifest
deleted file mode 100644
index 7fa8e2b54db2..000000000000
--- a/dev-python/hkdf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hkdf-0.0.3.tar.gz 3959 BLAKE2B 25786395ad7f87db5420adb4891821adf52e5eaf8098ca502aad16a69c75bbc5dedc2b8dfddee76a545e91f4900c1a0bfbe94d79822cd529e72474c65ee194d6 SHA512 c58f9310c151f8d710998d019221713ec71ac8083c42300f5e77326c7b35be341263c40fb485402937c381a6435cbd9899c8d32846a50d1d1e6a4d3e61f58c7d
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 2f2f6fda0ae6..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_{7,8,9,10,11} )
-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 f517494cf1e1..000000000000
--- a/dev-python/hkdf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>tamiko@gentoo.org</email>
-  <name>Matthias Maier</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/jplephem/Manifest b/dev-python/jplephem/Manifest
index 26ee80c32c70..0f76fcdb4f2d 100644
--- a/dev-python/jplephem/Manifest
+++ b/dev-python/jplephem/Manifest
@@ -1 +1 @@
-DIST jplephem-2.16.tar.gz 40918 BLAKE2B 90a14b424f4c48bb754bd4cca6a9e1d5e2a4cc51821234118889cc854c119c60b66c0157deae60f88b7368d8914124ec95ec1ac7646479cd79ee759515a1af09 SHA512 02bd3bac834726f1f41fbed9e3e7edc9ba3d00c394099248f9e1da48730c620d83880e24a3b29916becd7ced284efc7388ed98d5bf204a6fc53ec9e016ce0cf0
+DIST jplephem-2.18.tar.gz 40886 BLAKE2B c6beb3cb2aec7d82023a253f9b5bafd989fbc7631b1b727322bf8f092509eeb25c6921d550c7bb5862be74d493a19ca29b3835f9a18efbd44509d4776ca660f6 SHA512 8f3117445f33de25d1f1eb5b5cfa0f67d92e62e7ac8d7a32f92690d12533ef8cd5498a62b5ee9cb7dac6f43c944879bbf10aa73950a749caa02d814f81b37fbf
diff --git a/dev-python/jplephem/jplephem-2.16.ebuild b/dev-python/jplephem/jplephem-2.18.ebuild
index 580c8843f833..9b84388d32a5 100644
--- a/dev-python/jplephem/jplephem-2.16.ebuild
+++ b/dev-python/jplephem/jplephem-2.18.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
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 9381d6ef341b..df7ec93fd2da 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/langdetect/Manifest b/dev-python/langdetect/Manifest
index a11d7c268c91..e9da2ac43cac 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1 +1,3 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
+EBUILD langdetect-1.0.9.ebuild 493 BLAKE2B 0df8bce19bc80f79f8e76bcef5a4c2caf333365fe0cb9a3c076b7858bceded5a3e58921474f866a2709dd657b7ed330c1ec4a7f9d7bab0fcf1bc92d77cabc32d SHA512 ea2a1adcb133ac5fc951ba1aa90ef1ce3dfcc424e59727591763d4875aa044a74188be2d15fd89c6b2e83ed6ea04ec3d9851ed584ae79d2c2c127bde7d994b48
+MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index ddb5b0f1787e..020e07f2a3dd 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -2,9 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>cyber+gentoo@sysrq.in</email>
-  <name>Anna</name>
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
  </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
+ <upstream>
+  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
+ </upstream>
+ <origin>slonko-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/leechcorepyc/leechcorepyc-2.14.3.ebuild b/dev-python/leechcorepyc/leechcorepyc-2.14.3.ebuild
index 686020272b47..5dcc7ccc4540 100644
--- a/dev-python/leechcorepyc/leechcorepyc-2.14.3.ebuild
+++ b/dev-python/leechcorepyc/leechcorepyc-2.14.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/ufrisk/LeechCore"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # leechcorepyc ships with a bundled version of the LeechCore library. So we
 # don't depend on the library here. But we must be aware this module doesn't
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 f202106ef1d9..bb31eb438f7f 100644
--- a/dev-python/lxml/lxml-4.9.2.ebuild
+++ b/dev-python/lxml/lxml-4.9.2.ebuild
@@ -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 5e88b07790d3..000000000000
--- a/dev-python/magic-wormhole-mailbox-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST magic-wormhole-mailbox-server-0.4.1.gh.tar.gz 68402 BLAKE2B 4bf6bc9fa6dacaafb532d9d0ee069bb89ba63feb790f0f9c0d1117b1de4f075eb9dd3bf5c72a9df472e9dedc31dcd9292dc1820da770738fd9d0d29cb3bcf68a SHA512 d174d1bf901e7d21d7cb77ceffd6b9c7aa3c15433e11862365883d93437225c7c655b8338a5cad7bd5c60d7dd7d3dd017ef7e26213b535c043ce75000a540597
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 edb3d9a4dda6..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_{7,8,9,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 f517494cf1e1..000000000000
--- a/dev-python/magic-wormhole-mailbox-server/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>tamiko@gentoo.org</email>
-  <name>Matthias Maier</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/magic-wormhole-transit-relay/Manifest b/dev-python/magic-wormhole-transit-relay/Manifest
deleted file mode 100644
index 83f3c197203d..000000000000
--- a/dev-python/magic-wormhole-transit-relay/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST magic-wormhole-transit-relay-0.2.1.gh.tar.gz 45936 BLAKE2B ffb05c716a35e688801150c3fd6de28cf557ed346091400f9eeb9335b6815425624e70d61f54be8f0a1e8bb15e874528f7cfcef1e8f0a2f8d3cd4285adb1db3a SHA512 dcc309de800d9023ff106ea7b67da4814006ee50e517570c046f2dff20573306b3d5f7c4e227186b2b6f8ff7cb71e02e41499766badf299d859a0e5628066162
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 f8011254054a..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_{7,8,9,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 f517494cf1e1..000000000000
--- a/dev-python/magic-wormhole-transit-relay/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>tamiko@gentoo.org</email>
-  <name>Matthias Maier</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/magic-wormhole/Manifest b/dev-python/magic-wormhole/Manifest
deleted file mode 100644
index c437a0bbd540..000000000000
--- a/dev-python/magic-wormhole/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST magic-wormhole-0.12.0.tar.gz 274063 BLAKE2B 6a0cddd285169373926de9da26125b34457c76e456b1bfd910baed74090900a663435b0df78e5521fd91274b111d8fad56e923832cdd430b2eb27c31d8b510e3 SHA512 141244e746b0718f2c9417e8f7de6a714b0feb051aea8c7950ea0d1bc5d2e24e922bed29544fe76aa61b06aa2ce2b5f330824017af8c6030813415e6c004c716
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 2cf006729783..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_{7,8,9,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 f517494cf1e1..000000000000
--- a/dev-python/magic-wormhole/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>tamiko@gentoo.org</email>
-  <name>Matthias Maier</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/mautrix/Manifest b/dev-python/mautrix/Manifest
index 60eca2b03f11..1ea1524b5cb3 100644
--- a/dev-python/mautrix/Manifest
+++ b/dev-python/mautrix/Manifest
@@ -1 +1,2 @@
 DIST mautrix-0.19.13.tar.gz 245169 BLAKE2B 036794b984f1979a63a1396a52dfd639dfcc33fcb9bf6b564b13d3e80fdbae69a8b5cea564751a5256fe91349a4014f703094aca6e0303550f90067fc0f8b9ea SHA512 f8cd545a1fa3f7825f97dfb11e5d3a3b9ef1b72e1a387ea23d14320be912eceda2c386db94b38a9971c6c1d50720fdabbd51feb899f8d5c029b8f2965623886e
+DIST mautrix-0.19.14.tar.gz 244703 BLAKE2B 41c1bc32bca6f700283201ef52fa78a20b87665dbefbe9ad436dd6bb82d5446e744f6db041ba0ace33b13f8afcc8cf6e0e2f5478b6f41cac365320905e3fbe9e SHA512 7319716dd1b03f9677601002e08bf88ae870e283b32499fc38a9c77edf22f5702dbbded0e555de38a43d7b4d1b17bdd4e6579d79d6b22ece476057ebb1a2a62c
diff --git a/dev-python/mautrix/mautrix-0.19.14.ebuild b/dev-python/mautrix/mautrix-0.19.14.ebuild
new file mode 100644
index 000000000000..2d0281cd1ed2
--- /dev/null
+++ b/dev-python/mautrix/mautrix-0.19.14.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="A Python 3 asyncio Matrix framework"
+HOMEPAGE="https://github.com/mautrix/python/"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/olm[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
+	dev-python/yarl[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aiosqlite[${PYTHON_USEDEP}]
+		dev-python/asyncpg[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-2[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "media transcoding" media-video/ffmpeg
+}
diff --git a/dev-python/minio/Manifest b/dev-python/minio/Manifest
index e2e10867d2bc..5b9a42694de2 100644
--- a/dev-python/minio/Manifest
+++ b/dev-python/minio/Manifest
@@ -1 +1,2 @@
 DIST minio-7.1.14.tar.gz 117073 BLAKE2B b2d7d5d0eea342d8d8c533899980ad36278e368f292094a93457aeea940900beabbfc215b7d549b2bceb96acccb53501344fbcc5b69262b8705965e3a26c7a08 SHA512 841032aa014454158150e7feb54f0b3d11e7d4fc5d4581322a109abdaa33291e82481f794121fcbdcb98049bfab964e7eb38886dbf3fe0d719813c373e0a94cf
+DIST minio-7.1.15.tar.gz 115948 BLAKE2B e6bdd304d70c93c12b869e8d0f3a4347351e48f505766dc386a77f85ef6366559f48d1c007583e5c6845052b3bca65fe4964f70a9ad9f3b9146c0cef04eb1a83 SHA512 bb7ac5b1f1f70b0ff36e448097ebf0d9cbd964ddfe31dc452057c17396a85473fd98efedbbdbf81b9b8606bf2a3bab156f174052a2f4095062b18dd7cd5e6a5c
diff --git a/dev-python/minio/minio-7.1.15.ebuild b/dev-python/minio/minio-7.1.15.ebuild
new file mode 100644
index 000000000000..a0b5c7a5ef0e
--- /dev/null
+++ b/dev-python/minio/minio-7.1.15.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="MinIO Client SDK for Python"
+HOMEPAGE="https://github.com/minio/minio-py"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/nbclassic/nbclassic-0.5.5.ebuild b/dev-python/nbclassic/nbclassic-0.5.5.ebuild
index e32e39cbe9e1..8dfb95cac589 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 2ebb4a503908..1b6704e2dc9a 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 2ebb4a503908..1b6704e2dc9a 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 45d773e451b1..00e0536bc8ac 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1 +1,2 @@
 DIST nbsphinx-0.9.1.tar.gz 171587 BLAKE2B 38796379102f7488b58e0a4ca720b6800edc11477935c782dbd9124d96fb8587f5cd51b01f95f60f1372bafc5177e68a61a61c9d20261078a8421001e6936196 SHA512 d18c3da6b202c22dfdbb9ddfbb5b61af97200aaf75712f0e6a0221089c155faac9bca61cb0d552c231456e095f3303c59a9f23a99405dacf4b99117b929e6196
+DIST nbsphinx-0.9.2.tar.gz 171754 BLAKE2B 6bb73034b7f24c39c2d79e9beab623c46c07d9dd583a71920b83a6561e7f2899474db3edbb7b64386f4f41e1fb7960e942ea8327387ef2e0f1d3745627a3ade4 SHA512 b5e371e3177f03e72d87059d0c06cb4787afe255926e9f2440ea0c753f5457974535f42c98bd5bb289752151400612f28de98e1b36e6865b26790e56d1f78b80
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..cbb630c59a8e
--- /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_{7,8,9,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/notebook-6.4.12.ebuild b/dev-python/notebook/notebook-6.4.12.ebuild
index 7d0eca7a6cd2..65398129f50c 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 37e716091ae7..c62d6ca62d8c 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/openstacksdk-1.0.1.ebuild b/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
index a4e5ab97b273..3ba28fe7fb8c 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 8312031c5ba2..90a810d51d04 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 8312031c5ba2..90a810d51d04 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/os-client-config-2.1.0-r2.ebuild b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
index 979be6864d32..dd5aadd9541e 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/persist-queue/persist-queue-0.8.0.ebuild b/dev-python/persist-queue/persist-queue-0.8.0.ebuild
index e0a5cffe0d00..98671061b905 100644
--- a/dev-python/persist-queue/persist-queue-0.8.0.ebuild
+++ b/dev-python/persist-queue/persist-queue-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/prometheus-client/Manifest b/dev-python/prometheus-client/Manifest
new file mode 100644
index 000000000000..2ea9d5219fbb
--- /dev/null
+++ b/dev-python/prometheus-client/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-python/prometheus_client/metadata.xml b/dev-python/prometheus-client/metadata.xml
index ea8988e8af6a..ea8988e8af6a 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 7fe1e7c70c2a..52f9bc7d5efb 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_{7,8,9,10,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..53efc985b739
--- /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_{7,8,9,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 e7fd71fbabf7..000000000000
--- a/dev-python/prometheus_client/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prometheus_client-0.16.0.gh.tar.gz 82473 BLAKE2B bf285f52ce3de4c55f681871b814fe0be8dbdf61ed3031570983325e193a9b34cafbc8526f545801ac8711cc8331cf3b0c8f157394feb9ad827ac97872397341 SHA512 511936758026b6d6f48f52d27b1cb964a03668054d7a3c5c82c4fa20800be3812150fca74ab46dad11ca12f2c9ce1a6951a82ae2bacf91b3761f7bf7ce75e0d2
diff --git a/dev-python/pytest-flask/pytest-flask-1.2.0.ebuild b/dev-python/pytest-flask/pytest-flask-1.2.0.ebuild
index e74c22489d00..9d90a199e110 100644
--- a/dev-python/pytest-flask/pytest-flask-1.2.0.ebuild
+++ b/dev-python/pytest-flask/pytest-flask-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/pywebview/Manifest b/dev-python/pywebview/Manifest
index 3c663a01b15d..f4b5de7e2222 100644
--- a/dev-python/pywebview/Manifest
+++ b/dev-python/pywebview/Manifest
@@ -1 +1,2 @@
 DIST pywebview-3.7.2.tar.gz 440069 BLAKE2B 72a7b53ee72570f3ef0dc2c490f484dca02581490213708b6c45bb487b990d41ca64d477853454549c6cad3543f6381109a2fc54182bb14a720872b1fa240ed9 SHA512 943ce75a29f19b04890e8ae8f3327968b35ba347c8abab9079cfac5e9f93edfa0fbc3999d77a68bb7885d5a7236dc12c75b3a23e1cfbf2fc9fe794089a936db9
+DIST pywebview-4.1.tar.gz 30069532 BLAKE2B ca11bb04c4146204d379414fc6de0cd1e583c36feb126c859d8c8bb0e896bf5eb8de946943729e41d0c564c704d140baf765de2807aec0311348e97624c00f3a SHA512 5cca2912adda83043c86f4b1386c70583fa547424b10c19dc2bfc713407cd9001515844b820e2050962fe84373febfaab495f646c56ab1d48207b47f2c535208
diff --git a/dev-python/pywebview/pywebview-4.1.ebuild b/dev-python/pywebview/pywebview-4.1.ebuild
new file mode 100644
index 000000000000..6b3af65eabf7
--- /dev/null
+++ b/dev-python/pywebview/pywebview-4.1.ebuild
@@ -0,0 +1,37 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight cross-platform wrapper around a webview component"
+HOMEPAGE="https://github.com/r0x0r/pywebview"
+SRC_URI="https://github.com/r0x0r/pywebview/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gtk qt5"
+REQUIRED_USE="|| ( gtk qt5 )"
+
+RDEPEND="
+	dev-python/bottle
+	dev-python/cryptography
+	dev-python/proxy_tools
+	gtk? (
+		dev-python/pygobject[cairo,${PYTHON_USEDEP}]
+		net-libs/webkit-gtk
+	)
+	qt5? (
+		 dev-python/pyside2[${PYTHON_USEDEP},webengine]
+		 dev-python/QtPy[${PYTHON_USEDEP},webengine]
+	)
+"
+
+distutils_enable_tests pytest
+
+RESTRICT="test" # FIXME: tests fail without message
diff --git a/dev-python/spake2/Manifest b/dev-python/spake2/Manifest
deleted file mode 100644
index 9f81f89fe54b..000000000000
--- a/dev-python/spake2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST spake2-0.8.gh.tar.gz 62425 BLAKE2B 64215362af26fff0785fdabf4282f7111a4cc917750827075b616f009cb1fa6373fc2325382c26b43c051aa5b94e414ca2a5223d9ab666289eb2d04723b15cb5 SHA512 908c377c831f4a11551973ca917b113d51a66c533d35fd19b2692fdb7e575ed2a5045d9b632bc55c37b68ad092f01dff5da191e9dfbfb5599b72844788438d68
diff --git a/dev-python/spake2/metadata.xml b/dev-python/spake2/metadata.xml
deleted file mode 100644
index f517494cf1e1..000000000000
--- a/dev-python/spake2/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>tamiko@gentoo.org</email>
-  <name>Matthias Maier</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/spake2/spake2-0.8.ebuild b/dev-python/spake2/spake2-0.8.ebuild
deleted file mode 100644
index 30d01f400513..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_{7,8,9,10,11} )
-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/termcolor/termcolor-2.3.0.ebuild b/dev-python/termcolor/termcolor-2.3.0.ebuild
index fd8e21b707f4..8244a41710e4 100644
--- a/dev-python/termcolor/termcolor-2.3.0.ebuild
+++ b/dev-python/termcolor/termcolor-2.3.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="$(pypi_sdist_url) -> ${P}.py.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/timeslot/timeslot-0.1.2.ebuild b/dev-python/timeslot/timeslot-0.1.2.ebuild
index ed439b4aa808..245a47e5320e 100644
--- a/dev-python/timeslot/timeslot-0.1.2.ebuild
+++ b/dev-python/timeslot/timeslot-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index db6db46c34b4..eafb18715e0a 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,2 +1,3 @@
 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
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..a8b387ed3347
--- /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=( python3_{7,8,9,10,11} pypy3 )
+
+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/tweepy/Manifest b/dev-python/tweepy/Manifest
index 173458adf0d0..ac2c22edcbd4 100644
--- a/dev-python/tweepy/Manifest
+++ b/dev-python/tweepy/Manifest
@@ -1 +1 @@
-DIST tweepy-4.10.1.tar.gz 5898710 BLAKE2B da6e411f9021a6de65b4ef083784fc07b086ceefa9e86b35ddbc7843902bfacdca080f7d66a9a1567e8c566731b1ba2da6d7f090c7c7555122da947b1293254d SHA512 bcc22f871cdc016004707d00ef562dd8c75d1cd684d1077d7336970ce76565d698e46cbf6477be70d72f14fa5f6c4a93a37408c5b8993d115108419b96a60b53
+DIST tweepy-4.14.0.tar.gz 5914530 BLAKE2B 64f5cfcd889e1726508c89f30b7e88a37eaf73b4d48e3571bfc5226ee52b33c36ea90821f45bbd06cb2e0e69699e3cd382d6a53641d6a31473629f8415d5fbaa SHA512 b4368c379b01cda05bac71cf188c31ad305ee6b1a66c76c6feb9622aa43b7875759763fce95be3ee12798f4948121501af788dc3161fada0d2f4a23bebfb0a1e
diff --git a/dev-python/tweepy/tweepy-4.10.1.ebuild b/dev-python/tweepy/tweepy-4.14.0.ebuild
index 21fbd6b1eb76..331cbb57a492 100644
--- a/dev-python/tweepy/tweepy-4.10.1.ebuild
+++ b/dev-python/tweepy/tweepy-4.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/txtorcon/Manifest b/dev-python/txtorcon/Manifest
deleted file mode 100644
index 021c0fbb9e57..000000000000
--- a/dev-python/txtorcon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST txtorcon-23.5.0.gh.tar.gz 394188 BLAKE2B ee63d2815a9b697aa37d27697ef6085dc91e750ba0cad854c8610eed7afcfec9b50cf5aead24f75676e2b0ee39167c50fbebc43a51911a3ebe17eb784b18d31e SHA512 33610c043084273f5dc06b797fff11bb0fccaae14229dbd07286e13e40ebc199594f6e52c64b87e4060e37bcb44bd90ccf7ff7217d923fdb33a581fb95144d56
diff --git a/dev-python/txtorcon/metadata.xml b/dev-python/txtorcon/metadata.xml
deleted file mode 100644
index f517494cf1e1..000000000000
--- a/dev-python/txtorcon/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>tamiko@gentoo.org</email>
-  <name>Matthias Maier</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
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 577dc628937c..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_{7,8,9,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}]"
diff --git a/dev-python/types-requests/Manifest b/dev-python/types-requests/Manifest
index cb79302546cd..11743e4caf6e 100644
--- a/dev-python/types-requests/Manifest
+++ b/dev-python/types-requests/Manifest
@@ -1 +1 @@
-DIST types-requests-2.30.0.0.tar.gz 14922 BLAKE2B a682fd934221e6da2deec781d8cd1facf816636d9cc8395d29ae8bf3be958cf1d90420cb54f64f24f8562d6cb613e61100a211e1d627a7abcc82320a4b7bbaa1 SHA512 7ffa1dca0839a581c1ef47846b01f7861b92ec62e90e0fe17ff007de56366a259541653a8df1517d7dc3b46c8fabfbac362b164a21ceb7fb31ae3f6dcc7b605b
+DIST types-requests-2.31.0.0.tar.gz 15131 BLAKE2B f4f8a2c981504742b103fe51867d4cfb2c1cb971b069bf451943780027bfdb986ecaf84aa2e51c04654b541b91efa98009d846c2b5a99b5889900c3e2a8ec617 SHA512 d6e043f873f41474182995251aeecf2975eb8255eee286d53c7772b174bbf013ecef3e6d78c05bb7af69fee1da2d4854ec01bf324dc8f5e78b0ca827526e43e7
diff --git a/dev-python/types-requests/types-requests-2.30.0.0.ebuild b/dev-python/types-requests/types-requests-2.31.0.0.ebuild
index 1c43931a56ed..1c43931a56ed 100644
--- a/dev-python/types-requests/types-requests-2.30.0.0.ebuild
+++ b/dev-python/types-requests/types-requests-2.31.0.0.ebuild
diff --git a/dev-python/yara-python/yara-python-4.3.1.ebuild b/dev-python/yara-python/yara-python-4.3.1.ebuild
index 526187aab3fa..179ba08c9754 100644
--- a/dev-python/yara-python/yara-python-4.3.1.ebuild
+++ b/dev-python/yara-python/yara-python-4.3.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/VirusTotal/yara-python.git"
 else
 	SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.0.2.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.0.2.ebuild
index 44fe1947e559..b3c4baecdcc1 100644
--- a/dev-python/ytmusicapi/ytmusicapi-1.0.2.ebuild
+++ b/dev-python/ytmusicapi/ytmusicapi-1.0.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://ytmusicapi.readthedocs.io/
 	https://github.com/sigma67/ytmusicapi/"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="0"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/zeroconf/zeroconf-0.62.0.ebuild b/dev-python/zeroconf/zeroconf-0.62.0.ebuild
index 25239136be56..6da20960156d 100644
--- a/dev-python/zeroconf/zeroconf-0.62.0.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.62.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]