remove old

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

7 files changed, 10 insertions, 853 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 254ebbfac1d4..661c13570590 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.432 2011/07/10 17:34:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.433 2011/07/10 19:24:56 aballier Exp $
+
+  10 Jul 2011; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.6.ebuild,
+  -ffmpeg-0.6_p25767.ebuild, -ffmpeg-0.6.90_rc0-r2.ebuild,
+  -files/avparser.patch, -files/avutil_aes_sha_h.patch:
+  remove old
 
   10 Jul 2011; Raúl Porcel <armin76@gentoo.org> ffmpeg-0.7_rc1.ebuild:
   ia64/sparc stable wrt #365273
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d28c82df1a41..f4d799dbc20a 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,27 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX avparser.patch 624 RMD160 87f9bd13d87e5560a36fe316e70e02fc0fa3a2c1 SHA1 3490a9f3553f6119eb1d16019f44c6ef36227453 SHA256 f5b1d3da4b007d28b6feca549260d82b0def7502353b7f7932d37852e64a37b3
-AUX avutil_aes_sha_h.patch 1299 RMD160 fe7e1d94adb228d9d64f40c499db9f9382154515 SHA1 d5da6c76515782244bd3791194e0ac73d922d390 SHA256 e8c4f3701f6ff00a29c672594d3397507be81186a08862e11d4c976ebda3db93
-DIST ffmpeg-0.6.90-rc0.tar.bz2 4531418 RMD160 5be99cc0242a3d7bf64622c082f0896460e90c66 SHA1 a5c898a220a7f2220a49a37c44d273d1775d081c SHA256 2e11fecba789fb2ee52e6fefbad07a026087b4b27df517fa0a6e31816f75c9f6
-DIST ffmpeg-0.6.tar.bz2 3720372 RMD160 1ff6a8f419239a03d84f67cc954f60f73632432a SHA1 c130e3bc368251b9130ce6eafb44fe8c3993ff5c SHA256 6730baa6750f0cbffaf5f4c04f8ddcf1ebe6c651a6eeb12ae947a228de4c8120
-DIST ffmpeg-0.6_p25767.tar.bz2 4000052 RMD160 1463e744ca5f6e5535571efe19296f055ba870fb SHA1 219ecd5007eb030945556a7f279beae980a96543 SHA256 a6773c54b528d967f56811866b149ac980ad96f6c06a00e56987f7a48b4d9ff2
 DIST ffmpeg-0.7-rc1.tar.bz2 4782516 RMD160 26bad1c174e7b58a3bc207c6327d052670b53203 SHA1 d15c005f46483fbfc3b678cb1c89123762b56b82 SHA256 55703829d2bef30c5f294aee9a3a62beb772ca443fbbd688e79c6a0bd012aa1e
 DIST ffmpeg-0.7.1.tar.bz2 4555714 RMD160 6539f725d869b97a1821636bd1416312970a6457 SHA1 d006cf0fb61d654c0845240da868ecf3a94c043f SHA256 243a770661b52cfa57bd59ab20b417f13bf8d076887f3c32bce533cbf92dea03
 DIST ffmpeg-0.8.tar.bz2 4551071 RMD160 766f6b8ccc556b0c76e1a238d63131dbe74537ab SHA1 461f87c4fc080e10ac0acc48287aaa706021bbc4 SHA256 3e26fdc317970386f96b27c9821890832ad2970b07e434a5bb27048d03e3fc0f
