media-plugins/audacious-plugins: Make USE gtk -> !qt5, alsa default

Simplifies REQUIRED_USE, makes repoman happier.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index d7585a68aa804ff5716fe6a6387bac07a219a025..79742c34a4ab6bc27bb6441f72ea0c3d7c2cb0a0 100644 (file)
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -5,9 +5,6 @@ EAPI=6
 
 MY_P="${P/_/-}"
 
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-
 if [[ ${PV} == *9999 ]]; then
        inherit autotools git-r3
        EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
@@ -15,17 +12,17 @@ else
        SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
        KEYWORDS="~amd64 ~x86"
 fi
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme gtk jack lame libav libnotify
-       libsamplerate lirc mms modplug mp3 nls opengl pulseaudio +qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
+IUSE="aac +adplug +alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme jack lame libav libnotify
+       libsamplerate lirc mms modplug mp3 nls opengl pulseaudio qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
 REQUIRED_USE="
-       ^^ ( gtk qt5 )
-       qt5? ( !aosd !hotkeys )
        || ( alsa jack pulseaudio qtmedia sdl )
-       ampache? ( qt5 http )
-       qtmedia? ( qt5 )"
+       ampache? ( qt5 http ) qtmedia? ( qt5 )
+       aosd? ( !qt5 ) hotkeys? ( !qt5 )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
@@ -49,7 +46,7 @@ RDEPEND="
        dev-libs/dbus-glib
        dev-libs/glib
        dev-libs/libxml2:2
-       ~media-sound/audacious-${PV}[gtk?,qt5?]
+       ~media-sound/audacious-${PV}[qt5=]
        aac? ( >=media-libs/faad2-2.7 )
        alsa? ( >=media-libs/alsa-lib-1.0.16 )
        ampache? ( =media-libs/ampache_browser-1* )
@@ -71,7 +68,7 @@ RDEPEND="
        )
        fluidsynth? ( media-sound/fluidsynth )
        http? ( >=net-libs/neon-0.26.4 )
-       gtk? ( x11-libs/gtk+:2 )
+       !qt5? ( x11-libs/gtk+:2 )
        qt5? (
                dev-qt/qtcore:5
                dev-qt/qtgui:5
@@ -137,7 +134,6 @@ src_configure() {
                $(use_enable flac filewriter)
                $(use_enable fluidsynth amidiplug)
                $(use_enable gme console)
-               $(use_enable gtk)
                $(use_enable hotkeys hotkey)
                $(use_enable http neon)
                $(use_enable jack)
@@ -150,6 +146,7 @@ src_configure() {
                $(use_enable mp3 mpg123)
                $(use_enable nls)
                $(use_enable pulseaudio pulse)
+               $(use_enable !qt5 gtk)
                $(use_enable qt5 qt)
                $(use_enable qtmedia qtaudio)
                $(use_enable scrobbler scrobbler2)

diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 49372c8715da1892237ba4fb6a8e21c543e51255..bf0fc38a66a714a6110b2971a1aaec0a4b007e31 100644 (file)
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -20,6 +20,7 @@
                <flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
                <flag name="hotkeys">Enable support for controlling via hotkeys</flag>
                <flag name="http">Support HTTP streams through neon</flag>
+               <flag name="qt5">Build with Qt5 interface instead Gtk+</flag>
                <flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
                <flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
                <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>