17 files changed, 111 insertions, 217 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d26bad81c262..d71b7bb3037b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index f08f2c42c931..c67972634e34 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -5,6 +5,7 @@ DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-8d817f6479a5df874028a8b40fd30aecd3479005.tar.gz 204890108 BLAKE2B 8c57c556371b37d00cda753a40f1162e678d89fa40e8f2b90a38aab7e17f9debfb2ebad53a3a95aa530a9e3e2b4b735828e404e576c8f2738370ec41c28badce SHA512 a38ce082ca1b999888ee0a633b94a02258579591e6ce73ba4722eafb9f0610f9624887eca43e4a6ae567c07ffc014f4ea4137e905899407951265d7c93785f18
+DIST llvm-project-9eb0f86c279f40a792ec27bf0e9b491b8c90a640.tar.gz 205195168 BLAKE2B c3d051270958216196d6051d41e78168a7027714c5658c7edc70d274ed91f9d4ee16e8d1f92672bf252c65005c636c380766210ac3d80b4ac2f9f6305aefa29b SHA512 ee62acdfa756a2ddeb46fcafa364489885b6ecc50c87f365af42f308ebc87b9674c33c2f5a84c5169d9c9cada08e4fffe35d2eff48f05b70e791e27ac2c8b347
 DIST llvm-project-a085402ef54379758e6c996dbaedfcb92ad222b5.tar.gz 204569231 BLAKE2B 75403225fbe54f0921b279b237a90f1922b16997d1538fa5f225e04451fa2fc4a28e886efb7460ef0c26a3a964f0c57084e331b0736fa223926259c76d873200 SHA512 b8c6b0c7c0a4c369ecfa7ac71cf96549a19853e14bdf061b6b54429ce7ed998b236bb9ed3adbd6bf1c70c7e975508f751ebd0031ac2ff474d32216048a1c5f2d
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
 EBUILD clang-python-16.0.6.ebuild 1203 BLAKE2B 7baa638bb302b5b97aea34e62d28035f6e2e7aab0bd626bae94d9b3ba9e776316a81003b55ae8a71008b13a664569c8587df927c5f925591addc99a2b4381832 SHA512 a2b00fe7edaf1cb1bb48c0e93555fbea3ef929f16d168b27e1ec1e3f38989e3220e6df1ab847ac2020faa7d44d957c6af7ec0723418e248677a40e29c071ddb2
@@ -12,4 +13,5 @@ EBUILD clang-python-17.0.6.ebuild 1203 BLAKE2B 13f87c2782967c4fded88a60220b87e9f
 EBUILD clang-python-18.0.0.9999.ebuild 1170 BLAKE2B 90973d66df90d8a0bca727049d90e2e0cd08d084d133ef6eae9a82eef22151a2a668f14b725ccf693092ff7bb42088696f5777454a84fb201278a56332b62cf1 SHA512 ab723719d9f4d2f2252c34626e7fc7631e72ccdcb8338d4072d9ce571dd55c51aba191b49c5f12fb252f78517e7358154273b89bc1fe7c39cd34070220a69085
 EBUILD clang-python-18.0.0_pre20240106.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
 EBUILD clang-python-18.0.0_pre20240113.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
+EBUILD clang-python-18.0.0_pre20240120.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-18.0.0_pre20240120.ebuild b/dev-python/clang-python/clang-python-18.0.0_pre20240120.ebuild
new file mode 100644
index 000000000000..bef9bf6fddbd
--- /dev/null
+++ b/dev-python/clang-python/clang-python-18.0.0_pre20240120.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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"
+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/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index a3178655f6d8..31d7731e6d04 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,6 +1,4 @@
 AUX lazy-object-proxy-1.10.0-pure-tests.patch 1020 BLAKE2B 4121388f3dd8535f1729fd239a5e01e006a5665d095504d6a9611a26914699787ef2c1379606fc0106acf1229911bad48d6f104e16afa89caa06f913d74b9d27 SHA512 68fc383fa494ae45a9addaed13404497423c9021bf0b85b19b72389c6a286510db3edcb38ff579be7144775a0a51da5ae21b7ca26be68a28b52222c9a0044401
 DIST lazy-object-proxy-1.10.0.tar.gz 43271 BLAKE2B f2146db4ebb3e48b4af36fa56a1656c3316896eab9e9b9c5450106b18df27a48a04c7ab8609384caf81899f956a20990e54818c836bd20b607766652d9797eca SHA512 0693a2b6d13909580e7b568a030b884f84fc1578b17e49ac4246572e3e8b18c05a2613572f24b908630528ecb606d149a106b46d079f2c42ced5172146e413c5
-DIST lazy-object-proxy-1.9.0.tar.gz 42830 BLAKE2B 565315a3e855bc5335af717d1edc947fef57514c06036280d1f4666ab9642cf7e7b4bb145da87cbca14d9efa9f4869d7ad256031983a773580dc398fb7ce25e0 SHA512 2168254a71cf52ef406e5edf4653b9c8ae05392d4ad3c2e5e8e9f8db56152d968a77d14226acdf7d962f66d460c40add335615442f6f176d697c071f9cb137f5
 EBUILD lazy-object-proxy-1.10.0.ebuild 1154 BLAKE2B 798a1272385a000fd6a63445ffe5186b420342f0ab026c450543bc81a3e553690e8c922e3e50e2dccbc21eb8912df845304a0996919b0c4a548c0a416f3956ff SHA512 49e4c1aca853fc2d46d4e2c1c8f5955ba12975b6075af5d13bdfad90820e86c71fc70d0724908b6b4c9ff073e9a9e6a0e64be808f7d47a5fd02c98ac92e3258b
