gentoo resync : 22.12.2021

2 files changed, 18 insertions, 37 deletions

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 1b20c340bc1d..48cf23177c86 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,5 +1,5 @@
 DIST QtPy-1.11.2.tar.gz 37098 BLAKE2B 8806cce798c4c2d885dd340d0d077567353cf0f3f1c2b284fd788c190b28b6133d052d31dea861e7d2497d0db88ba7ce8be83074360c61823f7a78dc01c015a5 SHA512 e49beb3180789a8080a19406b0e122bc9fc2192ac89b59f0956d7c65ac957779b192062956a97a7526f32724000df18abf32ddd6bda52f9cdf440ddc551887f8
 DIST QtPy-1.11.3.tar.gz 39637 BLAKE2B d1bfa0944dcebf5e408b9a061bcc6bab2fe172a70f0eadd36b229d2c9b40d74d8159c820608d3afd71a91085d5703af9b7045f359209730c53a9a83007159ce5 SHA512 461d858b05ff75f27017f6f0058f3e47643d5fe6c236e4307fa006735ad80e4c1fa487f1ab75edcfe881026541e302cdc3f8221c4ad7b97bce8c96b66db580bb
 EBUILD QtPy-1.11.2.ebuild 5709 BLAKE2B 7fb57a82d71239f394b8daa2963eef4563373c90b5e5c0a6c181ec5dbb6614ef29fb820f9b87a0986709805571f263fff1795c782818d2c33cc9c535dd4d764b SHA512 d78760501ed81c8fffb87bec71556c79911a32087388250e1a476a27c998433c36757d0be28c30cd28f08bc42fae0840733962c860c7ffd42cb6fda75d37b712
-EBUILD QtPy-1.11.3.ebuild 5712 BLAKE2B 862a3a4e7f30dea773c8b10e99ef93bf517799e923f6512d271b70033095a9306efeacfb593fc67c4ecfc0ab7346934c37419cb6bf4b95118d720c11257ba6b2 SHA512 5bd2a2588c647b61131e84f59e1cc6fd25334c12b4a2ba811f899fe1db75bc3682ebd1b39bb486046cb5b6c0bd83f650e8f0984601c4371a01d9d4a618b50804
+EBUILD QtPy-1.11.3-r1.ebuild 5178 BLAKE2B fd94c87072a09d4fd80890fcaf10005d58c20f249b1a527abd74b0922f3a514debaebc94963eed041dde978f0afa543f81a442f653f227f670e33ce1687fceb2 SHA512 5bc4ca11f8ec63e8687e85e152577ed356b3a8167d7bd346ee985f9d06f5d98d87348f7a3fc9723b8e06156471e9d075c9fda0a74d0865ef4f32b9315b70b572
 MISC metadata.xml 2904 BLAKE2B f951ee9cfb1e57da9c1b528015cf56bf72e36fbcea6973f5bd237e86c8039d82d9700166ab76773b9bfbc8e499df492994e5dd73aee0bb2d35914d36bcf1bd78 SHA512 e6e13d0c24f16379ac03711f02c5201d1ab28bcbbddd7063f0487bbaaeda99e5a2ef87f00d8df834d822c9230a50ddead93b44affccf07b80bfc275140f4e9ff
diff --git a/dev-python/QtPy/QtPy-1.11.3.ebuild b/dev-python/QtPy/QtPy-1.11.3-r1.ebuild
index 7e702e2e474e..56716c7509d2 100644
--- a/dev-python/QtPy/QtPy-1.11.3.ebuild
+++ b/dev-python/QtPy/QtPy-1.11.3-r1.ebuild
@@ -23,14 +23,7 @@ _IUSE_QT_MODULES="
 IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
 unset _IUSE_QT_MODULES
 
-# PySide2 does not support python3_10, nor is it likely that it will in the
-# future since upstream appears to be focussing on PySide6 for Qt6 instead
-# (which is compatible with python3_10). So if we want to use python3_10
-# we have to force disable pyside2.
-REQUIRED_USE="
-	|| ( pyqt5 pyside2 )
-	python_targets_python3_10? ( pyqt5 !pyside2 )
-"
+REQUIRED_USE="|| ( pyqt5 pyside2 )"
 
 # These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
 # Disable them for now, please check periodically if this is still up to date.
@@ -73,15 +66,13 @@ RDEPEND="
 		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
 	)
 	pyside2? (
-		$(python_gen_cond_dep '
-			dev-python/pyside2[${PYTHON_USEDEP}]
-			dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
-			dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
-			dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
-			dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
-			dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
-			declarative? ( dev-python/pyside2[qml,quick] )
-			' python3_{7..9} )
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
+		dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
+		dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
+		dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
+		dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
+		declarative? ( dev-python/pyside2[qml,quick] )
 	)
 "
 
@@ -100,15 +91,13 @@ BDEPEND="
 			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 		)
 		pyside2? (
-			$(python_gen_cond_dep '
-				dev-python/pyside2[${PYTHON_USEDEP}]
-				dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
-				dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
-				dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
-				dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
-				dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
-				dev-python/pyside2[xml,xmlpatterns]
-				' python3_{7..9} )
+			dev-python/pyside2[${PYTHON_USEDEP}]
+			dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
+			dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
+			dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
+			dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
+			dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
+			dev-python/pyside2[xml,xmlpatterns]
 		)
 	)
 "
@@ -133,20 +122,12 @@ src_prepare() {
 	sed -i -e "s/from PySide.QtCore import/raise ImportError #/" qtpy/__init__.py || die
 }
 
-src_test() {
-	virtx python_foreach_impl python_test
-}
-
 python_test() {
 	if use pyqt5; then
-		QT_API="pyqt5" epytest
+		virtx QT_API="pyqt5" epytest
 	fi
 	if use pyside2; then
-		if [[ "${EPYTHON}" == "python3.10" ]]; then
-			return
-		else
-			QT_API="pyside2" epytest
-		fi
+		virtx QT_API="pyside2" epytest
 	fi
 }