remove old

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

6 files changed, 10 insertions, 1197 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index e74d6d74cb84..800699845602 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # 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.801 2014/10/31 11:00:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.802 2014/10/31 11:10:20 aballier Exp $
+
+  31 Oct 2014; Alexis Ballier <aballier@gentoo.org> -ffmpeg-2.2.7.ebuild,
+  -ffmpeg-2.2.8.ebuild, -ffmpeg-2.4.1.ebuild,
+  -files/ffmpeg-0.10.10-freetype251.patch:
+  remove old
 
   31 Oct 2014; Alexis Ballier <aballier@gentoo.org> -ffmpeg-1.2.6.ebuild,
   -ffmpeg-1.2.7.ebuild, -ffmpeg-1.2.8.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d91264c7a561..44d5373a9201 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -2,7 +2,6 @@
 Hash: SHA256
 
 AUX dirac_arith_hardened.patch 1184 SHA256 80e0ffcfd9db67f6a15df93f081e4eae24b0f6879a394c8d1ba6a29b239b62b4 SHA512 996e6439a984d87adb2f42afc00d3011324e0752bea50bf2708a701cf21ebde53ec3a2051c0c85aaa7d04a515088aa8e54d3845cdc125c5be8a3e98f2e7143d0 WHIRLPOOL 6ac462685a2eef402e583b1778f7a5c241a0a47a742b22531b5137bea4c8c977ddd2145fcb925dd0900ee79810c7dbc49c6ff1d358b77e216f33a68c790db060
-AUX ffmpeg-0.10.10-freetype251.patch 1841 SHA256 523e34408a435958c48021a85b366468062eff5e523b15499f7693c862135017 SHA512 082249f8fde79e1a658156901b68cee80ef1152f6b94927d235d1fb4dfb5acf7b51809af8e405984692536dee2e205357701043438f81b892163db6e592a4005 WHIRLPOOL 2c90c2f9b9f80b039797ac63329b8d6e8c9acca79d288d7cbb971c7275db84f28a7b2588890799ef03cd75614d4e148697e381c69d440639de676eb8f607cc39
 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
@@ -11,31 +10,25 @@ DIST ffmpeg-0.10.15.tar.bz2 5785998 SHA256 8b6dbf73c192d2217e6ded8e0dd560c678f36
 DIST ffmpeg-1.0.10.tar.bz2 6443581 SHA256 1dbde434c3b5c573d3b2ffc1babe3814f781c10c4bc66193a4132a44c9715176 SHA512 0fcc0541db6cdbf044dbb000a214194b0bfc67f4ac3e5c6efb2207c84bb11f6c6c3cf245ea67e1912256d1e1a98cf336a6f548d154393c36e266d92093006ff7 WHIRLPOOL 50c75a41747394aa2629cdfc6bd631e0207194c87ecdda120032f42e0d04327443fb13ea2b00ed52212da30992b01318846da0a0a594bac7d5757bccb525f32c
 DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
 DIST ffmpeg-1.2.9.tar.bz2 5973148 SHA256 5cdd912e13c8fe302937db811f63616193a046538bace1389a4989d423b59a0b SHA512 83e06514a4c27a0a5850da9af42b403ccadfefcf734b7492b563b6040c9176d4635536173c45458335b1e694bb427389054dd48e1f7a428824e8a5eb54eece0b WHIRLPOOL 8f04005d43a654d38477fca7f9d7abb42e4c0b83d86d8051495946d5ede02c3d3ef3f9c7fdf815843e5f1414e2619ccbd4faaf3f64b3622842a5997d6a41f3a0
