Version bumps 2.0.8, 2.0.8a and 2.0.9.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

6 files changed, 1265 insertions, 12 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 47194648969b..8d7fb6c8259c 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,14 @@
 # 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.864 2013/10/26 08:29:54 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.865 2013/10/26 08:58:23 tomwij Exp $
+
+*vlc-2.0.8 (26 Oct 2013)
+*vlc-2.0.9 (26 Oct 2013)
+*vlc-2.0.8a (26 Oct 2013)
+
+  26 Oct 2013; Tom Wijsman <TomWij@gentoo.org> +vlc-2.0.8.ebuild,
+  +vlc-2.0.8a.ebuild, +vlc-2.0.9.ebuild, vlc-2.0.9999.ebuild:
+  Version bumps 2.0.8, 2.0.8a and 2.0.9.
 
   26 Oct 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml,
   vlc-2.0.9999.ebuild, vlc-2.1.9999.ebuild, vlc-9999.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 786ee32b1989..36189fe0eef2 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,24 +9,30 @@ AUX vlc-2.1.0-newer-rdp.patch 2133 SHA256 597549a7cae76998cb40871c6e5e3a11d2aeaa
 DIST vlc-2.0.5.tar.xz 18369292 SHA256 dff9eb00861bcd9f8446ff5cedbd3c5fd2bed460e6bfa84bd9e01f750ed96b6e SHA512 eff8146e99f819f49bf9875e4ce0bb562fca46bbf68cd7d2e2121e86d12c8b4ce02bf8fb024910f7d5742abec90583bba45eb2301156ed0418ef76952345d49e WHIRLPOOL bfef0e9adaeb520e709ce34d9a2057a26f302c657b1f89a2e655b2f6b9ad77a4ffcd0ee673549d617ff724f098116f128e13f36228a306670c85375ed9d01038
 DIST vlc-2.0.6.tar.xz 18619836 SHA256 31cc98035e2ce36c71a8f105aa5a87e3d8b5e206a0b3f7208c5ced407cbe1963 SHA512 80793305f7e0e48c99be99adfd85d699deaff53184f740b7624cdc9cad106b7c70f1d221e26c1362a1d1e5b02b861a1289e21a3af8a4c5ae3dfc316c67f15e74 WHIRLPOOL 04d2ff943d59979e25707aeab8a4157a3417b604ddf4d7116a6affe235afcd24fede3c49fea15b2b54784f9716b6376aae753b8b5b89f65e471d1fe11bfa728d
 DIST vlc-2.0.7.tar.xz 18538256 SHA256 243107d59e4bd0b942cb4ce10292eab8233394f8109ff4fde44e64d0ee745314 SHA512 6e8e55e40425cc9d48a174374a6b690f50d0a7cfed9a1b253786c9e7e52658fcd4feda94a5d4f66c58260b517248041b3f393af5171a42bf3a3e1475828b1ab2 WHIRLPOOL 7524f518a8c4575ac417261857326dcc6a2787cafd09f64a181fd597358b04433be09a4f418eb1186bb093ef467bb4de75f809721c392d60c117e1eefa0cce48
