remove old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

5 files changed, 9 insertions, 922 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index f28685d3440d..1c2cda7b222c 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.718 2014/03/10 20:06:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.719 2014/03/10 20:08:10 aballier Exp $
+
+  10 Mar 2014; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.10.11.ebuild,
+  -ffmpeg-1.2.5.ebuild, -ffmpeg-2.1.3.ebuild:
+  remove old
 
 *ffmpeg-1.0.9 (10 Mar 2014)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 6937d397d472..56fb24173941 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -5,29 +5,23 @@ AUX ffmpeg-0.10.10-freetype251.patch 1841 SHA256 523e34408a435958c48021a85b36646
 AUX ffmpeg-1.0.8-freetype251.patch 2008 SHA256 b52b832ad8b35ba79a1cbc5c592510d874e321de2ce80bfa52e21cd74aec6404 SHA512 e56c68980a52d9ff65e92267cf23ca5170c7ea7ec3100012af19f598c4fe64e6afac53100486edd5fc14ace31baaea01ddf552c74b9138c067cf95672e86c17e WHIRLPOOL 7a8084726afae99de24da2ba04889bb11993b59b070316ab2c9b20a38c59d61abdfa625888433e253be0c948cec39127c8b43d66f695ea48bedfd215cd03e392
 AUX flashtest.patch 2343 SHA256 fcd05d4ad3f8cc6dd64a55c83279bd5738002100f1cfdf2f4ca8c9547f5b9a28 SHA512 e2994e3b25b207021e00ed982a82efa8ab2fdf2499f5ef97b7f280a0abd33fac639b7e26c26b5ed7dac70931c009b7062b6c91c4b4b38d30a29f8b364a837ba0 WHIRLPOOL 78c41fd6dcd7f698b92ee6f9ac0c5c5d80c8e45c3dffb8c2bff72f0802084b78ce601dd716c6ae7b6bc6641b4f98a1ec33acfe761a13bcfaeafe3677fa6e3ee0
 AUX freiordl.patch 611 SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b84e0aae571f3dcf SHA512 1d7491e65fec247d9cb6b14e9a494f55e3a88ca9ce0962b7874e3f3e5c087ca7672bda5949637f4493c49a388070addb9db909c2e384f8a4349609ec02e7dd3f WHIRLPOOL dc2bbc9c95dff14998ef8f7f15c55b9cdc9464e01e036c3b67935d9505596360d103aafb9a50b43e6d2e78950664c4b6f214a874fc6aa29727397130a98e6511
-DIST ffmpeg-0.10.11.tar.bz2 5786390 SHA256 99a81aa43325de9c670659c15496ef348b5c4c65306caa1ce0893ae5f4f636d0 SHA512 c013b1f9fce764302db924ec057e1cb8df132dc55173476e77cf254e43c10d13124a9ce5c063eb586146de92620b6b88cad8a5198a1d30a4a9c6611a83e515e6 WHIRLPOOL f1f1589328af7594025fe44ecdff7d7b1edb2c88584ab737e719a3e2fa5cc0f94b65e6c645a22f6c474041b6404acf37740d24101c8e2bd9912112171695d22b
 DIST ffmpeg-0.10.12.tar.bz2 5787901 SHA256 118d82ca182871a9599202362106f03348dc335e2aec7d998d1f59ede3a8db02 SHA512 ade8ab6de75d7a2f3930089909b15e8979b0fc4937f3328575f9eb2b28de5b9db775a0e28bffbf38dab0323be98ee783ab9c708cda36bb366d737fbbd42cd1d9 WHIRLPOOL 9cd46c2472c4dab51caa8b2a4879ff1b5bf511595acb57e66250052e09625ac5334b814601c60bb7887e9eef40cfa76f81bb1b795572841333614e6f1e8d2fa3
 DIST ffmpeg-1.0.8.tar.bz2 6452144 SHA256 8580a317aa09fdabdcf5119c87f59fd3baa4df0f636aac4d3dfeb86c572277aa SHA512 5fc6caf20c016e9d8ff41175d3bb5bf6d4a2c25c65ea8630d45ef8d9a16ee53120d76e4bc220b4f4462618e5c731114182776d7193e9d085332cf087038f3488 WHIRLPOOL 6a6b80a5aa44ee1a1c0af61bdf95659eb319ae48b690c2c1b9dd5291ad3b6f5ab52884c835d925da88dd2467f49ec2198cb78c2ef78af4f2e372c6364c769f6e
 DIST ffmpeg-1.0.9.tar.bz2 6449857 SHA256 98b3c35bcc602ab1e236fa64da8ead3deae7a5f9c958c572b46fb299260d1034 SHA512 323764f40a03ec339e1743a57ba545c74b7a58fad7c2db29c252dd276a74e761f00649aa560415cd38e80db51d34037c66c8aaae6971f35d83f7d1943d1e7109 WHIRLPOOL e4ba2ce05f76a2414a46fbd04d50c1d1f7638b43fee718ab60d56f8ef5fbe367f33d992c3a6b3802cde9cfeb0252c4112a0f0e1c56c4fd10d76ead424f3c0ab1
