[gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2018-05-13 23:41 Aaron Bauman
  0 siblings, 0 replies; 113+ messages in thread
From: Aaron Bauman @ 2018-05-13 23:41 UTC (permalink / raw
  To: gentoo-commits

commit:     f021284cadad92b4eeb87f3047de2d9f64632bfa
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun May 13 23:39:45 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 13 23:39:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f021284c

dev-python/QtPy: amd64 stable wrt bug #655398

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 dev-python/QtPy/QtPy-1.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
index 27b02cc8155..80c9638f28b 100644
--- a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="designer gui opengl svg testlib webkit"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2024-11-05  5:53 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2024-11-05  5:53 UTC (permalink / raw
  To: gentoo-commits

commit:     d27e3d368dbe284d91ccb28fced0293fbc6e4be5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  5 04:52:48 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov  5 05:53:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d27e3d36

dev-python/QtPy: Bump to 2.4.2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/Manifest          |   1 +
 dev-python/QtPy/QtPy-2.4.2.ebuild | 243 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 244 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index f518af3f339b..19715d04e382 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1 +1,2 @@
 DIST QtPy-2.4.1.tar.gz 65492 BLAKE2B 3816e3836c171f75fc1877984b533602c8929a791b09a1f53b14687eae7a1067e47fcae3a198d798417521a1a81829168d3af94178b28d8a3bd2c28e7d9f7865 SHA512 cb7c65cfec5aba9bdc4942b95108ac0300eac5ca8f0c984e8ea789b77fded3a1817f591d43bc45e9aa4feb3cb3da64c0d42ae67f12121a807cf7c247e7612e7d
+DIST qtpy-2.4.2.tar.gz 66849 BLAKE2B 1eb362e797950d6c1406fb02bb3047ca7f8fdecd2b75371ab34f39601c9bdebce33336e3809c0d35dca31673c88d1734721a6dfdfb65f2ce20729445c4a4ca27 SHA512 2f9a0e1a4839c8dca23b4364900a12c2bd00f518353785a41eb6bd62fdc469670457f18224e1150a5a216ff5d0c4e799c3a1711ff7703ea07fadd655538fa37a

diff --git a/dev-python/QtPy/QtPy-2.4.2.ebuild b/dev-python/QtPy/QtPy-2.4.2.ebuild
new file mode 100644
index 000000000000..58ae66b2461e
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.4.2.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+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 ~arm ~arm64 ~loong ~ppc64 ~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 )
+	python_targets_python3_13? ( !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/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}]
+			dev-qt/qtsql:5[sqlite]
+		)
+		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]
+			dev-qt/qtbase:6[sqlite]
+		)
+		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]
+				dev-qt/qtsql:5[sqlite]
+				dev-python/pyside2-tools[${PYTHON_USEDEP}]
+			' python3_{10..11})
+			dev-qt/qtsql:5[sqlite]
+		)
+		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]
+			dev-python/pyside6-tools[${PYTHON_USEDEP}]
+			dev-qt/qtbase:6[sqlite]
+		)
+	)
+"
+
+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 \
+			-e '/from PyQt5.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' \
+			-e '/if "PyQt5" in sys.modules:/,/"pyqt5"/c\' \
+			-i qtpy/__init__.py || die
+
+		# We need to ensure the first option is an 'if' not 'elif'
+		sed -e 's/elif "PySide2" in sys.modules:/if "PySide2" in sys.modules:/g' -i qtpy/__init__.py || die
+	fi
+	if ! use pyside2; then
+		sed \
+			-e "s/from PySide2 import/raise ImportError #/" \
+			-e "s/from PySide2.QtCore import/raise ImportError #/" \
+			-e '/if "PySide2" in sys.modules:/,/"pyside2"/c\' \
+			-i qtpy/__init__.py || die
+
+		if ! use pyqt5; then
+			sed \
+				-e 's/elif "PyQt6" in sys.modules:/if "PyQt6" in sys.modules:/g' \
+				-i qtpy/__init__.py || die
+		fi
+	fi
+	if ! use pyqt6; then
+		sed \
+			-e '/from PyQt6.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' \
+			-e '/if "PyQt6" in sys.modules:/,/"pyqt6"/c\' \
+			-i qtpy/__init__.py || die
+
+		if ! use pyqt5 && ! use pyside2; then
+			sed \
+				-e 's/elif "PySide6" in sys.modules:/if "PySide6" in sys.modules:/g' \
+				-i qtpy/__init__.py || die
+		fi
+	fi
+	if ! use pyside6; then
+		sed \
+			-e "s/from PySide6 import/raise ImportError #/" \
+			-e "s/from PySide6.QtCore import/raise ImportError #/" \
+			-e '/if "PySide6" in sys.modules:/,/"pyside6"/c\' \
+			-i qtpy/__init__.py || die
+	fi
+}
+
+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
+	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 -o addopts= ||
+				die -n "Tests failed with ${EPYTHON} and QT_API=${QT_API}" ||
+				return 1
+		fi
+	done
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+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."
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2024-09-13 13:01 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2024-09-13 13:01 UTC (permalink / raw
  To: gentoo-commits

commit:     b65b94f10cc6ad5fe91b096b1ef3fb53eea431e4
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 12:59:10 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 13:00:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65b94f1

dev-python/QtPy: enable pyqt6 by default

also keep pyqt5 on by default since it is required by pandas

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/{QtPy-2.4.1-r1.ebuild => QtPy-2.4.1-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r2.ebuild
similarity index 99%
rename from dev-python/QtPy/QtPy-2.4.1-r1.ebuild
rename to dev-python/QtPy/QtPy-2.4.1-r2.ebuild
index e1495a0f9932..239b02d7039d 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r2.ebuild
@@ -24,7 +24,7 @@ _IUSE_QT_MODULES="
 	printsupport qml quick sensors serialport speech +sql svg testlib
 	webchannel webengine websockets +widgets +xml
 "
-IUSE="+pyqt5 pyqt6 pyside2 pyside6 ${_IUSE_QT_MODULES}"
+IUSE="+pyqt5 +pyqt6 pyside2 pyside6 ${_IUSE_QT_MODULES}"
 unset _IUSE_QT_MODULES
 
 REQUIRED_USE="


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2024-07-03 16:00 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2024-07-03 16:00 UTC (permalink / raw
  To: gentoo-commits

commit:     a1ab1e144a54f3becae3bbbe6e7ad9094d797428
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  3 15:59:39 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jul  3 16:00:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ab1e14

dev-python/QtPy: enable py3.13

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.1-r1.ebuild | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index 77a7edfb9514..e1495a0f9932 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 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} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 virtualx pypi
 
@@ -30,6 +30,7 @@ unset _IUSE_QT_MODULES
 REQUIRED_USE="
 	|| ( pyqt5 pyqt6 pyside2 pyside6 )
 	python_targets_python3_12? ( !pyside2 )
+	python_targets_python3_13? ( !pyside2 )
 "
 
 # These flags are currently *not* common to the PySide2/6 and PyQt5/6 ebuilds
@@ -139,7 +140,9 @@ BDEPEND="
 				dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
 				dev-python/pyside2[xml,xmlpatterns]
 				dev-qt/qtsql:5[sqlite]
+				dev-python/pyside2-tools[${PYTHON_USEDEP}]
 			' python3_{10..11})
+			dev-qt/qtsql:5[sqlite]
 		)
 		pyside6? (
 			dev-python/pyside6[${PYTHON_USEDEP}]
@@ -148,6 +151,7 @@ BDEPEND="
 			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]
+			dev-python/pyside6-tools[${PYTHON_USEDEP}]
 			dev-qt/qtbase:6[sqlite]
 		)
 	)


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-12-16 15:09 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2023-12-16 15:09 UTC (permalink / raw
  To: gentoo-commits

commit:     74a799a2ac142b9101a7496f0c52a51af1e85190
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 14:19:09 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 15:09:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74a799a2

dev-python/QtPy: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/Manifest             |   2 -
 dev-python/QtPy/QtPy-2.3.1-r1.ebuild | 215 ----------------------------------
 dev-python/QtPy/QtPy-2.3.1.ebuild    | 204 ---------------------------------
 dev-python/QtPy/QtPy-2.4.0-r1.ebuild | 216 -----------------------------------
 dev-python/QtPy/QtPy-2.4.0.ebuild    | 216 -----------------------------------
 5 files changed, 853 deletions(-)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 629ab0ed5441..f518af3f339b 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1 @@
-DIST QtPy-2.3.1.tar.gz 56260 BLAKE2B 1b8d76879cc1f07b3633e6b25887ac4621ee3a8e9ebbcaa1f1f8c4f3fbcdae37bd5d659717bf89227d4ed6b5126554b329813aaee0b6be333c0cdc931cfb8d43 SHA512 9c738ec07e18852b67c30962fbc0ca48479eccff2a9f2ee9f4817c4ead5a8068d54aced58d632977163f180a584a9b7b2b68ea25e0577b92a262fef8eb576041
-DIST QtPy-2.4.0.tar.gz 65007 BLAKE2B d2770608d807959aaa8b0201304be1f3f112f039f8febddf62bc7cd09a04ed53dd7fd89ee782fd3bd11c5f84c8d2a8c529242c2df01d34c27d87ac1f8873017f SHA512 54be0c9b15055f9c078ff8eebd88910d718833f3d9572567076b1fc0c22d3d5c12dc2a2d7fbedb9bc8636d575775e83cb08a554a0ee45a859297501a5711b716
 DIST QtPy-2.4.1.tar.gz 65492 BLAKE2B 3816e3836c171f75fc1877984b533602c8929a791b09a1f53b14687eae7a1067e47fcae3a198d798417521a1a81829168d3af94178b28d8a3bd2c28e7d9f7865 SHA512 cb7c65cfec5aba9bdc4942b95108ac0300eac5ca8f0c984e8ea789b77fded3a1817f591d43bc45e9aa4feb3cb3da64c0d42ae67f12121a807cf7c247e7612e7d

diff --git a/dev-python/QtPy/QtPy-2.3.1-r1.ebuild b/dev-python/QtPy/QtPy-2.3.1-r1.ebuild
deleted file mode 100644
index ed9a436932ef..000000000000
--- a/dev-python/QtPy/QtPy-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# 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 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-_IUSE_QT_MODULES="
-	designer +gui help multimedia +network opengl positioning
-	printsupport qml quick serialport +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 !pyside6 )
-"
-
-# 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 only )
-# 	dbus? ( pyqt5 only )
-#
-# 	3d? ( pyside2 only )
-# 	charts? ( pyside2 only )
-# 	concurrent? ( pyside2 only )
-# 	datavis? ( pyside2 only )
-# 	scxml? ( pyside2 only )
-#
-#	location? ( pyside2 and pyqt5 only )
-#	sensors? ( pyside2 and pyqt5 only )
-#	speech? ( pyside2 and pyqt5 only )
-#	x11extras? ( pyside2 and pyqt5 only )
-#	xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?]
-		dev-python/PyQt6[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?,serialport(+)?]
-			dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-			dev-python/pyside2[widgets?,xml?]
-		' python3_{10..11})
-	)
-	pyside6? (
-		$(python_gen_cond_dep '
-			dev-python/pyside6[${PYTHON_USEDEP}]
-			dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
-			dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
-			dev-python/pyside6[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-			dev-python/pyside6[widgets?,xml?]
-		' python3_{10..11})
-	)
-"
-
-# 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? (
-		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,opengl]
-			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
-			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,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(+),positioning]
-				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]
-			' python3_{10..11})
-		)
-		pyside6? (
-			$(python_gen_cond_dep '
-				dev-python/pyside6[${PYTHON_USEDEP}]
-				dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
-				dev-python/pyside6[network,opengl,positioning,printsupport,qml]
-				dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
-				dev-python/pyside6[webchannel,webengine,websockets,widgets,xml]
-			' python3_{10..11})
-		)
-	)
-"
-
-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 "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyqt6; then
-		sed -i -e "s/from PyQt6.QtCore import/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.3.1.ebuild b/dev-python/QtPy/QtPy-2.3.1.ebuild
deleted file mode 100644
index f048e6fa3d2c..000000000000
--- a/dev-python/QtPy/QtPy-2.3.1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# 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..11} )
-
-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 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-
-_IUSE_QT_MODULES="
-	designer +gui help multimedia +network opengl positioning
-	printsupport qml quick serialport +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 )"
-
-# 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 only )
-# 	dbus? ( pyqt5 only )
-#
-# 	3d? ( pyside2 only )
-# 	charts? ( pyside2 only )
-# 	concurrent? ( pyside2 only )
-# 	datavis? ( pyside2 only )
-# 	scxml? ( pyside2 only )
-#
-#	location? ( pyside2 and pyqt5 only )
-#	sensors? ( pyside2 and pyqt5 only )
-#	speech? ( pyside2 and pyqt5 only )
-#	x11extras? ( pyside2 and pyqt5 only )
-#	xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?]
-		dev-python/PyQt6[svg?,testlib?,webchannel?,websockets?,widgets?,xml?]
-		webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] )
-
-	)
-	pyside2? (
-		dev-python/pyside2[${PYTHON_USEDEP}]
-		dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?]
-		dev-python/pyside2[positioning?,printsupport?,qml?,quick?,serialport(+)?]
-		dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-		dev-python/pyside2[widgets?,xml?]
-	)
-	pyside6? (
-		dev-python/pyside6[${PYTHON_USEDEP}]
-		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
-		dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
-		dev-python/pyside6[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? (
-		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,opengl]
-			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
-			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,websockets,widgets,xml]
-			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick]
-		)
-		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,scxml]
-			dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
-			dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
-			dev-python/pyside2[xml,xmlpatterns]
-		)
-		pyside6? (
-			dev-python/pyside6[${PYTHON_USEDEP}]
-			dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
-			dev-python/pyside6[network,opengl,positioning,printsupport,qml]
-			dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
-			dev-python/pyside6[webchannel,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 "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyqt6; then
-		sed -i -e "s/from PyQt6.QtCore import/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-r1.ebuild b/dev-python/QtPy/QtPy-2.4.0-r1.ebuild
deleted file mode 100644
index 9b05e3e8e982..000000000000
--- a/dev-python/QtPy/QtPy-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# 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/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
deleted file mode 100644
index aecca39704a1..000000000000
--- a/dev-python/QtPy/QtPy-2.4.0.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# 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 serialport +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 !pyside6 )
-"
-
-# 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 only )
-# 	dbus? ( pyqt5 only )
-#
-# 	3d? ( pyside2 only )
-# 	charts? ( pyside2 only )
-# 	concurrent? ( pyside2 only )
-# 	datavis? ( pyside2 only )
-# 	scxml? ( pyside2 only )
-#
-#	location? ( pyside2 and pyqt5 only )
-#	sensors? ( pyside2 and pyqt5 only )
-#	speech? ( pyside2 and pyqt5 only )
-#	x11extras? ( pyside2 and pyqt5 only )
-#	xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?]
-		dev-python/PyQt6[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?,serialport(+)?]
-			dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-			dev-python/pyside2[widgets?,xml?]
-		' python3_{10..11})
-	)
-	pyside6? (
-		$(python_gen_cond_dep '
-			dev-python/pyside6[${PYTHON_USEDEP}]
-			dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
-			dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
-			dev-python/pyside6[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-			dev-python/pyside6[widgets?,xml?]
-		' python3_{10..11})
-	)
-"
-
-# 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/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,opengl]
-			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
-			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,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(+),positioning]
-				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]
-			' python3_{10..11})
-		)
-		pyside6? (
-			$(python_gen_cond_dep '
-				dev-python/pyside6[${PYTHON_USEDEP}]
-				dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
-				dev-python/pyside6[network,opengl,positioning,printsupport,qml]
-				dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
-				dev-python/pyside6[webchannel,webengine,websockets,widgets,xml]
-			' python3_{10..11})
-		)
-	)
-"
-
-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."
-}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-12-16 13:47 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2023-12-16 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     5898cac574a891347d551fd2c41f3b79ec371383
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 13:47:25 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 13:47:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5898cac5

dev-python/QtPy: Keyword 2.4.1-r1 arm, #913248

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index 1fa6f80c0f47..77a7edfb9514 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-12-16  7:05 Arthur Zamarin
  0 siblings, 0 replies; 113+ messages in thread
From: Arthur Zamarin @ 2023-12-16  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     d99ed53cb012e9e0ffec275a337b0526e48600fc
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 07:05:07 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 07:05:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d99ed53c

dev-python/QtPy: Stabilize 2.4.1-r1 amd64, #917728

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index d47ac96bfa23..1fa6f80c0f47 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-12-16  7:04 Arthur Zamarin
  0 siblings, 0 replies; 113+ messages in thread
