proxy commit for Pawel Stankowski, fix bugs 499806 513220 524996 519050 506322 512650

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

22 files changed, 159 insertions, 3126 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 662652cfec61..bff9e7eb35fd 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.914 2014/11/09 12:44:10 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.915 2014/11/10 08:42:52 dlan Exp $
+
+*vlc-2.2.9999 (10 Nov 2014)
+
+  10 Nov 2014; Yixun Lan <dlan@gentoo.org> -vlc-2.0.5.ebuild,
+  -vlc-2.0.7.ebuild, -vlc-2.0.8.ebuild, -vlc-2.0.8a.ebuild, -vlc-2.0.9.ebuild,
+  -vlc-2.0.9999.ebuild, -vlc-2.1.0.ebuild, -vlc-2.1.1.ebuild, vlc-2.1.2.ebuild,
+  vlc-2.1.4.ebuild, vlc-2.1.5.ebuild, vlc-2.1.9999.ebuild,
+  +vlc-2.2.9999.ebuild, vlc-9999.ebuild,
+  -files/vlc-2.0.7-include-flac-1.3.x-support.patch,
+  -files/vlc-2.0.8-freetype-proper-default-font.patch,
+  -files/vlc-2.0.8-support-uclibc.patch,
+  -files/vlc-2.1.0-avcodec-check-update-buffered_time-earlier-so-we-sho.patch,
+  -files/vlc-2.1.0-transcode-don-t-check-drift-if-we-have-VLC_TS_INVALI.patch,
+  -files/vlc-2.1.1-freetype-2.5.1-support.patch, metadata.xml:
+  proxy commit for Paweł Stankowski, removed all <2.1.2 ebuilds affected by security bug 499806.
+  live ebuild for 2.2.0-git branch; fixes bug #513220, reported by Uwe L. Korn (uwelk).
+  gettext version bump, bug #524996; bump libdvdnav dependency, bug 519050
+  fix avcodec issue, hevc support, bug 506322; fix binpkgs support, bug 512650
 
   09 Nov 2014; Yixun Lan <dlan@gentoo.org> metadata.xml:
   add Paweł Stankowski as maintainer, granted by TomWij
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index eb87822ea702..219e518538e5 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,58 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX vlc-2.0.7-include-flac-1.3.x-support.patch 1100 SHA256 1f64d1e9afb3ccf8e13efcc892a9245772c6d8b3695a47224e5011f90d034324 SHA512 de0ed49280365446c1505523f0d36fc1566a174ada4d1990d79252dfeb1873b8c29a48cfd8bd70c3200de1ba60f2f7208b91b1c0dcde20b3f78812c3a3554299 WHIRLPOOL e5f15080af6705e29597c92f1dbf488bce9d408c4f6f9cb2f8f1cf5ba685548a69dd3ebdf037826567276450406f9aa3d397f91815174fbefff436c392770823
-AUX vlc-2.0.8-freetype-proper-default-font.patch 448 SHA256 ee7e9b545ef6fbed5e2047e9b941a7aa38789cc0e1731367e2222641ca7e4188 SHA512 7f0c8f8e525d68bad9fca663741a1c5cdc77a81bea7cb7c365c4c5c87e027abb70c67ebfe1d92b96b5523f48d79f564dd1880b37488cc44e91198b40f43067eb WHIRLPOOL 46d20200fadcbe1e6715b6734b905d027808b5b1f7a6fd9aa6b011a60e52c899e6d69a750704844052940a8df905d4a1c0a3140222844bff9622147aab67407c
-AUX vlc-2.0.8-support-uclibc.patch 634 SHA256 51a046e290da05cc564e81523e04efeee8fbb8b5657e35ff64d35b46ad149db1 SHA512 05c373e67a100808fb36090e4719fd3d358153f8d646eff0e7451980c4629766b5842ca1c496d51246fe2c2430592e7c05c830bafbd909095c2f7003cf5cbadd WHIRLPOOL fac6f159d6a2d7d6472a4386bd2ed48429959fc9847fe46921df12fd180140fdd8089235a93730d1141ddf93d335a997a8dd8472cf95dad0e49607d5f9ab9c36
 AUX vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch 700 SHA256 91752f1ed1fbe8a2fcc78336a0725e1450946bab8085a4efce85a076dff40b87 SHA512 c3aa82ba9252f87d8f87c0bbfed7e0cdbd93c4f454e0ca6a9d73346e2efa294864af7eea1ea76b504354fb1baf5378cf626b35dcbfba3d888dbf0168ddfbed13 WHIRLPOOL 87c5017c8cdc1ad8cb313b6342f89af7ca7e90b20f151dd226ad8863407dae4cefb5934040154020778d3eb5dc78c5be43ae1e8e33fd0e823628c69c8cac7e61
-AUX vlc-2.1.0-avcodec-check-update-buffered_time-earlier-so-we-sho.patch 2602 SHA256 b0a366ff13201bf32e8a6b8bd43d40f5a9f7496cb213e26033103241198427fc SHA512 93922900b61467bc37482818dec54e219ba177c379e7360815a91b8557db424e7bec2e8e2a5f0997f05f155d72c44980378c8e11667ba70dfd40291b1b5ce203 WHIRLPOOL 7fc70e334dd45c5c9dd4cbdf6bdd4b050d178894ea8162ec3214da6cf69577bb996f95543f3185e20a5db7052b5f6be350ee5bf742503d27b17df3538de9c7a4
 AUX vlc-2.1.0-fix-libtremor-libs.patch 453 SHA256 5b2d4272b0258b30d1e34717ad83ebe2bcea78a5247798a74c0b86ace6d39463 SHA512 6c25995a518aeb1d501fa217d897962e1e81f66a4f28b6bb164dde3afe7f91772bb608f946d802857fa9a272cab1f88d3990d582be89ab8e37b1a8b6681798ae WHIRLPOOL 39d9d1670e244169087ecc81654b1d6407c9e5f0f0da1bb1b15d7c89a7dab232b9a174c2a5e9ed2586a57a370f3cd9d2c9434381387a1fbc70b7f7bd8de2ef85
 AUX vlc-2.1.0-libva-1.2.1-compat.patch 272 SHA256 fe9a4fdfe5447c869ec881f9e30236486a885b9f64b4c80004db7964b2b931c1 SHA512 74cba8136b2abb7a78b5ee8c8b5a9b3509a4a16ff9d4f136a3a7e2d6ff634ce20e34b8d140810ac63dd6cd3115d71cbb87a6e213fb172485494e55ade1b5230a WHIRLPOOL 1d2e747f4097c7903b798d7dfd17e11de41c01e903afda0b2c766ef5d7977da32362c52e5bc41c93a1f801a93c857c08d2cee3840f76a55afe0b2a768250073e
 AUX vlc-2.1.0-newer-rdp.patch 2133 SHA256 597549a7cae76998cb40871c6e5e3a11d2aeaa6443e5e9f69528f1d668bfc53d SHA512 e13541f116a11e27ffc25a25ff3e94c7122dcfdbe4eed8ad97abe3b672df135648523716eb2d0cd191caf0b59af010b4aab48202b3fbf5f1f7d6ab2144093122 WHIRLPOOL 8c0278e069ea73593a57d013b045380fe99ff7cfb79ffbca08d9cd761ee5b3ebccbcaaaab939861016af38dee35b9c327bb573ee8bef36934c64bf3ab8207d86
-AUX vlc-2.1.0-transcode-don-t-check-drift-if-we-have-VLC_TS_INVALI.patch 1953 SHA256 bd1694702a2faef7175b746dd0bf710aaa155d07cfc8023ca3d503347844cb53 SHA512 9b0d8ab9ba8578d99dc098fbbdd2d04a73e2ba60b4a00308fb9b66cd1ffddf14d85a7f158766ff73b07aabc22abdf0257d2f3811f4a9377a5eb0ab19e7c6a3e2 WHIRLPOOL 637894d3fa9503280da9825168c3e894274b6dbcb67d1bbe0cee025d025b5ca3a2216d25e04cc3142f7579153a0ecac5d5969f2181af5491a5fc12319b1b16f2
-AUX vlc-2.1.1-freetype-2.5.1-support.patch 764 SHA256 424fd612665c1c3d8f9247053379de1f93f56f81cb788d15470076c583d949e4 SHA512 aa11369b9cc5a91a0edaf7e23ada1651cdab01fa3acd54d454358c0789db2b2539fc4200c798b6ac58448341f6a2cfa32c987d2a44ac1af815fa4c2a7b091597 WHIRLPOOL 9c11f2b6ba5b903443991654b80ac2f6b1fe898c08b5b3c8004c3cc11fa5a9f4b20fb76e5eaaf137fcdb2a84e871a357aa72d3955668e5301de63ed4d1ff3d79
 AUX vlc-9999-libva-1.2.1-compat.patch 291 SHA256 54eb34b32afe6876fa40abac2cb97097030f1d372bb81b63ef88231a17e5f237 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968 WHIRLPOOL df5cfdb4ba36ccd92e79de7b913b14c5416aca0834025dc51f8178db6c88f5eecb332ae7096800607d6f7526a56c7fb94e2f593bc0c0e19f643428bcd3eb5868
-DIST vlc-2.0.5.tar.xz 18369292 SHA256 dff9eb00861bcd9f8446ff5cedbd3c5fd2bed460e6bfa84bd9e01f750ed96b6e SHA512 eff8146e99f819f49bf9875e4ce0bb562fca46bbf68cd7d2e2121e86d12c8b4ce02bf8fb024910f7d5742abec90583bba45eb2301156ed0418ef76952345d49e WHIRLPOOL bfef0e9adaeb520e709ce34d9a2057a26f302c657b1f89a2e655b2f6b9ad77a4ffcd0ee673549d617ff724f098116f128e13f36228a306670c85375ed9d01038
-DIST vlc-2.0.7.tar.xz 18538256 SHA256 243107d59e4bd0b942cb4ce10292eab8233394f8109ff4fde44e64d0ee745314 SHA512 6e8e55e40425cc9d48a174374a6b690f50d0a7cfed9a1b253786c9e7e52658fcd4feda94a5d4f66c58260b517248041b3f393af5171a42bf3a3e1475828b1ab2 WHIRLPOOL 7524f518a8c4575ac417261857326dcc6a2787cafd09f64a181fd597358b04433be09a4f418eb1186bb093ef467bb4de75f809721c392d60c117e1eefa0cce48
-DIST vlc-2.0.8.tar.xz 18858236 SHA256 a02af28345d4560e718066623f881b6eaf29ddce3b778fbf839e08b2415d1702 SHA512 ef096dd71b7e019ea96b1e75235f2e46377ae4c27913486233bcec15c91239bf32b9634b1c81b8cd665512e00e2ed29c3d2bf70244a681298b15d8affa0a939c WHIRLPOOL 6bb2ba95854bf67e8f28ce4aac00e16d1de6b84dd969432c76b1ea32ce36568f80e5eb79a1c5d1c4f608bfe17113de656d026a53670afca6ff5abfb8b34b11e4
-DIST vlc-2.0.8a.tar.xz 18859964 SHA256 05215f34c487723c84ebb54ab43b836fc70fb466326f7c601847141a499034d2 SHA512 f59c86991a12912f8131ee080795fb05af0e647c9313a514d6d5bb629bd00fdbc49e0e164c37ffc0496b29afff1e4d279a1ced732cb8948f2d2a4b6aeb9a0980 WHIRLPOOL 7164ce2b35de7e9bdea6215582127518e244ab4b7a6892677e371062395ff27b8eb34d516461f667995be0a594bfc4477403ab8054f24683599332cacdec2e22
-DIST vlc-2.0.9.tar.xz 18863020 SHA256 c4bea9be211360ddbf29b93661fb1f33f7d5ce44166d829cbebfa01f303bfb30 SHA512 937cc6e73915ee601d6d0f26e8c70d66b2510fbe148621dc0949c4510f4d0ffc39bfd68ae7b9dcec07e2fdb79c372111fb7964d4fb2778cac1c35d49fdddc1d5 WHIRLPOOL ae76ea4ead390eb896ff6c20c40ab86f6398a407e7c1887277c996dc1f8292e21b8fb63c0b9cf2fec63e19d2c869fad940035559f2deccd2f29e27dcee5f17cc
-DIST vlc-2.1.0.tar.xz 19571224 SHA256 d2177daa31786acf1e961b2f63429797a8c62c090e5359bcc7929a1ba5fe41f7 SHA512 abf397e1382289d579fec3dc540885c45ba055f158f7c248c5de27a7c50dac5a4c317145c4a786ed3819a9199fc304fa8f43ccde8c33c2938d40c805e7e9b124 WHIRLPOOL 4357db6bf832e3d549bca9bde547c52f6ce4cf5f43874a6931863e2cce8b0bfeac7ba4aa2fab94c2a82ae106f15dd60156cafdc51bf158746ff2bf2a2eee5666
-DIST vlc-2.1.1.tar.xz 19605108 SHA256 339c92cfb939ef6517b42fce7db59e59f259476d79d15b9b39e9d7f2b966b992 SHA512 9e6fd36daf750d7f0c06de5fc73b35cf017c6c13f3e54f0ec71e1b8fa8302674d48e72112c552113fea290e788b2832d749f8e06d2212109fca57d9f78bd4c14 WHIRLPOOL 54f90f0e959806a3bcf88fc194a051fa96cc3dbe358d92a1142f7581f24a4a04fc7cadfac65a26a3ddd0f1dbbf7f5345a6bc663cabef970e33afa020fa432ead
 DIST vlc-2.1.2.tar.xz 19609868 SHA256 219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4 SHA512 24ea51befb30ec2e4f796866bf086d36e809cb97bf04203a4637518c91a3035fa38a8e778aaf6fb3481db49d19236ae88bcbf31e1e4f7ae79b9d7bcc3cf037af WHIRLPOOL 7e4576370ea4a0d74d29b936f7c554c4fa22ca6b5d9260ce76d0e2bddf50826a2472c77746de61c81bd4601bead49f85c5c76a2f7ca309601c7a684c7091d09a
 DIST vlc-2.1.4.tar.xz 19560884 SHA256 3e566c7525478167e18cc53dc75d621e4af91eb40aabb6231e47db25d682d5d3 SHA512 da09744d0da1742a89747a34f749b83a30b18ddfc84ed9ee1a59a1c16cfa4ce0e7d4ddd66e9dfd13d5309b7ff66f72a7d3b2c3837ec740a193656ce6f8b04845 WHIRLPOOL 4929a66f4f1afc44726bb2d88e2e5e9b770811f57d21ee2258ccf84d7f5997c29b5b07bbb41cfc165b78339e4b070eadd5be958059f68d8f6e57b565eb977396
 DIST vlc-2.1.5.tar.xz 19574208 SHA256 6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 SHA512 37c6b82b4e89f4a14ed391cc677d9325a032e04bcc51a3e0d7d2ccf9e17a7a0deb90d9129e9dc3baf05a1ea9dae9c05e3177ab17a31098aafa6a2cb23388fa32 WHIRLPOOL c13098f922c7b24f3c718e88807a7dcb656af21bcf2be63d2ec7401583680658bd371e3935ba22537857861e0b1b0c4f0e693c87ed20999c679b4a04cddf7008
