media-sound/mpd: 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/mpd/mpd-0.21.20.ebuild b/media-sound/mpd/mpd-0.21.20.ebuild
index 540d4c5ec34f50284061f03ee2ed32b32d1b45c7..2506310f4d80031d39e69a176feb978ba5b613d2 100644 (file)
--- a/media-sound/mpd/mpd-0.21.20.ebuild
+++ b/media-sound/mpd/mpd-0.21.20.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
        +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-       +ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+       +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
        modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
        recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
        test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
@@ -56,12 +56,7 @@ RDEPEND="
        dbus? ( sys-apps/dbus )
        expat? ( dev-libs/expat )
        faad? ( media-libs/faad2 )
-
-       ffmpeg? (
-               libav? ( media-video/libav:0= )
-               !libav? ( media-video/ffmpeg:0= )
-       )
-
+       ffmpeg? ( media-video/ffmpeg:0= )
        flac? ( media-libs/flac )
        fluidsynth? ( media-sound/fluidsynth )
        gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )

diff --git a/media-sound/mpd/mpd-0.21.21.ebuild b/media-sound/mpd/mpd-0.21.21.ebuild
index 731ab04c695d563dbae5b3057b16badd6dc7c920..3be6a97782703781841061c715e91e858dd4dd77 100644 (file)
--- a/media-sound/mpd/mpd-0.21.21.ebuild
+++ b/media-sound/mpd/mpd-0.21.21.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
        +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-       +ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+       +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
        modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
        recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
        test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
@@ -56,12 +56,7 @@ RDEPEND="
        dbus? ( sys-apps/dbus )
        expat? ( dev-libs/expat )
        faad? ( media-libs/faad2 )
-
-       ffmpeg? (
-               libav? ( media-video/libav:0= )
-               !libav? ( media-video/ffmpeg:0= )
-       )
-
+       ffmpeg? ( media-video/ffmpeg:0= )
        flac? ( media-libs/flac )
        fluidsynth? ( media-sound/fluidsynth )
        gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )

diff --git a/media-sound/mpd/mpd-0.21.22.ebuild b/media-sound/mpd/mpd-0.21.22.ebuild
index 731ab04c695d563dbae5b3057b16badd6dc7c920..e1d6b01c903b1906ae83a90d967f86e5815d23bd 100644 (file)
--- a/media-sound/mpd/mpd-0.21.22.ebuild
+++ b/media-sound/mpd/mpd-0.21.22.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
        +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-       +ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+       +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
        modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
        recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
        test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
@@ -56,12 +56,7 @@ RDEPEND="
        dbus? ( sys-apps/dbus )
        expat? ( dev-libs/expat )
        faad? ( media-libs/faad2 )
-
-       ffmpeg? (
-               libav? ( media-video/libav:0= )
-               !libav? ( media-video/ffmpeg:0= )
-       )
-
+       ffmpeg? ( media-video/ffmpeg:0= )
        flac? ( media-libs/flac )
        fluidsynth? ( media-sound/fluidsynth )
        gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )

diff --git a/media-sound/mpd/mpd-0.21.23.ebuild b/media-sound/mpd/mpd-0.21.23.ebuild
index 731ab04c695d563dbae5b3057b16badd6dc7c920..e1d6b01c903b1906ae83a90d967f86e5815d23bd 100644 (file)
--- a/media-sound/mpd/mpd-0.21.23.ebuild
+++ b/media-sound/mpd/mpd-0.21.23.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
        +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-       +ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+       +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
        modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
        recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
        test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
@@ -56,12 +56,7 @@ RDEPEND="
        dbus? ( sys-apps/dbus )
        expat? ( dev-libs/expat )
        faad? ( media-libs/faad2 )
-
-       ffmpeg? (
-               libav? ( media-video/libav:0= )
-               !libav? ( media-video/ffmpeg:0= )
-       )
-
+       ffmpeg? ( media-video/ffmpeg:0= )
        flac? ( media-libs/flac )
        fluidsynth? ( media-sound/fluidsynth )
        gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )