Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-07-05 18:29:34 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-07-05 18:29:34 +0000
commit: f2977ce85e5a31b54b00b355d1a73786efd76d6e (patch)
tree: 93904c9119ccbc89cdc5fabcf00620eb3e076ab5 /dev-python
parent: 1aab753a13e3cdead389c03b6b12019cd6d4d0ff (diff)
download: baldeagleos-repo-f2977ce85e5a31b54b00b355d1a73786efd76d6e.tar.gz
baldeagleos-repo-f2977ce85e5a31b54b00b355d1a73786efd76d6e.tar.xz
baldeagleos-repo-f2977ce85e5a31b54b00b355d1a73786efd76d6e.zip
103 files changed, 795 insertions, 1813 deletions
diff --git a/dev-python/MechanicalSoup/Manifest b/dev-python/MechanicalSoup/Manifest
index 5516c20be158..57317f12db9f 100644
--- a/dev-python/MechanicalSoup/Manifest
+++ b/dev-python/MechanicalSoup/Manifest
@@ -1 +1 @@
-DIST MechanicalSoup-1.2.0.tar.gz 49669 BLAKE2B a9791fd2d389c8a553ed0acce179094770651553b7aaf299ec6779509b4ffb1bb97a4a4afe01af3e4ccb56cf100b5bacc39e9aedf1143a9eb6f4b98dbb020062 SHA512 5857274e07c678dc0e19ad4fef828ccf41bb846edad566c2da9914144ced8802efd546265efac792acbb885b29cab5cde4ac3cd2002826a8bb31f91004eb2caa
+DIST MechanicalSoup-1.3.0.tar.gz 50826 BLAKE2B c47760a0f8d9c7a6430580c81fb750d3eab37a773a7453fb2850396ea2cff1ae143b1ec9ec5e1d8051a52f39c1527b99126f4ea2c90a73c7730597dd92a42a11 SHA512 a205c9b36b540be8b3eb15803c34e67029cb5b33aaf36d235947cc46c588f2d63e68acd97a9872b20ad3f1c87dcdb6133b4860dc7d90752ac477aaaa9a7c3e82
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-1.2.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-1.3.0.ebuild
index c718eea72859..76c6394ee3cc 100644
--- a/dev-python/MechanicalSoup/MechanicalSoup-1.2.0.ebuild
+++ b/dev-python/MechanicalSoup/MechanicalSoup-1.3.0.ebuild
@@ -36,10 +36,8 @@ BDEPEND="
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
 
-python_prepare_all() {
-	# Override pytest options to skip coverage and flake8
-	sed -e '/^addopts =/d' -i setup.cfg || die
-	distutils-r1_python_prepare_all
+python_test() {
+	epytest -o addopts=
 }
 
 python_install_all() {
diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest
index 0ee0060c3e7a..19786acad6d3 100644
--- a/dev-python/Nuitka/Manifest
+++ b/dev-python/Nuitka/Manifest
@@ -1,3 +1,4 @@
 DIST Nuitka-1.6.4.tar.gz 4254226 BLAKE2B ec20d567f83bd80c662fefd897c224712735b11df8716fbc039f2413a5cb14433fcf3a893003109065a186911af71cd837892d9c767e92447b3a73bc09afcbf2 SHA512 5fed27a7bea2632ffd6bd802880dcf2372da72f5b1b02221d25322f49c130a1191469495d023c0dd1e25d2326d24385b978c6e9e36e0326c47127001715234c9
 DIST Nuitka-1.6.5.tar.gz 4250050 BLAKE2B 66586aa497da1174e0387a1050763760973a601d40cb5a36bdb030df60a2cde7908f30d173a871a136f9efe9798e3eb3ca03a945c2f1c7345c7ad87f3310f90f SHA512 20469e2872ffd4379ea0ce704fb6282aef8d6c5f8459067e0612248dc21de93b3de1282aab3ad5a285b5a198a9771b0b55897576a2420450753eddb3db827feb
 DIST Nuitka-1.6.6.tar.gz 4250403 BLAKE2B 027ccbaca57e5306ba150b5f9dbf31f2d8dc447a498369d70b824357ff9738375505f67c04b2317b09fefc568b0c4cebabfdffa219b64dfd734b435c31924c1a SHA512 c9b50cc40571b7d9477d972eef82aa72079fc6ef68040d8ff6cea2c51628797b6467174627f2376f6f8c14deb45fc8fcec2f43cbf3ae999a78b06cc1c887e8db
+DIST Nuitka-1.7.tar.gz 4275155 BLAKE2B b293075412c8d858e157598d4fd5b6e776f09a62d2d03cf81c55fb5b22d336551d12173bc3cd3817849b6d83efff996d9d259dedaf5cc119eea2fc8e86916e22 SHA512 1b973550787c67ce507744f8e3df88cc91cdae61663aaa38c46acd6644ae1b3b425b1d88fe75867275845ea2022fc8ac3481685fe6056e5c932d407109b96084
diff --git a/dev-python/Nuitka/Nuitka-1.7.ebuild b/dev-python/Nuitka/Nuitka-1.7.ebuild
new file mode 100644
index 000000000000..1158b562d51b
--- /dev/null
+++ b/dev-python/Nuitka/Nuitka-1.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 flag-o-matic optfeature pypi
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="
+	https://www.nuitka.net/
+	https://github.com/Nuitka/Nuitka/
+	https://pypi.org/project/Nuitka/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/scons[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 0b944f077a2c..efd2d5127844 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,2 +1 @@
-DIST anyio-3.6.1.tar.gz 140240 BLAKE2B 391892591bee88df8fd5c099b6670af8e01af0610f7659e2f2e717c2dfd94d6e5212260acf3acca6c8b149cab6781044fb665d579a63b322332bf87767374858 SHA512 99ae55eada2df971405a1592afd980ac964c80a4502465a2016423182409691d0c943280a3a7448efc78036e481614451585238b62ebea924709f0ba888f7604
 DIST anyio-3.7.0.tar.gz 142737 BLAKE2B f27b6c854f8861c760a922542471b5d7714cd54da0fa999a6efc8e394b49e538e7689147834a4076e1970932416fabe820923c2155048d943eee697454771c8f SHA512 0793012dc364d2bb27ebae8a23f275ecd24d444de750fbebcb72e70ca465a3be9c69938543e1a3c686abfff3ed9036974b38e3886fb24a110a9ef307a82d3f0b
diff --git a/dev-python/anyio/anyio-3.6.1.ebuild b/dev-python/anyio/anyio-3.6.1.ebuild
deleted file mode 100644
index c655ddea9455..000000000000
--- a/dev-python/anyio/anyio-3.6.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
-HOMEPAGE="
-	https://github.com/agronholm/anyio/
-	https://pypi.org/project/anyio/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-"
-# On amd64, let's get more test coverage by dragging in uvloop, but let's
-# not bother on other arches where uvloop may not be supported.
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		amd64? (
-			$(python_gen_cond_dep '
-				>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
-			' python3_{8..10})
-		)
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme \
-	dev-python/sphinx-autodoc-typehints
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not network'
-}
diff --git a/dev-python/anyio/anyio-3.7.0.ebuild b/dev-python/anyio/anyio-3.7.0.ebuild
index 27d47fd69bc6..e3cc478b58f5 100644
--- a/dev-python/anyio/anyio-3.7.0.ebuild
+++ b/dev-python/anyio/anyio-3.7.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/bottle/bottle-0.12.25-r1.ebuild b/dev-python/bottle/bottle-0.12.25-r1.ebuild
index 50a8bdb36d03..b0170b5f73e5 100644
--- a/dev-python/bottle/bottle-0.12.25-r1.ebuild
+++ b/dev-python/bottle/bottle-0.12.25-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/bottle/bottle-0.12.25.ebuild b/dev-python/bottle/bottle-0.12.25.ebuild
deleted file mode 100644
index 6a463e36b45f..000000000000
--- a/dev-python/bottle/bottle-0.12.25.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="
-	https://bottlepy.org/
-	https://github.com/bottlepy/bottle/
-	https://pypi.org/project/bottle/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -e '/scripts/d' -i setup.py || die
-
-	# Remove test file requiring connection to network
-	rm test/test_server.py || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "Templating support" dev-python/mako
-	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
-	elog "we do as most other distros and do not install the script anymore."
-	elog "If you do want/have to call it directly rather than through your app,"
-	elog "please use the following instead:"
-	elog '  `python -m bottle`'
-}
diff --git a/dev-python/cachecontrol/Manifest b/dev-python/cachecontrol/Manifest
index 6d5366f2fbda..898f5abecb13 100644
--- a/dev-python/cachecontrol/Manifest
+++ b/dev-python/cachecontrol/Manifest
@@ -1,3 +1 @@
-DIST cachecontrol-0.12.11.gh.tar.gz 41338 BLAKE2B 09ce2336216b69dbe9796d658db9f5b0d378259484cba3a78ecd789843e19683adc2b1b90d579cea8700d07ed55a93ecc3a56e5da2c8ab025e5084d2847d4dbf SHA512 be1c91f58edda36192f1267a8fdfdc50685ff57da5d84f5348b608982327993333f18f5c318a20cf258b16d2bc83272ba58317e8c4c44a84d5d1f93b522dfc8b
-DIST cachecontrol-0.13.0.gh.tar.gz 43740 BLAKE2B b544d8a662a5850c629f76969fce32651c259fbdf59970c138db6418a2aa3104fe180377cfcee2613abd6d239d75d2878d95090615ff59f590c8a0080e711821 SHA512 271abe40ef66f8227fb604422de215ab99cac283c8464f3fe8eb015ecda6975034c53932565d2f2eab3bdeda94cacd3317798e9e3d1c03a16a11c52a9a0fa451
 DIST cachecontrol-0.13.1.tar.gz 29069 BLAKE2B d244d62338fd3aa9fb37b22c5fb6f69191b91d63621808c8bb5b4e9dd66ac3a6aa9087d435b06669d4303c4126ee63c0c3bd930c267e0de09b6c11d7dc8ec89c SHA512 9814e074f6b7adabc0d9601193128f247110303930178f3d5dfa6d992f679ed9144398a9b995320ea13e7abe95ea52aa910e5e3ec773b2245db9fc3fe08c9d76
diff --git a/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild b/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
deleted file mode 100644
index a5fcaa9c2dd6..000000000000
--- a/dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="httplib2 caching for requests"
-HOMEPAGE="
-	https://pypi.org/project/CacheControl/
-	https://github.com/ionrock/cachecontrol/
-"
-SRC_URI="
-	https://github.com/ionrock/cachecontrol/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachecontrol/cachecontrol-0.13.0.ebuild b/dev-python/cachecontrol/cachecontrol-0.13.0.ebuild
deleted file mode 100644
index 74fda2b4431d..000000000000
--- a/dev-python/cachecontrol/cachecontrol-0.13.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="httplib2 caching for requests"
-HOMEPAGE="
-	https://pypi.org/project/CacheControl/
-	https://github.com/psf/cachecontrol/
-"
-SRC_URI="
-	https://github.com/psf/cachecontrol/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.16.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		>=dev-python/filelock-3.8.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachecontrol/cachecontrol-0.13.1.ebuild b/dev-python/cachecontrol/cachecontrol-0.13.1.ebuild
index 9d1ef649bed2..bc3f2ff66623 100644
--- a/dev-python/cachecontrol/cachecontrol-0.13.1.ebuild
+++ b/dev-python/cachecontrol/cachecontrol-0.13.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index e99aeb91e935..61837531aef7 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,4 +1,3 @@
-DIST llvm-project-0e08374abb2c61a3ae5c24d5f60be3b548da9778.tar.gz 191661586 BLAKE2B 05e5328d8eb9972bd6399e8c0f5ab241a78e6591e63ee520180c4ff154df432ad96f49ddc615a2208f69ffbec539b201fffeaf4906011b7a961cbc3860126ffa SHA512 1d4429ecb2292e419ed6172cf251ba4a1448ed51424552ac48a159d0e3d3414777f7821382d1839b56f0c906fb0a147b1df4eecb071f8a5c11b0fc1d0d40d339
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
@@ -7,5 +6,5 @@ DIST llvm-project-16.0.5.src.tar.xz 118000368 BLAKE2B 9f84e6bab450dc8d6379771afb
 DIST llvm-project-16.0.5.src.tar.xz.sig 566 BLAKE2B 4c96f294f350e0086f8504a54c3387308c60efb573c8def40aec45b1918d43e36c44bafb0823625b6cefa5d99b3aacd7823d6c92c7a64a737653d5b51839a924 SHA512 4550c7c6a1b6ea603d1499aba5aca746f3948a00e7567604f5e7dc3b215a34357bad382a7ebea1f6cd7952841cb75a0dfbe2c278a8c6fcb630a5035b3e16e869
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-aad51417452432092258034c55537a7092fa6295.tar.gz 192649458 BLAKE2B 64b8fd306fc6a01172d9be78c969c013a4d05ae62966c4ca424a25e0d1e87c07c50dc17125924151643e1e3fc1d63803f9162dedac8bddc037104bdbef06c0d9 SHA512 3533710e2411df7f3a2f68fffdf6213116ae54b07881e5661e9e137234d5d1f87136cbde83fd97123719dd1d6ed4d09bcc4a0aec3b2705da09195279b0ef16e2
+DIST llvm-project-5ae7fde004cbc640c2f60207791ac36574e5f5c6.tar.gz 193410766 BLAKE2B 50287f1ad41a895040934f8f19fd8aa2e91065b930ab14125dbbc3977273655d11482b6229577c11a8ad2bdd854ca109449b603bbc2e30cee20e95e4fe11e8b7 SHA512 f24f7a3b0661d2d4533b24c295c114817aff22c8f1d473ffa639cee547d31502719f8e1be4f25b970d450ecb9dcaa809c0e12b1bb380774f52cda82a4769d7bc
 DIST llvm-project-d32fb5e5f51dedba495301073b9250f84ac6d8a8.tar.gz 193280254 BLAKE2B 31473bee900caa45c816a020113d7b6bf6e6e2db4848fa529bc622fbf2956487ab89b04d1624e7e1530e9aa56293361e01b9fde31912b2a08194398a11db8b63 SHA512 5799e106403a3954767afafac515112ec9f6505c02abb502e21a5d7019e1079912939803e95177d91678d2e28e07a12b33ceabb13e90696da13a3613a16f2396
diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230620.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230620.ebuild
deleted file mode 100644
index f37802f5c2d7..000000000000
--- a/dev-python/clang-python/clang-python-17.0.0_pre20230620.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230615.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230705.ebuild
index f37802f5c2d7..f37802f5c2d7 100644
--- a/dev-python/clang-python/clang-python-17.0.0_pre20230615.ebuild
+++ b/dev-python/clang-python/clang-python-17.0.0_pre20230705.ebuild
diff --git a/dev-python/constantly/constantly-15.1.0-r2.ebuild b/dev-python/constantly/constantly-15.1.0-r2.ebuild
deleted file mode 100644
index c100aef427b4..000000000000
--- a/dev-python/constantly/constantly-15.1.0-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Symbolic constants in Python"
-HOMEPAGE="https://github.com/twisted/constantly https://pypi.org/project/constantly/"
-SRC_URI="https://github.com/twisted/constantly/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 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? ( dev-python/twisted[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/constantly/constantly-15.1.0-r3.ebuild b/dev-python/constantly/constantly-15.1.0-r3.ebuild
index 6dc39607b4ac..c5b72641210c 100644
--- a/dev-python/constantly/constantly-15.1.0-r3.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index b4411320b4b8..cae2216ad75a 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,2 +1 @@
 DIST Deprecated-1.2.14.tar.gz 2974416 BLAKE2B d7994a435f7709a74fde71b1bfe20aaec44813893fd8d9fba70b55938ec2dcb01364a0084e5b161ad84819a6ce258ef28813f7272c9cc48cfc8a2159408b5f29 SHA512 5c2f71fc4c1abb6d4a6913bd9644d47d12f709a0830b2aa3513aa2aa92c13e916c49fcd45a5f38aa29279822a5bb8563c4062e5f3e21bb6c55ca97b7845ee736
-DIST deprecated-1.2.13.gh.tar.gz 2971610 BLAKE2B 00c1fad34e869b143ad7cada2426f999f1d353d23e33076b0197a7ca6c87b0f2d240d7f4944b7c7669974c89304a6cf04f5d2b4c44e6fee22c27522ec2cc9711 SHA512 c170b086bc4e37462181a0f53edbe745aa4f4924c7fd64d9693de267e070392b74445f9cba935e85c878b755603ca6cada8b4130ac96ab071be284047aa35619
diff --git a/dev-python/deprecated/deprecated-1.2.13-r1.ebuild b/dev-python/deprecated/deprecated-1.2.13-r1.ebuild
deleted file mode 100644
index 49549948de1c..000000000000
--- a/dev-python/deprecated/deprecated-1.2.13-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python @deprecated decorator to deprecate old API"
-HOMEPAGE="
-	https://github.com/tantale/deprecated/
-	https://pypi.org/project/Deprecated/
-"
-SRC_URI="
-	https://github.com/tantale/deprecated/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/wrapt[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_deprecated.py::test_respect_global_filter
-		tests/test_deprecated_class.py::test_class_respect_global_filter
-	)
-
-	epytest
-}
diff --git a/dev-python/deprecated/deprecated-1.2.14.ebuild b/dev-python/deprecated/deprecated-1.2.14.ebuild
index 6834e296163c..e29c59f9f275 100644
--- a/dev-python/deprecated/deprecated-1.2.14.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.14.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/wrapt[${PYTHON_USEDEP}]
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 1a961a2e630d..115090ea2d64 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,2 +1,3 @@
 DIST fakeredis-2.14.1.tar.gz 101789 BLAKE2B 2e38319aa8bb23c9cd2196d8dbcf489fead785bffa3b464b7e420f28b247c911ea9f3775328f8fec7c26b1a77e32d6a21acf627fe7b603f311b0f3820fa06b54 SHA512 71b7f034ad5ccdd569052a82d2e15ec21db4b5a26bc5c660f76bb88c0b7aaa252234e899644dfd63086aaf8a9400ea13acc6439fdca08f84c8392949815f33d2
 DIST fakeredis-2.15.0.tar.gz 108160 BLAKE2B aaf135ffc395d6304c2f95b0339610f506382e865039f647a9af3fd9e3fa8cd9b9f6ea6557670fd61e949136f35de10b0fad63a1813d59f5b3697dd200195960 SHA512 59bc74a328b85cebcf0ae61d70e4ce26f3cdde3b82de6746f6b33229a6185d542db1e2ddd7c8ea600db69a6c630dbf81998ba108982da33487fe5ad2068abb29
