From: Samuli Suominen <ssuominen@gentoo.org>
Date: Thu, 14 Feb 2008 15:17:09 +0000 (+0000)
Subject: Remove USE dts from some old ebuilds, and remove some entirely because libdts is... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=42194f9aa5cfa67ec9ae2e6d50ea8044d4211115;p=gentoo.git

Remove USE dts from some old ebuilds, and remove some entirely because libdts is replaced by libdca.
Package-Manager: portage-2.1.4.4
---

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 8eb38e517eae..a8c90a08c126 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.213 2008/02/06 13:29:16 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.214 2008/02/14 15:17:09 drac Exp $
+
+  14 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  -ffmpeg-0.4.9_p20051216.ebuild, -ffmpeg-0.4.9_p20060302.ebuild,
+  -ffmpeg-0.4.9_p20060530.ebuild, -ffmpeg-0.4.9_p20060816.ebuild,
+  ffmpeg-0.4.9_p20061016.ebuild, -ffmpeg-0.4.9_p20070129.ebuild,
+  -ffmpeg-0.4.9_p20070325.ebuild, ffmpeg-0.4.9_p20070330.ebuild:
+  Remove USE dts from some old ebuilds, and remove some entirely because
+  libdts is replaced by libdca.
 
 *ffmpeg-0.4.9_p20080206 (06 Feb 2008)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 8216cacd04cb..7fdab0f4c846 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -14,30 +14,18 @@ AUX ffmpeg-unknown-options.patch 414 RMD160 46f7d8e81ab42368dabb6e29dec29a02d780
 DIST 26104-510.zip 291836 RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca SHA1 b22dbe895991c23fad446c3c4ff7b6db12673778 SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46
 DIST 26204-510.zip 246663 RMD160 1b68232bc40d84298b134c57697e29a842e63ffd SHA1 9ca910295c2888fba95a98da83762a22aaf34651 SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991
 DIST ffmpeg-0.4.9-p20050226.tbz2 1501308 RMD160 904b4349fce0ea18afc6da7bd38ad350f71707cb SHA1 a3e1f9a60708fb0ed1ecfa235d0ce098c79aca86 SHA256 308ca9e70100bab109831805ae81c29efc8aee529444f886dd89e4e3f442f08b
-DIST ffmpeg-0.4.9-p20051216.tar.bz2 1719827 RMD160 7be198931c92661456148dd7ad0f3013f1973b53 SHA1 b1375c0b1dd6cad3d5dd82b1104743f68c6767be SHA256 e68579868df0fbfddd1e8400ad9a35e5f483af19c203972890bf09652b993394
-DIST ffmpeg-0.4.9-p20060302.tar.bz2 1759647 RMD160 e1e2c826c95d2eddd06d91b7df8fba1a3dc277bd SHA1 c679e2fd24737179b4009e59396d647c22adaac1 SHA256 17bd539cc1244a00e0de1d0d4ae3ea731553a8405be616bfc79858496633391d
-DIST ffmpeg-0.4.9-p20060530.tar.bz2 1807070 RMD160 84d6f692cf34bb9413d9d4934bfab478c7c14658 SHA1 6df0134d9ce939b9ae1fbd4525755502c9d227db SHA256 e24b7f84801f679be8f24fcd38e1622ab06ebb97d001be67862135e78ac599f3
-DIST ffmpeg-0.4.9-p20060816.tar.bz2 1948118 RMD160 eb8e076f75c32b7a4874009451c7cb67c32f2fc2 SHA1 3ba0b79eb7bf77895b1b9d074ec825e8ab6ec018 SHA256 20e397ed778e23ae6eebe17d7b91839591512a3146629a2fcc68e0729b2b03bb
 DIST ffmpeg-0.4.9-p20061016.tar.bz2 2009859 RMD160 b41eeb50ef91e5f7a44f725d29d3b9f8104dd62c SHA1 2e15183755378b4089264be3f8865e24eeaa39dc SHA256 99d18860b5db8f3218481c3c977ad63dcff285f193740f31ae5c8e3cac79d531
-DIST ffmpeg-0.4.9-p20070129.tar.bz2 2086323 RMD160 b0895a2d3927c769b7abac1b91d66e7f78586d4f SHA1 12d9e43fd7ee222be4f5b8c58bb63c9056ab3df3 SHA256 107a9c7bfc19c2fde01465d2cbab8082a0e4c1197ff28658aa14932e1be7914f
-DIST ffmpeg-0.4.9-p20070325.tar.bz2 2189783 RMD160 b70c170861423b3724fb7e7036535b10bc656636 SHA1 dbc456e8cedee7da76329375ac467cae74d1e0ad SHA256 147c132824b7df8d4b8dfc5c8ede92dfd3e6b5230f91570ac59326816be8b71c
 DIST ffmpeg-0.4.9-p20070330.tar.bz2 2192476 RMD160 e52bf6abbf7c630aa3e76243987fb7dd6d9b84a1 SHA1 bcc18c88c64f6f941eb1ac94357e0d6dcbf99045 SHA256 58a7e7d909e02fda07856ea044ae0f5f9c174791f63a449f2f23f37a78b34f95
 DIST ffmpeg-0.4.9-p20070525.tar.bz2 2264657 RMD160 dca62fedb6b5b61fe57c73a1cbac278b760fe98d SHA1 12bc5cb37bed8b9e66ea4d9711eed9a3d35edd9f SHA256 1b391c14e5c0015af6e6449dc9fd27a4f63aa0d342716427ba014c98950e2224
 DIST ffmpeg-0.4.9-p20070616.tar.bz2 2275972 RMD160 73d0334b85f0859bbfc40a4d9c27fb987b36ca25 SHA1 6c649cf5b4c803bf7aec2f70adbd9d0992360e71 SHA256 bb15d2aee946ac6113928386f7385b15ffa4d9640e60830bd9868079bfb2da88
 DIST ffmpeg-0.4.9-p20080206.tar.bz2 2474139 RMD160 0472ed0fa1d69a791328b3c221bdd08b0a826648 SHA1 8f3a6ea93c200ca949d47a432b9c5174a954ec75 SHA256 3effb76b8ecfcf2de7cf261b26fc9eb70fd193d487e98cb9563e53e7d369f785
 EBUILD ffmpeg-0.4.9_p20050226-r3.ebuild 4373 RMD160 511095c4ea2560216773626b41faf450aec3c671 SHA1 8c370e5a0878fef1757c16e40d26c2e26f48047f SHA256 154be70b4a9c44387cd0307f2f0592455f82d65c277129905e72142870deb7ea
