[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-meta/

[Michael Palimaka]

commit:     f0580ee296001492681fa38b5092725421bbbe82
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 13:55:20 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 14:05:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0580ee2

dev-qt/qt-meta: remove KDE use flag

Gentoo-bug: 629144
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qt-meta/metadata.xml         | 1 -
 dev-qt/qt-meta/qt-meta-4.8.6.ebuild | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qt-meta/metadata.xml b/dev-qt/qt-meta/metadata.xml
index 9d64d73a77f..202b54f3e09 100644
--- a/dev-qt/qt-meta/metadata.xml
+++ b/dev-qt/qt-meta/metadata.xml
@@ -6,7 +6,6 @@
                <name>Gentoo Qt Project</name>
        </maintainer>
        <use>
-               <flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon 
variant (needed for KDE)</flag>
                <flag name="qt3support">Enable the Qt3Support library for 
Qt4</flag>
        </use>
 </pkgmetadata>

diff --git a/dev-qt/qt-meta/qt-meta-4.8.6.ebuild 
b/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
index a4744de4f14..2e381a85404 100644
--- a/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
+++ b/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.qt.io/";
 LICENSE="metapackage"
 SLOT="4"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+dbus examples kde +qt3support +webkit"
+IUSE="+dbus examples +qt3support +webkit"
 
 DEPEND=""
 RDEPEND="
@@ -28,12 +28,11 @@ RDEPEND="
        >=dev-qt/qthelp-${PV}:4
        >=dev-qt/qtmultimedia-${PV}:4
        >=dev-qt/qtopengl-${PV}:4
-       kde? ( media-libs/phonon[qt4] )
-       !kde? ( || ( >=dev-qt/qtphonon-${PV}:4 media-libs/phonon[qt4] ) )
        >=dev-qt/qtscript-${PV}:4
        >=dev-qt/qtsql-${PV}:4
        >=dev-qt/qtsvg-${PV}:4
        >=dev-qt/qttest-${PV}:4
        webkit? ( >=dev-qt/qtwebkit-${PV}:4 )
        >=dev-qt/qtxmlpatterns-${PV}:4
+       media-libs/phonon[qt4]
 "