gentoo resync : 29.12.2022

3 files changed, 35 insertions, 30 deletions

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index fcc5a66b3ac7..9132602799d5 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,5 +1,4 @@
-DIST QtPy-2.0.1.tar.gz 43047 BLAKE2B 66625852e75fbfcf0bf96e740754ca26b6d5226dd5450d0274cf6dc875cba18e5ed8e339c8c7ad084ffa9b135f19447e087b338690ec521205316c4f22f09197 SHA512 5d482b0a5bd2be67a0fabccf98a9dedf28ef328641c8c976e2274d4a5afb14b9fefce251e80496ed54425dcb3da24984c6c36308db0bfc810ea2142528ad88fd
 DIST QtPy-2.1.0.tar.gz 46470 BLAKE2B 2e032d141ad134444143cd59b8952957b226d9519925083aecce82adf62eebd3f58803cf548c4142fb1ece6f0e2340043a82a7aef056f6e4a9ac8b9caf72d80d SHA512 052cab4218d23d46162d11bf038dccfe6200b05c1c8647bd1f9dcbdaa7af50c23d4ae85829e065c7bae57630d149d562d76cc78202b4f448cbf6547010c746ff
-EBUILD QtPy-2.0.1.ebuild 5215 BLAKE2B 23261bb6e3a1818b8032c4bb87ee501a12aac8e9595c2aaf17cfa516d8db2f1fd6410af388601fed1a6f9daf8323300303deda7e434dfd7f152db4bed742ca77 SHA512 aca9dc14dd97d1ab4719f47e110fdd91ed12c97f3f83dae91f3d2888650af57917b251da3a85dbcfae6fbedc1dd270450ea0ce63cc2385e70d59b0f4f6b9ca4d
-EBUILD QtPy-2.1.0.ebuild 5006 BLAKE2B 31a8b946e69abcb0658db406f8c58158d7e0ee05e8cb6b15e96077dc78baa2f25b02124e2a530575c78b5ea15491f92d14c46b55da00ca854a333c1b5db02de7 SHA512 ebc7e15e6bc7183156548722161a81c9486410ce860fb1f95b76a361f950a7973df227b2350a05d4dfd3b425e057174992ef2e0ffe304b5876d7c60f0631cde9
+EBUILD QtPy-2.1.0-r1.ebuild 5166 BLAKE2B 1058583029d29a6575a198b2dc0085916fc2f3e8347ae308e41c8d35e14e3d56c478b96b3e22a42c464d242551880780e6ab260ca56642209092c3d56c1d711e SHA512 d10ee8366b3ffafd1af0011aa11cbe4b1c2dbf2a87079d901b79fe88bc206b850b9f8083229e378a42ab1c7bd8f8548b7b695d18bd0fcd487aa85b0ac740c66e
+EBUILD QtPy-2.1.0.ebuild 5003 BLAKE2B 60931695b10ab9f9bbabb0cb53025ac1a10412c82f1f51b2c828d266222fddefe5acad3bfc02542897366b48bb7738364cd50344e95d2eca61f9c96695f2f495 SHA512 082b96730ba1b6c138cb78cbcff47d7b882017c7133f8de4256cbbb213bddd709a7f9067a9590a79bc9ebda7528a823e3c7bbbdd8edb44d1a6490b109c1842ed
 MISC metadata.xml 2904 BLAKE2B f951ee9cfb1e57da9c1b528015cf56bf72e36fbcea6973f5bd237e86c8039d82d9700166ab76773b9bfbc8e499df492994e5dd73aee0bb2d35914d36bcf1bd78 SHA512 e6e13d0c24f16379ac03711f02c5201d1ab28bcbbddd7063f0487bbaaeda99e5a2ef87f00d8df834d822c9230a50ddead93b44affccf07b80bfc275140f4e9ff
diff --git a/dev-python/QtPy/QtPy-2.0.1.ebuild b/dev-python/QtPy/QtPy-2.1.0-r1.ebuild
index 9fcfb7eab3c3..41ec2ce12760 100644
--- a/dev-python/QtPy/QtPy-2.0.1.ebuild
+++ b/dev-python/QtPy/QtPy-2.1.0-r1.ebuild
@@ -3,17 +3,21 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+HOMEPAGE="
+	https://github.com/spyder-ide/qtpy/
+	https://pypi.org/project/QtPy/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 _IUSE_QT_MODULES="
 	declarative designer gui help location multimedia network opengl
@@ -23,7 +27,10 @@ _IUSE_QT_MODULES="
 IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
 unset _IUSE_QT_MODULES
 
-REQUIRED_USE="|| ( pyqt5 pyside2 )"
+REQUIRED_USE="
+	|| ( pyqt5 pyside2 )
+	python_targets_python3_11? ( 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.
@@ -67,13 +74,15 @@ RDEPEND="
 		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
 	)
 	pyside2? (
-		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] )
+		$(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_{8..10})
 	)
 "
 
@@ -92,13 +101,15 @@ BDEPEND="
 			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 		)
 		pyside2? (
-			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]
+			$(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_{8..10})
 		)
 	)
 "
@@ -106,8 +117,9 @@ BDEPEND="
 distutils_enable_tests pytest
 
 src_prepare() {
-	default
-	# Disale Qt for Python implementations that are not selected
+	distutils-r1_src_prepare
+	sed -i -e 's:--cov=qtpy --cov-report=term-missing::' pytest.ini || die
+	# Disable Qt for Python implementations that are not selected
 	if ! use pyqt5; then
 		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
 	fi
@@ -115,12 +127,6 @@ src_prepare() {
 		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
 		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
 	fi
-
-	# Disable outdated PyQt4 and PySide
-	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PyQt4.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide.QtCore import/raise ImportError #/" qtpy/__init__.py || die
 }
 
 python_test() {
diff --git a/dev-python/QtPy/QtPy-2.1.0.ebuild b/dev-python/QtPy/QtPy-2.1.0.ebuild
index 80b2b816f117..42c74bba738e 100644
--- a/dev-python/QtPy/QtPy-2.1.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 _IUSE_QT_MODULES="
 	declarative designer gui help location multimedia network opengl