From: Arthur Zamarin @ 2023-12-16  7:04 UTC (permalink / raw
  To: gentoo-commits

commit:     aaa48da5a7273753d478586c47eca3d4b7e33cd4
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 07:04:11 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 07:04:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa48da5

dev-python/QtPy: Stabilize 2.4.1-r1 x86, #917728

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index 047f7c6bd69a..d47ac96bfa23 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-12-15 12:39 Arthur Zamarin
  0 siblings, 0 replies; 113+ messages in thread
From: Arthur Zamarin @ 2023-12-15 12:39 UTC (permalink / raw
  To: gentoo-commits

commit:     adcaf43c62aac9838ff98742a2e8a938c1c82f8d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 12:39:02 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 12:39:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adcaf43c

dev-python/QtPy: Stabilize 2.4.1-r1 arm64, #917728

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index ccfe14b964a8..047f7c6bd69a 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-12-15 11:04 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2023-12-15 11:04 UTC (permalink / raw
  To: gentoo-commits

commit:     dff69e99790a95302c1cd9ae9706d435c4f5cf72
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 11:03:17 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 11:04:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff69e99

dev-python/QtPy: Tests require sqlite support in qtsql

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.1-r1.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index 62287d911655..ccfe14b964a8 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
@@ -118,6 +118,7 @@ BDEPEND="
 			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
 			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
 			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+			dev-qt/qtsql:5[sqlite]
 		)
 		pyqt6? (
 			dev-python/PyQt6[${PYTHON_USEDEP}]
@@ -126,6 +127,7 @@ BDEPEND="
 			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]
+			dev-qt/qtbase:6[sqlite]
 		)
 		pyside2? (
 			$(python_gen_cond_dep '
@@ -136,6 +138,7 @@ BDEPEND="
 				dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
 				dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
 				dev-python/pyside2[xml,xmlpatterns]
+				dev-qt/qtsql:5[sqlite]
 			' python3_{10..11})
 		)
 		pyside6? (
@@ -145,6 +148,7 @@ BDEPEND="
 			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]
+			dev-qt/qtbase:6[sqlite]
 		)
 	)
 "


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-12-05  4:20 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2023-12-05  4:20 UTC (permalink / raw
  To: gentoo-commits

commit:     b24eac52dcae0163e1a0dc706d184cae320ed14e
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Wed Nov 29 23:59:32 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec  5 04:20:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b24eac52

dev-python/QtPy: drop outdated test dependency on mock

It was dropped upstream in 2.0.0 in favor of the stdlib unittest.mock:
https://github.com/spyder-ide/qtpy/commit/bc8f851e723c08a1ffe0978f9f9bd522ebfa1eec

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.3.1-r1.ebuild | 1 -
 dev-python/QtPy/QtPy-2.3.1.ebuild    | 3 +--
 dev-python/QtPy/QtPy-2.4.0-r1.ebuild | 1 -
 dev-python/QtPy/QtPy-2.4.0.ebuild    | 1 -
 dev-python/QtPy/QtPy-2.4.1-r1.ebuild | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/dev-python/QtPy/QtPy-2.3.1-r1.ebuild b/dev-python/QtPy/QtPy-2.3.1-r1.ebuild
index 237b0ebc5a17..ed9a436932ef 100644
--- a/dev-python/QtPy/QtPy-2.3.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.3.1-r1.ebuild
@@ -110,7 +110,6 @@ RDEPEND="
 # all flags are available in PyQt5/PySide2, so some tests are still skipped.
 BDEPEND="
 	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
 		pyqt5? (
 			dev-python/PyQt5[${PYTHON_USEDEP}]
 			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]

diff --git a/dev-python/QtPy/QtPy-2.3.1.ebuild b/dev-python/QtPy/QtPy-2.3.1.ebuild
index 3861afc77cd8..f048e6fa3d2c 100644
--- a/dev-python/QtPy/QtPy-2.3.1.ebuild
+++ b/dev-python/QtPy/QtPy-2.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1 virtualx pypi
 
@@ -103,7 +103,6 @@ RDEPEND="
 # all flags are available in PyQt5/PySide2, so some tests are still skipped.
 BDEPEND="
 	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
 		pyqt5? (
 			dev-python/PyQt5[${PYTHON_USEDEP}]
 			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]

diff --git a/dev-python/QtPy/QtPy-2.4.0-r1.ebuild b/dev-python/QtPy/QtPy-2.4.0-r1.ebuild
index b36bfa5ce6fc..9b05e3e8e982 100644
--- a/dev-python/QtPy/QtPy-2.4.0-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.0-r1.ebuild
@@ -110,7 +110,6 @@ RDEPEND="
 # 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}]

diff --git a/dev-python/QtPy/QtPy-2.4.0.ebuild b/dev-python/QtPy/QtPy-2.4.0.ebuild
index 4e8c65ec1df3..aecca39704a1 100644
--- a/dev-python/QtPy/QtPy-2.4.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.0.ebuild
@@ -110,7 +110,6 @@ RDEPEND="
 # 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}]

diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index c62f831980bd..62287d911655 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
@@ -110,7 +110,6 @@ RDEPEND="
 # 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}]


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-12-03  5:45 Arthur Zamarin
  0 siblings, 0 replies; 113+ messages in thread
From: Arthur Zamarin @ 2023-12-03  5:45 UTC (permalink / raw
  To: gentoo-commits

commit:     fe20f3229bb78954b0371ef0cdf609f2a01d6d27
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 05:45:30 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 05:45:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe20f322

dev-python/QtPy: Keyword 2.4.1-r1 ppc64, #913248

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index ae81a1be637c..c62f831980bd 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-11-22 15:57 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2023-11-22 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     cf52607acd7fd4ab3b1dc97ce45722b137718b9f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 15:47:56 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 15:57:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf52607a

dev-python/QtPy: Reenable the test for dev-qt/qtsensors:6

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.1-r1.ebuild | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index 2d5fc3255ee9..ca7b19c3936d 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
@@ -215,9 +215,7 @@ python_test() {
 		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
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6]
 	fi
 	if use pyside2; then
 		einfo "Testing with ${EPYTHON} and QT_API=PySide2"
@@ -231,9 +229,7 @@ python_test() {
 		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
+			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6]
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-11-22 15:57 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2023-11-22 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     1e7680b617adb9a171116d17e0625c39795f2918
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 15:56:42 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 15:57:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e7680b6

dev-python/QtPy: Refactor/streamline running tests

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.1-r1.ebuild | 53 +++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index ca7b19c3936d..ae81a1be637c 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
@@ -200,37 +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]
-	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]
-	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() {


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-10-26 15:18 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2023-10-26 15:18 UTC (permalink / raw
  To: gentoo-commits

commit:     ad167a488a979260256cb3513dbe7594b9276fc9
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 26 15:15:11 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Oct 26 15:18:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad167a48

dev-python/QtPy: properly handle implicit QT_API behaviour

If a Qt4Python implementation has already been imported QtPy tries to use
that implementation by default, even if this implementation is disabled by
USE flag configuration. Here we add some extra sed's to remove the sys.modules
check for implementations that we have disabled, taking care that the first
entry in the if block always starts with if and not elif.

Closes: https://bugs.gentoo.org/916298
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../{QtPy-2.4.1.ebuild => QtPy-2.4.1-r1.ebuild}    | 43 ++++++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/dev-python/QtPy/QtPy-2.4.1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
similarity index 87%
rename from dev-python/QtPy/QtPy-2.4.1.ebuild
rename to dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index b36bfa5ce6fc..2d5fc3255ee9 100644
--- a/dev-python/QtPy/QtPy-2.4.1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
@@ -157,18 +157,45 @@ 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
+		sed \
+			-e '/from PyQt5.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' \
+			-e '/if "PyQt5" in sys.modules:/,/"pyqt5"/c\' \
+			-i qtpy/__init__.py || die
+
+		# We need to ensure the first option is an 'if' not 'elif'
+		sed -e 's/elif "PySide2" in sys.modules:/if "PySide2" in sys.modules:/g' -i 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
+		sed \
+			-e "s/from PySide2 import/raise ImportError #/" \
+			-e "s/from PySide2.QtCore import/raise ImportError #/" \
+			-e '/if "PySide2" in sys.modules:/,/"pyside2"/c\' \
+			-i qtpy/__init__.py || die
+
+		if ! use pyqt5; then
+			sed \
+				-e 's/elif "PyQt6" in sys.modules:/if "PyQt6" in sys.modules:/g' \
+				-i qtpy/__init__.py || die
+		fi
+	fi
+	if ! use pyqt6; then
+		sed \
+			-e '/from PyQt6.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' \
+			-e '/if "PyQt6" in sys.modules:/,/"pyqt6"/c\' \
+			-i qtpy/__init__.py || die
+
+		if ! use pyqt5 && ! use pyside2; then
+			sed \
+				-e 's/elif "PySide6" in sys.modules:/if "PySide6" in sys.modules:/g' \
+				-i qtpy/__init__.py || die
+		fi
 	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
+		sed \
+			-e "s/from PySide6 import/raise ImportError #/" \
+			-e "s/from PySide6.QtCore import/raise ImportError #/" \
+			-e '/if "PySide6" in sys.modules:/,/"pyside6"/c\' \
+			-i qtpy/__init__.py || die
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-10-24  5:16 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2023-10-24  5:16 UTC (permalink / raw
  To: gentoo-commits

commit:     84b1490861405d8f2cba6973dc8bbb49d37ede39
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 04:41:26 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 05:16:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84b14908

dev-python/QtPy: Bump to 2.4.1

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/Manifest          |   1 +
 dev-python/QtPy/QtPy-2.4.1.ebuild | 217 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 218 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 0fa4465c840c..629ab0ed5441 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,2 +1,3 @@
 DIST QtPy-2.3.1.tar.gz 56260 BLAKE2B 1b8d76879cc1f07b3633e6b25887ac4621ee3a8e9ebbcaa1f1f8c4f3fbcdae37bd5d659717bf89227d4ed6b5126554b329813aaee0b6be333c0cdc931cfb8d43 SHA512 9c738ec07e18852b67c30962fbc0ca48479eccff2a9f2ee9f4817c4ead5a8068d54aced58d632977163f180a584a9b7b2b68ea25e0577b92a262fef8eb576041
 DIST QtPy-2.4.0.tar.gz 65007 BLAKE2B d2770608d807959aaa8b0201304be1f3f112f039f8febddf62bc7cd09a04ed53dd7fd89ee782fd3bd11c5f84c8d2a8c529242c2df01d34c27d87ac1f8873017f SHA512 54be0c9b15055f9c078ff8eebd88910d718833f3d9572567076b1fc0c22d3d5c12dc2a2d7fbedb9bc8636d575775e83cb08a554a0ee45a859297501a5711b716
+DIST QtPy-2.4.1.tar.gz 65492 BLAKE2B 3816e3836c171f75fc1877984b533602c8929a791b09a1f53b14687eae7a1067e47fcae3a198d798417521a1a81829168d3af94178b28d8a3bd2c28e7d9f7865 SHA512 cb7c65cfec5aba9bdc4942b95108ac0300eac5ca8f0c984e8ea789b77fded3a1817f591d43bc45e9aa4feb3cb3da64c0d42ae67f12121a807cf7c247e7612e7d

diff --git a/dev-python/QtPy/QtPy-2.4.1.ebuild b/dev-python/QtPy/QtPy-2.4.1.ebuild
new file mode 100644
index 000000000000..b36bfa5ce6fc
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.4.1.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."
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-10-18 11:36 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2023-10-18 11:36 UTC (permalink / raw
  To: gentoo-commits

commit:     ed3cc96f11f8f1fc2bc12444122691ab6ec6b01c
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 11:35:10 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 11:36:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed3cc96f

dev-python/QtPy: add USE=sensors and USE=speech

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.0-r1.ebuild | 217 +++++++++++++++++++++++++++++++++++
 dev-python/QtPy/metadata.xml         |   2 +
 2 files changed, 219 insertions(+)

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/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>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-10-18 11:36 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2023-10-18 11:36 UTC (permalink / raw
  To: gentoo-commits

commit:     003d4e6652e266438f53f740b89c35be7b6da956
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 10:57:38 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 11:36:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=003d4e66

dev-python/QtPy: drop pyside2[script,scripttools] tests

Closes: https://bugs.gentoo.org/915781
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.3.1-r1.ebuild | 4 +---
 dev-python/QtPy/QtPy-2.3.1.ebuild    | 4 +---
 dev-python/QtPy/QtPy-2.4.0.ebuild    | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

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.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]


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-09-26  0:54 Sam James
  0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2023-09-26  0:54 UTC (permalink / raw
  To: gentoo-commits

commit:     292c09858c05d0b84d098420118438d281e0961b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 00:54:32 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 00:54:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=292c0985

dev-python/QtPy: Stabilize 2.4.0 x86, #914687

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.4.0.ebuild b/dev-python/QtPy/QtPy-2.4.0.ebuild
index e134e3445f2d..8e96d92a9313 100644
--- a/dev-python/QtPy/QtPy-2.4.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-09-11  6:48 Jakov Smolić
  0 siblings, 0 replies; 113+ messages in thread
From: Jakov Smolić @ 2023-09-11  6:48 UTC (permalink / raw
  To: gentoo-commits

commit:     e06eda332b2dea0f99e10457f2e303a74a58266b
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 06:47:55 2023 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 06:47:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e06eda33

dev-python/QtPy: Keyword 2.4.0 riscv, #913248

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.4.0.ebuild b/dev-python/QtPy/QtPy-2.4.0.ebuild
index 5702325ca211..e134e3445f2d 100644
--- a/dev-python/QtPy/QtPy-2.4.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-09-10  5:27 WANG Xuerui
  0 siblings, 0 replies; 113+ messages in thread
From: WANG Xuerui @ 2023-09-10  5:27 UTC (permalink / raw
  To: gentoo-commits

commit:     e3ced86f0b677f5107dd6dae7952b56c7c9f8d51
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 05:23:52 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 05:26:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ced86f

dev-python/QtPy: keyword 2.4.0 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.4.0.ebuild b/dev-python/QtPy/QtPy-2.4.0.ebuild
index e87365436358..5702325ca211 100644
--- a/dev-python/QtPy/QtPy-2.4.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-08-30  8:52 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2023-08-30  8:52 UTC (permalink / raw
  To: gentoo-commits

commit:     a0f7fa79d4df333865c7c90b93935e88fbf591cc
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 08:50:49 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 08:52:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0f7fa79

dev-python/QtPy: fix disabling of pyqt5 or pyqt6

The import statement now spans three lines which broke
our sed

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.4.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/QtPy/QtPy-2.4.0.ebuild b/dev-python/QtPy/QtPy-2.4.0.ebuild
index 677fc3b3bda7..e87365436358 100644
--- a/dev-python/QtPy/QtPy-2.4.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.0.ebuild
@@ -159,10 +159,10 @@ 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
+		sed -i -e '/from PyQt5.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' qtpy/__init__.py || die
 	fi
 	if ! use pyqt6; then
-		sed -i -e "s/from PyQt6.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+		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


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-08-30  7:43 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2023-08-30  7:43 UTC (permalink / raw
  To: gentoo-commits

commit:     34797659bbd0bb5b8b29fd71518033ab4d83bd14
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 07:43:37 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 07:43:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34797659

dev-python/QtPy: add 2.4.0

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/Manifest          |   1 +
 dev-python/QtPy/QtPy-2.4.0.ebuild | 219 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 220 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 32f8aebac423..0fa4465c840c 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1 +1,2 @@
 DIST QtPy-2.3.1.tar.gz 56260 BLAKE2B 1b8d76879cc1f07b3633e6b25887ac4621ee3a8e9ebbcaa1f1f8c4f3fbcdae37bd5d659717bf89227d4ed6b5126554b329813aaee0b6be333c0cdc931cfb8d43 SHA512 9c738ec07e18852b67c30962fbc0ca48479eccff2a9f2ee9f4817c4ead5a8068d54aced58d632977163f180a584a9b7b2b68ea25e0577b92a262fef8eb576041
+DIST QtPy-2.4.0.tar.gz 65007 BLAKE2B d2770608d807959aaa8b0201304be1f3f112f039f8febddf62bc7cd09a04ed53dd7fd89ee782fd3bd11c5f84c8d2a8c529242c2df01d34c27d87ac1f8873017f SHA512 54be0c9b15055f9c078ff8eebd88910d718833f3d9572567076b1fc0c22d3d5c12dc2a2d7fbedb9bc8636d575775e83cb08a554a0ee45a859297501a5711b716

diff --git a/dev-python/QtPy/QtPy-2.4.0.ebuild b/dev-python/QtPy/QtPy-2.4.0.ebuild
new file mode 100644
index 000000000000..677fc3b3bda7
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.4.0.ebuild
@@ -0,0 +1,219 @@
+# 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 ~x86"
+
+_IUSE_QT_MODULES="
+	designer +gui help multimedia +network opengl positioning
+	printsupport qml quick serialport +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 !pyside6 )
+"
+
+# 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 only )
+# 	dbus? ( pyqt5 only )
+#
+# 	3d? ( pyside2 only )
+# 	charts? ( pyside2 only )
+# 	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 )
+#	speech? ( pyside2 and pyqt5 only )
+#	x11extras? ( pyside2 and pyqt5 only )
+#	xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?]
+		dev-python/PyQt6[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?,serialport(+)?]
+			dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
+			dev-python/pyside2[widgets?,xml?]
+		' python3_{10..11})
+	)
+	pyside6? (
+		$(python_gen_cond_dep '
+			dev-python/pyside6[${PYTHON_USEDEP}]
+			dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
+			dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
+			dev-python/pyside6[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
+			dev-python/pyside6[widgets?,xml?]
+		' python3_{10..11})
+	)
+"
+
+# 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,opengl]
+			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
+			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,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(+),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_{10..11})
+		)
+		pyside6? (
+			$(python_gen_cond_dep '
+				dev-python/pyside6[${PYTHON_USEDEP}]
+				dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
+				dev-python/pyside6[network,opengl,positioning,printsupport,qml]
+				dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
+				dev-python/pyside6[webchannel,webengine,websockets,widgets,xml]
+			' python3_{10..11})
+		)
+	)
+"
+
+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 "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyqt6; then
+		sed -i -e "s/from PyQt6.QtCore import/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."
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-08-21 15:26 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2023-08-21 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     89f6989558c40ccb5f34b32f3b4d5784c9896a8e
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 14:36:05 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 15:26:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f69895

dev-python/QtPy: enable py3.12 for USE=pyqt5 or USE=pyqt6

Pyside{2,6} still isn't compatible with 3.12 but this at least allows us
to move further with enabling 3.12 on packages higher up in the dep graph.

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.3.1-r1.ebuild | 218 +++++++++++++++++++++++++++++++++++
 1 file changed, 218 insertions(+)

diff --git a/dev-python/QtPy/QtPy-2.3.1-r1.ebuild b/dev-python/QtPy/QtPy-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..b6127a1aae93
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.3.1-r1.ebuild
@@ -0,0 +1,218 @@
+# 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 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+_IUSE_QT_MODULES="
+	designer +gui help multimedia +network opengl positioning
+	printsupport qml quick serialport +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 !pyside6 )
+"
+
+# 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 only )
+# 	dbus? ( pyqt5 only )
+#
+# 	3d? ( pyside2 only )
+# 	charts? ( pyside2 only )
+# 	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 )
+#	speech? ( pyside2 and pyqt5 only )
+#	x11extras? ( pyside2 and pyqt5 only )
+#	xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?]
+		dev-python/PyQt6[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?,serialport(+)?]
+			dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
+			dev-python/pyside2[widgets?,xml?]
+		' python3_{10..11})
+	)
+	pyside6? (
+		$(python_gen_cond_dep '
+			dev-python/pyside6[${PYTHON_USEDEP}]
+			dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
+			dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
+			dev-python/pyside6[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
+			dev-python/pyside6[widgets?,xml?]
+		' python3_{10..11})
+	)
+"
+
+# 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}]
+		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,opengl]
+			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
+			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,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(+),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_{10..11})
+		)
+		pyside6? (
+			$(python_gen_cond_dep '
+				dev-python/pyside6[${PYTHON_USEDEP}]
+				dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
+				dev-python/pyside6[network,opengl,positioning,printsupport,qml]
+				dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
+				dev-python/pyside6[webchannel,webengine,websockets,widgets,xml]
+			' python3_{10..11})
+		)
+	)
+"
+
+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 "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyqt6; then
+		sed -i -e "s/from PyQt6.QtCore import/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."
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-04-29  7:09 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2023-04-29  7:09 UTC (permalink / raw
  To: gentoo-commits

commit:     12a3558cb09e0e6089539fbc6e5a3bb06c1f9d08
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 07:07:29 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 07:09:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a3558c

dev-python/QtPy: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/Manifest          |   1 -
 dev-python/QtPy/QtPy-2.3.0.ebuild | 207 --------------------------------------
 2 files changed, 208 deletions(-)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index a05791b29c6c..32f8aebac423 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,2 +1 @@
-DIST QtPy-2.3.0.tar.gz 53980 BLAKE2B 142694c3b10dc2ed46c168a063c0019928358d079dddfef0708ec8cabd782e206734bc0f680a7ee7309b483c56ecd739b3364061eaf190a1a9c9e41d940af202 SHA512 1fa3d52367fa70ca178a128f3cc95f333b1408dd88b9f9d15ef30b4c7f848a91df1626fa046667ce6bd6ee3f7a3909f1b3fb06b902eff26e1f058139eced73c6
 DIST QtPy-2.3.1.tar.gz 56260 BLAKE2B 1b8d76879cc1f07b3633e6b25887ac4621ee3a8e9ebbcaa1f1f8c4f3fbcdae37bd5d659717bf89227d4ed6b5126554b329813aaee0b6be333c0cdc931cfb8d43 SHA512 9c738ec07e18852b67c30962fbc0ca48479eccff2a9f2ee9f4817c4ead5a8068d54aced58d632977163f180a584a9b7b2b68ea25e0577b92a262fef8eb576041

diff --git a/dev-python/QtPy/QtPy-2.3.0.ebuild b/dev-python/QtPy/QtPy-2.3.0.ebuild
deleted file mode 100644
index b3033047630e..000000000000
--- a/dev-python/QtPy/QtPy-2.3.0.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# 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_{9..11} )
-
-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 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-
-_IUSE_QT_MODULES="
-	designer +gui help multimedia +network opengl positioning
-	printsupport qml quick serialport +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 )"
-
-# 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 only )
-# 	dbus? ( pyqt5 only )
-#
-# 	3d? ( pyside2 only )
-# 	charts? ( pyside2 only )
-# 	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 )
-#	speech? ( pyside2 and pyqt5 only )
-#	x11extras? ( pyside2 and pyqt5 only )
-#	xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?]
-		dev-python/PyQt6[svg?,testlib?,webchannel?,websockets?,widgets?,xml?]
-		webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] )
-
-	)
-	pyside2? (
-		dev-python/pyside2[${PYTHON_USEDEP}]
-		dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?]
-		dev-python/pyside2[positioning?,printsupport?,qml?,quick?,serialport(+)?]
-		dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-		dev-python/pyside2[widgets?,xml?]
-	)
-	pyside6? (
-		dev-python/pyside6[${PYTHON_USEDEP}]
-		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
-		dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
-		dev-python/pyside6[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}]
-		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,opengl]
-			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
-			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,websockets,widgets,xml]
-			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick]
-		)
-		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]
-		)
-		pyside6? (
-			dev-python/pyside6[${PYTHON_USEDEP}]
-			dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
-			dev-python/pyside6[network,opengl,positioning,printsupport,qml]
-			dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
-			dev-python/pyside6[webchannel,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 "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyqt6; then
-		sed -i -e "s/from PyQt6.QtCore import/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."
-}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-04-29  6:59 Arthur Zamarin
  0 siblings, 0 replies; 113+ messages in thread
From: Arthur Zamarin @ 2023-04-29  6:59 UTC (permalink / raw
  To: gentoo-commits

commit:     ef943a5e875fceaef396f1ff86ad9fcfef22214c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 06:59:10 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 06:59:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef943a5e

dev-python/QtPy: Stabilize 2.3.1 ALLARCHES, #905230

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.3.1.ebuild b/dev-python/QtPy/QtPy-2.3.1.ebuild
index bcd54d8d87a8..b3033047630e 100644
--- a/dev-python/QtPy/QtPy-2.3.1.ebuild
+++ b/dev-python/QtPy/QtPy-2.3.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-03-29  6:24 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2023-03-29  6:24 UTC (permalink / raw
  To: gentoo-commits

commit:     0abd3cf6199425e4f2e7e0789bb72e54bdf39955
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 06:04:33 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 06:24:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0abd3cf6

dev-python/QtPy: Bump to 2.3.1

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/Manifest          |   1 +
 dev-python/QtPy/QtPy-2.3.1.ebuild | 207 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 91b7071dba66..a05791b29c6c 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1 +1,2 @@
 DIST QtPy-2.3.0.tar.gz 53980 BLAKE2B 142694c3b10dc2ed46c168a063c0019928358d079dddfef0708ec8cabd782e206734bc0f680a7ee7309b483c56ecd739b3364061eaf190a1a9c9e41d940af202 SHA512 1fa3d52367fa70ca178a128f3cc95f333b1408dd88b9f9d15ef30b4c7f848a91df1626fa046667ce6bd6ee3f7a3909f1b3fb06b902eff26e1f058139eced73c6
+DIST QtPy-2.3.1.tar.gz 56260 BLAKE2B 1b8d76879cc1f07b3633e6b25887ac4621ee3a8e9ebbcaa1f1f8c4f3fbcdae37bd5d659717bf89227d4ed6b5126554b329813aaee0b6be333c0cdc931cfb8d43 SHA512 9c738ec07e18852b67c30962fbc0ca48479eccff2a9f2ee9f4817c4ead5a8068d54aced58d632977163f180a584a9b7b2b68ea25e0577b92a262fef8eb576041

diff --git a/dev-python/QtPy/QtPy-2.3.1.ebuild b/dev-python/QtPy/QtPy-2.3.1.ebuild
new file mode 100644
index 000000000000..bcd54d8d87a8
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.3.1.ebuild
@@ -0,0 +1,207 @@
+# 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_{9..11} )
+
+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 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+_IUSE_QT_MODULES="
+	designer +gui help multimedia +network opengl positioning
+	printsupport qml quick serialport +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 )"
+
+# 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 only )
+# 	dbus? ( pyqt5 only )
+#
+# 	3d? ( pyside2 only )
+# 	charts? ( pyside2 only )
+# 	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 )
+#	speech? ( pyside2 and pyqt5 only )
+#	x11extras? ( pyside2 and pyqt5 only )
+#	xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?]
+		dev-python/PyQt6[svg?,testlib?,webchannel?,websockets?,widgets?,xml?]
+		webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] )
+
+	)
+	pyside2? (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?]
+		dev-python/pyside2[positioning?,printsupport?,qml?,quick?,serialport(+)?]
+		dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
+		dev-python/pyside2[widgets?,xml?]
+	)
+	pyside6? (
+		dev-python/pyside6[${PYTHON_USEDEP}]
+		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
+		dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
+		dev-python/pyside6[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}]
+		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,opengl]
+			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
+			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,websockets,widgets,xml]
+			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick]
+		)
+		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]
+		)
+		pyside6? (
+			dev-python/pyside6[${PYTHON_USEDEP}]
+			dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
+			dev-python/pyside6[network,opengl,positioning,printsupport,qml]
+			dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
+			dev-python/pyside6[webchannel,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 "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyqt6; then
+		sed -i -e "s/from PyQt6.QtCore import/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."
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2023-03-17 15:25 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2023-03-17 15:25 UTC (permalink / raw
  To: gentoo-commits

commit:     6dfa593576ef822f1cad03da8708e6d9c727774a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 11:59:47 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 15:25:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dfa5935

dev-python/QtPy: Use pypi.eclass

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.3.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/QtPy/QtPy-2.3.0.ebuild b/dev-python/QtPy/QtPy-2.3.0.ebuild
index 2f1b4e2fd828..b3033047630e 100644
--- a/dev-python/QtPy/QtPy-2.3.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.3.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1 virtualx
+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/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-12-25 17:50 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2022-12-25 17:50 UTC (permalink / raw
  To: gentoo-commits

commit:     5a871b7047727804da1fa604da098ba2b9dbbbe6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 17:47:31 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 17:49:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a871b70

dev-python/QtPy: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/Manifest             |   3 -
 dev-python/QtPy/QtPy-2.1.0-r4.ebuild | 144 ------------------------
 dev-python/QtPy/QtPy-2.2.0.ebuild    | 207 -----------------------------------
 dev-python/QtPy/QtPy-2.2.1.ebuild    | 207 -----------------------------------
 dev-python/QtPy/metadata.xml         |   6 -
 5 files changed, 567 deletions(-)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index da928d090655..91b7071dba66 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,4 +1 @@
-DIST QtPy-2.1.0.tar.gz 46470 BLAKE2B 2e032d141ad134444143cd59b8952957b226d9519925083aecce82adf62eebd3f58803cf548c4142fb1ece6f0e2340043a82a7aef056f6e4a9ac8b9caf72d80d SHA512 052cab4218d23d46162d11bf038dccfe6200b05c1c8647bd1f9dcbdaa7af50c23d4ae85829e065c7bae57630d149d562d76cc78202b4f448cbf6547010c746ff
-DIST QtPy-2.2.0.tar.gz 51573 BLAKE2B 5db2be83c74fa241cbec6818fbf5b5a8ecf681fdb2813cd51b011342eb8f0f2463c0a9f251e791f6051fa3276ad1e502f7e51bf0dcd2d3192bd76d0119dc8b16 SHA512 b0e7696c7861942c16749dc5f5ccbfd038f7fc2b1defbf372885223c4100805cada9bbb2f5bdae1f1c642b52d480d6e0048e221d9efd3f3103da54e6e2bfd0ff
-DIST QtPy-2.2.1.tar.gz 52207 BLAKE2B c2fa3e7ab0bcb2fc5610bdbab57daa6e4bbbfa346f46fbba8dd9d5d9e592e4f7a2f54aa0cf7291222dca9c2db4b944abeff36513f044f86fce294b1d00261cae SHA512 9c0887880984aabcc2633ec7aa161726f295ff20c9c95db5bcd9121676e49017b8033412172b257ae29311a1d3fc42b9eb183cc48fe5d64c9a471211ec6fbc11
 DIST QtPy-2.3.0.tar.gz 53980 BLAKE2B 142694c3b10dc2ed46c168a063c0019928358d079dddfef0708ec8cabd782e206734bc0f680a7ee7309b483c56ecd739b3364061eaf190a1a9c9e41d940af202 SHA512 1fa3d52367fa70ca178a128f3cc95f333b1408dd88b9f9d15ef30b4c7f848a91df1626fa046667ce6bd6ee3f7a3909f1b3fb06b902eff26e1f058139eced73c6

diff --git a/dev-python/QtPy/QtPy-2.1.0-r4.ebuild b/dev-python/QtPy/QtPy-2.1.0-r4.ebuild
deleted file mode 100644
index ddebeff472ae..000000000000
--- a/dev-python/QtPy/QtPy-2.1.0-r4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/
-	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"
-
-_IUSE_QT_MODULES="
-	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport speech sql svg testlib
-	webchannel webengine websockets widgets x11extras xml xmlpatterns
-"
-IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
-unset _IUSE_QT_MODULES
-
-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.
-# 	bluetooth? ( pyqt5 )
-# 	dbus? ( pyqt5 )
-#
-# 	3d? ( pyside2 )
-# 	charts? ( pyside2 )
-# 	concurrent? ( pyside2 )
-# 	datavis? ( pyside2 )
-# 	scxml? ( pyside2 )
-# 	script? ( pyside2 )
-# 	scripttools? ( pyside2 )
-
-# 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[declarative?,designer?,gui?,help?,location?]
-		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
-		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
-		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] )
-	)
-"
-
-# 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}]
-		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}]
-		)
-		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]
-		)
-	)
-"
-
-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 "s/from PyQt5.QtCore import/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
-	sed -i -e "s/from PyQt6.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	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
-}
-
-python_test() {
-	if use pyqt5; then
-		QT_API="pyqt5" virtx epytest
-	fi
-	if use pyside2; then
-		QT_API="pyside2" virtx epytest
-	fi
-}
-
-pkg_postinst() {
-	if use pyqt5 && use pyside2; then
-		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
-		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
-	fi
-}

