15 files changed, 372 insertions, 6 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4bdb10a8c170..fea92af3e61b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/frozendict/Manifest b/dev-python/frozendict/Manifest
index ac456423cdb6..42350e0a9598 100644
--- a/dev-python/frozendict/Manifest
+++ b/dev-python/frozendict/Manifest
@@ -1,3 +1,5 @@
 DIST frozendict-2.3.5.gh.tar.gz 307566 BLAKE2B 8d8b7d483e248be5de3c6e689dbb7e8dc40f8a8112456308e6a0e633dee04640aa0bb43edcf07e2a9829b87b8d082aa0926581622372224e9636cca27eaeaef0 SHA512 9e3820f2a24f2362f1be82049df871449a5225a927efa7735a2e9320e3c9f835a4a0a99a0037a3366df55a5744b38e96b358a9cc624defa79f45a5bff4c3b61d
+DIST frozendict-2.3.6.gh.tar.gz 309471 BLAKE2B 1de3b0c2993243622d6f9c1058b086e3225216b6e80d0bc9b73b974ba2a1f18faa8ec97f5e1b3083e7ac4469517202fc273ec694f02e5405c5d4fc241acf9d14 SHA512 b57a77164f77b0f067e29377b7694ac9e4d7dbae617b649ed2018779dab5c3da27176481079386f43f3b3dc66a84cac0bd85b4b0b650072b812b3c6cffd06ba9
 EBUILD frozendict-2.3.5.ebuild 1108 BLAKE2B ea5636195e9158ebcb64d1b721f21e8cdeb79c50f625d15b465b278c7d4b7f4009ad95b7f57741944bc47f396e8ae49aee4e8444a266c12a2a2066cf141e1f81 SHA512 bddfdaa737d74b7cccde069d40ac19061156e22f32ffffe7f4cf286a5c454f97550be7f43a32f2cb12b6615340fd06e17eb70ebf8932d1da44b803bce12f7b5c
+EBUILD frozendict-2.3.6.ebuild 768 BLAKE2B 5d5805566f82798feefcfee33c5b0929b13b92fdd269940de3955a829ed1d9a2b39da37fcc5babeccc79524a5230e8dab35313f76eac69d2b25b44b552e96f2d SHA512 cd1c51153ec919548efe107c60962e250dc48f1373a690ac4333eea96966b910f6cf58cda4a926c209e3fc575a731326bcf76f3799cb9d8f8a34d9864bade033
 MISC metadata.xml 634 BLAKE2B 362d9aef54a08943047b2f7b04f74d142be6eb74c74d8242460a70e22a3d77d475f588057fbca3ec6f691f2516a52bc23016e694824d092470670e05e98a79d6 SHA512 7f452c4e377081a16c159ca73079a73666dbd862f237516cb3962bfa7a8c4d32f6c68c7bcd5ef37cade10b999fd026178ca2192bd8254d37da642c9bec81137c
diff --git a/dev-python/frozendict/frozendict-2.3.6.ebuild b/dev-python/frozendict/frozendict-2.3.6.ebuild
new file mode 100644
index 000000000000..9548bcbf1869
--- /dev/null
+++ b/dev-python/frozendict/frozendict-2.3.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple immutable mapping for python"
+HOMEPAGE="
+	https://github.com/Marco-Sulla/python-frozendict/
+	https://pypi.org/project/frozendict/
+"
+SRC_URI="
+	https://github.com/Marco-Sulla/python-frozendict/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/python-${P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	# This prevents the build system from ignoring build failures, sigh.
+	local -x CIBUILDWHEEL=1
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	rm -rf frozendict || die
+	epytest
+}
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index e7b4377e2e71..76b1d8f72c2f 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,4 +1,6 @@
 AUX httplib2-0.12.1-use-system-cacerts.patch 582 BLAKE2B ee2a407452ab557eec0934a175958ac7f1d1af3ad588b7f288b9e9f0a3d2b08146fdee05943e2681a1462986098256fa818d9561a4541ba0ed3b95984172271f SHA512 ff1b982e9f95f6efa53064b2a8d2748bf5a91a26fdaeb584f044d8e036b91034dbcf4719cb08855de412d6abcc33fe82e18fbd250c14d0ae2fea47b412fcafc3
 DIST httplib2-0.21.0.gh.tar.gz 373245 BLAKE2B d7194773c2b61cbf579da5aea7f52cb3481eed86896be215b942de7f9418a39c4a934868c9e01b6bfb050a32e4b7bc7ff775b28af5ba5db2827131e436bf0b04 SHA512 8269014f05f5e4b668c7dea8ae708b27a60b4216d712a93ab58b74f399ab5bc0dcdcd8c1411ccff587c7bdb6bc20917451ad969e5bef2d5c5262327cabe17bbb
