Adding metadata

68 files changed, 561 insertions, 549 deletions

diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index fcba7f15e7e0..14f432b04706 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1 +1,2 @@
 DIST alembic-1.11.1.tar.gz 1176522 BLAKE2B 5a4185cb59b48301d350db3c44487408ca6c8d88b47ddd22e4c19fad57d0961cb3968652ba15986cf42adb9bb38542a79b11ddd980c9841a071844d26fed56fd SHA512 d068d581df952c2d304534218bd8f948407e288005514501816e60600b186bf03bcc60f485c4c6d5c80caf718210c2bf619f1758327bc592663f160c3bd21e65
+DIST alembic-1.11.2.tar.gz 1192900 BLAKE2B 47919a02bfabc51caf13b70d7598bd54c63e2f3deea0a6547677433cb4dfab2fea7b199ad5288109c970386a3f318bf29ac2d931d2299dfed63883c3c4dde179 SHA512 7a3c2c723134d7d3048596dc7a98993edf737e09cea0b7df5cf5a05fbc37b9c7eb7fa28e4f1ce2adbb9c4683f838227b760feae148fbc617bc9fdd8e52c667c1
diff --git a/dev-python/alembic/alembic-1.11.2.ebuild b/dev-python/alembic/alembic-1.11.2.ebuild
new file mode 100644
index 000000000000..b6a2493e61be
--- /dev/null
+++ b/dev-python/alembic/alembic-1.11.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="
+	https://github.com/sqlalchemy/alembic/
+	https://pypi.org/project/alembic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# setup.cfg contains -p no:warnings in addopts which triggers
+	# datetime.utcfromtimestamp() deprecation warning as an error in py3.12
+	epytest -o addopts=
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 5d7796fd8bef..cd91e403df40 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,2 +1 @@
-DIST anyio-3.7.0.tar.gz 142737 BLAKE2B f27b6c854f8861c760a922542471b5d7714cd54da0fa999a6efc8e394b49e538e7689147834a4076e1970932416fabe820923c2155048d943eee697454771c8f SHA512 0793012dc364d2bb27ebae8a23f275ecd24d444de750fbebcb72e70ca465a3be9c69938543e1a3c686abfff3ed9036974b38e3886fb24a110a9ef307a82d3f0b
 DIST anyio-3.7.1.tar.gz 142927 BLAKE2B 80a093943fbd23069e9511a83b3eb1e27f2863b11e184709f92cab2dfebc05ea3c291d22be4b1e79d00ae52e10009d5fb2c664730009b40e2b666587538d0ca5 SHA512 067bbffa9e0d6ce339a4999a677c857e839aa3bf5a056d841fec8cbd3be17023c9158df907ff66b9a5437a78158bc9bbb3b9ebe30c57ef98660642bc057d7d10
diff --git a/dev-python/anyio/anyio-3.7.0.ebuild b/dev-python/anyio/anyio-3.7.0.ebuild
deleted file mode 100644
index e3cc478b58f5..000000000000
--- a/dev-python/anyio/anyio-3.7.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
-HOMEPAGE="
-	https://github.com/agronholm/anyio/
-	https://pypi.org/project/anyio/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
-	' 3.{9..10})
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-"
-# On amd64, let's get more test coverage by dragging in uvloop, but let's
-# not bother on other arches where uvloop may not be supported.
-BDEPEND="
-	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		amd64? (
-			$(python_gen_cond_dep '
-				>=dev-python/uvloop-0.17[${PYTHON_USEDEP}]
-			' python3_{10..11})
-		)
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme \
-	dev-python/sphinx-autodoc-typehints
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires link-local IPv6 interface
-		tests/test_sockets.py::TestTCPListener::test_bind_link_local
-
-		# trio-0.22?
-		'tests/test_sockets.py::TestTCPStream::test_connection_refused[trio-multi]'
-		'tests/test_taskgroups.py::test_exception_group_children[trio]'
-		'tests/test_taskgroups.py::test_exception_group_host[trio]'
-		'tests/test_taskgroups.py::test_exception_group_filtering[trio]'
-	)
-	if [[ ${EPYTHON} == python3.12 ]]; then
-		EPYTEST_DESELECT+=(
-			tests/test_fileio.py::TestPath::test_properties
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not network'
-}
diff --git a/dev-python/anyio/anyio-3.7.1.ebuild b/dev-python/anyio/anyio-3.7.1.ebuild
index 3e868668c047..1287dd6b6eb2 100644
--- a/dev-python/anyio/anyio-3.7.1.ebuild
+++ b/dev-python/anyio/anyio-3.7.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cachetools/cachetools-5.3.1.ebuild b/dev-python/cachetools/cachetools-5.3.1.ebuild
index 9aa1afaf597c..5a42efcf9706 100644
--- a/dev-python/cachetools/cachetools-5.3.1.ebuild
+++ b/dev-python/cachetools/cachetools-5.3.1.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index 7817f0f91f5e..cc0504c54657 100644
--- a/dev-python/click-default-group/Manifest
+++ b/dev-python/click-default-group/Manifest
@@ -1 +1,2 @@
 DIST click-default-group-1.2.2.gh.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
+DIST click-default-group-1.2.4.gh.tar.gz 4816 BLAKE2B 06954c374c1fcdf6163b476ec9888c563493b3c6d6395cab4b7191cae335519262a5082f587752c1968c4108edd20bb87c55bde8100c8cad90b2c1d433fa7469 SHA512 0239e703421e693399e8e54e4a6bdc4a74e6f16307f008ee742788ce3e8040f633de2b1bf12997a5c448b70cb55f77ccd4f42c5b4abe3b6a05df18908daf61da
diff --git a/dev-python/click-default-group/click-default-group-1.2.4.ebuild b/dev-python/click-default-group/click-default-group-1.2.4.ebuild
new file mode 100644
index 000000000000..cd28efc50f6c
--- /dev/null
+++ b/dev-python/click-default-group/click-default-group-1.2.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extends click.Group to invoke a command without explicit subcommand name"
+HOMEPAGE="
+	https://github.com/click-contrib/click-default-group/
+	https://pypi.org/project/click-default-group/
+"
+SRC_URI="
+	https://github.com/click-contrib/click-default-group/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ensurepip-wheel/Manifest b/dev-python/ensurepip-wheel/Manifest
index f04225cb86ca..d95ada828129 100644
--- a/dev-python/ensurepip-wheel/Manifest
+++ b/dev-python/ensurepip-wheel/Manifest
@@ -1,2 +1,3 @@
 DIST wheel-0.40.0-py3-none-any.whl 64545 BLAKE2B d42fcef0b33b560d5249d32c3400e8440bff154fbc21321e1802ffd6f734fcab032b296d5986cd5c23388800c9234d60c25e2e8f9008beeb6518391c52773f93 SHA512 83c4511bc8186485c7e61da1a798fdc41e209841300d70ea8e8f5515ec8200667b0195e3df149a81f10e3eaa159e8bab7f1701b43ce3d6746aee79cd0ba862e7
 DIST wheel-0.41.0-py3-none-any.whl 64712 BLAKE2B d4e4a9fbc432a246500997412bbda14bf4ad3e9b08bc702c9df9f2649c71399251d6d922c98769eb8bfd34e1a6f9c5c4f182d717c5d9aa9e8e88c6d7ccbb09e7 SHA512 fa2230b0f9f65a860ddbcf63be920a49adad7d4e97be6445e49c2fd746257ab5e3a824f5819c2b80bb3879727720eae07b1e1fc9e5f8e3c1b882e19efa3df52d
+DIST wheel-0.41.1-py3-none-any.whl 64755 BLAKE2B 66741b95010f3463793b893b63663eda3f31b5f6e55c3677c9d46f374cdc98b15c45f2ac39551aaee9f9cb2e38f108811f27c394d67b240e4ca80048c290c13b SHA512 db12f20343044676a1e7b5920b7b72e0369a1c29fc5426686b7dac7f2cfffb36b01407b52cbf974c06ddaa540227167b9f69e7cdc6af3aad9eb56c4ad0fec267
diff --git a/dev-python/ensurepip-wheel/ensurepip-wheel-0.41.1.ebuild b/dev-python/ensurepip-wheel/ensurepip-wheel-0.41.1.ebuild
new file mode 100644
index 000000000000..e3e7fe90c1fa
--- /dev/null
+++ b/dev-python/ensurepip-wheel/ensurepip-wheel-0.41.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared wheel wheel for use in pip tests"
+HOMEPAGE="https://pypi.org/project/wheel/"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
+S=${DISTDIR}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/exceptiongroup/Manifest b/dev-python/exceptiongroup/Manifest
index cb338eb5af2e..6ef35014bed4 100644
--- a/dev-python/exceptiongroup/Manifest
+++ b/dev-python/exceptiongroup/Manifest
@@ -1,2 +1 @@
-DIST exceptiongroup-1.1.1.gh.tar.gz 23107 BLAKE2B d68778e4a4d14add65ee2300fd15308c17b2cae1733bf4e8938e88b5cf76b9f19d8f9c102c06298769ff9541ded02868763d9c4aac776d22f78c250ea2d942ce SHA512 eb072fef6160cc6d332ae6e08ee7a34ce478188d143f97daae3f8251a8253a7b460249a121af27d66953ff8000ea5ef43a6dee145b14ba7b2968790132a766bf
 DIST exceptiongroup-1.1.2.gh.tar.gz 23079 BLAKE2B f6bce757f1a2672956bf919f3ef0c9c6ea1034bf176e2ed8f3fa92c3fe34974885c59fa9915a42b8d5673b077d48fea3179e12cbd0c39f4277090fdbb3803d08 SHA512 432768f97e3468546b71993fd20ed98d85eb15170228cef8fe39d7c2232d0249c29f6fe1c991313742ee3a22a73cc91336d54ef278337b20e0e2ba296cf7102e
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.1.1.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.1.1.ebuild
deleted file mode 100644
index 9f1512b5f61a..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-# pypi sdist does not include tests as of 1.1.1
-# https://github.com/agronholm/exceptiongroup/pull/59
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.1.2.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.1.2.ebuild
index 81b215620048..9f1512b5f61a 100644
--- a/dev-python/exceptiongroup/exceptiongroup-1.1.2.ebuild
+++ b/dev-python/exceptiongroup/exceptiongroup-1.1.2.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT PSF-2.4"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild b/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
index 086d866ed33d..d8feab086fed 100644
--- a/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
+++ b/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/hatchling[${PYTHON_USEDEP}]
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index b164e3e0fd4c..a384658c70ed 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,2 +1 @@
-DIST httpcore-0.17.2.gh.tar.gz 85086 BLAKE2B 74f748c0135cbd0551b3d1cf22b655e9d8e26f517790d08e9cb10f10cc7eecc09187e755e429fd9620f6f845be1abc3a7fde2a4d8ce557d57296d1777aaebc81 SHA512 429451323b31006eddae88b2f5575bb4b672206056d466e274f0667c185f196bedc06e82ed3a824836d56360004ba368370bca88656c3c998d61f7382c990296
 DIST httpcore-0.17.3.gh.tar.gz 91500 BLAKE2B 65e6ac917f215fb3c2f6651633db29cf58b7c936b1554102bb1c2e777a289527d44472c2b92fb7c62e7e1a812a1cf9573796051f90ea088dc37fcc2052dfe10b SHA512 41f48d32caa7d7a3456528404392a257927d047f0a1c733e2a68c0fec97c7454c7f8d7d1b6851c5722cfac292dfaa478a4033c656e66d389c81c72dee8e7a7d2
diff --git a/dev-python/httpcore/httpcore-0.17.2.ebuild b/dev-python/httpcore/httpcore-0.17.2.ebuild
deleted file mode 100644
index 7778bbf77d87..000000000000
--- a/dev-python/httpcore/httpcore-0.17.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="
-	https://www.encode.io/httpcore/
-	https://github.com/encode/httpcore/
-	https://pypi.org/project/httpcore/
-"
-SRC_URI="
-	https://github.com/encode/httpcore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.15[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "SOCKS support" dev-python/socksio
-}
diff --git a/dev-python/httpcore/httpcore-0.17.3.ebuild b/dev-python/httpcore/httpcore-0.17.3.ebuild
index 98686208df69..7778bbf77d87 100644
--- a/dev-python/httpcore/httpcore-0.17.3.ebuild
+++ b/dev-python/httpcore/httpcore-0.17.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/immutabledict/Manifest b/dev-python/immutabledict/Manifest
index eaa140bd8f86..1aa463cbefaf 100644
--- a/dev-python/immutabledict/Manifest
+++ b/dev-python/immutabledict/Manifest
@@ -1,3 +1,2 @@
-DIST immutabledict-2.2.4.tar.gz 4314 BLAKE2B fb971bd1a7f2e577131cd19d97e6eae840ad8ea4a3eda96ff54e20235202b791029e2f76b19980c54ab2679ad7147ef420e3ba237e01f5da303efa8108f218cd SHA512 436e39ac98ea9e8ad262113ef6d8ad629800adf29eda5c064e679167d57515d90165ec4a14e572281711f1a26ae0ea3f2164b6487024b20c31895f966fc0050a
 DIST immutabledict-2.2.5.tar.gz 4316 BLAKE2B 2f251c8409a88cfba741cc9ee2b72d486a7dd8422ca4d841d47246beef506762781106300d9cd4ec8f57115950b09f09bacbb1bc3ceeb0a4b78ef5ba32d3e045 SHA512 3bd94d077f599b6e96a4e17a0d9ecf6365975afe73048f9d9de4df35a8272af1baed264ad84ae6826dd6359ad0d371cd90082b4a064cc6350a0e61bc1cf8c713
 DIST immutabledict-3.0.0.tar.gz 4478 BLAKE2B 7b5344f5153d28914da7124c3ca95e9b5c6422788259170de9f301de0a145324157635ca3543be824e9a0ebf93efe99a30dc1c8882bf926927023f2d06e318ad SHA512 90170703c1226e06d6726285005689cf66804ed2b3fda08c0350d9eeca6ec7427bd4004d42168e2f5ae7302acf1d16274a16d0e132bd81fbc8d470d75ec064a5
diff --git a/dev-python/immutabledict/immutabledict-2.2.4.ebuild b/dev-python/immutabledict/immutabledict-2.2.4.ebuild
deleted file mode 100644
index 3be7f7143851..000000000000
--- a/dev-python/immutabledict/immutabledict-2.2.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="An immutable wrapper around dictionaries"
-HOMEPAGE="
-	https://github.com/corenting/immutabledict/
-	https://pypi.org/project/immutabledict/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/immutabledict/immutabledict-2.2.5.ebuild b/dev-python/immutabledict/immutabledict-2.2.5.ebuild
index 7b30e998a1bf..3be7f7143851 100644
--- a/dev-python/immutabledict/immutabledict-2.2.5.ebuild
+++ b/dev-python/immutabledict/immutabledict-2.2.5.ebuild
@@ -15,6 +15,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index aba8321c88ab..b46317de95f1 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,3 +1,2 @@
-DIST ipywidgets-8.0.6.tar.gz 115372 BLAKE2B 9369c6697879cb07576ef82769b2df7cb24c7076e5d6d01be30c9f23ee3586616fa44ff7a16904bd0a5754032d4c9be58cb7c63392360d4347f1284d8bd53093 SHA512 9275f259f7f20b20e14856b1a500094300c18f3e9ff46086a5856a5261a71d62a005a2541f4987b9761d57da1db15e881f0c858dcde34978cbef8b5efe691723
 DIST ipywidgets-8.0.7.tar.gz 115457 BLAKE2B fc9e0da01de1b76b770335a8ac8844b930ca941b64e35dda561aed1732da64d3c814244d8695d4c9ee15247ce6c4095fc710c80bfb32bbabd26ad6d06dc04da8 SHA512 8dddc9d3df9d5f862b380553e7ea5df24e2d9f7cf086c9b8c51d5efe7018969a0fc56c442ccacc2bcfd7a870eb72ec9d75b05e3eff1ded2aff4a391c9d85053d
 DIST ipywidgets-8.1.0.tar.gz 116121 BLAKE2B dbe8f137294820c6e2da7aaa2ffa1a3b13da30888d70384a174bbc29f85e0e826968e4ccb719bf8ca5d3abce342b1e594a35e814e8b32ac52229ead36b9a068b SHA512 39e3b20420e24eb119b584a9edc364d62573550edde41d0f881ff20649877b61aea80df31b95102e38953256b612ced28d9b5afb22a17cc04a3f258d79f43058
diff --git a/dev-python/ipywidgets/ipywidgets-8.0.6.ebuild b/dev-python/ipywidgets/ipywidgets-8.0.6.ebuild
deleted file mode 100644
index 637053cd3805..000000000000
--- a/dev-python/ipywidgets/ipywidgets-8.0.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="
-	https://ipywidgets.readthedocs.io/
-	https://github.com/jupyter-widgets/ipywidgets/
-	https://pypi.org/project/ipywidgets/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-4.0.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# upstream hack to autoconfigure ipywidgets in jupyter
-	# we don't have jupyterlab_widgets packaged
-	sed -i -e '/jupyterlab_widgets/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ipywidgets/ipywidgets-8.0.7.ebuild b/dev-python/ipywidgets/ipywidgets-8.0.7.ebuild
index 612f7d27dc9d..637053cd3805 100644
--- a/dev-python/ipywidgets/ipywidgets-8.0.7.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-8.0.7.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
index f61d0b25f3de..6aaf5ab5e063 100644
--- a/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
+++ b/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-server/jupyter-server-2.7.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.7.0.ebuild
index 437d9c5846dd..0c1c161f768a 100644
--- a/dev-python/jupyter-server/jupyter-server-2.7.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.7.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.4.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.4.ebuild
index 9f0b7007214f..83b9a334f24f 100644
--- a/dev-python/jupyterlab/jupyterlab-4.0.4.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.0.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD MIT GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/async-lru[${PYTHON_USEDEP}]
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
index 647e0d3abd16..d2d1fa7285f1 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -1 +1,3 @@
 DIST libnacl-1.8.0.gh.tar.gz 43351 BLAKE2B 4ba0ebcb50755d80418ffe7238c65d9309954cb2a0eac61937c488144b56093f3fcd87f0bf22a290c7b415c70cb781fbf7a2c608863d43694230fe34b3ad418e SHA512 7a39d646083591782691c4d58fd4d743b385ee553bcc4c4741707a237fa3b1213629b5070390526175bdfe8436859aa7711779ff8b22a981227edb30b94e82d6
+DIST libnacl-1.9.0.gh.tar.gz 43752 BLAKE2B 4a604958aeb9c4b26351b74fa3452b72b7e822c9ea28f4a070464568f1eed184615f0ad5624a2838bf055cf221a9a0f493419b16f2bf2be26c608b396d3f234c SHA512 1c1011f218864f4eab6a985a957f7ec5b8a227ed107ab336a0bc076be10bae6d598f3e81f3a20177e81f25f93c36b23118f515b98f87e11b1f727cae3db1e267
+DIST libnacl-2.0.0.gh.tar.gz 44710 BLAKE2B 50fa7d446370bb6043d942b28364b5bf2a23efcd6f3c82a59ee0ef0f7666a9ebe8e3dcf487d43e6ecb548ededb5e6228b3da401dc30924fef90047da40888168 SHA512 f8159ae479d920058662ffde2ac3bad2c8b413d55ca0bd442b81c7071b4cfca90eae277f85e7bf0bb63cd71ee1e0ad4cbbb03468ed55d1bcbe06d2e9a0976b72
diff --git a/dev-python/libnacl/libnacl-1.9.0.ebuild b/dev-python/libnacl/libnacl-1.9.0.ebuild
new file mode 100644
index 000000000000..6ff28402e1df
--- /dev/null
+++ b/dev-python/libnacl/libnacl-1.9.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python ctypes wrapper for libsodium"
+HOMEPAGE="
+	https://libnacl.readthedocs.io/
+	https://github.com/saltstack/libnacl/
+	https://pypi.org/project/libnacl/
+"
+SRC_URI="
+	https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-libs/libsodium
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -p 'test_*.py' tests/ ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/libnacl/libnacl-2.0.0.ebuild b/dev-python/libnacl/libnacl-2.0.0.ebuild
new file mode 100644
index 000000000000..6ff28402e1df
--- /dev/null
+++ b/dev-python/libnacl/libnacl-2.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python ctypes wrapper for libsodium"
+HOMEPAGE="
+	https://libnacl.readthedocs.io/
+	https://github.com/saltstack/libnacl/
+	https://pypi.org/project/libnacl/
+"
+SRC_URI="
+	https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-libs/libsodium
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -p 'test_*.py' tests/ ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.5.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.5.ebuild
index ebb299dcf228..8e24a22bc897 100644
--- a/dev-python/miniupnpc/miniupnpc-2.2.5.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.5.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/mkdocs-pymdownx-material-extras/Manifest b/dev-python/mkdocs-pymdownx-material-extras/Manifest
index a08a0c5f1937..ca9ca3f5e8fc 100644
--- a/dev-python/mkdocs-pymdownx-material-extras/Manifest
+++ b/dev-python/mkdocs-pymdownx-material-extras/Manifest
@@ -1,2 +1,3 @@
 DIST mkdocs_pymdownx_material_extras-2.4.3.tar.gz 24693 BLAKE2B c7b7518d5eaca04dff0373e897f9fb871aa8537a1438841ab58a4f157910070ccf339091340521d56b7b727cedf33dd5b3ca711155e39b505da195f2308ab0e0 SHA512 3659235bf200f2c400892e9223bc6a1465af116f6f5a85c4decedfd951eba57fbbcb70faf6c22ef9d79d049621d66e64790dad2fa95d43a41213f288b27405a9
+DIST mkdocs_pymdownx_material_extras-2.5.1.tar.gz 24771 BLAKE2B 2bee64966601503fd6c11d8256ca73210923cf59df41a319b45c2db2435b205a860cbbfc04e5ddffceb05d6371c95dda6ceab88c4c8d3fdaa583dacd64a832ca SHA512 f50a40c55e72fcbe2d51777c434cc1fb841645456efb3b60fd8f6412b9008467e191e0cb072692e3552c7f28e678b503642845b787c66f56b9f9e4b2504bb68d
 DIST mkdocs_pymdownx_material_extras-2.5.tar.gz 24753 BLAKE2B 7ba244926f796a0b050ce1b518ea7c7ef5744b34fa45b617257704598e471b2a8cfb8b89ac83536b11496046104e0a4eadf6bada966da9efb6b48dff9273ce2a SHA512 61e702971525b4100873db84c39e1a564448a52655269fe5ee02382f40a5aee8891c3e216e172f7ef9a16841e633207f37d151b4fd80c0313d3d4a377f9dd71d
diff --git a/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.5.1.ebuild b/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.5.1.ebuild
new file mode 100644
index 000000000000..c4c95ee6d27b
--- /dev/null
+++ b/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.5.1.ebuild
@@ -0,0 +1,23 @@
+# 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="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras/
+	https://pypi.org/project/mkdocs-pymdownx-material-extras/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-8.3.3[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mypy/mypy-1.4.1-r1.ebuild b/dev-python/mypy/mypy-1.4.1-r1.ebuild
index 328dbfab7be4..d3088702b74d 100644
--- a/dev-python/mypy/mypy-1.4.1-r1.ebuild
+++ b/dev-python/mypy/mypy-1.4.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index e411c25222e4..d9f7eefd63d6 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,3 +1,4 @@
 DIST notebook-6.5.4.tar.gz 5785832 BLAKE2B 28845c51c244d08b12e6a2853d3407a2af9e351f1501db8e76ff4f069e656d9bf27c3d2893b38f3f2bb51cedf38658219be3843a3397a588046d55bf445d3222 SHA512 72bf4efa4d553a6265c72e188ad0ee085accbbc05b0af182531c892303149d83f38f6d410f1bcb2c835071f713cb4267d58324b982b4087caabf9b46b8d77cfa
 DIST notebook-7.0.0.tar.gz 3922786 BLAKE2B 5aaeae9f48c456691607d5ef05012368f0e6abd1eb1266a5fc68ac999027cdb1e03a640b13048b47a754ef8c803bf1fe3a8c056dc600d825fa05387e905183a2 SHA512 fb58c03b60f02cc8b2096c13c493c38324fbb76a93dbb31a94775ed341a9594168598bc3a35ce18ef1ce6e2dd79f7b2e32d752dc3307780cfbc9fbc0c7f1c9a6
 DIST notebook-7.0.1.tar.gz 3926420 BLAKE2B a711c6202ec87f5b9ee9b82779048f4dc366643a645890006b6588ddd70428e79e4028171cc4b4fb4fa1e6f93a2a948aae34980915ad4a2a5f7c34971e6bf917 SHA512 4bfae67044525527c1d5ff1dd269c8ca1179bbef3a9f0cf043244103c996f02ef4cbbf11c4ceffe84ca0cb0a8250f18cd3ebf6dd55cca53ceaa47f65df7dae22
+DIST notebook-7.0.2.tar.gz 3927445 BLAKE2B 09f867a5eed76616d749afcd18bf673fc2c09f5073a17d5a89a284d8aacb9e110a67f24973e0ba165027b3199f8e9032f549aabcbd8d3bc67a9d6533d21a4e09 SHA512 b204f15f855f8e829dfd1d325be664cc0328e2b897d838bfd9721ca369d4da8d0d1012bff69b40a35f0b186d3eae5f46326604eefb0b8e91824a815deedbcc67
diff --git a/dev-python/notebook/notebook-7.0.2.ebuild b/dev-python/notebook/notebook-7.0.2.ebuild
new file mode 100644
index 000000000000..417111271a38
--- /dev/null
+++ b/dev-python/notebook/notebook-7.0.2.ebuild
@@ -0,0 +1,57 @@
+# 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 pypi xdg-utils
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-4.0.2[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-5[${PYTHON_USEDEP}]
+	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
+	<dev-python/notebook-shim-0.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/nbval[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/numpy/numpy-1.24.4-r1.ebuild b/dev-python/numpy/numpy-1.24.4-r1.ebuild
index 89e0cf8de4b1..ccc124e43ec2 100644
--- a/dev-python/numpy/numpy-1.24.4-r1.ebuild
+++ b/dev-python/numpy/numpy-1.24.4-r1.ebuild
@@ -110,6 +110,7 @@ python_prepare_all() {
 	gawk -i inplace -v "enabled_flags=${enabled_flags[*]}" \
 		-f "${FILESDIR}"/replace_cpuflags.awk \
 		numpy/distutils/ccompiler_opt.py || die
+	rm -f numpy/distutils/tests/test_ccompiler_opt.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/overrides/overrides-7.3.1.ebuild b/dev-python/overrides/overrides-7.3.1.ebuild
index a08949e323ae..8c729dd5f2fe 100644
--- a/dev-python/overrides/overrides-7.3.1.ebuild
+++ b/dev-python/overrides/overrides-7.3.1.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390"
 
 distutils_enable_tests pytest
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 49ba67aa717e..7302c28cfbc6 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1,4 @@
 DIST python-phonenumbers-8.13.15.gh.tar.gz 4912960 BLAKE2B aef5c2524f2ae122bc0b3846fed94c5d8fad219eab72ba1838baca7ce3e839510b2601b967cfdd1c26e5200f05821ef7892f7445074a09c3dde150f5ab4a8c08 SHA512 688425ee6a62b132b865580bd7615235357963c51a49333bf400d01877728374173ff674c82535f67c86c0abb39acbb4373b4760116c3161b5bb633efc6a9f32
 DIST python-phonenumbers-8.13.16.gh.tar.gz 4913171 BLAKE2B 07bf7c13669554baf6d6250e0e42ca070966d21ec61836d1ec99d5515a283d891ccdb8496c86d82e0c6f1fe1be227e523262f16e5fe0b1a08bfee13a146f6b66 SHA512 6f655621d9e0e3ac9c8b0972118c81104621e4bf45d541606a82f373e59b8a3bd519d93bfb15bb769c7ab04a0abefa1db3d6125bc59f425de49269fce611f176
 DIST python-phonenumbers-8.13.17.gh.tar.gz 4913309 BLAKE2B fdebb1d3df0c397b02499dfe52dcd31c2e900e1b3f1dce1471e709054e2a2a77b77018e297df9706722731c9c740d0f880b042175f21bf84a6c0b37ba7d6b1fb SHA512 37ed31bf8f01c9c18448deded86435ce76f2c07c30edcdc342a41937c2c173dbf2c3cbbfd3ce2e40023eaee72501421d2bb7c398847adafdbaea315528884131
+DIST python-phonenumbers-8.13.18.gh.tar.gz 4914264 BLAKE2B 1bd17f2f8f68e475fcea4f69357001bdb8230827551d33bfec8727d1a04c175c4066c094742d02ad0c610e1ba80b309c3aae17d45ae4f735e620f0abecb3a91b SHA512 1656ce7ef9834f60c386fa3ca26fb9be81d4663ad29b007ddc64104d7678ea529cb2928b75df626076fc9859e36fb210147126fb634c328051d5321f9352c15e
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.18.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.18.ebuild
new file mode 100644
index 000000000000..4ef52501be16
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.13.18.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/prompt-toolkit/Manifest b/dev-python/prompt-toolkit/Manifest
index 04a41c7b03cb..fe9de91e312f 100644
--- a/dev-python/prompt-toolkit/Manifest
+++ b/dev-python/prompt-toolkit/Manifest
@@ -1,2 +1 @@
-DIST prompt_toolkit-3.0.38.tar.gz 422834 BLAKE2B 484ff9414d47f6f2188b8d50c6fcbe16ed850a8be880dfc60e9a3b750a26490f273b118d7bf0f1219530a59998273270b3b210750c35d00d7551ba15bb3f7e64 SHA512 eed2a73501d7ac413986f069564295db9eced3be4853a73c687e511ce1cf8c32c7c9bff4f851787e7910ed05818d4eb39556718c01f30e3ba8bfafe67d631a38
 DIST prompt_toolkit-3.0.39.tar.gz 423068 BLAKE2B d8673b3a9f4eb57c503e85471c13cefdb4f53fad58145d4198cd0f678d3f2d9d72d22d651b239386d8ade29c1fd155a98e80e4002b00ccbbbeff577636b9aa27 SHA512 6aaa80d515cd9731be1cc0de97f679b9dc22701dfb3e23b5434240aae0cac5eaede08437171a710492ff4041a9d46956cf8ed02750e9a78319eb61223033ba90
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.38.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.38.ebuild
deleted file mode 100644
index 6604db0e2d1e..000000000000
--- a/dev-python/prompt-toolkit/prompt-toolkit-3.0.38.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="
-	https://pypi.org/project/prompt-toolkit/
-	https://github.com/prompt-toolkit/python-prompt-toolkit/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.39.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.39.ebuild
index a6b3200f792d..6604db0e2d1e 100644
--- a/dev-python/prompt-toolkit/prompt-toolkit-3.0.39.ebuild
+++ b/dev-python/prompt-toolkit/prompt-toolkit-3.0.39.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index e5f73291743b..d58e5972e327 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,3 +1,5 @@
+DIST psycopg-3.1.10.gh.tar.gz 490875 BLAKE2B 26b82aa34f0eecc3e15943390b74d82e838415564f96d6d11c65d2d705045f78231d7a0275bc74b6a1e095210d249aaaa2e2e59debd4c19cdcfbe348fe598b95 SHA512 37d1d2cbe3956862d3dbecd50505267f89a837e42e188e7ff7295c4e5e0d480efd86019ce5a88cd9b682075e2e99ec9037f83de42cb1f5dbcc370a8d3c90a474
 DIST psycopg-3.1.8.gh.tar.gz 483283 BLAKE2B 29141637c359b5ff8988753ee4e492b0aaf82bfc6445e0c5e1d9ef18f59f09ab071ce9a6183f2d864b62e85a109b24afbdd96248c00c8bb5c01357b06648ebba SHA512 4424305debc7b055fcd19b27714df46d54f8ae38452d8d5a3276df70a6c27e0094081020fdf2c34c73275cb058054414ac80843bb3e6a841bb3556ce39c76287
 DIST psycopg-3.1.9.gh.tar.gz 487052 BLAKE2B 0422742d21b872c927d8df5f85e8e64fbfc912d08db85dbb1675fa64ccec4bd849b05b1f4773898b791edf0fbcd1aa0fe2c8bc210fd1672f70fba24df10b3624 SHA512 84e48b8fa7c8f677e193585e69e31dd43b8b55379f2370753e2af99351be25c2eba0bc66f19cb1ed65b8762123cc7a8d10023810815c53a8c963c6b743822766
 DIST psycopg2-2.9.4.tar.gz 384017 BLAKE2B 4bc0afcc890c8a257c1ccd5c6e4e5301857a80f8b1428aa46c1473c9e18f5d2914a2e592c13336b06106217bb334d9b0321835bdd123f1627cbeb29dedf97bf7 SHA512 259088e42e0ab0d8a1a0ccf04f5e560f32c6179b4a0a0059e91bcf269baa8f4b0f1f949c332c640a2438c927a29b2c144078a861f8e18ba9c764da7c93c73b8d
+DIST psycopg2-2.9.7.tar.gz 383496 BLAKE2B ebec20330ed5e8f1e6190ebbbf9b7a2127e260a3979d63b5dc376843d549412d3b5157a471c00562ff2111c4f3d45c6fd18aa5682368057a90a78a8616eb62be SHA512 77f9136989ce035dc66eec47271bd2e18606db0637eb34300b0b95895358499dae2f5f714ce49d817070f949ec9daa46d221861449cce75225c15c19e757c1a3
diff --git a/dev-python/psycopg/psycopg-2.9.7.ebuild b/dev-python/psycopg/psycopg-2.9.7.ebuild
new file mode 100644
index 000000000000..30dc84653647
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.9.7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN="psycopg2"
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="
+	https://www.psycopg.org/
+	https://pypi.org/project/psycopg2/
+	https://pypi.org/project/psycopg2/
+"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? ( >=dev-db/postgresql-8.1[server] )
+"
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" psycopg2_test || die
+
+	local -x PSYCOPG2_TESTDB_HOST="${T}"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	"${EPYTHON}" -c "
+import tests
+tests.unittest.main(defaultTest='tests.test_suite')
+" --verbose || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/psycopg/psycopg-3.1.10.ebuild b/dev-python/psycopg/psycopg-3.1.10.ebuild
new file mode 100644
index 000000000000..182aefe77346
--- /dev/null
+++ b/dev-python/psycopg/psycopg-3.1.10.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="
+	https://www.psycopg.org/psycopg3/
+	https://github.com/psycopg/psycopg/
+	https://pypi.org/project/psycopg/
+"
+SRC_URI="
+	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${P}/psycopg
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+DEPEND="
+	>=dev-db/postgresql-8.1:*
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-db/postgresql-8.1[server]
+		dev-python/anyio[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# tests are lurking in top-level directory
+	cd .. || die
+
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" test || die
+
+	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# tests for the psycopg_pool package
+		tests/pool
+		# some broken mypy magic
+		tests/test_module.py::test_version
+		tests/test_module.py::test_version_c
+		tests/test_typing.py
+		tests/crdb/test_typing.py
+		# TODO, relying on undefined ordering in Python?
+		tests/test_dns_srv.py::test_srv
+		# timing test, fragile to load
+		tests/test_concurrency_async.py::test_ctrl_c
+	)
+
+	# leak tests seem to be brittle
+	epytest -p no:django -k "not leak"
+}
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 1a63b4186149..7d7dc567ee93 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,2 +1 @@
-DIST pycairo-1.23.0.tar.gz 344623 BLAKE2B e0551e2d4259d509f3165682b11852f28f0df93e6befcd398ef95bc5f0eed0818dc72a05a9b085148d4369e9b3283bc4d91ce032c6c88a3b15962c83eb03db57 SHA512 fc0cc878cc716a6a2baf89a193facfcd89970c884afd3bb9d7fbecf42894ddd191988a8f0fe79100786509f17fbe4f1990eca33a5299414b2df2539d66de5abf
 DIST pycairo-1.24.0.tar.gz 344850 BLAKE2B f1469254ccfcb96ee5e39af49fcae575717e2f0e9a3dc74a13408306b5c94f4557a9c6d6a448541cb1f6dd27781e484b37d5ea9f230dc87f9d3370fac31dfdba SHA512 bbc160bc9c3c9365018c680f6a69347bc222cdaec10ea48d18aedd0341048df74973d3299d783662adf02b414874824660da10943d88f64c30451d3fdccc63fb
diff --git a/dev-python/pycairo/files/pycairo-1.23.0-fix-sphinx.patch b/dev-python/pycairo/files/pycairo-1.23.0-fix-sphinx.patch
deleted file mode 100644
index a86dd935e482..000000000000
--- a/dev-python/pycairo/files/pycairo-1.23.0-fix-sphinx.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/890411
-https://github.com/pygobject/pycairo/pull/318
-
-From 9e78bd1acbaef6659dbe3076934ed779eac27a96 Mon Sep 17 00:00:00 2001
-From: Chris Mayo <aklhfex@gmail.com>
-Date: Sun, 23 Apr 2023 19:44:26 +0100
-Subject: [PATCH] docs: Fix build failure due to extlinks with Sphinx 6
-
-extlinks caption must be None or contain one %s.
-
-Compatible with Sphinx >= 4.0.
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -48,10 +48,10 @@ def exec_module(path):
- ]
- 
- extlinks = {
--    'fdobug': ('https://bugs.freedesktop.org/show_bug.cgi?id=%s', '#fdo-'),
--    'bug': ('https://github.com/pygobject/pycairo/issues/%s', '#'),
--    'pr': ('https://github.com/pygobject/pycairo/pull/%s', '#pr-'),
--    'user': ('https://github.com/%s', ''),
-+    'fdobug': ('https://bugs.freedesktop.org/show_bug.cgi?id=%s', '#fdo-%s'),
-+    'bug': ('https://github.com/pygobject/pycairo/issues/%s', '#%s'),
-+    'pr': ('https://github.com/pygobject/pycairo/pull/%s', '#pr-%s'),
-+    'user': ('https://github.com/%s', '%s'),
- }
- suppress_warnings = ["image.nonlocal_uri"]
- 
diff --git a/dev-python/pycairo/pycairo-1.23.0.ebuild b/dev-python/pycairo/pycairo-1.23.0.ebuild
deleted file mode 100644
index 1b3acd654c08..000000000000
--- a/dev-python/pycairo/pycairo-1.23.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="
-	https://www.cairographics.org/pycairo/
-	https://github.com/pygobject/pycairo/
-	https://pypi.org/project/pycairo/
-"
-SRC_URI="
-	https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=x11-libs/cairo-1.15.10[svg(+)]
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.23.0-fix-sphinx.patch
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
-	esetup.py build_tests
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install \
-		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pydantic/pydantic-1.10.12.ebuild b/dev-python/pydantic/pydantic-1.10.12.ebuild
index f4ac3c801e6d..34decf3331a3 100644
--- a/dev-python/pydantic/pydantic-1.10.12.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.12.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="native-extensions"
 
 RDEPEND="
diff --git a/dev-python/pydantic/pydantic-1.10.9.ebuild b/dev-python/pydantic/pydantic-1.10.9.ebuild
index 2d25b84eec2a..44a2b189b23b 100644
--- a/dev-python/pydantic/pydantic-1.10.9.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.9.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="native-extensions"
 
 RDEPEND="
diff --git a/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild b/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild
index b7fe10487d2f..1c5b50871caa 100644
--- a/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild
+++ b/dev-python/pyflakes/pyflakes-3.0.1-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-python3.11.patch
diff --git a/dev-python/pyflakes/pyflakes-3.0.1.ebuild b/dev-python/pyflakes/pyflakes-3.0.1.ebuild
deleted file mode 100644
index 41dbf40cb173..000000000000
--- a/dev-python/pyflakes/pyflakes-3.0.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="
-	https://github.com/PyCQA/pyflakes/
-	https://pypi.org/project/pyflakes/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyproject-api/pyproject-api-1.5.3.ebuild b/dev-python/pyproject-api/pyproject-api-1.5.3.ebuild
index c47744a9adc3..b35915dd203e 100644
--- a/dev-python/pyproject-api/pyproject-api-1.5.3.ebuild
+++ b/dev-python/pyproject-api/pyproject-api-1.5.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index b9277da7e624..27ebe5527325 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1,4 +1 @@
-DIST pyproject_fmt-0.11.2.tar.gz 12134 BLAKE2B bff72bd12d41f9d9fa7cae82938f6cc921a079e966587a6432f07d17702835863f20e460003cc9321a8465c2e660b7474e0c9f54987b7ee7deaae99dd0e76b56 SHA512 2600212e4afcf238636c7b41a60e9a235a742a923fdcafcb174e08799845797d1813fc61ca56db9ada35def0deb94192180fe4ff15bb6cfa7208e1c1d3b339d0
-DIST pyproject_fmt-0.12.0.tar.gz 13006 BLAKE2B 77581a51f4cf3885ce0e13ba91170406e9f757cf09bad251b5dfe38d209f9efcdaa9909d2d52b21106d5db021bce3e498e67bcf95011155955b821337e9f6e36 SHA512 98c6c8f95032d53f188a2cf85f477aaafdb94b59e3619aab155751f328ff309b959ffb1f1de9b613486486c98abd850396c891c04d5548c93931ead41d742503
-DIST pyproject_fmt-0.12.1.tar.gz 13006 BLAKE2B 435f08e09ce6f28f33ac6b4a8701793622d1b118838babb7166e672776571beaeeeb2f2cc0cec95271abce678fa43f6ab03d616a3c6b86ad0ad3ea2feb3acdb0 SHA512 e48e73770f636f74b1e02b55e8bc3b76de110b72f1dd0f5a1c6d2616c8c64d4651bc99207b41524fce9d15443e69a8ffcc4f646a4aa5d56c515e9ce225391835
 DIST pyproject_fmt-0.13.0.tar.gz 13021 BLAKE2B 911925fb489782af9952cea68105ceeaa62fe96af130688f08892bc6fc701063f0a3b17c079323fd5358999f73fdffff59dbe910ca280cf9a963b2e45c10d22d SHA512 eb97893c9e04edd4667f961cb2232cda1be42f96ae94cd95886e70e48835b0228a0054bb4a75c439deff16990335ef56fbf60b8a0b2530d18856d075d42ff404
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.11.2.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.11.2.ebuild
deleted file mode 100644
index ae7eb6576943..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.11.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Format your pyproject.toml file"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-fmt/
-	https://pypi.org/project/pyproject-fmt/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/natsort-8.3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.12.0.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.12.0.ebuild
deleted file mode 100644
index ddbc1f3f5156..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Format your pyproject.toml file"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-fmt/
-	https://pypi.org/project/pyproject-fmt/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/natsort-8.3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.12.1.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.12.1.ebuild
deleted file mode 100644
index ddbc1f3f5156..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.12.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Format your pyproject.toml file"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-fmt/
-	https://pypi.org/project/pyproject-fmt/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/natsort-8.3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.13.0-r1.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.13.0-r1.ebuild
index 9f7f5ce0da54..cd495d9ed238 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.13.0-r1.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.13.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/natsort-8.3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.13.0.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.13.0.ebuild
deleted file mode 100644
index ddbc1f3f5156..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.13.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Format your pyproject.toml file"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-fmt/
-	https://pypi.org/project/pyproject-fmt/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/natsort-8.3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/referencing/Manifest b/dev-python/referencing/Manifest
index e727fdc1e023..42f90e58f311 100644
--- a/dev-python/referencing/Manifest
+++ b/dev-python/referencing/Manifest
@@ -1,2 +1,4 @@
 DIST referencing-0.30.0.tar.gz 35259 BLAKE2B fe26f83ae6752b35976627c9584980c9f5ee094ce7340ff1724039f641492a6d52eb8031b733256d5a91976a8e6cc545f2e8ae05aa8df3978dc9199117ef2dc2 SHA512 afc709140706f37a6baad5e2293fe3e7f4e214867020ac962e1ee1282777d4e6864037d6d545a0429dd11fd1eb2f91b633192cb0752f4ad4b8d138897ba2a573
+DIST referencing-0.30.1.tar.gz 53193 BLAKE2B 10bb0c85cee6e0ec4c399477b6b06a8e015efbdf1adf5cd32ba5c785711656012d416a7074602b00252e40d3f18375f5b29e8f8fe196126c95a8e7616629d63a SHA512 3da75977003cc950a520af053ec9c83e42704a5566cf74714d977da4316ccf7c89b2d18b8bdc28351b4fe2e992e6812dc214f9c9dcd716dab774b1060382fe7c
+DIST referencing-0.30.2.tar.gz 53386 BLAKE2B 9122194461f7d8c0333ec37d9fe3540f46531215751632f11326850b476d7f78784ac8ca8f963dd31aa2a76337105f625fe6c693a65896af5731e80b2f444be2 SHA512 fd6de21a67f21f39bcf2c6b59b068888cb834710250c0d2ca7ef7dd05a27070c18717383d66824c400118afee6d3ef664e007ad16f9cdcbdcb5b2632152df25e
 DIST referencing-suite-6e126a9fc8f243c4948feb11a7b66efda9d71098.gh.tar.gz 18291 BLAKE2B 89b1ca81ad66b4f89dae37d39cd3d0953ce3cea540d736fa81abff87ad199a5e9e6860c24efbc609c24feb4892331791d6adafeb4fa3c9acea564aff84ee5443 SHA512 5aed034c66c711e9b89280ea1adf08af9aad3d381376f29c4d7a33d69658190d742b51e1b42aef0ec6dd7c8ddbadc3f2c7b09c697f4267fc072a97d750ce5772
diff --git a/dev-python/referencing/referencing-0.30.1.ebuild b/dev-python/referencing/referencing-0.30.1.ebuild
new file mode 100644
index 000000000000..11a0a890e88d
--- /dev/null
+++ b/dev-python/referencing/referencing-0.30.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Cross-specification JSON referencing (JSON Schema, OpenAPI...)"
+HOMEPAGE="
+	https://github.com/python-jsonschema/referencing/
+	https://pypi.org/project/referencing/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/rpds-py-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/referencing/referencing-0.30.2.ebuild b/dev-python/referencing/referencing-0.30.2.ebuild
new file mode 100644
index 000000000000..11a0a890e88d
--- /dev/null
+++ b/dev-python/referencing/referencing-0.30.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 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} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Cross-specification JSON referencing (JSON Schema, OpenAPI...)"
+HOMEPAGE="
+	https://github.com/python-jsonschema/referencing/
+	https://pypi.org/project/referencing/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/rpds-py-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tox/tox-4.6.4.ebuild b/dev-python/tox/tox-4.6.4.ebuild
index 7dea077166bd..34f729d017aa 100644
--- a/dev-python/tox/tox-4.6.4.ebuild
+++ b/dev-python/tox/tox-4.6.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/cachetools-5.3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index c381dbc14c59..260d9a5ce6ee 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,2 +1,3 @@
 DIST wheel-0.40.0.tar.gz 96226 BLAKE2B f4207ab822f037a3d8decc50643ad7e49a632028c712bc33c680d178f10117ff0aa4f2a971bf739a77a76dbf818360d0f628ce997b942ee9d85ec7fac28badc8 SHA512 211e68d927c93b9b2748bf081097d1172cf8d4863d540be72f1d6023b64042410805d4208a2c94de89a1eeb0fb32044e78f41ab58ac94498ac0c489a1eea0d23
 DIST wheel-0.41.0.tar.gz 96943 BLAKE2B 8c0c4509640023c6fea2f680b24707b5ba75da50f54ffc4efe06355dfb6cd06c83fc15763666dc31c6ed83deebe552189bbaeda6fd3cba356a79f71f0992d1f9 SHA512 2e5099f5d512dd8e2205cfefa68e9229a7713367ec367f580021eeb68fb5bc0382bd89a524aa8f0d7617eb26f5d57eaa5e0976d94d042a6ffa20738624d3bae7
+DIST wheel-0.41.1.tar.gz 97605 BLAKE2B 499474c0f8e6cedf68566981b45f47e3460920c4ef0f64780c8b585360633197befe1dca453df68318b152c3912b0f94ce7c830ca08f98740ce63f1be297b2e9 SHA512 706db476563f35d16b6657b81c81290fb684ee0cf4ba54d11faafe00ccbc626b43736dfc59d1f75469f82b4f6006db35dba5d4c9bc2a1a436aeafcbe94386714
diff --git a/dev-python/wheel/wheel-0.41.1.ebuild b/dev-python/wheel/wheel-0.41.1.ebuild
new file mode 100644
index 000000000000..9759993ea368
--- /dev/null
+++ b/dev-python/wheel/wheel-0.41.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="
+	https://github.com/pypa/wheel/
+	https://pypi.org/project/wheel/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unbundle packaging
+	rm -r src/wheel/vendored || die
+	sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
+	sed -i -e 's:wheel\.vendored\.::' tests/*.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index d79ee7d1d133..9548771ac64e 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,2 +1 @@
-DIST widgetsnbextension-4.0.7.tar.gz 1057085 BLAKE2B c9da4af41f1dfa88b4ffe68b295ac95c64db6acbc154e013052bfd32d78211dc74c8c776103700244fbccebba711ceb86571355983b9a1a8840a3266d65a7503 SHA512 b140e9ff419ba51133d532a00f8476124718335a83054270e22ccea83ad2020c20ef09016bd780e133a97dbeae2aebbd45d4a1534912844efb1e83c460834cc0
 DIST widgetsnbextension-4.0.8.tar.gz 1147105 BLAKE2B 295d3bde4197f029c037510eb8579f48fec1d3ccf3a13f54dc900a35fb427dd89324fb65e71b8017770ecb3d9a5b947e06825ee79ed3881bc501fb504b3213e5 SHA512 66d74b213bde9427917c113f6861551f44578e614c3b004b520d765d5d7946f696b719f6383028034164dded2b063f58a0a16aec1152eac125bd7a6ae8dab391
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.7.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.7.ebuild
deleted file mode 100644
index 52c75ecc2ad0..000000000000
--- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="
-	https://ipython.org/
-	https://pypi.org/project/widgetsnbextension/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/notebook[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.8.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.8.ebuild
index fff9268f39cf..52c75ecc2ad0 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.8.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.8.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/notebook[${PYTHON_USEDEP}]