gentoo auto-resync : 06:11:2023 - 22:18:31

30 files changed, 58 insertions, 922 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index bb033fa0767d..2e2e4ec285f1 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/fb-re2/Manifest b/dev-python/fb-re2/Manifest
new file mode 100644
index 000000000000..fca739a41e84
--- /dev/null
+++ b/dev-python/fb-re2/Manifest
@@ -0,0 +1,3 @@
+DIST pyre2-1.0.7.gh.tar.gz 11684 BLAKE2B 748a409aa56dab0e088961bdd0b8659dfe0ed817ed1f6fe1dce15fd03e32b30472776c4e21a4f39e66aa5b3539650a657c36acf8b857332b255a139ef0f890a9 SHA512 c4579bf73af2f0a5ccbb6a28b87ce777ef08199947c1bdf740b426960f41b3530c97a7158fac7768b51c92b8a3797f8e66de61e0c942f239920bd5397d63e2c4
+EBUILD fb-re2-1.0.7-r1.ebuild 794 BLAKE2B 348d5b9d6f457083f1ce5b7b6bfcb45a57759546b1ec24eb70adf9e8c6e0c226011383f1b631c88403f0e833b7ddc269cfdb02ea79fccfb96dfda4537b17d9e0 SHA512 b7021e02985133e10cfd21befeb2de5af7cf2b8a05fe34f43bce5b17f9153218388465eb367497470fd3d6847c6f9cec31fda78e35614ce8f59e2511c51601db
+MISC metadata.xml 478 BLAKE2B f2283b1a19187b55a685f3fdeaa453b04f15b33318665383d5e082ec33e474647bc57610abfeda670736eca6108edcc167efb88e245372ffee938c6a9eb64685 SHA512 de5f466c3d94a98777ce707cfc4d169213d537e908ab54c290a3ad3edbd4abd4e869db259e38fbc9e475d1581a161766aa1590cd6b30b4807c36b7b20c4a8190
diff --git a/dev-python/fb-re2/fb-re2-1.0.7-r1.ebuild b/dev-python/fb-re2/fb-re2-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..31d33cd6b0eb
--- /dev/null
+++ b/dev-python/fb-re2/fb-re2-1.0.7-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+MY_P=pyre2-${PV}
+DESCRIPTION="Python bindings for dev-libs/re2"
+HOMEPAGE="
+	https://github.com/facebook/pyre2/
+	https://pypi.org/project/fb-re2/
+"
+SRC_URI="
+	https://github.com/facebook/pyre2/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/re2:=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# py3.12
+	# https://github.com/facebook/pyre2/pull/26
+	sed -e 's:assertRaisesRegexp:assertRaisesRegex:' \
+		-i tests/test_match.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyre2/metadata.xml b/dev-python/fb-re2/metadata.xml
index 02411b37bc6a..02411b37bc6a 100644
--- a/dev-python/pyre2/metadata.xml
+++ b/dev-python/fb-re2/metadata.xml
diff --git a/dev-python/pykka/Manifest b/dev-python/pykka/Manifest
index 05c5d44ae5ee..9c0b687c3700 100644
--- a/dev-python/pykka/Manifest
+++ b/dev-python/pykka/Manifest
@@ -1,5 +1,5 @@
-DIST pykka-3.1.1.gh.tar.gz 44312 BLAKE2B cb50f01e27ca7b6aec10b61fb41d59e1d4fec29b65595afbab1e931137ef35efe8860bab0ce3b7a6a30a44aa215deb237a4e13abc541c537dab062b7d14acf0d SHA512 0cb5ca7924f77d9d0ba8b2f288e2a635f7ce70ae49bd5f5ddf574f37f76252b575cb95898ab244d27b96090345bcbbe82bad1c97f5cca73fb8fffa707e553e55
 DIST pykka-4.0.0.gh.tar.gz 48507 BLAKE2B c394f493884b5f6a97d52e1f7038615510cfb1f75ef9f639fb3b1a4feb8ea5206edda6b647fd782fe16902cd1d9d210f168d0846942ed0f1b720a869029c2b34 SHA512 2078df598c23a742a62f374b1de76ba94f671e4af458532ba16245b32579462574c75adebf625aaab0a5875bc9e9803a10d2f8c82f783537ad893b896be00f12
-EBUILD pykka-3.1.1.ebuild 598 BLAKE2B 611d8b52964ce78b6827902f9e0563463fea28e1e9b204c375aca4e1412fb1b382334976c5b3344d3a747144546bcd00809e547a835efdff714bc553919372f0 SHA512 5a271703da0bd12c2026f6b794c82ad34e27be6cbb1ab69726e0268138f3e3c3f381ffba730a6aa80beec312db2a39770fc2566466d6edd658fc6b63602897f8
+DIST pykka-4.0.1.gh.tar.gz 48549 BLAKE2B 4aaeb31b9e9aa9cdc5125719a6a26e9d0b400d5df09bc55d240528bf3623aa46aaf70c2bafb868f8ec82accef239673fd8019571c48341305cac209213ba065c SHA512 fd49250cc641ffcfd3ad71f3716452ef6dbc54e201e56d8fb3d13d8315379058e5648b773327830d1e2eb60fe6a9576aac81d5613cd02af3ce5b42866716e030
 EBUILD pykka-4.0.0.ebuild 599 BLAKE2B c74aa5af3d2a96ff5ecac74bef03376c8b95d44608bd547cc3e534337a045a7a6d8d8ab28def671487b15ddbfc97c22b91d3c53a43cf0ebba773d92eec3dd12b SHA512 ab915f00d5609a894bd46d87220a8e74c65e94c4094add1dcbf5c18f2c5cd2656c2a7716c7a6c74d2ad24d8712fa9438784a762f69701c47c8b67dbf4badd0f0
+EBUILD pykka-4.0.1.ebuild 599 BLAKE2B d67e1ead0aa04bdacdc2475183ed51820f82c79ab73d89bc8ab08082d4a000c2fcf9f316cd5beaf120fc9052c20ec2d0bb5f30fde781bbc8202723cfc523fe0f SHA512 420a9b72184ddb2e4d53a0940b7e80ce55a52220922e8c370022c18169c1dcc93a0a56866cd3aef853efcc8d65ec497eb195fe916281458cf6fe21946c52bcf3
 MISC metadata.xml 360 BLAKE2B 6a3cd04142f75ec9e5c91d91e2d267e618e9824ea8b9b6be452c77b22c7d2f29d41068848f32c4e03e85f90767d4a8c83d2064cd9e20dda4997194fcc1bb9e81 SHA512 1fef48dd8d3bc9397d4bbbc90a8a1a3db7f39a1e6795e9057d6bfcde6ada8f939b2589235b07824c15ee348c42f1ffb372a10d7a49741d7db57b542ce31c11e9
