media-sound/qmmp: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>

diff --git a/media-sound/qmmp/qmmp-1.3.2-r1.ebuild b/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
index 56dd403d4ac026e452e4265f5ce77fa6cdf77044..f11837f77b722f7814e5003edafd1cb0cda13068 100644 (file)
--- a/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
 pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
@@ -51,10 +51,7 @@ RDEPEND="
        curl? ( net-misc/curl )
        dbus? ( dev-qt/qtdbus:5 )
        enca? ( app-i18n/enca )
-       ffmpeg? (
-               !libav? ( media-video/ffmpeg:= )
-               libav? ( media-video/libav:= )
-       )
+       ffmpeg? ( media-video/ffmpeg:= )
        flac? ( media-libs/flac )
        game? ( media-libs/game-music-emu )
        jack? (

diff --git a/media-sound/qmmp/qmmp-1.3.5-r1.ebuild b/media-sound/qmmp/qmmp-1.3.5-r1.ebuild
index 1cb8b262455dd00500e1fa8bac02567803259fd4..4c02d12db02dcf0b0c4b4887af70fa9054e27e40 100644 (file)
--- a/media-sound/qmmp/qmmp-1.3.5-r1.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.5-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
 pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
@@ -50,10 +50,7 @@ RDEPEND="
        curl? ( net-misc/curl )
        dbus? ( dev-qt/qtdbus:5 )
        enca? ( app-i18n/enca )
-       ffmpeg? (
-               !libav? ( media-video/ffmpeg:= )
-               libav? ( media-video/libav:= )
-       )
+       ffmpeg? ( media-video/ffmpeg:= )
        flac? ( media-libs/flac )
        game? ( media-libs/game-music-emu )
        jack? (

diff --git a/media-sound/qmmp/qmmp-1.3.6-r1.ebuild b/media-sound/qmmp/qmmp-1.3.6-r1.ebuild
index 1cb8b262455dd00500e1fa8bac02567803259fd4..4c02d12db02dcf0b0c4b4887af70fa9054e27e40 100644 (file)
--- a/media-sound/qmmp/qmmp-1.3.6-r1.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.6-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
 pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
@@ -50,10 +50,7 @@ RDEPEND="
        curl? ( net-misc/curl )
        dbus? ( dev-qt/qtdbus:5 )
        enca? ( app-i18n/enca )
-       ffmpeg? (
-               !libav? ( media-video/ffmpeg:= )
-               libav? ( media-video/libav:= )
-       )
+       ffmpeg? ( media-video/ffmpeg:= )
        flac? ( media-libs/flac )
        game? ( media-libs/game-music-emu )
        jack? (

diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 1cb8b262455dd00500e1fa8bac02567803259fd4..4c02d12db02dcf0b0c4b4887af70fa9054e27e40 100644 (file)
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
 pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
@@ -50,10 +50,7 @@ RDEPEND="
        curl? ( net-misc/curl )
        dbus? ( dev-qt/qtdbus:5 )
        enca? ( app-i18n/enca )
-       ffmpeg? (
-               !libav? ( media-video/ffmpeg:= )
-               libav? ( media-video/libav:= )
-       )
+       ffmpeg? ( media-video/ffmpeg:= )
        flac? ( media-libs/flac )
        game? ( media-libs/game-music-emu )
        jack? (