gentoo auto-resync : 18:10:2023 - 15:59:05

6 files changed, 227 insertions, 13 deletions

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 6e1d467f8df6..1f43e7c67583 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,6 +1,7 @@
 DIST QtPy-2.3.1.tar.gz 56260 BLAKE2B 1b8d76879cc1f07b3633e6b25887ac4621ee3a8e9ebbcaa1f1f8c4f3fbcdae37bd5d659717bf89227d4ed6b5126554b329813aaee0b6be333c0cdc931cfb8d43 SHA512 9c738ec07e18852b67c30962fbc0ca48479eccff2a9f2ee9f4817c4ead5a8068d54aced58d632977163f180a584a9b7b2b68ea25e0577b92a262fef8eb576041
 DIST QtPy-2.4.0.tar.gz 65007 BLAKE2B d2770608d807959aaa8b0201304be1f3f112f039f8febddf62bc7cd09a04ed53dd7fd89ee782fd3bd11c5f84c8d2a8c529242c2df01d34c27d87ac1f8873017f SHA512 54be0c9b15055f9c078ff8eebd88910d718833f3d9572567076b1fc0c22d3d5c12dc2a2d7fbedb9bc8636d575775e83cb08a554a0ee45a859297501a5711b716
-EBUILD QtPy-2.3.1-r1.ebuild 8601 BLAKE2B 4b6aad6be0986c0a63dadae349c511fd26061b2ff6a78b89de04951fff9d64c03c8ef6d8b9dbcb3a5654ca37b68f045a4af268a1abf7d4203e7a89b80e608e31 SHA512 d37012e3485b78db68ab4005223268872b1ec553c77d7b40d4fb19ee97331ced84e52fa97cf7d37ffcda5301cab991cb099a1efb1ebd53c7cf12815c8dd0ae5e
-EBUILD QtPy-2.3.1.ebuild 8326 BLAKE2B 08fe67f11f10cf1f41dbbf3eb48cecf4ec0b93efde7f39d7d04d4ccad527b2e906348bcd4861ac94a5e2e24cf0635fbe8e0f168eb1572a735b95877bb51cc372 SHA512 81d4aa3e55aede8a48733ada73bd754b78cf6058ec629c3965a81dc7cffafacf75f1155e951b240b38cebe8c562cf40ca2626ba794a70dbc538d3c25b4e32034
-EBUILD QtPy-2.4.0.ebuild 8669 BLAKE2B b47383237901025acc242e588da3d19ca519c808f8fd415c4d1e7dc68c1adab3bf8c88b79d6d1d53950e1271bcf502f13fbfc5f0d03cb62020732d681cd38414 SHA512 5fe8b0b2ce9aac33316cf3365fada3954e838be33db56b857542401f01d43734c9577ce2d3abf671fcce51fd376817a3582a09ca884aa6290a47f968d1675e8b
-MISC metadata.xml 2716 BLAKE2B 7c62f7b181608c56a8e9be69c05e2cb34e5f450682ea4e7ca6c4bff5f02cf4ff803d44dda356d2be3968464842d421b5ac7320fc4d08a430e7805f6e400a262f SHA512 62509ecf92f89453fea52a8c23accff778a5572b689428838d801470ab30f2e2cb85f9319a75afeb81c284d68fb2abe399714bb1410daa8ec896af1f17763347
+EBUILD QtPy-2.3.1-r1.ebuild 8521 BLAKE2B dc1f6cea1837cf3ec4e00b5ad716ad0395a6ff7152cd3b5f643f2f30e952b97baee8b33587469c9a9afb433340fcfa72d2e81a6297134d5f6112ca259c5eccfc SHA512 55defcbe0f0b570eb64b3744bdd5381d1508f56aa98a98b092e6eb931cdf01f797b122d7938b03065ccfabe2f2df269a9a65de03a7f08d5ef128c0ce4b8914bf
+EBUILD QtPy-2.3.1.ebuild 8246 BLAKE2B 1c711d5a69b52f21e69d52a8059b21effc2ddfedf1cf426fe86b682d42d9b6a2869e23187ae78fa8513131dc49df5c0970ba73b8f32271f9d41ed5aa9d398ac1 SHA512 5a606d51c0d73560833a72e5eeec6c6487b902a4303bff86e8f1266d4e24c527836c9fdc4f7a981d2d7e298eb106655dc275481b063ce1951ab109d6a03820ce
+EBUILD QtPy-2.4.0-r1.ebuild 8822 BLAKE2B c0c5ae7c439d813b7b00b99fe0228fbdf7c4c153664654503c43321cab239175c4c1a27da70424cb2d4cf88b0cbf246032c883f1cefa362e586175d50b872e94 SHA512 4c6cb624ac751f8a397a346eb3e55fc6362063ad20c1bc8d2008312ff0d1430486df4160bbfad2d811dfc9413683dcd0d0c51876c68c25e84cab97cf656696f7
+EBUILD QtPy-2.4.0.ebuild 8589 BLAKE2B cdc3997f440cb75c1873f86ef40fb01de85fa73bb27cb5e4db2f17051329d5cfa9febd269b542b0e39785d99be986859446bbb65ccd285469e41b5b4cf87610d SHA512 1a8b975a9420d4306b49e5dadf0773ec2c2dc4e01b8b373a86e51f5ecd3cfdda73f0cf038208a3a6aa06bdfc34db49371a6ea9183f6bdb52fd4773b5b5156244
+MISC metadata.xml 2864 BLAKE2B f1ed249b3864a0c66d02e0aeaf48dfa8ae18ee452a75a1932ab621d86902f602c511bb113fd385ad9d6b57d6d7a07b350f1ba25ab07cc0f646281d9d41e03134 SHA512 bf065ae2c73b735ad7f501e5a525718d506495a7ce4b415e79f67b52c166082f53272a1295fc325d8a98f050bc01d2a5bba1e85ef7e1e8dfcc738b837f93bfbc
diff --git a/dev-python/QtPy/QtPy-2.3.1-r1.ebuild b/dev-python/QtPy/QtPy-2.3.1-r1.ebuild
index b6127a1aae93..237b0ebc5a17 100644
--- a/dev-python/QtPy/QtPy-2.3.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.3.1-r1.ebuild
@@ -42,8 +42,6 @@ REQUIRED_USE="
 # 	concurrent? ( pyside2 only )
 # 	datavis? ( pyside2 only )
 # 	scxml? ( pyside2 only )