-EBUILD lazy-object-proxy-1.9.0.ebuild 910 BLAKE2B 85533c25fd4d211813a03fc2e91d8a856e5acd351d0bbcf99babd44613770b548600c2dc1d476a1bf4170e4d4fc0d8f4133de13678c9d4ec88da320ffcb8c7cf SHA512 823f60c8dd0a742c9c504ff89bcec9c10e96a9b188f7c962a26f1803a0c20f90a13a541473a7b221c027a504c4bc9b7664e804dea308fbd88cb2e8d2fef17cde
 MISC metadata.xml 540 BLAKE2B daf53065c3af28ec7316bab786a7ebfa6890de83bd6434d39052797a1d08d9e7e05fc437fd9994bc437ba0d38dc6ab1cb2e073c2c053fdf55817302800e97b19 SHA512 e66e27df4757f7d13912934551b7fb346d734789f1b0b17e5c875dd5261babf65188bd31966f502be19e953fd9bfd87a64d49ce8e1849b2122a30905d3639e9d
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
deleted file mode 100644
index 388ac18b33a2..000000000000
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A fast and thorough lazy object proxy"
-HOMEPAGE="
-	https://github.com/ionelmc/python-lazy-object-proxy/
-	https://pypi.org/project/lazy-object-proxy/
-	https://python-lazy-object-proxy.readthedocs.io/
-"
-
-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"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# No need to benchmark
-	sed \
-		-e '/benchmark/s:test_:_&:g' \
-		-e '/pytest.mark.benchmark/d' \
-		-i tests/test_lazy_object_proxy.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 2beff4ce35ca..033f5f652a0b 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -5,6 +5,7 @@ DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-8d817f6479a5df874028a8b40fd30aecd3479005.tar.gz 204890108 BLAKE2B 8c57c556371b37d00cda753a40f1162e678d89fa40e8f2b90a38aab7e17f9debfb2ebad53a3a95aa530a9e3e2b4b735828e404e576c8f2738370ec41c28badce SHA512 a38ce082ca1b999888ee0a633b94a02258579591e6ce73ba4722eafb9f0610f9624887eca43e4a6ae567c07ffc014f4ea4137e905899407951265d7c93785f18
+DIST llvm-project-9eb0f86c279f40a792ec27bf0e9b491b8c90a640.tar.gz 205195168 BLAKE2B c3d051270958216196d6051d41e78168a7027714c5658c7edc70d274ed91f9d4ee16e8d1f92672bf252c65005c636c380766210ac3d80b4ac2f9f6305aefa29b SHA512 ee62acdfa756a2ddeb46fcafa364489885b6ecc50c87f365af42f308ebc87b9674c33c2f5a84c5169d9c9cada08e4fffe35d2eff48f05b70e791e27ac2c8b347
 DIST llvm-project-a085402ef54379758e6c996dbaedfcb92ad222b5.tar.gz 204569231 BLAKE2B 75403225fbe54f0921b279b237a90f1922b16997d1538fa5f225e04451fa2fc4a28e886efb7460ef0c26a3a964f0c57084e331b0736fa223926259c76d873200 SHA512 b8c6b0c7c0a4c369ecfa7ac71cf96549a19853e14bdf061b6b54429ce7ed998b236bb9ed3adbd6bf1c70c7e975508f751ebd0031ac2ff474d32216048a1c5f2d
 EBUILD lit-15.0.7.ebuild 913 BLAKE2B 38afb1ee0c64d7480ccf1c84c6c1ae0e1ff5f75a0b52272b68d50717a338f143214329245bd650e107d8091ffe1bef6b29293a4b47d147122ea6cea64b448b92 SHA512 fc58e9f0ba65f388830a4e935f448126eb61f2dcf6fa40750e6feaf8a5943fb259bd3c1db3877767e4ba9ade75f6204de8a33c14630176a34fa097e522a0a051
 EBUILD lit-16.0.6.ebuild 921 BLAKE2B dcfe57279dff5c6d80fdf5fc115c76c8ae5af3c8c7fa5da0f1c5592a3428b5a3ecd5c5feef4635c139d4d2d7a7edba53d07a53ba6525b778767c906daf6fd252 SHA512 d5c0943678b3e65cdb148bac517e1ce9700ff8a65c63796e0d4640a28d1086c7bb95f9b6c2d6507c379521cc320108b12f7c4165b4c8c4ff10d56ade2a90a438
@@ -12,4 +13,5 @@ EBUILD lit-17.0.6.ebuild 1026 BLAKE2B 53cf66c043c39b6d50c2696206341991c231d956b1
 EBUILD lit-18.0.0.9999.ebuild 961 BLAKE2B 4cf7d1fed4bc116054ce3c1b12784bd9626cbdc4694e88a9569ceca26981a58d6001783df9c684ffec3ae8a23d697756fe17ff712a3533905bd6394e79fdc21d SHA512 3f3cc1b6947b3375fc383de5dc0ac217f47f4b3f575c4b29cb89ca06f330cbdde1ef2496f0583a8bebeb703ebc60d10ae49337471ba33b11e528f0d4af685925
 EBUILD lit-18.0.0_pre20240106.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
 EBUILD lit-18.0.0_pre20240113.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
