gentoo auto-resync : 06:11:2022 - 15:20:09

11 files changed, 20 insertions, 221 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index efb0ae030f20..943c90565349 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index ba1008395005..deb3694536b7 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -12,6 +12,6 @@ EBUILD protobuf-python-3.19.6.ebuild 1745 BLAKE2B b4a48882580da78eb0544d211fb950
 EBUILD protobuf-python-3.20.1.ebuild 1512 BLAKE2B 9826dc63b7dd36a16b5ff21431466386dd7f853d19ea4ad20399ce4a1b9855f03ebc06cdc9c90b5270ac4919b4919832a520729e0c1db3df2e53f80383e7e4f4 SHA512 7a2047e3c7e2fb3ab24764deb24a0fd9cdb2343ed7d53a42a0aa5ac5e365590699477616a2e2961467872ed1951a1422d4d41a6d6ddff521c2ca8c4b5ee92afb
 EBUILD protobuf-python-3.20.3.ebuild 1706 BLAKE2B 938d6441352ad78d933fe61e96d68a0506b44fbc6d5838ac511fed9a89a2eee4fa3b98cd7f5de5cbc093903cc0c1648381dc450d676cc35699d86b2b74c8e6d3 SHA512 dd90ddfa5303159bc10c966e3ef245e57f0068e0bc6185aacd94be11e1a249ebe884bee33d4450a4f98c5a472d5ebcbdb6e249036faab5ae8a89bbc9837eab78
 EBUILD protobuf-python-4.21.8.ebuild 1714 BLAKE2B e500f0ecf1821870d298b997665112b67a356a4bdb8a87d7214a2a51992d0730f175c62efcf56face417bda61aaedf026a43104b3f399e83abb1da3288ab3365 SHA512 cd533b3bf62bf1e55376d11ca8684ff51597c8ded9fb6559469759459653c5139da6c3c442287f1ebbbb99b0058f533cf1be49f7df01f8b8ce47c80608431a69
-EBUILD protobuf-python-4.21.9.ebuild 1713 BLAKE2B 58eadac3c3029fe40422832ac319d9650fbe096e0bf26bfee6911ce36ef77977f77f4ffa1f712b7427403ce590bf86c1cd78c9a47cef90de085d515d9a76ada7 SHA512 95adb1b59ec00ff6258ce1447fc51819b02daec6979561ddccd81a33bc912db232b11b741660211571e9b76cb7339c4e0bed48ec04546b1b3fb923bd3ea5f91b
+EBUILD protobuf-python-4.21.9.ebuild 1712 BLAKE2B 416fa84627746999b075d6ab9e31e7effd16523ece20cfac95c81628824267251f55fadf0d5845946421325a347a2f7ad50498edec9831685efc809a6c4e753b SHA512 e34a7f61bd521fbfccc711ac9ca72dd10c1c589d391889bc07586cf53147ab9fd7e39616313ca90166a73446e043f380263d4cb08fb9ee87abc68b7b218b2a35
 EBUILD protobuf-python-9999.ebuild 1723 BLAKE2B a09d187382486e66c363b03a441e45168f4bd9d57e83e1c3cae81874da623c70a67af9de4dd09d7405b9b95c6cad757087c53ca6739714831386a0e0eb921a6f SHA512 dbc65d2d16248ead6e9cdba28cf19afa509286cf3759cc2fa7285c66c025523219f0845e7fbefad0b6cee9ab2d1091d279bcc0ab89b29f9f5a0c31619e7660d3
 MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