-EBUILD ffmpeg-0.6.90_rc0-r2.ebuild 7945 RMD160 2e6f2473b90d3e74ce733797908172618cdc66d0 SHA1 b5101ab094a4d28a73f6997eaf5adc78aa0075b5 SHA256 8f3c607568ec7a3525f176460e645abf6989647a8783091bff3da4a1d07e7af5
-EBUILD ffmpeg-0.6.ebuild 7782 RMD160 7dcb53dfd7bed74aa95a6813cad6c55f9fc7f062 SHA1 92d32ee520b6125b1e825bb98f3731cdfb9918c8 SHA256 ba710a4af02900b36fc1ef8d4a60bfb9a216040b3974a2394c1e8e7cec5ef52c
-EBUILD ffmpeg-0.6_p25767.ebuild 7911 RMD160 d573b7275c7d72baf655b3ceadf136d43d2fd5ee SHA1 5e6a9b938d283187120148095ff8621d4bd82ad7 SHA256 387073c421106fa9a2f14e71cdba1524d87eebe5b1fb4ef505908dafb0cd0bf8
 EBUILD ffmpeg-0.7.1.ebuild 8228 RMD160 d2ed15125e1209a2e9b30238ed0f46933ddfc179 SHA1 c1a6310a25732312757d9bac4b270163767a7330 SHA256 36b56006fcb498c6c477d37bc78b80b374dd3c4676cf8170d2e3e1c32380f9fb
 EBUILD ffmpeg-0.7_rc1.ebuild 8231 RMD160 b25976076ec15e196ce5d3decbe32e2e32bdc167 SHA1 0f36eff5f4523cace149e30c617f7b69b5376437 SHA256 bf591ef1bd97fbbb0679049b994258d4421f37988beb3908fb843ff189ab0d66
 EBUILD ffmpeg-0.8.ebuild 8226 RMD160 6349d529b58cf1f697b9642341ebc8080f628e98 SHA1 cec32221f09a4d8bc8db7cef94584d1f6d2ba692 SHA256 8c21c8eca12256222db7fd95023ada817c48ba9759f98172a2f8530eae42f9a2
 EBUILD ffmpeg-9999.ebuild 7866 RMD160 642380fe3c344ae4d68cccf0a94515f71bbd1a3b SHA1 9735b1a7d292a41b5a866f1964157b0586c3c653 SHA256 64799f19c14a07d4dd806103a7b7edff86caa453ee8be5b7c0c1008798d4b29b
-MISC ChangeLog 63466 RMD160 e859d1a944194d7274b665c905cf0252ce1a0d4b SHA1 513e4d90fff2511308acbafcbc02393b7437f529 SHA256 9f3e5bcdea85a3d9952af645f937f72f8f2455557ce64642f6b4f49b3dd8951e
+MISC ChangeLog 63668 RMD160 f98b0bb36be3900ff9ebbdbb0506a74f8e616e5f SHA1 e67b97c0331c4f76b29fee62b11aa3f066955f00 SHA256 cb4eed137f93d50959d0b62e80dc0f9f3ba75d1705f7e41d92bc1b52ae686992
 MISC metadata.xml 2502 RMD160 7bae5e66cd6f15e3698d0a3cf08b5a3f653b4a25 SHA1 9d036b3eabb7a94a70a54d4c23d7efe0949817ff SHA256 fc5f64eea8d69b93f35e7c8a402d6322c46409e8cc5579a4b96f0fa50ea728ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4Z4rIACgkQuQc30/atMkCLTQCguQA0cFMJXH3ujidYLPazMm28