-DIST ffmpeg-2.2.7.tar.bz2 7027327 SHA256 e01dc650bf85f05d8ec08021b281dc7b80f02c794edce49d2b95d9dace8ed8a7 SHA512 622b436dbd03deb68ec8f31e288605534b8288719d14e5baf5c8a59b7913d3f48580416064a64029735e000153197ac5a4dac654fdb9c404d4e13c73e44ffdf9 WHIRLPOOL 51cb74026cb13c6b947a7beb21be028ffc41c903a87ece72ce16d2ac361010cda547efbdeae5f525565a6a20ea5d7578f1689faac5e38da48fc56ec085e41be5
-DIST ffmpeg-2.2.8.tar.bz2 7026357 SHA256 f85425ce3eb544b6e9580c2defdba48b109329b74236b722f26dac975bfa389b SHA512 c00d1321d66d9079b6972b894d575a0cd509a99cf09d3308924ad3fff0d02976022a9645126732c8d201f3c45624a1bfec074b1b7bfa413fa0f1e2e916d9e63f WHIRLPOOL 73561e84f015da7e6899e7e8aa40e8c4dd00b987f7f78f30e9f76c22427f0d4119b94c629a181d974264f56edfc4979fe8cc98999c8533c21b46e0b9a95b0dec
 DIST ffmpeg-2.2.9.tar.bz2 7030449 SHA256 3e8912d81d78097490e22112fd8367d0d828b147ea36b2b3f36629abfdd77239 SHA512 04881e6e0be7f590fa0cf2384521a6c0c2eb7c0f7cbc58ea81448fa68d82410797a588bde420ea35e472e0d0bf3fddb3287dab64071ae9d9b749cffd7d3128ac WHIRLPOOL 48ae704e2944e50b4312ad7431d365e7f01331b97a100642a63274f60a865cc79b079771d970bd754b6279938c1232b11965fe4ac5511f1e97f129977ba7573a
 DIST ffmpeg-2.3.3.tar.bz2 7448421 SHA256 bb4c0d10a24e08fe67292690a1b4d4ded04f5c4c388f0656c98940ab0c606446 SHA512 0360a98075b29c0d54a8983d3417c8ed71d7523b83ec5f4afca31a94d0ba68729ff985abbcc8cb54882475e9d290080ada8a2140758951bc8d9f41f6fba1c64e WHIRLPOOL 3530f98d9aefc2d1b332481fd1420bd9ab5be677e6d78a420fd64222cb8b71c986391682abce3f704c48d05c4a2a39632d2a544bea87da46fc52b4d9663b0f8b
 DIST ffmpeg-2.3.4.tar.bz2 7435650 SHA256 2f7dece56ea72a22c7cf49e50b58eaadef340457404395cc0479c843b42344f8 SHA512 bfb2c33a1d10bd5f8f226a82ca99a9486d1e68e54f8cdb996b13f57a49e731ce9c0606392d92e8486e6cbc9ee75d241cf1abb2127ca274ce1ee67144e6b86c6a WHIRLPOOL 9b47f43f786260fe782d29be0b91deab091162b655c2fa7e09be55f86f4073a6dfeba60a0d9c9f8418b34aa7b9ca12ddd66bd0e4acb6bf5ad9b74b0e0670c136
-DIST ffmpeg-2.4.1.tar.bz2 7367864 SHA256 b4aecfce2c41ea4a21320dad818aa9a365b09a9cafe0b7173359cba86683c7f3 SHA512 201f357b7cf89bcbce3d015d5e5ab292b75c0f221f2e86908500ad73b47913aaa64938ab860cd59caebb4104294abb2f339d8a328f64f39a3fa4da66660c8e79 WHIRLPOOL e1096cb2bbfa276637b8731986fe3aaa8bc3b740e993b729ffaf04b248563864f0b4a1ea02602075cd2aa1ea4a6a3ffc16616184f665cad1918effc2b20b30b5
 DIST ffmpeg-2.4.2.tar.bz2 7367100 SHA256 974f90a9d7bde835213ab970c2190402e5d6566e47a7bb657d756ee92540fa7e SHA512 a5ed325f63dddbadff17291b8fbff4c6055a736c6ff9431c63c5e304510189e90110c36ae4a186954b8b9fdb76ac11f0a8435c13dfe54675eca6d7e2acd85fa3 WHIRLPOOL 22f0e49fc59fd88dad4fc44ccb38c2af7eb8364ebc0e3a9d6274f5dc5cc1d13036a0c65e618bf7e90757b8e69bc6b17e48f8298798b00c37643be5057bb406ab
 EBUILD ffmpeg-0.10.15.ebuild 9938 SHA256 d4c3b812f56c3c610c42709836c2263912b4118c86b1953289ba44493c5b511b SHA512 b04f03badab825c227af90d7986bb6b46b7b8b4ed20ef6de04d8429cf630ba96d36981b951c13443b48c6ff49a4e21f1d8c17108ce7862d2a41ce80386d42dc5 WHIRLPOOL 7188c3419031aa6a74cec9549a2dde10a88bc7c224160fc68121dc8b82e4b8fee14dfd065676274f9ec194251a092545dab2fd7d9c16a22e0dde9f8ecece8d2d
 EBUILD ffmpeg-1.0.10.ebuild 9661 SHA256 8e268c28be34d501171171af761494f37a26a8fe84293e9b8a05cf8bfd56ac76 SHA512 79781c15c09bff885f6f193e361bf8f929eca66903575fdfdb1188afc5d69c3bb6d0bd232d5eced7f4ac4a9c2f3aaff59a4164024e38bbd7f4c0a2c4a074c008 WHIRLPOOL 84e24bfc65736aa714a5506c9e8b1fa9e6ddc91e0c06e991e4598cdf1b85c1da68317fded1374fbfa6076f7a81c0da0cded87d7e3e9f2a1427d5218a59482fcf
 EBUILD ffmpeg-1.2.6-r1.ebuild 10971 SHA256 744922812b304456ca62be21ba8241ad45508cb2ece3421a65874f48c8da54e1 SHA512 52473418fb4eb13735ff2a69f1771d5371ade710fe1cd3c4578e1fe3231165ab5774ad23681aa1f083e396282d0690a3fb09ece623feff39786bdcc6177eb952 WHIRLPOOL 73bc7685d5fd0d6e68f4914e246f6de991cd826ea4e952320450aaecd803ec873606e27495ce3892ef78de777f0d7292dfcd4e42873be2a7712df09a1fe11918
 EBUILD ffmpeg-1.2.9.ebuild 10929 SHA256 7f8efcf95b404dc68d6e1ca867d2a751d159c6eb225136965497f3dd71f90fef SHA512 586e74091bcf30fc3ccf9b526dcf65cd6971a1bb73e2bdc0db80a6b70f39a3a86d678c923b7c1bf25f9c588d6ac037a41715d94fba23c66a12d92ab93ba156ed WHIRLPOOL b539e057094f9df79b2b10df5af6a513278ca3cd31856080cad433041426f549df96d3fb6d7dcdb97226a91a55e23a85409578a2fe89317d70e19c51c59901c8
