Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-meta/
Date: Wed, 30 Aug 2017 14:05:21
Message-Id: 1504101905.f0580ee296001492681fa38b5092725421bbbe82.kensington@gentoo
1 commit: f0580ee296001492681fa38b5092725421bbbe82
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 30 13:55:20 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=f0580ee2
7
8 dev-qt/qt-meta: remove KDE use flag
9
10 Gentoo-bug: 629144
11 Package-Manager: Portage-2.3.6, Repoman-2.3.3
12
13 dev-qt/qt-meta/metadata.xml | 1 -
14 dev-qt/qt-meta/qt-meta-4.8.6.ebuild | 5 ++---
15 2 files changed, 2 insertions(+), 4 deletions(-)
16
17 diff --git a/dev-qt/qt-meta/metadata.xml b/dev-qt/qt-meta/metadata.xml
18 index 9d64d73a77f..202b54f3e09 100644
19 --- a/dev-qt/qt-meta/metadata.xml
20 +++ b/dev-qt/qt-meta/metadata.xml
21 @@ -6,7 +6,6 @@
22 <name>Gentoo Qt Project</name>
23 </maintainer>
24 <use>
25 - <flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag>
26 <flag name="qt3support">Enable the Qt3Support library for Qt4</flag>
27 </use>
28 </pkgmetadata>
29
30 diff --git a/dev-qt/qt-meta/qt-meta-4.8.6.ebuild b/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
31 index a4744de4f14..2e381a85404 100644
32 --- a/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
33 +++ b/dev-qt/qt-meta/qt-meta-4.8.6.ebuild
34 @@ -9,7 +9,7 @@ HOMEPAGE="https://www.qt.io/"
35 LICENSE="metapackage"
36 SLOT="4"
37 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
38 -IUSE="+dbus examples kde +qt3support +webkit"
39 +IUSE="+dbus examples +qt3support +webkit"
40
41 DEPEND=""
42 RDEPEND="
43 @@ -28,12 +28,11 @@ RDEPEND="
44 >=dev-qt/qthelp-${PV}:4
45 >=dev-qt/qtmultimedia-${PV}:4
46 >=dev-qt/qtopengl-${PV}:4
47 - kde? ( media-libs/phonon[qt4] )
48 - !kde? ( || ( >=dev-qt/qtphonon-${PV}:4 media-libs/phonon[qt4] ) )
49 >=dev-qt/qtscript-${PV}:4
50 >=dev-qt/qtsql-${PV}:4
51 >=dev-qt/qtsvg-${PV}:4
52 >=dev-qt/qttest-${PV}:4
53 webkit? ( >=dev-qt/qtwebkit-${PV}:4 )
54 >=dev-qt/qtxmlpatterns-${PV}:4
55 + media-libs/phonon[qt4]
56 "