-EBUILD ffmpeg-0.4.9_p20051216.ebuild 5758 RMD160 024dead83d8caf9dd103521f8a73e3bfe03c576b SHA1 05a1784ca09e29de8fed90b0ecbe4cca8a054b58 SHA256 4afa2d9b1e4c9a42a5f27b3bc10cd8ca19b58822e192a53e39790b4db906062c
-EBUILD ffmpeg-0.4.9_p20060302.ebuild 7804 RMD160 2546fc9db991d17c3cb5de45a906df70e3877795 SHA1 bb6d485eb4b456fd7962ba3ce40e228017222838 SHA256 df1d2edf7fc5f20086b29282dc8d693829aad2da3cdb0acdf00ce3e8d0e12bca
-EBUILD ffmpeg-0.4.9_p20060530.ebuild 7515 RMD160 b419e79f85f876936d1abf06fc7a4d4afa17fb0c SHA1 372dbd59d8950b237ddb6c46ebf369c249ca26c0 SHA256 3a9cc77e2ef2af9e74290013976398157743ed07e35698e9cf3b673bf8adef03
-EBUILD ffmpeg-0.4.9_p20060816.ebuild 5525 RMD160 847e46487307f3aa6e39a10ddbcd0c7a15276c05 SHA1 eeb2f84fe553b6b4091fd45a20f4078aa54207f6 SHA256 551856db4d7337e8c2409f020ac3aa4d1e0f23dd92cce370e7608304174b0f5d
-EBUILD ffmpeg-0.4.9_p20061016.ebuild 5734 RMD160 3867f49d69403b0e1972c972142ed59f01c2b8eb SHA1 b6c99144447112e4a1f5a6accffc00dc2d0592fa SHA256 09d919bdc293026153898ce7589d4df27d3be9eec52eb9dd873bad91b5741309
-EBUILD ffmpeg-0.4.9_p20070129.ebuild 5744 RMD160 68681a135d747a8e81a91d8b11e914d8552aef21 SHA1 191939e46c836c0af40221f14913fb66cd945d8c SHA256 08722091a88ed0ef81243d92fe9b46f33fb086a217bfb74ecb0f44c72ba50af3
-EBUILD ffmpeg-0.4.9_p20070325.ebuild 6113 RMD160 f1740ec240aa542530763a0639545964fbf5f380 SHA1 ce836934c9d9185b9f3ed615658e8f49c07d98fe SHA256 8b59f033cd467b52255a7c81b342ae2aa5ffa6e597aed15f4a055bb356a9fac8
-EBUILD ffmpeg-0.4.9_p20070330.ebuild 6182 RMD160 157ca8a0789e707ec79560b1de157afdc3c48a6f SHA1 9f51fdda8bd5bf3f4b695165db68137cdc1837bf SHA256 9cb704db6817d46af4fec0b5eaa6b1a22b9c5c7f7b2197bc97319436f5e63560
+EBUILD ffmpeg-0.4.9_p20061016.ebuild 5658 RMD160 3834d6dcbd3d12b59836307e57ad03ba72dc341f SHA1 fe7bb122a674711c498589c867e8414476c3d38c SHA256 4c845ec72eedcd21d10be8a61f632508ff3fc982103908cbc35e973be98ddee6
+EBUILD ffmpeg-0.4.9_p20070330.ebuild 6103 RMD160 f93cf816b1218589d4c523bdf7816757534a9d31 SHA1 d699bc6a277318daa8b19ae065f03ff24a3db0c8 SHA256 5b043e1a9ea9d83de4fb823d2a0a5e9951d42571e102b0c8c7645a349853c53c
 EBUILD ffmpeg-0.4.9_p20070525.ebuild 5517 RMD160 6481c671ad697adf8b2b315f63088ab92769baf6 SHA1 bffb4f642108ad98b2062d6c1ee8f63ade5b5bb6 SHA256 75cc3c53f035a67f3ec555076e6c0cd02478398ed08327e980f9dc7dd3ac9169
 EBUILD ffmpeg-0.4.9_p20070616-r1.ebuild 5660 RMD160 4a63c00d68449311368195ca81759a0f91697efb SHA1 f1e3d5b4e7cdc9d8ed4f58557a7481faff87dcc5 SHA256 d5c8785879246568087a80b0cf7ff324389caf4d379f3521aa629997285843fe
 EBUILD ffmpeg-0.4.9_p20070616-r2.ebuild 5732 RMD160 c5b44effa457bcf4347cc80a6bce8fbdecbd9ebf SHA1 bf0b4e65cf028abab71a8140c3dc2631be9f9c7f SHA256 e85473cce75c39c4122516b0c038436c3f6113a0129c851615d33a93172ec2c2
 EBUILD ffmpeg-0.4.9_p20070616.ebuild 5517 RMD160 d3bd76b5b77b8427710b4406a60d66f9f44ce392 SHA1 cdc7688d14784d7dff43f08cbf4440ed6d3a1854 SHA256 f039e913336d5483b94622b308730f05cb66a46673e6e21bb4a0897e54f17879
 EBUILD ffmpeg-0.4.9_p20080206.ebuild 5180 RMD160 2733ba5760f0b51470c17d769f9938cf60e3b7a2 SHA1 b79c78372b6c1a478bc0fee13e8b95baeff9fb74 SHA256 cad015057b62bcd32bfc3a136e4e83f7d578595e8d96f67bf85bc1214ac0340d
