remove old

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

7 files changed, 10 insertions, 1803 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 039a0e8ff54b..767430cee9af 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.788 2014/08/29 19:05:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.789 2014/08/29 19:08:50 aballier Exp $
+
+  29 Aug 2014; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.10.14.ebuild,
+  -ffmpeg-2.2.5.ebuild, -ffmpeg-2.3.ebuild, -ffmpeg-2.3.1.ebuild,
+  -ffmpeg-2.3.2.ebuild:
+  remove old
 
   29 Aug 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   update subslot per upstream git master, bug #521502 by gerion
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f082b3dda321..76262b4646d5 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -7,7 +7,6 @@ AUX ffmpeg-1.0.8-freetype251.patch 2008 SHA256 b52b832ad8b35ba79a1cbc5c592510d87
 AUX flashtest.patch 2343 SHA256 fcd05d4ad3f8cc6dd64a55c83279bd5738002100f1cfdf2f4ca8c9547f5b9a28 SHA512 e2994e3b25b207021e00ed982a82efa8ab2fdf2499f5ef97b7f280a0abd33fac639b7e26c26b5ed7dac70931c009b7062b6c91c4b4b38d30a29f8b364a837ba0 WHIRLPOOL 78c41fd6dcd7f698b92ee6f9ac0c5c5d80c8e45c3dffb8c2bff72f0802084b78ce601dd716c6ae7b6bc6641b4f98a1ec33acfe761a13bcfaeafe3677fa6e3ee0
 AUX freiordl.patch 611 SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b84e0aae571f3dcf SHA512 1d7491e65fec247d9cb6b14e9a494f55e3a88ca9ce0962b7874e3f3e5c087ca7672bda5949637f4493c49a388070addb9db909c2e384f8a4349609ec02e7dd3f WHIRLPOOL dc2bbc9c95dff14998ef8f7f15c55b9cdc9464e01e036c3b67935d9505596360d103aafb9a50b43e6d2e78950664c4b6f214a874fc6aa29727397130a98e6511
 AUX ladspadl.patch 723 SHA256 b660bef2bdd4ecba5c3ec04fccee16f4ed3eab0dc7f125f19ab004274df7d17a SHA512 fa2022e2ac73cdf63a7ebdcc71672123adf223b4eca4ee027974a3de380f54378d063166c7048c243ccfb2a95b8ebbd1115f010fe9e491bbdcee7896c523d790 WHIRLPOOL c2d175d1e953117365a929ba85d75b0fc5e60ae4e23a00a2998c6f62c00084a3d78becf027ef2710f8768cd7528b333dfad9dbfea049a7d2f45b5b66751e16a4
