Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/
Date: Fri, 23 Nov 2018 21:33:56
Message-Id: 1543008817.a199320f07c2823fb044222113d6a2396d89a854.asturm@gentoo
1 commit: a199320f07c2823fb044222113d6a2396d89a854
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 23 20:27:01 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 23 21:33:37 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a199320f
7
8 media-sound/audacious: Make USE gtk -> !qt5, drop REQUIRED_USE
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-sound/audacious/audacious-9999.ebuild | 7 +++----
14 media-sound/audacious/metadata.xml | 1 +
15 2 files changed, 4 insertions(+), 4 deletions(-)
16
17 diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
18 index 5b4597edcdb..3bbf110f138 100644
19 --- a/media-sound/audacious/audacious-9999.ebuild
20 +++ b/media-sound/audacious/audacious-9999.ebuild
21 @@ -23,8 +23,7 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
22
23 LICENSE="BSD-2"
24 SLOT="0"
25 -IUSE="gtk nls +qt5"
26 -REQUIRED_USE="^^ ( gtk qt5 )"
27 +IUSE="nls qt5"
28
29 RDEPEND="
30 >=dev-libs/dbus-glib-0.60
31 @@ -32,7 +31,7 @@ RDEPEND="
32 >=x11-libs/cairo-1.2.6
33 >=x11-libs/pango-1.8.0
34 virtual/freedesktop-icon-theme
35 - gtk? ( x11-libs/gtk+:2 )
36 + !qt5? ( x11-libs/gtk+:2 )
37 qt5? (
38 dev-qt/qtcore:5
39 dev-qt/qtgui:5
40 @@ -64,8 +63,8 @@ src_configure() {
41 econf \
42 --disable-valgrind \
43 --enable-dbus \
44 - $(use_enable gtk) \
45 $(use_enable nls) \
46 + $(use_enable !qt5 gtk) \
47 $(use_enable qt5 qt)
48 }
49
50
51 diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
52 index 5eeba2c5c26..503c619ac00 100644
53 --- a/media-sound/audacious/metadata.xml
54 +++ b/media-sound/audacious/metadata.xml
55 @@ -11,5 +11,6 @@
56 </maintainer>
57 <use>
58 <flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
59 + <flag name="qt5">Build with Qt5 interface instead Gtk+</flag>
60 </use>
61 </pkgmetadata>