diff --git a/dev-python/protobuf-python/protobuf-python-4.21.9.ebuild b/dev-python/protobuf-python/protobuf-python-4.21.9.ebuild
index d3f2a14a19e7..a271bc824cf8 100644
--- a/dev-python/protobuf-python/protobuf-python-4.21.9.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-4.21.9.ebuild
@@ -23,7 +23,7 @@ else
 		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
 			-> ${PARENT_P}.tar.gz
 	"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index b2a47567fcc5..bc4067102a04 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -3,6 +3,6 @@ AUX pythran-0.12.0-gcc13.patch 1472 BLAKE2B f385cfd607a77a72fd5815502416b267342d
 DIST pythran-0.11.0.gh.tar.gz 3582011 BLAKE2B 532afe9edd84d2699254bcad330dc03fcda4defce73997ec9feecf1a9e0c8f4fd407a5c4ebae7e10f96463a43453137953dc3e4df010ae7fb63d540d41b79f53 SHA512 bd703148f26a0511f5a21e691e62f4e9b7bf5a92548f8ac837b2d24135917b71b052941180c9801f29c457018eb57e5f5107a509d6815d8dd8ddab1b8626b1a1
 DIST pythran-0.12.0.gh.tar.gz 3589256 BLAKE2B 5eeba4b7d73e56cc2b696098edb085e11d406485960614b50426e3df7c425ad22537ae72a2931a9ec318ab23153660da543ec1890f03379981eee10a34b82cea SHA512 8f698cb2efc8e53005a6a18b81b9119796d56e638c4634d3a9268bc8d4ac340c7ff1a26212f17210ad7200eb8a3e0f9dd20702d9d9c51f24a76dadc7d0877693
 EBUILD pythran-0.11.0.ebuild 1216 BLAKE2B 3bbdd186dec832ba93efc8681b36738f28779b6b30068b27309ce7a3701a15a95387e56878bf77aa7f7ecbd316328dc9d815178a2c471e0441bf12ca5deb86bd SHA512 78fdf9b66ddf94d3513a2a07203ac1274e9d1dc928afabea0a573e47716006606a5ae38c372a98c7e601195080bd876a3bb816e74c3aaaa49b9f3f56f106ea87
-EBUILD pythran-0.12.0-r2.ebuild 1477 BLAKE2B 71cc65ef8328949bc613d770695170a828f19f4217e0f421f45988f3d72fec616059cb1ac85e926266211d219776bbd27acf0121db5328a8c1e04d6b1c151efd SHA512 04dc22f16b1c95fcbcb13eb3e16ccb5a3efd6a01afaeb06a17b0ace61923bf0d79aba42ad7667db3a7a8b5d9ac242181dd1bdfee9ac7c4749a9930787e0dc26c
+EBUILD pythran-0.12.0-r2.ebuild 1476 BLAKE2B c825378ae5851ef58bfa748e1845436f2d28fd2ad974f5fee99b242b860c554e327c49e7f36bccc23b99f69b047e72e48c8cb1732b2e052cec2f5d1c25820e29 SHA512 c4c9ced68c1b2adf51177e404107224108c645a7f79fe53e54b0e9004f29923daf69b9a732380776a8f2972730b8cdef6188d4ee78a2dfc6612733c6cb094c3c
 EBUILD pythran-0.12.0.ebuild 1190 BLAKE2B ef04054cb343d9a3c3e0bdc5fe2f6c41aef90bef6cb2eaf2d3fbadf35430677072a45e0888fc05a8874bfe6b61bb799b0cf9b86a93fc493e95a5e1c6e95dcce1 SHA512 794a5d327f8c9aeea34cdccd596726c7084a14e8a9a9af7ec604afad6f602409b814eac6fb042a7a8a8626a38a5e1e3aadcaa531d0233bcefccffe3647312dfd
 MISC metadata.xml 354 BLAKE2B e7ec71fae294f6f697b0fd99b0ccef24049af7999866344e8da2ebc40bc2988a21f2cb0374b52b781a5f8b55f26ebca364dc93f4e69d957a3ff6bd3c32cd988d SHA512 9008d270ea6757557482edb55c5848aea9a29abfbbad65d93000660a1e51ad2456a2b7ccfcacb80da23b3dd38cee2c4da9645aed48a35edb4a497bbe3a80dd7f
diff --git a/dev-python/pythran/pythran-0.12.0-r2.ebuild b/dev-python/pythran/pythran-0.12.0-r2.ebuild
index ac1e01dfcd19..a89aec5395d9 100644
--- a/dev-python/pythran/pythran-0.12.0-r2.ebuild
+++ b/dev-python/pythran/pythran-0.12.0-r2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ppc64 ~riscv ~s390 ~x86"
 
 RDEPEND="
 	dev-libs/boost
diff --git a/dev-python/qiskit-aer/Manifest b/dev-python/qiskit-aer/Manifest
index 8e4338355fe4..87564f73ec4a 100644
--- a/dev-python/qiskit-aer/Manifest
+++ b/dev-python/qiskit-aer/Manifest
@@ -1,6 +1,4 @@
 AUX qiskit-aer-0.10.3-remove-cmake-dependency.patch 253 BLAKE2B 7b5da68c4a6c64ea4b3f0a0ff1a52294783762d8b34f3b7facbbe5bb2657b5cbe0e502ed01ea6c1b4135985391c5d6bc8fccfc34164bb6a88bbaf1e3aa9b3968 SHA512 6d9a14d7c04292efcbb3f7f8abdfa1f1efeeeb081b5775f01162f95fcc9c0f6465863058dd88374b0bb2525dc4fdc3b7408100b3ac990109554b2d77b3a93223
-DIST qiskit-aer-0.10.3.gh.tar.gz 6657490 BLAKE2B 443f7df2259c720fb93a60659da9b1cded25f9dbdf585bd0322e9f4effe4c5955daf6587d6c3964ab4a7e4a8bf6270f857abae1cf4e6b0718801daa6a96c2aec SHA512 c882624bac373566b003a01fffa6963d4ad8796ce18786b50ef85350daac26814c147b36067eb6fce4f264919b3680246e767b5c13ac338817fd394620392079
 DIST qiskit-aer-0.11.1.gh.tar.gz 6699343 BLAKE2B 3795e1f71914bbc0074a2eac10a82a28f3171d50f292a13dcb705f62daa5fa332a1eabd52391c1b168a822ca6428feb79fe08bb7c93cfd2f7ee5b0d38fed012b SHA512 7880f2ee99f34eca285b9e7cd096981db2f981d41c54881c4036e2745e4af1185b740d93cd157b83ce4adaf8c207c9c063b86e9a1fa514d1388437d6f33e219f
-EBUILD qiskit-aer-0.10.3.ebuild 2611 BLAKE2B cbfaba731f4e1965b80bbfaf8ecd3c166e8af4aa6d90eeb580889fa5fa85d8238d4e7ac7ccf8865d639f532b69da44d9eecdc077fd8852a4fbc717bbf1c4b5d5 SHA512 a47e66b21bdf4e497ae499ac48da2bbc8f77c0023d2c84969afb7aa6f2006b9794d1cdbdb32c60d5f9b180e78bdaf676ebf9d6992cb0dde9abe370c53d172af3
 EBUILD qiskit-aer-0.11.1.ebuild 2630 BLAKE2B 6861b9f02a51601e7b555e760c53e6d7b3d32bf3d71adccfc6830090ca90d0e1215636a2ad3c2325e54a97a7fffd1b0cb538db63213329145f8817a6c4b0f82c SHA512 3fec21e2ecb5afec2625302bed99cda4c7e9f3185ee33656be86f29d71b4700c6a6c884c1bd5247a680773f3b2093643cc3fe5a5696bb0e1db9a3f594d644e94
 MISC metadata.xml 1049 BLAKE2B e2118dc211ac8f42115959dde943a32331b4186524ef4a5a1343d8798a329e1d0de5f9a52a9c1212ec6af39392993378c6422424488782747ffbf4ab1e63d25e SHA512 bc4c9a19376938e973bedbdff0bbe95edb98c78b75d03f2a12985558a5cd5d0ceb934c43371438dd597a8d4fb8879d5483aeb8d806ac4d9b73b704d1232086b8
