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>