-c4sAoJ384SVJPy1WafWRpv39GAIKk3Js
-=+iRM
+iEYEARECAAYFAk4aJr8ACgkQvFcC4BYPU0pUhACfTGshcobjpo+qk7stWfQbpJew
+kJAAoM3hVMN2wm4sPCRIiPJh5lYZKrId
+=HUNk
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.6.90_rc0-r2.ebuild b/media-video/ffmpeg/ffmpeg-0.6.90_rc0-r2.ebuild
deleted file mode 100644
index 310671ef96cf..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.6.90_rc0-r2.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6.90_rc0-r2.ebuild,v 1.1 2011/04/13 12:48:00 aballier Exp $
-
-EAPI="2"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git"
-	EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-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"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-IUSE="
-	+3dnow +3dnowext alsa altivec amr avx bindist +bzip2 cpudetection
-	custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables
-	ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp
-	schroedinger sdl speex +ssse3 static-libs test theora threads truetype v4l
-	v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib
-	"
-
-VIDEO_CARDS="nvidia"
-
-for x in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${x}"
-done
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bzip2? ( app-arch/bzip2 )
-	dirac? ( media-video/dirac )
-	encode? (
-		faac? ( media-libs/faac )
-		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		vorbis? ( media-libs/libvorbis media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20101029 )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	truetype? ( media-libs/freetype:2 )
-	vaapi? ( >=x11-libs/libva-0.32 )
-	video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
-	vpx? ( media-libs/libvpx )
-	X? ( x11-libs/libX11 x11-libs/libXext )
-	zlib? ( sys-libs/zlib )
-	!media-video/qt-faststart
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	dirac? ( dev-util/pkgconfig )
-	doc? ( app-text/texi2html )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( dev-util/pkgconfig )
-	schroedinger? ( dev-util/pkgconfig )
-	test? ( net-misc/wget )
-	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
-	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	epatch "${FILESDIR}/avparser.patch" \
-		"${FILESDIR}/avutil_aes_sha_h.patch"
-}
-
-src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
-
-	# enabled by default
-	for i in debug doc network vaapi zlib; do
-		use ${i} || myconf="${myconf} --disable-${i}"
-	done
-	use bzip2 || myconf="${myconf} --disable-bzlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	use custom-cflags && myconf="${myconf} --disable-optimizations"
-	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
-
-	#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 && use vdpau || myconf="${myconf} --disable-vdpau"
-
-	# Encoders
-	if use encode
-	then
-		use mp3 && myconf="${myconf} --enable-libmp3lame"
-		for i in theora vorbis x264 xvid; do
-			use ${i} && myconf="${myconf} --enable-lib${i}"
-		done
-		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
-	use X && myconf="${myconf} --enable-x11grab"
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf="${myconf} --disable-outdev=${i}"
-	done
-	# libavfilter options
-	use frei0r && myconf="${myconf} --enable-frei0r"
-	use truetype && myconf="${myconf} --enable-libfreetype"
-
-	# 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 gsm dirac rtmp schroedinger speex vpx; do
-		use ${i} && myconf="${myconf} --enable-lib${i}"
-	done
-	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
-
-	# CPU features
-	for i in mmx ssse3 altivec avx ; 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 for x86.
-	if use pic && use x86 ; 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="
-		--enable-gpl
-		--enable-version3
-		--enable-postproc
-		--enable-avfilter
-		--disable-stripping
-		${myconf}"
-
-	# 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"
-
-	# 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-shared \
-		--cc="$(tc-getCC)" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-}
-
-src_compile() {
-	emake version.h || die #252269
-	emake || die
-
-	if use qt-faststart; then
-		tc-export CC
-		emake -C tools qt-faststart || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man || die
-
-	dodoc Changelog README INSTALL
-	dodoc doc/*
-
-	if use qt-faststart; then
-		dobin tools/qt-faststart || die
-	fi
-}
-
-src_test() {
-	if use encode ; then
-		for t in codectest lavftest seektest ; do
-			LD_LIBRARY_PATH="${S}/libavcore:${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.6.ebuild b/media-video/ffmpeg/ffmpeg-0.6.ebuild
deleted file mode 100644
index e023eba6c113..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.6.ebuild
+++ /dev/null
@@ -1,253 +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.6.ebuild,v 1.17 2010/12/27 20:12:37 armin76 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"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-fi
-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 rtmp schroedinger +hardcoded-tables bindist v4l v4l2
-	  speex +ssse3 jpeg2k vaapi vdpau vpx"
-
-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.20100605 )
-		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 )
-	rtmp? ( media-video/rtmpdump )
-	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 )
-	vaapi? ( x11-libs/libva )
-	vpx? ( media-libs/libvpx )
-	video_cards_nvidia? (
-		vdpau? ( x11-libs/libvdpau )
-	)"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	dirac? ( dev-util/pkgconfig )
-	rtmp? ( 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 gsm faad dirac rtmp schroedinger speex vpx; do
-		use $i && myconf="${myconf} --enable-lib$i"
-	done
-	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
-
-	#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"
-	use vaapi || myconf="${myconf} --disable-vaapi"
-
-	# 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.6_p25767.ebuild b/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild
deleted file mode 100644
index a9207a42d3a8..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild,v 1.6 2011/04/10 11:45:20 armin76 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"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-fi
-IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
-
-VIDEO_CARDS="nvidia"
-
-for x in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${x}"
-done
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bzip2? ( app-arch/bzip2 )
-	dirac? ( media-video/dirac )
-	encode? (
-		faac? ( media-libs/faac )
-		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		vorbis? ( media-libs/libvorbis media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20101029 )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	vaapi? ( x11-libs/libva )
-	video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
-	vpx? ( media-libs/libvpx )
-	X? ( x11-libs/libX11 x11-libs/libXext )
-	zlib? ( sys-libs/zlib )
-	!media-video/qt-faststart
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	dirac? ( dev-util/pkgconfig )
-	doc? ( app-text/texi2html )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( dev-util/pkgconfig )
-	schroedinger? ( dev-util/pkgconfig )
-	test? ( net-misc/wget )
-	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )
-"
-
-src_prepare() {
-	if [ "${PV#9999}" != "${PV}" ] ; then
-		# Set SVN version manually
-		subversion_wc_info
-		sed -i -e "s/UNKNOWN/SVN-r${ESVN_WC_REVISION}/" "${S}/version.sh" || die
-	elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-		sed -i -e "s/UNKNOWN/SVN-r${FFMPEG_REVISION}/" "${S}/version.sh" || die
-	fi
-}
-
-src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
-
-	# enabled by default
-	for i in debug doc network vaapi zlib; do
-		use ${i} || myconf="${myconf} --disable-${i}"
-	done
-	use bzip2 || myconf="${myconf} --disable-bzlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	use custom-cflags && myconf="${myconf} --disable-optimizations"
-	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
-
-	#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 && use vdpau || myconf="${myconf} --disable-vdpau"
-
-	# Encoders
-	if use encode
-	then
-		use mp3 && myconf="${myconf} --enable-libmp3lame"
-		for i in theora vorbis x264 xvid; do
-			use ${i} && myconf="${myconf} --enable-lib${i}"
-		done
-		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
-	use X && myconf="${myconf} --enable-x11grab"
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf="${myconf} --disable-outdev=${i}"
-	done
-	# libavfilter options
-	use frei0r && myconf="${myconf} --enable-frei0r"
-
-	# 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 gsm dirac rtmp schroedinger speex vpx; do
-		use ${i} && myconf="${myconf} --enable-lib${i}"
-	done
-	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
-
-	# 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 for x86.
-	if use pic && use x86 ; 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="
-		--enable-gpl
-		--enable-version3
-		--enable-postproc
-		--enable-avfilter
-		--disable-stripping
-		${myconf}"
-
-	# 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"
-
-	# 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-shared \
-		--cc="$(tc-getCC)" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-}
-
-src_compile() {
-	emake version.h || die #252269
-	emake || die
-
-	if use qt-faststart; then
-		tc-export CC
-		emake -C tools qt-faststart || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man || die
-
-	dodoc Changelog README INSTALL
-	dodoc doc/*
-
-	if use qt-faststart; then
-		dobin tools/qt-faststart || die
-	fi
-}
-
-src_test() {
-	if use encode ; then
-		for t in codectest lavftest seektest ; do
-			LD_LIBRARY_PATH="${S}/libavcore:${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/avparser.patch b/media-video/ffmpeg/files/avparser.patch
deleted file mode 100644
index b743d9b0f3a2..000000000000
--- a/media-video/ffmpeg/files/avparser.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 1f6265e011f6e56562b2f58c182bc0261062b3c4
-Author: Brad <brad@comstyle.com>
-Date:   Wed Apr 6 17:41:12 2011 -0400
-
-    Fix parser: mark av_parser_parse() for removal on next major bump
-    
-    Fix the breakage introduced with 9073ca6c6ebb9e3e9b60d968b7aa16cc8b6d558d
-
-diff --git a/libavcodec/parser.c b/libavcodec/parser.c
-index 0c69b91..3ba3e9c 100644
---- a/libavcodec/parser.c
-+++ b/libavcodec/parser.c
-@@ -105,7 +105,7 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){
-     }
- }
- 
--#if LIBAVCODEC_VERSION_MINOR < 53
-+#if LIBAVCODEC_VERSION_MAJOR < 53
- /**
-  *
-  * @param buf           input
diff --git a/media-video/ffmpeg/files/avutil_aes_sha_h.patch b/media-video/ffmpeg/files/avutil_aes_sha_h.patch
deleted file mode 100644
index 870d73b7ad89..000000000000
--- a/media-video/ffmpeg/files/avutil_aes_sha_h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit dc4103610520ae70d4989ffe3850dcf4deed54a9
-Author: Alexis Ballier <aballier@gentoo.org>
-Date:   Thu Apr 7 10:19:23 2011 -0300
-
-    Install libavutil/{aes,sha}.h
-    
-    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
-diff --git a/libavutil/Makefile b/libavutil/Makefile
-index 300acb1..baee496 100644
---- a/libavutil/Makefile
-+++ b/libavutil/Makefile
-@@ -3,6 +3,7 @@ include $(SUBDIR)../config.mak
- NAME = avutil
- 
- HEADERS = adler32.h                                                     \
-+          aes.h                                                         \
-           attributes.h                                                  \
-           audioconvert.h                                                \
-           avassert.h                                                    \
-@@ -33,6 +34,7 @@ HEADERS = adler32.h                                                     \
-           random_seed.h                                                 \
-           rational.h                                                    \
-           samplefmt.h                                                   \
-+          sha.h                                                         \
-           sha1.h                                                        \
- 
- BUILT_HEADERS = avconfig.h