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

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)

21 files changed, 138 insertions, 3084 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/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