diff --git a/dev-python/pykka/pykka-3.1.1.ebuild b/dev-python/pykka/pykka-4.0.1.ebuild
index 76ae776ec224..01455843e208 100644
--- a/dev-python/pykka/pykka-3.1.1.ebuild
+++ b/dev-python/pykka/pykka-4.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylatex/Manifest b/dev-python/pylatex/Manifest
index 9b32ae03cec8..72bdf0249b57 100644
--- a/dev-python/pylatex/Manifest
+++ b/dev-python/pylatex/Manifest
@@ -1,5 +1,5 @@
 DIST PyLaTeX-1.4.2.gh.tar.gz 307158 BLAKE2B bc20478759fc8315fd7fa2161d1638035c0dad4731c4cb254c78dfc45da2b361b3864d2ec04d6eb8fd7947e9908610eb0104444edff95666abba6a9f6da4cb4b SHA512 dcbe58de0ab715d6fbb571a7ad3981c875eacd08d06244b8715fa240df6f8f072417ae076a5caee204e000bf7eb55097b9ba49eddb5ce666470e494c15aa88ed
 DIST pylatex-1.4.1.tar.gz 301482 BLAKE2B c68c8bbf70c5099b3c3146922afe94dcf4f90bfc8644fa165ee27835f4a24642645f9849f2f9fd69656dc07dcc4807869275aacf33a1e5b9c59e539801f8e821 SHA512 55a5734e4d239cef4bcaafa0ba64eea013ba3e86d137de5a5f8311d70c949d783e2e7aad24d39d16a6febbe4bddc34e47248068e1328fe3f95f39a7c7019a3a9
 EBUILD pylatex-1.4.1.ebuild 1409 BLAKE2B 3640f58eef86b6dec0f544f3462890eee76cb9a389a707c39e38d83b2729327a4636063325c7924bb5b7e08b180a57d1f97ef5f49b1d79bd18eff0e26b634d3c SHA512 d203089ddbd5f0b9614070759ec95fc21bc35908403b05e323a4a7d4b63a2a16bf4f3aaf0bc665b0b4192c60904c3023bd745892281acf4bee599953b04fef94
-EBUILD pylatex-1.4.2.ebuild 1451 BLAKE2B ff3a14416c7db3256ad95c93b130dd479ef6ac51fd2f97878d032631be19562e783695937c0241f6a3da93c263f824686000fb8e18c322188d4d0ae6b382c48b SHA512 92d1f37f1ef095379613c332db9388fdf5c953a2cd39f6feee66781ee2d9096bbe38a7f3e2a677d06ca8eff463a6b0bb8397fd8bb60fdf33a81639e0787533c8
+EBUILD pylatex-1.4.2.ebuild 1449 BLAKE2B 98f557357877510f6cf279346e9e2e639f644a9c9e1f7929199ae5b03a6df0c51986459ef0d49cf65e87c48bc6d2c20b376edb8484d7ce5ff5849f7305203666 SHA512 261e2764f1cd9920a44660738eed9598c3adb5994341165216e3328fa0cb1d47d12660c0007f3acb726f50334eb7a0384b63346838da149092e6c5f1b3000572
 MISC metadata.xml 772 BLAKE2B 4be85c7cd4f0b794fb5af51784d40961156954320046cb773520f6898430cea11ebf367e84ff593ed8c95b23c741ad32b3e9920f06fcd719e05d153981009ba6 SHA512 54e51c201eb124c8ccfc44dba8c47fe77bde86090219e8f38e1aaba9392598eac991bb134a5f98ea585829f9d6d362f237866898f2ef898d6faaeea05354d9af
diff --git a/dev-python/pylatex/pylatex-1.4.2.ebuild b/dev-python/pylatex/pylatex-1.4.2.ebuild
index 64beb6cf7322..9e0084f70d18 100644
--- a/dev-python/pylatex/pylatex-1.4.2.ebuild
+++ b/dev-python/pylatex/pylatex-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 optfeature
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
index 7a2e74f4c4a0..83b69149680a 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -1,3 +1,3 @@
 DIST pylibacl-0.7.0.tar.gz 47543 BLAKE2B 277c03d01ab184ffaaa2c07c56e8f2464cba8b6da0fbd251880d274bef3b27dc211f1571425d4216e02bbeba8c623edfa56cafbb27932092ffce254e6be8df5d SHA512 077515a00c7a048faf7792acd9c3e768d35674c0b3f4ec72fdf37561c90ed12bb392582a4fb9a23b7916db3375278c2636f2844f362a8335e7ad68e1e9b9c3bd
-EBUILD pylibacl-0.7.0.ebuild 948 BLAKE2B fe6a573c3aa09991b909082dbc2cde23e23326573a9846bd55e394f12d2e312461559907b44413226e627244e8dca9eef699fb2329c90ed5456d866b60c8c3e2 SHA512 b5ce9e8ee51b7109d7199a27b38ae1ecd2748deed6c9c568dc7d1899febe47e8fcf386bd176b404d761b852e87b1fdbcc5af4fe2d4ffe364cf87eb4adfa78153
+EBUILD pylibacl-0.7.0.ebuild 949 BLAKE2B 8bb0575d130959a71103d2926f4f3bf5abe510c67c990948428e573737791b5c0dd8df8341fb2ea9886c1a1286448e437b66395a12b046e690b5002c133dfd4d SHA512 a7fc02dec0c3d10248e3b71a6a363c5bf1cc642702c02f76146a158aa07a8f5c351af0c2187cd6a6fabaf8599e08d3d1a760528f30273b26285275361c1bdd21
 MISC metadata.xml 446 BLAKE2B 0e111cfd834a03f88984dac937b5b3d09a7675338f0381d30603b0512d7f5ae1f486a832d060ecfb9c5946c7273893ed030555062b8bd3f26f10765c28a90143 SHA512 7df5bf16220e50c851fb03af84a600eaba23fdb703aefc2586aa2d27a1e55a18ad7b117274b8a07c7d7997dfd96fd51bd2dca6d3a1dad01cacafa678a5c8a794
diff --git a/dev-python/pylibacl/pylibacl-0.7.0.ebuild b/dev-python/pylibacl/pylibacl-0.7.0.ebuild
index 887fdb9687df..e13e8b005169 100644
--- a/dev-python/pylibacl/pylibacl-0.7.0.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.7.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index 9b69736a561f..f23733bedc02 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,4 +1,4 @@
 AUX pylibmc-1.6.1-fix-test-failures-r1.patch 516 BLAKE2B b471ca80b11beff5ac0119f5eafaf437a74022c977a884b8bdf4ef2afdb3d535ad6602db9b1206fb6649bf57ffe5bbd17509d3dda3b6604fcfa428b592dbeae3 SHA512 802337b66cbd188cc81208420448da24cecde3c01d435d6814437f0ee31850b6ef8a53f61647740da340a69971e5fe570cc2a8c1b31226e425ce7ff88bca101c
 DIST pylibmc-1.6.3.gh.tar.gz 72154 BLAKE2B 3367651d355cb9c6693d8162e740c855c8f84f6b2a5f54ba5fb7f505474263650b46d5ed04c11af2199a7b40c6d4cf0d13a63d2d76a395ff30570a4a3e5259ec SHA512 4bc85d305410f775a39d8d3f64a7e97538ed6ae890cd64833e5bff92fbb60fe8ebc4cc7956df015f6590eb55b7009bd36b299dc636ee0da7f71ed51cc98f3012
-EBUILD pylibmc-1.6.3.ebuild 1271 BLAKE2B d94fd8dbe80d265761f92771a7e954988f2ba9108b3d0fea00601b08ce8b9b8fc25c7a9ee5ee525b13c1bdc79e70cfa71c34f4d0a231478fd5eb27afcb1194e5 SHA512 78b6ca2dde3117cbec5685e9dff3fc818d72d70f9bfe68af5f29e8002d12c4e26f2a648e63430d3b1c89a0b0482062fa2236b7c80869bd65a8bb6e726901bdbf
+EBUILD pylibmc-1.6.3.ebuild 1272 BLAKE2B 187acf10dbbae7a0ead20177310c3475d8c7024cc1bbb9a60c4583894fc64bd3fbc5197674f1f9af237239437285f1114b6a71093ab7915c616623831cd7a7b4 SHA512 cc3f342bbf43a993a81d4ec875995a1034b38bbc7814b7af59bf6889e1ff7adf0f2c6e8de016cb7583527db6a2fd9863d10745a53c0236c093490263d57cc87a
 MISC metadata.xml 367 BLAKE2B fd37f3e072661e616dcfabb2054827a7b1c3830e555cb6fa461e93dadcd39ab1856c0ad4cbe03be85924889b97ba7cc88da651011a4b1c5622fcd950339f7e2d SHA512 33977c15a726c2039221bcbd282244c240013922bd4f1398e75f01ebd68dd0f8574ac890ddb578cb633a89b52584927800f86dcb4a1eb0ab27b165c38b9a91e6