+DIST vlc-2.0.8.tar.xz 18858236 SHA256 a02af28345d4560e718066623f881b6eaf29ddce3b778fbf839e08b2415d1702 SHA512 ef096dd71b7e019ea96b1e75235f2e46377ae4c27913486233bcec15c91239bf32b9634b1c81b8cd665512e00e2ed29c3d2bf70244a681298b15d8affa0a939c WHIRLPOOL 6bb2ba95854bf67e8f28ce4aac00e16d1de6b84dd969432c76b1ea32ce36568f80e5eb79a1c5d1c4f608bfe17113de656d026a53670afca6ff5abfb8b34b11e4
+DIST vlc-2.0.8a.tar.xz 18859964 SHA256 05215f34c487723c84ebb54ab43b836fc70fb466326f7c601847141a499034d2 SHA512 f59c86991a12912f8131ee080795fb05af0e647c9313a514d6d5bb629bd00fdbc49e0e164c37ffc0496b29afff1e4d279a1ced732cb8948f2d2a4b6aeb9a0980 WHIRLPOOL 7164ce2b35de7e9bdea6215582127518e244ab4b7a6892677e371062395ff27b8eb34d516461f667995be0a594bfc4477403ab8054f24683599332cacdec2e22
+DIST vlc-2.0.9.tar.xz 18863020 SHA256 c4bea9be211360ddbf29b93661fb1f33f7d5ce44166d829cbebfa01f303bfb30 SHA512 937cc6e73915ee601d6d0f26e8c70d66b2510fbe148621dc0949c4510f4d0ffc39bfd68ae7b9dcec07e2fdb79c372111fb7964d4fb2778cac1c35d49fdddc1d5 WHIRLPOOL ae76ea4ead390eb896ff6c20c40ab86f6398a407e7c1887277c996dc1f8292e21b8fb63c0b9cf2fec63e19d2c869fad940035559f2deccd2f29e27dcee5f17cc
 DIST vlc-patches-101.tar.bz2 3011 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae SHA512 f059f3c47b571dd5a28d979abdcb3a8c2ebef13845cd4102d877b1786ef4b3ba15cc22873de0fd84fcc7a4413f582064f12edf40627e9f030fd8e6fa03d67c66 WHIRLPOOL eb2f184c99db6d174d22e4231003d93171f5081f917f10ecf6bc927ff96983aa21756d15063909cb6f8ad77f0db0b978fdf2eb2fba3320f19c6bc26e17b04ba7
 EBUILD vlc-2.0.5.ebuild 10964 SHA256 a16425b3ac14d440e2929a5bc9cabd15e3ef23f1d3d5a6d334b848f413220d20 SHA512 3e839fa62e456a391499b002dbf57fa1c9713ce63b731650fb1842ed1ec7f378fc74655b2c24471e18ac5fc987efce5caf58e90cc095b44137e4197f09064c99 WHIRLPOOL 180ed9da75b7cae009b5fee01e366c322cea5d20ed6b34839c7bbfb82c5bce4c9e02a97bb3aef306e3c794e33687edf105b8f23c7449cf9f8f207db099e0fa21
 EBUILD vlc-2.0.6.ebuild 11027 SHA256 04bbf069ffbfdbcc82afb16192003cfe0c0453a5e14eb2473c9199675c6ef4ad SHA512 cf577b8824ba8414e9c9ab263d5e97e78b7d836f79b032871b2ad9efecac670d0d4f724327964c50db548aacc943930107f41a4ff211c7c727931c3881554fd9 WHIRLPOOL e82ba709ec6f764fa589fb1d182e3fbfdd097d663deaf8628d2fa4f2f9c317f1d711fa67a990768df0d8bfd04f1b176e52bc17975a0a254d23ad1178a05f1e85
 EBUILD vlc-2.0.7.ebuild 11017 SHA256 889c22514ff968c2d89637a2b207ebb41e98e44b4384956be850bbf42083952a SHA512 681039b0b1c1f3ac7ea27c21e81100d23f7fe726d060220c6c9a86ef454dfb551450e3a097063391b88b5c00b008421723d8ec84de6901ed4b3675df009a37e0 WHIRLPOOL 3bd88ccc00e6db6e5eeff3186b08873ecc38743393c7978091ffce446a975a6fdfe2801f918f8d1a5101f0b07213d0eebd34dd84150aabfd6cf0401ea9d536df
-EBUILD vlc-2.0.9999.ebuild 13208 SHA256 91bd382ced17a5bbe5f371202f68046f3ce99502cc0d23f97d72f3aad46f263c SHA512 c11080dc6450a626fda9a2859651fb688f90e51872a42131ea9318714c4a8701ee39dd3760d2097100fb40221a1a98e053c89f70e514d34f485424d46544aafd WHIRLPOOL ec87e51255eab0277f5c9973643fbef0d45f95b241d2b1adedbbd0e6c472685144cac5e3902e7522ca45ad12b57e86336bf753344376803abf489db4faf7a6c0
+EBUILD vlc-2.0.8.ebuild 13183 SHA256 9d8f4defd81a10def3b43e91d349df6e25e4302b930a5a292312443378c88473 SHA512 44f9a111ff04282019b9cf5ce632e3dfaed8368c703a6d3b17064693d510bd48838aee72563739e6ce96b4c9dec4b6c438f80fd4119422ce36355be1221e45d7 WHIRLPOOL a3773a065088c0a858007234e7935270e7611712c4221d356cd484eaed515df240665a68bb5fe03829e1a775096c74b62fc576cb79e4919b2b4a285c5a1c713d
+EBUILD vlc-2.0.8a.ebuild 13184 SHA256 99b2fa6c41c437f40382f8d0f6646de443ddb9f54172a3b52009eafce694aea4 SHA512 f337a4027c8d021575d22795d728a8a3aa22cff1a488f70bc896f0bd4296ba2029c2c43ec600bd1af7516eec43f177df1753104d1c16bbfe03ce011c2e76f098 WHIRLPOOL efcc39c0adac1cad8ac3fde593062d1397d7711bd2153284a8a97ea6fb1a06fdfda61a1c4a6cc7b31d116e6eb8e1ed0176992e096524a75a6ea06328e108fed9
+EBUILD vlc-2.0.9.ebuild 13183 SHA256 3994e5f2477c8305a407ea248dbd47e90f0228063e002c593d46be4b7d660bca SHA512 0600569c74b7fd87994c13435e45d4f1035d19bdf33a9a1f1aa5526241ebe4364089cc78ddf2f0699ab9a733a2fda4acdb00fc73c800cb573e55a42cf44e7292 WHIRLPOOL ef194787a295799328394a76f1683e13158ed97587015b91906495affc2d049537c1ad0e54da4f4770f002a8d6ee23162915cb14e9e446c03b2d9bb9e29e62fc
+EBUILD vlc-2.0.9999.ebuild 13211 SHA256 cf088ddb1415585612157f9a2eaf1440237c4bc29f3c8bd9725c5419e841df3b SHA512 a4bb03abdee8757388bc830619e04dfe5a77763c0058d5e5e6416e0e365c2bf27365d9ad63888ca7fd3fc07bfef9eb4b0d2474012c929f9e098f87b91e151b94 WHIRLPOOL 7e50bfb69b5203bf0549e6780a61c9521b241d153800de87b631d908c3d26c9b68ab963c2f9c0fac165d628cb84bf82d0a4a4b2e3b798870143b46e0a9c13f81
 EBUILD vlc-2.1.9999.ebuild 13410 SHA256 5f319cf9cb7b5c579836289190b2bbdc8cabe5ea810a954d3608d7c30535c72c SHA512 62d08b6262d610711cc835f2d1d1bd63d99246d9cd31c81c670eb3ddd31439534c9d1d204448213e239201bf76f5daa6749018fdd6706ca63bc74bb3d882b692 WHIRLPOOL e94e57361a1ac33bc872412367070a2895dc55c497a8d55ba79b4f66aabbeb80e30df290ca03237e592834aea0004f7122faa99636233b8040fed3e28f24e734
 EBUILD vlc-9999.ebuild 13699 SHA256 4723a35b528964eaa170be341d8780b873624b5deffd5e77923e80fb9961dc76 SHA512 0c0f224507c40ddc8cbb88fc1625cd8ce56cc476f21517e4a9f2f2648c2e392bdfef6010b695c589f21abd5aea6d503d628f482a52fff25e881709b16bf3b9a0 WHIRLPOOL 48c7f17e181ac145e3cb344afe175eaa0a88a4d7718d170a58fcb7ab37b1ac49a991b062f89cc6922c69c201e7024a7a40f63cd7e0f1ffa6710c39217eb161ff
