remove old

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

5 files changed, 9 insertions, 923 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 03950768303d..34b157a7cb9a 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.674 2013/08/12 00:09:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.675 2013/08/12 00:11:31 aballier Exp $
+
+  12 Aug 2013; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.10.7.ebuild,
+  -ffmpeg-1.2.1.ebuild, -ffmpeg-2.0.ebuild:
+  remove old
 
   12 Aug 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-1.0.7.ebuild,
   ffmpeg-1.2.1.ebuild, ffmpeg-1.2.2.ebuild, ffmpeg-2.0.ebuild,
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index a580b4521eb8..7d7c9d197194 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -3,27 +3,21 @@ Hash: SHA256
 
 AUX flashtest.patch 2343 SHA256 fcd05d4ad3f8cc6dd64a55c83279bd5738002100f1cfdf2f4ca8c9547f5b9a28 SHA512 e2994e3b25b207021e00ed982a82efa8ab2fdf2499f5ef97b7f280a0abd33fac639b7e26c26b5ed7dac70931c009b7062b6c91c4b4b38d30a29f8b364a837ba0 WHIRLPOOL 78c41fd6dcd7f698b92ee6f9ac0c5c5d80c8e45c3dffb8c2bff72f0802084b78ce601dd716c6ae7b6bc6641b4f98a1ec33acfe761a13bcfaeafe3677fa6e3ee0
 AUX freiordl.patch 611 SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b84e0aae571f3dcf SHA512 1d7491e65fec247d9cb6b14e9a494f55e3a88ca9ce0962b7874e3f3e5c087ca7672bda5949637f4493c49a388070addb9db909c2e384f8a4349609ec02e7dd3f WHIRLPOOL dc2bbc9c95dff14998ef8f7f15c55b9cdc9464e01e036c3b67935d9505596360d103aafb9a50b43e6d2e78950664c4b6f214a874fc6aa29727397130a98e6511
-DIST ffmpeg-0.10.7.tar.bz2 5782181 SHA256 f5f3fc43e0f7789a3cf8f4f379851a5a838dd652144e5d2ad4fc727387678422 SHA512 d84cc9e678ee23b3ce2e0854c0907914042ad15ff0bdf4c62ddee71ec66fb23a2be89a4553c367eb79f6652a134bb33cf3c5e89a169dc1200fdb6f182aea4968 WHIRLPOOL a4fd815da627f20cfa2ea867129286f6016f2b54ca81fc3444edda5f224063173b789b92d1ce3812c3af6449f3652f9972365f63d20acfdb1beadf4bc2a1b6ba
 DIST ffmpeg-0.10.8.tar.bz2 5782880 SHA256 2e371088a71656be41b4ff70ae7e80a1d88c5149d6209013c9cce4b84278cbc8 SHA512 93d7305da4966d7fa2f07fe090ac608e52bb683984c12c8c1105521540fe48dbb6d6a99211fdff72ec514c36d5ae7b800badbab583eb20ad2dccee6a340632d6 WHIRLPOOL 9454db93a24f2a419a1388d0686c4a58cafe495eb387c145ee93a829ac63a4e779e9d697a5882b705194a8eeabcc992cf89158cb00da6d0f57dd71ab62d26c09
 DIST ffmpeg-1.0.7.tar.bz2 6451535 SHA256 f7e52bd5e0de064e36ecb04adf155c31dd30366a13168fabe61fd135f24d5c11 SHA512 a3a756fe50773551de58113de7b848f6ccb21ed2cf5c5f04387694937152ae978639aa92e4207cc09f384f34093ad2e6ddf7dfb334097f20f1326e13748f57d5 WHIRLPOOL ba2cc60a7bd7de1dca7f6c9ed02874db0f711c273d9616c5eeda0ee2b33fa9e36f55eb812d75e24583f81098505635ccff018b7aea67dbe9b3fd18583042fb73
-DIST ffmpeg-1.2.1.tar.bz2 5968378 SHA256 0302375c3a64e9c2facfa7cbeb1aa333a39fdf6bbacda228cd48e04bf9ee32ca SHA512 71f7318744533938f179b261b888144a19de533c77e0cfbb888a90258508462c84a95d4436727513a4f42af810a84e3e27d965a9c8d6b58c8d56aeeddb834f6c WHIRLPOOL 2ad9d81e9bbaadc0ccafc77c29478b2042dafd4cca71b65805b5b90b03248cda99c49000a80ae62cfb9ccde4fcafbddcab6d99547e2c2824498a893be40cbbb4
 DIST ffmpeg-1.2.2.tar.bz2 5968091 SHA256 1cb29ec4951f5941ea43638ea1e3042e3d3215992bda03f45628e8c49cb21064 SHA512 555a9fee6c5017602396362a7d073d444ef7539f020a2437d9fa7849310a4956e716fd60a956e1074e6f57fd260bb00cd1c8178bcd4052a3bad0117c1683e8cf WHIRLPOOL d77d7071fa048b55591f0d7f3b5a6631ca81a27d57d3988acf215f66ae7006e2975109fe23290379a7f51e42bc9d0374dd7f1c431f7cfb5b84546fa9fed1977c
 DIST ffmpeg-2.0.1.tar.bz2 6187933 SHA256 611eae7e3485d5fd9ff03e0ac7575ea89bc8105e40e99a40de02324957482f95 SHA512 8589de3133881616ad2fa5e66338c4a06a01cb102dba7f60b63127fcf359227cff8fef652bf4c991554296edf7aafae1241afa764fcf5ceb571cfdd2e9bc6051 WHIRLPOOL 816c1c3f4d41358dfa665b6d35b48901392da8d8583348f1e9e024a7bde8c9e89809524590e427048ffa390ab9ea2e42b7e69806fe641e8181e6077028e4b3f1
-DIST ffmpeg-2.0.tar.bz2 6188516 SHA256 940e1bc4f3e185364099b4ba60d4b952615a4232c5641baa3e9f45d4d748130c SHA512 0cf1284d091d593ff7cb93647baa7227e0d1aef5eac30843a198a9f12a42db7e5d66f15df162d57ac51d07cd78e17d1e577fff425f0e04bd36f414100209d032 WHIRLPOOL f7b305680569d1fc314afc7c23604620612e87cbe6842cbec3c0f469bd0fbb6b2dbf55bded118c57b168940367f8d19a6a6cc5f58cf3545ce582652b86820124
-EBUILD ffmpeg-0.10.7.ebuild 8938 SHA256 f5e01fac8854398bf96c3200c57556e8888138dcda36e8aa9b9578fa62ce4e2c SHA512 91ca4ed62938bc3af03ab5a2030840bbb0f1025f6d5ee2bbb463fe1a9cb7891af3d7beb443b974977360ddf979b35c0a012dc13a5bb837c20aaf0139481b935e WHIRLPOOL a05c7f31aea2d685df8cd5fe6ce36182cbaf48cd9cb7e5c2dfaad34d2637cebe377dae7a46644b3f886e27ac81db98d43f62362da48697a5b978a1ff1ea769d0
 EBUILD ffmpeg-0.10.8.ebuild 9618 SHA256 b27e37bd4d5cbae19e2a9c038f3800cdf0d8c8b4b15df8378065cf817f3ce4b8 SHA512 e75db8449f51d85d45e34760d7e863355340cef1338056d87786ad2b4a75c199c0c3062a82088ed50baf9f2bf94492b80106ad50ab79baf2d8f93b92ed1a27fc WHIRLPOOL 3f6375c5e2db3f07931572a09ecf97c932a97ceb075195d4b8a9264d836451f45e2592c505da6696d1ac94a092f9e569fb47963317597091334e68edcc9730d6
 EBUILD ffmpeg-1.0.7.ebuild 9601 SHA256 7dfa716f53e0eaa38ca2b581a633b8495815b3f8ee3a4c73a8e80e48aae39e94 SHA512 ff5da2f4c56cf5fba5a97f4fccf42ea893bf360439b4ed4a17c834f416f81bcdfaef24e8d95767dc05fa96a7c67d16da3a517a531f35456b68b2413c1d3b7582 WHIRLPOOL dba93f9acf649854ea72117e989a3c4acebfef8ae7e47e055fec53967a1e7c2ab0bc7d8c4ef43ea5c5048e7084cf1cdee5a37fc59889d33e2806d78f954e56a4
