summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-06-02 11:45:47 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-06-02 13:26:40 +0200
commit95de12b10d2623d38cd7290034ed646729d61716 (patch)
tree321a386e69fb5c9eac4ba7b3b59706ee5cd390b0 /media-sound/audacious
parentdev-db/pgxnclient: Cleanup old (diff)
downloadgentoo-95de12b10d2623d38cd7290034ed646729d61716.tar.gz
gentoo-95de12b10d2623d38cd7290034ed646729d61716.tar.bz2
gentoo-95de12b10d2623d38cd7290034ed646729d61716.zip
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@gentoo.org>
Diffstat (limited to 'media-sound/audacious')
-rw-r--r--media-sound/audacious/audacious-9999.ebuild17
-rw-r--r--media-sound/audacious/metadata.xml3
2 files changed, 7 insertions, 13 deletions
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
index edf35f502de2..13924b39fcb0 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 42ef143d3440..30869dd2bbde 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -9,7 +9,4 @@
<email>sound@gentoo.org</email>
<name>Gentoo Sound project</name>
</maintainer>
- <use>
- <flag name="gtk">Build with GTK interface instead of Qt5</flag>
- </use>
</pkgmetadata>