Make the extra tools useflags become USE_EXPAND per -dev discussion.

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

5 files changed, 22 insertions, 24 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 9769b64378f0..3bef512646c5 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.530 2012/03/20 09:42:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.531 2012/03/22 11:33:27 aballier Exp $
+
+  22 Mar 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.2.ebuild,
+  ffmpeg-9999.ebuild, metadata.xml:
+  Make the extra tools useflags become USE_EXPAND per -dev discussion.
 
   20 Mar 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   cws2fws requires zlib
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 537de0d265cc..11ce6605f32f 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -5,16 +5,16 @@ AUX ffmpeg-0.7.6-fix_ppc64_32ul.patch 1094 RMD160 b765f1f8420701e6d9447391dd498f
 DIST ffmpeg-0.10.2.tar.bz2 5780204 RMD160 b9dd617935e106e4a1980167bdb7ec8d76d3f2f7 SHA1 743f44a71f93b14c9b26ca2424b0da8457cef4be SHA256 2d990012091c07849843c456eb34ad015a00f45a66cba5be7c81a28e45fb6711
 DIST ffmpeg-0.10.tar.bz2 5778962 RMD160 a60568d4e8bd1a44a2c986e0648cfacba766bcd4 SHA1 a3a7fe25db760a99d51266b33386da9c8552feef SHA256 43596aa76d1a0fab6d42927bf60383405de2bca8fbc740c2012877559ae17ff9
 DIST ffmpeg-0.7.8.tar.bz2 4530406 RMD160 8f69a6bc5caaba4e3d440c2d5dc96a946454a52c SHA1 df4983c028a61d4bf3baceab3bae535b91b8928a SHA256 548197968e69b732c12b2cad3173eb6933a9573a7b1f5b29be36d31b9977c9f3
-EBUILD ffmpeg-0.10.2.ebuild 8400 RMD160 2220ac9706305854c595725f1bebd7c88434a7b5 SHA1 1a3da93ed6c2afbf14234f18613d875e6df965e4 SHA256 91871c133d04bb0e52c7c595779ee520aaeca6378b9c8ae2db32a35dfeb447b8
+EBUILD ffmpeg-0.10.2.ebuild 8451 RMD160 c6f0485e6b01bcf9abbd4c3059b205bd4c749e7f SHA1 caeeae213778c4c4adae8267e8391be49bc931ca SHA256 f52bdb1d504f2fa9dee49946855b7786c96b03b9466ed55c6d133ea611f7a4e3
 EBUILD ffmpeg-0.10.ebuild 8269 RMD160 69cf831e39a2aeb0194178faf5459bf2de66eaa1 SHA1 be8c04d54302cbcd3a530090196640b1e4908697 SHA256 0b62eda7478179120c425f99dc405e5f77b3d4b7f50b8de6dfb6f3fcac0c351e
 EBUILD ffmpeg-0.7.8.ebuild 8434 RMD160 ee37ec983306aaa4bf464a6bcccd7072c8490052 SHA1 7712cefb7ac062070f1d367d250204e95ea9e709 SHA256 f295745280616cc04724889e2d5b02a9648321e572c256e959989610c0b774e3
-EBUILD ffmpeg-9999.ebuild 8491 RMD160 2ed6d5a8f61aa7ef5a544a096754a7e0470533a9 SHA1 101c31fa0c3f74a0abf2fac20781999ac795fd08 SHA256 b4f0d8d783763ca272d06e4a531a2334189f15e729d634b8667af5a92427de0b
-MISC ChangeLog 75665 RMD160 60c46c31b3c7355febf9a9a889e6967243e6630a SHA1 e01c1b68a9090ea21533e0619bdb9ab1054e1e05 SHA256 6a9a6f7ee99d8acfbe819c81a226089cbd9f1da9d34f14596375379637a75ae0
-MISC metadata.xml 3877 RMD160 9b6cd927541728550f3af64b917cff20a81ce5a2 SHA1 ea5093cac15cc650a534e6551ef11c2b714c710f SHA256 3536c68f0fe95c662dfa0866e742322e9bdc1d6943ec26d04c61ef94be3c53e6
+EBUILD ffmpeg-9999.ebuild 8523 RMD160 bc0659737b75fc0f4a5cb67b4fab8c14cb8c05e1 SHA1 b1799e832ef5d0f5696145719bd7b5a500215ee6 SHA256 3352d2810963784ddd01257d1046ff84369574d89aa3f7e32ffde813361448c3
+MISC ChangeLog 75847 RMD160 382a8720a92dd19be3ce98c9a7530def5f8273f2 SHA1 784bd3cd18f8ba7183175babd39401ccb23c7f56 SHA256 5146f3963f3fa40e3d047fd922143002dae699ddcbf72c96422cc89b3cb80edf
+MISC metadata.xml 3122 RMD160 6263ca0c7ee124af6e229139858a5f5918a1b899 SHA1 25c26812e525fb99a933d55d7713ae43e41ed8bd SHA256 68989560c9de314d276ca99945817a58873b793f48e318ccf67cf2c7f0d7fa54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9oUSYACgkQvFcC4BYPU0qonACgpnsvBARRYD7VODprlpq/vSe4
-hosAn14s0KtqPzdUkWb+35p9qWNEzYnv
-=dbCF
+iEYEARECAAYFAk9rDg0ACgkQvFcC4BYPU0qrWgCgraZkGoyigA5UrYSVX7Gco0nF
+0nMAn08fmXJEFDAinK22C4F3hICTEdHg
+=gqIi
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.ebuild b/media-video/ffmpeg/ffmpeg-0.10.2.ebuild
index 3118a3818e30..8368ef945a3c 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.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/ffmpeg/ffmpeg-0.10.2.ebuild,v 1.1 2012/03/18 13:54:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.2.ebuild,v 1.2 2012/03/22 11:33:27 aballier Exp $
 
 EAPI="4"
 
