gentoo auto-resync : 23:02:2023 - 21:45:48

25 files changed, 415 insertions, 97 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a095ea077ca2..2e55bcdfa59a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index ce94b55642e2..019798da58bc 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,5 @@
 AUX bleach-4.1.0-py39.patch 1216 BLAKE2B 15bd8b862610ca68b5a2d6d7569bb72a6293c85c0dd0a2b9dda58ab50a25c021fd8306219c47d851a738e57acee3e0ddd43a55dc5a30a789010a3d385cb8ba69 SHA512 10d2aff6c5f62a56589f8f129df1f5f3b514a57a8518669b909491b801d6994b548ec4f7f7c04f161bf06c82aee397a5610787682e07aa40e0d469242bd2c5bd
 AUX bleach-6.0.0-py39.patch 1527 BLAKE2B 07bfabe99b5185398d85a5320f88286363562db4afd129186322efe66881f76f0517726a19d0df627064d9e011ee3e2e621c145e183eb179f148ec0c9b6b9309 SHA512 a6d0ccdda4425e1700d8113ee4d60bae48568b78279e303ecc051f803ac3aa693eb18ada5ce6dc224262f4a614972d793e400f4b1b585a18a29c11d4d402abd8
-DIST bleach-5.0.1.tar.gz 199642 BLAKE2B 8d06dd38e89b91bf48f3481b5337b8d9700d8cc88faf3a260898b2b8f15ecf5c5160f96bff2c5ce02f361b773b0ce9a51322d9836dcc99b7878921846e8da182 SHA512 6c8e80eaf6db6f0e6d9066f3443192f44c489e079945b6d11b11e7eb270ea865011019e05d43c7896262dc11ca168e697630d9da8dca9f5bb48f0e2161fda6c8
 DIST bleach-6.0.0.tar.gz 201298 BLAKE2B e4af5da351fdb63bc75b935f70f40434bd81c49cde4f584901397e5fd4ac4507d2e29eb283ff28a764018dbd795021e2edf1f43385ff8a2d7d8affd358fc0e31 SHA512 95900e4347c1f7d0aa5b2e8fbf43fac6410dd6bbbac988fb3f407a964d0aa1dc51fe3cf17459e6ce762a02b45bb3d20b539ca05727278d120aee9500cf0d208a
-EBUILD bleach-5.0.1.ebuild 1119 BLAKE2B 5c236c5adc4040c6e792a4e45759c3bc2efa18d77010936dc4547476d738de4849977c4cf55f07e6f2c2b7088c6609542475cb0df6bc018e45ec1a107615ac7d SHA512 ae5cf5c23b2f902ab76f99f95147ef235371514bf02c805c5183112de855d3798fdc8b0b14bac4dc485a0db43455d7194a0ab747c9fb8e498073af404c866e42
-EBUILD bleach-6.0.0.ebuild 1127 BLAKE2B 322e1d27d68628f5cc11ce9692f60d54a91aad0e019a6587c5f3041bc9357235745071283dcda979ee7e58fe8ab6fdfcc21db05009a372e69efb90c4f8fc07a6 SHA512 841ff51b69494e11235493add3fb920ff32874b35d57b21aa0cf23d385626ee8df1b479697f3d6a64d6846ba2e29d0abec2c3d406ff170b7c08becc3287c0c8a
+EBUILD bleach-6.0.0.ebuild 1072 BLAKE2B 8f3625c6a012da79fdf5f8af784ea214e875b66c9b510a86f0cb4b19b8aa7f78e77e848e91f6867d724e9bfcb6b5b8458ba93520cad7168484459cc4aa80a165 SHA512 ac09a214658663c27ae5f6b81a3174955a70ec5adec00bb11f434b6e48fa5922a40b9d39a19d0031252a6af636049433d9276e97eb23fbda539ea4d885c3368b
 MISC metadata.xml 401 BLAKE2B 9250e95731d3269e92b401f17d066e70838fa4009e9b62e6ec88420ada2b4695179fad49a8b010eab162ed0af2e2398fa987e04cd8ad34813dfb1ed1ad1208e4 SHA512 e5ba74a86efa4450b9181fb5f32dfd63ac5d3e34b8e1c447b21acb4cb615d77711761352a8e1e4807bde17b1b2e688eded99d8a9785cd42a915d470084b98a04