-DIST vlc-patches-101.tar.bz2 3011 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae SHA512 f059f3c47b571dd5a28d979abdcb3a8c2ebef13845cd4102d877b1786ef4b3ba15cc22873de0fd84fcc7a4413f582064f12edf40627e9f030fd8e6fa03d67c66 WHIRLPOOL eb2f184c99db6d174d22e4231003d93171f5081f917f10ecf6bc927ff96983aa21756d15063909cb6f8ad77f0db0b978fdf2eb2fba3320f19c6bc26e17b04ba7
-EBUILD vlc-2.0.5.ebuild 11066 SHA256 9e906091c5bc3198f65567d1e3e5deaebb55090ff0e1993aec59ab4374534888 SHA512 7552ca24730999f94a377af52ce604cf03e9a8daa2dc73403e9c22816680398f0d847b0b3d8adc7158ff144d96753eeaf9a08ca18edd4447a6c3d9a5e221e661 WHIRLPOOL 7eb86e63c4961edd45af9d50f9a3fa6ae100e061c3dadda1566cc760b9589964d0f8f90da766afb03ece22114b87d97d541ee68a4bd1662989e9b860ac45ae54
-EBUILD vlc-2.0.7.ebuild 11116 SHA256 6eef5ac5d6537bed5ed62f32bdd5e197ea3be3df77f364503abb022d6c093664 SHA512 5d0c8eba0f0309a6912d908f170c799a1b4d66f7f30d57a66ad24b7bb6b05aa0de45065a71a8d24c7f92b10082a3567547f358b6c1ccf56254f08415a727e215 WHIRLPOOL 73a481da20fd14f59ab18e7a47e43dd839074e2775df42913d1adfaf6cf617c04063f7bcffa0e074b5cf03bf5c6f360b6d9832ec37f1dc4f91d23375ae9c090c
-EBUILD vlc-2.0.8.ebuild 13216 SHA256 0bbdd0e9577de5f710cbae7a304031a21805d26d6a0d67cc7b3f8e6c58ad492f SHA512 802faad80f7940610c57993372d3940c2748d23bb103f2b9f0ecd416aabd1a7091df642252ef3c49809e258ac62639f9a778549022dd65237fea540d448deda7 WHIRLPOOL 4160547a192981bb00909d7c7c8697935a3e3dc119b25758f9bc1a60ae62868c3c354d700b985adc58ec0656cee8a3886687a5ed5f14d8d292508e01bd62b1d5
-EBUILD vlc-2.0.8a.ebuild 13217 SHA256 790b74504eb9cd7cf308aba06c16fcef41a8e4422f3fa8cf710a10c28ba46ff4 SHA512 d237027e228ee9061e4200b3ecaf7a5a322d9bf1a0bae6514f8eadfd6061853e722e99eaa9290603959e3b0e052cf987531d88f327f71169dc3d3d695df986b0 WHIRLPOOL c3a380a95a0534ab9521eece25bc0f44e578ae33f7fd4ce06841def3b651b1479f195918be0eb835ec3ed4a35bf8ec378535722c27158fae462ec67cdcd44a4e
-EBUILD vlc-2.0.9.ebuild 13242 SHA256 1e66393ca389edc1ca61f2f2cae67e9095d66134bd0afd7e35f43d8b8d565a64 SHA512 5dbd18bf5cca33b7a2d3a2ea0419925a650df4157f20cd30070f73cebddc1a2aa92d99b508a2bb3e151558e06a941e712ceeb9878c6d1d1804e393a1af83089d WHIRLPOOL 2ceeba4e819afe18ff859b556ccec34bfbcbc2e0fb5a05f11d26f5c57013b4e055889c27f38b80a28c57470f0bd5d7838eca8d7342eea5919f7963d163961abf
-EBUILD vlc-2.0.9999.ebuild 13238 SHA256 c569665242112b3b659556b9ec2e36c76ddbdbf9aeaa9c89d56112b682fdc67b SHA512 af1fb07efadc2de6f9830e1aae35217ba6406f33b0557619c9c7a63e7151a05f101f72ebfb34175408ba974c3f52019120d9eb0bfed9526cbae88765dba930bb WHIRLPOOL f3b0a3c8e0a681edc29a5129810594102497be14a3e70f5d5f5cbe68333626eea8348d33057322b6c038d7924ac1fb95e5747b3d1e73cc7db8a97407ef9dec45
-EBUILD vlc-2.1.0.ebuild 14139 SHA256 9117f7417935749eb7a265f6f74a57848b92ebbad3fd3244213199ba35171b28 SHA512 fb0d664d4f79fa3dfa1838c44dd39be31cd24268d9ef2a09742f12367e49c33e120db7cf992fc0ec720fa843f256e12bbc6e1659722a58bd2a3fc13467c88aec WHIRLPOOL d7be88a8080f286f8af60070dfe0fe54f15135e518e91d84ec3a70e299bfa4b9ceded57014077ed04da417843df79b0704f0f255cdc081a25d6e052cf5d8f271
-EBUILD vlc-2.1.1.ebuild 14110 SHA256 f26db3bbaa265524d6eef7735ab4b49d4d78c3f72332efbb39483795ff3ecf48 SHA512 9551790732ebb86edeae36df7300809ac356a22317bc104dc792fb955ce5b426b34965408687401de016c6e09c036faf5fd9874269bf1408002ee41a0fbac8b2 WHIRLPOOL c018e959f893ff80c96852289aa503cc9c69672c134c299b25db6e2342992ce14599b4b9b7d6c8e89e4f18372d7ac044156548e7cd7945aa906aae76cbc34f83
-EBUILD vlc-2.1.2.ebuild 14124 SHA256 7aec6c9c893accd22e94eaefc695a275281c7002ef5e813416033b64c494e0c0 SHA512 aff6a2b2549dbc61f2be03b29e41b38b6ef5ca0a33efbf59b179e5253e292a774d17c74d3e77965419462a7a24408000f8a636a4e97ca7430414eb7279307b78 WHIRLPOOL e9d25a3710b08e0ca8a569dc753b2e24344bd404727498fdf2a7c9d61899c2dc546a1a9af7df1560d97048d010a9dd50d74c81e50c87a9ae3895b32c489f6b1f
-EBUILD vlc-2.1.4.ebuild 14489 SHA256 f905a457096e6bb716ca6b0c79325be68e2caca1639c3fe5e794623821f4db06 SHA512 d199abee23cf874abc94e56c4ca1072afdab643fe41696e1b612976e16787c230d6af222faa7e81b6a109a82fd33666000fc30fd6fbaffd0bc0dce111433d164 WHIRLPOOL 1fe16c0d00647baf41daac4ffd6d65482688e01d9b13261d86a5b015eceac9bf53130c3a24ca611777b90808d300111eb04bab2470ea040d3804173342c06ed0
-EBUILD vlc-2.1.5.ebuild 14579 SHA256 dad21993c81e48a57a2fefcfe58d6e5b901900d7b5e37c94236ab1be797622f2 SHA512 c0756d48ae65a1c94c4ff8e1a8ead3311c37e76ae32667a8b1651be5e9ee3bd79dd3d7e5a16c758d11ca2fde7922849d7b89d58a68f281041ae7ae767cdf677b WHIRLPOOL ee8c1da56fcf268eb2b8d31ddb4c2e17ee7b5325270351094396cbd872a9ab78490616d6fa45f690aa5d76e6743b1ccb32c9cc2f0fb93b1d6cdcb164a84b3121
-EBUILD vlc-2.1.9999.ebuild 14505 SHA256 9cb89d2e13aefa5b6e39a1aad4fce5bef9615d20b7720f116f5a45e03358d1ff SHA512 615fe48078691e3b8a9337be0d925c962118b8aa87d4d615d87e6fb581d3ccaecd97593b6bb7e5630a65e6faf5452092cdca17665de92dfaa647efc0d8a7fe40 WHIRLPOOL 31dc9a2676ce95c9601931202a5f3d965a69b1da1b15dce434b569d0bcac4c297020cd65b322bd1687d1339142faa2c2ff19af8ee9aa9a7f5a32e628c94c5d63
-EBUILD vlc-9999.ebuild 14531 SHA256 f4316970aa6fe99daaef990e38eff4f1d18c791af0659714132557129c311791 SHA512 e6b66807cc7fa5bda7d537d7c1ca23cb6052fda872e7915f5f72284f1031f8a071bf0a2a69010ab2628bae5bb7bf670a5d551261667089e8afbe51c89dd9395a WHIRLPOOL aebb6efc6f3d02f0e3ad6bca589914fe76f52c450787a5cd34674794b9e214ae663e0f43d5a95918e975a2de5e03e344d2ba5be3274dd538f8542c36dca068b8
-MISC ChangeLog 28986 SHA256 c7aaf096b64ec5228442f8c05f21bdb4bac0ccf28cc7b462e243356010ecd011 SHA512 69fd0a3eca84d5d9998ff43f6d54ecdab2f1e14ecf70c7402f5338fe7c07c2a5fd483eb14aef524f1f6e3a2203582dd76d3ef32dfa0280e839f10a803c3c1a71 WHIRLPOOL 2cf7d805f335ffcd5164a6651561d271597a3e92428bd0a1fc52181345b1b2a0f0f3236a91be555352e741f3be1032177ac1f9476ed108e762ef9c96db5c0200
+EBUILD vlc-2.1.2.ebuild 14179 SHA256 886ece415483568d60fa60cb798ab14bb64aa7d70977e06cfaca8a9db6d56fe5 SHA512 f063488ea2bbad2e3cd34602b1aff9b4a7008923f0b24549efb2e7a2b36fbf2a7a232675ad73c414139f49751ab0013c54d61281dc767df4077cda654cb1a133 WHIRLPOOL b5c934c8093ef06fe8e379f6816a0ab9323efd8593077958b7b223aa2381e55ea7af7fce9a37f51468d5086adbf27129641544f365b67bdd958513e5954b533b
+EBUILD vlc-2.1.4.ebuild 14544 SHA256 50fd0480946a0b717768fc9d148aee2fa26aa2bf7c0587af79e9c0053802cd9d SHA512 a9266c351156dac4da031fbe96875887acb929182f14005b58cc9a062623c4b00afd230ac03c233edb5f09815c6151f6326839c0e3727b4e6490d257f3df9448 WHIRLPOOL 259f81bd3edebbf375c28360e42631d8f0c7cc0c07062d9e41724e90b68c220129ab06a973c2799274bbe1b36a2d8acc24193d3079745d54fe7a701de96bbded
+EBUILD vlc-2.1.5.ebuild 14636 SHA256 b088145480db3204530978e72ba63761cc60bcd39b618cb758c043013fdb0c49 SHA512 5e9c24c762ce50b66a079a72592fdd96dddadcd4558fcaa12fe3ff243ca0c331b5fcebf4fbfc356a6c42b5fcb70554b5249b4ffa6bf23edafda93e75ece9a3aa WHIRLPOOL c890eb2f35597a0e8fb9be95ebb7ea0c3ddfa4e82d5a8fb8210ae012fc1559a803b6521312417fac64713bf2dbe3e3e6684daeec8efca0f1629c936d98d0e36f
+EBUILD vlc-2.1.9999.ebuild 14560 SHA256 729cb33e71c6178cac5d75f839f68d2c25fe4632eb8be419fe6a907f1cbfca84 SHA512 e5f92af59a730b04bfc091a49dc0f4e3327d5259c8c253a1aec423e8e70e329e9cff25284d3391aa759b520158847003efd28d60177a36b33771bdf8ee4759a2 WHIRLPOOL 48ad3087f3c2dd526f56649e0a448052b23fd5fc993261f4e8e2e052d25f4e131ff2b12ad16f8b58d74ef3bc01257072616c3c9a86966a10c645110ed9888a39
+EBUILD vlc-2.2.9999.ebuild 14634 SHA256 7de9f71fa26925757a885601c11556c3bc96bfe7444d5a805c1a819dd16972df SHA512 d51ba995506c9d9c091eea43563d7218321c8204232553760b8a176925f264dee509a1f8f0134ac7697f9a6a62a16ea8480e7d4d94a8b76c7567fd3a5617a52b WHIRLPOOL d6dab8b76f0eb15afe7c0fd39be6b16f8447a066cd9875d4ab5f2a353af538bbb2685f932340969c8c23d99dffd6fddb5fef3ce0205c92c74d3fd6572cdf5601
+EBUILD vlc-9999.ebuild 14626 SHA256 b6b9788c0cb31c7b522683dde5bf5df99ccc30433f33a8d096505e47846e335b SHA512 bda52c47ed93cc565ff207aae4c7bc529ea55d7a5fd86bbd2b9957f32728bab3601afe189fad0e657a5593aedce1e578e458f934d9c469a65f5422a00e3b66b8 WHIRLPOOL 7050ba79b89b67476d1c603b67a9b8535dc8ab1dd6cd606b669be97ef0a2dd1792a99c29930339e49b10845b51cf57ad82a9aec0a004770d999cc23b2b6935a0
+MISC ChangeLog 30047 SHA256 518ec94383f23cd2ffac99e39a4b5fe8626d9080d1c7f0896a14c3801b691159 SHA512 d8dd103e38b516443623edbb92cc8ca25e775cd5fd88b9dda982306909dcaa9889b0b852a9060537fadd205f32bd934fb58d8fe1536b5f62305b892d4e69803b WHIRLPOOL 58d7738e254d8b8bc781ba300c56f87be02622ae56707cc9fbd89f68602866376a5b623472897fbdfa319dd8d052f3b8493451ef9da0d2fe3da76c5951d6d155
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
-MISC metadata.xml 7326 SHA256 e926f56d5445efe17d08067bd7b66a4346ff8c34b8f8b12272dd0da8c1e88f8d SHA512 a84edddce7cc07723c43e17993bc9ed0dca553b01989b10c19233e36e05db1b6978b650be7f9ed2411cd617046278a81beb41f2c01f512b22e1d91ff85c28a64 WHIRLPOOL 72c05c2ab3e04e9425dff8c3058c51b80fe29be4f3613f687029a521ce8b510bf2d80ebe76e8d2fe87d2806b898712d2498d32eb3e2b49041bef4fe1292daf7d
+MISC metadata.xml 6685 SHA256 53c98903379fececa4684161812ff46e52488aa62610fc763acb09cd9f16fe8a SHA512 4a1b75fe4eb801556155d9a75dcfb54426ef187322c2bdbd95c872910925a388952182623fc6aa6765445470a627f4ca6757f72120a0147b94baf954d2ef5d65 WHIRLPOOL 2fb2e7e4eeaa6fee36185b4e014aec67c178404a0a81cb5d86b6763ab2f03c32256353082c6e9d00c6ef81c1a3ce8ee99f0cb65ad193f95f93d96881c65af98a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUX2GoAAoJEJIMDbyqvv1VlCcP+QGw1uZFtfYz0rrTzfBPmTtD
-b3v3jG++uI955bnZBuHVqBxMv3hIfJj1JC8vGsZCoGekytnAGOsZrv7VHM+FExJQ
-QuiqjCJkpusjID5268Xp9c6VYbYTsGrv/32ONyI1CB0tli7Xv1fQpmrS+N4zeT9l
-I3qahXi7/66li9G2VD42lgCvuaaHWb2P7cnObozPmL+KFJOffLuHcgvauNGWLRwm
-fRkKUGnAWgMMDyswP9aVnFogUCvC6sAn0upUxlxEkwaVMvkJNvzMfOvG7jFo4q3x
-aGcKB4aV+SBL04iHRlrFnDujql5W6nD64JitA/81OsXVvvCAYgrpp8TmYbSeMOKF
-yv/9Ri3HCJZWQEsbuW6QjHgVhvCVymeht9w2X3RGHOoQxiZiUOAPhIRussqXIiv0
-UOaYYPFMDN8XtZD1keqbSb7qAALjAMwdAEBlc5UVXO8XqOGsSicGjNxPz+0SyJBo
-KH8u/1D1A+8PV7/c7fijJQFZ7Lu4DeBthslHBPi7bCEW7Em/04VgiKKN91Wmfsn9
-jGpWF9dwrB2oEnRA7LVqnsvoMa9NEWqBmcIfaqe9L/EEB2fc/DmeWZZ2tsrvlfAa
-cJ8h1lLaPPev0aEI7BFJPbmYLzyKrzk+gVC4kI6dpB1Wl402ReGKUYNAN2ZRSiyh
-CBNDGbOAUf2AuXkMDH4q
-=luqf
+iQIcBAEBCAAGBQJUYHq7AAoJEJIMDbyqvv1V5MgP/RLypFyUa9y87SH+RM5droqn
+nYiB6C4FUKjO0axfXKg3AIJdLE85WwqYC0CbTuaa6vaCZQDmwy0+e20haCzkm6ad
+iEjtbBZ6xwVVwHkUKsXpFKr3PozSEeh6VK4SKGhhYlF2Seq6fFAdj8rcDU+CyKEt
+WMRrTeyFpPHn40LqB65H4LzhvFVMjiWO9NhOAHZvWM80Www1b5EYx3XGAexR76Gr
+lo8GE/VxkovyHD0HVUyxRk/i5mdU50CBVA7xL98SppfC4MM8w0Az9DNQLV8nTlrg
+mQi9A5QxdJ+5qxbhHj/Ldjtxx51OSeEzRuACiCkKMuIjFZFofk7USNwVkyBcYeLO
+hGLn1mRcKgTxOFkW7Ou8Vk0YtltVNMWE1iPZXeyVApjiJ/A6c5ZycirKna7ozccb
+XYyDUuSHvgWzGiFtXB3Simcb2Svk4A8nEEfvbvTeuNJH59rHe/YHWXCJSh99ECY7
+mGmiFPBhKrGdHWASAYG8FymEpaCiBBjW633gOF+hrfILW+P8t99U220eMg6wWSb2
+ggKL4eYDJmeqTNh+qzhEvKonG3AEVhauo42MIS2FCgcYexrfNvQiIjZFHQXZDUjB
+8elzdy4AGES2Gug407/AqaynToUE8dmqQTVw0v8koNoSn4NgPHgzFtDKfZvJ3xbt
+MZUL0NxOdsZxLBLOPQET
+=ZUUu
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/vlc-2.0.7-include-flac-1.3.x-support.patch b/media-video/vlc/files/vlc-2.0.7-include-flac-1.3.x-support.patch
deleted file mode 100644
index bbcd6df863fc..000000000000
--- a/media-video/vlc/files/vlc-2.0.7-include-flac-1.3.x-support.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 607065b410b4768372c204ccdbbca200230fff25 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Wed, 2 Jan 2013 22:44:33 +0100
-Subject: [PATCH] Fix build with unreleased FLAC 1.3.x
-
-The issue was initialy reported here:
-http://bugzilla.redhat.com/891123
-
-FLAC upstream has always expected to include <FLAC/ suffix
-for included headers as shown in examples/c/decode/file/main.c
-
-The FLAC suffix will not be be made available in the flac.pc
-for the next release:
-http://lists.xiph.org/pipermail/flac-dev/2012-April/003355.html
-
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
----
- modules/codec/flac.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/codec/flac.c b/modules/codec/flac.c
-index 4cfbfa9..543e8bb 100644
---- a/modules/codec/flac.c
-+++ b/modules/codec/flac.c
-@@ -37,8 +37,8 @@
- #include <vlc_plugin.h>
- #include <vlc_codec.h>
- 
--#include <stream_decoder.h>
--#include <stream_encoder.h>
-+#include <FLAC/stream_decoder.h>
-+#include <FLAC/stream_encoder.h>
- 
- #include <vlc_block_helper.h>
- #include <vlc_bits.h>
--- 
-1.7.6.6.GIT
-
diff --git a/media-video/vlc/files/vlc-2.0.8-freetype-proper-default-font.patch b/media-video/vlc/files/vlc-2.0.8-freetype-proper-default-font.patch
deleted file mode 100644
index 4ae009b9b881..000000000000
--- a/media-video/vlc/files/vlc-2.0.8-freetype-proper-default-font.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/modules/text_renderer/freetype.c
-+++ b/modules/text_renderer/freetype.c
-@@ -67,7 +67,7 @@
- # define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf"
- # define DEFAULT_FAMILY "Nokia Sans Bold"
- #else
--# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
--# define DEFAULT_FAMILY "Serif Bold"
-+# define DEFAULT_FONT_FILE "/usr/share/fonts/dejavu/DejaVuSans.ttf"
-+# define DEFAULT_FAMILY "DejaVu Sans"
- #endif
- 
diff --git a/media-video/vlc/files/vlc-2.0.8-support-uclibc.patch b/media-video/vlc/files/vlc-2.0.8-support-uclibc.patch
deleted file mode 100644
index eb2f4987de8b..000000000000
--- a/media-video/vlc/files/vlc-2.0.8-support-uclibc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -uNr a/src/posix/linux_specific.c b/src/posix/linux_specific.c
---- a/src/posix/linux_specific.c	2011-12-08 20:00:28.000000000 +0200
-+++ b/src/posix/linux_specific.c	2013-08-02 19:47:52.823858758 +0200
-@@ -83,14 +83,14 @@
-     unsigned refs;
- } once = { VLC_STATIC_MUTEX, 0 };
- 
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- # include <gnu/libc-version.h>
- # include <stdlib.h>
- #endif
- 
- void system_Init (void)
- {
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
-     const char *glcv = gnu_get_libc_version ();
- 
-     /* gettext in glibc 2.5-2.7 is not thread-safe. LibVLC keeps crashing,
diff --git a/media-video/vlc/files/vlc-2.1.0-avcodec-check-update-buffered_time-earlier-so-we-sho.patch b/media-video/vlc/files/vlc-2.1.0-avcodec-check-update-buffered_time-earlier-so-we-sho.patch
deleted file mode 100644
index 357b4725882d..000000000000
--- a/media-video/vlc/files/vlc-2.1.0-avcodec-check-update-buffered_time-earlier-so-we-sho.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 31df15fbbee73dcf51ff63451064205a03c99bd8 Mon Sep 17 00:00:00 2001
-From: Ilkka Ollakka <ileoo@videolan.org>
-Date: Sun, 29 Sep 2013 14:26:59 +0300
-Subject: [PATCH] avcodec: check/update buffered_time earlier, so we shouldn't
- use 0 as time when encoding
-
-Ref #9022
-(cherry picked from commit 5a43b77365cb65ea8a28e3db2d0b9f3cdcee7191)
-
-Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>
----
- modules/codec/avcodec/encoder.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
-index a82d235..be473bf 100644
---- a/modules/codec/avcodec/encoder.c
-+++ b/modules/codec/avcodec/encoder.c
-@@ -1149,12 +1149,17 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
-         AVPacket packet = {0};
-         avcodec_get_frame_defaults( p_sys->frame );
-         p_sys->frame->format     = p_sys->p_context->sample_fmt;
--        p_sys->frame->pts        = date_Get( &p_sys->buffer_date );
-         p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
--        date_Increment( &p_sys->buffer_date, p_sys->i_frame_size );
- 
-+        if( unlikely( p_aout_buf && ( p_aout_buf->i_pts > VLC_TS_INVALID ) &&
-+            (p_aout_buf->i_pts != date_Get( &p_sys->buffer_date ) ) ) )
-+            date_Set( &p_sys->buffer_date, p_aout_buf->i_pts );
-+
-+        p_sys->frame->pts        = date_Get( &p_sys->buffer_date );
-+        date_Increment( &p_sys->buffer_date, p_sys->i_frame_size );
-         if( likely( p_aout_buf ) )
-         {
-+
-             p_aout_buf->i_nb_samples -= leftover_samples;
-             memcpy( p_sys->p_buffer+buffer_delay, p_aout_buf->p_buffer, leftover );
- 
-@@ -1169,6 +1174,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
-             p_aout_buf->i_buffer     -= leftover;
-             p_aout_buf->i_pts         = date_Get( &p_sys->buffer_date );
-         }
-+
-         if(unlikely( ( (leftover + buffer_delay) < p_sys->i_buffer_out ) &&
-                      !(p_sys->p_codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME ))
-           )
-@@ -1254,10 +1260,6 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
-         const int align = 1;
- #endif
- 
--        if( unlikely( p_aout_buf->i_pts > VLC_TS_INVALID &&
--                      p_aout_buf->i_pts != date_Get( &p_sys->buffer_date ) ) )
--            date_Set( &p_sys->buffer_date, p_aout_buf->i_pts );
--
-         avcodec_get_frame_defaults( p_sys->frame );
-         if( p_sys->b_variable )
-             p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
--- 
-1.8.4
-
diff --git a/media-video/vlc/files/vlc-2.1.0-transcode-don-t-check-drift-if-we-have-VLC_TS_INVALI.patch b/media-video/vlc/files/vlc-2.1.0-transcode-don-t-check-drift-if-we-have-VLC_TS_INVALI.patch
deleted file mode 100644
index bb8cc8640294..000000000000
--- a/media-video/vlc/files/vlc-2.1.0-transcode-don-t-check-drift-if-we-have-VLC_TS_INVALI.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 1bbf0e468419744a382b6d4df02aa49c3cb153f1 Mon Sep 17 00:00:00 2001
-From: Ilkka Ollakka <ileoo@videolan.org>
-Date: Sun, 29 Sep 2013 11:41:08 +0300
-Subject: [PATCH] transcode: don't check drift if we have VLC_TS_INVALID pts
- (cherry picked from commit af762f811d4ed34a883bc2003f4c70e18f66965e)
-
-Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>
----
- modules/stream_out/transcode/audio.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c
-index 6d5ccb3..8d3ee57 100644
---- a/modules/stream_out/transcode/audio.c
-+++ b/modules/stream_out/transcode/audio.c
-@@ -216,8 +216,13 @@ int transcode_audio_process( sout_stream_t *p_stream,
-         if( p_sys->b_master_sync )
-         {
-             mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
--            mtime_t i_drift = p_audio_buf->i_pts - i_pts;
--            if (i_drift > MASTER_SYNC_MAX_DRIFT || i_drift < -MASTER_SYNC_MAX_DRIFT)
-+            mtime_t i_drift = 0;
-+
-+            if( likely( p_audio_buf->i_pts != VLC_TS_INVALID ) )
-+                i_drift = p_audio_buf->i_pts - i_pts;
-+
-+            if ( unlikely(i_drift > MASTER_SYNC_MAX_DRIFT
-+                 || i_drift < -MASTER_SYNC_MAX_DRIFT) )
-             {
-                 msg_Dbg( p_stream,
-                     "drift is too high (%"PRId64"), resetting master sync",
-@@ -225,7 +230,8 @@ int transcode_audio_process( sout_stream_t *p_stream,
-                 date_Set( &id->interpolated_pts, p_audio_buf->i_pts );
-                 i_pts = p_audio_buf->i_pts + 1;
-             }
--            p_sys->i_master_drift = p_audio_buf->i_pts - i_pts;
-+            if( likely(p_audio_buf->i_pts != VLC_TS_INVALID ) )
-+                p_sys->i_master_drift = p_audio_buf->i_pts - i_pts;
-             date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );
-             p_audio_buf->i_pts = i_pts;
-         }
--- 
-1.8.4
-
diff --git a/media-video/vlc/files/vlc-2.1.1-freetype-2.5.1-support.patch b/media-video/vlc/files/vlc-2.1.1-freetype-2.5.1-support.patch
deleted file mode 100644
index 242db38d4417..000000000000
--- a/media-video/vlc/files/vlc-2.1.1-freetype-2.5.1-support.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-X-Git-Url: http://git.videolan.org/?p=vlc%2Fvlc-2.1.git;a=blobdiff_plain;f=modules%2Ftext_renderer%2Ffreetype.c;h=c27ec4558956f00b1fd2b448fa07d680a2be5c82;hp=25d6b15650d13982fd8c792df92389fd4de8eadd;hb=4eb6d91e94f720bf2dd22dcfee171e4ff4b790df;hpb=9ebead9dfbdcac2da31bc856cec51c058f5ddca8
-
-diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
-index 25d6b15..c27ec45 100644
---- a/modules/text_renderer/freetype.c
-+++ b/modules/text_renderer/freetype.c
-@@ -90,10 +90,11 @@
- #endif
- 
- /* Freetype */
--#include <freetype/ftsynth.h>
-+#include <ft2build.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- #include FT_STROKER_H
-+#include FT_SYNTHESIS_H
- 
- #define FT_FLOOR(X)     ((X & -64) >> 6)
- #define FT_CEIL(X)      (((X + 63) & -64) >> 6)
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 616a3e56e4cb..827ed94c4092 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -22,14 +22,11 @@
 		<flag name="chromaprint">Enables libchromaprint for Chromaprint based audio fingerprinter support.</flag>
 		<flag name="dc1394">Enables IIDC cameras support.</flag>
 		<flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
-		<flag name="direct2d">Enable Win7/VistaPU Direct2D support.</flag>
 		<flag name="directx">Enable Win32 DirectX support.</flag>
-		<flag name="dshow">Enables Win32 DirectShow support.</flag>
 		<flag name="dvbpsi">Enables support for Mpeg-TS files (.ts, .m2ts, .mts) via <pkg>media-libs/libdvbpsi</pkg>.</flag>
 		<flag name="dxva2">Enables Win32 DxVA2 support.</flag>
 		<flag name="egl">Enables EGL video output module.</flag>
 		<flag name="faad">Enable AAC audio decoding library support via media-libs/faad2.</flag>
-		<flag name="fbosd">Enables the framebuffer overlay plugin.</flag>
 		<flag name="fdk">Enables the Fraunhofer AAC codec library.</flag>
 		<flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (with external sound fonts).</flag>
 		<flag name="gcrypt">Enables cryptography support via libgcrypt.</flag>
@@ -39,7 +36,6 @@
 		<flag name="httpd">Enables a web based interface for vlc.</flag>
 		<flag name="ios-vout">Enables iPhone OS video output.</flag>
 		<flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
-		<flag name="libproxy">Enables support for proxy settings in the HTTP access module.</flag>
 		<flag name="libtar">Uses libtar instead of the built-in tar reader for reading custom skins.</flag>
 		<flag name="libtiger">Enables Ogg Kate subtitles rendering using libtiger.</flag>
 		<flag name="linsys">Enables support for Linux Linear Systems Ltd. SDI and HD-SDI input cards.</flag>
@@ -60,7 +56,6 @@
 		<flag name="opus">Support opus decoding via libopus.</flag>
 		<flag name="postproc">Enables image post-processing via libpostproc (part of FFmpeg).</flag>
 		<flag name="projectm">Enables the projectM visualization plugin.</flag>
-		<flag name="pvr">Enables PVR cards access module.</flag>
 		<flag name="qt4" restrict="&gt;=media-video/vlc-0.9">Builds a <pkg>x11-libs/qt</pkg> based frontend, a graphical interface.</flag>
 		<flag name="rdp">Enables freerdp for RDP/Remote Desktop client support</flag>
 		<flag name="rtsp">Enables real audio and RTSP modules.</flag>
@@ -69,24 +64,20 @@
 		<flag name="sid">Adds support for playing C64 SID files through <pkg>media-libs/libsidplay-2</pkg>.</flag>
 		<flag name="sdl-image">Enables sdl image video decoder (depends on sdl)</flag>
 		<flag name="sftp">Enables libssh2 to support SFTP file transfer.</flag>
-		<flag name="shine">Enables shine fixed point mp3 encoder.</flag>
 		<flag name="shout">Enables libshout output.</flag>
 		<flag name="skins">Enables support for the skins2 interface.</flag>
-		<flag name="switcher">Enables MPEG2 video switcher stream output module.</flag>
 		<flag name="swscale">Enables image scaling and conversion via libswscale (part of FFmpeg).</flag>
 		<flag name="tremor">Enables tremor, a fixed-point version of the Ogg Vorbis decoder.</flag>
 		<flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder).</flag>
 		<flag name="upnp">Enables support for the Intel SDK stack based UPnP discovery module instead of CyberLink.</flag>
 		<flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
 		<flag name="vcdx">Enables VCD with navigation via libvcdinfo (depends on cdio)</flag>