diff --git a/dev-python/QtPy/QtPy-2.2.0.ebuild b/dev-python/QtPy/QtPy-2.2.0.ebuild
deleted file mode 100644
index 8886b6b5862d..000000000000
--- a/dev-python/QtPy/QtPy-2.2.0.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/
-	https://pypi.org/project/QtPy/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-_IUSE_QT_MODULES="
-	designer +gui help multimedia +network opengl positioning
-	printsupport qml quick serialport +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 )"
-
-# 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 only )
-# 	dbus? ( pyqt5 only )
-#
-# 	3d? ( pyside2 only )
-# 	charts? ( pyside2 only )
-# 	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 )
-#	speech? ( pyside2 and pyqt5 only )
-#	x11extras? ( pyside2 and pyqt5 only )
-#	xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?]
-		dev-python/PyQt6[svg?,testlib?,webchannel?,websockets?,widgets?,xml?]
-		webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] )
-
-	)
-	pyside2? (
-		dev-python/pyside2[${PYTHON_USEDEP}]
-		dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?]
-		dev-python/pyside2[positioning?,printsupport?,qml?,quick?,serialport(+)?]
-		dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-		dev-python/pyside2[widgets?,xml?]
-	)
-	pyside6? (
-		dev-python/pyside6[${PYTHON_USEDEP}]
-		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
-		dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
-		dev-python/pyside6[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}]
-		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,opengl]
-			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
-			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,websockets,widgets,xml]
-			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick]
-		)
-		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]
-		)
-		pyside6? (
-			dev-python/pyside6[${PYTHON_USEDEP}]
-			dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
-			dev-python/pyside6[network,opengl,positioning,printsupport,qml]
-			dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
-			dev-python/pyside6[webchannel,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 "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyqt6; then
-		sed -i -e "s/from PyQt6.QtCore import/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.2.1.ebuild b/dev-python/QtPy/QtPy-2.2.1.ebuild
deleted file mode 100644
index 3f6efa842b50..000000000000
--- a/dev-python/QtPy/QtPy-2.2.1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 virtualx
-
-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/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-
-_IUSE_QT_MODULES="
-	designer +gui help multimedia +network opengl positioning
-	printsupport qml quick serialport +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 )"
-
-# 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 only )
-# 	dbus? ( pyqt5 only )
-#
-# 	3d? ( pyside2 only )
-# 	charts? ( pyside2 only )
-# 	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 )
-#	speech? ( pyside2 and pyqt5 only )
-#	x11extras? ( pyside2 and pyqt5 only )
-#	xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?]
-		dev-python/PyQt6[svg?,testlib?,webchannel?,websockets?,widgets?,xml?]
-		webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] )
-
-	)
-	pyside2? (
-		dev-python/pyside2[${PYTHON_USEDEP}]
-		dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?]
-		dev-python/pyside2[positioning?,printsupport?,qml?,quick?,serialport(+)?]
-		dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-		dev-python/pyside2[widgets?,xml?]
-	)
-	pyside6? (
-		dev-python/pyside6[${PYTHON_USEDEP}]
-		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
-		dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
-		dev-python/pyside6[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}]
-		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,opengl]
-			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
-			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,websockets,widgets,xml]
-			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick]
-		)
-		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]
-		)
-		pyside6? (
-			dev-python/pyside6[${PYTHON_USEDEP}]
-			dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
-			dev-python/pyside6[network,opengl,positioning,printsupport,qml]
-			dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
-			dev-python/pyside6[webchannel,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 "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyqt6; then
-		sed -i -e "s/from PyQt6.QtCore import/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/metadata.xml b/dev-python/QtPy/metadata.xml
index c28298ab205e..e748334bb8e6 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -19,11 +19,9 @@
 		<flag name="pyqt6">Use <pkg>dev-python/PyQt6</pkg> as Qt for Python implementation</flag>
 		<flag name="pyside2">Use <pkg>dev-python/pyside2</pkg> as Qt for Python implementation</flag>
 		<flag name="pyside6">Use <pkg>dev-python/pyside6</pkg> as Qt for Python implementation</flag>
-		<flag name="declarative">Build bindings for the QtQml and QtQuick modules and enable the qmlscene plugin</flag>
 		<flag name="designer">Pull in bindings for the QtDesigner module and enable the designer plugin</flag>
 		<flag name="gui">Pull in bindings for the QtGui module</flag>
 		<flag name="help">Pull in bindings for the QtHelp module</flag>
-		<flag name="location">Pull in bindings for the QtLocation module</flag>
 		<flag name="multimedia">Pull in QtMultimedia and QtMultimediaWidgets modules</flag>
 		<flag name="network">Pull in bindings for the QtNetwork module</flag>
 		<flag name="opengl">Pull in bindings for the QtOpenGL module</flag>
@@ -31,9 +29,7 @@
 		<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">Build 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>
@@ -41,8 +37,6 @@
 		<flag name="webengine">Pull in QtWebEngine and QtWebEngineWidgets modules</flag>
 		<flag name="websockets">Pull in bindings for the QtWebSockets module</flag>
 		<flag name="widgets">Pull in bindings for the QtWidgets module</flag>
-		<flag name="x11extras">Pull in bindings for the QtX11Extras module</flag>
-		<flag name="xmlpatterns">Pull in bindings for the QtXmlPatterns module</flag>
 		<flag name="xml">Pull in QtXml module</flag>
 	</use>
 	<upstream>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-12-25 16:42 Sam James
  0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2022-12-25 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     b4761df206225e47d2b63a5e8d1d915632b70f40
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 16:41:29 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 16:41:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4761df2

dev-python/QtPy: Stabilize 2.3.0 ALLARCHES, #888399

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.3.0.ebuild b/dev-python/QtPy/QtPy-2.3.0.ebuild
index 5f7066c51d79..e111f74f6011 100644
--- a/dev-python/QtPy/QtPy-2.3.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.3.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 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-12-05 17:24 WANG Xuerui
  0 siblings, 0 replies; 113+ messages in thread
From: WANG Xuerui @ 2022-12-05 17:24 UTC (permalink / raw
  To: gentoo-commits

commit:     aa83e8bf68663f10d39e7ef4b696162e3a19b6c5
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  5 16:24:18 2022 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Mon Dec  5 17:21:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa83e8bf

dev-python/QtPy: keyword 2.3.0 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.3.0.ebuild b/dev-python/QtPy/QtPy-2.3.0.ebuild
index c8424bf55a0d..5f7066c51d79 100644
--- a/dev-python/QtPy/QtPy-2.3.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.3.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 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-11-22 20:01 Arthur Zamarin
  0 siblings, 0 replies; 113+ messages in thread
From: Arthur Zamarin @ 2022-11-22 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     acf3cadad8c8ab423f35ccd11033dbf15e31f214
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 20:01:40 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 20:01:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf3cada

dev-python/QtPy: Keyword 2.3.0 ppc64, #871525

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.3.0.ebuild b/dev-python/QtPy/QtPy-2.3.0.ebuild
index 7eaa9a277082..c8424bf55a0d 100644
--- a/dev-python/QtPy/QtPy-2.3.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.3.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 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-11-08 14:01 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2022-11-08 14:01 UTC (permalink / raw
  To: gentoo-commits

commit:     0ac9243a5db485e1dc8ccd44a2aab21204056bd1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  8 13:42:19 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov  8 14:01:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ac9243a

dev-python/QtPy: Bump to 2.3.0

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/Manifest          |   1 +
 dev-python/QtPy/QtPy-2.3.0.ebuild | 207 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index cbe97f2b7ebe..da928d090655 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,4 @@
 DIST QtPy-2.1.0.tar.gz 46470 BLAKE2B 2e032d141ad134444143cd59b8952957b226d9519925083aecce82adf62eebd3f58803cf548c4142fb1ece6f0e2340043a82a7aef056f6e4a9ac8b9caf72d80d SHA512 052cab4218d23d46162d11bf038dccfe6200b05c1c8647bd1f9dcbdaa7af50c23d4ae85829e065c7bae57630d149d562d76cc78202b4f448cbf6547010c746ff
 DIST QtPy-2.2.0.tar.gz 51573 BLAKE2B 5db2be83c74fa241cbec6818fbf5b5a8ecf681fdb2813cd51b011342eb8f0f2463c0a9f251e791f6051fa3276ad1e502f7e51bf0dcd2d3192bd76d0119dc8b16 SHA512 b0e7696c7861942c16749dc5f5ccbfd038f7fc2b1defbf372885223c4100805cada9bbb2f5bdae1f1c642b52d480d6e0048e221d9efd3f3103da54e6e2bfd0ff
 DIST QtPy-2.2.1.tar.gz 52207 BLAKE2B c2fa3e7ab0bcb2fc5610bdbab57daa6e4bbbfa346f46fbba8dd9d5d9e592e4f7a2f54aa0cf7291222dca9c2db4b944abeff36513f044f86fce294b1d00261cae SHA512 9c0887880984aabcc2633ec7aa161726f295ff20c9c95db5bcd9121676e49017b8033412172b257ae29311a1d3fc42b9eb183cc48fe5d64c9a471211ec6fbc11
+DIST QtPy-2.3.0.tar.gz 53980 BLAKE2B 142694c3b10dc2ed46c168a063c0019928358d079dddfef0708ec8cabd782e206734bc0f680a7ee7309b483c56ecd739b3364061eaf190a1a9c9e41d940af202 SHA512 1fa3d52367fa70ca178a128f3cc95f333b1408dd88b9f9d15ef30b4c7f848a91df1626fa046667ce6bd6ee3f7a3909f1b3fb06b902eff26e1f058139eced73c6

diff --git a/dev-python/QtPy/QtPy-2.3.0.ebuild b/dev-python/QtPy/QtPy-2.3.0.ebuild
new file mode 100644
index 000000000000..7eaa9a277082
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.3.0.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 virtualx
+
+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/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+_IUSE_QT_MODULES="
+	designer +gui help multimedia +network opengl positioning
+	printsupport qml quick serialport +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 )"
+
+# 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 only )
+# 	dbus? ( pyqt5 only )
+#
+# 	3d? ( pyside2 only )
+# 	charts? ( pyside2 only )
+# 	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 )
+#	speech? ( pyside2 and pyqt5 only )
+#	x11extras? ( pyside2 and pyqt5 only )
+#	xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?]
+		dev-python/PyQt6[svg?,testlib?,webchannel?,websockets?,widgets?,xml?]
+		webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] )
+
+	)
+	pyside2? (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?]
+		dev-python/pyside2[positioning?,printsupport?,qml?,quick?,serialport(+)?]
+		dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
+		dev-python/pyside2[widgets?,xml?]
+	)
+	pyside6? (
+		dev-python/pyside6[${PYTHON_USEDEP}]
+		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
+		dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
+		dev-python/pyside6[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}]
+		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,opengl]
+			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
+			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,websockets,widgets,xml]
+			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick]
+		)
+		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]
+		)
+		pyside6? (
+			dev-python/pyside6[${PYTHON_USEDEP}]
+			dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
+			dev-python/pyside6[network,opengl,positioning,printsupport,qml]
+			dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
+			dev-python/pyside6[webchannel,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 "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyqt6; then
+		sed -i -e "s/from PyQt6.QtCore import/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."
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-10-29 21:11 Sam James
  0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2022-10-29 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     8512adc7299a86607d01215887917aba9d7af8f9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 21:11:33 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 21:11:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8512adc7

dev-python/QtPy: restore keywords

Closes: https://bugs.gentoo.org/867790
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.2.0.ebuild | 2 +-
 dev-python/QtPy/QtPy-2.2.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/QtPy/QtPy-2.2.0.ebuild b/dev-python/QtPy/QtPy-2.2.0.ebuild
index 3da0d633e745..8886b6b5862d 100644
--- a/dev-python/QtPy/QtPy-2.2.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning

diff --git a/dev-python/QtPy/QtPy-2.2.1.ebuild b/dev-python/QtPy/QtPy-2.2.1.ebuild
index 3f913ef7b679..3f6efa842b50 100644
--- a/dev-python/QtPy/QtPy-2.2.1.ebuild
+++ b/dev-python/QtPy/QtPy-2.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-10-28  3:37 Jakov Smolić
  0 siblings, 0 replies; 113+ messages in thread
From: Jakov Smolić @ 2022-10-28  3:37 UTC (permalink / raw
  To: gentoo-commits

commit:     5d9d5e01a712bf124840527a54dbe204d7f18405
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 03:36:08 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 03:36:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9d5e01

dev-python/QtPy: Stabilize 2.2.1 ALLARCHES, #877985

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.2.1.ebuild b/dev-python/QtPy/QtPy-2.2.1.ebuild
index ddaae22c14f9..3f913ef7b679 100644
--- a/dev-python/QtPy/QtPy-2.2.1.ebuild
+++ b/dev-python/QtPy/QtPy-2.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-10-04 12:20 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2022-10-04 12:20 UTC (permalink / raw
  To: gentoo-commits

commit:     45f639f2fdb92e60ae4cd512a5ce0db951c5058c
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 12:19:49 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 12:20:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f639f2

dev-python/QtPy: add 2.2.1

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/Manifest          |   1 +
 dev-python/QtPy/QtPy-2.2.1.ebuild | 207 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 72d18e849036..cbe97f2b7ebe 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,2 +1,3 @@
 DIST QtPy-2.1.0.tar.gz 46470 BLAKE2B 2e032d141ad134444143cd59b8952957b226d9519925083aecce82adf62eebd3f58803cf548c4142fb1ece6f0e2340043a82a7aef056f6e4a9ac8b9caf72d80d SHA512 052cab4218d23d46162d11bf038dccfe6200b05c1c8647bd1f9dcbdaa7af50c23d4ae85829e065c7bae57630d149d562d76cc78202b4f448cbf6547010c746ff
 DIST QtPy-2.2.0.tar.gz 51573 BLAKE2B 5db2be83c74fa241cbec6818fbf5b5a8ecf681fdb2813cd51b011342eb8f0f2463c0a9f251e791f6051fa3276ad1e502f7e51bf0dcd2d3192bd76d0119dc8b16 SHA512 b0e7696c7861942c16749dc5f5ccbfd038f7fc2b1defbf372885223c4100805cada9bbb2f5bdae1f1c642b52d480d6e0048e221d9efd3f3103da54e6e2bfd0ff
+DIST QtPy-2.2.1.tar.gz 52207 BLAKE2B c2fa3e7ab0bcb2fc5610bdbab57daa6e4bbbfa346f46fbba8dd9d5d9e592e4f7a2f54aa0cf7291222dca9c2db4b944abeff36513f044f86fce294b1d00261cae SHA512 9c0887880984aabcc2633ec7aa161726f295ff20c9c95db5bcd9121676e49017b8033412172b257ae29311a1d3fc42b9eb183cc48fe5d64c9a471211ec6fbc11

diff --git a/dev-python/QtPy/QtPy-2.2.1.ebuild b/dev-python/QtPy/QtPy-2.2.1.ebuild
new file mode 100644
index 000000000000..ddaae22c14f9
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.2.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 virtualx
+
+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/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+_IUSE_QT_MODULES="
+	designer +gui help multimedia +network opengl positioning
+	printsupport qml quick serialport +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 )"
+
+# 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 only )
+# 	dbus? ( pyqt5 only )
+#
+# 	3d? ( pyside2 only )
+# 	charts? ( pyside2 only )
+# 	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 )
+#	speech? ( pyside2 and pyqt5 only )
+#	x11extras? ( pyside2 and pyqt5 only )
+#	xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?]
+		dev-python/PyQt6[svg?,testlib?,webchannel?,websockets?,widgets?,xml?]
+		webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] )
+
+	)
+	pyside2? (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?]
+		dev-python/pyside2[positioning?,printsupport?,qml?,quick?,serialport(+)?]
+		dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
+		dev-python/pyside2[widgets?,xml?]
+	)
+	pyside6? (
+		dev-python/pyside6[${PYTHON_USEDEP}]
+		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
+		dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
+		dev-python/pyside6[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}]
+		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,opengl]
+			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
+			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,websockets,widgets,xml]
+			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick]
+		)
+		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]
+		)
+		pyside6? (
+			dev-python/pyside6[${PYTHON_USEDEP}]
+			dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
+			dev-python/pyside6[network,opengl,positioning,printsupport,qml]
+			dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
+			dev-python/pyside6[webchannel,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 "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyqt6; then
+		sed -i -e "s/from PyQt6.QtCore import/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."
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-09-27 12:16 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2022-09-27 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     2a187a6d08cd9620953dbc9a9b80118e9a65e603
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 12:14:22 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 12:15:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a187a6d

dev-python/QtPy: drop pyside6 + python3_11 restriction

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.2.0.ebuild | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/dev-python/QtPy/QtPy-2.2.0.ebuild b/dev-python/QtPy/QtPy-2.2.0.ebuild
index 6c8adb1b00bf..3da0d633e745 100644
--- a/dev-python/QtPy/QtPy-2.2.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.2.0.ebuild
@@ -27,11 +27,7 @@ _IUSE_QT_MODULES="
 IUSE="+pyqt5 pyqt6 pyside2 pyside6 ${_IUSE_QT_MODULES}"
 unset _IUSE_QT_MODULES
 
-# PySide6 is not yet ready for python3_11
-REQUIRED_USE="
-	|| ( pyqt5 pyqt6 pyside2 pyside6 )
-	pyside6? ( !python_targets_python3_11 )
-"
+REQUIRED_USE="|| ( pyqt5 pyqt6 pyside2 pyside6 )"
 
 # 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.
@@ -95,7 +91,6 @@ RDEPEND="
 		dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
 		dev-python/pyside2[widgets?,xml?]
 	)
-	!python_targets_python3_11? (
 	pyside6? (
 		dev-python/pyside6[${PYTHON_USEDEP}]
 		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
@@ -103,7 +98,6 @@ RDEPEND="
 		dev-python/pyside6[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
@@ -136,7 +130,6 @@ BDEPEND="
 			dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
 			dev-python/pyside2[xml,xmlpatterns]
 		)
-		!python_targets_python3_11? (
 		pyside6? (
 			dev-python/pyside6[${PYTHON_USEDEP}]
 			dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
@@ -144,7 +137,6 @@ BDEPEND="
 			dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
 			dev-python/pyside6[webchannel,webengine,websockets,widgets,xml]
 		)
-		)
 	)
 "
 


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-09-08 19:39 Jakov Smolić
  0 siblings, 0 replies; 113+ messages in thread
From: Jakov Smolić @ 2022-09-08 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     05620cc00ee30eaf38b633209588d68ee498bf08
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 18:51:50 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 19:39:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05620cc0

dev-python/QtPy: keyword 2.2.0 for ~riscv

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.2.0.ebuild b/dev-python/QtPy/QtPy-2.2.0.ebuild
index 37fc347793e2..6c8adb1b00bf 100644
--- a/dev-python/QtPy/QtPy-2.2.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-08-13 14:18 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2022-08-13 14:18 UTC (permalink / raw
  To: gentoo-commits

commit:     91f91926e801af9a19969127534b0feeb4fdacdd
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 08:31:03 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 14:18:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f91926

dev-python/QtPy: take pyqt6/pyside6 into account 2.1.0

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/{QtPy-2.1.0-r3.ebuild => QtPy-2.1.0-r4.ebuild} | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-python/QtPy/QtPy-2.1.0-r3.ebuild b/dev-python/QtPy/QtPy-2.1.0-r4.ebuild
similarity index 95%
rename from dev-python/QtPy/QtPy-2.1.0-r3.ebuild
rename to dev-python/QtPy/QtPy-2.1.0-r4.ebuild
index 967021dd8836..ddebeff472ae 100644
--- a/dev-python/QtPy/QtPy-2.1.0-r3.ebuild
+++ b/dev-python/QtPy/QtPy-2.1.0-r4.ebuild
@@ -122,6 +122,9 @@ 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
+	sed -i -e "s/from PyQt6.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	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
 }
 
 python_test() {


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-08-13 14:18 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2022-08-13 14:18 UTC (permalink / raw
  To: gentoo-commits

commit:     10a2647476f7d1597a686f200caaad093b5f97fb
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 14:16:45 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 14:18:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a26474

dev-python/QtPy: add 2.2.0 and enable PyQt6 and PySide6

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/Manifest          |   1 +
 dev-python/QtPy/QtPy-2.2.0.ebuild | 215 ++++++++++++++++++++++++++++++++++++++
 dev-python/QtPy/metadata.xml      |   4 +
 3 files changed, 220 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 310de7019de0..72d18e849036 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1 +1,2 @@
 DIST QtPy-2.1.0.tar.gz 46470 BLAKE2B 2e032d141ad134444143cd59b8952957b226d9519925083aecce82adf62eebd3f58803cf548c4142fb1ece6f0e2340043a82a7aef056f6e4a9ac8b9caf72d80d SHA512 052cab4218d23d46162d11bf038dccfe6200b05c1c8647bd1f9dcbdaa7af50c23d4ae85829e065c7bae57630d149d562d76cc78202b4f448cbf6547010c746ff
+DIST QtPy-2.2.0.tar.gz 51573 BLAKE2B 5db2be83c74fa241cbec6818fbf5b5a8ecf681fdb2813cd51b011342eb8f0f2463c0a9f251e791f6051fa3276ad1e502f7e51bf0dcd2d3192bd76d0119dc8b16 SHA512 b0e7696c7861942c16749dc5f5ccbfd038f7fc2b1defbf372885223c4100805cada9bbb2f5bdae1f1c642b52d480d6e0048e221d9efd3f3103da54e6e2bfd0ff

diff --git a/dev-python/QtPy/QtPy-2.2.0.ebuild b/dev-python/QtPy/QtPy-2.2.0.ebuild
new file mode 100644
index 000000000000..37fc347793e2
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.2.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/
+	https://pypi.org/project/QtPy/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+_IUSE_QT_MODULES="
+	designer +gui help multimedia +network opengl positioning
+	printsupport qml quick serialport +sql svg testlib
+	webchannel webengine websockets +widgets +xml
+"
+IUSE="+pyqt5 pyqt6 pyside2 pyside6 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+# PySide6 is not yet ready for python3_11
+REQUIRED_USE="
+	|| ( pyqt5 pyqt6 pyside2 pyside6 )
+	pyside6? ( !python_targets_python3_11 )
+"
+
+# 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 only )
+# 	dbus? ( pyqt5 only )
+#
+# 	3d? ( pyside2 only )
+# 	charts? ( pyside2 only )
+# 	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 )
+#	speech? ( pyside2 and pyqt5 only )
+#	x11extras? ( pyside2 and pyqt5 only )
+#	xmlpatterns? ( pyside2 and pyqt5 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?,serialport?,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?,serialport?,sql?]
+		dev-python/PyQt6[svg?,testlib?,webchannel?,websockets?,widgets?,xml?]
+		webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] )
+
+	)
+	pyside2? (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?]
+		dev-python/pyside2[positioning?,printsupport?,qml?,quick?,serialport(+)?]
+		dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
+		dev-python/pyside2[widgets?,xml?]
+	)
+	!python_targets_python3_11? (
+	pyside6? (
+		dev-python/pyside6[${PYTHON_USEDEP}]
+		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
+		dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
+		dev-python/pyside6[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}]
+		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,opengl]
+			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
+			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,websockets,widgets,xml]
+			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick]
+		)
+		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_targets_python3_11? (
+		pyside6? (
+			dev-python/pyside6[${PYTHON_USEDEP}]
+			dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
+			dev-python/pyside6[network,opengl,positioning,printsupport,qml]
+			dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
+			dev-python/pyside6[webchannel,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 "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyqt6; then
+		sed -i -e "s/from PyQt6.QtCore import/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/metadata.xml b/dev-python/QtPy/metadata.xml
index 7fa9451ae932..c28298ab205e 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -16,7 +16,9 @@
 	</longdescription>
 	<use>
 		<flag name="pyqt5">Use <pkg>dev-python/PyQt5</pkg> as Qt for Python implementation</flag>
+		<flag name="pyqt6">Use <pkg>dev-python/PyQt6</pkg> as Qt for Python implementation</flag>
 		<flag name="pyside2">Use <pkg>dev-python/pyside2</pkg> as Qt for Python implementation</flag>
+		<flag name="pyside6">Use <pkg>dev-python/pyside6</pkg> as Qt for Python implementation</flag>
 		<flag name="declarative">Build bindings for the QtQml and QtQuick modules and enable the qmlscene plugin</flag>
 		<flag name="designer">Pull in bindings for the QtDesigner module and enable the designer plugin</flag>
 		<flag name="gui">Pull in bindings for the QtGui module</flag>
@@ -27,6 +29,8 @@
 		<flag name="opengl">Pull in bindings for the QtOpenGL module</flag>
 		<flag name="positioning">Pull in bindings for the QtPositioning module</flag>
 		<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">Build bindings for the QtTextToSpeech module</flag>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-07-15  7:24 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2022-07-15  7:24 UTC (permalink / raw
  To: gentoo-commits

commit:     3b391b1cad4d97368243115ab0fbed4dacd170bb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 07:21:39 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 07:24:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b391b1c

dev-python/QtPy: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.1.0-r1.ebuild | 146 -----------------------------------
 dev-python/QtPy/QtPy-2.1.0.ebuild    | 139 ---------------------------------
 2 files changed, 285 deletions(-)

diff --git a/dev-python/QtPy/QtPy-2.1.0-r1.ebuild b/dev-python/QtPy/QtPy-2.1.0-r1.ebuild
deleted file mode 100644
index 41ec2ce12760..000000000000
--- a/dev-python/QtPy/QtPy-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/
-	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"
-
-_IUSE_QT_MODULES="
-	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport speech sql svg testlib
-	webchannel webengine websockets widgets x11extras xml xmlpatterns
-"
-IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
-unset _IUSE_QT_MODULES
-
-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.
-# 	bluetooth? ( pyqt5 )
-# 	dbus? ( pyqt5 )
-#
-# 	3d? ( pyside2 )
-# 	charts? ( pyside2 )
-# 	concurrent? ( pyside2 )
-# 	datavis? ( pyside2 )
-# 	scxml? ( pyside2 )
-# 	script? ( pyside2 )
-# 	scripttools? ( pyside2 )
-
-# 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[declarative?,designer?,gui?,help?,location?]
-		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
-		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
-		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_{8..10})
-	)
-"
-
-# 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}]
-		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}]
-		)
-		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_{8..10})
-		)
-	)
-"
-
-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 "s/from PyQt5.QtCore import/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
-}
-
-python_test() {
-	if use pyqt5; then
-		QT_API="pyqt5" virtx epytest
-	fi
-	if use pyside2; then
-		QT_API="pyside2" virtx epytest
-	fi
-}
-
-pkg_postinst() {
-	if use pyqt5 && use pyside2; then
-		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
-		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
-	fi
-}

