Fix faac local use flag desc; don't disable by default in IUSE

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 14 insertions, 10 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 3e077eafd83b..211d3b264883 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.277 2009/03/10 18:47:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.278 2009/03/11 23:11:39 beandog Exp $
+
+  11 Mar 2009; Steve Dibb <beandog@gentoo.org> metadata.xml,
+  ffmpeg-0.5-r1.ebuild, ffmpeg-9999.ebuild:
+  Fix faac local use flag desc; don't disable by default in IUSE
 
 *ffmpeg-0.5-r1 (10 Mar 2009)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index b36623b0d4bd..c3912c858089 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -10,7 +10,7 @@ EBUILD ffmpeg-0.4.9_p20081219.ebuild 6146 RMD160 d9ace186852d82930fb988e5ef265f3
 EBUILD ffmpeg-0.4.9_p20090121.ebuild 6151 RMD160 af9848d2992e88c99a9b907542e95c5ee571f638 SHA1 b3f5d2e73a78f6c647e9096d8d3c7c23eb95fff2 SHA256 2ca908b5a71741b347aea0e7c44f74e24356b691f3c13705ff957580d3230c37
 EBUILD ffmpeg-0.4.9_p20090201-r1.ebuild 6253 RMD160 e8a26996c720d2b8483c487b58f29563dd468cf8 SHA1 e1796504e4586151d5df63a727c5a9e231a3404e SHA256 a15df64fc68af3838e927794b9536f355900c5430900f86d410ef9d75a86b64f
 EBUILD ffmpeg-0.4.9_p20090201.ebuild 6273 RMD160 d78b233e4b285c2f452396c84827126c9eb5dbb6 SHA1 a330052ed12fb8ca0cb1e30557d08719c9f012b6 SHA256 9ae1b2798eab76507447ebe785d97f3752ebf8fde9bc89866817b45d47efbb1f
-EBUILD ffmpeg-0.5-r1.ebuild 6145 RMD160 3afc81efd617c7cb130aba59ff81d392b88590c9 SHA1 aee16d3033db733bd306047d280e8327178db076 SHA256 5053c95a9ecc087aae7631ef1f00ecd5c40e2c870fc6c633be574e5171f0cb80
-EBUILD ffmpeg-9999.ebuild 6042 RMD160 249a21b68de9f5b7710982ce59c0dcbcd74f7def SHA1 0b62f8bad5a6e46e9c7dbe5ee56544252cb610f2 SHA256 3fa0e16d46ef42ae9a7853207dbf7e665c911ba7129d56a8014a5da4f2a43c91
-MISC ChangeLog 42128 RMD160 de9075bad615bb25406d22499255fc7fe13e9aef SHA1 399e470d5f998cc9109ef2f7687637ec8569d6f6 SHA256 d5a85dd56437387b6d4a268feb6db5e90c67541ade9b96620da209ace8541f24
-MISC metadata.xml 1614 RMD160 5f0065e48397a73cb871bbf78381dad7b0fbd98c SHA1 dc90e3a12e4a107d190a91a1c802de8a2a5b4fda SHA256 8a35c0545fa4663cac93f7c9b93b2a68466197671722ea8c5d35925ed06099ac
+EBUILD ffmpeg-0.5-r1.ebuild 6143 RMD160 1a45c752573bc8dcd4c3f7b110d0eff9e9b75f2e SHA1 e85a4ff9b7ec04d0233721f120422d24d8aa5b25 SHA256 cc87ea24ce5544a22ac5d4b6b1fc441a105d111574aa4152c718c68ed92bdb53
+EBUILD ffmpeg-9999.ebuild 6040 RMD160 fb7666d6767ca4836f15e603f6216c038ef67622 SHA1 0884e32c94f36ad1153f9b72939bc91f909a581d SHA256 c28561671b9ec4208f435576a3c61e1c05e26cc030227657abf7c654c920290a
+MISC ChangeLog 42299 RMD160 c498d2b1faf4a81b2f563ac6ccf7853dfe1428db SHA1 e2780f17244ddd85643553fb92a60914c7b21bdd SHA256 61a3970a9407afeaa8b2b1486b25d2cfcfa6253a6e569a9ee3f840dd842cf7f9
+MISC metadata.xml 1573 RMD160 befd4c2d30f834fda711f150843aebcc6f027b57 SHA1 a5128622bfb5d2c1bdc44e1542a2a09664516193 SHA256 7c1a4821aa99606ae3c52df66cf3a3fa8d32d94cfc0e07d346b203e6966a1183
diff --git a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
index fa5f16e59216..47c1325ed3cd 100644
--- a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.1 2009/03/10 18:47:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.2 2009/03/11 23:11:39 beandog Exp $
 
 EAPI=1
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="+3dnow +3dnowext alsa altivec amr custom-cflags debug dirac doc ieee1394
-	  +encode -faac -faad gsm ipv6 +mmx +mmxext vorbis test theora threads x264
+	  +encode faac faad gsm ipv6 +mmx +mmxext vorbis test theora threads x264
 	  xvid network zlib sdl X mp3 oss schroedinger +hardcoded-tables bindist
 	  v4l v4l2 speex +ssse3 vhook jpeg2k"
 
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index c88c6c7f6179..285daed798ad 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.11 2009/03/10 18:47:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.12 2009/03/11 23:11:39 beandog Exp $
 
 EAPI=1
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="+3dnow +3dnowext alsa altivec amr custom-cflags debug dirac doc
-	  ieee1394 +encode -faac -faad gsm ipv6 +mmx +mmxext vorbis test theora
+	  ieee1394 +encode faac faad gsm ipv6 +mmx +mmxext vorbis test theora
 	  threads x264 xvid network zlib sdl X mp3 oss schroedinger
 	  +hardcoded-tables bindist v4l v4l2 speex +ssse3 jpeg2k"
 
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 153e3f9f2754..f1d5e95ffbae 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -13,7 +13,7 @@
     </flag>
     <flag name="amr">Enables Adaptive Multi-Rate Audio support</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 (instead of internal libavcodec support)</flag>
+	<flag name="faac">Use external faac library for AAC encoding</flag>
 	<flag name="faad">Use external faad library for AAC decoding (instead of internal libavcodec support)</flag>
     <flag name="gsm">Enables support for the gsm lossy speech compression codec via libgsm.</flag>
     <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>