| 1 |
commit: 74da6ad0fd38f7c9e62db4820af0d2640b14670a |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 14 20:08:59 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 15 00:34:42 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74da6ad0 |
| 7 |
|
| 8 |
media-sound/audacious: Default switched to Qt5 |
| 9 |
|
| 10 |
Upstream commit 72e6f21e3a77a18ecfa57120a607a48c4e66b493 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
media-sound/audacious/audacious-9999.ebuild | 20 +++++++++++--------- |
| 16 |
media-sound/audacious/metadata.xml | 3 ++- |
| 17 |
2 files changed, 13 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild |
| 20 |
index 12769bfaa10..edf35f502de 100644 |
| 21 |
--- a/media-sound/audacious/audacious-9999.ebuild |
| 22 |
+++ b/media-sound/audacious/audacious-9999.ebuild |
| 23 |
@@ -20,7 +20,7 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2" |
| 24 |
|
| 25 |
LICENSE="BSD-2" |
| 26 |
SLOT="0" |
| 27 |
-IUSE="nls qt5" |
| 28 |
+IUSE="gtk nls" |
| 29 |
|
| 30 |
BDEPEND=" |
| 31 |
virtual/pkgconfig |
| 32 |
@@ -32,8 +32,8 @@ DEPEND=" |
| 33 |
>=x11-libs/cairo-1.2.6 |
| 34 |
>=x11-libs/pango-1.8.0 |
| 35 |
virtual/freedesktop-icon-theme |
| 36 |
- !qt5? ( x11-libs/gtk+:2 ) |
| 37 |
- qt5? ( |
| 38 |
+ gtk? ( x11-libs/gtk+:2 ) |
| 39 |
+ !gtk? ( |
| 40 |
dev-qt/qtcore:5 |
| 41 |
dev-qt/qtgui:5 |
| 42 |
dev-qt/qtwidgets:5 |
| 43 |
@@ -63,12 +63,14 @@ src_configure() { |
| 44 |
# Building without D-Bus is *unsupported* and a USE-flag |
| 45 |
# will not be added due to the bug reports that will result. |
| 46 |
# Bugs #197894, #199069, #207330, #208606 |
| 47 |
- econf \ |
| 48 |
- --disable-valgrind \ |
| 49 |
- --enable-dbus \ |
| 50 |
- $(use_enable nls) \ |
| 51 |
- $(use_enable !qt5 gtk) \ |
| 52 |
- $(use_enable qt5 qt) |
| 53 |
+ local myeconfargs=( |
| 54 |
+ --disable-valgrind |
| 55 |
+ --enable-dbus |
| 56 |
+ $(use_enable gtk gtk) |
| 57 |
+ $(use_enable !gtk qt) |
| 58 |
+ $(use_enable nls) |
| 59 |
+ ) |
| 60 |
+ econf "${myeconfargs[@]}" |
| 61 |
} |
| 62 |
|
| 63 |
src_install() { |
| 64 |
|
| 65 |
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml |
| 66 |
index 56e2b754081..c563fb86934 100644 |
| 67 |
--- a/media-sound/audacious/metadata.xml |
| 68 |
+++ b/media-sound/audacious/metadata.xml |
| 69 |
@@ -10,6 +10,7 @@ |
| 70 |
<name>Gentoo Sound project</name> |
| 71 |
</maintainer> |
| 72 |
<use> |
| 73 |
- <flag name="qt5">Build with Qt5 interface instead Gtk+</flag> |
| 74 |
+ <flag name="gtk">Build with GTK interface instead of Qt5</flag> |
| 75 |
+ <flag name="qt5">Build with Qt5 interface instead of GTK</flag> |
| 76 |
</use> |
| 77 |
</pkgmetadata> |
Archives