diff --git a/dev-python/QtPy/QtPy-2.1.0.ebuild b/dev-python/QtPy/QtPy-2.1.0.ebuild
deleted file mode 100644
index 42c74bba738e..000000000000
--- a/dev-python/QtPy/QtPy-2.1.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-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"
-
-_IUSE_QT_MODULES="
-	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport speech sql svg testlib
-	webchannel webengine websockets widgets x11extras xml xmlpatterns
-"
-IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
-unset _IUSE_QT_MODULES
-
-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.
-# 	bluetooth? ( pyqt5 )
-# 	dbus? ( pyqt5 )
-#
-# 	3d? ( pyside2 )
-# 	charts? ( pyside2 )
-# 	concurrent? ( pyside2 )
-# 	datavis? ( pyside2 )
-# 	scxml? ( pyside2 )
-# 	script? ( pyside2 )
-# 	scripttools? ( pyside2 )
-
-# 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[declarative?,designer?,gui?,help?,location?]
-		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
-		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
-		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] )
-	)
-"
-
-# 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}]
-		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}]
-		)
-		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]
-		)
-	)
-"
-
-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 "s/from PyQt5.QtCore import/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
-}
-
-python_test() {
-	if use pyqt5; then
-		QT_API="pyqt5" virtx epytest
-	fi
-	if use pyside2; then
-		QT_API="pyside2" virtx epytest
-	fi
-}
-
-pkg_postinst() {
-	if use pyqt5 && use pyside2; then
-		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
-		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
-	fi
-}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-07-15  0:45 Sam James
  0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2022-07-15  0:45 UTC (permalink / raw
  To: gentoo-commits

commit:     2ea767c220e8608ab02ab3d5408b3a09ca012719
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 00:43:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 00:43:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea767c2

dev-python/QtPy: Stabilize 2.1.0-r3 ALLARCHES, #858017

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.1.0-r3.ebuild b/dev-python/QtPy/QtPy-2.1.0-r3.ebuild
index 5557233a170a..967021dd8836 100644
--- a/dev-python/QtPy/QtPy-2.1.0-r3.ebuild
+++ b/dev-python/QtPy/QtPy-2.1.0-r3.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


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-07-01 20:09 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2022-07-01 20:09 UTC (permalink / raw
  To: gentoo-commits

commit:     2b683e0de98d97f6d376d89dbf5bff34f3c36121
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 19:58:25 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 20:09:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b683e0d

dev-python/QtPy: drop python3_11 - pyside2 restriction

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/{QtPy-2.1.0-r2.ebuild => QtPy-2.1.0-r3.ebuild} | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.1.0-r2.ebuild b/dev-python/QtPy/QtPy-2.1.0-r3.ebuild
similarity index 99%
rename from dev-python/QtPy/QtPy-2.1.0-r2.ebuild
rename to dev-python/QtPy/QtPy-2.1.0-r3.ebuild
index b68d19eaa03b..5557233a170a 100644
--- a/dev-python/QtPy/QtPy-2.1.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-2.1.0-r3.ebuild
@@ -29,7 +29,6 @@ unset _IUSE_QT_MODULES
 
 REQUIRED_USE="
 	|| ( pyqt5 pyside2 )
-	python_targets_python3_11? ( pyqt5 !pyside2 )
 "
 
 # These flags are currently *not* common to both the PySide2 and PyQt5 ebuild


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-06-30 16:56 Sam James
  0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2022-06-30 16:56 UTC (permalink / raw
  To: gentoo-commits

commit:     34abc17c83bc4e9425e34cbfe8fdd87eadc6f106
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 16:56:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 16:56:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34abc17c

dev-python/QtPy: allow Python 3.11 for pyside2/shiboken

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.1.0-r2.ebuild | 142 +++++++++++++++++++++++++++++++++++
 1 file changed, 142 insertions(+)

diff --git a/dev-python/QtPy/QtPy-2.1.0-r2.ebuild b/dev-python/QtPy/QtPy-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..b68d19eaa03b
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.1.0-r2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/
+	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"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+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.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# 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[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		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] )
+	)
+"
+
+# 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}]
+		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}]
+		)
+		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]
+		)
+	)
+"
+
+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 "s/from PyQt5.QtCore import/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
+}
+
+python_test() {
+	if use pyqt5; then
+		QT_API="pyqt5" virtx epytest
+	fi
+	if use pyside2; then
+		QT_API="pyside2" virtx epytest
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-06-08 19:16 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2022-06-08 19:16 UTC (permalink / raw
  To: gentoo-commits

commit:     8f1dbf57e17294c7af8ca1eb28a7a09755a67b1e
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 10:53:28 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 19:15:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1dbf57

dev-python/QtPy: enable py3.11

Pyside2 currently does not compile with py3.11 and it is
not likely to get fixed soon because upstream development
has moved to pyside6 for Qt6. Python 3.10 on pyside2 already
required a bunch of patches to function.

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.1.0-r1.ebuild | 146 +++++++++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)

diff --git a/dev-python/QtPy/QtPy-2.1.0-r1.ebuild b/dev-python/QtPy/QtPy-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..41ec2ce12760
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.1.0-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/
+	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"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+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.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# 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[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		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_{8..10})
+	)
+"
+
+# 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}]
+		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}]
+		)
+		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_{8..10})
+		)
+	)
+"
+
+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 "s/from PyQt5.QtCore import/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
+}
+
+python_test() {
+	if use pyqt5; then
+		QT_API="pyqt5" virtx epytest
+	fi
+	if use pyside2; then
+		QT_API="pyside2" virtx epytest
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-06-07  2:50 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2022-06-07  2:50 UTC (permalink / raw
  To: gentoo-commits

commit:     dcb0c9b36ffdc0d38267a7f6d9fef2fb24eb7771
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 02:49:32 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 02:50:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb0c9b3

dev-python/QtPy: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/Manifest          |   1 -
 dev-python/QtPy/QtPy-2.0.1.ebuild | 140 --------------------------------------
 2 files changed, 141 deletions(-)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 9369e646aa03..310de7019de0 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,2 +1 @@
-DIST QtPy-2.0.1.tar.gz 43047 BLAKE2B 66625852e75fbfcf0bf96e740754ca26b6d5226dd5450d0274cf6dc875cba18e5ed8e339c8c7ad084ffa9b135f19447e087b338690ec521205316c4f22f09197 SHA512 5d482b0a5bd2be67a0fabccf98a9dedf28ef328641c8c976e2274d4a5afb14b9fefce251e80496ed54425dcb3da24984c6c36308db0bfc810ea2142528ad88fd
 DIST QtPy-2.1.0.tar.gz 46470 BLAKE2B 2e032d141ad134444143cd59b8952957b226d9519925083aecce82adf62eebd3f58803cf548c4142fb1ece6f0e2340043a82a7aef056f6e4a9ac8b9caf72d80d SHA512 052cab4218d23d46162d11bf038dccfe6200b05c1c8647bd1f9dcbdaa7af50c23d4ae85829e065c7bae57630d149d562d76cc78202b4f448cbf6547010c746ff

diff --git a/dev-python/QtPy/QtPy-2.0.1.ebuild b/dev-python/QtPy/QtPy-2.0.1.ebuild
deleted file mode 100644
index 9fcfb7eab3c3..000000000000
--- a/dev-python/QtPy/QtPy-2.0.1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="https://github.com/spyder-ide/qtpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-_IUSE_QT_MODULES="
-	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport speech sql svg testlib
-	webchannel webengine websockets widgets x11extras xml xmlpatterns
-"
-IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
-unset _IUSE_QT_MODULES
-
-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.
-# 	bluetooth? ( pyqt5 )
-# 	dbus? ( pyqt5 )
-#
-# 	3d? ( pyside2 )
-# 	charts? ( pyside2 )
-# 	concurrent? ( pyside2 )
-# 	datavis? ( pyside2 )
-# 	scxml? ( pyside2 )
-# 	script? ( pyside2 )
-# 	scripttools? ( pyside2 )
-
-# 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[declarative?,designer?,gui?,help?,location?]
-		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
-		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
-		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] )
-	)
-"
-
-# 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}]
-		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}]
-		)
-		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]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-	# Disale 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
-	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
-
-	# 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() {
-	if use pyqt5; then
-		QT_API="pyqt5" virtx epytest
-	fi
-	if use pyside2; then
-		QT_API="pyside2" virtx epytest
-	fi
-}
-
-pkg_postinst() {
-	if use pyqt5 && use pyside2; then
-		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
-		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
-	fi
-}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-06-06 23:32 Sam James
  0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2022-06-06 23:32 UTC (permalink / raw
  To: gentoo-commits

commit:     3c994b10d2c4e3457255e3f609d3a7e0475a9717
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 23:31:11 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 23:31:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c994b10

dev-python/QtPy: Stabilize 2.1.0 ALLARCHES, #850013

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-05-03  8:27 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2022-05-03  8:27 UTC (permalink / raw
  To: gentoo-commits

commit:     a581a756a1840bbff8de5739bd76a919c4544a46
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 08:04:21 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May  3 08:26:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a581a756

dev-python/QtPy: Bump to 2.1.0

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/Manifest          |   1 +
 dev-python/QtPy/QtPy-2.1.0.ebuild | 139 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 7e9bb91dfc69..9369e646aa03 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1 +1,2 @@
 DIST QtPy-2.0.1.tar.gz 43047 BLAKE2B 66625852e75fbfcf0bf96e740754ca26b6d5226dd5450d0274cf6dc875cba18e5ed8e339c8c7ad084ffa9b135f19447e087b338690ec521205316c4f22f09197 SHA512 5d482b0a5bd2be67a0fabccf98a9dedf28ef328641c8c976e2274d4a5afb14b9fefce251e80496ed54425dcb3da24984c6c36308db0bfc810ea2142528ad88fd
+DIST QtPy-2.1.0.tar.gz 46470 BLAKE2B 2e032d141ad134444143cd59b8952957b226d9519925083aecce82adf62eebd3f58803cf548c4142fb1ece6f0e2340043a82a7aef056f6e4a9ac8b9caf72d80d SHA512 052cab4218d23d46162d11bf038dccfe6200b05c1c8647bd1f9dcbdaa7af50c23d4ae85829e065c7bae57630d149d562d76cc78202b4f448cbf6547010c746ff

diff --git a/dev-python/QtPy/QtPy-2.1.0.ebuild b/dev-python/QtPy/QtPy-2.1.0.ebuild
new file mode 100644
index 000000000000..80b2b816f117
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.1.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+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"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+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.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# 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[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		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] )
+	)
+"
+
+# 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}]
+		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}]
+		)
+		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]
+		)
+	)
+"
+
+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 "s/from PyQt5.QtCore import/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
+}
+
+python_test() {
+	if use pyqt5; then
+		QT_API="pyqt5" virtx epytest
+	fi
+	if use pyside2; then
+		QT_API="pyside2" virtx epytest
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-04-02 15:58 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2022-04-02 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     4e5f4091abe3d83d5551330ab13f673814c57133
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 15:57:47 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 15:57:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e5f4091

dev-python/QtPy: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/Manifest          |   1 -
 dev-python/QtPy/QtPy-2.0.0.ebuild | 140 --------------------------------------
 2 files changed, 141 deletions(-)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index dfd253d5f51f..7e9bb91dfc69 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,2 +1 @@
-DIST QtPy-2.0.0.tar.gz 39628 BLAKE2B bc1b2cf975c3457cb026016854ec70e0aa3247c1234643dbf95681f655678e43ba0200b26e16a0b9eafd6fb373c1f876d9a54458ceb9b9b035ad463b7874db2c SHA512 95855c305da7f54850bcb6297a1f12ceda79eaf6d9b01771b1391d2d7b07b8f690e134cc2d52417bcc320395dce8c1f7f5c6ccadf2939db196e0ed5441215d5a
 DIST QtPy-2.0.1.tar.gz 43047 BLAKE2B 66625852e75fbfcf0bf96e740754ca26b6d5226dd5450d0274cf6dc875cba18e5ed8e339c8c7ad084ffa9b135f19447e087b338690ec521205316c4f22f09197 SHA512 5d482b0a5bd2be67a0fabccf98a9dedf28ef328641c8c976e2274d4a5afb14b9fefce251e80496ed54425dcb3da24984c6c36308db0bfc810ea2142528ad88fd

diff --git a/dev-python/QtPy/QtPy-2.0.0.ebuild b/dev-python/QtPy/QtPy-2.0.0.ebuild
deleted file mode 100644
index 9fcfb7eab3c3..000000000000
--- a/dev-python/QtPy/QtPy-2.0.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="https://github.com/spyder-ide/qtpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-_IUSE_QT_MODULES="
-	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport speech sql svg testlib
-	webchannel webengine websockets widgets x11extras xml xmlpatterns
-"
-IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
-unset _IUSE_QT_MODULES
-
-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.
-# 	bluetooth? ( pyqt5 )
-# 	dbus? ( pyqt5 )
-#
-# 	3d? ( pyside2 )
-# 	charts? ( pyside2 )
-# 	concurrent? ( pyside2 )
-# 	datavis? ( pyside2 )
-# 	scxml? ( pyside2 )
-# 	script? ( pyside2 )
-# 	scripttools? ( pyside2 )
-
-# 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[declarative?,designer?,gui?,help?,location?]
-		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
-		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
-		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] )
-	)
-"
-
-# 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}]
-		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}]
-		)
-		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]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-	# Disale 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
-	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
-
-	# 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() {
-	if use pyqt5; then
-		QT_API="pyqt5" virtx epytest
-	fi
-	if use pyside2; then
-		QT_API="pyside2" virtx epytest
-	fi
-}
-
-pkg_postinst() {
-	if use pyqt5 && use pyside2; then
-		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
-		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
-	fi
-}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-04-02 12:04 Arthur Zamarin
  0 siblings, 0 replies; 113+ messages in thread
From: Arthur Zamarin @ 2022-04-02 12:04 UTC (permalink / raw
  To: gentoo-commits

commit:     463f79b6f48369cdd865c790463fcd2f7b250042
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 12:04:06 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 12:04:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=463f79b6

dev-python/QtPy: Stabilize 2.0.1 ALLARCHES, #836527

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-2.0.1.ebuild b/dev-python/QtPy/QtPy-2.0.1.ebuild
index 3013f6cdc707..9fcfb7eab3c3 100644
--- a/dev-python/QtPy/QtPy-2.0.1.ebuild
+++ b/dev-python/QtPy/QtPy-2.0.1.ebuild
@@ -13,7 +13,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


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-03-01  9:38 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2022-03-01  9:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5eb222cbb8c9b29eb31b8757598a5722a78369b6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 08:59:57 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 09:38:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eb222cb

dev-python/QtPy: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/Manifest              |   2 -
 dev-python/QtPy/QtPy-1.11.2.ebuild    | 158 ----------------------------------
 dev-python/QtPy/QtPy-1.11.3-r1.ebuild | 139 ------------------------------
 3 files changed, 299 deletions(-)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 6bb3ddeff649..dfd253d5f51f 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,4 +1,2 @@
-DIST QtPy-1.11.2.tar.gz 37098 BLAKE2B 8806cce798c4c2d885dd340d0d077567353cf0f3f1c2b284fd788c190b28b6133d052d31dea861e7d2497d0db88ba7ce8be83074360c61823f7a78dc01c015a5 SHA512 e49beb3180789a8080a19406b0e122bc9fc2192ac89b59f0956d7c65ac957779b192062956a97a7526f32724000df18abf32ddd6bda52f9cdf440ddc551887f8
-DIST QtPy-1.11.3.tar.gz 39637 BLAKE2B d1bfa0944dcebf5e408b9a061bcc6bab2fe172a70f0eadd36b229d2c9b40d74d8159c820608d3afd71a91085d5703af9b7045f359209730c53a9a83007159ce5 SHA512 461d858b05ff75f27017f6f0058f3e47643d5fe6c236e4307fa006735ad80e4c1fa487f1ab75edcfe881026541e302cdc3f8221c4ad7b97bce8c96b66db580bb
 DIST QtPy-2.0.0.tar.gz 39628 BLAKE2B bc1b2cf975c3457cb026016854ec70e0aa3247c1234643dbf95681f655678e43ba0200b26e16a0b9eafd6fb373c1f876d9a54458ceb9b9b035ad463b7874db2c SHA512 95855c305da7f54850bcb6297a1f12ceda79eaf6d9b01771b1391d2d7b07b8f690e134cc2d52417bcc320395dce8c1f7f5c6ccadf2939db196e0ed5441215d5a
 DIST QtPy-2.0.1.tar.gz 43047 BLAKE2B 66625852e75fbfcf0bf96e740754ca26b6d5226dd5450d0274cf6dc875cba18e5ed8e339c8c7ad084ffa9b135f19447e087b338690ec521205316c4f22f09197 SHA512 5d482b0a5bd2be67a0fabccf98a9dedf28ef328641c8c976e2274d4a5afb14b9fefce251e80496ed54425dcb3da24984c6c36308db0bfc810ea2142528ad88fd

diff --git a/dev-python/QtPy/QtPy-1.11.2.ebuild b/dev-python/QtPy/QtPy-1.11.2.ebuild
deleted file mode 100644
index 80a6b0988c86..000000000000
--- a/dev-python/QtPy/QtPy-1.11.2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="https://github.com/spyder-ide/qtpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-_IUSE_QT_MODULES="
-	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport speech sql svg testlib
-	webchannel webengine websockets widgets x11extras xml xmlpatterns
-"
-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 )
-"
-
-# 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.
-# 	bluetooth? ( pyqt5 )
-# 	dbus? ( pyqt5 )
-#
-# 	3d? ( pyside2 )
-# 	charts? ( pyside2 )
-# 	concurrent? ( pyside2 )
-# 	datavis? ( pyside2 )
-# 	scxml? ( pyside2 )
-# 	script? ( pyside2 )
-# 	scripttools? ( pyside2 )
-
-# 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="
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
-		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
-		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
-		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} )
-	)
-"
-
-# 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}]
-		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}]
-		)
-		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} )
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-	# Disale 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
-	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
-
-	# 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
-}
-
-src_test() {
-	virtx python_foreach_impl python_test
-}
-
-python_test() {
-	if use pyqt5; then
-		QT_API="pyqt5" epytest
-	fi
-	if use pyside2; then
-		if [[ "${EPYTHON}" == "python3.10" ]]; then
-			return
-		else
-			QT_API="pyside2" epytest
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use pyqt5 && use pyside2; then
-		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
-		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
-	fi
-}

diff --git a/dev-python/QtPy/QtPy-1.11.3-r1.ebuild b/dev-python/QtPy/QtPy-1.11.3-r1.ebuild
deleted file mode 100644
index 56716c7509d2..000000000000
--- a/dev-python/QtPy/QtPy-1.11.3-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="https://github.com/spyder-ide/qtpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-_IUSE_QT_MODULES="
-	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport speech sql svg testlib
-	webchannel webengine websockets widgets x11extras xml xmlpatterns
-"
-IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
-unset _IUSE_QT_MODULES
-
-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.
-# 	bluetooth? ( pyqt5 )
-# 	dbus? ( pyqt5 )
-#
-# 	3d? ( pyside2 )
-# 	charts? ( pyside2 )
-# 	concurrent? ( pyside2 )
-# 	datavis? ( pyside2 )
-# 	scxml? ( pyside2 )
-# 	script? ( pyside2 )
-# 	scripttools? ( pyside2 )
-
-# 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="
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
-		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
-		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
-		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] )
-	)
-"
-
-# 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}]
-		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}]
-		)
-		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]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-	# Disale 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
-	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
-
-	# 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() {
-	if use pyqt5; then
-		virtx QT_API="pyqt5" epytest
-	fi
-	if use pyside2; then
-		virtx QT_API="pyside2" epytest
-	fi
-}
-
-pkg_postinst() {
-	if use pyqt5 && use pyside2; then
-		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
-		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
-	fi
-}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-02-28 23:59 Sam James
  0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2022-02-28 23:59 UTC (permalink / raw
  To: gentoo-commits

commit:     7113b9f6981afca35651198d2d550367c82b86a7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 23:58:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 23:58:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7113b9f6

dev-python/QtPy: Stabilize 2.0.0 ALLARCHES, #834212

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/QtPy/QtPy-2.0.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/QtPy/QtPy-2.0.0.ebuild b/dev-python/QtPy/QtPy-2.0.0.ebuild
index dab3deb709bf..9fcfb7eab3c3 100644
--- a/dev-python/QtPy/QtPy-2.0.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,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


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2022-02-19 11:12 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2022-02-19 11:12 UTC (permalink / raw
  To: gentoo-commits

commit:     d7e3ecb0e61e5978852f25cccce5f0317fb24b9d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 11:07:44 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 11:12:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e3ecb0

dev-python/QtPy: add version 2.0.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/Manifest          |   1 +
 dev-python/QtPy/QtPy-2.0.1.ebuild | 140 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 724b914aaef8..6bb3ddeff649 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,4 @@
 DIST QtPy-1.11.2.tar.gz 37098 BLAKE2B 8806cce798c4c2d885dd340d0d077567353cf0f3f1c2b284fd788c190b28b6133d052d31dea861e7d2497d0db88ba7ce8be83074360c61823f7a78dc01c015a5 SHA512 e49beb3180789a8080a19406b0e122bc9fc2192ac89b59f0956d7c65ac957779b192062956a97a7526f32724000df18abf32ddd6bda52f9cdf440ddc551887f8
 DIST QtPy-1.11.3.tar.gz 39637 BLAKE2B d1bfa0944dcebf5e408b9a061bcc6bab2fe172a70f0eadd36b229d2c9b40d74d8159c820608d3afd71a91085d5703af9b7045f359209730c53a9a83007159ce5 SHA512 461d858b05ff75f27017f6f0058f3e47643d5fe6c236e4307fa006735ad80e4c1fa487f1ab75edcfe881026541e302cdc3f8221c4ad7b97bce8c96b66db580bb
 DIST QtPy-2.0.0.tar.gz 39628 BLAKE2B bc1b2cf975c3457cb026016854ec70e0aa3247c1234643dbf95681f655678e43ba0200b26e16a0b9eafd6fb373c1f876d9a54458ceb9b9b035ad463b7874db2c SHA512 95855c305da7f54850bcb6297a1f12ceda79eaf6d9b01771b1391d2d7b07b8f690e134cc2d52417bcc320395dce8c1f7f5c6ccadf2939db196e0ed5441215d5a
+DIST QtPy-2.0.1.tar.gz 43047 BLAKE2B 66625852e75fbfcf0bf96e740754ca26b6d5226dd5450d0274cf6dc875cba18e5ed8e339c8c7ad084ffa9b135f19447e087b338690ec521205316c4f22f09197 SHA512 5d482b0a5bd2be67a0fabccf98a9dedf28ef328641c8c976e2274d4a5afb14b9fefce251e80496ed54425dcb3da24984c6c36308db0bfc810ea2142528ad88fd

diff --git a/dev-python/QtPy/QtPy-2.0.1.ebuild b/dev-python/QtPy/QtPy-2.0.1.ebuild
new file mode 100644
index 000000000000..3013f6cdc707
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.0.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+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.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# 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[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		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] )
+	)
+"
+
+# 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}]
+		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}]
+		)
+		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]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	# Disale 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
+	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
+
+	# 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() {
+	if use pyqt5; then
+		QT_API="pyqt5" virtx epytest
+	fi
+	if use pyside2; then
+		QT_API="pyside2" virtx epytest
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-12-23 11:24 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-12-23 11:24 UTC (permalink / raw
  To: gentoo-commits

commit:     f08ce8d8ad67f1b07bbcf6ccb2cc600f8e9e7f52
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 23 11:23:23 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Dec 23 11:24:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f08ce8d8

dev-python/QtPy: add version 2.0.0

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/Manifest          |   1 +
 dev-python/QtPy/QtPy-2.0.0.ebuild | 140 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 8d96740ebaa3..724b914aaef8 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,2 +1,3 @@
 DIST QtPy-1.11.2.tar.gz 37098 BLAKE2B 8806cce798c4c2d885dd340d0d077567353cf0f3f1c2b284fd788c190b28b6133d052d31dea861e7d2497d0db88ba7ce8be83074360c61823f7a78dc01c015a5 SHA512 e49beb3180789a8080a19406b0e122bc9fc2192ac89b59f0956d7c65ac957779b192062956a97a7526f32724000df18abf32ddd6bda52f9cdf440ddc551887f8
 DIST QtPy-1.11.3.tar.gz 39637 BLAKE2B d1bfa0944dcebf5e408b9a061bcc6bab2fe172a70f0eadd36b229d2c9b40d74d8159c820608d3afd71a91085d5703af9b7045f359209730c53a9a83007159ce5 SHA512 461d858b05ff75f27017f6f0058f3e47643d5fe6c236e4307fa006735ad80e4c1fa487f1ab75edcfe881026541e302cdc3f8221c4ad7b97bce8c96b66db580bb
+DIST QtPy-2.0.0.tar.gz 39628 BLAKE2B bc1b2cf975c3457cb026016854ec70e0aa3247c1234643dbf95681f655678e43ba0200b26e16a0b9eafd6fb373c1f876d9a54458ceb9b9b035ad463b7874db2c SHA512 95855c305da7f54850bcb6297a1f12ceda79eaf6d9b01771b1391d2d7b07b8f690e134cc2d52417bcc320395dce8c1f7f5c6ccadf2939db196e0ed5441215d5a

diff --git a/dev-python/QtPy/QtPy-2.0.0.ebuild b/dev-python/QtPy/QtPy-2.0.0.ebuild
new file mode 100644
index 000000000000..dab3deb709bf
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.0.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+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.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# 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[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		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] )
+	)
+"
+
+# 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}]
+		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}]
+		)
+		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]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	# Disale 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
+	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
+
+	# 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() {
+	if use pyqt5; then
+		QT_API="pyqt5" virtx epytest
+	fi
+	if use pyside2; then
+		QT_API="pyside2" virtx epytest
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-12-15 17:12 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-12-15 17:12 UTC (permalink / raw
  To: gentoo-commits

commit:     fa0684ea0ef948a16dd61d2f35060d010c00ae87
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 15 15:33:05 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Dec 15 17:11:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0684ea

dev-python/QtPy: move virtx so failure is not ignored

Closes: https://bugs.gentoo.org/829145
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.11.3-r1.ebuild | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.11.3-r1.ebuild b/dev-python/QtPy/QtPy-1.11.3-r1.ebuild
index 6ced63406d95..56716c7509d2 100644
--- a/dev-python/QtPy/QtPy-1.11.3-r1.ebuild
+++ b/dev-python/QtPy/QtPy-1.11.3-r1.ebuild
@@ -122,16 +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
-		QT_API="pyside2" epytest
+		virtx QT_API="pyside2" epytest
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-12-14 13:33 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-12-14 13:33 UTC (permalink / raw
  To: gentoo-commits

commit:     97771b1b14bd8ae25d6ece32b194e5434eca836d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 14 13:23:50 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Dec 14 13:29:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97771b1b

dev-python/QtPy: drop pyside2,py310 restriction

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../{QtPy-1.11.3.ebuild => QtPy-1.11.3-r1.ebuild}  | 47 ++++++++--------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.11.3.ebuild b/dev-python/QtPy/QtPy-1.11.3-r1.ebuild
similarity index 76%
rename from dev-python/QtPy/QtPy-1.11.3.ebuild
rename to dev-python/QtPy/QtPy-1.11.3-r1.ebuild
index 7e702e2e474e..6ced63406d95 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]
 		)
 	)
 "
