bump a new snapshot, enable faad2 support to be closer to upstream, unleash qt4 gui due to numerous requests, should fix a few bugs and hopefuly not trigger a lot

Package-Manager: portage-2.1.4_rc14

4 files changed, 371 insertions, 8 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 3b060c107c0b..b389723e8598 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.274 2008/01/01 21:36:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.275 2008/01/10 22:21:26 aballier Exp $
+
+*vlc-0.9.0_alpha20080110 (10 Jan 2008)
+
+  10 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  +vlc-0.9.0_alpha20080110.ebuild:
+  bump a new snapshot, enable faad2 support to be closer to upstream, unleash
+  qt4 gui due to numerous requests, should fix a few bugs and hopefuly not
+  trigger a lot
 
   01 Jan 2008; Alexis Ballier <aballier@gentoo.org>
   vlc-0.9.0_alpha20071022.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 9a630e2100c5..98e9b48be701 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -2,9 +2,12 @@
 Hash: SHA1
 
 DIST vlc-0.8.6c.tar.bz2 11147601 RMD160 6245419e39401b1ee138a5be3ea0375cdedcb17e SHA1 aefaf7a039874930b3e7caf139d2ed5b5bbd0a56 SHA256 5fc24d7bbd2c1f715af1860e39207b857662fea5d0f6f212df4794688c7db6ae
+DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-43.tar.bz2 4183 RMD160 1feaa6f0c8a7fb744d9ba84094ba368df70a2c2b SHA1 d964a7a310ca2f75e40e79c7ce3bc663cc985f44 SHA256 466df1a4832cc38e4680857838412b0ba05b3c3c546a060bf400347cdf46e193
 DIST vlc-patches-44.tar.bz2 9091 RMD160 00aa48418061fc37c20bf8400c4dd60b1bfb4479 SHA1 e3d15e19ec70784bd87c104c032d47c06fee0ddc SHA256 c34b5f161e6447bb91c69407778d71e28a023d4be91de0f9f9eec0d40027d3b4
+DIST vlc-patches-45.tar.bz2 5825 RMD160 5aee3bb6679e8e20b685bfef0d4c86b94f7bee15 SHA1 be5c81838f3d8f71cba9768bbfae46507c02dd0f SHA256 2dccd7baec3f977cc8576610c333b1f5b655cd0f50391c3efc2f9069be70ca39
 DIST vlc-snapshot-20071022.tar.bz2 12796717 RMD160 be8d7301806d4d503a1390ea740e01062612370f SHA1 285f61abc4c6337b7733793b8728234150934b5d SHA256 f54fa54c95f6ee8fde4af075e7bd7111d8e46ad18d9700ba7b8bfdc0d33222ca
+DIST vlc-snapshot-20080110.tar.bz2 13168158 RMD160 d02a5be78953315d2a12236ff50c16d0de557cd0 SHA1 aaff5c58dd20c139eb461c1667518f53669d1c80 SHA256 735180bc21adf1696039c3b8b67d63f14496bd299ab966374eb5e72dc09c193a
 EBUILD vlc-0.8.6c.ebuild 8849 RMD160 42c591e399cdcacfdd3fe0f08b5f1a622515446a SHA1 483c095afd0a03f546fd22a349580c4e774516eb SHA256 ffc03883b2fcd65b149264ae43134d3983919ffa33875853d5b6c2fa5ea5f077
 MD5 e7b7596e161534d833fca1a9d79512ce vlc-0.8.6c.ebuild 8849
 RMD160 42c591e399cdcacfdd3fe0f08b5f1a622515446a vlc-0.8.6c.ebuild 8849
@@ -13,10 +16,14 @@ EBUILD vlc-0.9.0_alpha20071022.ebuild 10184 RMD160 ca8f89fc11a3038e7457e641cfd01
 MD5 88f9c07bb41846264f6fa8086aa6ee3c vlc-0.9.0_alpha20071022.ebuild 10184
 RMD160 ca8f89fc11a3038e7457e641cfd01222d8850484 vlc-0.9.0_alpha20071022.ebuild 10184
 SHA256 07a1e504e44c4d0bd2d6e0c53ad3c467615a3128da4f83919295b670c49776f1 vlc-0.9.0_alpha20071022.ebuild 10184
