| 1 |
commit: 535398f10d49db5b034f245f5718ae73db3fa071 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 30 13:46:48 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 30 14:05:05 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=535398f1 |
| 7 |
|
| 8 |
dev-python/PyQt4: remove kde USE flag |
| 9 |
|
| 10 |
Gentoo-bug: 629144 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 12 |
|
| 13 |
dev-python/PyQt4/PyQt4-4.12.1.ebuild | 7 ++----- |
| 14 |
dev-python/PyQt4/PyQt4-4.12.ebuild | 7 ++----- |
| 15 |
dev-python/PyQt4/metadata.xml | 1 - |
| 16 |
3 files changed, 4 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild b/dev-python/PyQt4/PyQt4-4.12.1.ebuild |
| 19 |
index a88d0967b04..d632d951e8d 100644 |
| 20 |
--- a/dev-python/PyQt4/PyQt4-4.12.1.ebuild |
| 21 |
+++ b/dev-python/PyQt4/PyQt4-4.12.1.ebuild |
| 22 |
@@ -20,7 +20,7 @@ LICENSE="GPL-3" |
| 23 |
SLOT="0" |
| 24 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 25 |
|
| 26 |
-IUSE="X compat dbus debug declarative designer doc examples help kde multimedia |
| 27 |
+IUSE="X compat dbus debug declarative designer doc examples help multimedia |
| 28 |
opengl phonon script scripttools sql svg testlib webkit xmlpatterns" |
| 29 |
REQUIRED_USE=" |
| 30 |
${PYTHON_REQUIRED_USE} |
| 31 |
@@ -45,10 +45,7 @@ RDEPEND=" |
| 32 |
help? ( >=dev-qt/qthelp-${QT_PV} ) |
| 33 |
multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} ) |
| 34 |
opengl? ( >=dev-qt/qtopengl-${QT_PV} ) |
| 35 |
- phonon? ( |
| 36 |
- kde? ( >=media-libs/phonon-4.7[qt4] ) |
| 37 |
- !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} >=media-libs/phonon-4.7[qt4] ) ) |
| 38 |
- ) |
| 39 |
+ phonon? ( >=media-libs/phonon-4.7[qt4] ) |
| 40 |
script? ( >=dev-qt/qtscript-${QT_PV} ) |
| 41 |
scripttools? ( >=dev-qt/qtgui-${QT_PV} ) |
| 42 |
sql? ( >=dev-qt/qtsql-${QT_PV} ) |
| 43 |
|
| 44 |
diff --git a/dev-python/PyQt4/PyQt4-4.12.ebuild b/dev-python/PyQt4/PyQt4-4.12.ebuild |
| 45 |
index 3f6ed72fa42..979f8323a03 100644 |
| 46 |
--- a/dev-python/PyQt4/PyQt4-4.12.ebuild |
| 47 |
+++ b/dev-python/PyQt4/PyQt4-4.12.ebuild |
| 48 |
@@ -20,7 +20,7 @@ LICENSE="GPL-3" |
| 49 |
SLOT="0" |
| 50 |
KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" |
| 51 |
|
| 52 |
-IUSE="X compat dbus debug declarative designer doc examples help kde multimedia |
| 53 |
+IUSE="X compat dbus debug declarative designer doc examples help multimedia |
| 54 |
opengl phonon script scripttools sql svg testlib webkit xmlpatterns" |
| 55 |
REQUIRED_USE=" |
| 56 |
${PYTHON_REQUIRED_USE} |
| 57 |
@@ -45,10 +45,7 @@ RDEPEND=" |
| 58 |
help? ( >=dev-qt/qthelp-${QT_PV} ) |
| 59 |
multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} ) |
| 60 |
opengl? ( >=dev-qt/qtopengl-${QT_PV} ) |
| 61 |
- phonon? ( |
| 62 |
- kde? ( >=media-libs/phonon-4.7[qt4] ) |
| 63 |
- !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} >=media-libs/phonon-4.7[qt4] ) ) |
| 64 |
- ) |
| 65 |
+ phonon? ( >=media-libs/phonon-4.7[qt4] ) |
| 66 |
script? ( >=dev-qt/qtscript-${QT_PV} ) |
| 67 |
scripttools? ( >=dev-qt/qtgui-${QT_PV} ) |
| 68 |
sql? ( >=dev-qt/qtsql-${QT_PV} ) |
| 69 |
|
| 70 |
diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml |
| 71 |
index 9fe84c585da..7cc6900ee95 100644 |
| 72 |
--- a/dev-python/PyQt4/metadata.xml |
| 73 |
+++ b/dev-python/PyQt4/metadata.xml |
| 74 |
@@ -12,7 +12,6 @@ |
| 75 |
<flag name="declarative">Build bindings for the QtDeclarative module</flag> |
| 76 |
<flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag> |
| 77 |
<flag name="help">Build bindings for the QtHelp module</flag> |
| 78 |
- <flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag> |
| 79 |
<flag name="multimedia">Build bindings for the QtMultimedia module</flag> |
| 80 |
<flag name="opengl">Build bindings for the QtOpenGL module</flag> |
| 81 |
<flag name="phonon">Build bindings for the phonon module</flag> |
Archives