gentoo auto-resync : 29:05:2023 - 09:16:49

77 files changed, 716 insertions, 1445 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4ac158444fee..7d9056fa9c7a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiodns/Manifest b/dev-python/aiodns/Manifest
index c684bf322c77..91024c4e38e5 100644
--- a/dev-python/aiodns/Manifest
+++ b/dev-python/aiodns/Manifest
@@ -1,4 +1,4 @@
 AUX aiodns-3.0.0-py3.10-tests.patch 757 BLAKE2B 1b5040841b3ced3b83b330e0033f54ee6ee97a8d025f22d87674f5fca9858e48febbf25c6b3441ba5b27ef9cb15f841e65f25ed999b9f536559ec50e1f010bbc SHA512 85219c885ee70871fb43f53e2ec52c164b08b63e120ee5ca5bc4531ea71155b6d81f5a813f056eabf7f4da2b425b12df6b5649cc7a9ba98d0ca9473043ee1829
 DIST aiodns-3.0.0.tar.gz 6743 BLAKE2B 2a3c61156069fa598df58191b35383da3e054396cdeb1bc8916cc0414bb6efc89d45789883a5b4f33e3a08a6ee544356b02d6c697c096deae3398f0ff4d3c316 SHA512 8c1016f3b0cb461e70e9a55034f9ad3b3db705a845bf20bb6503c7a5d592b4c5d2e8ddc60b375c5fafdc559dc4566736f4c93f26710be2dcbd181284ef039825
-EBUILD aiodns-3.0.0-r1.ebuild 714 BLAKE2B 3df417806cc92f9a640d3aa69dd0aa7f7444cd8675ad7a6a9929bf7eda673534d9d2d6de6d34f4797ade27ed80795f235927151097284560a8b88f374441998a SHA512 c07260b997261890caea611a91fa6551e8e21bc86a713f37b942cfee0b70a6aba4fcfdf37024a2d76027aa83cd4fdb5bc4e0fbcc60412da5a61a39f86be78ef1
+EBUILD aiodns-3.0.0-r1.ebuild 888 BLAKE2B aba0a5751d611bbfd199e4c909f7597171efe4a73dd64ee825300c1f00a90c1451744a27bb0e91592507c1d09bb8a0c730725ec7c31abfc44c19871b86322062 SHA512 c3d6d12332f1ad19828d2467d1cfbb4b60daedb290bc0baf12fe554c8cdf0ca1cc8f2c031bd946334a9451f5f3e9c78b1849221dd75bc3f976a229432dd39554
 MISC metadata.xml 466 BLAKE2B 6f6f9859ea69490be57bf7c6581e3b51b8b0f3563cc013e072bcc221a81eaf7ade938e935a730c125452c0c6c8ac45d8c91ce1748cfa3ea1df3db55fa4c59d31 SHA512 101ea2c67fcd9b0c9496892422f7eac07d1c381f1fead1706c96fafdf5c2bb48f3c3b6912a166ee20a8b54be12e2989367674813c98aba0fd896f63110c8ee1c
