Removing -r2 for real now

4 files changed, 40 insertions, 242 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 9e5d1e90d3a3..0dc9eddab7e2 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.26 2003/07/19 18:13:20 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.27 2003/07/20 07:45:01 raker Exp $
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0-r1.ebuild:
+  Added the dvb USE variable.  Added a comment re: truetype for 0.6.1
+  Now showing the whole list of IUSE variables.  Updated
+  wxwindows dependancy to >=wxGTK-2.4.1 as 2.4.0 has problems.
+  Added -i to kde-related sed statements.  Re-worded some comments.
+  General ebuild beautification.
 
   19 Jul 2003; Nick Hadaway <raker@gentoo.org>:
   Removed unneeded vlc-0.6.0-r2.ebuild.
diff --git a/media-video/vlc/files/digest-vlc-0.6.0-r2 b/media-video/vlc/files/digest-vlc-0.6.0-r2
deleted file mode 100644
index 9696a1b88ca9..000000000000
--- a/media-video/vlc/files/digest-vlc-0.6.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f985a6e94dd411681b0b81e414f11e6 vlc-0.6.0.tar.bz2 2844463
diff --git a/media-video/vlc/vlc-0.6.0-r1.ebuild b/media-video/vlc/vlc-0.6.0-r1.ebuild
index bae0f5aa5bda..59469625532e 100644
--- a/media-video/vlc/vlc-0.6.0-r1.ebuild
+++ b/media-video/vlc/vlc-0.6.0-r1.ebuild
@@ -1,13 +1,21 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.0-r1.ebuild,v 1.1 2003/07/16 23:38:40 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.0-r1.ebuild,v 1.2 2003/07/20 07:45:01 raker Exp $
+
+# Missing support for...
+#	tarkin - package not in portage yet
+#	theora - package not in portage yet
+#	tremor - package not in portage yet
+#	matroska - talking with vlc developers
+#	gtk2 - still experimental? - need more info
 
-# NOTE: Some ideas for version specifics, etc...  have been referenced 
-# from the videolan.org ebuild.  Thanks guys!
 
-IUSE="arts qt ncurses dvd gtk nls 3dfx matrox svga fbcon esd kde X alsa ggi oggvorbis gnome xv oss sdl aalib slp truetype v4l xvid lirc wxwindows imlib mozilla"
+IUSE="arts qt ncurses dvd gtk nls 3dfx matrox svga fbcon esd kde X alsa \ 
+      ggi oggvorbis gnome xv oss sdl aalib slp truetype v4l xvid lirc  \
+      wxwindows imlib mozilla dvb"
 
 S=${WORKDIR}/${P}
+
 DESCRIPTION="VideoLAN Client - DVD/video player and more"
 SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 HOMEPAGE="http://www.videolan.org/vlc"
@@ -20,6 +28,8 @@ DEPEND="X? ( virtual/x11 )
 	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
 	alsa? ( >=media-libs/alsa-lib-0.9_rc2 )
 	arts? ( kde-base/kdelibs )
+	dvb? ( media-libs/libdvb
+		media-tv/linuxtv-dvb )
 	dvd? ( >=media-libs/libdvdread-0.9.3
 		>=media-libs/libdvdcss-1.2.6
 		>=media-libs/libdvdplay-1.0.1 )
@@ -40,7 +50,7 @@ DEPEND="X? ( virtual/x11 )
 	sdl? ( >=media-libs/libsdl-1.2.5 )
 	slp? ( >=net-libs/openslp-1.0.10 )
 	truetype? ( >=media-libs/freetype-2.1.4 )
-	wxwindows? ( >=x11-libs/wxGTK-2.4.0 )
+	wxwindows? ( >=x11-libs/wxGTK-2.4.1 )
 	xvid? ( >=media-libs/xvid-0.9.1 )
 	>=media-libs/a52dec-0.7.4
 	>=media-libs/faad2-1.1
@@ -48,17 +58,12 @@ DEPEND="X? ( virtual/x11 )
 	>=media-libs/libdv-0.98
         >=media-libs/libdvbpsi-0.1.2
 	>media-video/ffmpeg-0.4.6
-	>media-libs/libmpeg2-0.3.1"
+	>media-libs/libmpeg2-0.3.1
+	>=media-video/mplayer-0.90"
 
-# vlc requires cvs-pulled builds of ffmpeg and libmpeg2
-# I have added these builds to portage as...
-# ffmpeg-0.4.7_pre20030624 and libmpeg2-0.3.2_pre20030625
-#   -raker@gentoo.org
-#
-# Missing support for...
-#	tarkin
-#	theora
-#	tremor
+# mplayer is a required dependancy until the libpostproc code becomes
+# a separate packages or until ffmpeg get support for installing
+# the library.
 
 # get kde and arts paths
 if [ -n "`use kde`" -o -n "`use arts`" ]; then
@@ -68,40 +73,33 @@ if [ -n "`use kde`" -o -n "`use arts`" ]; then
 fi
 
 src_unpack() {
-	
 	unpack ${A}
 	cd ${S}
 
+	# This should be fixed in 0.6.1
 	epatch ${FILESDIR}/mozplugin.patch
 
 	# if qt3 is installed, patch vlc to work with it instead of qt2
 	( use qt || use kde ) && ( \
 	if [ ${QTDIR} = "/usr/qt/3" ]
 	then
-		cp configure.ac configure.ac.orig
-		sed "s:-lkfile::" \
-			configure.ac.orig > configure.ac
+		sed -i -e "s:-lkfile::" configure
 
 		cd ${S}/modules/gui/kde
-		cp interface.h interface.h.orig
-		sed "s:\(#include <kmainwindow.h>\):\1\n#include <kstatusbar.h>:" \
-			interface.h.orig > interface.h
+		sed -i -e "s:\(#include <kmainwindow.h>\):\1\n#include <kstatusbar.h>:" interface.h
 
-		cp preferences.cpp preferences.cpp.orig
-		sed 's:\("vlc preferences", true, false, \)\("Save\):\1(KGuiItem)\2:' \
-			preferences.cpp.orig > preferences.cpp
+		sed -i -e 's:\("vlc preferences", true, false, \)\("Save\):\1(KGuiItem)\2:' preferences.cpp
 	fi
 	)
 
-	# Change the location of the glide headers
+	# Change the location where glide headers are installed
 	cd ${S}
 	sed -i -e "s:/usr/include/glide:/usr/include/glide3:" configure
 }
 
 src_compile(){
-
-	cd ${S}
-	myconf=""
+	local myconf
+	myconf="--enable-release --enable-faad --enable-a52 --enable-dvbpsi"
 
 	use X || myconf="${myconf} --disable-x11"
 
@@ -173,6 +171,11 @@ src_compile(){
 		sed -i -e "s:/usr/share/idl/mozilla:/usr/lib/mozilla/include/idl:g" Makefile.in
 	fi
 
+	use dvb && myconf="${myconf} --enable-satellite --enable-pvr"
+
+	# Coming in 0.6.1 - For enabling subtitling code
+	# use truetype && myconf="${myconf} --enable-freetype"
+
 	# vlc uses its own ultraoptimized CXXFLAGS
 	# and forcing custom ones generally fails building
 	export CXXFLAGS=""
@@ -180,23 +183,14 @@ src_compile(){
 	export WANT_AUTOCONF_2_5=1
 	export WANT_AUTOMAKE_1_6=1
 
-	myconf="${myconf} \
-		--enable-release \
-		--enable-faad \
-		--enable-a52 \
-		--enable-dvbpsi"
-
-	ewarn ${myconf}
 	econf ${myconf} || die "configure of VLC failed"
 
 	make || die "make of VLC failed"
 }
 
 src_install() {
-	
 	einstall || die "make install failed"
 
 	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL* \
 	MAINTAINERS NEWS README* MODULES THANKS
-
 }
diff --git a/media-video/vlc/vlc-0.6.0-r2.ebuild b/media-video/vlc/vlc-0.6.0-r2.ebuild
deleted file mode 100644
index 9b0be49c695a..000000000000
--- a/media-video/vlc/vlc-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.0-r2.ebuild,v 1.1 2003/07/17 14:09:36 raker Exp $
-
-# NOTE: Some ideas for version specifics, etc...  have been referenced 
-# from the videolan.org ebuild.  Thanks guys!
-
-IUSE="arts qt ncurses dvd gtk nls 3dfx matrox svga fbcon esd kde X alsa ggi oggvorbis gnome xv oss sdl aalib slp truetype v4l xvid lirc wxwindows imlib mozilla"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="VideoLAN Client - DVD/video player and more"
-SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.videolan.org/vlc"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
-
-DEPEND="X? ( virtual/x11 )
-	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
-	alsa? ( >=media-libs/alsa-lib-0.9_rc2 )
-	arts? ( kde-base/kdelibs )
-	dvd? ( >=media-libs/libdvdread-0.9.3
-		>=media-libs/libdvdcss-1.2.6
-		>=media-libs/libdvdplay-1.0.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	ggi? ( >=media-libs/libggi-2.0_beta3 )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	imlib? ( >=media-libs/imlib2-1.0.6 )
-	kde? ( kde-base/kdelibs )
-	lirc? ( app-misc/lirc )
-	mad? ( media-libs/libmad media-libs/libid3tag )
-	mozilla? ( >=net-www/mozilla-1.4 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( sys-devel/gettext )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 
-	             >=media-libs/libogg-1.0 )
-	qt? ( x11-libs/qt )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	slp? ( >=net-libs/openslp-1.0.10 )
-	truetype? ( >=media-libs/freetype-2.1.4 )
-	wxwindows? ( >=x11-libs/wxGTK-2.4.0 )
-	xvid? ( >=media-libs/xvid-0.9.1 )
-	>=media-libs/a52dec-0.7.4
-	>=media-libs/faad2-1.1
-	>=media-libs/flac-1.1.0
-	>=media-libs/libdv-0.98
-        >=media-libs/libdvbpsi-0.1.2
-	>media-video/ffmpeg-0.4.6
-	>media-libs/libmpeg2-0.3.1"
-
-# vlc requires cvs-pulled builds of ffmpeg and libmpeg2
-# I have added these builds to portage as...
-# ffmpeg-0.4.7_pre20030624 and libmpeg2-0.3.2_pre20030625
-#   -raker@gentoo.org
-#
-# Missing support for...
-#	tarkin
-#	theora
-#	tremor
-
-# get kde and arts paths
-if [ -n "`use kde`" -o -n "`use arts`" ]; then
-    inherit kde-functions
-    set-kdedir 3
-    # $KDEDIR is now set to arts/kdelibs location
-fi
-
-src_unpack() {
-	
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/mozplugin.patch
-
-	# if qt3 is installed, patch vlc to work with it instead of qt2
-	( use qt || use kde ) && ( \
-	if [ ${QTDIR} = "/usr/qt/3" ]
-	then
-		cp configure.ac configure.ac.orig
-		sed "s:-lkfile::" \
-			configure.ac.orig > configure.ac
-
-		cd ${S}/modules/gui/kde
-		cp interface.h interface.h.orig
-		sed "s:\(#include <kmainwindow.h>\):\1\n#include <kstatusbar.h>:" \
-			interface.h.orig > interface.h
-
-		cp preferences.cpp preferences.cpp.orig
-		sed 's:\("vlc preferences", true, false, \)\("Save\):\1(KGuiItem)\2:' \
-			preferences.cpp.orig > preferences.cpp
-	fi
-	)
-
-	# Change the location of the glide headers
-	cd ${S}
-	sed -i -e "s:/usr/include/glide:/usr/include/glide3:" configure
-}
-
-src_compile(){
-
-	cd ${S}
-	myconf=""
-
-	use X || myconf="${myconf} --disable-x11"
-
-	use xv || myconf="${myconf} --disable-xvideo"
-
-	use ggi && myconf="${myconf} --enable-ggi"
-
-        use 3dfx && myconf="${myconf} --enable-glide"
-
-        use matrox && myconf="${myconf} --enable-mga"
-
-        use svga && myconf="${myconf} --enable-svgalib"
-
-	use sdl || myconf="${myconf} --disable-sdl"
-
-        use fbcon || myconf="${myconf} --disable-fb"
-
-        use aalib && myconf="${myconf} --enable-aa"
-
-	use dvd \
-		&& myconf="${myconf} --enable-dvdread" \
-		|| myconf="${myconf} \
-			--disable-dvd \
-			--disable-dvdread \
-			--disable-dvdplay \
-			--disable-vcd"
-
-	use alsa && myconf="${myconf} --enable-alsa"
-
-        use oss || myconf="${myconf} --disable-oss"
-
-	use esd && myconf="${myconf} --enable-esd"
-
-	use arts && myconf="${myconf} --enable-arts"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	use gtk \
-		&& myconf="${myconf} --disable-gtk2" \
-		|| myconf="${myconf} --disable-gtk --disable-gtk2"
-
-	use gnome && myconf="${myconf} --enable-gnome --disable-gnome2"
-
-	use kde && myconf="${myconf} --enable-kde"
-
-	use qt && myconf="${myconf} --enable-qt"
-
-	use ncurses && myconf="${myconf} --enable-ncurses"
-
-	use oggvorbis || myconf="${myconf} --disable-vorbis --disable-ogg"
-
-	use lirc && myconf="${myconf} --enable-lirc"
-
-	use slp || myconf="${myconf} --disable-slp"
-
-	use mad && myconf="${myconf} --enable-mad"
-
-	use v4l && myconf="${myconf} --enable-v4l"
-
-	(use imlib && use wxwindows) && myconf="${myconf} --enable-skins"
-
-	use xvid && myconf="${myconf} --enable-xvid"
-
-	if [ "`use mozilla`" ]; then 
-		myconf="${myconf} --enable-mozilla \
-			MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config \
-			XPIDL=/usr/bin/xpidl"
-		sed -i -e "s:/usr/share/idl/mozilla:/usr/lib/mozilla/include/idl:g" Makefile.am
-		sed -i -e "s:/usr/share/idl/mozilla:/usr/lib/mozilla/include/idl:g" Makefile.in
-	fi
-
-	# vlc uses its own ultraoptimized CXXFLAGS
-	# and forcing custom ones generally fails building
-	export CXXFLAGS=""
-	export CFLAGS=""
-	export WANT_AUTOCONF_2_5=1
-	export WANT_AUTOMAKE_1_6=1
-
-	myconf="${myconf} \
-		--enable-release \
-		--enable-faad \
-		--enable-a52 \
-		--enable-dvbpsi"
-
-	ewarn ${myconf}
-	econf ${myconf} || die "configure of VLC failed"
-
-	make || die "make of VLC failed"
-}
-
-src_install() {
-	
-	einstall || die "make install failed"
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL* \
-	MAINTAINERS NEWS README* MODULES THANKS
-
-}