-		<flag name="visual">Enables a libvisual based visualization plugin.</flag>
 		<flag name="vlm">New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC.</flag>
 		<flag name="vpx">Enables the decoder(s) from the WebM VP8 / VP9 Codec SDK.</flag>
-		<flag name="waveout">Enable win32 waveOut plugin.</flag>
-		<flag name="wingdi">Enable Win32 GDI module.</flag>
 		<flag name="wma-fixed">Enables fixed point WMA decoder.</flag>
 		<flag name="X">Enables support for, e.g., fullscreen mode via the X Window System. By itself, this flag does not build a graphical interface.</flag>
 		<flag name="xcb">Support the X C-language Binding, a replacement for Xlib; !!! you will need this option to be able to integrate video in the Qt interface, see bug #500678.</flag>
+		<flag name="x265">Support X265 Encoder.</flag>
 		<flag name="zvbi">Enables support for teletext subtitles via the zvbi library.</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/vlc/vlc-2.0.5.ebuild b/media-video/vlc/vlc-2.0.5.ebuild
deleted file mode 100644
index ada6d69646aa..000000000000
--- a/media-video/vlc/vlc-2.0.5.ebuild
+++ /dev/null
@@ -1,354 +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/vlc/vlc-2.0.5.ebuild,v 1.14 2014/04/25 00:35:39 tomwij Exp $
-
-EAPI="5"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM=git-2
-	EGIT_BOOTSTRAP="bootstrap"
-	if [ "${PV%.9999}" != "${PV}" ] ; then
-		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
-	fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs flag-o-matic ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-PATCHLEVEL="101"
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-elif [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-fi
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
-"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 ~arm ppc ppc64 -sparc x86 ~amd64-fbsd ~x86-fbsd"
-else
-	KEYWORDS=""
-fi
-IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
-	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
-	directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
-	fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
-	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
-	libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx
-	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
-	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
-	mtp musepack ncurses neon ogg omxil opengl opus optimisememory oss png
-	portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba
-	schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg
-	+swscale switcher taglib theora truetype twolame udev upnp vaapi v4l
-	vcdx vlm vorbis waveout wingdi wma-fixed +X x264 +xcb xml
-	xosd xv zvbi"
-
-RDEPEND="
-		>=sys-libs/zlib-1.2.5.1-r2[minizip]
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		aalib? ( media-libs/aalib )
-		aac? ( >=media-libs/faad2-2.6.1 )
-		alsa? ( >=media-libs/alsa-lib-1.0.23 )
-		avahi? ( >=net-dns/avahi-0.6[dbus] )
-		avcodec? ( virtual/ffmpeg )
-		avformat? ( virtual/ffmpeg )
-		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		bluray? ( >=media-libs/libbluray-0.2.1 )
-		cddb? ( >=media-libs/libcddb-1.2.0 )
-		dbus? ( >=sys-apps/dbus-1.0.2 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
-		dirac? ( >=media-video/dirac-0.10.0 )
-		directfb? ( dev-libs/DirectFB sys-libs/zlib )
-		dts? ( media-libs/libdca )
-		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 )
-		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
-		egl? ( virtual/opengl )
-		elibc_glibc? ( >=sys-libs/glibc-2.8 )
-		flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
-		fluidsynth? ( media-sound/fluidsynth )
-		fontconfig? ( media-libs/fontconfig )
-		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0 )
-		gme? ( media-libs/game-music-emu )
-		gnome? ( gnome-base/gnome-vfs )
-		gnutls? ( >=net-libs/gnutls-2.0.0 )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
-		ios-vout? ( virtual/opengl )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
-		kate? ( >=media-libs/libkate-0.1.1 )
-		libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig )
-		libcaca? ( >=media-libs/libcaca-0.99_beta14 )
-		libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 )
-		libproxy? ( net-libs/libproxy )
-		libsamplerate? ( media-libs/libsamplerate )
-		libtar? ( >=dev-libs/libtar-1.2.11-r3 )
-		libtiger? ( media-libs/libtiger )
-		linsys? ( >=media-libs/zvbi-0.2.28 )
-		lirc? ( app-misc/lirc )
-		live? ( >=media-plugins/live-2011.12.23 )
-		lua? ( >=dev-lang/lua-5.1 )
-		macosx-vout? ( virtual/opengl )
-		matroska? (	>=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 )
-		modplug? ( >=media-libs/libmodplug-0.8.8.1 )
-		mp3? ( media-libs/libmad )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
-		mtp? ( >=media-libs/libmtp-1.0.0 )
-		musepack? ( >=media-sound/musepack-tools-444 )
-		ncurses? ( >=sys-libs/ncurses-5.9-r2[unicode] )
-		ogg? ( media-libs/libogg )
-		opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
-		opus? ( media-libs/opus )
-		png? ( media-libs/libpng sys-libs/zlib )
-		portaudio? ( >=media-libs/portaudio-19_pre )
-		postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) )
-		projectm? ( media-libs/libprojectm )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
-		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
-		samba? ( >=net-fs/samba-3.4.6[smbclient] )
-		schroedinger? ( >=media-libs/schroedinger-1.0.10 )
-		sdl? ( >=media-libs/libsdl-1.2.8
-			sdl-image? ( media-libs/sdl-image sys-libs/zlib	) )
-		shout? ( media-libs/libshout )
-		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama )
-		speex? ( media-libs/speex )
-		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
-		svg? ( >=gnome-base/librsvg-2.9.0 )
-		swscale? ( virtual/ffmpeg )
-		taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
-		theora? ( >=media-libs/libtheora-1.0_beta3 )
-		truetype? ( <media-libs/freetype-2.5.3 virtual/ttf-fonts
-			!fontconfig? ( media-fonts/dejavu ) )
-		twolame? ( media-sound/twolame )
-		udev? ( virtual/udev )
-		upnp? ( net-libs/libupnp )
-		v4l? ( media-libs/libv4l )
-		vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] )
-		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
-		vorbis? ( media-libs/libvorbis )
-		X? ( x11-libs/libX11 )
-		x264? ( >=media-libs/x264-0.0.20090923:= )
-		xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
-		xml? ( dev-libs/libxml2 )
-		xosd? ( x11-libs/xosd )
-		zvbi? ( >=media-libs/zvbi-0.2.25 )
-		"
-
-DEPEND="${RDEPEND}
-	fbosd? ( sys-kernel/linux-headers )
-	kde? ( >=kde-base/kdelibs-4 )
-	xcb? ( x11-proto/xproto )
-	app-arch/xz-utils
-	virtual/pkgconfig:*"
-
-REQUIRED_USE="
-	aalib? ( X )
-	bidi? ( truetype )
-	cddb? ( cdda )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	egl? ( X )
-	ffmpeg? ( avcodec avformat swscale postproc )
-	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
-	httpd? ( lua )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	media-library? ( sqlite )
-	qt4? ( X )
-	sdl? ( X )
-	skins? ( truetype qt4 X )
-	switcher? ( avcodec )
-	vaapi? ( avcodec X )
-	vlm? ( encode )
-	xosd? ( X )
-	xv? ( xcb )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git-2_src_unpack
-	fi
-}
-
-src_prepare() {
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4
-
-	epatch "${FILESDIR}"/${PN}-2.0.7-include-flac-1.3.x-support.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	# needs libresid-builder from libsidplay:2 which is in another directory...
-	# FIXME!
-	use sid && append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable aac faad) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable atmo) \
-		$(use_enable audioqueue) \
-		$(use_enable avahi bonjour) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cdda vcd) \
-		$(use_enable cddb libcddb) \
-		$(use_enable dbus) $(use_enable dbus dbus-control) \
-		$(use_enable dirac) \
-		$(use_enable direct2d) \
-		$(use_enable directfb) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dshow) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable egl) \
-		$(use_enable encode sout) \
-		$(use_enable fbosd) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable growl) \
-		$(use_enable httpd) \
-		$(use_enable ieee1394 dv) \
-		$(use_enable ios-vout) \
-		$(use_enable jack) \
-		$(use_enable kate) \
-		$(use_with kde kde-solid) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libproxy) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-audio) \
-		$(use_enable macosx-dialog-provider) \
-		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable macosx-quartztext) \
-		$(use_enable macosx-vout) \
-		$(use_enable matroska mkv) \
-		$(use_enable media-library) \
-		$(use_enable mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) $(use_enable ogg mux_ogg) \
-		$(use_enable omxil) \
-		$(use_enable opengl glx) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable oss) \
-		$(use_enable png) \
-		$(use_enable portaudio) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr) \
-		$(use_enable qt4) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smb) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable shine) \
-		$(use_enable sid) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable sqlite) \
-		$(use_enable sse) \
-		$(use_enable svg) \
-		$(use_enable switcher) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcdx) \
-		$(use_enable vlm) \
-		$(use_enable vorbis) \
-		$(use_enable waveout) \
-		$(use_enable wingdi) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xosd) \
-		$(use_enable xv xvideo) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-loader \
-		--disable-optimizations \
-		--without-tuning \
-		--enable-fast-install
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS THANKS NEWS README \
-		doc/fortunes.txt doc/intf-vcd.txt
-
-	# Punt useless libtool's .la files
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-}
diff --git a/media-video/vlc/vlc-2.0.7.ebuild b/media-video/vlc/vlc-2.0.7.ebuild
deleted file mode 100644
index 31e5cf08117d..000000000000
--- a/media-video/vlc/vlc-2.0.7.ebuild
+++ /dev/null
@@ -1,355 +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/vlc/vlc-2.0.7.ebuild,v 1.13 2014/04/25 00:35:39 tomwij Exp $
-
-EAPI="5"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM=git-2
-	EGIT_BOOTSTRAP="bootstrap"
-	if [ "${PV%.9999}" != "${PV}" ] ; then
-		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
-	fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs flag-o-matic ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-PATCHLEVEL="101"
-
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-elif [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-fi
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
-"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 ~arm ppc ppc64 -sparc x86 ~amd64-fbsd ~x86-fbsd"
-else
-	KEYWORDS=""
-fi
-IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
-	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
-	directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
-	fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
-	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
-	libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx
-	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
-	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
-	mtp musepack ncurses neon ogg omxil opengl opus optimisememory oss png
-	portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba
-	schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg
-	+swscale switcher taglib theora truetype twolame udev upnp vaapi v4l
-	vcdx vlm vorbis waveout wingdi wma-fixed +X x264 +xcb xml
-	xosd xv zvbi"
-
-RDEPEND="
-		>=sys-libs/zlib-1.2.5.1-r2[minizip]
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		aalib? ( media-libs/aalib )
-		aac? ( >=media-libs/faad2-2.6.1 )
-		alsa? ( >=media-libs/alsa-lib-1.0.23 )
-		avahi? ( >=net-dns/avahi-0.6[dbus] )
-		avcodec? ( virtual/ffmpeg )
-		avformat? ( virtual/ffmpeg )
-		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		bluray? ( >=media-libs/libbluray-0.2.1 )
-		cddb? ( >=media-libs/libcddb-1.2.0 )
-		dbus? ( >=sys-apps/dbus-1.0.2 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
-		dirac? ( >=media-video/dirac-0.10.0 )
-		directfb? ( dev-libs/DirectFB sys-libs/zlib )
-		dts? ( media-libs/libdca )
-		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 )
-		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
-		egl? ( virtual/opengl )
-		elibc_glibc? ( >=sys-libs/glibc-2.8 )
-		flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
-		fluidsynth? ( media-sound/fluidsynth )
-		fontconfig? ( media-libs/fontconfig )
-		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0 )
-		gme? ( media-libs/game-music-emu )
-		gnome? ( gnome-base/gnome-vfs )
-		gnutls? ( >=net-libs/gnutls-2.0.0 )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
-		ios-vout? ( virtual/opengl )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
-		kate? ( >=media-libs/libkate-0.1.1 )
-		libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig )
-		libcaca? ( >=media-libs/libcaca-0.99_beta14 )
-		libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 )
-		libproxy? ( net-libs/libproxy )
-		libsamplerate? ( media-libs/libsamplerate )
-		libtar? ( >=dev-libs/libtar-1.2.11-r3 )
-		libtiger? ( media-libs/libtiger )
-		linsys? ( >=media-libs/zvbi-0.2.28 )
-		lirc? ( app-misc/lirc )
-		live? ( >=media-plugins/live-2011.12.23 )
-		lua? ( >=dev-lang/lua-5.1 )
-		macosx-vout? ( virtual/opengl )
-		matroska? (	>=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 )
-		modplug? ( >=media-libs/libmodplug-0.8.8.1 )
-		mp3? ( media-libs/libmad )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
-		mtp? ( >=media-libs/libmtp-1.0.0 )
-		musepack? ( >=media-sound/musepack-tools-444 )
-		ncurses? ( >=sys-libs/ncurses-5.9-r2[unicode] )
-		ogg? ( media-libs/libogg )
-		opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
-		opus? ( media-libs/opus )
-		png? ( media-libs/libpng sys-libs/zlib )
-		portaudio? ( >=media-libs/portaudio-19_pre )
-		postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) )
-		projectm? ( media-libs/libprojectm )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
-		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
-		samba? ( >=net-fs/samba-3.4.6[smbclient] )
-		schroedinger? ( >=media-libs/schroedinger-1.0.10 )
-		sdl? ( >=media-libs/libsdl-1.2.8
-			sdl-image? ( media-libs/sdl-image sys-libs/zlib	) )
-		shout? ( media-libs/libshout )
-		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama )
-		speex? ( media-libs/speex )
-		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
-		svg? ( >=gnome-base/librsvg-2.9.0 )
-		swscale? ( virtual/ffmpeg )
-		taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
-		theora? ( >=media-libs/libtheora-1.0_beta3 )
-		truetype? ( <media-libs/freetype-2.5.3 virtual/ttf-fonts
-			!fontconfig? ( media-fonts/dejavu ) )
-		twolame? ( media-sound/twolame )
-		udev? ( virtual/udev )
-		upnp? ( net-libs/libupnp )
-		v4l? ( media-libs/libv4l )
-		vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] )
-		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
-		vorbis? ( media-libs/libvorbis )
-		X? ( x11-libs/libX11 )
-		x264? ( >=media-libs/x264-0.0.20090923:= )
-		xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
-		xml? ( dev-libs/libxml2 )
-		xosd? ( x11-libs/xosd )
-		zvbi? ( >=media-libs/zvbi-0.2.25 )
-		"
-
-DEPEND="${RDEPEND}
-	fbosd? ( sys-kernel/linux-headers )
-	kde? ( >=kde-base/kdelibs-4 )
-	xcb? ( x11-proto/xproto )
-	app-arch/xz-utils
-	virtual/pkgconfig:*"
-
-REQUIRED_USE="
-	aalib? ( X )
-	bidi? ( truetype )
-	cddb? ( cdda )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	egl? ( X )
-	ffmpeg? ( avcodec avformat swscale postproc )
-	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
-	httpd? ( lua )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	media-library? ( sqlite )
-	qt4? ( X )
-	sdl? ( X )
-	skins? ( truetype qt4 X )
-	switcher? ( avcodec )
-	vaapi? ( avcodec X )
-	vlm? ( encode )
-	xosd? ( X )
-	xv? ( xcb )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git-2_src_unpack
-	fi
-}
-
-src_prepare() {
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4
-
-	epatch "${WORKDIR}"/patches/010_all_freetype-font.patch
-	epatch "${FILESDIR}"/${P}-include-flac-1.3.x-support.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	# needs libresid-builder from libsidplay:2 which is in another directory...
-	# FIXME!
-	use sid && append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable aac faad) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable atmo) \
-		$(use_enable audioqueue) \
-		$(use_enable avahi bonjour) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cdda vcd) \
-		$(use_enable cddb libcddb) \
-		$(use_enable dbus) $(use_enable dbus dbus-control) \
-		$(use_enable dirac) \
-		$(use_enable direct2d) \
-		$(use_enable directfb) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dshow) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable egl) \
-		$(use_enable encode sout) \
-		$(use_enable fbosd) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable growl) \
-		$(use_enable httpd) \
-		$(use_enable ieee1394 dv) \
-		$(use_enable ios-vout) \
-		$(use_enable jack) \
-		$(use_enable kate) \
-		$(use_with kde kde-solid) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libproxy) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-audio) \
-		$(use_enable macosx-dialog-provider) \
-		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable macosx-quartztext) \
-		$(use_enable macosx-vout) \
-		$(use_enable matroska mkv) \
-		$(use_enable media-library) \
-		$(use_enable mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) $(use_enable ogg mux_ogg) \
-		$(use_enable omxil) \
-		$(use_enable opengl glx) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable oss) \
-		$(use_enable png) \
-		$(use_enable portaudio) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr) \
-		$(use_enable qt4) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smb) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable shine) \
-		$(use_enable sid) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable sqlite) \
-		$(use_enable sse) \
-		$(use_enable svg) \
-		$(use_enable switcher) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcdx) \
-		$(use_enable vlm) \
-		$(use_enable vorbis) \
-		$(use_enable waveout) \
-		$(use_enable wingdi) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xosd) \
-		$(use_enable xv xvideo) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-loader \
-		--disable-optimizations \
-		--without-tuning \
-		--enable-fast-install
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS THANKS NEWS README \
-		doc/fortunes.txt doc/intf-vcd.txt
-
-	# Punt useless libtool's .la files
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-}
diff --git a/media-video/vlc/vlc-2.0.8.ebuild b/media-video/vlc/vlc-2.0.8.ebuild
deleted file mode 100644
index a25f7e8c51d4..000000000000
--- a/media-video/vlc/vlc-2.0.8.ebuild
+++ /dev/null
@@ -1,413 +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/vlc/vlc-2.0.8.ebuild,v 1.11 2014/09/02 07:41:51 mgorny Exp $
-
-EAPI="5"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-
-	if [ "${PV%.9999}" != "${PV}" ] ; then
-		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
-	fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs flag-o-matic ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-elif [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV/a/}/${P}.tar.xz"
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
-else
-	KEYWORDS=""
-fi
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
-	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
-	directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
-	faad fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
-	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
-	libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx
-	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
-	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
-	mtp musepack ncurses neon ogg omxil opengl optimisememory opus oss
-	png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba
-	schroedinger sdl sdl-image sftp shine shout sid skins speex sqlite sse svg
-	+swscale switcher taglib theora tremor truetype twolame udev upnp vaapi v4l
-	vcdx visual vlm vorbis waveout wingdi wma-fixed +X x264 +xcb xml xosd xv
-	zvbi"
-
-RDEPEND="
-		dev-libs/libgpg-error:0
-		net-dns/libidn:0
-		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
-		virtual/libintl:0
-		a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-		aalib? ( media-libs/aalib:0 )
-		alsa? ( >=media-libs/alsa-lib-1.0.23:0 )
-		avahi? ( >=net-dns/avahi-0.6:0[dbus] )
-		avcodec? ( virtual/ffmpeg:0 )
-		avformat? ( virtual/ffmpeg:0 )
-		bidi? ( >=dev-libs/fribidi-0.10.4:0 )
-		bluray? ( >=media-libs/libbluray-0.2.1:0 )
-		cddb? ( >=media-libs/libcddb-1.2.0:0 )
-		dbus? ( >=sys-apps/dbus-1.0.2:0 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.0.2:2 )
-		dirac? ( >=media-video/dirac-0.10.0:0 )
-		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
-		dts? ( media-libs/libdca:0 )
-		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 )
-		dvd? ( media-libs/libdvdread:0 >=media-libs/libdvdnav-0.1.9:0 )
-		egl? ( virtual/opengl:0 )
-		elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-		faad? ( >=media-libs/faad2-2.6.1:0 )
-		flac? ( media-libs/libogg:0 >=media-libs/flac-1.1.2:0 )
-		fluidsynth? ( media-sound/fluidsynth:0 )
-		fontconfig? ( media-libs/fontconfig:1.0 )
-		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0 )
-		gme? ( media-libs/game-music-emu:0 )
-		gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
-		gnutls? ( >=net-libs/gnutls-2.0.0:0 )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
-		ios-vout? ( virtual/opengl:0 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
-		kate? ( >=media-libs/libkate-0.1.1:0 )
-		libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
-		libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
-		libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
-		libproxy? ( net-libs/libproxy:0 )
-		libsamplerate? ( media-libs/libsamplerate:0 )
-		libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
-		libtiger? ( media-libs/libtiger:0 )
-		linsys? ( >=media-libs/zvbi-0.2.28:0 )
-		lirc? ( app-misc/lirc:0 )
-		live? ( >=media-plugins/live-2011.12.23:0 )
-		lua? ( >=dev-lang/lua-5.1:0 )
-		macosx-vout? ( virtual/opengl:0 )
-		matroska? (	>=dev-libs/libebml-1.0.0:0= >=media-libs/libmatroska-1.0.0:0= )
-		modplug? ( >=media-libs/libmodplug-0.8.8.1:0 )
-		mp3? ( media-libs/libmad:0 )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-		mtp? ( >=media-libs/libmtp-1.0.0:0 )
-		musepack? ( >=media-sound/musepack-tools-444:0 )
-		ncurses? ( sys-libs/ncurses:5[unicode] )
-		ogg? ( media-libs/libogg:0 )
-		opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
-		opus? ( >=media-libs/opus-1.0.3:0 )
-		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
-		portaudio? ( >=media-libs/portaudio-19_pre:0 )
-		postproc? ( || ( media-libs/libpostproc:0 media-video/ffmpeg:0 ) )
-		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
-		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
-		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
-		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-		sdl? ( >=media-libs/libsdl-1.2.8:0
-			sdl-image? ( media-libs/sdl-image:0 sys-libs/zlib:0 ) )
-		sftp? ( net-libs/libssh2:0 )
-		shout? ( media-libs/libshout:0 )
-		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-		speex? ( media-libs/speex:0 )
-		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
-		svg? ( >=gnome-base/librsvg-2.9.0:2 )
-		swscale? ( virtual/ffmpeg:0 )
-		taglib? ( >=media-libs/taglib-1.5:0 sys-libs/zlib:0 )
-		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
-		tremor? ( media-libs/tremor:0 )
-		truetype? ( <media-libs/freetype-2.5.3:2 virtual/ttf-fonts:0
-			!fontconfig? ( media-fonts/dejavu:0 ) )
-		twolame? ( media-sound/twolame:0 )
-		udev? ( virtual/udev:0 )
-		upnp? ( net-libs/libupnp:0 )
-		v4l? ( media-libs/libv4l:0 )
-		vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] )
-		vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
-		visual? ( media-libs/libvisual:0.4 )
-		vorbis? ( media-libs/libvorbis:0 )
-		X? ( x11-libs/libX11:0 )
-		x264? ( >=media-libs/x264-0.0.20090923:0= )
-		xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 x11-libs/xcb-util-keysyms:0 )
-		xml? ( dev-libs/libxml2:2 )
-		xosd? ( x11-libs/xosd:0 )
-		zvbi? ( >=media-libs/zvbi-0.2.25:0 )
-"
-
-DEPEND="${RDEPEND}
-	fbosd? ( sys-kernel/linux-headers:0 )
-	kde? ( >=kde-base/kdelibs-4:4 )
-	xcb? ( x11-proto/xproto:0 )
-	app-arch/xz-utils:0
-	>=sys-devel/gettext-0.18.1:*
-	virtual/pkgconfig:*"
-
-REQUIRED_USE="
-	aalib? ( X )
-	bidi? ( truetype )
-	cddb? ( cdda )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	egl? ( X )
-	ffmpeg? ( avcodec avformat swscale postproc )
-	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
-	httpd? ( lua )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	media-library? ( sqlite )
-	qt4? ( X )
-	sdl? ( X )
-	skins? ( truetype qt4 X )
-	switcher? ( avcodec )
-	vaapi? ( avcodec X )
-	vlm? ( encode )
-	xosd? ( X )
-	xv? ( xcb )
-"
-
-S="${WORKDIR}/${MY_P/a/}"
-
-pkg_setup() {
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
-		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
-			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
-		fi
-	fi
-}
-
-src_unpack() {
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
-	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
-	#
-	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
-	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
-	#
-	# http://gcc.gnu.org/c99status.html
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
-		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
-	fi
-
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
-	# Bootstrap when we are on a git checkout.
-	if [[ "${PV%9999}" != "${PV}" ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4 || die
-
-	# Fix mistakes.
-	if use truetype || use projectm ; then
-		epatch "${FILESDIR}"/${PN}-2.0.8-freetype-proper-default-font.patch
-	fi
-
-	# Patch up incompatibilities and reconfigure autotools.
-	epatch "${FILESDIR}"/${PN}-2.0.8-support-uclibc.patch
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	# Needs libresid-builder from libsidplay:2 which is in another directory...
-	# FIXME!
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	econf \
-		${myconf} \
-		--enable-vlc \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-loader \
-		--disable-optimizations \
-		--disable-update-check \
-		--enable-fast-install \
-		--enable-screen \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable atmo) \
-		$(use_enable audioqueue) \
-		$(use_enable avahi bonjour) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cdda vcd) \
-		$(use_enable cddb libcddb) \
-		$(use_enable dbus) $(use_enable dbus dbus-control) \
-		$(use_enable dirac) \
-		$(use_enable direct2d) \
-		$(use_enable directfb) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dshow) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable egl) \
-		$(use_enable encode sout) \
-		$(use_enable faad) \
-		$(use_enable fbosd) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable growl) \
-		$(use_enable httpd) \
-		$(use_enable ieee1394 dv) \
-		$(use_enable ios-vout) \
-		$(use_enable jack) \
-		$(use_enable kate) \
-		$(use_with kde kde-solid) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libproxy) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-audio) \
-		$(use_enable macosx-dialog-provider) \
-		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable macosx-quartztext) \
-		$(use_enable macosx-vout) \
-		$(use_enable matroska mkv) \
-		$(use_enable media-library) \
-		$(use_enable mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) $(use_enable ogg mux_ogg) \
-		$(use_enable omxil) \
-		$(use_enable opengl glx) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable oss) \
-		$(use_enable png) \
-		$(use_enable portaudio) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr) \
-		$(use_enable qt4) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smb) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable sftp) \
-		$(use_enable shine) \
-		$(use_enable sid) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable sqlite) \
-		$(use_enable sse) \
-		$(use_enable svg) \
-		$(use_enable switcher) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable tremor) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcdx) \
-		$(use_enable visual) \
-		$(use_enable vlm) \
-		$(use_enable vorbis) \
-		$(use_enable waveout) \
-		$(use_enable wingdi) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xosd) \
-		$(use_enable xv xvideo) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-crystalhd \
-		--disable-decklink \
-		--disable-goom \
-		--disable-hildon \
-		--disable-iomx \
-		--disable-kai \
-		--disable-kva \
-		--disable-opencv
-
-		# ^ We don't have these disables libraries in the Portage tree yet.
-}
-
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
-
-src_install() {
-	default
-
-	# Punt useless libtool's .la files
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-}
diff --git a/media-video/vlc/vlc-2.0.8a.ebuild b/media-video/vlc/vlc-2.0.8a.ebuild
deleted file mode 100644
index 05601d39f27b..000000000000
--- a/media-video/vlc/vlc-2.0.8a.ebuild
+++ /dev/null
@@ -1,413 +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/vlc/vlc-2.0.8a.ebuild,v 1.11 2014/09/02 07:41:51 mgorny Exp $
-
-EAPI="5"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-
-	if [ "${PV%.9999}" != "${PV}" ] ; then
-		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
-	fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs flag-o-matic ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-elif [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV/a/}/${P}.tar.xz"
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
-else
-	KEYWORDS=""
-fi
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
-	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
-	directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
-	faad fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
-	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
-	libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx
-	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
-	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
-	mtp musepack ncurses neon ogg omxil opengl optimisememory opus oss
-	png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba
-	schroedinger sdl sdl-image sftp shine shout sid skins speex sqlite sse svg
-	+swscale switcher taglib theora tremor truetype twolame udev upnp vaapi v4l
-	vcdx visual vlm vorbis waveout wingdi wma-fixed +X x264 +xcb xml xosd xv
-	zvbi"
-
-RDEPEND="
-		dev-libs/libgpg-error:0
-		net-dns/libidn:0
-		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
-		virtual/libintl:0
-		a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-		aalib? ( media-libs/aalib:0 )
-		alsa? ( >=media-libs/alsa-lib-1.0.23:0 )
-		avahi? ( >=net-dns/avahi-0.6:0[dbus] )
-		avcodec? ( virtual/ffmpeg:0 )
-		avformat? ( virtual/ffmpeg:0 )
-		bidi? ( >=dev-libs/fribidi-0.10.4:0 )
-		bluray? ( >=media-libs/libbluray-0.2.1:0 )
-		cddb? ( >=media-libs/libcddb-1.2.0:0 )
-		dbus? ( >=sys-apps/dbus-1.0.2:0 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.0.2:2 )
-		dirac? ( >=media-video/dirac-0.10.0:0 )
-		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
-		dts? ( media-libs/libdca:0 )
-		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 )
-		dvd? ( media-libs/libdvdread:0 >=media-libs/libdvdnav-0.1.9:0 )
-		egl? ( virtual/opengl:0 )
-		elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-		faad? ( >=media-libs/faad2-2.6.1:0 )
-		flac? ( media-libs/libogg:0 >=media-libs/flac-1.1.2:0 )
-		fluidsynth? ( media-sound/fluidsynth:0 )
-		fontconfig? ( media-libs/fontconfig:1.0 )
-		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0 )
-		gme? ( media-libs/game-music-emu:0 )
-		gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
-		gnutls? ( >=net-libs/gnutls-2.0.0:0 )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
-		ios-vout? ( virtual/opengl:0 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
-		kate? ( >=media-libs/libkate-0.1.1:0 )
-		libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
-		libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
-		libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
-		libproxy? ( net-libs/libproxy:0 )
-		libsamplerate? ( media-libs/libsamplerate:0 )
-		libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
-		libtiger? ( media-libs/libtiger:0 )
-		linsys? ( >=media-libs/zvbi-0.2.28:0 )
-		lirc? ( app-misc/lirc:0 )
-		live? ( >=media-plugins/live-2011.12.23:0 )
-		lua? ( >=dev-lang/lua-5.1:0 )
-		macosx-vout? ( virtual/opengl:0 )
-		matroska? (	>=dev-libs/libebml-1.0.0:0= >=media-libs/libmatroska-1.0.0:0= )
-		modplug? ( >=media-libs/libmodplug-0.8.8.1:0 )
-		mp3? ( media-libs/libmad:0 )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-		mtp? ( >=media-libs/libmtp-1.0.0:0 )
-		musepack? ( >=media-sound/musepack-tools-444:0 )
-		ncurses? ( sys-libs/ncurses:5[unicode] )
-		ogg? ( media-libs/libogg:0 )
-		opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
-		opus? ( >=media-libs/opus-1.0.3:0 )
-		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
-		portaudio? ( >=media-libs/portaudio-19_pre:0 )
-		postproc? ( || ( media-libs/libpostproc:0 media-video/ffmpeg:0 ) )
-		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
-		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
-		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
-		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-		sdl? ( >=media-libs/libsdl-1.2.8:0
-			sdl-image? ( media-libs/sdl-image:0 sys-libs/zlib:0 ) )
-		sftp? ( net-libs/libssh2:0 )
-		shout? ( media-libs/libshout:0 )
-		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-		speex? ( media-libs/speex:0 )
-		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
-		svg? ( >=gnome-base/librsvg-2.9.0:2 )
-		swscale? ( virtual/ffmpeg:0 )
-		taglib? ( >=media-libs/taglib-1.5:0 sys-libs/zlib:0 )
-		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
-		tremor? ( media-libs/tremor:0 )
-		truetype? ( <media-libs/freetype-2.5.3:2 virtual/ttf-fonts:0
-			!fontconfig? ( media-fonts/dejavu:0 ) )
-		twolame? ( media-sound/twolame:0 )
-		udev? ( virtual/udev:0 )
-		upnp? ( net-libs/libupnp:0 )
-		v4l? ( media-libs/libv4l:0 )
-		vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] )
-		vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
-		visual? ( media-libs/libvisual:0.4 )
-		vorbis? ( media-libs/libvorbis:0 )
-		X? ( x11-libs/libX11:0 )
-		x264? ( >=media-libs/x264-0.0.20090923:0= )
-		xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 x11-libs/xcb-util-keysyms:0 )
-		xml? ( dev-libs/libxml2:2 )
-		xosd? ( x11-libs/xosd:0 )
-		zvbi? ( >=media-libs/zvbi-0.2.25:0 )
-"
-
-DEPEND="${RDEPEND}
-	fbosd? ( sys-kernel/linux-headers:0 )
-	kde? ( >=kde-base/kdelibs-4:4 )
-	xcb? ( x11-proto/xproto:0 )
-	app-arch/xz-utils:0
-	>=sys-devel/gettext-0.18.1:*
-	virtual/pkgconfig:*"
-
-REQUIRED_USE="
-	aalib? ( X )
-	bidi? ( truetype )
-	cddb? ( cdda )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	egl? ( X )
-	ffmpeg? ( avcodec avformat swscale postproc )
-	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
-	httpd? ( lua )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	media-library? ( sqlite )
-	qt4? ( X )
-	sdl? ( X )
-	skins? ( truetype qt4 X )
-	switcher? ( avcodec )
-	vaapi? ( avcodec X )
-	vlm? ( encode )
-	xosd? ( X )
-	xv? ( xcb )
-"
-
-S="${WORKDIR}/${MY_P/a/}"
-
-pkg_setup() {
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
-		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
-			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
-		fi
-	fi
-}
-
-src_unpack() {
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
-	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
-	#
-	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
-	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
-	#
-	# http://gcc.gnu.org/c99status.html
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
-		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
-	fi
-
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
-	# Bootstrap when we are on a git checkout.
-	if [[ "${PV%9999}" != "${PV}" ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4 || die
-
-	# Fix mistakes.
-	if use truetype || use projectm ; then
-		epatch "${FILESDIR}"/${PN}-2.0.8-freetype-proper-default-font.patch
-	fi
-
-	# Patch up incompatibilities and reconfigure autotools.
-	epatch "${FILESDIR}"/${PN}-2.0.8-support-uclibc.patch
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	# Needs libresid-builder from libsidplay:2 which is in another directory...
-	# FIXME!
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	econf \
-		${myconf} \
-		--enable-vlc \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-loader \
-		--disable-optimizations \
-		--disable-update-check \
-		--enable-fast-install \
-		--enable-screen \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable atmo) \
-		$(use_enable audioqueue) \
-		$(use_enable avahi bonjour) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cdda vcd) \
-		$(use_enable cddb libcddb) \
-		$(use_enable dbus) $(use_enable dbus dbus-control) \
-		$(use_enable dirac) \
-		$(use_enable direct2d) \
-		$(use_enable directfb) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dshow) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable egl) \
-		$(use_enable encode sout) \
-		$(use_enable faad) \
-		$(use_enable fbosd) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable growl) \
-		$(use_enable httpd) \
-		$(use_enable ieee1394 dv) \
-		$(use_enable ios-vout) \
-		$(use_enable jack) \
-		$(use_enable kate) \
-		$(use_with kde kde-solid) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libproxy) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-audio) \
-		$(use_enable macosx-dialog-provider) \
-		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable macosx-quartztext) \
-		$(use_enable macosx-vout) \
-		$(use_enable matroska mkv) \
-		$(use_enable media-library) \
-		$(use_enable mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) $(use_enable ogg mux_ogg) \
-		$(use_enable omxil) \
-		$(use_enable opengl glx) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable oss) \
-		$(use_enable png) \
-		$(use_enable portaudio) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr) \
-		$(use_enable qt4) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smb) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable sftp) \
-		$(use_enable shine) \
-		$(use_enable sid) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable sqlite) \
-		$(use_enable sse) \
-		$(use_enable svg) \
-		$(use_enable switcher) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable tremor) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcdx) \
-		$(use_enable visual) \
-		$(use_enable vlm) \
-		$(use_enable vorbis) \
-		$(use_enable waveout) \
-		$(use_enable wingdi) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xosd) \
-		$(use_enable xv xvideo) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-crystalhd \
-		--disable-decklink \
-		--disable-goom \
-		--disable-hildon \
-		--disable-iomx \
-		--disable-kai \
-		--disable-kva \
-		--disable-opencv
-
-		# ^ We don't have these disables libraries in the Portage tree yet.
-}
-
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
-
-src_install() {
-	default
-
-	# Punt useless libtool's .la files
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-}
diff --git a/media-video/vlc/vlc-2.0.9.ebuild b/media-video/vlc/vlc-2.0.9.ebuild
deleted file mode 100644
index 6ad1e094e3f0..000000000000
--- a/media-video/vlc/vlc-2.0.9.ebuild
+++ /dev/null
@@ -1,413 +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/vlc/vlc-2.0.9.ebuild,v 1.12 2014/09/02 07:41:51 mgorny Exp $
-
-EAPI="5"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-
-	if [ "${PV%.9999}" != "${PV}" ] ; then
-		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
-	fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs flag-o-matic ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-elif [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV/a/}/${P}.tar.xz"
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
-else
-	KEYWORDS=""
-fi
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
-	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
-	directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
-	faad fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
-	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
-	libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx
-	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
-	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
-	mtp musepack ncurses neon ogg omxil opengl optimisememory opus oss
-	png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba
-	schroedinger sdl sdl-image sftp shine shout sid skins speex sqlite sse svg
-	+swscale switcher taglib theora tremor truetype twolame udev upnp vaapi v4l
-	vcdx visual vlm vorbis waveout wingdi wma-fixed +X x264 +xcb xml xosd xv
-	zvbi"
-
-RDEPEND="
-		dev-libs/libgpg-error:0
-		net-dns/libidn:0
-		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
-		virtual/libintl:0
-		a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-		aalib? ( media-libs/aalib:0 )
-		alsa? ( >=media-libs/alsa-lib-1.0.23:0 )
-		avahi? ( >=net-dns/avahi-0.6:0[dbus] )
-		avcodec? ( virtual/ffmpeg:0 )
-		avformat? ( virtual/ffmpeg:0 )
-		bidi? ( >=dev-libs/fribidi-0.10.4:0 )
-		bluray? ( >=media-libs/libbluray-0.2.1:0 )
-		cddb? ( >=media-libs/libcddb-1.2.0:0 )
-		dbus? ( >=sys-apps/dbus-1.0.2:0 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.0.2:2 )
-		dirac? ( >=media-video/dirac-0.10.0:0 )
-		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
-		dts? ( media-libs/libdca:0 )
-		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 <media-libs/libdvbpsi-1:0 )
-		dvd? ( media-libs/libdvdread:0 >=media-libs/libdvdnav-0.1.9:0 )
-		egl? ( virtual/opengl:0 )
-		elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-		faad? ( >=media-libs/faad2-2.6.1:0 )
-		flac? ( media-libs/libogg:0 >=media-libs/flac-1.1.2:0 )
-		fluidsynth? ( media-sound/fluidsynth:0 )
-		fontconfig? ( media-libs/fontconfig:1.0 )
-		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0 )
-		gme? ( media-libs/game-music-emu:0 )
-		gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
-		gnutls? ( >=net-libs/gnutls-2.0.0:0 )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
-		ios-vout? ( virtual/opengl:0 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
-		kate? ( >=media-libs/libkate-0.1.1:0 )
-		libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
-		libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
-		libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
-		libproxy? ( net-libs/libproxy:0 )
-		libsamplerate? ( media-libs/libsamplerate:0 )
-		libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
-		libtiger? ( media-libs/libtiger:0 )
-		linsys? ( >=media-libs/zvbi-0.2.28:0 )
-		lirc? ( app-misc/lirc:0 )
-		live? ( >=media-plugins/live-2011.12.23:0 )
-		lua? ( >=dev-lang/lua-5.1:0 )
-		macosx-vout? ( virtual/opengl:0 )
-		matroska? (	>=dev-libs/libebml-1.0.0:0= >=media-libs/libmatroska-1.0.0:0= )
-		modplug? ( >=media-libs/libmodplug-0.8.8.1:0 )
-		mp3? ( media-libs/libmad:0 )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-		mtp? ( >=media-libs/libmtp-1.0.0:0 )
-		musepack? ( >=media-sound/musepack-tools-444:0 )
-		ncurses? ( sys-libs/ncurses:5[unicode] )
-		ogg? ( media-libs/libogg:0 )
-		opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
-		opus? ( >=media-libs/opus-1.0.3:0 )
-		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
-		portaudio? ( >=media-libs/portaudio-19_pre:0 )
-		postproc? ( || ( media-libs/libpostproc:0 media-video/ffmpeg:0 ) )
-		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
-		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
-		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
-		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-		sdl? ( >=media-libs/libsdl-1.2.8:0
-			sdl-image? ( media-libs/sdl-image:0 sys-libs/zlib:0 ) )
-		sftp? ( net-libs/libssh2:0 )
-		shout? ( media-libs/libshout:0 )
-		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-		speex? ( media-libs/speex:0 )
-		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
-		svg? ( >=gnome-base/librsvg-2.9.0:2 )
-		swscale? ( virtual/ffmpeg:0 )
-		taglib? ( >=media-libs/taglib-1.5:0 sys-libs/zlib:0 )
-		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
-		tremor? ( media-libs/tremor:0 )
-		truetype? ( <media-libs/freetype-2.5.3:2 virtual/ttf-fonts:0
-			!fontconfig? ( media-fonts/dejavu:0 ) )
-		twolame? ( media-sound/twolame:0 )
-		udev? ( virtual/udev:0 )
-		upnp? ( net-libs/libupnp:0 )
-		v4l? ( media-libs/libv4l:0 )
-		vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] )
-		vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
-		visual? ( media-libs/libvisual:0.4 )
-		vorbis? ( media-libs/libvorbis:0 )
-		X? ( x11-libs/libX11:0 )
-		x264? ( >=media-libs/x264-0.0.20090923:0= )
-		xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 x11-libs/xcb-util-keysyms:0 )
-		xml? ( dev-libs/libxml2:2 )
-		xosd? ( x11-libs/xosd:0 )
-		zvbi? ( >=media-libs/zvbi-0.2.25:0 )
-"
-
-DEPEND="${RDEPEND}
-	fbosd? ( sys-kernel/linux-headers:0 )
-	kde? ( >=kde-base/kdelibs-4:4 )
-	xcb? ( x11-proto/xproto:0 )
-	app-arch/xz-utils:0
-	>=sys-devel/gettext-0.18.1:*
-	virtual/pkgconfig:*"
-
-REQUIRED_USE="
-	aalib? ( X )
-	bidi? ( truetype )
-	cddb? ( cdda )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	egl? ( X )
-	ffmpeg? ( avcodec avformat swscale postproc )
-	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
-	httpd? ( lua )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	media-library? ( sqlite )
-	qt4? ( X )
-	sdl? ( X )
-	skins? ( truetype qt4 X )
-	switcher? ( avcodec )
-	vaapi? ( avcodec X )
-	vlm? ( encode )
-	xosd? ( X )
-	xv? ( xcb )
-"
-
-S="${WORKDIR}/${MY_P/a/}"
-
-pkg_setup() {
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
-		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
-			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
-		fi
-	fi
-}
-
-src_unpack() {
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
-	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
-	#
-	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
-	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
-	#
-	# http://gcc.gnu.org/c99status.html
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
-		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
-	fi
-
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
-	# Bootstrap when we are on a git checkout.
-	if [[ "${PV%9999}" != "${PV}" ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4 || die
-
-	# Fix mistakes.
-	if use truetype || use projectm ; then
-		epatch "${FILESDIR}"/${PN}-2.0.8-freetype-proper-default-font.patch
-	fi
-
-	# Patch up incompatibilities and reconfigure autotools.
-	epatch "${FILESDIR}"/${PN}-2.0.8-support-uclibc.patch
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	# Needs libresid-builder from libsidplay:2 which is in another directory...
-	# FIXME!
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	econf \
-		${myconf} \
-		--enable-vlc \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-loader \
-		--disable-optimizations \
-		--disable-update-check \
-		--enable-fast-install \
-		--enable-screen \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable atmo) \
-		$(use_enable audioqueue) \
-		$(use_enable avahi bonjour) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cdda vcd) \
-		$(use_enable cddb libcddb) \
-		$(use_enable dbus) $(use_enable dbus dbus-control) \
-		$(use_enable dirac) \
-		$(use_enable direct2d) \
-		$(use_enable directfb) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dshow) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable egl) \
-		$(use_enable encode sout) \
-		$(use_enable faad) \
-		$(use_enable fbosd) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable growl) \
-		$(use_enable httpd) \
-		$(use_enable ieee1394 dv) \
-		$(use_enable ios-vout) \
-		$(use_enable jack) \
-		$(use_enable kate) \
-		$(use_with kde kde-solid) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libproxy) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-audio) \
-		$(use_enable macosx-dialog-provider) \
-		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable macosx-quartztext) \
-		$(use_enable macosx-vout) \
-		$(use_enable matroska mkv) \
-		$(use_enable media-library) \
-		$(use_enable mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) $(use_enable ogg mux_ogg) \
-		$(use_enable omxil) \
-		$(use_enable opengl glx) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable oss) \
-		$(use_enable png) \
-		$(use_enable portaudio) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr) \
-		$(use_enable qt4) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smb) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable sftp) \
-		$(use_enable shine) \
-		$(use_enable sid) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable sqlite) \
-		$(use_enable sse) \
-		$(use_enable svg) \
-		$(use_enable switcher) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable tremor) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcdx) \
-		$(use_enable visual) \
-		$(use_enable vlm) \
-		$(use_enable vorbis) \
-		$(use_enable waveout) \
-		$(use_enable wingdi) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xosd) \
-		$(use_enable xv xvideo) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-crystalhd \
-		--disable-decklink \
-		--disable-goom \
-		--disable-hildon \
-		--disable-iomx \
-		--disable-kai \
-		--disable-kva \
-		--disable-opencv
-
-		# ^ We don't have these disables libraries in the Portage tree yet.
-}
-
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
-
-src_install() {
-	default
-
-	# Punt useless libtool's .la files
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-}
diff --git a/media-video/vlc/vlc-2.0.9999.ebuild b/media-video/vlc/vlc-2.0.9999.ebuild
deleted file mode 100644
index f259f3d07d3d..000000000000
--- a/media-video/vlc/vlc-2.0.9999.ebuild
+++ /dev/null
@@ -1,413 +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/vlc/vlc-2.0.9999.ebuild,v 1.39 2014/09/02 07:41:51 mgorny Exp $
-
-EAPI="5"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-
-	if [ "${PV%.9999}" != "${PV}" ] ; then
-		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
-	fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs flag-o-matic ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-elif [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV/a/}/${P}.tar.xz"
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-else
-	KEYWORDS=""
-fi
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
-	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
-	directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
-	faad fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
-	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
-	libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx
-	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
-	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
-	mtp musepack ncurses neon ogg omxil opengl optimisememory opus oss
-	png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba
-	schroedinger sdl sdl-image sftp shine shout sid skins speex sqlite sse svg
-	+swscale switcher taglib theora tremor truetype twolame udev upnp vaapi v4l
-	vcdx visual vlm vorbis waveout wingdi wma-fixed +X x264 +xcb xml xosd xv
-	zvbi"
-
-RDEPEND="
-		dev-libs/libgpg-error:0
-		net-dns/libidn:0
-		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
-		virtual/libintl:0
-		a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-		aalib? ( media-libs/aalib:0 )
-		alsa? ( >=media-libs/alsa-lib-1.0.23:0 )
-		avahi? ( >=net-dns/avahi-0.6:0[dbus] )
-		avcodec? ( virtual/ffmpeg:0 )
-		avformat? ( virtual/ffmpeg:0 )
-		bidi? ( >=dev-libs/fribidi-0.10.4:0 )
-		bluray? ( >=media-libs/libbluray-0.2.1:0 )
-		cddb? ( >=media-libs/libcddb-1.2.0:0 )
-		dbus? ( >=sys-apps/dbus-1.0.2:0 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.0.2:2 )
-		dirac? ( >=media-video/dirac-0.10.0:0 )
-		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
-		dts? ( media-libs/libdca:0 )
-		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 )
-		dvd? ( media-libs/libdvdread:0 >=media-libs/libdvdnav-0.1.9:0 )
-		egl? ( virtual/opengl:0 )
-		elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-		faad? ( >=media-libs/faad2-2.6.1:0 )
-		flac? ( media-libs/libogg:0 >=media-libs/flac-1.1.2:0 )
-		fluidsynth? ( media-sound/fluidsynth:0 )
-		fontconfig? ( media-libs/fontconfig:1.0 )
-		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0 )
-		gme? ( media-libs/game-music-emu:0 )
-		gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
-		gnutls? ( >=net-libs/gnutls-2.0.0:0 )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
-		ios-vout? ( virtual/opengl:0 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
-		kate? ( >=media-libs/libkate-0.1.1:0 )
-		libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
-		libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
-		libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
-		libproxy? ( net-libs/libproxy:0 )
-		libsamplerate? ( media-libs/libsamplerate:0 )
-		libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
-		libtiger? ( media-libs/libtiger:0 )
-		linsys? ( >=media-libs/zvbi-0.2.28:0 )
-		lirc? ( app-misc/lirc:0 )
-		live? ( >=media-plugins/live-2011.12.23:0 )
-		lua? ( >=dev-lang/lua-5.1:0 )
-		macosx-vout? ( virtual/opengl:0 )
-		matroska? (	>=dev-libs/libebml-1.0.0:0= >=media-libs/libmatroska-1.0.0:0= )
-		modplug? ( >=media-libs/libmodplug-0.8.8.1:0 )
-		mp3? ( media-libs/libmad:0 )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-		mtp? ( >=media-libs/libmtp-1.0.0:0 )
-		musepack? ( >=media-sound/musepack-tools-444:0 )
-		ncurses? ( sys-libs/ncurses:5[unicode] )
-		ogg? ( media-libs/libogg:0 )
-		opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
-		opus? ( >=media-libs/opus-1.0.3:0 )
-		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
-		portaudio? ( >=media-libs/portaudio-19_pre:0 )
-		postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc:0 ) )
-		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
-		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
-		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
-		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-		sdl? ( >=media-libs/libsdl-1.2.8:0
-			sdl-image? ( media-libs/sdl-image:0 sys-libs/zlib:0 ) )
-		sftp? ( net-libs/libssh2:0 )
-		shout? ( media-libs/libshout:0 )
-		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-		speex? ( media-libs/speex:0 )
-		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
-		svg? ( >=gnome-base/librsvg-2.9.0:2 )
-		swscale? ( virtual/ffmpeg:0 )
-		taglib? ( >=media-libs/taglib-1.5:0 sys-libs/zlib:0 )
-		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
-		tremor? ( media-libs/tremor:0 )
-		truetype? ( <media-libs/freetype-2.5.3:2 virtual/ttf-fonts:0
-			!fontconfig? ( media-fonts/dejavu:0 ) )
-		twolame? ( media-sound/twolame:0 )
-		udev? ( virtual/udev:0 )
-		upnp? ( net-libs/libupnp:0 )
-		v4l? ( media-libs/libv4l:0 )
-		vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] )
-		vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
-		visual? ( media-libs/libvisual:0.4 )
-		vorbis? ( media-libs/libvorbis:0 )
-		X? ( x11-libs/libX11:0 )
-		x264? ( >=media-libs/x264-0.0.20090923:0= )
-		xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 x11-libs/xcb-util-keysyms:0 )
-		xml? ( dev-libs/libxml2:2 )
-		xosd? ( x11-libs/xosd:0 )
-		zvbi? ( >=media-libs/zvbi-0.2.25:0 )
-"
-
-DEPEND="${RDEPEND}
-	fbosd? ( sys-kernel/linux-headers:0 )
-	kde? ( >=kde-base/kdelibs-4:4 )
-	xcb? ( x11-proto/xproto:0 )
-	app-arch/xz-utils:0
-	>=sys-devel/gettext-0.18.1:*
-	virtual/pkgconfig:*"
-
-REQUIRED_USE="
-	aalib? ( X )
-	bidi? ( truetype )
-	cddb? ( cdda )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	egl? ( X )
-	ffmpeg? ( avcodec avformat swscale postproc )
-	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
-	httpd? ( lua )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	media-library? ( sqlite )
-	qt4? ( X )
-	sdl? ( X )
-	skins? ( truetype qt4 X )
-	switcher? ( avcodec )
-	vaapi? ( avcodec X )
-	vlm? ( encode )
-	xosd? ( X )
-	xv? ( xcb )
-"
-
-S="${WORKDIR}/${MY_P/a/}"
-
-pkg_setup() {
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
-		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
-			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
-		fi
-	fi
-}
-
-src_unpack() {
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
-	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
-	#
-	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
-	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
-	#
-	# http://gcc.gnu.org/c99status.html
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
-		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
-	fi
-
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
-	# Bootstrap when we are on a git checkout.
-	if [[ "${PV%9999}" != "${PV}" ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4 || die
-
-	# Fix mistakes.
-	if use truetype || use projectm ; then
-		epatch "${FILESDIR}"/${PN}-2.0.8-freetype-proper-default-font.patch
-	fi
-
-	# Patch up incompatibilities and reconfigure autotools.
-	epatch "${FILESDIR}"/${PN}-2.0.8-support-uclibc.patch
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	# Needs libresid-builder from libsidplay:2 which is in another directory...
-	# FIXME!
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	econf \
-		${myconf} \
-		--enable-vlc \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-loader \
-		--disable-optimizations \
-		--disable-update-check \
-		--enable-fast-install \
-		--enable-screen \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable atmo) \
-		$(use_enable audioqueue) \
-		$(use_enable avahi bonjour) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cdda vcd) \
-		$(use_enable cddb libcddb) \
-		$(use_enable dbus) $(use_enable dbus dbus-control) \
-		$(use_enable dirac) \
-		$(use_enable direct2d) \
-		$(use_enable directfb) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dshow) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable egl) \
-		$(use_enable encode sout) \
-		$(use_enable faad) \
-		$(use_enable fbosd) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable growl) \
-		$(use_enable httpd) \
-		$(use_enable ieee1394 dv) \
-		$(use_enable ios-vout) \
-		$(use_enable jack) \
-		$(use_enable kate) \
-		$(use_with kde kde-solid) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libproxy) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-audio) \
-		$(use_enable macosx-dialog-provider) \
-		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable macosx-quartztext) \
-		$(use_enable macosx-vout) \
-		$(use_enable matroska mkv) \
-		$(use_enable media-library) \
-		$(use_enable mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) $(use_enable ogg mux_ogg) \
-		$(use_enable omxil) \
-		$(use_enable opengl glx) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable oss) \
-		$(use_enable png) \
-		$(use_enable portaudio) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr) \
-		$(use_enable qt4) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smb) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable sftp) \
-		$(use_enable shine) \
-		$(use_enable sid) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable sqlite) \
-		$(use_enable sse) \
-		$(use_enable svg) \
-		$(use_enable switcher) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable tremor) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcdx) \
-		$(use_enable visual) \
-		$(use_enable vlm) \
-		$(use_enable vorbis) \
-		$(use_enable waveout) \
-		$(use_enable wingdi) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xosd) \
-		$(use_enable xv xvideo) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-crystalhd \
-		--disable-decklink \
-		--disable-goom \
-		--disable-hildon \
-		--disable-iomx \
-		--disable-kai \
-		--disable-kva \
-		--disable-opencv
-
-		# ^ We don't have these disables libraries in the Portage tree yet.
-}
-
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
-
-src_install() {
-	default
-
-	# Punt useless libtool's .la files
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-}
diff --git a/media-video/vlc/vlc-2.1.0.ebuild b/media-video/vlc/vlc-2.1.0.ebuild
deleted file mode 100644
index 8603824d6fd2..000000000000
--- a/media-video/vlc/vlc-2.1.0.ebuild
+++ /dev/null
@@ -1,434 +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/vlc/vlc-2.1.0.ebuild,v 1.17 2014/09/02 07:41:51 mgorny Exp $
-
-EAPI="5"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-
-	if [ "${PV%.9999}" != "${PV}" ] ; then
-		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
-	fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-elif [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-else
-	KEYWORDS=""
-fi
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
-	+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug dirac
-	directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode faad fdk
-	fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
-	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
-	libsamplerate libtiger linsys libtar lirc live lua +macosx
-	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
-	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
-	mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
-	png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
-	schroedinger sdl sdl-image sftp shout sid skins speex sse svg +swscale
-	taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
-	vlm vorbis wma-fixed +X x264 +xcb xml xv zvbi"
-
-RDEPEND="
-		!<media-video/ffmpeg-1.2:0
-		dev-libs/libgpg-error:0
-		net-dns/libidn:0
-		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
-		virtual/libintl:0
-		a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-		aalib? ( media-libs/aalib:0 )
-		alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
-		avahi? ( >=net-dns/avahi-0.6:0[dbus] )
-		avcodec? ( virtual/ffmpeg:0 )
-		avformat? ( virtual/ffmpeg:0 )
-		bidi? ( >=dev-libs/fribidi-0.10.4:0 )
-		bluray? ( >=media-libs/libbluray-0.2.1:0 )
-		cddb? ( >=media-libs/libcddb-1.2.0:0 )
-		chromaprint? ( >=media-libs/chromaprint-0.6:0 )
-		dbus? ( >=sys-apps/dbus-1.0.2:0 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1.0:2 )
-		dirac? ( >=media-video/dirac-0.10.0:0 )
-		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
-		dts? ( media-libs/libdca:0 )
-		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 )
-		dvd? ( media-libs/libdvdread:0 >=media-libs/libdvdnav-0.1.9:0 )
-		egl? ( virtual/opengl:0 )
-		elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-		faad? ( >=media-libs/faad2-2.6.1:0 )
-		fdk? ( media-libs/fdk-aac:0 )
-		flac? ( media-libs/libogg:0 >=media-libs/flac-1.1.2:0 )
-		fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
-		fontconfig? ( media-libs/fontconfig:1.0 )
-		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0 )
-		gme? ( media-libs/game-music-emu:0 )
-		gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
-		gnutls? ( >=net-libs/gnutls-3.0.20:0 )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
-		ios-vout? ( virtual/opengl:0 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
-		kate? ( >=media-libs/libkate-0.3.0:0 )
-		libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
-		libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
-		libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
-		libsamplerate? ( media-libs/libsamplerate:0 )
-		libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
-		libtiger? ( >=media-libs/libtiger-0.3.1:0 )
-		linsys? ( >=media-libs/zvbi-0.2.28:0 )
-		lirc? ( app-misc/lirc:0 )
-		live? ( >=media-plugins/live-2011.12.23:0 )
-		lua? ( >=dev-lang/lua-5.1:0 )
-		macosx-vout? ( virtual/opengl:0 )
-		matroska? (	>=dev-libs/libebml-1.0.0:0= >=media-libs/libmatroska-1.0.0:0= )
-		modplug? ( >=media-libs/libmodplug-0.8.8.1:0 )
-		mp3? ( media-libs/libmad:0 )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-		mtp? ( >=media-libs/libmtp-1.0.0:0 )
-		musepack? ( >=media-sound/musepack-tools-444:0 )
-		ncurses? ( sys-libs/ncurses:5[unicode] )
-		ogg? ( media-libs/libogg:0 )
-		opencv? ( >media-libs/opencv-2.0:0 )
-		opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
-		opus? ( >=media-libs/opus-1.0.3:0 )
-		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
-		postproc? ( || ( media-libs/libpostproc:0 >=media-video/ffmpeg-1.2:0 ) )
-		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
-		qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )
-		qt5? ( >=dev-qt/qtgui-5.1.0:5 >=dev-qt/qtcore-5.1.0:5 dev-qt/qtwidgets:5 )
-		rdp? ( net-misc/freerdp:0= )
-		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
-		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-		sdl? ( >=media-libs/libsdl-1.2.10:0
-			sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
-		sftp? ( net-libs/libssh2:0 )
-		shout? ( media-libs/libshout:0 )
-		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-		speex? ( media-libs/speex:0 )
-		svg? ( >=gnome-base/librsvg-2.9.0:2 )
-		swscale? ( virtual/ffmpeg:0 )
-		taglib? ( >=media-libs/taglib-1.6.1:0 sys-libs/zlib:0 )
-		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
-		tremor? ( media-libs/tremor:0 )
-		truetype? ( <media-libs/freetype-2.5.3:2 virtual/ttf-fonts:0
-			!fontconfig? ( media-fonts/dejavu:0 ) )
-		twolame? ( media-sound/twolame:0 )
-		udev? ( >=virtual/udev-142:0 )
-		upnp? ( net-libs/libupnp:0 )
-		v4l? ( media-libs/libv4l:0 )
-		vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] )
-		vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
-		vdpau? ( >=x11-libs/libvdpau-0.6:0 !<media-video/libav-10_beta1 )
-		vorbis? ( media-libs/libvorbis:0 )
-		X? ( x11-libs/libX11:0 )
-		x264? ( >=media-libs/x264-0.0.20090923:0= )
-		xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 )
-		xml? ( dev-libs/libxml2:2 )
-		zvbi? ( >=media-libs/zvbi-0.2.25:0 )
-"
-
-DEPEND="${RDEPEND}
-	kde? ( >=kde-base/kdelibs-4:4 )
-	xcb? ( x11-proto/xproto:0 )
-	app-arch/xz-utils:0
-	>=sys-devel/gettext-0.18.3:*
-	virtual/pkgconfig:*
-"
-
-REQUIRED_USE="
-	aalib? ( X )
-	bidi? ( truetype )
-	cddb? ( cdda )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	egl? ( X )
-	ffmpeg? ( avcodec avformat swscale postproc )
-	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
-	httpd? ( lua )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	qt4? ( X !qt5 )
-	qt5? ( X !qt4 )
-	sdl? ( X )
-	skins? ( truetype X ^^ ( qt4 qt5 ) )
-	vaapi? ( avcodec X )
-	vlm? ( encode )
-	xv? ( xcb )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
-		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
-			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
-		fi
-	fi
-}
-
-src_unpack() {
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Support for Qt5.
-	if use qt5 ; then
-		export UIC="/usr/lib64/qt5/bin/uic"
-		export MOC="/usr/lib64/qt5/bin/moc"
-	fi
-
-	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
-	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
-	#
-	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
-	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
-	#
-	# http://gcc.gnu.org/c99status.html
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
-		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
-	fi
-
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
-	# Bootstrap when we are on a git checkout.
-	if [[ "${PV%9999}" != "${PV}" ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Patch up incompatibilities and reconfigure autotools.
-	epatch "${FILESDIR}"/${PN}-2.1.0-newer-rdp.patch
-	epatch "${FILESDIR}"/${PN}-2.1.0-libva-1.2.1-compat.patch
-
-	# Fix up broken audio; first is a fixed reversed bisected commit, latter two are backported.
-	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
-	epatch "${FILESDIR}"/${PN}-2.1.0-avcodec-check-update-buffered_time-earlier-so-we-sho.patch
-	epatch "${FILESDIR}"/${PN}-2.1.0-transcode-don-t-check-drift-if-we-have-VLC_TS_INVALI.patch
-
-	# Disable avcodec checks when avcodec is not used.
-	sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	# Needs libresid-builder from libsidplay:2 which is in another directory...
-	# FIXME!
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use truetype || use projectm ; then
-		local dejavu="/usr/share/fonts/dejavu/"
-		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
-				--with-default-font-family=Sans \
-				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-				--with-default-monospace-font-family=Monospace"
-	fi
-
-	local qt_flag=""
-	if use qt4 || use qt5 ; then
-		qt_flag="--enable-qt"
-	fi
-
-	econf \
-		${myconf} \
-		--enable-vlc \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-optimizations \
-		--disable-update-check \
-		--enable-fast-install \
-		--enable-screen \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable atmo) \
-		$(use_enable audioqueue) \
-		$(use_enable avahi bonjour) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cdda vcd) \
-		$(use_enable cddb libcddb) \
-		$(use_enable chromaprint) \
-		$(use_enable dbus) \
-		$(use_enable dirac) \
-		$(use_enable directfb) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable egl) \
-		$(use_enable encode sout) \
-		$(use_enable faad) \
-		$(use_enable fdk fdkaac) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable growl) \
-		$(use_enable httpd) \
-		$(use_enable ieee1394 dv1394) \
-		$(use_enable ios-vout) \
-		$(use_enable jack) \
-		$(use_enable kate) \
-		$(use_with kde kde-solid) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-audio) \
-		$(use_enable macosx-dialog-provider) \
-		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable macosx-quartztext) \
-		$(use_enable macosx-vout) \
-		$(use_enable matroska mkv) \
-		$(use_enable mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) $(use_enable ogg mux_ogg) \
-		$(use_enable omxil) \
-		$(use_enable opencv) \
-		$(use_enable opengl glx) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable png) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		${qt_flag} \
-		$(use_enable rdp libfreerdp) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smbclient) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable sid) \
-		$(use_enable sftp) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable sse) \
-		$(use_enable svg) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable tremor) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcdx) \
-		$(use_enable vdpau) \
-		$(use_enable vlm) \
-		$(use_enable vorbis) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xv xvideo) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-crystalhd \
-		--disable-decklink \
-		--disable-goom \
-		--disable-kai \
-		--disable-kva \
-		--disable-oss \
-		--disable-quicksync \
-		--disable-shine \
-		--disable-sndio \
-		--disable-vda \
-		--disable-vsxu
-
-		# ^ We don't have these disables libraries in the Portage tree yet.
-}
-
-src_test() {
-	Xemake check-TESTS
-}
-
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
-
-src_install() {
-	default
-
-	# Punt useless libtool's .la files
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-}
diff --git a/media-video/vlc/vlc-2.1.2.ebuild b/media-video/vlc/vlc-2.1.2.ebuild
index 0211b96ed2e5..c321028ac95f 100644
--- a/media-video/vlc/vlc-2.1.2.ebuild
+++ b/media-video/vlc/vlc-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.13 2014/09/10 22:06:30 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.14 2014/11/10 08:42:52 dlan Exp $
 
 EAPI="5"
 
