Updated 2.0.9999 and added 2.1.9999 by backporting fixes from 9999; adapted 2.0.9999 to work for the 2.0 branch, disabled opencv support because it breaks against current ~ versions of opencv and requires multiple commits to be backported.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

5 files changed, 601 insertions, 110 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 474c5f3b6c77..56aca88bcfeb 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.857 2013/10/24 23:40:49 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.858 2013/10/26 05:53:46 tomwij Exp $
+
+*vlc-2.1.9999 (26 Oct 2013)
+
+  26 Oct 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/vlc-2.0.8-freetype-proper-default-font.patch, +vlc-2.1.9999.ebuild,
+  metadata.xml, vlc-2.0.9999.ebuild:
+  Updated 2.0.9999 and added 2.1.9999 by backporting fixes from 9999; adapted
+  2.0.9999 to work for the 2.0 branch, disabled opencv support because it breaks
+  against current ~ versions of opencv and requires multiple commits to be
+  backported.
 
   24 Oct 2013; Tom Wijsman <TomWij@gentoo.org>
   +files/vlc-2.1.0-fix-libtremor-libs.patch, vlc-9999.ebuild:
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
new file mode 100644
index 000000000000..4ae009b9b881
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.0.8-freetype-proper-default-font.patch
@@ -0,0 +1,12 @@
+--- 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/metadata.xml b/media-video/vlc/metadata.xml
index 7d0f7256e08d..bdf60c61bd32 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -70,6 +70,7 @@
     <flag name="upnp">Enables support for Intel UPnP stack.</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>
diff --git a/media-video/vlc/vlc-2.0.9999.ebuild b/media-video/vlc/vlc-2.0.9999.ebuild
index d8e398274cf9..0ad37e3d3559 100644
--- a/media-video/vlc/vlc-2.0.9999.ebuild
+++ b/media-video/vlc/vlc-2.0.9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 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.25 2013/08/11 22:57:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.26 2013/10/26 05:53:46 tomwij Exp $
 
 EAPI="5"
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM=git-2
-	EGIT_BOOTSTRAP="bootstrap"
+	SCM="git-r3"
+
 	if [ "${PV%.9999}" != "${PV}" ] ; then
 		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
 	else
@@ -39,6 +39,7 @@ if [ "${PV%9999}" = "${PV}" ] ; then
 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
@@ -47,107 +48,116 @@ IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	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 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"
+	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="
-		>=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 )
-		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[unicode] )
-		ogg? ( media-libs/libogg )
-		opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
-		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 )
+		dev-libs/libgpg-error:0
+		net-dns/libidn:0
+		net-misc/freerdp:0
+		>=sys-devel/gettext-0.18.3:0
+		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
+		a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+		aalib? ( media-libs/aalib:0 )
+		aac? ( >=media-libs/faad2-2.6.1: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 )
+		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[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 )
+		samba? ( >=net-fs/samba-3.4.6:0[smbclient] )
+		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 x11-libs/libXpm x11-libs/libXinerama )
-		speex? ( media-libs/speex )
+		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 )
-		swscale? ( virtual/ffmpeg )
-		taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
-		theora? ( >=media-libs/libtheora-1.0_beta3 )
-		truetype? ( media-libs/freetype 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 )
-		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 )
-		"
+		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 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 )
+		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 )
-	kde? ( >=kde-base/kdelibs-4 )
-	xcb? ( x11-proto/xproto )
-	app-arch/xz-utils
-	virtual/pkgconfig"
+	fbosd? ( sys-kernel/linux-headers:0 )
+	kde? ( >=kde-base/kdelibs-4:4 )
+	xcb? ( x11-proto/xproto:0 )
+	app-arch/xz-utils:0
+	virtual/pkgconfig:0"
 
 REQUIRED_USE="
 	aalib? ( X )
@@ -178,24 +188,61 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	if [ "${PV%9999}" != "${PV}" ] ; then
-		git-2_src_unpack
+		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
+	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
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
 
 	eautoreconf
 }
 
 src_configure() {
-	# needs libresid-builder from libsidplay:2 which is in another directory...
+	# Needs libresid-builder from libsidplay:2 which is in another directory...
 	# FIXME!
-	use sid && append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+	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 aac faad) \
@@ -269,6 +316,7 @@ src_configure() {
 		$(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) \
@@ -284,6 +332,7 @@ src_configure() {
 		$(use_enable schroedinger) \
 		$(use_enable sdl) \
 		$(use_enable sdl-image) \
+		$(use_enable sftp) \
 		$(use_enable shine) \
 		$(use_enable sid) \
 		$(use_enable shout) \
@@ -296,6 +345,7 @@ src_configure() {
 		$(use_enable swscale) \
 		$(use_enable taglib) \
 		$(use_enable theora) \
+		$(use_enable tremor) \
 		$(use_enable truetype freetype) \
 		$(use_enable twolame) \
 		$(use_enable udev) \
@@ -303,6 +353,7 @@ src_configure() {
 		$(use_enable v4l v4l2) \
 		$(use_enable vaapi libva) \
 		$(use_enable vcdx) \
+		$(use_enable visual) \
 		$(use_enable vlm) \
 		$(use_enable vorbis) \
 		$(use_enable waveout) \
@@ -315,17 +366,22 @@ src_configure() {
 		$(use_enable xosd) \
 		$(use_enable xv xvideo) \
 		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-loader \
-		--disable-optimizations \
-		--without-tuning \
-		--enable-fast-install
+		--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.
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
 
-	dodoc 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
diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild
new file mode 100644
index 000000000000..294cdfd09ab7
--- /dev/null
+++ b/media-video/vlc/vlc-2.1.9999.ebuild
@@ -0,0 +1,412 @@
+# Copyright 1999-2013 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.1 2013/10/26 05:53:46 tomwij 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="~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 chromaprint dbus dc1394 debug dirac
+	directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode 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 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="
+		dev-libs/libgpg-error:0
+		net-dns/libidn:0
+		net-misc/freerdp:0
+		>=sys-devel/gettext-0.18.3:0
+		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
+		a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+		aalib? ( media-libs/aalib:0 )
+		aac? ( >=media-libs/faad2-2.6.1: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 )
+		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.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 )
+		fdk? ( media-libs/fdk-aac:0 )
+		flac? ( media-libs/libogg:0 >=media-libs/flac-1.1.2:0 )
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.0: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 )
+		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 )
+		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-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 )
+		qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 )
+		samba? ( >=net-fs/samba-3.4.6:0[smbclient] )
+		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 )
+		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 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 )
+		vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
+		vdpau? ( >=x11-libs/libvdpau-0.6:0 )
+		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 )
+		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
+	virtual/pkgconfig:0
+"
+
+REQUIRED_USE="
+	aalib? ( X )
+	bidi? ( truetype )
+	cddb? ( cdda )
+	dvb? ( dvbpsi )
+	dxva2? ( avcodec )
+	egl? ( X )
+	ffmpeg? ( avcodec avformat swscale postproc )
+	fontconfig? ( truetype )
+	gnutls? ( gcrypt )
+	httpd? ( lua )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	qt4? ( X !qt5 )
+	qt5? ( X !qt4 )
+	sdl? ( X )
+	skins? ( truetype X ^^ ( qt4 qt5 ) )
+	vaapi? ( avcodec X )
+	vlm? ( encode )
+	xv? ( xcb )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+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
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	# 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 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 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 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 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
+}