-MISC ChangeLog 47970 RMD160 e8dbfd588fad3cd9740b7389f68efb45f36d7bfc SHA1 618fae1b1a372dc058d7b85c99db3f2fb46f8d03 SHA256 c168188a25e232da95680edc29c2a427929948ed6e8f5c78ffbc6237843e2c07
-MD5 a77c068556962942828af1174f853048 ChangeLog 47970
-RMD160 e8dbfd588fad3cd9740b7389f68efb45f36d7bfc ChangeLog 47970
-SHA256 c168188a25e232da95680edc29c2a427929948ed6e8f5c78ffbc6237843e2c07 ChangeLog 47970
+EBUILD vlc-0.9.0_alpha20080110.ebuild 10160 RMD160 7bf7b7d0b5adb3755bd714e164850e145712575b SHA1 3ce17434410fe0fc46b28ed124c9229e1f9a6adf SHA256 10bacf4180b414d189589977a21eddd3830a547d01443b5ae16300c9a7530692
+MD5 629a0556506274092387f2aa617fc060 vlc-0.9.0_alpha20080110.ebuild 10160
+RMD160 7bf7b7d0b5adb3755bd714e164850e145712575b vlc-0.9.0_alpha20080110.ebuild 10160
+SHA256 10bacf4180b414d189589977a21eddd3830a547d01443b5ae16300c9a7530692 vlc-0.9.0_alpha20080110.ebuild 10160
+MISC ChangeLog 48267 RMD160 18effd32d0a4c51e48ae798b60b78730ffae6a2d SHA1 33af7faead9149ffee8c3197f819cfa3b60030cc SHA256 f583f4a7745f9535b132719627c6c3dd9384d0c37c379ad600216b9089d30f15
+MD5 bd650dddf1c70dc6f994860ecc97eb9f ChangeLog 48267
+RMD160 18effd32d0a4c51e48ae798b60b78730ffae6a2d ChangeLog 48267
+SHA256 f583f4a7745f9535b132719627c6c3dd9384d0c37c379ad600216b9089d30f15 ChangeLog 48267
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -27,10 +34,13 @@ SHA256 c7c3d04432a54fba82cd15ba0801e4c60b250cb599f9d0b5fd46b230eae2f65e files/di
 MD5 a226fe989a1acdfb52645eddade06b0c files/digest-vlc-0.9.0_alpha20071022 515
 RMD160 c8103362e52b3db447537eee10ba70be5387af4d files/digest-vlc-0.9.0_alpha20071022 515
 SHA256 0122640d03d1f6c2784a6768b2b461263463f81e81a7b1a55d8d037aa80ebbb8 files/digest-vlc-0.9.0_alpha20071022 515