+DIST httplib2-0.22.0.gh.tar.gz 373972 BLAKE2B 6adfbc61d4f898666512da5d02cf082fcaf76bf1816de955510f5c4721a36c38d99fef963d5150b62cca091543ed65bb1ef5f33ce99123e1cd2abe467d4970e3 SHA512 77210f85ccaa2d2cf4a6c89f5146ca5eb9a6f26f00e862f6d0716ec73baffdf94714ae1d5eaced4349920b91276a7835e2f028c6d9156e84c241514b198791e5
 EBUILD httplib2-0.21.0.ebuild 1859 BLAKE2B bbe446a39165ac74ceafcdd50d37fdbf0bc06f63beb32782421dec8479602c2b03ed541ff311235833863a51d44e3e5512a8ead0ab329c3c5a193fe492775a2c SHA512 6de23bec28b84c5e3d610696f99965cb613845d6a74814eba1db2fe9d18bc229d341705a730c5a8ea6c0bc5dcb92274e9bf2f3b7fbfab4be25fb53d9494c845c
+EBUILD httplib2-0.22.0.ebuild 1867 BLAKE2B 51cdae1dbfcccaf0a9b7d1b964d3df97af7c7d60b43b01ac03728e4dd0def426c94bb3e25892005355fbb5c021a9550d890a523a161f18c9cc86de08f737fce1 SHA512 08dd706674820651667ebea27775b173096dbf3e96b5e178682737c44fbf158630a40282de1176c7ba0eaffe78a22fcbfe942c62bbed49064175056ce51d94fb
 MISC metadata.xml 406 BLAKE2B fcac2ef4d82fd109083a57097d0e8b99e1fbb3103a2e8ffa29cd77acc0300b0d91d30661a5721f25680b822a1e0f22e4e457fa05bd8948c68b0e3712146a3de6 SHA512 5a94811b95720f0bdb57c725e35313ecc5a15f12a8f75e39c9034440eed957cfb3dd9e86437c0c7b1df51f47602723a7e94ce2b62509dab4eaa4feac02e1558c
diff --git a/dev-python/httplib2/httplib2-0.22.0.ebuild b/dev-python/httplib2/httplib2-0.22.0.ebuild
new file mode 100644
index 000000000000..2b1549a355b3
--- /dev/null
+++ b/dev-python/httplib2/httplib2-0.22.0.ebuild
@@ -0,0 +1,70 @@
+# 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="A comprehensive HTTP client library"
+HOMEPAGE="
+	https://pypi.org/project/httplib2/
+	https://github.com/httplib2/httplib2/
+"
+SRC_URI="
+	https://github.com/httplib2/httplib2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	app-misc/ca-certificates
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-libs/openssl
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	# cryptography dep is entirely optional, and has a good fallback
+	sed -i -e 's:from cryptography.*:pass:' tests/__init__.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken by using system certificates
+		tests/test_cacerts_from_env.py::test_certs_file_from_builtin
+		tests/test_cacerts_from_env.py::test_certs_file_from_environment
+		tests/test_cacerts_from_env.py::test_with_certifi_removed_from_modules
+
+		# broken by new PySocks, probably
+		tests/test_proxy.py::test_server_not_found_error_is_raised_for_invalid_hostname
+		tests/test_proxy.py::test_socks5_auth
+
+		# broken by recerting (TODO)
+		tests/test_https.py::test_min_tls_version
+		tests/test_https.py::test_max_tls_version
+
+		# new cryptography or openssl-3?
+		tests/test_https.py::test_client_cert_password_verified
+	)
+
+	# tests in python* are replaced by tests/
+	# upstream fails at cleaning up stuff
+	epytest tests
+}
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index 073a651367b0..38749d0cf1f2 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,5 +1,5 @@
 DIST nbclassic-0.5.1.tar.gz 20178622 BLAKE2B 1ff79c9af218011c697016ecef149f42e683607eebb8e199ef75957d9d3127858ce8f443aeedb60844e3277b4c8cd4959d123658a5103ab2112fec469ef01a96 SHA512 1dabc27ad115d1961e7881e7a51653449cae291c74aea222bbf92d49cb7bc9657ae1f1d9a81eafbd70bc0cafd57b75cd2c76bebf91aabc5fdd9eede534f1cec9
 DIST nbclassic-0.5.3.tar.gz 20199979 BLAKE2B aa509bbd2bab51b94f475e81b7e1c5661370e850680df8f64c86d76ff2aed7a84a0e6c00f36a695ef7f84cdc731fb7613107abc96fb13a3127ded6689d6e81a1 SHA512 07e26d4cb30e3388420ced182a31a050419f4a872256efca6684e4af0e08ec8bf7f6f14f127fe1391457ad5fc792377a1a7bafc0fa1a92eec455454c6321a9ec
 EBUILD nbclassic-0.5.1.ebuild 2340 BLAKE2B ca95be529e3827effd5b02d7d91f12a8aec6c794e9b115b021949aa4c11dfc7b605e43665ee29153001a96358402824eafcba3dc41da8a3d9e0e5b1757b2fdb2 SHA512 1e81fdba2be812e76dd892eb197bda5b95a5983e9b33a17ed3403bc61d97647b1e8c9de5cb03da4ef6bc574d814726b5e71b3667f344a51f2491125486a85b59
