Fix faac handling if USE=-encode, bug 300364.

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

4 files changed, 39 insertions, 23 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index cea8e9253ab8..bde9532fbb47 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.338 2010/01/24 16:43:59 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.339 2010/01/26 15:00:41 spatz Exp $
+
+  26 Jan 2010; Dror Levin <spatz@gentoo.org> ffmpeg-0.5_p20601-r1.ebuild,
+  ffmpeg-9999-r1.ebuild:
+  Fix faac handling if USE=-encode, bug 300364.
 
   24 Jan 2010; Tobias Klausmann <klausman@gentoo.org>
   ffmpeg-0.5_p20373.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 248709bd77d4..0fa21c4eaee0 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX ffmpeg-0.5_p20601-r1-libtheora.patch 1067 RMD160 58c172ffa186d616462405cec7cbc17e085e7d8e SHA1 0c4154a7ee429f8bc4b28204b9b3385d2c949e64 SHA256 bde37379b335a0505addc15697d807f3536843747556b61591333dded1a05be5
 DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
 DIST ffmpeg-0.5_p20373.tar.bz2 3087600 RMD160 6a960e0837f419c882c7bd18c91f582df0e19c58 SHA1 ddf5d0389586d8ceb2979e0804a7b80a9640aad4 SHA256 2a217144c82f11c80f325c653157bd9fc5424dc43a2b2ccbc8eb03a01d33418d
 DIST ffmpeg-0.5_p20601.tar.bz2 3103450 RMD160 0fb6ebf92673510ab4118422dcbb7f96b0d47e4f SHA1 38211d48ffcab03c83d0cf2043e3c931041a6928 SHA256 3e79c8245ab66d3eda907d5857a9cecda164a9eacfa83e52322760260519ade4
 EBUILD ffmpeg-0.5-r1.ebuild 6579 RMD160 5e83ac138a45d2f52b16ee72c1ee6ff3073d2e21 SHA1 1c2517f10be827668807cf051b7c595162534eb0 SHA256 84d0af467747bd359582c4e7e90e61edf6eb6857d87905228fc1411e7ce00630
 EBUILD ffmpeg-0.5_p20373.ebuild 7684 RMD160 6706941ec4346afde3a434adc60957874674b871 SHA1 35d8227d3103c57ab9973c4eb0a00f32d2458be7 SHA256 1dfe7fb023dd73247ce01fd7d44e05746b3fccdab6d0ddb87d5ed1a97e3934b3
-EBUILD ffmpeg-0.5_p20601-r1.ebuild 7811 RMD160 57134c88df873b35cfb1929c9fff94886f9e9dcf SHA1 2a06a449f6ad51722131b93cb43339adeb1fed47 SHA256 fae722aae9d6cf63311ccc4ade611ed402947863a5f612b2bc5669eb7b19e847
-EBUILD ffmpeg-9999-r1.ebuild 7660 RMD160 8b5933c6f2097560760984454d6042359309b26b SHA1 ff3533a3ed78f12cbce328bc581a4552aff07d0c SHA256 87e61d2cd57794bc868f25482b20aa48ef3917050563d3e6ed113ba41209b63e
-MISC ChangeLog 50519 RMD160 d04fde49cbdc33c47a44ac682b697bef1b7ba40b SHA1 3671ea75de303ac6642e836b0a87b5410eb2c90f SHA256 81a89268bc3ec9b23bf72b718fbb60c493eba3930bb32e9e55d77e3e59084164
+EBUILD ffmpeg-0.5_p20601-r1.ebuild 7777 RMD160 4c6ed67d658b0bc1840470fce4a31a61ae9f6e70 SHA1 ab9ee712fa24f4d2d66c90fb888061f822d9bcfa SHA256 9951088582b7361a63eee8b0276f058f0b701bbece7ab8aee4cae9378bbe0506
+EBUILD ffmpeg-9999-r1.ebuild 7625 RMD160 7cbbc005e9971172125482f64514880aca15ac21 SHA1 bd52bc63218cd477f691c60fd80f8a26c0565626 SHA256 84c6ea3da8448960a31bc7a0400915ab641ff2acdff96eaebb81adaa402eb5b4
+MISC ChangeLog 50664 RMD160 0b95260c2da1b0d4c2d4633efec7b994c7a611d3 SHA1 1a6359a7a12bf68d41ed02f2cc21a4d93da8dfe6 SHA256 98cee91c72e9bb998830a8e0820dd30aae8f576c5a781ae88738715c9d2fac73
 MISC metadata.xml 1876 RMD160 3fed4cfedd4cd693c1053bd4ea90c75260aa2815 SHA1 827e1fc2f346f5c8695d45c4697dbcd4fbc47462 SHA256 a2b6f4fce6ae13c3cdc007124cea38857942efeb7fac9779487d087b6068ca52
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQEcBAEBCgAGBQJLXwOhAAoJEAWF714uGAc6tj8H/2jXnnd+ASYmWDbKOAUtMFx+
+Nhh/yNdFnsmF1O9ntcHWPjiBIH3MOtZpGma7ByrNKoKBOWpBzc9qCEYOGSsrZibZ
+gjw8dLbcRk87aPwdj0ipiuqujEzXnmaGugr1qRx1cijnypkqNA12e/bNPCNPCSv6
+cfkj6czkraNPnVlnZclCsdiU0dZbcfVXLSPNKuIU7PFzo2owX0tfsEIYcQeD0uQ8
+8EpAOvJwQLFga42G1e4KJLeWKodJYBiTvOqymgCmoLUEuBA+S/GMgjSP+wqjwptI
+VBiubt8fWJj3hEIr9+NyRRl6vCXQZO3aC3OVHtn3gcNRgo4EymvlyDMrWP8eO9A=
+=eMZv
+-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild
index 7b47f02c45ee..8cc4cc2efe65 100644
--- a/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild,v 1.2 2009/11/26 04:55:11 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild,v 1.3 2010/01/26 15:00:41 spatz Exp $
 
 EAPI=2
 SCM=""
@@ -109,6 +109,13 @@ src_configure() {
 		use theora && myconf="${myconf} --enable-libtheora"
 		use x264 && myconf="${myconf} --enable-libx264"
 		use xvid && myconf="${myconf} --enable-libxvid"
+		if use bindist
+		then
+			use faac && ewarn "faac is nonfree and cannot be distributed;
+			disabling faac support."
+		else
+			use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
+		fi
 	else
 		myconf="${myconf} --disable-encoders"
 	fi
@@ -140,14 +147,6 @@ src_configure() {
 		# Crappy detection or our installation is weird, pick one (FIXME)
 		append-flags -I/usr/include/gsm
 	fi
-	if use bindist
-	then
-		use faac && ewarn "faac is nonfree and cannot be distributed; disabling
-		faac support."
-	else
-		use faac && myconf="${myconf} --enable-libfaac"
-		{ use faac ; } && myconf="${myconf} --enable-nonfree"
-	fi
 
 	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
 	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i"
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 8648a8b1f45f..3ae8cc72fba9 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.26 2010/01/19 11:41:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.27 2010/01/26 15:00:41 spatz Exp $
 
 EAPI=2
 SCM=""
@@ -105,6 +105,13 @@ src_configure() {
 		use theora && myconf="${myconf} --enable-libtheora"
 		use x264 && myconf="${myconf} --enable-libx264"
 		use xvid && myconf="${myconf} --enable-libxvid"
+		if use bindist
+		then
+			use faac && ewarn "faac is nonfree and cannot be distributed;
+			disabling faac support."
+		else
+			use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
+		fi
 	else
 		myconf="${myconf} --disable-encoders"
 	fi
@@ -136,14 +143,6 @@ src_configure() {
 		# Crappy detection or our installation is weird, pick one (FIXME)
 		append-flags -I/usr/include/gsm
 	fi
-	if use bindist
-	then
-		use faac && ewarn "faac is nonfree and cannot be distributed; disabling
-		faac support."
-	else
-		use faac && myconf="${myconf} --enable-libfaac"
-		{ use faac ; } && myconf="${myconf} --enable-nonfree"
-	fi
 
 	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
 	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i"