+DIST fakeredis-2.16.0.tar.gz 108416 BLAKE2B 0897614e567d59b54a35c18922a33cc79e8d2759614fc13b2dfbbf0e52c802470678cdf497b914762f258e84b50afb178ac1a0604acfdb1520daf3a03ac87a6a SHA512 a9fdf6da74c9fc650df9720b39a8c2ecb609353d1c535433bd8ca3ff4674f112e2bb06a381ad8f994e7daab78cc41b1bf1c75a0e287af0b41387bf15d05fce5d
diff --git a/dev-python/fakeredis/fakeredis-2.16.0.ebuild b/dev-python/fakeredis/fakeredis-2.16.0.ebuild
new file mode 100644
index 000000000000..a9b86f58ee5c
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.16.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
+	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
+		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index 6795e133d7ce..e4eeee10037b 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,2 +1 @@
-DIST fixtures-4.0.1.tar.gz 56752 BLAKE2B bddda3976ec453129fa05e53da066344ed8f4db9626ec21dd0159e6720993da0c17e3b51ba37de2ef05cd7649809d674cc6409b16c8e1d242dc424d573010975 SHA512 722436f146768e4db1e3312a0db1edab2a7daa86107825fb2436654eaf74e00f569357531316df506ef3f80cef89ac7185aee1adf0b00a6ee85cbc9811ca8100
 DIST fixtures-4.1.0.tar.gz 58561 BLAKE2B fc88ee580806e289d3d4a8a35701b0b17ee48bc157dbb355035ac0fb1bde64bdbf3596d54538e6032c74f8862a36fea92d1f72a96fd7d60c04480089db755bd8 SHA512 6897449fdefd07abe7714186b366fdf4505283f6747f8fa4d17044bc45da58eb36e69d89381527ccecb98e6c62c58bc6d4f558af41cbfc87b0221ae60ba71ff6
diff --git a/dev-python/fixtures/fixtures-4.0.1.ebuild b/dev-python/fixtures/fixtures-4.0.1.ebuild
deleted file mode 100644
index f3c3d793c7ee..000000000000
--- a/dev-python/fixtures/fixtures-4.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
-HOMEPAGE="
-	https://github.com/testing-cabal/fixtures/
-	https://pypi.org/project/fixtures/
-"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pbr-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/fixtures/fixtures-4.1.0.ebuild b/dev-python/fixtures/fixtures-4.1.0.ebuild
index 6ae56030b9bd..f3c3d793c7ee 100644
--- a/dev-python/fixtures/fixtures-4.1.0.ebuild
+++ b/dev-python/fixtures/fixtures-4.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pbr-5.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index ef860b5489ef..3185ce5e3d2d 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,3 +1 @@
-DIST hatch-hatchling-v1.17.0.gh.tar.gz 383013 BLAKE2B 469d0d3e017d2dadcfdf9e2b4975f9e484739737a5c2d8fca9c55a4e519cf2e12b1ee44b3e26160476b3b990b15219a7075e692b58dcc4104b76b57395d8b0d1 SHA512 3649f2932c9963184deda5aac91726dad30ed88db2230377dc303714e0cdfd148b2fefc174ddeffff5cd95033bd984a35e3d297da02c29e4bfb7a6fb42f12dbd
-DIST hatch-hatchling-v1.17.1.gh.tar.gz 383218 BLAKE2B be31190492af5904aa9d8d10fa7f204d664599fc9543a6c3b5a3781bdc68a3f5f3fd2eabbd21e34e21ed8367c8253ed280b6aa5c6387268534799de4b75efa35 SHA512 2a9b163d10834b021f6ebd35484ebff01f22a7addbb2c472ec21dcc7a389e617d955935820bd7247d33fe79c4009e0e368a898b29fa0a3c7fff232f3bd7c424e
 DIST hatch-hatchling-v1.18.0.gh.tar.gz 386992 BLAKE2B 9597d139ca0d59b82862a4b89208bf61ceb0859ed37e2f62c14f7f26550638716cd375082cae6ce0e233f92297b97015af5587144c2d801ecacdb15a07f32cf2 SHA512 e71e51fdace9b9aa276c2efba3a81a030ed934c21283057f83a6ce4a09f8feed8cd4386088280c9fe1381dd92e574daeda8c845a6a2cf6a015708126ca9788d7
