Adding metadata

102 files changed, 347 insertions, 249 deletions

diff --git a/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild
index d9dafdae0ade..10e1a3e3f7fc 100644
--- a/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild
+++ b/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	>=dev-cpp/rapidfuzz-cpp-1.7.0
diff --git a/dev-python/a2wsgi/a2wsgi-1.7.0.ebuild b/dev-python/a2wsgi/a2wsgi-1.7.0.ebuild
index cba7a3f7d3e0..2d5508f8af60 100644
--- a/dev-python/a2wsgi/a2wsgi-1.7.0.ebuild
+++ b/dev-python/a2wsgi/a2wsgi-1.7.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/boolean-py/boolean-py-4.0.ebuild b/dev-python/boolean-py/boolean-py-4.0.ebuild
index e24f496bf90b..b9baa4654812 100644
--- a/dev-python/boolean-py/boolean-py-4.0.ebuild
+++ b/dev-python/boolean-py/boolean-py-4.0.ebuild
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/calver/calver-2022.06.26.ebuild b/dev-python/calver/calver-2022.06.26.ebuild
index c91f09dac288..f42f7726743f 100644
--- a/dev-python/calver/calver-2022.06.26.ebuild
+++ b/dev-python/calver/calver-2022.06.26.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index e5bf84e1d780..8354dcef0de0 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -1 +1,2 @@
 DIST celery-5.3.0_beta1.gh.tar.gz 1509819 BLAKE2B 8864d9895823fde8ed1938a8b418906e624f14f6d306f1afb54bfc3c1897facfb22a85e368b2fb3ac96992d639e5f03589bfc78488de9ce060c88d9d1321e4ab SHA512 c617a03ca85120b7889eb94b36e41b3ba45b93acfe239c56c93b0860042a06fceaad1c396342e27f941ae58fd3d7468bf22d6b042b04e246b55abe5eedb63016