diff --git a/dev-python/qiskit-aer/qiskit-aer-0.10.3.ebuild b/dev-python/qiskit-aer/qiskit-aer-0.10.3.ebuild
deleted file mode 100644
index 3fc6e2707460..000000000000
--- a/dev-python/qiskit-aer/qiskit-aer-0.10.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="High performance simulator for quantum circuits that includes noise models"
-HOMEPAGE="https://github.com/Qiskit/qiskit-aer"
-SRC_URI="https://github.com/Qiskit/qiskit-aer/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# The reference implementation of BLAS/CBLAS is not compatible with qiskit-aer right now,
-# because importing library causes an error.
-# /usr/lib/python3.9/site-packages/qiskit/providers/aer/backends/controller_wrappers.cpython-39-x86_64-linux-gnu.so: undefined symbol: slamch_
-# Using sci-libs/openblas instead here,
-# with the option to switch between reference/openblas implementation runtime (eselect-ldso).
-COMMON_DEPEND="
-	>=dev-python/numpy-1.16.3[${PYTHON_USEDEP}]
-	>=dev-cpp/nlohmann_json-3.1.1
-	>=dev-libs/spdlog-1.5.0
-	>=dev-cpp/muParserX-4.0.8
-	virtual/cblas[eselect-ldso]
-	sci-libs/openblas[eselect-ldso]"
-
-BDEPEND="
-	${COMMON_DEPEND}
-	>dev-util/cmake-3.17
-	>=dev-python/scikit-build-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.6[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	>=dev-python/qiskit-terra-0.19.1[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-# Remove cmake dependency from setup.py because of
-# invalid dependency description. We put this dependency check in BDEPEND.
-PATCHES=( "${FILESDIR}/qiskit-aer-0.10.3-remove-cmake-dependency.patch" )
-
-check_openblas() {
-	local libdir=$(get_libdir) me="openblas"
-
-	# check blas
-	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_blas} != "${me}" ]]; then
-		eerror "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
-		eerror "To use qiskit-aer, you have to issue (as root):"
-		eerror "\t eselect blas set ${libdir} ${me}"
-		return 1
-	fi
-	return 0
-}
-
-pkg_setup() {
-	if use test; then
-		check_openblas
-		if [ $? -ne 0 ]; then
-			die "Set blas implementation to openblas using 'eselect blas set openblas'!"
-		fi
-	fi
-}
-
-python_prepare_all() {
-	export DISABLE_CONAN="ON"
-	export DISABLE_DEPENDENCY_INSTALL="ON"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# We have to hide the source code directory so tests
-	# do not use these, but instead the compiled library.
-	mv qiskit qiskit.hidden || die
-	epytest
-	mv qiskit.hidden qiskit || die
-}
-
-pkg_postinst() {
-	check_openblas
-}
diff --git a/dev-python/qiskit-terra/Manifest b/dev-python/qiskit-terra/Manifest
index b4b6abb7aeca..715197a222d7 100644
--- a/dev-python/qiskit-terra/Manifest
+++ b/dev-python/qiskit-terra/Manifest
@@ -1,4 +1,3 @@
-AUX qiskit-terra-0.19.2-test-corrections.patch 1730 BLAKE2B 7fe634eefa9d1548c11b2dfd12c70972d2d8a789e7975aca85966105cd3b899d9a0bbed133fae765c9be3f806f146e6248a4b2409fc1f5449cf5bf15f9ab2dc4 SHA512 e3d3dafdb9165073dabace613cc82d48144e8a0bc2f21d41421614430b636237bd11e398ee741a4e1641f8cfa4df938b5c7e51c263e1fc6685670c2bd62830b6
 DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
 DIST ahash-0.8.0.crate 39776 BLAKE2B 577f82ca509d5c04e25d8dbf1d0929a2d4ffd9314b13eca4f05229cdf62f678a8284bc3cc422776bb0bec8a6db6178b5e8f7f7430043ca6fed9593ea34710272 SHA512 97f85602b516ddc30509ec16402f7e83065034c93224b4421b53fc3ff03301b59c2548608bfcd5147f04d5100d491c0f8c5c38361a7d6684c79a4d7e029ba826
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
@@ -39,7 +38,6 @@ DIST pyo3-build-config-0.16.6.crate 28891 BLAKE2B 26667482bf9f5b140daab9728f5896
 DIST pyo3-ffi-0.16.6.crate 60756 BLAKE2B 148e67de195577a1676c80be1a5538d80cf25b0d9eac9facfdcd223dc40484a9c3c7c84377f727e83e50118fa803591acc1d800b93adf29c91e6a15154c2856c SHA512 97c69900e2b355a002d10e48883cc8d4d9245d07f956087fb9c3b0ecfb9039c84c3f3a23f17caf28c637c4522f0fe252fbbb16b543825e4f724ee19232a34d22
 DIST pyo3-macros-0.16.6.crate 8453 BLAKE2B 518809b1236149f14b264d48f642e873aea2b22edb655cf4cf4d6307d2eeb7544228b80ca7559397d3483c837ae2ea9f772a26563d01a95613dad0a1a704c1e9 SHA512 95b6898da9974ef232b04197e47ea4e7d60de9f817da9a9995f07b05ca74965df2b2e8e8267d616b665b04ab810b93ca17255b20df89ac9c71014e5c9fd3a9f1
 DIST pyo3-macros-backend-0.16.6.crate 49252 BLAKE2B 9fc531507d4f9d0e7ed183987fbabd043f7c31afe6488c53c6100d98e75e5296e9ee7cc4eb14798967ac62e7d8c31d602eac5166699058def384e4f029a3cf0b SHA512 49d82cff8762eeb27d8220aa98b2be43f614445f156212d45abef052e347ba2f4a7930e7c5c8a9843ea895ac5c223afc6527d036a9cad00efff9bda18907b019