diff --git a/dev-python/hatchling/hatchling-1.17.0.ebuild b/dev-python/hatchling/hatchling-1.17.0.ebuild
deleted file mode 100644
index e89eb4cd2190..000000000000
--- a/dev-python/hatchling/hatchling-1.17.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/pypa/hatch/
-"
-SRC_URI="
-	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-# deps are listed in backend/src/hatchling/ouroboros.py
-RDEPEND="
-	>=dev-python/editables-0.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	dev-python/trove-classifiers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/pytest-mock[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-		# broken if CARGO is set
-		tests/backend/builders/test_app.py::TestBuildBootstrap::test_no_cargo
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	# tests mock cargo subprocess call but the backend raises if CARGO
-	# is not set and shutil.which() can't find it
-	local -x CARGO=cargo
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-1.17.1.ebuild b/dev-python/hatchling/hatchling-1.17.1.ebuild
deleted file mode 100644
index 5ccc4f215153..000000000000
--- a/dev-python/hatchling/hatchling-1.17.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/pypa/hatch/
-"
-SRC_URI="
-	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-# deps are listed in backend/src/hatchling/ouroboros.py
-RDEPEND="
-	>=dev-python/editables-0.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	dev-python/trove-classifiers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/pytest-mock[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-		# broken if CARGO is set
-		tests/backend/builders/test_app.py::TestBuildBootstrap::test_no_cargo
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	# tests mock cargo subprocess call but the backend raises if CARGO
-	# is not set and shutil.which() can't find it
-	local -x CARGO=cargo
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-1.18.0.ebuild b/dev-python/hatchling/hatchling-1.18.0.ebuild
index d492fe929cc2..f818a1a90b94 100644
--- a/dev-python/hatchling/hatchling-1.18.0.ebuild
+++ b/dev-python/hatchling/hatchling-1.18.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 # deps are listed in backend/src/hatchling/ouroboros.py
 RDEPEND="
diff --git a/dev-python/hiredis/hiredis-2.2.3.ebuild b/dev-python/hiredis/hiredis-2.2.3.ebuild
index a066005ed766..b748e52b5b26 100644
--- a/dev-python/hiredis/hiredis-2.2.3.ebuild
+++ b/dev-python/hiredis/hiredis-2.2.3.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	>=dev-libs/hiredis-1.0.0:=
diff --git a/dev-python/immutabledict/Manifest b/dev-python/immutabledict/Manifest
index ba6b5b55470e..adc259c53466 100644
--- a/dev-python/immutabledict/Manifest
+++ b/dev-python/immutabledict/Manifest
@@ -1 +1,2 @@
 DIST immutabledict-2.2.4.tar.gz 4314 BLAKE2B fb971bd1a7f2e577131cd19d97e6eae840ad8ea4a3eda96ff54e20235202b791029e2f76b19980c54ab2679ad7147ef420e3ba237e01f5da303efa8108f218cd SHA512 436e39ac98ea9e8ad262113ef6d8ad629800adf29eda5c064e679167d57515d90165ec4a14e572281711f1a26ae0ea3f2164b6487024b20c31895f966fc0050a
+DIST immutabledict-2.2.5.tar.gz 4316 BLAKE2B 2f251c8409a88cfba741cc9ee2b72d486a7dd8422ca4d841d47246beef506762781106300d9cd4ec8f57115950b09f09bacbb1bc3ceeb0a4b78ef5ba32d3e045 SHA512 3bd94d077f599b6e96a4e17a0d9ecf6365975afe73048f9d9de4df35a8272af1baed264ad84ae6826dd6359ad0d371cd90082b4a064cc6350a0e61bc1cf8c713
diff --git a/dev-python/immutabledict/immutabledict-2.2.5.ebuild b/dev-python/immutabledict/immutabledict-2.2.5.ebuild
new file mode 100644
index 000000000000..7b30e998a1bf
--- /dev/null
+++ b/dev-python/immutabledict/immutabledict-2.2.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="An immutable wrapper around dictionaries"
+HOMEPAGE="
+	https://github.com/corenting/immutabledict/
+	https://pypi.org/project/immutabledict/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/incremental/incremental-22.10.0-r1.ebuild b/dev-python/incremental/incremental-22.10.0-r1.ebuild
index f65dcaffbc63..32873973fd95 100644
--- a/dev-python/incremental/incremental-22.10.0-r1.ebuild
+++ b/dev-python/incremental/incremental-22.10.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/twisted/incremental https://pypi.org/project/increm
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/incremental/incremental-22.10.0.ebuild b/dev-python/incremental/incremental-22.10.0.ebuild
deleted file mode 100644
index 32873973fd95..000000000000
--- a/dev-python/incremental/incremental-22.10.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Incremental is a small library that versions your Python projects"
-HOMEPAGE="https://github.com/twisted/incremental https://pypi.org/project/incremental/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial incremental ||
-		die "Tests failed on ${EPYTHON}"
-}
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 8b6951c25899..a0490f399321 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,3 +1,4 @@
 DIST inflect-6.0.4.tar.gz 71131 BLAKE2B 24ec6f25462594fde4558f7a4269c68d31989ead54c982f3a4382b5f0c192fd5fcac7544413fecef0abaf7c3fe2f9b4a8049fc7dc7d324e4397fb6a81763ef8e SHA512 96aaa74b3e8c5dcc91d81af336af73535826f3cedaa556d6baf540ca54db1a7c1f17a372c240446c0d81697520eab154bad4f0aad6195c6ab8e131ae443d3811
 DIST inflect-6.1.0.tar.gz 71080 BLAKE2B a4f86fa3d64f979ad184d3744dd40c5a220ea904bef3cc87af3f675febdd1346b918797a879ebee368f4d9381e698476229b538fe15f14921c41351450132a04 SHA512 2457ed594081a3f26390e88b5d5826867cd3d54ffd73c4cfe52c20cac873157ec64e30ff3e01efebb0b1edf8b0e412930bae434e1cd8c7920a273667d5e6eb68
 DIST inflect-6.2.0.tar.gz 71776 BLAKE2B f0ddd4a00d23db6462d8286baf11f46596cf1292dff327940e7aab2d17e73571f8ff68bb54f1b449176398448b1478c0b99e886990dbed75b33ba170bb54a343 SHA512 ebc1c0e0518112417bfbb1147c42e2c867e1a3dffb22a67bb995170a04c3813e55620bf6fd07d1c40d380bc8886435ec634c477f706134e4f8943c94b3269851
+DIST inflect-7.0.0.tar.gz 70963 BLAKE2B ae896109acd33946e05902d121ecbd95e04dc33a1d6da6035148521de5baff8cff877a5c56c104bde29d56025e231e20f97e0ee50686de0ec19b567d53612314 SHA512 b2ca39d0e36cda8c8c42d208443d3b84b10d659dcd0d368273503d6e76df19c61ac3c623d526ea918ca8b347d6db8bdfb691609e480eaa33dd4f1c37e008473b
diff --git a/dev-python/inflect/inflect-7.0.0.ebuild b/dev-python/inflect/inflect-7.0.0.ebuild
new file mode 100644
index 000000000000..e62f44d35df8
--- /dev/null
+++ b/dev-python/inflect/inflect-7.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="
+	https://pypi.org/project/inflect/
+	https://github.com/jaraco/inflect/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	>=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 7067af1b28d3..8257ccd17a87 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1 +1,2 @@
 DIST ipywidgets-8.0.6.tar.gz 115372 BLAKE2B 9369c6697879cb07576ef82769b2df7cb24c7076e5d6d01be30c9f23ee3586616fa44ff7a16904bd0a5754032d4c9be58cb7c63392360d4347f1284d8bd53093 SHA512 9275f259f7f20b20e14856b1a500094300c18f3e9ff46086a5856a5261a71d62a005a2541f4987b9761d57da1db15e881f0c858dcde34978cbef8b5efe691723
+DIST ipywidgets-8.0.7.tar.gz 115457 BLAKE2B fc9e0da01de1b76b770335a8ac8844b930ca941b64e35dda561aed1732da64d3c814244d8695d4c9ee15247ce6c4095fc710c80bfb32bbabd26ad6d06dc04da8 SHA512 8dddc9d3df9d5f862b380553e7ea5df24e2d9f7cf086c9b8c51d5efe7018969a0fc56c442ccacc2bcfd7a870eb72ec9d75b05e3eff1ded2aff4a391c9d85053d
diff --git a/dev-python/ipywidgets/ipywidgets-8.0.7.ebuild b/dev-python/ipywidgets/ipywidgets-8.0.7.ebuild
new file mode 100644
index 000000000000..612f7d27dc9d
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-8.0.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="
+	https://ipywidgets.readthedocs.io/
+	https://github.com/jupyter-widgets/ipywidgets/
+	https://pypi.org/project/ipywidgets/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-4.0.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# upstream hack to autoconfigure ipywidgets in jupyter
+	# we don't have jupyterlab_widgets packaged
+	sed -i -e '/jupyterlab_widgets/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 9ab71c7069ca..ddd3686f4d04 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,3 +1 @@
-DIST jaraco.collections-4.1.0.tar.gz 17806 BLAKE2B 7558a50407db2113718701c52196f2ae2e0400a1f91104edb280e73ed5f8d74f9976c4309649684022ff83e8d5f55ceb0a9dbd44ca97e08fd508eb516e8ad4af SHA512 15ec220503304cedaa2c03a94cea79b172500685cc640902f774d178994cca1acda9cdc2a9b8f0ffec54cc98b0b75d2cd70512a12a453ea15ae19af4c691a3f8
-DIST jaraco.collections-4.2.0.tar.gz 17623 BLAKE2B 8e96751618156eb9c45d4f0d8ee79f7ef5de8ef8332d3d0d8ecc27567057ca2d6702bcea0c3e8f8191bf8e5ddb4e37bba1facfe23365991a7390ff6c36939689 SHA512 4b26923b4c014399da45d8248219065dd56489ff434acac901cc04ccd32fe15ac6c97afa3aa88939d4d887a341c64dd65797d514ba287550a1f1e99183e0f71c
 DIST jaraco.collections-4.3.0.tar.gz 17862 BLAKE2B f40c6f40fb7fea5c74244b24a8121471ce4e33615d6db7f0db660f669c8aca65f9fb1986d2213762883b671067c8137c21694e41e7276cd4a9b00bc1989f022d SHA512 cee6169dfbe71752e6ed93db35a41896d891932cab949fed534bb90d5ac246eba3fb19105d39981b5cff9996331914e67858cc1158c23ffa702cf1cdcdced90e
diff --git a/dev-python/jaraco-collections/jaraco-collections-4.1.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-4.1.0.ebuild
deleted file mode 100644
index db3b5f2cff31..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-4.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.collections/
-	https://pypi.org/project/jaraco.collections/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/jaraco-collections-4.2.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-4.2.0.ebuild
deleted file mode 100644
index fe572b303082..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-4.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.collections/
-	https://pypi.org/project/jaraco.collections/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/jaraco-collections-4.3.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-4.3.0.ebuild
index fe572b303082..db3b5f2cff31 100644
--- a/dev-python/jaraco-collections/jaraco-collections-4.3.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-4.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/jaraco-text[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 34fb2f5801f3..8bcef4e1bf8a 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,3 +1 @@
-DIST jaraco.functools-3.6.0.tar.gz 16054 BLAKE2B dad26dc73b696dfc62d21f1807a8340e770b35881f3877fdcf6e7e95080f0cd1a81339500c306f4afb2dda896a19ffffcc1715cfc4d37f36594d59af3fd58ac0 SHA512 f249e6cdcbd88e5c89663bcc0467687ea533dc70b7c9260880da8099380b5c925f05933527de6043aa0786709a0ca4d4b183cc18acab69d8e88f63a3360e9efb
-DIST jaraco.functools-3.7.0.tar.gz 16107 BLAKE2B 3a8419af3d104118144bba053c94d2f1db0972f3a908fa66cc69ec4dfe31bb6ecb1f1a2f43d7ccdbca0be5094d21e15d40d9f8d75b3ba66e606fced08150872f SHA512 37b33b526a3f3cff259c93c764bdde06015440bef025d9f5a177125a654abb23f96d71f0b4f4e73cdfe7274af1575a01d8e112f9d333cbe12f53b1583bae1d5a
 DIST jaraco.functools-3.8.0.tar.gz 16251 BLAKE2B 15735a053b395173de2568d13d54d0a770477f72e138998abb67f24314d13ae1a008a2b373979dfb8b3b8955754758e07eb5981459b793ba4b6839e6aefbdda8 SHA512 923e94f54c46896d89db6b4a0c5d803996dc5caddd6a3ada66f943b58afd1750f5403d10de5ab87f93e57c3eab43806401f7c6b5a8265938793d45cba93df688
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild
deleted file mode 100644
index 3bc882236c51..000000000000
--- a/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.functools/
-	https://pypi.org/project/jaraco.functools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' 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 = "jaraco.functools"
-		version = "${PV}"
-		description = "Functools like those found in stdlib"
-	EOF
-}
-
-python_install() {
-	distutils-r1_python_install
-	# rename to workaround a bug in pkg_resources
-	# https://bugs.gentoo.org/834522
-	mv "${D}$(python_get_sitedir)"/jaraco{_,.}functools-${PV}.dist-info || die
-}
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.7.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.7.0.ebuild
deleted file mode 100644
index 412f59d3a5b6..000000000000
--- a/dev-python/jaraco-functools/jaraco-functools-3.7.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.functools/
-	https://pypi.org/project/jaraco.functools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' 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 = "jaraco.functools"
-		version = "${PV}"
-		description = "Functools like those found in stdlib"
-	EOF
-}
-
-python_install() {
-	distutils-r1_python_install
-	# rename to workaround a bug in pkg_resources
-	# https://bugs.gentoo.org/834522
-	mv "${D}$(python_get_sitedir)"/jaraco{_,.}functools-${PV}.dist-info || die
-}
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.8.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.8.0.ebuild
index 412f59d3a5b6..3bc882236c51 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.8.0.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.8.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index 7d18f8ebd857..ec6703058afd 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,3 +1 @@
-DIST jsonpatch-1.32.tar.gz 27988 BLAKE2B b60dc7607f644f1ffd095486c237e3bb537b465132725e98fc8799a42a92dcbb43e1e41d281fbc2ce2c4efec327ad681d7740129be55d94c51321e620d084d95 SHA512 4e2978555dd506e09553014d426c4e3a6c6d5c865428f11450952704007c8a0b2060b945cf1fa33a128151427e1c66919891466e095e96fff4316304f0b3ad1d
-DIST python-json-patch-1.32.gh.tar.gz 27988 BLAKE2B b60dc7607f644f1ffd095486c237e3bb537b465132725e98fc8799a42a92dcbb43e1e41d281fbc2ce2c4efec327ad681d7740129be55d94c51321e620d084d95 SHA512 4e2978555dd506e09553014d426c4e3a6c6d5c865428f11450952704007c8a0b2060b945cf1fa33a128151427e1c66919891466e095e96fff4316304f0b3ad1d
 DIST python-json-patch-1.33.gh.tar.gz 28475 BLAKE2B 7d95ab23e09141cbe26618c91b12558d5fbfecda3e5b148d834753a364155d30859a9bdc3d321bdfcc5269f7e0170671524ae78f5fe65a8c97041bab3fb522b9 SHA512 0685f63949bee135b19d0962bdaab32ba97e02772b6650d885be57c09a2e89546222ebba1a4cf146b2f91027790b0a3ff2ea072d66dcebf9153aa601638bbfa2
diff --git a/dev-python/jsonpatch/jsonpatch-1.32-r1.ebuild b/dev-python/jsonpatch/jsonpatch-1.32-r1.ebuild
deleted file mode 100644
index c339a4ff8acd..000000000000
--- a/dev-python/jsonpatch/jsonpatch-1.32-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=python-json-patch-${PV}
-DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
-HOMEPAGE="
-	https://github.com/stefankoegl/python-json-patch/
-	https://pypi.org/project/jsonpatch/
-"
-SRC_URI="
-	https://github.com/stefankoegl/python-json-patch/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
-	"${EPYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpatch/jsonpatch-1.32.ebuild b/dev-python/jsonpatch/jsonpatch-1.32.ebuild
deleted file mode 100644
index f0db874c3202..000000000000
--- a/dev-python/jsonpatch/jsonpatch-1.32.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
-HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
-SRC_URI="https://github.com/stefankoegl/python-json-patch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-json-patch-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${RDEPEND} )
-"
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
-	"${EPYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpatch/jsonpatch-1.33.ebuild b/dev-python/jsonpatch/jsonpatch-1.33.ebuild
index c339a4ff8acd..fa7dba632021 100644
--- a/dev-python/jsonpatch/jsonpatch-1.33.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.33.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index a11d7c268c91..e9da2ac43cac 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1 +1,3 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
+EBUILD langdetect-1.0.9.ebuild 493 BLAKE2B 0df8bce19bc80f79f8e76bcef5a4c2caf333365fe0cb9a3c076b7858bceded5a3e58921474f866a2709dd657b7ed330c1ec4a7f9d7bab0fcf1bc92d77cabc32d SHA512 ea2a1adcb133ac5fc951ba1aa90ef1ce3dfcc424e59727591763d4875aa044a74188be2d15fd89c6b2e83ed6ea04ec3d9851ed584ae79d2c2c127bde7d994b48
+MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index ddb5b0f1787e..020e07f2a3dd 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -2,9 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>cyber+gentoo@sysrq.in</email>
-  <name>Anna</name>
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
  </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
