| 1 |
commit: c3eb993546e9ebf478e25605fe92960f48cd949e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 14 22:21:46 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 16 14:54:31 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3eb9935 |
| 7 |
|
| 8 |
dev-python/QtPy: Drop PyQt4 and pyside[webkit] options |
| 9 |
|
| 10 |
Gentoo-bug: 620684 |
| 11 |
Package-Manager: Portage-2.3.11, Repoman-2.3.3 |
| 12 |
|
| 13 |
dev-python/QtPy/QtPy-1.2.1.ebuild | 26 ++++++++++++-------------- |
| 14 |
dev-python/QtPy/QtPy-1.3.1.ebuild | 17 +++++------------ |
| 15 |
dev-python/QtPy/metadata.xml | 1 - |
| 16 |
3 files changed, 17 insertions(+), 27 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-python/QtPy/QtPy-1.2.1.ebuild b/dev-python/QtPy/QtPy-1.2.1.ebuild |
| 19 |
index 86fa7592ebd..51f9d64960b 100644 |
| 20 |
--- a/dev-python/QtPy/QtPy-1.2.1.ebuild |
| 21 |
+++ b/dev-python/QtPy/QtPy-1.2.1.ebuild |
| 22 |
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
| 23 |
|
| 24 |
inherit distutils-r1 |
| 25 |
|
| 26 |
-DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide" |
| 27 |
+DESCRIPTION="Abstraction layer for PyQt5/PySide" |
| 28 |
HOMEPAGE="https://github.com/spyder-ide/qtpy" |
| 29 |
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 30 |
|
| 31 |
@@ -18,20 +18,18 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
| 32 |
IUSE="designer gui opengl svg testlib webkit" |
| 33 |
|
| 34 |
RDEPEND=" |
| 35 |
- || ( |
| 36 |
- dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=] |
| 37 |
- dev-python/PyQt4[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=] |
| 38 |
- dev-python/pyside[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=] |
| 39 |
- ) |
| 40 |
gui? ( || ( |
| 41 |
- dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] |
| 42 |
- dev-python/PyQt4[${PYTHON_USEDEP},X] |
| 43 |
- dev-python/pyside[${PYTHON_USEDEP},X] |
| 44 |
+ dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] |
| 45 |
+ dev-python/pyside[${PYTHON_USEDEP},X] |
| 46 |
) ) |
| 47 |
testlib? ( || ( |
| 48 |
- dev-python/PyQt5[${PYTHON_USEDEP},testlib] |
| 49 |
- dev-python/PyQt4[${PYTHON_USEDEP},testlib] |
| 50 |
- dev-python/pyside[${PYTHON_USEDEP},X] |
| 51 |
- ) )" |
| 52 |
- |
| 53 |
+ dev-python/PyQt5[${PYTHON_USEDEP},testlib] |
| 54 |
+ dev-python/pyside[${PYTHON_USEDEP},X] |
| 55 |
+ ) ) |
| 56 |
+ webkit? ( dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=] ) |
| 57 |
+ !webkit? ( || ( |
| 58 |
+ dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=] |
| 59 |
+ dev-python/pyside[${PYTHON_USEDEP},designer=,opengl=,svg=] |
| 60 |
+ ) ) |
| 61 |
+" |
| 62 |
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
| 63 |
|
| 64 |
diff --git a/dev-python/QtPy/QtPy-1.3.1.ebuild b/dev-python/QtPy/QtPy-1.3.1.ebuild |
| 65 |
index 5d5c3d3f23c..de40764e990 100644 |
| 66 |
--- a/dev-python/QtPy/QtPy-1.3.1.ebuild |
| 67 |
+++ b/dev-python/QtPy/QtPy-1.3.1.ebuild |
| 68 |
@@ -7,30 +7,25 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
| 69 |
|
| 70 |
inherit distutils-r1 |
| 71 |
|
| 72 |
-DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide" |
| 73 |
+DESCRIPTION="Abstraction layer for PyQt5/PySide" |
| 74 |
HOMEPAGE="https://github.com/spyder-ide/qtpy" |
| 75 |
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 76 |
|
| 77 |
LICENSE="MIT" |
| 78 |
SLOT="0" |
| 79 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 80 |
-IUSE="designer gui opengl pyqt4 +pyqt5 pyside svg testlib webkit" |
| 81 |
+IUSE="designer gui opengl +pyqt5 pyside svg testlib webkit" |
| 82 |
|
| 83 |
-REQUIRED_USE="|| ( pyqt4 pyqt5 pyside )" |
| 84 |
+REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )" |
| 85 |
|
| 86 |
RDEPEND=" |
| 87 |
- pyqt4? ( |
| 88 |
- dev-python/PyQt4[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?] |
| 89 |
- gui? ( dev-python/PyQt4[${PYTHON_USEDEP},X] ) |
| 90 |
- testlib? ( dev-python/PyQt4[${PYTHON_USEDEP},testlib] ) |
| 91 |
- ) |
| 92 |
pyqt5? ( |
| 93 |
dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?] |
| 94 |
gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] ) |
| 95 |
testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] ) |
| 96 |
) |
| 97 |
pyside? ( |
| 98 |
- dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?] |
| 99 |
+ dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?] |
| 100 |
gui? ( dev-python/pyside[${PYTHON_USEDEP},X] ) |
| 101 |
testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] ) |
| 102 |
) |
| 103 |
@@ -40,9 +35,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
| 104 |
src_prepare() { |
| 105 |
default |
| 106 |
|
| 107 |
- if ! use pyqt4; then |
| 108 |
- sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die |
| 109 |
- fi |
| 110 |
+ sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die |
| 111 |
|
| 112 |
if ! use pyqt5; then |
| 113 |
sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die |
| 114 |
|
| 115 |
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml |
| 116 |
index 85ca2f8aaa3..58c106d8187 100644 |
| 117 |
--- a/dev-python/QtPy/metadata.xml |
| 118 |
+++ b/dev-python/QtPy/metadata.xml |
| 119 |
@@ -18,7 +18,6 @@ |
| 120 |
<use> |
| 121 |
<flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag> |
| 122 |
<flag name="gui">Build bindings for the QtGui module</flag> |
| 123 |
- <flag name="pyqt4">Enable the <pkg>dev-python/PyQt4</pkg> backend</flag> |
| 124 |
<flag name="pyqt5">Enable the <pkg>dev-python/PyQt5</pkg> backend</flag> |
| 125 |
<flag name="pyside">Enable the <pkg>dev-python/pyside</pkg> backend</flag> |
| 126 |
<flag name="svg">Build bindings for the QtSvg module</flag> |
Archives