-MISC ChangeLog 16817 SHA256 5ca28a42f62a7302859f73e327e1eac9c80402f44797fb0eeaa8c5368de7f3fb SHA512 3ab63693875ce991074610b65bafb6094703d334c93f078a2393f73a6d41f885861ed2f9a79cf57335f31126868daaad0e877346089e15b0eb164e16e5c3bc15 WHIRLPOOL ec03c67024b3385babd5fb1188e5c802ade4adc78927895aa69b13a94c329b93128ed1097159de28a439bb5703b97844264276907aefa60aeca6dd4cb45c3070
+MISC ChangeLog 17064 SHA256 fe502f4a87c0c46ea7c60f6195985f10a74e1bd56e977af82361332d8a40b03c SHA512 eab107ac8fc59a2d9aff651af9cb815eac76ca2b8b5980d162f9884f351793be3ccc22c845ab87a37e0aa1566f3e31ef2791cd15972e8b3775cb50a6f4611ab4 WHIRLPOOL 9ae2fbfe69e2218be9f53dec7868532f46c7740ef74b0367ea6fb1e8d1cbed73650ada0eb0034db3aa12524d1e7fada5e7280e48409694885c81e53011a1e0ab
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 6882 SHA256 3620cc5667481a82177337d6c85e3a85b94850039f7d04a5407a9f19f36d7a82 SHA512 a68bda118fd709fc8ee71d899205080d3108efb8db49bdb74973f434ce3deecc610784d1ca6118a2b09ce62a858ba6d841763d83a71ef5ef8919826e0e5a9638 WHIRLPOOL 8bffe3ded979f9bbd0fa45017900edefb0598f9657fb91de1f918160614af611103425bf9125057b230583071367b0c0144ad839bca9972349be0ee3d980c8d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSa31zAAoJEJWyH81tNOV9kg0H/A73MTedsTwZCkZIVtg3dATb
-o1J1ywBbK11FT0GgyV27M1exsDAZIKexchoNWQlP+D0xQLIL1X15UCbcHXgC1JWT
-PeMfd0xM0CP4riYJwV8mWdR5SfrcOutYqLcxxep8poZObUdCvISWlxEpokg4tlmp
-pwvFm2qa7NLmhASNAWAMszAN2yn9ptPekiYt75pPAntyvIWaEw6eYT2XdneGUehd
-rZN5/qjbDuewfrp2NLzpbAzC1Bon+X4aPRVGYnfm+gJbqqMGLHvgBoyBz9riSzxb
-kf6J0LYrA+ehNayQEC7D6Lsf1JPhCqqx7zmKuShRtrBXqRjP0R7M2z7kFQuEB5I=
-=W5IS
+iQEcBAEBCAAGBQJSa4QiAAoJEJWyH81tNOV9XgAH/3wbDjnajnSNCasYXzORIZOZ
+VwcvXPYEmLXIGmS8qHYJtSQz/DRdW8VSw9tDnCws9jTb5nKH/b3zYL94ZNVlzpo4
+4vyzSJ5m7+7APdDbwOqgNRuNcK03c0mayEflAi+QT7MNG2wXezhOlWCNJY07VD09
+Bw/L+pdwpPOtcCJBnItXAtD5kmPhO+G9enVxQO+WHmDLiEDjvx4Dec5aRCivdtCB
+FJgFmdsctvCbOCNxFu65Y2t8TbJnp+fxs8G542t1qgv7HDeDnazJ/wARblA4m/Wn
+fz17zXyIMch9kZu5E4ost/AWkPe+HaqA1caJe1l5aFm1CWn1l9TkxmLqnXeauwY=
+=VZsE
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-2.0.8.ebuild b/media-video/vlc/vlc-2.0.8.ebuild
new file mode 100644
index 000000000000..f95008baef05
--- /dev/null
+++ b/media-video/vlc/vlc-2.0.8.ebuild
@@ -0,0 +1,413 @@
+# 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.8.ebuild,v 1.1 2013/10/26 08:58:23 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 ${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 ~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
+		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 )
+		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 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:0 )
+	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 )
+	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
new file mode 100644
index 000000000000..c635da53ec24
--- /dev/null
+++ b/media-video/vlc/vlc-2.0.8a.ebuild
@@ -0,0 +1,413 @@
+# 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.8a.ebuild,v 1.1 2013/10/26 08:58:23 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 ${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 ~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
+		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 )
+		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 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:0 )
+	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 )
+	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
new file mode 100644
index 000000000000..c071a08ae2fd
--- /dev/null
+++ b/media-video/vlc/vlc-2.0.9.ebuild
@@ -0,0 +1,413 @@
+# 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.9.ebuild,v 1.1 2013/10/26 08:58:23 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 ${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 ~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
+		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 )
+		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 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:0 )
+	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 )
+	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
index b1a54cc763e8..12b40db74848 100644
--- a/media-video/vlc/vlc-2.0.9999.ebuild
+++ b/media-video/vlc/vlc-2.0.9999.ebuild
@@ -1,6 +1,6 @@
 # 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.30 2013/10/26 08:29:54 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.31 2013/10/26 08:58:23 tomwij Exp $
 
 EAPI="5"
 
@@ -184,7 +184,7 @@ REQUIRED_USE="
 	xv? ( xcb )
 "
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${MY_P/a/}"
 
 pkg_setup() {
 	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then