version bump

7 files changed, 29 insertions, 172 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 065710145201..62f9932d4e5c 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.14 2002/09/28 23:36:03 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.15 2002/11/09 19:01:50 seemant Exp $
+
+*vlc-0.4.5 (09 Nov 2002)
+
+  09 Nov 2002; Seemant Kulleen <seemant@gentoo.org>  vlc-0.4.5.ebuild
+  files/digest-vlc-0.4.5 :
+
+  Version bump, thanks to: mholzer@gentoo.org (Martin Holzer) in bug #10426
 
 *vlc-0.4.4 (13 Aug 2002)
 
diff --git a/media-video/vlc/files/digest-vlc-0.4.2 b/media-video/vlc/files/digest-vlc-0.4.2
deleted file mode 100644
index 1a65277205e5..000000000000
--- a/media-video/vlc/files/digest-vlc-0.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 669304af15a819d67825692e1fc49127 vlc-0.4.2.tar.gz 1397202
diff --git a/media-video/vlc/files/digest-vlc-0.4.3 b/media-video/vlc/files/digest-vlc-0.4.3
deleted file mode 100644
index 80af7ba34eca..000000000000
--- a/media-video/vlc/files/digest-vlc-0.4.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f459aaf0be4a5f5170f7bc4355ab7e43 vlc-0.4.3.tar.gz 1401155
diff --git a/media-video/vlc/files/digest-vlc-0.4.5 b/media-video/vlc/files/digest-vlc-0.4.5
new file mode 100644
index 000000000000..a9911b07f44f
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.4.5
@@ -0,0 +1 @@
+MD5 dd25763d19e656659d8871808c257507 vlc-0.4.5.tar.gz 1452433
diff --git a/media-video/vlc/vlc-0.4.2.ebuild b/media-video/vlc/vlc-0.4.2.ebuild
deleted file mode 100644
index e83017b354d7..000000000000
--- a/media-video/vlc/vlc-0.4.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.4.2.ebuild,v 1.4 2002/10/05 05:39:16 drobbins Exp $
-
-IUSE="arts qt ncurses dvd gtk nls 3dfx esd directfb kde X alsa ggi oggvorbis gnome"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="VideoLAN Client - DVD/video player"
-SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.videolan.org"
-
-DEPEND="X? ( virtual/x11 )
-	qt? ( x11-libs/qt )
-	dvd? ( media-libs/libdvdread
-		media-libs/libdvdcss )
-	>=media-libs/libsdl-1.1.8-r1
-	esd? ( >=media-sound/esound-0.2.22 )
-	ggi? ( >=media-libs/libggi-2.0_beta3 )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	kde? ( kde-base/kdelibs )
-	arts? ( kde-base/kdelibs )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	ncurses? ( sys-libs/ncurses )
-	oggvorbis? ( media-libs/libvorbis )
-	alsa? ( >=media-libs/alsa-lib-0.9_rc2 )
-	>=media-sound/mad-0.14.2b"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	# 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.in configure.in.orig
-		sed "s:-lkfile::" \
-			configure.in.orig > configure.in
-
-		cd ${S}/plugins/kde
-		cp kde_interface.h kde_interface.h.orig
-		sed "s:\(#include <kmainwindow.h>\):\1\n#include <kstatusbar.h>:" \
-			kde_interface.h.orig > kde_interface.h
-
-		cp kde_preferences.cpp kde_preferences.cpp.orig
-		sed 's:\("vlc preferences", true, false, \)\("Save\):\1(KGuiItem)\2:' \
-			kde_preferences.cpp.orig > kde_preferences.cpp
-	fi
-	)
-}
-
-src_compile(){
-
-	use X \
-		&& myconf="${myconf} --enable-x11 --enable-xvideo" \
-		|| myconf="${myconf} --disable-x11 --disable-xvideo"
-
-	use qt \
-		&& myconf="${myconf} --enable-qt" \
-		|| myconf="${myconf} --disable-qt"
-	
-	use dvd \
-		&& myconf="${myconf} \
-			--enable-dvd \
-			--enable-dvdread \
-			--enable-vcd" \
-		|| myconf="${myconf} --disable-dvd --disable-dvdread --disable-vcd"
-	
-	use esd \
-		&& myconf="${myconf} --enable-esd" \
-		|| myconf="${myconf} --disable-esd"
-
-	use ggi \
-		&& myconf="${myconf} --enable-ggi" \
-		|| myconf="${myconf} --disable-ggi"
-
-	use gtk \
-		&& myconf="${myconf} --enable-gtk" \
-		|| myconf="${myconf} --disable-gtk"
-
-	use kde \
-		&& myconf="${myconf} --enable-kde" \
-		|| myconf="${myconf} --disable-kde"
-
-	use nls \
-		|| myconf="${myconf} --disable-nls"
-	
-	use 3dfx \
-		&& myconf="${myconf} --enable-glide" \
-		|| myconf="${myconf} --disable-glide"
-
-	use arts \
-		&& myconf="${myconf} --enable-arts" \
-		|| myconf="${myconf} --disable-arts"
-	
-	use gnome \
-		&& myconf="${myconf} --enable-gnome" \
-		|| myconf="${myconf} --disable-gnome"
-	
-	use ncurses \
-		&& myconf="${myconf} --enable-ncurses" \
-		|| myconf="${myconf} --disable-ncurses"
-	
-	use directfb \
-		&& myconf="${myconf} --enable-fb" \
-		|| myconf="${myconf} --disable-fb"
-
-	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis" \
-		|| myconf="${myconf} --disable-vorbis"
-
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
-
-	# vlc uses its own ultraoptimizaed CXXFLAGS
-	# and forcing custom ones generally fails building
-	export CXXFLAGS=""
-	export CFLAGS=""
-	
-	autoconf || die
-	
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		--host=${CHOST} \
-		--build=${CHOST} \
-		--target=${CHOST} \
-		--localstatedir=/var/state/vlc \
-		--with-sdl \
-		--disable-a52 \
-		--enable-release \
-		--enable-mad \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	dodir /usr/{bin,lib}
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL* README* MODULES TODO
-
-}
diff --git a/media-video/vlc/vlc-0.4.4.ebuild b/media-video/vlc/vlc-0.4.4.ebuild
index 021296f6b239..5bcd8f16c0ce 100644
--- a/media-video/vlc/vlc-0.4.4.ebuild
+++ b/media-video/vlc/vlc-0.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.4.4.ebuild,v 1.6 2002/10/05 05:39:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.4.4.ebuild,v 1.7 2002/11/09 19:01:50 seemant Exp $
 
 IUSE="arts qt ncurses dvd gtk nls 3dfx esd directfb kde X alsa ggi oggvorbis gnome"
 