diff --git a/dev-python/bleach/bleach-5.0.1.ebuild b/dev-python/bleach/bleach-5.0.1.ebuild
deleted file mode 100644
index 42b516fd5ae9..000000000000
--- a/dev-python/bleach/bleach-5.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="
-	https://github.com/mozilla/bleach/
-	https://pypi.org/project/bleach/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/bleach-4.1.0-py39.patch
-)
-
-src_prepare() {
-	# unbundle unpatched broken html5lib
-	rm -r bleach/_vendor || die
-	sed -i -e 's:bleach\._vendor\.parse:urllib.parse:' \
-		bleach/parse_shim.py || die
-	sed -i -e 's:bleach\._vendor\.::' \
-		bleach/html5lib_shim.py \
-		bleach/sanitizer.py \
-		tests/test_clean.py || die
-	# indirect html5lib deps
-	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bleach/bleach-6.0.0.ebuild b/dev-python/bleach/bleach-6.0.0.ebuild
index 350261336111..05c0eb3e2c36 100644
--- a/dev-python/bleach/bleach-6.0.0.ebuild
+++ b/dev-python/bleach/bleach-6.0.0.ebuild
@@ -6,18 +6,17 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
 HOMEPAGE="
 	https://github.com/mozilla/bleach/
 	https://pypi.org/project/bleach/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index c9b6bc1f7932..9499d10b9dc6 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,12 +4,15 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
 DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
+DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
+DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
 DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 0452806a0baf8641d44d86c91b95958fe3bdef74fe62c32e6cb90c90ee8718c61fe9649d2f9ac17b127d65c64cba9093adee742f455be720ca2bf558131cee05 SHA512 5179df9990802cfcedcd59b8a38a6198cdfddb511fb872872c2e4cfc95531f114acb6bb43395c74659c6b46a42da32213e8312e2ed71b6e317a7270a12cfa214
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
 EBUILD clang-python-16.0.0.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-16.0.0_rc2.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
+EBUILD clang-python-16.0.0_rc3.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0_pre20230211.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0_pre20230218.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
diff --git a/dev-python/clang-python/clang-python-16.0.0_rc3.ebuild b/dev-python/clang-python/clang-python-16.0.0_rc3.ebuild
new file mode 100644
index 000000000000..5ec556a2ca20
--- /dev/null
+++ b/dev-python/clang-python/clang-python-16.0.0_rc3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..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/h5py/Manifest b/dev-python/h5py/Manifest
index 1722bdf977b5..75fbd7d8885a 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -2,5 +2,5 @@ AUX h5py-3.7.0-types.patch 1285 BLAKE2B 13433f524dadbff797fc1668d0ac2954867d3c9c
 DIST h5py-3.7.0.tar.gz 392355 BLAKE2B efc974ff14457ef00329c6b2adf5b926e2dff33bbb4b9e9d60773760a973214c5279bfafca87c6fcab02bbffb85b780c708d26fb55a1e7a401d8d676f20acc15 SHA512 c10a9a623c88dbc965238cb2057b8924492c762c29610cfdb24f26f878a7322e414d3e5c90d750c2f5cfe1b4949f884bc17f09a126b01a4721ad6e14761174a2
 DIST h5py-3.8.0.tar.gz 400774 BLAKE2B 2e48991225170fbb728fa55a68aea795db42c7eae605d123a24a59a8730220ddc98e88dfbff60220ce8c6952ca7fc0c3e33d472acae09864a29bfe11d90fcca1 SHA512 13397f66a9fc735e1143eb9e3dd584280e955adf49de467bf56c1a98952903720480ab8d505921b7e22c16453498625ad93421a64e520f15ea3566472849a8fd
 EBUILD h5py-3.7.0.ebuild 1530 BLAKE2B 9ebe99b9f990f8d4771ad6afffe78993c0a8a483c927d35a2b097be870fd4803143f2720df44a5ed1d677922f924a4542e3b64d500314b8947b48a0a46389938 SHA512 8c97aabb14491a3d8d60c19f94634508427878508f2971887db3c62cd42a6d0d96ece36e3f58cc27d53fe8655ef3b895bcc9c9b267950cf537839000ba4d9a15
-EBUILD h5py-3.8.0.ebuild 1478 BLAKE2B 45d91af73ec4ec38b09a295c508b7d5906415c570c7fd2435a522c2b52da8dbc02a2ab238774a8359b4ac40b1e257b430e8b7ddb90dbf3a5e3f747c3d8a49e7b SHA512 fe769cc89f58c15a16fdbe4e34d33f9eaf047d1bbffcd5324c634f5cc236f1f21548debb69f195f9e95dbc43d6d67dc8e253dd623acb96a7b1a3880d2d2070c3
+EBUILD h5py-3.8.0.ebuild 1476 BLAKE2B 7e4efbc225560fd38bbec95c6fd3ba7ba1d015b23e22006d99e5d425cc7bc5a5968fc5f94b45336888bb7003461db5548f21c4d72cc082c7060a65e2f1c04709 SHA512 8a6b209793140d7b7ecaa44bf772827d23490b9e4f1a0f18831ed3c450a2a73e177cc9dc6949817ac2e2a823ca6bc031b4c5a488ce3314845097e20470060ae2
 MISC metadata.xml 1069 BLAKE2B 0f3ef8e7af7f4bb493824427a238588c019c04c28fe8a4b9c0b9af1c986158eb3dae3b7d7937713cc4c87374ef80686603ccdbae2baff5b1150d814ab108d973 SHA512 47a6074e383cc922234ebb9f67aaa5863421eaeb2003444587bb8499b3bf845da93ac8d8d267717bea01300691df10f67c9389248fbe228afe07c17fba3a64f3
diff --git a/dev-python/h5py/h5py-3.8.0.ebuild b/dev-python/h5py/h5py-3.8.0.ebuild
index 2eb6cdb7db99..ba2b73c2383a 100644
--- a/dev-python/h5py/h5py-3.8.0.ebuild
+++ b/dev-python/h5py/h5py-3.8.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~riscv x86 ~amd64-linux ~x86-linux"
 # disable mpi until mpi4py gets python3_8
 #IUSE="examples mpi"
 IUSE="examples"
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 61b26f906c46..d677056ff059 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,12 +4,15 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
 DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
+DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
+DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
 DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B ff939004df0d10a698e942c99ecf3bb11fe8e0c035e3dfb0ac495f2368d83bb89cccb11de0878b3555c4047b8d0e4b969e5cec8aef8891aabf2d16a550696870 SHA512 7be9e5f983bffabf30c954e45ede8fb6b30013b84cbd50f66fa3a2185b0223b4ede7466d40376453283e9ca806da1ae80afe6e6fee001ede95b78226bcc7267d
 EBUILD lit-15.0.7.ebuild 914 BLAKE2B 5ec2a2dc492bcd56b0f4461b5f2b9eb2a948327027b98b9afd8dc022dcdb8b99012c91710b69432384e96cbceb1bb5351e259b02f0191aacda74edf07046b736 SHA512 46c55b6eed3ad82d459c3a1c52623ee928169401f56745b436904af6ad58959bc4b503d1fd0fe7bcf4cf1846db0f386a25ad9ccca46a0e1a61fb2a925b5073de
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-16.0.0_rc2.ebuild 877 BLAKE2B e0fb3eb26a481420f154c6c7306824e929cbea060ec0e28c28991c39f86f756ee5d004abf6c76775975e053a588df73b2fd121a55617621c8a179899adecb41d SHA512 9799e40aa5ad07879a049777666963e225ffc97618fdae22869e8c8a648b0e33554859c525fad2307e23b96616bf24847c1ad7aa3e69353927c03f975b3bcbb8
+EBUILD lit-16.0.0_rc3.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0_pre20230211.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0_pre20230218.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
diff --git a/dev-python/lit/lit-16.0.0_rc3.ebuild b/dev-python/lit/lit-16.0.0_rc3.ebuild
new file mode 100644
index 000000000000..f4b401a77373
--- /dev/null
+++ b/dev-python/lit/lit-16.0.0_rc3.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_{9..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/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 613f2c300c82..bf1f9de5ab9e 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,5 +1,3 @@
-DIST prometheus_client-0.15.0.gh.tar.gz 82056 BLAKE2B d9d94fe823edf99d273e9a85c27a8363c59c24a7d125a62bbadecd9abc81485949a27dacfc5faec31f27fdb263fec412210545b18f72c40a357c24d380242200 SHA512 ea11cb2fc08bd5e10ea97ee3be3068a2c37cbaa45ab3e146f8a0080074f69e7744ff90d1a0fb4f01eaefd1efc5f76428d6c898bead85d5fa37b6a59e9f832134
 DIST prometheus_client-0.16.0.gh.tar.gz 82473 BLAKE2B bf285f52ce3de4c55f681871b814fe0be8dbdf61ed3031570983325e193a9b34cafbc8526f545801ac8711cc8331cf3b0c8f157394feb9ad827ac97872397341 SHA512 511936758026b6d6f48f52d27b1cb964a03668054d7a3c5c82c4fa20800be3812150fca74ab46dad11ca12f2c9ce1a6951a82ae2bacf91b3761f7bf7ce75e0d2
-EBUILD prometheus_client-0.15.0.ebuild 702 BLAKE2B efb5005ef84eaf04f2b8ffd19a91fa1504c8647313dc5beb1a2444b47d8885077e18cede88aa1965a2938ae6ee70ee91c5e00908ecbd059d672174703037a471 SHA512 cc33bb8273322978163db273b1a18b40d7f8227bbb70c21cd3f6ceb1a9b66df5794bdd649879db9524b5e1f6aab813208be6d1c9b868c07630032b0570d6e6e5
-EBUILD prometheus_client-0.16.0.ebuild 710 BLAKE2B 6c1031f034b289341939921fc01b96efaef93129f604e185babddd675c937e066ded10c42c51d3b7e02fbcfc47723492180ac29d8daae527932d78cbac285882 SHA512 3e1cea9c207fc57b0cd70417b6f6ca832c2657c0f277a9c5a6a904cdc9e525e4e2014b7270e6d15ec3ff02cf6d545fe8ec03769a7b3f951140382b5479f1438b
+EBUILD prometheus_client-0.16.0.ebuild 702 BLAKE2B efb5005ef84eaf04f2b8ffd19a91fa1504c8647313dc5beb1a2444b47d8885077e18cede88aa1965a2938ae6ee70ee91c5e00908ecbd059d672174703037a471 SHA512 cc33bb8273322978163db273b1a18b40d7f8227bbb70c21cd3f6ceb1a9b66df5794bdd649879db9524b5e1f6aab813208be6d1c9b868c07630032b0570d6e6e5
 MISC metadata.xml 409 BLAKE2B 900f1046ec87679dabe88792bfea55cdf6dbbc1f332260e5487628530a1e5b2e07a1b5776313c484ed2355c205dea165547628297da3fd3e0d9e7c352f4f7a54 SHA512 beee1bb3823aa235e8c2667b18157254335777dbf1169beaee54190d41819dd0e82c58a8ea09c4981740370d7e5463ce11d327e02bf411093dfb653a557077ff
diff --git a/dev-python/prometheus_client/prometheus_client-0.15.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.15.0.ebuild
deleted file mode 100644
index 8edd5ebc00d9..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.15.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
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="
-	https://github.com/prometheus/client_python/
-	https://pypi.org/project/prometheus-client/
-"
-SRC_URI="
-	https://github.com/prometheus/client_python/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/client_python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/twisted[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prometheus_client/prometheus_client-0.16.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.16.0.ebuild
index ffa7b276ca52..8edd5ebc00d9 100644
--- a/dev-python/prometheus_client/prometheus_client-0.16.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.16.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/client_python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/twisted[${PYTHON_USEDEP}]
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 669049e41202..39170fc4734b 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,3 +1,4 @@
 DIST pycparser-2.21.tar.gz 170877 BLAKE2B ae6bf42dfc552bf1e3bfb5430cdb0c15b5e011ec53cbd03e0e2507c08a1a78690cefce2de134bd984caccc5dbde90661cb4c18df5c289217967213aac4d52404 SHA512 e61fbdde484d1cf74d4b27bdde40cf2da4b7028ca8ecd37c83d77473dab707d457321aecaf97da3b114c1d58a4eb200290b76f9c958044b57e5fed949895b5f0
-EBUILD pycparser-2.21-r1.ebuild 1813 BLAKE2B f009abed1128e42cb7e6e6ce61e12e3a39d806c2eaddff92d37698435b1c9a053a93aca15da21224405267533e9aa789114fa2eed364fa20e870e0709883f13c SHA512 c4e87cc3402b05f425a70feb709b8727c7d602eba07d42d2d2670d646b7c6f01794b639d95e5ee16c11dd1b2af9a8aab37abb47fe527a4a31179fe2a945d07e3
+EBUILD pycparser-2.21-r1.ebuild 1779 BLAKE2B fbdd2c5116a1426ddd942c29f0ddb391dfbbcbaa7a8fcf1475cf9a386fd4c919efc2120665a2cef46ba5d54d6cd4c204826d58c467e44b5c1ae289182ee117f0 SHA512 f0313b385d0fc9566ca5aff66e9a626ebd714ae170228988d6ff3fa729830be5d3d27953b148de90dfda8af954ce535ae682866937c317ea9f230d75be138ad0
+EBUILD pycparser-2.21-r2.ebuild 1899 BLAKE2B 66b26e6aff00ef9cda0ca26714784e838d2fb7104cfb9d803cbeb3e0f7ab44e7af7c2bb65b9b0cb24a09521c82f4ec3103f54c0e710f9f08f38704fb4c244c84 SHA512 8030001ab674a3cb5c11b429f6294f94d6f4ac80037247c8e83815ea282f6b2f606de10308fdf94ee3eecda496191a63cc4141b5e3c8fe9da4d7a2acb65fb65b
 MISC metadata.xml 406 BLAKE2B 61cb250ac460c4ea05f47bd8d208e44706bc80965ca1982e490d759d3a63652e5e13bf357532afb599ecea491f3c9a4cd315b97250b115bb7e8fa769b2ef03ff SHA512 b2d4ffde31f97a98e4a74bdd70751519d1339bbf3384e9e671760506fc2dac9d92bf6f7a743973002b4ae6da1cd2bb11abbfe63cbb330a1c32702b3eef24a62b
diff --git a/dev-python/pycparser/pycparser-2.21-r1.ebuild b/dev-python/pycparser/pycparser-2.21-r1.ebuild
index 3b32ad92c905..1b0d8e6f6901 100644
--- a/dev-python/pycparser/pycparser-2.21-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.21-r1.ebuild
@@ -43,9 +43,6 @@ python_prepare_all() {
 
 	rm tests/test_examples.py || die
 
-	# bug #701878
-	MAKEOPTS+=" -j1"
-
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pycparser/pycparser-2.21-r2.ebuild b/dev-python/pycparser/pycparser-2.21-r2.ebuild
new file mode 100644
index 000000000000..edebc42725b5
--- /dev/null
+++ b/dev-python/pycparser/pycparser-2.21-r2.ebuild
@@ -0,0 +1,69 @@
+# 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=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="C parser and AST generator written in Python"
+HOMEPAGE="
+	https://github.com/eliben/pycparser/
+	https://pypi.org/project/pycparser/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/ply:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# remove the original files to guarantee their regen
+	rm pycparser/{c_ast,lextab,yacctab}.py || die
+
+	# kill sys.path manipulations to force the tests to use built files
+	sed -i -e '/sys\.path/d' tests/*.py || die
+
+	# Ensure we can find tests in our directory
+	sed -i -e 's/from tests.test_util/from test_util/g' tests/test_*.py || die
+
+	# unbundle ply
+	rm -r pycparser/ply || die
+	sed -i -e 's:\(from \)[.]\(ply\b\):\1\2:' pycparser/*.py || die
+	sed -i -e "s:'pycparser.ply'::" setup.py || die
+
+	ln -s "${S}"/examples tests/examples || die
+
+	rm tests/test_examples.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Skip tests if cpp is not in PATH
+	type -P cpp >/dev/null || return 0
+	# change workdir to avoid '.' import
+	cd tests || die
+
+	# Ensure that 'cpp' is called with the right arguments
+	# Tests don't seem to always pass the include they intend to use.
+	mkdir -p "${T}"/bin || die
+	cat > "${T}"/bin/cpp <<-EOF || die
+	#!${BROOT}/bin/bash
+	exec ${BROOT}/usr/bin/cpp -I${S}/utils/fake_libc_include/ \$@
+	EOF
+	chmod +x "${T}"/bin/cpp || die
+
+	PATH="${T}/bin:${PATH}" eunittest
+}
diff --git a/dev-python/pylint-venv/Manifest b/dev-python/pylint-venv/Manifest
index e6a0a38253a5..3a3f3f632d0f 100644
--- a/dev-python/pylint-venv/Manifest
+++ b/dev-python/pylint-venv/Manifest
@@ -1,5 +1,5 @@
 DIST pylint-venv-2.3.0.gh.tar.gz 4967 BLAKE2B 7095848b28f1128d44164fecbd1fd1c3694140d8b3818fefcab92aa5a4083608dfc36c96a6c30b117a8592bea0de9b92a537c33f8db4ce8c1285a575d1aa2131 SHA512 c3f9294a137cc6369984cf714196ee0a248471990f2c6e691da86f3048126b99775cc8e9c516c72bd8746d0d814a52387eca165c5f1960aa418ec5abb13a3bed
 DIST pylint-venv-3.0.0.gh.tar.gz 14757 BLAKE2B 807b0e6eb7fee32d592fc215a6c4018003078f66c3500ffb9e9769e98e2226554433f2ae33f6480ae4240e8e96b932df23f8ddc3b3dab5bdd54cff3509f9ba48 SHA512 d239919a42f5107de255cc8de0737bbf57798f949f6845cad13da2fa30ded05ad07319b6294d19fe866ea0d533b3a30ba0f064a9c1091ac39ace6d9998f0f5df
 EBUILD pylint-venv-2.3.0.ebuild 567 BLAKE2B 4eb68ff151974107b70067b2e1cf25bdf9955c75eef278ac7a6ed2661e9ed3a501899570fe9aa6d42d9a563049270af09d47ab2cc29599b5a63b15ed516641c5 SHA512 dde267ef4ffa3365c148b7b5fc5b9e348c7f832db5699ed31ec2b0895014ccb6d5a1cd6bccd6ded12a46598ee89b7d331cee02011e675c2c26a9534af50b70ad
-EBUILD pylint-venv-3.0.0.ebuild 853 BLAKE2B b8f77ffb77e3b48c9b1165bde772d2216807949681da0934b15f5b87abc097eaf380f7c06de8ab087f46e9c2f0d40861093a05b334146c6d2e8abd33b249221e SHA512 d72eff40c46deead0f4643da5a95aea83cb773ea19566b659bf3f3db61495760dfd52e0fcf522078a5239c848e742480b93cc28b6837a4e6f791ee70a6001976
+EBUILD pylint-venv-3.0.0.ebuild 1009 BLAKE2B 9c4bc6d0ed40027369b0abe689b06d463cd4164cf27c063e7f36e358314837ad0fe1751a306c96d5df7c7716fae45fbc68ee683be4fd5bd493a76830b924ff11 SHA512 1f062f83663546cebfe5faca1d2c573e2b57ffdccd83dd69927dfd37ee71f51fd288c6df4e5db79cb661819b2cce5b1ee3c20b2f8d0c278191731b77268e34b7
 MISC metadata.xml 412 BLAKE2B 8dc1e28ad5e2b21a9483906e776a96d598e294fbc4dbf669ecea9357055b1a7439e0046353ab39b3c2bfaab7924f43a89c309db735e44a00838dd1bed2f5c088 SHA512 4e7963aa4cdcc168bd4755f21cb58cb084c185e1c71ef9fdfe168feb1ec65fc4848c99801e449f253e420b9e34d49aab396d2e02bb60a7cbd3733dd2a899c6cd
diff --git a/dev-python/pylint-venv/pylint-venv-3.0.0.ebuild b/dev-python/pylint-venv/pylint-venv-3.0.0.ebuild
index ad1160f14a79..f90bdef4e3a8 100644
--- a/dev-python/pylint-venv/pylint-venv-3.0.0.ebuild
+++ b/dev-python/pylint-venv/pylint-venv-3.0.0.ebuild
@@ -39,5 +39,8 @@ src_prepare() {
 }
 
 python_test() {
+	# we need to set PYTHONPATH explicitly since the test runs installed
+	# pylint (i.e. starts outside the test venv)
+	local -x PYTHONPATH=${S}:${PYTHONPATH}
 	bash test/test.sh || die "Test failed with ${EPYTHON}"
 }
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index aa7fa42ca2f8..1eda11d32187 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,3 +1,4 @@
 DIST python-dotenv-0.21.1.tar.gz 35930 BLAKE2B e89b88754406464c7d9493d8824147c1b3862a1f1c9a723ddd0cec9c053b5772fe2f5d55fac0e979a3ffc5d717ec22ceb45064ed45f58f2a3c12c1018ebe2f47 SHA512 30bbff6c4d95ee3e58d0ce895fd9bcceef52f59f66060bcbc66460bb5fff977760d168a09415a6a52587ad560b892da60fafa5824a6634ba3202d07243d2ac8b
-EBUILD python-dotenv-0.21.1.ebuild 870 BLAKE2B cee78e7722648167832ed60a990eb5db9de6b584aa32418ca53f92b43cacc5214900196b717a6ae552c46b0670c7b082133b49ad7e1941f62d1ea7fdb5f11ea8 SHA512 e20943a32f679058251bf030cbc4661ad9fd06d3a355a3fc0c737497a3935f8aab380f388662b1cac058c1643707648dc37a47780ff5545a2b0bbd248420fcb2
+EBUILD python-dotenv-0.21.1-r1.ebuild 1070 BLAKE2B f2ba5353fe5596d0e405fbe7af0f1ced29e919f9713fd73f8bedc0a469e9e0d8bf21b4cc3ec2a1af2cdb38475bf0cec2816629fbe1180fdbb9c195b8cd2782e9 SHA512 0ecfb08c51b83c0b1e956f63996119940389ece8ded445e7b5fb1e213267299a6a7bd57d06b4b22b53aa8a01d915fe4febd77fce35f535af122ac6e4fbe2ffc5
+EBUILD python-dotenv-0.21.1.ebuild 908 BLAKE2B 5b9619fe65dd1e5642239ee84dd561bd6e3784eb2aa72e1e0452f859c0b3ec0760788912c9cd8d99ec2118856ac7c0c5b625958c7f10c271d86feedd73e8834c SHA512 d3ecb18c78f594e89301910f92c5e1ce1ee1bf02c6027ad22f5ac8953d10d66e7d0d2280c474f8b7422f2108356df09d9fa6bc04db8eb7336d04ce41a5641305
 MISC metadata.xml 529 BLAKE2B 1dd381879887df2d49a80084ffd386891cffa2547fedf00bb1dbee3c3abe79759620b606a916d71cab518bb3869ecee4775c735db22aac17e785bdda5c4905a5 SHA512 ad2129cb6c691f9f4622de92701f9825cbbfe61e9c2552f91bae53c90e19abe9b4f7cd2e379c516254d8b9a5989d4861f5ec05ec7949c5b533c9b7fc6416056a
diff --git a/dev-python/python-dotenv/python-dotenv-0.21.1-r1.ebuild b/dev-python/python-dotenv/python-dotenv-0.21.1-r1.ebuild
new file mode 100644
index 000000000000..0daaef339c0d
--- /dev/null
+++ b/dev-python/python-dotenv/python-dotenv-0.21.1-r1.ebuild
@@ -0,0 +1,44 @@
+# 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
+# Re-add pypy3 after https://bugs.gentoo.org/729958
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Manage .env files"
+HOMEPAGE="https://github.com/theskumar/python-dotenv"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Requirement <dev-python/sh-2 has an upstream ticket:
+# https://github.com/theskumar/python-dotenv/issues/450
+DEPEND="
+	test? (
+		>=dev-python/click-5[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		<dev-python/sh-2[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
+
+python_install() {
+	distutils-r1_python_install
+	ln -s dotenv "${D}$(python_get_scriptdir)"/python-dotenv || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Avoid collision with dev-ruby/dotenv (bug #798648)
+	mv "${ED}"/usr/bin/{,python-}dotenv || die
+}
diff --git a/dev-python/python-dotenv/python-dotenv-0.21.1.ebuild b/dev-python/python-dotenv/python-dotenv-0.21.1.ebuild
index b5856062bbd0..8f180df1ab98 100644
--- a/dev-python/python-dotenv/python-dotenv-0.21.1.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.21.1.ebuild
@@ -16,9 +16,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
-DEPEND="
+BDEPEND="
 	test? (
 		>=dev-python/click-5[${PYTHON_USEDEP}]
+		<dev-python/sh-2[${PYTHON_USEDEP}]
 		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/qiskit-terra/Manifest b/dev-python/qiskit-terra/Manifest
index c84c91257d52..0c89475abcdc 100644
--- a/dev-python/qiskit-terra/Manifest
+++ b/dev-python/qiskit-terra/Manifest
@@ -45,17 +45,23 @@ DIST priority-queue-1.2.0.crate 32057 BLAKE2B b858eac5ca05efcd0d630b0e4ac5a4de60
 DIST proc-macro2-1.0.47.crate 41955 BLAKE2B dbfc20b61443225130d08b05deeba56e63e76921e56359c9b0531798b18778d6ddcb56c3372fb6ccc68586a6c1dc725054f0e83f93e8623cb5ff6a7a2ed3dc83 SHA512 60c5d0dcbdee7ddab40664882d3cf5a868f7ea5b49ebab3b4419c3f325582b816625e73e0d1737bbd46bd7d765ece6c81c2ff4be894555d4b255f5cb9255e931
 DIST pyo3-0.17.3.crate 408939 BLAKE2B e67ce34c626dbede3c76abf66ba5078827e8a75644ff9fbd83eccf3d53096a3c2e0991da8b3489ea9984c665751308bcf4aa9c3d31dd62c72127694156a7a0a9 SHA512 5c83ea76202edce13c370d023562a9009382e36fdf3fcd7c4dea844ab8e5e048db4cc79a9c0ea98fb7017a83da16924ba0981ad98bd83e75e2fac434738e9740
 DIST pyo3-0.18.0.crate 410258 BLAKE2B 02d7906839107a1c6d9ce9ab247d28984e6482143d1d86328889eb8d32537df6a316bf9e51fd95883856e92a68560c9a9fd4dd5c5ca8e1bdb4e1b55fbeaa4035 SHA512 8eca3313ce9574aa2bf92a55f597261e7883607d85cca22c43689a657a087ae9a8dd8b6ffe9961f438c6a3328719236135a0e90ab8461dc84999de66457d8f7e
+DIST pyo3-0.18.1.crate 415128 BLAKE2B c77b956c4c96c4f0356abf5df14f89ef7fbd4d779169c2acccfc827a3a5d2d7980e5e8a467c1f6e73bb00a4500293995bc81014f110853c33b8e30d0698d0a21 SHA512 37e82b2b212de59335f8b5e4129dfc53872ceda156238f4aaee8cf358a8daf2d64cb716aa63d343c4f602fc61344b94bcd3cc8e02bee80256f5b49033a5c5825
 DIST pyo3-build-config-0.17.3.crate 29230 BLAKE2B 193df0c15a2150505c823338e76f4d75e2f28158626edf332da2b10b6a81bfaf7f95a3a32c9f218717504b2f0dd80d3fb61c78ab3df9cb9024c3686f8ca002b0 SHA512 92652ffdfb3f6c3c8a1c2f97f5e2ed19175ba6bad5cd0f0c113b569369193aa18d95adc780bbdb8202d815a1ec0b6aeaf40d93d64faab42f4e8b452c806906a2
 DIST pyo3-build-config-0.18.0.crate 28756 BLAKE2B e64bcf3231338d4877c9a2dcf2aab59aa4bce9951ca39f9c7a7377e669ebd1ff0d45c025394e2d1a0b6fcde1fd19f100ea555f18a62869d4f7c5cd656740a9ea SHA512 1e49ee06e2308394572aba0905830f2e978782b81c0c09290b8fa2a30950dfb3ec7f1c04eff5dbeafd658d2155290cfa74307d80fd5064aa92af66de42b38501
+DIST pyo3-build-config-0.18.1.crate 29134 BLAKE2B 288519ea8b17bf81564ea7e91fa548ca5b966cb08939eccd80356935372aa7bbac1c9f1f8780b49010f4f66d1724d698a6197a740b232d62c75df341194c8ac5 SHA512 6277726d3f0faf70453f61f90c547db01ce5d50823ca9ba731d57309edbb33729bcfa3299415716cf6154ec2cb3a4c1e7eabc8ea18e400e746b37324bfca2ec9
 DIST pyo3-ffi-0.17.3.crate 62854 BLAKE2B 3f1c519b210de0aee19b832845c1d44237f780f18173ddc1b1cef5eac1060fab40fd8dbec067a49e4d28fc7edcd0bd751f54438ad42a8b98641de0517052c64b SHA512 c08481d1530207fee544a5dde14253415e5451c1c013b86ac1f0e9bcb3c1df7866764cd11bad523105b6821725560329b89ff689b3aa2f0698cdab148d0fc12e
 DIST pyo3-ffi-0.18.0.crate 62767 BLAKE2B a56d139a8639c5483086fa206518ceb5c2720afd36081e02b5ecf4f1c45c1133592165e8168905fc5bd6bf8fd8f1d729fec89da9a17f979e0af2bdf64b32d254 SHA512 d55792933ebecf0119a3591a1ed76334915bec5273d47c1f1b60ccb8959d4b0072952ed7da1838640b0882b7b6ba01bcf0f4758467e07c9b5d823d68098aedda
+DIST pyo3-ffi-0.18.1.crate 62852 BLAKE2B 86bc534333e05578b1bf890fdd71af685d626aebbd8b4132162c1d29ab89ee493f903497fecb576164a1b23df11b36f20c18cede97ded567428724a702f0529f SHA512 35f2838f6b06bbb1ad6ebdc0d68c750fc8cffc43b62fadf2b76d4a395a4655797e9d93543ffb204ff7ea312f7f37444375c556831a231122f9fc1477ec986bec
 DIST pyo3-macros-0.17.3.crate 7257 BLAKE2B 4c5e166a37c31f2cc21b7dce9b46dcdaeea0f12299c421430efe72b47ac954f10680bf6ecb28a5f0058abaf22519f6ce05d21e5de534e362ceb9847049601f4f SHA512 f99d38ea69b1d46599d203908d12eb3fe4869a48b21b3eaba0c9c8e52b9f2b3c5ea72505dcb9b3330450dd724eeba859eef724fe9624ebbd8bd3cbcff7372df1
 DIST pyo3-macros-0.18.0.crate 7078 BLAKE2B 399a018a38ff60ab5f608063d4ed4a3243af437aab6314742689907eece14af982626307810cab97112fd16f0d3b4b6f7eb2fc1349577e66436d74727b16bf43 SHA512 336ea59c648b9310ecca4f3878ce609076b79d5b40201c8e8ccf565deb348d222229da793ed6394509d9020d75c1b489f96dbc3dedad6ca2b3dae25818502440
+DIST pyo3-macros-0.18.1.crate 7174 BLAKE2B 0eb2d106d193cfb14fc8c9cce175458a38bc069f9c232a7bc541e2951bd06ad3dfab483f730ece97a4ca2827ad4dcd0444e77df6a8ff79cc5861c2985d0d2b7a SHA512 baf43c6c5ef8f5fcc91728d693d52453b779de5c48cfdb295449a32ce559c0304e3a93b43bad7b312eee1c44bbe680efc57423d4e38986f3c6eacebf07998609
 DIST pyo3-macros-backend-0.17.3.crate 49992 BLAKE2B a922c3c2c1f494002fa8592704c43ddbb4d9bf650187adcfc94f82c1275bcb69d444ede404d1b40bdf1e199427e8de880464b76c7385c2f96633544ad021c4b4 SHA512 b4dbddc3ac7ae542560459376127cabdbb4de83c04d70a4efe0976fa94e6ce94a7a62723f689a8fbb1d795fc235b1ac3611f8b4985ae2af0db4a9dc08de48927
 DIST pyo3-macros-backend-0.18.0.crate 48261 BLAKE2B a95dee8233a7fed386860f052202348753823091cce26fa0a41c659da7a62cb0c20ff9a540c33366ce57a90aa953699c9b555dab817d43855f0911ca7cec2ff3 SHA512 051c5bdcdeb60d3a19ecd12099d5906eb7fa4624005e3207b1a225fc6b9cd6606e9b9f9f4f145f934ac88e1915e587ed760734e738a752df72cb20d9550a78d4
+DIST pyo3-macros-backend-0.18.1.crate 48618 BLAKE2B 8db09610fd6fc95d1979a4065f89611c507ff7e7f72d9cd64590f85f6d8543ee6d234e772c55db88e3624808ad135389f5ff0edfd2eca6ecf1a29ece332c1c2e SHA512 20aed4aa485d6ffc02b0d08aa4c5fc086e73482aedb5ebce155c3f973d0e058902ef806740d483368eb80caac4ccc163516eaf56a027910d71cedc5bc0ee665c
 DIST qiskit-terra-0.22.3.gh.tar.gz 9258519 BLAKE2B 5046390a9ecec5508d558e2d4609b0308d37367cf82ffb677d0e540e8213f9fb82e8774c4c128072b6c89fef190764c41e6f9de3ab754ba1a5884d21002f930a SHA512 787e0a3ad95974f3fc8300937569704da4db7b2681f985ba359a30170516587f4be9523e7c9892dc0e2ccf0faf2bdf6e9905bb5988dc1022467ac313ec7f0bc4
 DIST qiskit-terra-0.23.0.gh.tar.gz 9524936 BLAKE2B 409e9de2012bc10394669499a4b0f0c9eb5ca730b859ebd04bc620354b86a295610433e3a49e6300904b3927309d7fa52149de16a1083f89667928cb016448e5 SHA512 cc6fc9d7b794c00a4fad549c8be2d52021470c4d8d39a51de8c312c0096e6fc2af27e9234d0dfbcf96a8620e28ba9a075ccdd939d59e72f66078cd671f92b37f
 DIST qiskit-terra-0.23.1.gh.tar.gz 9525036 BLAKE2B f02afd580cac2dfd05bb50ed1744d3d084eb2e90175249bd0eea8fb741058b1bd4f5db16f8ababe643732934e863714fce1807c23aa044adab0406dbbebf40de SHA512 46fb5721782b92f013cce9833bf86e4cd725e80612894423a1c80837e8ad11439ef898df1f5228fd2a7c40cbbfc309d482b9b54a954210871abdcd4018d625d2
+DIST qiskit-terra-0.23.2.gh.tar.gz 9530943 BLAKE2B 72160fc302162b3432aa11e5e063004e8eca7ba4d16320b96b6ba6e5621e7e89fd8d34a129fd6d41548d626aacd6461f084b23471fc126ef9e475afa9540b314 SHA512 92536209dae13c5a0720d3acc7f46f7632bbe3be35330970b6d166853727193388aa0afa613ec15f08a86cd3a55991d7c655342dc6a2987ac49588400e7f759a
 DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
@@ -89,4 +95,5 @@ DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a7046
 EBUILD qiskit-terra-0.22.3-r1.ebuild 4029 BLAKE2B 7a9785ed07276a2ee063ca8616fb0625ac400ea90170d9419cf72d50c8a0a7e95593d53a6373acf43cdcebc7b35c2820205ab7f0b287634c7bc46a7b6520abc7 SHA512 c8e84e53e8aa832c29550fef67187bbb47fb2aa1434adf93668c8d3383e42e089d04eded49ae205f4fb8e65b55f59083d606e77e711804e55902313097d5d718
 EBUILD qiskit-terra-0.23.0.ebuild 3932 BLAKE2B 641d36a1084bee8e7611885a77699f0b87ddc6bb1675b82a36fd01e92cda5933b2ebefa5f47d6b7f2071061e093fe01fc3d0020490122721a1c0125b4cfab066 SHA512 d217a6d63bec35c54b680e9720d483b4b22a07a2a0580a483d33317d90dda22fb3d41f2cfb32ec30161217df0088bcf6bcfa02f7b78b5f4455ae5ccebb812c17
 EBUILD qiskit-terra-0.23.1.ebuild 4090 BLAKE2B e9aa9355c91d71573e7ad08652a35d4d8458b867ee4c4cfab1e4f1b89aacdf7e043859d92e20639a8e23bf89927cc3101ae744ae9356983942f29460808075f7 SHA512 a099862a590f4e53b89eaab6cde05a852c1bfead9fcaa8acc8d9d2d2c9f8a923fb79313f3df0261d5615d314bb75cc36e3dfc72ab0d7dcd01e1e5eaabd10397a
+EBUILD qiskit-terra-0.23.2.ebuild 4733 BLAKE2B d8a032465f549962fe2f0bc6662a60395cc6ebbf7b6d33091a983f10d55a2902638c636ce293228d94a8432bb6e6a52d17dddb4613717502aae42b7f02292a8e SHA512 e0180e6b6b0f433abac801f0771fad9a48c9f672436669b27ae130741dfd14044a051dbe3141ebf0d1083fbc4dfe5ab8e597b49ad315450726c5cff52d5fce5f
 MISC metadata.xml 1099 BLAKE2B 4d2ae544b77d18aafe53ad0bfdc7bc32b9656eb4096d8f2ed0c2e71e8718d260d1030207753cd4e0b10748ec7508813f84a5232e7d491348be2c7ca1fcc5d860 SHA512 113bee16467977079ee15aab442d9255f9d3d3ad29dc27f2082b1f9b902856ce827aff722f988d4a9da2bc8762523002d8acb5702271ef87c188990c2b677038
diff --git a/dev-python/qiskit-terra/qiskit-terra-0.23.2.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.23.2.ebuild
new file mode 100644
index 000000000000..3d1bdc2d0aba
--- /dev/null
+++ b/dev-python/qiskit-terra/qiskit-terra-0.23.2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	ahash-0.7.6
+	ahash-0.8.0
+	autocfg-1.1.0
+	bitflags-1.3.2
+	cfg-if-1.0.0
+	crossbeam-channel-0.5.6
+	crossbeam-deque-0.8.2
+	crossbeam-epoch-0.9.11
+	crossbeam-utils-0.8.12
+	either-1.8.0
+	fixedbitset-0.4.2
+	getrandom-0.2.8
+	hashbrown-0.11.2
+	hashbrown-0.12.3
+	hermit-abi-0.1.19
+	indexmap-1.7.0
+	indoc-1.0.7
+	libc-0.2.137
+	libm-0.2.5
+	lock_api-0.4.9
+	matrixmultiply-0.3.2
+	memoffset-0.6.5
+	memoffset-0.8.0
+	ndarray-0.15.6
+	num-bigint-0.4.3
+	num-complex-0.4.2
+	num-integer-0.1.45
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	numpy-0.18.0
+	once_cell-1.16.0
+	parking_lot-0.12.1
+	parking_lot_core-0.9.4
+	petgraph-0.6.2
+	ppv-lite86-0.2.16
+	priority-queue-1.2.0
+	proc-macro2-1.0.47
+	pyo3-0.18.1
+	pyo3-build-config-0.18.1
+	pyo3-ffi-0.18.1
+	pyo3-macros-0.18.1
+	pyo3-macros-backend-0.18.1
+	quote-1.0.21
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.4
+	rand_distr-0.4.3
+	rand_pcg-0.3.1
+	rawpointer-0.2.1
+	rayon-1.6.0
+	rayon-core-1.10.1
+	redox_syscall-0.2.16
+	rustc-hash-1.1.0
+	rustworkx-core-0.12.1
+	scopeguard-1.1.0
+	smallvec-1.10.0
+	syn-1.0.103
+	target-lexicon-0.12.4
+	unicode-ident-1.0.5
+	unindent-0.1.10
+	version_check-0.9.4
+	wasi-0.11.0+wasi-snapshot-preview1
+	windows-sys-0.42.0
+	windows_aarch64_gnullvm-0.42.0
+	windows_aarch64_msvc-0.42.0
+	windows_i686_gnu-0.42.0
+	windows_i686_msvc-0.42.0
+	windows_x86_64_gnu-0.42.0
+	windows_x86_64_gnullvm-0.42.0
+	windows_x86_64_msvc-0.42.0
+"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit cargo distutils-r1 multiprocessing
+
+DESCRIPTION="Terra is the foundation on which Qiskit is built"
+HOMEPAGE="
+	https://github.com/Qiskit/qiskit-terra/
+	https://pypi.org/project/qiskit-terra/
+"
+SRC_URI="
+	https://github.com/Qiskit/qiskit-terra/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	$(cargo_crate_uris)
+"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT
+	Unicode-DFS-2016
+	|| ( LGPL-3 MPL-2.0 )
+"
+SLOT="0"
+IUSE="+visualization"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/rustworkx-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.10[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
+	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/symengine-0.8[${PYTHON_USEDEP}]
+	>=dev-python/tweedledum-1.1[${PYTHON_USEDEP}]
+	visualization? (
+		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
+		>=dev-python/ipywidgets-7.3.0[${PYTHON_USEDEP}]
+		dev-python/pydot[${PYTHON_USEDEP}]
+		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
+		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
+	test? (
+		app-text/poppler[png]
+		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
+		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/qiskit-aer[${PYTHON_USEDEP}]
+		>=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
+		test/python/transpiler/test_unitary_synthesis.py::TestUnitarySynthesis::test_two_qubit_synthesis_not_pulse_optimal
+
+		# TestOptions::test_copy - TypeError: argument of type 'Options' is not iterable
+		test/python/providers/test_options.py::TestOptions::test_copy
+
+		# DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('mpl_toolkits')`.
+		test/python/test_version.py::TestVersion::test_qiskit_version
+
+		# Hangs
+		# Broken by https://github.com/Qiskit/qiskit-terra/pull/8952?
+		test/python/compiler/test_transpiler.py::TestTranspileParallel::test_parallel_dispatch_4_3
+		test/python/compiler/test_transpiler.py::TestTranspileParallel::test_parallel_with_target_4_3
+	)
+	local EPYTEST_IGNORE=(
+		# TODO, also apparently slow
+		test/randomized/test_transpiler_equivalence.py
+	)
+
+	rm -rf qiskit || die
+	# Run the Python test suite rather than everything under test/ which
+	# includes the 'randomized' suite. Upstream run that in a separate CI job.
+	# Note: use -p timeout --timeout 500 if debugging hanging tests.
+	epytest -p xdist -n "$(makeopts_jobs)" test/python
+}
diff --git a/dev-python/versioningit/Manifest b/dev-python/versioningit/Manifest
index d33074be7572..251bff5ba644 100644
--- a/dev-python/versioningit/Manifest
+++ b/dev-python/versioningit/Manifest
@@ -1,5 +1,5 @@
 DIST versioningit-2.1.0.tar.gz 735718 BLAKE2B edceb4b5a76ecc5e4f5549a348cd5c72bd1c77be1fb6d8c1694af4c94ff38e773b2e288ad22cecd93a3cd14d602dd6c50634db74a51e486856472098cf18bf89 SHA512 0cea71e8b21edefba008d947d8527810e1e38c8e2f208707dbc913b3734b51a57b20444fa4dd703574f0106068518057496292ae5997d85ba047ff4795ba64fa
 DIST versioningit-2.2.0.tar.gz 742936 BLAKE2B 05bfebce378947a9196b4bd90495dc8f89fa9b79b99e5a4423ff39df77f0353125ba5f2deec1e685feacb6fbb8ee896fd1f18155b985f803be4d21e885689128 SHA512 9169bd04c29937a5d913dfa4951affe9d01f21f513fb6f704bdd65f44c91dd47c366169fd50aecc938992cb32b6cac835359b1dc9a6b431b8b5371125564791e
-EBUILD versioningit-2.1.0.ebuild 1070 BLAKE2B 5a29a168466fb160f4a06b2c77e8aa8b5ecbace315fed81f33fcd8c05b6d4d32531b849413812a5f7d6d66b2637cac7770dfca3ff69492435b6badfc80efe5b0 SHA512 9e3e30278fff5e4bb974edf8fbd141865e90a71f1822740c8ee55b1e98ba3c02454d596e08f2b41802b762f8ace2d8b445f1a696cdf81b740b1afdf48afbed05
+EBUILD versioningit-2.1.0.ebuild 1069 BLAKE2B 397a1f92cf673a4f950104047a762a514080f1eae57aec3d9118714419a2b9162b11995124eb0c71e3ef4d8eeaa074c48038fdeda210e0472cba3cc4cdc5d4ea SHA512 5d7661364ac44059f2d6fb8ad2073e1238322ce77273637aebe597ab2a3c842a397c6e012549daef1117ab1300d984047aa325257a464805c53d2d08077b3fbe
 EBUILD versioningit-2.2.0.ebuild 1070 BLAKE2B 5a29a168466fb160f4a06b2c77e8aa8b5ecbace315fed81f33fcd8c05b6d4d32531b849413812a5f7d6d66b2637cac7770dfca3ff69492435b6badfc80efe5b0 SHA512 9e3e30278fff5e4bb974edf8fbd141865e90a71f1822740c8ee55b1e98ba3c02454d596e08f2b41802b762f8ace2d8b445f1a696cdf81b740b1afdf48afbed05
 MISC metadata.xml 400 BLAKE2B 96934adb9ade5b51537765da51d530a644f87328688415cfd5b239048adede18db1ec7cbb2a234cc2e28fea368aa9c815176bb22262c9053fdc2c85c6c6e3f56 SHA512 9070b850fff35058a11cc7504bbc5fbef17cc9154df5419a64bae10fd3cb160a043ffd0880fc3c5054bd1d2eb4891bcbf5764c56f2441ab79366336caf91e379
diff --git a/dev-python/versioningit/versioningit-2.1.0.ebuild b/dev-python/versioningit/versioningit-2.1.0.ebuild
index 88cdc4b3b0d6..a0d4acc1502b 100644
--- a/dev-python/versioningit/versioningit-2.1.0.ebuild
+++ b/dev-python/versioningit/versioningit-2.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]