-EBUILD ffmpeg-1.2.1.ebuild 8937 SHA256 f090a1d415fd6d0abee2c1383e690b53d860b1c653302edd7f8109a291abe9e0 SHA512 2f93a57f691c590abc70b501685b99376e0167a98de317f03740028876b55d4f989f44fa27737e6c0ba0fe56d60f37f7fa3e8c00b02754762c83a1a2a7cea5ec WHIRLPOOL 069d666b44218f6e82932860321146cce2a47ec9edb0327b2a6ab85fced6eee9f816de9cdf818dac466864d4e813cefa4a1d92f39b796aec7cba089b3e43a9b4
 EBUILD ffmpeg-1.2.2.ebuild 8937 SHA256 b16282509ea71d53fd99dc1a9cd194865a6e2b34b52df323034f64071b3053ce SHA512 4b7bae450fd393681c99ea198c7184414afabe987813549458c68a622d7187f49426147c629a04e0bcb6180d5b68c4a8c45c8597c8341bd12ee4ed826deb61ef WHIRLPOOL 59b425152630235c459672d2f159c86516351c8320d509a8c8c953702c51b465dfeb5a5b9fe7d2651f8c4d7bd825764dabfc0bb21699a617e195ede0d7e74e01
 EBUILD ffmpeg-2.0.1.ebuild 9756 SHA256 6390b6667805cc95a59ca466a8c6ab579521d218ffd99c6d982f27b378fd646d SHA512 28dc229f2ae2e2dd383123b619505cc27bda1855254b2079572724841bed53e7bbf77c1cc859ccb235406992027bea1bc0a1198a1568ce4595296ca866fe9c8d WHIRLPOOL d3b830a192ea455753889125b966fb7fdc65fb03d691d43244719ead9959856cf5217f40abc004b0c0478acd8624abceec2c02998bcf56840b8d7d04482f3c26
-EBUILD ffmpeg-2.0.ebuild 9754 SHA256 ac36efafc7852c33f2f836af48bc8bc950de8379804af8d3e7c4ea3a96c1b89e SHA512 65d069f71d475ec71cf09117b190f466db5e20a1bb4a71fc4b6172983dfb63f24ee04e4534c3f44b82ebaa4d3b883949647b8492f31c7ddd89933c9b68fec334 WHIRLPOOL 3e2b7b65f21ef66aa75290dba346f10e386d533c524fb3b43c7dab9f4f9bfc0a216193d7eee7eea6660b6b7bbe85bd7a165cbc882b5f47da877f77f37df54b52
 EBUILD ffmpeg-9999.ebuild 9757 SHA256 209d9186e6d6316e0bc2268542450e340f056f2c5d34dd61a68846f6be87fb80 SHA512 b9c0d62c8ad255965901bbf17de210b1c3c9912ca288a07aa4bf36b87616419bd8f64e6cc11167bfad0c771d3055496c51a3fd997dafc92c49490c3dab8e66ca WHIRLPOOL ec2e33c546c71b58f8817d070df07c8d9a2f5a22f3bf9142deb825232a78c6be4db1da383943d61854f70e903998a70dfd6c3a4be5832d08576b19b500a48be4
-MISC ChangeLog 94266 SHA256 965368c8474d18454062e30b8f6d66f09bbd793ac187a8b727a3fcc76f63ad47 SHA512 5e0c44ed9cfd53f44b97c099069599dc56b200cfb3d5ece0798473c865ffd605d8b589bf2840d64e98f3b1d9ab2ef2016904a19a21b5c39f09f4579f584c5215 WHIRLPOOL 52e5ed810c5c93f8053f92919d56508632512da7c31551d38f21524592c615b39f6efc9bac25ce4fc51b83f1ab92d7ebc3b29bce8d6de84ce14ea5291c2ccb99
+MISC ChangeLog 94399 SHA256 1da6fe82b948494e6731d25de9b808bf611c6c87a1f8b5f76d150acfec15393b SHA512 06ec9f448e260c4ed28cf9f4133aa44912d6d0deeef5cb3662add321b00bbdbb4478b7472b86f73be899956b1aa2d65fabe80132a59bc9933dab58c078b8c1cc WHIRLPOOL 94e9b7e79b3924b3a7247de36f24ed97f725f8dfbd324a2b81eb0e4971b40a2df9f2fc9d0f5a377474c82756a6c1cd5b57e1141a2f14f61505c02baa3295219d
 MISC metadata.xml 3860 SHA256 0480b2ab42cca74fa5abe6d7f40ccf82c81d19eef97b88878ec07afc83ad6fa8 SHA512 3a1f45a406c90cd54354f5d78d9e51883dc530f904b56c822ae843e87632a6d64e11aa23c874bd47ba40673addc579d9b76cf573434717ab1f0fb4d8ff4e310c WHIRLPOOL f62cf68b99f10188af3f5b7cca0a6daf614cfe048ebd8c4f802a47105a3f839d680487ae1be2144d10dcf5c475502ad3d4092d6fd4c491a924cfadada1f62ffe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIIJ6YACgkQvFcC4BYPU0pHRACfcRp88+PA+ANr28ojYIBOxtn5
-SNMAn36pABgR9f07H0vOqJ+uzWgCtH2z
-=4r3q
+iEYEAREIAAYFAlIIKDUACgkQvFcC4BYPU0rVCwCgzES9m1N04Xk30iYRi7L2uBBq
+84AAn1DdNMEihrZtCnA1ChykJ1ejoMl7
+=kyuk
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.10.7.ebuild b/media-video/ffmpeg/ffmpeg-0.10.7.ebuild
deleted file mode 100644
index d1c73c43609f..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.10.7.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.7.ebuild,v 1.11 2013/06/13 12:35:58 xmw Exp $
-
-EAPI="4"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	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-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-IUSE="
-	aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug
-	dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack
-	jpeg2k libass libv4l modplug mp3 network openal openssl oss pic pulseaudio
-	rtmp schroedinger sdl speex static-libs test theora threads
-	truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
-	"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffeval graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
-	celt? ( >=media-libs/celt-0.11.1 )
-	dirac? ( media-video/dirac )
-	encode? (
-		aac? ( media-libs/vo-aacenc )
-		aacplus? ( media-libs/libaacplus )
-		amr? ( media-libs/vo-amrwbenc )
-		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.20111017 )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	frei0r? ( media-plugins/frei0r-plugins )
-	gnutls? ( >=net-libs/gnutls-2.12.16 )
-	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:0 )
-	libass? ( media-libs/libass )
-	libv4l? ( media-libs/libv4l )
-	modplug? ( media-libs/libmodplug )
-	openal? ( >=media-libs/openal-1.1 )
-	pulseaudio? ( media-sound/pulseaudio )
-	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 )
-	vdpau? ( x11-libs/libvdpau )
-	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
-	zlib? ( sys-libs/zlib )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	dirac? ( virtual/pkgconfig )
-	doc? ( app-text/texi2html )
-	gnutls? ( virtual/pkgconfig )
-	ieee1394? ( virtual/pkgconfig )
-	libv4l? ( virtual/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig )
-	schroedinger? ( virtual/pkgconfig )
-	test? ( net-misc/wget )
-	truetype? ( virtual/pkgconfig )
-	v4l? ( sys-kernel/linux-headers )
-"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode zlib )"
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
-	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	epatch "${FILESDIR}/freiordl.patch"
-	epatch "${FILESDIR}/flashtest.patch"
-
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
-			configure libavdevice/libcdio.c || die
-	fi
-}
-
-src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
-	# Set to --enable-version3 if (L)GPL-3 is required
-	local version3=""
-
-	# enabled by default
-	for i in debug doc network vaapi vdpau zlib; do
-		use ${i} || myconf="${myconf} --disable-${i}"
-	done
-	use bzip2 || myconf="${myconf} --disable-bzlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
-	use openssl && myconf="${myconf} --enable-openssl --enable-nonfree"
-	for i in gnutls ; do
-		use $i && myconf="${myconf} --enable-$i"
-	done
-
-	# Encoders
-	if use encode
-	then
-		use mp3 && myconf="${myconf} --enable-libmp3lame"
-		use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; }
-		use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; }
-		for i in theora vorbis x264 xvid; do
-			use ${i} && myconf="${myconf} --enable-lib${i}"
-		done
-		use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
-		use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
-	else
-		myconf="${myconf} --disable-encoders"
-	fi
-
-	# libavdevice options
-	use cdio && myconf="${myconf} --enable-libcdio"
-	use ieee1394 && myconf="${myconf} --enable-libdc1394"
-	use openal && myconf="${myconf} --enable-openal"
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf="${myconf} --disable-indev=v4l"
-	use v4l || myconf="${myconf} --disable-indev=v4l2"
-	for i in alsa oss jack ; do
-		use ${i} || myconf="${myconf} --disable-indev=${i}"
-	done
-	use X && myconf="${myconf} --enable-x11grab"
-	use pulseaudio && myconf="${myconf} --enable-libpulse"
-	use libv4l && myconf="${myconf} --enable-libv4l2"
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf="${myconf} --disable-outdev=${i}"
-	done
-	# libavfilter options
-	use frei0r && myconf="${myconf} --enable-frei0r"
-	use truetype && myconf="${myconf} --enable-libfreetype"
-	use libass && myconf="${myconf} --enable-libass"
-
-	# 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" ; version3=" --enable-version3" ; }
-	for i in celt gsm dirac modplug rtmp schroedinger speex vpx; do
-		use ${i} && myconf="${myconf} --enable-lib${i}"
-	done
-	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
-	done
-	if use pic ; then
-		myconf="${myconf} --enable-pic"
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		use x86 && myconf="${myconf} --disable-asm"
-	fi
-	[[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004
-
-	# 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
-		myconf="${myconf} --cpu=${i}"
-		break
-	done
-
-	# Mandatory configuration
-	myconf="
-		--enable-gpl
-		${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"
-
-	cd "${S}"
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-}
-
-src_compile() {
-	emake
-
-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			emake tools/$i
-		fi
-	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man
-
-	dodoc Changelog README INSTALL
-	dodoc -r doc/*
-
-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			dobin tools/$i
-		fi
-	done
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-		emake fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-1.2.1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.1.ebuild
deleted file mode 100644
index d118e1a3dfa2..000000000000
--- a/media-video/ffmpeg/ffmpeg-1.2.1.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.1.ebuild,v 1.4 2013/08/12 00:09:07 aballier Exp $
-
-EAPI="4"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://source.ffmpeg.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-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-IUSE="
-	aac aacplus alsa amr bindist bluray +bzip2 cdio celt
-	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
-	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
-	libcaca libsoxr libv4l modplug mp3 network openal openssl opus oss pic
-	pulseaudio rtmp schroedinger sdl speex static-libs test theora threads
-	truetype twolame v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
-	"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext ssse3 vis neon"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffescape ffeval fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bluray? ( media-libs/libbluray )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
-	celt? ( >=media-libs/celt-0.11.1 )
-	encode? (
-		aac? ( media-libs/vo-aacenc )
-		aacplus? ( media-libs/libaacplus )
-		amr? ( media-libs/vo-amrwbenc )
-		faac? ( media-libs/faac )
-		fdk? ( media-libs/fdk-aac )
-		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		twolame? ( media-sound/twolame )
-		x264? ( >=media-libs/x264-0.0.20111017 )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	flite? ( app-accessibility/flite )
-	fontconfig? ( media-libs/fontconfig )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gnutls? ( >=net-libs/gnutls-2.12.16 )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	iconv? ( virtual/libiconv )
-	iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
-	libass? ( media-libs/libass )
-	libcaca? ( media-libs/libcaca )
-	libsoxr? ( media-libs/soxr )
-	libv4l? ( media-libs/libv4l )
-	modplug? ( media-libs/libmodplug )
-	openal? ( >=media-libs/openal-1.1 )
-	openssl? ( dev-libs/openssl )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	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 )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
-	zlib? ( sys-libs/zlib )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	ieee1394? ( virtual/pkgconfig )
-	libv4l? ( virtual/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig )
-	schroedinger? ( virtual/pkgconfig )
-	test? ( net-misc/wget )
-	truetype? ( virtual/pkgconfig )
-	v4l? ( sys-kernel/linux-headers )
-"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-BUILD_DIR=${S}_build
-
-src_prepare() {
-	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	epatch_user
-}
-
-src_configure() {
-	mkdir -p "${BUILD_DIR}"
-	cd "${BUILD_DIR}"
-
-	local myconf="${EXTRA_FFMPEG_CONF}"
-
-	# options to use as use_enable in the foo[:bar] form.
-	# This will feed configure with $(use_enable foo bar)
-	# or $(use_enable foo foo) if no :bar is set.
-	local ffuse="bzip2:bzlib cpudetection:runtime-cpudetect debug doc
-			     gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi vdpau zlib"
-	use openssl && myconf="${myconf} --enable-nonfree"
-
-	# Encoders
-	if use encode
-	then
-		ffuse="${ffuse} aac:libvo-aacenc amr:libvo-amrwbenc mp3:libmp3lame fdk:libfdk-aac"
-		for i in aacplus faac theora twolame x264 xvid; do
-			ffuse="${ffuse} ${i}:lib${i}"
-		done
-
-		# Licensing.
-		if use aac || use amr ; then
-			myconf="${myconf} --enable-version3"
-		fi
-		if use aacplus || use faac || use fdk ; then
-			myconf="${myconf} --enable-nonfree"
-		fi
-	else
-		myconf="${myconf} --disable-encoders"
-	fi
-
-	# libavdevice options
-	ffuse="${ffuse}	cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal"
-
-	# Indevs
-	use v4l || myconf="${myconf} --disable-indev=v4l2"
-	for i in alsa oss jack ; do
-		use ${i} || myconf="${myconf} --disable-indev=${i}"
-	done
-	ffuse="${ffuse}	libv4l:libv4l2 pulseaudio:libpulse X:x11grab"
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf="${myconf} --disable-outdev=${i}"
-	done
-
-	# libavfilter options
-	ffuse="${ffuse} flite:libflite frei0r fontconfig libass truetype:libfreetype"
-
-	# libswresample options
-	ffuse="${ffuse} libsoxr"
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	ffuse="${ffuse} threads:pthreads"
-
-	# Decoders
-	ffuse="${ffuse} amr:libopencore-amrwb amr:libopencore-amrnb	jpeg2k:libopenjpeg"
-	use amr && myconf="${myconf} --enable-version3"
-	for i in bluray celt gsm modplug opus rtmp schroedinger speex vorbis vpx; do
-		ffuse="${ffuse} ${i}:lib${i}"
-	done
-
-	for i in ${ffuse} ; do
-		myconf="${myconf} $(use_enable ${i%:*} ${i#*:})"
-	done
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
-	done
-	if use pic ; then
-		myconf="${myconf} --enable-pic"
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		use x86 && myconf="${myconf} --disable-asm"
-	fi
-	[[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004
-
-	# 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
-		myconf="${myconf} --cpu=${i}"
-		break
-	done
-
-	# Mandatory configuration
-	myconf="
-		--enable-gpl
-		--enable-postproc
-		--enable-avfilter
-		--enable-avresample
-		--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
-
-	"${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-}
-
-src_compile() {
-	cd "${BUILD_DIR}"
-	emake V=1
-
-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			emake V=1 tools/$i
-		fi
-	done
-}
-
-src_install() {
-	cd "${BUILD_DIR}"
-	emake V=1 DESTDIR="${D}" install install-man
-
-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			dobin tools/$i
-		fi
-	done
-
-	cd "${S}"
-	dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
-	use doc && dohtml -r doc/*
-	if use examples ; then
-		dodoc -r doc/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-2.0.ebuild b/media-video/ffmpeg/ffmpeg-2.0.ebuild
deleted file mode 100644
index 62ff71e35190..000000000000
--- a/media-video/ffmpeg/ffmpeg-2.0.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.0.ebuild,v 1.4 2013/08/12 00:09:07 aballier Exp $
-
-EAPI="5"
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=52.55.55
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://source.ffmpeg.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-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0/${FFMPEG_SUBSLOT}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-IUSE="
-	aac aacplus alsa amr amrenc bindist bluray +bzip2 cdio celt
-	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
-	gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k
-	libass libcaca libsoxr libv4l modplug mp3 network openal openssl opus oss
-	pic pulseaudio quvi rtmp schroedinger sdl speex static-libs test theora
-	threads truetype twolame v4l vaapi vdpau vorbis vpx wavpack X x264 xvid
-	+zlib
-	"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext ssse3 vis neon"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bluray? ( media-libs/libbluray )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
-	celt? ( >=media-libs/celt-0.11.1 )
-	encode? (
-		aac? ( media-libs/vo-aacenc )
-		aacplus? ( media-libs/libaacplus )
-		amrenc? ( media-libs/vo-amrwbenc )
-		faac? ( media-libs/faac )
-		fdk? ( media-libs/fdk-aac )
-		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		twolame? ( media-sound/twolame )
-		wavpack? ( media-sound/wavpack )
-		x264? ( >=media-libs/x264-0.0.20111017:= )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	flite? ( app-accessibility/flite )
-	fontconfig? ( media-libs/fontconfig )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gme? ( media-libs/game-music-emu )
-	gnutls? ( >=net-libs/gnutls-2.12.16 )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	iconv? ( virtual/libiconv )
-	iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
-	libass? ( media-libs/libass )
-	libcaca? ( media-libs/libcaca )
-	libsoxr? ( media-libs/soxr )
-	libv4l? ( media-libs/libv4l )
-	modplug? ( media-libs/libmodplug )
-	openal? ( >=media-libs/openal-1.1 )
-	openssl? ( dev-libs/openssl )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	quvi? ( media-libs/libquvi )
-	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 )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
-	zlib? ( sys-libs/zlib )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	ieee1394? ( virtual/pkgconfig )
-	libv4l? ( virtual/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig )
-	schroedinger? ( virtual/pkgconfig )
-	test? ( net-misc/wget )
-	truetype? ( virtual/pkgconfig )
-	v4l? ( sys-kernel/linux-headers )
-"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-BUILD_DIR=${S}_build
-
-src_prepare() {
-	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	epatch_user
-}
-
-src_configure() {
-	mkdir -p "${BUILD_DIR}"
-	cd "${BUILD_DIR}"
-
-	local myconf="${EXTRA_FFMPEG_CONF}"
-
-	# options to use as use_enable in the foo[:bar] form.
-	# This will feed configure with $(use_enable foo bar)
-	# or $(use_enable foo foo) if no :bar is set.
-	local ffuse="bzip2:bzlib cpudetection:runtime-cpudetect debug doc
-			     gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi vdpau zlib"
-	use openssl && myconf="${myconf} --enable-nonfree"
-
-	# Encoders
-	if use encode
-	then
-		ffuse="${ffuse} aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame fdk:libfdk-aac"
-		for i in aacplus faac theora twolame wavpack x264 xvid; do
-			ffuse="${ffuse} ${i}:lib${i}"
-		done
-
-		# Licensing.
-		if use aac || use amrenc ; then
-			myconf="${myconf} --enable-version3"
-		fi
-		if use aacplus || use faac || use fdk ; then
-			myconf="${myconf} --enable-nonfree"
-		fi
-	else
-		myconf="${myconf} --disable-encoders"
-	fi
-
-	# libavdevice options
-	ffuse="${ffuse}	cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal"
-
-	# Indevs
-	use v4l || myconf="${myconf} --disable-indev=v4l2 --disable-outdev=v4l2"
-	for i in alsa oss jack ; do
-		use ${i} || myconf="${myconf} --disable-indev=${i}"
-	done
-	ffuse="${ffuse}	libv4l:libv4l2 pulseaudio:libpulse X:x11grab"
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf="${myconf} --disable-outdev=${i}"
-	done
-
-	# libavfilter options
-	ffuse="${ffuse} flite:libflite frei0r fontconfig libass truetype:libfreetype"
-
-	# libswresample options
-	ffuse="${ffuse} libsoxr"
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	ffuse="${ffuse} threads:pthreads"
-
-	# Decoders
-	ffuse="${ffuse} amr:libopencore-amrwb amr:libopencore-amrnb	jpeg2k:libopenjpeg"
-	use amr && myconf="${myconf} --enable-version3"
-	for i in bluray celt gme gsm modplug opus quvi rtmp schroedinger speex vorbis vpx; do
-		ffuse="${ffuse} ${i}:lib${i}"
-	done
-
-	for i in ${ffuse} ; do
-		myconf="${myconf} $(use_enable ${i%:*} ${i#*:})"
-	done
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
-	done
-	if use pic ; then
-		myconf="${myconf} --enable-pic"
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		use x86 && myconf="${myconf} --disable-asm"
-	fi
-	[[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004
-
-	# 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
-		myconf="${myconf} --cpu=${i}"
-		break
-	done
-
-	# Mandatory configuration
-	myconf="
-		--enable-gpl
-		--enable-postproc
-		--enable-avfilter
-		--enable-avresample
-		--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
-
-	"${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-}
-
-src_compile() {
-	cd "${BUILD_DIR}"
-	emake V=1
-
-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			emake V=1 tools/$i
-		fi
-	done
-}
-
-src_install() {
-	cd "${BUILD_DIR}"
-	emake V=1 DESTDIR="${D}" install install-man
-
-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			dobin tools/$i
-		fi
-	done
-
-	cd "${S}"
-	dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
-	use doc && dohtml -r doc/*
-	if use examples ; then
-		dodoc -r doc/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}