+EBUILD lit-18.0.0_pre20240120.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-18.0.0_pre20240120.ebuild b/dev-python/lit/lit-18.0.0_pre20240120.ebuild
new file mode 100644
index 000000000000..3d0315962098
--- /dev/null
+++ b/dev-python/lit/lit-18.0.0_pre20240120.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 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"
+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() {
+	# flaky test
+	# https://github.com/llvm/llvm-project/issues/72022
+	rm tests/progress-bar.py || die
+
+	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/pycountry/Manifest b/dev-python/pycountry/Manifest
index ce8ea87c5e79..40258423dfb3 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,6 +1,6 @@
 AUX pycountry-22.3.5-fix-tests-for-pypy3.patch 740 BLAKE2B 192233d0307af96304a8fac1454389b81488365a1d44088b183cd3e2455ae600066e00e39a1ee68974961e5f5386967f24a495734490768f9423e21f15d259a9 SHA512 c593e382150bfea0e19446bb720e0d4f733aaf8964bf07689e8c8f238c8fe9ca2e89c957249c46cc489f9ca84540f0184659899945562e728bd35c965e2aa911
 DIST pycountry-22.3.5.tar.gz 10141551 BLAKE2B d645eade8ce9be3b99f4f2b189cc50c3395ecb3899ab9fa668066993abbfa576191cfcc05b7bb2764d088a86df492770bcc0a8834f04e6fde58a01defe8a1b14 SHA512 07dc507ee94f1880727761df197f81704386d9246163c9a5872f47083d37c7d1205dfbd28c6663ef0731a0b05277ade03a1a1929ab84087e0e85c05028c68b89
 DIST pycountry-23.12.11.tar.gz 5927399 BLAKE2B a8d32593d80a881abd03b482a99afc22996a730d911577f91eb8035336f07a25a8cd74cd19f9396675acacbab953098bf831119f8b9f7c72fc6c2807713fe6c9 SHA512 25b5a74c0dd8115473571976a64b6fed7010f62c1b3b4c1888b9e13a7cf4f533173f51d4652d55c426adee4e0ff119bb6e3132d04dce150b9d1ca4b11366c579
-EBUILD pycountry-22.3.5.ebuild 743 BLAKE2B 247deca5a0afec2e018d0f55a759e788f20a472ac0e7579b2ebbc7e9214cfb368887525af6a575c1a27589cf57bc35fe3c58d5f5cf4735c5c050dae973612941 SHA512 ebc5c4d125ff62718195a5c7ca10f139777d851ca366024ac233c35013fa4ff4254bdfce6217d657a7028466e6d43c488a502a556966049e97c8b302331e2fb3
+EBUILD pycountry-22.3.5.ebuild 742 BLAKE2B 24e1b4cd4fa3c5ce13426e9789ce4a050383d2706b692c566d4a19df0252aa71268272320852e565e02a55ab6d674fef074b314f2e0bc19d598340c4e7b75eb6 SHA512 9effc0b629931bce29883dbdbf1973f5afc007cc94e82c0f5ad650d70e0d2f4c19782f95e30b54e4baa64cc861f3c5b52da770c3a0290cecaa639d4eaccc2f77
 EBUILD pycountry-23.12.11.ebuild 615 BLAKE2B 7f6bd30375189eb507deef339b94eb21642f11244dc007ec36f6ba8e3fb9442224f56affcd32809d933a15dabd4388c6cc6709a17e785a231d10a0b775bdc71b SHA512 32d12c7faf7f87c0138271aa024b60253cc9fe79ebe823f53c8cc08427fe537cce5cf7478a7e4bd5e92763ac66df9fd774c7e3a13cba04eb962cc087bc1fd461
 MISC metadata.xml 463 BLAKE2B 59f17132a93f1409b1cc14bafcab38887eedb9f66fd220c8c0696f7d1cfac3ac6005d9193f400d4f4a913343c6aa6bb8b6382012bb716af14d900f903f2c1b0d SHA512 2ed9620b00447a881a0f5311c13696105d149d72ad3b649519ba6dba93487e41cb5ac381741ed9e0388ff1780e3ba3699fea01bf1e7453daad4161a4d9ff0c9f
diff --git a/dev-python/pycountry/pycountry-22.3.5.ebuild b/dev-python/pycountry/pycountry-22.3.5.ebuild
index 135ef31a061a..e0fdeac24dc3 100644
--- a/dev-python/pycountry/pycountry-22.3.5.ebuild
+++ b/dev-python/pycountry/pycountry-22.3.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index d06f50cf9bdd..e53935f43d82 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,8 +1,6 @@
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-DIST reportlab-4.0.7.tar.gz 3683030 BLAKE2B e307fd165bc66a97ad98789d8fcd128e7db789a8dbbad50451a910efd4052e850a34f7b0a65b78920c77de9309519c242640ba348005733693d1998641ca23cf SHA512 d0fa92f1553a7ac2d4df13d0ec68f8145a78ed8a702c14fb283bee6e8b05bc1afb16664d02313154d40875712de2767b2b2d93f78c72e7ca6b53c5332dac334b
 DIST reportlab-4.0.8.tar.gz 3683777 BLAKE2B e3fab54369a9d75f381fab651d5f5cd46ed090c0e9c7105d89225d291b133892f6311a3ad1e2727bf26be7a7ca3562f5a8a7c6126112adebe1aa530ebdd42187 SHA512 4d1db3e104374027a7be39815f7cbc06638bb3834477fcf29a4afda71be669a13d8e09c5a83dd1df085423cb61a89fa102a1fd1d106bccb2360cb02edbd918fc
 DIST reportlab-4.0.9.tar.gz 3684146 BLAKE2B 1db674238d481f77c8847c56527d73ea209a66df9d520c590460b91fa118bbdeb103fa37fc6fbc23f5cb28206c9bcf1e663ad0ab3b52f003e9d72b26b630e8fd SHA512 5ae2ce70e108b84e84d88c6ba54015d390f79552bdcf40564fa803d33428ea67e7a08824a68c836475e6dfeaf75b00b56c30b81e4ec82011fdbc8978a1cfb80c
-EBUILD reportlab-4.0.7.ebuild 1089 BLAKE2B f3478ec743d5c7915b3bdc7626693e561ceed7823fb61e4b5dc789612a2e5aedf6b14400c5413c8d271b673d2c1f59fa79741d6b3cdee2a47239c3bf8540618c SHA512 052b70efe70647c6db16a8af6f7a10b46abb3f25cef077e23c043316af9cc509d659fee9b194617cfbf30423c29daefe789637f8686e4af80edc4d2b20b0b56d
 EBUILD reportlab-4.0.8.ebuild 1127 BLAKE2B e5624e6143d4fe89cefeab13e446df376a9170da99656a540a8a12ae7e5bb802309ac36d30321500aaa80f6fa02f847e79981a256226e48c514ba9f2dc1c5673 SHA512 b2dc097df222baaef6d73a992040d2ab3c8908daeeb74a7ab90857d5a68a2869d8c8fb1b8a0ddac88cf769978c615b9bcaa96d86473ecafdf5be32ecf21bc396
 EBUILD reportlab-4.0.9.ebuild 1134 BLAKE2B 6d3841bececb2e63486fe4e1532be85290f44be1a6fc3516dca73f19cf565d93e3b28c03ba78f0c2646c5b369eef6bbfcf37d3fc392eb1fb02ca0d3e314b2bf0 SHA512 1432dc1abc1e2e148d96fb73a0cb8cd7ebec132d05ead0834a8c529a862c16001d49b48855df5a089441691882cf1a73423f6fa624c441a03cdb497692cba800
 MISC metadata.xml 1913 BLAKE2B e088a4a5ee1ca40351c04d8ee825fb783679c8c4ac5ba7c513975e546f7f90f4777a7d9b312a4bb2ce97db5695fcfcf913610b02a9780ffc86143ee1845ee281 SHA512 84422b0f54f169b4342bb5842935a57dd7721d8d6e41f4fece4ce0cf20ee70a764fa1914371e47ed9437bd40243ec22c93f20c167a48ee6ba9d9cfbf3e7c1fe8
diff --git a/dev-python/reportlab/reportlab-4.0.7.ebuild b/dev-python/reportlab/reportlab-4.0.7.ebuild
deleted file mode 100644
index c4886666bf9a..000000000000
--- a/dev-python/reportlab/reportlab-4.0.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/
-"
-SRC_URI+="
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-"
-BDEPEND="
-	app-arch/unzip
-"
-
-distutils_enable_sphinx docs/source
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-src_configure() {
-	cat > local-setup.cfg <<-EOF || die
-		[OPTIONS]
-		no-download-t1-files = 1
-	EOF
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py --post-install --verbosity=2 ||
-		die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index f2ca9a273b42..a12d05cbda1b 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,5 +1,3 @@
-DIST ujson-5.8.0.tar.gz 7154530 BLAKE2B 8eef1b2e03fa4a99dccc9d5fba8c1436d8e11b419e7f4c8d382bf5a2250477c99a1f0ff7f9e548ca5a50217a5964dafc953ab3cdb66b784ef1dea129ec1c2b6a SHA512 258e5527bda8b9fb3bea03f97d5db752ae06183337610975fc28f928817b430ae7a1867932ee7b0a0ccd6b825e2c5a104d7ce78c1e3405ed5679a2a70a5804c3
 DIST ujson-5.9.0.tar.gz 7154214 BLAKE2B a13eda1c967b8ad39265caf28f97ef302a0b320653cde3ac927dc8119861aa468cfe267980c18b71172f5b766b2e6bc61bb86f18695528934902867ae3a42d37 SHA512 9940bc0c892341a6d2b85cfe592888866f02f054f1367812c39395eaee946f7c66a0197b2791bbb765ae38a06dcd871145effefbc06c71a87f7d24be105cda1f
-EBUILD ujson-5.8.0.ebuild 888 BLAKE2B 8c1a24b1573a43691c35e639f6ec1cd3c5f6093ef2096da81c4e76dde05e3d394cec7cf8865a8042de45f00d78762f9daeea83a2dace982cf41521c0e21e7547 SHA512 c3871a2335c1a2f782f7bfb336a0c0daede0f63955360367a7e57af5fad176f4209cc4f63ab7d5d06badc0be41cb287be3018d85ab8c9bebe1272108d706dc6a
-EBUILD ujson-5.9.0.ebuild 889 BLAKE2B 661a3bdee3449caa5f6b6d8adc90d4e25b2fecb6e1ad6510fd188a3df58705db49881d1cec2017cf1fa3f8bbefc91582d2f3efe3e954faa076a42af5f1ddb7a8 SHA512 6548a1f32cce4e4b1ccdc448fd777baccf896d53a2c7d6497a2e17372623c165ff1c392d80fdb55a007811e5e9d398f9ec96bf605a6996ef5dcae063bcfa37ac
+EBUILD ujson-5.9.0.ebuild 888 BLAKE2B 0d125e92f4c44c4909c43020789b41484e325f407adae0a204382ea64800c81f9c27b09faa8579dbecba644cabbd23e151af8589bf13f2c3255e77d71a5594c1 SHA512 fcdf13706b07d8b425afcc65db891cf39bd8df4b3617ed4e3aac5cde612d2b06073e417adec2e920b3c893b8a815c2cef50d5d783829f3968ee87cbbae24f5cf
 MISC metadata.xml 494 BLAKE2B 8e20150926d62643e7ff2110cba22313db0c0e3112290ce08302d57103aa35c42a56921d0b46e0acca2ef83756eb4f7384f23ddb06fe41ef6c4a28921f11ec33 SHA512 d9c0a59f916b84d50e51a21152c1815fea90a909dc9bd44ea620b2a33ca6a92ee237aafe29debcc9d1a2bf63c84112300845309eb0ab1265e5d2b0c05dd313f0
diff --git a/dev-python/ujson/ujson-5.8.0.ebuild b/dev-python/ujson/ujson-5.8.0.ebuild
deleted file mode 100644
index ae958330011b..000000000000
--- a/dev-python/ujson/ujson-5.8.0.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_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="
-	https://github.com/ultrajson/ultrajson/
-	https://pypi.org/project/ujson/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	dev-libs/double-conversion:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	export UJSON_BUILD_DC_INCLUDES="${EPREFIX}/usr/include/double-conversion"
-	export UJSON_BUILD_DC_LIBS="-ldouble-conversion"
-	export UJSON_BUILD_NO_STRIP=1
-}
diff --git a/dev-python/ujson/ujson-5.9.0.ebuild b/dev-python/ujson/ujson-5.9.0.ebuild
index 478022107d15..f569e3aff688 100644
--- a/dev-python/ujson/ujson-5.9.0.ebuild
+++ b/dev-python/ujson/ujson-5.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/double-conversion:=
diff --git a/dev-python/virtualenvwrapper/Manifest b/dev-python/virtualenvwrapper/Manifest
index abc3bc42370a..563fd525264c 100644
--- a/dev-python/virtualenvwrapper/Manifest
+++ b/dev-python/virtualenvwrapper/Manifest
@@ -1,8 +1,6 @@
 AUX virtualenvwrapper-4.8.4_p20230121-override-default-python-executable.patch 905 BLAKE2B e3dc59287d4fa4efe5427c77690853136a3d52abf58ae3f8931755c846f6f81beb5d04338d9a587a1281ef7ef9b99616c95d2c355df3481141a13d843dc4cb79 SHA512 b5827d93420d33767e6931ebb7ab6337baa186848e270eff4bfe2f31d98e550647754c7b466290a8fee666acd8a0f5b4d4a962af8834c43349b448f569ba15d9
 AUX virtualenvwrapper-4.8.4_p20230121-remove-use-of-which.patch 4608 BLAKE2B 06a808faa7c3fbb96206c59d6c40429800496be41e8b03bf760a199bbb50b1735469094e6cb35504c23a7339d5564329e335b7a563b1df96143e9cf48b9cde43 SHA512 52ed979503f50d53dc849f99f219200e3ec837693612a8723dd7f0cb8bd325573c9bbbefbd162da1390eae9e4e0031079ac9d151cff2232c43fa4aa892bf81f6
 AUX virtualenvwrapper-6.0.0-remove-use-of-which.patch 4163 BLAKE2B 18b55822ef7fdf9da462fa35a0bc9a40ff99617dc0a0df1d29dd93b0ae1ba77c598f5458eb1ccf1f9fb86503e23d332db224fe59acd1af6b692a88bdffd5944f SHA512 e7749734d9a58841eff2019e89d36c5f1c2c8a2138b088584da5eec30cce2ee4e94fdbeae802d6d9d883076863d967eb0096f84b2bbb3180ac7cfa9936945fb7
-DIST virtualenvwrapper-4.8.4_p20230121.gh.tar.gz 72852 BLAKE2B 2996b88f93790587ffbeed936334bb1f12a9d6d952eb7c9b728a6644c9b7c7e0953bc7c71201fbd590f6258eb163af1aa6494f476decfa54f095ca215e4e13e1 SHA512 9df8b20dd8d50fe7891b845c8112edc165b08cc231ebb4010aed8ec50a22005207a9a3c9c9941daa2b958022f0edf993425bf95692f7032d1e5c5719a552d3b4
 DIST virtualenvwrapper-6.0.0.tar.gz 95407 BLAKE2B b2a6a7a58be23e1cf0642d780d8fc53e9aef6e44703fa15a2e7627db3c3e12024b33da75b591897ea5181ed5407eb2d52e96f56d7026c083a03e13f94165d9e4 SHA512 ab805b61a9f81e0b0842182686a88fcf07e41ad7206484f002110c693ca6076e2a88fefbef8b7409838082ed7e7a43f61f1a0006a314cb1d71efb943dc6fdede
-EBUILD virtualenvwrapper-4.8.4_p20230121-r2.ebuild 1888 BLAKE2B 15666b92afe81bfb98db8759cca62e7052a4c67cb7d6e679e20801d3630a719578209218b7bb8a35afc4c8dc8c44e844187e76c917ac9ee859bae6d4d2a05bb9 SHA512 9ea5c3929247bd3d6343ec67205e61d9a214224d35339fed4a2f714688d25d3a952f35178cd66063de167e3f7009d7e82f48af05f0a62b00961ebaa32e71f497
-EBUILD virtualenvwrapper-6.0.0.ebuild 1728 BLAKE2B 4ae29cf6a68d5be6adec2ac00d4c6d2d2df57a14299da2915816eeb7a768989f2a5ad24c5dbb460e30cb602aed43ffb13eadd4a6731d25428c4484ab04c7150d SHA512 d99188cc099ddf68e407047b18b62c2a27c7288ed6ba2dca5d353ce5ff70f6d62f31042e238f17f790562bfd2bb351285e4f04d018c0f91dbdb38e364e9931d5
+EBUILD virtualenvwrapper-6.0.0.ebuild 1795 BLAKE2B 0352ecb5c59f8371c431da8b4fbc665f29b5dd51e6d57befc03695acb071cd750c3a1ddca243d791367ba85f8ab36cc6dc90e0c8131a4057fffe282839c6eefd SHA512 7462480c8f1e79d0526869bfc80936c3a2cc0a7847c89c3bfcbba771aca92ca0bd1f2d0d0fe85c47bd58a410ec9554547f5e2ba2ff51f6a20e8a1c5087e0186b
 MISC metadata.xml 732 BLAKE2B fa857378ea2001e084a9d00d5ccc65644cc4e3ade62c04ff7dfeec4cf7df245bd700833aec1f5f430d780be5adb8fb594300e43a113b232fa83a3cfd2fa0cb15 SHA512 935796e3055e0104328dab877ca92e579770d6748053e464f6ce3563ea49022eaeae322c5c9cb026e9c3f42089c89ae06c0a2e755d124c71e05768cbbefdda44
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r2.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r2.ebuild
deleted file mode 100644
index 5a6e6871efc5..000000000000
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool"
-HOMEPAGE="
-	https://github.com/python-virtualenvwrapper/virtualenvwrapper
-	https://pypi.org/project/virtualenvwrapper/
-"
-
-COMMIT="e63d2c389ed276aa161bb50a27c77af94d96a50c"
-SRC_URI="
-	https://github.com/python-virtualenvwrapper/virtualenvwrapper/archive/${COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-export PBR_VERSION="${PV/_p/.post}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/stevedore[${PYTHON_USEDEP}]
-		dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pbr[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/virtualenvwrapper-${PV}-remove-use-of-which.patch"
-	"${FILESDIR}/virtualenvwrapper-${PV}-override-default-python-executable.patch"
-)
-
-src_prepare() {
-	default
-
-	# specify default python interpeter to align with PYTHON_SINGLE_TARGET
-	sed -i -e "s:@@GENTOO_PYTHON_EXECUTABLE@@:${PYTHON}:" virtualenvwrapper.sh || die
-
-	# remove tests which require an internet connection
-	rm tests/test_mkvirtualenv_install.sh || die
-	rm tests/test_mkvirtualenv_requirements.sh || die
-
-	# remove tests which require functional git repos with remotes
-	sed -i -e '/test_wipeenv_\(pip_e\|develop\) () {/,/}/ d' tests/test_wipeenv.sh || die
-}
-
-python_test() {
-	# tests have unusual expectations
-	local -x HOME="${HOME%/}"
-	local -x USER="${USER}"
-
-	cp -a "${BUILD_DIR}"/{install/usr,test} || die
-	local -x VIRTUAL_ENV="${BUILD_DIR}/test"
-
-	bash ./tests/run_tests "${VIRTUAL_ENV}" || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-6.0.0.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-6.0.0.ebuild
index f94c8c8dcdc2..45e014b5fb7f 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-6.0.0.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-6.0.0.ebuild
@@ -34,6 +34,9 @@ BDEPEND="
 	')
 	test? (
 		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/pip[${PYTHON_USEDEP}]
+		')
 	)
 "