-EBUILD nbclassic-0.5.3.ebuild 2148 BLAKE2B f6bdfafab59122bf7f3df696b96ed76337fa52b61de7ee47b3780fabedb38b4021fbd4d5326f182e8de866ef0f792c69164cd161833902add7c3609857c4ed65 SHA512 5e550b1824ccfa6c9681c0eb3f4150913dfb393a274ec2ab145e71e54507165cd2ccff9a5699c7098793c5389b6db4915bfb01c3cb792f05433b6d2df20ef571
+EBUILD nbclassic-0.5.3.ebuild 2160 BLAKE2B 70f2495e797f686f9d83eaaa9e7aa0b4082c798f3b5e8636b787bd1ebfc4f4a3f3d292c42e4b38566bc2db1b5fd53eb1171642b1f41dd3a7eeb98c6aef42a84e SHA512 abfc97e7247fb4d91fb41149a929a498285ad2d8b0882776cf7a3d0749278c290f839aa31f6b510fbc65519cab7cc09aea66f8d40a5478dd555082cb784285ac
 MISC metadata.xml 407 BLAKE2B 8be751d3f2e0e1e2952c39cd1846285ebb994d833022767dde609294ee9f98044b1189934e7d27c3134b1f06c95705687491dbf52739bdd0bc17f06cfdff53cf SHA512 6cc07376da4e55e5df153fdb0f43371ed415bed6db1bce2f67dd113d1e0f1994974dd6bee746021efb2d8c36ca2ca534109227c541d38b37b652a68b9642f2cb
diff --git a/dev-python/nbclassic/nbclassic-0.5.3.ebuild b/dev-python/nbclassic/nbclassic-0.5.3.ebuild
index 77e7f9ad30af..98319d95b62b 100644
--- a/dev-python/nbclassic/nbclassic-0.5.3.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.3.ebuild
@@ -26,7 +26,6 @@ RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
 	>=dev-python/notebook_shim-0.1.0[${PYTHON_USEDEP}]
@@ -38,6 +37,9 @@ RDEPEND="
 
 	<dev-python/notebook-7[${PYTHON_USEDEP}]
 "
+PDEPEND="
+	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
+"
 
 # dev-python/nbval is missing impls
 BDEPEND="
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 52ec8f526fff..279e453e26a2 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,5 +1,5 @@
 DIST PyOpenGL-3.1.6.tar.gz 1903892 BLAKE2B 7d1109a09703a7113aa9cc02994662df77bea1da63e81a8adbdc812514b71e04bfa51dad9e48c0e0b98327e4f7deda7a8590c340a38127d38e91659f38739220 SHA512 b6f2f083df0fd7cf8f8a1077f42fa388bce94c0edde00ed6492104af8306c9925b74649cd2c222be4205b0892e7975de2f7591d0f0bcd9540eb53c0de95fec00
 DIST pyopengl-3.1.6-glut-font-egl.patch 1430 BLAKE2B 4b8962045b1efce2b4ec8ca759689d880e8df074e98c8c680172fd01d6cfbae33148cef41c46c7d1231674836d0009626ccedd873fcfe35f644fe9a2aaab2d5e SHA512 a0c491bca31cff312a2f431f89109cbf3aff276aee375325cacc5c6ebe37ad2119072ad7658e11b56efd62b18b8ed2642de999c79b0c999414e44c2b1ec7225b
-EBUILD pyopengl-3.1.6-r2.ebuild 1332 BLAKE2B 0a73635a53913a9995d5901d26b254932c7c51e517c92ebcb424b9c27a707243c37023190fc272356efa7e0759a8d48673f810477c23124dfef05fd5ac178547 SHA512 b5afbd53722b61f0bc42b26c4675f60bfe6861902b9c01e9753b62ae486f7143edef282e9954c316d562c9b2fbb658140d8fb0f581a8f35faed59fafc709bc22
+EBUILD pyopengl-3.1.6-r2.ebuild 1331 BLAKE2B a53021c4745308d782bfb3a11bc339db98813a59eea9019ed5b82ab56fddbeab1d00cc53302e6f7ed0dfd7d7880dbf056462119bf5c1c35b5b421aeb0629b708 SHA512 89011d11f18fa037d2216cad9ccec5b95916677d019612e58ef887da971cade785fe659bb4721c79a851b0d697efb99525a048d74515b512cccdc70725759baa
 EBUILD pyopengl-3.1.6.ebuild 1141 BLAKE2B 450f7d3f7f29f578171e0b6e232ac52bcb5c63fdc7612c367e99605665dd0bddb8e9156c4b3255adf18cb9f5d33bfc907131dd11db34432689e8c9d92726008e SHA512 c3fb429e35962ccf58ee1b3112ed51979706db28c5cf75116e8207a01ecae690db46458a6e9af8507b301defbc91daf7426956778b2d54884ea6a4539d312638
 MISC metadata.xml 422 BLAKE2B c9ee324fb408e8d0856193fde1324109e77c97f28fff0dc83d9c903cf3e2385c3401d8f949d50fc2e2a9c41b79c421298e04fc79639b79352138f41aeafb7018 SHA512 bedbbc7fcafc2c625f79241e75faeafd0d3c37b4186b5ef8842e8612d9527a4991f208b1878b1f1e28f4056eab2104e7acb57814e39ee82c0208d6f93fbb7b85
diff --git a/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild b/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
index b6e9981b895c..19a75dee2db2 100644
--- a/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/PyOpenGL-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/qiskit-terra/Manifest b/dev-python/qiskit-terra/Manifest
index 3406a26e4cf9..b56b8df96aae 100644
--- a/dev-python/qiskit-terra/Manifest
+++ b/dev-python/qiskit-terra/Manifest
@@ -41,6 +41,7 @@ DIST pyo3-ffi-0.18.1.crate 62852 BLAKE2B 86bc534333e05578b1bf890fdd71af685d626ae
 DIST pyo3-macros-0.18.1.crate 7174 BLAKE2B 0eb2d106d193cfb14fc8c9cce175458a38bc069f9c232a7bc541e2951bd06ad3dfab483f730ece97a4ca2827ad4dcd0444e77df6a8ff79cc5861c2985d0d2b7a SHA512 baf43c6c5ef8f5fcc91728d693d52453b779de5c48cfdb295449a32ce559c0304e3a93b43bad7b312eee1c44bbe680efc57423d4e38986f3c6eacebf07998609
 DIST pyo3-macros-backend-0.18.1.crate 48618 BLAKE2B 8db09610fd6fc95d1979a4065f89611c507ff7e7f72d9cd64590f85f6d8543ee6d234e772c55db88e3624808ad135389f5ff0edfd2eca6ecf1a29ece332c1c2e SHA512 20aed4aa485d6ffc02b0d08aa4c5fc086e73482aedb5ebce155c3f973d0e058902ef806740d483368eb80caac4ccc163516eaf56a027910d71cedc5bc0ee665c
 DIST qiskit-terra-0.23.2.gh.tar.gz 9530943 BLAKE2B 72160fc302162b3432aa11e5e063004e8eca7ba4d16320b96b6ba6e5621e7e89fd8d34a129fd6d41548d626aacd6461f084b23471fc126ef9e475afa9540b314 SHA512 92536209dae13c5a0720d3acc7f46f7632bbe3be35330970b6d166853727193388aa0afa613ec15f08a86cd3a55991d7c655342dc6a2987ac49588400e7f759a