-# 	script? ( pyside2 only )
-# 	scripttools? ( pyside2 only )
 #
 #	location? ( pyside2 and pyqt5 only )
 #	sensors? ( pyside2 and pyqt5 only )
@@ -133,7 +131,7 @@ BDEPEND="
 				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[printsupport,qml,quick,scxml]
 				dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
 				dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
 				dev-python/pyside2[xml,xmlpatterns]
diff --git a/dev-python/QtPy/QtPy-2.3.1.ebuild b/dev-python/QtPy/QtPy-2.3.1.ebuild
index b3033047630e..3861afc77cd8 100644
--- a/dev-python/QtPy/QtPy-2.3.1.ebuild
+++ b/dev-python/QtPy/QtPy-2.3.1.ebuild
@@ -39,8 +39,6 @@ REQUIRED_USE="|| ( pyqt5 pyqt6 pyside2 pyside6 )"
 # 	concurrent? ( pyside2 only )
 # 	datavis? ( pyside2 only )
 # 	scxml? ( pyside2 only )
-# 	script? ( pyside2 only )
-# 	scripttools? ( pyside2 only )
 #
 #	location? ( pyside2 and pyqt5 only )
 #	sensors? ( pyside2 and pyqt5 only )
@@ -125,7 +123,7 @@ BDEPEND="
 			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[printsupport,qml,quick,scxml]
 			dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
 			dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
 			dev-python/pyside2[xml,xmlpatterns]
diff --git a/dev-python/QtPy/QtPy-2.4.0-r1.ebuild b/dev-python/QtPy/QtPy-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..b36bfa5ce6fc
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.4.0-r1.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 virtualx pypi
+
+DESCRIPTION="Abstraction layer on top of PyQt and PySide with additional custom QWidgets"
+HOMEPAGE="
+	https://github.com/spyder-ide/qtpy/
+	https://pypi.org/project/QtPy/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+
+_IUSE_QT_MODULES="
+	designer +gui help multimedia +network opengl positioning
+	printsupport qml quick sensors serialport speech +sql svg testlib
+	webchannel webengine websockets +widgets +xml
+"
+IUSE="+pyqt5 pyqt6 pyside2 pyside6 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+REQUIRED_USE="
+	|| ( pyqt5 pyqt6 pyside2 pyside6 )
+	python_targets_python3_12? ( !pyside2 )
+"
+
+# These flags are currently *not* common to the PySide2/6 and PyQt5/6 ebuilds
+# Disable them for now, please check periodically if this is still up to date.
+# 	bluetooth? ( pyqt5/6 and pyside6 only )
+# 	dbus? ( pyqt5/6 and pyside6 only )
+#
+# 	3d? ( pyside2/6 only )
+# 	charts? ( pyside2 only )
+# 	concurrent? ( pyside2 only )
+# 	datavis? ( pyside2 only )
+# 	scxml? ( pyside2/6 only )
+#
+#	x11extras? ( pyside2 and pyqt5 only )
+#	xmlpatterns? ( pyside2 and pyqt5 only )
+#
+# location? ( pyside2/6 and pyqt5 only)
+# nfc? ( pyqt6 and pyside6 only)
+# spatialaudio? ( pyqt6 and pyside6 only)
+# pdfium? ( pyqt6 and pyside6 only)
+
+# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
+# to work. The package only checks whether PyQt5/pyside2 is installed, it does
+# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
+#
+# Webengine is a special case, because PyQt5 provides this in a separate package
+# while PySide2 ships it in the same package.
+#
+# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
+# for qml and quick in one flag: declarative PySide2 does not.
+#
+# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
+# added anyway with a (+) to make it future proof if the ebuild were to change
+# this behaviour in the future.
+#
+# The PySide2 ebuild currently enables opengl and serialport support
+# unconditionally, the flag is added anyway with a (+) to make it future proof
+# if the ebuild were to change this behaviour in the future.
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer?,gui?,help?,multimedia?,network?,opengl?]
+		dev-python/PyQt5[positioning?,printsupport?,sensors?,serialport?,speech?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?,xml(+)?]
+		qml? ( dev-python/PyQt5[declarative] )
+		quick? ( dev-python/PyQt5[declarative] )
+		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
+	)
+	pyqt6? (
+		dev-python/PyQt6[${PYTHON_USEDEP}]
+		dev-python/PyQt6[designer?,gui?,help?,multimedia?,network?,opengl?]
+		dev-python/PyQt6[positioning?,printsupport?,qml?,quick?,sensors?,serialport?,sql?]
+		dev-python/PyQt6[speech?,svg?,testlib?,webchannel?,websockets?,widgets?,xml?]
+		webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] )
+
+	)
+	pyside2? (
+		$(python_gen_cond_dep '
+			dev-python/pyside2[${PYTHON_USEDEP}]
+			dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?]
+			dev-python/pyside2[positioning?,printsupport?,qml?,quick?,sensors?,serialport(+)?]
+			dev-python/pyside2[speech?,sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
+			dev-python/pyside2[widgets?,xml?]
+		' python3_{10..11})
+	)
+	pyside6? (
+		dev-python/pyside6[${PYTHON_USEDEP}]
+		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
+		dev-python/pyside6[positioning?,printsupport?,qml?,quick?,sensors(-)?,serialport?]
+		dev-python/pyside6[speech(-)?,sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
+		dev-python/pyside6[widgets?,xml?]
+	)
+"
+
+# The QtPy testsuite skips tests for bindings that are not installed, so here we
+# ensure that everything is available and all tests are run. Note that not
+# all flags are available in PyQt5/PySide2, so some tests are still skipped.
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-qt[${PYTHON_USEDEP}]
+		pyqt5? (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
+			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
+			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
+			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
+			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		)
+		pyqt6? (
+			dev-python/PyQt6[${PYTHON_USEDEP}]
+			dev-python/PyQt6[dbus,designer,gui,help,multimedia,network,nfc,opengl]
+			dev-python/PyQt6[pdfium(-),positioning,printsupport,qml,quick,quick3d,serialport]
+			dev-python/PyQt6[sensors(-),spatialaudio(-),speech(-),sql,ssl,svg,testlib,webchannel]
+			dev-python/PyQt6[websockets,widgets,xml]
+			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick]
+		)
+		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(+)]
+				dev-python/pyside2[positioning,printsupport,qml,quick,scxml]
+				dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
+				dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
+				dev-python/pyside2[xml,xmlpatterns]
+			' python3_{10..11})
+		)
+		pyside6? (
+			dev-python/pyside6[${PYTHON_USEDEP}]
+			dev-python/pyside6[3d(-),bluetooth(-),concurrent,dbus,designer,gui,help]
+			dev-python/pyside6[location(-),multimedia,network,nfc(-),opengl,positioning,pdfium(-)]
+			dev-python/pyside6[printsupport,qml,quick,quick3d,scxml(-),sensors(-)]
+			dev-python/pyside6[serialport,spatialaudio(-),speech(-),sql,svg,testlib,webchannel]
+			dev-python/pyside6[webengine,websockets,widgets,xml]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	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 '/from PyQt5.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' qtpy/__init__.py || die
+	fi
+	if ! use pyqt6; then
+		sed -i -e '/from PyQt6.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' qtpy/__init__.py || die
+	fi
+	if ! use pyside2; then
+		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
+	if ! use pyside6; then
+		sed -i -e "s/from PySide6 import/raise ImportError #/" qtpy/__init__.py || die
+		sed -i -e "s/from PySide6.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+}
+
+python_test() {
+	# Test for each enabled Qt4Python target.
+	# Deselect the other targets, their test fails if we specify QT_API
+	# or if we have disabled their corresponding inherit in __init__.py above
+	if use pyqt5; then
+		einfo "Testing with ${EPYTHON} and QT_API=PyQt5"
+		QT_API="pyqt5" virtx epytest \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6]
+	fi
+	if use pyqt6; then
+		einfo "Testing with ${EPYTHON} and QT_API=PyQt6"
+		QT_API="pyqt6" virtx epytest \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6] \
+			--deselect qtpy/tests/test_qtsensors.py::test_qtsensors
+			# Qt6Sensors not yet packaged and enabled in PyQt6 ebuild
+	fi
+	if use pyside2; then
+		einfo "Testing with ${EPYTHON} and QT_API=PySide2"
+		QT_API="pyside2" virtx epytest \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6]
+	fi
+	if use pyside6; then
+		einfo "Testing with ${EPYTHON} and QT_API=PySide6"
+		QT_API="pyside6" virtx epytest \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
+			--deselect qtpy/tests/test_qtsensors.py::test_qtsensors
+			# Qt6Sensors not yet packaged and enabled in PySide6 ebuild
+	fi
+}
+
+pkg_postinst() {
+	elog "When multiple Qt4Python targets are enabled QtPy will default to"
+	elog "the first enabled target in this order: PyQt5 PySide2 PyQt6 PySide6."
+	elog "This can be overridden with the QT_API environment variable."
+}
diff --git a/dev-python/QtPy/QtPy-2.4.0.ebuild b/dev-python/QtPy/QtPy-2.4.0.ebuild
index 8e96d92a9313..4e8c65ec1df3 100644
--- a/dev-python/QtPy/QtPy-2.4.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.0.ebuild
@@ -42,8 +42,6 @@ REQUIRED_USE="
 # 	concurrent? ( pyside2 only )
 # 	datavis? ( pyside2 only )
 # 	scxml? ( pyside2 only )
-# 	script? ( pyside2 only )
-# 	scripttools? ( pyside2 only )
 #
 #	location? ( pyside2 and pyqt5 only )
 #	sensors? ( pyside2 and pyqt5 only )
@@ -134,7 +132,7 @@ BDEPEND="
 				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[printsupport,qml,quick,scxml]
 				dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
 				dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
 				dev-python/pyside2[xml,xmlpatterns]
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index e748334bb8e6..e50590762519 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -29,7 +29,9 @@
 		<flag name="printsupport">Pull in bindings for the QtPrintSupport module</flag>
 		<flag name="qml">Build bindings for the QtQml</flag>
 		<flag name="quick">Build bindings for the QtQuick</flag>
+		<flag name="sensors">Pull in bindings for the QtSensors module</flag>
 		<flag name="serialport">Pull in bindings for the QtSerialPort module</flag>
+		<flag name="speech">Pull in bindings for the QtTextToSpeech module</flag>
 		<flag name="sql">Pull in bindings for the QtSql module</flag>
 		<flag name="svg">Pull in bindings for the QtSvg module</flag>
 		<flag name="testlib">Pull in bindings for the QtTest module</flag>