remove old

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

5 files changed, 17 insertions, 557 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index d7e80008e49e..c49b8a42d14b 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.348 2010/04/23 12:53:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.349 2010/05/11 09:37:34 aballier Exp $
+
+  11 May 2010; Alexis Ballier <aballier@gentoo.org>
+  -ffmpeg-0.5_p20601-r1.ebuild, -ffmpeg-0.5_p21602.ebuild,
+  -files/ffmpeg-0.5_p20601-r1-libtheora.patch:
+  remove old
 
   23 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
   ffmpeg-0.5_p20373.ebuild, ffmpeg-0.5_p20601-r1.ebuild,
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index b94357f8c949..68e4a68e980e 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,12 +1,17 @@
-AUX ffmpeg-0.5_p20601-r1-libtheora.patch 1067 RMD160 58c172ffa186d616462405cec7cbc17e085e7d8e SHA1 0c4154a7ee429f8bc4b28204b9b3385d2c949e64 SHA256 bde37379b335a0505addc15697d807f3536843747556b61591333dded1a05be5
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ffmpeg-0.5_p20373.tar.bz2 3087600 RMD160 6a960e0837f419c882c7bd18c91f582df0e19c58 SHA1 ddf5d0389586d8ceb2979e0804a7b80a9640aad4 SHA256 2a217144c82f11c80f325c653157bd9fc5424dc43a2b2ccbc8eb03a01d33418d
-DIST ffmpeg-0.5_p20601.tar.bz2 3103450 RMD160 0fb6ebf92673510ab4118422dcbb7f96b0d47e4f SHA1 38211d48ffcab03c83d0cf2043e3c931041a6928 SHA256 3e79c8245ab66d3eda907d5857a9cecda164a9eacfa83e52322760260519ade4
-DIST ffmpeg-0.5_p21602.tar.bz2 3212091 RMD160 af9abf8e67c95abf92f6651f8c7ccf6e5c81faff SHA1 849ff09f3762cec3d864d46524f2237c05a30554 SHA256 abb889364577a5c01f3018b58e36a9cd3db64bc2a15b9ecbdeb0d0cdb8d8babe
 DIST ffmpeg-0.5_p22846.tar.bz2 3675057 RMD160 3ebd997321d59fa0baf87329518e925ccbed3cf8 SHA1 d207570ed009b63c94485ccc64439107cf700f39 SHA256 a52d82476afa7c8ed62c1a52760e49907947c1ef1ecfc3e9022fa713e9783f2f
 EBUILD ffmpeg-0.5_p20373.ebuild 7726 RMD160 6a30c400850e5db57fbae395cbf29daee2067aab SHA1 aff753318e267974fd6516f056352bc769329add SHA256 1f08d25a8b1e5bc708437218e6e8c05c7579ba6945e2d8ab8561a733e23d413c
-EBUILD ffmpeg-0.5_p20601-r1.ebuild 7933 RMD160 572c0cf0f88b89e72fb683458c51ed5f8092137d SHA1 a4c977064d594877e2332244bfaf1c02f87d3e81 SHA256 e1d6c4fa5b8a9c345e33c37d33fda6080ea8578cd3b45c46b028c2fa7098cb5a
-EBUILD ffmpeg-0.5_p21602.ebuild 7730 RMD160 cd2e73f093eff607eeb72737cd74646e53e7176e SHA1 32289e8679bc9865de211972f5dfa1432b665034 SHA256 b975122c9793164ef331b9041b53a26794882639cf520e00fcc0369ca5be8291
 EBUILD ffmpeg-0.5_p22846.ebuild 7573 RMD160 dbdc2b63a8287360634a6693439dc01b35633038 SHA1 bb83bb3e68c3909d39b66d5893f51fff598976b2 SHA256 a33b9ee276d213d70a4f120f428c480222f53be89a61b7c5a81c5c74907db57e
 EBUILD ffmpeg-9999-r1.ebuild 7506 RMD160 a972af9e4ebbefeea08aea2e848109377d233b75 SHA1 06307a2df84a8c540c7cafcf8f9c6ce8794feecb SHA256 55404f8df8fa5c5c43394cb660d6cc9f297d13e65ec4892609880adefa8ce1cd
-MISC ChangeLog 52206 RMD160 9e993afb8cd51e07b8435e568ccc178317b24d85 SHA1 f357d5ca5a94fe9e454766a3c362be41f92e7005 SHA256 abad5489872587ba7841f0a296c6ce98019518f3f62f0b412fa0462923bac313
+MISC ChangeLog 52377 RMD160 a8032405df9c85c13cc5f6fa14c09a0e126f9b04 SHA1 bc92b718f62f3515f571fb1fcf04141a538b485d SHA256 e36f9126c57234317ba2e5747f6172efe0901249399da393862f3393fa629fa4
 MISC metadata.xml 1742 RMD160 9471b0e1a844b21af5a875e2618847aeaaea126f SHA1 0f574b277a0d395e15c59ea406d1a75685687c42 SHA256 55112c676590fe2edb972c39407bac9de0ffbf940f1ed281493a7dd6f71bbeff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvpJWQACgkQvFcC4BYPU0qO3QCglq6lmv8TLEksifnR47KJEG+M
+3CoAnA0VkjBS7d+pBk2BUpDv3zz54BUs
+=Y4/s
+-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild
deleted file mode 100644
index 47422e21a9af..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild,v 1.6 2010/04/23 12:53:48 ssuominen Exp $
-
-EAPI=2
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM=subversion
-	ESVN_REPO_URI="svn://svn.ffmpeg.org/ffmpeg/trunk"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
-	  doc ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test
-	  theora threads x264 xvid network zlib sdl X mp3 amr
-	  oss pic schroedinger +hardcoded-tables bindist v4l v4l2
-	  speex +ssse3 jpeg2k vdpau"
-
-VIDEO_CARDS="nvidia"
-
-for x in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${x}"
-done
-
-RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
-	alsa? ( media-libs/alsa-lib )
-	encode? (
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		vorbis? ( media-libs/libvorbis media-libs/libogg )
-		theora? ( media-libs/libtheora[encode] media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20091124 )
-		xvid? ( >=media-libs/xvid-1.1.0 ) )
-	faad? ( >=media-libs/faad2-2.6.1 )
-	zlib? ( sys-libs/zlib )
-	ieee1394? ( media-libs/libdc1394
-				sys-libs/libraw1394 )
-	dirac? ( media-video/dirac )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	amr? ( media-libs/opencore-amr )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( x11-libs/libX11 x11-libs/libXext )
-	video_cards_nvidia? (
-		vdpau? ( x11-libs/libvdpau )
-	)"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	dirac? ( dev-util/pkgconfig )
-	schroedinger? ( dev-util/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	doc? ( app-text/texi2html )
-	test? ( net-misc/wget )
-	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )"
-
-src_prepare() {
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		sed -i s/UNKNOWN/SVN-r${ESVN_WC_REVISION}/ "${S}/version.sh"
-	elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-		sed -i s/UNKNOWN/SVN-r${FFMPEG_REVISION}/ "${S}/version.sh"
-	fi
-
-	# This got added in right after this snapshot
-	# Small fix to build against libtheora-1.0
-	epatch "${FILESDIR}/${PF}-libtheora.patch"
-}
-
-src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
-
-	# enabled by default
-	use debug || myconf="${myconf} --disable-debug"
-	use zlib || myconf="${myconf} --disable-zlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	if use network; then
-		use ipv6 || myconf="${myconf} --disable-ipv6"
-	else
-		myconf="${myconf} --disable-network"
-	fi
-
-	use custom-cflags && myconf="${myconf} --disable-optimizations"
-	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
-
-	# enabled by default
-	if use encode
-	then
-		use mp3 && myconf="${myconf} --enable-libmp3lame"
-		use vorbis && myconf="${myconf} --enable-libvorbis"
-		use theora && myconf="${myconf} --enable-libtheora"
-		use x264 && myconf="${myconf} --enable-libx264"
-		use xvid && myconf="${myconf} --enable-libxvid"
-		if use bindist
-		then
-			use faac && ewarn "faac is nonfree and cannot be distributed;
-			disabling faac support."
-		else
-			use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
-		fi
-	else
-		myconf="${myconf} --disable-encoders"
-	fi
-
-	# libavdevice options
-	use ieee1394 && myconf="${myconf} --enable-libdc1394"
-	# Indevs
-	for i in v4l v4l2 alsa oss jack ; do
-		use $i || myconf="${myconf} --disable-indev=$i"
-	done
-	# Outdevs
-	for i in alsa oss ; do
-		use $i || myconf="${myconf} --disable-outdev=$i"
-	done
-	use X && myconf="${myconf} --enable-x11grab"
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	use threads && myconf="${myconf} --enable-pthreads"
-
-	# Decoders
-	use amr && myconf="${myconf} --enable-libopencore-amrwb
-		--enable-libopencore-amrnb"
-	for i in faad dirac schroedinger speex; do
-		use $i && myconf="${myconf} --enable-lib$i"
-	done
-	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
-	if use gsm; then
-		myconf="${myconf} --enable-libgsm"
-		# Crappy detection or our installation is weird, pick one (FIXME)
-		append-flags -I/usr/include/gsm
-	fi
-
-	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
-	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i"
-	#	use vdpau || myconf="${myconf} --disable-decoder=$i"
-	#done
-	use video_cards_nvidia || myconf="${myconf} --disable-vdpau"
-	use vdpau || myconf="${myconf} --disable-vdpau"
-
-	# CPU features
-	for i in mmx ssse3 altivec ; do
-		use $i ||  myconf="${myconf} --disable-$i"
-	done
-	use mmxext || myconf="${myconf} --disable-mmx2"
-	use 3dnow || myconf="${myconf} --disable-amd3dnow"
-	use 3dnowext || myconf="${myconf} --disable-amd3dnowext"
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC.
-	if gcc-specs-pie ; then
-		myconf="${myconf} --disable-mmx --disable-mmx2"
-	fi
-
-	# Option to force building pic
-	use pic && myconf="${myconf} --enable-pic"
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host" # bug #273421
-		[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
-		myconf="${myconf} --cpu=$i"
-		break
-	done
-
-	# Mandatory configuration
-	myconf="${myconf} --enable-gpl --enable-version3 --enable-postproc \
-			--enable-avfilter --enable-avfilter-lavf \
-			--disable-stripping"
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
-		case ${CHOST} in
-			*freebsd*)
-				myconf="${myconf} --target-os=freebsd"
-				;;
-			mingw32*)
-				myconf="${myconf} --target-os=mingw32"
-				;;
-			*linux*)
-				myconf="${myconf} --target-os=linux"
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
-	use doc || myconf="${myconf} --disable-doc"
-
-	# 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"
-}
-
-src_compile() {
-	emake version.h || die #252269
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man || die "Install Failed"
-
-	dodoc Changelog README INSTALL
-	dodoc doc/*
-}
-
-src_test() {
-	if use encode ; then
-		for t in codectest lavftest seektest ; do
-			LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-				emake ${t} || die "Some tests in ${t} failed"
-		done
-	else
-		ewarn "Tests fail without USE=encode, skipping"
-	fi
-}
diff --git a/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild
deleted file mode 100644
index eb664f94da4a..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p21602.ebuild,v 1.4 2010/04/23 12:53:48 ssuominen Exp $
-
-EAPI=2
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM=subversion
-	ESVN_REPO_URI="svn://svn.ffmpeg.org/ffmpeg/trunk"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
-	  doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test
-	  theora threads x264 xvid network zlib sdl X mp3 amr
-	  oss pic schroedinger +hardcoded-tables bindist v4l v4l2
-	  speex +ssse3 jpeg2k vdpau"
-
-VIDEO_CARDS="nvidia"
-
-for x in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${x}"
-done
-
-RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
-	alsa? ( media-libs/alsa-lib )
-	encode? (
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		vorbis? ( media-libs/libvorbis media-libs/libogg )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20100118 )
-		xvid? ( >=media-libs/xvid-1.1.0 ) )
-	faad? ( >=media-libs/faad2-2.6.1 )
-	zlib? ( sys-libs/zlib )
-	ieee1394? ( media-libs/libdc1394
-				sys-libs/libraw1394 )
-	dirac? ( media-video/dirac )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	amr? ( media-libs/opencore-amr )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( x11-libs/libX11 x11-libs/libXext )
-	video_cards_nvidia? (
-		vdpau? ( x11-libs/libvdpau )
-	)"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	dirac? ( dev-util/pkgconfig )
-	schroedinger? ( dev-util/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	doc? ( app-text/texi2html )
-	test? ( net-misc/wget )
-	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )"
-
-src_prepare() {
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		sed -i s/UNKNOWN/SVN-r${ESVN_WC_REVISION}/ "${S}/version.sh"
-	elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-		sed -i s/UNKNOWN/SVN-r${FFMPEG_REVISION}/ "${S}/version.sh"
-	fi
-}
-
-src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
-
-	# enabled by default
-	use debug || myconf="${myconf} --disable-debug"
-	use zlib || myconf="${myconf} --disable-zlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-	use network || myconf="${myconf} --disable-network"
-
-	use custom-cflags && myconf="${myconf} --disable-optimizations"
-	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
-
-	# enabled by default
-	if use encode
-	then
-		use mp3 && myconf="${myconf} --enable-libmp3lame"
-		use vorbis && myconf="${myconf} --enable-libvorbis"
-		use theora && myconf="${myconf} --enable-libtheora"
-		use x264 && myconf="${myconf} --enable-libx264"
-		use xvid && myconf="${myconf} --enable-libxvid"
-		if use bindist
-		then
-			use faac && ewarn "faac is nonfree and cannot be distributed;
-			disabling faac support."
-		else
-			use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
-		fi
-	else
-		myconf="${myconf} --disable-encoders"
-	fi
-
-	# libavdevice options
-	use ieee1394 && myconf="${myconf} --enable-libdc1394"
-	# Indevs
-	for i in v4l v4l2 alsa oss jack ; do
-		use $i || myconf="${myconf} --disable-indev=$i"
-	done
-	# Outdevs
-	for i in alsa oss ; do
-		use $i || myconf="${myconf} --disable-outdev=$i"
-	done
-	use X && myconf="${myconf} --enable-x11grab"
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	use threads && myconf="${myconf} --enable-pthreads"
-
-	# Decoders
-	use amr && myconf="${myconf} --enable-libopencore-amrwb
-		--enable-libopencore-amrnb"
-	for i in faad dirac schroedinger speex; do
-		use $i && myconf="${myconf} --enable-lib$i"
-	done
-	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
-	if use gsm; then
-		myconf="${myconf} --enable-libgsm"
-		# Crappy detection or our installation is weird, pick one (FIXME)
-		append-flags -I/usr/include/gsm
-	fi
-
-	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
-	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i"
-	#	use vdpau || myconf="${myconf} --disable-decoder=$i"
-	#done
-	use video_cards_nvidia || myconf="${myconf} --disable-vdpau"
-	use vdpau || myconf="${myconf} --disable-vdpau"
-
-	# CPU features
-	for i in mmx ssse3 altivec ; do
-		use $i ||  myconf="${myconf} --disable-$i"
-	done
-	use mmxext || myconf="${myconf} --disable-mmx2"
-	use 3dnow || myconf="${myconf} --disable-amd3dnow"
-	use 3dnowext || myconf="${myconf} --disable-amd3dnowext"
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC.
-	if gcc-specs-pie ; then
-		myconf="${myconf} --disable-mmx --disable-mmx2"
-	fi
-
-	# Option to force building pic
-	use pic && myconf="${myconf} --enable-pic"
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host" # bug #273421
-		[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
-		myconf="${myconf} --cpu=$i"
-		break
-	done
-
-	# Mandatory configuration
-	myconf="${myconf} --enable-gpl --enable-version3 --enable-postproc \
-			--enable-avfilter --enable-avfilter-lavf \
-			--disable-stripping"
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
-		case ${CHOST} in
-			*freebsd*)
-				myconf="${myconf} --target-os=freebsd"
-				;;
-			mingw32*)
-				myconf="${myconf} --target-os=mingw32"
-				;;
-			*linux*)
-				myconf="${myconf} --target-os=linux"
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
-	use doc || myconf="${myconf} --disable-doc"
-
-	# 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"
-}
-
-src_compile() {
-	emake version.h || die #252269
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man || die "Install Failed"
-
-	dodoc Changelog README INSTALL
-	dodoc doc/*
-}
-
-src_test() {
-	if use encode ; then
-		for t in codectest lavftest seektest ; do
-			LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-				emake ${t} || die "Some tests in ${t} failed"
-		done
-	else
-		ewarn "Tests fail without USE=encode, skipping"
-	fi
-}
diff --git a/media-video/ffmpeg/files/ffmpeg-0.5_p20601-r1-libtheora.patch b/media-video/ffmpeg/files/ffmpeg-0.5_p20601-r1-libtheora.patch
deleted file mode 100644
index baec435eba9f..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-0.5_p20601-r1-libtheora.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- libavcodec/libtheoraenc.c.orig	2009-11-25 20:55:18.000000000 -0700
-+++ libavcodec/libtheoraenc.c	2009-11-25 20:55:21.000000000 -0700
-@@ -86,6 +86,7 @@
- 
- static int get_stats(AVCodecContext *avctx, int eos)
- {
-+#ifdef TH_ENCCTL_2PASS_OUT
-     TheoraContext *h = avctx->priv_data;
-     uint8_t *buf;
-     int bytes;
-@@ -108,12 +109,17 @@
-         av_base64_encode(avctx->stats_out, b64_size, h->stats, h->stats_offset);
-     }
-     return 0;
-+#else
-+    av_log(avctx, AV_LOG_ERROR, "libtheora too old to support 2pass\n");
-+    return -1;
-+#endif
- }
- 
- // libtheora won't read the entire buffer we give it at once, so we have to
- // repeatedly submit it...
- static int submit_stats(AVCodecContext *avctx)
- {
-+#ifdef TH_ENCCTL_2PASS_IN
-     TheoraContext *h = avctx->priv_data;
-     int bytes;
-     if (!h->stats) {
-@@ -138,6 +144,10 @@
-         h->stats_offset += bytes;
-     }
-     return 0;
-+#else
-+    av_log(avctx, AV_LOG_ERROR, "libtheora too old to support 2pass\n");
-+    return -1;
-+#endif
- }
- 
- static av_cold int encode_init(AVCodecContext* avc_context)