+ <upstream>
+  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
+ </upstream>
+ <origin>slonko-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index fc8504389ded..cd628c924e62 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,2 +1,3 @@
 DIST libarchive-c-4.0.gh.tar.gz 47743 BLAKE2B c6246b35a9a389c6cd999b32412436f8134737a4cba1c0bf8a905e3ba6e1653c515956f43a580901dd4278cbc00b783ecfa7a4306f0fc7ca2d2666b3af500cb8 SHA512 787b049a5f06d7370369a6bb2d9ebab6e4e5eda0a4f839906e205a7e19a00f9f7e350d4c42e3434e345063dd0ea44e5b0b4c0524033b05a6d8f15758757c5c36
 DIST python-libarchive-c-4.0.gh.tar.gz 47727 BLAKE2B 87f8cfb0adf080b11df85d065fbcc38bf5682592882b3a8a8077e5cfb590cc10a05b98c98a2be41570aa59d06899b2e47815183e563007b1077717cdaa79a21c SHA512 1544713802789859ffa9a0d8f4e490f720bbd4d589aae8899d0d1fb6780f2cde0db96f3023c1c32eacea07ea325ac180797aebdb0e8e37093af53807f2e5c812
+DIST python-libarchive-c-5.0.gh.tar.gz 48751 BLAKE2B 2ab737c7493c202ba9a1ad57e1066aad12ea984bfa0e63115f59491ea14b3bd1d46d2bb20f033bf5bae64a6badf73b641183f63cc79c9f0e6141792a35521dc4 SHA512 df4758f4b7207fe77ae650aa78c302e9e2a0c7ba81fbeae70af8cb37789a056bc420acd73c1d5baec7b0e93a47fd3e5130db8e43c983f4723366f75a58823f75
diff --git a/dev-python/libarchive-c/libarchive-c-5.0.ebuild b/dev-python/libarchive-c/libarchive-c-5.0.ebuild
new file mode 100644
index 000000000000..24fb3b4a6436
--- /dev/null
+++ b/dev-python/libarchive-c/libarchive-c-5.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+MY_P=python-libarchive-c-${PV}
+DESCRIPTION="A Python interface to libarchive"
+HOMEPAGE="
+	https://github.com/Changaco/python-libarchive-c/
+	https://pypi.org/project/libarchive-c/
+"
+SRC_URI="
+	https://github.com/Changaco/python-libarchive-c/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+
+RDEPEND="
+	app-arch/libarchive
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index e99aeb91e935..61837531aef7 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,4 +1,3 @@
-DIST llvm-project-0e08374abb2c61a3ae5c24d5f60be3b548da9778.tar.gz 191661586 BLAKE2B 05e5328d8eb9972bd6399e8c0f5ab241a78e6591e63ee520180c4ff154df432ad96f49ddc615a2208f69ffbec539b201fffeaf4906011b7a961cbc3860126ffa SHA512 1d4429ecb2292e419ed6172cf251ba4a1448ed51424552ac48a159d0e3d3414777f7821382d1839b56f0c906fb0a147b1df4eecb071f8a5c11b0fc1d0d40d339
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
@@ -7,5 +6,5 @@ DIST llvm-project-16.0.5.src.tar.xz 118000368 BLAKE2B 9f84e6bab450dc8d6379771afb
 DIST llvm-project-16.0.5.src.tar.xz.sig 566 BLAKE2B 4c96f294f350e0086f8504a54c3387308c60efb573c8def40aec45b1918d43e36c44bafb0823625b6cefa5d99b3aacd7823d6c92c7a64a737653d5b51839a924 SHA512 4550c7c6a1b6ea603d1499aba5aca746f3948a00e7567604f5e7dc3b215a34357bad382a7ebea1f6cd7952841cb75a0dfbe2c278a8c6fcb630a5035b3e16e869
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-aad51417452432092258034c55537a7092fa6295.tar.gz 192649458 BLAKE2B 64b8fd306fc6a01172d9be78c969c013a4d05ae62966c4ca424a25e0d1e87c07c50dc17125924151643e1e3fc1d63803f9162dedac8bddc037104bdbef06c0d9 SHA512 3533710e2411df7f3a2f68fffdf6213116ae54b07881e5661e9e137234d5d1f87136cbde83fd97123719dd1d6ed4d09bcc4a0aec3b2705da09195279b0ef16e2
+DIST llvm-project-5ae7fde004cbc640c2f60207791ac36574e5f5c6.tar.gz 193410766 BLAKE2B 50287f1ad41a895040934f8f19fd8aa2e91065b930ab14125dbbc3977273655d11482b6229577c11a8ad2bdd854ca109449b603bbc2e30cee20e95e4fe11e8b7 SHA512 f24f7a3b0661d2d4533b24c295c114817aff22c8f1d473ffa639cee547d31502719f8e1be4f25b970d450ecb9dcaa809c0e12b1bb380774f52cda82a4769d7bc
 DIST llvm-project-d32fb5e5f51dedba495301073b9250f84ac6d8a8.tar.gz 193280254 BLAKE2B 31473bee900caa45c816a020113d7b6bf6e6e2db4848fa529bc622fbf2956487ab89b04d1624e7e1530e9aa56293361e01b9fde31912b2a08194398a11db8b63 SHA512 5799e106403a3954767afafac515112ec9f6505c02abb502e21a5d7019e1079912939803e95177d91678d2e28e07a12b33ceabb13e90696da13a3613a16f2396
diff --git a/dev-python/lit/lit-17.0.0_pre20230620.ebuild b/dev-python/lit/lit-17.0.0_pre20230620.ebuild
deleted file mode 100644
index 0e39fac626c6..000000000000
--- a/dev-python/lit/lit-17.0.0_pre20230620.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-17.0.0_pre20230615.ebuild b/dev-python/lit/lit-17.0.0_pre20230705.ebuild
index 0e39fac626c6..0e39fac626c6 100644
--- a/dev-python/lit/lit-17.0.0_pre20230615.ebuild
+++ b/dev-python/lit/lit-17.0.0_pre20230705.ebuild
diff --git a/dev-python/markdown-it-py/Manifest b/dev-python/markdown-it-py/Manifest
index d111c336f99f..7afaac0b4e51 100644
--- a/dev-python/markdown-it-py/Manifest
+++ b/dev-python/markdown-it-py/Manifest
@@ -1,2 +1 @@
-DIST markdown-it-py-2.2.0.gh.tar.gz 266808 BLAKE2B 8eae5e1924e7afbc79203a11beb7b8271c4c524f5b26cd4bed86f784e4e811d081c2c6bf573bfcdb08f5e270c323957c439c9b9744c7036c4615daece24bde35 SHA512 84d6c15084bf33bdecdcbc8419322f2898bde20de6baeaee6c66c4e6ad9e47dfb8a14e2b1fcf71b8c42e7b61a7caed119919faf0faf6765aad85c186d91fe9d5
 DIST markdown-it-py-3.0.0.gh.tar.gz 275478 BLAKE2B ab264d6de015262e770b5da9c26a48a9fa40209119e38e12e4185aa8b5141986df62f2ff44d80c2d62732e75408b3a70bf35ae9b7ca899ae284636cc62ded710 SHA512 820265595ab650f5ac64419d5c2687d1ee361d2a0550b9d94e86ec826cfe5e89cbd69e59d6582aac41d3b95f00ce4a0b7213bf6cd590fdbd8fd9b743c7418759
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.2.0.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.2.0.ebuild
deleted file mode 100644
index 3b356dbfe859..000000000000
--- a/dev-python/markdown-it-py/markdown-it-py-2.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of markdown-it, Markdown parser"
-HOMEPAGE="
-	https://pypi.org/project/markdown-it-py/
-	https://github.com/executablebooks/markdown-it-py/
-"
-SRC_URI="
-	https://github.com/executablebooks/markdown-it-py/archive/v${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/linkify-it-py-3[${PYTHON_USEDEP}]
-	dev-python/mdurl[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# No need to benchmark
-	benchmarking/
-)
diff --git a/dev-python/markdown-it-py/markdown-it-py-3.0.0.ebuild b/dev-python/markdown-it-py/markdown-it-py-3.0.0.ebuild
index 3958860572b2..3b356dbfe859 100644
--- a/dev-python/markdown-it-py/markdown-it-py-3.0.0.ebuild
+++ b/dev-python/markdown-it-py/markdown-it-py-3.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/linkify-it-py-3[${PYTHON_USEDEP}]
diff --git a/dev-python/markupsafe/markupsafe-2.1.3.ebuild b/dev-python/markupsafe/markupsafe-2.1.3.ebuild
index 7145a9b61a48..6447492e385d 100644
--- a/dev-python/markupsafe/markupsafe-2.1.3.ebuild
+++ b/dev-python/markupsafe/markupsafe-2.1.3.ebuild
@@ -20,6 +20,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index e61556113be5..2f6212e4da8f 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,3 +1,2 @@
 DIST mypy-1.3.0.gh.tar.gz 2823529 BLAKE2B 0f1b4b6178ef9308fa6aeda494092229ebe07095c032b83fffd28be851608a3dc92ae4924ea64d87318155bf9d99bf16e17e2603f39fc915463455db520d6138 SHA512 1ab0e667bd019ea6804c70c775c2bfb454231ca2426b2b78b5c91672f7f20fd1195ee481a688d9b6238c3b5f6dc9a7aa5466c7405ce71dd6f78c489a43670fc0
-DIST mypy-1.4.0.gh.tar.gz 2863445 BLAKE2B e6d700a464d6ddb2ef49fd0dadca2139e7b21ebb33753e5f4ec0a60f7cac623d853dcf02cb096397c52e35c39182a082ade11b57e2a7a116bdeb9a606f854a99 SHA512 69aa3babe77c6f7576d01f29e4b9cf456bfcf7689a82d5156967c04f85ff823b34907ae006db75f1accfa52a76b51d98de1a9d307c32e70a4130046c13087501
 DIST mypy-1.4.1.gh.tar.gz 2864808 BLAKE2B 7dfda945cf554e170d048fc4b2689aa25a57e058857e17dd052090089a7880da74a3dd552fb1b8f8fa9bd9e84f1c97e49b36075d10957c6ee12c2507fb775668 SHA512 8a20ded76d9d3f323dc607c6cfdd4814c2ab798620a0b38198c7ff79bd1fb93aef7f8d60afa6e568957fcd8d9bfdf42308da07b4b0dd6260f192131377ee6951
diff --git a/dev-python/mypy/mypy-1.3.0.ebuild b/dev-python/mypy/mypy-1.3.0-r1.ebuild
index 78f54324de9e..eece54ec3e63 100644
--- a/dev-python/mypy/mypy-1.3.0.ebuild
+++ b/dev-python/mypy/mypy-1.3.0-r1.ebuild
@@ -27,8 +27,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390
 RDEPEND="
 	!dev-util/stubgen
 	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-2[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
 	>=dev-python/mypy_extensions-1.0.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
@@ -40,11 +38,11 @@ BDEPEND="
 		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
 		>=dev-python/filelock-3.3.0[${PYTHON_USEDEP}]
 		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		<dev-python/pytest-7.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
 		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
-		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
 	)
 "
@@ -64,5 +62,5 @@ python_test() {
 	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
 	# fail with high COLUMNS values
 	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs)"
+	epytest -n "$(makeopts_jobs)" --dist=worksteal
 }
diff --git a/dev-python/mypy/mypy-1.4.0.ebuild b/dev-python/mypy/mypy-1.4.0.ebuild
deleted file mode 100644
index 9a095bd28cea..000000000000
--- a/dev-python/mypy/mypy-1.4.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="
-	https://www.mypy-lang.org/
-	https://github.com/python/mypy/
-	https://pypi.org/project/mypy/
-"
-SRC_URI="
-	https://github.com/python/mypy/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-2[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-1.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' pypy3 python3_{8..10})
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/filelock-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	dev-python/furo
-distutils_enable_tests pytest
-
-# this requires packaging a lot of type stubs
-export MYPY_USE_MYPYC=0
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# the majority of them require Internet (via pip)
-		mypy/test/testpep561.py
-	)
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/mypy/mypy-1.4.1.ebuild b/dev-python/mypy/mypy-1.4.1-r1.ebuild
index b0cb44c614eb..328dbfab7be4 100644
--- a/dev-python/mypy/mypy-1.4.1.ebuild
+++ b/dev-python/mypy/mypy-1.4.1-r1.ebuild
@@ -27,8 +27,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv
 RDEPEND="
 	!dev-util/stubgen
 	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-2[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
 	>=dev-python/mypy_extensions-1.0.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
@@ -45,7 +43,6 @@ BDEPEND="
 		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
 		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
-		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
 	)
 "
