Remove USE dts from some old ebuilds, and remove some entirely because libdts is replaced by libdca.

(Portage version: 2.1.4.4)

9 files changed, 15 insertions, 1246 deletions

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/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 \