@@ -186,7 +186,7 @@ REQUIRED_USE="
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
+	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
 		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
 			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
 		fi
@@ -241,7 +241,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
 
 	# Disable avcodec checks when avcodec is not used.
-	sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
+	if ! use avcodec; then
+		sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
+	fi
 
 	# Don't use --started-from-file when not using dbus.
 	if ! use dbus ; then
diff --git a/media-video/vlc/vlc-2.1.4.ebuild b/media-video/vlc/vlc-2.1.4.ebuild
index 992bd1ec45cf..514caf3c1632 100644
--- a/media-video/vlc/vlc-2.1.4.ebuild
+++ b/media-video/vlc/vlc-2.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.8 2014/09/10 22:06:30 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.9 2014/11/10 08:42:52 dlan Exp $
 
 EAPI="5"
 
@@ -187,7 +187,7 @@ REQUIRED_USE="
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
+	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
 		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
 			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
 		fi
@@ -242,7 +242,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
 
 	# Disable avcodec checks when avcodec is not used.
-	sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
+	if ! use avcodec; then
+		sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
+	fi
 
 	# Don't use --started-from-file when not using dbus.
 	if ! use dbus ; then
diff --git a/media-video/vlc/vlc-2.1.5.ebuild b/media-video/vlc/vlc-2.1.5.ebuild
index 24263b5c87b1..2729fa30f455 100644
--- a/media-video/vlc/vlc-2.1.5.ebuild
+++ b/media-video/vlc/vlc-2.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.1 2014/09/17 21:39:20 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.2 2014/11/10 08:42:52 dlan Exp $
 
 EAPI="5"
 
@@ -187,7 +187,7 @@ REQUIRED_USE="
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
+	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
 		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
 			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
 		fi
@@ -250,7 +250,9 @@ src_prepare() {
 	fi
 
 	# Disable a bogus check
-	sed -i "s:libavcodec < 56:libavcodec < 57:g" configure.ac || die
+	if ! use avcodec; then
+		sed -i "s:libavcodec < 56:libavcodec < 57:g" configure.ac || die
+	fi
 
 	eautoreconf
 
diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild
index 1ac35dc791a4..1ce6b7d7c8dd 100644
--- a/media-video/vlc/vlc-2.1.9999.ebuild
+++ b/media-video/vlc/vlc-2.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.23 2014/09/10 22:06:30 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.24 2014/11/10 08:42:52 dlan Exp $
 
 EAPI="5"
 
@@ -187,7 +187,7 @@ REQUIRED_USE="
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
+	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
 		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
 			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
 		fi
@@ -242,7 +242,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
 
 	# Disable avcodec checks when avcodec is not used.
-	sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
+	if ! use avcodec; then
+		sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
+	fi
 
 	# Don't use --started-from-file when not using dbus.
 	if ! use dbus ; then
diff --git a/media-video/vlc/vlc-2.1.1.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 3e8a42aaf3cf..567278cc944d 100644
--- a/media-video/vlc/vlc-2.1.1.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.1.ebuild,v 1.9 2014/09/02 07:41:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v 1.1 2014/11/10 08:42:52 dlan Exp $
 
 EAPI="5"
 
@@ -32,7 +32,7 @@ else
 fi
 
 LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/core7.0.0-vlc5.4.0"
+SLOT="0/5-7" # vlc - vlccore
 
 if [ "${PV%9999}" = "${PV}" ] ; then
 	KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~amd64-fbsd ~x86-fbsd"
@@ -41,18 +41,18 @@ else
 fi
 
 IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
-	+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug dirac
-	directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode faad fdk
+	+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
+	directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
 	fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
-	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
-	libsamplerate libtiger linsys libtar lirc live lua +macosx
-	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
-	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
+	growl httpd ieee1394 jack jpeg kate kde libass libcaca libnotify
+	libsamplerate libtiger linsys libtar lirc live lua
+	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
+	matroska media-library mmx modplug mp3 mpeg
 	mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
 	png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
 	schroedinger sdl sdl-image sftp shout sid skins speex sse svg +swscale
 	taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
-	vlm vorbis wma-fixed +X x264 +xcb xml xv zvbi"
+	vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi"
 
 RDEPEND="
 		!<media-video/ffmpeg-1.2:0
@@ -67,31 +67,29 @@ RDEPEND="
 		avcodec? ( virtual/ffmpeg:0 )
 		avformat? ( virtual/ffmpeg:0 )
 		bidi? ( >=dev-libs/fribidi-0.10.4:0 )
-		bluray? ( >=media-libs/libbluray-0.2.1:0 )
-		cddb? ( >=media-libs/libcddb-1.2.0:0 )
+		bluray? ( >=media-libs/libbluray-0.3:0 )
+		cddb? ( >=media-libs/libcddb-1.2:0 )
 		chromaprint? ( >=media-libs/chromaprint-0.6:0 )
-		dbus? ( >=sys-apps/dbus-1.0.2:0 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1.0:2 )
-		dirac? ( >=media-video/dirac-0.10.0:0 )
+		dbus? ( >=sys-apps/dbus-1.6:0 )
+		dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
 		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
-		dts? ( media-libs/libdca:0 )
+		dts? ( >=media-libs/libdca-0.0.5:0 )
 		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 )