diff --git a/dev-python/pylibmc/pylibmc-1.6.3.ebuild b/dev-python/pylibmc/pylibmc-1.6.3.ebuild
index d0dfa09680d1..68be0892d91d 100644
--- a/dev-python/pylibmc/pylibmc-1.6.3.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyre2/Manifest b/dev-python/pyre2/Manifest
deleted file mode 100644
index 2aa689ecaa57..000000000000
--- a/dev-python/pyre2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyre2-1.0.7.tar.gz 11684 BLAKE2B 748a409aa56dab0e088961bdd0b8659dfe0ed817ed1f6fe1dce15fd03e32b30472776c4e21a4f39e66aa5b3539650a657c36acf8b857332b255a139ef0f890a9 SHA512 c4579bf73af2f0a5ccbb6a28b87ce777ef08199947c1bdf740b426960f41b3530c97a7158fac7768b51c92b8a3797f8e66de61e0c942f239920bd5397d63e2c4
-EBUILD pyre2-1.0.7.ebuild 468 BLAKE2B c72251a962fc5ab85f819e47a8542fee5d6323be89ff4a5dab3d210c438bb991a83304fc53ce6d68c187a2a63402b29f07dbd8d1670b41aea759a22c9f3639a0 SHA512 739b1cc57c7a5f5b412ad89f78dfc17eaf7b208a9ba5b20b5c4b98a1bdf7e9c3c920edbd63eff9fbf9886bfda9276460d28e836788b6bbed2e3bed0ead754941
-MISC metadata.xml 478 BLAKE2B f2283b1a19187b55a685f3fdeaa453b04f15b33318665383d5e082ec33e474647bc57610abfeda670736eca6108edcc167efb88e245372ffee938c6a9eb64685 SHA512 de5f466c3d94a98777ce707cfc4d169213d537e908ab54c290a3ad3edbd4abd4e869db259e38fbc9e475d1581a161766aa1590cd6b30b4807c36b7b20c4a8190
diff --git a/dev-python/pyre2/pyre2-1.0.7.ebuild b/dev-python/pyre2/pyre2-1.0.7.ebuild
deleted file mode 100644
index 0b7240daf0e3..000000000000
--- a/dev-python/pyre2/pyre2-1.0.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for dev-libs/re2"
-HOMEPAGE="https://github.com/facebook/pyre2/"
-SRC_URI="https://github.com/facebook/pyre2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/re2:="
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 579be0e4ef06..7a6a88d743b6 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,7 +1,4 @@
-AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f
 AUX pyside2-tools-5.15.11-no-copy-uic.patch 1343 BLAKE2B dbabe4c0a46b0f3ccb160df34626258154efaa69554507b87e0cebe638c93b9abc6d3cf6d72f0c90833d21646e9b44a2ea0bbebeb2f11f92a748adf4f9663277 SHA512 4dbc2bbca3c16aafeeba8d2384d15dd28d7f8611027850293f165af37f9cf0ba17b1617cee06125c2e37edb011ecdeb00feb84edb8cf6c901b9e32b6d9cba639
-DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2
 DIST pyside-setup-opensource-src-5.15.11.tar.xz 3584760 BLAKE2B c4d60439a218451eb0c505031524fe1e30a117b7e89a28b5cd7518c193a8d2de01a5db8cb3acdd97c81da6dddff99f786c6c763427f78cdd0af4031122ac2d24 SHA512 377b3f6a793313cf7f5bea0dcef6630bac32d79b247e213d0b1b719805b35692aa8dd9a8896c75c6266f05af38809f574051d64b1a2f958a48c90167feccfb91
-EBUILD pyside2-tools-5.15.10.ebuild 1661 BLAKE2B bd0332d0e204e18b9ed20b867de3ba7b061c3d2e5dd2a8c75cd54f9ddd1f683a5dbcb7807adec6ddcb5e09c40cfd0856840cd19830fd93b6576c870cd7edb2f5 SHA512 42966f0de37d0bebed199f36ddf57660a15d49e37d7745bac3ce2a9c82706475fca8a55267648871131dea369601ea1ba74f6e79d53f5e81ec50cad578241887
 EBUILD pyside2-tools-5.15.11-r1.ebuild 1593 BLAKE2B ef7c11fb6ba0213f607103bacb1a0e1083d6784441c1abc4c12c4d5feea7683d066b0f6b28decc6bfb7e243f8fcd64e08f3735aa9378aa7aae6d6e766e54227e SHA512 51a294af97e39738721c02928e79e8e619c8555dfb4320f7a330a36dca363cfe0abd74c53ac6c0f7bd1341cd6320afc127ed5cdec0dbeef6d1ae6ab44d9591ca
 MISC metadata.xml 402 BLAKE2B 28348df442d189eadb56e04dfda71c1d5a56868aae85611a7d77ecdc7651e34ce02563c8da1270aad55758e2dd4301de44434e0bbdb010ef484e240068602ede SHA512 a54866110e38c24d67d60286c64b63dc0b537c55eb201b84b9173b47710b6e8a840d9072ca46fbef969bf481e43e1d8824b20655d7fe6b300cfd5333c3f74a41
diff --git a/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch b/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
deleted file mode 100644
index 60de6aa07ee7..000000000000
--- a/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 20a5e19..575c1df 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,38 +55,6 @@ else()
-     set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}")
- endif()
- 
--install(FILES "${UIC_PATH}"
--        DESTINATION bin
--        PERMISSIONS
--        OWNER_EXECUTE OWNER_WRITE OWNER_READ
--        GROUP_EXECUTE GROUP_READ
--        WORLD_EXECUTE WORLD_READ)
--
--install(FILES "${RCC_PATH}"
--        DESTINATION bin
--        PERMISSIONS
--        OWNER_EXECUTE OWNER_WRITE OWNER_READ
--        GROUP_EXECUTE GROUP_READ
--        WORLD_EXECUTE WORLD_READ)
--
--if (EXISTS ${DESIGNER_PATH})
--    if (APPLE)
--        install(DIRECTORY "${DESIGNER_PATH}"
--                DESTINATION bin
--                FILE_PERMISSIONS
--                OWNER_EXECUTE OWNER_WRITE OWNER_READ
--                GROUP_EXECUTE GROUP_READ
--                WORLD_EXECUTE WORLD_READ)
--    else()
--        install(FILES "${DESIGNER_PATH}"
--                DESTINATION bin
--                PERMISSIONS
--                OWNER_EXECUTE OWNER_WRITE OWNER_READ
--                GROUP_EXECUTE GROUP_READ
--                WORLD_EXECUTE WORLD_READ)
--    endif()
--endif()
--
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
-                "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-                IMMEDIATE @ONLY)
-@@ -113,14 +81,6 @@ endif()
- 
- add_subdirectory(pylupdate)
- 
--# pyside2-rcc, pyside2-uic, pyside2-designer, shiboken and pyside2-lupdate entrypoints
--install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside_tool.py
--        DESTINATION bin
--        PERMISSIONS
--        OWNER_EXECUTE OWNER_WRITE OWNER_READ
--        GROUP_EXECUTE GROUP_READ
--        WORLD_EXECUTE WORLD_READ)
--
- if (BUILD_TESTS)
-     enable_testing()
-     add_subdirectory(tests)
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild
deleted file mode 100644
index 24d169ccfa4f..000000000000
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{10..11} )
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake python-r1
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="PySide development tools (pyside2-lupdate with support for Python)"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-python/pyside2-${PV}[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-# the tools conflict with tools from QT
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.1-dont-install-tools.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	# The tests are only related to the tools that we don't install
-	local mycmakeargs=(
-		-DBUILD_TESTS=OFF
-	)
-
-	pyside-tools_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-		)
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
-	}
-
-	python_foreach_impl pyside-tools_configure
-}
-
-src_compile() {
-	pyside-tools_compile() {
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
-	}
-
-	python_foreach_impl pyside-tools_compile
-}
-
-src_install() {
-	pyside-tools_install() {
-		python_doexe "${BUILD_DIR}/pylupdate/pyside2-lupdate"
-	}
-
-	python_foreach_impl pyside-tools_install
-
-	doman pylupdate/pyside2-lupdate.1
-	einstalldocs
-}
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 913e74ba3050..223ae64f0a31 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,8 +1,3 @@
-AUX pyside2-5.15.2-python310.patch 508 BLAKE2B bdfc33975d1dd0c9eb73d1bae3ec2aff8c1ab1eace10dbde18b467c451605ef5e8c278965043d3cf19dfa8dc80f3fe4bdc1caadd15119303c3e134e364ed5098 SHA512 69a8691d452472f3ae8a58eadd1c1d69cef186192f9fe8311ae65419c94a9efc0331e9446b97f688777f3d5c7ef5a0100bed2e4ce3956b2a4aacfad0b95c1c75
-AUX pyside2-5.15.2-python311-fixups.patch 1962 BLAKE2B 37d91352ea09eaef6d36c600165e4fea74145b0fa05620e739254d3983acc501455154fc51ce3448aa4f60a00cd377f0896cb3dc14f1a921d6948dc53c500784 SHA512 39e999c80ed2717eaf59b47c12e64208d1b54d3d61daacf7a8ebeb4586f3b7312dd5db3fc53d4d2f3c426d80729e5d655e9b612153c704b40b7d261ddd57e580
-AUX pyside2-5.15.2-python311.patch 1777 BLAKE2B 1afa7c39755c4f91b4b4c951f59e1a3190f924d8b20cf2140ad5342c2fa046ff7e6bec540bea9d7652116894e0cb7f5fa5ea73067212ca5b631382e7139d7786 SHA512 b88f300e4944cbb9adc8ac887e263e74e088a1b291000c86f6677a01241939e612fa5eebba3807fb2318477e68de241914832cc92ed0470726804d3098486120
-DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2
 DIST pyside-setup-opensource-src-5.15.11.tar.xz 3584760 BLAKE2B c4d60439a218451eb0c505031524fe1e30a117b7e89a28b5cd7518c193a8d2de01a5db8cb3acdd97c81da6dddff99f786c6c763427f78cdd0af4031122ac2d24 SHA512 377b3f6a793313cf7f5bea0dcef6630bac32d79b247e213d0b1b719805b35692aa8dd9a8896c75c6266f05af38809f574051d64b1a2f958a48c90167feccfb91
-EBUILD pyside2-5.15.10-r3.ebuild 9201 BLAKE2B 19fa8f90205d11ed6fb71f47c896c6fefc48f5fa01952805b977e15ae7f782f1e080585864adb11ea74caa5fcb3ebe60864a7ec04a6d8e6f30f125c6791edc95 SHA512 ebfa127a76ba24b9d5be2c60655775679a60c9e6e5b6d3202766307a94e31884c00322ef39a1888ccf93598bd184165ed7c94d3591d102d0f86203b68aa63bb7
 EBUILD pyside2-5.15.11-r1.ebuild 9049 BLAKE2B d61db4c46a5486fc06c17bfd305262b4dfeba05c6ca7e37abca3a4cc67cd888a702587f2f024d516151a50a033b864f60d7dab474803cf9a349ba7240834e5ab SHA512 f5f5869fc2726bcb1d321e7cc2dbb056c9854387c9694f670010492489e65c4fd2c36455671adbc1db4fc83d0bef8e2252c994fa30281667f56b10f0a220af2d
 MISC metadata.xml 2143 BLAKE2B 0e07f94230c96f0d0cad7fc8c066356f20770d8ec285aaa049bc3650ec2f81837512d6ef217472ce799ce85a1e0a93d275d8b13f770bd68e6e86e5de495c26e8 SHA512 7bbd56f0e8bdece4cde891e8f864802fe872861fd1fa1398b3dac5554e212545acd47aa763389e685e37b2d2b8679212e06b0a8c589f824b71bcce4811973102