-DIST ffmpeg-1.2.5.tar.bz2 5971768 SHA256 9cfcdfe1949f8781b1b473fe668b8f2ab6befc2cffefd159840c62273e3e41a9 SHA512 71fa01f1eb96cfdf5bf628f4c2999e0f157aae423316cdecdc3c81c36ca438996c5d4751871611ada9b31e6542ca08c0f5f61bee9170b1336ee5a8fe1db8eb06 WHIRLPOOL 386ef933a890b565ded79f1109c09aac7d553c8af4d927dc8d6585c77a63d396a2b7484810178552ec66e95e13a85942891ed0fcb947fd793dfe72bb8816ec21
 DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
-DIST ffmpeg-2.1.3.tar.bz2 6638987 SHA256 1d332e7fd35f87e1ffb6c9b0405cbfda085ef712ede0133a213793a4e66d13a3 SHA512 fcaf04089c6081e476c23220c33d67252f8eecacc67a79a23a658865cab896cf5f29f8825626c09151539aa35dcae64726bcb6f96fadf51bc8b9c4e5fa3c47a0 WHIRLPOOL 9c289ac74285c7394de8fb34ab65c25835ab1a56bec51dd888e3e6899a9680d0e4bba68d92f685a0b5439be5ca51b0799b15c0bdeab5105720c5fe558319dc38
 DIST ffmpeg-2.1.4.tar.bz2 6638914 SHA256 7fb46cbd686830db192968e2f117744b1e9cd23f2fcf5ee63e6cbeaa089a8101 SHA512 37478730420be5d769b3c3ff743af6bb68406e20d86079d0e971334100801e41842881c53a2e307e3c0326019cb7b3402a847e5c67c20d305007b90c2973dd4f WHIRLPOOL 48e9f6889b813dc07f520e52d953895d6220e04b81e347f22913e4518f2577bdb6d87d053b7764d99f80608cbe5ecbd075255825779ed43de18676e3aa5966b9
-EBUILD ffmpeg-0.10.11.ebuild 9684 SHA256 c5fb97665f143665f995c1f4d44b2c25b95e38aea0a79bfa1f1302072b488ef9 SHA512 8db020d3d9c9078667d54754e1b4c95f02092dcee43d55e7e7ba91addb17fcb8700d796f6247b294b20af86921db9d471adb736a67a1e9bf67af1602ca5d431d WHIRLPOOL 782ac549898767907ad17518ad7cb62e5de90f829cb271bfc25ea61b3a01bedf0fd2f32c73fb2c7b415ef5e1179d1815fa4967ed9ccaa42cf318d052912a82be
 EBUILD ffmpeg-0.10.12.ebuild 9684 SHA256 c4889c053bd9244fc822d0f02748d731d371d86bc4c0890f2f05e078644540b7 SHA512 281cdb54e2a703f3e4d387b89da9294e6f2942962afb212475799a147bffe5c4bb6ef6efa6b36f84abbd809f77a29c0ccae2239fde65ec1d376868ac91a532f3 WHIRLPOOL 4126d694ccb38880819f64e2aa33b5cf0cc8824f1135d76e56d82cfe71e4a11e36437a7c2ef98ed245c611bff5f5a1c56c377540da404a739db01c097e1eb3a1
 EBUILD ffmpeg-1.0.8.ebuild 9650 SHA256 84d1ef638cfe3c7fe5106e9c3d3ec7905cb5288b67261de32bc58eb1846af229 SHA512 15fd02e2944286676040fe747878fd4230a60a512abc9b97eda177fc8fbf853421d410b0b4a7a3a5e04842e96366f3e419748df00878803a2b17b3d0d71fbf90 WHIRLPOOL 3e9a4181f732c9441811413dc0fa3ac35b2733712ea6b0a97e67d815af4739d710c56d04bb0047466fd2989f0e7999c886ac778c77424e8d39c3078eeb340d68
 EBUILD ffmpeg-1.0.9.ebuild 9663 SHA256 555f55ea849c1696b1101c8b88bf3013c90e66355083a41294ae1149088e0278 SHA512 3b6eec2aed3ce504a59bfb7d6bc65a1e7ec96fd180e438d5a2ec729855f91d99970a2435dbf4c447c9d092649f4c7b33bf9de7f544341bfb19d5f32cf08a5e07 WHIRLPOOL dd73000403bc8b748c0818385c89990b922e114c5c7310a18f9483e4010220f09bee4db3e716b08e0beab364e0cc6d659ea90a62c85f69033b87cf18f605eb29
