1 |
commit: 7a9268be4bcba43f3206b51da598312a105dd0dd |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 18 07:05:53 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 18 07:21:21 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a9268be |
7 |
|
8 |
dev-python/QtPy: Revert "allow dependency to be satisfied by pyside2" |
9 |
|
10 |
The lot of USE dependencies break pkgcheck, plus the any-of logic is |
11 |
wrong and does not match what the package does. If PyQt5 is installed |
12 |
at all, the package will default to using it even if the dependencies |
13 |
are satisfied by pyside2. |
14 |
|
15 |
Reverts: 8bdd53a2d42010f0ec8f83273938a62195bfbcd5 |
16 |
Bug: https://bugs.gentoo.org/790764 |
17 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
18 |
|
19 |
dev-python/QtPy/QtPy-1.9.0-r3.ebuild | 107 ----------------------------------- |
20 |
dev-python/QtPy/metadata.xml | 17 ------ |
21 |
2 files changed, 124 deletions(-) |
22 |
|
23 |
diff --git a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild |
24 |
deleted file mode 100644 |
25 |
index e707c30eebb..00000000000 |
26 |
--- a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild |
27 |
+++ /dev/null |
28 |
@@ -1,107 +0,0 @@ |
29 |
-# Copyright 1999-2021 Gentoo Authors |
30 |
-# Distributed under the terms of the GNU General Public License v2 |
31 |
- |
32 |
-EAPI=7 |
33 |
- |
34 |
-PYTHON_COMPAT=( python3_{7..8} ) |
35 |
- |
36 |
-inherit distutils-r1 virtualx |
37 |
- |
38 |
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets" |
39 |
-HOMEPAGE="https://github.com/spyder-ide/qtpy" |
40 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
41 |
- |
42 |
-LICENSE="MIT" |
43 |
-SLOT="0" |
44 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
45 |
- |
46 |
-IUSE=" |
47 |
- declarative designer gui help location multimedia network |
48 |
- opengl positioning printsupport qml quick sensors serialport |
49 |
- sql svg test testlib webchannel webengine websockets |
50 |
- widgets x11extras xml xmlpatterns |
51 |
-" |
52 |
- |
53 |
-# Webengine is a special case, because PyQt5 provides this in a |
54 |
-# separate package , while PySide2 ships it in the same package |
55 |
-# |
56 |
-# declarative/qml/quick is a special case, because PyQt5 bundles |
57 |
-# the bindings for qml and quick in one flag: declarative, |
58 |
-# PySide2 does not. |
59 |
-# |
60 |
-# The PyQt5 ebuild currently enables xml support unconditionally, |
61 |
-# the flag is added anyway with a (+) to make it future proof |
62 |
-# if the ebuild were to change this behaviour in the future. |
63 |
-# |
64 |
-# The PySide2 ebuild currently enables opengl and serialport |
65 |
-# support unconditionally, the flag is added anyway with a (+) |
66 |
-# to make it future proof if the ebuild were to change this |
67 |
-# behaviour in the future. |
68 |
-# |
69 |
-RDEPEND=" |
70 |
- app-eselect/eselect-QtPy |
71 |
- || ( |
72 |
- 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?] |
73 |
- 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?] |
74 |
- ) |
75 |
- |
76 |
- webengine? ( || ( |
77 |
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}] |
78 |
- dev-python/pyside2[${PYTHON_USEDEP},webengine] |
79 |
- ) ) |
80 |
- |
81 |
- qml? ( || ( |
82 |
- dev-python/PyQt5[${PYTHON_USEDEP},declarative] |
83 |
- dev-python/pyside2[${PYTHON_USEDEP},qml] |
84 |
- ) ) |
85 |
- |
86 |
- quick? ( || ( |
87 |
- dev-python/PyQt5[${PYTHON_USEDEP},declarative] |
88 |
- dev-python/pyside2[${PYTHON_USEDEP},quick] |
89 |
- ) ) |
90 |
- |
91 |
- declarative? ( || ( |
92 |
- dev-python/PyQt5[${PYTHON_USEDEP},declarative] |
93 |
- dev-python/pyside2[${PYTHON_USEDEP},qml,quick] |
94 |
- ) ) |
95 |
-" |
96 |
- |
97 |
-# These bindings are currently only provided by PyQt5 or PySide2 |
98 |
-# but not by both. Just DEPEND on these directly if they are |
99 |
-# required. |
100 |
-# Please check periodically if this list is still up to date |
101 |
-# |
102 |
-# bluetooth? ( dev-python/PyQt5[${PYTHON_USEDEP},bluetooth] ) |
103 |
-# dbus? ( dev-python/PyQt5[${PYTHON_USEDEP},dbus] ) |
104 |
-# examples? ( dev-python/PyQt5[${PYTHON_USEDEP},examples] ) |
105 |
-# networkauth? ( dev-python/PyQt5[${PYTHON_USEDEP},networkauth] ) |
106 |
-# ssl? ( dev-python/PyQt5[${PYTHON_USEDEP},ssl] ) |
107 |
-# webkit? ( dev-python/PyQt5[${PYTHON_USEDEP},webkit] ) |
108 |
-# |
109 |
-# 3d? ( dev-python/pyside2[${PYTHON_USEDEP},3d] ) |
110 |
-# charts? ( dev-python/pyside2[${PYTHON_USEDEP},charts] ) |
111 |
-# concurrent? ( dev-python/pyside2[${PYTHON_USEDEP},concurrent] ) |
112 |
-# datavis? ( dev-python/pyside2[${PYTHON_USEDEP},datavis] ) |
113 |
-# scxml? ( dev-python/pyside2[${PYTHON_USEDEP},scxml] ) |
114 |
-# script? ( dev-python/pyside2[${PYTHON_USEDEP},script] ) |
115 |
-# scripttools? ( dev-python/pyside2[${PYTHON_USEDEP},scripttools] ) |
116 |
-# speech? ( dev-python/pyside2[${PYTHON_USEDEP},speech] ) |
117 |
- |
118 |
-# The QtPy testsuite skips tests for bindings that are |
119 |
-# not installed, so here we ensure that everything |
120 |
-# is available and all tests are run. |
121 |
-BDEPEND="test? ( |
122 |
- 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] |
123 |
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}] |
124 |
- 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] |
125 |
-)" |
126 |
- |
127 |
-distutils_enable_tests pytest |
128 |
- |
129 |
-python_test() { |
130 |
- export QT_API="pyqt5" |
131 |
- virtx pytest -vv |
132 |
- export QT_API="pyside2" |
133 |
- virtx pytest -vv |
134 |
- unset QT_API |
135 |
-} |
136 |
|
137 |
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml |
138 |
index 582ff9f96b8..1ad412dcb92 100644 |
139 |
--- a/dev-python/QtPy/metadata.xml |
140 |
+++ b/dev-python/QtPy/metadata.xml |
141 |
@@ -19,30 +19,13 @@ |
142 |
Basically, you can write your code as if you were using PySide2 but import Qt modules from qtpy instead of PySide2 (or PyQt5) |
143 |
</longdescription> |
144 |
<use> |
145 |
- <flag name="declarative">Pull in bindings for the QtQml/QtQuick modules and enable the qmlscene plugin</flag> |
146 |
<flag name="designer">Pull in bindings for the QtDesigner module and enable the designer plugin</flag> |
147 |
<flag name="gui">Pull in bindings for the QtGui module</flag> |
148 |
- <flag name="help">Pull in bindings for the QtHelp module</flag> |
149 |
- <flag name="location">Pull in bindings for the QtLocation module</flag> |
150 |
- <flag name="multimedia">Pull in QtMultimedia and QtMultimediaWidgets modules</flag> |
151 |
- <flag name="network">Pull in bindings for the QtNetwork module</flag> |
152 |
<flag name="opengl">Pull in bindings for the QtOpenGL module</flag> |
153 |
- <flag name="positioning">Pull in bindings for the QtPositioning module</flag> |
154 |
<flag name="printsupport">Pull in bindings for the QtPrintSupport module</flag> |
155 |
- <flag name="qml">Pull in QtQml module</flag> |
156 |
- <flag name="quick">Pull in QtQuick and QtQuickWidgets modules</flag> |
157 |
- <flag name="sensors">Pull in bindings for the QtSensors module</flag> |
158 |
- <flag name="serialport">Pull in bindings for the QtSerialPort module</flag> |
159 |
- <flag name="sql">Pull in bindings for the QtSql module</flag> |
160 |
<flag name="svg">Pull in bindings for the QtSvg module</flag> |
161 |
<flag name="testlib">Pull in bindings for the QtTest module</flag> |
162 |
- <flag name="webchannel">Pull in bindings for the QtWebChannel module</flag> |
163 |
<flag name="webengine">Pull in QtWebEngine and QtWebEngineWidgets modules</flag> |
164 |
- <flag name="websockets">Pull in bindings for the QtWebSockets module</flag> |
165 |
- <flag name="widgets">Pull in bindings for the QtWidgets module</flag> |
166 |
- <flag name="x11extras">Pull in bindings for the QtX11Extras module</flag> |
167 |
- <flag name="xmlpatterns">Pull in bindings for the QtXmlPatterns module</flag> |
168 |
- <flag name="xml">Pull in QtXml module</flag> |
169 |
</use> |
170 |
<upstream> |
171 |
<remote-id type="github">spyder-ide/qtpy</remote-id> |