-		dvd? ( media-libs/libdvdread:0 >=media-libs/libdvdnav-0.1.9:0 )
-		egl? ( virtual/opengl:0 )
+		dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.2.1:0 )
 		elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
 		faad? ( >=media-libs/faad2-2.6.1:0 )
 		fdk? ( media-libs/fdk-aac:0 )
-		flac? ( media-libs/libogg:0 >=media-libs/flac-1.1.2:0 )
+		flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
 		fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
 		fontconfig? ( media-libs/fontconfig:1.0 )
-		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0 )
+		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
 		gme? ( media-libs/game-music-emu:0 )
 		gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
 		gnutls? ( >=net-libs/gnutls-3.0.20:0 )
 		ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
-		ios-vout? ( virtual/opengl:0 )
 		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
-		kate? ( >=media-libs/libkate-0.3.0:0 )
+		jpeg? ( virtual/jpeg:0 )
+		kate? ( >=media-libs/libkate-0.3:0 )
 		libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
 		libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
 		libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
@@ -102,37 +100,36 @@ RDEPEND="
 		lirc? ( app-misc/lirc:0 )
 		live? ( >=media-plugins/live-2011.12.23:0 )
 		lua? ( >=dev-lang/lua-5.1:0 )
-		macosx-vout? ( virtual/opengl:0 )
-		matroska? (	>=dev-libs/libebml-1.0.0:0= >=media-libs/libmatroska-1.0.0:0= )
-		modplug? ( >=media-libs/libmodplug-0.8.8.1:0 )
+		matroska? (	>=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
+		modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
 		mp3? ( media-libs/libmad:0 )
 		mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-		mtp? ( >=media-libs/libmtp-1.0.0:0 )
+		mtp? ( >=media-libs/libmtp-1:0 )
 		musepack? ( >=media-sound/musepack-tools-444:0 )
 		ncurses? ( sys-libs/ncurses:5[unicode] )
-		ogg? ( media-libs/libogg:0 )
-		opencv? ( >media-libs/opencv-2.0:0 )
+		ogg? ( >=media-libs/libogg-1:0 )
+		opencv? ( >media-libs/opencv-2:0 )
 		opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
 		opus? ( >=media-libs/opus-1.0.3:0 )
 		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
-		postproc? ( || ( media-libs/libpostproc:0 >=media-video/ffmpeg-1.2:0 ) )
+		postproc? ( || ( >=media-video/ffmpeg-1.2:0 media-libs/libpostproc:0 ) )
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
-		qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )
-		qt5? ( >=dev-qt/qtgui-5.1.0:5 >=dev-qt/qtcore-5.1.0:5 dev-qt/qtwidgets:5 )
-		rdp? ( net-misc/freerdp:0= )
-		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
+		pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+		qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 )
+		qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 dev-qt/qtwidgets:5 )
+		rdp? ( >=net-misc/freerdp-1.0.1:0= )
+		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
 		sdl? ( >=media-libs/libsdl-1.2.10:0
 			sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
 		sftp? ( net-libs/libssh2:0 )
-		shout? ( media-libs/libshout:0 )
+		shout? ( >=media-libs/libshout-2.1:0 )
 		sid? ( media-libs/libsidplay:2 )
 		skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
 		speex? ( media-libs/speex:0 )
-		svg? ( >=gnome-base/librsvg-2.9.0:2 )
+		svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
 		swscale? ( virtual/ffmpeg:0 )
-		taglib? ( >=media-libs/taglib-1.6.1:0 sys-libs/zlib:0 )
+		taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
 		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
 		tremor? ( media-libs/tremor:0 )
 		truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
@@ -142,13 +139,26 @@ RDEPEND="
 		upnp? ( net-libs/libupnp:0 )
 		v4l? ( media-libs/libv4l:0 )
 		vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] )
-		vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
-		vdpau? ( >=x11-libs/libvdpau-0.6:0 !<media-video/libav-10_beta1 )
-		vorbis? ( media-libs/libvorbis:0 )
+		vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )"
+
+# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
+# thus we'll have to wait for a new release there.
+RDEPEND="${RDEPEND}
+		vdpau? (
+			>=x11-libs/libvdpau-0.6:0
+			|| (
+				>=media-video/ffmpeg-1.2:0=
+				>=media-video/libav-10:0=
+			)
+		)
+		vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+		vorbis? ( >=media-libs/libvorbis-1.1:0 )
+		vpx? ( media-libs/libvpx:0 )
 		X? ( x11-libs/libX11:0 )
 		x264? ( >=media-libs/x264-0.0.20090923:0= )
+		x264? ( media-libs/x265:0= )
 		xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 )
-		xml? ( dev-libs/libxml2:2 )
+		xml? ( >=dev-libs/libxml2-2.5:2 )
 		zvbi? ( >=media-libs/zvbi-0.2.25:0 )
 "
 
@@ -156,6 +166,7 @@ DEPEND="${RDEPEND}
 	kde? ( >=kde-base/kdelibs-4:4 )
 	xcb? ( x11-proto/xproto:0 )
 	app-arch/xz-utils:0
+	dev-lang/yasm:*
 	>=sys-devel/gettext-0.18.3:*
 	virtual/pkgconfig:*
 "
@@ -166,7 +177,6 @@ REQUIRED_USE="
 	cddb? ( cdda )
 	dvb? ( dvbpsi )
 	dxva2? ( avcodec )
-	egl? ( X )
 	ffmpeg? ( avcodec avformat swscale postproc )
 	fontconfig? ( truetype )
 	gnutls? ( gcrypt )
@@ -186,7 +196,7 @@ REQUIRED_USE="
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
+	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
 		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
 			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
 		fi
@@ -202,12 +212,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Support for Qt5.
-	if use qt5 ; then
-		export UIC="/usr/lib64/qt5/bin/uic"
-		export MOC="/usr/lib64/qt5/bin/moc"
-	fi
-
 	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
 	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
 	#
@@ -233,20 +237,24 @@ src_prepare() {
 	# We are not in a real git checkout due to the absence of a .git directory.
 	touch src/revision.txt || die
 
+	# Fix build system mistake.
+	epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
+
 	# Patch up incompatibilities and reconfigure autotools.
-	epatch "${FILESDIR}"/${PN}-2.1.0-newer-rdp.patch
-	epatch "${FILESDIR}"/${PN}-2.1.0-libva-1.2.1-compat.patch
+	epatch "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
 
-	# Fix up broken audio; first is a fixed reversed bisected commit, latter two are backported.
+	# Fix up broken audio when skipping using a fixed reversed bisected commit.
 	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
 
-	# Support for freetype-2.5.1.
-	if has_version '>=media-libs/freetype-2.5.1' ; then
-		epatch "${FILESDIR}"/${P}-freetype-2.5.1-support.patch
+	# Disable avcodec checks when avcodec is not used.
+	if ! use avcodec; then
+		sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
 	fi
 
-	# Disable avcodec checks when avcodec is not used.
-	sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
 
 	eautoreconf
 
@@ -299,7 +307,6 @@ src_configure() {
 		$(use_enable cddb libcddb) \
 		$(use_enable chromaprint) \
 		$(use_enable dbus) \
-		$(use_enable dirac) \
 		$(use_enable directfb) \
 		$(use_enable directx) \
 		$(use_enable dc1394) \
@@ -308,7 +315,6 @@ src_configure() {
 		$(use_enable dvbpsi) \
 		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
 		$(use_enable dxva2) \
-		$(use_enable egl) \
 		$(use_enable encode sout) \
 		$(use_enable faad) \
 		$(use_enable fdk fdkaac) \
@@ -322,8 +328,8 @@ src_configure() {
 		$(use_enable growl) \
 		$(use_enable httpd) \
 		$(use_enable ieee1394 dv1394) \
-		$(use_enable ios-vout) \
 		$(use_enable jack) \
+		$(use_enable jpeg) \
 		$(use_enable kate) \
 		$(use_with kde kde-solid) \
 		$(use_enable libass) \
@@ -336,12 +342,10 @@ src_configure() {
 		$(use_enable lirc) \
 		$(use_enable live live555) \
 		$(use_enable lua) \
-		$(use_enable macosx-audio) \
 		$(use_enable macosx-dialog-provider) \
 		$(use_enable macosx-eyetv) \
 		$(use_enable macosx-qtkit) \
 		$(use_enable macosx-quartztext) \
-		$(use_enable macosx-vout) \
 		$(use_enable matroska mkv) \
 		$(use_enable mmx) \
 		$(use_enable modplug mod) \
@@ -353,8 +357,9 @@ src_configure() {
 		$(use_enable neon) \
 		$(use_enable ogg) $(use_enable ogg mux_ogg) \
 		$(use_enable omxil) \
+		$(use_enable omxil omxil-vout) \
 		$(use_enable opencv) \
-		$(use_enable opengl glx) \
+		$(use_enable opengl glx) $(use_enable opengl glspectrum) \
 		$(use_enable opus) \
 		$(use_enable optimisememory optimize-memory) \
 		$(use_enable png) \
@@ -362,7 +367,7 @@ src_configure() {
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
 		${qt_flag} \
-		$(use_enable rdp libfreerdp) \
+		$(use_enable rdp freerdp) \
 		$(use_enable rtsp realrtsp) \
 		$(use_enable run-as-root) \
 		$(use_enable samba smbclient) \
@@ -376,6 +381,7 @@ src_configure() {
 		$(use_enable speex) \
 		$(use_enable sse) \
 		$(use_enable svg) \
+		$(use_enable svg svgdec) \
 		$(use_enable swscale) \
 		$(use_enable taglib) \
 		$(use_enable theora) \
@@ -389,27 +395,43 @@ src_configure() {
 		$(use_enable vcdx) \
 		$(use_enable vdpau) \
 		$(use_enable vlm) \
+		$(use_enable vnc) \
 		$(use_enable vorbis) \
+		$(use_enable vpx) \
 		$(use_enable wma-fixed) \
 		$(use_with X x) \
 		$(use_enable x264) \
+		$(use_enable x265) \
 		$(use_enable xcb) \
 		$(use_enable xml libxml2) \
 		$(use_enable xv xvideo) \
 		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-asdcp \
+		--disable-coverage \
+		--disable-cprof \
 		--disable-crystalhd \
 		--disable-decklink \
+		--disable-gles1 \
+		--disable-gles2 \
 		--disable-goom \
 		--disable-kai \
 		--disable-kva \
+		--disable-maintainer-mode \
+		--disable-merge-ffmpeg \
+		--disable-mfx \
+		--disable-mmal-codec \
+		--disable-mmal-vout \
+		--disable-opensles \
 		--disable-oss \
-		--disable-quicksync \
+		--disable-quicktime \
+		--disable-rpi-omxil \
 		--disable-shine \
 		--disable-sndio \
 		--disable-vda \
-		--disable-vsxu
+		--disable-vsxu \
+		--disable-wasapi
 
-		# ^ We don't have these disables libraries in the Portage tree yet.
+		# ^ We don't have these disabled libraries in the Portage tree yet.
 }
 
 src_test() {
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 8524121706c1..48c24c254158 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.224 2014/09/10 22:06:30 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.225 2014/11/10 08:42:52 dlan Exp $
 
 EAPI="5"
 
@@ -52,7 +52,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
 	png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
 	schroedinger sdl sdl-image sftp shout sid skins speex sse svg +swscale
 	taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
-	vlm vnc vorbis vpx wma-fixed +X x264 +xcb xml xv zvbi"
+	vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi"
 
 RDEPEND="
 		!<media-video/ffmpeg-1.2:0
@@ -75,7 +75,7 @@ RDEPEND="
 		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
 		dts? ( >=media-libs/libdca-0.0.5:0 )
 		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 )
-		dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.2.1:0 )
+		dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9.0:0 )
 		elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
 		faad? ( >=media-libs/faad2-2.6.1:0 )
 		fdk? ( media-libs/fdk-aac:0 )
@@ -156,6 +156,7 @@ RDEPEND="${RDEPEND}
 		vpx? ( media-libs/libvpx:0 )
 		X? ( x11-libs/libX11:0 )
 		x264? ( >=media-libs/x264-0.0.20090923:0= )
+		x265? ( media-libs/x265:0= )
 		xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 )
 		xml? ( >=dev-libs/libxml2-2.5:2 )
 		zvbi? ( >=media-libs/zvbi-0.2.25:0 )
@@ -166,7 +167,7 @@ DEPEND="${RDEPEND}
 	xcb? ( x11-proto/xproto:0 )
 	app-arch/xz-utils:0
 	dev-lang/yasm:*
-	>=sys-devel/gettext-0.18.3:*
+	>=sys-devel/gettext-0.19.2:*
 	virtual/pkgconfig:*
 "
 
@@ -195,7 +196,7 @@ REQUIRED_USE="
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
+	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
 		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
 			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
 		fi
@@ -246,7 +247,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
 
 	# Disable avcodec checks when avcodec is not used.
-	sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
+	if ! use avcodec; then
+		sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
+	fi
 
 	# Don't use --started-from-file when not using dbus.
 	if ! use dbus ; then
@@ -401,6 +404,7 @@ src_configure() {
 		$(use_enable xcb) \
 		$(use_enable xml libxml2) \
 		$(use_enable xv xvideo) \
+		$(use_enable x265) \
 		$(use_enable zvbi) $(use_enable !zvbi telx) \
 		--disable-asdcp \
 		--disable-coverage \
@@ -423,7 +427,6 @@ src_configure() {
 		--disable-rpi-omxil \
 		--disable-shine \
 		--disable-sndio \
-		--disable-x265 \
 		--disable-vda \
 		--disable-vsxu \
 		--disable-wasapi