diff --git a/dev-python/pyside2/files/pyside2-5.15.2-python310.patch b/dev-python/pyside2/files/pyside2-5.15.2-python310.patch
deleted file mode 100644
index cb2af4537cac..000000000000
--- a/dev-python/pyside2/files/pyside2-5.15.2-python310.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr libpyside/feature_select.cpp libpyside/feature_select.cpp
---- a/libpyside/feature_select.cpp	2020-11-11 14:51:30.000000000 +0200
-+++ b/libpyside/feature_select.cpp	2021-12-01 15:39:40.356426568 +0200
-@@ -405,6 +405,8 @@ static inline PyObject *SelectFeatureSet
-             if (!SelectFeatureSetSubtype(sub_type, select_id))
-                 break;
-         }
-+        // PYSIDE-1436: Clear all caches for the type and subtypes.
-+        PyType_Modified(type);
-     }
-     return type->tp_dict;
- }
diff --git a/dev-python/pyside2/files/pyside2-5.15.2-python311-fixups.patch b/dev-python/pyside2/files/pyside2-5.15.2-python311-fixups.patch
deleted file mode 100644
index d91b0b6806ca..000000000000
--- a/dev-python/pyside2/files/pyside2-5.15.2-python311-fixups.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-The Fedora / upstream fixes (shiboken2-5.15.2-python311.patch) end up breaking
-Python 3.8 compatibility (maybe 3.9 too, but didn't get that far).
-
-Wrap them with PY_VERSION_HEX for Python 3.11.
---- a/libpyside/pysideqflags.cpp
-+++ b/libpyside/pysideqflags.cpp
-@@ -187,7 +187,12 @@ namespace QFlags
-         }
-         newspec.slots = SbkNewQFlagsType_spec.slots;
-         PyTypeObject *type = (PyTypeObject *)SbkType_FromSpec(&newspec);
--        Py_SET_TYPE(type, &PyType_Type);
-+
-+        #if PY_VERSION_HEX < 0x030B00A1
-+            Py_TYPE(type) = &PyType_Type;
-+        #else
-+            Py_SET_TYPE(type, &PyType_Type);
-+        #endif
- 
-         PySideQFlagsType *flagsType = reinterpret_cast<PySideQFlagsType *>(type);
-         PepType_PFTP(flagsType)->converterPtr = &PepType_PFTP(flagsType)->converter;
---- a/libpyside/pysidesignal.cpp
-+++ b/libpyside/pysidesignal.cpp
-@@ -162,7 +162,13 @@ PyTypeObject *PySideSignalTypeF(void)
-     if (!type) {
-         type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&PySideSignalType_spec));
-         PyTypeObject *hold = Py_TYPE(type);
--        Py_SET_TYPE(type, PySideMetaSignalTypeF());
-+
-+        #if PY_VERSION_HEX < 0x030B00A1
-+            Py_TYPE(type) = PySideMetaSignalTypeF();
-+        #else
-+            Py_SET_TYPE(type, PySideMetaSignalTypeF());
-+        #endif
-+
-         Py_INCREF(Py_TYPE(type));
-         Py_DECREF(hold);
-     }
---- a/libpyside/pysideweakref.cpp
-+++ b/libpyside/pysideweakref.cpp
-@@ -90,7 +90,13 @@ PyObject *create(PyObject *obj, PySideWeakRefFunction func, void *userData)
- 
-     if (Py_TYPE(PySideCallableObjectTypeF()) == 0)
-     {
--        Py_SET_TYPE(PySideCallableObjectTypeF(), &PyType_Type);
-+
-+        #if PY_VERSION_HEX < 0x030B00A1
-+            Py_TYPE(PySideCallableObjectTypeF()) = &PyType_Type;
-+        #else
-+            Py_SET_TYPE(PySideCallableObjectTypeF(), &PyType_Type);
-+        #endif
-+
-         PyType_Ready(PySideCallableObjectTypeF());
-     }
- 
diff --git a/dev-python/pyside2/files/pyside2-5.15.2-python311.patch b/dev-python/pyside2/files/pyside2-5.15.2-python311.patch
deleted file mode 100644
index 70b07c4800fd..000000000000
--- a/dev-python/pyside2/files/pyside2-5.15.2-python311.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://src.fedoraproject.org/fork/pviktori/rpms/python-pyside2/raw/5da9902bd8732b49eb722d71f306d4ab197c84b8/f/python3.11.patch
-
-From 77fdd690ca14e97b4c800c4127362ca0c83a716a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Thu, 9 Jun 2022 13:45:07 +0200
-Subject: [PATCH] Fix usage of Py_TYPE() for Python 3.11
-
-The macro was changed to a function, no longer allowing for assignment.
---- a/libpyside/pysideqflags.cpp
-+++ b/libpyside/pysideqflags.cpp
-@@ -187,7 +187,7 @@ namespace QFlags
-         }
-         newspec.slots = SbkNewQFlagsType_spec.slots;
-         PyTypeObject *type = (PyTypeObject *)SbkType_FromSpec(&newspec);
--        Py_TYPE(type) = &PyType_Type;
-+        Py_SET_TYPE(type, &PyType_Type);
- 
-         PySideQFlagsType *flagsType = reinterpret_cast<PySideQFlagsType *>(type);
-         PepType_PFTP(flagsType)->converterPtr = &PepType_PFTP(flagsType)->converter;
---- a/libpyside/pysidesignal.cpp
-+++ b/libpyside/pysidesignal.cpp
-@@ -162,7 +162,7 @@ PyTypeObject *PySideSignalTypeF(void)
-     if (!type) {
-         type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&PySideSignalType_spec));
-         PyTypeObject *hold = Py_TYPE(type);
--        Py_TYPE(type) = PySideMetaSignalTypeF();
-+        Py_SET_TYPE(type, PySideMetaSignalTypeF());
-         Py_INCREF(Py_TYPE(type));
-         Py_DECREF(hold);
-     }
---- a/libpyside/pysideweakref.cpp
-+++ b/libpyside/pysideweakref.cpp
-@@ -90,7 +90,7 @@ PyObject *create(PyObject *obj, PySideWeakRefFunction func, void *userData)
- 
-     if (Py_TYPE(PySideCallableObjectTypeF()) == 0)
-     {
--        Py_TYPE(PySideCallableObjectTypeF()) = &PyType_Type;
-+        Py_SET_TYPE(PySideCallableObjectTypeF(), &PyType_Type);
-         PyType_Ready(PySideCallableObjectTypeF());
-     }
- 
diff --git a/dev-python/pyside2/pyside2-5.15.10-r3.ebuild b/dev-python/pyside2/pyside2-5.15.10-r3.ebuild
deleted file mode 100644
index fa43d3ed66e7..000000000000
--- a/dev-python/pyside2/pyside2-5.15.10-r3.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit cmake python-r1 virtualx
-
-# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
-# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide2/QtGui/CMakeLists.txt" and
-# "PySide2/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/pyside2"
-
-# See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
-# Shall we allow essential modules to be disabled? They are:
-# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
-# x11extras (for X)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE="
-	3d charts +concurrent datavis designer gles2-only +gui help location
-	multimedia +network positioning +printsupport qml quick
-	scxml sensors speech +sql svg test +testlib webchannel webengine websockets
-	+widgets +x11extras xml xmlpatterns
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liners from within "${S}":
-#     $ grep 'set.*_deps' PySide2/Qt*/CMakeLists.txt
-#     $ cat /lib64/cmake/Qt5*/Qt5*.cmake | grep -i DEPENDENCIES
-# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	3d? ( gui network )
-	charts? ( gui widgets )
-	datavis? ( gui )
-	designer? ( gui widgets xml )
-	gles2-only? ( gui )
-	help? ( gui sql widgets )
-	location? ( gui network positioning quick )
-	multimedia? ( gui network widgets )
-	printsupport? ( gui widgets )
-	qml? ( gui network )
-	quick? ( gui network qml widgets network )
-	speech? ( multimedia )
-	sql? ( widgets )
-	svg? ( widgets )
-	testlib? ( widgets )
-	webchannel? ( qml )
-	webengine? (
-		gui network positioning quick qml
-		widgets? ( printsupport network webchannel )
-	)
-	websockets? ( network )
-	widgets? ( gui )
-	x11extras? ( gui )
-"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:5"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-python/shiboken2-${PV}[${PYTHON_USEDEP}]
-	=dev-qt/qtcore-${QT_PV}
-	=dev-qt/qtopengl-${QT_PV}[gles2-only=]
-	=dev-qt/qtserialport-${QT_PV}
-	3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
-	charts? ( =dev-qt/qtcharts-${QT_PV}[qml?] )
-	concurrent? ( =dev-qt/qtconcurrent-${QT_PV} )
-	datavis? ( =dev-qt/qtdatavis3d-${QT_PV}[qml?,gles2-only=] )
-	designer? ( =dev-qt/designer-${QT_PV} )
-	gui? ( =dev-qt/qtgui-${QT_PV}[jpeg,gles2-only=] )
-	help? ( =dev-qt/qthelp-${QT_PV} )
-	location? ( =dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[qml?,gles2-only=,widgets?] )
-	network? ( =dev-qt/qtnetwork-${QT_PV} )
-	positioning? ( =dev-qt/qtpositioning-${QT_PV}[qml?] )
-	printsupport? ( =dev-qt/qtprintsupport-${QT_PV}[gles2-only=] )
-	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	quick? (
-		=dev-qt/qtdeclarative-${QT_PV}[widgets?]
-		=dev-qt/qtquickcontrols2-${QT_PV}[widgets?]
-	)
-	scxml? ( =dev-qt/qtscxml-${QT_PV} )
-	sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] )
-	speech? ( =dev-qt/qtspeech-${QT_PV} )
-	sql? ( =dev-qt/qtsql-${QT_PV} )
-	svg? ( =dev-qt/qtsvg-${QT_PV} )
-	testlib? ( =dev-qt/qttest-${QT_PV} )
-	webchannel? ( =dev-qt/qtwebchannel-${QT_PV}[qml] )
-	webengine? ( || (
-		=dev-qt/qtwebengine-${QT_PV}[alsa,widgets?]
-		=dev-qt/qtwebengine-${QT_PV}[pulseaudio,widgets?]
-		)
-	)
-	websockets? ( =dev-qt/qtwebsockets-${QT_PV}[qml?] )
-	widgets? ( =dev-qt/qtwidgets-${QT_PV}[gles2-only=] )
-	x11extras? ( =dev-qt/qtx11extras-${QT_PV} )
-	xml? ( =dev-qt/qtxml-${QT_PV} )
-	xmlpatterns? ( =dev-qt/qtxmlpatterns-${QT_PV}[qml?] )
-"
-DEPEND="${RDEPEND}
-	test? ( x11-misc/xvfb-run )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.2-python310.patch"
-	"${FILESDIR}/${PN}-5.15.2-python311.patch"
-	"${FILESDIR}/${PN}-5.15.2-python311-fixups.patch"
-)
-
-src_configure() {
-	# See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DCore=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Location=$(usex !location)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !positioning)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickControls2=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !quick yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineCore=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Xml=$(usex !xml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns)
-	)
-
-	pyside2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
-		)
-		cmake_src_configure
-	}
-	python_foreach_impl pyside2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake_src_test
-}
-
-src_install() {
-	pyside2_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig
-		# file for the current Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		sed -i -e 's~^Requires: shiboken2$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
-
-		# Uniquify the PySide2 pkgconfig file for the current Python target,
-		# preserving an unversioned "pyside2.pc" file arbitrarily associated
-		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl pyside2_install
-
-	# CMakeLists.txt installs a "PySide2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., pyside2-tools) to target one
-	# "libpyside2-*.so" library linked to one Python interpreter. See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i -e 's~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)"/cmake/PySide2*/PySide2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
-}
diff --git a/dev-python/pytest-shell-utilities/Manifest b/dev-python/pytest-shell-utilities/Manifest
index 9a362db867fd..7b44a7c1b8a8 100644
--- a/dev-python/pytest-shell-utilities/Manifest
+++ b/dev-python/pytest-shell-utilities/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-shell-utilities-1.8.0.gh.tar.gz 79387 BLAKE2B 830e481996347a45aac357da8f98c8e9ee091a2bfd84af01a853abacde7fb9e10c451742cc8aa60cb8fed71e8176e43d95e17fbdd870f3f490334f5f6860e936 SHA512 817219983a77ad1685d4a70aae7a261e40dff095545a261bf527b756f763718ae5a841635600917f6c1c9d37df128ca1a9e2532a211cdf0c7ab89ab1ac083eff
-EBUILD pytest-shell-utilities-1.8.0.ebuild 1074 BLAKE2B 39b61f06b91ddafceec8b61fdeceb33ba7f90a80130f57bd1781e38733a14dbd9d837646e86c5dda7d271ae50c7dcac54a25ba3b09a57f6c1b8ea9de5f934f17 SHA512 d3ae065051477965243e28b1f6286ced515dee420ebef4431e1059bdf55f819ac3be79a7b19a2284a52009f43e69ba61c9fb27c3870d3e9ff6962f783ca1f2ac
+EBUILD pytest-shell-utilities-1.8.0.ebuild 1074 BLAKE2B e37eed52bce88da46307d15df4c150b91f24e6d79693e596ab3630cf6915006a21063e55f097d9aabf52249c2dee7712c8a095a3f4c7bc74b282998e4341d34b SHA512 6acd0d6f9ec0be77a43f1b903fe746bd364e6e23c940440123e10d6ed3df8f30a9562fd8b431f090e9c64aaac45fcb8f227b41ddc3a47e9a39dd4c74f9cfa5b7
 MISC metadata.xml 508 BLAKE2B a72a63a2ac42538d8e95c8714345bda8a30aa1ce72c29e756bd78447655aa0fc429366b71c3833c2e074a3027b66e94067810540f75368ecb42a10a2096a5706 SHA512 9226db1de4dd7e82a09921776462390e7d539541e955254a89ff455aea35ed47ddd957ae335253b538eb635293dc6226ba639e55f5f1a109db4f5dc5b5cde914
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.8.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.8.0.ebuild
index 62eaee9f0e6e..3986a42f12a7 100644
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.8.0.ebuild
+++ b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index 42f7e31b29f5..a494b9b6fb78 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,9 +1,3 @@
-AUX shiboken2-5.15.5-add-numpy-1.23-compatibility.patch 1095 BLAKE2B 8266da9d94c67ef09ae8f80b342fc99fddbfa1efbc30ccff5408ab9c9439b4b066942b0cc0cf4064c8162f1545c7ef1b4297fb0bb7c25e87eb131767c96bd561 SHA512 5c0f76aaf9920bde858e158fe87a353cc4c4e5ce0789b28f3d2d47c5d9461c18723e1b9bb2a4f833e783ba51c7d1f57752c0ddb9512c56b01ee44d6aaa10dd83
-AUX shiboken2-5.15.5-python311-1.patch 3124 BLAKE2B 97e51ae8cc6866da7ac9cced4f1988eeb00c8bbf1e033766b6f926ec16ad1dab171f15060ddaaf541f1eadfcc0fb9251df2ea613c3c16a51467d0870b378dda1 SHA512 8d11c6cc737ac99aa748e9e100a8b559aa315142f587d77f4ecae8f5ac74e65ddfb3348631203a781d445177d423f0a83307d8121b5d35ba6065e0cbb52673a8
-AUX shiboken2-5.15.5-python311-2.patch 2056 BLAKE2B c93be29e31b0fa6ce28a29de0dc4dba9635e86ba0103d77334e324a0d26f4c81c9ee6583bef146eb908fe290426eb462dd0a0f68e917ca5f3c4505742d673a0f SHA512 df6f185546180b3d27d8ed1ec1ccf90cdf3813f8928894717ad02e97f0c404b8dc00aed330e8b51aa7e04d5b3e621a15981fc911b2371542f9266c147fdf3828
-AUX shiboken2-5.15.5-python311-3.patch 2363 BLAKE2B 84521be2008dda0fc9398dac2c6e235d0d976c3219f7ecf50f28938a7cce6952ec41795c2c86d0f71ccd94210661dc22a471adb2f879a133e11a3148923fd708 SHA512 540ff5afbfebcc00f20c43993f67458013f4655c06505fdf23bc26085bd2c621863dd9c28be1a20dca299113aee828974f853b145818fdb11d59fc12d0bb8c14
-DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2
 DIST pyside-setup-opensource-src-5.15.11.tar.xz 3584760 BLAKE2B c4d60439a218451eb0c505031524fe1e30a117b7e89a28b5cd7518c193a8d2de01a5db8cb3acdd97c81da6dddff99f786c6c763427f78cdd0af4031122ac2d24 SHA512 377b3f6a793313cf7f5bea0dcef6630bac32d79b247e213d0b1b719805b35692aa8dd9a8896c75c6266f05af38809f574051d64b1a2f958a48c90167feccfb91