@@ -63,5 +60,5 @@ python_test() {
 	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
 	# fail with high COLUMNS values
 	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs)"
+	epytest -n "$(makeopts_jobs)" --dist=worksteal
 }
diff --git a/dev-python/prompt-toolkit/Manifest b/dev-python/prompt-toolkit/Manifest
index 7637b4dbaac2..04a41c7b03cb 100644
--- a/dev-python/prompt-toolkit/Manifest
+++ b/dev-python/prompt-toolkit/Manifest
@@ -1 +1,2 @@
 DIST prompt_toolkit-3.0.38.tar.gz 422834 BLAKE2B 484ff9414d47f6f2188b8d50c6fcbe16ed850a8be880dfc60e9a3b750a26490f273b118d7bf0f1219530a59998273270b3b210750c35d00d7551ba15bb3f7e64 SHA512 eed2a73501d7ac413986f069564295db9eced3be4853a73c687e511ce1cf8c32c7c9bff4f851787e7910ed05818d4eb39556718c01f30e3ba8bfafe67d631a38
+DIST prompt_toolkit-3.0.39.tar.gz 423068 BLAKE2B d8673b3a9f4eb57c503e85471c13cefdb4f53fad58145d4198cd0f678d3f2d9d72d22d651b239386d8ade29c1fd155a98e80e4002b00ccbbbeff577636b9aa27 SHA512 6aaa80d515cd9731be1cc0de97f679b9dc22701dfb3e23b5434240aae0cac5eaede08437171a710492ff4041a9d46956cf8ed02750e9a78319eb61223033ba90
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.39.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.39.ebuild
new file mode 100644
index 000000000000..a6b3200f792d
--- /dev/null
+++ b/dev-python/prompt-toolkit/prompt-toolkit-3.0.39.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index 68b1f0eb8ea6..783f3165057e 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -31,6 +31,7 @@ DIST proc-macro2-1.0.56.crate 44454 BLAKE2B b2a1f28979245a784a4b3a0af8cb04bd01ef
 DIST proc-macro2-1.0.60.crate 44160 BLAKE2B 3cca40d5ffa85607212ea8da63995b35b1d59bf077ad1f708bb08f20a3f3d477e934205008984bf2e947e6e53689192df1d437772c75148e122e0f1f4fe43455 SHA512 2a3d33d2e42e3b7edac7a099dcaf83c43ad47852217424c2bcf8ed5b894292975ef5a11df01ebb3479971e94d5b032b9d043c28bed476d6f7087fb9297fbaac0
 DIST pydantic_core-0.39.0.tar.gz 302824 BLAKE2B bc4df1e66113845a5458d27c2408258dc0b0377732a2920d24d3a6f00cb9c7456c4fd9a59bfffcf5774ef9fba62c93e08947daae9fca99e76d537ce9f6de4eb1 SHA512 9221ceb3b944f52c7b8b874148af2c9eeb68088bbc3af53c1b530d002481e0d05eda8d27eaaa468d52509d1ca7338162cc593dc78d9365db829d69b395bffebc
 DIST pydantic_core-2.0.1.tar.gz 305815 BLAKE2B f57af9abd4f3e7c14f0215485311bcd39cc3369335f742f59cfd6ecd8a9d866bd1f70e592de596bc2c7572e864b33124a8f657ebdff27c1fa57ec8f50a974c6d SHA512 33339cba162b36e346d22b9c130d3e451579fc4beb7b6407628f3108cf29aaf0f15fc066c398d2fc3d9ed451f0512a39df61fbc891b9023fcd39c262659fbce9
+DIST pydantic_core-2.0.2.tar.gz 305778 BLAKE2B ef1e53a44ff9f295a410b0b6f5e3a1183cddcc5376adae2c8c5b87791b0443d6b97cf1129810924adcf46221a2d38b98ded01b3db1d14d064ad6e00069675ac1 SHA512 034eac42feedcd526bff0557a1ef83aa04e0c728b93b3d2831f76472736acd5063b4e541cc64206273ec7b305a38f453cb34e33dc64385f9cf45a5c261ef3c6c
 DIST pyo3-0.19.0.crate 412659 BLAKE2B f8833d39c3c8318466ee5b9010cbdce1a20f844f15a257ae41c5d8c72f645e0c14e7e5ae0b50a8aebec60afd827cd23d5b5b4b70188531e6f5b89ef191066189 SHA512 9cef7f8a73cfea32661eaf8fd8d5af6ca180e3fd71ac956d9fbb96a1d194f238116e3ab31917b15359e7f6b0b3bc4587437463a4c61bca988f16657a64440919
 DIST pyo3-build-config-0.19.0.crate 29172 BLAKE2B 20904ad814ed9a22b801eb7b06851292d50f5716116a5b4a670e8c499878bf6d193525a4579b044ed413823c17ecd1ad0178baae1cab1fe3f431cc9a0f442576 SHA512 3105ce54bff87bef803f30b79d3ab2dbe440d68418f8cdc875f18ceb2bb0d06ed0923cf02af5f8293ca901f40b96c1b99a12a8a8e74813dcf70534d3aec2bfb7
 DIST pyo3-ffi-0.19.0.crate 64481 BLAKE2B 1cad9db14e9c14e2aa24eab25439f9d8f7503b5f4c3e8bc9a58370e3d63261898ea678f75d276f9d2eedd5fa90a106f30e7362262619a81bead93bf45673e144 SHA512 9e01b15153c44f13c77c28719d3ab36bb859c4a15dc936af4af3e99f44946b4b4752faf3d2320391735b205ca6c055a43e7f5ac98ce53d281fdf536ce67dfbbe
diff --git a/dev-python/pydantic-core/pydantic-core-2.0.2.ebuild b/dev-python/pydantic-core/pydantic-core-2.0.2.ebuild
new file mode 100644
index 000000000000..7307e89584fa
--- /dev/null
+++ b/dev-python/pydantic-core/pydantic-core-2.0.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+CRATES="
+	ahash@0.8.3
+	aho-corasick@0.7.20
+	autocfg@1.1.0
+	base64@0.13.1
+	bitflags@1.3.2
+	cc@1.0.79
+	cfg-if@1.0.0
+	enum_dispatch@0.3.11
+	form_urlencoded@1.1.0
+	getrandom@0.2.8
+	hashbrown@0.12.3
+	heck@0.4.1
+	idna@0.3.0
+	indexmap@1.9.3
+	indoc@1.0.9
+	itoa@1.0.6
+	libc@0.2.140
+	libmimalloc-sys@0.1.30
+	lock_api@0.4.9
+	memchr@2.5.0
+	memoffset@0.9.0
+	mimalloc@0.1.34
+	num-bigint@0.4.3
+	num-integer@0.1.45
+	num-traits@0.2.15
+	once_cell@1.17.1
+	parking_lot@0.12.1
+	parking_lot_core@0.9.7
+	percent-encoding@2.2.0
+	proc-macro2@1.0.60
+	pyo3-build-config@0.19.0
+	pyo3-ffi@0.19.0
+	pyo3-macros-backend@0.19.0
+	pyo3-macros@0.19.0
+	pyo3@0.19.0
+	python3-dll-a@0.2.6
+	quote@1.0.28
+	redox_syscall@0.2.16
+	regex-syntax@0.6.29
+	regex@1.7.3
+	rustversion@1.0.12
+	ryu@1.0.13
+	scopeguard@1.1.0
+	serde@1.0.159
+	serde_json@1.0.95
+	smallvec@1.10.0
+	speedate@0.9.0
+	strum@0.25.0
+	strum_macros@0.24.3
+	strum_macros@0.25.0
+	syn@1.0.109
+	syn@2.0.18
+	target-lexicon@0.12.6
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	unicode-bidi@0.3.13
+	unicode-ident@1.0.8
+	unicode-normalization@0.1.22
+	unindent@0.1.11
+	url@2.3.1
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	windows-sys@0.45.0
+	windows-targets@0.42.2
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_msvc@0.42.2
+	windows_i686_gnu@0.42.2
+	windows_i686_msvc@0.42.2
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_msvc@0.42.2
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Core validation logic for pydantic written in Rust"
+HOMEPAGE="
+	https://github.com/pydantic/pydantic-core/
+	https://pypi.org/project/pydantic-core/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2022.7.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
+
+src_prepare() {
+	sed -i -e '/--benchmark/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		tests/benchmarks
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	rm -rf pydantic_core || die
+	epytest -p pytest_mock -p timeout
+}
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 3d7b80e8fb72..c59f42e923e6 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,3 +1,4 @@
+DIST pydantic-1.10.11.gh.tar.gz 766203 BLAKE2B 5ab426a805a471baac409c82d5a0cdaa9eae0bc46c0c0643ab653db68ccd5bd6db2c2e6aa12113f513e35d590b291986d463e776515f495991e9818541ab2553 SHA512 494e692781dd8fe3980e06ba975fa0c86ad32e36bffead8c836e1680ff3c43de458ef5a344182950060fc3616208d82ad77fd9098811384208f25a9b72c0fe42
 DIST pydantic-1.10.9.gh.tar.gz 765868 BLAKE2B 802c542d75b41ff2926215bf4f6bd68a906d581db7b08ed85577f9021d259717f3ef8dbacfe381723aa042aab8720ad182c57fee188f2436b33d21164e24ba23 SHA512 d376a302eac3427cdc8da0ed2fab01c0b5e7a059447777a53c394a60dac5fa0066488be8553022bb5aa89367d5a2e80e5d6e3cb39d9272843718dd07f6acd11e
+DIST pydantic-2.0.1.tar.gz 578758 BLAKE2B 1f330806462cfbb60d4c7dac0a682e191fcdb8e4c75b36603ec7acd8115b625123cf2806248b41e1b9ac5395ca412801180db3cea7a64239ea91c59db19c71dd SHA512 cec0ab3fbe1120806e8821296b65e35c3b8711b4bb2b1d45bcf506964678b6087c5f463ad2332b19ab554f0b04ee7b4fc11f9caa6d292442fe40cdc19dfb4053
 DIST pydantic-2.0.tar.gz 572748 BLAKE2B 611bb31065c1016d18137c0b5bfb0c7730243f727c1ffa3e3264f78fe750f31832d7388c177f59e0a676fa1eca7fc102e425fef59f97dc852c17b400723efc63 SHA512 830f5379f623e128f23f6d0672f0005a8b184b646e162be67fc08008f75dff53012c1576f0530ef9f6723ac664cfd662432de8f35cbcf98963ed8a680d697ce9
-DIST pydantic-2.0b3.tar.gz 543489 BLAKE2B 89faa3ca4187840ad2fa8025bfef8fba265eaf88e31a75751aa619e1235af08e33aa3b7a713da9e69119a43316da893b02e669d3e704781f77fe94598db40410 SHA512 db6690d15f91b635f0a4002f81cb9ba15e625ece4172bd355e5aef7058f6f385d0b3d1f7e2cab3e25aa6a5f48f6455965a1adaa18fc5a2ca5845c09804c9a3dd
diff --git a/dev-python/pydantic/pydantic-1.10.11.ebuild b/dev-python/pydantic/pydantic-1.10.11.ebuild
new file mode 100644
index 000000000000..f4ac3c801e6d
--- /dev/null
+++ b/dev-python/pydantic/pydantic-1.10.11.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/_beta/b}
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="
+	https://github.com/pydantic/pydantic/
+	https://pypi.org/project/pydantic/
+"
+SRC_URI="
+	https://github.com/pydantic/pydantic/archive/v${PV/_beta/b}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="native-extensions"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	native-extensions? (
+		<dev-python/cython-3[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/email-validator-1.2.1[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-dotenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/CFLAGS/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
+		# do not build extensions on PyPy to workaround
+		# https://github.com/cython/cython/issues/4763
+		local -x SKIP_CYTHON=1
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock
+
+	local EPYTEST_DESELECT=(
+		# flaky test, known upstream
+		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
+		# mypy linting causes regressions with new mypy versions
+		tests/mypy
+	)
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				tests/test_private_attributes.py::test_private_attribute
+				tests/test_private_attributes.py::test_private_attribute_annotation
+				tests/test_private_attributes.py::test_private_attribute_factory
+				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
+				tests/test_private_attributes.py::test_underscore_attrs_are_private
+			)
+			;;
+		python3.12)
+			EPYTEST_DESELECT+=(
+				tests/test_abc.py::test_model_subclassing_abstract_base_classes_without_implementation_raises_exception
+				tests/test_generics.py::test_partial_specification_name
+				tests/test_generics.py::test_parse_generic_json
+				tests/test_types.py::test_secretfield
+			)
+			;;
+	esac
+	rm -rf pydantic || die
+	epytest
+}
diff --git a/dev-python/pydantic/pydantic-2.0_beta3.ebuild b/dev-python/pydantic/pydantic-2.0.1.ebuild
index 3c4f56a6c9bc..b968fb9c83d8 100644
--- a/dev-python/pydantic/pydantic-2.0_beta3.ebuild
+++ b/dev-python/pydantic/pydantic-2.0.1.ebuild
@@ -20,7 +20,7 @@ KEYWORDS=""
 
 RDEPEND="
 	>=dev-python/annotated-types-0.4.0[${PYTHON_USEDEP}]
