fix ffmpeg useflag logic: it means avcodec, avformat, swscale and postproc, bug #423017 by Hans

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

6 files changed, 22 insertions, 25 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index f4a125ed2137..f6fa05db7b74 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.811 2012/06/30 12:26:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.812 2012/06/30 20:12:06 aballier Exp $
+
+  30 Jun 2012; Alexis Ballier <aballier@gentoo.org> vlc-2.0.1.ebuild,
+  vlc-2.0.2.ebuild, vlc-2.0.9999.ebuild, vlc-9999.ebuild:
+  fix ffmpeg useflag logic: it means avcodec, avformat, swscale and postproc,
+  bug #423017 by Hans
 
 *vlc-2.0.2 (30 Jun 2012)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 08854f557b29..0d6a7cb6622d 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,17 +9,17 @@ DIST vlc-patches-105.tar.bz2 4325 RMD160 1fc8f5edc1f136c7074a5a00aabec583aec1cc5
 DIST vlc-patches-108.tar.bz2 3189 RMD160 1788635a15e229fca1e40b6e8c7425915c963cf7 SHA1 0e1d6129add81b84fb3212c1c636dd4744e65d4f SHA256 18de61bb0e0d7b4d79b516096c44db4b083510c338b19802422c69f1431b9598
 DIST vlc-patches-109.tar.bz2 5292 RMD160 a94be4d080d135a29358e250c327d2c3281bbb62 SHA1 261db75fa8c0e5fe4d234887a2365ccaf0fafc0f SHA256 264423f9ec76004d1bbe9549e5c7f935e951ad22ca8377b77271981c92403b6e
 EBUILD vlc-1.1.13.ebuild 11793 RMD160 c302441e84e179a53c2042bc7b30450aa64ec4d0 SHA1 5e9d4256a8b48648d2234a22666bbad28b941a49 SHA256 a5f2ac401c0c7061a56f6335c0ca52b29737b9edd0aa8d67c5899974b335bc5d
-EBUILD vlc-2.0.1.ebuild 11090 RMD160 5e874c7ad23d3f20496cbef7a393eedad0641059 SHA1 913076959b63399ac0477c3986e0640c76254187 SHA256 040f5257c86f469e1eb916b29f91cc6da31a50f80b5045ab73148508967fb4d4
-EBUILD vlc-2.0.2.ebuild 11050 RMD160 94089be955ea911c892ba706f01292a2ce0df34e SHA1 19432937c4e8529b8ec49b071074f627b05bc6be SHA256 f0ee96d949bb0e517994ded99ff51a73a677b176f6555aacbbf1de342074eae6
-EBUILD vlc-2.0.9999.ebuild 11054 RMD160 05996cf5141e44b8e558ce98fd60717d6fd0a385 SHA1 d5b02d960ea1079dd262ea854583e3140f732648 SHA256 a8776fbad3045925bc1d038c4a407ad19c52a3cb307dc649246c55e8aae2642a
-EBUILD vlc-9999.ebuild 10842 RMD160 3ddd98dcd8ebd473392c74033776421398d7aa61 SHA1 7427245a18f163990d1c355445efa2727729ceb7 SHA256 a98998b64756a33cdf7d6f6ef47a8f17fb8fa0894ab6f068e98fdff6f3f351a5
-MISC ChangeLog 6358 RMD160 5b75eda4b9481931f2900e40f08d126d8b34040a SHA1 d0876f7f3fb820ffd7ded356e686f294f0a0c38c SHA256 f871c1065702aae050fb929819ae4b0f901de53becfbbcdd7e1d0af32b64f636
+EBUILD vlc-2.0.1.ebuild 11078 RMD160 11e202a321dbf6eb07859b65c524372e20287ed8 SHA1 99ae8ce6cbe893609d85dc6851e4f85c52608c60 SHA256 6a32cb08f9fc0a879d2cd661da65c86984d0b8f4889e01c1cd750e70218df1cb
+EBUILD vlc-2.0.2.ebuild 11033 RMD160 076e7f3007e0a17cb062f9e85382251dbd16fb53 SHA1 a476149a26e0644287a99ed36c195fa7cfcff8ba SHA256 612079068a47bf6fa46a0905550fa3e540c270eb9bb2a6aea794483f805ea4d1
+EBUILD vlc-2.0.9999.ebuild 11037 RMD160 d26606d5f4de18aa69f6823baf24572ff2449f95 SHA1 3854724b6f40ed0b7b835a45d3dfdf2b834fa97e SHA256 ecb07bb64ebed290fcfa189a61c4d864663f9556b5d9584751753a08a8ea047e
+EBUILD vlc-9999.ebuild 10825 RMD160 cdd2d6dfad66b8eba227ee692196988dee9fad9e SHA1 c6a37b65abf6bbe758a3e1e3d4d4e9039907d508 SHA256 551f8e6ad611941ee7b4b29dcc9a7cc6ebd2a4daa1423459a1b3a0681473d163
+MISC ChangeLog 6587 RMD160 ad159d0868202b3eeca07f8231b4f3ef9f1e4463 SHA1 e4f55f3d18b955b77958d9674db0798674cc804b SHA256 659a9fb0a0c93d3cdfe1c1febac2a8469b78563a3d39e0b6f79e1b81e690262c
 MISC ChangeLog-2011 113818 RMD160 fbb86916aed66ae0a18a2b1f13d3c1dc9fdcaf7a SHA1 5e3dab004808f103ffae80563d33568e98f0d119 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2
 MISC metadata.xml 6481 RMD160 092eeb49fdd24ddd43a1a16c2f63fcd8293e0d36 SHA1 8048bb48c124ef8c4533fc00aec9b6a773289bc6 SHA256 b99038f79031a2050ce0ba658a45e87d1388066989b8410109587aacc81ba7f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/u8HYACgkQvFcC4BYPU0qBwgCfdyxhU1BhMsBhj4Ydw2JkEji8