-EBUILD shiboken2-5.15.10-r2.ebuild 6823 BLAKE2B 851f820ab41b907e5cafc39e1d96a3e4d5cba3aa2e5a3fb4b09c9f5010d50852e370e28c763bb2e3a3de64c2682127f77175422d699e2df4843ecf509c188c83 SHA512 542e53832c82d16f84170fe185b7a1a6f418a0b3c46c7b1643c7d89dfb3c82a528a6fe79d931d0d410fd59568f96675bed2684610b03d73bbf7cebc37ed5a451
 EBUILD shiboken2-5.15.11.ebuild 6609 BLAKE2B 2b2ceb224779248382ff2369286b32b0c9547a8e664e59cad7809e479220d9e12b3bf5399e96df5ed3df4f109ce39f5e2436376add605251467970bf6e68b648 SHA512 8e19aac014aa639a3d457db8504c5c49533a8d62695c6f835a2e4f3c59301984a412a70da02ce9e2eec70b6ca6349fb8211b3dfb3f326a05b513d7b991e636d9
 MISC metadata.xml 730 BLAKE2B 803b825adb9fcd4379b1e3fba57d6b1916a81ced12f3b3c7d3ddcd68a0c03e85fcf31d5b07a70deebe073f267fe93a0529f7ffb4b1a9508a2223894883044f3b SHA512 5a462077fee2bd3ac87ab79274be0a718fd9b273fca4946d2d2734cefdf5817e6b4dc478a828b3bc783c63e64a62a6662b482d61eefe57386c15f9703a57fb24
diff --git a/dev-python/shiboken2/files/shiboken2-5.15.5-add-numpy-1.23-compatibility.patch b/dev-python/shiboken2/files/shiboken2-5.15.5-add-numpy-1.23-compatibility.patch
deleted file mode 100644
index 7ce30bb2e67d..000000000000
--- a/dev-python/shiboken2/files/shiboken2-5.15.5-add-numpy-1.23-compatibility.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://raw.githubusercontent.com/FreeCAD/homebrew-freecad/master/patches/libshiboken-numpy-1.23.compat.patch
-
-From c238f558bb72860c15da00546a7b7924d0b90848 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Thu, 21 Jul 2022 06:37:26 +0200
-Subject: [PATCH] add numpy-1.23 compatibility
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- libshiboken/sbknumpyarrayconverter.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/libshiboken/sbknumpyarrayconverter.cpp
-+++ b/libshiboken/sbknumpyarrayconverter.cpp
-@@ -116,8 +116,13 @@ std::ostream &operator<<(std::ostream &str, PyArrayObject *o)
-             str << " NPY_ARRAY_NOTSWAPPED";
-         if ((flags & NPY_ARRAY_WRITEABLE) != 0)
-             str << " NPY_ARRAY_WRITEABLE";
-+#if NPY_VERSION >= 0x00000010 // NPY_1_23_API_VERSION
-+        if ((flags & NPY_ARRAY_WRITEBACKIFCOPY) != 0)
-+            str << " NPY_ARRAY_WRITEBACKIFCOPY";
-+#else
-         if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0)
-             str << " NPY_ARRAY_UPDATEIFCOPY";
-+#endif
-     } else {
-         str << '0';
-     }
--- 
-2.35.1
-
diff --git a/dev-python/shiboken2/files/shiboken2-5.15.5-python311-1.patch b/dev-python/shiboken2/files/shiboken2-5.15.5-python311-1.patch
deleted file mode 100644
index 771ce2ad1886..000000000000
--- a/dev-python/shiboken2/files/shiboken2-5.15.5-python311-1.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From c87d4e27cd482918c1d091c09cfac749a56b0f99 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 20 Jul 2022 07:15:57 +0200
-Subject: [PATCH 1/3] 
- https://src.fedoraproject.org/fork/pviktori/rpms/python-pyside2/raw/5da9902bd8732b49eb722d71f306d4ab197c84b8/f/python3.11.patch
- https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=52df3b8f64
- https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=73adefe22f
- https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=a09a1db839
-
-From b64ad27d8dfeeecaaa8a98051252a32c9d998df4 Mon Sep 17 00:00:00 2001
-From: Friedemann Kleint <Friedemann.Kleint@qt.io>
-Date: Thu, 9 Jun 2022 16:50:41 +0200
-Subject: [PATCH] libshiboken: Fix a crash in Shiboken::Object::isValid() for
- Python 3.11
-
-The function is passed type objects for class methods, which caused
-it to crash.
-
-The first clause did not catch this, and so it was cast to SbkObject
-below.
-
-Add a type check to prevent this.
-
-Pick-to: 6.3 6.2 5.15
-Task-number: PYSIDE-1960
-Change-Id: Icfdd6fefb7156ac5961444bd5395109849a1d66e
-Reviewed-by: Christian Tismer <tismer@stackless.com>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-
-Original patch no longer applies with 5.15.5.
-Manually re-applied to respect code changes.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/libshiboken/basewrapper.cpp
-+++ b/libshiboken/basewrapper.cpp
-@@ -377,7 +377,7 @@ SbkObjectType *SbkObject_TypeF(void)
-     static PyTypeObject *type = nullptr;
-     if (!type) {
-         type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&SbkObject_Type_spec));
--        Py_TYPE(type) = SbkObjectType_TypeF();
-+        Py_SET_TYPE(type, SbkObjectType_TypeF());
-         Py_INCREF(Py_TYPE(type));
-         type->tp_weaklistoffset = offsetof(SbkObject, weakreflist);
-         type->tp_dictoffset = offsetof(SbkObject, ob_dict);
-@@ -1152,7 +1152,7 @@ introduceWrapperType(PyObject *enclosingObject,
-     typeSpec->slots[0].pfunc = reinterpret_cast<void *>(baseType ? baseType : SbkObject_TypeF());
- 
-     PyObject *heaptype = SbkType_FromSpecWithBases(typeSpec, baseTypes);
--    Py_TYPE(heaptype) = SbkObjectType_TypeF();
-+    Py_SET_TYPE(heaptype, SbkObjectType_TypeF());
-     Py_INCREF(Py_TYPE(heaptype));
-     auto *type = reinterpret_cast<SbkObjectType *>(heaptype);
- #if PY_VERSION_HEX < 0x03000000
-@@ -1517,6 +1517,7 @@ bool setCppPointer(SbkObject *sbkObj, PyTypeObject *desiredType, void *cptr)
- bool isValid(PyObject *pyObj)
- {
-     if (!pyObj || pyObj == Py_None
-+        || PyType_Check(pyObj) != 0
-         || Py_TYPE(Py_TYPE(pyObj)) != SbkObjectType_TypeF()) {
-         return true;
-     }
---- a/libshiboken/sbkenum.cpp
-+++ b/libshiboken/sbkenum.cpp
-@@ -753,7 +753,7 @@ newTypeWithName(const char *name,
-     PyTuple_SetItem(bases, 0, reinterpret_cast<PyObject *>(basetype));
-     auto *type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpecWithBases(&newspec, bases));
-     PyErr_Print();
--    Py_TYPE(type) = SbkEnumType_TypeF();
-+    Py_SET_TYPE(type, SbkEnumType_TypeF());
- 
-     auto *enumType = reinterpret_cast<SbkEnumType *>(type);
-     PepType_SETP(enumType)->cppName = cppName;
diff --git a/dev-python/shiboken2/files/shiboken2-5.15.5-python311-2.patch b/dev-python/shiboken2/files/shiboken2-5.15.5-python311-2.patch
deleted file mode 100644
index 54a54630cb0c..000000000000
--- a/dev-python/shiboken2/files/shiboken2-5.15.5-python311-2.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 6fc0af3753839839b227075cc2a9e43c7cd7a26d Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 20 Jul 2022 07:23:15 +0200
-Subject: [PATCH 2/3] From a09a1db8391243e6bb290ee66bb6e3afbb114c61 Mon Sep 17
- 00:00:00 2001 From: Friedemann Kleint <Friedemann.Kleint@qt.io> Date: Fri, 24
- Jun 2022 09:22:01 +0200 Subject: libshiboken: Fix crashes with static strings
- in Python 3.11
-
-In Python 3.11, some strings come with a refcount above decimal
-1000000000, apparently indicating that they are interned. Replace the
-mechanism by PyUnicode_InternFromString().
-
-Task-number: PYSIDE-1960
-Pick-to: 6.3 6.2 5.15
-Change-Id: I6436afee351f89da5814b5d6bc76970b1b508168
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-Reviewed-by: Christian Tismer <tismer@stackless.com>
-Upstream: https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?id=a09a1db8391243e6bb290ee66bb6e3afbb114c61
-
-Original patch no longer applies.
-Manually adapted to respect code changes.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/libshiboken/sbkstring.cpp
-+++ b/libshiboken/sbkstring.cpp
-@@ -41,8 +41,14 @@
- #include "sbkstaticstrings_p.h"
- #include "autodecref.h"
- 
--#include <vector>
--#include <unordered_set>
-+#if PY_VERSION_HEX >= 0x030B0000 || defined(Py_LIMITED_API)
-+#  define USE_INTERN_STRINGS
-+#endif
-+
-+#ifndef USE_INTERN_STRINGS
-+#  include <vector>
-+#  include <unordered_set>
-+#endif
- 
- namespace Shiboken
- {
-@@ -233,6 +239,13 @@ Py_ssize_t len(PyObject *str)
- //     PyObject *attr = PyObject_GetAttr(obj, name());
- //
- 
-+#ifdef USE_INTERN_STRINGS
-+PyObject *createStaticString(const char *str)
-+{
-+    return PyUnicode_InternFromString(str);
-+}
-+#else
-+
- using StaticStrings = std::unordered_set<PyObject *>;
- 
- static void finalizeStaticStrings();    // forward
-@@ -283,6 +296,8 @@ PyObject *createStaticString(const char *str)
-     return result;
- }
- 
-+#endif // !USE_INTERN_STRINGS
-+
- ///////////////////////////////////////////////////////////////////////
- //
- // PYSIDE-1019: Helper function for snake_case vs. camelCase names
diff --git a/dev-python/shiboken2/files/shiboken2-5.15.5-python311-3.patch b/dev-python/shiboken2/files/shiboken2-5.15.5-python311-3.patch
deleted file mode 100644
index 9c44dc621b45..000000000000
--- a/dev-python/shiboken2/files/shiboken2-5.15.5-python311-3.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From f62a1766e5f0cf0e503a76cd755408f2c65dc947 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 20 Jul 2022 07:29:37 +0200
-Subject: [PATCH 3/3] The Fedora / upstream fixes
- (shiboken2-5.15.2-python311.patch) end up breaking Python 3.8 compatibility
- (maybe 3.9 too, but didn't get that far).
-
-Wrap them with PY_VERSION_HEX for Python 3.11.
-
-Original patch no longer applied due to code changes.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/libshiboken/basewrapper.cpp
-+++ b/libshiboken/basewrapper.cpp
-@@ -377,7 +377,11 @@ SbkObjectType *SbkObject_TypeF(void)
-     static PyTypeObject *type = nullptr;
-     if (!type) {
-         type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&SbkObject_Type_spec));
--        Py_SET_TYPE(type, SbkObjectType_TypeF());
-+        #if PY_VERSION_HEX < 0x030B00A1
-+            Py_TYPE(type) = SbkObjectType_TypeF();
-+        #else
-+            Py_SET_TYPE(type, SbkObjectType_TypeF());
-+        #endif
-         Py_INCREF(Py_TYPE(type));
-         type->tp_weaklistoffset = offsetof(SbkObject, weakreflist);
-         type->tp_dictoffset = offsetof(SbkObject, ob_dict);
-@@ -1152,7 +1156,11 @@ introduceWrapperType(PyObject *enclosingObject,
-     typeSpec->slots[0].pfunc = reinterpret_cast<void *>(baseType ? baseType : SbkObject_TypeF());
- 
-     PyObject *heaptype = SbkType_FromSpecWithBases(typeSpec, baseTypes);
--    Py_SET_TYPE(heaptype, SbkObjectType_TypeF());
-+    #if PY_VERSION_HEX < 0x030B00A1
-+        Py_TYPE(heaptype) = SbkObjectType_TypeF();
-+    #else
-+        Py_SET_TYPE(heaptype, SbkObjectType_TypeF());
-+    #endif
-     Py_INCREF(Py_TYPE(heaptype));
-     auto *type = reinterpret_cast<SbkObjectType *>(heaptype);
- #if PY_VERSION_HEX < 0x03000000
---- a/libshiboken/sbkenum.cpp
-+++ b/libshiboken/sbkenum.cpp
-@@ -753,7 +753,11 @@ newTypeWithName(const char *name,
-     PyTuple_SetItem(bases, 0, reinterpret_cast<PyObject *>(basetype));
-     auto *type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpecWithBases(&newspec, bases));
-     PyErr_Print();
--    Py_SET_TYPE(type, SbkEnumType_TypeF());
-+    #if PY_VERSION_HEX < 0x030B00A1
-+        Py_TYPE(type) = SbkEnumType_TypeF();
-+    #else
-+        Py_SET_TYPE(type, SbkEnumType_TypeF());
-+    #endif
- 
-     auto *enumType = reinterpret_cast<SbkEnumType *>(type);
-     PepType_SETP(enumType)->cppName = cppName;
diff --git a/dev-python/shiboken2/shiboken2-5.15.10-r2.ebuild b/dev-python/shiboken2/shiboken2-5.15.10-r2.ebuild
deleted file mode 100644
index f83d6000ad45..000000000000
--- a/dev-python/shiboken2/shiboken2-5.15.10-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Split the "/usr/bin/shiboken2" binding generator from the
-# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former
-# requires everything (including Clang) at runtime; the latter only requires
-# Qt and Python at runtime. Note that "pip" separates these two as well. See:
-# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
-# Once split, the PySide2 ebuild should be revised to require
-# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime.
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit cmake llvm python-r1 toolchain-funcs
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python binding generator for C++ libraries"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/shiboken2"
-
-# The "sources/shiboken2/libshiboken" directory is triple-licensed under the
-# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
-# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be
-# arbitrarily relicensed. (TODO)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE="+docstrings numpy test vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-3)*:5"
-
-# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
-LLVM_MAX_SLOT=15
-RDEPEND="${PYTHON_DEPS}
-	=dev-qt/qtcore-${QT_PV}
-	<sys-devel/clang-16:=
-	<sys-devel/clang-runtime-16:=
-	docstrings? (
-		>=dev-libs/libxml2-2.6.32
-		>=dev-libs/libxslt-1.1.19
-		=dev-qt/qtxml-${QT_PV}
-		=dev-qt/qtxmlpatterns-${QT_PV}
-	)
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-"
-DEPEND="${RDEPEND}
-	test? (	=dev-qt/qttest-${QT_PV}	)
-"
-
-DOCS=( AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.15.5-python311-1.patch
-	"${FILESDIR}"/${PN}-5.15.5-python311-2.patch
-	"${FILESDIR}"/${PN}-5.15.5-python311-3.patch
-	"${FILESDIR}"/${PN}-5.15.5-add-numpy-1.23-compatibility.patch
-)
-
-# Ensure the path returned by get_llvm_prefix() contains clang as well.
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	# TODO: File upstream issue requesting a sane way to disable NumPy support.
-	if ! use numpy; then
-		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
-			libshiboken/CMakeLists.txt || die
-	fi
-
-	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
-	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
-	if use vulkan; then
-		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
-			ApiExtractor/clangparser/compilersupport.cpp || die
-	fi
-
-	local clangver="$(CPP=clang clang-major-version)"
-
-	# Clang 15 and older used the full version as a directory name.
-	if [[ ${clangver} -lt 16 ]]; then
-		clangver="$(CPP=clang clang-fullversion)"
-	fi
-
-	# Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
-	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
-	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
-	# the largest version specifier that exists under the "/usr/lib/clang/"
-	# subdirectory. This assumption is false in edge cases, including when
-	# users downgrade from newer Clang versions but fail to remove those
-	# versions with "emerge --depclean". See also:
-	#     https://github.com/leycec/raiagent/issues/85
-	#
-	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
-	# eclass are defective, returning nonsensical placeholder strings if the
-	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
-	# PySide2 does *NOT* care whether the end user has done so or not, as
-	# PySide2 unconditionally requires Clang in either case. See also:
-	#     https://bugs.gentoo.org/619490
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${clangver}"'/include"))~' \
-		ApiExtractor/clangparser/compilersupport.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Minimal tests for now, 2 failing with the extended version
-	# FIXME Subscripted generics cannot be used with class and instance checks
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
-	)
-
-	shiboken2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
-		)
-		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
-		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-		cmake_src_configure
-	}
-	python_foreach_impl shiboken2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	shiboken2_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the "shiboken2" executable for the current Python target,
-		# preserving an unversioned "shiboken2" file arbitrarily associated
-		# with the last Python target.
-		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
-
-		# Uniquify the Shiboken2 pkgconfig file for the current Python target,
-		# preserving an unversioned "shiboken2.pc" file arbitrarily associated
-		# with the last Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl shiboken2_install
-
-	# CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so"
-	# library and one "shiboken2" executable linked to one Python interpreter.
-	# See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i \
-		-e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		-e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)"/cmake/Shiboken2*/Shiboken2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
-
-	# Remove the broken "shiboken_tool.py" script. By inspection, this script
-	# reduces to a noop. Moreover, this script raises the following exception:
-	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
-	rm "${ED}"/usr/bin/shiboken_tool.py || die
-}