@@ -47,7 +47,7 @@ done
 FFTOOLS="aviocat cws2fws ffeval graph2dot ismindex pktdumper qt-faststart trasher"
 
 for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +$i"
+	IUSE="${IUSE} +fftools_$i"
 done
 
 RDEPEND="
@@ -109,6 +109,7 @@ DEPEND="${RDEPEND}
 # faac is license-incompatible with ffmpeg
 REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
 	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
 	test? ( encode zlib )"
 
 S=${WORKDIR}/${P/_/-}
@@ -256,7 +257,7 @@ src_compile() {
 	emake
 
 	for i in ${FFTOOLS} ; do
-		if use $i ; then
+		if use fftools_$i ; then
 			emake tools/$i
 		fi
 	done
@@ -269,7 +270,7 @@ src_install() {
 	dodoc -r doc/*
 
 	for i in ${FFTOOLS} ; do
-		if use $i ; then
+		if use fftools_$i ; then
 			dobin tools/$i
 		fi
 	done
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 52b118b6cb27..fd254fedf289 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-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/ffmpeg/ffmpeg-9999.ebuild,v 1.82 2012/03/20 09:42:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.83 2012/03/22 11:33:27 aballier Exp $
 
 EAPI="4"
 
@@ -47,7 +47,7 @@ done
 FFTOOLS="aviocat cws2fws ffeval graph2dot ismindex pktdumper qt-faststart trasher"
 
 for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +$i"
+	IUSE="${IUSE} +fftools_$i"
 done
 
 RDEPEND="
@@ -110,7 +110,7 @@ DEPEND="${RDEPEND}
 # faac is license-incompatible with ffmpeg
 REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
 	libv4l? ( v4l )
-	cws2fws? ( zlib )
+	fftools_cws2fws? ( zlib )
 	test? ( encode zlib )"
 
 S=${WORKDIR}/${P/_/-}
@@ -258,7 +258,7 @@ src_compile() {
 	emake
 
 	for i in ${FFTOOLS} ; do
-		if use $i ; then
+		if use fftools_$i ; then
 			emake tools/$i
 		fi
 	done
@@ -271,7 +271,7 @@ src_install() {
 	dodoc -r doc/*
 
 	for i in ${FFTOOLS} ; do
-		if use $i ; then
+		if use fftools_$i ; then
 			dobin tools/$i
 		fi
 	done
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 69896b73cc3b..0b75b158bbcf 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -14,31 +14,24 @@
 	<flag name="ass">Enables <pkg>media-libs/libass</pkg> based subtitle renderer.</flag>
     <flag name="aacplus">AAC+ encoding via <pkg>media-libs/libaacplus</pkg>.</flag>
     <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
-	<flag name="aviocat">Install aviocat: cat's an URL to another one, useful for dumping streams.</flag>
     <flag name="avx">Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips)</flag>
 	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
     <flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
 	<flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></flag>
     <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
-	<flag name="cws2fws">Install cws2fws: converts cws files (Macromedia Flash, compressed) to fws ones (Macromedia Flash, uncompressed).</flag>
     <flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
 	<flag name="faac">Use external faac library for AAC encoding</flag>
-	<flag name="ffeval">Install ffeval: A simple expression evalutor.</flag>
 	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
-	<flag name="graph2dot">Install graph2dot: A tool to convert a libavfilter graph to a dot file.</flag>
     <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
-	<flag name="ismindex">Install ismindex: A tool for creating smooth streaming manifests.</flag>
 	<flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
     <flag name="mmxext">Enables mmx2 support</flag>
     <flag name="network">Enables network streaming support</flag>
 	<flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds support for encrypted network protocols (TLS/HTTPS).</flag>
     <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
-	<flag name="pktdumper">Install pktdumper: Dumps packets as demuxed by libavformat.</flag>
 	<flag name="qt-faststart">Build and install qt-faststart application</flag>
     <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
     <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
     <flag name="ssse3">Faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
-	<flag name="trasher">Install trasher: Writes burts of random data into a file. Great for testing error robustness/resilience/concealment.</flag>
 	<flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
 	<flag name="vdpau">Enables VDPAU decoders (requires nVidia video cards and binary nvidia-drivers to offload CPU processing to video card)</flag>
 	<flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag>