cleanup

15 files changed, 48 insertions, 942 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 38581ff47aed..2ae2b08c1fad 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.37 2003/11/22 05:17:07 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.38 2003/12/13 05:39:38 seemant Exp $
+
+  12 Dec 2003; Seemant Kulleen <seemant@gentoo.org> metadata.xml,
+  vlc-0.4.4.ebuild, vlc-0.4.5.ebuild, vlc-0.5.2-r1.ebuild, vlc-0.5.2.ebuild,
+  vlc-0.6.0.ebuild, vlc-0.6.2.ebuild:
+  remove crufty ebuilds and move to use_enable syntax for configure options
 
   22 Nov 2003; Luca Barbato <lu_zero@gentoo.org> vlc-0.6.2.ebuild,
   files/0.6.2-mozilla-fix.patch:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 9c3cec266649..adb400184d46 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,21 +1,12 @@
+MD5 d6395ceab5c2fb31fb9e536179a7f9ef vlc-0.6.0-r1.ebuild 5638
+MD5 abe46c2122fa9684f681e695f25b9225 vlc-0.6.2.ebuild 5524
 MD5 a28c65345cf74b646ed398cdff1b54a0 vlc-0.6.1.ebuild 6093
-MD5 eb3b00a8c4043b2e652c311223980bfb vlc-0.5.2.ebuild 3863
-MD5 06a8dad48609b22fb46b5f3369fc3353 ChangeLog 7575
-MD5 7c774a2b9d465d101f738022312eff63 vlc-0.4.5.ebuild 3837
-MD5 1eabb88c18a1821e01eab0a586de02d9 metadata.xml 259
-MD5 e3d3beec835ea8693d8d3c841de6f706 vlc-0.4.4.ebuild 3837
-MD5 8c9941428f88ebdda0a06f49d2050762 vlc-0.5.2-r1.ebuild 4463
-MD5 0daa748a621e36c12110e6ad4537387f vlc-0.6.2.ebuild 6321
-MD5 413d9228231f51808168f16e4b6c5ce6 vlc-0.6.0.ebuild 5041
-MD5 b0f05c5c4ed72cfd1264c786f7c26364 vlc-0.6.0-r1.ebuild 5641
-MD5 d766f772e3e3be4f8d6cbf4d54bf2700 files/digest-vlc-0.6.2 63
-MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590
-MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0 63
-MD5 6d7dd1d8477d38f85cc4d4ed59489b4f files/digest-vlc-0.5.2-r1 63
-MD5 6d7dd1d8477d38f85cc4d4ed59489b4f files/digest-vlc-0.5.2 63
+MD5 f8543211b75a85a10a4d22d7cb09a6be ChangeLog 7833
+MD5 06579cc387999571bc69fadac7f077fa metadata.xml 263
 MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0-r1 63
+MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995
 MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744
 MD5 f3095908d6d0b8fb2fbceb3362574761 files/digest-vlc-0.6.1 63
-MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995
+MD5 d766f772e3e3be4f8d6cbf4d54bf2700 files/digest-vlc-0.6.2 63
+MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590
 MD5 09c124e45049f615519ded3278a97376 files/0.6.2-mozilla-fix.patch 1261
-MD5 36b957169001a5ba78c09d813f23b550 files/digest-vlc-0.4.5 63
diff --git a/media-video/vlc/files/digest-vlc-0.4.4 b/media-video/vlc/files/digest-vlc-0.4.4
deleted file mode 100644
index 9d729d3eb894..000000000000
--- a/media-video/vlc/files/digest-vlc-0.4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e5054a1705e4d98b63d75ed6845586a vlc-0.4.4.tar.bz2 1080620
diff --git a/media-video/vlc/files/digest-vlc-0.4.5 b/media-video/vlc/files/digest-vlc-0.4.5
deleted file mode 100644
index 954f7a3d268e..000000000000
--- a/media-video/vlc/files/digest-vlc-0.4.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 02b4c321ec2ae00efc03f30ee1e550f9 vlc-0.4.5.tar.bz2 1131313
diff --git a/media-video/vlc/files/digest-vlc-0.5.2 b/media-video/vlc/files/digest-vlc-0.5.2
deleted file mode 100644
index 2efa8c982aae..000000000000
--- a/media-video/vlc/files/digest-vlc-0.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f588624f5c4db4dcb245a2b1de5469c4 vlc-0.5.2.tar.bz2 1958763
diff --git a/media-video/vlc/files/digest-vlc-0.5.2-r1 b/media-video/vlc/files/digest-vlc-0.5.2-r1
deleted file mode 100644
index 2efa8c982aae..000000000000
--- a/media-video/vlc/files/digest-vlc-0.5.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f588624f5c4db4dcb245a2b1de5469c4 vlc-0.5.2.tar.bz2 1958763
diff --git a/media-video/vlc/files/digest-vlc-0.6.0 b/media-video/vlc/files/digest-vlc-0.6.0
deleted file mode 100644
index 9696a1b88ca9..000000000000
--- a/media-video/vlc/files/digest-vlc-0.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f985a6e94dd411681b0b81e414f11e6 vlc-0.6.0.tar.bz2 2844463
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index b27218d48158..2e58af207e7e 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>no-herd</herd>
+  <herd>media-video</herd>
   <maintainer>
     <email>raker@gentoo.org</email>
     <name>Nick Hadaway</name>
diff --git a/media-video/vlc/vlc-0.4.4.ebuild b/media-video/vlc/vlc-0.4.4.ebuild
deleted file mode 100644
index 3a1e72b4ced9..000000000000
--- a/media-video/vlc/vlc-0.4.4.ebuild
+++ /dev/null
@@ -1,157 +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.4.4.ebuild,v 1.10 2003/09/04 04:52:00 msterret 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.bz2"
-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
-		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
-	>=media-libs/a52dec-0.7.4
-	>=media-libs/libdvbpsi-0.1.1"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-# 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}
-	# 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
-
-	econf \
-		--with-sdl \
-		--enable-release \
-		--enable-mad \
-		--enable-a52 \
-		--enable-dvbpsi \
-		${myconf} || die "configure failed"
-
-	emake || die "parallel make failed"
-}
-
-src_install() {
-
-	dodir /usr/{bin,lib}
-
-	einstall || die "make install failed"
-
-	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL* README* MODULES TODO
-
-}
diff --git a/media-video/vlc/vlc-0.4.5.ebuild b/media-video/vlc/vlc-0.4.5.ebuild
deleted file mode 100644
index c0c95322d574..000000000000
--- a/media-video/vlc/vlc-0.4.5.ebuild
+++ /dev/null
@@ -1,157 +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.4.5.ebuild,v 1.5 2003/09/04 04:52:00 msterret 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.bz2"
-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
-		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
-	>=media-libs/a52dec-0.7.4
-	>=media-libs/libdvbpsi-0.1.1"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-# 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}
-	# 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
-
-	econf \
-		--with-sdl \
-		--enable-release \
-		--enable-mad \
-		--enable-a52 \
-		--enable-dvbpsi \
-		${myconf} || die "configure failed"
-
-	emake || die "parallel make failed"
-}
-
-src_install() {
-
-	dodir /usr/{bin,lib}
-
-	einstall || die "make install failed"
-
-	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL* README* MODULES TODO
-
-}
diff --git a/media-video/vlc/vlc-0.5.2-r1.ebuild b/media-video/vlc/vlc-0.5.2-r1.ebuild
deleted file mode 100644
index fdac8b220d22..000000000000
--- a/media-video/vlc/vlc-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,182 +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.5.2-r1.ebuild,v 1.4 2003/09/04 04:52:00 msterret Exp $
-
-IUSE="arts qt ncurses dvd gtk nls 3dfx esd kde X alsa ggi oggvorbis gnome xv oss sdl fbcon aalib"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="VideoLAN Client - DVD/video player"
-SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.videolan.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~hppa"
-
-DEPEND="X? ( virtual/x11 )
-	qt? ( x11-libs/qt )
-	dvd? ( media-libs/libdvdread
-		media-libs/libdvdcss )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	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 )
-	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
-	>=media-sound/mad-0.14.2b
-	>=media-libs/a52dec-0.7.4
-	>=media-libs/libdvbpsi-0.1.1"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-# 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}
-	# 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
-		# adding configure.ac.in
-		cp configure.ac.in configure.ac.in.orig
-		sed "s:-lkfile::" \
-			configure.ac.in.orig > configure.ac.in
-
-		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
-	)
-}
-
-src_compile(){
-
-	use X \
-		&& myconf="${myconf} --enable-x11" \
-		|| myconf="${myconf} --disable-x11"
-
-	use xv\
-		&& myconf="${myconf} --enable-xvideo" \
-		|| myconf="${myconf} --diable-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 oggvorbis \
-		&& myconf="${myconf} --enable-vorbis" \
-		|| myconf="${myconf} --disable-vorbis --disable-ogg"
-
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
-
-	use oss \
-		&& myconf="${myconf} --enable-oss" \
-		|| myconf="${myconf} --disable-oss"
-
-	use sdl \
-		&& myconf="${myconf} --enable-sdl" \
-		|| myconf="${myconf} --disable-sdl"
-
-	use fbcon \
-		&& myconf="${myconf} --enable-fb" \
-		|| myconf="${myconf} --disable-fb"
-
-	use aalib \
-		&& myconf="${myconf} --enable-aa" \
-		|| myconf="${myconf} --disable-aa"
-
-	# vlc uses its own ultraoptimizaed CXXFLAGS
-	# and forcing custom ones generally fails building
-	export CXXFLAGS=""
-	export CFLAGS=""
-	export WANT_AUTOCONF_2_5=1
-	export WANT_AUTOMAKE_1_6=1
-
-
-	autoconf || die
-
-	econf \
-		--with-sdl \
-		--enable-release \
-		--enable-mad \
-		--enable-a52 \
-		--enable-dvbpsi \
-		${myconf} || die "configure failed"
-
-	emake || die "parallel make failed"
-}
-
-src_install() {
-
-	dodir /usr/{bin,lib}
-
-	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.5.2.ebuild b/media-video/vlc/vlc-0.5.2.ebuild
deleted file mode 100644
index b777261e2cbc..000000000000
--- a/media-video/vlc/vlc-0.5.2.ebuild
+++ /dev/null
@@ -1,157 +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.5.2.ebuild,v 1.3 2003/09/04 04:52:00 msterret 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.bz2"
-HOMEPAGE="http://www.videolan.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~hppa"
-
-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
-	>=media-libs/a52dec-0.7.4
-	>=media-libs/libdvbpsi-0.1.1"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-# 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}
-	# 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
-
-	econf \
-		--with-sdl \
-		--enable-release \
-		--enable-mad \
-		--enable-a52 \
-		--enable-dvbpsi \
-		${myconf} || die "configure failed"
-
-	emake || die "parallel make failed"
-}
-
-src_install() {
-
-	dodir /usr/{bin,lib}
-
-	einstall || die "make install failed"
-
-	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL* README* MODULES TODO
-
-}
diff --git a/media-video/vlc/vlc-0.6.0-r1.ebuild b/media-video/vlc/vlc-0.6.0-r1.ebuild
index bd51eb10071b..aac051d88feb 100644
--- a/media-video/vlc/vlc-0.6.0-r1.ebuild
+++ b/media-video/vlc/vlc-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2003/09/04 04:52:00 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.0-r1.ebuild,v 1.6 2003/12/13 05:39:38 seemant Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.videolan.org/vlc"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
+KEYWORDS="x86 ppc ~sparc ~alpha ~mips ~hppa"
 
 DEPEND="X? ( virtual/x11 )
 	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
