media-video/vlc: revbump/merge; best->native

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

7 files changed, 169 insertions, 483 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index fb1a7ad..b9d954b 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,111 @@
 # 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.882 2014/01/14 21:31:21 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.903 2014/05/31 14:45:22 tomwij Exp $
+
+  31 May 2014; Tom Wijsman <TomWij@gentoo.org> vlc-9999.ebuild:
+  Remove Qt5 MOC/UIC export code from live version, as it is automatically
+  detected by autoconf; fixes bug #511776, reported by Uwe L. Korn (uwelk).
+
+  25 Apr 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/vlc-2.0.7-include-flac-1.3.x-support.patch, vlc-2.0.5.ebuild,
+  vlc-2.0.7.ebuild:
+  Backport FLAC 1.3.x support patch to 2.0.5 and 2.0.7, pointed out by monkeh;
+  fixes bug #471936, reported by Alphat-PC, tested by Zero_Chaos.
+
+  23 Apr 2014; Tom Wijsman <TomWij@gentoo.org> vlc-9999.ebuild:
+  Reviewed dependencies of 9999 ebuild according to configure.ac; fixes bug
+  #507424, reported by Uwe L. Korn (uwelk).
+
+  26 Mar 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.8.ebuild,
+  vlc-2.1.4.ebuild, vlc-2.1.9999.ebuild, vlc-9999.ebuild:
+  Remove temporary -fPIC per ssuominen's comments in bug #502394.
+
+  26 Mar 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.8.ebuild,
+  vlc-2.1.4.ebuild, vlc-2.1.9999.ebuild, vlc-9999.ebuild:
+  Append -fPIC temporarily for bug #502394, reported by Marcin Mirosław.
+
+  26 Mar 2014; Tom Wijsman <TomWij@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:
+  Restrict freetype version on older versions of vlc; fixes bug #505266,
+  reported by Phil Stracchino (alaric).
+
+  26 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/vlc-9999-libva-1.2.1-compat.patch, vlc-9999.ebuild:
+  Update libva 1.2.1 compatibility patch for live version; fixes bug #505586,
+  reported by jospezial.
+
+  19 Mar 2014; Tom Wijsman <TomWij@gentoo.org> vlc-9999.ebuild:
+  Temporarly block non-live FFMPEG versions in live VLC with USE flag vdpau;
+  fixes bug #503168, reported by jospezial.
+
+  19 Mar 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.9.ebuild:
+  Adjust upper bound of dvbpsi dependency on vlc 2.0.9; fixes bug #504738,
+  reported by Maciej Piechotka. Users that need a higher version of libdvbpsi
+  are suggested to use a different vlc version.
+
+  12 Mar 2014; Tom Wijsman <TomWij@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.9999.ebuild, vlc-9999.ebuild:
+  Removed newer rdp patch from 9999 as it has been patched upstream. Fixes bug
+  #503464, reported by David Heidelberger (okias). Updated SLOT dependencies per
+  consensus with ssuominen.
+
+  10 Mar 2014; Samuli Suominen <ssuominen@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.9999.ebuild, vlc-9999.ebuild:
+  Remove bogus SLOT dependencies from gettext, pkg-config and yasm.
+
+  01 Mar 2014; Michał Górny <mgorny@gentoo.org> vlc-2.0.5.ebuild,
+  vlc-2.0.7.ebuild:
+  Update libgcrypt dep to use slot :0.
+
+  23 Feb 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.1.0.ebuild,
+  vlc-2.1.1.ebuild, vlc-2.1.2.ebuild, vlc-2.1.4.ebuild, vlc-2.1.9999.ebuild,
+  vlc-9999.ebuild:
+  Adjust vdpau USE flag libav blocker to match libavcodec requirement in
+  configure script; fixes bug #489606, reported by Nikolaj Sjujskij.
+
+*vlc-2.1.4 (22 Feb 2014)
+
+  22 Feb 2014; Tom Wijsman <TomWij@gentoo.org> +vlc-2.1.4.ebuild,
+  vlc-2.1.9999.ebuild, vlc-9999.ebuild:
+  There is no opengles in Portage yet; and thus, disabled GLES support until
+  there is. Dropped amd64-fbsd temporarily due to libvncserver dependency.
+  Version bump to 2.1.4; fixes bug #500678, reported (and tested) by Frank
+  Krömmelbein.
+
+  22 Feb 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml, vlc-9999.ebuild:
+  Update description of USE flag xcb with explanation that it is needed in order
+  to display video; fixes bug #492548, reported by YumekuiNeru.
+
+  22 Feb 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.8.ebuild,
+  vlc-2.0.8a.ebuild, vlc-2.0.9.ebuild, vlc-2.0.9999.ebuild, vlc-9999.ebuild:
+  Enable qt4 by default on the 2.0 ebuilds that didn't have it as the default;
+  fixes bug #473614, reported by Pacho Ramos.
+
+  22 Feb 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
+  Clarify USE flag upnp; fixes bug #447252, reported by mgorny.
+
+  21 Feb 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.1.9999.ebuild,
+  vlc-9999.ebuild:
+  Backport the 9999 fixes that still apply to the 2.1.9999 branch, preparing for
+  the 2.1.3 version bump.
+
+  20 Feb 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml, vlc-9999.ebuild:
+  Preparation for version bump by updating 9999 ebuild, small USE flag and
+  medium configure parameter changes.
+
+  30 Jan 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.8.ebuild,
+  vlc-2.0.8a.ebuild, vlc-2.0.9.ebuild, vlc-2.1.0.ebuild, vlc-2.1.1.ebuild,
+  vlc-2.1.2.ebuild:
+  Further corrected libintl dependencies, suggested by Nikoli.
+
+  30 Jan 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.9999.ebuild,
+  vlc-2.1.9999.ebuild, vlc-9999.ebuild:
+  Corrected libintl dependencies, suggested by Nikoli.
 
   14 Jan 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Simplified USE flag description of qt4, per desultory's request.
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 19b07c9..ab4b844 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,3 +1,4 @@
+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
@@ -8,10 +9,9 @@ AUX vlc-2.1.0-newer-rdp.patch 2133 SHA256 597549a7cae76998cb40871c6e5e3a11d2aeaa
 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-2.1.2-qt-mkdir-kludge.patch 1493 SHA256 0ff636da209e7c2fe811ebc613a9fd6ad63f7c4ae0c064054e5755691b9108a3 SHA512 d24b19261c44cfc8ded74d098da37b599cc0286ad5b8d780cfdc9c124ada884dc39d25687e57f46c9f034763fc53e131564e8364dc0bb307d69f5450b9833646 WHIRLPOOL 31df283e5a01e94f9f5e4ed95d5f5469df345970715f830620b752c9ba2ce8642994e4f9da8d869f6710d805700514dad41b097b55b56a29d687cb4e643b0274
