New version

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x1191738E

3 files changed, 373 insertions, 2 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 89560f2d6ff3..4a901a11c5fb 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.829 2012/12/11 05:46:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.830 2012/12/15 15:34:57 lu_zero Exp $
+
+*vlc-2.0.5 (15 Dec 2012)
+
+  15 Dec 2012; Luca Barbato <lu_zero@gentoo.org> +vlc-2.0.5.ebuild:
+  New version
 
   11 Dec 2012; Patrick Lauer <patrick@gentoo.org> vlc-2.0.1.ebuild,
   vlc-2.0.2.ebuild, vlc-2.0.3.ebuild, vlc-2.0.4.ebuild, vlc-2.0.9999.ebuild,
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 714573cfbdc1..9d7b87d86824 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST vlc-2.0.1.tar.xz 17210552 SHA256 7f485725c17487a77d70844cbd9acf528360d65cd6ff79d206657920f4fcbf4b SHA512 12d583daa1062ce78a3d842b978b78ae9c8805dedfcf0e8ae4ad1272984c1170e8a4f3ac0e6c8511cf016626a450cf9d763998d156e70460abba781d6599a6cd WHIRLPOOL 82aa1b036df008b25e36474e68daebfd2011d92add2eae42a105c24a1b4f8456d71d184cdd8f6939387c9f7c4b069f34d54c2ebea0ffdb08342051a880b49eae
 DIST vlc-2.0.2.tar.xz 18023928 SHA256 111a83b19d09989c1743ed708897586e20f6cd37f27cc2fcac09c75a7221c62f SHA512 a680632f669fd85edf8a4bd6ae57951c8bcc4fe1c5cac039b839b7409b2e432722057c588cae1a23eec41b1cce17edff97375da584bfcb3514da3ed528b72c3d WHIRLPOOL 410782ee9996ff1f0566d1b248649211a273dc1debe7cb071bdff966fcb62644b215039f2ab70137a34a326dfabfca88c46986e9d45d5a05b5f5b158a813c4f7
 DIST vlc-2.0.3.tar.xz 18268208 SHA256 fba9805f7415aebf5b88614de83802dc59d3282ff339128da41addf7e375d2d2 SHA512 015fb4c62f861b67f5e2562cb7e4aea684ea0a6682234c2b89ea48eb58e7bb06c621b96f35d311ec205dd1874e30ca1712beee1f4d75e401d340cee3c68ce4af WHIRLPOOL db73f8b3af32c8a4febfe8a6d0a9409d33a6e4310b1a338fc3613f00a20815738ad65690e07afb3a4e649d1ed95f1b4857853efe1c2edcbaa41cb34f923831cd
 DIST vlc-2.0.4-bug-438874-BI_RGB.patch 1524 SHA256 eef4c96b958f066d0ad1c68aaa5496c0594b322e82577bd8b00965c086585ca5 SHA512 771cd7831264714a3c5c7fbd95b24b9eb984d1ecc2af1b553f27ee5085a5bd4db4adc3cae582774b427137d24f0812f7c2840937a12f1bc9cb4394979f28d83c WHIRLPOOL 24eed337d7cfd9994988b5bd3393d8148ffa5a2ece943f837f88dc03623a3142aade8709409c630234a52555e111b76e1452e7031d00cabdc86365385e4bd7d1
 DIST vlc-2.0.4.tar.xz 18518272 SHA256 4e066ed0d48ddc85aa1f01964945af666b5713cb6230d76347aebbc9a6553db6 SHA512 f6a530d96e3a823a5fb036db894f4f224a318edb28ade2297c0fc7a20159d426a39c810cb3d0bf9b3032fe25880232fe0ff1e9bcf6b5aad765774d257cae97ca WHIRLPOOL 6b2c850d6c78a135cd2a153faf77c21cc9051818fb50da2b89c3c107f4c7ca352bb0929db7f1e60a921d16bf3c83ce7d58c0a3e61b847db0523c0f87c28eb041
+DIST vlc-2.0.5.tar.xz 18369292 SHA256 dff9eb00861bcd9f8446ff5cedbd3c5fd2bed460e6bfa84bd9e01f750ed96b6e SHA512 eff8146e99f819f49bf9875e4ce0bb562fca46bbf68cd7d2e2121e86d12c8b4ce02bf8fb024910f7d5742abec90583bba45eb2301156ed0418ef76952345d49e WHIRLPOOL bfef0e9adaeb520e709ce34d9a2057a26f302c657b1f89a2e655b2f6b9ad77a4ffcd0ee673549d617ff724f098116f128e13f36228a306670c85375ed9d01038
 DIST vlc-patches-101.tar.bz2 3011 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae SHA512 f059f3c47b571dd5a28d979abdcb3a8c2ebef13845cd4102d877b1786ef4b3ba15cc22873de0fd84fcc7a4413f582064f12edf40627e9f030fd8e6fa03d67c66 WHIRLPOOL eb2f184c99db6d174d22e4231003d93171f5081f917f10ecf6bc927ff96983aa21756d15063909cb6f8ad77f0db0b978fdf2eb2fba3320f19c6bc26e17b04ba7
 DIST vlc-patches-108.tar.bz2 3189 SHA256 18de61bb0e0d7b4d79b516096c44db4b083510c338b19802422c69f1431b9598 SHA512 b641967a4dfd89987c25adbf81636826dfa04dbaa963abcfa88537febb6b43794d6eefa805c5bfb04a8c9bd58c03149b1879c07b38dd661122830941cd4dbda1 WHIRLPOOL 59f4e0ff48ec567bfc62b4abd7604c004203d9d0826352cf729e68940faf0f2c2c8f2025b64b893c84beedddaa8453b86f7030c37bdbd619be3b2152c63d7e7b
 DIST vlc-patches-109.tar.bz2 5292 SHA256 264423f9ec76004d1bbe9549e5c7f935e951ad22ca8377b77271981c92403b6e SHA512 9b48d7290bf284fe27e802e7e720fb68bb4b4b38b1aa3dcd0e58bfc4096454b3caf79322ae33865d1c99ac050d14207052ed0748436540f4847cbc68babd5f82 WHIRLPOOL c493948158818779ced60d11f0a9d559c98f937f1137d78b99ca825fec1c94e80c455e2bb29e52d2dbe7eace8fe47bac3bcb373142eab3c1cadd190073e82f37
@@ -10,8 +14,16 @@ EBUILD vlc-2.0.1.ebuild 11086 SHA256 7232e0339f4b7edf522fc87eaa77b525531155506da
 EBUILD vlc-2.0.2.ebuild 11043 SHA256 1a5cbf917e1d544c4eb22bc716c967ea098b763f18bf73d47c0b2b95d7f0d0b0 SHA512 0b0054528a297214b6bca1d34141ddbf4d711247c3fad809f30b8be4f668ad90374e06b1087d7ff47cb2d07f0f101719cc78b0be67b611075760c733620984c1 WHIRLPOOL bc57943db62b3f7187b7f8738c2fa5aae78e4a3574d25bcb8f3ed05c3db621647848d74c03350a728ddafcf71c9cd46832fb126c64ea0e15fa28ca1e4cb74674
 EBUILD vlc-2.0.3.ebuild 11064 SHA256 76a88575dd3c0db5200cabb69e95aa74fa2aefed39adcc8d51dcbf6c5efafbd0 SHA512 8932e274c4e7aac5f7e2869cf5b191ccffc21314a5f181070ca8eea3d726a447acebc45447de4642c93ab0ed7f57fbea3977b16cfbcd2dacfa0a52521ff68f1d WHIRLPOOL d9e0006489c7cf7ff4407f081257b6536e87d3dc536bc27a06482aa37e7a12472a40aee79be04e7ada63eb4589ab85bf6598f31c9f6eff276fee240982cb6b7c
 EBUILD vlc-2.0.4.ebuild 11475 SHA256 3d63da62830b07806c91a18f4250f0eb6d13de31ecf32bcedbd77bfea2505d8e SHA512 6d664ddb7fd440910b2dab8abab2bd9dbea4c182dc81ef39b6dc62a8a86e2d435bdea4993438c2cdce06e0de902fb39feea948ea094008369b26df3e81d38a51 WHIRLPOOL ebcf98f7a20dd41431ac39c37035d5db1596fa58de0c4b3bee4053f149c71fcc68ce49e5b8519a67d795b17871334cb98908d3f09c2f59ab1fd3563016a877dc
+EBUILD vlc-2.0.5.ebuild 11078 SHA256 3bebba4702e2c907235ee1eca28098620601bdcbc07f5d59fcf4e8569878de05 SHA512 acb05148cdfc02a3a27f18442eb91f7bdf063c32e2b0588c67589b855166547044da4a1b942037a3515fe8997d05e2b67321d033791c00b0e955954bcb0e6cda WHIRLPOOL 652f4d70e0aed91a5b024b84a911e0608a052db5e94a195b6d9dafcd62f58a63aa22b9df422fa79e087210cf534617633fd9a81d5f9a31f26a0750a1f5840b1a
 EBUILD vlc-2.0.9999.ebuild 11073 SHA256 03c55b7967c4373bbbeb8605ea9744bf890c24d46cb43dd10256486c512b44cd SHA512 7cd4f38f45c405fee21c6d7c2b0a0d344fbe1371bf8cde321bb9bff2a28768f5c7ac505329a8af5f61b2da6893b9701f8b6a08da411c5b2b15ca52e3ade98885 WHIRLPOOL 296e62fee478317e62f1c5499cedc9b64b691f892435e4c6a4f959fa2f16825608e67d242e72837a99e125f3ec4944dd049f80827aee2da03522d1b8058d4fa8
 EBUILD vlc-9999.ebuild 10864 SHA256 d3e00671efd5b088850e2c7e3b7ab0f8dcb02830e8a91d80a40b6bad0201e71b SHA512 2abe49da3f9374a14858365e1c9570e2f67ef7ba8988706c840170cf9d0d9b484d408ced63c49f029cdb1d5772323acd535d8649ba97e57aa5488c6bfa257141 WHIRLPOOL 4c8616fbb6af1ce4feaecfcaae9967321a84feca600ae90a790ab2ebcdefff331a7cde27c5cff7fd3067c4863c29d0a9f5139edcd890961bfe82ff55783c0ccf
-MISC ChangeLog 8796 SHA256 8594ea91a282516d2f667caaf1efd9ff3608bafe656212531c0ad70763f401c2 SHA512 1e0ef851c9b396bc26f3ae841c7d57f39424368cf04f43be80c31702c1b66ea535cefbea84f648eb43ce78b1dfc49338a718be2cc89a8cd876ba0340b2e99499 WHIRLPOOL 3ae848e81dabb77bb406a62ae9e982b711f83eb62c70710578bcf96e068b45c64a5f7879a107e21d99d900bd7f32fb8dd885d2fb28e699d54cb66319771f30db
+MISC ChangeLog 8905 SHA256 60a2db902e77fd8160ed85f72b58df625358be4453e7f12f388b59ccf6a54eaf SHA512 d86fe6f771528d53526602b7dea824e5a7a408b93c3aeb62131dd0d52b03c1b9793c031ce078513a20151b96bbf9ad8647c1f845439845c48990711f91fb735c WHIRLPOOL 0acaf0b18e508572cf922502fd1ed0849e24adaea6932e7d6f8f8565d0664d03b24ec9b23f8ec1493638bf7373d04399906bc474e364eeb075ed623ceb24f2af
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 6440 SHA256 8e8e485c6c115e1bf3ec532c583e5ea83413d915d36dba1a2541acdddf44c54a SHA512 03498de9f961db2c10f7f19c4008e3dfdafc7f356c16ed30c1e61dc1010a2ed3d0e17a2f5ea5e2785ba47ea5c264d36c91c78b3edd865ca26c9348b163d1f40b WHIRLPOOL a7a1fc5ae6c9feec75820e63f74749a3e54fbfc6b140987a1ac51740d9f78bd1da887cb903b7ff3759e3e5a3a3574c2f60bff87bcfdeb63811ce05b9b89627c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAlDMmKcACgkQcXOrnRGRc47BDwEAwhGSRYCuw5hZvqh0q4e0PpeL
+NwW9hkvVHdgsJG/FfdYA/0BWpKHGh1zs75kmV2DGqZvkWjqj2TkJ2togKVaOFrIt
+=kNJx
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-2.0.5.ebuild b/media-video/vlc/vlc-2.0.5.ebuild
new file mode 100644
index 000000000000..02de7e448658
--- /dev/null
+++ b/media-video/vlc/vlc-2.0.5.ebuild
@@ -0,0 +1,354 @@
+# Copyright 1999-2012 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.1 2012/12/15 15:34:57 lu_zero Exp $
+
+EAPI="4"
+
+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="~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 win32codecs 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-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 media-libs/libpostproc ) )
+		projectm? ( media-libs/libprojectm )
+		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
+		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core: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 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 )
+		win32codecs? ( media-libs/win32codecs )
+		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}
+	alsa? ( >=media-sound/alsa-headers-1.0.23 )
+	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
+
+	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 win32codecs loader) \
+		$(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-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
+}