-EBUILD ffmpeg-1.2.5.ebuild 8939 SHA256 4590d85089b5949a48d436cb643ed3ce9fe5ec20e98de67d67ce1c73ff930820 SHA512 68c5942601561b1bc0101aba6b5f28ce60a99274ef074f3fab7c334791762e90476a73136cd47724523e7b5123fef3bc88cfc1ddbb3d5b81024b5e371e160465 WHIRLPOOL cc331d5ef44ff36fc0ddbbb6810ee920f5eccc1432fcfeeebaa90c249a8dafa9e5da32224d37f925e9cc1ae64167b1cbab047167fb89ab9dd019b781c704d28b
 EBUILD ffmpeg-1.2.6.ebuild 8939 SHA256 0eb74cc40aab27a0b9031957e59fcddba75190ead03d00987d828dffcf4b32fa SHA512 614c8f588e6be9cc081225b3e05313273ec1e6394f05126e5ef8d2f0f0d3970f2f5e4b1d57f4ea868954a29428137611e13a29e1bca8bafb78f71fd68d8dafe6 WHIRLPOOL 8705bd3dd8cb6095b8970f0bae98f73c9b0243ea2c5b3cc8139c12410b7a0298412a821015461a401abaee0f79279ac3f572237c8468732e826fc876b4f49f0e
-EBUILD ffmpeg-2.1.3.ebuild 10244 SHA256 80499a96b74defa8e8c1b3419611e53edd7167087e8f643241e949c159f30aa9 SHA512 0e8df2fdd50106263460d3b296299ab4ab2a0ed933c835a7fb9d8352dc15fe4f2fbb0868b6b2185d84739afed6ca499088594e11232c534f87ac446bb82a1f3a WHIRLPOOL e8081be3cde6d33d9252434d8a5e14cabd80b796ea084acd31f46b9f4beb766827f08273517cce3856e13ff23a3e33656a16348c6e60e894d6d52429e30bffa8
 EBUILD ffmpeg-2.1.4.ebuild 10244 SHA256 367938fd42fbe4fc6eba0dc63b18ab97eb8ece9e626bb736a26bca5aa08be8c5 SHA512 066c4d17588d95642235114057f8a486471b886cc78e791a4c10994dff717ec7120510d5894303ffb9b74ff4e8822a7a1d83b66abf83308c406cc1a8e3d094c8 WHIRLPOOL 8ff8507f4b88f78992083d08dad73f43dfcf3fc8e06202e9192938aebf25d2cc3f5a78d0399f6833047b68d1515f794a53a03228d79d0a71c30ceb5ff5960917
 EBUILD ffmpeg-9999.ebuild 10300 SHA256 1d1afb2d56b7954926c46ad81f5e18fd6520bc9566b58929ed5d0b3d3d6dce7d SHA512 119ce4d7c5ee747a9284ccb6636cd5342ddfef43273dd44236e126734533c8b59889f8a180ce8a04bdc9af8ecabf399f32815bad4b9d7b21e995c832f2e5d599 WHIRLPOOL c17233582b286d797d7393e870d984ea201b0732877ca305b110fad2cdb98efd9a1b1c20909cce29f3a82ecc1a60eca2bd1cf237bd682d6329f5fc23ce0f0aad
-MISC ChangeLog 100067 SHA256 7c887cad95067a2893b95c97405e9d8d10e96b0359389081ffb9bbb6ced43670 SHA512 ccd4557cd69bbb06ed48b2f2eebb27d0744b38f9886b0f1eed999ecf6f08d899929091e7e6bbd179deb05d30f224c1be1baa7fa9db6f4505c88c5e81ab2a22ad WHIRLPOOL 4c268d212cb1dec18d6f498501d34050cd5d49b4f0fe21eb799fc92bb996f98d34d80d2ef57890717940d62f5099bfbecde1ef35e3e6e1d851f7fa2f9dace7ca
+MISC ChangeLog 100203 SHA256 1c98e28dc5d78c27567bd35733e4aa8c5f6f59e4bf22428217faadc5a9a27ac8 SHA512 f8f8d97a60f2c421973fc16e5f71935dd8dfe6c2131d423b10a32db43a19faefc8432e157b7ed00f1cbc6d9916b8352bd4397d27d440e4ac6ab351aca38bcee1 WHIRLPOOL b0d1a35b45e5096fdf4cf987ef756f6aa3c766527632ee69cd5495ea1ff2be073c884994ff9971d82546a21b22ab675306c9572a9dbe64deb6d49d8daafd473d
 MISC metadata.xml 5175 SHA256 272f5c0872fdb00bf4c99e43fc01a2bdf3d62a5f1110ab8c684bee01087f2327 SHA512 40f072741d089598f010813021f89e62a9fd2ccebe0a0e48e43314ac3601568b75cc533cad0c3f139a02a4a70391cbf33bb7ddf1d50088a131acad394c007f71 WHIRLPOOL 998ee505287b62d225fdc3b9a255d18c9ef37d59ada1eefa7af2be96179bcfc6f5d7dfa9465e54a263310a2e6fb2a211cd1f087d6b8b0b7aa97b6f7e2855d1fd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMeG2QACgkQvFcC4BYPU0r08QCgjYonHixkTFoRTiLDiBnVeIGz
-Yx4An1YkdS3V+UQtb9h7ewmUNSDghwwU
-=cS0g
+iEYEAREIAAYFAlMeG6wACgkQvFcC4BYPU0rLsgCgyPoaLakpSGsP3RRIVeHNojPS
+Qt4An23fXreUMSdRlcJPzzdyjm0fT6sa
+=9Wrv
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.10.11.ebuild b/media-video/ffmpeg/ffmpeg-0.10.11.ebuild
deleted file mode 100644
index 51d52421003c..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.10.11.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.11.ebuild,v 1.1 2014/01/19 13:48:27 aballier Exp $
-
-EAPI="5"
-
-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} multilib-minimal
-
-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.10"
-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
-
-DOCS=""
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	cdio? ( dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}] )
-	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )
-	dirac? ( media-video/dirac[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
-		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )
-		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
-		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
-		theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] media-libs/libogg[${MULTILIB_USEDEP}] )
-		vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] media-libs/libogg[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
-	)
-	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
-	ieee1394? ( media-libs/libdc1394[${MULTILIB_USEDEP}] sys-libs/libraw1394[${MULTILIB_USEDEP}] )
-	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
-	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )
-	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )
-	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
-	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )
-	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libXfixes[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	!<media-video/ffmpeg-1.2
-	!<media-video/libav-9
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r11
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-# !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 )
-	test? ( encode zlib )"
-
-S=${WORKDIR}/${P/_/-}
-
-pkg_setup() {
-	ewarn "This version is _terribly_ outdated with known security issues and"
-	ewarn "bugs. It is provided only for binary compatibility."
-	ewarn "Use at your own risks."
-}
-
-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
-
-	epatch "${FILESDIR}"/${PN}-0.10.10-freetype251.patch
-}
-
-multilib_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 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.
-		[[ ${ABI} == 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-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"
-
-	"${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}" \
-		--disable-static \
-		--disable-{ffplay,ffmpeg,ffprobe,ffserver} \
-		--disable-{swresample,postproc,swscale,avdevice} \
-		${myconf} || die
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install-libs
-	rm -f "${ED}"/usr/$(get_libdir)/*.so
-}
diff --git a/media-video/ffmpeg/ffmpeg-1.2.5.ebuild b/media-video/ffmpeg/ffmpeg-1.2.5.ebuild
deleted file mode 100644
index 61cee7b61f75..000000000000
--- a/media-video/ffmpeg/ffmpeg-1.2.5.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.5.ebuild,v 1.1 2014/01/16 20:10:55 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.1.3.ebuild b/media-video/ffmpeg/ffmpeg-2.1.3.ebuild
deleted file mode 100644
index 17f41e9f8fb2..000000000000
--- a/media-video/ffmpeg/ffmpeg-2.1.3.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.1.3.ebuild,v 1.2 2014/02/12 12:48:25 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
-	ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal openssl opus
-	oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh static-libs test theora
-	threads truetype twolame v4l vaapi vdpau vorbis vpx wavpack X x264 xvid
-	+zlib zvbi
-	"
-
-ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
-MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
-PPC_CPU_FEATURES="altivec"
-SPARC_CPU_FEATURES="vis"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2:sse42"
-
-# 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="
-	${ARM_CPU_FEATURES}
-	${MIPS_CPU_FEATURES}
-	${PPC_CPU_FEATURES}
-	${SPARC_CPU_FEATURES}
-	${X86_CPU_FEATURES}
-"
-
-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 )
-		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 )
-	)
-	fdk? ( media-libs/fdk-aac )
-	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:0.4 )
-	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 )
-	ssh? ( net-libs/libssh )
-	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 )
-	zvbi? ( media-libs/zvbi )
-	!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 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libv4l? ( virtual/pkgconfig )
-	mmx? ( >=dev-lang/yasm-1.2 )
-	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"
-		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 ; 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 ladspa 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 fdk:libfdk-aac jpeg2k:libopenjpeg"
-	use amr && myconf="${myconf} --enable-version3"
-	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
-		ffuse="${ffuse} ${i}:lib${i}"
-	done
-	use fdk && myconf="${myconf} --enable-nonfree"
-
-	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
-}