-EBUILD ffmpeg-2.2.7.ebuild 12594 SHA256 988cdc1a5d56366ef8a87f133d4e96e4ccb3ec13709159e3fbc10e2302511fda SHA512 2346c5b017f07cf9a36e28f372df9a5454d6d7ab74900d86d69a02244fff9a784f8ed143e830d09cc6c4c88ea24b1ee02afe7cd8e58860fe11e213af4af42708 WHIRLPOOL b90e99becb52c98f30ee29d7bd448a5b396b45834981edd8fd62b91145c7bc4f3e7f217689272a32c28a8a0ac575dff0ef5092c41776ece421f6ba407232b8e0
-EBUILD ffmpeg-2.2.8.ebuild 12594 SHA256 399656fb7535f264427a32485e12b5acb9f5ddee186168bd5bc947915b03892f SHA512 6a63b3d2cdca786e2e0fba7aca68d385e02e7dfed56a922b582e40d3246e0bec07dd4f39434daa646a96d0c6cc01b2db167913b2186a23311be8b1cf8ef1802a WHIRLPOOL 4f423f512b16f07334b2c4f6fc8f348d0cd926d4b51c2142a2a51a4d4ae4284f6e93a0a5e599ae233c8124607818bfe7d8eff835f94ad099a927b6c7b3f4709b
 EBUILD ffmpeg-2.2.9.ebuild 12594 SHA256 07df652de81766fb59bc7f54e932c9bfc8ad13e23baa267c727e02400ef21ce6 SHA512 aee2d895020a5c3431d4cbf22fe7bbe4e01714d241a5081b38b721c147b6bde77f06828a3100d45aeb7d81f772e67ecf06a7dee321e8624bad9f37364c8d37bd WHIRLPOOL ab0b600f7f87f99584c8d0b94852b0503d87da4b27f4241b0bd036eaf8719fc18d061c12f5e52e2aec437a63a5a5888370bc428aebd56925a8de8167bccf2ca8
 EBUILD ffmpeg-2.3.3.ebuild 12854 SHA256 75413b542a3ccd81f07da76fb9f4e2f7d64214ffdfc066ee045983702265d386 SHA512 62046cbf3aefad694ac5ffc6db971dd6efe244426f17a226f51dc69ea2fa6b26bee21b35c5608f0375fde6f38f22d5593cf1556b675c803b0cf39706477a6e14 WHIRLPOOL adf4b8bd9afaf0c294cb9ac41eaa3dce85ea27286b52e2b01d2d4294e7770967a572a895b44f51d711f03259df3ab7fcb14e9bddddebdfe912a84b0c1c84d472
 EBUILD ffmpeg-2.3.4.ebuild 12854 SHA256 6a88d47b94a025f85cc007f2b07b99f4b4987d53d6c559db209436ae319dc2e6 SHA512 ceec5956b54be4bc6e07a08022e7a9f0b725e686cd8ac4f138e0e35ea6c360b0dd599eabf246fb1e5c33df56dbda78551f3c3321c254990fe5e12a6f6320aecb WHIRLPOOL cfa788cb7fa22def4262a4e555892d6e6213a569da1e89cf571884b1d9c4ebd7c9e51532ac5e1250d06bcf68528fce3f98f47606a389db07d5fc59a6d15ed058