-DIST qiskit-terra-0.19.2.gh.tar.gz 9536647 BLAKE2B 966370a782179512f3c4cd209f604f536ac4ac503f4805681d5729f4d6df4020bbaa5a2beb2fc393506eaa67a81666254375f14b827e07e1c1478a381fde5b45 SHA512 d02c028a86927610f1bca63830cb489069e68e016ed744a4092a96ddde163ea8ca1071048fc82b1807d4136e1fb2b0fcdde6d1a639ffc2ebe7c99dfd50c2e3d4
 DIST qiskit-terra-0.22.0.gh.tar.gz 9243589 BLAKE2B 208f554de7fd6c11e76879a8c4c08f27859f1dd729494c3ab372e73e5205def0f97a5dac16bd26f632a80428d5ead1797509f67e78983eebdc34d092158a5124 SHA512 c7e901035e3bf57df7765ec84a1344663c8763c3da6b372202dde1abd9a840d5dc0f30b91d0fcc8516af28921c1fcedc84959e147f8dbfc372497a7d25a8c5a6
 DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
@@ -66,6 +64,5 @@ DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd
 DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
-EBUILD qiskit-terra-0.19.2.ebuild 2476 BLAKE2B 0b69a0e4f96fd344e8a9a342bb013db5cfd7a7d03eb41a621d657b9ebce7de6f4aa5340aace825d70382ef7db54fa0bcf4e6aaaf131ef6ce415122c252efd78b SHA512 e1d76df908d3fd5975afec991fd0cb13dc31950f1c7107d9e53c0cebca3299546857c82a64df14dc50f1f7c337c9eb84855fd7618cf7734a5da403e72fd2c8fc
-EBUILD qiskit-terra-0.22.0.ebuild 3889 BLAKE2B b64cd6a4ec951deb1364f76c77f74f52c48ba520ae6e58d662d9cfd1343440b0d9a22a36f9df25dd92aa214629b2fbe63d21c55792d694cb97fd7cbb52d13c81 SHA512 acd910e98924a804f46633a4e6079571fd570b7acc5c89cf587891cdf0ff4afb07196c77c0fa3453c919440451101d38071b45c587727aa7b9ad0da77ea698db
+EBUILD qiskit-terra-0.22.0-r1.ebuild 3632 BLAKE2B df80e4075d21230e3d89f29776efdf04ec33668f4190b22dc463206a60cff49b5544336dad09a1844045b59c8c88eaf727c0c9600077bae843cbf2598ac551e6 SHA512 09ac8b4ca6342bc08b8126b9ef3c74c2e1e8c25d998a10d524eff2cd2451d900444d437540f0a4f6a242c68b510c0cc33877d3dcb9ed102581c2c8ac3f658f04
 MISC metadata.xml 1099 BLAKE2B 4d2ae544b77d18aafe53ad0bfdc7bc32b9656eb4096d8f2ed0c2e71e8718d260d1030207753cd4e0b10748ec7508813f84a5232e7d491348be2c7ca1fcc5d860 SHA512 113bee16467977079ee15aab442d9255f9d3d3ad29dc27f2082b1f9b902856ce827aff722f988d4a9da2bc8762523002d8acb5702271ef87c188990c2b677038