diff --git a/media-video/vlc/vlc-0.6.0.ebuild b/media-video/vlc/vlc-0.6.0.ebuild
deleted file mode 100644
index aa3cbe46fc82..000000000000
--- a/media-video/vlc/vlc-0.6.0.ebuild
+++ /dev/null
@@ -1,192 +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.ebuild,v 1.5 2003/09/04 04:52:00 msterret 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"
-
-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-sound/mad-0.14.2b )
-	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
-	>=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
-
-# 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}
-
-	# 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"
-
-	# vlc uses its own ultraoptimizaed 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
-
-}
diff --git a/media-video/vlc/vlc-0.6.2.ebuild b/media-video/vlc/vlc-0.6.2.ebuild
index b739b5c51595..a2776194737c 100644
--- a/media-video/vlc/vlc-0.6.2.ebuild
+++ b/media-video/vlc/vlc-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.10 2003/11/22 05:17:07 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.11 2003/12/13 05:39:38 seemant Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -121,92 +121,52 @@ src_compile(){
 	#--enable-testsuite      build test modules (default disabled)
 	#--disable-plugins       make all plugins built-in (default plugins enabled)
 
-	use nls || myconf="${myconf} --disable-nls"
-
 	use debug && myconf="${myconf} --enable-debug" \
 		|| myconf="${myconf} --enable-release"
 
-	use dvd \
-		&& myconf="${myconf} --enable-dvdread" \
-		|| myconf="${myconf} \
-			--disable-dvd \
-			--disable-dvdread \
-			--disable-dvdplay \
-			--disable-vcd"
-
-	use v4l && myconf="${myconf} --enable-v4l"
-
-	use dvb && myconf="${myconf} --enable-satellite --enable-pvr"
-
-	use oggvorbis || myconf="${myconf} --disable-vorbis --disable-ogg"
-
-	use matroska || myconf="${myconf} --disable-mkv"
-
-	use mad && myconf="${myconf} --enable-mad"
-
-	use faad && myconf="${myconf} --enable-faad"
-
-	use xvid && myconf="${myconf} --enable-xvid"
-
-	use X || myconf="${myconf} --disable-x11"
-
-	use xv || myconf="${myconf} --disable-xvideo"
-
-	use sdl || myconf="${myconf} --disable-sdl"
-
-	use truetype && myconf="${myconf} --enable-freetype"
-
-	use fbcon || myconf="${myconf} --disable-fb"
-
-	use svga && myconf="${myconf} --enable-svgalib"
-
-	use ggi && myconf="${myconf} --enable-ggi"
-
-	use 3dfx && myconf="${myconf} --enable-glide"
-
-	use aalib && myconf="${myconf} --enable-aa"
-
-	use oss || myconf="${myconf} --disable-oss"
-
-	use esd && myconf="${myconf} --enable-esd"
-
-	use arts && myconf="${myconf} --enable-arts"
-
-	use alsa && myconf="${myconf} --enable-alsa"
-
 	(use imlib && use wxwindows) && myconf="${myconf} --enable-skins"
 
-	use gtk || myconf="${myconf} --disable-gtk"
-
-	use gnome && myconf="${myconf} --enable-gnome"
-
-	use qt && myconf="${myconf} --enable-qt"
-
-	use kde && myconf="${myconf} --enable-kde"
-
-	use ncurses && myconf="${myconf} --enable-ncurses"
-
-	use xosd && myconf="${myconf} --enable-xosd"
-
-	use slp || myconf="${myconf} --disable-slp"
-
-	use lirc && myconf="${myconf} --enable-lirc"
-
-	use joystick && myconf="${myconf} --enable-joystick"
-
 	use mozilla \
 		&& myconf="${myconf} --enable-mozilla \
 		MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config \
 		XPIDL=/usr/bin/xpidl"
 
-	use altivec || myconf="${myconf} --disable-altivec"
-
 	export CXXFLAGS=""
 	export CFLAGS=""
 	export WANT_AUTOCONF_2_5=1
 	export WANT_AUTOMAKE_1_6=1
 
-	econf ${myconf} || die "configure failed"
+	econf \
+		`use_enable nls` \
+		`use_enable slp` \
+		`use_enable xosd` \
+		`use_enable ncurses` \
+		`use_enable alsa` \
+		`use_enable esd` \
+		`use_enable oss` \
+		`use_enable ggi` \
+		`use_enable sdl` \
+		`use_enable mad` \
+		`use_enable faad` \
+		`use_enable xvid` \
+		`use_enable v4l` \
+		`use_enable dvd` \
+		`use_enable dvd vcd` `use_enable dvdread` `use_enable dvd dvdplay` \
+		`use_enable dvb satellite` `use_enable dvb pvr` \
+		`use_enable joystick` `use_enable lirc` \
+		`use_enable qt` `use_enable kde` `use_enable arts` \
+		`use_enable gtk` `use_enable gnome` \
+		`use_enable oggvorbis ogg` `use_enable oggvorbis vorbis` \
+		`use_enable matroska mkv` \
+		`use_enable truetype freetype` \
+		`use_enable svga svgalib` \
+		`use_enable fbcon fb` \
+		`use_enable aalib aa` \
+		`use_enable xv xvideo` \
+		`use_enable X x11` \
+		`use_enable 3dfx glide` \
+		`use_enable altivec` \
+		${myconf} || die "configure failed"
 
 	if [ `gcc-major-version` -eq 2 ]; then
 		sed -i s:"-fomit-frame-pointer":: vlc-config