-DIST vlc-2.1.2.tar.xz 19609868 SHA256 219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4 SHA512 24ea51befb30ec2e4f796866bf086d36e809cb97bf04203a4637518c91a3035fa38a8e778aaf6fb3481db49d19236ae88bcbf31e1e4f7ae79b9d7bcc3cf037af WHIRLPOOL 7e4576370ea4a0d74d29b936f7c554c4fa22ca6b5d9260ce76d0e2bddf50826a2472c77746de61c81bd4601bead49f85c5c76a2f7ca309601c7a684c7091d09a
+AUX vlc-9999-libva-1.2.1-compat.patch 291 SHA256 54eb34b32afe6876fa40abac2cb97097030f1d372bb81b63ef88231a17e5f237 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968 WHIRLPOOL df5cfdb4ba36ccd92e79de7b913b14c5416aca0834025dc51f8178db6c88f5eecb332ae7096800607d6f7526a56c7fb94e2f593bc0c0e19f643428bcd3eb5868
 DIST vlc-2.1.4.tar.xz 19560884 SHA256 3e566c7525478167e18cc53dc75d621e4af91eb40aabb6231e47db25d682d5d3 SHA512 da09744d0da1742a89747a34f749b83a30b18ddfc84ed9ee1a59a1c16cfa4ce0e7d4ddd66e9dfd13d5309b7ff66f72a7d3b2c3837ec740a193656ce6f8b04845 WHIRLPOOL 4929a66f4f1afc44726bb2d88e2e5e9b770811f57d21ee2258ccf84d7f5997c29b5b07bbb41cfc165b78339e4b070eadd5be958059f68d8f6e57b565eb977396