+DIST qiskit-terra-0.23.3.gh.tar.gz 9524438 BLAKE2B 9b2c322f2db89e956aaa9a5b939daf38d9d85bb388f337a042f7e7595a021c38228e12c1d0fb2953d4bfbe622776d4d178bfa91821dc14bfcf282cef616f24cd SHA512 d5a92b2274bc14a8f74a8c6aed774d71f01921efd6178b2fdb5f054d7bf5d2db84f25da4d035af730338cb95001d1822336f97b383247fcb8accb629a5bd117d
 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
@@ -70,4 +71,5 @@ DIST windows_x86_64_gnu-0.42.0.crate 692493 BLAKE2B e00eae443cfed300480924465426
 DIST windows_x86_64_gnullvm-0.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf5db046ec945cb21ede76d2da477589e15d062ca6f04906dac80fdd2ef9fcda9244490aad86b401d0156eb6b65ba3599098e8cfe7 SHA512 242e11b4a0d50a0ffe8d0e26e971de30ef4d29260ae6749403d39cb4278297a240c1ec4112bb38151cbb11a6f3c8a743e84cd75b6a76adfeaee8e623649c9ecf
 DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9
 EBUILD qiskit-terra-0.23.2-r1.ebuild 4794 BLAKE2B ef322c8b61707beb7ef7e9702c50bfb611e26c468b66de46fd1a9fe0a026104bc4bbbf131b80fc402c0419398e1ca8f42420d765150f20b05de8756f5557d160 SHA512 fb78516570e4b1defab4a27c69dee55d93d2f959005342e56a2cea3d0399c7ab3d0d03136ce014bc53983b859da937ac1fcab76b58e113d4b33b6301e57b6381
+EBUILD qiskit-terra-0.23.3.ebuild 5549 BLAKE2B 45fdfcf760c4e0514f9a40c82a26ae4b12d886ac83092312843f409a2189f9e0ef40e262ae6deff8a629cc415a2895db1d9c915c355e788e612b0e02b4c7a095 SHA512 6f65a9ffb7f4cbc87263d4f781e02c1e9fe542347bf30155b78dd609f58a0b75c8a3728c2e1cee01600e366c97c571e9630b84dbc7646e69dff3a10e1be5fd6a
 MISC metadata.xml 1099 BLAKE2B 4d2ae544b77d18aafe53ad0bfdc7bc32b9656eb4096d8f2ed0c2e71e8718d260d1030207753cd4e0b10748ec7508813f84a5232e7d491348be2c7ca1fcc5d860 SHA512 113bee16467977079ee15aab442d9255f9d3d3ad29dc27f2082b1f9b902856ce827aff722f988d4a9da2bc8762523002d8acb5702271ef87c188990c2b677038