-EBUILD ffmpeg-2.4.1.ebuild 12968 SHA256 8c6b5bb57fae211e6247f24bf297add8fd59a32fb32bfefa44a2a5f6e6de7f54 SHA512 b6cd190c7967686a0ded66f17d7914632564e24db6dc41f365affa92317172e5557ea6e6d07799e778e42d3abc8438660a3cdf229e2c6e8b353cda3b16d0b2fa WHIRLPOOL 63f1c1643d5830cd1c71663ce7b6718dff31d1546f9e53120efd04d33f4ec47608cf67fdcfbda88b8b082b625d446fc1aaf3c41c84e2cf0b8875beec67d0f66b
 EBUILD ffmpeg-2.4.2.ebuild 12968 SHA256 2bd75fd3f786bcf41bf254583758fce36532f6c46bdfac4a05dcc53184d5fdaa SHA512 463e55cbd3b59196b425ceab6c56e8e1d7f0dfc4b948ef14494a15c35a624c6cc9a3dd98c56fd67193760d5de06cd3bb2f902f5e2e52e2347e1297954c441faa WHIRLPOOL 6680008c6927698de77609084450d8be9f6b3f8e7af5b326cab85f7b100662df8b5dd1582aaa69c8d5dee2ecc795a1a0e33706768163645d56abfce19ff5c91a
 EBUILD ffmpeg-9999.ebuild 13063 SHA256 8ebf2e94213d0a65bbe839d45b847d936cfbf16a468fa098a68b027b89fc42e7 SHA512 980dcba3010aa58a8aa4aa3b12aac3e6ea38f7ebdad6b80a139f2b344e09e947ea1c31f7a627a63a757cde9a9802ad6d765f53fea9518b13b6297209afcb2d61 WHIRLPOOL 21ef569e95c8c601bf19e8376d5ed6b97afba05d0f5917289ea5fb2a9ded8a837a3aa4ef3db180a6a176e0395330e1f4a3957a1353fd969ecd1cfc8cd1eb555d
-MISC ChangeLog 110874 SHA256 2c6499859abede48c189930852f65478098eda59c0a733566bd0e02f622c4b84 SHA512 b3410994e0cf66fc0243b8fc0ac90b044919d14227cd62f5b930eba1a0b9fdcebdae454b3c7384e89816f76a70e0d5e4e3616d9f909ad3f2e3ba10edd9090cc9 WHIRLPOOL 3915aeab154b02847bb6f0691a41b33e8d1398927dcb6c7d86937aac871b490858debe4f2e52a44f6c46e37b5d9be3e03494369e9f301672364b52d963cf271a
+MISC ChangeLog 111051 SHA256 1d405982ab4885274ebeab17dfb6d57c290e7846dfd7253efba9b471a18874ea SHA512 479cf5749f414f1ddf67bd07deca8ee01fc0070b3ab5a4107e1959c935681c0583d1276ad8c9bf3ac94b71ae85f6cd116d1d406230c24e08b4f3d919d045a939 WHIRLPOOL 635704ac20a97328b16e41683f86cf913aed66220a7cd88bb2f37704ac82a772d964906007687781e6c299ce663a3dd7954a6e21d1e05169a0400f3875053c94
 MISC metadata.xml 5647 SHA256 359e839a7d9c3c36825bfae0e9217688785d279cebbfc440bd4074f5bc58fb9c SHA512 3efe9374ca61952911a6593417494092d9fd5465745a63e427dc74cbd6aa4af46277ec4865603daf5b27163c8db97823ff2b4eb857e88d73f3278e63a949e372 WHIRLPOOL fc5873ea67edea764b6ffff08862ad850a4bef83daed4a1ac03fc2cd9cfb8cb587561ce8fdee39a79fd6686b4605bebaaa0c00dac6a858e5d6f5ac563751ea20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRTa9QACgkQvFcC4BYPU0oY6ACgp2bqOr5zM1YZjrbaeWS3kARL
-T78AoLwiARGDwftlMR5VvOH1eVSWc3MC
-=M0Q7
+iEYEAREIAAYFAlRTbh4ACgkQvFcC4BYPU0pmtgCfbuABFMHvXuq/uZkNWfqpB5e9
+bYoAoI70dVOhEUvTBAyF+4oGUZ/tuEr6
+=5T2P
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-2.2.7.ebuild b/media-video/ffmpeg/ffmpeg-2.2.7.ebuild
deleted file mode 100644
index 87e2eb992bac..000000000000
--- a/media-video/ffmpeg/ffmpeg-2.2.7.ebuild
+++ /dev/null
@@ -1,378 +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.2.7.ebuild,v 1.2 2014/08/29 19:50: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 multilib-minimal 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="~amd64 ~arm ~hppa ~mips ~x86 ~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 opengl
-	openssl opus oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh
-	static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx
-	wavpack webp X x264 x265 xvid +zlib zvbi
-	"
-
-ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
-MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
-PPC_CPU_FEATURES="altivec"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma3 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}
-	${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-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? (
-		|| (
-			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
-			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
-		)
-	)
-	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-0.8:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	quvi? ( media-libs/libquvi:0.4 )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	mmx? ( >=dev-lang/yasm-1.2 )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( net-misc/wget )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	epatch "${FILESDIR}/ladspadl.patch"
-	epatch_user
-}
-
-multilib_src_configure() {
-	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+=( --enable-nonfree )
-
-	# Encoders
-	if use encode
-	then
-		ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
-		for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
-			ffuse+=( ${i}:lib${i} )
-		done
-
-		# Licensing.
-		if use aac || use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-		if use aacplus || use faac ; then
-			myconf+=( --enable-nonfree )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# libavfilter options
-	ffuse+=( flite:libflite frei0r fontconfig ladspa libass truetype:libfreetype )
-
-	# libswresample options
-	ffuse+=( libsoxr )
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	ffuse+=( threads:pthreads )
-
-	# Decoders
-	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
-	use amr && myconf+=( --enable-version3 )
-	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
-		ffuse+=( ${i}:lib${i} )
-	done
-	use fdk && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r libquvi; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && 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+=( --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+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	set -- "${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[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-man
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	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
-}
-
-multilib_src_test() {
-	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.2.8.ebuild b/media-video/ffmpeg/ffmpeg-2.2.8.ebuild
deleted file mode 100644
index 51b96dccd396..000000000000
--- a/media-video/ffmpeg/ffmpeg-2.2.8.ebuild
+++ /dev/null
@@ -1,378 +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.2.8.ebuild,v 1.1 2014/10/05 06:17:11 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 multilib-minimal 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="~amd64 ~arm ~hppa ~mips ~x86 ~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 opengl
-	openssl opus oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh
-	static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx
-	wavpack webp X x264 x265 xvid +zlib zvbi
-	"
-
-ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
-MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
-PPC_CPU_FEATURES="altivec"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma3 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}
-	${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-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? (
-		|| (
-			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
-			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
-		)
-	)
-	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-0.8:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	quvi? ( media-libs/libquvi:0.4 )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	mmx? ( >=dev-lang/yasm-1.2 )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( net-misc/wget )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	epatch "${FILESDIR}/ladspadl.patch"
-	epatch_user
-}
-
-multilib_src_configure() {
-	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+=( --enable-nonfree )
-
-	# Encoders
-	if use encode
-	then
-		ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
-		for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
-			ffuse+=( ${i}:lib${i} )
-		done
-
-		# Licensing.
-		if use aac || use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-		if use aacplus || use faac ; then
-			myconf+=( --enable-nonfree )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# libavfilter options
-	ffuse+=( flite:libflite frei0r fontconfig ladspa libass truetype:libfreetype )
-
-	# libswresample options
-	ffuse+=( libsoxr )
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	ffuse+=( threads:pthreads )
-
-	# Decoders
-	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
-	use amr && myconf+=( --enable-version3 )
-	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
-		ffuse+=( ${i}:lib${i} )
-	done
-	use fdk && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r libquvi; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && 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+=( --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+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	set -- "${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[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-man
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	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
-}
-
-multilib_src_test() {
-	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.4.1.ebuild b/media-video/ffmpeg/ffmpeg-2.4.1.ebuild
deleted file mode 100644
index 418364f23480..000000000000
--- a/media-video/ffmpeg/ffmpeg-2.4.1.ebuild
+++ /dev/null
@@ -1,378 +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.4.1.ebuild,v 1.1 2014/10/05 07:15:05 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=54.56.56
-
-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 multilib-minimal 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 ) ) samba? ( 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 bs2b +bzip2 cdio celt
-	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
-	fribidi gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack
-	jpeg2k ladspa libass libcaca libsoxr libv4l lzma modplug mp3 +network
-	openal opengl openssl opus oss pic pulseaudio quvi rtmp samba schroedinger
-	sdl speex ssh static-libs test theora threads truetype twolame v4l vaapi
-	vdpau vorbis vpx wavpack webp X x264 x265 xvid +zlib zvbi
-	"
-
-ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
-MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
-PPC_CPU_FEATURES="altivec"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2:sse42 xop"
-
-# 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}
-	${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-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	mmx? ( >=dev-lang/yasm-1.2 )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( net-misc/wget )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	epatch_user
-}
-
-multilib_src_configure() {
-	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 lzma network openssl samba:libsmbclient
-		sdl:ffplay vaapi vdpau X:xlib zlib
-	)
-	use openssl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode
-	then
-		ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
-		for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
-			ffuse+=( ${i}:lib${i} )
-		done
-
-		# Licensing.
-		if use aac || use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-		if use aacplus || use faac ; then
-			myconf+=( --enable-nonfree )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# libavfilter options
-	ffuse+=( bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype )
-
-	# libswresample options
-	ffuse+=( libsoxr )
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	ffuse+=( threads:pthreads )
-
-	# Decoders
-	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
-	use amr && myconf+=( --enable-version3 )
-	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
-		ffuse+=( ${i}:lib${i} )
-	done
-	use fdk && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && 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+=( --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+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	set -- "${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[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-man
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-	use doc && dohtml -r doc/*
-	if use examples ; then
-		dodoc -r doc/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-multilib_src_test() {
-	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/files/ffmpeg-0.10.10-freetype251.patch b/media-video/ffmpeg/files/ffmpeg-0.10.10-freetype251.patch
deleted file mode 100644
index e55d62e71bfb..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-0.10.10-freetype251.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Patch based on
-http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=cea5812fa723c08b89d929eeba73462e05de2973
-
---- ffmpeg-0.10.10/configure
-+++ ffmpeg-0.10.10/configure
-@@ -943,6 +943,26 @@
-     add_extralibs $(get_safe ${pkg}_libs)
- }
- 
-+require_libfreetype(){
-+    log require_libfreetype "$@"
-+    pkg="freetype2"
-+    check_cmd $pkg_config --exists --print-errors $pkg \
-+	|| die "ERROR: $pkg not found"
-+    pkg_cflags=$($pkg_config --cflags $pkg)
-+    pkg_libs=$($pkg_config --libs $pkg)
-+    {
-+	echo "#include <ft2build.h>"
-+	echo "#include FT_FREETYPE_H"
-+	echo "long check_func(void) { return (long) FT_Init_FreeType; }"
-+	echo "int main(void) { return 0; }"
-+    } | check_ld "cc" $pkg_cflags $pkg_libs \
-+	&& set_safe ${pkg}_cflags $pkg_cflags \
-+	&& set_safe ${pkg}_libs   $pkg_libs \
-+	|| die "ERROR: $pkg not found"
-+    add_cflags    $(get_safe ${pkg}_cflags)
-+    add_extralibs $(get_safe ${pkg}_libs)
-+}
-+
- check_host_cc(){
-     log check_host_cc "$@"
-     cat > $TMPC
-@@ -3134,7 +3154,7 @@
-     "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h"  \
-     "dirac_decoder_init dirac_encoder_init"
- enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
--enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
-+enabled libfreetype && require_libfreetype
- enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
- enabled libmodplug && require  libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug
- enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
---- ffmpeg-0.10.10/libavfilter/vf_drawtext.c
-+++ ffmpeg-0.10.10/libavfilter/vf_drawtext.c
-@@ -47,7 +47,6 @@
- #undef time
- 
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
-