-MISC ChangeLog 31869 RMD160 07ddd2da4194d16849a6fae3056f563ac181b1e0 SHA1 9fcc9da7ca67d9e70263cd13ef6fe56e0d700694 SHA256 ee45a6081cf4bc223a443f2a1f4abfceeb368d58927b4503a301fc524f9a9787
+MISC ChangeLog 32283 RMD160 39eb123ad3f5dd796c9080103ed59670ba011310 SHA1 d081669ee96c3d44bc9a5bae2caecd9cdb1da5ee SHA256 ad8d9133d8d72b66d42b7f10bd706f4c14413636a690cd89b38d1d91163d53dc
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20051216.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20051216.ebuild
deleted file mode 100644
index ca7ad03cbe68..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20051216.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2007 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_p20051216.ebuild,v 1.25 2007/10/31 11:54:03 zzam Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.org/"
-MY_P=${P/_/-}
-S=${WORKDIR}
-S_BASE=${WORKDIR}/${MY_P}
-S_STATIC=${S_BASE}-static
-S_SHARED=${S_BASE}-shared
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# ~alpha need to test aac useflag
-# ~ia64 ~arm ~mips ~hppa
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="-* alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss test theora threads truetype v4l xvid dts network zlib sdl"
-
-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 )
-	ogg? ( media-libs/libogg )
-	vorbis? ( media-libs/libvorbis )
-	theora? ( media-libs/libtheora )
-	aac? ( media-libs/faad2 media-libs/faac )
-	a52? ( >=media-libs/a52dec-0.7.4-r4 )
-	xvid? ( >=media-libs/xvid-1.0.3 )
-	zlib? ( sys-libs/zlib )
-	dts? ( media-libs/libdts )
-	ieee1394? ( =media-libs/libdc1394-1*
-	            sys-libs/libraw1394 )
-	test? ( net-misc/wget )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S_BASE}
-
-	#Append -fomit-frame-pointer to avoid some common issues
-	use debug || append-flags "-fomit-frame-pointer"
-
-	# 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
-
-	epatch ${FILESDIR}/ffmpeg-unknown-options.patch
-	epatch ${FILESDIR}/ffmpeg-soname-symlink.patch
-	epatch "${FILESDIR}/${P}-asneeded-configure.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__/' \
-		libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \
-		libavcodec/msmpeg4.c \
-		libavutil/common.h \
-		|| die "sed failed (__PIC__)"
-
-	# Make it use pic always since we don't need textrels
-	sed -i -e "s:LIBOBJFLAGS=\"\":LIBOBJFLAGS=\'\$\(PIC\)\':" configure
-
-	# To make sure the ffserver test will work
-	sed -i -e "s:-e debug=off::" tests/server-regression.sh
-	cd ${S}
-	cp -R ${S_BASE} ${S_STATIC}
-	mv ${S_BASE} ${S_SHARED}
-
-	# Patch for gcc-4 shared build only
-	cd ${S_SHARED}
-	epatch ${FILESDIR}/ffmpeg-shared-gcc4.patch
-}
-
-src_compile() {
-	#Note; library makefiles don't propogate flags from config.mak so
-	#use specified CFLAGS are only used in executables
-	replace-flags -O0 -O2
-
-	local myconf=""
-
-	#disable mmx accelerated code if not requirested, or if PIC is required
-	# as the provided asm decidedly is not PIC.
-	if ( ! has_pic && use mmx ) || use amd64; then
-		myconf="${myconf} --enable-mmx"
-	else
-		myconf="${myconf} --disable-mmx"
-	fi
-
-	if use elibc_FreeBSD; then
-		myconf="${myconf} --enable-memalign-hack"
-	fi
-
-	myconf="${myconf}
-		$(use_enable altivec) \
-		$(use_enable debug) \
-		$(use_enable encode mp3lame) \
-		$(use_enable a52) --disable-a52bin \
-		$(use_enable oss audio-oss) \
-		$(use_enable v4l) \
-		$(use_enable ieee1394 dv1394) $(use_enable ieee1394 dc1394) \
-		$(use_enable threads pthreads) \
-		$(use_enable xvid) \
-		$(use_enable ogg libogg) \
-		$(use_enable vorbis) \
-		$(use_enable theora) \
-		$(use_enable dts) \
-		$(use_enable network) \
-		$(use_enable zlib) \
-		$(use_enable sdl ffplay) \
-		$(use_enable aac faad) $(use_enable aac faac) --disable-faadbin \
-		--cc=$(tc-getCC) \
-		--enable-gpl \
-		--enable-pp \
-		--disable-opts \
-		--disable-strip"
-
-	cd ${S_STATIC}
-	econf --disable-shared-pp --disable-shared --enable-static \
-		"--extra-ldflags=${LDFLAGS}" \
-		${myconf} || die "Configure failed"
-	emake || die "static failed"
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		ewarn ""
-		ewarn "Debug information will be almost useless as the frame pointer is omitted."
-		ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-		ewarn "difficult to fix. Please have that in mind."
-		ewarn ""
-	fi
-
-	cd ${S_SHARED}
-	econf --enable-shared-pp --enable-shared --disable-static \
-		"--extra-ldflags=${LDFLAGS}" \
-		${myconf} || die "Configure failed"
-	emake || die "shared failed"
-}
-
-src_install() {
-	for d in ${S_STATIC} ${S_SHARED}; do
-		cd ${d}
-
-		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}
-	use doc && make documentation
-	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
-}
-
-# Never die for now...
-src_test() {
-
-	for d in ${S_STATIC} ${S_SHARED}; do
-		cd ${d}/tests
-		for t in "codectest libavtest test-server" ; do
-			make ${t} || ewarn "Some tests in ${t} failed for ${d}"
-		done
-	done
-}
-
-pkg_postinst() {
-
-	ewarn "ffmpeg may have had ABI changes, if ffmpeg based programs"
-	ewarn "like xine-lib or vlc stop working as expected please"
-	ewarn "rebuild them."
-
-}
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
deleted file mode 100644
index d99cf60c9139..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2007 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_p20060302.ebuild,v 1.20 2007/10/31 11:54:03 zzam Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.org/"
-MY_P=${P/_/-}
-S=${WORKDIR}
-S_BASE=${WORKDIR}/${MY_P}
-S_STATIC=${S_BASE}-static
-S_SHARED=${S_BASE}-shared
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	amr? ( http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip
-	       http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-# ~alpha need to test aac useflag
-# ~ia64 ~arm ~mips ~hppa
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss
-	test theora threads truetype v4l x264 xvid dts network zlib sdl"
-
-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 )
-	ogg? ( media-libs/libogg )
-	vorbis? ( media-libs/libvorbis )
-	theora? ( media-libs/libtheora )
-	aac? ( media-libs/faad2 media-libs/faac )
-	a52? ( >=media-libs/a52dec-0.7.4-r4 )
-	xvid? ( >=media-libs/xvid-1.1.0 )
-	zlib? ( sys-libs/zlib )
-	dts? ( media-libs/libdts )
-	ieee1394? ( =media-libs/libdc1394-1*
-	            sys-libs/libraw1394 )
-	test? ( net-misc/wget )
-	x264? ( media-libs/x264-svn )
-	amr? ( app-arch/unzip )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S_BASE}
-
-	# amr (float) support
-	if use amr; then
-		einfo "Including amr wide and narrow band (float) support ... "
-
-		# narrow band codec
-		mkdir ${S_BASE}/libavcodec/amr_float
-		cd ${S_BASE}/libavcodec/amr_float
-		unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
-
-		# wide band codec
-		mkdir ${S_BASE}/libavcodec/amrwb_float
-		cd ${S_BASE}/libavcodec/amrwb_float
-		unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
-
-		# Patch if we're on 64-bit
-		if useq alpha || useq amd64 || useq ia64 || useq ppc64; then
-			cd ${S_BASE}
-			epatch ${FILESDIR}/${P}-amr-64bit.patch
-		fi
-	fi
-
-	cd ${S_BASE}
-
-	#Append -fomit-frame-pointer to avoid some common issues
-	use debug || append-flags "-fomit-frame-pointer"
-
-	# 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
-
-	epatch ${FILESDIR}/ffmpeg-unknown-options.patch
-	epatch "${FILESDIR}/${PN}-0.4.9_p20051216-asneeded-configure.patch"
-	epatch "${FILESDIR}/${P}-fbsd-flags.patch"
-
-	# .pc files contain wrong libdir path
-	epatch ${FILESDIR}/${PN}-libdir.patch
-	sed -i -e "s:GENTOOLIBDIR:$(get_libdir):" configure
-
-	# 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__/' \
-		libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \
-		libavcodec/msmpeg4.c \
-		libavutil/common.h \
-		|| die "sed failed (__PIC__)"
-
-	# Make it use pic always since we don't need textrels
-	sed -i -e "s:LIBOBJFLAGS=\"\":LIBOBJFLAGS=\'\$\(PIC\)\':" configure
-
-	# To make sure the ffserver test will work
-	sed -i -e "s:-e debug=off::" tests/server-regression.sh
-	cd ${S}
-	cp -R ${S_BASE} ${S_STATIC}
-	mv ${S_BASE} ${S_SHARED}
-	cd ${S_SHARED}
-	epatch "${FILESDIR}/ffmpeg-shared-gcc4.1.patch"
-}
-
-src_compile() {
-	#Note; library makefiles don't propogate flags from config.mak so
-	#use specified CFLAGS are only used in executables
-	replace-flags -O0 -O2
-
-	local myconf=""
-
-	#disable mmx accelerated code if not requested, or if PIC is required
-	# as the provided asm decidedly is not PIC.
-	if ( gcc-specs-pie || ! use mmx ) && ( ! use amd64 ); then
-		myconf="${myconf} --disable-mmx"
-	fi
-
-	if use elibc_FreeBSD; then
-		myconf="${myconf} --enable-memalign-hack"
-	fi
-
-	# enabled by default
-	use altivec || myconf="${myconf} --disable-altivec"
-	use debug || myconf="${myconf} --disable-debug"
-	use oss || myconf="${myconf} --disable-audio-oss"
-	use v4l || myconf="${myconf} --disable-v4l --disable-v4l2"
-	use ieee1394 || myconf="${myconf} --disable-dv1394"
-	use network || myconf="${myconf} --disable-network"
-	use zlib || myconf="${myconf} --disable-zlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	myconf="${myconf} --disable-opts"
-
-	# disabled by default
-	use encode && myconf="${myconf} --enable-mp3lame"
-	use a52 && myconf="${myconf} --enable-a52"
-	use ieee1394 && myconf="${myconf} --enable-dc1394"
-	use threads && myconf="${myconf} --enable-pthreads"
-	use xvid && myconf="${myconf} --enable-xvid"
-	use ogg && myconf="${myconf} --enable-libogg"
-	use vorbis && myconf="${myconf} --enable-vorbis"
-	use theora && myconf="${myconf} --enable-theora"
-	use dts && myconf="${myconf} --enable-dts"
-	use x264 && myconf="${myconf} --enable-x264"
-	use aac && myconf="${myconf} --enable-faad --enable-faac"
-	use amr && myconf="${myconf} --enable-amr_nb --enable-amr_wb"
-
-	myconf="${myconf} --enable-gpl --enable-pp --disable-strip"
-
-	cd ${S_STATIC}
-	#econf generates configure options unknown to ffmpeg's configure, so configure manually
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-static --disable-shared \
-		"--cc=$(tc-getCC)" \
-		"--extra-ldflags=${LDFLAGS}" \
-		${myconf} || die "static failed"
-
-	emake || die "static failed"
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if (use debug); then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	# This is needed to make sure that when linking with --as-needed all the
-	# libraries are found in the right places, not suitable for upstream yet as
-	# it's GNU-ld only (most likely).
-	append-ldflags "-Wl,-rpath-link,${S_SHARED}/libav"{codec,format,util}
-
-	cd ${S_SHARED}
-	#econf generates configure options unknown to ffmpeg's configure, so configure manually
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--disable-static --enable-shared \
-		"--cc=$(tc-getCC)" \
-		"--extra-ldflags=${LDFLAGS}" \
-		${myconf} || die "shared failed"
-
-	emake || die "shared failed"
-}
-
-src_install() {
-	for d in ${S_STATIC} ${S_SHARED}; do
-		cd ${d}
-
-		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 install-libs || die "Install Failed"
-	done
-
-	cd ${S_SHARED}
-	use doc && make documentation
-	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
-}
-
-# Never die for now...
-src_test() {
-
-	for d in ${S_STATIC} ${S_SHARED}; do
-		cd ${d}/tests
-		for t in "codectest libavtest test-server" ; do
-			make ${t} || ewarn "Some tests in ${t} failed for ${d}"
-		done
-	done
-}
-
-pkg_postinst() {
-
-	ewarn "ffmpeg may have had ABI changes, if ffmpeg based programs"
-	ewarn "like xine-lib or vlc stop working as expected please"
-	ewarn "rebuild them."
-
-}
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild
deleted file mode 100644
index de33140ef155..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2007 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_p20060530.ebuild,v 1.27 2007/10/31 11:54:03 zzam Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.org/"
-MY_P=${P/_/-}
-S=${WORKDIR}
-S_BASE=${WORKDIR}/${MY_P}
-S_STATIC=${S_BASE}-static
-S_SHARED=${S_BASE}-shared
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	amr? ( http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip
-		   http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* alpha amd64 hppa ppc ppc64 x86 ~x86-fbsd" #~alpha ~arm ~hppa ~ia64 ~ppc ~ppc64
-IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss
-	test theora threads truetype v4l x264 xvid dts network zlib sdl"
-
-RDEPEND="imlib? ( media-libs/imlib2 )
-	truetype? ( >=media-libs/freetype-2 )
-	sdl? ( >=media-libs/libsdl-1.2.1 )
-	encode? ( media-sound/lame )
-	ogg? ( media-libs/libogg )
-	vorbis? ( media-libs/libvorbis )
-	theora? ( media-libs/libtheora )
-	aac? ( media-libs/faad2 media-libs/faac )
-	a52? ( >=media-libs/a52dec-0.7.4-r4 )
-	xvid? ( >=media-libs/xvid-1.1.0 )
-	zlib? ( sys-libs/zlib )
-	dts? ( media-libs/libdts )
-	ieee1394? ( =media-libs/libdc1394-1*
-				sys-libs/libraw1394 )
-	x264? ( =media-libs/x264-svn-20060612 )"
-
-DEPEND="${RDEPEND}
-	test? ( net-misc/wget )
-	doc? ( app-text/texi2html )
-	amr? ( app-arch/unzip )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S_BASE}
-
-	# amr (float) support
-	if use amr; then
-		einfo "Including amr wide and narrow band (float) support ... "
-
-		# narrow band codec
-		mkdir ${S_BASE}/libavcodec/amr_float
-		cd ${S_BASE}/libavcodec/amr_float
-		unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
-
-		# wide band codec
-		mkdir ${S_BASE}/libavcodec/amrwb_float
-		cd ${S_BASE}/libavcodec/amrwb_float
-		unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
-
-		# Patch if we're on 64-bit
-		if useq alpha || useq amd64 || useq ia64 || useq ppc64; then
-			cd ${S_BASE}
-			epatch "${FILESDIR}/ffmpeg-0.4.9_p20060302-amr-64bit.patch"
-		fi
-	fi
-
-	cd ${S_BASE}
-
-	#Append -fomit-frame-pointer to avoid some common issues
-	use debug || append-flags "-fomit-frame-pointer"
-
-	# 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
-
-	epatch ${FILESDIR}/ffmpeg-unknown-options.patch
-	epatch ${FILESDIR}/${P}-snow-mmx.patch
-
-	# .pc files contain wrong libdir path
-	epatch ${FILESDIR}/${PN}-libdir.patch
-	sed -i -e "s:GENTOOLIBDIR:$(get_libdir):" configure
-
-	# 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__/' \
-		libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \
-		libavcodec/i386/mpegvideo_mmx_template.c \
-		libavcodec/libpostproc/mangle.h \
-		libavcodec/libpostproc/postprocess_template.c \
-		libavcodec/msmpeg4.c \
-		libavutil/common.h \
-		|| die "sed failed (__PIC__)"
-
-	# Make it use pic always since we don't need textrels
-	sed -i -e "s:LIBOBJFLAGS=\"\":LIBOBJFLAGS=\'\$\(PIC\)\':" configure
-
-	# To make sure the ffserver test will work
-	sed -i -e "s:-e debug=off::" tests/server-regression.sh
-	cd ${S}
-	cp -R ${S_BASE} ${S_STATIC}
-	mv ${S_BASE} ${S_SHARED}
-	cd ${S_SHARED}
-	epatch "${FILESDIR}/ffmpeg-shared-gcc4.1.patch"
-}
-
-src_compile() {
-	#Note; library makefiles don't propogate flags from config.mak so
-	#use specified CFLAGS are only used in executables
-	replace-flags -O0 -O2
-
-	local myconf=""
-
-	#disable mmx accelerated code if not requested, or if PIC is required
-	# as the provided asm decidedly is not PIC.
-	if ( gcc-specs-pie || ! use mmx ) && ( ! use amd64 ); then
-		myconf="${myconf} --disable-mmx"
-	fi
-
-	if use elibc_FreeBSD; then
-		myconf="${myconf} --enable-memalign-hack"
-	fi
-
-	# enabled by default
-	use altivec || myconf="${myconf} --disable-altivec"
-	use debug || myconf="${myconf} --disable-debug"
-	use oss || myconf="${myconf} --disable-audio-oss"
-	use v4l || myconf="${myconf} --disable-v4l --disable-v4l2"
-	use ieee1394 || myconf="${myconf} --disable-dv1394"
-	use network || myconf="${myconf} --disable-network"
-	use zlib || myconf="${myconf} --disable-zlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	myconf="${myconf} --disable-opts"
-
-	# disabled by default
-	use encode && myconf="${myconf} --enable-mp3lame"
-	use a52 && myconf="${myconf} --enable-a52"
-	use ieee1394 && myconf="${myconf} --enable-dc1394"
-	use threads && myconf="${myconf} --enable-pthreads"
-	use xvid && myconf="${myconf} --enable-xvid"
-	use ogg && myconf="${myconf} --enable-libogg"
-	use vorbis && myconf="${myconf} --enable-vorbis"
-	use theora && myconf="${myconf} --enable-theora"
-	use dts && myconf="${myconf} --enable-dts"
-	use x264 && myconf="${myconf} --enable-x264"
-	use aac && myconf="${myconf} --enable-faad --enable-faac"
-	use amr && myconf="${myconf} --enable-amr_nb --enable-amr_wb"
-
-	myconf="${myconf} --enable-gpl --enable-pp --disable-strip"
-
-	cd ${S_STATIC}
-	#econf generates configure options unknown to ffmpeg's configure, so configure manually
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-static --disable-shared \
-		"--cc=$(tc-getCC)" \
-		${myconf} || die "static failed"
-
-	emake || die "static failed"
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if (use debug); then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	cd ${S_SHARED}
-	#econf generates configure options unknown to ffmpeg's configure, so configure manually
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--disable-static --enable-shared \
-		"--cc=$(tc-getCC)" \
-		${myconf} || die "shared failed"
-
-	emake || die "shared failed"
-}
-
-src_install() {
-	for d in ${S_STATIC} ${S_SHARED}; do
-		cd ${d}
-
-		make DESTDIR=${D} \
-			LDCONFIG=true \
-			prefix=${D}/usr \
-			libdir=${D}/usr/$(get_libdir) \
-			mandir=${D}/usr/share/man \
-			infodir=${D}/usr/share/info \
-			bindir=${D}/usr/bin \
-			install install-libs || die "Install Failed"
-	done
-
-	cd ${S_SHARED}
-	use doc && make documentation
-	dodoc Changelog README INSTALL
-	dodoc doc/*
-
-	cd ${S_STATIC}/libavcodec/libpostproc
-	make LDCONFIG=true prefix=${D}/usr libdir=${D}/usr/$(get_libdir) \
-		install || die "Failed to install libpostproc.a!"
-
-	cd ${S_SHARED}/libavcodec/libpostproc
-	make LDCONFIG=true 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
-}
-
-# Never die for now...
-src_test() {
-
-	for d in ${S_STATIC} ${S_SHARED}; do
-		cd ${d}/tests
-		for t in "codectest libavtest test-server" ; do
-			make ${t} || ewarn "Some tests in ${t} failed for ${d}"
-		done
-	done
-}
-
-pkg_postinst() {
-
-	ewarn "ffmpeg may have had ABI changes, if ffmpeg based programs"
-	ewarn "like xine-lib or vlc stop working as expected please"
-	ewarn "rebuild them."
-
-}
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild
deleted file mode 100644
index 4f91fb78591a..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2007 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_p20060816.ebuild,v 1.9 2007/10/31 11:54:03 zzam Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.org/"
-MY_P=${P/_/-}
-S=${WORKDIR}/ffmpeg
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	amr? ( http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip
-		   http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss
-	test theora threads truetype v4l x264 xvid dts network zlib sdl"
-
-RDEPEND="imlib? ( media-libs/imlib2 )
-	truetype? ( >=media-libs/freetype-2 )
-	sdl? ( >=media-libs/libsdl-1.2.10 )
-	encode? ( media-sound/lame )
-	ogg? ( media-libs/libogg )
-	vorbis? ( media-libs/libvorbis )
-	aac? ( media-libs/faad2 media-libs/faac )
-	a52? ( >=media-libs/a52dec-0.7.4-r4 )
-	xvid? ( >=media-libs/xvid-1.1.0 )
-	zlib? ( sys-libs/zlib )
-	dts? ( media-libs/libdts )
-	ieee1394? ( =media-libs/libdc1394-1*
-				sys-libs/libraw1394 )
-	x264? ( >=media-libs/x264-svn-20060810 )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/texi2html )
-	test? ( net-misc/wget )
-	amr? ( app-arch/unzip )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# amr (float) support
-	if use amr; then
-		einfo "Including amr wide and narrow band (float) support ... "
-
-		# narrow band codec
-		mkdir ${S}/libavcodec/amr_float
-		cd ${S}/libavcodec/amr_float
-		unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
-
-		# wide band codec
-		mkdir ${S}/libavcodec/amrwb_float
-		cd ${S}/libavcodec/amrwb_float
-		unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
-
-		# Patch if we're on 64-bit
-		if useq alpha || useq amd64 || useq ia64 || useq ppc64; then
-			cd ${S}
-			epatch "${FILESDIR}/ffmpeg-0.4.9_p20060302-amr-64bit.patch"
-		fi
-	fi
-
-	cd ${S}
-
-	#Append -fomit-frame-pointer to avoid some common issues
-	use debug || append-flags "-fomit-frame-pointer"
-
-	# 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
-
-	# .pc files contain wrong libdir path
-	epatch ${FILESDIR}/${PN}-libdir.patch
-	sed -i -e "s:GENTOOLIBDIR:$(get_libdir):" configure
-
-	# Make it use pic always since we don't need textrels
-	sed -i -e "s:LIBOBJFLAGS=\"\":LIBOBJFLAGS=\'\$\(PIC\)\':" configure
-
-	# To make sure the ffserver test will work
-	sed -i -e "s:-e debug=off::" tests/server-regression.sh
-
-	epatch "${FILESDIR}/${PN}-shared-gcc4.1.patch"
-}
-
-src_compile() {
-	replace-flags -O0 -O2
-
-	local myconf="${EXTRA_ECONF}"
-
-	#disable mmx accelerated code if not requested, or if PIC is required
-	# as the provided asm decidedly is not PIC.
-	if ( gcc-specs-pie || ! use mmx ) && ( ! use amd64 ); then
-		myconf="${myconf} --disable-mmx"
-	fi
-
-	# enabled by default
-	use altivec || myconf="${myconf} --disable-altivec"
-	use debug || myconf="${myconf} --disable-debug"
-	use oss || myconf="${myconf} --disable-audio-oss"
-	use v4l || myconf="${myconf} --disable-v4l --disable-v4l2"
-	use ieee1394 || myconf="${myconf} --disable-dv1394"
-	use network || myconf="${myconf} --disable-network"
-	use zlib || myconf="${myconf} --disable-zlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	myconf="${myconf} --disable-opts"
-
-	# disabled by default
-	use encode && myconf="${myconf} --enable-mp3lame"
-	use a52 && myconf="${myconf} --enable-a52"
-	use ieee1394 && myconf="${myconf} --enable-dc1394"
-	use threads && myconf="${myconf} --enable-pthreads"
-	use xvid && myconf="${myconf} --enable-xvid"
-	if use vorbis
-	then
-		myconf="${myconf} --enable-vorbis --enable-libogg"
-	else
-		use ogg && myconf="${myconf} --enable-libogg"
-	fi
-	use dts && myconf="${myconf} --enable-dts"
-	use x264 && myconf="${myconf} --enable-x264"
-	use aac && myconf="${myconf} --enable-faad --enable-faac"
-	use amr && myconf="${myconf} --enable-amr_nb --enable-amr_wb"
-
-	myconf="${myconf} --enable-gpl --enable-pp --disable-strip"
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if (use debug); then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	cd ${S}
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--shlibdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man \
-		--enable-static --enable-shared \
-		"--cc=$(tc-getCC)" \
-		${myconf} || die "configure failed"
-
-	emake -j1 depend || die "depend failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake -j1 LDCONFIG=true DESTDIR=${D} install || die "Install Failed"
-
-	use doc && emake -j1 documentation
-	dodoc Changelog README INSTALL
-	dodoc doc/*
-}
-
-# Never die for now...
-src_test() {
-	cd ${S}/tests
-	for t in "codectest libavtest test-server" ; do
-		make ${t} || ewarn "Some tests in ${t} failed"
-	done
-}
-
-pkg_postinst() {
-	ewarn "ffmpeg may have had ABI changes, if ffmpeg based programs"
-	ewarn "like xine-lib or vlc stop working as expected please"
-	ewarn "rebuild them."
-}
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild
index 9d1e232ae927..f05cda1fa1d4 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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_p20061016.ebuild,v 1.15 2007/10/31 11:54:03 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild,v 1.16 2008/02/14 15:17:09 drac Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss
-	test theora threads truetype v4l x264 xvid dts network zlib sdl"
+	test theora threads truetype v4l x264 xvid network zlib sdl"
 
 RDEPEND="imlib? ( media-libs/imlib2 )
 	truetype? ( >=media-libs/freetype-2 )
@@ -29,7 +29,6 @@ RDEPEND="imlib? ( media-libs/imlib2 )
 	a52? ( >=media-libs/a52dec-0.7.4-r4 )
 	xvid? ( >=media-libs/xvid-1.1.0 )
 	zlib? ( sys-libs/zlib )
-	dts? ( media-libs/libdts )
 	ieee1394? ( =media-libs/libdc1394-1*
 				sys-libs/libraw1394 )
 	x264? ( >=media-libs/x264-svn-20061014 )"
@@ -124,7 +123,6 @@ src_compile() {
 	else
 		use ogg && myconf="${myconf} --enable-libogg"
 	fi
-	use dts && myconf="${myconf} --enable-dts"
 	use x264 && myconf="${myconf} --enable-x264"
 	use aac && myconf="${myconf} --enable-faad --enable-faac"
 	use amr && myconf="${myconf} --enable-amr_nb --enable-amr_wb"
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070129.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070129.ebuild
deleted file mode 100644
index 5bd436699628..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20070129.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2007 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_p20070129.ebuild,v 1.9 2007/10/31 11:54:03 zzam Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.org/"
-MY_P=${P/_/-}
-S=${WORKDIR}/ffmpeg
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	amr? ( http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip
-		   http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss
-	test theora threads truetype v4l x264 xvid dts network zlib sdl"
-
-RDEPEND="imlib? ( media-libs/imlib2 )
-	truetype? ( >=media-libs/freetype-2 )
-	sdl? ( >=media-libs/libsdl-1.2.10 )
-	encode? ( media-sound/lame )
-	ogg? ( media-libs/libogg )
-	vorbis? ( media-libs/libvorbis )
-	aac? ( media-libs/faad2 media-libs/faac )
-	a52? ( >=media-libs/a52dec-0.7.4-r4 )
-	xvid? ( >=media-libs/xvid-1.1.0 )
-	zlib? ( sys-libs/zlib )
-	dts? ( media-libs/libdts )
-	ieee1394? ( =media-libs/libdc1394-1*
-				sys-libs/libraw1394 )
-	x264? ( >=media-libs/x264-svn-20061014 )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/texi2html )
-	test? ( net-misc/wget )
-	amr? ( app-arch/unzip )"
-# Make sure the mmx USE flag is unmasked
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# amr (float) support
-	if use amr; then
-		einfo "Including amr wide and narrow band (float) support ... "
-
-		# narrow band codec
-		mkdir ${S}/libavcodec/amr_float
-		cd ${S}/libavcodec/amr_float
-		unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
-
-		# wide band codec
-		mkdir ${S}/libavcodec/amrwb_float
-		cd ${S}/libavcodec/amrwb_float
-		unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
-
-		# Patch if we're on 64-bit
-		if useq alpha || useq amd64 || useq ia64 || useq ppc64; then
-			cd ${S}
-			epatch "${FILESDIR}/ffmpeg-0.4.9_p20060302-amr-64bit.patch"
-		fi
-	fi
-
-	cd ${S}
-
-	#Append -fomit-frame-pointer to avoid some common issues
-	use debug || append-flags "-fomit-frame-pointer"
-
-	# 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
-
-	# .pc files contain wrong libdir path
-	epatch ${FILESDIR}/${PN}-libdir-2007.patch
-	sed -i -e "s:GENTOOLIBDIR:$(get_libdir):" configure
-
-	# Make it use pic always since we don't need textrels
-	sed -i -e "s:LIBOBJFLAGS=\"\":LIBOBJFLAGS=\'\$\(PIC\)\':" configure
-
-	# To make sure the ffserver test will work
-	sed -i -e "s:-e debug=off::" tests/server-regression.sh
-
-	epatch "${FILESDIR}/${PN}-shared-gcc4.1.patch"
-}
-
-src_compile() {
-	replace-flags -O0 -O2
-	#x86, what a wonderful arch....
-	replace-flags -O1 -O2
-	local myconf="${EXTRA_ECONF}"
-
-	#disable mmx accelerated code if not requested, or if PIC is required
-	# as the provided asm decidedly is not PIC.
-	if ( gcc-specs-pie || ! use mmx ) ; then
-		myconf="${myconf} --disable-mmx"
-	fi
-
-	# enabled by default
-	use altivec || myconf="${myconf} --disable-altivec"
-	use debug || myconf="${myconf} --disable-debug"
-	use oss || myconf="${myconf} --disable-audio-oss"
-	use v4l || myconf="${myconf} --disable-v4l --disable-v4l2"
-	use ieee1394 || myconf="${myconf} --disable-dv1394"
-	use network || myconf="${myconf} --disable-network"
-	use zlib || myconf="${myconf} --disable-zlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	myconf="${myconf} --disable-opts"
-
-	# disabled by default
-	use encode && myconf="${myconf} --enable-mp3lame"
-	use a52 && myconf="${myconf} --enable-a52"
-	use ieee1394 && myconf="${myconf} --enable-dc1394"
-	use threads && myconf="${myconf} --enable-pthreads"
-	use xvid && myconf="${myconf} --enable-xvid"
-	if use vorbis
-	then
-		myconf="${myconf} --enable-vorbis --enable-libogg"
-	else
-		use ogg && myconf="${myconf} --enable-libogg"
-	fi
-	use dts && myconf="${myconf} --enable-dts"
-	use x264 && myconf="${myconf} --enable-x264"
-	use aac && myconf="${myconf} --enable-faad --enable-faac"
-	use amr && myconf="${myconf} --enable-amr_nb --enable-amr_wb"
-
-	myconf="${myconf} --enable-gpl --enable-pp --disable-strip"
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if (use debug); then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	cd ${S}
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--shlibdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man \
-		--enable-static --enable-shared \
-		"--cc=$(tc-getCC)" \
-		${myconf} || die "configure failed"
-
-	emake -j1 depend || die "depend failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake -j1 LDCONFIG=true DESTDIR=${D} install || die "Install Failed"
-
-	use doc && emake -j1 documentation
-	dodoc Changelog README INSTALL
-	dodoc doc/*
-}
-
-# Never die for now...
-src_test() {
-	cd ${S}/tests
-	for t in "codectest libavtest test-server" ; do
-		make ${t} || ewarn "Some tests in ${t} failed"
-	done
-}
-
-pkg_postinst() {
-	ewarn "ffmpeg may have had ABI changes, if ffmpeg based programs"
-	ewarn "like xine-lib or vlc stop working as expected please"
-	ewarn "rebuild them."
-}
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070325.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070325.ebuild
deleted file mode 100644
index 9a88ed40f3be..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20070325.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2007 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_p20070325.ebuild,v 1.6 2007/10/31 11:54:03 zzam Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec. SVN revision 8519"
-HOMEPAGE="http://ffmpeg.org/"
-MY_P=${P/_/-}
-S=${WORKDIR}/ffmpeg
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	amr? ( http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip
-		   http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss
-	test theora threads truetype v4l x264 xvid dts network zlib sdl X"
-
-RDEPEND="imlib? ( media-libs/imlib2 )
-	truetype? ( >=media-libs/freetype-2 )
-	sdl? ( >=media-libs/libsdl-1.2.10 )
-	encode? ( media-sound/lame
-		vorbis? ( media-libs/libvorbis )
-		theora? ( media-libs/libtheora ) )
-	ogg? ( media-libs/libogg )
-	aac? ( media-libs/faad2 media-libs/faac )
-	a52? ( >=media-libs/a52dec-0.7.4-r4 )
-	xvid? ( >=media-libs/xvid-1.1.0 )
-	zlib? ( sys-libs/zlib )
-	dts? ( media-libs/libdts )
-	ieee1394? ( =media-libs/libdc1394-1*
-				sys-libs/libraw1394 )
-	x264? ( >=media-libs/x264-svn-20061014 )
-	X? ( x11-libs/libX11 x11-libs/libXext )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/texi2html )
-	test? ( net-misc/wget )
-	amr? ( app-arch/unzip )"
-# Make sure the mmx USE flag is unmasked
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# amr (float) support
-	if use amr; then
-		einfo "Including amr wide and narrow band (float) support ... "
-
-		# narrow band codec
-		mkdir ${S}/libavcodec/amr_float
-		cd ${S}/libavcodec/amr_float
-		unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
-
-		# wide band codec
-		mkdir ${S}/libavcodec/amrwb_float
-		cd ${S}/libavcodec/amrwb_float
-		unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
-
-		# Patch if we're on 64-bit
-		if useq alpha || useq amd64 || useq ia64 || useq ppc64; then
-			cd ${S}
-			epatch "${FILESDIR}/ffmpeg-0.4.9_p20060302-amr-64bit.patch"
-		fi
-	fi
-
-	cd ${S}
-
-	#Append -fomit-frame-pointer to avoid some common issues
-	use debug || append-flags "-fomit-frame-pointer"
-
-	# 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
-
-	# .pc files contain wrong libdir path
-	epatch ${FILESDIR}/${PN}-libdir-2007.patch
-	sed -i -e "s:GENTOOLIBDIR:$(get_libdir):" configure
-
-	# Make it use pic always since we don't need textrels
-	sed -i -e "s:LIBOBJFLAGS=\"\":LIBOBJFLAGS=\'\$\(PIC\)\':" configure
-
-	# To make sure the ffserver test will work
-	sed -i -e "s:-e debug=off::" tests/server-regression.sh
-
-	epatch "${FILESDIR}/${PN}-shared-gcc4.1.patch"
-}
-
-src_compile() {
-	replace-flags -O0 -O2
-	#x86, what a wonderful arch....
-	replace-flags -O1 -O2
-	local myconf="${EXTRA_ECONF}"
-
-	#disable mmx accelerated code if not requested, or if PIC is required
-	# as the provided asm decidedly is not PIC.
-	if ( gcc-specs-pie || ! use mmx ) ; then
-		myconf="${myconf} --disable-mmx"
-	fi
-
-	# enabled by default
-	use altivec || myconf="${myconf} --disable-altivec"
-	use debug || myconf="${myconf} --disable-debug"
-	use oss || myconf="${myconf} --disable-audio-oss"
-	use v4l || myconf="${myconf} --disable-v4l --disable-v4l2"
-	use ieee1394 || myconf="${myconf} --disable-dv1394"
-	use network || myconf="${myconf} --disable-network"
-	use zlib || myconf="${myconf} --disable-zlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	myconf="${myconf} --disable-opts"
-
-	# disabled by default
-	if use encode
-	then
-		myconf="${myconf} --enable-libmp3lame"
-		use vorbis && myconf="${myconf} --enable-libvorbis --enable-libogg"
-		use theora && myconf="${myconf} --enable-libtheora --enable-libogg"
-	fi
-	use a52 && myconf="${myconf} --enable-liba52"
-	use ieee1394 && myconf="${myconf} --enable-dc1394"
-	use threads && myconf="${myconf} --enable-pthreads"
-	use xvid && myconf="${myconf} --enable-xvid"
-	use X && myconf="${myconf} --enable-x11grab"
-	use ogg && myconf="${myconf} --enable-libogg"
-	use dts && myconf="${myconf} --enable-libdts"
-	use x264 && myconf="${myconf} --enable-x264"
-	use aac && myconf="${myconf} --enable-libfaad --enable-libfaac"
-	use amr && myconf="${myconf} --enable-amr-nb --enable-amr-wb \
-								 --enable-amr-if2"
-
-	myconf="${myconf} --enable-gpl --enable-pp --disable-strip \
-					  --enable-swscaler"
-
-	tc-is-cross-compiler && myconf="${myconf} --cross-compile --arch=$(tc-arch-kernel)"
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if (use debug); then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	cd ${S}
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--shlibdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man \
-		--enable-static --enable-shared \
-		"--cc=$(tc-getCC)" \
-		${myconf} || die "configure failed"
-
-	emake -j1 depend || die "depend failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake -j1 LDCONFIG=true DESTDIR=${D} install || die "Install Failed"
-
-	use doc && emake -j1 documentation
-	dodoc Changelog README INSTALL
-	dodoc doc/*
-}
-
-# Never die for now...
-src_test() {
-	cd ${S}/tests
-	for t in "codectest libavtest test-server" ; do
-		make ${t} || ewarn "Some tests in ${t} failed"
-	done
-}
-
-pkg_postinst() {
-	ewarn "ffmpeg may have had ABI changes, if ffmpeg based programs"
-	ewarn "like xine-lib or vlc stop working as expected please"
-	ewarn "rebuild them."
-}
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild
index c981a26f0359..23720683625c 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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_p20070330.ebuild,v 1.12 2007/10/31 11:54:03 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild,v 1.13 2008/02/14 15:17:09 drac Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss
-	test theora threads truetype v4l x264 xvid dts network zlib sdl X"
+	test theora threads truetype v4l x264 xvid network zlib sdl X"
 
 RDEPEND="imlib? ( media-libs/imlib2 )
 	truetype? ( >=media-libs/freetype-2 )
@@ -31,7 +31,6 @@ RDEPEND="imlib? ( media-libs/imlib2 )
 	a52? ( >=media-libs/a52dec-0.7.4-r4 )
 	xvid? ( >=media-libs/xvid-1.1.0 )
 	zlib? ( sys-libs/zlib )
-	dts? ( media-libs/libdts )
 	ieee1394? ( =media-libs/libdc1394-1*
 				sys-libs/libraw1394 )
 	x264? ( >=media-libs/x264-svn-20061014 )
@@ -130,7 +129,6 @@ src_compile() {
 	use xvid && myconf="${myconf} --enable-xvid"
 	use X && myconf="${myconf} --enable-x11grab"
 	use ogg && myconf="${myconf} --enable-libogg"
-	use dts && myconf="${myconf} --enable-libdts"
 	use x264 && myconf="${myconf} --enable-x264"
 	use aac && myconf="${myconf} --enable-libfaad --enable-libfaac"
 	use amr && myconf="${myconf} --enable-amr-nb --enable-amr-wb \