-DIST ffmpeg-0.10.14.tar.bz2 5786281 SHA256 1ef77533f3803b8630403df413005c1c41b18c50b16895815182fd70d2f833bb SHA512 17dd1452fa5b9f6405b357b8cd774d03047691ff5a79feb28b6e2bc1df895d71f43f4c7b7280db99cf645dcd9a5c0751af382499afef28957533fd2c0f91e063 WHIRLPOOL bb8d0d8f55e67e6a8c58621437566a7989e729e96b34c24bc27a2324c423f53113e540d67ede2acd1f078fa31b7ad5548a699b0a7f8c6c42018ab2c3ac26d426
 DIST ffmpeg-0.10.15.tar.bz2 5785998 SHA256 8b6dbf73c192d2217e6ded8e0dd560c678f362e373d87c28ed9fc8eb52293d5d SHA512 0fb719847bfdc16d17c64b1be607427557c63cdf7a8a637231b1dbaac38bfc3dc3ff8f69d51a6c0305d05b2b186ecfcf5e6d2a5f3192f015be9751e0481e429e WHIRLPOOL 69798dcdc0a37d837840bfc2e5cb37177f8ddaf47153c25a5c24726723fa6ca7b39e0940eb2133ee4715e855d7dd08f05dd7252f94a48424909ac799d1900cdb
 DIST ffmpeg-1.0.10.tar.bz2 6443581 SHA256 1dbde434c3b5c573d3b2ffc1babe3814f781c10c4bc66193a4132a44c9715176 SHA512 0fcc0541db6cdbf044dbb000a214194b0bfc67f4ac3e5c6efb2207c84bb11f6c6c3cf245ea67e1912256d1e1a98cf336a6f548d154393c36e266d92093006ff7 WHIRLPOOL 50c75a41747394aa2629cdfc6bd631e0207194c87ecdda120032f42e0d04327443fb13ea2b00ed52212da30992b01318846da0a0a594bac7d5757bccb525f32c
 DIST ffmpeg-1.0.8.tar.bz2 6452144 SHA256 8580a317aa09fdabdcf5119c87f59fd3baa4df0f636aac4d3dfeb86c572277aa SHA512 5fc6caf20c016e9d8ff41175d3bb5bf6d4a2c25c65ea8630d45ef8d9a16ee53120d76e4bc220b4f4462618e5c731114182776d7193e9d085332cf087038f3488 WHIRLPOOL 6a6b80a5aa44ee1a1c0af61bdf95659eb319ae48b690c2c1b9dd5291ad3b6f5ab52884c835d925da88dd2467f49ec2198cb78c2ef78af4f2e372c6364c769f6e
@@ -15,13 +14,8 @@ DIST ffmpeg-1.0.9.tar.bz2 6449857 SHA256 98b3c35bcc602ab1e236fa64da8ead3deae7a5f
 DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
 DIST ffmpeg-1.2.7.tar.bz2 5969563 SHA256 669b59483773b5b58d63b65e12749d68428729eaa6978c5acc6c82a60a2ed28e SHA512 b23800b1f7de5ab3ee473931f4d8791e4927b8d248df66c36ade54001365438eb7424ec2ee9e018ab37b76a9551457efdec019ea8356f8e59f1055fe1096f88b WHIRLPOOL d28a3c4bd7c67847d21c71f33b7fce0760136881ca2228c18ae41d5dc6ead2a50d9cbcf3d6593a82e51e666428389fce0c546f711b13bae530c464de2ac3101d
 DIST ffmpeg-1.2.8.tar.bz2 5970565 SHA256 429b5904abca0bc443bcc06358988aab9169683021aac21a306de28f329d2e59 SHA512 caa13a44d25c9d51f96c33b0e920a42fe899736cedf89c13513850fc1d0d81a6f67ce7391f98480e9283c8ca01be01e8fc43243a5a49519873df8a06d6083d8c WHIRLPOOL 23ca014f5f13060c220ce61b4e22a6207c4194607763ed2e77071bec8617644e4065cb8e42ba8b05a8b4802ccd5a9a3ed8510791c7eb09a57bec60f1ec360ab6
-DIST ffmpeg-2.2.5.tar.bz2 7024774 SHA256 c8587a1ac91599dd87fcfb53de6e32b9ab81449e7f22ff55044faf7815a68633 SHA512 cf350638e0b9987988bf4feebb44072fd14df6a3c49b1de9830a9126f1bbd6d11a21e84b9ded751849400ca11348b1952cb361099fa8a5ea737468a799f40cd3 WHIRLPOOL 32d98787d6d1c4e9fdb7261931f29f11aa3647ab7e4850fa4606336bf9da43be2fe07e05f1263f0ae03b666fe1ced57f27e5b8395b738425fd7c7c8bcee35c84
 DIST ffmpeg-2.2.7.tar.bz2 7027327 SHA256 e01dc650bf85f05d8ec08021b281dc7b80f02c794edce49d2b95d9dace8ed8a7 SHA512 622b436dbd03deb68ec8f31e288605534b8288719d14e5baf5c8a59b7913d3f48580416064a64029735e000153197ac5a4dac654fdb9c404d4e13c73e44ffdf9 WHIRLPOOL 51cb74026cb13c6b947a7beb21be028ffc41c903a87ece72ce16d2ac361010cda547efbdeae5f525565a6a20ea5d7578f1689faac5e38da48fc56ec085e41be5
-DIST ffmpeg-2.3.1.tar.bz2 7446524 SHA256 ee6a2f4c11424698537615443b2f4e1ef853bffd239f93295654e2c40ad78183 SHA512 5786be8389b4532eb7ffa439426dce7312df6c9572df3574444e84036ccebc414f0473d918096ff65e5de55a551cbc6fa96970a6cc490aa08bd4c18782267559 WHIRLPOOL f9477ae894338e1f70da6c2b69b9bb0f1a836b527e7711da243eeb2a4316eb7f9f556ebed7bf419762b017daa4a25524b7bd331b2b079bcb85b878b28816e4b1
-DIST ffmpeg-2.3.2.tar.bz2 7446477 SHA256 84e135432208361db2e1206df4380b7a7c3c2a38e0df23c6fc92553aafc4ffd2 SHA512 7bda541ba02e3c4672d91640b83fcc1bd94beefb777f7bb1c25e56b2dd7b30f43bd8fdeee9f6e907aab3c4caccde8e5a6a34308abb023fc969d1beb0ccd94edb WHIRLPOOL a9e6df11a3be25c51057793621d05df7c1de6e5cbf73d0446fc39d63f56b3fb16d73389a993ca0c320ff4824137d3ec1720fe3e2a6b3beffb29ccb194742d9bd
 DIST ffmpeg-2.3.3.tar.bz2 7448421 SHA256 bb4c0d10a24e08fe67292690a1b4d4ded04f5c4c388f0656c98940ab0c606446 SHA512 0360a98075b29c0d54a8983d3417c8ed71d7523b83ec5f4afca31a94d0ba68729ff985abbcc8cb54882475e9d290080ada8a2140758951bc8d9f41f6fba1c64e WHIRLPOOL 3530f98d9aefc2d1b332481fd1420bd9ab5be677e6d78a420fd64222cb8b71c986391682abce3f704c48d05c4a2a39632d2a544bea87da46fc52b4d9663b0f8b
-DIST ffmpeg-2.3.tar.bz2 7443666 SHA256 6b3dbb64e20951480bfd64bcbe305f6ee9031e5fccfd3b3e94cc5055525f809e SHA512 82bbe5109e426cbd3063f8b2edb3e2daa7f237c4fc46ca37907ab316351978b689f2e0c4d88645b2eb19582765072702f3a19a17c6b02dd11bccac3b41d27a03 WHIRLPOOL a6f16226e07f17c6fb66e58154035f0ae65d52bb113db7afb1ac234d467ce53a58a044cd262fa98a11a7e83faeadc0c16b2e9d3115f83d3e39c76f00d43db3a3
-EBUILD ffmpeg-0.10.14.ebuild 9936 SHA256 cecd036a7b218d0abe941004dc87242ee02756ed6d76a46fe5df7be134d59928 SHA512 74b4b986c89d227f4ae2f99ff7db063db5aa15d1872b10717bf5a42ad6e63517dac47a9f577162e3b33d85b42644e921e097eff73aa3c0466c2216480574cf5d WHIRLPOOL e67d1c5e7a1176fa7a92ac5d7b904b03780a3f3ef7081612d26c78ec129f1ae01401311bbdb6713ec06aaac64ae655a30742dcd53d0ee6582664a75e55feb227
 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.0.8.ebuild 9652 SHA256 1def1e010712626f090b7945a3fdd7134d39a6fbef32b589681675d5d9c41ec1 SHA512 5980171b00391cd8911c8a8e0e23648ee7bca693e6304b9440c81dba27cb8be7729e5dc32c3ecd52d95a683519e89b059ac235226a5e79bddb72e5c412fa8d3f WHIRLPOOL 6ce5c315b8fab1e2f9d7ddf322075cbf03f1cbbac4e189fc6642e859b0167dd0146084396fea2948c4feca625680a7db55d1c924dac3c1539bfb9e6b9a24f45c
@@ -30,19 +24,15 @@ EBUILD ffmpeg-1.2.6-r1.ebuild 10970 SHA256 1ca1d3d34a6795d9dc14f8a7c02a9863d4c70
 EBUILD ffmpeg-1.2.6.ebuild 8997 SHA256 04e7bc631ea399188fd9bed00c2d6c78e0113b1b197f55c31a1da002f92275de SHA512 3347cf697f21917b4bb4b669bc7da888d1e1d2207192e8a692d6f13eed2d091a6da85c44ef15592e12a3dbced218c5269bc8058da44c7b872882b21a71f3919f WHIRLPOOL 957a847757ca8fc032236fb5a97769a0a0aa2ed55a62913098fd8a915426ddf87fd4850d5c716222923d3f6564a0833f079de7e36faa4fdbfb9f0f7801476b0e
 EBUILD ffmpeg-1.2.7.ebuild 10927 SHA256 f93cbe16de7d436740fa321a3fb0522a3f0253aa55b14e520b40649da4120a93 SHA512 51bee7cb143fc16ab8bc5ddd7c0654db6d4de2831ac1c72ab816bc065e7f2768e162768c12ef78431534f97e0ab8687fe3225f288ada28ff530b3c9701adc922 WHIRLPOOL 4c4cfe485e234675b1dcb6dbfffff00f6c0016284b31d5d028ba44320819e75f0c9526cb17f38570bf638f72f8ad4a34c2a145df00692794497f91ddb3619cf1
 EBUILD ffmpeg-1.2.8.ebuild 10929 SHA256 349849634886a90212e6cb2aa92652e71d3b4b9e88498d90bebfb37154105d09 SHA512 553c2803497f3f4f8083def6710c4d05ce4b90ad6d6fd15f3b67c9adce8df443c6f2be065926339a199e06449fb0ddca3392a60c55ba615efb54a4f813250b64 WHIRLPOOL 932d3f426af62b5bf2a6ae4ab20e6cdb59a8c6230d61f397033e1fc0e11adce380d47328d1142c2ce7f28f50f58ec5d8f818ea51bafedaa179ad7d00e1afd13a
-EBUILD ffmpeg-2.2.5.ebuild 12546 SHA256 11ec6d885b818f921292971e6f0f68475d79098db7ec9337f93a89bb3cda0b68 SHA512 819efcc55fba4f6303d908639043177ae5ad1dff1725deb5a30bacb7b467c286dd28ea6d4f0a1b2497aafb34bb34e1d4cc234ab95f8578b35a73aa7cc8589f08 WHIRLPOOL 47cebb40855574d41630a73013f0c82f7e6254f7dc53b6154620479c943a9a6a1269c417a06616432ecc7894f8231003ea900ae5774d84234bf6ef57564c6706
 EBUILD ffmpeg-2.2.7.ebuild 12548 SHA256 2ac87b258a79fd29b1f6bf4fbf2632acf5488845bb806614de979f05c7571ca5 SHA512 0c973647b838216fc33c8ea931a17132ec1005dcb573dadf6eaaec4e5ace16671613e7f667261a3d680cfa076421128090b1b3fdf075eca0aaa552dd10b6b1de WHIRLPOOL 3b155dad616dc5f391a0ee0c2b152ec396da30563488f0770f4a3202b70f6c83b0249c244f367d0534fe56e51b6aa7fc872b901233d7502024dd8304f234c1f0
-EBUILD ffmpeg-2.3.1.ebuild 12876 SHA256 cd2a1cf17e1b58d7d31fc65787089be2e4ac710f2d0b00605a54eef10c339ec6 SHA512 4fddcb94b42295fdf525d15f573c2492feb9e6b31f9003ec6d47ee7ab7ba1bead635b7c48b0b8366f720531b1367119e865224cd16fbaf13cca6ccbb37f946a1 WHIRLPOOL 50d090502deb4c4a58b559f486bdd40653303482f08dd522467f1014aa2feadfecd461f1bfc859291102e9f85bf0da243885b1e976d84cccdec837d31add9c6c
-EBUILD ffmpeg-2.3.2.ebuild 12808 SHA256 61bad58398e48631a7efee958045bed8bca6e851f654636570975c4ecb60a6e4 SHA512 a78cfa96bd2db58eb3a40f959c6237fedf32cb2c34a5874fdb59c6a211f8ca5c91e2bedeca8a445254d8cd87248e6584a9de771183d09aaab128433c1fa6ca92 WHIRLPOOL 26d31ad3c6ec4671ab2963b84c44c7ad1eac2b17fdbd629b584e89771cd018cece6796dd0230dab4eb4a678bcd01342d947ace9f996874d0d3d1c3402764166e
 EBUILD ffmpeg-2.3.3.ebuild 12808 SHA256 8cac70a885bf862a140ddf705cdc2ae836e2ee0d07e11a62b2f7033008863277 SHA512 f589ec2fb712dbb32cc212281fbdcb82b68242b509e9785f023e72b6b1e95f1cfccf4ae1c34e46c9cbe952aa4b561d7e54c1de30f66f5eb138241d6098e04daa WHIRLPOOL 5e260e03febe5ddbf98e628b57e7df359b5399071bfdeb27e3d1070c14f97b91486586ac0f91ff6d39f7933ee10d2e6ccf4416dd25f9e997a17468057fc5534b
-EBUILD ffmpeg-2.3.ebuild 12874 SHA256 621b96aa35556f50dd64c00e4023afd9faba85994833c60bddd167a895e9fe06 SHA512 2ce05f69d06b32c5927e9f5534abf16c033e4bb78dc933194f127791fe1bce9bb14c5919a61f72ff5a87c73be3d2342158fd18d9f7d477721455d37d76c330ea WHIRLPOOL 0cf637dfc3886412ac9d5dbf7fe5a487773be32df1de1971faa8257779917710b8caaa3ffd72942dee1cb7d302f39ed285f99efb94c14d96a5af26d622190852
 EBUILD ffmpeg-9999.ebuild 12923 SHA256 52e2fdb976438cf67ad981c082cadf9d6aa9a722cc6e2c0e8cd646559123f1d7 SHA512 9859f08de83d293c9cee3d9aad941def4c7223e431f175906ad119f973854a34e45666fa5a0bd6282a11100f7858124b4bc0b0de523b57f1e20669fe74ba2af4 WHIRLPOOL 7764284539613f2320f6bf5f0c805e04c6bd6f50903539cdd324e8fb016985bcca286e57a67a025ae1f99c7445722229adbca6e043bea5d905300b5f1cc4ea68
-MISC ChangeLog 109226 SHA256 c6c78aa67b45d84654ef1403723cd29dd063f38f33e4c15ed481db9562a98df6 SHA512 32bfebf178a061fd9f4891ccd7f0d3b367fd7c8241ba07a6dc32f268957b57b752d89bf1d7b53646fe305ec5d658ffd37895fbc8d0d5bae96407a8e15c2a2958 WHIRLPOOL 017d38efe340653602f69c58a1ca0c4c1ec2f7f31124b1ecd11fc6e10a8c26a9b8717572d010e9f840d05bbe4b88cab1f03fd32aad26f5f0d93ca212acd72ffe
+MISC ChangeLog 109406 SHA256 77ed4fc5311229774da39abac6d4b66c38be006fac6b0e6dbe1627dfde950988 SHA512 61f114aaa3824072554fcc7bfd3391442cabeec74647d10c92ce67b513ad270fb62c7511535c7911c123ebabc1fba2d3acca967aaccd059418f4c6fc65bdf388 WHIRLPOOL dca54e9fe165356a5ce22280213a3537b8b53adf565167362a37305c7e82a9a9da6a09c5246d5ea8f28d376e5bd685c86062df8f57e75acd9420bba1232f6369
 MISC metadata.xml 5647 SHA256 359e839a7d9c3c36825bfae0e9217688785d279cebbfc440bd4074f5bc58fb9c SHA512 3efe9374ca61952911a6593417494092d9fd5465745a63e427dc74cbd6aa4af46277ec4865603daf5b27163c8db97823ff2b4eb857e88d73f3278e63a949e372 WHIRLPOOL fc5873ea67edea764b6ffff08862ad850a4bef83daed4a1ac03fc2cd9cfb8cb587561ce8fdee39a79fd6686b4605bebaaa0c00dac6a858e5d6f5ac563751ea20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQAzvwACgkQvFcC4BYPU0oQ4ACgpjTEtSQe8FRT0AojYY70jaaP
-NTwAnAqnql3Sy1rvN+3d/0BC3OudEN4Z
-=gkFu
+iEYEAREIAAYFAlQAz8MACgkQvFcC4BYPU0qOnQCgylTqmjDGk956vrWqw+isezyH
+VrcAoLG9vfgybNSQGRNoWflZac5iO7AB
+=M7pY
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.10.14.ebuild b/media-video/ffmpeg/ffmpeg-0.10.14.ebuild
deleted file mode 100644
index 2e56c4dfa52c..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.10.14.ebuild
+++ /dev/null
@@ -1,273 +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.14.ebuild,v 1.2 2014/08/10 20:58:53 slyfox 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-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-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}] )
-	dirac? ( >=media-video/dirac-1.0.2-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
-		amr? ( >=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}] )
-		vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-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}] )
-	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}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${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}] )
-	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}] )
-	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}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${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
-}
-
-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-2.2.5.ebuild b/media-video/ffmpeg/ffmpeg-2.2.5.ebuild
deleted file mode 100644
index 6ba2610e2e77..000000000000
--- a/media-video/ffmpeg/ffmpeg-2.2.5.ebuild
+++ /dev/null
@@ -1,377 +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.5.ebuild,v 1.3 2014/08/10 20:58:53 slyfox 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}]
-	)
-	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.3.1.ebuild b/media-video/ffmpeg/ffmpeg-2.3.1.ebuild
deleted file mode 100644
index 4beb1c32292a..000000000000
--- a/media-video/ffmpeg/ffmpeg-2.3.1.ebuild
+++ /dev/null
@@ -1,381 +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.3.1.ebuild,v 1.2 2014/08/10 20:58:53 slyfox 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 ) ) samba? ( 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 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 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}]
-			<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-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}] )
-	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}]
-	)
-	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 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/ffmpeg-2.3.2.ebuild b/media-video/ffmpeg/ffmpeg-2.3.2.ebuild
deleted file mode 100644
index 42811664ebb7..000000000000
--- a/media-video/ffmpeg/ffmpeg-2.3.2.ebuild
+++ /dev/null
@@ -1,376 +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.3.2.ebuild,v 1.2 2014/08/29 18:14:06 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 ) ) samba? ( 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 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 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}] )
-	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}]
-	)
-	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 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/ffmpeg-2.3.ebuild b/media-video/ffmpeg/ffmpeg-2.3.ebuild
deleted file mode 100644
index af96b8b0f0ac..000000000000
--- a/media-video/ffmpeg/ffmpeg-2.3.ebuild
+++ /dev/null
@@ -1,381 +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.3.ebuild,v 1.4 2014/08/10 20:58:53 slyfox 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 ) ) samba? ( 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 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 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}]
-			<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-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}] )
-	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}]
-	)
-	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 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
-}