New revision which now uses wxGTK 2.6 instead of 2.4. Added patch to disable hal support in configure (just for -r3 for now). Moved patches into patchset tarball and removed from files. Converted from gcc to toolchain-funcs eclass.

(Portage version: 2.0.51.21-r1)

14 files changed, 283 insertions, 99 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 5ed60fdccdc9..2e46fd7672b7 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.84 2005/05/09 08:48:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.85 2005/05/14 23:36:51 flameeyes Exp $
+
+*vlc-0.8.1-r3 (14 May 2005)
+
+  14 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/vlc-0.8.1-bool.patch, -files/vlc-0.8.1-matroska-shared.patch,
+  -files/vlc-0.8.1-time.patch, vlc-0.6.2.ebuild, vlc-0.6.2-r1.ebuild,
+  vlc-0.7.2.ebuild, vlc-0.8.1-r1.ebuild, vlc-0.8.1-r2.ebuild,
+  +vlc-0.8.1-r3.ebuild:
+  New revision which now uses wxGTK 2.6 instead of 2.4. Added patch to disable
+  hal support in configure (just for -r3 for now). Moved patches into patchset
+  tarball and removed from files. Converted from gcc to toolchain-funcs
+  eclass.
 
   09 May 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild,
   vlc-0.8.1-r2.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 346266002128..04b2b67bd7b4 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,18 +1,20 @@
-MD5 dd94be1e8971f0a7249d4e0da46e7f49 vlc-0.7.2.ebuild 6002
-MD5 fda1a95dc5a8aa555e11bda46094bcf8 vlc-0.6.2-r1.ebuild 6491
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 48b0337bfeb06af16f6546abae23d01c ChangeLog 16990
-MD5 11c9c7c06546f9197b80e060d9721c66 vlc-0.6.2.ebuild 5539
-MD5 fb557a0d65463c76ba884a9bd4c92c3d vlc-0.8.1-r2.ebuild 7163
-MD5 241a839ad6a91f404db7d5257bfcfd1f vlc-0.8.1-r1.ebuild 6818
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 7583a9de6fb67e5cd2936961f10b9e79 vlc-0.6.2-r1.ebuild 6503
+MD5 bc5bbb237d38ba8961fbf6d2f39bb5f8 vlc-0.6.2.ebuild 5551
+MD5 bb714fa8895d16736d15fd993525a6ae vlc-0.7.2.ebuild 6014
+MD5 e9bc3ea5fe9fad95b55f56819deac5bb vlc-0.8.1-r1.ebuild 6949
+MD5 b2296d525819bb4d826bf80e72045495 vlc-0.8.1-r2.ebuild 7164
+MD5 0c4cc3f42a9a36afa2069fbb24ba4af6 vlc-0.8.1-r3.ebuild 7148
 MD5 09c124e45049f615519ded3278a97376 files/0.6.2-mozilla-fix.patch 1261
 MD5 d766f772e3e3be4f8d6cbf4d54bf2700 files/digest-vlc-0.6.2 63
+MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202
 MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2 63
-MD5 77f4e9cceacd8059c3e1c8322a14c30a files/digest-vlc-0.8.1-r1 63
+MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
+MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r2 127
 MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744
 MD5 0ee383795d543048e4d47eb58f6d36bb files/mpeg2dec-20030612-configure.in-fpic.patch 1065
-MD5 40bcf94b78e4cb16470b8dd2673adb06 files/vlc-0.8.1-time.patch 403
-MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202
-MD5 f05d1c4b4158bf362dd4611e1dc34257 files/vlc-0.8.1-matroska-shared.patch 916
-MD5 77f4e9cceacd8059c3e1c8322a14c30a files/digest-vlc-0.8.1-r2 63
 MD5 9cbda09314f25e82e4929f0a245a3ceb files/vlc-0.8.1-bool.patch 920
+MD5 f05d1c4b4158bf362dd4611e1dc34257 files/vlc-0.8.1-matroska-shared.patch 916
+MD5 40bcf94b78e4cb16470b8dd2673adb06 files/vlc-0.8.1-time.patch 403
+MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r3 127
diff --git a/media-video/vlc/files/digest-vlc-0.8.1-r1 b/media-video/vlc/files/digest-vlc-0.8.1-r1
index ebd3c42b8d90..7bf5ab8b833c 100644
--- a/media-video/vlc/files/digest-vlc-0.8.1-r1
+++ b/media-video/vlc/files/digest-vlc-0.8.1-r1
@@ -1 +1,2 @@
 MD5 9cdf6d70d51dad30d198edfa96047529 vlc-0.8.1.tar.bz2 4877791