diff --git a/dev-python/qiskit-terra/files/qiskit-terra-0.19.2-test-corrections.patch b/dev-python/qiskit-terra/files/qiskit-terra-0.19.2-test-corrections.patch
deleted file mode 100644
index ec44ebe75faa..000000000000
--- a/dev-python/qiskit-terra/files/qiskit-terra-0.19.2-test-corrections.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/test/python/qobj/test_pulse_converter.py b/test/python/qobj/test_pulse_converter.py
-index ea5b77e78..cde568ecf 100644
---- a/test/python/qobj/test_pulse_converter.py
-+++ b/test/python/qobj/test_pulse_converter.py
-@@ -341,7 +341,8 @@ class TestQobjToInstructionConverter(QiskitTestCase):
- 
-         self.assertEqual(evaluated_instruction.start_time, 1)
-         self.assertEqual(evaluated_instruction.duration, 1)
--        self.assertEqual(evaluated_instruction.instructions[0][-1], instruction)
-+        self.assertEqual(evaluated_instruction.instructions[0][-1].channel, instruction.channel)
-+        self.assertAlmostEqual(evaluated_instruction.instructions[0][-1].frequency, instruction.frequency)
- 
-     def test_delay(self):
-         """Test converted qobj from Delay."""
-diff --git a/test/randomized/test_transpiler_equivalence.py b/test/randomized/test_transpiler_equivalence.py
-index 302760279..1d0a3e16f 100644
---- a/test/randomized/test_transpiler_equivalence.py
-+++ b/test/randomized/test_transpiler_equivalence.py
-@@ -21,7 +21,7 @@ from hypothesis.stateful import Bundle, RuleBasedStateMachine
- 
- import hypothesis.strategies as st
- 
--from qiskit import execute, transpile, Aer
-+from qiskit import execute, transpile, BasicAer
- from qiskit import QuantumCircuit, QuantumRegister, ClassicalRegister
- from qiskit.circuit import Measure, Reset, Gate, Barrier
- from qiskit.test.mock import (
-@@ -98,7 +98,7 @@ class QCircuitMachine(RuleBasedStateMachine):
-     qubits = Bundle("qubits")
-     clbits = Bundle("clbits")
- 
--    backend = Aer.get_backend("qasm_simulator")
-+    backend = BasicAer.get_backend("qasm_simulator")
-     max_qubits = int(backend.configuration().n_qubits / 2)
- 
-     def __init__(self):
diff --git a/dev-python/qiskit-terra/qiskit-terra-0.19.2.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.19.2.ebuild
deleted file mode 100644
index 54fdccc634c0..000000000000
--- a/dev-python/qiskit-terra/qiskit-terra-0.19.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terra is the foundation on which Qiskit is built"
-HOMEPAGE="https://github.com/Qiskit/qiskit-terra"
-SRC_URI="https://github.com/Qiskit/qiskit-terra/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+visualization"
-KEYWORDS="~amd64"
-
-BDEPEND=">=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
-		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
-		app-text/poppler[png]
-		>=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	>=dev-python/rustworkx-0.10.1[${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}]
-	)"
-
-distutils_enable_tests pytest
-
-# Small issues with the tests.
-# qiskit.Aer module depends on qiskit-terra, it cannot be used,
-# and an exact comparison of float switched to approximate comparison.
-PATCHES=( "${FILESDIR}/qiskit-terra-0.19.2-test-corrections.patch" )
-
-python_test() {
-	# We have to hide the source code directory so tests
-	# do not use these, but instead the compiled library.
-	mv qiskit qiskit.hidden || die
-
-	# Some small tests are failing which test optional features.
-	# Why they fail is still under investigation.
-	# transpiler_equivalence tests take too long time, they are also skipped.
-	epytest -k 'not (TestOptions and test_copy) and not TestUnitarySynthesisPlugin and not test_transpiler_equivalence and not (TestPauliSumOp and test_to_instruction)'
-
-	mv qiskit.hidden qiskit || die
-}
diff --git a/dev-python/qiskit-terra/qiskit-terra-0.22.0.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.22.0-r1.ebuild
index 7a0c507d8577..b25eb56cf16e 100644
--- a/dev-python/qiskit-terra/qiskit-terra-0.22.0.ebuild
+++ b/dev-python/qiskit-terra/qiskit-terra-0.22.0-r1.ebuild
@@ -123,20 +123,22 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-# Small issues with the tests.
-# qiskit.Aer module depends on qiskit-terra, it cannot be used,
-# and an exact comparison of float switched to approximate comparison.
-#PATCHES=( "${FILESDIR}/qiskit-terra-0.19.2-test-corrections.patch" )
+src_prepare() {
+	find -name '*.py' -exec sed -i -e 's:retworkx:rustworkx:' {} + || die
+	distutils-r1_src_prepare
+}
 
 python_test() {
-	# We have to hide the source code directory so tests
-	# do not use these, but instead the compiled library.
-	mv qiskit qiskit.hidden || die
-
-	# Some small tests are failing which test optional features.
-	# Why they fail is still under investigation.
-	# transpiler_equivalence tests take too long time, they are also skipped.
-	epytest -n "$(makeopts_jobs)" -k 'not (TestOptions and test_copy) and not TestUnitarySynthesisPlugin and not test_transpiler_equivalence and not (TestPauliSumOp and test_to_instruction)'
+	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
+	)
+	local EPYTEST_IGNORE=(
+		# TODO, also apparently slow
+		test/randomized/test_transpiler_equivalence.py
+	)
 
-	mv qiskit.hidden qiskit || die
+	rm -rf qiskit || die
+	epytest -p xdist -n "$(makeopts_jobs)"
 }