-EBUILD vlc-2.1.2-r1.ebuild 17094 SHA256 7b198c81dd522951ac45c6ff185923e64fa28e5bc44a96b59c066c660d2b8539 SHA512 14dd0f51d1dab086ead3c9957297b7a8c34b15509cb0328887ae119dfe25d747d068770db5e7243c5b8f020eb4d0e93365b29311a97599cf32e21c0216515a82 WHIRLPOOL 837cefebef2e89d2ea0e34ce75f1a9484fd4188605169c29ff80f2fc6d18d9859da1d9daf3967e1c141ee4ddecaf4138826bbf15c8871910bdb266633d88e34d
-EBUILD vlc-2.1.4-r1.ebuild 17525 SHA256 50e127aac3119fcbcb9b4f091aae0092979f66a46fe089f89bd22751ba6c9d50 SHA512 dd5acc847f8e9acd8a201f8ce114c1279361db97c8756f3e357c83b90eff901b6ba5c7af6e8c81233a5fffb47bc9045fa2c1d19afe1b161bf1d701d9d448fa3e WHIRLPOOL 879478aa9459e0b540ec118a33660abaa937adda8c607bc4f92d81c44921b7427ddf3fb794f3598c1545eb3cd5f68f9e97db9add12cb3e26f7ed07b58e1410f7
-MISC ChangeLog 22298 SHA256 9e00bed3496715272c730d772ab2ec4f1a2e8f215152dbfb7d9a2cc71ec47a1a SHA512 2cd1e2621c72749367b21edb9612eeda0cd899154a2ef24e312e60c011efff8e4598b61578abf05d15296c2dbb7869dc5e4e1301e501e12d0be5de6eca6694b8 WHIRLPOOL 9c34fb4282e2b0df9bdbd28422018b0207609d8c29217eb48157f99416d2cd43b25aed7a82a139dd79dfee37b0896f14f9c250f8576f65a22c50eb5a99e63b53
+EBUILD vlc-2.1.4-r1.ebuild 17544 SHA256 3dee2fe8a0b244a3b2059b08256228b1904a135a49045899044310c151721bd8 SHA512 7ea88a928f01a07237949a1a843a9e0dfd7b26ce60f8618f15f03e4fd1e69362932c16a7fdbaaa127fad3721668412b6d00270d0889113ab0e1ead9286bad963 WHIRLPOOL d2b399053379ba726358bd576c68054739f192dad29e991cabe71e72bac84d981eac52c3310e45eccb55955cddd7106acee7f4df45b4dd8e5002558c09f8a421
+MISC ChangeLog 27347 SHA256 e507bc189ed363c4ad977d8d6588ca2f944560be60199b31e53af36f411df452 SHA512 d79bddc1ae663eba0d1d2aadc144cd94542a138fda14dc7a4e62cb3409ee13d9de181c260093279cdd38ae976a11461668316842398bd6246bf9bbef3f1e6249 WHIRLPOOL 0841b7bd853eb663f521c5130c9586bb0f162c6a5c79e3ad75a37a7f0e5ba50772baedac5bba47dcf72f1f5eb4c34e403f27aa5f5d36aafe82bed47805f16cb8
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
-MISC metadata.xml 6844 SHA256 a3811bd21c177f53d9355c64713de4745b21508bb67feba129b39316be67e985 SHA512 b464088eba743833a8b2c4b89bb6c5bd961dc0304acd2f0fe3c0f4c4a6b73187e24fb47655ebd0670d5fa6bd1dc1204477a755549ff73a321b84e99734e94b23 WHIRLPOOL 003aab808c9d364ae3c6e1d15f7fc40d46236087ae1177455957b1e265f7c60a98888d8121364b41e8ed7004299d9245337e0afab31dfbd0491c0a60ee05ccef
+MISC metadata.xml 7078 SHA256 06f15f0f664689d21c79529dcd73781bc7be5c087df60cb7512c634445ab62bd SHA512 0186ee55a67cc50a935a7fb39bcbc3119165f27c342bef97695262c6cebf05a792babd899a7933dc79e2255b01d26b9f737c1f55b2b329078edeac3ab4a57319 WHIRLPOOL 674a810ff112b97d341e2453d97d15f4e82bddbf83c61baa970e19ebdf45d3193bd7509f889fea72c309a64146c2879e1bedcb0f9d0b18a3c71fef3990b080c9
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
new file mode 100644
index 0000000..bbcd6df
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.0.7-include-flac-1.3.x-support.patch
@@ -0,0 +1,38 @@
+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-9999-libva-1.2.1-compat.patch b/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch
new file mode 100644
index 0000000..adfdefe
--- /dev/null
+++ b/media-video/vlc/files/vlc-9999-libva-1.2.1-compat.patch
@@ -0,0 +1,12 @@
+--- a/modules/codec/avcodec/vaapi.c
++++ b/modules/codec/avcodec/vaapi.c
+@@ -34,6 +34,9 @@
+ #ifdef VLC_VA_BACKEND_XLIB
+ # include <vlc_xlib.h>
+ # include <va/va_x11.h>
++#if VA_MINOR_VERSION >= 34
++# include <va/va_compat.h>
++#endif
+ #endif
+ #ifdef VLC_VA_BACKEND_DRM
+ # include <sys/types.h>
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 67711b9..b1a2ccb 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -69,7 +69,7 @@
 		<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 Intel UPnP stack.</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>