-	~dev-python/pydantic-core-0.39.0[${PYTHON_USEDEP}]
+	~dev-python/pydantic-core-2.0.2[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-4.6.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
@@ -35,10 +35,7 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_test() {
-	local EPYTEST_DESELECT=(
-		# expect -Werror
-		tests/test_deprecated.py::test_extra_used_as_enum
-	)
+	local EPYTEST_DESELECT=()
 	local EPYTEST_IGNORE=(
 		# require pytest-examples
 		tests/test_docs.py
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 3b1b89d004d1..6085b7ff4646 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,2 +1 @@
-DIST PyJWT-2.6.0.tar.gz 72984 BLAKE2B d8e9cc85ec80ca8f0414b88bb4bfa4aa93c973e5f3e015dee9433371d8b3c9ba5d701df16073bbacbaca9c9433f8a69259623f2f4e70843dbdf520d4248bb3f3 SHA512 c2f797bbb84469db1332bad61807740d859d0e1fa500ba17981d6c1a7a30a6fab345ff241200e24ce1ffe686591642a858e5eb2e9462fa1ceda7fcd00ae55d30
 DIST PyJWT-2.7.0.tar.gz 77902 BLAKE2B ff1e1c5dfd301a86a42eb6b4b2d6d900b15acdf60875bac49aee980b75b724292ff48b169cd2b9708388860ea93fd94f3cbf891f4606bfeb544e07a14c328bb8 SHA512 0aa886dfdc3c668b45e1c649cc3fbe3c2dec7476f46bd361ff74f6e9c7ea0ad40306a8a8ae84bfd63fe1c1364302b8aa69943013c951b32c9f24e4782b94ca8d
diff --git a/dev-python/pyjwt/pyjwt-2.6.0.ebuild b/dev-python/pyjwt/pyjwt-2.6.0.ebuild
deleted file mode 100644
index 4f8a13bd08b7..000000000000
--- a/dev-python/pyjwt/pyjwt-2.6.0.ebuild
+++ /dev/null
@@ -1,36 +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="PyJWT"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="JSON Web Token implementation in Python"
-HOMEPAGE="
-	https://github.com/jpadilla/pyjwt/
-	https://pypi.org/project/PyJWT/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	!dev-python/python-jwt
-"
-BDEPEND="
-	test? (
-		>=dev-python/cryptography-3.4.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "cryptography" dev-python/cryptography
-}
diff --git a/dev-python/pyjwt/pyjwt-2.7.0.ebuild b/dev-python/pyjwt/pyjwt-2.7.0.ebuild
index 5da164745ccf..4f8a13bd08b7 100644
--- a/dev-python/pyjwt/pyjwt-2.7.0.ebuild
+++ b/dev-python/pyjwt/pyjwt-2.7.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	!dev-python/python-jwt
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index b5382006fb4e..033250f3e1de 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,3 +1,2 @@
-DIST pytest-7.3.1.tar.gz 1336938 BLAKE2B 8cabc475056000e393538c6c52e2ee5a9af6c57831c6aba82e3107ae44f88b63a68b37339842eebfa318bd27d4bf5e34959b72052d4646cc8682c84f131f98e7 SHA512 e6c8fcf1449f5e09e33c01ec2ade8812ceb13440324179288b8ca0eeaaffed1e581a65c8acf4c28efe61c19a067e7ceddccc45d8a1582c89259d53fee25ab253
 DIST pytest-7.3.2.tar.gz 1338457 BLAKE2B 4aa6ad62f654df9373427d9c19d92565a7da8d65460ee0872a30d4235e72af1ee3155871d7f7157b8e9c1173fc40bcdb87acab2b7bffdc6255cf8509e7a0bba3 SHA512 910de83f6ce47e7b1b25947050cf79e055ab04fd0c3dc3276546415684c20c8977883f16dfb913de3f339bc6284330f8a57d202c73f92b92545e45acb353b264
 DIST pytest-7.4.0.tar.gz 1349733 BLAKE2B 59b9e90ab226dd317a5beeb0b189d0e323379e781dcca3fc7aa37ab7ef6d623a25f6f50e4b648cd274bdbc202e914fd393749d093a4c9d8c2f19124403d6b4fe SHA512 48caca22c77e03cb3bca04d2f11695c48868433e6966b6f652f414b3b4405cb9dfba1ebdfd66060ba6add45609ec27b2eddd81d3739ef8e84a51b9da3c6f6099
diff --git a/dev-python/pytest/files/pytest-7.3.1-py312.patch b/dev-python/pytest/files/pytest-7.3.1-py312.patch
deleted file mode 100644
index b38486248309..000000000000
--- a/dev-python/pytest/files/pytest-7.3.1-py312.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-From 653606791456f7e6412712bc26428b90092336b5 Mon Sep 17 00:00:00 2001
-From: Ran Benita <ran@unusedvar.com>
-Date: Wed, 10 May 2023 10:36:09 +0300
-Subject: [PATCH] Avoid ast deprecation warnings on Python 3.12
-
-Fix #10977.
----
- src/_pytest/assertion/rewrite.py | 49 +++++++++++++++++++-------------
- src/_pytest/mark/expression.py   |  8 +++++-
- 2 files changed, 36 insertions(+), 21 deletions(-)
-
-diff --git a/src/_pytest/assertion/rewrite.py b/src/_pytest/assertion/rewrite.py
-index 8b182347052..00bb4feb94a 100644
---- a/src/_pytest/assertion/rewrite.py
-+++ b/src/_pytest/assertion/rewrite.py
-@@ -46,8 +46,14 @@
- 
- if sys.version_info >= (3, 8):
-     namedExpr = ast.NamedExpr
-+    astNameConstant = ast.Constant
-+    astStr = ast.Constant
-+    astNum = ast.Constant
- else:
-     namedExpr = ast.Expr
-+    astNameConstant = ast.NameConstant
-+    astStr = ast.Str
-+    astNum = ast.Num
- 
- 
- assertstate_key = StashKey["AssertionState"]()
-@@ -680,9 +686,12 @@ def run(self, mod: ast.Module) -> None:
-             if (
-                 expect_docstring
-                 and isinstance(item, ast.Expr)
--                and isinstance(item.value, ast.Str)
-+                and isinstance(item.value, astStr)
-             ):
--                doc = item.value.s
-+                if sys.version_info >= (3, 8):
-+                    doc = item.value.value
-+                else:
-+                    doc = item.value.s
-                 if self.is_rewrite_disabled(doc):
-                     return
-                 expect_docstring = False
-@@ -814,7 +823,7 @@ def pop_format_context(self, expl_expr: ast.expr) -> ast.Name:
-         current = self.stack.pop()
-         if self.stack:
-             self.explanation_specifiers = self.stack[-1]
--        keys = [ast.Str(key) for key in current.keys()]
-+        keys = [astStr(key) for key in current.keys()]
-         format_dict = ast.Dict(keys, list(current.values()))
-         form = ast.BinOp(expl_expr, ast.Mod(), format_dict)
-         name = "@py_format" + str(next(self.variable_counter))
-@@ -868,16 +877,16 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
-         negation = ast.UnaryOp(ast.Not(), top_condition)
- 
-         if self.enable_assertion_pass_hook:  # Experimental pytest_assertion_pass hook
--            msg = self.pop_format_context(ast.Str(explanation))
-+            msg = self.pop_format_context(astStr(explanation))
- 
-             # Failed
-             if assert_.msg:
-                 assertmsg = self.helper("_format_assertmsg", assert_.msg)
-                 gluestr = "\n>assert "
-             else:
--                assertmsg = ast.Str("")
-+                assertmsg = astStr("")
-                 gluestr = "assert "
--            err_explanation = ast.BinOp(ast.Str(gluestr), ast.Add(), msg)
-+            err_explanation = ast.BinOp(astStr(gluestr), ast.Add(), msg)
-             err_msg = ast.BinOp(assertmsg, ast.Add(), err_explanation)
-             err_name = ast.Name("AssertionError", ast.Load())
-             fmt = self.helper("_format_explanation", err_msg)
-@@ -893,8 +902,8 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
-             hook_call_pass = ast.Expr(
-                 self.helper(
-                     "_call_assertion_pass",
--                    ast.Num(assert_.lineno),
--                    ast.Str(orig),
-+                    astNum(assert_.lineno),
-+                    astStr(orig),
-                     fmt_pass,
-                 )
-             )
-@@ -913,7 +922,7 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
-                 variables = [
-                     ast.Name(name, ast.Store()) for name in self.format_variables
-                 ]
--                clear_format = ast.Assign(variables, ast.NameConstant(None))
-+                clear_format = ast.Assign(variables, astNameConstant(None))
-                 self.statements.append(clear_format)
- 
-         else:  # Original assertion rewriting
-@@ -924,9 +933,9 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
-                 assertmsg = self.helper("_format_assertmsg", assert_.msg)
-                 explanation = "\n>assert " + explanation
-             else:
--                assertmsg = ast.Str("")
-+                assertmsg = astStr("")
-                 explanation = "assert " + explanation
--            template = ast.BinOp(assertmsg, ast.Add(), ast.Str(explanation))
-+            template = ast.BinOp(assertmsg, ast.Add(), astStr(explanation))
-             msg = self.pop_format_context(template)
-             fmt = self.helper("_format_explanation", msg)
-             err_name = ast.Name("AssertionError", ast.Load())
-@@ -938,7 +947,7 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
-         # Clear temporary variables by setting them to None.
-         if self.variables:
-             variables = [ast.Name(name, ast.Store()) for name in self.variables]
--            clear = ast.Assign(variables, ast.NameConstant(None))
-+            clear = ast.Assign(variables, astNameConstant(None))
-             self.statements.append(clear)
-         # Fix locations (line numbers/column offsets).
-         for stmt in self.statements:
-@@ -952,20 +961,20 @@ def visit_NamedExpr(self, name: namedExpr) -> Tuple[namedExpr, str]:
-         # thinks it's acceptable.
-         locs = ast.Call(self.builtin("locals"), [], [])
-         target_id = name.target.id  # type: ignore[attr-defined]
--        inlocs = ast.Compare(ast.Str(target_id), [ast.In()], [locs])
-+        inlocs = ast.Compare(astStr(target_id), [ast.In()], [locs])
-         dorepr = self.helper("_should_repr_global_name", name)
-         test = ast.BoolOp(ast.Or(), [inlocs, dorepr])
--        expr = ast.IfExp(test, self.display(name), ast.Str(target_id))
-+        expr = ast.IfExp(test, self.display(name), astStr(target_id))
-         return name, self.explanation_param(expr)
- 
-     def visit_Name(self, name: ast.Name) -> Tuple[ast.Name, str]:
-         # Display the repr of the name if it's a local variable or
-         # _should_repr_global_name() thinks it's acceptable.
-         locs = ast.Call(self.builtin("locals"), [], [])
--        inlocs = ast.Compare(ast.Str(name.id), [ast.In()], [locs])
-+        inlocs = ast.Compare(astStr(name.id), [ast.In()], [locs])
-         dorepr = self.helper("_should_repr_global_name", name)
-         test = ast.BoolOp(ast.Or(), [inlocs, dorepr])
--        expr = ast.IfExp(test, self.display(name), ast.Str(name.id))
-+        expr = ast.IfExp(test, self.display(name), astStr(name.id))
-         return name, self.explanation_param(expr)
- 
-     def visit_BoolOp(self, boolop: ast.BoolOp) -> Tuple[ast.Name, str]:
-@@ -1001,7 +1010,7 @@ def visit_BoolOp(self, boolop: ast.BoolOp) -> Tuple[ast.Name, str]:
-             self.push_format_context()
-             res, expl = self.visit(v)
-             body.append(ast.Assign([ast.Name(res_var, ast.Store())], res))
--            expl_format = self.pop_format_context(ast.Str(expl))
-+            expl_format = self.pop_format_context(astStr(expl))
-             call = ast.Call(app, [expl_format], [])
-             self.expl_stmts.append(ast.Expr(call))
-             if i < levels:
-@@ -1013,7 +1022,7 @@ def visit_BoolOp(self, boolop: ast.BoolOp) -> Tuple[ast.Name, str]:
-                 self.statements = body = inner
-         self.statements = save
-         self.expl_stmts = fail_save
--        expl_template = self.helper("_format_boolop", expl_list, ast.Num(is_or))
-+        expl_template = self.helper("_format_boolop", expl_list, astNum(is_or))
-         expl = self.pop_format_context(expl_template)
-         return ast.Name(res_var, ast.Load()), self.explanation_param(expl)
- 
-@@ -1099,9 +1108,9 @@ def visit_Compare(self, comp: ast.Compare) -> Tuple[ast.expr, str]:
-                 next_expl = f"({next_expl})"
-             results.append(next_res)
-             sym = BINOP_MAP[op.__class__]
--            syms.append(ast.Str(sym))
-+            syms.append(astStr(sym))
-             expl = f"{left_expl} {sym} {next_expl}"
--            expls.append(ast.Str(expl))
-+            expls.append(astStr(expl))
-             res_expr = ast.Compare(left_res, [op], [next_res])
-             self.statements.append(ast.Assign([store_names[i]], res_expr))
-             left_res, left_expl = next_res, next_expl
-diff --git a/src/_pytest/mark/expression.py b/src/_pytest/mark/expression.py
-index f82a81d44c5..9287bcee50c 100644
---- a/src/_pytest/mark/expression.py
-+++ b/src/_pytest/mark/expression.py
-@@ -18,6 +18,7 @@
- import dataclasses
- import enum
- import re
-+import sys
- import types
- from typing import Callable
- from typing import Iterator
-@@ -26,6 +27,11 @@
- from typing import Optional
- from typing import Sequence
- 
-+if sys.version_info >= (3, 8):
-+    astNameConstant = ast.Constant
-+else:
-+    astNameConstant = ast.NameConstant
-+
- 
- __all__ = [
-     "Expression",
-@@ -132,7 +138,7 @@ def reject(self, expected: Sequence[TokenType]) -> NoReturn:
- 
- def expression(s: Scanner) -> ast.Expression:
-     if s.accept(TokenType.EOF):
--        ret: ast.expr = ast.NameConstant(False)
-+        ret: ast.expr = astNameConstant(False)
-     else:
-         ret = expr(s)
-         s.accept(TokenType.EOF, reject=True)
-From c945dba571025623a3ace7311d682e3e9448a161 Mon Sep 17 00:00:00 2001
-From: Ran Benita <ran@unusedvar.com>
-Date: Fri, 26 May 2023 20:28:21 +0300
-Subject: [PATCH] testing/python/collect: replace use of deprecated/removed
- `imp` module
-
----
- testing/python/collect.py | 26 +++++++++++++++-----------
- 1 file changed, 15 insertions(+), 11 deletions(-)
-
-diff --git a/testing/python/collect.py b/testing/python/collect.py
-index ac3edd395ab..52b34800965 100644
---- a/testing/python/collect.py
-+++ b/testing/python/collect.py
-@@ -897,25 +897,29 @@ def pytest_pycollect_makeitem(collector, name, obj):
-     def test_issue2369_collect_module_fileext(self, pytester: Pytester) -> None:
-         """Ensure we can collect files with weird file extensions as Python
-         modules (#2369)"""
--        # We'll implement a little finder and loader to import files containing
-+        # Implement a little meta path finder to import files containing
-         # Python source code whose file extension is ".narf".
-         pytester.makeconftest(
-             """
--            import sys, os, imp
-+            import sys
-+            import os.path
-+            from importlib.util import spec_from_loader
-+            from importlib.machinery import SourceFileLoader
-             from _pytest.python import Module
- 
--            class Loader(object):
--                def load_module(self, name):
--                    return imp.load_source(name, name + ".narf")
--            class Finder(object):
--                def find_module(self, name, path=None):
--                    if os.path.exists(name + ".narf"):
--                        return Loader()
--            sys.meta_path.append(Finder())
-+            class MetaPathFinder:
-+                def find_spec(self, fullname, path, target=None):
-+                    if os.path.exists(fullname + ".narf"):
-+                        return spec_from_loader(
-+                            fullname,
-+                            SourceFileLoader(fullname, fullname + ".narf"),
-+                        )
-+            sys.meta_path.append(MetaPathFinder())
- 
-             def pytest_collect_file(file_path, parent):
-                 if file_path.suffix == ".narf":
--                    return Module.from_parent(path=file_path, parent=parent)"""
-+                    return Module.from_parent(path=file_path, parent=parent)
-+            """
-         )
-         pytester.makefile(
-             ".narf",
diff --git a/dev-python/pytest/pytest-7.3.1-r2.ebuild b/dev-python/pytest/pytest-7.3.1-r2.ebuild
deleted file mode 100644
index 93fd9214a02b..000000000000
--- a/dev-python/pytest/pytest-7.3.1-r2.ebuild
+++ /dev/null
@@ -1,113 +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_TESTED=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="
-	https://pytest.org/
-	https://github.com/pytest-dev/pytest/
-	https://pypi.org/project/pytest/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-		>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/argcomplete[${PYTHON_USEDEP}]
-			>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-			>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/xmlschema[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-PATCHES=(
-	# deprecation warning fix
-	# https://github.com/pytest-dev/pytest/pull/10894/
-	"${FILESDIR}/${P}-py312.patch"
-)
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x COLUMNS=80
-
-	local EPYTEST_DESELECT=(
-		# broken by epytest args
-		testing/test_warnings.py::test_works_with_filterwarnings
-
-		# tend to be broken by random pytest plugins
-		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
-		testing/test_helpconfig.py::test_version_less_verbose
-		testing/test_helpconfig.py::test_version_verbose
-		testing/test_junitxml.py::test_random_report_log_xdist
-		testing/test_junitxml.py::test_runs_twice_xdist
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
-		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
-		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
-		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
-
-		# unstable with xdist
-		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
-
-		# TODO (XPASS)
-		testing/test_debugging.py::TestDebuggingBreakpoints::test_pdb_not_altered
-		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_simple
-		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_twice
-		testing/test_debugging.py::TestPDB::test_pdb_with_injected_do_debug
-		testing/test_debugging.py::test_pdb_suspends_fixture_capturing
-
-		# setuptools warnings
-		testing/acceptance_test.py::TestInvocationVariants::test_cmdline_python_namespace_package
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		# regressions on pypy3.9
-		# https://github.com/pytest-dev/pytest/issues/9787
-		testing/test_skipping.py::test_errors_in_xfail_skip_expressions
-		testing/test_unraisableexception.py
-	)
-
-	epytest -p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/pytest/pytest-7.3.1.ebuild b/dev-python/pytest/pytest-7.3.1.ebuild
deleted file mode 100644
index 35f2249c32b8..000000000000
--- a/dev-python/pytest/pytest-7.3.1.ebuild
+++ /dev/null
@@ -1,107 +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_TESTED=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="
-	https://pytest.org/
-	https://github.com/pytest-dev/pytest/
-	https://pypi.org/project/pytest/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-		>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/argcomplete[${PYTHON_USEDEP}]
-			>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-			>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/xmlschema[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x COLUMNS=80
-
-	local EPYTEST_DESELECT=(
-		# broken by epytest args
-		testing/test_warnings.py::test_works_with_filterwarnings
-
-		# tend to be broken by random pytest plugins
-		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
-		testing/test_helpconfig.py::test_version_less_verbose
-		testing/test_helpconfig.py::test_version_verbose
-		testing/test_junitxml.py::test_random_report_log_xdist
-		testing/test_junitxml.py::test_runs_twice_xdist
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
-		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
-		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
-		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
-
-		# unstable with xdist
-		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
-
-		# TODO (XPASS)
-		testing/test_debugging.py::TestDebuggingBreakpoints::test_pdb_not_altered
-		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_simple
-		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_twice
-		testing/test_debugging.py::TestPDB::test_pdb_with_injected_do_debug
-		testing/test_debugging.py::test_pdb_suspends_fixture_capturing
-
-		# setuptools warnings
-		testing/acceptance_test.py::TestInvocationVariants::test_cmdline_python_namespace_package
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		# regressions on pypy3.9
-		# https://github.com/pytest-dev/pytest/issues/9787
-		testing/test_skipping.py::test_errors_in_xfail_skip_expressions
-		testing/test_unraisableexception.py
-	)
-
-	epytest -p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/pytest/pytest-7.3.2.ebuild b/dev-python/pytest/pytest-7.3.2.ebuild
index a0a2d0dceb13..35f2249c32b8 100644
--- a/dev-python/pytest/pytest-7.3.2.ebuild
+++ b/dev-python/pytest/pytest-7.3.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/regex/regex-2023.6.3.ebuild b/dev-python/regex/regex-2023.6.3.ebuild
index 8c79b72444d7..9c0f8ac62891 100644
--- a/dev-python/regex/regex-2023.6.3.ebuild
+++ b/dev-python/regex/regex-2023.6.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index f0ad48ab5475..2558831bd4d9 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,3 +1 @@
-DIST rich-13.3.4.gh.tar.gz 15059899 BLAKE2B f0ca78bf4cdec19136f9372e541ea90713e55acf4dc6f709b8edba9c8dc56da9ac534c6f32b05b634a970e4c02b1f08bfcb5ff949889d6f7bfaa104a1ca6b1cd SHA512 ab3b2ef30ede12f0959671baeff299621303e09750c245b3b3d7b8f1dbd3b7465410400b39668791de57d6027fe24a0a17d5b7284eea162d819c4cb6b9535f81
-DIST rich-13.4.1.gh.tar.gz 15062357 BLAKE2B b5e0067f378910b6a93f0ec40ff47a4ce26298055fba694441962ec2443f9bb76a8ba34ffe43a05abdc077ea8b1d26bbf6294c9d2370baf724045be043c29544 SHA512 655252e9f34da17df6bc7ce74560667f4472da4df6ed699d4302a02301857543ba8756153f48ea8d5a2df5e627ed3c4c8ab732b2b2b27baf66a10c798795a885
 DIST rich-13.4.2.gh.tar.gz 15063000 BLAKE2B f65079440bc7d89a3ff03be01fa71e076493ae50f22ae8781be2448a7ff2769c174d6654db3a835d34720c34cd8cbecfdd6b13e3064cf7fdcade71806563309d SHA512 17052a9fb0e1d89b31a00d8a719214719891d048fd805185b2d4258c8766130f44bf2280c9567bc162f3b34d9bf2eb7d747d6a37d910c81cd53d3003b51f70bd
diff --git a/dev-python/rich/rich-13.3.4.ebuild b/dev-python/rich/rich-13.3.4.ebuild
deleted file mode 100644
index 7fcdffb6d57c..000000000000
--- a/dev-python/rich/rich-13.3.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${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/colorama[${PYTHON_USEDEP}]
-	<dev-python/markdown-it-py-3[${PYTHON_USEDEP}]
-	>=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-		# pygments?
-		tests/test_syntax.py::test_python_render_simple_indent_guides
-		tests/test_syntax.py::test_python_render_line_range_indent_guides
-	)
-	if [[ ${EPYTHON} == python3.12 ]]; then
-		EPYTEST_DESELECT+=(
-			# version-specific output -- the usual deal
-			tests/test_inspect.py::test_inspect_builtin_function_except_python311
-			tests/test_inspect.py::test_inspect_integer_with_methods_python310only
-			tests/test_inspect.py::test_inspect_integer_with_methods_python311_and_above
-			tests/test_pretty.py::test_attrs_broken
-		)
-	fi
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.4.1.ebuild b/dev-python/rich/rich-13.4.1.ebuild
deleted file mode 100644
index 47bdd73c0e5a..000000000000
--- a/dev-python/rich/rich-13.4.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${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/colorama[${PYTHON_USEDEP}]
-	>=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/markdown-it-py/s:\^:>=:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-		# pygments?
-		tests/test_syntax.py::test_python_render_simple_indent_guides
-		tests/test_syntax.py::test_python_render_line_range_indent_guides
-	)
-	# version-specific output -- the usual deal
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# pypy3.10, to be more precise
-				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
-			)
-			;;
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests/test_inspect.py::test_inspect_builtin_function_except_python311
-				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
-				tests/test_inspect.py::test_inspect_integer_with_methods_python311_and_above
-				tests/test_pretty.py::test_attrs_broken
-			)
-			;;
-	esac
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.4.2.ebuild b/dev-python/rich/rich-13.4.2.ebuild
index 353debe9fe77..b4911d2812ed 100644
--- a/dev-python/rich/rich-13.4.2.ebuild
+++ b/dev-python/rich/rich-13.4.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index b619b492c664..a850cd24ad1e 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,4 +1 @@
-DIST ruamel.yaml-0.17.28.tar.xz 187800 BLAKE2B 24dbf1c3fc76ec2f6255a7771dfa3bae24bf97c7014bd3205dd4968d73bdd9c4fc9e3adf721dba89c50554d13dbdd528f5f67c99692ef15b361119330b35005e SHA512 313bd7e4cfa559f90e150cf5a522b5c690b680b38df24ea3b4320484012b6e4c841f94fd21ca33283dfc0a1d04c465d38d4b5d48f95d2f1f9b876dc371a74f35
-DIST ruamel.yaml-0.17.30.tar.xz 189936 BLAKE2B 9e662551527372b3a1654d8e5da8c1e0a22f432d6564a807fe89bee7f93e2878d47e6a97f50475643575e89eb03564beb86daa7295d14513ff09615d38441f3b SHA512 0e460fa05e69d99591ff4dd1b35ae3be4ba40f21bcf514f16256a56a346b570c7c41a56e1ccf7c1d3ff14beb53800a4f0752243aa20fc37df345509c293d351a
-DIST ruamel.yaml-0.17.31.tar.xz 190068 BLAKE2B cb5682ca184d86f8acb2516f0ce515deb81f3eb1bd9ea0b340c588e738f657076d589424e71492cf8fe37f5a2f62e0c9881644770c23ef1cb8a6d42cae48a86c SHA512 5a453a31babe1b9ad3b782ae06598f5f65d5e6aee167beaf7b898a2b624578245915ef0579bb7f9eefbecee28a472d6f3e04cc721b0c7b320e79f5986225986c
 DIST ruamel.yaml-0.17.32.tar.xz 190144 BLAKE2B fe58904cacff21bd64eb7e9cc4ea613ae0ad8e6718f568f64876385b70b6c2ce2bc6137537ddf9d3c7e9c08c66a1112f78527080c025fb5655ddce2b73a4f477 SHA512 e78ae975c3a7281d69ca965604fbc7f014cf8aaec9e51e27c795caefc5708019c57629f54044b12833bca0c846a8005fc0b95e64f75b2da226cdca2fefbcd8ae
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.28.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.28.ebuild
deleted file mode 100644
index f3658c6dbc24..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.28.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/projects/ruamel-yaml/
-"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
-	!dev-python/namespace-ruamel
-"
-BDEPEND="
-	test? (
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-	local EPYTEST_IGNORE=(
-		# Old PyYAML tests from lib/ require special set-up and are
-		# invoked indirectly via test_z_olddata, tell pytest itself
-		# to leave the subdir alone.
-		_test/lib/
-	)
-
-	# this is needed to keep the tests working while
-	# dev-python/namespace-ruamel is still installed
-	distutils_write_namespace ruamel
-	epytest
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.30.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.30.ebuild
deleted file mode 100644
index 68ab1d975c37..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.30.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/projects/ruamel-yaml/
-"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
-	!dev-python/namespace-ruamel
-"
-BDEPEND="
-	test? (
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-	local EPYTEST_IGNORE=(
-		# Old PyYAML tests from lib/ require special set-up and are
-		# invoked indirectly via test_z_olddata, tell pytest itself
-		# to leave the subdir alone.
-		_test/lib/
-	)
-
-	# this is needed to keep the tests working while
-	# dev-python/namespace-ruamel is still installed
-	distutils_write_namespace ruamel
-	epytest
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.31.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.31.ebuild
deleted file mode 100644
index 68ab1d975c37..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.31.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/projects/ruamel-yaml/
-"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
-	!dev-python/namespace-ruamel
-"
-BDEPEND="
-	test? (
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-	local EPYTEST_IGNORE=(
-		# Old PyYAML tests from lib/ require special set-up and are
-		# invoked indirectly via test_z_olddata, tell pytest itself
-		# to leave the subdir alone.
-		_test/lib/
-	)
-
-	# this is needed to keep the tests working while
-	# dev-python/namespace-ruamel is still installed
-	distutils_write_namespace ruamel
-	epytest
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.32.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.32.ebuild
index 68ab1d975c37..f3658c6dbc24 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.32.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.32.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 5c1b588ee3da..45023164ab88 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1,4 @@
 DIST sentry-python-1.24.0.gh.tar.gz 360564 BLAKE2B 032c929b75e29ebb0e95f8dddcc567d7367399b0945f918821c5331898b0aa90eac4af531f4f49c52949d00b655508cd57a88915ab054f2a44f72e3dc81cc9a9 SHA512 9dee3f14082331232f743c7bd38a7a46273d4c467bdd4f8672f7597fa0d3baaecd34423d07669f14f0265be2c947bdbddc983aaa8cab66a139aeb036fde1b708
 DIST sentry-python-1.25.1.gh.tar.gz 362026 BLAKE2B f392d766305a119d8d24472d21efade8a0f058d18e8d0e7b15fbcc2c368171e89a79394534aa85a7f9c4013fc1ba2566ee3de6d4708e1c5d7f3e3dd2aae56d4d SHA512 eb22213d99989711fc1449f3910dbd81eafe6d8903181955cb307066ba90a6e0cf587e875c806a013ca2b9465dc070e622c4ec6a656bdec51668455d353ad91a
 DIST sentry-python-1.26.0.gh.tar.gz 371531 BLAKE2B cdc44a8c4067405242b7aaec28999902df8ac7938d933ec8f5c050b6659bf5f920d7422dbe712813de995308fd49ce6173ca59e346d5a8912f6c3452f6063fb2 SHA512 de1d1c4af1d629c7689691d99ebd0acd3c023fc07fcfc6e706e7738b536601186ce33672b85ba08123f430923bb0c67cdbe0e56c9642d2219df55c8f1d14f07d
+DIST sentry-python-1.27.0.gh.tar.gz 375579 BLAKE2B ad6de41078c76a1fe99c415d4eaf3a7ad11283f4a95ecdc543918de6f931b3ffc0d840345478834dbf97fe2f48490533a14de294b852ec5ac03f24d57cfef935 SHA512 45317295fc71f2a2965ba65552cd6b0fd5f48ae95e1ed06a288d61cfab96cd05d5316cef08f7a90599c1ba57d24022a610fe1bfb9c98ff2a0853f2fc8921c8e7
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.27.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.27.0.ebuild
new file mode 100644
index 000000000000..3161d9dcc8f6
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.27.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+MY_P=sentry-python-${PV}
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/python-socks[${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
+	tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
+	# 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/sh/Manifest b/dev-python/sh/Manifest
index a1c27a961680..6b47f0760654 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,2 +1 @@
-DIST sh-2.0.3.tar.gz 345365 BLAKE2B f818f84c71992fcfb653b757872da89a0007a873c639b3b0438a794bdfbd455e2ac22ef035b657b35da23e6890761ce7f161a02e3e0f847ee5209cec5fe911a4 SHA512 4d3bc20b2175b2507f0081af0b83faaf5eb97d131a24abaafb333a56e45d2cdb9167c3568bb40c6a6ea79b9836e335cb0d5bec2d036ce619eb312916d69fa72d
 DIST sh-2.0.4.tar.gz 345443 BLAKE2B b5b765c558ad8f7aa5197687b73b20e32397f195f401aa6313fb2b918d96446adad0c8f06485550fc70a623bc18f036b4fc037ee26f8acdb27358190bd4b573d SHA512 dc402941a3d6229f3331e32590e69745bf68d8680734f19661398559090fcb4b48ce3a28e1cdd7ba30b79b65c119f7b66ed6fe9351f12697670cf31a3ee7b270
diff --git a/dev-python/sh/sh-2.0.3.ebuild b/dev-python/sh/sh-2.0.3.ebuild
deleted file mode 100644
index 4e535d15dde5..000000000000
--- a/dev-python/sh/sh-2.0.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python subprocess interface"
-HOMEPAGE="
-	https://github.com/amoffat/sh/
-	https://pypi.org/project/sh/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/sh/sh-2.0.4.ebuild b/dev-python/sh/sh-2.0.4.ebuild
index 4976ffec2b43..4e535d15dde5 100644
--- a/dev-python/sh/sh-2.0.4.ebuild
+++ b/dev-python/sh/sh-2.0.4.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
diff --git a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4-r1.ebuild b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4-r1.ebuild
index afee496ffa4e..6f95a592ff33 100644
--- a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4-r1.ebuild
+++ b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4-r1.ebuild
@@ -14,6 +14,6 @@ HOMEPAGE="https://pypi.org/project/sphinx-epytext/ https://github.com/jayvdb/sph
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND=">=dev-python/sphinx-1.7.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index 8b5e321596bb..0290578849f0 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,2 +1,3 @@
 DIST tifffile-2023.3.21.gh.tar.gz 331285 BLAKE2B ce63dc2f389d3e93cf50c52efe849423c091bdf048ce7f408fe6ee4556da4b9efcbaa031e7bc7f2b3f953117f7ce18014d1a77f9253a82d6dc4352464cf4151d SHA512 68b90d7eab293991b0227090d5b4c047469cd65c339f8d19da68097d99640c7f45cf8746eac4b3da9a388a58cd4343bbcad25496b08c13c913e48f982e14f5b9
 DIST tifffile-2023.4.12.gh.tar.gz 332954 BLAKE2B 357e691a0b551eb1ac5349bcc8a7168399e93c82353f5da5d95953142f206388da876e16f6948937ed9fb36128eaa4c3999c6fca494a9d5466894b5324c1cdcd SHA512 3a5c2ed6beaaf0f1c7f4dced0f57eab1cbd1f23040df8c701ffac8569b6fbdcebd71b6970e9c6911c1fd501add78880d8102c8476126007472fcdb82c9628bcf
+DIST tifffile-2023.7.4.gh.tar.gz 335321 BLAKE2B a168de5ad4735f490b0e7a29d7db887708bdf28049d3b722cefff9880962cf7d58cf6929935d3e0fcddef11d8910cc798996df7d1af7e14083e52956900ffa61 SHA512 247912cee32a5b9d29cb228a73366fd61c1f0b316ddc78ad37513ed85157abd7012bbc36b4cef250636f5789ef7f0204eae9a6ddbe6b08440f7f82039dbb854a
diff --git a/dev-python/tifffile/tifffile-2023.7.4.ebuild b/dev-python/tifffile/tifffile-2023.7.4.ebuild
new file mode 100644
index 000000000000..cb26976c422f
--- /dev/null
+++ b/dev-python/tifffile/tifffile-2023.7.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read and write TIFF files"
+HOMEPAGE="
+	https://pypi.org/project/tifffile/
+	https://github.com/cgohlke/tifffile/
+	https://www.cgohlke.com/
+"
+SRC_URI="
+	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/dask[${PYTHON_USEDEP}]
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/test_tifffile.py::test_class_omexml
+	tests/test_tifffile.py::test_class_omexml_fail
+	tests/test_tifffile.py::test_class_omexml_modulo
+	tests/test_tifffile.py::test_class_omexml_attributes
+	tests/test_tifffile.py::test_class_omexml_multiimage
+	tests/test_tifffile.py::test_write_ome
+	tests/test_tifffile.py::test_write_ome_manual
+	# requires tons of free space
+	tests/test_tifffile.py::test_write_3gb
+	tests/test_tifffile.py::test_write_5GB_bigtiff
+	tests/test_tifffile.py::test_write_5GB_fails
+	tests/test_tifffile.py::test_write_6gb
+	tests/test_tifffile.py::test_write_bigtiff
+	'tests/test_tifffile.py::test_write_imagej_raw'
+	# TODO
+	tests/test_tifffile.py::test_issue_imagej_hyperstack_arg
+	tests/test_tifffile.py::test_issue_description_overwrite
+	# missing private marker
+	# https://github.com/cgohlke/tifffile/pull/195
+	tests/test_tifffile.py::test_issue_invalid_predictor
+)
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 8153c975d894..04cfadb5958f 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1 +1,2 @@
 DIST typed_ast-1.5.4.tar.gz 252491 BLAKE2B 07a97a881cd4c015897ca85e0b46acd6f63c48dbc69f4d73ad5e3bfd42b1b995a614d97b81c8d21c8d5dcbdddc838bffde033e11b55d866fa8e8db0aa8048731 SHA512 1ff27316d8e07219ad5b3744c167b7a7dfebb992f8ebc4623bf510f8b5d2b939cc9f659428e3228a42cdec0e63215cca973458aa914f2efdc59d5f33c150e153
+DIST typed_ast-1.5.5.tar.gz 252841 BLAKE2B 268773f648e05554246b5be3c5e66889f0e266e23a7d7a8f63b63ae055a68ef64ce8038e77089c95a5c791795b6e6dc0ff1cc048c6e0a6ba8ca8a2856078bf1c SHA512 df0faae882c2f367fd5dc0aeeed12806307c739bfe2f466e199821f4197280e3d82fceee83580face3ef7b5bf184b29477f0828766f2b8991c3fbb2a4265eb3c
diff --git a/dev-python/typed-ast/typed-ast-1.5.5.ebuild b/dev-python/typed-ast/typed-ast-1.5.5.ebuild
new file mode 100644
index 000000000000..d9962dab43d3
--- /dev/null
+++ b/dev-python/typed-ast/typed-ast-1.5.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python typed-ast backported"
+HOMEPAGE="
+	https://github.com/python/typed_ast/
+	https://pypi.org/project/typed-ast/
+"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	epytest
+}
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index 5a05105e8736..d79ee7d1d133 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1 +1,2 @@
 DIST widgetsnbextension-4.0.7.tar.gz 1057085 BLAKE2B c9da4af41f1dfa88b4ffe68b295ac95c64db6acbc154e013052bfd32d78211dc74c8c776103700244fbccebba711ceb86571355983b9a1a8840a3266d65a7503 SHA512 b140e9ff419ba51133d532a00f8476124718335a83054270e22ccea83ad2020c20ef09016bd780e133a97dbeae2aebbd45d4a1534912844efb1e83c460834cc0
+DIST widgetsnbextension-4.0.8.tar.gz 1147105 BLAKE2B 295d3bde4197f029c037510eb8579f48fec1d3ccf3a13f54dc900a35fb427dd89324fb65e71b8017770ecb3d9a5b947e06825ee79ed3881bc501fb504b3213e5 SHA512 66d74b213bde9427917c113f6861551f44578e614c3b004b520d765d5d7946f696b719f6383028034164dded2b063f58a0a16aec1152eac125bd7a6ae8dab391
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.8.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.8.ebuild
new file mode 100644
index 000000000000..fff9268f39cf
--- /dev/null
+++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="
+	https://ipython.org/
+	https://pypi.org/project/widgetsnbextension/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/notebook[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-07-05 18:29:34 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-07-05 18:29:34 +0000
commit	f2977ce85e5a31b54b00b355d1a73786efd76d6e (patch)
tree	93904c9119ccbc89cdc5fabcf00620eb3e076ab5 /dev-python
parent	1aab753a13e3cdead389c03b6b12019cd6d4d0ff (diff)
download	baldeagleos-repo-f2977ce85e5a31b54b00b355d1a73786efd76d6e.tar.gz baldeagleos-repo-f2977ce85e5a31b54b00b355d1a73786efd76d6e.tar.xz baldeagleos-repo-f2977ce85e5a31b54b00b355d1a73786efd76d6e.zip