+MD5 2d6075fd1acc53cbf960009e48d4eb8e files/digest-vlc-0.9.0_alpha20080110 738
+RMD160 3b521fe60f6126cd56eadae121d008b868d963d5 files/digest-vlc-0.9.0_alpha20080110 738
+SHA256 676de7f65272e63f7ca3a12bee063f1ca713a639abf0f4ab891c70ec83415294 files/digest-vlc-0.9.0_alpha20080110 738
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd6snQACgkQvFcC4BYPU0ptBACeOLOwcpKkJEHxckbuXWMwVwUs
-+6wAn1wDOygQh3xz74Km5Akgj5vbx21r
-=V51c
+iEYEARECAAYFAkeGmqgACgkQvFcC4BYPU0oaowCfbL12VKM/8OQ/OeDRCW1TwEIF
+sW4AoKGL1+BW5FypL8Wd+qw0Ez/0+c79
+=qg0n
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/digest-vlc-0.9.0_alpha20080110 b/media-video/vlc/files/digest-vlc-0.9.0_alpha20080110
new file mode 100644
index 000000000000..37640849763a
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.9.0_alpha20080110
@@ -0,0 +1,9 @@
+MD5 41d0f2736ed03ca6068ec0f04fa94ac1 vlc-m4-1.tar.bz2 1685
+RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f vlc-m4-1.tar.bz2 1685
+SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54 vlc-m4-1.tar.bz2 1685
+MD5 b03e626a296c18c22f555c5d94d0b478 vlc-patches-45.tar.bz2 5825
+RMD160 5aee3bb6679e8e20b685bfef0d4c86b94f7bee15 vlc-patches-45.tar.bz2 5825
+SHA256 2dccd7baec3f977cc8576610c333b1f5b655cd0f50391c3efc2f9069be70ca39 vlc-patches-45.tar.bz2 5825
+MD5 3787a8deaa6985f088781411691c2a0b vlc-snapshot-20080110.tar.bz2 13168158
+RMD160 d02a5be78953315d2a12236ff50c16d0de557cd0 vlc-snapshot-20080110.tar.bz2 13168158
+SHA256 735180bc21adf1696039c3b8b67d63f14496bd299ab966374eb5e72dc09c193a vlc-snapshot-20080110.tar.bz2 13168158
diff --git a/media-video/vlc/vlc-0.9.0_alpha20080110.ebuild b/media-video/vlc/vlc-0.9.0_alpha20080110.ebuild
new file mode 100644
index 000000000000..731a1ea8f0e5
--- /dev/null
+++ b/media-video/vlc/vlc-0.9.0_alpha20080110.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080110.ebuild,v 1.1 2008/01/10 22:21:26 aballier Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit eutils wxwidgets multilib autotools toolchain-funcs gnome2 nsplugins qt4
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+VLC_SNAPSHOT_TIME="0008"
+
+RESTRICT="test"
+
+# Used for live ebuilds
+# ESVN_REPO_URI="svn://svn.videolan.org/vlc/trunk"
+# ESVN_PROJECT="${PN}-trunk"
+# ESVN_BOOTSTRAP="bootstrap"
+# ESVN_PATCHES="${WORKDIR}/patches/*.patch"
+
+PATCHLEVEL="45"
+M4_TARBALL_VERSION="1"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+if [[ "${P}" == *_alpha* ]]; then # Snapshots taken from nightlies.videolan.org
+	SRC_URI="http://nightlies.videolan.org/build/source/trunk-${PV/*_alpha/}-${VLC_SNAPSHOT_TIME}/${PN}-snapshot-${PV/*_alpha/}.tar.bz2"
+	MY_P="${P/_alpha*/}-svn"
+elif [[ "${P}" == *_p* ]]; then # Snapshots
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	MY_P="${P}"
+elif [[ "${MY_P}" == "${P}" ]]; then
+	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
+fi
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
+	mirror://gentoo/${PN}-m4-${M4_TARBALL_VERSION}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="3dfx a52 aac aalib alsa altivec arts avahi bidi cdda cddb cdio daap dbus dc1394
+	debug directfb dts dvb dvd esd fbcon ffmpeg flac ggi gnome gnutls hal httpd
+	id3tag jack libcaca libgcrypt libnotify lirc live lua matroska mmx modplug mp3 mpeg
+	musepack musicbrainz ncurses nsplugin ogg opengl optimisememory oss png pvr qt4
+	rtsp samba sdl sdl-image seamonkey shout skins speex sse stream svg svga taglib
+	theora truetype twolame upnp v4l v4l2 vcd vcdx vlm vorbis win32codecs wxwindows
+	X x264 xinerama xml xosd xulrunner xv"
+
+RDEPEND="
+		sys-libs/zlib
+		media-libs/libdvbpsi
+		3dfx? ( media-libs/glide-v3 )
+		a52? ( >=media-libs/a52dec-0.7.4-r3 )
+		aalib? ( media-libs/aalib )
+		aac? ( >=media-libs/faad2-2.6.1 )
+		alsa? ( media-libs/alsa-lib )
+		arts? ( kde-base/arts )
+		avahi? ( >=net-dns/avahi-0.6 )
+		bidi? ( >=dev-libs/fribidi-0.10.4 )
+		cdda? ( >=dev-libs/libcdio-0.72
+			cddb? ( >=media-libs/libcddb-1.2.0 ) )
+		cdio? ( >=dev-libs/libcdio-0.78.2
+			>=media-video/vcdimager-0.7.22 )
+		daap? ( >=media-libs/libopendaap-0.3.0 )
+		dbus? ( >=sys-apps/dbus-1.0.2 )
+		dc1394? ( sys-libs/libraw1394
+			<media-libs/libdc1394-1.9.99 )
+		directfb? ( dev-libs/DirectFB )
+		dts? ( media-libs/libdca )
+		dvd? (	media-libs/libdvdread
+				media-libs/libdvdcss
+				>=media-libs/libdvdnav-0.1.9
+				media-libs/libdvdplay )
+		esd? ( media-sound/esound )
+		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
+		flac? ( media-libs/libogg
+			>=media-libs/flac-1.1.2 )
+		ggi? ( media-libs/libggi )
+		gnome? ( gnome-base/gnome-vfs )
+		gnutls? ( >=net-libs/gnutls-1.3.3 >=dev-libs/libgcrypt-1.2.0 )
+		hal? ( sys-apps/hal )
+		id3tag? ( media-libs/libid3tag
+			sys-libs/zlib )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
+		libcaca? ( media-libs/libcaca )
+		libgcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
+		libnotify? ( x11-libs/libnotify )
+		lirc? ( app-misc/lirc )
+		live? ( >=media-plugins/live-2007.02.20 )
+		lua? ( >=dev-lang/lua-5.1 )
+		matroska? (
+			>=dev-libs/libebml-0.7.6
+			>=media-libs/libmatroska-0.8.0 )
+		modplug? ( media-libs/libmodplug )
+		mp3? ( media-libs/libmad )
+		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
+		musepack? ( media-libs/libmpcdec )
+		musicbrainz? ( =media-libs/musicbrainz-2* )
+		ncurses? ( sys-libs/ncurses )
+		nsplugin? (
+			xulrunner? ( net-libs/xulrunner )
+			!xulrunner? ( seamonkey? ( www-client/seamonkey ) )
+			!xulrunner? ( !seamonkey? ( www-client/mozilla-firefox ) )
+		)
+		ogg? ( media-libs/libogg )
+		png? ( media-libs/libpng )
+		qt4? ( $(qt4_min_version 4.2.0 ) )
+		samba? ( net-fs/samba )
+		sdl? ( >=media-libs/libsdl-1.2.8
+			sdl-image? ( media-libs/sdl-image ) )
+		shout? ( media-libs/libshout )
+		speex? ( media-libs/speex )
+		svg? ( >=gnome-base/librsvg-2.9.0 )
+		svga? ( media-libs/svgalib )
+		taglib? ( media-libs/taglib )
+		theora? ( media-libs/libtheora )
+		truetype? ( media-libs/freetype
+			media-fonts/ttf-bitstream-vera )
+		twolame? ( media-sound/twolame )
+		upnp? ( net-libs/libupnp )
+		vorbis? ( media-libs/libvorbis )
+		win32codecs? ( media-libs/win32codecs )
+		wxwindows? ( =x11-libs/wxGTK-2.6* )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			xv? ( x11-libs/libXv )
+			xinerama? ( x11-libs/libXinerama )
+			opengl? ( virtual/opengl )
+		)
+		x264? ( >=media-libs/x264-svn-20061014 )
+		xml? ( dev-libs/libxml2 )
+		xosd? ( x11-libs/xosd )
+		"
+
+# Disabled features and reasons:
+# xvmc? ( x11-libs/libXvMC )
+#	Will probably compile only on x86
+# dirac? ( media-video/dirac )
+#	Needs testing but can be ok
+# zvbi? ( >=media-libs/zvbi-0.2.25 )
+#	Dep not up to date enough
+# fluidsynth? ( media-sound/fluidsynth )
+#	Will enable it later
+
+DEPEND="${RDEPEND}
+	dvb? ( sys-kernel/linux-headers )
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( sys-kernel/linux-headers )
+	X? ( xinerama? ( x11-proto/xineramaproto ) )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# Dispalys a warning if the first use flag is set but not the second
+vlc_use_needs() {
+	use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
+}
+
+pkg_setup() {
+	if use wxwindows; then
+		WX_GTK_VER="2.6"
+		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
+	fi
+	vlc_use_needs skins truetype
+	vlc_use_needs skins wxwindows
+	vlc_use_needs cdda cdio
+	vlc_use_needs vcdx cdio
+	vlc_use_needs libgcrypt gnutls
+	vlc_use_needs bidi truetype
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf
+}
+
+src_compile () {
+	local XPIDL=""
+	local MOZILLA_CONFIG=""
+
+	use vlm && \
+		myconf="${myconf} --enable-vlm --enable-sout" || \
+		myconf="${myconf} --disable-vlm"
+
+	if use nsplugin; then
+		if use xulrunner; then
+			XPIDL=/usr/$(get_libdir)/xulrunner
+			MOZILLA_CONFIG=/usr/bin/xulrunner-config
+		elif use seamonkey; then
+			XPIDL=/usr/$(get_libdir)/seamonkey
+			MOZILLA_CONFIG=/usr/$(get_libdir)/seamonkey/seamonkey-config
+		else
+			XPIDL=/usr/$(get_libdir)/mozilla-firefox
+			MOZILLA_CONFIG=/usr/$(get_libdir)/mozilla-firefox/firefox-config
+		fi
+	fi
+
+	econf \
+		$(use_enable 3dfx glide) \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable aac faad) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		$(use_enable arts) \
+		$(use_enable avahi bonjour) \
+		$(use_enable bidi fribidi) \
+		$(use_enable cdda) $(use_enable cdda cddax)\
+		$(use_enable cddb libcddb) \
+		$(use_enable cdio libcdio) \
+		$(use_enable daap) \
+		$(use_enable dbus) $(use_enable dbus dbus-control) \
+		--disable-dirac \
+		$(use_enable directfb) \
+		$(use_enable dc1394) \
+		$(use_enable dts dca) \
+		--disable-dv \
+		$(use_enable dvb) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \
+		$(use_enable esd) \
+		$(use_enable fbcon fb) \
+		$(use_enable ffmpeg) \
+		$(use_enable flac) \
+		--disable-fluidsynth \
+		--disable-galaktos \
+		$(use_enable ggi) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable gnutls) \
+		$(use_enable hal) \
+		$(use_enable httpd) \
+		$(use_enable id3tag) \
+		$(use_enable jack) \
+		$(use_enable libcaca caca) \
+		$(use_enable libgcrypt) \
+		$(use_enable libnotify notify) \
+		--disable-libtar \
+		$(use_enable lirc) \
+		$(use_enable live live555) \
+		$(use_enable lua) \
+		$(use_enable matroska mkv) \
+		$(use_enable mmx) \
+		$(use_enable modplug mod) \
+		$(use_enable mp3 mad) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable musepack mpc) \
+		$(use_enable musicbrainz) \
+		$(use_enable ncurses) \
+		$(use_enable nsplugin mozilla) XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
+		$(use_enable ogg) \
+		$(use_enable opengl glx) $(use_enable opengl) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable oss) \
+		$(use_enable png) \
+		--disable-portaudio \
+		$(use_enable pvr) \
+		$(use_enable qt4) \
+		$(use_enable rtsp) $(use_enable rtsp realrtsp) \
+		$(use_enable samba smb) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable shout) \
+		$(use_enable skins skins2) \
+		$(use_enable speex) \
+		$(use_enable sse) \
+		$(use_enable stream sout) \
+		$(use_enable svg) \
+		$(use_enable svga svgalib) \
+		$(use_enable taglib) \
+		$(use_enable theora) \
+		$(use_enable truetype freetype) \
+		$(use_enable twolame) \
+		$(use_enable upnp) \
+		$(use_enable v4l) \
+		$(use_enable v4l2) \
+		$(use_enable vcd) \
+		$(use_enable vcdx) \
+		$(use_enable vorbis) \
+		$(use_enable win32codecs loader) \
+		$(use_enable wxwindows wxwidgets) WX_CONFIG="${WX_CONFIG}" \
+		$(use_enable X x11) $(use_enable X screen) \
+		$(use_enable x264) \
+		$(use_enable xinerama) \
+		$(use_enable xml libxml2) \
+		$(use_enable xosd) \
+		$(use_enable xv xvideo) \
+		--disable-xvmc \
+		--disable-zvbi \
+		--disable-libvc1 \
+		--disable-snapshot \
+		--disable-growl \
+		--disable-pth \
+		--disable-optimizations \
+		--enable-utf8 \
+		--enable-libtool \
+		--enable-fast-install \
+		${myconf} || die "configuration failed"
+
+	if [[ $(gcc-major-version) == 2 ]]; then
+		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	fi
+
+	emake || die "make of VLC failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \
+		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
+
+	rm -rf "${D}/usr/share/doc/vlc" \
+		"${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
+
+	if use nsplugin; then
+		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+		mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
+			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
+	fi
+
+	use skins || rm -rf "${D}/usr/share/vlc/skins2"
+
+	for res in 16 32 48; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
+		newins "${S}"/share/vlc${res}x${res}.png vlc.png
+	done
+}