commit: 95de12b10d2623d38cd7290034ed646729d61716
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 2 09:45:47 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 2 11:26:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95de12b1
media-sound/audacious: Cleanup and sync live with 4.0.x
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/audacious/audacious-9999.ebuild | 17 +++++++----------
media-sound/audacious/metadata.xml | 3 ---
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/media-sound/audacious/audacious-9999.ebuild
b/media-sound/audacious/audacious-9999.ebuild
index edf35f502de..13924b39fcb 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,7 +20,7 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
-IUSE="gtk nls"
+IUSE="nls"
BDEPEND="
virtual/pkgconfig
@@ -29,15 +29,12 @@ BDEPEND="
DEPEND="
>=dev-libs/dbus-glib-0.60
>=dev-libs/glib-2.28
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
>=x11-libs/cairo-1.2.6
>=x11-libs/pango-1.8.0
virtual/freedesktop-icon-theme
- gtk? ( x11-libs/gtk+:2 )
- !gtk? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
"
RDEPEND="${DEPEND}"
PDEPEND="~media-plugins/audacious-plugins-${PV}"
@@ -65,9 +62,9 @@ src_configure() {
# Bugs #197894, #199069, #207330, #208606
local myeconfargs=(
--disable-valgrind
+ --disable-gtk
--enable-dbus
- $(use_enable gtk gtk)
- $(use_enable !gtk qt)
+ --enable-qt
$(use_enable nls)
)
econf "${myeconfargs[@]}"
diff --git a/media-sound/audacious/metadata.xml
b/media-sound/audacious/metadata.xml
index 42ef143d344..30869dd2bbd 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -9,7 +9,4 @@
<email>[email protected]</email>
<name>Gentoo Sound project</name>
</maintainer>
- <use>
- <flag name="gtk">Build with GTK interface instead of Qt5</flag>
- </use>
</pkgmetadata>