diff --git a/dev-python/aiodns/aiodns-3.0.0-r1.ebuild b/dev-python/aiodns/aiodns-3.0.0-r1.ebuild
index fd48e2ce2eb3..1a5434f93ef6 100644
--- a/dev-python/aiodns/aiodns-3.0.0-r1.ebuild
+++ b/dev-python/aiodns/aiodns-3.0.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
@@ -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/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index c1c60df1ebc8..f0d4e17659d4 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,7 +1,3 @@
-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
-EBUILD dogpile-cache-1.1.8.ebuild 707 BLAKE2B a29c76b5035cad6f92a9f2abf26ab220478f761201f53adabbfe6c53fe09eeb5fa4015d2bc911e11a89908bf0586586f1f41ad415e4d67e0464296339acea8e2 SHA512 987f008f3fdb0f9dd88735105ae044837c6448a8303b23a2792b6cdd948f69437602fe5847e552569c0b1463d803a33670e381e51770019bc70d95e83387522c
-EBUILD dogpile-cache-1.2.0.ebuild 710 BLAKE2B a3d2428b4b772b9e4f23f124b115919e4a9e791d98da53c0dd0acfbee3ab9f5224306f5e28de5d8cbf9c1801535da6be8b73d0bf4fe374066c1b7796eddf4234 SHA512 41ec051cb0c6101162696b318f8b483165f4b78fdaa08073f782333073c3979860e8e523f15d37d7caf752532d27bee161b982ec2b6804c972f16ad6f8577baf
 EBUILD dogpile-cache-1.2.1.ebuild 708 BLAKE2B 8c27befcd82712bb0562ee4b7ea389f219b07d4d31cbbe1fa17d0b7a7806ae174cd2f4892c5a4f22d6cc8f1abfd698c242cb83ae8ab86ab419d3193cb9a22122 SHA512 7c2453f155c2a0152c0ed7db41aef5bf81f21ed4bd0d278d916cd4441da4c192fd1c5cf24bed08d5d98a7ec323438c4f427f312ad41914427825371dd3f9037f
 MISC metadata.xml 843 BLAKE2B e0b6ed26300c658bb3f9bdc500bd24c38f26821d3a32ce448c56e5fd129f211efd58ef0faab1a6a9114a96991514de5fb9cf53b26601cb68fedb4c43aab3cdb2 SHA512 992ae84d983cbc06969e888e298cf8124dcf6068871bd5e12dd479a70ca00f5422d8c3cc178a842a340bffc5f72a5b203ce307ccbe49a0a60c0c52a5091052d9
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 68d3ce70c318..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_{9..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 820a9a008cd3..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_{9..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/flask-gravatar/Manifest b/dev-python/flask-gravatar/Manifest
index 55e5f7e1b844..6782c692daa6 100644
--- a/dev-python/flask-gravatar/Manifest
+++ b/dev-python/flask-gravatar/Manifest
@@ -1,3 +1,4 @@
 DIST Flask-Gravatar-0.5.0.tar.gz 17299 BLAKE2B 7dc16c609cdfbf690a39fbb3bd2810398030bd5c7a54394468902dd131116509da8de448a55907e4738fc984ef422f3c7970b8453b27971eadb106cbb8648562 SHA512 bb4ff064489a030fd763a46fc045109104535474d115aaabdf5c4d1a82a1e3303ee34f590a3f1203a9d009307fc8c45c37af7c30e76a4fb10bc46dd684d37751
+EBUILD flask-gravatar-0.5.0-r1.ebuild 753 BLAKE2B e55d2444e1ad324032a10de53d01ffed77015f2ea543977a0598032055aef1d0d28fe22748b3ce5e52373fa8a81aff63b47fc818d65b0ba9a2d9bee78164f35e SHA512 e0a1ffa02a6d7aa9511809218e17c4b27f537d7cb933ec8c6dffb8b12295ac7e2f8e133c5144377dc45a76751da3909e1b8c51084547a7878f7f9923051afb08
 EBUILD flask-gravatar-0.5.0.ebuild 718 BLAKE2B 5484a0a7d9046a472bf8d75308944f85f87599f350b850d0b81a83a1dc5cafa13bc44d6693dfc9e055d749e201a505266cfc65ede548b8650fea58477799bc09 SHA512 8fafdba6e507a50c3cd3f15160e2a7533b65f31a221fe45a9a57f68d0d7978abf6596bdf78e7a63ad6a07230c39a2c97ff17070c45401f73aa8f5e59294d82ac
 MISC metadata.xml 519 BLAKE2B 789e80f12265b3fa1380ee6be57f9ab8cd76bf92eef8e484845f1c2c855f0795d52bf190a66d68b5105236ca469eee526e6c5d0c76eea59752f8d2b200b3aef9 SHA512 69966562ebc6020fff360d783a9a9da4bf5d6ef1d43e288b3c6541496b3681a3c83736f34072e13f2ca821bcb4d00b20b07b41b1329c1ca139219e3d1aeffed4
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..7d12286ac41a
--- /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_{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/greenstalk/Manifest b/dev-python/greenstalk/Manifest
index eba7e18478c0..d77f087ddec6 100644
--- a/dev-python/greenstalk/Manifest
+++ b/dev-python/greenstalk/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD greenstalk-2.0.0-r1.ebuild 605 BLAKE2B 129aac1dad6c8fbd7b9353021483fd4cb6d5d584702c6b783b177857b8802ec035560ef0013febeed396413b3d8fa26901a88f6792ac759e0edff2cedf3cd9c6 SHA512 349875581720a6e0d38613f751bce47eb5ea13cc104f5de064b0a448f50d61208c1da72dce2268c7ea8e0280181ae9881bd259f0deacc2ab0742690eb2062db4
 EBUILD greenstalk-2.0.1.ebuild 655 BLAKE2B f95a494bd5becce75d750533a0316768edc26a9d2739a0b63c0256edd92d2ee266ba09f846460ee1013ba4c7ae94afd08b4384b01707f2909352e8e88dbff7b6 SHA512 d1577cff1ee6bcf7ad0b06b06f2609b9898397d6d2edd166109bf036e0548266c5e24d0c88e04b49910c798f88003e4efb7074a711be8ec7ca1c533ef1822c14
+EBUILD greenstalk-2.0.2.ebuild 655 BLAKE2B f95a494bd5becce75d750533a0316768edc26a9d2739a0b63c0256edd92d2ee266ba09f846460ee1013ba4c7ae94afd08b4384b01707f2909352e8e88dbff7b6 SHA512 d1577cff1ee6bcf7ad0b06b06f2609b9898397d6d2edd166109bf036e0548266c5e24d0c88e04b49910c798f88003e4efb7074a711be8ec7ca1c533ef1822c14
 MISC metadata.xml 328 BLAKE2B f299b714768a5868d4489a79e607349280bdb6888cf33031bacb0a34e1e8712445edb7dbe710ecddf2c5d81e75b11803b14875401a80f2a99769ce09aaaa0549 SHA512 cdfb1c1e3111e0391f098f2331527b72d8069786e93c2e32bf69211b97c8d754bbb8eb7facba100cc749f7fd1db50574b2ec1dfe7442316b18ff65e6497c7b60
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..0115a9c503b7
--- /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_{10..12} )
+
+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/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index e99598bb68f1..45282e69148d 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,5 +3,5 @@ DIST hypothesis-6.75.5.gh.tar.gz 9370565 BLAKE2B e9ef05cfc24a0e5ada5ba863b4ce4c2
 DIST hypothesis-6.75.6.gh.tar.gz 9370713 BLAKE2B 93996d6ff0c109c11123ad9b653502c44d51277760338c2575840d6257081bb19b0eedbf2d0feb15e9ebc9e6feacdbe79e070bfd31d35bb9c825bb4a2d44b7f5 SHA512 12396799a7f3fe661f5cb72ccf1a7299919d9f4b05a4075810803350380d217e30312d853ba72e49c28c4f1a08143cb76adc87465ba9cef7400e2dad9cc52001
 EBUILD hypothesis-6.75.3.ebuild 3332 BLAKE2B f8f40533ab1e341d563093f901fb42bbe290927d1579c201389e5c210d58dd883f5a9cd5819829b76c9cde8c6e0031a8a0234c99d0465855dd699e59b72d6a02 SHA512 f9fb85e22f3d7df7e5eeb0d6e09b5b4f294e281e222e7ddc80b0b92b92b7a6cd80a3eb4e6ee3eaa6b5ef1a2bd7248291e160c584b3d11b5b0a5649f01baca079
 EBUILD hypothesis-6.75.5.ebuild 3392 BLAKE2B fb6424f2cc03ef7ae8806ba24f845896c3af5dbb55a52ff60e423f97bf9811a2cf1aca9568260ff75901595a8a8423cae319205c4c6a750510f4751e5019d178 SHA512 3d3ca613a80fb92cec796a1dbcfa3c7d3b1974d9efb7dd268f09a67de4835a6962e82ab88840da75025cea10123ae31807a4497a7523612b6483b78086538e4d
-EBUILD hypothesis-6.75.6.ebuild 3392 BLAKE2B fb6424f2cc03ef7ae8806ba24f845896c3af5dbb55a52ff60e423f97bf9811a2cf1aca9568260ff75901595a8a8423cae319205c4c6a750510f4751e5019d178 SHA512 3d3ca613a80fb92cec796a1dbcfa3c7d3b1974d9efb7dd268f09a67de4835a6962e82ab88840da75025cea10123ae31807a4497a7523612b6483b78086538e4d
+EBUILD hypothesis-6.75.6.ebuild 2835 BLAKE2B 7e0520e23b0672f1088e665e612a2217367753b04d54902ff23f1a94efe92e20bca52033f15eb031d81adacba6583d62fb8c8d87080d6b94c8aed0d67eb39ba7 SHA512 113550407eb5a6cde0bc1391f48d8cd2acb4d8c6423233740a55a1c5b569d3c91b55a739626a4a87546f22d2f37d304cc76d2949120b95ad74306b126f4cebe5
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.75.6.ebuild b/dev-python/hypothesis/hypothesis-6.75.6.ebuild
index 73f0790f2dd8..151e8872fdec 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 467401afbe63..df30e9c8c5cb 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -3,10 +3,12 @@ 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
 EBUILD imageio-2.27.0.ebuild 2071 BLAKE2B 10ff98b2b56ca3e3ecc2b34a0196efb3512e7e17b7b79e3abdda530552fc790e32ac033b07d9875acf85578a35eb22f67de6c5304db850fdf1eb549312b75d6f SHA512 a381707af28eb925fb71c51bd88233039cd9abd7fd347bec4ecd64542a4c4ddb8628d1a5aec89aaf3f4f01ef12f0b77229a1f0bc9e0a4de35a646fddc77379e7
 EBUILD imageio-2.28.0.ebuild 2071 BLAKE2B 10ff98b2b56ca3e3ecc2b34a0196efb3512e7e17b7b79e3abdda530552fc790e32ac033b07d9875acf85578a35eb22f67de6c5304db850fdf1eb549312b75d6f SHA512 a381707af28eb925fb71c51bd88233039cd9abd7fd347bec4ecd64542a4c4ddb8628d1a5aec89aaf3f4f01ef12f0b77229a1f0bc9e0a4de35a646fddc77379e7
 EBUILD imageio-2.28.1.ebuild 2071 BLAKE2B 10ff98b2b56ca3e3ecc2b34a0196efb3512e7e17b7b79e3abdda530552fc790e32ac033b07d9875acf85578a35eb22f67de6c5304db850fdf1eb549312b75d6f SHA512 a381707af28eb925fb71c51bd88233039cd9abd7fd347bec4ecd64542a4c4ddb8628d1a5aec89aaf3f4f01ef12f0b77229a1f0bc9e0a4de35a646fddc77379e7
 EBUILD imageio-2.29.0.ebuild 2071 BLAKE2B 10ff98b2b56ca3e3ecc2b34a0196efb3512e7e17b7b79e3abdda530552fc790e32ac033b07d9875acf85578a35eb22f67de6c5304db850fdf1eb549312b75d6f SHA512 a381707af28eb925fb71c51bd88233039cd9abd7fd347bec4ecd64542a4c4ddb8628d1a5aec89aaf3f4f01ef12f0b77229a1f0bc9e0a4de35a646fddc77379e7
+EBUILD imageio-2.30.0.ebuild 2071 BLAKE2B 10ff98b2b56ca3e3ecc2b34a0196efb3512e7e17b7b79e3abdda530552fc790e32ac033b07d9875acf85578a35eb22f67de6c5304db850fdf1eb549312b75d6f SHA512 a381707af28eb925fb71c51bd88233039cd9abd7fd347bec4ecd64542a4c4ddb8628d1a5aec89aaf3f4f01ef12f0b77229a1f0bc9e0a4de35a646fddc77379e7
 MISC metadata.xml 702 BLAKE2B 646c6a83e6d8e345fddb9cbc42a83c1193b9590937cd652e293d03e6e9d4b240a69e6e86399f5edc9ef05f96d1d4c3713dfa65f8b13984f4483b2ce76a239429 SHA512 5e1e4db52fed55ab837c70ddb9ec81a7ce0b062064e2d33cb5771cd81d50a1a2164e446531c32a405bb9319acd736141765dcd00e36d6db770434a656ad925e1
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..30875e33909b
--- /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_{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/intervaltree/Manifest b/dev-python/intervaltree/Manifest
index 13ed9d05e921..1a769ba23cfc 100644
--- a/dev-python/intervaltree/Manifest
+++ b/dev-python/intervaltree/Manifest
@@ -1,3 +1,4 @@
 DIST intervaltree-3.1.0.tar.gz 32861 BLAKE2B 311b7937526495ff0d5d85b4e6a01744d585714c119e6b128ae47740a50234bfe32395728e55c1c9d0670c92b4e815901dbf26c9a83bbe8271875967e9f11f1b SHA512 adb49726912ad6e9cf6c0985b4fb94df91b4ef54aa2eb327186d7f15bc992745d81654d49f1dd2ce95f7173683ba2a072787ef1e8b389cd9b7e23b9ae743906a
+EBUILD intervaltree-3.1.0-r1.ebuild 484 BLAKE2B 294e7a818dc3194bb507c7851ffae564ea14f917b60b942b04153798f41fe0576ad61c37f932de4a28ecb9801c45cf2b4f15be4852e329bab161e2e214c92fee SHA512 3e3643fe90b2ab0e3c6ca182b07c3dfc197c5f67fcac66ff76f657726559227f7d7b140a302a20d5050577fdffa5aa7c1b761b58572a6d5d122385e03bf79231
 EBUILD intervaltree-3.1.0.ebuild 449 BLAKE2B 026cdc170c8bf661b5aad9413c3f3feead98d75e055c694de522311ad6549e0dd6cc1629708c212f8059fd54c00c0fd2c047d662774316b8b11906e84b9c73c8 SHA512 b4d8a2dd242d6caa700bd3f734a1facfb76d672fecbe4491d3e7620acaaf790e049d5046180d68a587242541d80fe05729a3ad329743382b7516d363db23b45f
-MISC metadata.xml 361 BLAKE2B 3ffaba82a393221d1fc74e6db19560dfabb92c1597c95dd4c2249238e465832f666dd05bb9fb3a8ba15b5224ca347165633a5ab2eab4461c366eb09ff3c712c6 SHA512 1885dd8b3cc203d7056e8a639bcd5c50775898016650556dc04cbb505d1e45d24e686e46ce836b5f9429f09c4d56af3a9d7af4855956d13167d0256a00e81459
+MISC metadata.xml 423 BLAKE2B 19e369d584f919a5d075d8b4b6d36edaa0a215f1b72fe971823d99cb38bebd362567eaec5f9821e2a6f380a13b38f79ad9756be3e984c94d6587bc4eae2c3cae SHA512 573f30eaa004bc02b75529478426ae7f449913eb43e94d74b7a7ad8ed6480368f0ab4c75ef37d776ae3e0d50ab88ee31d08f23b1b74ebb0e3cc209af4a835e72
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..2932bbfc024c
--- /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_{10..12} )
+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/intervaltree/metadata.xml b/dev-python/intervaltree/metadata.xml
index 04ccf9d87c64..8ae1effdbaef 100644
--- a/dev-python/intervaltree/metadata.xml
+++ b/dev-python/intervaltree/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">intervaltree</remote-id>
+		<remote-id type="github">chaimleib/intervaltree</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index dea528ad2558..f3c40cacb724 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,10 +1,4 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-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
-EBUILD ipython-8.12.0.ebuild 4404 BLAKE2B e6ab8fb0126ab3203c0d16bb45109d892de7fa06d75d366681bfab5951662267b78cf98a969e6df727ee0c2dd2c5fd885f99941dbb900664130c91760be39a12 SHA512 b4cce71a97340f949be18e404dd7b4361049037a7fa6aa436d748e11d50390499d7460356751093cd888c3ae09656fee02a6106ea33beedd34691c04c9875ab7
-EBUILD ipython-8.13.0.ebuild 4412 BLAKE2B 463589b9946247abd4e633b3f72a64f64f432f7cf48b16f0602579a87554d5eff73c41599a44ca0c141316826b951c484a0af8c3b9ab30d8889abe40159654c8 SHA512 4a14595f162c3e603319d94e80ec9b25efd5aae0758dded7ae94688c8b0d3559499cca5f6560ec4b26d407944c754af5ca08888e08fa78b3658c96db57f80002
-EBUILD ipython-8.13.1.ebuild 4412 BLAKE2B 463589b9946247abd4e633b3f72a64f64f432f7cf48b16f0602579a87554d5eff73c41599a44ca0c141316826b951c484a0af8c3b9ab30d8889abe40159654c8 SHA512 4a14595f162c3e603319d94e80ec9b25efd5aae0758dded7ae94688c8b0d3559499cca5f6560ec4b26d407944c754af5ca08888e08fa78b3658c96db57f80002
 EBUILD ipython-8.13.2.ebuild 4404 BLAKE2B e6ab8fb0126ab3203c0d16bb45109d892de7fa06d75d366681bfab5951662267b78cf98a969e6df727ee0c2dd2c5fd885f99941dbb900664130c91760be39a12 SHA512 b4cce71a97340f949be18e404dd7b4361049037a7fa6aa436d748e11d50390499d7460356751093cd888c3ae09656fee02a6106ea33beedd34691c04c9875ab7
 MISC metadata.xml 2802 BLAKE2B 2fb6773ad4ef10d531f978e3ed40f6d99cf1586ec6d7cf2bf7e60fd5d640d082a0946651e0a066993320ffeaace3426066ca24c325926b62125ae91816707128 SHA512 965c3e36e05475d9454af8219b84e080d4c83d775f8a7e20a4951a82246d672c46fd3cb1fff5f8664d0ce8e8fcb846de6f15abc4575db3a6b7d87209194bcecc
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 3a1f883190af..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_{9..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 ba9a80b2508f..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_{9..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 ba9a80b2508f..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_{9..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 5c3f32057fba..968be839164c 100644
--- a/dev-python/jupyter-lsp/Manifest
+++ b/dev-python/jupyter-lsp/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD jupyter-lsp-2.0.1.ebuild 2743 BLAKE2B bcad3f001aa2cb92fcbd9b7f9a8e1302e8fc3e2c6328a4fd7dde58098b15906c0f2eca5022b1b82119130ee1ddada766020d18eba831324bb1349e782f14f704 SHA512 8d33d169a193fbc8f3a2fd1b0cd9a1bec168c44550395c02d56a2952ab4e8677931720b27b6fc441faacadd1aa0bba3e39adf8cad83768643bc40e96f9df85da
 EBUILD jupyter-lsp-2.1.0.ebuild 2743 BLAKE2B bcad3f001aa2cb92fcbd9b7f9a8e1302e8fc3e2c6328a4fd7dde58098b15906c0f2eca5022b1b82119130ee1ddada766020d18eba831324bb1349e782f14f704 SHA512 8d33d169a193fbc8f3a2fd1b0cd9a1bec168c44550395c02d56a2952ab4e8677931720b27b6fc441faacadd1aa0bba3e39adf8cad83768643bc40e96f9df85da
-MISC metadata.xml 417 BLAKE2B 37e0faca144a5da718475df6e957d9664fa5a757735bf65985dba486180dce37621cf3c34cadef4dbefbdb5698192b601a8e0bb1c77f71ba5550e65e47cc5e9c SHA512 6b61ffc68a46993386baa1c1b95850edbfbdb8d4fa40c4111aaf4edbb7d8d4f8ed21960ee01e69e2a8b986f66c6ec4ff938392d7849e204936f05d62ce7e8531
+EBUILD jupyter-lsp-2.2.0.ebuild 2639 BLAKE2B 8b6a818385ab6777c7e24e2b40a3b53a9efefd5ba5d1dd82273c869b1c3f99e870095cb90ca0e32d025d3bbdb1384e31e008207f5b6c47d88269654a30478933 SHA512 d72be4c7efb607a2294967cb2a6f9fc857669f908a39f4acf5edb3b6c1ce2317ebfb8f57b75add2d522064436a4a8322e724c8602bb6fd375c18bed11fc3bc52
+MISC metadata.xml 418 BLAKE2B b5e29964f271efebf225f8f8cabfcda723f20a40693df463a8d0aad04d63dc67b35a16a8ee83fc7d37aff55fc481bceb02d20221c6c11ab3993fd1fd3b5cdbd4 SHA512 4935850508d3b951c3f6e0bd4068303e6f6415024852e276ffd67777dca3da53aa9879ef460287f90b5c66dde02ec10a1eeb249579ef1fabf7dbed882f5cbe42
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..c14e6e958015
--- /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_{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/jupyter-lsp/metadata.xml b/dev-python/jupyter-lsp/metadata.xml
index 5753744d2233..81371c1865e8 100644
--- a/dev-python/jupyter-lsp/metadata.xml
+++ b/dev-python/jupyter-lsp/metadata.xml
@@ -8,6 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jupyter-lsp</remote-id>
-		<remote-id type="github">krassowski/jupyterlab-lsp</remote-id>
+		<remote-id type="github">jupyter-lsp/jupyterlab-lsp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/mkdocs-i18n/Manifest b/dev-python/mkdocs-i18n/Manifest
index f5334ab0067c..bc968cec6052 100644
--- a/dev-python/mkdocs-i18n/Manifest
+++ b/dev-python/mkdocs-i18n/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD mkdocs-i18n-0.4.4.ebuild 551 BLAKE2B a0efc70120a724ad310f3ea8854bf5393008015c54925e5743ac796d1f72ebd5d49f9e6e230facf26cc5510b684a929ad895672c76e5e9f394c0ba76c029dfb1 SHA512 54370f8f596e0c3a648c31b85a1f044962e63982b64aa1e64147a7e1aba59a6e47b92299fb6b8ddfba5febc4a5719a8a461902a198941b153ed38bcec70a8438
 EBUILD mkdocs-i18n-0.4.5.ebuild 551 BLAKE2B a0efc70120a724ad310f3ea8854bf5393008015c54925e5743ac796d1f72ebd5d49f9e6e230facf26cc5510b684a929ad895672c76e5e9f394c0ba76c029dfb1 SHA512 54370f8f596e0c3a648c31b85a1f044962e63982b64aa1e64147a7e1aba59a6e47b92299fb6b8ddfba5febc4a5719a8a461902a198941b153ed38bcec70a8438
 MISC metadata.xml 540 BLAKE2B 0b6e023e1903f143668642c8a150cb0610500b8ced2082fb31586a1157281fe21535c249e67dc19789cd36318e255efc914f7f5e29dc2af97e6f0866214b8523 SHA512 6bf089cea5ea6ce4547fd616ecfed754f68cc17d7caeed4f633ef41c4349cfca1c68585a1bab548db284dcfa672348b73e53a5e6610a73480913694df92cace6
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 6afd004add19..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_{9..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 e81f4ef8e7dd..0070b6c85e27 100644
--- a/dev-python/nbxmpp/Manifest
+++ b/dev-python/nbxmpp/Manifest
@@ -1,7 +1,9 @@
 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
 EBUILD nbxmpp-3.2.5-r1.ebuild 798 BLAKE2B c5a53c25c177b51344a80efc8f9f723ebf26b6b934b5b8d09ed2418a5aec552625efd3ddb27de9d4492fc468fd7def31b3affc8d6384a5a2e2792711178eeb02 SHA512 a0c4d39a2df8f8904c45c9166bb13e2f3ef095591d614f62d47a0f95419f159d846fdd9899e525be8d718ba4f59d5bd7530e7855f7507e4dc19bd231851c9071
 EBUILD nbxmpp-4.2.2.ebuild 854 BLAKE2B 59b9c9d23f3bc3158289a5766908639b59a8fe5ad0ed7a76c9d83cd420035a0ad0696121d72aa6242ff07e7fc276fbc2ebaf4ce8d76548bb39056915c6110bd6 SHA512 aaaea7dee6254f92a5f170c7f5af9a94b4e3658296b86f5f2bde23c3ee80715513ce46c3c334cf462a775e35b55b87ea7100da0a5188ac5fa8bd55870d0355a5
 EBUILD nbxmpp-4.3.0.ebuild 856 BLAKE2B 451428e7b688a1e47d01117451ec63bda581e9019fa1cc9c639c590477011f09effbf5343e6a03bfc8e4d6e89d6c8d92a9f0c73a00c330d75f3dc6691057b31b SHA512 2883a578e813aa257aa0ffd231d9029aff97fac597d3335124d702cfd5b93f9e6e935b2c601b22c07f505b1b7356744df6b99616d518f5913ab64782dbe4ae2a
+EBUILD nbxmpp-4.3.1.ebuild 856 BLAKE2B 451428e7b688a1e47d01117451ec63bda581e9019fa1cc9c639c590477011f09effbf5343e6a03bfc8e4d6e89d6c8d92a9f0c73a00c330d75f3dc6691057b31b SHA512 2883a578e813aa257aa0ffd231d9029aff97fac597d3335124d702cfd5b93f9e6e935b2c601b22c07f505b1b7356744df6b99616d518f5913ab64782dbe4ae2a
 MISC metadata.xml 426 BLAKE2B 2772501445c7b3f8db801d5d6c52c6004cc6c67527b30cfcd5f48b54c3e483f1ace9307632f0da179cc4462e3ffde741b66af38c76e248004ff7238a591a15bf SHA512 0f456e67e255e045d97f969ed16c7e304d07a6b9a60d938dded30e78235a2ef984f5883c08f655e14084a8d76f54cd578c3d1eb387f0cc4d8502a5188dac987d
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..570d6eeeb400
--- /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_{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 f093c082c164..94bb3b3fda7e 100644
--- a/dev-python/notebook-shim/Manifest
+++ b/dev-python/notebook-shim/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD notebook-shim-0.2.2-r1.ebuild 928 BLAKE2B 603d883d1ff43be1efb0944a57491ab480dddb62f08ee355504def9bbec949826bbce506f08962262ee304db2ffbcfa5082da65101b6b4cc3c5bb7a3e0484788 SHA512 4d79e5e50ea8bc1815143ec0e5dc619e339eed5cb1d6378d04d7122a2b8fd9e5c7c431ee63cdccdd649e63dc95d3698de5abbb12514b3ec2509469cc876303bf
 EBUILD notebook-shim-0.2.3.ebuild 929 BLAKE2B 338d04554aa9367f99d4fe4565039f052fb9665eb5d7480b8b85f39b1cf0b80da4c2e78a1d305b6d1b4d810a9c5788d64ab4803c4a19518b27492a675e9b403b SHA512 6d1a274e80637309ae634002895605257a3c59122e1f8f3026c6906b3ec7f59035f7eb523b27640e94a87b9ff8013d925fdbf5784f7ebd52d3355460ca5828fe
 MISC metadata.xml 535 BLAKE2B 074e2bbcdd15078aaba2c65641a16ca7ce27e0c412d48f2a48a4cd80459a948abc478baa28b3e7417dde2bf13717040dc083711b114d61dfd2a7f7aaac1295ca SHA512 9ff7408848878f74eb9f10ec5aded639a749635851385b6679a72112c253a7427f65ac3e3c41f21f9e8551a439a7c00c4e28a5d70b3529ab9e687a5d0e7abeb9
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 3e846f9c9589..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_{9..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 f6ad3bd8a11c..39fb0403c2e7 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,3 +1,5 @@
 DIST openstackdocstheme-3.1.0.tar.gz 1256193 BLAKE2B 53bdd85094a74344154dd4a25f2d29142be12000f5b38c8d723ce800794677972215b6402d35fe9385ede246efd4111d457ccb2d04eb540fcbaea5cf92382c04 SHA512 654859f40779e1d285b08b12c040b016a066a62e0a6eacad3c5a271ee40ba1147650ca1b95ac68a4fe254a296948f3ae30803cd26f9f67f1be944683fe24445b
+DIST openstackdocstheme-3.1.1.tar.gz 1256245 BLAKE2B e0f1a9b13fe7e28e851eddcbf73a87b28509b9ea3d597a4680b3c8b39d309700f7fde8cf9fe9a63d6ec7210e505d24d541e1592553b8a8c9cd85b38de09a4442 SHA512 b620486617f5ab2e5ce149030a9bd79408a856709603725b2e17400253aaadee732c2ea5954d80c9ab384ac266d85e7e6698f3b525115183b38693718b3f195b
 EBUILD openstackdocstheme-3.1.0.ebuild 710 BLAKE2B 3be11178a9fd4274ddb1e860cc26a536eaccb15d6127c576175c817ee3a7e207a88c834a5a6aa7a7db82a1c26aedfe3c46aa35b159794f30e9563b1a7380df62 SHA512 ae04f1f5dc2f9b59f8a856e5c12b8bd4a1ca479928b40fafec0f98ca228564a7579030a7635cec74b84b347bbfdcf892ce349ed5165b534c85075d61baf5b540
+EBUILD openstackdocstheme-3.1.1.ebuild 714 BLAKE2B e09da7799f2352fbf92e765121440b6dd48a08d1060bf017e66e41759dc4a41d9bbbab0e72d7cb2036a3d3fb0fb37970f700fc8aaf1ace39c9dbdc55005bf6f8 SHA512 4c83d8f255fdf20fd6c32541bef942b33244ff6d3786bee183b72e8f82e70550460477b0f55a871aaa2e69622cc93bccf4c6eeb42faf648fe28121d65baf9f58
 MISC metadata.xml 747 BLAKE2B 17de68317b0cfdeea5d574db89402a0fd4bb335fa78a4050053585e7914e232a2679693a05a6ca260d84f7f82c2fff7c0af1b82183dd33e6ff96d947ed1ffab5 SHA512 3e132316c7623ae609f8f1035fa719960cea7448c3437f0b5456984cf3e60b62867ce0a8de3a7681315472984d2a8d317f5f06e68e2b0b8343c429cc55eff1d2
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..b6cec53a5c5a
--- /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_{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 27704abf4c66..86d985afdf87 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,7 +1,3 @@
-DIST openstacksdk-1.0.1.tar.gz 1118637 BLAKE2B d4677a3a5595bf871fc0b380f1cadfd56ebba14bc2255fcc6a6a4813c5c79807a1a0a76263844728f256704b2966b82be9bd6e968de9e7e85f411402f428cb78 SHA512 9871a262113b4396b3a5181e93d2e00312c5a80933c3ff6efa501a4b4d7d145985f54203eeb6e1f50c5593ba491b13a631b9293759e0615bf0eda393c247a4d3
-DIST openstacksdk-1.1.0.tar.gz 1141513 BLAKE2B f4c052ffa1efc36dfb355b50853d75ceddc5a3a361a8a8749bc51d55530dba465df451c7bf7154081130ca4d2d798e8c96b7230d4317bb9ebb96a9add410b501 SHA512 3c91a6a797c966bbf08dc51f013004c8ab9148dcd3a6fad4584fb40c256696a7ea02f241bc7ea1a3fbc56a7ec790dfd1900c0da54081c3d64f5077273d4e0835
 DIST openstacksdk-1.2.0.tar.gz 1160015 BLAKE2B d3ed5b9415715faf6d9cae225e2a8e7c3bd69907599fd2683f53e2070513a1f27aaae2d2f4aa40ada26ff819b5f8238c09e208243197165aa52f19776e53fc7c SHA512 4ce118b8b19b495f333f76cb416d2b4cc2c9ea835979cf67e83f6f7f40df13d29e19ed054a2f3ee469e6c5496da4a7a11193e4815b20195b28ba4c48263b6c1c
-EBUILD openstacksdk-1.0.1.ebuild 2635 BLAKE2B c884731c3c3b99362fcab7f180d4b2dfbcbf7b2a2f897e9be191b828611d03ca10f5af3d3a924c1c123c166f9e6cc09682cc90f5a20167ca0345b6a47bb6705b SHA512 271fb81e7040e08196b4c70f180d8d614c70bbe4d7a7eb4b584ad93c365f1603be90134a4338d8693477ef3d94dcfa4aca54df0f2fa8db0991695b0a1c01c2b3
-EBUILD openstacksdk-1.1.0.ebuild 2638 BLAKE2B 4365c3ccf1044ef1af93ce590e3edb088d021b55a378b45387d2e597d557233762fda154d88de664c9463892a40ff09e1f91bfd9fec330f5c6ba91a975d594b0 SHA512 2c6a571ce78aa11c15b0373f4d02111c4a8f428c9dacbb765f2d99d791a40da7844556dca7125a0a2c811e192ab64437096e3ff1d7f63b18403e72792a61017d
 EBUILD openstacksdk-1.2.0.ebuild 2636 BLAKE2B edc801b7ad004d2ac164850b9cae4074c24d0c9617b0ed56ef447ca76b26e27f8c5aa857d3c2dd1de57707e545fff96ce2ae46d9d21b7c6cfdf9265ef0b61032 SHA512 46754f9e5e1ac4080ec27cfda788c55e4a0dbd41fd0677d9d544f5231f6083c214dd79a77322c870025aadb49c5c49f4caf4abe511359d0d7e9b9bbbaca1722f
 MISC metadata.xml 517 BLAKE2B 661ad1e9eae06e7b36a5ff753e73bd4434042966cff3fd6fbc11bf70a1acc3eb8de29ad2a033d6d715e1152a5454d84077e99db3b588199b317f925864dc1403 SHA512 e6dbfbb3546c2a62b204b33ebb3bb33611079698212f098bd4da072200fe43e3bb350cc998b255ec4a15aa2ff3a04c89a9553dd7930db48e658dbcaff78526d6
diff --git a/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild b/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
deleted file mode 100644
index a4ac5fec7faa..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_{9..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 85400b39c990..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_{9..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 53961b516ae1..473f83d5614b 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,5 +1,3 @@
 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
-EBUILD pallets-sphinx-themes-2.0.3.ebuild 725 BLAKE2B 597be4ddf3a454d7f4fbee2cfd71713d070e41cbccebe9982d6334e874ed781448c5fa957be1ef5094119ba6e0dc85f566668095ed58904f1660747bfd3ff034 SHA512 0a24662e8c803a15be9c7e5624ceec696a4085d90f233acc07aa9bf1b0d94ab3fdbb6cbe3076aecbfa7cca7d6a187a2f788524268839841298f2c7bdf03706f7
 EBUILD pallets-sphinx-themes-2.1.0.ebuild 681 BLAKE2B b1b4074c1457a94017eafaf14e0fe31c3d4a8fcc5e8f9676e48518de8dabc62730a6e9a83933a5f49734aeba2945d8cf6af8ffd49845bf637742d294660e3a04 SHA512 634e45dffff7f739aa74abd19296014534e2ff8576a476a5355ccdbee80dc2c8cc08bd5659df551780ee8b407f81584c6e27691f72a65f88a7406998ac19c978
 MISC metadata.xml 418 BLAKE2B dd644619949598d5675c600fbc5c740dc9882042bd04c8ead4b81de2ebc2f3a3e88d79d1e4cbd710b953cae7b116b1cb09012af913914db5a652a1ba2b5f4970 SHA512 537261ae9194a004752e90e3b4972763f9e22c27d18a7655f4ca4005d2999402b46ca7408d0811e44d3b0a12cb6cac506508c89ae5edd245f15bda13da91f216
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 39528e6d5f11..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_{9..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 2fb278233366..fdb0b341001e 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD pip-run-10.0.7.ebuild 1415 BLAKE2B 37eddbbd484c549b5a3c5274c0f4fe29c093c0c555c43e47a00de0127c4196f49c39e157a588e08c5b1a6ae6f19cbf206e47e67aa70a7718519a01d382ed3105 SHA512 0ba95169ac46a7649f8bce7ee8d5cc81e6cdcfc2c77f014a6692e1f2717351cfaf2bd529bde083ebc59853b452d8749ac36034768ef980ac6e2d1a307a3fd4a5
 EBUILD pip-run-10.1.1.ebuild 1510 BLAKE2B dc758aac78a5f9fac5c5572ca113dd766793222b4da1ea31ae38a24824c4007401c9c02088d57955061abd2b556b1742038ab960dc0e0494262bfae31ef80401 SHA512 1940163e757ddeb9b3122ef227e771f108eb25629768c58e245fbd446afb8293020e4a796426c9c9cc9b2571510ce71f631a8b5bd3db0c964c680a448607bac8
+EBUILD pip-run-10.2.0.ebuild 1510 BLAKE2B dc758aac78a5f9fac5c5572ca113dd766793222b4da1ea31ae38a24824c4007401c9c02088d57955061abd2b556b1742038ab960dc0e0494262bfae31ef80401 SHA512 1940163e757ddeb9b3122ef227e771f108eb25629768c58e245fbd446afb8293020e4a796426c9c9cc9b2571510ce71f631a8b5bd3db0c964c680a448607bac8
 MISC metadata.xml 389 BLAKE2B bc573b4f57b4f8371ecef97266b8441d47e66d551f7088a7f312ca049f7debd90e989d24d59d7aff182795ae27e553d131f3875c789dc793532ff9c812bcaf20 SHA512 00b81cba684e7118a3ce79ec5cb6a27d6ad67064a2745ffead8dec51c7786c9441139b800868cad8854ff39d7e38163ab2c8fa5c7d3f328390b628f8342fb0ca
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..36f03616bed3
--- /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_{10..12} 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 74a05177fc99..5bd1fb931e37 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,11 +1,3 @@
-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
-EBUILD platformdirs-3.2.0.ebuild 1325 BLAKE2B 2b5b310d0ad321ca6e1120bed1eeb1c83c01329e217a41dad48c2ca70e677a38dafb426dbacd9c124fa96f98776883a3e57b09f4ca5da8bf1ad1a6338e8fe319 SHA512 aa00625d3b938c4560f67076a8a9061b0ec5c00aaa6e51beb33301d55a0c4b06160ba840269e6ab2bc5e1c8d4a4bae1982dd50808a9b23f6bec2e0b3efab1a28
-EBUILD platformdirs-3.3.0.ebuild 1333 BLAKE2B 73b2af2bda5ef0ec53e82fc4d4d38643670d58e269b187998faa6f0fe22d66ac445f4d2df02ca63d7a4dd069b2e3aee22132087eaefa4a8aa3ecca0982935356 SHA512 a1fd7fb535455d11e64563f967f7251e1f0c7666372c0013e8e7788802febd51f429a01ba8204365fa0dd790ba744c7f280f6f345f8c1271b6a484b5151ea696
-EBUILD platformdirs-3.4.0.ebuild 1333 BLAKE2B 73b2af2bda5ef0ec53e82fc4d4d38643670d58e269b187998faa6f0fe22d66ac445f4d2df02ca63d7a4dd069b2e3aee22132087eaefa4a8aa3ecca0982935356 SHA512 a1fd7fb535455d11e64563f967f7251e1f0c7666372c0013e8e7788802febd51f429a01ba8204365fa0dd790ba744c7f280f6f345f8c1271b6a484b5151ea696
-EBUILD platformdirs-3.5.0.ebuild 1333 BLAKE2B 73b2af2bda5ef0ec53e82fc4d4d38643670d58e269b187998faa6f0fe22d66ac445f4d2df02ca63d7a4dd069b2e3aee22132087eaefa4a8aa3ecca0982935356 SHA512 a1fd7fb535455d11e64563f967f7251e1f0c7666372c0013e8e7788802febd51f429a01ba8204365fa0dd790ba744c7f280f6f345f8c1271b6a484b5151ea696
 EBUILD platformdirs-3.5.1.ebuild 1326 BLAKE2B 02a40864be04dfe30c609d82652dac8ea264fdcf5e5fa7802cccd67aea42fef23fa674fac448cbe4af75e22a60e029fe00ab49a82529b45e02786d36fbbd6107 SHA512 97ac223f0e44101860803b0a109f3ba4d9f521b43f30d7f3ae79cd6745819bfba6ca46464323da9a0483c8a0f466dfe406d3928fe567323e6579e7adfd4d97ed
 MISC metadata.xml 383 BLAKE2B b8c8c1593d154e7a38ca4bc450c14ca21f2411ea1d71f67e9631c1def0acace43ebb6e67adc0c4a1f5f14aadfbce44d0d815fc3696410bef66c826fd5fb00a45 SHA512 f4ba6722e1cf661b3febe10bb15755a9cbc30226a08bdcabfa3d80be87b42d662d6a1edb3412ad79e8f36836a6dd4fd91a83dae29725ec47041056dc1f1f9b75
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 1ef6750de3f9..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_{9..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 58e26b5de925..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_{9..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 58e26b5de925..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_{9..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 58e26b5de925..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_{9..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/precis-i18n/Manifest b/dev-python/precis-i18n/Manifest
index d4820fa6eef1..a0721d67aab9 100644
--- a/dev-python/precis-i18n/Manifest
+++ b/dev-python/precis-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST precis_i18n-1.0.5.tar.gz 67710 BLAKE2B 7995c3cb74290524d70ecd75b052201df49ae7e9f4d0052c8176756866ba8533d164b057f0fc4c5c47b938a20e36898cb52bec411b56461cb9c4e4f7029db4ed SHA512 ba3b43d4a84de02e002f7e62a7fb75c4694f3c6a8963e5bdfd9927989c2ee84317fc5fa6f119e79bb1f88dc97a37a06930829daae3969d6a5b2f5ba57bedc3e9
-EBUILD precis-i18n-1.0.5.ebuild 505 BLAKE2B 306f88a346a654f4ce05a17032bf9d0f27a599529e7c75b3dcad506b072cb16f545d538e83a1134ec9139a3f025a005b26b6d3a62967232f9a19f9b564701714 SHA512 e1da1bbf33bc00845186f54c5025c7199291024f0aa9b15b7ead525f82c42a2f6b173f10c36379baf9aedf5cb9a582a69e0ba0c58ac1c1d851bcc6d05c557961
+EBUILD precis-i18n-1.0.5.ebuild 506 BLAKE2B ed942b8511c015f09e2dbe0f83508ff10793d9469d8d5eef0ed4a48d8bb5f1c31a5e7a7c780ba0eb3eaddc29ab54d62a843f26508ce6aa441ccedcdc22d11c35 SHA512 27849d82245c1ab73e069a89053317341592ae422c96b75a5920416dd9bf39cd4de73069a6f760fe01f5480f52837b4a281d33a74f4732a2d574df9b688ded08
 MISC metadata.xml 992 BLAKE2B eb9ed20de9967e142348667d23c3b81b0962a35b606806c1795abbbf1c1366b300673c30733eb8254a84518a05d5211356e1341dbe2d2ab56abc5e9a72520735 SHA512 22148b307c78c80b9363f00ca984431946a4d7275799f71a8151549b475d6671aced5ba790b050b8dc16d6136ca534c89f96c5ac8a49edc8267417fa39367cf9
diff --git a/dev-python/precis-i18n/precis-i18n-1.0.5.ebuild b/dev-python/precis-i18n/precis-i18n-1.0.5.ebuild
index 8576c88ad74b..08ccbcfe950f 100644
--- a/dev-python/precis-i18n/precis-i18n-1.0.5.ebuild
+++ b/dev-python/precis-i18n/precis-i18n-1.0.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index 4b02d729a57c..22b3814e7533 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1,3 +1,3 @@
 DIST pycares-4.3.0.gh.tar.gz 44577 BLAKE2B b69eeb34a2f8c9d7025dc74881431b3fc5489b7f7e9142bb9ecdaf217e495ad72b1a6a7dc484a52e6a01394bbfa6d0609b2054dd4a663176cfb73d980642a3e1 SHA512 1dad1a6722bdd2bc59cc4ca774cc9da243e61a442ef383c238714b1274e90359352c72d16a2c1af2fcce3ea92708a7e5cee89a9b3eb7c015f9a194051c685f52
-EBUILD pycares-4.3.0.ebuild 921 BLAKE2B 873aed2dcec7d404b69c038757cc994d342d4ba87c4d986f092cd9714df005c4c99064106ba878a637734244d7a356dd1f98a408a00487a2afe1014d7a48817d SHA512 0b0b3dc137a14812c082a0d637fea89b61297c903ec412c3604d4cc0f38776a3a2ebaf080b810f369284e62f68ed70f198a46ce0a1113383beddb713df2a990e
+EBUILD pycares-4.3.0.ebuild 1128 BLAKE2B 64346cc7503a9b61722dfa64dd061a3376e5b9b52ebad0d7ef44053accc3be90a1c541a6580302b2cc4b5c69ea5e968a7bb4cf0cef9a045588d00893ea628af7 SHA512 1df0b4851e6592929fb7bcb36b1a091406eeb95c5f7df24804c51ed9be73193aaaded614ae35dcd464c257cea7dc31a3481c9c25118e4597899773cfddefe576
 MISC metadata.xml 444 BLAKE2B a68f545c6f704176b98ebb3665e2f56e4879016ea4ffa4f342954d568d6fe76ad67bcf9d521f694b8fc0f199bff50969eb646554fff4a78f8644ac44edda0cdf SHA512 fe893795f2031639d9fa27efcb8afbb5a3e0ac2eb2a05f0465391813d60fba07372633e40136ce38eb429bae95d1ae5dccecd0aba228537553524343133dd202
diff --git a/dev-python/pycares/pycares-4.3.0.ebuild b/dev-python/pycares/pycares-4.3.0.ebuild
index 19ac39d76e8f..65783928aa52 100644
--- a/dev-python/pycares/pycares-4.3.0.ebuild
+++ b/dev-python/pycares/pycares-4.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
@@ -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 1eb6ce1ecc8d..7a2e74f4c4a0 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD pylibacl-0.6.0-r1.ebuild 981 BLAKE2B 09787b4157c15097c948b58835140d622e06495bbbb9df2fb71c28e7d0608c7213f542fafe915bb324cde7289e171712b9cdfc8a18dd64e1bf48f4edf9bf5eb0 SHA512 f7dbf359320d3986338c191457acb406b9c7687d2cfb4204aff5e330c418ed8889b6e3d4cee9b89a337df511074cf51d6f4d072f19a119ed5ca2be98a70d66fb
 EBUILD pylibacl-0.7.0.ebuild 948 BLAKE2B fe6a573c3aa09991b909082dbc2cde23e23326573a9846bd55e394f12d2e312461559907b44413226e627244e8dca9eef699fb2329c90ed5456d866b60c8c3e2 SHA512 b5ce9e8ee51b7109d7199a27b38ae1ecd2748deed6c9c568dc7d1899febe47e8fcf386bd176b404d761b852e87b1fdbcc5af4fe2d4ffe364cf87eb4adfa78153
 MISC metadata.xml 446 BLAKE2B 0e111cfd834a03f88984dac937b5b3d09a7675338f0381d30603b0512d7f5ae1f486a832d060ecfb9c5946c7273893ed030555062b8bd3f26f10765c28a90143 SHA512 7df5bf16220e50c851fb03af84a600eaba23fdb703aefc2586aa2d27a1e55a18ad7b117274b8a07c7d7997dfd96fd51bd2dca6d3a1dad01cacafa678a5c8a794
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 d5d6d50574b7..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_{9..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 f565ad9a4cc4..26d4671e48fc 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1,9 +1,3 @@
-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
-EBUILD pyproject-fmt-0.10.0.ebuild 782 BLAKE2B 8e0dab3061b6ee16ca0aea36198b8b406d3954d7a17ddae9389ae4c74a0d2d1c83e09551849d1489b47f26f3b1307d52ba6fa0175fb1e15e8a1667175c76a1da SHA512 c09a5cda28813143efe75b19cc705c20704649cfb61218efc784f781cbb858f63294d024557d382d18e6c11b6ee3e4f1f09c2269ec23cc7bed0c0c98cfc6d939
-EBUILD pyproject-fmt-0.11.1.ebuild 782 BLAKE2B 8e0dab3061b6ee16ca0aea36198b8b406d3954d7a17ddae9389ae4c74a0d2d1c83e09551849d1489b47f26f3b1307d52ba6fa0175fb1e15e8a1667175c76a1da SHA512 c09a5cda28813143efe75b19cc705c20704649cfb61218efc784f781cbb858f63294d024557d382d18e6c11b6ee3e4f1f09c2269ec23cc7bed0c0c98cfc6d939
 EBUILD pyproject-fmt-0.11.2.ebuild 775 BLAKE2B f9b4f138b36c1d48afaaa242313cf95d4dbec1c1a23ec988697adeaa3efaa6d666ffe4210acedd5db82865033b526ff139f4084f59fd7c1c257a0725884b3ee8 SHA512 3d402ddf5f98337dae17b66341f5affa6e95d3167a469c2767e9006e3f96ec8a84adcbf27d8f9f1bbdfe89dd415315423b5f01a9c93024683affeb84ad725a6e
-EBUILD pyproject-fmt-0.9.2.ebuild 861 BLAKE2B 8d4b076b7b2af9273591b0022f86c15aa97ad14b62d345305bcddd3f59a964e44756ed10a55dee26b867dc002b3f04ba81488ae4b624b347fb549d197e79d54d SHA512 2cfc68b195fccbd3baa2b6a3d9911b226fd501daaf260996d420ac612045d51d193eb70659dee44c00c9dddb59946a4064198fb3b6b35bc2b87a72439d10f93c
 MISC metadata.xml 380 BLAKE2B f139b3f6c22d40d7c91b9b35db262813e299d1a3c1a1f8d6129e457fac62e3e7029a05315a3bddd9c4542764a33160c89b58b3b62f457efb088a7ae7cd86a936 SHA512 38bd0633defb67ee1831480c8b3896e158d0735ec74057b13b3c389cf26bd6ecb878f21d172f83293789d81ca2c30afedab8eaeb4ab1774b39972fdd5f805a81
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 03da02e13551..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=( pypy3 python3_{9..11} )
-
-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 03da02e13551..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=( pypy3 python3_{9..11} )
-
-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 18ae3f04023d..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=( pypy3 python3_{9..11} )
-
-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/Manifest b/dev-python/pyrsistent/Manifest
index 106ed861bd91..2f055ba75332 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,3 +1,3 @@
 DIST pyrsistent-0.19.3.tar.gz 102640 BLAKE2B 60c5ef9d3f26c4529d05804df13453c75b6ff70e12fbbbbe22312686da929766fc903b18ca77d626192e1f3fc9fbdfdbbbd4eef102f1504b38feeeedf00450d5 SHA512 6bb70b6fd65b5cd9f961a3199c2d90725aaa66fb869e4eba2143735e2f3a7e4ecdc782b3498acc2d92e263c3bed14cec8cc77324f4ebd08c300ba6735db5ecf7
-EBUILD pyrsistent-0.19.3.ebuild 836 BLAKE2B 2afbe14442294d160546c195a01eccef026051594d644ab05d5ed77f20ca199f88a65da4203dae80eed4e7fb594aefd894e600f331d4610efa3a897089319b9c SHA512 27daaeb084c531713674be3540d3b79536f20f19d9152d46a1b6f7834b0a39e79159ba1ba67116e960a43ba06e759e2f49cf5884fb17d5f15db3df955ab6a100
+EBUILD pyrsistent-0.19.3.ebuild 624 BLAKE2B 3819ee660d713b755fce0e11fea8dc2eedecce7bd77844a089fee5d5fc52d91122bcf547bcb8d25fc841c884e6206b0cedd9cc04495a547c384d0eebee670b48 SHA512 c70f07f9112fe3efed0ce4d9355a345896ba4143d17c9413ba9a9cb83c76d6e183035add29473d3d703cf05213daae01db23c7772c1f2ba48fe8900d825e4e34
 MISC metadata.xml 522 BLAKE2B fbf571fd4d833fea0dc9942620655c45bb91b07ca02e2e0fccb23980de26303b9e9c3963453cae3775f7db33dfd485a4a55782a1b1b2b635af0d62e331596b99 SHA512 fe358befc92e29769bc2f84a516da1a26026e4ab84e812326da72ee02b18c79c3d6acdfb71cb6027d2d0f1e559cc00cf39406e335fb8f38d4479353a7dbb4ff2
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
index 82bedd9eff6a..589c00f63923 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/python-utils/Manifest b/dev-python/python-utils/Manifest
index ddcb486f3940..bc7215ad8924 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD python-utils-3.5.2.ebuild 735 BLAKE2B ca117316e18466936ee0d891a6346400643c9373dad660ad3f784efeaf911d5c76b0e46cd9c623dbfc26f1e0d6e1efd8213029f0d06bb25b8c08ec096abdc8bc SHA512 2a99a45b265d022b36be2a13106f5209c9c72eb479c09a2511a39179c17a351cbfd3f812b132c2435572026463e4d73af9b9a4c06179e171e7016f74b5e058fe
+EBUILD python-utils-3.6.0.ebuild 797 BLAKE2B 996f0ec85918e36871ed7ac55d4ee2cbe4503373933fa1f43979cd9f10695615d5dc2fd7d5be424c93f113ce582f070901a299ba42d76f474c4b6203974051f4 SHA512 1bb7be4642ecd961b3eece5c03358482bd5cc0eb533c2110d79cd85199a65f78449e776cce79df83a89719cdf005929ac44fe3978560545ebb41d7779e94d01b
 MISC metadata.xml 398 BLAKE2B 40018dd39311868fe5b37b6e03d6f6115427b84ca4cf4643b227dec910a193b547384c6cac4a97ed0f06a81c453c12ae57612e279e44a8a671b7f36a3ebc3128 SHA512 aaed2dfc1a9802d6d6d2d28d13fd478e0cee7c422992cde7994c4408690baba6c9e99ed77a55b0d3c5d966bb18cbc76c579b50f9d388a84ae204137b33c81a92
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..79f64316b1e5
--- /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_{10..12} 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/Manifest b/dev-python/requests-mock/Manifest
index c19a868d41c4..f76ad5a23997 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,3 +1,3 @@
 DIST requests-mock-1.10.0.tar.gz 72627 BLAKE2B 4ce1838f03b732de4007c2e9b700876dcf8dba0f5eafef1292e0e40ae75e08f9b3bf74c3620d2d762944ccf9af248304929f57a337122b1a69d13355dc3f290e SHA512 873c9b219e2a2360872fac22c83371ce40f4dee45e6a0d40365f4f551271c2168a662dced6e8baad890b1dadfc03d21d4ce013f149d25a42d998af4f4fca2a79
-EBUILD requests-mock-1.10.0.ebuild 1337 BLAKE2B 2aa3b4350bfd4ca176e5df6bfa61510302aa9960e89fc646da41ae4156d6ebfa631b76cbb23f6f463a62e230e67b5519c72114774c0adb35a163a810784c6e35 SHA512 5e58231bf2aaf486216b9c88a6899267106181c73399bba16d984900f8557270b52532fcd73e39f723c3807f955c2680e9b28d31112d573ca026fc852d58b457
+EBUILD requests-mock-1.10.0-r1.ebuild 1541 BLAKE2B 74b98fabd503939869c6e74b0b78753d345e4fb05d344ccd82301decb5bd642785a373a4f67f660f22a4f3b52d07d312b972301db010f26aff33fefc4e082a65 SHA512 5b4f3b7f1499378721718cba33169eba64f0f41e274c2271ab1fc6a3daf3200ba22720b0fee7a9712ce3b3e399b97890c679e6ead755a96a1add185ab5afe38b
 MISC metadata.xml 479 BLAKE2B ddd64d016f85e6960f2d8a10d53591c6ffa5c0f61ebc4074f5867a03c0d8f533468351b87cb10e662391aa3d8fdd61b07bcf607c1d5b07a13fe85cf600def424 SHA512 341437e0fb7b532b7845d000e0647ed9858efe1336e8b6f57f55f677483eae4985ac0f54016da09d22d007895f3450a5e1fa6cf5d20fa715f74466a4cdf43cfa
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 39c7bfbeceb3..7f72de938bf4 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=( pypy3 python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( pypy3 python3_{10..11} )
+
 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/rq/Manifest b/dev-python/rq/Manifest
index e9027a254fa9..7316ae5bce0b 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -5,5 +5,6 @@ DIST rq-1.15.gh.tar.gz 633276 BLAKE2B 885b4ef343924b8f4a88c6c3e93bbed1b62022e722
 EBUILD rq-1.13.0.ebuild 1401 BLAKE2B 4fa72ab225622213cf46207cd8ced06faf4be6e67bfaa24f4a6107de3cf90a8a804c74d9b31cdcacd16cb3d1bdc0add6ebf5e39fd83a4ef2c0d0a7d3560b0281 SHA512 b719e2538d10d7b71c1d91132965d839ae688a396f3535db065c9c2ffaf7dc5e0725272acd86adcddbb3e803583ea8b3ef8e21a4b56c47d72785cbd2237e345d
 EBUILD rq-1.14.1.ebuild 1447 BLAKE2B b139b20c73be2e56b82f20cfa30dcf166eb23d02fdb95226eac7ff79ed23b56705f148629dae7dbb628152b346db6d2175b7ebd05a966262e57dc5da00207c01 SHA512 7e781a8cc32f3fff0260d6dc4b12e9f2e3b88e09fd5fdf62e4f6697c055347265aaa25fc212bcdae4ab054c473ffa8d8603ad7c57f5f90096384d019f0d76dc8
 EBUILD rq-1.14.ebuild 1447 BLAKE2B e07a3b74e72ce85b03c73fb549940d3f8252a4014b86bd400b7487a975ccac42d3b8ec442dade3ef5792ae332e223fcd93b2c88598c17259378d05c4d81c09f8 SHA512 03dfcf71b23e6688098ff22f4051350312e0ff8961d1547ad2b8d81d28f32777b872243230952a2b4a64ef920f20cf8c704f82ce5cc254d1ff9dc4f4a4c2aba3
+EBUILD rq-1.15-r1.ebuild 1441 BLAKE2B 7abf8e40a520fd49e1f90198a212e242ddf83ebf6c43ae806e0516cbbe3fbabfb1b279b0698195793033ad1629b43702902a30ca8d83b31265d80f8b9e6a7e97 SHA512 e1921bff061bea32d5facaa128140530f9d21117f03aae0d9df7f29193a2d897f40328c80eaf80ed4685b19363935b040c544bead2be5d3c107a885d1ee11d97
 EBUILD rq-1.15.ebuild 1447 BLAKE2B dc02a1685f96ef33bdc088032b033fa3b7fd712bf1a891703d3491d9716c23273acbba88dcd2360aec0a8d42262870dad08b5bcd15a5074e6e2816fe4a621889 SHA512 cd79cb058fe8980923e0d5062f3f40039c59f008accdffafd7908d25dc2628b5bc9e476b9d3f6874ca5a0ba0e52dac58a75ba2a4bfa306245b6e6cf637e4641f
 MISC metadata.xml 453 BLAKE2B 6a46d43b524fded1ad4749fb9669ea07f8b3e23940d0bf2a4db5d92564316b01fdfbe220771e30b1a110ef72c613ad683cdcb7940682ea32198a5b6f027e4db3 SHA512 104ef96c34b55a9fda377c1304ff85781219fdbccef1a83d1bef30cb2fbd0ef816cfe82715af8937f452499135f7ed65c65a29c34919a09b6144ada367c26af5
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..8c0bd028f82f
--- /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_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 f62b0dabc094..c26495ad1725 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -1,5 +1,3 @@
 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
-EBUILD send2trash-1.8.0-r1.ebuild 597 BLAKE2B 3dfa767d7b2899138545db0706d6789bda9bd0390a659339732f9e2a1ac2aea7ccc201fbab673ebb8431c36e8d67c0bd38cc0e6fc3b90c3740bfad36148835ba SHA512 36d8f947745d56836f6c289016be925c867bdf95836be9f4d5c142c31c67aebb6054040c9fb7498671bd7dec1d44e75f94b3ae472c9103b8a5b05fc0eba16748
 EBUILD send2trash-1.8.2.ebuild 548 BLAKE2B 392060f57d1a2cf6f4f70c0b450250e4fb6f8077e0bad3ecb2b404f234f05fb1b6a098fed73b19c2cc34829f4d80b12c3fa5f14358793372017abfcd2b3593c2 SHA512 a3ef4eaecf8cc461788189d1c3d6ff1853fbf1261c15671050f5340f4ba7ee9d0e15581702f1542e9c6469e232cccbf369a9e607ec34fbca4294c0839f40eb8f
 MISC metadata.xml 411 BLAKE2B bc650bdcb346ddb4c94fff51727b5ae9f2ae1cb62d0fe52709b531fd779fb4b5342f8c200a924816763b3b21354849b320a92050d62d243a48e862f46c997d9b SHA512 b5ba72495ce17919eedb91021749653ec411d1df1188520f95a4db28efbfc9c59d291c23e54014430be77fbf961a0662f25539805086b5b284b992520f5dcc22
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 67099dcfbe81..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_{9..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 b9c932f5ced1..762b881b8599 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,6 +1,8 @@
 AUX sentry-sdk-1.21.0-ignore-warnings.patch 329 BLAKE2B cdb4295e600d868feb11b4a0af534bca90a1fa777344d56c945ddcfe71b3db10848df4032df06b9acf84cf574bec04dce4dc8935dd7421a6d0a2a011db337d6f SHA512 d1b5c50c78d1bb299280c4937fc8a8fdfc7d174d41061a32b57178c4dee58ab4b4b7afe8566a6b79244e53be8714b3ee7fdc9bf3401835d6d743e9fdc5a0aa05
 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
 EBUILD sentry-sdk-1.20.0.ebuild 3785 BLAKE2B b0bce95599516c454e844283e3564e7410ae325fb9e84481bccbc15cb2e7ba340c7b566d32a0eb8cd898755aa3457d50caa38978029b1832a878fe71ce461781 SHA512 25443ddddfcc879b56e80fdf4cd82c42423218351e0ba7f7439132055c7cb2f84fa948b5941acb954f8d9b853b409f00f7547a9f435f1cca2058ffb46bc265b8
 EBUILD sentry-sdk-1.23.1.ebuild 3937 BLAKE2B b370faf396fc337e0486b51cfff1814ea1274f57004298c52c156ed3ddfffee188641033c4880f5f59f28697c6e13cd10e497b66a48a72904a1eb2d6cbee6ee4 SHA512 737349bca5887c5302f8a5048637f5d027812c884be3ad277768350eea4f99313f6cf69495b796df18a196376de99e9a18637c1c38edbd44735a57e8c4d3befd
+EBUILD sentry-sdk-1.24.0.ebuild 4025 BLAKE2B c6b45c95d4b4773620d42def50d5b77092d38767cb2d799765d92d83f29bbfdcac8b02e21752c6785e26e6c3b498a257c42e4280997133611975034649973c68 SHA512 27a3a8cb1f9088db27f5e5f42871babc8cad747d0637fd49b30ad551fa46cd255fd654efaacd0555b47345fec9bccd2aa1504b8ce6aa205f1cc59d80fec3bd09
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
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..b84cde048f6c
--- /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_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 a55362592285..068b679f9e4a 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,4 +1,6 @@
 DIST slixmpp-1.8.3.tar.gz 1053891 BLAKE2B cecf307406f093e8b069a70485edf38a95054b2d299b0a34064e582c20243d8f90ea557079cde9b22bb1b3b9e3e7d452347625bb2c21def461193360290b4d62 SHA512 2d499c106bcb8d86a8522e617d855f5c6aeb5e3e7f3757331baef1bcfa4e81d24ef6a554e760e323ab1b542c168dae4cb99ea56db92f5539542045ac6c8b9c9d
+DIST slixmpp-1.8.4.tar.gz 546263 BLAKE2B 78a7b1b9015f27d63b3c127a292e2794a9de2283fbb9763ef52d03d37cc2d0fcc3f0696beca858a0d120991059a5eced62b5a4a9e87436b81dc17f6bbdc4b106 SHA512 afa82670e4cb2c904503a6ef652d3f2ecd59732a18eef05b85e0a55f15112685ecc1b50951b3f717a211d1c9069a4e7c65d913454426441f56688ff05a5c0921
 EBUILD slixmpp-1.8.3.ebuild 809 BLAKE2B 240a3d30c4b8ab55084a0771215f0e72b331c5c975caea7658b8280accb92012d3f8eab35c25de91c9c8a2abfd689fadc156a363298a1d4bed13e3a5f1573db2 SHA512 6647e7ebde1c6801f5437e0df3acf265ecc529bf1ffc82b74c2958300b9c1905e358fbb2b90b053056eaef7de0b2630bec65c7bc073d1e61225c3624af2f585b
+EBUILD slixmpp-1.8.4.ebuild 811 BLAKE2B 0687de329e8b701be5fe03f4c28da4cbe97a5637932039547b63640806c05654ff13c410924154de232df3db694684cc83607554f0652f6074a907d1e499e67a SHA512 fda400215d8d99317706479c7030fea39f75ad3393694511c2c9e064bc8c70e86466183c8d475b00ba7519d41e4e9112328f1af835846396ebc5135d691343dd
 EBUILD slixmpp-9999.ebuild 794 BLAKE2B ccd54888f0be3a13135bf28b01cf8b700e0ac833dd5dc9a29f8a4fed42e79544d2e6a5b9d5533abd6be8d813e319da4dfdd4e5fcd2024bd36ff4be3530c3bd93 SHA512 aa46ae06c4354d191bf69d05ba8898507b3c506126bf48159fb7a9738209a8944ea926cdd3838a0faa053b5e1746cd562d415627fdd7c238390ffb35dca88d70
 MISC metadata.xml 418 BLAKE2B 24c02f722eda50cda05da1a70efe953324ec8a1ba91a755e356bc9953387cdb35876f072a7f045dcda9e4fd74e73fd5bbd4f0f7d921431a374543bb02d5813c7 SHA512 1c36a0aef8162cd0b19eadec95dcdd5ff8f742c7438097e198736ae4772aba3a6ff41553a08878d54d0c548900444e2d40187f669a46173dd4f89072ac234365
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..0e6c3ea4c37c
--- /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_{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 5a2a9efe0499..ce34528b6dd2 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,11 +1,3 @@
-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
-EBUILD tldextract-3.4.0.ebuild 805 BLAKE2B f572853301263e96298f36fc83fe5bc2b32f28980f6f1bee9e936663f98fee48af63bc1fb46b2f592feed76a6f704948ab52c80c0bdb2250c91db7a08d4f8ae4 SHA512 4baac3a4709a29d92a90b4b20473d9236e98c7540b29a7210485652c0b99f118007d122a1cdbbf7cea63e617473efcd80c5def827b07cc07d53b75d8fa43c686
-EBUILD tldextract-3.4.1.ebuild 806 BLAKE2B a02cfd636006b8f9c691eb025f1848d95f31be6bc64038c27ebab159905354f42d5dd74e442b8c00aa8175d0db30bb3ba24b58db67b13941b095252fd5723aeb SHA512 167c7c382fc28a76af036d1b044989482dd1a78b44fcc7c65728d55ff1d570e0fde799f499cd17b86b875cdf03b43e56bcb69721420abf230fbddad8a2c96e58
-EBUILD tldextract-3.4.2.ebuild 807 BLAKE2B 6c74f9908b049534cc924499695f5043c3660c380e8a0a545e4f0568411a83584fffa88e64856f306df2fe5aef6dceab8b78dd7b249591bddfcb833edc9796b2 SHA512 e9ac62047f33f7790faa925e8c558392807a198ad972cd73b100832f2032b75b4020efb765d824a0a423a09b50892961cb1fc6558510a55dc02c286d6356530d
-EBUILD tldextract-3.4.3.ebuild 807 BLAKE2B 6c74f9908b049534cc924499695f5043c3660c380e8a0a545e4f0568411a83584fffa88e64856f306df2fe5aef6dceab8b78dd7b249591bddfcb833edc9796b2 SHA512 e9ac62047f33f7790faa925e8c558392807a198ad972cd73b100832f2032b75b4020efb765d824a0a423a09b50892961cb1fc6558510a55dc02c286d6356530d
 EBUILD tldextract-3.4.4.ebuild 806 BLAKE2B c297ee85d60a01c5a3d63b9970f7c4daeb4a0400b82c7853b07cd5f2f41af57ebeb0e862d8ecf430b8111a0083b8025b996b79af8647b003aa97f2b37627e905 SHA512 c6f9b9f799458605425f8b52366419d03c795f04bbc4b9d3d92703b1dea32ed35ed965d307fd3c882ab309b342c3a859eb8b945c3b6a7a83cc59af6b57fe76e0
 MISC metadata.xml 560 BLAKE2B 4d6e6aa7507ce4734371e8b8442e8d4840db0d2896f7e7430438bc9b700edf6c8546fc3beb1e17d489013b6cc49d1daf805581d6fda29f51109e7a643b0e8965 SHA512 4e7ed8a1876afc62954ee58937557182099ea2289633d2d279a2982bb32a8de261163f0b83ba44c257b8c087c007b1bb462ecad69df1115a024a3a9c8ea1fe9e
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 66681e8d4d8a..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_{9..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 896936d16d06..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_{9..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 421d0afe56cf..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_{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 421d0afe56cf..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_{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 118ef0366edd..244953c58192 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,5 +1,3 @@
-DIST tomlkit-0.11.7.tar.gz 188555 BLAKE2B 1958ace56c37746585879f1b657af53f36d1b3e741a5e41438a9806897e252bfbf42040c65a05df6c1921413da3e68be6d5d6ef9ce0a0c5d457b170f1cce6528 SHA512 456de2047fe1da1905ebf6eed99bdbd7d565fab2ecb50b9c06655188271d52b3680882ce0db2beb69fa9e7d18548b8045a99c4897e12e1d92d9cf92a937864ab
 DIST tomlkit-0.11.8.tar.gz 188825 BLAKE2B 3b3b31f0243592ae28d3fc7c23bc6cd61eaa0d9907f4c7afc838e816783ac4ce28a0491c15c31649749272c8d65dd51b7a0160c8f0bf1e209115ebcb5ba13906 SHA512 538851d5460770000a1263fb2384dc8283f9fe56364ccebac2cef31be85c51056bbaf59c96134ceae624b978334c29b54653c28838567cd2806e70ec6e3e5856
-EBUILD tomlkit-0.11.7.ebuild 970 BLAKE2B 610835a1227ee7b6193082b674c58b7a1ea512e8c066fddf25b58b74c1a95ede8288102e4333bd740528251982d53bc8b916f8a6831311a3f0d9ee7ac16df890 SHA512 236629923b5eec0cc479d4f7964025350dff4a2842f6f6561f37e4cc21959ff87462983f0bb0cf4c50589dc1f1082823cdc253e54da9e783fd575d51b3c703b0
 EBUILD tomlkit-0.11.8.ebuild 971 BLAKE2B 75e6cfba124a94757c2e10ca5ea406535393020a86d114771abc29569061954af6430963c94b4fec11f312d7ca5143ca5b4d3ee0ad2e1a47af41370473b99c11 SHA512 d8ed481c1fd001814da2a3ea0a400d4e9fddf2d7aa3ddb7cdb45410e90b6b793ba98a365296a9b5b67f3bc7f0dd0c6e2fa466d8d553ea623c958699a4af1f094
 MISC metadata.xml 525 BLAKE2B 663169c851817eb7368c49d678119f1f2dfebe642325d3dbc59498f60b452710a257ca5cd5173a4fc8391d33038cce079b3fba112ad7e9c0caf0c1872ee43f13 SHA512 5a6cf412fc06854557d001ae4a6f654b36d351c8c0b4bc08c1a7c40f49d8dceba931598f5eed6c75e1d7797570fcf8fb7799f5f035931f80d05b1e9bd0d258c0
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 7abc245f1b50..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=( pypy3 python3_{9..11} )
-
-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/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 71a9bceef142..937268c5678e 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD xlsxwriter-3.1.0.ebuild 685 BLAKE2B 5ddcc459a9806a68cbff7d23a326f7ee65a3489bee5adb169ece7c57055b02be7eb67e94b43922f9c26941a2eff97678533bff22d7626e77c752c07454dd0b74 SHA512 26e7957e0d66363b3c374e0e068c64bd6dce7ba01d599f33218d7e0d5733ade25b4a1caf96dc81ad1e0c3a9ebbeb0d38a92f0b216b0a2cd6ab25fa42c0dadca0
 EBUILD xlsxwriter-3.1.1.ebuild 692 BLAKE2B 7f9b0f52f78f33779786237a3545ed4e5aeeee39c7dac130ef35a3712e836335ccbbaa4ed4026c2193f0113576d90abc2b5f39bf5dc214020af90ae379d4f9a6 SHA512 435f5cc3459a2d86fddbc1f5cd47e9309e8d4b7775ae3fe12670a22b45f013b2da8cb0be038397a50846c4ac5c13276add71498d8a0a6368566acdf406769c79
+EBUILD xlsxwriter-3.1.2.ebuild 692 BLAKE2B 7f9b0f52f78f33779786237a3545ed4e5aeeee39c7dac130ef35a3712e836335ccbbaa4ed4026c2193f0113576d90abc2b5f39bf5dc214020af90ae379d4f9a6 SHA512 435f5cc3459a2d86fddbc1f5cd47e9309e8d4b7775ae3fe12670a22b45f013b2da8cb0be038397a50846c4ac5c13276add71498d8a0a6368566acdf406769c79
 MISC metadata.xml 411 BLAKE2B e41e1e6dddecef73fff1c0bd74d51b023694ea6eb162022679a2939819f5c3339b1e76d00e25f761c46f66d323a5ad7085ed86fb13fbe3f53526c75004a68e93 SHA512 63242ff274e1dde596e50f9360e1247084b7bae05cd42d60605700c49e33b53849529578cf532415b899bd2ccd04066f99e97c6e80d53c13f71522a041579976
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..de882ad03167
--- /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_{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