Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to "sound", bug 357661.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

7 files changed, 19 insertions, 13 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index a7b03943b526..8d9b55c8e10b 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.733 2014/05/14 20:23:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.734 2014/05/15 17:11:09 ulm Exp $
+
+  15 May 2014; Ulrich Müller <ulm@gentoo.org> ffmpeg-0.10.12.ebuild,
+  ffmpeg-1.0.8.ebuild, ffmpeg-1.0.9.ebuild, ffmpeg-1.2.6.ebuild,
+  ffmpeg-2.2.2.ebuild, ffmpeg-9999.ebuild:
+  Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
+  "sound", bug 357661.
 
   14 May 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-2.2.2.ebuild:
   drop keywords on 2.2.2 for arches that have missing deps, bug #510340
diff --git a/media-video/ffmpeg/ffmpeg-0.10.12.ebuild b/media-video/ffmpeg/ffmpeg-0.10.12.ebuild
index 7706c47e8018..5f68df3585b4 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.12.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.12.ebuild,v 1.1 2014/03/10 20:01:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.12.ebuild,v 1.2 2014/05/15 17:11:09 ulm Exp $
 
 EAPI="5"
 
@@ -78,7 +78,7 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
 	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
 	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video,${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
 	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
 	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-1.0.8.ebuild b/media-video/ffmpeg/ffmpeg-1.0.8.ebuild
index a953b918d28f..4b142c777319 100644
--- a/media-video/ffmpeg/ffmpeg-1.0.8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.8.ebuild,v 1.12 2014/01/26 12:09:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.8.ebuild,v 1.13 2014/05/15 17:11:09 ulm Exp $
 
 EAPI="4"
 
@@ -88,7 +88,7 @@ RDEPEND="
 	opus? ( media-libs/opus )
 	pulseaudio? ( media-sound/pulseaudio )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
+	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video] )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	truetype? ( media-libs/freetype:2 )
diff --git a/media-video/ffmpeg/ffmpeg-1.0.9.ebuild b/media-video/ffmpeg/ffmpeg-1.0.9.ebuild
index f32c838bdc37..c72e48e90172 100644
--- a/media-video/ffmpeg/ffmpeg-1.0.9.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.9.ebuild,v 1.1 2014/03/10 20:06:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.9.ebuild,v 1.2 2014/05/15 17:11:09 ulm Exp $
 
 EAPI="4"
 
@@ -88,7 +88,7 @@ RDEPEND="
 	opus? ( media-libs/opus )
 	pulseaudio? ( media-sound/pulseaudio )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
+	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video] )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	truetype? ( media-libs/freetype:2 )
diff --git a/media-video/ffmpeg/ffmpeg-1.2.6.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6.ebuild
index e6d02ff014f9..4c33100d37c7 100644
--- a/media-video/ffmpeg/ffmpeg-1.2.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6.ebuild,v 1.4 2014/05/07 17:59:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6.ebuild,v 1.5 2014/05/15 17:11:09 ulm Exp $
 
 EAPI="4"
 
@@ -90,7 +90,7 @@ RDEPEND="
 	opus? ( media-libs/opus )
 	pulseaudio? ( media-sound/pulseaudio )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
+	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video] )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	truetype? ( media-libs/freetype:2 )
diff --git a/media-video/ffmpeg/ffmpeg-2.2.2.ebuild b/media-video/ffmpeg/ffmpeg-2.2.2.ebuild
index 27201636defe..de9fe22a88b5 100644
--- a/media-video/ffmpeg/ffmpeg-2.2.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.2.ebuild,v 1.2 2014/05/14 20:23:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.2.ebuild,v 1.3 2014/05/15 17:11:09 ulm Exp $
 
 EAPI="5"
 
@@ -118,7 +118,7 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	quvi? ( media-libs/libquvi:0.4 )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
+	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video] )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	ssh? ( net-libs/libssh )
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 6e422ddf418b..fe24898b7190 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.152 2014/03/16 22:34:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.153 2014/05/15 17:11:09 ulm Exp $
 
 EAPI="5"
 
@@ -118,7 +118,7 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	quvi? ( media-libs/libquvi:0.4 )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
+	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video] )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
 	ssh? ( net-libs/libssh )