-axMAn3NAWdBF0d6o5hRmPBVi/TnZZ5Kk
-=j5j3
+iEYEARECAAYFAk/vXZwACgkQvFcC4BYPU0r2tACfWdZI/MVGsEmpGpPyum+EFtY7
+lacAni90w8o2fxYNt7IewRUCPpJ0LANy
+=IuVy
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-2.0.1.ebuild b/media-video/vlc/vlc-2.0.1.ebuild
index 26c333e93dc5..00b25306e531 100644
--- a/media-video/vlc/vlc-2.0.1.ebuild
+++ b/media-video/vlc/vlc-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.1.ebuild,v 1.17 2012/06/14 21:35:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.1.ebuild,v 1.18 2012/06/30 20:12:06 aballier Exp $
 
 EAPI="4"
 
@@ -162,9 +162,7 @@ REQUIRED_USE="
 	dvb? ( dvbpsi )
 	dxva2? ( avcodec )
 	egl? ( X )
-	avcodec? ( ffmpeg )
-	avformat? ( ffmpeg )
-	swscale? ( ffmpeg )
+	ffmpeg? ( avcodec avformat swscale postproc )
 	fontconfig? ( truetype )
 	gnutls? ( gcrypt )
 	libtar? ( skins )
diff --git a/media-video/vlc/vlc-2.0.2.ebuild b/media-video/vlc/vlc-2.0.2.ebuild
index 1fb20832c9db..4eb1f5029ad2 100644
--- a/media-video/vlc/vlc-2.0.2.ebuild
+++ b/media-video/vlc/vlc-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.2.ebuild,v 1.1 2012/06/30 12:26:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.2.ebuild,v 1.2 2012/06/30 20:12:06 aballier Exp $
 
 EAPI="4"
 
@@ -162,9 +162,7 @@ REQUIRED_USE="
 	dvb? ( dvbpsi )
 	dxva2? ( avcodec )
 	egl? ( X )
-	avcodec? ( ffmpeg )
-	avformat? ( ffmpeg )
-	swscale? ( ffmpeg )
+	ffmpeg? ( avcodec avformat swscale postproc )
 	fontconfig? ( truetype )
 	gnutls? ( gcrypt )
 	libcaca? ( X )
diff --git a/media-video/vlc/vlc-2.0.9999.ebuild b/media-video/vlc/vlc-2.0.9999.ebuild
index 309fa3d0956e..c5f24402a216 100644
--- a/media-video/vlc/vlc-2.0.9999.ebuild
+++ b/media-video/vlc/vlc-2.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.13 2012/06/12 18:30:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.14 2012/06/30 20:12:06 aballier Exp $
 
 EAPI="4"
 
@@ -162,9 +162,7 @@ REQUIRED_USE="
 	dvb? ( dvbpsi )
 	dxva2? ( avcodec )
 	egl? ( X )
-	avcodec? ( ffmpeg )
-	avformat? ( ffmpeg )
-	swscale? ( ffmpeg )
+	ffmpeg? ( avcodec avformat swscale postproc )
 	fontconfig? ( truetype )
 	gnutls? ( gcrypt )
 	libcaca? ( X )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 19fd8ea5269a..ebc2ae93eb60 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.176 2012/06/12 18:30:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.177 2012/06/30 20:12:06 aballier Exp $
 
 EAPI="4"
 
@@ -159,9 +159,7 @@ REQUIRED_USE="
 	dvb? ( dvbpsi )
 	dxva2? ( avcodec )
 	egl? ( X )
-	avcodec? ( ffmpeg )
-	avformat? ( ffmpeg )
-	swscale? ( ffmpeg )
+	ffmpeg? ( avcodec avformat swscale postproc )
 	fontconfig? ( truetype )
 	gnutls? ( gcrypt )
 	libcaca? ( X )