@@ -142,11 +131,7 @@ python_test() {
 		QT_API="pyqt5" epytest
 	fi
 	if use pyside2; then
-		if [[ "${EPYTHON}" == "python3.10" ]]; then
-			return
-		else
-			QT_API="pyside2" epytest
-		fi
+		QT_API="pyside2" epytest
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-12-04  4:57 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2021-12-04  4:57 UTC (permalink / raw
  To: gentoo-commits

commit:     7099b48ac8c88cdae31f4645f6b4329865f290ab
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  3 18:40:58 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec  4 04:57:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7099b48a

dev-python/QtPy: Bump to 1.11.3

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/Manifest           |   1 +
 dev-python/QtPy/QtPy-1.11.3.ebuild | 158 +++++++++++++++++++++++++++++++++++++
 2 files changed, 159 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index ef4a19299281..8d96740ebaa3 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1 +1,2 @@
 DIST QtPy-1.11.2.tar.gz 37098 BLAKE2B 8806cce798c4c2d885dd340d0d077567353cf0f3f1c2b284fd788c190b28b6133d052d31dea861e7d2497d0db88ba7ce8be83074360c61823f7a78dc01c015a5 SHA512 e49beb3180789a8080a19406b0e122bc9fc2192ac89b59f0956d7c65ac957779b192062956a97a7526f32724000df18abf32ddd6bda52f9cdf440ddc551887f8
+DIST QtPy-1.11.3.tar.gz 39637 BLAKE2B d1bfa0944dcebf5e408b9a061bcc6bab2fe172a70f0eadd36b229d2c9b40d74d8159c820608d3afd71a91085d5703af9b7045f359209730c53a9a83007159ce5 SHA512 461d858b05ff75f27017f6f0058f3e47643d5fe6c236e4307fa006735ad80e4c1fa487f1ab75edcfe881026541e302cdc3f8221c4ad7b97bce8c96b66db580bb

diff --git a/dev-python/QtPy/QtPy-1.11.3.ebuild b/dev-python/QtPy/QtPy-1.11.3.ebuild
new file mode 100644
index 000000000000..7e702e2e474e
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.11.3.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+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 )
+"
+
+# 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.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# 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="
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		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} )
+	)
+"
+
+# 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}]
+		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}]
+		)
+		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} )
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	# Disale 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
+	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
+
+	# 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
+}
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
+python_test() {
+	if use pyqt5; then
+		QT_API="pyqt5" epytest
+	fi
+	if use pyside2; then
+		if [[ "${EPYTHON}" == "python3.10" ]]; then
+			return
+		else
+			QT_API="pyside2" epytest
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-11-16  6:19 Sam James
  0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2021-11-16  6:19 UTC (permalink / raw
  To: gentoo-commits

commit:     1ebd37e37de9047f132754aca8d80eaa4502983f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 06:19:06 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 06:19:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ebd37e3

dev-python/QtPy: Keyword 1.11.2 arm, #816981

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.11.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.11.2.ebuild b/dev-python/QtPy/QtPy-1.11.2.ebuild
index a220d160ebfd..80a6b0988c86 100644
--- a/dev-python/QtPy/QtPy-1.11.2.ebuild
+++ b/dev-python/QtPy/QtPy-1.11.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 _IUSE_QT_MODULES="
 	declarative designer gui help location multimedia network opengl


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-11-14 20:29 Sam James
  0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2021-11-14 20:29 UTC (permalink / raw
  To: gentoo-commits

commit:     2f0af893b04f33979369fe9f20a752b6c3fb1788
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 14 20:28:55 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 20:28:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0af893

dev-python/QtPy: Stabilize 1.11.2 ALLARCHES, #823572

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.11.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.11.2.ebuild b/dev-python/QtPy/QtPy-1.11.2.ebuild
index 4f256a44dd52..a220d160ebfd 100644
--- a/dev-python/QtPy/QtPy-1.11.2.ebuild
+++ b/dev-python/QtPy/QtPy-1.11.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 _IUSE_QT_MODULES="
 	declarative designer gui help location multimedia network opengl


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-10-04 19:57 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-10-04 19:57 UTC (permalink / raw
  To: gentoo-commits

commit:     e57c8003037eebb728de70fa6ad16b437bdcf71d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  4 19:56:50 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Oct  4 19:56:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e57c8003

dev-python/QtPy: add version 1.11.2

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/Manifest           |   1 +
 dev-python/QtPy/QtPy-1.11.2.ebuild | 158 +++++++++++++++++++++++++++++++++++++
 2 files changed, 159 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 2f2e5c04e36..34a411739e0 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,4 @@
 DIST QtPy-1.10.0.tar.gz 34339 BLAKE2B cbae5eb38bf8ee4ab1528bca0afa93c57b70f48eb44639eac04344f4bbef28a4277bd3727ed5ac25f8ef18cc5391fafd33bb8ea42037eabee10cd4d13d7d3d1c SHA512 5ca326ae64cc85b48b02daa344d23387a9165a0097d59c31d921c7f67141afe31dad8a46abd0b201b31446f97405d7dce4dacd936b24c5faf9484dc37665e974
 DIST QtPy-1.11.1.tar.gz 37068 BLAKE2B 5eef91a8aaad5d8354d123481e434a2b32b1aa1eddd4b6cc0205a40249533c2f6211b13ea049485243e510b0d820c35f0f5833df4c42276d15f3f8269cff3604 SHA512 467780e353b9658234cc164a11bc1526165a31a2021fd75efdd109ea516de5f279bb601130c98fd295aba99c40f20ab3d2c4758951180d4dc05e47bbc3e8408c
+DIST QtPy-1.11.2.tar.gz 37098 BLAKE2B 8806cce798c4c2d885dd340d0d077567353cf0f3f1c2b284fd788c190b28b6133d052d31dea861e7d2497d0db88ba7ce8be83074360c61823f7a78dc01c015a5 SHA512 e49beb3180789a8080a19406b0e122bc9fc2192ac89b59f0956d7c65ac957779b192062956a97a7526f32724000df18abf32ddd6bda52f9cdf440ddc551887f8
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7

diff --git a/dev-python/QtPy/QtPy-1.11.2.ebuild b/dev-python/QtPy/QtPy-1.11.2.ebuild
new file mode 100644
index 00000000000..4f256a44dd5
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.11.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+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 )
+"
+
+# 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.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# 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="
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		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} )
+	)
+"
+
+# 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}]
+		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}]
+		)
+		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} )
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	# Disale 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
+	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
+
+	# 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
+}
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
+python_test() {
+	if use pyqt5; then
+		QT_API="pyqt5" epytest
+	fi
+	if use pyside2; then
+		if [[ "${EPYTHON}" == "python3.10" ]]; then
+			return
+		else
+			QT_API="pyside2" epytest
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-09-14  9:33 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-09-14  9:33 UTC (permalink / raw
  To: gentoo-commits

commit:     c97b37c3db7bd25043d5e1297f00abce5f4dc0e2
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 09:32:16 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 09:33:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97b37c3

dev-python/QtPy: drop version 1.11.0

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/Manifest           |   1 -
 dev-python/QtPy/QtPy-1.11.0.ebuild | 158 -------------------------------------
 2 files changed, 159 deletions(-)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 547c3fcc464..2f2e5c04e36 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,4 +1,3 @@
 DIST QtPy-1.10.0.tar.gz 34339 BLAKE2B cbae5eb38bf8ee4ab1528bca0afa93c57b70f48eb44639eac04344f4bbef28a4277bd3727ed5ac25f8ef18cc5391fafd33bb8ea42037eabee10cd4d13d7d3d1c SHA512 5ca326ae64cc85b48b02daa344d23387a9165a0097d59c31d921c7f67141afe31dad8a46abd0b201b31446f97405d7dce4dacd936b24c5faf9484dc37665e974
-DIST QtPy-1.11.0.tar.gz 36855 BLAKE2B 6e505241a59fa0b5bf8b82a4de2ee0d8e04e56975a7bc9857af212d5511769d2819ea627fc30605f0459c566ca5a2fce4303a2e282c3230bf5a8155a326097b5 SHA512 589626bd61ec94a6c9c5eb0c436c4b96a5d387e7aa4e7ea22a5de6e9e6f73d2034cda0144783837e8bd4798cd6da1415b8478b2e92ff5fd826800bfbc0751859
 DIST QtPy-1.11.1.tar.gz 37068 BLAKE2B 5eef91a8aaad5d8354d123481e434a2b32b1aa1eddd4b6cc0205a40249533c2f6211b13ea049485243e510b0d820c35f0f5833df4c42276d15f3f8269cff3604 SHA512 467780e353b9658234cc164a11bc1526165a31a2021fd75efdd109ea516de5f279bb601130c98fd295aba99c40f20ab3d2c4758951180d4dc05e47bbc3e8408c
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7

diff --git a/dev-python/QtPy/QtPy-1.11.0.ebuild b/dev-python/QtPy/QtPy-1.11.0.ebuild
deleted file mode 100644
index 7dee17becfa..00000000000
--- a/dev-python/QtPy/QtPy-1.11.0.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="https://github.com/spyder-ide/qtpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-_IUSE_QT_MODULES="
-	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport speech sql svg testlib
-	webchannel webengine websockets widgets x11extras xml xmlpatterns
-"
-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 )
-"
-
-# 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.
-# 	bluetooth? ( pyqt5 )
-# 	dbus? ( pyqt5 )
-#
-# 	3d? ( pyside2 )
-# 	charts? ( pyside2 )
-# 	concurrent? ( pyside2 )
-# 	datavis? ( pyside2 )
-# 	scxml? ( pyside2 )
-# 	script? ( pyside2 )
-# 	scripttools? ( pyside2 )
-
-# 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="
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
-		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
-		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
-		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} )
-	)
-"
-
-# 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}]
-		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}]
-		)
-		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} )
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-	# Disale 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
-	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
-
-	# 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
-}
-
-src_test() {
-	virtx python_foreach_impl python_test
-}
-
-python_test() {
-	if use pyqt5; then
-		QT_API="pyqt5" epytest
-	fi
-	if use pyside2; then
-		if [[ "${EPYTHON}" == "python3.10" ]]; then
-			return
-		else
-			QT_API="pyside2" epytest
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use pyqt5 && use pyside2; then
-		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
-		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
-	fi
-}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-09-14  9:33 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-09-14  9:33 UTC (permalink / raw
  To: gentoo-commits

commit:     1204cde5aa266c7478ea0576a7718ac85d098b98
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 09:31:51 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 09:33:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1204cde5

dev-python/QtPy: add version 1.11.1

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/Manifest           |   1 +
 dev-python/QtPy/QtPy-1.11.1.ebuild | 158 +++++++++++++++++++++++++++++++++++++
 2 files changed, 159 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index f0efdb86f08..547c3fcc464 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,4 @@
 DIST QtPy-1.10.0.tar.gz 34339 BLAKE2B cbae5eb38bf8ee4ab1528bca0afa93c57b70f48eb44639eac04344f4bbef28a4277bd3727ed5ac25f8ef18cc5391fafd33bb8ea42037eabee10cd4d13d7d3d1c SHA512 5ca326ae64cc85b48b02daa344d23387a9165a0097d59c31d921c7f67141afe31dad8a46abd0b201b31446f97405d7dce4dacd936b24c5faf9484dc37665e974
 DIST QtPy-1.11.0.tar.gz 36855 BLAKE2B 6e505241a59fa0b5bf8b82a4de2ee0d8e04e56975a7bc9857af212d5511769d2819ea627fc30605f0459c566ca5a2fce4303a2e282c3230bf5a8155a326097b5 SHA512 589626bd61ec94a6c9c5eb0c436c4b96a5d387e7aa4e7ea22a5de6e9e6f73d2034cda0144783837e8bd4798cd6da1415b8478b2e92ff5fd826800bfbc0751859
+DIST QtPy-1.11.1.tar.gz 37068 BLAKE2B 5eef91a8aaad5d8354d123481e434a2b32b1aa1eddd4b6cc0205a40249533c2f6211b13ea049485243e510b0d820c35f0f5833df4c42276d15f3f8269cff3604 SHA512 467780e353b9658234cc164a11bc1526165a31a2021fd75efdd109ea516de5f279bb601130c98fd295aba99c40f20ab3d2c4758951180d4dc05e47bbc3e8408c
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7

diff --git a/dev-python/QtPy/QtPy-1.11.1.ebuild b/dev-python/QtPy/QtPy-1.11.1.ebuild
new file mode 100644
index 00000000000..4f256a44dd5
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.11.1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+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 )
+"
+
+# 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.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# 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="
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		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} )
+	)
+"
+
+# 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}]
+		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}]
+		)
+		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} )
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	# Disale 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
+	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
+
+	# 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
+}
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
+python_test() {
+	if use pyqt5; then
+		QT_API="pyqt5" epytest
+	fi
+	if use pyside2; then
+		if [[ "${EPYTHON}" == "python3.10" ]]; then
+			return
+		else
+			QT_API="pyside2" epytest
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-09-14  9:33 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-09-14  9:33 UTC (permalink / raw
  To: gentoo-commits

commit:     588b189d3963bf007e3695bd8745d752558239b8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 09:32:37 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 09:33:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=588b189d

dev-python/QtPy: drop version 1.9.0-r3

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r3.ebuild | 55 ------------------------------------
 1 file changed, 55 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
deleted file mode 100644
index 7ee5dea86d8..00000000000
--- a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="designer gui opengl printsupport svg testlib webengine"
-
-# 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).
-RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,printsupport?,svg?]
-	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
-# The QtPy testsuite skips tests for bindings that are
-# not installed, so here we ensure that everything
-# is available and all tests are run.
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		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,sql,svg,testlib,webchannel]
-		dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
-		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	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 PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-}
-
-python_test() {
-	local -x QT_API="pyqt5"
-	virtx pytest -vv
-}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-09-05  9:54 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-09-05  9:54 UTC (permalink / raw
  To: gentoo-commits

commit:     8db6a61396a39cb91a2a5379da7ff0ea09ac0291
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  5 08:41:13 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Sep  5 09:54:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db6a613

dev-python/QtPy: add version 1.11.0

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/Manifest           |   1 +
 dev-python/QtPy/QtPy-1.11.0.ebuild | 158 +++++++++++++++++++++++++++++++++++++
 2 files changed, 159 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 81011542f98..f0efdb86f08 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,2 +1,3 @@
 DIST QtPy-1.10.0.tar.gz 34339 BLAKE2B cbae5eb38bf8ee4ab1528bca0afa93c57b70f48eb44639eac04344f4bbef28a4277bd3727ed5ac25f8ef18cc5391fafd33bb8ea42037eabee10cd4d13d7d3d1c SHA512 5ca326ae64cc85b48b02daa344d23387a9165a0097d59c31d921c7f67141afe31dad8a46abd0b201b31446f97405d7dce4dacd936b24c5faf9484dc37665e974
+DIST QtPy-1.11.0.tar.gz 36855 BLAKE2B 6e505241a59fa0b5bf8b82a4de2ee0d8e04e56975a7bc9857af212d5511769d2819ea627fc30605f0459c566ca5a2fce4303a2e282c3230bf5a8155a326097b5 SHA512 589626bd61ec94a6c9c5eb0c436c4b96a5d387e7aa4e7ea22a5de6e9e6f73d2034cda0144783837e8bd4798cd6da1415b8478b2e92ff5fd826800bfbc0751859
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7

diff --git a/dev-python/QtPy/QtPy-1.11.0.ebuild b/dev-python/QtPy/QtPy-1.11.0.ebuild
new file mode 100644
index 00000000000..7dee17becfa
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.11.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+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 )
+"
+
+# 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.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# 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="
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		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} )
+	)
+"
+
+# 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}]
+		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}]
+		)
+		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} )
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	# Disale 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
+	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
+
+	# 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
+}
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
+python_test() {
+	if use pyqt5; then
+		QT_API="pyqt5" epytest
+	fi
+	if use pyside2; then
+		if [[ "${EPYTHON}" == "python3.10" ]]; then
+			return
+		else
+			QT_API="pyside2" epytest
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-09-03  1:53 Sam James
  0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2021-09-03  1:53 UTC (permalink / raw
  To: gentoo-commits

commit:     ca18e674062c5115666f7cba2fe46518247866c1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  3 01:52:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  3 01:52:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca18e674

dev-python/QtPy: Stabilize 1.9.0-r5 arm64, #799632

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
index c4c03bc5f4c..7f17cc4ccec 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 _IUSE_QT_MODULES="
 	declarative designer gui help location multimedia network opengl


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-08-19 19:44 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-08-19 19:44 UTC (permalink / raw
  To: gentoo-commits

commit:     f93f2803c8c57b1dc92c518c2eb828f4b4e10b9f
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 19:39:23 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 19:44:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f93f2803

dev-python/QtPy: add version 1.10.0

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/Manifest           |   1 +
 dev-python/QtPy/QtPy-1.10.0.ebuild | 158 +++++++++++++++++++++++++++++++++++++
 2 files changed, 159 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index b8374d6358e..81011542f98 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1 +1,2 @@
+DIST QtPy-1.10.0.tar.gz 34339 BLAKE2B cbae5eb38bf8ee4ab1528bca0afa93c57b70f48eb44639eac04344f4bbef28a4277bd3727ed5ac25f8ef18cc5391fafd33bb8ea42037eabee10cd4d13d7d3d1c SHA512 5ca326ae64cc85b48b02daa344d23387a9165a0097d59c31d921c7f67141afe31dad8a46abd0b201b31446f97405d7dce4dacd936b24c5faf9484dc37665e974
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7

diff --git a/dev-python/QtPy/QtPy-1.10.0.ebuild b/dev-python/QtPy/QtPy-1.10.0.ebuild
new file mode 100644
index 00000000000..7dee17becfa
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.10.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+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 )
+"
+
+# 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.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# 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="
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		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} )
+	)
+"
+
+# 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}]
+		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}]
+		)
+		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} )
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	# Disale 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
+	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
+
+	# 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
+}
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
+python_test() {
+	if use pyqt5; then
+		QT_API="pyqt5" epytest
+	fi
+	if use pyside2; then
+		if [[ "${EPYTHON}" == "python3.10" ]]; then
+			return
+		else
+			QT_API="pyside2" epytest
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-07-19 18:36 Sam James
  0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2021-07-19 18:36 UTC (permalink / raw
  To: gentoo-commits

commit:     eaf575c04e637ee37140c695d6b787f2c96e054e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 19 18:34:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 19 18:34:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf575c0

dev-python/QtPy: Stabilize 1.9.0-r5 amd64, #799632

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
index 79112596577..c4c03bc5f4c 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 _IUSE_QT_MODULES="
 	declarative designer gui help location multimedia network opengl


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-06-03  8:23 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-06-03  8:23 UTC (permalink / raw
  To: gentoo-commits

commit:     381d231e55d9901c55ba281330559652c66b5122
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  3 08:22:46 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jun  3 08:23:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=381d231e

dev-python/QtPy: add MissingUseDepDefault

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
index 13536b01bec..b1afa53aa7d 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
@@ -67,7 +67,7 @@ RDEPEND="
 		dev-python/PyQt5[${PYTHON_USEDEP}]
 		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
 		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech?,sql?,svg?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
 		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
 		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
 		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
@@ -95,7 +95,7 @@ BDEPEND="
 			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[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
 			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
 			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 		)


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-06-02 20:27 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-06-02 20:27 UTC (permalink / raw
  To: gentoo-commits

commit:     cb7418b6e3f62b9dc73a7f425a38af4351b87db7
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  2 20:25:36 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jun  2 20:25:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb7418b6

dev-python/QtPy: add USE="speech"

Bug: https://bugs.gentoo.org/792861
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r5.ebuild | 15 +++++++--------
 dev-python/QtPy/metadata.xml         |  3 ++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
index a2061df8a26..13536b01bec 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
@@ -17,8 +17,8 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 
 _IUSE_QT_MODULES="
 	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport sql svg testlib webchannel
-	webengine websockets widgets x11extras xml xmlpatterns
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
 "
 IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
 unset _IUSE_QT_MODULES
@@ -44,7 +44,6 @@ REQUIRED_USE="
 # 	scxml? ( pyside2 )
 # 	script? ( pyside2 )
 # 	scripttools? ( pyside2 )
-# 	speech? ( pyside2 )
 
 # 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
@@ -68,7 +67,7 @@ RDEPEND="
 		dev-python/PyQt5[${PYTHON_USEDEP}]
 		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
 		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,sql?,svg?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech?,sql?,svg?]
 		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
 		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
 		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
@@ -78,9 +77,9 @@ RDEPEND="
 			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(+)?,sql?,svg?,testlib?]
-			dev-python/pyside2[webchannel?,webengine?,websockets?,widgets?]
-			dev-python/pyside2[x11extras?,xml?,xmlpatterns?]
+			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} )
 	)
@@ -96,7 +95,7 @@ BDEPEND="
 			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,sql,svg,testlib,webchannel]
+			dev-python/PyQt5[sensors,serialport,speech,sql,svg,testlib,webchannel]
 			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
 			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 		)

diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 9bf18f12651..8238afd3186 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -17,7 +17,7 @@
 	<use>
 		<flag name="pyqt5">Use <pkg>dev-python/PyQt5</pkg> as Qt for Python implementation</flag>
 		<flag name="pyside2">Use <pkg>dev-python/pyside2</pkg> as Qt for Python implementation</flag>
-		<flag name="declarative">Pull in bindings for the QtQml/QtQuick modules and enable the qmlscene plugin</flag>
+		<flag name="declarative">Build bindings for the QtQml and QtQuick modules and enable the qmlscene plugin</flag>
 		<flag name="designer">Pull in bindings for the QtDesigner module and enable the designer plugin</flag>
 		<flag name="gui">Pull in bindings for the QtGui module</flag>
 		<flag name="help">Pull in bindings for the QtHelp module</flag>
@@ -29,6 +29,7 @@
 		<flag name="printsupport">Pull in bindings for the QtPrintSupport module</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">Build 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>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-06-02  7:44 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-06-02  7:44 UTC (permalink / raw
  To: gentoo-commits

commit:     8dd62a5cb7b049a63d46c90c8e95cb43613685ee
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  2 07:44:22 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jun  2 07:44:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dd62a5c

dev-python/QtPy: fix flags for test dependencies