+MD5 2c417872741c9eefc3987b461100a12c vlc-patches-1.tar.bz2 2149
diff --git a/media-video/vlc/files/digest-vlc-0.8.1-r2 b/media-video/vlc/files/digest-vlc-0.8.1-r2
index ebd3c42b8d90..7bf5ab8b833c 100644
--- a/media-video/vlc/files/digest-vlc-0.8.1-r2
+++ b/media-video/vlc/files/digest-vlc-0.8.1-r2
@@ -1 +1,2 @@
 MD5 9cdf6d70d51dad30d198edfa96047529 vlc-0.8.1.tar.bz2 4877791
+MD5 2c417872741c9eefc3987b461100a12c vlc-patches-1.tar.bz2 2149
diff --git a/media-video/vlc/files/digest-vlc-0.8.1-r3 b/media-video/vlc/files/digest-vlc-0.8.1-r3
new file mode 100644
index 000000000000..7bf5ab8b833c
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.8.1-r3
@@ -0,0 +1,2 @@
+MD5 9cdf6d70d51dad30d198edfa96047529 vlc-0.8.1.tar.bz2 4877791
+MD5 2c417872741c9eefc3987b461100a12c vlc-patches-1.tar.bz2 2149
diff --git a/media-video/vlc/files/vlc-0.8.1-bool.patch b/media-video/vlc/files/vlc-0.8.1-bool.patch
deleted file mode 100644
index 10c7d57b1ed6..000000000000
--- a/media-video/vlc/files/vlc-0.8.1-bool.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur vlc-0.8.1/modules/gui/ncurses.c vlc-0.8.1-ncurses/modules/gui/ncurses.c
---- vlc-0.8.1/modules/gui/ncurses.c	2004-11-06 17:35:17.000000000 +0100
-+++ vlc-0.8.1-ncurses/modules/gui/ncurses.c	2005-05-07 13:52:03.661397416 +0200
-@@ -875,7 +875,7 @@
- 
- static void SearchPlaylist( intf_thread_t *p_intf, char *psz_searchstring )
- {
--    bool b_ok = false;
-+    vlc_bool_t b_ok = VLC_FALSE;
-     int i_current;
-     int i_first = 0 ;
-     int i_item = -1;
-@@ -900,7 +900,7 @@
-                            psz_searchstring ) != NULL )
-         {
-             i_item = i_current;
--            b_ok = true;
-+            b_ok = VLC_TRUE;
-             break;
-         }
-     }
-@@ -914,7 +914,7 @@
-                                psz_searchstring ) != NULL )
-             {
-                 i_item = i_current;
--                b_ok = true;
-+                b_ok = VLC_TRUE;
-                 break;
-             }
-         }
diff --git a/media-video/vlc/files/vlc-0.8.1-matroska-shared.patch b/media-video/vlc/files/vlc-0.8.1-matroska-shared.patch
deleted file mode 100644
index fbccda2eba02..000000000000
--- a/media-video/vlc/files/vlc-0.8.1-matroska-shared.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur vlc-0.8.1/configure.ac vlc-0.8.1-matroska/configure.ac
---- vlc-0.8.1/configure.ac	2004-11-14 17:10:56.000000000 +0100
-+++ vlc-0.8.1-matroska/configure.ac	2005-04-24 23:27:48.786094568 +0200
-@@ -1732,16 +1732,10 @@
-     AC_CHECK_HEADERS(matroska/KaxVersion.h, [
-       AC_CHECK_HEADERS(matroska/KaxAttachments.h)
-       VLC_ADD_CXXFLAGS([mkv],[])
--      AC_CHECK_LIB(ebml_pic, main, [
-+      AC_CHECK_LIB(ebml, main, [
-         # We have ebml_pic, that's good, we can build an mkv.so plugin !
-         VLC_ADD_PLUGINS([mkv])
--        VLC_ADD_LDFLAGS([mkv],[-lmatroska_pic -lebml_pic])
--      ], [
--        AC_CHECK_LIB(ebml, main, [
--          # We only have libebml, make mkv.a a builtin
--          VLC_ADD_BUILTINS([mkv])
--          VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
--        ])
-+        VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
-       ])
-     ])
-   ])
-Only in vlc-0.8.1-matroska: configure.ac~
diff --git a/media-video/vlc/files/vlc-0.8.1-time.patch b/media-video/vlc/files/vlc-0.8.1-time.patch
deleted file mode 100644
index 4e236c6f4e69..000000000000
--- a/media-video/vlc/files/vlc-0.8.1-time.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uprN modules.orig/video_filter/time.c modules/video_filter/time.c
---- modules.orig/video_filter/time.c	2005-04-13 16:30:59.000000000 +0200
-+++ modules/video_filter/time.c	2005-04-13 16:31:28.000000000 +0200
-@@ -27,6 +27,8 @@
- #include <stdlib.h>                                      /* malloc(), free() */
- #include <string.h>
- 
-+#include <time.h>
-+
- #include <vlc/vlc.h>
- #include <vlc/vout.h>
- 
diff --git a/media-video/vlc/vlc-0.6.2-r1.ebuild b/media-video/vlc/vlc-0.6.2-r1.ebuild
index e418d23cc4c1..3ce63e5af495 100644
--- a/media-video/vlc/vlc-0.6.2-r1.ebuild
+++ b/media-video/vlc/vlc-0.6.2-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2-r1.ebuild,v 1.20 2005/04/20 13:45:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2-r1.ebuild,v 1.21 2005/05/14 23:36:51 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
 #	theora - package not in portage yet - experimental
 #	tremor - package not in portage yet - experimental
 
-inherit gcc eutils libtool
+inherit toolchain-funcs eutils libtool
 
 PFFM=ffmpeg-20030813
 PMPG=mpeg2dec-20030612
diff --git a/media-video/vlc/vlc-0.6.2.ebuild b/media-video/vlc/vlc-0.6.2.ebuild
index 55959cde66d0..dab72093a847 100644
--- a/media-video/vlc/vlc-0.6.2.ebuild
+++ b/media-video/vlc/vlc-0.6.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.26 2005/04/20 13:45:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.27 2005/05/14 23:36:51 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
 #	theora - package not in portage yet - experimental
 #	tremor - package not in portage yet - experimental
 
-inherit gcc eutils
+inherit toolchain-funcs eutils
 
 DESCRIPTION="VideoLAN Client - DVD/video player and more"
 HOMEPAGE="http://www.videolan.org/vlc/"
diff --git a/media-video/vlc/vlc-0.7.2.ebuild b/media-video/vlc/vlc-0.7.2.ebuild
index a1840824dff9..d5d5ec88c359 100644
--- a/media-video/vlc/vlc-0.7.2.ebuild
+++ b/media-video/vlc/vlc-0.7.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2.ebuild,v 1.12 2005/04/20 13:45:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2.ebuild,v 1.13 2005/05/14 23:36:51 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
 #	tremor - package not in portage yet - experimental
 
-inherit libtool gcc eutils
+inherit libtool toolchain-funcs eutils
 
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
diff --git a/media-video/vlc/vlc-0.8.1-r1.ebuild b/media-video/vlc/vlc-0.8.1-r1.ebuild
index 346a4f76945b..b1b640ca291f 100644
--- a/media-video/vlc/vlc-0.8.1-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.1-r1.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r1.ebuild,v 1.9 2005/05/09 08:48:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r1.ebuild,v 1.10 2005/05/14 23:36:51 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
 #	tremor - package not in portage yet - experimental
 #	ncurses - needs a patch which is applied in -r2, disabled here
 
-inherit libtool gcc eutils wxwidgets
+inherit libtool toolchain-funcs eutils wxwidgets
 
+PATCHLEVEL="1"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
-SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -91,10 +93,8 @@ src_unpack() {
 	# Fix the default font
 	sed -i -e "s:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/ttf-bitstream-vera/VeraBd.ttf:" modules/misc/freetype.c
 
-	cd ${S}
-	epatch ${FILESDIR}/${P}-time.patch
-	cd ${S}/modules/video_output
-	epatch ${FILESDIR}/glide.patch
+	EPATCH_EXCLUDE="01_all_nohal.patch 00_all_bool.patch 00_all_matroska-shared.patch"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
 }
 
 src_compile () {
diff --git a/media-video/vlc/vlc-0.8.1-r2.ebuild b/media-video/vlc/vlc-0.8.1-r2.ebuild
index 471212224733..2a4c0a02377a 100644
--- a/media-video/vlc/vlc-0.8.1-r2.ebuild
+++ b/media-video/vlc/vlc-0.8.1-r2.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r2.ebuild,v 1.4 2005/05/09 08:48:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r2.ebuild,v 1.5 2005/05/14 23:36:51 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
 #	tremor - package not in portage yet - experimental
 
-inherit libtool gcc eutils wxwidgets
+inherit libtool toolchain-funcs eutils wxwidgets
 
+PATCHLEVEL="1"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
-SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -93,7 +95,8 @@ src_unpack() {
 	# We only have glide v3 in portage
 	cd ${S}
 
-	epatch ${FILESDIR}/${P}-matroska-shared.patch
+	EPATCH_EXCLUDE="01_all_nohal.patch"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
 
 	./bootstrap
 
@@ -104,11 +107,6 @@ src_unpack() {
 	# Fix the default font
 	sed -i -e "s:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/ttf-bitstream-vera/VeraBd.ttf:" modules/misc/freetype.c
 
-	cd ${S}
-	epatch ${FILESDIR}/${P}-time.patch
-	epatch ${FILESDIR}/${P}-bool.patch
-	cd ${S}/modules/video_output
-	epatch ${FILESDIR}/glide.patch
 }
 
 src_compile () {
diff --git a/media-video/vlc/vlc-0.8.1-r3.ebuild b/media-video/vlc/vlc-0.8.1-r3.ebuild
new file mode 100644
index 000000000000..ef4fee43556d
--- /dev/null
+++ b/media-video/vlc/vlc-0.8.1-r3.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r3.ebuild,v 1.1 2005/05/14 23:36:51 flameeyes Exp $
+
+# Missing support for...
+#	tarkin - package not in portage yet - experimental
+#	tremor - package not in portage yet - experimental
+
+inherit libtool toolchain-funcs eutils wxwidgets
+
+PATCHLEVEL="1"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick mozilla hal stream mad xv bidi gtk2 sdl ssl"
+
+RDEPEND="hal? ( =sys-apps/hal-0.4* )
+		cdio? ( >=dev-libs/libcdio-0.70 )
+		cddb? ( >=media-libs/libcddb-0.9.4 )
+		live? ( >=media-plugins/live-2005.01.29 )
+		dvd? (  media-libs/libdvdread
+				media-libs/libdvdcss
+				>=media-libs/libdvdnav-0.1.9
+				media-libs/libdvdplay )
+		esd? ( media-sound/esound )
+		ogg? ( media-libs/libogg )
+		matroska? ( >=media-libs/libmatroska-0.7.3-r1 )
+		mad? ( media-libs/libmad )
+		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
+		a52? ( media-libs/a52dec )
+		dts? ( media-libs/libdts )
+		flac? ( media-libs/flac )
+		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
+		vorbis? ( media-libs/libvorbis )
+		theora? ( media-libs/libtheora )
+		X? ( virtual/x11 )
+		xv? ( virtual/x11 )
+		freetype? ( media-libs/freetype
+			media-fonts/ttf-bitstream-vera )
+		svga? ( media-libs/svgalib )
+		ggi? ( media-libs/libggi )
+		aalib? ( media-libs/aalib )
+		libcaca? ( media-libs/libcaca )
+		arts? ( kde-base/arts )
+		alsa? ( virtual/alsa )
+		wxwindows? ( =x11-libs/wxGTK-2.6* )
+		ncurses? ( sys-libs/ncurses )
+		xosd? ( x11-libs/xosd )
+		lirc? ( app-misc/lirc )
+		mozilla? ( www-client/mozilla )
+		3dfx? ( media-libs/glide-v3 )
+		bidi? ( >=dev-libs/fribidi-0.10.4 )
+		gnutls? ( >=net-libs/gnutls-1.0.0 )
+		opengl? ( virtual/opengl )
+		sys-libs/zlib
+		media-libs/libpng
+		media-libs/libdvbpsi
+		aac?( >=media-libs/faad2-2.0-r2 )
+		sdl? ( >=media-libs/libsdl-1.2.8 )
+		ssl? ( net-libs/gnutls )"
+#		threads? ( dev-libs/pth )
+#		portaudio? ( >=media-libs/portaudio-0.19 )
+
+DEPEND="${RDEPEND}
+	dev-util/cvs
+	>=sys-devel/gettext-0.11.5
+	=sys-devel/automake-1.6*
+	sys-devel/autoconf
+	dev-util/pkgconfig"
+
+
+pkg_setup() {
+	if use wxwindows; then
+		WX_GTK_VER="2.6"
+		if use gtk2; then
+			if use unicode; then
+				need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
+			else
+				need-wxwidgets gtk2 || die "You need to install wxGTK with gtk2 support."
+			fi
+		else
+			need-wxwidgets gtk || die "You need to install wxGTK with gtk support."
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# We only have glide v3 in portage
+	cd ${S}
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
+
+	./bootstrap
+
+	sed -i -e \
+		"s:/usr/include/glide:/usr/include/glide3:;s:glide2x:glide3:" \
+		configure || die "sed glibc failed."
+
+	# Fix the default font
+	sed -i -e "s:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/ttf-bitstream-vera/VeraBd.ttf:" modules/misc/freetype.c
+}
+
+src_compile () {
+	# Avoid timestamp skews with autotools
+	touch configure.ac
+	touch aclocal.m4
+	touch configure
+	touch config.h.in
+	touch $(find . -name Makefile.in)
+
+	# reason why:
+	# skins2 interface is horribly broken for some reason.
+	# Therefore it's being disabled for the standard wxwindows
+	# interface which isn't
+	myconf="${myconf} --disable-skins2"
+
+	# reason why:
+	# cddax needs all this stuff to work
+	if use cdio && use cddb && use cdda ; then
+		myconf="${myconf} --enable-cddax"
+	else
+		myconf="${myconf} --disable-cddax"
+	fi
+
+	# reason why:
+	# mozilla-config is not in ${PATH}
+	# so the configure script won't find it
+	# unless we setup the proper variable
+	if use mozilla ; then
+		myconf="${myconf} --enable-mozilla MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config"
+	else
+		myconf="${myconf} --disable-mozilla"
+	fi
+
+	# Portaudio support needs at least v19
+	# pth (threads) support is quite unstable with latest ffmpeg/libmatroska.
+	econf \
+		$(use_enable altivec) \
+		$(use_enable unicode utf8) \
+		$(use_enable stream sout) \
+		$(use_enable httpd) \
+		$(use_enable vlm) \
+		$(use_enable gnutls) \
+		$(use_enable v4l) \
+		$(use_enable cdda ) \
+		$(use_enable vcd ) \
+		$(use_enable dvb) \
+		$(use_enable dvb pvr) \
+		$(use_enable ogg) \
+		$(use_enable matroska mkv) \
+		$(use_enable flac) \
+		$(use_enable vorbis) \
+		$(use_enable theora) \
+		$(use_enable X x11) \
+		$(use_enable xv xvideo) \
+		$(use_enable opengl glx) $(use_enable opengl) \
+		$(use_enable freetype) \
+		$(use_enable bidi fribidi) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \
+		$(use_enable fbcon fb) \
+		$(use_enable svga svgalib) \
+		$(use_enable 3dfx glide) \
+		$(use_enable aalib aa) \
+		$(use_enable libcaca caca) \
+		$(use_enable oss) \
+		$(use_enable esd) \
+		$(use_enable arts) \
+		$(use_enable alsa) \
+		$(use_enable wxwindows) \
+		$(use_enable ncurses) \
+		$(use_enable xosd) \
+		$(use_enable lirc) \
+		$(use_enable joystick) \
+		$(use_enable live livedotcom) $(use_with live livedotcom-tree /usr/lib/live) \
+		$(use_enable mad) \
+		$(use_enable ffmpeg) \
+		$(use_enable aac faad) \
+		$(use_enable a52) \
+		$(use_enable dts) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable ggi) \
+		$(use_enable 3dfx glide) \
+		$(use_enable sdl) \
+		$(use_enable ssl gnutls) \
+		$(use_enable hal) \
+		--disable-pth \
+		--disable-portaudio \
+		${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
+
+	# reason why:
+	# looks for xpidl in /usr/lib/mozilla/xpidl
+	# and doesn't find it there because it's
+	# in /usr/bin! - ChrisWhite
+	if use mozilla; then
+		sed -e "s:^XPIDL = .*:XPIDL = /usr/bin/xpidl:" -i mozilla/Makefile \
+		|| die "could not fix XPIDL path"
+	fi
+
+	MAKEOPTS="${MAKEOPTS} -j1"
+	emake || die "make of VLC failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed!"
+
+	dodoc ABOUT-NLS AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \
+		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
+
+	rm -r ${D}/usr/share/vlc/vlc*.png ${D}/usr/share/vlc/vlc*.xpm ${D}/usr/share/vlc/vlc*.ico \
+		${D}/usr/share/vlc/kvlc*.png ${D}/usr/share/vlc/kvlc*.xpm ${D}/usr/share/vlc/qvlc*.png \
+		${D}/usr/share/vlc/qvlc*.xpm ${D}/usr/share/vlc/gvlc*.png ${D}/usr/share/vlc/gvlc*.xpm \
+		${D}/usr/share/vlc/gvlc*.ico ${D}/usr/share/vlc/gnome-vlc*.png \
+		${D}/usr/share/vlc/gnome-vlc*.xpm ${D}/usr/share/vlc/skins2 \
+		${D}/usr/share/doc/vlc
+
+	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
+
+	make_desktop_entry vlc "VLC Media Player" vlc "AudioVideo;Player"
+}