Using 'aac' instead of faad and faac.

8 files changed, 49 insertions, 43 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index f32a67d7373f..6e6e2afd8267 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.45 2004/11/02 19:50:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.46 2004/12/14 12:16:05 eradicator Exp $
+
+  14 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ffmpeg-0.4.7.ebuild, ffmpeg-0.4.8.20040222.ebuild,
+  ffmpeg-0.4.8.20040322-r1.ebuild, ffmpeg-0.4.8.20040322.ebuild,
+  ffmpeg-0.4.8.ebuild, ffmpeg-0.4.9_pre1.ebuild:
+  Using 'aac' instead of faad and faac.
 
   02 Nov 2004; Markus Rothe <corsair@gentoo.org> ffmpeg-0.4.9_pre1.ebuild:
   Marked ~ppc64
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 414cf6b1e384..6812af26f6bd 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 67ef1fb98dbafd40f09489184cf183c7 ChangeLog 6545
-MD5 7ab542cf2d4db12d38d48c3445952ef7 ffmpeg-0.4.7.ebuild 2181
-MD5 eeb50b01975c1eb7e8dd92e792644ccc ffmpeg-0.4.8.20040222.ebuild 3308
-MD5 e21d3e844efd68639461fab575d7474d ffmpeg-0.4.8.20040322-r1.ebuild 3729
-MD5 8d3991a509e966cd8a16fb2e26a7c30d ffmpeg-0.4.8.20040322.ebuild 3268
-MD5 c1c2bc1658fc298b4eeb9376948f821d ffmpeg-0.4.8.ebuild 2393
-MD5 71198f80b45bb661d9adaae6ce86c643 ffmpeg-0.4.9_pre1.ebuild 3614
+MD5 91e2def761d8653a166f2934fda3e5be ChangeLog 6813
+MD5 c1a25439a8c44204306f2e3bc6489681 ffmpeg-0.4.7.ebuild 2183
+MD5 0acc7d8c259ec90ad9fb69b28f43d8da ffmpeg-0.4.8.20040222.ebuild 3309
+MD5 8801e336bab5d3ff8725a344e9cd9547 ffmpeg-0.4.8.20040322-r1.ebuild 3698
+MD5 c4bbe6b992b24f5c7792ce56ea70eb37 ffmpeg-0.4.8.20040322.ebuild 3269
+MD5 52df915fbbf246fcb759c24f7c3b0289 ffmpeg-0.4.8.ebuild 2394
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 b2e27c0d8bca44c7f156be2f901e1c25 ffmpeg-0.4.9_pre1.ebuild 3581
 MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777
 MD5 7eca667f050b6c515830ff9be05bacc6 files/digest-ffmpeg-0.4.7 65
 MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
-MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491
 MD5 56615d0a04f7435f464f01f8bed50c50 files/digest-ffmpeg-0.4.8.20040222 69
 MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322 69
 MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322-r1 69
+MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491
 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1 70
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBom0QHTu7gpaalycRAhcMAJ431YUSYuFp6qMTIZrLWUgT5BIM5gCgtmIU
-Z/JgcGxBR8J+itSSN55ixCY=
-=KTq1
+iD8DBQFBvtmeArHZZzCEUG0RAhocAJ9O329y2JpO3VPbV38ktL59B05wewCfe4Bf
+TXugravhSPjxnqVI4nqP6OI=
+=/9Cv
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.4.7.ebuild b/media-video/ffmpeg/ffmpeg-0.4.7.ebuild
index a601e9e121be..cb65f698fe0a 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.7.ebuild,v 1.9 2004/11/22 22:48:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.7.ebuild,v 1.10 2004/12/14 12:16:05 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,12 +11,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha ~ia64 ~amd64 ~arm ~mips"
-IUSE="mmx encode oggvorbis doc faad dvd static sdl imlib truetype"
+IUSE="mmx encode oggvorbis doc aac dvd static sdl imlib truetype"
 
 DEPEND="encode? ( >=media-sound/lame-3.92 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
 	doc? ( >=app-text/texi2html-1.64 )
-	faad? ( >=media-libs/faad2-1.1 )
+	aac? ( >=media-libs/faad2-1.1 )
 	dvd? ( >=media-libs/a52dec-0.7.4 )
 	sdl? ( >=media-libs/libsdl-1.2.5 )
 	imlib? ( >=media-libs/imlib2-1.0.6 )
@@ -44,7 +44,7 @@ src_compile() {
 	use mmx || myconf="${myconf} --disable-mmx"
 	use encode && myconf="${myconf} --enable-mp3lame"
 	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	use faad && myconf="${myconf} --enable-faad --enable-faadbin"
+	use aac && myconf="${myconf} --enable-faad --enable-faadbin"
 	use dvd && myconf="${myconf} --enable-a52 --enable-a52bin"
 	use static || myconf="${myconf} --enable-shared"
 	use sdl || myconf="${myconf} --disable-ffplay"
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild
index 1d41ad42d619..1abf983ffbf8 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild,v 1.7 2004/11/22 22:48:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild,v 1.8 2004/12/14 12:16:05 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,12 +16,12 @@ SRC_URI="http://download.videolan.org/pub/videolan/vlc/0.7.1/contrib/ffmpeg-${PD
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~x86 -ppc ~sparc ~alpha ~amd64 ~ia64 ~arm ~mips"
-IUSE="altivec debug doc dvd encode faad imlib mmx oggvorbis sdl static truetype"
+IUSE="altivec debug doc dvd encode aac imlib mmx oggvorbis sdl static truetype"
 
 DEPEND="encode? ( >=media-sound/lame-3.92 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
 	doc? ( >=app-text/texi2html-1.64 )
-	faad? ( >=media-libs/faad2-1.1 )
+	aac? ( >=media-libs/faad2-1.1 )
 	dvd? ( >=media-libs/a52dec-0.7.4 )
 	sdl? ( >=media-libs/libsdl-1.2.5 )
 	imlib? ( >=media-libs/imlib2-1.0.6 )
@@ -49,7 +49,7 @@ src_compile() {
 	use mmx || myconf="${myconf} --disable-mmx"
 	use encode && myconf="${myconf} --enable-mp3lame"
 	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	use faad && myconf="${myconf} --enable-faad --enable-faadbin"
+	use aac && myconf="${myconf} --enable-faad --enable-faadbin"
 	use dvd && myconf="${myconf} --enable-a52"
 	use static || myconf="${myconf} --enable-shared"
 	use sdl || myconf="${myconf} --disable-ffplay"
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
index 8497f8ec5b5d..751ed7d44523 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild,v 1.11 2004/11/22 22:48:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild,v 1.12 2004/12/14 12:16:05 eradicator Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -16,13 +16,13 @@ SRC_URI="http://download.videolan.org/pub/videolan/vlc/0.7.1/contrib/ffmpeg-${PD
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~arm ~mips"
-IUSE="altivec debug doc dvd encode faac faad imlib mmx oggvorbis sdl static truetype"
+IUSE="altivec debug doc dvd encode aac imlib mmx oggvorbis sdl static truetype"
 
 DEPEND="encode? ( >=media-sound/lame-3.92 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
 	doc? ( >=app-text/texi2html-1.64 )
-	faad? ( >=media-libs/faad2-1.1 )
-	!ia64? ( !alpha? ( faac? ( >=media-libs/faac-1.23 ) ) )
+	faad? ( >=media-libs/faad2-1.1
+	        !alpha? ( >=media-libs/faac-1.23 ) )
 	dvd? ( >=media-libs/a52dec-0.7.4 )
 	sdl? ( >=media-libs/libsdl-1.2.5 )
 	imlib? ( >=media-libs/imlib2-1.0.6 )
@@ -58,9 +58,9 @@ src_compile() {
 	use mmx || myconf="${myconf} --disable-mmx"
 	use encode && myconf="${myconf} --enable-mp3lame"
 	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	use faad && myconf="${myconf} --enable-faad --enable-faadbin"
-	if ! use ia64 && ! use alpha; then
-	    use faac && myconf="${myconf} --enable-faac"
+	use aac && myconf="${myconf} --enable-faad --enable-faadbin"
+	if ! use alpha; then
+	    use aac && myconf="${myconf} --enable-faac"
 	fi
 	use dvd && myconf="${myconf} --enable-a52"
 	use static || myconf="${myconf} --enable-shared"
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild
index bf548e47824e..b6c504599902 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild,v 1.11 2004/11/22 22:48:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild,v 1.12 2004/12/14 12:16:05 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,12 +16,12 @@ SRC_URI="http://download.videolan.org/pub/videolan/vlc/0.7.1/contrib/ffmpeg-${PD
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc sparc ~alpha amd64 ~ia64 ~arm ~mips"
-IUSE="altivec debug doc dvd encode faad imlib mmx oggvorbis sdl static truetype"
+IUSE="altivec debug doc dvd encode aac imlib mmx oggvorbis sdl static truetype"
 
 DEPEND="encode? ( >=media-sound/lame-3.92 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
 	doc? ( >=app-text/texi2html-1.64 )
-	faad? ( >=media-libs/faad2-1.1 )
+	aac? ( >=media-libs/faad2-1.1 )
 	dvd? ( >=media-libs/a52dec-0.7.4 )
 	sdl? ( >=media-libs/libsdl-1.2.5 )
 	imlib? ( >=media-libs/imlib2-1.0.6 )
@@ -49,7 +49,7 @@ src_compile() {
 	use mmx || myconf="${myconf} --disable-mmx"
 	use encode && myconf="${myconf} --enable-mp3lame"
 	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	use faad && myconf="${myconf} --enable-faad --enable-faadbin"
+	use aac && myconf="${myconf} --enable-faad --enable-faadbin"
 	use dvd && myconf="${myconf} --enable-a52"
 	use static || myconf="${myconf} --enable-shared"
 	use sdl || myconf="${myconf} --disable-ffplay"
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.ebuild
index 81b6cf8282a0..cc339bb2f954 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.ebuild,v 1.11 2004/11/22 22:48:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.ebuild,v 1.12 2004/12/14 12:16:05 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,12 +11,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ppc ~sparc alpha amd64 ia64 arm ~mips"
-IUSE="altivec debug doc dvd encode faad imlib mmx oggvorbis sdl static truetype"
+IUSE="altivec debug doc dvd encode aac imlib mmx oggvorbis sdl static truetype"
 
 DEPEND="encode? ( >=media-sound/lame-3.92 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
 	doc? ( >=app-text/texi2html-1.64 )
-	faad? ( >=media-libs/faad2-1.1 )
+	aac? ( >=media-libs/faad2-1.1 )
 	dvd? ( >=media-libs/a52dec-0.7.4 )
 	sdl? ( >=media-libs/libsdl-1.2.5 )
 	imlib? ( >=media-libs/imlib2-1.0.6 )
@@ -42,7 +42,7 @@ src_compile() {
 	use mmx || myconf="${myconf} --disable-mmx"
 	use encode && myconf="${myconf} --enable-mp3lame"
 	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	use faad && myconf="${myconf} --enable-faad --enable-faadbin"
+	use aac && myconf="${myconf} --enable-faad --enable-faadbin"
 	use dvd && myconf="${myconf} --enable-a52 --enable-a52bin"
 	use static || myconf="${myconf} --enable-shared"
 	use sdl || myconf="${myconf} --disable-ffplay"
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild
index 5b651ee9f92a..627c786d0c40 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild,v 1.5 2004/11/22 22:48:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild,v 1.6 2004/12/14 12:16:05 eradicator Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -15,13 +15,13 @@ SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~ppc64 ~arm ~mips"
-IUSE="altivec debug doc dvd encode faac faad imlib mmx oggvorbis sdl static truetype"
+IUSE="altivec debug doc dvd encode aac imlib mmx oggvorbis sdl static truetype"
 
 DEPEND="encode? ( >=media-sound/lame-3.92 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
 	doc? ( >=app-text/texi2html-1.64 )
-	faad? ( >=media-libs/faad2-1.1 )
-	!ia64? ( !alpha? ( faac? ( >=media-libs/faac-1.23 ) ) )
+	aac? ( >=media-libs/faad2-1.1
+	       !alpha? ( >=media-libs/faac-1.23 ) )
 	dvd? ( >=media-libs/a52dec-0.7.4 )
 	sdl? ( >=media-libs/libsdl-1.2.5 )
 	imlib? ( >=media-libs/imlib2-1.0.6 )
@@ -57,9 +57,9 @@ src_compile() {
 	use mmx || myconf="${myconf} --disable-mmx"
 	use encode && myconf="${myconf} --enable-mp3lame"
 	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	use faad && myconf="${myconf} --enable-faad --enable-faadbin"
-	if ! use ia64 && ! use alpha; then
-	    use faac && myconf="${myconf} --enable-faac"
+	use aac && myconf="${myconf} --enable-faad --enable-faadbin"
+	if ! use alpha; then
+	    use aac && myconf="${myconf} --enable-faac"
 	fi
 	use dvd && myconf="${myconf} --enable-a52"
 	use static || myconf="${myconf} --enable-shared"