Revbump to add missing links to needed libs in libavformat. Handle a52 and faad properly. Removing old versions.

Package-Manager: portage-2.0.51.20-r4

27 files changed, 106 insertions, 1058 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index a9178c183ce7..babab7a57309 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.72 2005/04/25 21:37:12 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.73 2005/04/26 01:21:53 eradicator Exp $
+
+*ffmpeg-0.4.9_p20050226-r5 (26 Apr 2005)
+
+  26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/ffmpeg-0.4.7-2.6.patch, -files/0.4.8-gcc3.4-magicF2W.patch,
+  -files/alpha-idct.patch, +files/ffmpeg-a52.patch,
+  -files/ffmpeg-configure-extralibs.patch,
+  +files/ffmpeg-missing_links.patch, -ffmpeg-0.4.7.ebuild,
+  -ffmpeg-0.4.8.20040222.ebuild, -ffmpeg-0.4.8.20040322.ebuild,
+  -ffmpeg-0.4.8.20040322-r1.ebuild, -ffmpeg-0.4.9_pre1.ebuild,
+  -ffmpeg-0.4.9_p20050226-r1.ebuild, -ffmpeg-0.4.9_p20050226.ebuild,
+  -ffmpeg-0.4.9_p20050226-r2.ebuild, ffmpeg-0.4.9_p20050226-r3.ebuild,
+  -ffmpeg-0.4.9_p20050226-r4.ebuild, +ffmpeg-0.4.9_p20050226-r5.ebuild:
+  Revbump to add missing links to needed libs in libavformat. Handle a52 and
+  faad properly. Removing old versions.
 
   25 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
   files/ffmpeg-0.4.9_p20050226-gcc4.patch, ffmpeg-0.4.9_p20050226-r4.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d747d0aac605..15f5c293b55f 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,41 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b28732767da5cfc6e18c8ddffaf5c6ed ffmpeg-0.4.8.20040322-r1.ebuild 3756
-MD5 7fc0177915085ea79bfdd8090ac91d4e ChangeLog 10921
-MD5 9898dc0c81badd38f0d98074a511efa3 ffmpeg-0.4.8.20040322.ebuild 3327
+MD5 b8faa4ae46fde09b47988c95fc5bc86f ChangeLog 11704
 MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
-MD5 aae18a15539a110fd4ef3199cc2b4f94 ffmpeg-0.4.8.20040222.ebuild 3367
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 de878cc424e3dc3b3d1a15fa1565fb97 ffmpeg-0.4.7.ebuild 2201
-MD5 b426bb275301556b7556c9da9b54b385 ffmpeg-0.4.9_pre1.ebuild 3676
-MD5 556d5a8e7d0e3475c6eb42280a6d92d0 ffmpeg-0.4.9_p20050226.ebuild 3271
-MD5 0e7ff4e46ede79a2e47d6285e501041a ffmpeg-0.4.9_p20050226-r1.ebuild 3926
-MD5 f9ad96b4c9f4d1983c5d0090cb564721 ffmpeg-0.4.9_p20050226-r2.ebuild 4382
-MD5 99135a0902ee370985847f3a4fbcfa20 ffmpeg-0.4.9_p20050226-r3.ebuild 4380
-MD5 b5847ae808554b585a6ea5ecc22241e1 ffmpeg-0.4.9_p20050226-r4.ebuild 4669
-MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491
+MD5 1396c0a289f99962c52a404b750f7a99 ffmpeg-0.4.9_p20050226-r5.ebuild 4354
+MD5 912d6d17440a836812ac0fd4cd93d23b ffmpeg-0.4.9_p20050226-r3.ebuild 4383
 MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
-MD5 7eca667f050b6c515830ff9be05bacc6 files/digest-ffmpeg-0.4.7 65
-MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322 69
-MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322-r1 69
-MD5 56615d0a04f7435f464f01f8bed50c50 files/digest-ffmpeg-0.4.8.20040222 69
-MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777
-MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
-MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1 70
-MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226 73
+MD5 e592f1aa79ce0d709ac4980404956e87 files/ffmpeg-a52.patch 1111
+MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r5 73
 MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
-MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r1 73
-MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r2 73
+MD5 1a8c0be3a5a5ba1d929b7773265943b7 files/ffmpeg-missing_links.patch 1199
 MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r3 73
-MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r4 73
 MD5 20274823abfde904ae73478349585dd0 files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
-MD5 36d1f36a3d310ddd32bd782f10e1bdb7 files/ffmpeg-configure-extralibs.patch 724
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCbWQJ1ZcsMnZjRyIRAih/AKCacjQ+f1C72gjB/qO3fOMAVfHRpQCgjlJQ
-jof/9FE7OyWk4452yafu/Pw=
-=OM8v
+iD8DBQFCbZe+ArHZZzCEUG0RAu9jAJ4vKpfdng48V80UVUQcN5A+SKqu4ACfYk3V
+iklZYBVex4CtLGJo+SHfDpI=
+=5oiq
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.4.7.ebuild b/media-video/ffmpeg/ffmpeg-0.4.7.ebuild
deleted file mode 100644
index 93159adb042b..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2005 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.11 2005/02/06 18:30:56 luckyduck Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
-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 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 )
-	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 )
-	truetype? ( >=media-libs/freetype-2.1.2 )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# fixes a compile on alpha.  This is fixed in upstream cvs
-	# http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ffmpeg/ffmpeg/libavcodec/alpha/dsputil_alpha.c.diff?r1=1.19&r2=1.20
-	# so this patch should be removed with the next _pre build
-	#epatch ${FILESDIR}/alpha-idct.patch
-
-	epatch ${FILESDIR}/${P}-2.6.patch
-}
-
-src_compile() {
-	filter-flags -fforce-addr -fPIC
-	# fixes bug #16281
-	use alpha && append-flags -fPIC
-
-	local myconf
-
-	use mmx || myconf="${myconf} --disable-mmx"
-	use encode && myconf="${myconf} --enable-mp3lame"
-	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	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"
-
-	./configure ${myconf} \
-		--prefix=/usr || die "./configure failed."
-	make || die "make failed."
-	use doc && make -C doc all
-}
-
-src_install() {
-	einstall || die "Installation failed."
-	dosym /usr/bin/ffmpeg /usr/bin/ffplay
-	dosym /usr/lib/libavcodec-${PV}.so /usr/lib/libavcodec.so
-
-	dodoc COPYING CREDITS Changelog INSTALL README
-	docinto doc
-	dodoc doc/TODO doc/*.html doc/*.texi
-	insinto /etc
-	doins doc/ffserver.conf
-}
-
-src_test() { :; }
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild
deleted file mode 100644
index 8658da518a8d..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.8.20040222.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2005 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.9 2005/02/06 18:30:56 luckyduck Exp $
-
-inherit eutils flag-o-matic
-
-# TODO: --enablea52bin breaks compile
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
-PDATE=${PV##*.}
-MY_PV=${PV%.*}
-S=${WORKDIR}/${PN}-${PDATE}
-SRC_URI="http://download.videolan.org/pub/videolan/vlc/0.7.1/contrib/ffmpeg-${PDATE}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 -ppc ~sparc ~alpha ~amd64 ~ia64 ~arm ~mips"
-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 )
-	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 )
-	truetype? ( >=media-libs/freetype-2.1.2 )
-	!<media-video/mplayer-1.0_pre3-r1"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# for some reason it tries to #include <X11/Xlib.h>,b ut doesn't use it
-	cd ${S}
-	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-}
-
-src_compile() {
-	filter-flags -fforce-addr -fPIC
-	# fixes bug #16281
-	use alpha && append-flags -fPIC
-	use amd64 && append-flags -fPIC
-
-	local myconf
-	#myconf="${myconf} --disable-opts --enable-pp --enable-shared-pp"
-	myconf="${myconf} --disable-opts --enable-pp"
-	use mmx || myconf="${myconf} --disable-mmx"
-	use encode && myconf="${myconf} --enable-mp3lame"
-	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	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"
-	use debug || myconf="${myconf} --disable-debug"
-	use altivec || myconf="${myconf} --disable-altivec"
-
-# Using --enable-a52bin breaks the compile
-	#use dvd && myconf="${myconf} --enable-a52 --enable-a52bin"
-
-	./configure ${myconf} \
-		--prefix=/usr || die "./configure failed."
-	make || die "make failed."
-	use doc && make -C doc all
-
-	filter-flags -momit-leaf-frame-pointer
-	# fixes bug #45576
-	./configure ${myconf} \
-		--prefix=/usr || die "./configure failed."
-	# Build libpostproc
-	cd ${S}/libavcodec/libpostproc
-	make || die "Failed to build libpostproc.a!"
-	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		prefix=${D}/usr \
-		bindir=${D}/usr/bin \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-	dosym /usr/bin/ffmpeg /usr/bin/ffplay
-	dosym /usr/lib/libavcodec-${MY_PV}.so /usr/lib/libavcodec.so
-
-	dodoc COPYING CREDITS Changelog INSTALL README
-	docinto doc
-	dodoc doc/TODO doc/*.html doc/*.texi
-	insinto /etc
-	doins doc/ffserver.conf
-
-	# Install libpostproc ...
-	cd ${S}/libavcodec/libpostproc
-	make prefix=${D}/usr \
-		install || die "Failed to install libpostproc.a!"
-	make prefix=${D}/usr \
-		SHARED_PP="yes" \
-		install || die "Failed to install libpostproc.so!"
-	cd ${S}
-	# Some stuff like transcode can use this one.
-	dolib ${S}/libavcodec/libpostproc/libpostproc.a
-
-	preplib /usr
-}
-
-# FEATURES=maketest breakes the compile
-src_test() { :; }
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
deleted file mode 100644
index e67528d2ee47..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2005 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.13 2005/02/06 18:30:56 luckyduck Exp $
-
-inherit eutils flag-o-matic gcc
-
-# TODO: --enablea52bin breaks compile
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
-PDATE=${PV##*.}
-MY_PV=${PV%.*}
-S=${WORKDIR}/${PN}-${PDATE}
-SRC_URI="http://download.videolan.org/pub/videolan/vlc/0.7.1/contrib/ffmpeg-${PDATE}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~arm ~mips"
-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
-	        !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 )
-	truetype? ( >=media-libs/freetype-2.1.2 )
-	!<media-video/mplayer-1.0_pre3-r1"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# for some reason it tries to #include <X11/Xlib.h>,b ut doesn't use it
-	cd ${S}
-	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-
-	#this will allow ffmpeg to be compiled with gcc-3.4.x fixing bug #49383
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		einfo "Compiler used: gcc-3.4.x Applying patch conditionally."
-		epatch ${FILESDIR}/0.4.8-gcc3.4-magicF2W.patch
-	fi
-}
-
-src_compile() {
-	filter-flags -fforce-addr -fPIC
-	# fixes bug #16281
-	use alpha && append-flags -fPIC
-	use amd64 && append-flags -fPIC
-	use ppc && append-flags -fPIC
-
-	local myconf
-	#myconf="${myconf} --disable-opts --enable-pp --enable-shared-pp"
-	myconf="${myconf} --disable-opts --enable-pp"
-	use mmx || myconf="${myconf} --disable-mmx"
-	use encode && myconf="${myconf} --enable-mp3lame"
-	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	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"
-	use sdl || myconf="${myconf} --disable-ffplay"
-	use debug || myconf="${myconf} --disable-debug"
-	use altivec || myconf="${myconf} --disable-altivec"
-
-# Using --enable-a52bin breaks the compile
-	#use dvd && myconf="${myconf} --enable-a52 --enable-a52bin"
-
-	./configure ${myconf} \
-		--prefix=/usr || die "./configure failed."
-	make || die "make failed."
-	use doc && make -C doc all
-
-	filter-flags -momit-leaf-frame-pointer
-	# fixes bug #45576
-	./configure ${myconf} \
-		--prefix=/usr || die "./configure failed."
-	# Build libpostproc
-	cd ${S}/libavcodec/libpostproc
-	make || die "Failed to build libpostproc.a!"
-	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		prefix=${D}/usr \
-		bindir=${D}/usr/bin \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-	dosym /usr/lib/libavcodec-${MY_PV}.so /usr/lib/libavcodec.so
-
-	dodoc COPYING CREDITS Changelog INSTALL README
-	docinto doc
-	dodoc doc/TODO doc/*.html doc/*.texi
-	insinto /etc
-	doins doc/ffserver.conf
-
-	# Install libpostproc ...
-	cd ${S}/libavcodec/libpostproc
-	make prefix=${D}/usr \
-		install || die "Failed to install libpostproc.a!"
-	make prefix=${D}/usr \
-		SHARED_PP="yes" \
-		install || die "Failed to install libpostproc.so!"
-	cd ${S}
-	# Some stuff like transcode can use this one.
-	dolib ${S}/libavcodec/libpostproc/libpostproc.a
-
-	preplib /usr
-}
-
-# FEATURES=maketest breakes the compile
-src_test() { :; }
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild
deleted file mode 100644
index a7b8c4d6600b..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.8.20040322.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2005 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.13 2005/02/06 18:30:56 luckyduck Exp $
-
-inherit eutils flag-o-matic
-
-# TODO: --enablea52bin breaks compile
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
-PDATE=${PV##*.}
-MY_PV=${PV%.*}
-S=${WORKDIR}/${PN}-${PDATE}
-SRC_URI="http://download.videolan.org/pub/videolan/vlc/0.7.1/contrib/ffmpeg-${PDATE}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc sparc ~alpha amd64 ~ia64 ~arm ~mips"
-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 )
-	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 )
-	truetype? ( >=media-libs/freetype-2.1.2 )
-	!<media-video/mplayer-1.0_pre3-r1"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# for some reason it tries to #include <X11/Xlib.h>,b ut doesn't use it
-	cd ${S}
-	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-}
-
-src_compile() {
-	filter-flags -fforce-addr -fPIC
-	# fixes bug #16281
-	use alpha && append-flags -fPIC
-	use amd64 && append-flags -fPIC
-
-	local myconf
-	#myconf="${myconf} --disable-opts --enable-pp --enable-shared-pp"
-	myconf="${myconf} --disable-opts --enable-pp"
-	use mmx || myconf="${myconf} --disable-mmx"
-	use encode && myconf="${myconf} --enable-mp3lame"
-	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	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"
-	use debug || myconf="${myconf} --disable-debug"
-	use altivec || myconf="${myconf} --disable-altivec"
-
-# Using --enable-a52bin breaks the compile
-	#use dvd && myconf="${myconf} --enable-a52 --enable-a52bin"
-
-	./configure ${myconf} \
-		--prefix=/usr || die "./configure failed."
-	make || die "make failed."
-	use doc && make -C doc all
-
-	filter-flags -momit-leaf-frame-pointer
-	# fixes bug #45576
-	./configure ${myconf} \
-		--prefix=/usr || die "./configure failed."
-	# Build libpostproc
-	cd ${S}/libavcodec/libpostproc
-	make || die "Failed to build libpostproc.a!"
-	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		prefix=${D}/usr \
-		bindir=${D}/usr/bin \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-	dosym /usr/lib/libavcodec-${MY_PV}.so /usr/lib/libavcodec.so
-
-	dodoc COPYING CREDITS Changelog INSTALL README
-	docinto doc
-	dodoc doc/TODO doc/*.html doc/*.texi
-	insinto /etc
-	doins doc/ffserver.conf
-
-	# Install libpostproc ...
-	cd ${S}/libavcodec/libpostproc
-	make prefix=${D}/usr \
-		install || die "Failed to install libpostproc.a!"
-	make prefix=${D}/usr \
-		SHARED_PP="yes" \
-		install || die "Failed to install libpostproc.so!"
-	cd ${S}
-	# Some stuff like transcode can use this one.
-	dolib ${S}/libavcodec/libpostproc/libpostproc.a
-
-	preplib /usr
-}
-
-# FEATURES=maketest breakes the compile
-src_test() { :; }
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r1.ebuild
deleted file mode 100644
index 9a964b9e691b..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2005 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_p20050226-r1.ebuild,v 1.4 2005/03/30 07:58:44 chriswhite Exp $
-
-inherit eutils flag-o-matic gcc
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tbz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~ppc64 ~arm ~mips ~hppa"
-IUSE="aac altivec debug doc dv dvd encode imlib mmx oggvorbis oss threads truetype v4l pic xvid"
-
-DEPEND="imlib? (media-libs/imlib2)
-		truetype? (>=media-libs/freetype-2)
-		sdl? (>=media-libs/libsdl-1.2.1)
-		doc? (app-text/texi2html)
-		encode? (media-sound/lame)
-		oggvorbis? (media-libs/libvorbis
-					media-libs/libogg)
-		!alpha? ( aac? (media-libs/faad2 media-libs/faac) )
-		dvd? (media-libs/a52dec)
-		xvid? (media-libs/xvid)
-		"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# for some reason it tries to #include <X11/Xlib.h>, but doesn't use it
-	cd ${S}
-	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-
-	# make a52bin actually compile... adds the needed external lib
-	# and makes fprintf -> av_log like it's supposed to be...
-	epatch ${FILESDIR}/gentoo-${PN}001.patch
-
-	# If MMX isn't to be built, make the libraries properly PIC
-	# Also covers bug #16281
-	if use pic || use !mmx; then
-		#ffmpeg doesn'g use libtool, so the condition for PIC code
-		#is __PIC__, not PIC.
-		sed -i -e 's/#if\(\(.*def *\)\|\(.*defined *\)\)PIC/#if\1__PIC__/' \
-			libavcodec/i386/dsputil_mmx{.c,_rnd.h} \
-			libavcodec/msmpeg4.c \
-			|| die "sed failed (__PIC__)"
-
-		#fixup library makefiles to add '-fPIC'
-		sed -i -e 's/CFLAGS=/CFLAGS=-fPIC /' \
-			libav{codec,format}/Makefile \
-			|| die "sed failed (-fPIC)"
-
-		#fixup liba52 to respect the --disable-mmx configure option
-		sed -i -e 's/#ifdef ARCH_X86/#ifdef HAVE_MMX/' \
-			libavcodec/liba52/resample.c \
-			|| die "sed failed (HAVE_MMX)"
-	fi
-}
-
-src_compile() {
-	#Note; library makefiles don't propogate flags from config.mak so
-	#use specified CFLAGS are only used in executables
-	filter-flags -fforce-addr -momit-leaf-frame-pointer
-
-	local myconf=""
-
-	#disable mmx accelerated code if not requirested, or if PIC is required
-	# as the provided asm decidedly isn't PIC.
-	if use pic || use !mmx; then
-		myconf="${myconf} --disable-mmx"
-	else
-		myconf="${myconf} --enable-mmx"
-	fi
-
-	use encode && use aac && myconf="${myconf} --enable-faac"
-
-	if use oggvorbis ; then
-		myconf="${myconf} --enable-ogg --enable-vorbis"
-	else
-		myconf="${myconf} --disable-ogg --disable-theora"
-	fi
-
-	use !alpha && myconf="${myconf} $(use_enable aac faad) $(use_enable aac faac) $(use_enable aac faadbin)"
-
-	econf \
-	$(use_enable altivec) \
-	$(use_enable debug) \
-	$(use_enable encode mp3lame) \
-	$(use_enable dvd a52) $(use_enable dvd a52bin) \
-	$(use_enable oss audio-oss) \
-	$(use_enable v4l) \
-	$(use_enable dv dv1394) \
-	$(use_enable threads pthreads) \
-	$(use_enable xvid) \
-	--enable-gpl \
-	--enable-shared-pp \
-	--enable-shared \
-	--enable-pp \
-	--disable-optimize \
-	${myconf} \
-	|| die "Configure failed"
-
-	emake || die "Make Failed"
-}
-
-src_install() {
-	use doc && make documentation
-	make DESTDIR=${D} \
-	prefix=${D}/usr \
-	mandir=${D}/usr/share/man \
-	infodir=${D}/usr/share/info \
-	bindir=${D}/usr/bin \
-	install installlib || die "Install Failed"
-
-	dodoc ChangeLog README INSTALL
-	dodoc doc/*
-
-	cd ${S}/libavcodec/libpostproc
-	make prefix=${D}/usr \
-		install || die "Failed to install libpostproc.a!"
-	make prefix=${D}/usr \
-		SHARED_PP="yes" \
-		install || die "Failed to install libpostproc.so!"
-	cd ${S}
-	# Some stuff like transcode can use this one.
-	dolib ${S}/libavcodec/libpostproc/libpostproc.a
-
-	preplib /usr
-}
-
-# FEATURES=maketest breakes the compile
-src_test() { :; }
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild
deleted file mode 100644
index 72238bdf8d45..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2005 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_p20050226-r2.ebuild,v 1.4 2005/03/30 07:58:44 chriswhite Exp $
-
-inherit eutils flag-o-matic gcc multilib toolchain-funcs
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
-MY_P=${P/_/-}
-S=${WORKDIR}
-S_BASE=${WORKDIR}/${MY_P}
-S_STATIC=${S_BASE}-static
-S_SHARED=${S_BASE}-shared
-
-SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tbz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~ppc64 ~arm ~mips ~hppa"
-IUSE="aac altivec debug doc dv dvd encode imlib mmx oggvorbis oss threads truetype v4l xvid"
-
-DEPEND="imlib? (media-libs/imlib2)
-		truetype? (>=media-libs/freetype-2)
-		sdl? (>=media-libs/libsdl-1.2.1)
-		doc? (app-text/texi2html)
-		encode? (media-sound/lame)
-		oggvorbis? (media-libs/libvorbis
-					media-libs/libogg)
-		!alpha? ( aac? (media-libs/faad2 media-libs/faac) )
-		dvd? (>=media-libs/a52dec-0.7.4-r4)
-		xvid? (media-libs/xvid)
-		"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S_BASE}
-
-	# for some reason it tries to #include <X11/Xlib.h>, but doesn't use it
-	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-
-	# make a52bin actually compile... adds the needed external lib
-	# and makes fprintf -> av_log like it's supposed to be...
-	epatch ${FILESDIR}/gentoo-${PN}001.patch
-
-	#ffmpeg doesn'g use libtool, so the condition for PIC code
-	#is __PIC__, not PIC.
-	sed -i -e 's/#if\(\(.*def *\)\|\(.*defined *\)\)PIC/#if\1__PIC__/' \
-		libavcodec/i386/dsputil_mmx{.c,_rnd.h} \
-		libavcodec/msmpeg4.c \
-		|| die "sed failed (__PIC__)"
-
-	#fixup liba52 to respect the --disable-mmx configure option
-	sed -i -e 's/#ifdef ARCH_X86/#ifdef HAVE_MMX/' \
-		libavcodec/liba52/resample.c \
-		|| die "sed failed (HAVE_MMX)"
-
-	epatch ${FILESDIR}/${PN}-libdir-pic.patch
-
-	sed -i -e "s:\$ldl\ \$extralibs:\$ldl\ -la52\ \$extralibs:" configure || die "Unable to patch in -la52"
-
-	cd ${S}
-	cp -R ${S_BASE} ${S_STATIC}
-	mv ${S_BASE} ${S_SHARED}
-}
-
-src_compile() {
-	#Note; library makefiles don't propogate flags from config.mak so
-	#use specified CFLAGS are only used in executables
-	filter-flags -fforce-addr -momit-leaf-frame-pointer
-
-	local myconf=""
-
-	#disable mmx accelerated code if not requirested, or if PIC is required
-	# as the provided asm decidedly isn't PIC.
-	if has_pic || use !mmx; then
-		myconf="${myconf} --disable-mmx"
-	else
-		myconf="${myconf} --enable-mmx"
-	fi
-
-	use encode && use aac && myconf="${myconf} --enable-faac"
-
-	if use oggvorbis ; then
-		myconf="${myconf} --enable-ogg --enable-vorbis"
-	else
-		myconf="${myconf} --disable-ogg --disable-theora"
-	fi
-
-	use !alpha && myconf="${myconf} $(use_enable aac faad) $(use_enable aac faac) $(use_enable aac faadbin)"
-
-	myconf="${myconf}
-		$(use_enable altivec) \
-		$(use_enable debug) \
-		$(use_enable encode mp3lame) \
-		$(use_enable dvd a52) $(use_enable dvd a52bin) \
-		$(use_enable oss audio-oss) \
-		$(use_enable v4l) \
-		$(use_enable dv dv1394) \
-		$(use_enable threads pthreads) \
-		$(use_enable xvid) \
-		--enable-gpl \
-		--enable-pp \
-		--disable-optimize"
-
-	cd ${S_STATIC}
-	econf --disable-shared-pp --disable-shared --enable-static ${myconf} || die "Configure failed"
-	emake CC="$(tc-getCC)" || die
-
-	cd ${S_SHARED}
-	econf --enable-shared-pp --enable-shared --disable-static ${myconf} || die "Configure failed"
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	for d in ${S_STATIC} ${S_SHARED}; do
-		cd ${d}
-
-		use doc && make documentation
-		make DESTDIR=${D} \
-			prefix=${D}/usr \
-			libdir=${D}/usr/$(get_libdir) \
-			mandir=${D}/usr/share/man \
-			infodir=${D}/usr/share/info \
-			bindir=${D}/usr/bin \
-			install installlib || die "Install Failed"
-	done
-
-	cd ${S_SHARED}
-	dodoc ChangeLog README INSTALL
-	dodoc doc/*
-
-	cd ${S_STATIC}/libavcodec/libpostproc
-	make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) \
-		install || die "Failed to install libpostproc.a!"
-
-	cd ${S_SHARED}/libavcodec/libpostproc
-	make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) \
-		SHARED_PP="yes" \
-		install || die "Failed to install libpostproc.so!"
-
-	# Some stuff like transcode can use this one.
-	dolib ${S_STATIC}/libavcodec/libpostproc/libpostproc.a
-
-	preplib /usr
-}
-
-# FEATURES=maketest breakes the compile
-src_test() { :; }
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild
index 3c345e2be398..3ba94bc7029e 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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_p20050226-r3.ebuild,v 1.7 2005/04/24 18:02:25 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild,v 1.8 2005/04/26 01:21:53 eradicator Exp $
 
 inherit eutils flag-o-matic gcc multilib toolchain-funcs
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tbz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc alpha amd64 ~ia64 ppc64 ~arm ~mips hppa"
+KEYWORDS="x86 ppc sparc alpha amd64 ~ia64 ppc64 ~arm ~mips hppa"
 IUSE="aac altivec debug doc dv dvd encode imlib mmx oggvorbis oss threads truetype v4l xvid"
 
 DEPEND="imlib? (media-libs/imlib2)
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r5.ebuild
index dd0fa3cfd91b..22ad799ba1c3 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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_p20050226-r4.ebuild,v 1.5 2005/04/25 21:37:12 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r5.ebuild,v 1.1 2005/04/26 01:21:53 eradicator Exp $
 
 inherit eutils flag-o-matic gcc multilib toolchain-funcs
 
@@ -18,9 +18,8 @@ LICENSE="GPL-2"
 SLOT="0"
 # ~alpha need to test aac useflag
 # ~ia64 ~arm ~mips ~hppa 
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
-IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss threads
-truetype v4l xvid dts network zlib sdl"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss threads truetype v4l xvid dts network zlib sdl"
 
 # Theora support has switch but there's no oggtheora.c sourcefile...
 
@@ -37,7 +36,7 @@ DEPEND="imlib? ( media-libs/imlib2 )
 	zlib? ( sys-libs/zlib )
 	dts? ( media-libs/libdts )
 	ieee1394? ( media-plugins/libdc1394
-		sys-libs/libraw1394 )"
+	            sys-libs/libraw1394 )"
 
 src_unpack() {
 	unpack ${A} || die
@@ -49,10 +48,6 @@ src_unpack() {
 	# Fix building with gcc4
 	epatch ${FILESDIR}/${P}-gcc4.patch
 
-	# make a52bin actually compile... adds the needed external lib
-	# and makes fprintf -> av_log like it's supposed to be...
-	epatch ${FILESDIR}/gentoo-${PN}001.patch
-
 	#ffmpeg doesn'g use libtool, so the condition for PIC code
 	#is __PIC__, not PIC.
 	sed -i -e 's/#\(\(.*def *\)\|\(.*defined *\)\|\(.*defined(*\)\)PIC/#\1__PIC__/' \
@@ -61,13 +56,9 @@ src_unpack() {
 		libavcodec/common.h \
 		|| die "sed failed (__PIC__)"
 
-	#fixup liba52 to respect the --disable-mmx configure option
-	sed -i -e 's/#ifdef ARCH_X86/#ifdef HAVE_MMX/' \
-		libavcodec/liba52/resample.c \
-		|| die "sed failed (HAVE_MMX)"
-
 	epatch ${FILESDIR}/${PN}-libdir-pic.patch
-	epatch ${FILESDIR}/${PN}-configure-extralibs.patch
+	epatch ${FILESDIR}/${PN}-a52.patch
+	epatch ${FILESDIR}/${PN}-missing_links.patch
 
 	cd ${S}
 	cp -R ${S_BASE} ${S_STATIC}
@@ -93,7 +84,7 @@ src_compile() {
 		$(use_enable altivec) \
 		$(use_enable debug) \
 		$(use_enable encode mp3lame) \
-		$(use_enable a52) $(use_enable a52 a52bin) \
+		$(use_enable a52) --disable-a52bin \
 		$(use_enable oss audio-oss) \
 		$(use_enable v4l) \
 		$(use_enable ieee1394 dv1394) $(use_enable ieee1394 dc1394) \
@@ -105,7 +96,7 @@ src_compile() {
 		$(use_enable network) \
 		$(use_enable zlib) \
 		$(use_enable sdl ffplay) \
-		$(use_enable aac faad) $(use_enable aac faac) $(use_enable aac faadbin) \
+		$(use_enable aac faad) $(use_enable aac faac) --disable-faadbin \
 		--enable-gpl \
 		--enable-pp \
 		--disable-opts"
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226.ebuild
deleted file mode 100644
index bf85d4ceef8c..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2005 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_p20050226.ebuild,v 1.5 2005/03/30 07:58:44 chriswhite Exp $
-
-inherit eutils flag-o-matic gcc
-
-# TODO: --enablea52bin breaks compile
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tbz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~ppc64 ~arm ~mips ~hppa"
-IUSE="aac altivec debug doc dv dvd encode imlib mmx oggvorbis oss threads truetype v4l"
-
-DEPEND="imlib? (media-libs/imlib2)
-		truetype? (>=media-libs/freetype-2)
-		sdl? (>=media-libs/libsdl-1.2.1)
-		doc? (app-text/texi2html)
-		encode? (media-sound/lame)
-		oggvorbis? (media-libs/libvorbis
-					media-libs/libogg)
-		!alpha? ( aac? (media-libs/faad2 media-libs/faac) )
-		dvd? (media-libs/a52dec)
-		"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# for some reason it tries to #include <X11/Xlib.h>,b ut doesn't use it
-	cd ${S}
-	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-
-	# make a52bin actually compile... adds the needed external lib
-	# and makes fprintf -> av_log like it's supposed to be...
-	epatch ${FILESDIR}/gentoo-${PN}001.patch
-
-	#this will allow ffmpeg to be compiled with gcc-3.4.x fixing bug #49383
-	#if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	#then
-	#	einfo "Compiler used: gcc-3.4.x Applying patch conditionally."
-	#	epatch ${FILESDIR}/0.4.8-gcc3.4-magicF2W.patch
-	#fi
-}
-
-src_compile() {
-	filter-flags -fforce-addr -fPIC -momit-leaf-frame-pointer
-	# fixes bug #16281
-
-	use alpha && append-flags -fPIC
-	use amd64 && append-flags -fPIC
-	use hppa && append-flags -fPIC
-	use ppc && append-flags -fPIC
-
-	local myconf=""
-
-	use encode && use aac && myconf="${myconf} --enable-faac"
-
-	if use oggvorbis ; then
-		myconf="${myconf} --enable-ogg --enable-vorbis"
-	else
-		myconf="${myconf} --disable-ogg --disable-theora"
-	fi
-
-	use !alpha && myconf="${myconf} $(use_enable aac faad) $(use_enable aac faac) $(use_enable aac faadbin)"
-
-	econf \
-	$(use_enable mmx) \
-	$(use_enable altivec) \
-	$(use_enable debug) \
-	$(use_enable encode mp3lame) \
-	$(use_enable dvd a52) $(use_enable dvd a52bin) \
-	$(use_enable oss audio-oss) \
-	$(use_enable v4l) \
-	$(use_enable dv dv1394) \
-	$(use_enable threads pthreads) \
-	--enable-gpl \
-	--enable-shared-pp \
-	--enable-shared \
-	--enable-pp \
-	--disable-optimize \
-	${myconf} \
-	|| die "Configure failed"
-
-
-}
-
-src_install() {
-	use doc && make documentation
-	make DESTDIR=${D} \
-	prefix=${D}/usr \
-	mandir=${D}/usr/share/man \
-	infodir=${D}/usr/share/info \
-	bindir=${D}/usr/bin \
-	install installlib || die "Install Failed"
-
-	dodoc ChangeLog README INSTALL
-	dodoc doc/*
-
-	cd ${S}/libavcodec/libpostproc
-	make prefix=${D}/usr \
-		install || die "Failed to install libpostproc.a!"
-	make prefix=${D}/usr \
-		SHARED_PP="yes" \
-		install || die "Failed to install libpostproc.so!"
-	cd ${S}
-	# Some stuff like transcode can use this one.
-	dolib ${S}/libavcodec/libpostproc/libpostproc.a
-
-	preplib /usr
-}
-
-# FEATURES=maketest breakes the compile
-src_test() { :; }
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild
deleted file mode 100644
index 995e7318b1fa..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_pre1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2005 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.9 2005/02/06 18:30:56 luckyduck Exp $
-
-inherit eutils flag-o-matic gcc
-
-# TODO: --enablea52bin breaks compile
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ppc64 ~arm ~mips ~hppa"
-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 )
-	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 )
-	truetype? ( >=media-libs/freetype-2.1.2 )
-	!<media-video/mplayer-1.0_pre3-r1"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# for some reason it tries to #include <X11/Xlib.h>,b ut doesn't use it
-	cd ${S}
-	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-
-	#this will allow ffmpeg to be compiled with gcc-3.4.x fixing bug #49383
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		einfo "Compiler used: gcc-3.4.x Applying patch conditionally."
-		epatch ${FILESDIR}/0.4.8-gcc3.4-magicF2W.patch
-	fi
-}
-
-src_compile() {
-	filter-flags -fforce-addr -fPIC
-	# fixes bug #16281
-	use alpha && append-flags -fPIC
-	use amd64 && append-flags -fPIC
-	use hppa && append-flags -fPIC
-	use ppc && append-flags -fPIC
-
-	local myconf
-	#myconf="${myconf} --disable-opts --enable-pp --enable-shared-pp"
-	myconf="${myconf} --disable-opts --enable-pp --enable-gpl"
-	use mmx || myconf="${myconf} --disable-mmx"
-	use encode && myconf="${myconf} --enable-mp3lame"
-	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	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"
-	use sdl || myconf="${myconf} --disable-ffplay"
-	use debug || myconf="${myconf} --disable-debug"
-	use altivec || myconf="${myconf} --disable-altivec"
-
-# Using --enable-a52bin breaks the compile
-	#use dvd && myconf="${myconf} --enable-a52 --enable-a52bin"
-
-	./configure ${myconf} \
-		--prefix=/usr || die "./configure failed."
-	make || die "make failed."
-	use doc && make -C doc all
-
-	filter-flags -momit-leaf-frame-pointer
-	# fixes bug #45576
-	./configure ${myconf} \
-		--prefix=/usr || die "./configure failed."
-	# Build libpostproc
-	cd ${S}/libavcodec/libpostproc
-	make || die "Failed to build libpostproc.a!"
-	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		prefix=${D}/usr \
-		bindir=${D}/usr/bin \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	dodoc COPYING CREDITS Changelog INSTALL README
-	docinto doc
-	dodoc doc/TODO doc/*.html doc/*.texi
-	insinto /etc
-	doins doc/ffserver.conf
-
-	# Install libpostproc ...
-	cd ${S}/libavcodec/libpostproc
-	make prefix=${D}/usr \
-		install || die "Failed to install libpostproc.a!"
-	make prefix=${D}/usr \
-		SHARED_PP="yes" \
-		install || die "Failed to install libpostproc.so!"
-	cd ${S}
-	# Some stuff like transcode can use this one.
-	dolib ${S}/libavcodec/libpostproc/libpostproc.a
-
-	preplib /usr
-}
-
-# FEATURES=maketest breakes the compile
-src_test() { :; }
diff --git a/media-video/ffmpeg/files/0.4.8-gcc3.4-magicF2W.patch b/media-video/ffmpeg/files/0.4.8-gcc3.4-magicF2W.patch
deleted file mode 100644
index d227610656c5..000000000000
--- a/media-video/ffmpeg/files/0.4.8-gcc3.4-magicF2W.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- libavcodec/liba52/resample_mmx.c	2004/05/01 14:38:45	1.1
-+++ libavcodec/liba52/resample_mmx.c	2004/05/01 14:58:39
-@@ -7,10 +7,10 @@
- 	and it would mean (C / MMX2 / MMX / 3DNOW) versions 
- */
- 
--static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
--static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
--static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
--static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
-+static uint64_t __attribute__((used)) __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
-+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
-+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
-+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
- 
- static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
-     int32_t * f = (int32_t *) _f;
-
diff --git a/media-video/ffmpeg/files/alpha-idct.patch b/media-video/ffmpeg/files/alpha-idct.patch
deleted file mode 100644
index 120c9d780f80..000000000000
--- a/media-video/ffmpeg/files/alpha-idct.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urN ffmpeg-cvs-2003-06-24/libavcodec/alpha/dsputil_alpha.c ffmpeg-cvs-2003-06-24-modified/libavcodec/alpha/dsputil_alpha.c
---- ffmpeg-cvs-2003-06-24/libavcodec/alpha/dsputil_alpha.c	2003-06-20 20:11:30.000000000 -0500
-+++ ffmpeg-cvs-2003-06-24-modified/libavcodec/alpha/dsputil_alpha.c	2003-07-02 12:58:06.000000000 -0500
-@@ -20,6 +20,7 @@
- #include "asm.h"
- #include "../dsputil.h"
- 
-+extern void simple_idct_axp(DCTELEM *block);
- extern void simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block);
- extern void simple_idct_add_axp(uint8_t *dest, int line_size, DCTELEM *block);
- 
-@@ -363,5 +364,5 @@
-     
-     c->idct_put = simple_idct_put_axp;
-     c->idct_add = simple_idct_add_axp;
--    c->idct_idct = simple_idct_axp;
-+    c->idct = simple_idct_axp;
- }
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.7 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.7
deleted file mode 100644
index 8a62667b2000..000000000000
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd9ab3e27f6c92fa06286b8f40277994 ffmpeg-0.4.7.tar.gz 1304077
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.8.20040222 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.8.20040222
deleted file mode 100644
index 67b183c7eacc..000000000000
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.8.20040222
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9d94f58d1c5eda0d11075b1755599530 ffmpeg-20040222.tar.bz2 1256586
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.8.20040322 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.8.20040322
deleted file mode 100644
index d342e6bcd757..000000000000
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.8.20040322
+++ /dev/null
@@ -1 +0,0 @@
-MD5 24c6e9073699ccdb8119b2fcfd476bd2 ffmpeg-20040322.tar.bz2 1301977
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.8.20040322-r1 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.8.20040322-r1
deleted file mode 100644
index d342e6bcd757..000000000000
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.8.20040322-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 24c6e9073699ccdb8119b2fcfd476bd2 ffmpeg-20040322.tar.bz2 1301977
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r1 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r1
deleted file mode 100644
index e182f6a35a7d..000000000000
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4c0a6fb7339f7809424f525fe94570e ffmpeg-0.4.9-p20050226.tbz2 1501308
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r2 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r2
deleted file mode 100644
index e182f6a35a7d..000000000000
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4c0a6fb7339f7809424f525fe94570e ffmpeg-0.4.9-p20050226.tbz2 1501308
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r4 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r4
deleted file mode 100644
index e182f6a35a7d..000000000000
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4c0a6fb7339f7809424f525fe94570e ffmpeg-0.4.9-p20050226.tbz2 1501308
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r5
index e182f6a35a7d..e182f6a35a7d 100644
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r5
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_pre1 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_pre1
deleted file mode 100644
index 21e5cc684690..000000000000
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_pre1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea5587e3c66d50b1503b82ac4179c303 ffmpeg-0.4.9-pre1.tar.gz 1611332
diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.7-2.6.patch b/media-video/ffmpeg/files/ffmpeg-0.4.7-2.6.patch
deleted file mode 100644
index d2209b6b4434..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-0.4.7-2.6.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ffmpeg-0.4.7/libavformat/grab.c	2003-08-24 23:29:50.000000000 +0100
-+++ ffmpeg-0.4.7/libavformat/grab.c	2004-01-04 18:04:29.000000000 +0000
-@@ -17,13 +17,13 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- #include "avformat.h"
--#include <linux/videodev.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <sys/time.h>
- #include <time.h>
-+#include <linux/videodev.h>
- 
- typedef struct {
-     int fd;
diff --git a/media-video/ffmpeg/files/ffmpeg-a52.patch b/media-video/ffmpeg/files/ffmpeg-a52.patch
new file mode 100644
index 000000000000..373f8b14b589
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-a52.patch
@@ -0,0 +1,27 @@
+diff -Naurp ffmpeg-0.4.9-p20050226.orig/libavcodec/Makefile ffmpeg-0.4.9-p20050226/libavcodec/Makefile
+--- ffmpeg-0.4.9-p20050226.orig/libavcodec/Makefile	2005-04-25 17:31:43.000000000 -0700
++++ ffmpeg-0.4.9-p20050226/libavcodec/Makefile	2005-04-25 17:34:46.000000000 -0700
+@@ -73,8 +73,9 @@ OBJS+= a52dec.o
+ 
+ # using builtin liba52 or runtime linked liba52.so.0
+ ifneq ($(CONFIG_A52BIN),yes)
+-OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
+-	liba52/imdct.o  liba52/parse.o liba52/crc.o liba52/resample.o
++#OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
++#	liba52/imdct.o  liba52/parse.o liba52/crc.o liba52/resample.o
++EXTRALIBS += -la52
+ endif
+ endif
+ 
+diff -Naurp ffmpeg-0.4.9-p20050226.orig/libavcodec/a52dec.c ffmpeg-0.4.9-p20050226/libavcodec/a52dec.c
+--- ffmpeg-0.4.9-p20050226.orig/libavcodec/a52dec.c	2004-05-21 07:37:16.000000000 -0700
++++ ffmpeg-0.4.9-p20050226/libavcodec/a52dec.c	2005-04-25 17:37:06.000000000 -0700
+@@ -23,7 +23,7 @@
+  */
+ 
+ #include "avcodec.h"
+-#include "liba52/a52.h"
++#include <a52dec/a52.h>
+ 
+ #ifdef CONFIG_A52BIN
+ #include <dlfcn.h>
diff --git a/media-video/ffmpeg/files/ffmpeg-configure-extralibs.patch b/media-video/ffmpeg/files/ffmpeg-configure-extralibs.patch
deleted file mode 100644
index a61ba0f75505..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-configure-extralibs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur ffmpeg-0.4.9-p20050226/configure ffmpeg-0.4.9-p20050226-configure/configure
---- ffmpeg-0.4.9-p20050226/configure	2005-02-24 16:18:02.000000000 +0100
-+++ ffmpeg-0.4.9-p20050226-configure/configure	2005-04-24 18:13:19.206706664 +0200
-@@ -404,7 +404,7 @@
-   ;;
-   --enable-a52) a52="yes"
-   ;;
--  --enable-a52bin) a52bin="yes" ; extralibs="$ldl $extralibs"
-+  --enable-a52bin) a52bin="yes" ; extralibs="$ldl $extralibs -la52"
-   ;;
-   --enable-dts) dts="yes" ; extralibs="$extralibs -ldts"
-   ;;
-@@ -428,7 +428,7 @@
-   ;;
-   --enable-xvid) xvid="yes"
-   ;;
--  --enable-dc1394) dc1394="yes"
-+  --enable-dc1394) dc1394="yes" ; extralibs="$extralibs -ldc1394_control -lraw1394"
-   ;;
-   --disable-vhook) vhook="no"
-   ;;
diff --git a/media-video/ffmpeg/files/ffmpeg-missing_links.patch b/media-video/ffmpeg/files/ffmpeg-missing_links.patch
new file mode 100644
index 000000000000..0a2a57174a5c
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-missing_links.patch
@@ -0,0 +1,44 @@
+diff -Naurp ffmpeg-0.4.9-p20050226-shared.orig/libavformat/Makefile ffmpeg-0.4.9-p20050226-shared/libavformat/Makefile
+--- ffmpeg-0.4.9-p20050226-shared.orig/libavformat/Makefile	2005-04-25 16:55:04.000000000 -0700
++++ ffmpeg-0.4.9-p20050226-shared/libavformat/Makefile	2005-04-25 17:12:05.000000000 -0700
+@@ -46,6 +46,7 @@ endif
+ 
+ ifeq ($(CONFIG_DC1394),yes)
+ OBJS+= dc1394.o
++EXTRALIBS+=-ldc1394_control -lraw1394
+ endif
+ 
+ ifeq ($(CONFIG_AUDIO_OSS),yes)
+@@ -69,6 +70,7 @@ endif
+ 
+ ifeq ($(CONFIG_LIBOGG),yes)
+ OBJS+= ogg.o
++EXTRALIBS+= -logg
+ endif
+ 
+ ifeq ($(TARGET_ARCH_SPARC64),yes)
+diff -Naurp ffmpeg-0.4.9-p20050226-shared.orig/Makefile ffmpeg-0.4.9-p20050226-shared/Makefile
+--- ffmpeg-0.4.9-p20050226-shared.orig/Makefile	2005-02-24 07:18:02.000000000 -0800
++++ ffmpeg-0.4.9-p20050226-shared/Makefile	2005-04-25 17:54:56.000000000 -0700
+@@ -53,10 +53,18 @@ EXTRALIBS+= -ltheora
+ endif
+ endif
+ 
++ifeq ($(CONFIG_AC3),yes)
++ifneq ($(CONFIG_A52BIN),yes)
++EXTRALIBS += -la52
++endif
++endif
++
++ifeq ($(CONFIG_DTS),yes)
++EXTRALIBS += -ldts
++endif
++
+ ifeq ($(CONFIG_FAAD),yes)
+-ifeq ($(CONFIG_FAADBIN),yes)
+-# no libs needed
+-else
++ifneq ($(CONFIG_FAADBIN),yes)
+ EXTRALIBS += -lfaad
+ endif
+ endif