Adding metadata

81 files changed, 957 insertions, 1437 deletions

diff --git a/dev-python/aiodns/aiodns-3.0.0-r1.ebuild b/dev-python/aiodns/aiodns-3.0.0-r1.ebuild
index 6d597add8ed9..0cfb351d30f5 100644
--- a/dev-python/aiodns/aiodns-3.0.0-r1.ebuild
+++ b/dev-python/aiodns/aiodns-3.0.0-r1.ebuild
@@ -22,9 +22,18 @@ RESTRICT="test"
 RDEPEND=">=dev-python/pycares-3[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest
 
 PATCHES=(
 	# https://github.com/saghul/aiodns/commit/146286601fe80eb4ede8126769e79b5d5e63f64e
 	"${FILESDIR}/${P}-py3.10-tests.patch"
 )
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet changed, https://github.com/saghul/aiodns/issues/107
+		tests.py::DNSTest::test_query_bad_chars
+	)
+
+	epytest tests.py
+}
diff --git a/dev-python/constantly/constantly-15.1.0-r3.ebuild b/dev-python/constantly/constantly-15.1.0-r3.ebuild
index 870d97fe86e9..6dc39607b4ac 100644
--- a/dev-python/constantly/constantly-15.1.0-r3.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index f6de871126d2..6c0f78bed4d4 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,3 +1 @@
-DIST dogpile.cache-1.1.8.tar.gz 394499 BLAKE2B 3371e6ffceb6629200a18095a20a313952b8a246d2ec7580e6409bde0f16851f8332922647b92383b47276933cfeb818dde6df48efd2534df0f94cbbc511e01c SHA512 2bacc111e17ecc706b3389f5c40ded888cc893f6d01c34a4e1e0d8d94c4592369b0c283aa80eb6ebec90dde7a89fd3b7fb9bbcbdd8010f90ad7de4501db13ace
-DIST dogpile.cache-1.2.0.tar.gz 258021 BLAKE2B 1173023866891a003314df7999ebe2d5a81836bdef0d495c0f6a635ba76678805866c4acdbc42ffaf18a548a298ea41cfbd649c2638e1ce5c4d8d1014d609730 SHA512 a97b851bd9c541004d701e4564cc641e479d40ab60aa08a48c4617f42ee444cf19e4d7551b76ecbfc16ceef1097d3334d15bd1d0a9b3b6ad15ed4e17149e0864
 DIST dogpile.cache-1.2.1.tar.gz 258589 BLAKE2B c271f823f1a57f26c07078edd9af5a899aa6c3793d979f3eb86cbad7814360d51dc26cdfe06f92f6bbc9a14620362332c22379a6024c9adab18f46c1ad3583fe SHA512 407a0b5842b9ae4a8a82da933b4c7a4fec4391b877dcddb4f454c7fdf78ed0d2f6db16650c89c8047e1ec2eb6348c23bdcae99a0998aa2de58cfc00d92e2fa5a
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.8.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.8.ebuild
deleted file mode 100644
index 6e62e209e2a7..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value"
-HOMEPAGE="
-	https://github.com/sqlalchemy/dogpile.cache/
-	https://pypi.org/project/dogpile.cache/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.2.0.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.2.0.ebuild
deleted file mode 100644
index 1fd73411dc78..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value"
-HOMEPAGE="
-	https://github.com/sqlalchemy/dogpile.cache/
-	https://pypi.org/project/dogpile.cache/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/elementpath/elementpath-4.1.2.ebuild b/dev-python/elementpath/elementpath-4.1.2.ebuild
index 76956a781094..fd833df739ec 100644
--- a/dev-python/elementpath/elementpath-4.1.2.ebuild
+++ b/dev-python/elementpath/elementpath-4.1.2.ebuild
@@ -25,10 +25,23 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest
 
 src_prepare() {
 	# fails for some reason, more fit for upstream testing anyway
 	rm tests/test_typing.py || die
 	distutils-r1_src_prepare
 }
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if [[ ${EPYTHON} == python3.12 ]]; then
+		EPYTEST_DESELECT+=(
+			# sometimes fails with precision problems
+			# https://github.com/sissaschool/elementpath/issues/66
+			tests/test_xpath1_parser.py::LxmlXPath1ParserTest::test_sum_function
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.5.0-r1.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..564b36290e93
--- /dev/null
+++ b/dev-python/flask-gravatar/flask-gravatar-0.5.0-r1.ebuild
@@ -0,0 +1,35 @@
+# 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} )
+PYPI_NO_NORMALIZE=1
+PYPI_PN="Flask-Gravatar"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
+HOMEPAGE="https://github.com/zzzsochi/Flask-Gravatar/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	sed -e 's:--pep8::' \
+		-e 's:--cov=flask_gravatar --cov-report=term-missing::' \
+		-i pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cd tests || die
+	epytest
+}
diff --git a/dev-python/flask/flask-2.3.2.ebuild b/dev-python/flask/flask-2.3.2.ebuild
index 42ed25f381b7..3ec91118c391 100644
--- a/dev-python/flask/flask-2.3.2.ebuild
+++ b/dev-python/flask/flask-2.3.2.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
-		!!dev-python/shiboken2
+		!!dev-python/shiboken2[${PYTHON_USEDEP}]
 	)
 "
 
@@ -53,6 +53,13 @@ distutils_enable_sphinx docs \
 distutils_enable_tests pytest
 
 python_test() {
+	local EPYTEST_DESELECT=()
+	if [[ ${EPYTHON} == python3.12 ]]; then
+		EPYTEST_DESELECT+=(
+			tests/test_basic.py::test_max_cookie_size
+		)
+	fi
+
 	epytest -p no:httpbin
 }
 
diff --git a/dev-python/greenstalk/Manifest b/dev-python/greenstalk/Manifest
index 886de67f0935..3ce25cf08829 100644
--- a/dev-python/greenstalk/Manifest
+++ b/dev-python/greenstalk/Manifest
@@ -1,2 +1,3 @@
 DIST greenstalk-2.0.0.gh.tar.gz 13280 BLAKE2B 510b84d7dd48e0f5c9fb46ec0158473623a9e4c570e1c72db45802fce7a61b99c8f15f87d6711fa7540e6e2b6d4a846194adc28e2696400c45dc6692747f41fb SHA512 4d338bccb09b7c17c0216ce9cc4c1c9c896d15327053adc248404140ded27df6969fc8f0807120ec9417676ead57395185fb9fc5d826f49a1a1ee473aabbb048
 DIST greenstalk-2.0.1.gh.tar.gz 14355 BLAKE2B 72bb2b85b8054d3c7489eb22883d1dd1b74505de231e464ca1d962ef02df5431663da3d511f3e47c6ec3e1946c30888f2c12436e5bc3fa922d396384ec6c69f5 SHA512 d78694e0828504e7bee75c0a05ee910916310cc6a2f30ae43846350e68e39b2e262b57cb32fa106ae0dfb280ffb8569fb7c03137154d52fc85d586c7ffbccb92
+DIST greenstalk-2.0.2.gh.tar.gz 14352 BLAKE2B a938d5a3b9a55bd7ad50001c6fef7c34ac9ddc8a4425dd0880f2a1c904bf67d459eea2e4935748aa8bf419fa4eba23e570a23e59c44c05e9ae15ccde175efd35 SHA512 50016b9cfe01c5ab9d50f4a5766a57a436ca7a4d3488dcf0db6ea54c1b3880574ccb9c56664dc62ca6c0173b37ddfd1680af765ce7df5b5d84d0ddeab3ae2b7c
diff --git a/dev-python/greenstalk/greenstalk-2.0.2.ebuild b/dev-python/greenstalk/greenstalk-2.0.2.ebuild
new file mode 100644
index 000000000000..3286f6090e1d
--- /dev/null
+++ b/dev-python/greenstalk/greenstalk-2.0.2.ebuild
@@ -0,0 +1,36 @@
+# 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="Python 3 client for the beanstalkd work queue"
+HOMEPAGE="
+	https://greenstalk.readthedocs.io/
+	https://github.com/justinmayhew/greenstalk/
+	https://pypi.org/project/greenstalk/
+"
+SRC_URI="
+	https://github.com/justinmayhew/greenstalk/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		app-misc/beanstalkd
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests.py
+}
diff --git a/dev-python/httpbin/httpbin-0.7.0-r5.ebuild b/dev-python/httpbin/httpbin-0.7.0-r5.ebuild
index b80de7ffe342..22f39e31b0b0 100644
--- a/dev-python/httpbin/httpbin-0.7.0-r5.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0-r5.ebuild
@@ -50,6 +50,10 @@ src_prepare() {
 	sed -e 's:test_redirect:_&:' \
 		-e 's:test_relative:_&:' \
 		-i test_httpbin.py || die
+	# broken
+	sed -e 's:test_digest_auth:_&:' \
+		-e 's:test_base64:_&:' \
+		-i test_httpbin.py || die
 
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/hypothesis/hypothesis-6.75.6.ebuild b/dev-python/hypothesis/hypothesis-6.75.6.ebuild
index cd0956034706..8db36527a43b 100644
--- a/dev-python/hypothesis/hypothesis-6.75.6.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.75.6.ebuild
@@ -67,20 +67,10 @@ python_test() {
 		)
 	fi
 	if [[ ${EPYTHON} == python3.12 ]]; then
-		# these look serious but affect hypothesis only partially,
-		# i.e. many revdeps will still work and since this is a test dep,
-		# we don't need it 100% perfect
-		# https://github.com/python/cpython/issues/105013
-		EPYTEST_IGNORE+=(
-			tests/cover/test_type_lookup.py
-		)
 		EPYTEST_DESELECT+=(
-			hypothesis-python/tests/cover/test_complex_numbers.py::test_allow_subnormal
-			hypothesis-python/tests/cover/test_lambda_formatting.py::test_can_get_descriptions_of_nested_lambdas_with_different_names
 			hypothesis-python/tests/cover/test_lookup.py
-			hypothesis-python/tests/cover/test_targeting.py::test_disallowed_inputs_to_target
+			hypothesis-python/tests/cover/test_type_lookup.py
 			hypothesis-python/tests/cover/test_type_lookup_forward_ref.py
-			hypothesis-python/tests/cover/test_uuids.py
 			hypothesis-python/tests/quality/test_discovery_ability.py::test_one_of_flattens_filter_branches_{1..3}
 		)
 	fi
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index e3bc5a358deb..b9561176afd5 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -2,5 +2,6 @@ DIST imageio-2.27.0.gh.tar.gz 405391 BLAKE2B f013de16f460e04f5d30c7bcc3c64dc05cd
 DIST imageio-2.28.0.gh.tar.gz 406506 BLAKE2B 4021f872cd156461f216047d612ee985779e3cd1bb4d05e82ed12eb7582737ca60d1462a4d8fadeb56dd2aa197763f70f9aac5a1dced884276cf13bf43fdb990 SHA512 ba3aad7e32dd0468b9fc8ddc76c79b89be3e805a0d903b5fe6ff2279996db288b6809be6bc231f95751e1f55c8b12dedaa8b6c7635ba24a43f902f41f9bccf0d
 DIST imageio-2.28.1.gh.tar.gz 408022 BLAKE2B f2ee9f9e7daa875393c0f3fe11539cb50bc56e88aeb3d0362e1cf5aa01322c2a211779d2b142d95ed483a53a896605b2e0c557d5d05c4e295c8d3a403a392f31 SHA512 82b14db674de5b03b5f303acabfb94768278b635fe70fd09623c73ec5dcad5965ad7341a07cc41af71bbb0e5548bc4d79d20e510095a2bbaed50061b435bfc7a
 DIST imageio-2.29.0.gh.tar.gz 410455 BLAKE2B 537f732383b7fa90b07c66c37c1f4f4d6f8934df990730b35c2232088f6a177c971247551c8019c9f4d5ee0b70fd0a7af308530368f2a29a01675585d8119bfd SHA512 3214274ead4b84a88a3bf40eb6e6ae4b0b7fa2819ae87ff3aa2cf9b19b3c57b6217d88bf9a81609ea746ac534061642164c9c5780388a6f6c7c6f4431459d0a5
+DIST imageio-2.30.0.gh.tar.gz 410664 BLAKE2B d577b7031228528545575f605c76bf504ad035bb87057917e1761e55a4975a3b6a051787f494374c49db2e7a727a5c39cbb41753c1a92fcbc8d78dd2b28bc584 SHA512 a72e64a0240b72e56b6172dded67754890ffeda9b67f5740467e51bc9fa019b4c987baad0545c04ddcba8151f9484c49064d826e73fa03772dcf082eee7b514c
 DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27
 DIST imageio-cockatoo.mp4 728751 BLAKE2B 45b22cd517c1cb7c0cd12f8865facaca6a847047aea716e49633cf2b1dc13826f94787c8a8f9dd5f48c6a896f5d37794c0058da1bde9e1469f196916476dbfa2 SHA512 e9cb7c25de8019c59ba4090cf10ab29f2b5d62ada37a877081ca07d2ecfe010036222ae843b41bbcc843130d97fa5e14421de252639e9481df1d1c27b19add49
diff --git a/dev-python/imageio/imageio-2.30.0.ebuild b/dev-python/imageio/imageio-2.30.0.ebuild
new file mode 100644
index 000000000000..b2c6261b94ce
--- /dev/null
+++ b/dev-python/imageio/imageio-2.30.0.ebuild
@@ -0,0 +1,82 @@
+# 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
+
+BIN_COMMIT=224074bca448815e421a59266864c23041531a42
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
+			-> ${PN}-chelsea.png
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
+			-> ${PN}-cockatoo.mp4
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+	test? (
+		dev-python/fsspec[${PYTHON_USEDEP}]
+		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		# block silently downloading vulnerable libraries from the Internet
+		"${FILESDIR}"/imageio-2.22.0-block-download.patch
+	)
+
+	if use test; then
+		mkdir -p "${HOME}"/.imageio/images || die
+		local i
+		for i in chelsea.png cockatoo.mp4; do
+			cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
+		done
+	fi
+
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+	# Tries to download ffmpeg binary ?!
+	tests/test_ffmpeg.py::test_get_exe_installed
+	# blocked by our patch
+	tests/test_core.py::test_fetching
+	tests/test_core.py::test_request
+	# known broken
+	# https://github.com/imageio/imageio/issues/890
+	tests/test_freeimage.py::test_exr_write
+)
diff --git a/dev-python/incremental/incremental-22.10.0-r1.ebuild b/dev-python/incremental/incremental-22.10.0-r1.ebuild
index 5785730b2c3e..f65dcaffbc63 100644
--- a/dev-python/incremental/incremental-22.10.0-r1.ebuild
+++ b/dev-python/incremental/incremental-22.10.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/twisted/incremental https://pypi.org/project/increm
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/intervaltree/intervaltree-3.1.0-r1.ebuild b/dev-python/intervaltree/intervaltree-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..f8064cb414bf
--- /dev/null
+++ b/dev-python/intervaltree/intervaltree-3.1.0-r1.ebuild
@@ -0,0 +1,19 @@
+# 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="Editable interval tree data structure for Python 2 and 3"
+HOMEPAGE="https://pypi.org/project/intervaltree/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index ad59b0fee185..a7ea88a639d4 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,4 +1 @@
-DIST ipython-8.12.0.tar.gz 5465154 BLAKE2B 946d3e649dcf8eea3518ed68499cfcaa6caa7eac99aa21c05fcbb81338037151253ba84d8d942746600dad3883f6d0e8ba1e82e9932cdddc8e1e77a270573ebf SHA512 3e9a42a6fb34a46d32d1236eac99182a756db2ec7b57c77dbedff1e4b25bcf2ef37effe4e5575cda450a1cde77e3c0d24172dcf19d102110a1ac75b9cfe9272c
-DIST ipython-8.13.0.tar.gz 5467133 BLAKE2B 038b4af8c5f9b32c9a2a1152e9a48131ae46f2903435f50fe67aeabfed7d34daf3f3439af372e561812c88bd6b90d7c729d4d876fe8b6e093582004def5058b7 SHA512 df71a2d30c3e88be89126b7f7178b45377b32c54ed78af0f3dda2612ccdbf7a55f23ccfe8293e50b063f47ecdcab6ff4454855bdabd5c1a45c4e573fd7a7b6d4
-DIST ipython-8.13.1.tar.gz 5467211 BLAKE2B 6d09ba56acbb20b367a1e3be163a63343f56fad7d62c2ec76c9ae2012d5884f534ae9e9eaac501cbc94c3d4ffb6eb599eb568d5fa57ab3af56efeec8d094343b SHA512 370512abc8fbe2c512b33167b8feded2b1177d9c194e60c912ee20e6286f90b20abb3982945f691c19cf0391dd556396d3df8755d5cd72fbbb5babe5f034a3d5
 DIST ipython-8.13.2.tar.gz 5467542 BLAKE2B dd924954c93eadc844e75cbfe95627f84120a120a7f69a2bd767c8506fe95ddac912ec9e55cad9ed1149369aec699e0e159f02b7a69ea4ec041e4af6677355ee SHA512 43bbc1669dffad690ee34c0455ca8ea66d30d6249d5c743c7cc100c0a218408761bce9cb798333bf7e7b0c03507009bcb8e1550bcd5be71680f30f822f9376bd
diff --git a/dev-python/ipython/ipython-8.12.0.ebuild b/dev-python/ipython/ipython-8.12.0.ebuild
deleted file mode 100644
index aab38ab1ea02..000000000000
--- a/dev-python/ipython/ipython-8.12.0.ebuild
+++ /dev/null
@@ -1,159 +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='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature pypi virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="
-	https://ipython.org/
-	https://github.com/ipython/ipython/
-	https://pypi.org/project/ipython/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc examples notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.38[${PYTHON_USEDEP}]
-	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/stack_data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.9)
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-python_prepare_all() {
-	# Remove out of date insource files
-	#rm IPython/extensions/cythonmagic.py || die
-	#rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-		IPython/terminal/tests/test_shortcuts.py::test_modify_shortcut_with_filters
-	)
-	# nonfatal implied by virtx
-	nonfatal epytest || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-8.13.0.ebuild b/dev-python/ipython/ipython-8.13.0.ebuild
deleted file mode 100644
index 1aaaa18f9562..000000000000
--- a/dev-python/ipython/ipython-8.13.0.ebuild
+++ /dev/null
@@ -1,159 +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='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature pypi virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="
-	https://ipython.org/
-	https://github.com/ipython/ipython/
-	https://pypi.org/project/ipython/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc examples notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.38[${PYTHON_USEDEP}]
-	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/stack_data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.9)
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-python_prepare_all() {
-	# Remove out of date insource files
-	#rm IPython/extensions/cythonmagic.py || die
-	#rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-		IPython/terminal/tests/test_shortcuts.py::test_modify_shortcut_with_filters
-	)
-	# nonfatal implied by virtx
-	nonfatal epytest || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-8.13.1.ebuild b/dev-python/ipython/ipython-8.13.1.ebuild
deleted file mode 100644
index 1aaaa18f9562..000000000000
--- a/dev-python/ipython/ipython-8.13.1.ebuild
+++ /dev/null
@@ -1,159 +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='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature pypi virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="
-	https://ipython.org/
-	https://github.com/ipython/ipython/
-	https://pypi.org/project/ipython/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc examples notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.38[${PYTHON_USEDEP}]
-	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/stack_data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.9)
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-python_prepare_all() {
-	# Remove out of date insource files
-	#rm IPython/extensions/cythonmagic.py || die
-	#rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-		IPython/terminal/tests/test_shortcuts.py::test_modify_shortcut_with_filters
-	)
-	# nonfatal implied by virtx
-	nonfatal epytest || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/jupyter-lsp/Manifest b/dev-python/jupyter-lsp/Manifest
index f97188430438..a760b049b301 100644
--- a/dev-python/jupyter-lsp/Manifest
+++ b/dev-python/jupyter-lsp/Manifest
@@ -1,2 +1,3 @@
 DIST jupyter-lsp-2.0.1.tar.gz 43962 BLAKE2B 0a030542297c6a311ca2b9a681acf4ae4d196ebaee342fa44a7a5b0c9a3788aecdb7b6a60a4653114ae6c5a69f4da9108a831eda72401643b8bb34cad6d3de43 SHA512 539851c567cf0dfa08c9658fe98941a8aaa90f625cba1d231d54fe3f4e19cbd9f14fc5b54c39798af1d1da40075dbaa7f43e95517934571391c488639f9c66b3
 DIST jupyter-lsp-2.1.0.tar.gz 44667 BLAKE2B 751dcc2d45641b3e4efe949a5e89e7f8bbd95d1d543db32fa5878fe3b30a6569056da7b7cb447f6ffecdb035c88e47ab1e734ba2ff6aa1d16ec248590ff6122b SHA512 296ef188bc353dabb65507f0a303e20aacc30a09cdd0952bc031397b7317b0f0cf314f7320c876ff74b58a9906d5ae4413988009faa4ecee090213aef9d4a620
+DIST jupyter-lsp-2.2.0.tar.gz 45769 BLAKE2B 7004a1bc6b8ece280df1bb54a80ca8b7d93a4995a92c909dcc7f6193500b1881ca5beb6fc3b0c1a4e7659465216b05b4ee7b83b1d2973fce5b74a304e87e3fd4 SHA512 0f6d844be172054eed7599eb5f2c2be4c1ebb749176af3f08aa3327849fa045de2b8f9003c67188ed0f1b7ba2e28f1223d0dcca008eaa528caacf38a95c3f59b
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
new file mode 100644
index 000000000000..f61d0b25f3de
--- /dev/null
+++ b/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYPI_NO_NORMALIZE=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab"
+HOMEPAGE="
+	https://github.com/jupyter-lsp/jupyterlab-lsp
+	https://pypi.org/project/jupyter-lsp/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.1.2[${PYTHON_USEDEP}]
+"
+
+EPYTEST_DESELECT=(
+	# Not packaged
+	jupyter_lsp/tests/test_detect.py::test_r_package_detection
+	"jupyter_lsp/tests/test_listener.py::test_listeners[bash-language-server]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[dockerfile-language-server-nodejs]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[pylsp]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[sql-language-server]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[typescript-language-server]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[unified-language-server]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-css-languageserver-bin]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-html-languageserver-bin]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-json-languageserver-bin]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[yaml-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[bash-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[dockerfile-language-server-nodejs]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[pylsp]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[sql-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[typescript-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[unified-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[vscode-css-languageserver-bin]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[vscode-html-languageserver-bin]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[vscode-json-languageserver-bin]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[yaml-language-server]"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not depend on pytest-cov or flake8
+	sed -i -e '/--cov/d' -e '/--flake8/d' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	optfeature "Language server for Python" dev-python/python-lsp-server
+}
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index a11d7c268c91..e9da2ac43cac 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1 +1,3 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
+EBUILD langdetect-1.0.9.ebuild 493 BLAKE2B 0df8bce19bc80f79f8e76bcef5a4c2caf333365fe0cb9a3c076b7858bceded5a3e58921474f866a2709dd657b7ed330c1ec4a7f9d7bab0fcf1bc92d77cabc32d SHA512 ea2a1adcb133ac5fc951ba1aa90ef1ce3dfcc424e59727591763d4875aa044a74188be2d15fd89c6b2e83ed6ea04ec3d9851ed584ae79d2c2c127bde7d994b48
+MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index ddb5b0f1787e..020e07f2a3dd 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -2,9 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>cyber+gentoo@sysrq.in</email>
-  <name>Anna</name>
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
  </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
+ <upstream>
+  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
+ </upstream>
+ <origin>slonko-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/mkdocs-i18n/Manifest b/dev-python/mkdocs-i18n/Manifest
index 71a49db06635..a7068f584f93 100644
--- a/dev-python/mkdocs-i18n/Manifest
+++ b/dev-python/mkdocs-i18n/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-i18n-0.4.4.tar.gz 17191 BLAKE2B 4ab926befac2c90b6b9ff55fd6887c8b78e88f801c820749df125ea97418fbfb0a8531b2168b508737e7dffbf426826433211ee80f25b80a42ae160f78a93670 SHA512 f9f27c0f274aa7ee5c64cee46d4165d51022cac0171f95a238b62c911e1be16b6a4ff227fea3b78de2ffa0095b9c95280e8919e207e6947db300a136fe16e659
 DIST mkdocs-i18n-0.4.5.tar.gz 17228 BLAKE2B 19d6af2d96cd67d4b39e210f20113e75a6c47a413639f2d6c218cbf11709f91197d79df2c0ecfffe8a2e0912613178564e73eccdf15cece82d71b0639641940e SHA512 18c28704d1d0e294dfcfef402959e502c96b0e8fe346ba3f0c2ff49d70a67f3fe1254fcd1bcbf4217182e946b9f86f61d8d5b9c9475334c6f464feb696d0134e
diff --git a/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild b/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
deleted file mode 100644
index 56ee53995cef..000000000000
--- a/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.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"
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="MkDocs i18n plugin"
-HOMEPAGE="
-	https://gitlab.com/mkdocs-i18n/mkdocs-i18n/-/tree/main
-	https://pypi.org/project/mkdocs-i18n/
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
-	dev-python/mkdocs-material[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/nbxmpp/Manifest b/dev-python/nbxmpp/Manifest
index cad19b83deea..5d59a70bcf34 100644
--- a/dev-python/nbxmpp/Manifest
+++ b/dev-python/nbxmpp/Manifest
@@ -1,3 +1,4 @@
 DIST python-nbxmpp-3.2.5.tar.bz2 132029 BLAKE2B 846f3b47c3a9a95cf1fa1b557a007fd4901fb4acaa3160ea4b9b1cdff1e9d2c3e64bc5251b739d816f3f1c449c350d1ac44c14cbef87d14fe5a6450418451007 SHA512 577f8c7b0f5a7c69b4d980bff93f0a208ab0a660d731eb95ec63b76583194b94bd9d9f6b10fcac3951a6e6afb5d0c4da2140cbc17ef653f19ec6957b5d2e5f04
 DIST python-nbxmpp-4.2.2.tar.bz2 133951 BLAKE2B 4ef9d7a6b2f1a548eac3d97eee322badbce5c69114441145ee525df45c5291771de3171e6591c0962dfe077fd9bc9fc83b8caeaefaeb13e0eb65b4ebcb5d37c7 SHA512 6edf469354ad1bb1eeb2545f67b4e7cf2362becfb2cc8c2caa6f050d56c0c15ac2fd29d52095d673199da7170ccfddbf7e8d8f98c47882ab75d14d19f71a81d9
 DIST python-nbxmpp-4.3.0.tar.bz2 135597 BLAKE2B e0d193bc8c99aa473c013607d341b4b0adc8a3639f8f51c2d00ac8f7d5fbd779540f791d44e685f54e46b3df140c18611fe252bdaad7cb5e650318ac8cdfd70f SHA512 da1fc22d51d7ffbe5a1df5fffd33c16c131348713f6e56b1d654d3f3c0e30e9dae9745ff6f20148e746205b74e8180dbf322e5f603475d85779ab2e075d22835
+DIST python-nbxmpp-4.3.1.tar.bz2 135981 BLAKE2B eb14bf40448fc49cd2656d4ffdafcbe66e4d91d371377f976cc1030067830f47cdd1a27b7c28f0d0a7a4292225913e55db12b6dfb7cc2e5f4ffe230f3aef0e51 SHA512 da69a54efed5c906d8c6e5a093254c0b86d21071403838c2cf969b2d969ea4647c3153fdc4231efa5ecce00eff8989a83e818e9ff7590964d25167878ae93adc
diff --git a/dev-python/nbxmpp/nbxmpp-4.3.1.ebuild b/dev-python/nbxmpp/nbxmpp-4.3.1.ebuild
new file mode 100644
index 000000000000..cd44bc48aeba
--- /dev/null
+++ b/dev-python/nbxmpp/nbxmpp-4.3.1.ebuild
@@ -0,0 +1,35 @@
+# 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-nbxmpp-${PV}
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="
+	https://dev.gajim.org/gajim/python-nbxmpp/
+	https://pypi.org/project/nbxmpp/
+"
+SRC_URI="
+	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${MY_P}.tar.bz2
+"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	net-libs/libsoup:3.0[introspection]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/precis-i18n-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.42[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/notebook-shim/Manifest b/dev-python/notebook-shim/Manifest
index 4a62ab819254..d0da0f05cc7e 100644
--- a/dev-python/notebook-shim/Manifest
+++ b/dev-python/notebook-shim/Manifest
@@ -1,2 +1 @@
-DIST notebook_shim-0.2.2.tar.gz 12947 BLAKE2B 5a04944be3f8de7bd7b1c10f59d73869b7aed670c3afebf79e7780d5992f9af2929529498604c1a5c0d164467681ffa0e8924e1c9a7945e52ae353bdb710c7bc SHA512 42cf9153495e4ab8230ef560d36381a5aa1d9bbd583ed140e04e9850f4a82bab06ecf36e45b88595e8686d8122c9a52eee8133a7f1b622d75d326ebf36519d30
 DIST notebook_shim-0.2.3.tar.gz 13082 BLAKE2B 5e988605ee01a49f31bf2dcdbe86d2f8e12f3e314d962f619068c57b13ed144643db1b08d5afed7a91ddfcde82497e49fe643d9fdd1c43a9535d7468794dfe7e SHA512 87114ea915ab5160b11023dddcc622aafba315fe07de21cedbed1e374ec2406eba378575e903377dbb9cc69e7449eb184cb0420513b7dc05078af0e91bc5f884
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
deleted file mode 100644
index b5fc5146e622..000000000000
--- a/dev-python/notebook-shim/notebook-shim-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_PEP517=hatchling
-inherit distutils-r1 pypi
-
-DESCRIPTION="A shim layer for notebook traits and config"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/notebook_shim/
-	https://pypi.org/project/notebook-shim/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-1.8[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_tornasync.plugin
-}
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 72db3fd2e90d..51fd4ed84dd1 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1 +1,2 @@
 DIST openstackdocstheme-3.1.0.tar.gz 1256193 BLAKE2B 53bdd85094a74344154dd4a25f2d29142be12000f5b38c8d723ce800794677972215b6402d35fe9385ede246efd4111d457ccb2d04eb540fcbaea5cf92382c04 SHA512 654859f40779e1d285b08b12c040b016a066a62e0a6eacad3c5a271ee40ba1147650ca1b95ac68a4fe254a296948f3ae30803cd26f9f67f1be944683fe24445b
+DIST openstackdocstheme-3.1.1.tar.gz 1256245 BLAKE2B e0f1a9b13fe7e28e851eddcbf73a87b28509b9ea3d597a4680b3c8b39d309700f7fde8cf9fe9a63d6ec7210e505d24d541e1592553b8a8c9cd85b38de09a4442 SHA512 b620486617f5ab2e5ce149030a9bd79408a856709603725b2e17400253aaadee732c2ea5954d80c9ab384ac266d85e7e6698f3b525115183b38693718b3f195b
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.1.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.1.1.ebuild
new file mode 100644
index 000000000000..b7adeb3f84e8
--- /dev/null
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.1.1.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=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Theme and extension support for Sphinx documentation"
+HOMEPAGE="
+	https://docs.openstack.org/openstackdocstheme/latest/
+	https://opendev.org/openstack/openstackdocstheme/
+	https://github.com/openstack/openstackdocstheme/
+	https://pypi.org/project/openstackdocstheme/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~x86"
+
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${BDEPEND}
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index ff208318fc6d..dce91e2a895e 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,3 +1 @@
-DIST openstacksdk-1.0.1.tar.gz 1118637 BLAKE2B d4677a3a5595bf871fc0b380f1cadfd56ebba14bc2255fcc6a6a4813c5c79807a1a0a76263844728f256704b2966b82be9bd6e968de9e7e85f411402f428cb78 SHA512 9871a262113b4396b3a5181e93d2e00312c5a80933c3ff6efa501a4b4d7d145985f54203eeb6e1f50c5593ba491b13a631b9293759e0615bf0eda393c247a4d3
-DIST openstacksdk-1.1.0.tar.gz 1141513 BLAKE2B f4c052ffa1efc36dfb355b50853d75ceddc5a3a361a8a8749bc51d55530dba465df451c7bf7154081130ca4d2d798e8c96b7230d4317bb9ebb96a9add410b501 SHA512 3c91a6a797c966bbf08dc51f013004c8ab9148dcd3a6fad4584fb40c256696a7ea02f241bc7ea1a3fbc56a7ec790dfd1900c0da54081c3d64f5077273d4e0835
 DIST openstacksdk-1.2.0.tar.gz 1160015 BLAKE2B d3ed5b9415715faf6d9cae225e2a8e7c3bd69907599fd2683f53e2070513a1f27aaae2d2f4aa40ada26ff819b5f8238c09e208243197165aa52f19776e53fc7c SHA512 4ce118b8b19b495f333f76cb416d2b4cc2c9ea835979cf67e83f6f7f40df13d29e19ed054a2f3ee469e6c5496da4a7a11193e4815b20195b28ba4c48263b6c1c
diff --git a/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild b/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
deleted file mode 100644
index 3ba28fe7fb8c..000000000000
--- a/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
+++ /dev/null
@@ -1,84 +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="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="
-	https://opendev.org/openstack/openstacksdk/
-	https://github.com/openstack/openstacksdk/
-	https://pypi.org/project/openstacksdk/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/openstacksdk/openstacksdk-1.1.0.ebuild b/dev-python/openstacksdk/openstacksdk-1.1.0.ebuild
deleted file mode 100644
index 90a810d51d04..000000000000
--- a/dev-python/openstacksdk/openstacksdk-1.1.0.ebuild
+++ /dev/null
@@ -1,84 +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="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="
-	https://opendev.org/openstack/openstacksdk/
-	https://github.com/openstack/openstacksdk/
-	https://pypi.org/project/openstacksdk/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index 999a847969a2..f27a864b0f75 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,2 +1 @@
 DIST Pallets-Sphinx-Themes-2.1.0.tar.gz 21908 BLAKE2B 941aebe8b596b606ee02ee3d5e82019a09536175b7350484af5d072d5ce990271f93d1c9fcafbd33023145e23dacf2b844ccb117984b1262d073e2cff4b03f7d SHA512 3d2528cdc98a0da05410239875ff0295d4b68a15fce77890d6f1a6b4b59aee3f9c9b4c7e786b0945a8a7c549d24c1c206227ef751c1aa9fa90104509a912e167
-DIST pallets-sphinx-themes-2.0.3.gh.tar.gz 20835 BLAKE2B 72cea4f0dd6e6b6e862f187c492b892a6646f4db4b57031ae9c3dbac0aca7fe14df0637d6aa41a6e26bfe493839cd20064f2310c628823a70940e4a57e49ffd2 SHA512 a7c84effe85eb56001dab8b326d0160442aa63397d9ae2d0dff9ec85352ee3896a0cd1423b09b99d764290602ec67e0dc3f4b4aaad186a274d5cd74827c525ce
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.3.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.3.ebuild
deleted file mode 100644
index 961845ed95df..000000000000
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.3.ebuild
+++ /dev/null
@@ -1,29 +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
-
-DESCRIPTION="Sphinx themes for Pallets and related projects"
-HOMEPAGE="
-	https://github.com/pallets/pallets-sphinx-themes/
-	https://pypi.org/project/Pallets-Sphinx-Themes/
-"
-SRC_URI="
-	https://github.com/pallets/pallets-sphinx-themes/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index 90ff1b0efb2e..47a59d6061e1 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,2 +1,3 @@
 DIST pip-run-10.0.7.tar.gz 32869 BLAKE2B ea5dfea09def536eced9436a114f12cbefccf26c4b37376a560dc1fffdd8167d019ec52d57666d7b4d77dc9c580a5f48455d945aa9ddb4340a7dca88f0ded309 SHA512 cd8780372f579005e40c77b3c2d9e582cd1a144e871eec205fd0bd2ff64eac837918211d3479088f56bd3043dbfd883502b2d6f7b01dc24448888f65fdd6920b
 DIST pip-run-10.1.1.tar.gz 33010 BLAKE2B 5a3dcd1e119b65718b465ecbd118d80de776252ecbd438344eb78abc2e4a69073417310ed096f0b604740762aa24af2788041476c93d919ea72812e1597327f5 SHA512 ddf61aa31012567ff21e943739a1e29066875db3c39ca77abfa409fd75abc599756ca8aeaf9bd23d19af46ad2747e7dec4a7d3cf76a444f59c19e769419dc59a
+DIST pip-run-10.2.0.tar.gz 33523 BLAKE2B 7d19c089da98dbba2faec969f490fcd5ea48881f4ccbbfaa283465ef083521aee7d82b9de8b03a89ec8b08005db1232cd9577030cb98c111b4a0e0f7294cca84 SHA512 b26a00c6ebd8e9e505e6b218fea7070b23b5926de44e1d5a762abb2a4ebd62b1bdda7e19c4092012daf068b518a2e127ab08099f6d1a7ddc643b3ba5bf999ed0
diff --git a/dev-python/pip-run/pip-run-10.2.0.ebuild b/dev-python/pip-run/pip-run-10.2.0.ebuild
new file mode 100644
index 000000000000..d754f56026d7
--- /dev/null
+++ b/dev-python/pip-run/pip-run-10.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Install packages and run Python with them"
+HOMEPAGE="
+	https://github.com/jaraco/pip-run/
+	https://pypi.org/project/pip-run/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/autocommand[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib-resources[${PYTHON_USEDEP}]
+	' 3.8)
+	dev-python/jaraco-context[${PYTHON_USEDEP}]
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.3[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/path[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jaraco-path[${PYTHON_USEDEP}]
+		>=dev-python/jaraco-test-5.3[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/nbformat[${PYTHON_USEDEP}]
+		' python3_{10..11})
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=()
+
+	if ! has_version "dev-python/nbformat[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/test_scripts.py
+		)
+	fi
+
+	epytest -m "not network"
+}
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 4e9786ade267..cb4030d6c0e0 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,5 +1 @@
-DIST platformdirs-3.2.0.tar.gz 15017 BLAKE2B ce9f180965e0736ae83170b3a055dbb58e2ce59b84a414cd212f0f2f27a6a0a194636d315a30e344046ee1da85f2de3d2e7c58c02a329c4a36129fa617d8feb6 SHA512 2e4613f563b7014b526e1f81f561726a0060983b0e998ce46d070b2f4f4ec26ad46d6a3cd242fb14a420e6439207b9c9eeb31daac7ec65005abc3a74131e5cf8
-DIST platformdirs-3.3.0.tar.gz 15459 BLAKE2B 46b59ce32b262feef1e045803b79c64ade18917dac34b11bd34ec8a6c872e9871df948532e10a8c4ebfbfddf2592243d8f8be6b24a84e75c08c5948068337f94 SHA512 c7530daf27072b0dea2d9bdb2fd764fb1f19daa735b199d3361579ffed709ba55392502600f73b8433e2651d36711dc264cf60a6fa50f29d9249b1e9808e35a3
-DIST platformdirs-3.4.0.tar.gz 15735 BLAKE2B 6297b04dd8720ffa0af1899c2c8081c836d23d0526e6510a81fa727ca42d5006709d6e8bd583f09aade09f603c4489e21468b8c66d848220c8c6f1de37535e97 SHA512 e98648b5065cdb3b75c183548b4143c6564292e4ec283710490fd019a2e72f6207ac6af6617e192aadf17b521eebc18126bf4b69fac227ac3cda4b768ce109da
-DIST platformdirs-3.5.0.tar.gz 16037 BLAKE2B eef04e650c8028b87cc90fce02aed9259a6e4317b8445c429bbef1cb2ff1e6e6aae3c6dba38be2fed2e443cb4a7dc8c783345435ae922d0632e14823d7b80bfc SHA512 2c454a760b3045f4824b1c436ac85533e7a6809e4525d70cee4d98289f9efc5a882384347a1992aaa237dc29ea8e778515eadeca208a2d058f9e574f5175ce20
 DIST platformdirs-3.5.1.tar.gz 17164 BLAKE2B 7d9aeff02000b75a028e6f75dc4793e53bbe72b5fc069482d5790d9280a92b801dffca847fe64513b8ee3d24b5639681cb1cfcb1f97d85e8e996c7f6cbca2f71 SHA512 e3aa38bc943f9dc709dfaa3c6fe9e11f3b33d4263d1d41f7349d9926db2e41a36dd43c74ea2175ad89b107601f2dffded0f45e7703b9cb8ca9739945dee3c6fb
diff --git a/dev-python/platformdirs/platformdirs-3.2.0.ebuild b/dev-python/platformdirs/platformdirs-3.2.0.ebuild
deleted file mode 100644
index 7b5d8dcef438..000000000000
--- a/dev-python/platformdirs/platformdirs-3.2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021-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 pypi
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-
-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"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/dev-python/platformdirs/platformdirs-3.3.0.ebuild b/dev-python/platformdirs/platformdirs-3.3.0.ebuild
deleted file mode 100644
index 2c65d0f2dfcc..000000000000
--- a/dev-python/platformdirs/platformdirs-3.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021-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 pypi
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-
-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"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/dev-python/platformdirs/platformdirs-3.4.0.ebuild b/dev-python/platformdirs/platformdirs-3.4.0.ebuild
deleted file mode 100644
index 2c65d0f2dfcc..000000000000
--- a/dev-python/platformdirs/platformdirs-3.4.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021-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 pypi
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-
-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"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/dev-python/platformdirs/platformdirs-3.5.0.ebuild b/dev-python/platformdirs/platformdirs-3.5.0.ebuild
deleted file mode 100644
index 2c65d0f2dfcc..000000000000
--- a/dev-python/platformdirs/platformdirs-3.5.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021-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 pypi
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-
-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"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/dev-python/pycares/pycares-4.3.0.ebuild b/dev-python/pycares/pycares-4.3.0.ebuild
index a7b63c68ebe5..b9790691f13c 100644
--- a/dev-python/pycares/pycares-4.3.0.ebuild
+++ b/dev-python/pycares/pycares-4.3.0.ebuild
@@ -32,7 +32,9 @@ DEPEND="
 	net-dns/c-ares:=
 "
 BDEPEND="
-	virtual/python-cffi[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/cffi[${PYTHON_USEDEP}]
+	' 'python*')
 "
 RDEPEND="
 	dev-python/idna[${PYTHON_USEDEP}]
@@ -45,6 +47,12 @@ BDEPEND+="
 	)
 "
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# regression due to Internet changing (probably)
+	# https://github.com/saghul/pycares/issues/187
+	tests/test_all.py::DNSTest::test_query_class_chaos
+)
 
 export PYCARES_USE_SYSTEM_LIB=1
diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
index 5bce98e24acb..426df7a3a1be 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -1,2 +1 @@
-DIST pylibacl-0.6.0.gh.tar.gz 40231 BLAKE2B ba76f5540de62cec8572960b65f65289d7fe2066f76861240849c4c8175a9219b7ced086739b5a9b4d560a125c8fe759cc7b5b688bd4dc3d84ca4dc78897ea75 SHA512 a93ad199d9946490a863906411893a204bf801df71cf70217d6b29940a9365f05fd121116f22e054a3b8d27cd62e35c73566c1e0dd246ae5c0edd2f967df50ba
 DIST pylibacl-0.7.0.tar.gz 47543 BLAKE2B 277c03d01ab184ffaaa2c07c56e8f2464cba8b6da0fbd251880d274bef3b27dc211f1571425d4216e02bbeba8c623edfa56cafbb27932092ffce254e6be8df5d SHA512 077515a00c7a048faf7792acd9c3e768d35674c0b3f4ec72fdf37561c90ed12bb392582a4fb9a23b7916db3375278c2636f2844f362a8335e7ad68e1e9b9c3bd
diff --git a/dev-python/pylibacl/pylibacl-0.6.0-r1.ebuild b/dev-python/pylibacl/pylibacl-0.6.0-r1.ebuild
deleted file mode 100644
index 9bde2971dc44..000000000000
--- a/dev-python/pylibacl/pylibacl-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,41 +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
-
-DESCRIPTION="POSIX ACLs (Access Control Lists) for Python"
-HOMEPAGE="
-	https://pylibacl.k1024.org/
-	https://pypi.org/project/pylibacl/
-	https://github.com/iustin/pylibacl/
-"
-SRC_URI="
-	https://github.com/iustin/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86"
-
-RDEPEND="sys-apps/acl"
-DEPEND="${RDEPEND}"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_test() {
-	if ! nonfatal epytest ; then
-		eerror
-		eerror "If you got the following errors:"
-		eerror "\"IOError: [Errno 95] Operation not supported\","
-		eerror "then you should remount the filesystem containing"
-		eerror "build directory with \"acl\" option enabled."
-		eerror
-		die "Tests fail with ${EPYTHON}"
-	fi
-}
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index 8a42410ebc8b..f9acc1fd26c6 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1,4 +1 @@
-DIST pyproject-fmt-0.9.2.gh.tar.gz 15615 BLAKE2B 91912d350224fb2cbfd5f4e2310c10849dd0a1f43ac076059b521966d07526f9509cf87bba182cc4e9eb6b87c7c58c2972bb4f256bf63724e9d3b6c4fe9e67dd SHA512 3045381fc811fa8b8b7e845d9af5564d1969b73bfbb3e5a5c1953843754607cdbd809b829691d7195df73a1e136f68fbb3d3b66c783aa7c706b352e88d9b3f92
-DIST pyproject_fmt-0.10.0.tar.gz 11148 BLAKE2B de8f068b4bda97dcde68010645f637c69253712d7b5d8514660a2b3fc874defe76a343b10c5cdc2c3c2bdbb214a5ae0b1483944fb0eb9f1607c8bad7d0f51e60 SHA512 9383f2e02971f95cad724ea7a9c1f322d0c4e94ee36c5a3dd668f15b149f5e259274be086399f83e4f95bded796200debff351558b92249200874f1cb4c04323
-DIST pyproject_fmt-0.11.1.tar.gz 12099 BLAKE2B 7a85cf8189e818b2433874b5c65bceadfe5897f44702389201b68da0cc2539473435b455897af0fbc4fac64d289de576934d88c92819541d367f2a994253a5fa SHA512 deccb4678ae3f063ced8daa75db567d1e98a4126f6bf1481229217e69777f596e37f0975f58b51f773b165d3ddc603910fea3cc322dfc9aa9d488f29f429ecab
 DIST pyproject_fmt-0.11.2.tar.gz 12134 BLAKE2B bff72bd12d41f9d9fa7cae82938f6cc921a079e966587a6432f07d17702835863f20e460003cc9321a8465c2e660b7474e0c9f54987b7ee7deaae99dd0e76b56 SHA512 2600212e4afcf238636c7b41a60e9a235a742a923fdcafcb174e08799845797d1813fc61ca56db9ada35def0deb94192180fe4ff15bb6cfa7208e1c1d3b339d0
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.10.0.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.10.0.ebuild
deleted file mode 100644
index 93594daa113d..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.10.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.7[${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.11.1.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.11.1.ebuild
deleted file mode 100644
index 93594daa113d..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.11.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.7[${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.9.2.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.9.2.ebuild
deleted file mode 100644
index 77e42ac70078..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.9.2.ebuild
+++ /dev/null
@@ -1,38 +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
-
-DESCRIPTION="Format your pyproject.toml file"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-fmt/
-	https://pypi.org/project/pyproject-fmt/
-"
-SRC_URI="
-	https://github.com/tox-dev/pyproject-fmt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/packaging-23[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
index 8e886d13294a..0945c14c65ab 100644
--- a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
@@ -26,15 +26,3 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=()
-	if [[ ${EPYTHON} == python3.12 ]]; then
-		EPYTEST_IGNORE+=(
-			# probably a bug in python itself or in hypothesis
-			tests/hypothesis_vector_test.py
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/pytest/files/pytest-7.3.1-py312.patch b/dev-python/pytest/files/pytest-7.3.1-py312.patch
index 62a32e0cb7a6..b38486248309 100644
--- a/dev-python/pytest/files/pytest-7.3.1-py312.patch
+++ b/dev-python/pytest/files/pytest-7.3.1-py312.patch
@@ -1,16 +1,16 @@
-From b1ba5ff337300e4242fb961d8496474e4b739c9b Mon Sep 17 00:00:00 2001
+From 653606791456f7e6412712bc26428b90092336b5 Mon Sep 17 00:00:00 2001
 From: Ran Benita <ran@unusedvar.com>
 Date: Wed, 10 May 2023 10:36:09 +0300
 Subject: [PATCH] Avoid ast deprecation warnings on Python 3.12
 
 Fix #10977.
 ---
- src/_pytest/assertion/rewrite.py | 44 ++++++++++++++++++--------------
+ src/_pytest/assertion/rewrite.py | 49 +++++++++++++++++++-------------
  src/_pytest/mark/expression.py   |  8 +++++-
- 2 files changed, 32 insertions(+), 20 deletions(-)
+ 2 files changed, 36 insertions(+), 21 deletions(-)
 
 diff --git a/src/_pytest/assertion/rewrite.py b/src/_pytest/assertion/rewrite.py
-index 8b182347052..2f9038ee132 100644
+index 8b182347052..00bb4feb94a 100644
 --- a/src/_pytest/assertion/rewrite.py
 +++ b/src/_pytest/assertion/rewrite.py
 @@ -46,8 +46,14 @@
@@ -28,16 +28,22 @@ index 8b182347052..2f9038ee132 100644
  
  
  assertstate_key = StashKey["AssertionState"]()
-@@ -680,7 +686,7 @@ def run(self, mod: ast.Module) -> None:
+@@ -680,9 +686,12 @@ def run(self, mod: ast.Module) -> None:
              if (
                  expect_docstring
                  and isinstance(item, ast.Expr)
 -                and isinstance(item.value, ast.Str)
 +                and isinstance(item.value, astStr)
              ):
-                 doc = item.value.s
+-                doc = item.value.s
++                if sys.version_info >= (3, 8):
++                    doc = item.value.value
++                else:
++                    doc = item.value.s
                  if self.is_rewrite_disabled(doc):
-@@ -814,7 +820,7 @@ def pop_format_context(self, expl_expr: ast.expr) -> ast.Name:
+                     return
+                 expect_docstring = False
+@@ -814,7 +823,7 @@ def pop_format_context(self, expl_expr: ast.expr) -> ast.Name:
          current = self.stack.pop()
          if self.stack:
              self.explanation_specifiers = self.stack[-1]
@@ -46,7 +52,7 @@ index 8b182347052..2f9038ee132 100644
          format_dict = ast.Dict(keys, list(current.values()))
          form = ast.BinOp(expl_expr, ast.Mod(), format_dict)
          name = "@py_format" + str(next(self.variable_counter))
-@@ -868,16 +874,16 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
+@@ -868,16 +877,16 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
          negation = ast.UnaryOp(ast.Not(), top_condition)
  
          if self.enable_assertion_pass_hook:  # Experimental pytest_assertion_pass hook
@@ -66,7 +72,7 @@ index 8b182347052..2f9038ee132 100644
              err_msg = ast.BinOp(assertmsg, ast.Add(), err_explanation)
              err_name = ast.Name("AssertionError", ast.Load())
              fmt = self.helper("_format_explanation", err_msg)
-@@ -893,8 +899,8 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
+@@ -893,8 +902,8 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
              hook_call_pass = ast.Expr(
                  self.helper(
                      "_call_assertion_pass",
@@ -77,7 +83,7 @@ index 8b182347052..2f9038ee132 100644
                      fmt_pass,
                  )
              )
-@@ -913,7 +919,7 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
+@@ -913,7 +922,7 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
                  variables = [
                      ast.Name(name, ast.Store()) for name in self.format_variables
                  ]
@@ -86,7 +92,7 @@ index 8b182347052..2f9038ee132 100644
                  self.statements.append(clear_format)
  
          else:  # Original assertion rewriting
-@@ -924,9 +930,9 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
+@@ -924,9 +933,9 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
                  assertmsg = self.helper("_format_assertmsg", assert_.msg)
                  explanation = "\n>assert " + explanation
              else:
@@ -98,7 +104,7 @@ index 8b182347052..2f9038ee132 100644
              msg = self.pop_format_context(template)
              fmt = self.helper("_format_explanation", msg)
              err_name = ast.Name("AssertionError", ast.Load())
-@@ -938,7 +944,7 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
+@@ -938,7 +947,7 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
          # Clear temporary variables by setting them to None.
          if self.variables:
              variables = [ast.Name(name, ast.Store()) for name in self.variables]
@@ -107,7 +113,7 @@ index 8b182347052..2f9038ee132 100644
              self.statements.append(clear)
          # Fix locations (line numbers/column offsets).
          for stmt in self.statements:
-@@ -952,20 +958,20 @@ def visit_NamedExpr(self, name: namedExpr) -> Tuple[namedExpr, str]:
+@@ -952,20 +961,20 @@ def visit_NamedExpr(self, name: namedExpr) -> Tuple[namedExpr, str]:
          # thinks it's acceptable.
          locs = ast.Call(self.builtin("locals"), [], [])
          target_id = name.target.id  # type: ignore[attr-defined]
@@ -132,7 +138,7 @@ index 8b182347052..2f9038ee132 100644
          return name, self.explanation_param(expr)
  
      def visit_BoolOp(self, boolop: ast.BoolOp) -> Tuple[ast.Name, str]:
-@@ -1001,7 +1007,7 @@ def visit_BoolOp(self, boolop: ast.BoolOp) -> Tuple[ast.Name, str]:
+@@ -1001,7 +1010,7 @@ def visit_BoolOp(self, boolop: ast.BoolOp) -> Tuple[ast.Name, str]:
              self.push_format_context()
              res, expl = self.visit(v)
              body.append(ast.Assign([ast.Name(res_var, ast.Store())], res))
@@ -141,7 +147,7 @@ index 8b182347052..2f9038ee132 100644
              call = ast.Call(app, [expl_format], [])
              self.expl_stmts.append(ast.Expr(call))
              if i < levels:
-@@ -1013,7 +1019,7 @@ def visit_BoolOp(self, boolop: ast.BoolOp) -> Tuple[ast.Name, str]:
+@@ -1013,7 +1022,7 @@ def visit_BoolOp(self, boolop: ast.BoolOp) -> Tuple[ast.Name, str]:
                  self.statements = body = inner
          self.statements = save
          self.expl_stmts = fail_save
@@ -150,7 +156,7 @@ index 8b182347052..2f9038ee132 100644
          expl = self.pop_format_context(expl_template)
          return ast.Name(res_var, ast.Load()), self.explanation_param(expl)
  
-@@ -1099,9 +1105,9 @@ def visit_Compare(self, comp: ast.Compare) -> Tuple[ast.expr, str]:
+@@ -1099,9 +1108,9 @@ def visit_Compare(self, comp: ast.Compare) -> Tuple[ast.expr, str]:
                  next_expl = f"({next_expl})"
              results.append(next_res)
              sym = BINOP_MAP[op.__class__]
@@ -195,3 +201,58 @@ index f82a81d44c5..9287bcee50c 100644
      else:
          ret = expr(s)
          s.accept(TokenType.EOF, reject=True)
+From c945dba571025623a3ace7311d682e3e9448a161 Mon Sep 17 00:00:00 2001
+From: Ran Benita <ran@unusedvar.com>
+Date: Fri, 26 May 2023 20:28:21 +0300
+Subject: [PATCH] testing/python/collect: replace use of deprecated/removed
+ `imp` module
+
+---
+ testing/python/collect.py | 26 +++++++++++++++-----------
+ 1 file changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/testing/python/collect.py b/testing/python/collect.py
+index ac3edd395ab..52b34800965 100644
+--- a/testing/python/collect.py
++++ b/testing/python/collect.py
+@@ -897,25 +897,29 @@ def pytest_pycollect_makeitem(collector, name, obj):
+     def test_issue2369_collect_module_fileext(self, pytester: Pytester) -> None:
+         """Ensure we can collect files with weird file extensions as Python
+         modules (#2369)"""
+-        # We'll implement a little finder and loader to import files containing
++        # Implement a little meta path finder to import files containing
+         # Python source code whose file extension is ".narf".
+         pytester.makeconftest(
+             """
+-            import sys, os, imp
++            import sys
++            import os.path
++            from importlib.util import spec_from_loader
++            from importlib.machinery import SourceFileLoader
+             from _pytest.python import Module
+ 
+-            class Loader(object):
+-                def load_module(self, name):
+-                    return imp.load_source(name, name + ".narf")
+-            class Finder(object):
+-                def find_module(self, name, path=None):
+-                    if os.path.exists(name + ".narf"):
+-                        return Loader()
+-            sys.meta_path.append(Finder())
++            class MetaPathFinder:
++                def find_spec(self, fullname, path, target=None):
++                    if os.path.exists(fullname + ".narf"):
++                        return spec_from_loader(
++                            fullname,
++                            SourceFileLoader(fullname, fullname + ".narf"),
++                        )
++            sys.meta_path.append(MetaPathFinder())
+ 
+             def pytest_collect_file(file_path, parent):
+                 if file_path.suffix == ".narf":
+-                    return Module.from_parent(path=file_path, parent=parent)"""
++                    return Module.from_parent(path=file_path, parent=parent)
++            """
+         )
+         pytester.makefile(
+             ".narf",
diff --git a/dev-python/pytest/pytest-7.3.1-r1.ebuild b/dev-python/pytest/pytest-7.3.1-r2.ebuild
index 93fd9214a02b..93fd9214a02b 100644
--- a/dev-python/pytest/pytest-7.3.1-r1.ebuild
+++ b/dev-python/pytest/pytest-7.3.1-r2.ebuild
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index 719f9c00269d..31e2a045f9c4 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1 +1,2 @@
 DIST python-utils-3.5.2.tar.gz 26883 BLAKE2B 9532d8fecd8d57a9a9f50e2e7e67386e4c5922f4ec316851544147f6da82586bb01796bb3e3fc95c894a790c57711c983d8da9abc5edc5a722089a0d86d7fb61 SHA512 2e36bbb2e43591744c63ea972b7f361138694eb32510643ea88e8d757882379e3aec247c2fc4d5c67876939b71d564570a975700728c79f9db0cc4fcbc1605e7
+DIST python-utils-3.6.0.tar.gz 28488 BLAKE2B 0426943a631ad68afafdbe603d14a32e179e58f8c45ac98248096de40bb67243196ca4498e1b908a25e213301e26d42f3f2c175cfa282c18b1db8f15b14385e6 SHA512 2d26e9c37f42d525640b9573cd794acb93e44a01d817e4c9ccf2d07261581dd16a04f38d245f97efb01952476fbc312e1831b5b617659787cbaac38692853bdd
diff --git a/dev-python/python-utils/python-utils-3.6.0.ebuild b/dev-python/python-utils/python-utils-3.6.0.ebuild
new file mode 100644
index 000000000000..1c962e9ab526
--- /dev/null
+++ b/dev-python/python-utils/python-utils-3.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Collection of small Python functions & classes"
+HOMEPAGE="
+	https://github.com/WoLpH/python-utils/
+	https://pypi.org/project/python-utils/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	docs
+	_python_utils_tests/test_logger.py
+	python_utils/loguru.py
+)
+
+python_prepare_all() {
+	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/requests-mock/requests-mock-1.10.0.ebuild b/dev-python/requests-mock/requests-mock-1.10.0-r1.ebuild
index ed621450804e..ace07b4604fc 100644
--- a/dev-python/requests-mock/requests-mock-1.10.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.10.0-r1.ebuild
@@ -3,21 +3,28 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
 inherit distutils-r1 pypi
 
 DESCRIPTION="Mock out responses from the requests package"
-HOMEPAGE="https://github.com/jamielennox/requests-mock"
+HOMEPAGE="
+	https://github.com/jamielennox/requests-mock/
+	https://pypi.org/project/requests-mock/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
+# urllib3 causes regressions that aren't caught by tests:
+# https://github.com/jamielennox/requests-mock/issues/228
 RDEPEND="
 	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/urllib3-2[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
diff --git a/dev-python/requests/requests-2.31.0.ebuild b/dev-python/requests/requests-2.31.0.ebuild
index 9fdaf76a8cb7..45049d82ac90 100644
--- a/dev-python/requests/requests-2.31.0.ebuild
+++ b/dev-python/requests/requests-2.31.0.ebuild
@@ -64,6 +64,12 @@ python_test() {
 		tests/test_requests.py::TestRequests::test_cookie_removed_on_expire
 		tests/test_requests.py::TestPreparingURLs::test_redirecting_to_bad_url
 	)
+	if [[ ${EPYTHON} == python3.12 ]]; then
+		EPYTEST_DESELECT+=(
+			# different repr()
+			requests/utils.py::requests.utils.from_key_val_list
+		)
+	fi
 
 	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
 		EPYTEST_DESELECT+=(
diff --git a/dev-python/rq/rq-1.15-r1.ebuild b/dev-python/rq/rq-1.15-r1.ebuild
new file mode 100644
index 000000000000..b47805b29e78
--- /dev/null
+++ b/dev-python/rq/rq-1.15-r1.ebuild
@@ -0,0 +1,61 @@
+# 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="Simple, lightweight library for creating and processing background jobs"
+HOMEPAGE="
+	https://python-rq.org/
+	https://github.com/rq/rq/
+	https://pypi.org/project/rq/
+"
+# Tests missing from sdist, as of 1.14.1
+SRC_URI="
+	https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/sentry-sdk[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the actual tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
index b593457ef3ab..0da980374d2a 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -1,2 +1 @@
 DIST Send2Trash-1.8.2.tar.gz 17487 BLAKE2B 3362a7e0c70f0e3f0f7a64676174d6c6f28290079590e08e4a746c0e19f96deca028aa521df58afa7f0ab47d78f286df01f98e903dfd771063af0ff40b4f6c08 SHA512 378107c8175e8d08566258daa13d3000e66ec03f732698180a2eb7f862c39d3c458be66ecf3f8864f559b961e29b777b8e7f5169468219e19723def62a69bb9c
-DIST send2trash-1.8.0.gh.tar.gz 15040 BLAKE2B 06f6b0b9e4e9316bc60332ea76426922db6d35fa5d4e0602e91a58996bb55a2344d7d56547bdf21151641c5ec710b78b2b11c8fda158eb911155994c86d10078 SHA512 9dc15fbd262eb5a05a355b436c0e582e5ef9b484f859b53faafe6af5bd08ef88b9aa5121485c2fffb7dbe5aeeef29f6719035e08c61da273fd4fa51383b062fe
diff --git a/dev-python/send2trash/send2trash-1.8.0-r1.ebuild b/dev-python/send2trash/send2trash-1.8.0-r1.ebuild
deleted file mode 100644
index fa252f4037d3..000000000000
--- a/dev-python/send2trash/send2trash-1.8.0-r1.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
-
-DESCRIPTION="Sends files to the Trash (or Recycle Bin)"
-HOMEPAGE="
-	https://github.com/arsenetar/send2trash/
-	https://pypi.org/project/Send2Trash/
-"
-SRC_URI="
-	https://github.com/arsenetar/send2trash/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-SLOT="0"
-LICENSE="BSD"
-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/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 79af58891add..cbd8c4ec5242 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,2 +1,3 @@
 DIST sentry-python-1.20.0.gh.tar.gz 345505 BLAKE2B e95225188a74f4d9e67f6044bcf3bbeccacc31c455a652d8233350d138c20ee9f356e56aab98a1c2f764917d79426e10a810cb6c18cfabcc5f606ec21c42f7e8 SHA512 6c162d44cc3b38a9aa192a7153d52e93424950e1020cd2d6ea8e61d23b3d41ca169e3dde7c0355e5da2ed45ce39c41322d6e0f239d6e00e30a55540db796f968
 DIST sentry-python-1.23.1.gh.tar.gz 355099 BLAKE2B d4aea7fd4746f1ee7873382f6a8545a1e21583e12b241ecc9ccf210bab95aa07051e802199c1c225756bb4fe9b8b9ec4bb76d737f2c19216df1b30e33614f54b SHA512 3d7237c0d624c51cf7a99ea1c480fb67d0dee7ae48cefd7322d870881ecc6b25f5fa481c6cd86b75fa7f1a4acf54f9c0f576021bf75cc8e8b9be99ec05453e2f
+DIST sentry-python-1.24.0.gh.tar.gz 360564 BLAKE2B 032c929b75e29ebb0e95f8dddcc567d7367399b0945f918821c5331898b0aa90eac4af531f4f49c52949d00b655508cd57a88915ab054f2a44f72e3dc81cc9a9 SHA512 9dee3f14082331232f743c7bd38a7a46273d4c467bdd4f8672f7597fa0d3baaecd34423d07669f14f0265be2c947bdbddc983aaa8cab66a139aeb036fde1b708
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.24.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.24.0.ebuild
new file mode 100644
index 000000000000..3e0f3be0e2dc
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.24.0.ebuild
@@ -0,0 +1,116 @@
+# 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=sentry-python-${PV}
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
+)
+
+EPYTEST_IGNORE=(
+	# tests require Internet access
+	tests/integrations/httpx/test_httpx.py
+	tests/integrations/requests/test_requests.py
+	tests/integrations/stdlib/test_httplib.py
+	tests/integrations/flask/test_flask.py
+	tests/integrations/django/test_basic.py
+	tests/integrations/socket/test_socket.py
+	# wtf is it supposed to do?!
+	tests/integrations/gcp/test_gcp.py
+	# broken by rq-1.10.1 (optional dep)
+	tests/integrations/rq/test_rq.py
+	# fastapi is not packaged
+	tests/integrations/asgi/test_fastapi.py
+	# TODO
+	tests/integrations/bottle
+	# TODO: causes breakage in other tests
+	tests/integrations/starlette
+	# TODO
+	tests/integrations/tornado
+	# requires mockupdb
+	tests/integrations/pymongo
+)
+
+EPYTEST_DESELECT=(
+	# hangs
+	'tests/test_transport.py::test_transport_works'
+	# TODO
+	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+	tests/test_client.py::test_databag_depth_stripping
+	tests/test_client.py::test_databag_string_stripping
+	tests/test_client.py::test_databag_breadth_stripping
+	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/asgi/test_asgi.py::test_websocket
+	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
+	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
+	# incompatible version?
+	tests/integrations/falcon/test_falcon.py
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
+	# test_circular_references: apparently fragile
+	'tests/integrations/threading/test_threading.py::test_circular_references'
+	# test for new feature, fails with IndexError
+	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	# TODO
+	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
+	tests/test_profiler.py::test_sample_buffer
+	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
+	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
+	tests/test_profiler.py::test_thread_scheduler_single_background_thread
+	# broken with py3.11, *shrug*
+	tests/test_profiler.py::test_extract_stack_with_max_depth
+	# TODO
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
+	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
+	tests/test_scrubber.py::test_span_data_scrubbing
+	# this is not even funny
+	tests/integrations/modules/test_modules.py::test_installed_modules
+)
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index eed5a97014bc..4ed6b2d81e23 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1 +1,2 @@
 DIST slixmpp-1.8.3.tar.gz 1053891 BLAKE2B cecf307406f093e8b069a70485edf38a95054b2d299b0a34064e582c20243d8f90ea557079cde9b22bb1b3b9e3e7d452347625bb2c21def461193360290b4d62 SHA512 2d499c106bcb8d86a8522e617d855f5c6aeb5e3e7f3757331baef1bcfa4e81d24ef6a554e760e323ab1b542c168dae4cb99ea56db92f5539542045ac6c8b9c9d
+DIST slixmpp-1.8.4.tar.gz 546263 BLAKE2B 78a7b1b9015f27d63b3c127a292e2794a9de2283fbb9763ef52d03d37cc2d0fcc3f0696beca858a0d120991059a5eced62b5a4a9e87436b81dc17f6bbdc4b106 SHA512 afa82670e4cb2c904503a6ef652d3f2ecd59732a18eef05b85e0a55f15112685ecc1b50951b3f717a211d1c9069a4e7c65d913454426441f56688ff05a5c0921
diff --git a/dev-python/slixmpp/slixmpp-1.8.4.ebuild b/dev-python/slixmpp/slixmpp-1.8.4.ebuild
new file mode 100644
index 000000000000..dd052e8709d7
--- /dev/null
+++ b/dev-python/slixmpp/slixmpp-1.8.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 3 library for XMPP"
+HOMEPAGE="https://lab.louiz.org/poezio/slixmpp"
+LICENSE="MIT"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
+	inherit git-r3
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~riscv"
+fi
+
+DEPEND="
+	net-dns/libidn:=
+"
+RDEPEND="
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	${DEPEND}
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index fd67c47dae44..5e3dc02c4fc9 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,5 +1 @@
-DIST tldextract-3.4.0.tar.gz 111437 BLAKE2B 94a3a77144fcaddebdf2129cea8fd43e971f0ac9b40029c6c1735ee06f499f4bf48823fc61540d99f71fd62192742c10168ef8f25b534eec9e2a04d3879be63a SHA512 6cd6b079c35af62e4f8da67c687630471d1a57ebfab7d982abe411b03fb6673dd238a1f676de5624d13bd2eb42b91ae0a97708e33579217916d88bca4db218db
-DIST tldextract-3.4.1.tar.gz 104202 BLAKE2B 24e6f5a4af1718fdf3b52b2c12146849033b80fc0ba0320ccf72735fd0e39c36678660a70a203964ebd92acb3911e037b899b1796a941731735fa1e028999cd1 SHA512 6b63ba8f800e1adc836ecee43947fc0ee5198eefe7d3f64a267c7e0a4d18a44c60454ba67636a4b19e00a125f8b37f1f816f782976a9a335e5500a333c8e07aa
-DIST tldextract-3.4.2.tar.gz 105004 BLAKE2B 0bf2eddea49983720a554874bf1ec2d3280317657c9752d87ef825c9ce451f15a443c847d2bdbd6ac0f3fa3166da4bfce9852f6aff6710c5a53d8ac42541e9f2 SHA512 60ec9d99339940354db03e01d46bed571d604be9edce406476696d6a4d5e07677243f4c7f40fb1ca7e7f2f6bbe9d7d25a4959ade7f5091bcf89524c2c9cc927d
-DIST tldextract-3.4.3.tar.gz 105593 BLAKE2B 46e3998fe208a188ec3d547ade8ec8019f712b3b36d692dff44130c9daac879a1ba8e859565e6f5631415254a3cc625bbadfb499d450fbae7fbbfe32e108eae0 SHA512 6bdc66e73bbc537a355c21ea6d2b512e58f2199f7f38ae8d737aa4ecb7c615250276bdfb2aab939df06877216407c083b248d054cc2ad07fdc4243dbbef318c5
 DIST tldextract-3.4.4.tar.gz 105688 BLAKE2B 070fdde3f71b09a9f5409f7a9a0eb8a0a0855ffca4fbf1926146d21de11af4ed893d796932384df7b1713a52f10c7b367ba7f154d15fd7da2c72a71993c4454d SHA512 f6b4a7ed984c95e66838cda951058281e5e05bde74d02c6e5a6cd0345dc99703179303123905a095a46afe4c05dacb94a09677b6aa4cbf018df22e7bc2809a40
diff --git a/dev-python/tldextract/tldextract-3.4.0.ebuild b/dev-python/tldextract/tldextract-3.4.0.ebuild
deleted file mode 100644
index bd8a75c039b1..000000000000
--- a/dev-python/tldextract/tldextract-3.4.0.ebuild
+++ /dev/null
@@ -1,35 +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="Accurately separate the TLD from the registered domain and subdomains of a URL"
-HOMEPAGE="
-	https://github.com/john-kurkowski/tldextract/
-	https://pypi.org/project/tldextract/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tldextract/tldextract-3.4.1.ebuild b/dev-python/tldextract/tldextract-3.4.1.ebuild
deleted file mode 100644
index 8ed1050e7c1f..000000000000
--- a/dev-python/tldextract/tldextract-3.4.1.ebuild
+++ /dev/null
@@ -1,35 +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="Accurately separate the TLD from the registered domain and subdomains of a URL"
-HOMEPAGE="
-	https://github.com/john-kurkowski/tldextract/
-	https://pypi.org/project/tldextract/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tldextract/tldextract-3.4.2.ebuild b/dev-python/tldextract/tldextract-3.4.2.ebuild
deleted file mode 100644
index 8ed1050e7c1f..000000000000
--- a/dev-python/tldextract/tldextract-3.4.2.ebuild
+++ /dev/null
@@ -1,35 +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="Accurately separate the TLD from the registered domain and subdomains of a URL"
-HOMEPAGE="
-	https://github.com/john-kurkowski/tldextract/
-	https://pypi.org/project/tldextract/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tldextract/tldextract-3.4.3.ebuild b/dev-python/tldextract/tldextract-3.4.3.ebuild
deleted file mode 100644
index 8ed1050e7c1f..000000000000
--- a/dev-python/tldextract/tldextract-3.4.3.ebuild
+++ /dev/null
@@ -1,35 +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="Accurately separate the TLD from the registered domain and subdomains of a URL"
-HOMEPAGE="
-	https://github.com/john-kurkowski/tldextract/
-	https://pypi.org/project/tldextract/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index 24d3f78b6057..71c905a9d459 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,2 +1 @@
-DIST tomlkit-0.11.7.tar.gz 188555 BLAKE2B 1958ace56c37746585879f1b657af53f36d1b3e741a5e41438a9806897e252bfbf42040c65a05df6c1921413da3e68be6d5d6ef9ce0a0c5d457b170f1cce6528 SHA512 456de2047fe1da1905ebf6eed99bdbd7d565fab2ecb50b9c06655188271d52b3680882ce0db2beb69fa9e7d18548b8045a99c4897e12e1d92d9cf92a937864ab
 DIST tomlkit-0.11.8.tar.gz 188825 BLAKE2B 3b3b31f0243592ae28d3fc7c23bc6cd61eaa0d9907f4c7afc838e816783ac4ce28a0491c15c31649749272c8d65dd51b7a0160c8f0bf1e209115ebcb5ba13906 SHA512 538851d5460770000a1263fb2384dc8283f9fe56364ccebac2cef31be85c51056bbaf59c96134ceae624b978334c29b54653c28838567cd2806e70ec6e3e5856
diff --git a/dev-python/tomlkit/tomlkit-0.11.7.ebuild b/dev-python/tomlkit/tomlkit-0.11.7.ebuild
deleted file mode 100644
index d600ea13dda5..000000000000
--- a/dev-python/tomlkit/tomlkit-0.11.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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 pypi
-
-DESCRIPTION="Style preserving TOML library"
-HOMEPAGE="
-	https://github.com/sdispater/tomlkit/
-	https://pypi.org/project/tomlkit/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "poetry' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "tomlkit"
-		version = "${PV}"
-		description = "Style preserving TOML library"
-	EOF
-}
diff --git a/dev-python/tornado/tornado-6.3.2-r1.ebuild b/dev-python/tornado/tornado-6.3.2-r1.ebuild
new file mode 100644
index 000000000000..848aa1dac97e
--- /dev/null
+++ b/dev-python/tornado/tornado-6.3.2-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python web framework and asynchronous networking library"
+HOMEPAGE="
+	https://www.tornadoweb.org/
+	https://github.com/tornadoweb/tornado/
+	https://pypi.org/project/tornado/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.2-test-timeout-increase.patch
+	"${FILESDIR}"/${PN}-6.3.2-ignore-deprecationwarning.patch
+)
+
+src_prepare() {
+	# network-sandbox? ipv6?
+	sed -i -e 's:test_localhost:_&:' \
+		tornado/test/netutil_test.py || die
+	# regressions with py3.12, not important enough to block us
+	sed -e 's:test_chunked(:_&:' \
+		-e 's:test_gzip:_&:' \
+		-e 's:test_header_callback:_&:' \
+		-i tornado/test/{curl_,simple_,}httpclient_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x ASYNC_TEST_TIMEOUT=60
+	# Avoid time-sensitive tests
+	# https://github.com/tornadoweb/tornado/blob/10974e6ebee80a26a2a65bb9bd715cf858fafde5/tornado/test/util.py#L19
+	local -x TRAVIS=1
+	local -x NO_NETWORK=1
+
+	cd "${T}" || die
+	"${EPYTHON}" -m tornado.test.runtests --verbose ||
+		die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tornado/tornado-6.3.2.ebuild b/dev-python/tornado/tornado-6.3.2.ebuild
index 86a7e5949b81..4cc55544759c 100644
--- a/dev-python/tornado/tornado-6.3.2.ebuild
+++ b/dev-python/tornado/tornado-6.3.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/twisted/twisted-22.10.0-r3.ebuild b/dev-python/twisted/twisted-22.10.0-r3.ebuild
index 42dc3ecc1445..5ca656ea3c98 100644
--- a/dev-python/twisted/twisted-22.10.0-r3.ebuild
+++ b/dev-python/twisted/twisted-22.10.0-r3.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="conch http2 serial ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/versioneer/versioneer-0.28.ebuild b/dev-python/versioneer/versioneer-0.28.ebuild
index dec1cb729b7a..9cc2bd8716cc 100644
--- a/dev-python/versioneer/versioneer-0.28.ebuild
+++ b/dev-python/versioneer/versioneer-0.28.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="Unlicense"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/werkzeug/files/werkzeug-2.3.4-iri-bytes.patch b/dev-python/werkzeug/files/werkzeug-2.3.4-iri-bytes.patch
new file mode 100644
index 000000000000..1e06b0621cdd
--- /dev/null
+++ b/dev-python/werkzeug/files/werkzeug-2.3.4-iri-bytes.patch
@@ -0,0 +1,64 @@
+From 3ba0fd5c52c9943c492ce098693bf9e651942fe5 Mon Sep 17 00:00:00 2001
+From: midchildan <git@midchildan.org>
+Date: Sat, 27 May 2023 01:03:02 +0900
+Subject: [PATCH] fix: iri_to_uri fails when the argument is a bytestring
+
+This was caused by the 'charset' variable being used before it was ready.
+---
+ CHANGES.rst          |  4 ++++
+ src/werkzeug/urls.py | 20 ++++++++++----------
+ tests/test_urls.py   |  3 +++
+ 3 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/src/werkzeug/urls.py b/src/werkzeug/urls.py
+index 89ef21943..f5760eb4c 100644
+--- a/src/werkzeug/urls.py
++++ b/src/werkzeug/urls.py
+@@ -966,6 +966,16 @@ def iri_to_uri(
+ 
+     .. versionadded:: 0.6
+     """
++    if charset is not None:
++        warnings.warn(
++            "The 'charset' parameter is deprecated and will be removed"
++            " in Werkzeug 3.0.",
++            DeprecationWarning,
++            stacklevel=2,
++        )
++    else:
++        charset = "utf-8"
++
+     if isinstance(iri, tuple):
+         warnings.warn(
+             "Passing a tuple is deprecated and will not be supported in Werkzeug 3.0.",
+@@ -982,16 +992,6 @@ def iri_to_uri(
+         )
+         iri = iri.decode(charset)
+ 
+-    if charset is not None:
+-        warnings.warn(
+-            "The 'charset' parameter is deprecated and will be removed"
+-            " in Werkzeug 3.0.",
+-            DeprecationWarning,
+-            stacklevel=2,
+-        )
+-    else:
+-        charset = "utf-8"
+-
+     if errors is not None:
+         warnings.warn(
+             "The 'errors' parameter is deprecated and will be removed in Werkzeug 3.0.",
+diff --git a/tests/test_urls.py b/tests/test_urls.py
+index 56bca8e94..765d42546 100644
+--- a/tests/test_urls.py
++++ b/tests/test_urls.py
+@@ -231,6 +231,9 @@ def test_iri_support():
+ 
+     assert urls.iri_to_uri("/foo") == "/foo"
+ 
++    with pytest.deprecated_call():
++        assert urls.iri_to_uri(b"/foo") == "/foo"
++
+     assert (
+         urls.iri_to_uri("http://föö.com:8080/bam/baz")
+         == "http://xn--f-1gaa.com:8080/bam/baz"
diff --git a/dev-python/werkzeug/werkzeug-2.3.4.ebuild b/dev-python/werkzeug/werkzeug-2.3.4-r1.ebuild
index 19d61a826269..0c0e153d547b 100644
--- a/dev-python/werkzeug/werkzeug-2.3.4.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.3.4-r1.ebuild
@@ -48,6 +48,11 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/pallets/werkzeug/pull/2709
+	"${FILESDIR}/${P}-iri-bytes.patch"
+)
+
 python_test() {
 	local EPYTEST_DESELECT=()
 	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 1b0a78fc26ea..1b744c059415 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,2 +1,3 @@
 DIST XlsxWriter-RELEASE_3.1.0.gh.tar.gz 36681465 BLAKE2B 13a9a03f49714136556c24b2e20bdac6366179a242fe4190abeec95859f572e47928f50543b8b8639662d8053f49d2fcc818ed3a74106d1773ff75c363024e13 SHA512 97ecc110bb5fd8b72ed66e9415ea6488a0d52505d93722b268258ecd299c21e872b4db2228dc6581da3e8b4ae93ca5252bff448c290de4232d4e5792aa8e43c4
 DIST XlsxWriter-RELEASE_3.1.1.gh.tar.gz 36691990 BLAKE2B 5341a2699fec7015003a602fca08483cff68cfa6f782c41d49f1801b4aab1a332048cb9ddb02fba0bb69a227cdcb22279e9fccf9b6808220724066e26886c0bc SHA512 c827bdaefd962864e09673b891ec267da89306f65ea29ccab1807af8ed89f22721d6ca296b7b83d4099bdeadf4508f576e6e618828ffc8abed1d38b3c84c6076
+DIST XlsxWriter-RELEASE_3.1.2.gh.tar.gz 36697835 BLAKE2B 055d0ac2e70ce5f86167f630044136f984bf19b494cb2ea5d7b98ce2098942e4c89eb0c3c3a8eeb48b1a4dcff30b71d45c2f2528634ed2f652d27f358d4778f7 SHA512 05f70721e6c55d54acdc143681ec581d3bf16c5d07725790bc648c169507e3cd9bd600ac4fcb4ff03fa449a6efc469d0745b92fcdb89afbf27ee1e2998c09613
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.1.2.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.1.2.ebuild
new file mode 100644
index 000000000000..5878ec751f37
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-3.1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="
+	https://github.com/jmcnamara/XlsxWriter/
+	https://pypi.org/project/XlsxWriter/
+"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/zstandard/zstandard-0.21.0.ebuild b/dev-python/zstandard/zstandard-0.21.0.ebuild
index 90c4421fec08..8d5b23c9782e 100644
--- a/dev-python/zstandard/zstandard-0.21.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.21.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	app-arch/zstd:=