+DIST celery-5.3.0_beta2.gh.tar.gz 1539309 BLAKE2B 262b28dc72f689a888f6faae2ae5a8fde8d37cb3a07c76acb141ee922fd512f2bf621c5ec28b941b1b95e723e3cfe8ec00451a168c9f3b4e401f4aa2110aca2d SHA512 d8cf774050374ee4bead19135d2b7b5d6f3d48f724ccabd4fdcc487fffde58ee678988e95a18d463b0318a2e6617278aac1e22c528ed18f661f0139c2e728909
diff --git a/dev-python/celery/celery-5.3.0_beta2.ebuild b/dev-python/celery/celery-5.3.0_beta2.ebuild
new file mode 100644
index 000000000000..f4da3e35c424
--- /dev/null
+++ b/dev-python/celery/celery-5.3.0_beta2.ebuild
@@ -0,0 +1,117 @@
+# 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 bash-completion-r1 check-reqs distutils-r1 optfeature
+
+MY_PV="${PV/_beta/b}"
+DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
+HOMEPAGE="
+	https://docs.celeryproject.org/en/stable/index.html
+	https://pypi.org/project/celery/
+	https://github.com/celery/celery
+"
+SRC_URI="https://github.com/celery/celery/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/billiard-3.6.4.0[${PYTHON_USEDEP}]
+	<dev-python/billiard-5.0.0[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/click-didyoumean[${PYTHON_USEDEP}]
+	dev-python/click-plugins[${PYTHON_USEDEP}]
+	dev-python/click-repl[${PYTHON_USEDEP}]
+	>=dev-python/kombu-5.3.0_beta1[${PYTHON_USEDEP}]
+	<dev-python/kombu-6.0.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/vine[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep 'ncurses(+)')
+		dev-python/azure-storage-blob[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.9.178[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/elasticsearch-py[${PYTHON_USEDEP}]
+		>=dev-python/moto-1.3.7[${PYTHON_USEDEP}]
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		dev-python/pymongo[${PYTHON_USEDEP}]
+		dev-python/pytest-celery[${PYTHON_USEDEP}]
+		dev-python/pytest-click[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+		dev-python/redis[${PYTHON_USEDEP}]
+		dev-python/sphinx-testing[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sci-astronomy/pyephem[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_celery-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-click-2.5.0[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	)
+"
+
+CHECKREQS_MEMORY="2G"
+
+EPYTEST_DESELECT=(
+	t/unit/backends/test_elasticsearch.py::test_ElasticsearchBackend::test_backend_concurrent_update
+	t/unit/backends/test_elasticsearch.py::test_ElasticsearchBackend::test_exception_safe_to_retry
+	t/unit/tasks/test_stamping.py::test_canvas_stamping::test_stamping_headers_in_options
+	t/unit/tasks/test_stamping.py::test_canvas_stamping::test_stamping_with_replace
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs --no-autodoc
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+python_install_all() {
+	# Main celeryd init.d and conf.d
+	newinitd "${FILESDIR}/celery.initd-r2" celery
+	newconfd "${FILESDIR}/celery.confd-r2" celery
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	newbashcomp extra/bash-completion/celery.bash "${PN}"
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "msgpack support" dev-python/msgpack
+	#optfeature "rabbitmq support" dev-python/librabbitmq
+	#optfeature "slmq support" dev-python/softlayer_messaging
+	#optfeature "couchbase support" dev-python/couchbase
+	optfeature "redis support" dev-python/redis-py
+	optfeature "auth support" dev-python/pyopenssl
+	optfeature "yaml support" dev-python/pyyaml
+	optfeature "memcache support" dev-python/pylibmc
+	optfeature "mongodb support" dev-python/pymongo
+	optfeature "sqlalchemy support" dev-python/sqlalchemy
+	optfeature "sqs support" dev-python/boto
+	#optfeature "cassandra support" dev-python/cassandra-driver
+}
diff --git a/dev-python/cerberus/cerberus-1.3.4-r1.ebuild b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
index 316ed3c6205d..e22dbdf4a1aa 100644
--- a/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
+++ b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.2_no-pytest-runner.patch
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index bea3a70b3746..0fd5905e2df6 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -5,3 +5,4 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230414.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230414.ebuild
new file mode 100644
index 000000000000..f37802f5c2d7
--- /dev/null
+++ b/dev-python/clang-python/clang-python-17.0.0_pre20230414.ebuild
@@ -0,0 +1,54 @@
+# 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} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
index f62071fc06c3..86e402ae12b8 100644
--- a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild b/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
index d00822a2314f..d0c5e5bb16e8 100644
--- a/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
+++ b/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
@@ -15,6 +15,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/docopt/docopt-0.6.2-r5.ebuild b/dev-python/docopt/docopt-0.6.2-r5.ebuild
index 6ab16ed2e0dd..a8d2042a1a55 100644
--- a/dev-python/docopt/docopt-0.6.2-r5.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.2-pytest_node_from_parent.patch
diff --git a/dev-python/dropbox/Manifest b/dev-python/dropbox/Manifest
index b492e361299a..4ebd3603123d 100644
--- a/dev-python/dropbox/Manifest
+++ b/dev-python/dropbox/Manifest
@@ -1 +1 @@
-DIST dropbox-sdk-python-11.36.0.gh.tar.gz 1166682 BLAKE2B 46864c7d4143272a81a6e14c7430c153dc93dd0a82d8e78ef8bcf3c1a64919e2cccf725832fb794179f6eef953f172bc1dd579447ee2e8c36a141f9402807b3d SHA512 5dc30fabd0abe52de68d152300a5dbfc9e5fb55ed5799a3ceba5e0782914944d1ed915761f4ca3993913250608e3152234495abefff6f2b548cd11b7f2fe0e23
+DIST dropbox-sdk-python-11.36.1.gh.tar.gz 1166660 BLAKE2B ed2586c27e020cae38dafdee7367ea38ad191a6275ab677adef13cf3b3c2eec1fab204d6845a7108b33a925a41459053eb5d33bd5a5c0be771613e9f89f775d7 SHA512 29db18efa9059744d6e18f3f15eaee9161df0e26af947fac3fdf3d7e906380f499c1ecc4b2c14a5207c879cd282b73dea44a1dc664f27be99fbe2cd309b86f09
diff --git a/dev-python/dropbox/dropbox-11.36.0.ebuild b/dev-python/dropbox/dropbox-11.36.1.ebuild
index b52b5e4ea07d..0a1dd189c752 100644
--- a/dev-python/dropbox/dropbox-11.36.0.ebuild
+++ b/dev-python/dropbox/dropbox-11.36.1.ebuild
@@ -25,8 +25,6 @@ RDEPEND="
 	>=dev-python/stone-2.0.0[${PYTHON_USEDEP}]
 "
 
-PATCHES=( "${FILESDIR}"/${P}-setuptools-67.patch )
-
 # disable tests that need SCOPED_USER_DROPBOX_TOKEN
 # and tests that fail
 EPYTEST_DESELECT=(
diff --git a/dev-python/dropbox/files/dropbox-11.36.0-setuptools-67.patch b/dev-python/dropbox/files/dropbox-11.36.0-setuptools-67.patch
deleted file mode 100644
index 84d29befc635..000000000000
--- a/dev-python/dropbox/files/dropbox-11.36.0-setuptools-67.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This fails with setuptools-67
-
-Bug: https://bugs.gentoo.org/892569
-See also: https://github.com/dropbox/dropbox-sdk-python/issues/458
-
---- a/setup.py
-+++ b/setup.py
-@@ -27,7 +27,7 @@
- install_reqs = [
-     'requests >= 2.16.2',
-     'six >= 1.12.0',
--    'stone >= 2.*',
-+    'stone >= 2.0',
- ]
- 
- setup_requires = [
---- a/test/requirements.txt
-+++ b/test/requirements.txt
-@@ -2,4 +2,4 @@
- mock
- pytest-mock
- coverage
--stone>=2.*
-\ No newline at end of file
-+stone>=2.0
diff --git a/dev-python/filebytes/filebytes-0.10.2.ebuild b/dev-python/filebytes/filebytes-0.10.2.ebuild
index 5119a9624308..faf05e08a914 100644
--- a/dev-python/filebytes/filebytes-0.10.2.ebuild
+++ b/dev-python/filebytes/filebytes-0.10.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/sashs/filebytes"
 else
 	SRC_URI="https://github.com/sashs/filebytes/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild b/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
index 8b901991ffa5..bb2cf4ab8842 100644
--- a/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
+++ b/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/c-w/ghp-import"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/hatchling/hatchling-1.14.0.ebuild b/dev-python/hatchling/hatchling-1.14.0.ebuild
index 8f408c685cca..6f41711c856d 100644
--- a/dev-python/hatchling/hatchling-1.14.0.ebuild
+++ b/dev-python/hatchling/hatchling-1.14.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 # deps are listed in backend/src/hatchling/ouroboros.py
 RDEPEND="
diff --git a/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild b/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild
index 7a284a238f0f..742dbbeb60db 100644
--- a/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild
+++ b/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	<dev-python/httpx-0.24.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild b/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild
index adabfcde4350..be14865dec60 100644
--- a/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild
+++ b/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/h11[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-6.20.2.ebuild b/dev-python/ipykernel/ipykernel-6.20.2.ebuild
index b53e0727fa15..aded297afa59 100644
--- a/dev-python/ipykernel/ipykernel-6.20.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.20.2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
 	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-6.1.12[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
 	dev-python/nest_asyncio[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-6.21.2.ebuild b/dev-python/ipykernel/ipykernel-6.21.2.ebuild
index d198de7f1c77..e4f4cf75e696 100644
--- a/dev-python/ipykernel/ipykernel-6.21.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.21.2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
 	>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-8[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-8[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
 	dev-python/nest_asyncio[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-6.21.3.ebuild b/dev-python/ipykernel/ipykernel-6.21.3.ebuild
index 8931e3b83d07..1c6d073d85a0 100644
--- a/dev-python/ipykernel/ipykernel-6.21.3.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.21.3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
 	>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-8[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-8[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
 	dev-python/nest_asyncio[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-6.22.0.ebuild b/dev-python/ipykernel/ipykernel-6.22.0.ebuild
index 99d40c6c00fa..1fd114899109 100644
--- a/dev-python/ipykernel/ipykernel-6.22.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.22.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
 	>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-8[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-8[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
 	dev-python/nest_asyncio[${PYTHON_USEDEP}]
diff --git a/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
index bace4982f515..0a77ed262282 100644
--- a/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/pyzmq-18[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.3[${PYTHON_USEDEP}]
 	>=dev-python/ipython-4[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/jupyter-client[${PYTHON_USEDEP}]
 	dev-python/jupyter-server[${PYTHON_USEDEP}]
 	>=dev-python/ipykernel-4.4[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
diff --git a/dev-python/ipyparallel/ipyparallel-8.5.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.5.1.ebuild
index be69af296770..ec158c6441cb 100644
--- a/dev-python/ipyparallel/ipyparallel-8.5.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.5.1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/pyzmq-18[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.3[${PYTHON_USEDEP}]
 	>=dev-python/ipython-4[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/jupyter-client[${PYTHON_USEDEP}]
 	dev-python/jupyter-server[${PYTHON_USEDEP}]
 	>=dev-python/ipykernel-4.4[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
diff --git a/dev-python/ipyparallel/ipyparallel-8.6.0.ebuild b/dev-python/ipyparallel/ipyparallel-8.6.0.ebuild
index 8871c81182d7..49d7bb4f88b4 100644
--- a/dev-python/ipyparallel/ipyparallel-8.6.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.6.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/pyzmq-18[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.3[${PYTHON_USEDEP}]
 	>=dev-python/ipython-4[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/jupyter-client[${PYTHON_USEDEP}]
 	dev-python/jupyter-server[${PYTHON_USEDEP}]
 	>=dev-python/ipykernel-4.4[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
diff --git a/dev-python/jsmin/jsmin-3.0.1.ebuild b/dev-python/jsmin/jsmin-3.0.1.ebuild
index 3a15822607aa..fa0e430e5217 100644
--- a/dev-python/jsmin/jsmin-3.0.1.ebuild
+++ b/dev-python/jsmin/jsmin-3.0.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 pypi
 DESCRIPTION="JavaScript minifier"
 HOMEPAGE="https://pypi.org/project/jsmin/ https://github.com/tikitu/jsmin/"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter-client/Manifest
index dad45aeddbff..ba4e36dadfe1 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter-client/Manifest
@@ -1,4 +1,3 @@
-DIST jupyter_client-7.4.9.tar.gz 329115 BLAKE2B 8b43b237ac79bc51e40e403cf4a3ada18d03437094dc1dd9b9988adb1bcfbc56ba4b2373d3dd858df583b723723127f934c01544f3d6a576886b012364674f0f SHA512 0de91309ffddd2da50ae69bff4f7ecd741398171982f66488e6367d78388c6844b353bed1834684fa4af890364120ce09f2fa6b3ed7778c501058ae558439969
 DIST jupyter_client-8.0.3.tar.gz 334366 BLAKE2B 04ea6e8206fe0b741da1ba0d17cb559657824c20f4fcff48fd0ce4287dce7da9a151000e7a0f08cbf3fa6b1868d8d7e424d49d70a258283466350946f4ce5220 SHA512 27eca49e44c13d819624c6ab596b24b9b469f82a788920eb4db02cee43c2efdf22ea68bf282f5f4ca28d38c9238d51d70d7aa214f2c3b8f6c2a7ebcaf12d567c
 DIST jupyter_client-8.1.0.tar.gz 335241 BLAKE2B d9491f958b21ba09494bf42ff5a3bae786388a16c007f5756df8900fc53c6fdb4d67bff09b16290338d07fc3c3466483f20ab82482fb235e0e55481294eaeef1 SHA512 21317e5ca61b72408e94116f0be545753088d891742579fcf7a451be179a7783dc153d2898e0ff50ce06017f90cb48f907a5bb056090b13ec0da2af7287f6dcd
 DIST jupyter_client-8.2.0.tar.gz 335567 BLAKE2B e02f8813d12ec8ba0e15291dad04cfaeeb98ea524050a10d142d74af203e43aa1c2e22e7fd7b071c05831b3dd644985a42e38f59fee65f4570e5eb88bbc9fbb1 SHA512 1337c4f2d93d9cd2ae5e3d8f30a8e4af69dad6e09c97e949d9300df0668be4da91134c73da06eb417c10ff2c09fd7beb28699e7a17502ceee3453cb9323b4363
diff --git a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild b/dev-python/jupyter-client/jupyter-client-8.0.3.ebuild
index dcc7b3853658..dcc7b3853658 100644
--- a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.0.3.ebuild
diff --git a/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild b/dev-python/jupyter-client/jupyter-client-8.1.0.ebuild
index 87f82d3032e0..87f82d3032e0 100644
--- a/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.1.0.ebuild
diff --git a/dev-python/jupyter_client/jupyter_client-8.2.0.ebuild b/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild
index ce5778fb5224..ce5778fb5224 100644
--- a/dev-python/jupyter_client/jupyter_client-8.2.0.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild
diff --git a/dev-python/jupyter_client/metadata.xml b/dev-python/jupyter-client/metadata.xml
index 747655885e81..747655885e81 100644
--- a/dev-python/jupyter_client/metadata.xml
+++ b/dev-python/jupyter-client/metadata.xml
diff --git a/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
index ba2020fa594f..71dc6feb5c44 100644
--- a/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
 	dev-python/argon2-cffi[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.4.4[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
 	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_events-0.4.0[${PYTHON_USEDEP}]
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 886327d27541..4f0bad465622 100644
--- a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
 	dev-python/argon2-cffi[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.4.4[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
 	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_events-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/files/jupyter_client-7.0.6-test-timeout.patch b/dev-python/jupyter_client/files/jupyter_client-7.0.6-test-timeout.patch
deleted file mode 100644
index 740677c13d00..000000000000
--- a/dev-python/jupyter_client/files/jupyter_client-7.0.6-test-timeout.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Avoid test timeouts on slower hosts like e.g. ia64 (guppy):
-```
-FAILED jupyter_client/tests/test_kernelmanager.py::TestParallel::test_start_sequence_kernels[tcp] - Failed: Timeout >30.0s
-FAILED jupyter_client/tests/test_kernelmanager.py::TestParallel::test_start_sequence_kernels[ipc] - Failed: Timeout >30.0s
-```
---- a/jupyter_client/tests/test_client.py
-+++ b/jupyter_client/tests/test_client.py
-@@ -13,7 +13,7 @@ from jupyter_client.kernelspec import KernelSpecManager
- from jupyter_client.kernelspec import NATIVE_KERNEL_NAME
- from jupyter_client.kernelspec import NoSuchKernel
- 
--TIMEOUT = 30
-+TIMEOUT = 180
- 
- pjoin = os.path.join
- 
---- a/jupyter_client/tests/test_kernelmanager.py
-+++ b/jupyter_client/tests/test_kernelmanager.py
-@@ -24,7 +24,7 @@ from jupyter_client import KernelManager
- 
- pjoin = os.path.join
- 
--TIMEOUT = 30
-+TIMEOUT = 180
- 
- 
- @pytest.fixture(params=["tcp", "ipc"])
---- a/jupyter_client/tests/test_multikernelmanager.py
-+++ b/jupyter_client/tests/test_multikernelmanager.py
-@@ -22,7 +22,7 @@ from jupyter_client import KernelManager
- from jupyter_client.multikernelmanager import AsyncMultiKernelManager
- from jupyter_client.multikernelmanager import MultiKernelManager
- 
--TIMEOUT = 30
-+TIMEOUT = 180
- 
- 
- class TestKernelManager(TestCase):
diff --git a/dev-python/jupyter_client/jupyter_client-7.4.9.ebuild b/dev-python/jupyter_client/jupyter_client-7.4.9.ebuild
deleted file mode 100644
index 0fc30407e410..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.4.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/jupyter_client/
-	https://pypi.org/project/jupyter-client/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.9.2[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/ipykernel-6.12[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild b/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild
index cfbb5a62bb8d..625f50a84e8a 100644
--- a/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="amd64 x86"
 RDEPEND="
 	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
 	dev-python/ipython[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-7.0.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
 	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_kernel_test/jupyter_kernel_test-0.5.0.ebuild b/dev-python/jupyter_kernel_test/jupyter_kernel_test-0.5.0.ebuild
index eff352741e2e..203a41b7e426 100644
--- a/dev-python/jupyter_kernel_test/jupyter_kernel_test-0.5.0.ebuild
+++ b/dev-python/jupyter_kernel_test/jupyter_kernel_test-0.5.0.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	>=dev-python/jupyter_client-6.1.13[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-6.1.13[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
index 0e64ea2bf97b..c412aa66ba92 100644
--- a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
+++ b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/kurbopy/kurbopy-0.9.0.ebuild b/dev-python/kurbopy/kurbopy-0.9.0-r1.ebuild
index 0a48568ec84e..052be41ec6e9 100644
--- a/dev-python/kurbopy/kurbopy-0.9.0.ebuild
+++ b/dev-python/kurbopy/kurbopy-0.9.0-r1.ebuild
@@ -64,4 +64,4 @@ src_install() {
 
 distutils_enable_tests pytest
 
-QA_FLAGS_IGNORED="usr/lib/python3\..*/site-packages/kurbopy/kurbopy.cpython-.*.so"
+QA_FLAGS_IGNORED="usr/lib/python3\..*/site-packages/kurbopy/kurbopy.*.so"
diff --git a/dev-python/license-expression/license-expression-30.1.0.ebuild b/dev-python/license-expression/license-expression-30.1.0.ebuild
index df7100b7797f..37e803cc3052 100644
--- a/dev-python/license-expression/license-expression-30.1.0.ebuild
+++ b/dev-python/license-expression/license-expression-30.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index bea3a70b3746..0fd5905e2df6 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -5,3 +5,4 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
diff --git a/dev-python/lit/lit-17.0.0_pre20230414.ebuild b/dev-python/lit/lit-17.0.0_pre20230414.ebuild
new file mode 100644
index 000000000000..0e39fac626c6
--- /dev/null
+++ b/dev-python/lit/lit-17.0.0_pre20230414.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/mautrix/Manifest b/dev-python/mautrix/Manifest
index a689e9f04e1c..17ebc0e031c4 100644
--- a/dev-python/mautrix/Manifest
+++ b/dev-python/mautrix/Manifest
@@ -1,2 +1,3 @@
+DIST mautrix-0.19.10.tar.gz 244595 BLAKE2B 39eac167456337c03a3bd4042f9ca924bb25f5bcccb65680d6344ee3febfb44635cd4a2c1c553d7dc51690ce4cfd449c2cb3b70de902f84de5b24b3dcaf2d0f0 SHA512 5f81ff8dde309e977c80b919c163aeb6d154a66957b93fad760938a9c67f2e940c58209bae93584251e5148278c1a8bf7065d389e1675105b6aba48707cd7c6d
 DIST mautrix-0.19.8.tar.gz 240541 BLAKE2B 973b5db77e037d24e5fa0648a385546b9499ce211020c2db533c3a91135011f57495305c9f0c729aa78b4f38ed63462394e1f68548535ca5a7ddb3afb2d07014 SHA512 00f2d65ca9e301237b2837ade71d9154ae170497c6f04762d62794a775062cf33f876808f613ea3c9630b8d033de0da1dfc9945a0fc1ff24b8202d590ecf916f
 DIST mautrix-0.19.9.tar.gz 240651 BLAKE2B 75032d7585bb74e8cc3e58ce7337e852b7fbbef2c6657de21a2c07f30d71eca1b303c861be419b3e4e2526999c9e0d00989e8fe74bb3f5bd77198f613c5fc046 SHA512 8ae890973649e17a0885ef7b05f8263aa978f7072ce32f5350db553caea42478c48a3df4a94a3a8f76cfc131ae9298ff4a5cfbe85d6259066d8cfffd25f710e4
diff --git a/dev-python/mautrix/mautrix-0.19.10.ebuild b/dev-python/mautrix/mautrix-0.19.10.ebuild
new file mode 100644
index 000000000000..850e9da981d1
--- /dev/null
+++ b/dev-python/mautrix/mautrix-0.19.10.ebuild
@@ -0,0 +1,40 @@
+# 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/future[${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/mergedeep/mergedeep-1.3.4.ebuild b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
index 0254398f4a6a..373c8cb48ad5 100644
--- a/dev-python/mergedeep/mergedeep-1.3.4.ebuild
+++ b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/clarketm/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/source dev-python/alabaster dev-python/recommonmark
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.0.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.0.ebuild
index fcc5b22ea6eb..7dcba0b1e078 100644
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.0.ebuild
+++ b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.0.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 # Tests are broken outside of upstream git repo
 RESTRICT="test"
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild
index c5197003de77..ac40a7a74848 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild b/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
index 4a484fbff9fb..56ee53995cef 100644
--- a/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
+++ b/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.1.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.1.ebuild
index 5fef27057666..9744961c949a 100644
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.1.ebuild
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.1.6-r1.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.1.6-r1.ebuild
index d4b06709c0c6..3c9137deeebd 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.1.6-r1.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.1.6-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.4.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.4.ebuild
index 9ef159e5c0f4..0f2a86652d2d 100644
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.4.ebuild
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.4.3.ebuild b/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.4.3.ebuild
index fd6bdddf4226..c4c95ee6d27b 100644
--- a/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.4.3.ebuild
+++ b/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.4.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-8.3.3[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
index 242f7e2a93fb..20141da43875 100644
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs/mkdocs-1.4.2.ebuild b/dev-python/mkdocs/mkdocs-1.4.2.ebuild
index 7a760662ac99..ec3d8140bcd8 100644
--- a/dev-python/mkdocs/mkdocs-1.4.2.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 # https://bugs.gentoo.org/873349
 # Building documentation requires packaging: callouts and mkdocs-autorefs
diff --git a/dev-python/nbclassic/nbclassic-0.5.5.ebuild b/dev-python/nbclassic/nbclassic-0.5.5.ebuild
index 93ad876568e2..32c174194f50 100644
--- a/dev-python/nbclassic/nbclassic-0.5.5.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.5.ebuild
@@ -17,14 +17,14 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/argon2-cffi[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-6.1.1[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclient/nbclient-0.7.2.ebuild b/dev-python/nbclient/nbclient-0.7.2.ebuild
index 31568d51fd27..a6a6e654dbba 100644
--- a/dev-python/nbclient/nbclient-0.7.2.ebuild
+++ b/dev-python/nbclient/nbclient-0.7.2.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-6.1.12[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclient/nbclient-0.7.3.ebuild b/dev-python/nbclient/nbclient-0.7.3.ebuild
index 269e90c266b7..f98a942384ab 100644
--- a/dev-python/nbclient/nbclient-0.7.3.ebuild
+++ b/dev-python/nbclient/nbclient-0.7.3.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-6.1.12[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-7.3.1.ebuild b/dev-python/nbconvert/nbconvert-7.3.1.ebuild
index bede32dfac49..59d2d87885b6 100644
--- a/dev-python/nbconvert/nbconvert-7.3.1.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.3.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index b4f90eb7e5c5..f19331e77f0e 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/nbsphinx/nbsphinx-0.9.1.ebuild b/dev-python/nbsphinx/nbsphinx-0.9.1.ebuild
index a18d61563441..cbb630c59a8e 100644
--- a/dev-python/nbsphinx/nbsphinx-0.9.1.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.9.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/nbval/nbval-0.10.0-r1.ebuild b/dev-python/nbval/nbval-0.10.0-r1.ebuild
index 7bbb828be123..f9ddc29c80c8 100644
--- a/dev-python/nbval/nbval-0.10.0-r1.ebuild
+++ b/dev-python/nbval/nbval-0.10.0-r1.ebuild
@@ -12,12 +12,12 @@ HOMEPAGE="https://github.com/computationalmodelling/nbval"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/jupyter-client[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/nbval/nbval-0.10.0.ebuild b/dev-python/nbval/nbval-0.10.0.ebuild
index a306487ea883..9049d1d9a8a7 100644
--- a/dev-python/nbval/nbval-0.10.0.ebuild
+++ b/dev-python/nbval/nbval-0.10.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64"
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/jupyter-client[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/nbval/nbval-0.9.6.ebuild b/dev-python/nbval/nbval-0.9.6.ebuild
index 7e72ce9297ac..2d2a32a7564c 100644
--- a/dev-python/nbval/nbval-0.9.6.ebuild
+++ b/dev-python/nbval/nbval-0.9.6.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 x86"
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/jupyter-client[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/pytest-cov[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/notebook-6.4.12.ebuild b/dev-python/notebook/notebook-6.4.12.ebuild
index 784e7d893a9a..f98db3148974 100644
--- a/dev-python/notebook/notebook-6.4.12.ebuild
+++ b/dev-python/notebook/notebook-6.4.12.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-5.3.4[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/notebook-6.5.3.ebuild b/dev-python/notebook/notebook-6.5.3.ebuild
index ce3a0cee1fcd..8f55551c40a6 100644
--- a/dev-python/notebook/notebook-6.5.3.ebuild
+++ b/dev-python/notebook/notebook-6.5.3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-5.3.4[${PYTHON_USEDEP}]
 	>=dev-python/nbclassic-0.4.7[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/notebook-6.5.4.ebuild b/dev-python/notebook/notebook-6.5.4.ebuild
index 6252917e6b03..beb1731c26d1 100644
--- a/dev-python/notebook/notebook-6.5.4.ebuild
+++ b/dev-python/notebook/notebook-6.5.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://jupyter.org"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.7.4
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-5.3.4[${PYTHON_USEDEP}]
 	>=dev-python/nbclassic-0.4.7[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild b/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
index f7bcbee8255e..23fbdfcd612c 100644
--- a/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
+++ b/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
diff --git a/dev-python/octave_kernel/octave_kernel-0.34.2.ebuild b/dev-python/octave_kernel/octave_kernel-0.34.2.ebuild
index 9036ee45e512..bc00b3b6bc1a 100644
--- a/dev-python/octave_kernel/octave_kernel-0.34.2.ebuild
+++ b/dev-python/octave_kernel/octave_kernel-0.34.2.ebuild
@@ -22,7 +22,7 @@ RESTRICT="test"
 
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-4.3.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_packaging-0.9[${PYTHON_USEDEP}]
 	>=dev-python/metakernel-0.24.0[${PYTHON_USEDEP}]
 	sci-mathematics/octave"
diff --git a/dev-python/pdm-pep517/pdm-pep517-1.1.4.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.1.4.ebuild
index 0ddad371bbd7..9aa3ff5e939a 100644
--- a/dev-python/pdm-pep517/pdm-pep517-1.1.4.ebuild
+++ b/dev-python/pdm-pep517/pdm-pep517-1.1.4.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pooch/pooch-1.7.0.ebuild b/dev-python/pooch/pooch-1.7.0.ebuild
index 8a760b7cabc9..b835d03c13cb 100644
--- a/dev-python/pooch/pooch-1.7.0.ebuild
+++ b/dev-python/pooch/pooch-1.7.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.11.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.11.ebuild
index ee8dce84331f..46e0d0b5ee70 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.11.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.11.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210902.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210902.ebuild
index f94aa79d700c..a35c0b9ea9ca 100644
--- a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210902.ebuild
+++ b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210902.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyspelling/pyspelling-2.8.2.ebuild b/dev-python/pyspelling/pyspelling-2.8.2.ebuild
index ce4b13832371..b46707b8cce1 100644
--- a/dev-python/pyspelling/pyspelling-2.8.2.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.8.2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
diff --git a/dev-python/pytest-jupyter/pytest-jupyter-0.6.2.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.6.2.ebuild
index a9ee8ffc0f7b..53474ef98f9a 100644
--- a/dev-python/pytest-jupyter/pytest-jupyter-0.6.2.ebuild
+++ b/dev-python/pytest-jupyter/pytest-jupyter-0.6.2.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
-	>=dev-python/jupyter_client-7.4.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-7.4.0[${PYTHON_USEDEP}]
 	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
index ca2a639a868b..f17c9857c711 100644
--- a/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
+++ b/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/jupyter_client-7.4.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-7.4.0[${PYTHON_USEDEP}]
 	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
index 8b3b51cc39f6..2e2a54fe6072 100644
--- a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
+++ b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/pytest-localserver/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="dev-python/pyftpdlib[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/python-multipart/python-multipart-0.0.6.ebuild b/dev-python/python-multipart/python-multipart-0.0.6.ebuild
index 0544ee900962..31aec27ccd5d 100644
--- a/dev-python/python-multipart/python-multipart-0.0.6.ebuild
+++ b/dev-python/python-multipart/python-multipart-0.0.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python-socks/python-socks-2.2.0.ebuild b/dev-python/python-socks/python-socks-2.2.0.ebuild
index db49b35c8a00..15c5438f68ee 100644
--- a/dev-python/python-socks/python-socks-2.2.0.ebuild
+++ b/dev-python/python-socks/python-socks-2.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # curio is not packaged
 # asyncio is the only backend we have, so dep on its deps unconditionally
diff --git a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild
index efc6c3b5f666..edfc1e0fa299 100644
--- a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild
+++ b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/waylan/pyyaml-env-tag"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/qtconsole/qtconsole-5.4.0.ebuild b/dev-python/qtconsole/qtconsole-5.4.0.ebuild
index d3a877329021..b98d0a381f06 100644
--- a/dev-python/qtconsole/qtconsole-5.4.0.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.4.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-4.1.1[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17.1[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.2.2_p1[${PYTHON_USEDEP}]
diff --git a/dev-python/qtconsole/qtconsole-5.4.1.ebuild b/dev-python/qtconsole/qtconsole-5.4.1.ebuild
index 3a91584a213b..75722e32ec5f 100644
--- a/dev-python/qtconsole/qtconsole-5.4.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.4.1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-4.1.1[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17.1[${PYTHON_USEDEP}]
diff --git a/dev-python/qtconsole/qtconsole-5.4.2.ebuild b/dev-python/qtconsole/qtconsole-5.4.2.ebuild
index 3a91584a213b..75722e32ec5f 100644
--- a/dev-python/qtconsole/qtconsole-5.4.2.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.4.2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-4.1.1[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17.1[${PYTHON_USEDEP}]
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.15.1.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.15.1.ebuild
index 542bbfab8e48..387547288001 100644
--- a/dev-python/rapidfuzz/rapidfuzz-2.15.1.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-2.15.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild b/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
index d25f9fbbf8a6..a745eeeccab3 100644
--- a/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
+++ b/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
@@ -20,4 +20,4 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/scipy/scipy-1.10.1.ebuild b/dev-python/scipy/scipy-1.10.1.ebuild
index 78980f9871c4..fe736b0e0e17 100644
--- a/dev-python/scipy/scipy-1.10.1.ebuild
+++ b/dev-python/scipy/scipy-1.10.1.ebuild
@@ -36,7 +36,7 @@ else
 		)"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 -hppa ppc ppc64 ~riscv ~sparc x86"
+		KEYWORDS="amd64 arm arm64 -hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 	fi
 fi
 
diff --git a/dev-python/selenium/selenium-4.8.3.ebuild b/dev-python/selenium/selenium-4.8.3.ebuild
index 56e0e23f9ad9..98c4cf64c47d 100644
--- a/dev-python/selenium/selenium-4.8.3.ebuild
+++ b/dev-python/selenium/selenium-4.8.3.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 	)
 "
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/spotipy/Manifest b/dev-python/spotipy/Manifest
index 7f08287826ac..9f7c8f6e6543 100644
--- a/dev-python/spotipy/Manifest
+++ b/dev-python/spotipy/Manifest
@@ -1,2 +1 @@
-DIST spotipy-2.22.1.gh.tar.gz 111228 BLAKE2B df75cce406d59c9de3e4c836309262d61f7f1249761d3172be13033512944e69a56ca67f16b55e4736f760b74d3ebd8f384225ce9309a5fc1bd8c93be4099069 SHA512 d8c5871dd606e3335656fb55fa042d8c91c72a4c7d62a584bd407a7546184996694c67d499f908fc7049e406c548269286de6cba17064f0385adba3661b34c3b
 DIST spotipy-2.23.0.gh.tar.gz 112399 BLAKE2B 5510ce35624c561df61fffee78f211dfa91ff8d5b3dc15d37c96a51bf830e67aac9c6a0787c71715bee17a3ba91b84766c1ecec37d5775f2182617f2b74a2cb3 SHA512 52955fa3365d5153f19f60874ce8e96910ac8db783499e0e2ef2ab31127277844e24a045115dc522dd7b7535f7907de56da87e02a63b94ee7506b75c1e108e9b
diff --git a/dev-python/spotipy/spotipy-2.22.1.ebuild b/dev-python/spotipy/spotipy-2.22.1.ebuild
deleted file mode 100644
index 9860349e2b86..000000000000
--- a/dev-python/spotipy/spotipy-2.22.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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
-
-DESCRIPTION="A lightweight Python library for the Spotify Web API"
-HOMEPAGE="
-	https://spotipy.readthedocs.io/
-	https://github.com/spotipy-dev/spotipy/
-	https://pypi.org/project/spotipy/
-"
-SRC_URI="
-	https://github.com/spotipy-dev/spotipy/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~x86"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/redis[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/unit/test_oauth.py::TestSpotifyClientCredentials::test_spotify_client_credentials_get_access_token
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.4.3.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.4.3.ebuild
index 9ef6ad5791e0..d5f621a9cbc2 100644
--- a/dev-python/spyder-kernels/spyder-kernels-2.4.3.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-2.4.3.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
 	>=dev-python/ipykernel-6.16.1[${PYTHON_USEDEP}]
 	<dev-python/ipython-9[${PYTHON_USEDEP}]
 	>=dev-python/ipython-8.11.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-9[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.4.9[${PYTHON_USEDEP}]
+	<dev-python/jupyter-client-9[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-7.4.9[${PYTHON_USEDEP}]
 	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
 	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.9.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.9.ebuild
index c137b9e59e98..d72c8b1260b3 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.9.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.9.ebuild
@@ -71,6 +71,7 @@ python_test() {
 			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
 			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
 			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
 			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
 		)
 	fi
diff --git a/dev-python/starlette/starlette-0.26.1.ebuild b/dev-python/starlette/starlette-0.26.1.ebuild
index af9bc32d9cd7..6544c8c3a26e 100644
--- a/dev-python/starlette/starlette-0.26.1.ebuild
+++ b/dev-python/starlette/starlette-0.26.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/statsmodels/statsmodels-0.13.2.ebuild b/dev-python/statsmodels/statsmodels-0.13.2.ebuild
index ea977c5b44a6..afda1e8d8b96 100644
--- a/dev-python/statsmodels/statsmodels-0.13.2.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.13.2.ebuild
@@ -37,7 +37,7 @@ BDEPEND="
 
 distutils_enable_sphinx docs \
 	'dev-python/ipykernel' \
-	'dev-python/jupyter_client' \
+	'dev-python/jupyter-client' \
 	'dev-python/matplotlib' \
 	'dev-python/nbconvert' \
 	'dev-python/numpydoc'
diff --git a/dev-python/statsmodels/statsmodels-0.13.5.ebuild b/dev-python/statsmodels/statsmodels-0.13.5.ebuild
index 92c76974b0e3..96f416005aac 100644
--- a/dev-python/statsmodels/statsmodels-0.13.5.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.13.5.ebuild
@@ -42,7 +42,7 @@ BDEPEND="
 
 distutils_enable_sphinx docs \
 	'dev-python/ipykernel' \
-	'dev-python/jupyter_client' \
+	'dev-python/jupyter-client' \
 	'dev-python/matplotlib' \
 	'dev-python/nbconvert' \
 	'dev-python/numpydoc'
diff --git a/dev-python/tabulate/tabulate-0.9.0.ebuild b/dev-python/tabulate/tabulate-0.9.0.ebuild
index b3843a297d0c..ad250a7ccefe 100644
--- a/dev-python/tabulate/tabulate-0.9.0.ebuild
+++ b/dev-python/tabulate/tabulate-0.9.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild b/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild
index aff95f71c0dc..0ff1627c4faa 100644
--- a/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild
+++ b/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild b/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild
index 6d94b2ae26c8..700576463658 100644
--- a/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild
+++ b/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/exceptiongroup[${PYTHON_USEDEP}]
diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.3.9.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.3.9.ebuild
index 1bc25ab9955d..6f8834546ce3 100644
--- a/dev-python/trove-classifiers/trove-classifiers-2023.3.9.ebuild
+++ b/dev-python/trove-classifiers/trove-classifiers-2023.3.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/calver[${PYTHON_USEDEP}]
diff --git a/dev-python/tulir-telethon/tulir-telethon-1.28.0_alpha9.ebuild b/dev-python/tulir-telethon/tulir-telethon-1.28.0_alpha9-r1.ebuild
index 4553aabe4933..4edea02c02ec 100644
--- a/dev-python/tulir-telethon/tulir-telethon-1.28.0_alpha9.ebuild
+++ b/dev-python/tulir-telethon/tulir-telethon-1.28.0_alpha9-r1.ebuild
@@ -35,3 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/readthedocs/quick_references/test_client_reference.py::test_all_methods_present
+)
diff --git a/dev-python/uvicorn/uvicorn-0.21.1-r1.ebuild b/dev-python/uvicorn/uvicorn-0.21.1-r1.ebuild
index 918f77e9cec7..ee7373927de0 100644
--- a/dev-python/uvicorn/uvicorn-0.21.1-r1.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.21.1-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/wcmatch/wcmatch-8.4.1.ebuild b/dev-python/wcmatch/wcmatch-8.4.1.ebuild
index 07840414177b..fda5f84f3094 100644
--- a/dev-python/wcmatch/wcmatch-8.4.1.ebuild
+++ b/dev-python/wcmatch/wcmatch-8.4.1.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/bracex-2.1.1[${PYTHON_USEDEP}]