diff --git a/dev-python/qiskit-terra/qiskit-terra-0.23.3.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.23.3.ebuild
new file mode 100644
index 000000000000..0d2063c9c3f1
--- /dev/null
+++ b/dev-python/qiskit-terra/qiskit-terra-0.23.3.ebuild
@@ -0,0 +1,188 @@
+# 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..11} )
+
+inherit cargo distutils-r1 multiprocessing optfeature
+
+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}]
+	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
+		# DeprecationWarning: It is deprecated to return a value that is not None from a test case
+		# (<bound method BackendTestCase.test_configuration of <test.python.basicaer.test_statevector_simulator.StatevectorS...
+		test/python/basicaer/test_statevector_simulator.py::StatevectorSimulatorTest::test_configuration
+
+		# AssertionError: DeprecationWarning not triggered
+		test/python/pulse/test_block.py::TestBlockOperation::test_execute_block
+
+		# AssertionError: Lists differ: [] != ['INFO:LocalLogger:bound_pass_manager', 'INFO:LocalLogger:bound_pass_manager']
+		test/python/primitives/test_backend_estimator.py::TestBackendEstimator::test_bound_pass_manager
+		test/python/primitives/test_backend_sampler.py::TestBackendSampler::test_bound_pass_manager
+
+		# 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
+}
+
+pkg_postinst() {
+	optfeature "qiskit.circuit.classicalfunction support" dev-python/tweedledum
+}
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index fb7e929153b2..5cce6b045f4a 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -3,5 +3,5 @@ AUX symengine-0.9.2-setuptools-61.patch 566 BLAKE2B 362c880be08c98da85b1ae2a13ca
 DIST symengine.py-0.9.2.gh.tar.gz 110856 BLAKE2B 11330acc04970d367fe66787521776dbd803929d91802ea09d1bc54a96c8fd87e85114042f57fc8c007de2dcaa1b0503a8389ac677797cc2efc866d71d76d1db SHA512 ea9e8cb7dd789b551f5372c32b98365ab251bac838204b5c832783f9866c2774f5d411f2f59e5e60f17939a1c341702acfc3e3f7e77246330ab3cb74f5ba7cca
 DIST symengine.py-0.9.2.tar.gz 110856 BLAKE2B 11330acc04970d367fe66787521776dbd803929d91802ea09d1bc54a96c8fd87e85114042f57fc8c007de2dcaa1b0503a8389ac677797cc2efc866d71d76d1db SHA512 ea9e8cb7dd789b551f5372c32b98365ab251bac838204b5c832783f9866c2774f5d411f2f59e5e60f17939a1c341702acfc3e3f7e77246330ab3cb74f5ba7cca
 EBUILD symengine-0.9.2-r1.ebuild 1203 BLAKE2B b5b7a45528031359d386d35a5b79f82248027cfa80b4a8c1fbd86145791bafea52ccc1626ba594958f8b0b87cdce95559dc5835f74c85476bbc3a0979cfd6a23 SHA512 dc92dcd46f8b913c6a4d14a725bf1681dff6f595c16ea4845d03cd6cade9a970949a8d82e5a91073c466b8fb8dc84a5edb2a95485a18b002941d602758cbe05b
-EBUILD symengine-0.9.2-r2.ebuild 1181 BLAKE2B f0459729f3c71a07e7a731230cd51cb718a0b9458783408ddf074e89bf0d88813d4890724c199154134fd4ab14d83a82f73711f3d654c07709e82ed1d1e8bbc7 SHA512 1b6a03b733f2acbdbce0c0ef104e6234a2dda77ca23ce978c64befa4116444cd83da7d4b45e9663bf52a22c37b9aed5f77e61ba9233f2bd95b51aaea7fbf3ed8
+EBUILD symengine-0.9.2-r3.ebuild 1179 BLAKE2B 7082b8679541bc5db57b5cf4fa51b0cea5f13cfcbe40a4a55b6da91f84f3e326953880759b1dff40a3e9f3b98eecd65b854e02a1eda36c7bfafee56b7559ba40 SHA512 ea3d324c08ccf8cdd8bd495b59d379ca06e285efafaee29717fa51beb4bef416bf7924cdc5a9efacbe706933e6451be61e42d167d88aaa4e8a79e91bb449739e
 MISC metadata.xml 505 BLAKE2B 9c9b44455691ec31e5eed2f355dc4633ba05548c6e00fe49e665ad7fd1867bd6a7345f84409ea14049cc01818ef67d7795afff4e01fe88c25b1977f4d6f0fbff SHA512 6a774984cef49d82908bced7cf61bb5550207503335ae09abd9c08cdde5396cbf123d7ed5d49934ccf7dbc5167f0c13f2e6ecf31bca9f5af0a2f7c46f22bf9df
diff --git a/dev-python/symengine/symengine-0.9.2-r2.ebuild b/dev-python/symengine/symengine-0.9.2-r3.ebuild
index 2d540508032a..fb0fcbc0720c 100644
--- a/dev-python/symengine/symengine-0.9.2-r2.ebuild
+++ b/dev-python/symengine/symengine-0.9.2-r3.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 # See also https://github.com/symengine/symengine.py/blob/master/symengine_version.txt
 DEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/symengine-$(ver_cut 1-2):=
+	=sci-libs/symengine-$(ver_cut 1-2)*
 "
 RDEPEND="
 	${DEPEND}
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index 521f10f76692..274b83d62b05 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,3 +1,5 @@
 DIST tifffile-2023.3.15.gh.tar.gz 331071 BLAKE2B 4bb1f725bd38523dd60383aab530c8e8ec25a71fc5e9350cc77023ab2ce4bd8c5d85dc97a50144fc0148710be8bd7b0f8b5f20d4e2f9a85b541cc9b0e41ebfaa SHA512 b7f8f5a0a4dbacc409a39b1906104ee0024e7275ca1d7dd4cf3137b29dc38ef13103719ab191f7b61e2ef939e734d7442977d5f3a2c6560a1ce0361cd488ca7c
+DIST tifffile-2023.3.21.gh.tar.gz 331285 BLAKE2B ce63dc2f389d3e93cf50c52efe849423c091bdf048ce7f408fe6ee4556da4b9efcbaa031e7bc7f2b3f953117f7ce18014d1a77f9253a82d6dc4352464cf4151d SHA512 68b90d7eab293991b0227090d5b4c047469cd65c339f8d19da68097d99640c7f45cf8746eac4b3da9a388a58cd4343bbcad25496b08c13c913e48f982e14f5b9
 EBUILD tifffile-2023.3.15.ebuild 1600 BLAKE2B 2a75f65bcbe7cfa39d1d9778521c7c201c01e4bdaf5c5d24a47748e2eb6a849e7e1a1f508c1d49453de839bbfa2e0b0eaddbf8910c6d5a0fbb2e5364791a275e SHA512 ea82d23134791f8748abe1fcc0386fe57adb00d5eefe57174b3bbc2bca3c790538c13d78f675e5f1f4559b236a62738bcd613087a9c59893770466db90385dea
+EBUILD tifffile-2023.3.21.ebuild 1600 BLAKE2B 2a75f65bcbe7cfa39d1d9778521c7c201c01e4bdaf5c5d24a47748e2eb6a849e7e1a1f508c1d49453de839bbfa2e0b0eaddbf8910c6d5a0fbb2e5364791a275e SHA512 ea82d23134791f8748abe1fcc0386fe57adb00d5eefe57174b3bbc2bca3c790538c13d78f675e5f1f4559b236a62738bcd613087a9c59893770466db90385dea
 MISC metadata.xml 346 BLAKE2B 8cecb51fe01826a2a190c4e3020836f5706a918515a3ef5b4624fc3e9985411a8fd3c261fb7b6d8ad4f4486164487d11bdc2b071eeb5a95083db4c5323ae2dbe SHA512 81f8f6f5231d6cc9a8e7f95416a63cc52027f58fa54ce16bacfaa0ae285a48c5a3850d83d5ab50ca89be248ce386528db32811b23d61fa0d0e1e0cc737150465
diff --git a/dev-python/tifffile/tifffile-2023.3.21.ebuild b/dev-python/tifffile/tifffile-2023.3.21.ebuild
new file mode 100644
index 000000000000..66babf481615
--- /dev/null
+++ b/dev-python/tifffile/tifffile-2023.3.21.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read and write TIFF files"
+HOMEPAGE="
+	https://pypi.org/project/tifffile/
+	https://github.com/cgohlke/tifffile/
+	https://www.cgohlke.com/
+"
+SRC_URI="
+	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/dask[${PYTHON_USEDEP}]
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/test_tifffile.py::test_class_omexml
+	tests/test_tifffile.py::test_class_omexml_fail
+	tests/test_tifffile.py::test_class_omexml_modulo
+	tests/test_tifffile.py::test_class_omexml_attributes
+	tests/test_tifffile.py::test_class_omexml_multiimage
+	tests/test_tifffile.py::test_write_ome
+	tests/test_tifffile.py::test_write_ome_manual
+	# requires tons of free space
+	tests/test_tifffile.py::test_write_3gb
+	tests/test_tifffile.py::test_write_5GB_bigtiff
+	tests/test_tifffile.py::test_write_5GB_fails
+	tests/test_tifffile.py::test_write_6gb
+	tests/test_tifffile.py::test_write_bigtiff
+	'tests/test_tifffile.py::test_write_imagej_raw'
+	# TODO
+	tests/test_tifffile.py::test_issue_imagej_hyperstack_arg
+	tests/test_tifffile.py::test_issue_description_overwrite
+)