@@ -79,6 +79,7 @@
 		<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="zvbi">Enables support for teletext subtitles via the zvbi library.</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/vlc/vlc-2.1.2-r1.ebuild b/media-video/vlc/vlc-2.1.2-r1.ebuild
deleted file mode 100644
index 8dd8c90..0000000
--- a/media-video/vlc/vlc-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,470 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 eutils-multilib multilib autotools toolchain-funcs flag-o-matic virtualx multilib-minimal ${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/5-7" # vlc - vlccore
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64"
-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[${MULTILIB_USEDEP}]
-		net-dns/libidn:0[${MULTILIB_USEDEP}]
-		>=sys-devel/gettext-0.18.3:0[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.5.1-r2:0[minizip,${MULTILIB_USEDEP}]
-		a52? ( >=media-libs/a52dec-0.7.4-r3:0[${MULTILIB_USEDEP}] )
-		aalib? ( media-libs/aalib:0[${MULTILIB_USEDEP}] )
-		alsa? ( >=media-libs/alsa-lib-1.0.24:0[${MULTILIB_USEDEP}] )
-		avahi? ( >=net-dns/avahi-0.6:0[dbus,${MULTILIB_USEDEP}] )
-		avcodec? ( virtual/ffmpeg:0[${MULTILIB_USEDEP}] )
-		avformat? ( virtual/ffmpeg:0[${MULTILIB_USEDEP}] )
-		bidi? ( >=dev-libs/fribidi-0.10.4:0[${MULTILIB_USEDEP}] )
-		bluray? ( >=media-libs/libbluray-0.2.1:0[${MULTILIB_USEDEP}] )
-		cddb? ( >=media-libs/libcddb-1.2.0:0[${MULTILIB_USEDEP}] )
-		chromaprint? ( >=media-libs/chromaprint-0.6:0[${MULTILIB_USEDEP}] )
-		dbus? ( >=sys-apps/dbus-1.0.2:0[${MULTILIB_USEDEP}] )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1:0[${MULTILIB_USEDEP}] >=media-libs/libdc1394-2.1.0:2[${MULTILIB_USEDEP}] )
-		dirac? ( >=media-video/dirac-0.10.0:0[${MULTILIB_USEDEP}] )
-		directfb? ( dev-libs/DirectFB:0[${MULTILIB_USEDEP}] sys-libs/zlib:0[${MULTILIB_USEDEP}] )
-		dts? ( media-libs/libdca:0[${MULTILIB_USEDEP}] )
-		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0[${MULTILIB_USEDEP}] )
-		dvd? ( media-libs/libdvdread:0 >=media-libs/libdvdnav-0.1.9:0[${MULTILIB_USEDEP}] )
-		egl? ( virtual/opengl:0[${MULTILIB_USEDEP}] )
-		elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-		faad? ( >=media-libs/faad2-2.6.1:0[${MULTILIB_USEDEP}] )
-		fdk? ( media-libs/fdk-aac:0[${MULTILIB_USEDEP}] )
-		flac? ( media-libs/libogg:0 >=media-libs/flac-1.1.2:0[${MULTILIB_USEDEP}] )
-		fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0[${MULTILIB_USEDEP}] )
-		fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
-		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0[${MULTILIB_USEDEP}] )
-		gme? ( media-libs/game-music-emu:0[${MULTILIB_USEDEP}] )
-		gnome? ( gnome-base/gnome-vfs:2[${MULTILIB_USEDEP}] dev-libs/glib:2[${MULTILIB_USEDEP}] )
-		gnutls? ( >=net-libs/gnutls-3.0.20:0[${MULTILIB_USEDEP}] )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1:0[${MULTILIB_USEDEP}] >=sys-libs/libavc1394-0.5.3:0[${MULTILIB_USEDEP}] )
-		ios-vout? ( virtual/opengl:0[${MULTILIB_USEDEP}] )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0[${MULTILIB_USEDEP}] )
-		kate? ( >=media-libs/libkate-0.3.0:0[${MULTILIB_USEDEP}] )
-		libass? ( >=media-libs/libass-0.9.8:0[${MULTILIB_USEDEP}] media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
-		libcaca? ( >=media-libs/libcaca-0.99_beta14:0[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify:0[${MULTILIB_USEDEP}]
-			x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-			x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-			dev-libs/glib:2[${MULTILIB_USEDEP}] )
-		libsamplerate? ( media-libs/libsamplerate:0[${MULTILIB_USEDEP}] )
-		libtar? ( >=dev-libs/libtar-1.2.11-r3:0[${MULTILIB_USEDEP}] )
-		libtiger? ( >=media-libs/libtiger-0.3.1:0[${MULTILIB_USEDEP}] )
-		linsys? ( >=media-libs/zvbi-0.2.28:0[${MULTILIB_USEDEP}] )
-		lirc? ( app-misc/lirc:0[${MULTILIB_USEDEP}] )
-		live? ( >=media-plugins/live-2011.12.23:0[${MULTILIB_USEDEP}] )
-		lua? ( >=dev-lang/lua-5.1:0 )
-		macosx-vout? ( virtual/opengl:0[${MULTILIB_USEDEP}] )
-		matroska? (	>=dev-libs/libebml-1.0.0:0=[${MULTILIB_USEDEP}] >=media-libs/libmatroska-1.0.0:0=[${MULTILIB_USEDEP}] )
-		modplug? ( >=media-libs/libmodplug-0.8.8.1:0[${MULTILIB_USEDEP}] )
-		mp3? ( media-libs/libmad:0[${MULTILIB_USEDEP}] )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2:0[${MULTILIB_USEDEP}] )
-		mtp? ( >=media-libs/libmtp-1.0.0:0[${MULTILIB_USEDEP}] )
-		musepack? ( >=media-sound/musepack-tools-444:0[${MULTILIB_USEDEP}] )
-		ncurses? ( sys-libs/ncurses:5[unicode,${MULTILIB_USEDEP}] )
-		ogg? ( media-libs/libogg:0[${MULTILIB_USEDEP}] )
-		opencv? ( >media-libs/opencv-2.0:0[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl:0[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.3.99.901:0[${MULTILIB_USEDEP}] )
-		opus? ( >=media-libs/opus-1.0.3:0[${MULTILIB_USEDEP}] )
-		png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] sys-libs/zlib:0[${MULTILIB_USEDEP}] )
-		postproc? ( || ( media-libs/libpostproc:0[${MULTILIB_USEDEP}] >=media-video/ffmpeg-1.2:0=[${MULTILIB_USEDEP}] ) )
-		projectm? ( media-libs/libprojectm:0[${MULTILIB_USEDEP}] media-fonts/dejavu:0 )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0[${MULTILIB_USEDEP}] )
-		qt4? ( >=dev-qt/qtgui-4.6.0:4[${MULTILIB_USEDEP}] >=dev-qt/qtcore-4.6.0:4[${MULTILIB_USEDEP}] )
-		qt5? ( >=dev-qt/qtgui-5.1.0:5[${MULTILIB_USEDEP}]
-			>=dev-qt/qtcore-5.1.0:5[${MULTILIB_USEDEP}] dev-qt/qtwidgets:5[${MULTILIB_USEDEP}] )
-		rdp? ( net-misc/freerdp:0= )
-		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient,${MULTILIB_USEDEP}] >=net-fs/samba-4.0.0:0[client,${MULTILIB_USEDEP}] ) )
-		schroedinger? ( >=media-libs/schroedinger-1.0.10:0[${MULTILIB_USEDEP}] )
-		sdl? ( >=media-libs/libsdl-1.2.10:0[${MULTILIB_USEDEP}]
-			sdl-image? ( >=media-libs/sdl-image-1.2.10:0[${MULTILIB_USEDEP}] sys-libs/zlib:0[${MULTILIB_USEDEP}] ) )
-		sftp? ( net-libs/libssh2:0[${MULTILIB_USEDEP}] )
-		shout? ( media-libs/libshout:0[${MULTILIB_USEDEP}] )
-		sid? ( media-libs/libsidplay:2[${MULTILIB_USEDEP}] )
-		skins? ( x11-libs/libXext:0[${MULTILIB_USEDEP}]
-			x11-libs/libXpm:0[${MULTILIB_USEDEP}]
-			x11-libs/libXinerama:0[${MULTILIB_USEDEP}] )
-		speex? ( media-libs/speex:0[${MULTILIB_USEDEP}] )
-		svg? ( >=gnome-base/librsvg-2.9.0:2[${MULTILIB_USEDEP}] )
-		swscale? ( virtual/ffmpeg:0[${MULTILIB_USEDEP}] )
-		taglib? ( >=media-libs/taglib-1.6.1:0[${MULTILIB_USEDEP}] sys-libs/zlib:0[${MULTILIB_USEDEP}] )
-		theora? ( >=media-libs/libtheora-1.0_beta3:0[${MULTILIB_USEDEP}] )
-		tremor? ( media-libs/tremor:0[${MULTILIB_USEDEP}] )
-		truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] virtual/ttf-fonts:0
-			!fontconfig? ( media-fonts/dejavu:0 ) )
-		twolame? ( media-sound/twolame:0[${MULTILIB_USEDEP}] )
-		udev? ( >=virtual/udev-142:0[${MULTILIB_USEDEP}] )
-		upnp? ( net-libs/libupnp:0[${MULTILIB_USEDEP}] )
-		v4l? ( media-libs/libv4l:0[${MULTILIB_USEDEP}] )
-		vaapi? ( x11-libs/libva:0[${MULTILIB_USEDEP}] virtual/ffmpeg[vaapi,${MULTILIB_USEDEP}] )
-		vcdx? ( >=dev-libs/libcdio-0.78.2:0[${MULTILIB_USEDEP}] >=media-video/vcdimager-0.7.22:0[${MULTILIB_USEDEP}] )
-		vdpau? ( >=x11-libs/libvdpau-0.6:0[${MULTILIB_USEDEP}] !<media-video/libav-9.11 )
-		vorbis? ( media-libs/libvorbis:0[${MULTILIB_USEDEP}] )
-		X? ( x11-libs/libX11:0[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20090923:0=[${MULTILIB_USEDEP}] )
-		xcb? ( >=x11-libs/libxcb-1.6:0[${MULTILIB_USEDEP}]
-			>=x11-libs/xcb-util-0.3.4:0[${MULTILIB_USEDEP}]
-			>=x11-libs/xcb-util-keysyms-0.3.4:0[${MULTILIB_USEDEP}] )
-		xml? ( dev-libs/libxml2:2[${MULTILIB_USEDEP}] )
-		zvbi? ( >=media-libs/zvbi-0.2.25:0[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	kde? ( >=kde-base/kdelibs-4:4 )
-	xcb? ( x11-proto/xproto:0[${MULTILIB_USEDEP}] )
-	app-arch/xz-utils:0[${MULTILIB_USEDEP}]
-	virtual/pkgconfig:0
-"
-
-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}"
-
-MULTILIB_PARALLEL_PHASES="src_configure src_compile src_test"
-
-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
-	if use '!prefix' && use test; then
-		if ! has userpriv ${FEATURES}; then
-			ewarn
-			ewarn "The VLC testsuite cannot run as root and will therefore"
-			ewarn "be skipped.  Set FEATURES=userpriv if you want to test"
-			ewarn
-		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
-
-	# questionable out-of-tree build hack for qt missing target directories
-	epatch "${FILESDIR}"/${PN}-2.1.2-qt-mkdir-kludge.patch
-
-	# 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
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-multilib_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_SOURCE="${S}" 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_best_abi 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_best_abi 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_best_abi 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.
-}
-
-multilib_src_test() {
-	if use test; then
-		if (( $(id -u) )) ; then
-			Xemake check-TESTS PACKAGE_STRING="${P} (${ABI})"
-			cd test
-			Xmake check-TESTS
-		else
-			einfo
-			einfo "Skipping VLC test-suite because we are root"
-			einfo
-		fi
-	fi
-}
-
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
-
-multilib_src_install_all() {
-	dodoc ${DOCS}
-	# Punt useless libtool's .la files
-	find "${D}" -name '*.la' -delete
-}
-
-abi_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
-}
-
-pkg_postinst() {
-	multilib_foreach_abi abi_pkg_postinst
-}
diff --git a/media-video/vlc/vlc-2.1.4-r1.ebuild b/media-video/vlc/vlc-2.1.4-r1.ebuild
index 6eb8445..cd9fcf6 100644
--- a/media-video/vlc/vlc-2.1.4-r1.ebuild
+++ b/media-video/vlc/vlc-2.1.4-r1.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
 		opengl? ( virtual/opengl:0[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.3.99.901:0[${MULTILIB_USEDEP}] )
 		opus? ( >=media-libs/opus-1.0.3:0[${MULTILIB_USEDEP}] )
 		png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] sys-libs/zlib:0[${MULTILIB_USEDEP}] )
