Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62.

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

4 files changed, 28 insertions, 14 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 43ff50fc480f..2bb810a88074 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.370 2014/12/08 19:13:10 angelos Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.371 2015/02/27 22:24:32 mgorny Exp $
+
+  27 Feb 2015; Michał Górny <mgorny@gentoo.org> mpd-0.18.16.ebuild,
+  mpd-0.18.20.ebuild, mpd-0.19.6.ebuild:
+  Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in
+  https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62.
 
 *mpd-0.19.6 (08 Dec 2014)
 *mpd-0.18.20 (08 Dec 2014)
diff --git a/media-sound/mpd/mpd-0.18.16.ebuild b/media-sound/mpd/mpd-0.18.16.ebuild
index f0d69f205430..5f5cad35900b 100644
--- a/media-sound/mpd/mpd-0.18.16.ebuild
+++ b/media-sound/mpd/mpd-0.18.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.16.ebuild,v 1.7 2014/11/03 09:34:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.16.ebuild,v 1.8 2015/02/27 22:24:32 mgorny Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ppc ~sh x86 ~x86-fbsd ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
-	fluidsynth gme +id3tag inotify ipv6 jack lame mms libmpdclient
+	fluidsynth gme +id3tag inotify ipv6 jack lame mms libav libmpdclient
 	libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus
 	oss pipe pulseaudio recorder selinux sid sndfile soundcloud sqlite systemd tcpd
 	twolame unicode vorbis wavpack wildmidi zeroconf zip"
@@ -40,7 +40,10 @@ CDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	cdio? ( dev-libs/libcdio-paranoia )
 	curl? ( net-misc/curl )
 	faad? ( media-libs/faad2 )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
 	flac? ( media-libs/flac[ogg?] )
 	fluidsynth? ( media-sound/fluidsynth )
 	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
diff --git a/media-sound/mpd/mpd-0.18.20.ebuild b/media-sound/mpd/mpd-0.18.20.ebuild
index 3031a2915b30..d3546e4636ef 100644
--- a/media-sound/mpd/mpd-0.18.20.ebuild
+++ b/media-sound/mpd/mpd-0.18.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.20.ebuild,v 1.1 2014/12/08 19:13:10 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.20.ebuild,v 1.2 2015/02/27 22:24:32 mgorny Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sh ~x86 ~x86-fbsd ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
-	fluidsynth gme +id3tag inotify ipv6 jack lame mms libmpdclient
+	fluidsynth gme +id3tag inotify ipv6 jack lame mms libav libmpdclient
 	libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus
 	oss pipe pulseaudio recorder selinux sid sndfile soundcloud sqlite systemd tcpd
 	twolame unicode vorbis wavpack wildmidi zeroconf zip"
@@ -40,7 +40,10 @@ CDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	cdio? ( dev-libs/libcdio-paranoia )
 	curl? ( net-misc/curl )
 	faad? ( media-libs/faad2 )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
 	flac? ( media-libs/flac[ogg?] )
 	fluidsynth? ( media-sound/fluidsynth )
 	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
diff --git a/media-sound/mpd/mpd-0.19.6.ebuild b/media-sound/mpd/mpd-0.19.6.ebuild
index d1ae18877033..7d05c70d153c 100644
--- a/media-sound/mpd/mpd-0.19.6.ebuild
+++ b/media-sound/mpd/mpd-0.19.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.19.6.ebuild,v 1.1 2014/12/08 19:13:10 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.19.6.ebuild,v 1.2 2015/02/27 22:24:32 mgorny Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug expat faad +fifo +ffmpeg
 	flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms
-	libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack
+	libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack
 	+network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid
 	sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack
 	wildmidi zeroconf zip"
@@ -51,7 +51,10 @@ CDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	curl? ( net-misc/curl )
 	expat? ( dev-libs/expat )
 	faad? ( media-libs/faad2 )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
 	flac? ( media-libs/flac[ogg?] )
 	fluidsynth? ( media-sound/fluidsynth )
 	glib? ( dev-libs/glib:2 )