Since the test phase was rewritten in the previous commit
to allow testing with only one of the implementations (in
order to allow adding python3.10), we no longer have to
pull in both implementations to run the test phase.

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r5.ebuild | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
index b2d2c09acca..a2061df8a26 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
@@ -92,21 +92,25 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
-		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,sql,svg,testlib,webchannel]
-		dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
-		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		$(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} )
+		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,sql,svg,testlib,webchannel]
+			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
+			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} )
+		)
 	)
 "
 


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-05-22 20:55 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-05-22 20:55 UTC (permalink / raw
  To: gentoo-commits

commit:     1215812e23caf0fa6e4bea830224d2d0033a30c5
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat May 22 20:43:26 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat May 22 20:55:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1215812e

dev-python/QtPy: add <stabilize-allarches/>

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 605a0838da7..9bf18f12651 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -44,4 +44,5 @@
 		<remote-id type="github">spyder-ide/qtpy</remote-id>
 		<remote-id type="pypi">QtPy</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-05-21 16:08 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-05-21 16:08 UTC (permalink / raw
  To: gentoo-commits

commit:     66e7b25d79ffd8ac927a939a6ce23a031cdb9897
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri May 21 16:08:45 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri May 21 16:08:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e7b25d

dev-python/QtPy: drop webkit dep

It is deprecated, and the tests will work either way because things which
are not found are automatically skipped.

Also require both pyqt5 and pyside2 to be set if we want to run tests, because
it won't work if one of them is disabled.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r4.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r4.ebuild b/dev-python/QtPy/QtPy-1.9.0-r4.ebuild
index b31189ce6bd..0aa58b9aaab 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r4.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r4.ebuild
@@ -23,7 +23,10 @@ _IUSE_QT_MODULES="
 IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
 unset _IUSE_QT_MODULES
 
-REQUIRED_USE="|| ( pyqt5 pyside2 )"
+REQUIRED_USE="
+	|| ( pyqt5 pyside2 )
+	test? ( 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.
@@ -89,7 +92,7 @@ BDEPEND="
 		dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
 		dev-python/PyQt5[multimedia,network,networkauth,opengl,positioning]
 		dev-python/PyQt5[printsupport,sensors,serialport,sql,svg,testlib]
-		dev-python/PyQt5[webchannel,webkit,websockets,widgets,x11extras,xml(+)]
+		dev-python/PyQt5[webchannel,websockets,widgets,x11extras,xml(+)]
 		dev-python/PyQt5[xmlpatterns]
 		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 		dev-python/pyside2[${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-05-20  9:42 Andrew Ammerlaan
  0 siblings, 0 replies; 113+ messages in thread
From: Andrew Ammerlaan @ 2021-05-20  9:42 UTC (permalink / raw
  To: gentoo-commits

commit:     5cf79d0718816ddef25b7ddc3353d4f4975dbb6e
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed May 19 13:15:23 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu May 20 09:42:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf79d07

dev-python/QtPy: allow use of pyside2, but better this time

Closes: https://bugs.gentoo.org/790764
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/20871
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r4.ebuild | 137 +++++++++++++++++++++++++++++++++++
 dev-python/QtPy/metadata.xml         |  17 +++++
 2 files changed, 154 insertions(+)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r4.ebuild b/dev-python/QtPy/QtPy-1.9.0-r4.ebuild
new file mode 100644
index 00000000000..b31189ce6bd
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.9.0-r4.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..8} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport sql svg testlib webchannel
+	webengine websockets widgets x11extras xml xmlpatterns
+"
+IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+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.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+# 	networkauth? ( pyqt5 )
+# 	webkit? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+# 	speech? ( pyside2 )
+
+# 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="
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		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(+)?,sql?,svg?,testlib?]
+		dev-python/pyside2[webchannel?,webengine?,websockets?,widgets?]
+		dev-python/pyside2[x11extras?,xml?,xmlpatterns?]
+		declarative? ( dev-python/pyside2[qml,quick] )
+	)
+"
+
+# 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/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
+		dev-python/PyQt5[multimedia,network,networkauth,opengl,positioning]
+		dev-python/PyQt5[printsupport,sensors,serialport,sql,svg,testlib]
+		dev-python/PyQt5[webchannel,webkit,websockets,widgets,x11extras,xml(+)]
+		dev-python/PyQt5[xmlpatterns]
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		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]
+)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	if ! use pyqt5; then
+		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyside2; then
+		sed -i -e "s/from PySide2 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
+}
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
+python_test() {
+	local -x QT_API
+	for QT_API in pyqt5 pyside2; do
+		epytest
+	done
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}

diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index f0ef6662c62..605a0838da7 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -15,13 +15,30 @@
 		Basically, you can write your code as if you were using PySide2 but import Qt modules from qtpy instead of PySide2 (or PyQt5)
 	</longdescription>
 	<use>
+		<flag name="pyqt5">Use <pkg>dev-python/PyQt5</pkg> as Qt for Python implementation</flag>
+		<flag name="pyside2">Use <pkg>dev-python/pyside2</pkg> as Qt for Python implementation</flag>
+		<flag name="declarative">Pull in bindings for the QtQml/QtQuick modules and enable the qmlscene plugin</flag>
 		<flag name="designer">Pull in bindings for the QtDesigner module and enable the designer plugin</flag>
 		<flag name="gui">Pull in bindings for the QtGui module</flag>
+		<flag name="help">Pull in bindings for the QtHelp module</flag>
+		<flag name="location">Pull in bindings for the QtLocation module</flag>
+		<flag name="multimedia">Pull in QtMultimedia and QtMultimediaWidgets modules</flag>
+		<flag name="network">Pull in bindings for the QtNetwork module</flag>
 		<flag name="opengl">Pull in bindings for the QtOpenGL module</flag>
+		<flag name="positioning">Pull in bindings for the QtPositioning module</flag>
 		<flag name="printsupport">Pull in bindings for the QtPrintSupport module</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="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>
+		<flag name="webchannel">Pull in bindings for the QtWebChannel module</flag>
 		<flag name="webengine">Pull in QtWebEngine and QtWebEngineWidgets modules</flag>
+		<flag name="websockets">Pull in bindings for the QtWebSockets module</flag>
+		<flag name="widgets">Pull in bindings for the QtWidgets module</flag>
+		<flag name="x11extras">Pull in bindings for the QtX11Extras module</flag>
+		<flag name="xmlpatterns">Pull in bindings for the QtXmlPatterns module</flag>
+		<flag name="xml">Pull in QtXml module</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">spyder-ide/qtpy</remote-id>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-05-18 13:40 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2021-05-18 13:40 UTC (permalink / raw
  To: gentoo-commits

commit:     77ad0e85e627843f89462b5317f674f446bb94b5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 13:39:57 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 18 13:40:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ad0e85

dev-python/QtPy: add missing mock dep

Closes: https://bugs.gentoo.org/790809
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index 3452e37975a..8e1f50a8e47 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 # is available and all tests are run.
 BDEPEND="
 	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/PyQt5[${PYTHON_USEDEP},bluetooth,dbus,declarative,designer,gui,help,location,multimedia,network,networkauth,opengl,positioning,printsupport,sensors,serialport,sql,ssl,svg,testlib,webchannel,webkit,websockets,widgets,x11extras,xml(+),xmlpatterns]
 		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 	)"


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-05-18 11:40 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2021-05-18 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     7d73acb6db8502af609ff9aa15aae3b15c4161c5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 11:11:45 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 18 11:40:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d73acb6

dev-python/QtPy: Fix missing pytest dep

Closes: https://bugs.gentoo.org/790800
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index 33c8ccc6869..3452e37975a 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -33,6 +33,8 @@ BDEPEND="
 		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 	)"
 
+distutils_enable_tests pytest
+
 src_prepare() {
 	default
 


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-05-18  8:51 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2021-05-18  8:51 UTC (permalink / raw
  To: gentoo-commits

commit:     1d14f1c12251ca25b8ed0ee53e141406b5f5e67f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 07:30:00 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 18 08:50:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d14f1c1

dev-python/QtPy: Backport some improvements from removed -r3

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r2.ebuild | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index 32222ef6ef4..33c8ccc6869 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit distutils-r1
+inherit distutils-r1 virtualx
 
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
 HOMEPAGE="https://github.com/spyder-ide/qtpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
@@ -16,11 +16,22 @@ SLOT="0"
 KEYWORDS="amd64 arm64 x86"
 IUSE="designer gui opengl printsupport svg testlib webengine"
 
+# 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).
 RDEPEND="
 	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,printsupport?,svg?]
 	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
 	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
 	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
+# The QtPy testsuite skips tests for bindings that are
+# not installed, so here we ensure that everything
+# is available and all tests are run.
+BDEPEND="
+	test? (
+		dev-python/PyQt5[${PYTHON_USEDEP},bluetooth,dbus,declarative,designer,gui,help,location,multimedia,network,networkauth,opengl,positioning,printsupport,sensors,serialport,sql,ssl,svg,testlib,webchannel,webkit,websockets,widgets,x11extras,xml(+),xmlpatterns]
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+	)"
 
 src_prepare() {
 	default
@@ -29,3 +40,8 @@ src_prepare() {
 	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
 	sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
 }
+
+python_test() {
+	local -x QT_API="pyqt5"
+	virtx pytest -vv
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-05-18  7:21 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2021-05-18  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     7a9268be4bcba43f3206b51da598312a105dd0dd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 07:05:53 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 18 07:21:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a9268be

dev-python/QtPy: Revert "allow dependency to be satisfied by pyside2"

The lot of USE dependencies break pkgcheck, plus the any-of logic is
wrong and does not match what the package does.  If PyQt5 is installed
at all, the package will default to using it even if the dependencies
are satisfied by pyside2.

Reverts: 8bdd53a2d42010f0ec8f83273938a62195bfbcd5
Bug: https://bugs.gentoo.org/790764
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r3.ebuild | 107 -----------------------------------
 dev-python/QtPy/metadata.xml         |  17 ------
 2 files changed, 124 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
deleted file mode 100644
index e707c30eebb..00000000000
--- a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="
-	declarative designer gui help location multimedia network
-	opengl positioning printsupport qml quick sensors serialport
-	sql svg test testlib webchannel webengine websockets
-	widgets x11extras xml xmlpatterns
-"
-
-# 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="
-	app-eselect/eselect-QtPy
-	|| (
-		dev-python/PyQt5[${PYTHON_USEDEP},designer?,gui?,help?,location?,multimedia?,network?,opengl?,positioning?,printsupport?,sensors?,serialport?,sql?,svg?,testlib?,webchannel?,websockets?,widgets?,x11extras?,xml(+)?,xmlpatterns?]
-		dev-python/pyside2[${PYTHON_USEDEP},designer?,gui?,help?,location?,multimedia?,network?,opengl(+)?,positioning?,printsupport?,sensors?,serialport(+)?,sql?,svg?,testlib?,webchannel?,websockets?,widgets?,x11extras?,xml?,xmlpatterns?]
-	)
-
-	webengine? ( || (
-		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		dev-python/pyside2[${PYTHON_USEDEP},webengine]
-	) )
-
-	qml? ( || (
-		dev-python/PyQt5[${PYTHON_USEDEP},declarative]
-		dev-python/pyside2[${PYTHON_USEDEP},qml]
-	) )
-
-	quick? ( || (
-		dev-python/PyQt5[${PYTHON_USEDEP},declarative]
-		dev-python/pyside2[${PYTHON_USEDEP},quick]
-	) )
-
-	declarative? ( || (
-		dev-python/PyQt5[${PYTHON_USEDEP},declarative]
-		dev-python/pyside2[${PYTHON_USEDEP},qml,quick]
-	) )
-"
-
-# These bindings are currently only provided by PyQt5 or PySide2
-# but not by both. Just DEPEND on these directly if they are
-# required.
-# Please check periodically if this list is still up to date
-#
-# 	bluetooth? ( dev-python/PyQt5[${PYTHON_USEDEP},bluetooth] )
-# 	dbus? ( dev-python/PyQt5[${PYTHON_USEDEP},dbus] )
-# 	examples? ( dev-python/PyQt5[${PYTHON_USEDEP},examples] )
-# 	networkauth? ( dev-python/PyQt5[${PYTHON_USEDEP},networkauth] )
-# 	ssl? ( dev-python/PyQt5[${PYTHON_USEDEP},ssl] )
-# 	webkit? ( dev-python/PyQt5[${PYTHON_USEDEP},webkit] )
-#
-# 	3d? ( dev-python/pyside2[${PYTHON_USEDEP},3d] )
-# 	charts? ( dev-python/pyside2[${PYTHON_USEDEP},charts] )
-# 	concurrent? ( dev-python/pyside2[${PYTHON_USEDEP},concurrent] )
-# 	datavis? ( dev-python/pyside2[${PYTHON_USEDEP},datavis] )
-# 	scxml? ( dev-python/pyside2[${PYTHON_USEDEP},scxml] )
-# 	script? ( dev-python/pyside2[${PYTHON_USEDEP},script] )
-# 	scripttools? ( dev-python/pyside2[${PYTHON_USEDEP},scripttools] )
-# 	speech? ( dev-python/pyside2[${PYTHON_USEDEP},speech] )
-
-# The QtPy testsuite skips tests for bindings that are
-# not installed, so here we ensure that everything
-# is available and all tests are run.
-BDEPEND="test? (
-	dev-python/PyQt5[${PYTHON_USEDEP},bluetooth,dbus,declarative,designer,gui,help,location,multimedia,network,networkauth,opengl,positioning,printsupport,sensors,serialport,sql,ssl,svg,testlib,webchannel,webkit,websockets,widgets,x11extras,xml(+),xmlpatterns]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	dev-python/pyside2[${PYTHON_USEDEP},3d,charts,concurrent,datavis,designer,gui,help,location,multimedia,network,opengl(+),positioning,printsupport,qml,quick,script,scripttools,scxml,sensors,serialport(+),speech,sql,svg,testlib,webchannel,webengine,websockets,widgets,x11extras,xml,xmlpatterns]
-)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	export QT_API="pyqt5"
-	virtx pytest -vv
-	export QT_API="pyside2"
-	virtx pytest -vv
-	unset QT_API
-}

diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 582ff9f96b8..1ad412dcb92 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -19,30 +19,13 @@
 		Basically, you can write your code as if you were using PySide2 but import Qt modules from qtpy instead of PySide2 (or PyQt5)
 	</longdescription>
 	<use>
-		<flag name="declarative">Pull in bindings for the QtQml/QtQuick modules and enable the qmlscene plugin</flag>
 		<flag name="designer">Pull in bindings for the QtDesigner module and enable the designer plugin</flag>
 		<flag name="gui">Pull in bindings for the QtGui module</flag>
-		<flag name="help">Pull in bindings for the QtHelp module</flag>
-		<flag name="location">Pull in bindings for the QtLocation module</flag>
-		<flag name="multimedia">Pull in QtMultimedia and QtMultimediaWidgets modules</flag>
-		<flag name="network">Pull in bindings for the QtNetwork module</flag>
 		<flag name="opengl">Pull in bindings for the QtOpenGL module</flag>
-		<flag name="positioning">Pull in bindings for the QtPositioning module</flag>
 		<flag name="printsupport">Pull in bindings for the QtPrintSupport module</flag>
-		<flag name="qml">Pull in QtQml module</flag>
-		<flag name="quick">Pull in QtQuick and QtQuickWidgets modules</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="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>
-		<flag name="webchannel">Pull in bindings for the QtWebChannel module</flag>
 		<flag name="webengine">Pull in QtWebEngine and QtWebEngineWidgets modules</flag>
-		<flag name="websockets">Pull in bindings for the QtWebSockets module</flag>
-		<flag name="widgets">Pull in bindings for the QtWidgets module</flag>
-		<flag name="x11extras">Pull in bindings for the QtX11Extras module</flag>
-		<flag name="xmlpatterns">Pull in bindings for the QtXmlPatterns module</flag>
-		<flag name="xml">Pull in QtXml module</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">spyder-ide/qtpy</remote-id>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-05-18  7:21 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2021-05-18  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     3f0e8899f48d961985d497077a2eda7530c0ca02
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 06:56:24 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 18 07:21:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f0e8899

dev-python/QtPy: Revert "x86 stable wrt bug #782481"

The stabilization is canceled because of major bugs in the ebuild.

Reverts: a619fb83c68a1904886f8d23c9e5ea8b25565748
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
index 0b26034aaa5..e707c30eebb 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE="
 	declarative designer gui help location multimedia network


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-05-18  6:29 Agostino Sarubbo
  0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2021-05-18  6:29 UTC (permalink / raw
  To: gentoo-commits

commit:     a619fb83c68a1904886f8d23c9e5ea8b25565748
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 06:29:24 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue May 18 06:29:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a619fb83

dev-python/QtPy: x86 stable wrt bug #782481

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
index e707c30eebb..0b26034aaa5 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 
 IUSE="
 	declarative designer gui help location multimedia network


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2021-03-11  7:18 Joonas Niilola
  0 siblings, 0 replies; 113+ messages in thread
From: Joonas Niilola @ 2021-03-11  7:18 UTC (permalink / raw
  To: gentoo-commits

commit:     8bdd53a2d42010f0ec8f83273938a62195bfbcd5
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Jan 25 21:31:30 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 07:17:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bdd53a2

dev-python/QtPy: allow dependency to be satisfied by pyside2

Now that pyside2 is in the repo, the test phase finally works!

Bug: https://bugs.gentoo.org/767199
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r3.ebuild | 107 +++++++++++++++++++++++++++++++++++
 dev-python/QtPy/metadata.xml         |  73 +++++++++++++++---------
 2 files changed, 154 insertions(+), 26 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
new file mode 100644
index 00000000000..e707c30eebb
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..8} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="
+	declarative designer gui help location multimedia network
+	opengl positioning printsupport qml quick sensors serialport
+	sql svg test testlib webchannel webengine websockets
+	widgets x11extras xml xmlpatterns
+"
+
+# 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="
+	app-eselect/eselect-QtPy
+	|| (
+		dev-python/PyQt5[${PYTHON_USEDEP},designer?,gui?,help?,location?,multimedia?,network?,opengl?,positioning?,printsupport?,sensors?,serialport?,sql?,svg?,testlib?,webchannel?,websockets?,widgets?,x11extras?,xml(+)?,xmlpatterns?]
+		dev-python/pyside2[${PYTHON_USEDEP},designer?,gui?,help?,location?,multimedia?,network?,opengl(+)?,positioning?,printsupport?,sensors?,serialport(+)?,sql?,svg?,testlib?,webchannel?,websockets?,widgets?,x11extras?,xml?,xmlpatterns?]
+	)
+
+	webengine? ( || (
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		dev-python/pyside2[${PYTHON_USEDEP},webengine]
+	) )
+
+	qml? ( || (
+		dev-python/PyQt5[${PYTHON_USEDEP},declarative]
+		dev-python/pyside2[${PYTHON_USEDEP},qml]
+	) )
+
+	quick? ( || (
+		dev-python/PyQt5[${PYTHON_USEDEP},declarative]
+		dev-python/pyside2[${PYTHON_USEDEP},quick]
+	) )
+
+	declarative? ( || (
+		dev-python/PyQt5[${PYTHON_USEDEP},declarative]
+		dev-python/pyside2[${PYTHON_USEDEP},qml,quick]
+	) )
+"
+
+# These bindings are currently only provided by PyQt5 or PySide2
+# but not by both. Just DEPEND on these directly if they are
+# required.
+# Please check periodically if this list is still up to date
+#
+# 	bluetooth? ( dev-python/PyQt5[${PYTHON_USEDEP},bluetooth] )
+# 	dbus? ( dev-python/PyQt5[${PYTHON_USEDEP},dbus] )
+# 	examples? ( dev-python/PyQt5[${PYTHON_USEDEP},examples] )
+# 	networkauth? ( dev-python/PyQt5[${PYTHON_USEDEP},networkauth] )
+# 	ssl? ( dev-python/PyQt5[${PYTHON_USEDEP},ssl] )
+# 	webkit? ( dev-python/PyQt5[${PYTHON_USEDEP},webkit] )
+#
+# 	3d? ( dev-python/pyside2[${PYTHON_USEDEP},3d] )
+# 	charts? ( dev-python/pyside2[${PYTHON_USEDEP},charts] )
+# 	concurrent? ( dev-python/pyside2[${PYTHON_USEDEP},concurrent] )
+# 	datavis? ( dev-python/pyside2[${PYTHON_USEDEP},datavis] )
+# 	scxml? ( dev-python/pyside2[${PYTHON_USEDEP},scxml] )
+# 	script? ( dev-python/pyside2[${PYTHON_USEDEP},script] )
+# 	scripttools? ( dev-python/pyside2[${PYTHON_USEDEP},scripttools] )
+# 	speech? ( dev-python/pyside2[${PYTHON_USEDEP},speech] )
+
+# The QtPy testsuite skips tests for bindings that are
+# not installed, so here we ensure that everything
+# is available and all tests are run.
+BDEPEND="test? (
+	dev-python/PyQt5[${PYTHON_USEDEP},bluetooth,dbus,declarative,designer,gui,help,location,multimedia,network,networkauth,opengl,positioning,printsupport,sensors,serialport,sql,ssl,svg,testlib,webchannel,webkit,websockets,widgets,x11extras,xml(+),xmlpatterns]
+	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+	dev-python/pyside2[${PYTHON_USEDEP},3d,charts,concurrent,datavis,designer,gui,help,location,multimedia,network,opengl(+),positioning,printsupport,qml,quick,script,scripttools,scxml,sensors,serialport(+),speech,sql,svg,testlib,webchannel,webengine,websockets,widgets,x11extras,xml,xmlpatterns]
+)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	export QT_API="pyqt5"
+	virtx pytest -vv
+	export QT_API="pyside2"
+	virtx pytest -vv
+	unset QT_API
+}

diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index a19bcec1894..5b164c14610 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -1,30 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Gentoo Python Project</name>
-  </maintainer>
-  <longdescription>
-     QtPy is a small abstraction layer that lets you write
-     applications using a single API call to either PyQt or
-     PySide. QtPy also provides a set of additional QWidgets. It
-     provides support for PyQt5, PyQt4 and PySide using the PyQt5
-     layout (where the QtGui module has been split into QtGui and
-     QtWidgets).
-     Basically, you write your code as if you were using PyQt5 but
-     import qt from QtPy instead of PyQt5.
-  </longdescription>
-  <use>
-    <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
-    <flag name="gui">Build bindings for the QtGui module</flag>
-    <flag name="printsupport">Build bindings for the QtPrintSupport module</flag>
-    <flag name="svg">Build bindings for the QtSvg module</flag>
-    <flag name="testlib">Build bindings for the QtTest module</flag>
-    <flag name="webengine">Build bindings for the QtWebEngine module</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">spyder-ide/qtpy</remote-id>
-    <remote-id type="pypi">QtPy</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Gentoo Python Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		QtPy is a small abstraction layer that lets you write applications using a single API call to either PyQt or PySide.
+		It provides support for PyQt5, PyQt4, PySide2 and PySide using the Qt5 layout (where the QtGui module has been split into QtGui and QtWidgets).
+		Basically, you can write your code as if you were using PySide2 but import Qt modules from qtpy instead of PySide2 (or PyQt5)
+	</longdescription>
+	<use>
+		<flag name="declarative">Pull in bindings for the QtQml/QtQuick modules and enable the qmlscene plugin</flag>
+		<flag name="designer">Pull in bindings for the QtDesigner module and enable the designer plugin</flag>
+		<flag name="gui">Pull in bindings for the QtGui module</flag>
+		<flag name="help">Pull in bindings for the QtHelp module</flag>
+		<flag name="location">Pull in bindings for the QtLocation module</flag>
+		<flag name="multimedia">Pull in QtMultimedia and QtMultimediaWidgets modules</flag>
+		<flag name="network">Pull in bindings for the QtNetwork module</flag>
+		<flag name="opengl">Pull in bindings for the QtOpenGL module</flag>
+		<flag name="positioning">Pull in bindings for the QtPositioning module</flag>
+		<flag name="printsupport">Pull in bindings for the QtPrintSupport module</flag>
+		<flag name="qml">Pull in QtQml module</flag>
+		<flag name="quick">Pull in QtQuick and QtQuickWidgets modules</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="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>
+		<flag name="webchannel">Pull in bindings for the QtWebChannel module</flag>
+		<flag name="webengine">Pull in QtWebEngine and QtWebEngineWidgets modules</flag>
+		<flag name="websockets">Pull in bindings for the QtWebSockets module</flag>
+		<flag name="widgets">Pull in bindings for the QtWidgets module</flag>
+		<flag name="x11extras">Pull in bindings for the QtX11Extras module</flag>
+		<flag name="xmlpatterns">Pull in bindings for the QtXmlPatterns module</flag>
+		<flag name="xml">Pull in QtXml module</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">spyder-ide/qtpy</remote-id>
+		<remote-id type="pypi">QtPy</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-08-03  3:11 Sam James
  0 siblings, 0 replies; 113+ messages in thread
From: Sam James @ 2020-08-03  3:11 UTC (permalink / raw
  To: gentoo-commits

commit:     995ca569178c14b47aad8860ce54852be4eef17b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  3 03:10:44 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug  3 03:10:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=995ca569

dev-python/QtPy: arm64 stable (bug #732342)

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index 8b053ca3c20..73b4b1e1e65 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="designer gui opengl printsupport svg testlib webengine"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-07-07 20:01 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2020-07-07 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     820a170368d5d44fd6d54495a359029794ec2a70
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  7 19:14:02 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul  7 20:01:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=820a1703

dev-python/QtPy: Add transitive USE=printsupport

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r2.ebuild | 4 ++--
 dev-python/QtPy/metadata.xml         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index ea4bf286622..8b053ca3c20 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -14,10 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="designer gui opengl svg testlib webengine"
+IUSE="designer gui opengl printsupport svg testlib webengine"
 
 RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?]
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,printsupport?,svg?]
 	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
 	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
 	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"

diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 076f782a9d6..a19bcec1894 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -18,6 +18,7 @@
   <use>
     <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
     <flag name="gui">Build bindings for the QtGui module</flag>
+    <flag name="printsupport">Build bindings for the QtPrintSupport module</flag>
     <flag name="svg">Build bindings for the QtSvg module</flag>
     <flag name="testlib">Build bindings for the QtTest module</flag>
     <flag name="webengine">Build bindings for the QtWebEngine module</flag>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-06-09 19:46 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2020-06-09 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     c29104abc1856ae3dc0af574efa7a30d6a4b997e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  9 18:06:07 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 19:46:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c29104ab

dev-python/QtPy: Port to py3.9

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index 3a1e1c6e7f3..ea4bf286622 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-06-09 19:46 Mart Raudsepp
  0 siblings, 0 replies; 113+ messages in thread
From: Mart Raudsepp @ 2020-06-09 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     2d7ec80eefbbc847c0c326ed646f0388b1da8256
Author:     Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Tue Jun  9 05:46:48 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 19:45:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d7ec80e

dev-python/QtPy: arm64 keyworded (bug #727654)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index d4497c54426..3a1e1c6e7f3 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="designer gui opengl svg testlib webengine"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-05-11 16:48 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2020-05-11 16:48 UTC (permalink / raw
  To: gentoo-commits

commit:     dcd1805b8cf4347dd11eb61aaea09c75bc2a7d05
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 11 16:22:09 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 11 16:48:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd1805b

dev-python/QtPy: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r1.ebuild | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r1.ebuild b/dev-python/QtPy/QtPy-1.9.0-r1.ebuild
deleted file mode 100644
index 3317738568c..00000000000
--- a/dev-python/QtPy/QtPy-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="designer gui opengl svg testlib webengine"
-
-RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?]
-	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/from PyQt4.Qt 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 PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-05-11 11:38 Agostino Sarubbo
  0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2020-05-11 11:38 UTC (permalink / raw
  To: gentoo-commits

commit:     15814cd697329b12f87be1d4b1de8366b9eb8d7d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon May 11 11:37:55 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon May 11 11:37:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15814cd6

dev-python/QtPy: x86 stable wrt bug #720474

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index 8448fcdcc03..d4497c54426 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="designer gui opengl svg testlib webengine"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-05-09  7:40 Agostino Sarubbo
  0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2020-05-09  7:40 UTC (permalink / raw
  To: gentoo-commits

commit:     dbdb6f600d252c89030460e6059fe743e5d9055e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 07:39:29 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat May  9 07:39:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbdb6f60

dev-python/QtPy: amd64 stable wrt bug #720474

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index a258ad52abe..8448fcdcc03 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="designer gui opengl svg testlib webengine"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-03-01  3:30 Andrey Grozin
  0 siblings, 0 replies; 113+ messages in thread
From: Andrey Grozin @ 2020-03-01  3:30 UTC (permalink / raw
  To: gentoo-commits

commit:     d12d7f17749c192769ad801e1049e3b0224dfbec
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  1 03:28:59 2020 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Mar  1 03:29:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12d7f17

dev-python/QtPy: add python3_8

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r2.ebuild | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
new file mode 100644
index 00000000000..a258ad52abe
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="designer gui opengl svg testlib webengine"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?]
+	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt 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 PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-02-28 18:02 Andreas Sturmlechner
  0 siblings, 0 replies; 113+ messages in thread
From: Andreas Sturmlechner @ 2020-02-28 18:02 UTC (permalink / raw
  To: gentoo-commits

commit:     c5f36075e48164b9ed2b30655cbec59a326d3f6c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 28 18:01:11 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 18:01:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5f36075

dev-python/QtPy: Drop 1.4.2

Closes: https://bugs.gentoo.org/709866
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-python/QtPy/Manifest          |  1 -
 dev-python/QtPy/QtPy-1.4.2.ebuild | 35 -----------------------------------
 dev-python/QtPy/metadata.xml      |  1 -
 3 files changed, 37 deletions(-)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index bb4317acd14..b8374d6358e 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,2 +1 @@
-DIST QtPy-1.4.2.tar.gz 27471 BLAKE2B d70de67944a4019031b52cd3f6c588261537a74ce8b968d9577b016d18767e3e2b6981dae983573bd1644949b13ee271a10beaef9a371ac41b3cd1b9cb506cb2 SHA512 eb8a059f110f3262ab62f8198019b9826a5b834da62e59791fb3a6c235eb797291e4f180b31704d7d61811791e5b245a05b57fc385de358480561508e3b29a4d
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7

diff --git a/dev-python/QtPy/QtPy-1.4.2.ebuild b/dev-python/QtPy/QtPy-1.4.2.ebuild
deleted file mode 100644
index 6eb7616e6d7..00000000000
--- a/dev-python/QtPy/QtPy-1.4.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl svg testlib webkit webengine"
-
-RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
-	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-	webengine? ( || (
-		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		dev-python/PyQt5[webengine?]
-	) )
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/from PyQt4.Qt 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 PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-}

diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index e1b8d6e3aa7..076f782a9d6 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -21,7 +21,6 @@
     <flag name="svg">Build bindings for the QtSvg module</flag>
     <flag name="testlib">Build bindings for the QtTest module</flag>
     <flag name="webengine">Build bindings for the QtWebEngine module</flag>
-    <flag name="webkit">Build bindings for the QtWebKit module</flag>
   </use>
   <upstream>
     <remote-id type="github">spyder-ide/qtpy</remote-id>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-02-28 17:50 Agostino Sarubbo
  0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2020-02-28 17:50 UTC (permalink / raw
  To: gentoo-commits

commit:     12a852e86199b6abb1215220cecea5f3ee9f93a9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 28 17:49:45 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 17:49:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a852e8

dev-python/QtPy: x86 stable wrt bug #709866

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r1.ebuild b/dev-python/QtPy/QtPy-1.9.0-r1.ebuild
index 5794685d124..3317738568c 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r1.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="designer gui opengl svg testlib webengine"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-02-27  9:49 Agostino Sarubbo
  0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2020-02-27  9:49 UTC (permalink / raw
  To: gentoo-commits

commit:     56d0d6ae1543e813242e0774c6c3927bebacba49
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 09:48:46 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 09:48:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56d0d6ae

dev-python/QtPy: amd64 stable wrt bug #709866

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r1.ebuild b/dev-python/QtPy/QtPy-1.9.0-r1.ebuild
index c9e168b9473..5794685d124 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r1.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="designer gui opengl svg testlib webengine"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-02-26 22:02 Andreas Sturmlechner
  0 siblings, 0 replies; 113+ messages in thread
From: Andreas Sturmlechner @ 2020-02-26 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     cf1f1eca5b92832bb17aa50b23edbe1d88480f2b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 20:33:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 21:56:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf1f1eca

dev-python/QtPy: Drop 1.9.0 (r0)

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0.ebuild | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.9.0.ebuild b/dev-python/QtPy/QtPy-1.9.0.ebuild
deleted file mode 100644
index 85c3f572b63..00000000000
--- a/dev-python/QtPy/QtPy-1.9.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="designer gui opengl svg testlib webkit webengine"
-
-RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
-	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/from PyQt4.Qt 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 PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-02-26 22:02 Andreas Sturmlechner
  0 siblings, 0 replies; 113+ messages in thread
From: Andreas Sturmlechner @ 2020-02-26 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     a9d67f34b6045af9d64e432e461b7793e3cd666e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 20:33:32 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 21:56:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d67f34

dev-python/QtPy: Drop USE webkit

Bug: https://bugs.gentoo.org/709866
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.9.0-r1.ebuild | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/dev-python/QtPy/QtPy-1.9.0-r1.ebuild b/dev-python/QtPy/QtPy-1.9.0-r1.ebuild
new file mode 100644
index 00000000000..c9e168b9473
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.9.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="designer gui opengl svg testlib webengine"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?]
+	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt 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 PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2020-02-05 21:21 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2020-02-05 21:21 UTC (permalink / raw
  To: gentoo-commits

commit:     ff43bff62186354ad4e1ea0b24266d1fa6bab6a4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 20:58:32 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb  5 21:21:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff43bff6

dev-python/QtPy: Remove py2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/QtPy/QtPy-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.4.2.ebuild b/dev-python/QtPy/QtPy-1.4.2.ebuild
index fcb713ba467..6eb7616e6d7 100644
--- a/dev-python/QtPy/QtPy-1.4.2.ebuild
+++ b/dev-python/QtPy/QtPy-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Abstraction layer for PyQt5/PySide"


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2019-12-23  9:11 Benda XU
  0 siblings, 0 replies; 113+ messages in thread
From: Benda XU @ 2019-12-23  9:11 UTC (permalink / raw
  To: gentoo-commits

commit:     24f35e2e29792f2e2c16d9ed08195e6cdff048f4
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Dec 16 08:56:29 2019 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 09:08:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24f35e2e

dev-python/QtPy: Version bump 1.9.0

  Remove python{2_7,3_5}, drop {amd64,x86}-linux keywords.

Bug: https://github.com/gentoo/gentoo/pull/13988
Bug: https://bugs.gentoo.org/702458
Closes: https://github.com/gentoo/gentoo/pull/14009
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
Package-Manager: Portage-2.3.81, Repoman-2.3.20

 dev-python/QtPy/Manifest          |  1 +
 dev-python/QtPy/QtPy-1.9.0.ebuild | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 914a769263a..bb4317acd14 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1 +1,2 @@
 DIST QtPy-1.4.2.tar.gz 27471 BLAKE2B d70de67944a4019031b52cd3f6c588261537a74ce8b968d9577b016d18767e3e2b6981dae983573bd1644949b13ee271a10beaef9a371ac41b3cd1b9cb506cb2 SHA512 eb8a059f110f3262ab62f8198019b9826a5b834da62e59791fb3a6c235eb797291e4f180b31704d7d61811791e5b245a05b57fc385de358480561508e3b29a4d
+DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7

diff --git a/dev-python/QtPy/QtPy-1.9.0.ebuild b/dev-python/QtPy/QtPy-1.9.0.ebuild
new file mode 100644
index 00000000000..85c3f572b63
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.9.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="designer gui opengl svg testlib webkit webengine"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt 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 PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2019-07-18 20:58 Andreas Sturmlechner
  0 siblings, 0 replies; 113+ messages in thread
From: Andreas Sturmlechner @ 2019-07-18 20:58 UTC (permalink / raw
  To: gentoo-commits

commit:     610062c99dbadb4b7c90d5d3462a669a06be5c9e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 20:28:56 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 20:58:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=610062c9

dev-python/QtPy: Drop old

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-python/QtPy/Manifest             |  2 --
 dev-python/QtPy/QtPy-1.3.1-r1.ebuild | 32 --------------------------------
 dev-python/QtPy/QtPy-1.4.0-r1.ebuild | 32 --------------------------------
 3 files changed, 66 deletions(-)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index d6bee717fe2..914a769263a 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1 @@
-DIST QtPy-1.3.1.tar.gz 25061 BLAKE2B 5e504c9fd6182c23ec7f3160f6d2c073bb64bf3145b4336420be39dfda2d942633792abdcf2b7c0772ca7066e497d456667cbec2067a7798114929b0c9ca2d7d SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008
-DIST QtPy-1.4.0.tar.gz 27019 BLAKE2B 6b90876f4801a19c98ddb8c4d678737a3b3ad61af1fe47c79b59b970ea4a895774bc554dfb9c99a4d806ad0316fb7c00e731c32a9d3f0a929a1f8bd4352851ab SHA512 7a989011114c17de29d5de6ff075935efdf9ebbae72d14580646bc81ce877f0beceaac511cade9e750dd9ee7e9f0f133c5676fa192ea906e7483feb543743379
 DIST QtPy-1.4.2.tar.gz 27471 BLAKE2B d70de67944a4019031b52cd3f6c588261537a74ce8b968d9577b016d18767e3e2b6981dae983573bd1644949b13ee271a10beaef9a371ac41b3cd1b9cb506cb2 SHA512 eb8a059f110f3262ab62f8198019b9826a5b834da62e59791fb3a6c235eb797291e4f180b31704d7d61811791e5b245a05b57fc385de358480561508e3b29a4d

diff --git a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
deleted file mode 100644
index 34685354258..00000000000
--- a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl svg testlib webkit"
-
-RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
-	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/from PyQt4.Qt 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 PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-}

diff --git a/dev-python/QtPy/QtPy-1.4.0-r1.ebuild b/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
deleted file mode 100644
index 3108385eeb5..00000000000
--- a/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl svg testlib webkit webengine"
-
-RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?,webengine?]
-	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/from PyQt4.Qt 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 PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2019-07-18 14:25 Agostino Sarubbo
  0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2019-07-18 14:25 UTC (permalink / raw
  To: gentoo-commits

commit:     5857fb71c842af027162a9ce5b7b91806a3838a3
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 14:25:43 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 14:25:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5857fb71

dev-python/QtPy: amd64 stable wrt bug #689964

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 dev-python/QtPy/QtPy-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.4.2.ebuild b/dev-python/QtPy/QtPy-1.4.2.ebuild
index dea26e08a1e..08987abc73d 100644
--- a/dev-python/QtPy/QtPy-1.4.2.ebuild
+++ b/dev-python/QtPy/QtPy-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="designer gui opengl svg testlib webkit webengine"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2019-07-18  7:26 Agostino Sarubbo
  0 siblings, 0 replies; 113+ messages in thread
From: Agostino Sarubbo @ 2019-07-18  7:26 UTC (permalink / raw
  To: gentoo-commits

commit:     b002445f210056a84f43ebcb6fd8669778b1ab6b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 07:25:43 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 07:25:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b002445f

dev-python/QtPy: x86 stable wrt bug #689964

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 dev-python/QtPy/QtPy-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.4.2.ebuild b/dev-python/QtPy/QtPy-1.4.2.ebuild
index 2675e70c03d..dea26e08a1e 100644
--- a/dev-python/QtPy/QtPy-1.4.2.ebuild
+++ b/dev-python/QtPy/QtPy-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="designer gui opengl svg testlib webkit webengine"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2019-06-29 21:34 Andreas Sturmlechner
  0 siblings, 0 replies; 113+ messages in thread
From: Andreas Sturmlechner @ 2019-06-29 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     594f2a57870e20d8ab968d73391d12b8e450c3b7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 21:03:01 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 21:33:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=594f2a57

dev-python/QtPy: 1.4.2 version bump, EAPI-7, fixing USE=webengine

Closes: https://bugs.gentoo.org/688184
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-python/QtPy/Manifest          |  1 +
 dev-python/QtPy/QtPy-1.4.2.ebuild | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 5f659f57b1d..d6bee717fe2 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,2 +1,3 @@
 DIST QtPy-1.3.1.tar.gz 25061 BLAKE2B 5e504c9fd6182c23ec7f3160f6d2c073bb64bf3145b4336420be39dfda2d942633792abdcf2b7c0772ca7066e497d456667cbec2067a7798114929b0c9ca2d7d SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008
 DIST QtPy-1.4.0.tar.gz 27019 BLAKE2B 6b90876f4801a19c98ddb8c4d678737a3b3ad61af1fe47c79b59b970ea4a895774bc554dfb9c99a4d806ad0316fb7c00e731c32a9d3f0a929a1f8bd4352851ab SHA512 7a989011114c17de29d5de6ff075935efdf9ebbae72d14580646bc81ce877f0beceaac511cade9e750dd9ee7e9f0f133c5676fa192ea906e7483feb543743379
+DIST QtPy-1.4.2.tar.gz 27471 BLAKE2B d70de67944a4019031b52cd3f6c588261537a74ce8b968d9577b016d18767e3e2b6981dae983573bd1644949b13ee271a10beaef9a371ac41b3cd1b9cb506cb2 SHA512 eb8a059f110f3262ab62f8198019b9826a5b834da62e59791fb3a6c235eb797291e4f180b31704d7d61811791e5b245a05b57fc385de358480561508e3b29a4d

diff --git a/dev-python/QtPy/QtPy-1.4.2.ebuild b/dev-python/QtPy/QtPy-1.4.2.ebuild
new file mode 100644
index 00000000000..2675e70c03d
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.4.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer gui opengl svg testlib webkit webengine"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+	webengine? ( || (
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		dev-python/PyQt5[webengine?]
+	) )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt 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 PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2018-05-14  1:36 Andreas Sturmlechner
  0 siblings, 0 replies; 113+ messages in thread
From: Andreas Sturmlechner @ 2018-05-14  1:36 UTC (permalink / raw
  To: gentoo-commits

commit:     313ed0a4bb04f6945dae2a4c01a149a25fe971a9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 01:35:51 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 14 01:35:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313ed0a4

dev-python/QtPy: Drop 1.2.1

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 dev-python/QtPy/Manifest          |  1 -
 dev-python/QtPy/QtPy-1.2.1.ebuild | 35 -----------------------------------
 2 files changed, 36 deletions(-)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index ee88062e92c..5f659f57b1d 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,2 @@
-DIST QtPy-1.2.1.tar.gz 29210 BLAKE2B a0b091902c7c7ccde1dbe8cc7e235de2340f3b2d9bfb5869a66d50d61cdf9cebf9ba2fa4458290a6f47c7a9c46227c5d8a8a9d7f2cac86f1528a7d6e350638b1 SHA512 7f9609b479a11daf1d8302040552f3926aa869eb775d23e32282a80ae9f5a39bf9be6b18cd62a6094a176ee8e7b4aef896fa8687eb2ce9ab9486f02aeeb756d7
 DIST QtPy-1.3.1.tar.gz 25061 BLAKE2B 5e504c9fd6182c23ec7f3160f6d2c073bb64bf3145b4336420be39dfda2d942633792abdcf2b7c0772ca7066e497d456667cbec2067a7798114929b0c9ca2d7d SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008
 DIST QtPy-1.4.0.tar.gz 27019 BLAKE2B 6b90876f4801a19c98ddb8c4d678737a3b3ad61af1fe47c79b59b970ea4a895774bc554dfb9c99a4d806ad0316fb7c00e731c32a9d3f0a929a1f8bd4352851ab SHA512 7a989011114c17de29d5de6ff075935efdf9ebbae72d14580646bc81ce877f0beceaac511cade9e750dd9ee7e9f0f133c5676fa192ea906e7483feb543743379

diff --git a/dev-python/QtPy/QtPy-1.2.1.ebuild b/dev-python/QtPy/QtPy-1.2.1.ebuild
deleted file mode 100644
index 51f9d64960b..00000000000
--- a/dev-python/QtPy/QtPy-1.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="designer gui opengl svg testlib webkit"
-
-RDEPEND="
-	gui? ( || (
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		dev-python/pyside[${PYTHON_USEDEP},X]
-	) )
-	testlib? ( || (
-		dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-		dev-python/pyside[${PYTHON_USEDEP},X]
-	) )
-	webkit? ( dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=] )
-	!webkit? ( || (
-		dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=]
-		dev-python/pyside[${PYTHON_USEDEP},designer=,opengl=,svg=]
-	) )
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2018-05-13 22:06 Thomas Deutschmann
  0 siblings, 0 replies; 113+ messages in thread
From: Thomas Deutschmann @ 2018-05-13 22:06 UTC (permalink / raw
  To: gentoo-commits

commit:     79df7bc030fde8d3b2b29e052ac16397833f078d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 13 22:02:57 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 13 22:06:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79df7bc0

dev-python/QtPy: x86 stable (bug #655398)

Package-Manager: Portage-2.3.34, Repoman-2.3.9

 dev-python/QtPy/QtPy-1.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
index 7987c23cfe1..27b02cc8155 100644
--- a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="designer gui opengl svg testlib webkit"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2018-05-10 14:10 Andreas Sturmlechner
  0 siblings, 0 replies; 113+ messages in thread
From: Andreas Sturmlechner @ 2018-05-10 14:10 UTC (permalink / raw
  To: gentoo-commits

commit:     4825d7cef9cdcb79345ed8c97ab2b599dbe2ff16
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 10 11:35:40 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 10 14:10:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4825d7ce

dev-python/QtPy: Drop old

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 dev-python/QtPy/QtPy-1.3.1.ebuild | 48 ---------------------------------------
 dev-python/QtPy/QtPy-1.4.0.ebuild | 48 ---------------------------------------
 dev-python/QtPy/metadata.xml      |  2 --
 3 files changed, 98 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.3.1.ebuild b/dev-python/QtPy/QtPy-1.3.1.ebuild
deleted file mode 100644
index de40764e990..00000000000
--- a/dev-python/QtPy/QtPy-1.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl +pyqt5 pyside svg testlib webkit"
-
-REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )"
-
-RDEPEND="
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
-		gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-		testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-	)
-	pyside? (
-		dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?]
-		gui? ( dev-python/pyside[${PYTHON_USEDEP},X] )
-		testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] )
-	)
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-
-	if ! use pyqt5; then
-		sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-
-	if ! use pyside; then
-		sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-}

diff --git a/dev-python/QtPy/QtPy-1.4.0.ebuild b/dev-python/QtPy/QtPy-1.4.0.ebuild
deleted file mode 100644
index 67ff013c69f..00000000000
--- a/dev-python/QtPy/QtPy-1.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl +pyqt5 pyside svg testlib webkit webengine"
-
-REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )"
-
-RDEPEND="
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?,webengine?]
-		gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-		testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-	)
-	pyside? (
-		dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?]
-		gui? ( dev-python/pyside[${PYTHON_USEDEP},X] )
-		testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] )
-	)
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-
-	if ! use pyqt5; then
-		sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-
-	if ! use pyside; then
-		sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-}

diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index f7b2b130bc4..e1b8d6e3aa7 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -18,8 +18,6 @@
   <use>
     <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
     <flag name="gui">Build bindings for the QtGui module</flag>
-    <flag name="pyqt5">Enable the <pkg>dev-python/PyQt5</pkg> backend</flag>
-    <flag name="pyside">Enable the <pkg>dev-python/pyside</pkg> backend</flag>
     <flag name="svg">Build bindings for the QtSvg module</flag>
     <flag name="testlib">Build bindings for the QtTest module</flag>
     <flag name="webengine">Build bindings for the QtWebEngine module</flag>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2018-05-10 14:10 Andreas Sturmlechner
  0 siblings, 0 replies; 113+ messages in thread
From: Andreas Sturmlechner @ 2018-05-10 14:10 UTC (permalink / raw
  To: gentoo-commits

commit:     12aaf19b09317d73f8dc6d087bc52f7307ccbf1c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 10 11:35:04 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 10 14:10:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12aaf19b

dev-python/QtPy: Drop USE=pyside,pyqt5

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 dev-python/QtPy/QtPy-1.3.1-r1.ebuild | 32 ++++++++++++++++++++++++++++++++
 dev-python/QtPy/QtPy-1.4.0-r1.ebuild | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
new file mode 100644
index 00000000000..7987c23cfe1
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer gui opengl svg testlib webkit"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt 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 PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}

diff --git a/dev-python/QtPy/QtPy-1.4.0-r1.ebuild b/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
new file mode 100644
index 00000000000..0ec5a63afb8
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer gui opengl svg testlib webkit webengine"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?,webengine?]
+	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt 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 PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2018-04-22 20:43 Andrey Grozin
  0 siblings, 0 replies; 113+ messages in thread
From: Andrey Grozin @ 2018-04-22 20:43 UTC (permalink / raw
  To: gentoo-commits

commit:     6031f5f01a4e141b7ab47ad6191c173c0b75ba0e
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 20:42:39 2018 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 20:42:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6031f5f0

dev-python/QtPy: bump to 1.4.0 and support QtWebengine

Suggested-by: holgersson <AT> posteo.de
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-python/QtPy/Manifest          |  1 +
 dev-python/QtPy/QtPy-1.4.0.ebuild | 48 +++++++++++++++++++++++++++++++++++++++
 dev-python/QtPy/metadata.xml      |  1 +
 3 files changed, 50 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index f66f23724c6..ee88062e92c 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,2 +1,3 @@
 DIST QtPy-1.2.1.tar.gz 29210 BLAKE2B a0b091902c7c7ccde1dbe8cc7e235de2340f3b2d9bfb5869a66d50d61cdf9cebf9ba2fa4458290a6f47c7a9c46227c5d8a8a9d7f2cac86f1528a7d6e350638b1 SHA512 7f9609b479a11daf1d8302040552f3926aa869eb775d23e32282a80ae9f5a39bf9be6b18cd62a6094a176ee8e7b4aef896fa8687eb2ce9ab9486f02aeeb756d7
 DIST QtPy-1.3.1.tar.gz 25061 BLAKE2B 5e504c9fd6182c23ec7f3160f6d2c073bb64bf3145b4336420be39dfda2d942633792abdcf2b7c0772ca7066e497d456667cbec2067a7798114929b0c9ca2d7d SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008
+DIST QtPy-1.4.0.tar.gz 27019 BLAKE2B 6b90876f4801a19c98ddb8c4d678737a3b3ad61af1fe47c79b59b970ea4a895774bc554dfb9c99a4d806ad0316fb7c00e731c32a9d3f0a929a1f8bd4352851ab SHA512 7a989011114c17de29d5de6ff075935efdf9ebbae72d14580646bc81ce877f0beceaac511cade9e750dd9ee7e9f0f133c5676fa192ea906e7483feb543743379

diff --git a/dev-python/QtPy/QtPy-1.4.0.ebuild b/dev-python/QtPy/QtPy-1.4.0.ebuild
new file mode 100644
index 00000000000..67ff013c69f
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer gui opengl +pyqt5 pyside svg testlib webkit webengine"
+
+REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )"
+
+RDEPEND="
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?,webengine?]
+		gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+		testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+	)
+	pyside? (
+		dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?]
+		gui? ( dev-python/pyside[${PYTHON_USEDEP},X] )
+		testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] )
+	)
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+
+	if ! use pyqt5; then
+		sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+
+	if ! use pyside; then
+		sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+}

diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 58c106d8187..f7b2b130bc4 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -22,6 +22,7 @@
     <flag name="pyside">Enable the <pkg>dev-python/pyside</pkg> backend</flag>
     <flag name="svg">Build bindings for the QtSvg module</flag>
     <flag name="testlib">Build bindings for the QtTest module</flag>
+    <flag name="webengine">Build bindings for the QtWebEngine module</flag>
     <flag name="webkit">Build bindings for the QtWebKit module</flag>
   </use>
   <upstream>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2017-10-16 14:54 Andreas Sturmlechner
  0 siblings, 0 replies; 113+ messages in thread