-		postproc? ( || ( >=media-video/ffmpeg-1.2.0:0[${MULTILIB_USEDEP}] media-libs/libpostproc:0[${MULTILIB_USEDEP}] ) )
+		postproc? ( || ( >=media-video/ffmpeg-1.2:0[${MULTILIB_USEDEP}] media-libs/libpostproc:0[${MULTILIB_USEDEP}] ) )
 		projectm? ( media-libs/libprojectm:0[${MULTILIB_USEDEP}] media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0[${MULTILIB_USEDEP}] )
 		qt4? ( >=dev-qt/qtgui-4.6.0:4[${MULTILIB_USEDEP}] >=dev-qt/qtcore-4.6.0:4[${MULTILIB_USEDEP}] )
@@ -165,8 +165,8 @@ DEPEND="${RDEPEND}
 	kde? ( >=kde-base/kdelibs-4:4 )
 	xcb? ( x11-proto/xproto:0[${MULTILIB_USEDEP}] )
 	app-arch/xz-utils:0[${MULTILIB_USEDEP}]
-	>=sys-devel/gettext-0.18.3:0[${MULTILIB_USEDEP}]
-	virtual/pkgconfig:0
+	>=sys-devel/gettext-0.18.3:*[${MULTILIB_USEDEP}]
+	virtual/pkgconfig:*
 "
 
 REQUIRED_USE="
@@ -348,7 +348,7 @@ multilib_src_configure() {
 		$(use_enable ios-vout ios-vout2) \
 		$(use_enable jack) \
 		$(use_enable kate) \
-		$(use_with_best_abi kde kde-solid) \
+		$(multilib_native_use_with kde kde-solid) \
 		$(use_enable libass) \
 		$(use_enable libcaca caca) \
 		$(use_enable libnotify notify) \
@@ -358,7 +358,7 @@ multilib_src_configure() {
 		$(use_enable linsys) \
 		$(use_enable lirc) \
 		$(use_enable live live555) \
-		$(use_enable_best_abi lua) \
+		$(multilib_native_use_enable lua) \
 		$(use_enable macosx-audio) \
 		$(use_enable macosx-dialog-provider) \
 		$(use_enable macosx-eyetv) \
@@ -386,7 +386,7 @@ multilib_src_configure() {
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
 		${qt_flag} \
-		$(use_enable_best_abi rdp libfreerdp) \
+		$(multilib_native_use_enable rdp libfreerdp) \
 		$(use_enable rtsp realrtsp) \
 		$(use_enable run-as-root) \
 		$(use_enable samba smbclient) \