From fd87b7c771378b2116981e3924bee5805148e118 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 22 Nov 2023 17:18:34 +0000
Subject: gentoo auto-resync : 22:11:2023 - 17:18:34

---
 dev-python/QtPy/Manifest             |  2 +-
 dev-python/QtPy/QtPy-2.4.1-r1.ebuild | 57 ++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 33 deletions(-)

(limited to 'dev-python/QtPy')

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index c9990f417f20..e2469d6f5e38 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -5,5 +5,5 @@ EBUILD QtPy-2.3.1-r1.ebuild 8521 BLAKE2B dc1f6cea1837cf3ec4e00b5ad716ad0395a6ff7
 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
-EBUILD QtPy-2.4.1-r1.ebuild 9483 BLAKE2B 021bfc74c13c94e91250d4d5556ea610cc85bd66a32644dec10f2bc8b4f436845f4b78a86a5abb214b6f545dc267365a728fe4cce1282dbb42cad7e939d4f52e SHA512 958da8845b46f9cc7c05b6882c194f6de471abd530bd2cfa3b4c9a3541a0ac3926173757a3ab4b931177a8bdee15b70b8d824d5f9d629a5e807a04b0c71463bd
+EBUILD QtPy-2.4.1-r1.ebuild 8532 BLAKE2B c2932c35a19e2c8f1ce0eed76cd4bfc6d2ee4cc99956bd3f558efd515d99bc43b1dd255a99e60ed18ac530e5a2f2c49c0fff847788ae7dea1c2ea98ebd91254f SHA512 03962f29e5f8b0a3ddf398768b23870e7e1ab9c47acc040c308779efd894e82644a5e291a76dfcf3210491f2169d767ea2d6d17450692492499665e78d8a8edf
 MISC metadata.xml 2864 BLAKE2B f1ed249b3864a0c66d02e0aeaf48dfa8ae18ee452a75a1932ab621d86902f602c511bb113fd385ad9d6b57d6d7a07b350f1ba25ab07cc0f646281d9d41e03134 SHA512 bf065ae2c73b735ad7f501e5a525718d506495a7ce4b415e79f67b52c166082f53272a1295fc325d8a98f050bc01d2a5bba1e85ef7e1e8dfcc738b837f93bfbc
diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index 2d5fc3255ee9..ae81a1be637c 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
@@ -200,41 +200,34 @@ src_prepare() {
 }
 
 python_test() {
+	local -x QT_API
+	local -a EPYTEST_DESELECT
+	local other
+
 	# 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
+	for QT_API in PyQt{5,6} PySide{2,6}; do
+		if use "${QT_API,,}"; then
+			EPYTEST_DESELECT=()
+			for other in PyQt{5,6} PySide{2,6}; do
+				if [[ ${QT_API} != ${other} ]]; then
+					EPYTEST_DESELECT+=(
+						"qtpy/tests/test_main.py::test_qt_api_environ[${other}]"
+					)
+				fi
+			done
+
+			einfo "Testing with ${EPYTHON} and QT_API=${QT_API}"
+			nonfatal epytest ||
+				die -n "Tests failed with ${EPYTHON} and QT_API=${QT_API}" ||
+				return 1
+		fi
+	done
+}
+
+src_test() {
+	virtx distutils-r1_src_test
 }
 
 pkg_postinst() {
-- 
cgit v1.2.3