From: Andreas Sturmlechner @ 2017-10-16 14:54 UTC (permalink / raw
  To: gentoo-commits

commit:     c3eb993546e9ebf478e25605fe92960f48cd949e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 22:21:46 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 14:54:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3eb9935

dev-python/QtPy: Drop PyQt4 and pyside[webkit] options

Gentoo-bug: 620684
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-python/QtPy/QtPy-1.2.1.ebuild | 26 ++++++++++++--------------
 dev-python/QtPy/QtPy-1.3.1.ebuild | 17 +++++------------
 dev-python/QtPy/metadata.xml      |  1 -
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.2.1.ebuild b/dev-python/QtPy/QtPy-1.2.1.ebuild
index 86fa7592ebd..51f9d64960b 100644
--- a/dev-python/QtPy/QtPy-1.2.1.ebuild
+++ b/dev-python/QtPy/QtPy-1.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
-DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide"
+DESCRIPTION="Abstraction layer for PyQt5/PySide"
 HOMEPAGE="https://github.com/spyder-ide/qtpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
@@ -18,20 +18,18 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="designer gui opengl svg testlib webkit"
 
 RDEPEND="
-	|| (
-		  dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=]
-		  dev-python/PyQt4[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=]
-		  dev-python/pyside[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=]
-	   )
 	gui? ( || (
-		  dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		  dev-python/PyQt4[${PYTHON_USEDEP},X]
-		  dev-python/pyside[${PYTHON_USEDEP},X]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/pyside[${PYTHON_USEDEP},X]
 	) )
 	testlib? ( || (
-		  dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-		  dev-python/PyQt4[${PYTHON_USEDEP},testlib]
-		  dev-python/pyside[${PYTHON_USEDEP},X]
-	) )"
-
+		dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+		dev-python/pyside[${PYTHON_USEDEP},X]
+	) )
+	webkit? ( dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=] )
+	!webkit? ( || (
+		dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=]
+		dev-python/pyside[${PYTHON_USEDEP},designer=,opengl=,svg=]
+	) )
+"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

diff --git a/dev-python/QtPy/QtPy-1.3.1.ebuild b/dev-python/QtPy/QtPy-1.3.1.ebuild
index 5d5c3d3f23c..de40764e990 100644
--- a/dev-python/QtPy/QtPy-1.3.1.ebuild
+++ b/dev-python/QtPy/QtPy-1.3.1.ebuild
@@ -7,30 +7,25 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
-DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide"
+DESCRIPTION="Abstraction layer for PyQt5/PySide"
 HOMEPAGE="https://github.com/spyder-ide/qtpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl pyqt4 +pyqt5 pyside svg testlib webkit"
+IUSE="designer gui opengl +pyqt5 pyside svg testlib webkit"
 
-REQUIRED_USE="|| ( pyqt4 pyqt5 pyside )"
+REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )"
 
 RDEPEND="
-	pyqt4? (
-		dev-python/PyQt4[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
-		gui? ( dev-python/PyQt4[${PYTHON_USEDEP},X] )
-		testlib? ( dev-python/PyQt4[${PYTHON_USEDEP},testlib] )
-	)
 	pyqt5? (
 		dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
 		gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
 		testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
 	)
 	pyside? (
-		dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+		dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?]
 		gui? ( dev-python/pyside[${PYTHON_USEDEP},X] )
 		testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] )
 	)
@@ -40,9 +35,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 src_prepare() {
 	default
 
-	if ! use pyqt4; then
-		sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-	fi
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
 
 	if ! use pyqt5; then
 		sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die

diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 85ca2f8aaa3..58c106d8187 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -18,7 +18,6 @@
   <use>
     <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
     <flag name="gui">Build bindings for the QtGui module</flag>
-    <flag name="pyqt4">Enable the <pkg>dev-python/PyQt4</pkg> backend</flag>
     <flag name="pyqt5">Enable the <pkg>dev-python/PyQt5</pkg> backend</flag>
     <flag name="pyside">Enable the <pkg>dev-python/pyside</pkg> backend</flag>
     <flag name="svg">Build bindings for the QtSvg module</flag>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2017-09-28 12:22 Michael Palimaka
  0 siblings, 0 replies; 113+ messages in thread
From: Michael Palimaka @ 2017-09-28 12:22 UTC (permalink / raw
  To: gentoo-commits

commit:     649ce73ba08a5fd8af802937b3b44fab8e9a4a82
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 28 12:21:39 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 12:21:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=649ce73b

dev-python/QtPy: version bump 1.3.1

Closes: https://bugs.gentoo.org/602528
Closes: https://bugs.gentoo.org/611856
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-python/QtPy/Manifest          |  1 +
 dev-python/QtPy/QtPy-1.3.1.ebuild | 55 +++++++++++++++++++++++++++++++++++++++
 dev-python/QtPy/metadata.xml      |  3 +++
 3 files changed, 59 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 464e0adcfcc..568620d06cf 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1 +1,2 @@
 DIST QtPy-1.2.1.tar.gz 29210 SHA256 5803ce31f50b24295e8e600b76cc91d7f2a3140a5a0d526d40226f9ec5e9097d SHA512 7f9609b479a11daf1d8302040552f3926aa869eb775d23e32282a80ae9f5a39bf9be6b18cd62a6094a176ee8e7b4aef896fa8687eb2ce9ab9486f02aeeb756d7 WHIRLPOOL c598789661a43c96b3b4db8fb766fbfdcc746a8c6bdf270175b4e3f2733b666939e44921a056c1f77d2d6683ec73a4221ab409c320c840cdc7ee2d00ccec6184
+DIST QtPy-1.3.1.tar.gz 25061 SHA256 08af2525d59f9eb639946d5ed7a72b002103c5b7369c0ef0dd70ad2696845313 SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008 WHIRLPOOL 7bd85d95fcbcea6f93d781d2c8e12252f4eff17dcfec269f24d97998d5aad50dec24f702641d1b5432c1235ba13f9ed5ec43f2ef20ff0b23d00873af8410e340

diff --git a/dev-python/QtPy/QtPy-1.3.1.ebuild b/dev-python/QtPy/QtPy-1.3.1.ebuild
new file mode 100644
index 00000000000..5d5c3d3f23c
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.3.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer gui opengl pyqt4 +pyqt5 pyside svg testlib webkit"
+
+REQUIRED_USE="|| ( pyqt4 pyqt5 pyside )"
+
+RDEPEND="
+	pyqt4? (
+		dev-python/PyQt4[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+		gui? ( dev-python/PyQt4[${PYTHON_USEDEP},X] )
+		testlib? ( dev-python/PyQt4[${PYTHON_USEDEP},testlib] )
+	)
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+		gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+		testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+	)
+	pyside? (
+		dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+		gui? ( dev-python/pyside[${PYTHON_USEDEP},X] )
+		testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] )
+	)
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	if ! use pyqt4; then
+		sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+
+	if ! use pyqt5; then
+		sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+
+	if ! use pyside; then
+		sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+}

diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 2acbd329e3d..85ca2f8aaa3 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -18,6 +18,9 @@
   <use>
     <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
     <flag name="gui">Build bindings for the QtGui module</flag>
+    <flag name="pyqt4">Enable the <pkg>dev-python/PyQt4</pkg> backend</flag>
+    <flag name="pyqt5">Enable the <pkg>dev-python/PyQt5</pkg> backend</flag>
+    <flag name="pyside">Enable the <pkg>dev-python/pyside</pkg> backend</flag>
     <flag name="svg">Build bindings for the QtSvg module</flag>
     <flag name="testlib">Build bindings for the QtTest module</flag>
     <flag name="webkit">Build bindings for the QtWebKit module</flag>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2017-09-25 14:10 Pacho Ramos
  0 siblings, 0 replies; 113+ messages in thread
From: Pacho Ramos @ 2017-09-25 14:10 UTC (permalink / raw
  To: gentoo-commits

commit:     0569e2544694663558175440d6fa3990f24a4bcd
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 14:09:47 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 14:10:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0569e254

dev-python/QtPy: amd64/x86 stable, bug #625078

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 dev-python/QtPy/QtPy-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.2.1.ebuild b/dev-python/QtPy/QtPy-1.2.1.ebuild
index 581838a34a9..86fa7592ebd 100644
--- a/dev-python/QtPy/QtPy-1.2.1.ebuild
+++ b/dev-python/QtPy/QtPy-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="designer gui opengl svg testlib webkit"
 


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2017-06-27  2:49 Sebastien Fabbro
  0 siblings, 0 replies; 113+ messages in thread
From: Sebastien Fabbro @ 2017-06-27  2:49 UTC (permalink / raw
  To: gentoo-commits

commit:     970e0efece767b1c4870878a0d162fb4d858525a
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 02:31:16 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 02:48:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=970e0efe

dev-python/QtPy: added python-3.6

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-python/QtPy/QtPy-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/QtPy/QtPy-1.2.1.ebuild b/dev-python/QtPy/QtPy-1.2.1.ebuild
index b2268fbed62..581838a34a9 100644
--- a/dev-python/QtPy/QtPy-1.2.1.ebuild
+++ b/dev-python/QtPy/QtPy-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2017-05-02 14:02 Michał Górny
  0 siblings, 0 replies; 113+ messages in thread
From: Michał Górny @ 2017-05-02 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     da59934e0ded8f202642c85c32b5eb7f3aea688f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 13:37:18 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May  2 14:02:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da59934e

dev-python/QtPy: Clean old versions up

 dev-python/QtPy/Manifest          |  1 -
 dev-python/QtPy/QtPy-1.1.2.ebuild | 37 -------------------------------------
 2 files changed, 38 deletions(-)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 2be833316a2..464e0adcfcc 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,2 +1 @@
-DIST QtPy-1.1.2.tar.gz 14390 SHA256 2abb462decc80fa4f0ba9ff18feaaab21a765d7d2d0808120f001f9a4c385946 SHA512 5f610e60ac6ed2f2b0eed59dd24537b34ccff8816afad059e056f47dd95d2dd49939ec6e0ebb816520a2ef075d8f9619903a4b2c79f18ed12e16eb60718e5c1d WHIRLPOOL 297112c79003b868aadbe404f70926bdbc0045c852b1f5f8d6000d0e7ce74c46a54667e7117787d1b5488e71a3120ef1553a3abb3d0f26f5416441c9314dac86
 DIST QtPy-1.2.1.tar.gz 29210 SHA256 5803ce31f50b24295e8e600b76cc91d7f2a3140a5a0d526d40226f9ec5e9097d SHA512 7f9609b479a11daf1d8302040552f3926aa869eb775d23e32282a80ae9f5a39bf9be6b18cd62a6094a176ee8e7b4aef896fa8687eb2ce9ab9486f02aeeb756d7 WHIRLPOOL c598789661a43c96b3b4db8fb766fbfdcc746a8c6bdf270175b4e3f2733b666939e44921a056c1f77d2d6683ec73a4221ab409c320c840cdc7ee2d00ccec6184

diff --git a/dev-python/QtPy/QtPy-1.1.2.ebuild b/dev-python/QtPy/QtPy-1.1.2.ebuild
deleted file mode 100644
index 61abaad6481..00000000000
--- a/dev-python/QtPy/QtPy-1.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="designer gui svg testlib webkit"
-
-RDEPEND="
-	|| (
-		  dev-python/PyQt5[${PYTHON_USEDEP},designer=,svg=,webkit=]
-		  dev-python/PyQt4[${PYTHON_USEDEP},designer=,svg=,webkit=]
-		  dev-python/pyside[${PYTHON_USEDEP},designer=,svg=,webkit=]
-	   )
-	gui? ( || (
-		  dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		  dev-python/PyQt4[${PYTHON_USEDEP},X]
-		  dev-python/pyside[${PYTHON_USEDEP},X]
-	) )
-	testlib? ( || (
-		  dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-		  dev-python/PyQt4[${PYTHON_USEDEP},testlib]
-		  dev-python/pyside[${PYTHON_USEDEP},X]
-	) )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2017-02-28 21:28 Sebastien Fabbro
  0 siblings, 0 replies; 113+ messages in thread
From: Sebastien Fabbro @ 2017-02-28 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     5daadcbd7accd490b24e686ac2207a7cbf575a97
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 21:26:30 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 21:28:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5daadcbd

dev-python/QtPy: add opengl flag

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-python/QtPy/QtPy-1.2.1.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.2.1.ebuild b/dev-python/QtPy/QtPy-1.2.1.ebuild
index 61abaad6481..b2268fbed62 100644
--- a/dev-python/QtPy/QtPy-1.2.1.ebuild
+++ b/dev-python/QtPy/QtPy-1.2.1.ebuild
@@ -15,13 +15,13 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="designer gui svg testlib webkit"
+IUSE="designer gui opengl svg testlib webkit"
 
 RDEPEND="
 	|| (
-		  dev-python/PyQt5[${PYTHON_USEDEP},designer=,svg=,webkit=]
-		  dev-python/PyQt4[${PYTHON_USEDEP},designer=,svg=,webkit=]
-		  dev-python/pyside[${PYTHON_USEDEP},designer=,svg=,webkit=]
+		  dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=]
+		  dev-python/PyQt4[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=]
+		  dev-python/pyside[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=]
 	   )
 	gui? ( || (
 		  dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2017-02-26 18:02 Sebastien Fabbro
  0 siblings, 0 replies; 113+ messages in thread
From: Sebastien Fabbro @ 2017-02-26 18:02 UTC (permalink / raw
  To: gentoo-commits

commit:     9b359909ef032c7d07893d4a503a1d869d1ae10c
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 05:22:18 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 18:02:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b359909

dev-python/QtPy: version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-python/QtPy/Manifest          |  1 +
 dev-python/QtPy/QtPy-1.2.1.ebuild | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 2ed02ac56e..2be833316a 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1 +1,2 @@
 DIST QtPy-1.1.2.tar.gz 14390 SHA256 2abb462decc80fa4f0ba9ff18feaaab21a765d7d2d0808120f001f9a4c385946 SHA512 5f610e60ac6ed2f2b0eed59dd24537b34ccff8816afad059e056f47dd95d2dd49939ec6e0ebb816520a2ef075d8f9619903a4b2c79f18ed12e16eb60718e5c1d WHIRLPOOL 297112c79003b868aadbe404f70926bdbc0045c852b1f5f8d6000d0e7ce74c46a54667e7117787d1b5488e71a3120ef1553a3abb3d0f26f5416441c9314dac86
+DIST QtPy-1.2.1.tar.gz 29210 SHA256 5803ce31f50b24295e8e600b76cc91d7f2a3140a5a0d526d40226f9ec5e9097d SHA512 7f9609b479a11daf1d8302040552f3926aa869eb775d23e32282a80ae9f5a39bf9be6b18cd62a6094a176ee8e7b4aef896fa8687eb2ce9ab9486f02aeeb756d7 WHIRLPOOL c598789661a43c96b3b4db8fb766fbfdcc746a8c6bdf270175b4e3f2733b666939e44921a056c1f77d2d6683ec73a4221ab409c320c840cdc7ee2d00ccec6184

diff --git a/dev-python/QtPy/QtPy-1.2.1.ebuild b/dev-python/QtPy/QtPy-1.2.1.ebuild
new file mode 100644
index 0000000000..5942d6fd93
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="designer gui svg testlib webkit"
+
+RDEPEND="
+	|| (
+		  dev-python/PyQt5[${PYTHON_USEDEP},designer=,svg=,webkit=]
+		  dev-python/PyQt4[${PYTHON_USEDEP},designer=,svg=,webkit=]
+		  dev-python/pyside[${PYTHON_USEDEP},designer=,svg=,webkit=]
+	   )
+	gui? ( || (
+		  dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		  dev-python/PyQt4[${PYTHON_USEDEP},X]
+		  dev-python/pyside[${PYTHON_USEDEP},X]
+	) )
+	testlib? ( || (
+		  dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+		  dev-python/PyQt4[${PYTHON_USEDEP},testlib]
+		  dev-python/pyside[${PYTHON_USEDEP},X]
+	) )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2017-01-04 19:24 Sebastien Fabbro
  0 siblings, 0 replies; 113+ messages in thread
From: Sebastien Fabbro @ 2017-01-04 19:24 UTC (permalink / raw
  To: gentoo-commits

commit:     efa01455a24474255b48ac6cb40e597cb885409d
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 18:14:28 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 19:24:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efa01455

dev-python/QtPy: forced widget flag for pyqt5 with gui
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=604152

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-python/QtPy/QtPy-1.1.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/QtPy/QtPy-1.1.2.ebuild b/dev-python/QtPy/QtPy-1.1.2.ebuild
index ae4e1e0..5942d6f 100644
--- a/dev-python/QtPy/QtPy-1.1.2.ebuild
+++ b/dev-python/QtPy/QtPy-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,7 +25,7 @@ RDEPEND="
 		  dev-python/pyside[${PYTHON_USEDEP},designer=,svg=,webkit=]
 	   )
 	gui? ( || (
-		  dev-python/PyQt5[${PYTHON_USEDEP},gui]
+		  dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
 		  dev-python/PyQt4[${PYTHON_USEDEP},X]
 		  dev-python/pyside[${PYTHON_USEDEP},X]
 	) )


^ permalink raw reply related	[flat|nested] 113+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
@ 2016-12-10  2:05 Sebastien Fabbro
  0 siblings, 0 replies; 113+ messages in thread
From: Sebastien Fabbro @ 2016-12-10  2:05 UTC (permalink / raw
  To: gentoo-commits

commit:     b5d8435a1be8b264bf4b209ca3425e5ac7bf34bf
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 00:21:03 2016 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 02:05:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d8435a

dev-python/QtPy: initial import

Package-Manager: portage-2.3.3

 dev-python/QtPy/Manifest          |  1 +
 dev-python/QtPy/QtPy-1.1.2.ebuild | 38 ++++++++++++++++++++++++++++++++++++++
 dev-python/QtPy/metadata.xml      | 25 +++++++++++++++++++++++++
 3 files changed, 64 insertions(+)

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
new file mode 100644
index 00000000..2ed02ac
--- /dev/null
+++ b/dev-python/QtPy/Manifest
@@ -0,0 +1 @@
+DIST QtPy-1.1.2.tar.gz 14390 SHA256 2abb462decc80fa4f0ba9ff18feaaab21a765d7d2d0808120f001f9a4c385946 SHA512 5f610e60ac6ed2f2b0eed59dd24537b34ccff8816afad059e056f47dd95d2dd49939ec6e0ebb816520a2ef075d8f9619903a4b2c79f18ed12e16eb60718e5c1d WHIRLPOOL 297112c79003b868aadbe404f70926bdbc0045c852b1f5f8d6000d0e7ce74c46a54667e7117787d1b5488e71a3120ef1553a3abb3d0f26f5416441c9314dac86

diff --git a/dev-python/QtPy/QtPy-1.1.2.ebuild b/dev-python/QtPy/QtPy-1.1.2.ebuild
new file mode 100644
index 00000000..ae4e1e0
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="designer gui svg testlib webkit"
+
+RDEPEND="
+	|| (
+		  dev-python/PyQt5[${PYTHON_USEDEP},designer=,svg=,webkit=]
+		  dev-python/PyQt4[${PYTHON_USEDEP},designer=,svg=,webkit=]
+		  dev-python/pyside[${PYTHON_USEDEP},designer=,svg=,webkit=]
+	   )
+	gui? ( || (
+		  dev-python/PyQt5[${PYTHON_USEDEP},gui]
+		  dev-python/PyQt4[${PYTHON_USEDEP},X]
+		  dev-python/pyside[${PYTHON_USEDEP},X]
+	) )
+	testlib? ( || (
+		  dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+		  dev-python/PyQt4[${PYTHON_USEDEP},testlib]
+		  dev-python/pyside[${PYTHON_USEDEP},X]
+	) )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
new file mode 100644
index 00000000..1f974af
--- /dev/null
+++ b/dev-python/QtPy/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Gentoo Python Project</name>
+  </maintainer>
+  <longdescription>
+     QtPy is a small abstraction layer that lets you write
+     applications using a single API call to either PyQt or
+     PySide. QtPy also provides a set of additional QWidgets. It
+     provides support for PyQt5, PyQt4 and PySide using the PyQt5
+     layout (where the QtGui module has been split into QtGui and
+     QtWidgets).
+     Basically, you write your code as if you were using PyQt5 but
+     import qt from QtPy instead of PyQt5.
+  </longdescription>
+  <use>
+    <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
+    <flag name="gui">Build bindings for the QtGui module</flag>
+    <flag name="svg">Build bindings for the QtSvg module</flag>
+    <flag name="testlib">Build bindings for the QtTest module</flag>
+    <flag name="webkit">Build bindings for the QtWebKit module</flag>
+  </use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 113+ messages in thread

end of thread, other threads:[~2024-11-05  5:53 UTC | newest]

Thread overview: 113+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-13 23:41 [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/ Aaron Bauman
  -- strict thread matches above, loose matches on Subject: below --
2024-11-05  5:53 Michał Górny
2024-09-13 13:01 Andrew Ammerlaan
2024-07-03 16:00 Andrew Ammerlaan
2023-12-16 15:09 Michał Górny
2023-12-16 13:47 Michał Górny
2023-12-16  7:05 Arthur Zamarin
2023-12-16  7:04 Arthur Zamarin
2023-12-15 12:39 Arthur Zamarin
2023-12-15 11:04 Michał Górny
2023-12-05  4:20 Michał Górny
2023-12-03  5:45 Arthur Zamarin
2023-11-22 15:57 Michał Górny
2023-11-22 15:57 Michał Górny
2023-10-26 15:18 Andrew Ammerlaan
2023-10-24  5:16 Michał Górny
2023-10-18 11:36 Andrew Ammerlaan
2023-10-18 11:36 Andrew Ammerlaan
2023-09-26  0:54 Sam James
2023-09-11  6:48 Jakov Smolić
2023-09-10  5:27 WANG Xuerui
2023-08-30  8:52 Andrew Ammerlaan
2023-08-30  7:43 Andrew Ammerlaan
2023-08-21 15:26 Andrew Ammerlaan
2023-04-29  7:09 Michał Górny
2023-04-29  6:59 Arthur Zamarin
2023-03-29  6:24 Michał Górny
2023-03-17 15:25 Michał Górny
2022-12-25 17:50 Michał Górny
2022-12-25 16:42 Sam James
2022-12-05 17:24 WANG Xuerui
2022-11-22 20:01 Arthur Zamarin
2022-11-08 14:01 Michał Górny
2022-10-29 21:11 Sam James
2022-10-28  3:37 Jakov Smolić
2022-10-04 12:20 Andrew Ammerlaan
2022-09-27 12:16 Andrew Ammerlaan
2022-09-08 19:39 Jakov Smolić
2022-08-13 14:18 Andrew Ammerlaan
2022-08-13 14:18 Andrew Ammerlaan
2022-07-15  7:24 Michał Górny
2022-07-15  0:45 Sam James
2022-07-01 20:09 Andrew Ammerlaan
2022-06-30 16:56 Sam James
2022-06-08 19:16 Andrew Ammerlaan
2022-06-07  2:50 Michał Górny
2022-06-06 23:32 Sam James
2022-05-03  8:27 Michał Górny
2022-04-02 15:58 Michał Górny
2022-04-02 12:04 Arthur Zamarin
2022-03-01  9:38 Michał Górny
2022-02-28 23:59 Sam James
2022-02-19 11:12 Andrew Ammerlaan
2021-12-23 11:24 Andrew Ammerlaan
2021-12-15 17:12 Andrew Ammerlaan
2021-12-14 13:33 Andrew Ammerlaan
2021-12-04  4:57 Michał Górny
2021-11-16  6:19 Sam James
2021-11-14 20:29 Sam James
2021-10-04 19:57 Andrew Ammerlaan
2021-09-14  9:33 Andrew Ammerlaan
2021-09-14  9:33 Andrew Ammerlaan
2021-09-14  9:33 Andrew Ammerlaan
2021-09-05  9:54 Andrew Ammerlaan
2021-09-03  1:53 Sam James
2021-08-19 19:44 Andrew Ammerlaan
2021-07-19 18:36 Sam James
2021-06-03  8:23 Andrew Ammerlaan
2021-06-02 20:27 Andrew Ammerlaan
2021-06-02  7:44 Andrew Ammerlaan
2021-05-22 20:55 Andrew Ammerlaan
2021-05-21 16:08 Andrew Ammerlaan
2021-05-20  9:42 Andrew Ammerlaan
2021-05-18 13:40 Michał Górny
2021-05-18 11:40 Michał Górny
2021-05-18  8:51 Michał Górny
2021-05-18  7:21 Michał Górny
2021-05-18  7:21 Michał Górny
2021-05-18  6:29 Agostino Sarubbo
2021-03-11  7:18 Joonas Niilola
2020-08-03  3:11 Sam James
2020-07-07 20:01 Michał Górny
2020-06-09 19:46 Michał Górny
2020-06-09 19:46 Mart Raudsepp
2020-05-11 16:48 Michał Górny
2020-05-11 11:38 Agostino Sarubbo
2020-05-09  7:40 Agostino Sarubbo
2020-03-01  3:30 Andrey Grozin
2020-02-28 18:02 Andreas Sturmlechner
2020-02-28 17:50 Agostino Sarubbo
2020-02-27  9:49 Agostino Sarubbo
2020-02-26 22:02 Andreas Sturmlechner
2020-02-26 22:02 Andreas Sturmlechner
2020-02-05 21:21 Michał Górny
2019-12-23  9:11 Benda XU
2019-07-18 20:58 Andreas Sturmlechner
2019-07-18 14:25 Agostino Sarubbo
2019-07-18  7:26 Agostino Sarubbo
2019-06-29 21:34 Andreas Sturmlechner
2018-05-14  1:36 Andreas Sturmlechner
2018-05-13 22:06 Thomas Deutschmann
2018-05-10 14:10 Andreas Sturmlechner
2018-05-10 14:10 Andreas Sturmlechner
2018-04-22 20:43 Andrey Grozin
2017-10-16 14:54 Andreas Sturmlechner
2017-09-28 12:22 Michael Palimaka
2017-09-25 14:10 Pacho Ramos
2017-06-27  2:49 Sebastien Fabbro
2017-05-02 14:02 Michał Górny
2017-02-28 21:28 Sebastien Fabbro
2017-02-26 18:02 Sebastien Fabbro
2017-01-04 19:24 Sebastien Fabbro
2016-12-10  2:05 Sebastien Fabbro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox