| 1 |
commit: 95de12b10d2623d38cd7290034ed646729d61716 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 2 09:45:47 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 2 11:26:40 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95de12b1 |
| 7 |
|
| 8 |
media-sound/audacious: Cleanup and sync live with 4.0.x |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
media-sound/audacious/audacious-9999.ebuild | 17 +++++++---------- |
| 14 |
media-sound/audacious/metadata.xml | 3 --- |
| 15 |
2 files changed, 7 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild |
| 18 |
index edf35f502de..13924b39fcb 100644 |
| 19 |
--- a/media-sound/audacious/audacious-9999.ebuild |
| 20 |
+++ b/media-sound/audacious/audacious-9999.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2019 Gentoo Authors |
| 23 |
+# Copyright 1999-2020 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
@@ -20,7 +20,7 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2" |
| 28 |
|
| 29 |
LICENSE="BSD-2" |
| 30 |
SLOT="0" |
| 31 |
-IUSE="gtk nls" |
| 32 |
+IUSE="nls" |
| 33 |
|
| 34 |
BDEPEND=" |
| 35 |
virtual/pkgconfig |
| 36 |
@@ -29,15 +29,12 @@ BDEPEND=" |
| 37 |
DEPEND=" |
| 38 |
>=dev-libs/dbus-glib-0.60 |
| 39 |
>=dev-libs/glib-2.28 |
| 40 |
+ dev-qt/qtcore:5 |
| 41 |
+ dev-qt/qtgui:5 |
| 42 |
+ dev-qt/qtwidgets:5 |
| 43 |
>=x11-libs/cairo-1.2.6 |
| 44 |
>=x11-libs/pango-1.8.0 |
| 45 |
virtual/freedesktop-icon-theme |
| 46 |
- gtk? ( x11-libs/gtk+:2 ) |
| 47 |
- !gtk? ( |
| 48 |
- dev-qt/qtcore:5 |
| 49 |
- dev-qt/qtgui:5 |
| 50 |
- dev-qt/qtwidgets:5 |
| 51 |
- ) |
| 52 |
" |
| 53 |
RDEPEND="${DEPEND}" |
| 54 |
PDEPEND="~media-plugins/audacious-plugins-${PV}" |
| 55 |
@@ -65,9 +62,9 @@ src_configure() { |
| 56 |
# Bugs #197894, #199069, #207330, #208606 |
| 57 |
local myeconfargs=( |
| 58 |
--disable-valgrind |
| 59 |
+ --disable-gtk |
| 60 |
--enable-dbus |
| 61 |
- $(use_enable gtk gtk) |
| 62 |
- $(use_enable !gtk qt) |
| 63 |
+ --enable-qt |
| 64 |
$(use_enable nls) |
| 65 |
) |
| 66 |
econf "${myeconfargs[@]}" |
| 67 |
|
| 68 |
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml |
| 69 |
index 42ef143d344..30869dd2bbd 100644 |
| 70 |
--- a/media-sound/audacious/metadata.xml |
| 71 |
+++ b/media-sound/audacious/metadata.xml |
| 72 |
@@ -9,7 +9,4 @@ |
| 73 |
<email>sound@g.o</email> |
| 74 |
<name>Gentoo Sound project</name> |
| 75 |
</maintainer> |
| 76 |
- <use> |
| 77 |
- <flag name="gtk">Build with GTK interface instead of Qt5</flag> |
| 78 |
- </use> |
| 79 |
</pkgmetadata> |
Archives