@@ -9,6 +9,10 @@ DESCRIPTION="VideoLAN Client - DVD/video player"
 SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://www.videolan.org"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
+
 DEPEND="X? ( virtual/x11 )
 	qt? ( x11-libs/qt )
 	dvd? ( media-libs/libdvdread
@@ -29,10 +33,6 @@ DEPEND="X? ( virtual/x11 )
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
 # get kde and arts paths
 if [ -n "`use kde`" -o -n "`use arts`" ]; then
     inherit kde-functions
diff --git a/media-video/vlc/vlc-0.4.3.ebuild b/media-video/vlc/vlc-0.4.5.ebuild
index 5c986221e05e..da03550ed082 100644
--- a/media-video/vlc/vlc-0.4.3.ebuild
+++ b/media-video/vlc/vlc-0.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.4.3.ebuild,v 1.6 2002/10/05 05:39:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.4.5.ebuild,v 1.1 2002/11/09 19:01:50 seemant Exp $
 
 IUSE="arts qt ncurses dvd gtk nls 3dfx esd directfb kde X alsa ggi oggvorbis gnome"
 
@@ -9,6 +9,10 @@ DESCRIPTION="VideoLAN Client - DVD/video player"
 SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://www.videolan.org"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
 DEPEND="X? ( virtual/x11 )
 	qt? ( x11-libs/qt )
 	dvd? ( media-libs/libdvdread
@@ -29,9 +33,12 @@ DEPEND="X? ( virtual/x11 )
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
+# 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() {
 
@@ -129,24 +136,22 @@ src_compile(){
 	autoconf || die
 	
 	econf \
-		--build=${CHOST} \
-		--target=${CHOST} \
-		--localstatedir=/var/state/vlc \
 		--with-sdl \
 		--disable-a52 \
 		--enable-release \
 		--enable-mad \
 		--enable-a52 \
 		--enable-dvbpsi \
-		${myconf} || die
+		${myconf} || die "configure failed"
 
-	emake || die
+	emake || die "parallel make failed"
 }
 
 src_install() {
 
 	dodir /usr/{bin,lib}
-	make DESTDIR=${D} install || die
+
+	einstall || die "make install failed"
 
 	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL* README* MODULES TODO