Pruned old ebuilds, fixed dependency on libmpeg2-0.3* for vlc-0.6.2 (fixes #60696). Updated metadata, ChrisWhite is retired :/.

Package-Manager: portage-2.0.51.19

16 files changed, 16 insertions, 1252 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 63d3e544f845..0c13b85f932b 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,14 @@
 # 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.77 2005/04/18 01:25:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.78 2005/04/18 23:59:06 flameeyes Exp $
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
+  -vlc-0.6.0-r1.ebuild, -vlc-0.6.1.ebuild, vlc-0.6.2.ebuild,
+  -vlc-0.7.1.ebuild, -vlc-0.7.1-r1.ebuild, -vlc-0.7.2-r1.ebuild,
+  -vlc-0.8.0.ebuild:
+  Pruned old ebuilds, as many bugs are fixed in recent ~arch ebuilds, and 
+  0.8.1-r1 is the wannabe-stable. Fixed dependency on libmpeg2-0.3* 
+  for vlc-0.6.2 (fixes #60696). Updated metadata, ChrisWhite is retired :/
 
   18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.6.0-r1.ebuild,
   vlc-0.6.1.ebuild, vlc-0.6.2.ebuild, vlc-0.6.2-r1.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index e19d3edef351..73ca50d08bf7 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,27 +1,14 @@
-MD5 c93943ad91a4f4d68ccbed3cba86d848 metadata.xml 261
-MD5 32ece6490b4a084ff4ca51252986082f vlc-0.7.1-r1.ebuild 5976
-MD5 133ffa739d09e81f98f2865c2087fc05 vlc-0.7.1.ebuild 6767
-MD5 45d534007a64abb02a0b6013055f6749 vlc-0.7.2-r1.ebuild 6478
 MD5 1cf3f35ae5b1f079f1c2e988e72f5233 vlc-0.7.2.ebuild 6007
-MD5 da732f16e60140e88624fb8fc13734f0 vlc-0.8.0.ebuild 6424
 MD5 55819a1638e31615a1ec51d09f6d50de vlc-0.8.1.ebuild 5409
 MD5 efecfd0f86499e54b0ce76146de14dd3 vlc-0.8.1-r1.ebuild 6770
-MD5 050d6f318226f65bf013f9fd9e010b50 ChangeLog 14762
-MD5 ef1ce55f27caac22ddd17a43d854e5b5 vlc-0.6.2.ebuild 5552
+MD5 a1ea154d21953db866cf737dbc6fe683 ChangeLog 15196
 MD5 922c5025744b20389f1308adfee401e7 vlc-0.6.2-r1.ebuild 6503
-MD5 7d01475065f35348a299db2a1bcbe88b vlc-0.6.1.ebuild 6116
-MD5 0f6ee2cf42b4fb98c7a62b7c0a48f1a6 vlc-0.6.0-r1.ebuild 5640
+MD5 6bc089e06f042607bd4bb5cabe7dc72e vlc-0.6.2.ebuild 5551
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 09c124e45049f615519ded3278a97376 files/0.6.2-mozilla-fix.patch 1261
 MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590
-MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0-r1 63
-MD5 f3095908d6d0b8fb2fbceb3362574761 files/digest-vlc-0.6.1 63
 MD5 d766f772e3e3be4f8d6cbf4d54bf2700 files/digest-vlc-0.6.2 63
-MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202
-MD5 d0a16a05f6983059df4b1b07c0a47bdd files/digest-vlc-0.7.1 130
-MD5 f031efc738d255e8b7b893aaeb5ca30c files/digest-vlc-0.7.1-r1 63
 MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2 63
-MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2-r1 63
-MD5 c3619276ab1c8a5790066e59ca82347d files/digest-vlc-0.8.0 63
 MD5 77f4e9cceacd8059c3e1c8322a14c30a files/digest-vlc-0.8.1 63
 MD5 77f4e9cceacd8059c3e1c8322a14c30a files/digest-vlc-0.8.1-r1 63
 MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744
@@ -31,3 +18,4 @@ MD5 0ee383795d543048e4d47eb58f6d36bb files/mpeg2dec-20030612-configure.in-fpic.p
 MD5 310366968813598e8b0cae64b5dbd19a files/vlc-0.7.2-live.patch 1287
 MD5 40bcf94b78e4cb16470b8dd2673adb06 files/vlc-0.8.1-time.patch 403
 MD5 0cb865191c6e2dfa7fd777e911044327 files/vlc.desktop 214
+MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202
diff --git a/media-video/vlc/files/digest-vlc-0.6.0-r1 b/media-video/vlc/files/digest-vlc-0.6.0-r1
deleted file mode 100644
index 9696a1b88ca9..000000000000
--- a/media-video/vlc/files/digest-vlc-0.6.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f985a6e94dd411681b0b81e414f11e6 vlc-0.6.0.tar.bz2 2844463
diff --git a/media-video/vlc/files/digest-vlc-0.6.1 b/media-video/vlc/files/digest-vlc-0.6.1
deleted file mode 100644
index d38e2a00c70b..000000000000
--- a/media-video/vlc/files/digest-vlc-0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 46cfa8ea0ce7ebb4e85bdef3827e4ace vlc-0.6.1.tar.bz2 2958187
diff --git a/media-video/vlc/files/digest-vlc-0.7.1 b/media-video/vlc/files/digest-vlc-0.7.1
deleted file mode 100644
index 3b595a8400f1..000000000000
--- a/media-video/vlc/files/digest-vlc-0.7.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a25725fa8c9b8a64c60e315d22c31a58 vlc-0.7.1.tar.bz2 4063461
-MD5 c10a7fd0e3ff070821650319863d515e live.2004.02.26.tar.gz 337885
diff --git a/media-video/vlc/files/digest-vlc-0.7.1-r1 b/media-video/vlc/files/digest-vlc-0.7.1-r1
deleted file mode 100644
index e49c0ae9c372..000000000000
--- a/media-video/vlc/files/digest-vlc-0.7.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a25725fa8c9b8a64c60e315d22c31a58 vlc-0.7.1.tar.bz2 4063461
diff --git a/media-video/vlc/files/digest-vlc-0.7.2-r1 b/media-video/vlc/files/digest-vlc-0.7.2-r1
deleted file mode 100644
index 2fabdc869b72..000000000000
--- a/media-video/vlc/files/digest-vlc-0.7.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3749fb3a0aed1372d4975a5b962e72cc vlc-0.7.2.tar.bz2 4516835
diff --git a/media-video/vlc/files/digest-vlc-0.8.0 b/media-video/vlc/files/digest-vlc-0.8.0
deleted file mode 100644
index fc8985f17cdf..000000000000
--- a/media-video/vlc/files/digest-vlc-0.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ccd58c030ff0cee29470382927b6e4be vlc-0.8.0.tar.bz2 4861078
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 4f80006f8487..d9df1878d8e2 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
-  <maintainer>
-    <email>chriswhite@gentoo.org</email>
-    <name>Chris White</name>
-  </maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/vlc/vlc-0.6.0-r1.ebuild b/media-video/vlc/vlc-0.6.0-r1.ebuild
deleted file mode 100644
index 6e66ed853000..000000000000
--- a/media-video/vlc/vlc-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# 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.0-r1.ebuild,v 1.18 2005/04/18 01:25:26 flameeyes Exp $
-
-# Missing support for...
-#	tarkin - package not in portage yet
-#	theora - package not in portage yet
-#	tremor - package not in portage yet
-#	matroska - not working yet
-#	gtk2 - still experimental? - need more info
-
-inherit eutils
-
-DESCRIPTION="VideoLAN Client - DVD/video player and more"
-HOMEPAGE="http://www.videolan.org/vlc/"
-SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha x86"
-IUSE="3dfx X aalib alsa arts debug dvb dvd esd fbcon ggi gnome gtk imlib kde
-	lirc mad mozilla ncurses nls oggvorbis oss qt sdl slp svga truetype v4l
-	wxwindows xv xvid"
-
-RDEPEND="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 )
-	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/madplay-0.14.2b )
-	mozilla? ( >=www-client/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.1 )
-	xvid? ( =media-libs/xvid-0.9* )
-	>=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"
-
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
-
-# 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 use kde || use arts; then
-	inherit kde-functions
-	set-kdedir 3
-	# $KDEDIR is now set to arts/kdelibs location
-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
-		sed -i -e "s:-lkfile::" configure
-
-		cd ${S}/modules/gui/kde
-		sed -i -e "s:\(#include <kmainwindow.h>\):\1\n#include <kstatusbar.h>:" interface.h
-
-		sed -i -e 's:\("vlc preferences", true, false, \)\("Save\):\1(KGuiItem)\2:' preferences.cpp
-	fi
-	)
-
-	# Change the location where glide headers are installed
-	cd ${S}
-	sed -i -e "s:/usr/include/glide:/usr/include/glide3:" configure
-}
-
-src_compile(){
-	local myconf
-	myconf="--enable-faad --enable-a52 --enable-dvbpsi --disable-mga"
-
-	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 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
-
-	use dvb && myconf="${myconf} --enable-satellite --enable-pvr"
-
-	# Coming in 0.6.1 - For enabling subtitling code
-	# use truetype && myconf="${myconf} --enable-freetype"
-
-	# Matroska support doesn't appear to compile properly yet
-	# use matroska && myconf="${myconf} --enable-mkv"
-
-	use debug && myconf="${myconf} --enable-debug" \
-		|| myconf="${myconf} --enable-release"
-
-	# vlc uses its own ultraoptimized CXXFLAGS
-	# and forcing custom ones generally fails building
-	export CXXFLAGS=""
-	export CFLAGS=""
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.6
-
-	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.1.ebuild b/media-video/vlc/vlc-0.6.1.ebuild
deleted file mode 100644
index c2a33aa237aa..000000000000
--- a/media-video/vlc/vlc-0.6.1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# 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.1.ebuild,v 1.16 2005/04/18 01:25:26 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 eutils
-
-DESCRIPTION="VideoLAN Client - DVD/video player and more"
-HOMEPAGE="http://www.videolan.org/vlc/"
-SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~x86"
-IUSE="3dfx X aalib alsa arts debug dvb dvd esd aac fbcon ggi gnome gtk imlib
-	joystick kde lirc mad matroska mozilla ncurses nls oggvorbis oss qt sdl slp svga
-	truetype v4l wxwindows xosd xv xvid"
-
-RDEPEND="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.8
-		>=media-libs/libdvdplay-1.0.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	aac? ( >=media-libs/faad2-1.1 )
-	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/madplay-0.14.2b )
-	matroska? ( >=media-libs/libmatroska-0.4.4 )
-	mozilla? ( >=www-client/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.1 )
-	xosd? ( >=x11-libs/xosd-2.0 )
-	xvid? ( =media-libs/xvid-0.9* )
-	>=media-libs/a52dec-0.7.4
-	>=media-libs/flac-1.1.0
-	>=media-libs/libdv-0.98
-	>=media-libs/libdvbpsi-0.1.3
-	>media-video/ffmpeg-0.4.6
-	>media-libs/libmpeg2-0.3.1
-	>=media-video/mplayer-0.90"
-
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
-
-# 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 use kde || 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}/buildorder.patch
-
-	# if qt3 is installed, patch vlc to work with it instead of qt2
-	( use qt || use kde ) && ( \
-	if [ ${QTDIR} = "/usr/qt/3" ]
-	then
-		sed -i -e "s:-lkfile::" configure
-
-		cd ${S}/modules/gui/kde
-		sed -i -e "s:\(#include <kmainwindow.h>\):\1\n#include <kstatusbar.h>:" interface.h
-
-		sed -i -e 's:\("vlc preferences", true, false, \)\("Save\):\1(KGuiItem)\2:' preferences.cpp
-	fi
-	)
-
-	# Change the location where glide headers are installed
-	cd ${S}
-	sed -i -e "s:/usr/include/glide:/usr/include/glide3:" configure
-}
-
-src_compile(){
-	local myconf
-	myconf="--disable-mga --enable-flac --with-gnu-ld"
-
-	#--enable-pth            GNU Pth support (default disabled)
-	#--enable-st             State Threads (default disabled)
-	#--enable-gprof          gprof profiling (default disabled)
-	#--enable-cprof          cprof profiling (default disabled)
-	#--enable-mostly-builtin most modules will be built-in (default disabled)
-	#--disable-optimizations disable compiler optimizations (default enabled)
-	#--disable-altivec       disable AltiVec optimizations (default enabled on PPC)
-	#--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 aac && 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"
-
-	export CXXFLAGS=""
-	export CFLAGS=""
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.6
-
-	# The buildorder.patch changes Makefile.am, so we need to
-	# run automake so the change is propogated
-	automake
-
-	econf ${myconf} || die "configure of VLC failed"
-
-	MAKEOPTS="${MAKEOPTS} -j1"
-	emake || die "make of VLC failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL* \
-	MAINTAINERS NEWS README* THANKS doc/ChangeLog-*
-}
diff --git a/media-video/vlc/vlc-0.6.2.ebuild b/media-video/vlc/vlc-0.6.2.ebuild
index 4a4c3526c70d..6245d5f4f190 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-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.24 2005/04/18 01:25:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.25 2005/04/18 23:59:06 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -56,7 +56,7 @@ RDEPEND="X? ( virtual/x11 )
 	>=media-libs/libdv-0.98
 	>=media-libs/libdvbpsi-0.1.3
 	>=media-video/ffmpeg-0.4.7
-	>media-libs/libmpeg2-0.3.1
+	=media-libs/libmpeg2-0.3*
 	>=media-video/mplayer-0.90"
 
 DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
diff --git a/media-video/vlc/vlc-0.7.1-r1.ebuild b/media-video/vlc/vlc-0.7.1-r1.ebuild
deleted file mode 100644
index 86e068f5379f..000000000000
--- a/media-video/vlc/vlc-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# 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.1-r1.ebuild,v 1.12 2005/03/23 16:18:35 seemant 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 libtool gcc eutils
-
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-SRC_URI="http://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="3dfx X aalib alsa arts bidi debug dvb dvd esd aac fbcon ggi gnome gtk
-	imlib joystick lirc mad matroska mozilla ncurses nls oggvorbis oss png sdl slp
-	speex svga truetype v4l wxwindows xosd xv"
-
-RDEPEND="X? ( virtual/x11 )
-	aalib? ( >=media-libs/aalib-1.4_rc4-r2
-			>=media-libs/libcaca-0.9 )
-	alsa? ( >=media-libs/alsa-lib-0.9_rc2 )
-	dvb? ( media-libs/libdvb
-		media-tv/linuxtv-dvb )
-	dvd? ( >=media-libs/libdvdread-0.9.4
-		>=media-libs/libdvdcss-1.2.8
-		>=media-libs/libdvdnav-0.1.9
-		>=media-libs/libdvdplay-1.0.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	aac? ( >=media-libs/faad2-2.0_rc3 )
-	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 )
-	lirc? ( app-misc/lirc )
-	mad? ( media-libs/libmad
-		media-libs/libid3tag )
-	matroska? ( >=media-libs/libmatroska-0.6.2 )
-	mozilla? ( >=www-client/mozilla-1.4 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0
-		>=media-libs/libogg-1.0 )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	slp? ( >=net-libs/openslp-1.0.10 )
-	bidi? ( >=dev-libs/fribidi-0.10.4 )
-	truetype? ( >=media-libs/freetype-2.1.4 )
-	wxwindows? ( >=x11-libs/wxGTK-2.4.1 )
-	xosd? ( >=x11-libs/xosd-2.0 )
-	3dfx? ( !amd64? ( media-libs/glide-v3 ) )
-	png? ( >=media-libs/libpng-1.2.5 )
-	speex? ( >=media-libs/speex-1.0.3 )
-	svga? ( media-libs/svgalib )
-	>=media-sound/lame-3.93.1
-	>=media-libs/libdvbpsi-0.1.3
-	>=media-libs/a52dec-0.7.4
-	>=media-libs/libmpeg2-0.4.0
-	>=media-video/ffmpeg-0.4.8.20040222
-	=media-plugins/live-2004.03*
-	>=media-libs/flac-1.1.0"
-
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.5.8"
-
-src_unpack() {
-	unpack ${A}
-
-	# We only have glide v3 in portage
-	cd ${S}
-	sed -i \
-		-e "s:/usr/include/glide:/usr/include/glide3:" \
-		-e "s:glide2x:glide3:" \
-		configure
-
-	cd ${S}/modules/video_output
-	epatch ${FILESDIR}/glide.patch
-	cd ${S}
-
-}
-
-src_compile() {
-	# Configure and build VLC
-	cd ${S}
-	local myconf
-	myconf="--disable-mga --enable-flac --with-gnu-ld \
-			--enable-a52 --enable-dvbpsi --enable-libmpeg2 \
-			--disable-qt --disable-kde --disable-libcdio --disable-libcddb \
-			--disable-vcdx --enable-ffmpeg --with-ffmpeg-mp3lame \
-			--enable-livedotcom --with-livedotcom-tree=/usr/lib/live \
-			--disable-skins2" #keep the new skins disabled for now
-
-	#--enable-pth				GNU Pth support (default disabled)
-	#--enable-st				State Threads (default disabled)
-	#--enable-gprof				gprof profiling (default disabled)
-	#--enable-cprof				cprof profiling (default disabled)
-	#--enable-mostly-builtin	most modules will be built-in (default enabled)
-	#--disable-optimizations	disable compiler optimizations (default disabled)
-	#--enable-testsuite			build test modules (default disabled)
-	#--disable-plugins			make all plugins built-in (default plugins enabled)
-
-	use debug && myconf="${myconf} --enable-debug" \
-		|| myconf="${myconf} --enable-release"
-
-	(use imlib && use wxwindows) && myconf="${myconf} --enable-skins"
-
-	use mozilla \
-		&& myconf="${myconf} --enable-mozilla \
-		MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config \
-		XPIDL=/usr/bin/xpidl"
-
-	if [ "${ARCH}" = "ppc" ]; then
-		# Please post a bugreport on the next version bump
-		# to have a ppc dev test if AltiVec has been fixed!
-		ewarn "AltiVec is broken in this version of VLC"
-		myconf="${myconf} --disable-altivec"
-	fi
-
-	# vlc uses its own ultraoptimizaed CXXFLAGS
-	# and forcing custom ones generally fails building
-	export CXXFLAGS=""
-	export CFLAGS=""
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.6
-
-	# Avoid timestamp skews with autotools
-	touch configure.ac
-	touch aclocal.m4
-	touch configure
-	touch config.h.in
-	touch $(find . -name Makefile.in)
-
-#		$(use_enable dvb satellite) \
-#		$(use_enable altivec) \
-	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 aac faad) \
-		$(use_enable v4l) \
-		$(use_enable dvd) \
-		$(use_enable dvd vcd) \
-		$(use_enable dvd dvdread) \
-		$(use_enable dvd dvdplay) \
-		$(use_enable dvd dvdnav) \
-		$(use_enable dvb) \
-		$(use_enable dvb pvr) \
-		$(use_enable joystick) $(use_enable lirc) \
-		$(use_enable arts) \
-		$(use_enable gtk) $(use_enable gnome) \
-		$(use_enable oggvorbis ogg) $(use_enable oggvorbis vorbis) \
-		$(use_enable speex) \
-		$(use_enable matroska mkv) \
-		$(use_enable truetype freetype) \
-		$(use_enable bidi fribidi) \
-		$(use_enable svga svgalib) \
-		$(use_enable fbcon fb) \
-		$(use_enable aalib aa) $(use_enable aalib caca) \
-		$(use_enable xv xvideo) \
-		$(use_enable X x11) \
-		$(use_enable 3dfx glide) \
-		${myconf} || die "configure of VLC failed"
-
-	if [[ $(gcc-major-version) == 2 ]]; then
-		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
-	fi
-
-	# parallel make doesn't work with our complicated makefile
-	# this is also the reason as why you shouldn't run autoconf
-	# or automake yourself. (or bootstrap for that matter)
-	MAKEOPTS="${MAKEOPTS} -j1"
-	emake || die "make of VLC failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL* \
-	MAINTAINERS NEWS README* THANKS doc/ChangeLog-*
-}
diff --git a/media-video/vlc/vlc-0.7.1.ebuild b/media-video/vlc/vlc-0.7.1.ebuild
deleted file mode 100644
index c7a6ec968fe0..000000000000
--- a/media-video/vlc/vlc-0.7.1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# 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.1.ebuild,v 1.11 2005/03/23 16:18:35 seemant 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 libtool gcc eutils
-
-# Change these to correspond with the
-# unpacked dirnames of the CVS snapshots.
-PLIVE=live
-
-SLIVE=${WORKDIR}/${PLIVE}
-
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc"
-SRC_URI="http://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2
-	http://download.videolan.org/pub/${PN}/${PV}/contrib/live.2004.02.26.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-ppc ~x86"
-IUSE="3dfx X aalib alsa altivec arts bidi debug dvb dvd dvdread esd aac fbcon
-	ggi gnome gtk imlib joystick kde lirc mad matroska mozilla ncurses nls oggvorbis
-	oss png qt sdl slp speex svga truetype v4l wxwindows xosd xv xvid"
-
-RDEPEND="X? ( virtual/x11 )
-	aalib? ( >=media-libs/aalib-1.4_rc4-r2
-			>=media-libs/libcaca-0.9 )
-	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.4
-		>=media-libs/libdvdcss-1.2.8
-		>=media-libs/libdvdplay-1.0.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	aac? ( >=media-libs/faad2-2.0_rc3 )
-	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 )
-	matroska? ( >=media-libs/libmatroska-0.6.2 )
-	mozilla? ( >=www-client/mozilla-1.4 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	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.1 )
-	xosd? ( >=x11-libs/xosd-2.0 )
-	xvid? ( >=media-libs/xvid-0.9.1 )
-	3dfx? ( media-libs/glide-v3 )
-	bidi? ( >=dev-libs/fribidi-0.10.4 )
-	png? ( >=media-libs/libpng-1.2.5 )
-	speex? ( >=media-libs/speex-1.0.3 )
-	svga? ( media-libs/svgalib )
-	>=media-libs/a52dec-0.7.4
-	>=media-sound/lame-3.93.1
-	>=media-libs/flac-1.1.0
-	>=media-libs/libmpeg2-0.4.0
-	>=media-video/ffmpeg-0.4.8.20040222
-	>=media-libs/libdvbpsi-0.1.3"
-
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
-
-# liveMedia (live.com) is not a true library but needs to be 'imported'
-# into your own sourcetree. This is against VLC coding policy.
-
-# get kde and arts paths
-if use kde || use arts; then
-	inherit kde-functions
-	set-kdedir 3
-	# $KDEDIR is now set to arts/kdelibs location
-fi
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${SLIVE}
-	epatch ${FILESDIR}/live-gcc3-3.patch
-
-	# if qt3 is installed, patch vlc to work with it instead of qt2
-	if use qt || use kde
-	then
-		if [ ${QTDIR} = "/usr/qt/3" ]
-		then
-			sed -i -e "s:-lkfile::" configure
-
-			cd ${S}/modules/gui/kde
-			sed -i \
-				"s:\(#include <kmainwindow.h>\):\1\n#include <kstatusbar.h>:" \
-				interface.h
-
-			sed -i \
-				's:\("vlc preferences", true, false, \)\("Save\):\1(KGuiItem)\2:' \
-				preferences.cpp
-		fi
-	fi
-
-	# We only have glide v3 in portage
-	cd ${S}
-	sed -i \
-		-e "s:/usr/include/glide:/usr/include/glide3:" \
-		-e "s:glide2x:glide3:" \
-		configure
-
-	cd ${S}/modules/video_output
-	epatch ${FILESDIR}/glide.patch
-	cd ${S}
-
-	cd ${S}
-	# Avoid timestamp skews with autotools
-	touch configure.ac
-	touch aclocal.m4
-	touch configure
-	touch config.h.in
-	touch $(find . -name Makefile.in)
-}
-
-src_compile() {
-	# configure and building of livedotcom
-	cd ${SLIVE}
-	./genMakefiles linux || die "Creating liveMedia Makefiles failed."
-	make || die "liveMedia code failed to compile."
-
-	# Configure and build VLC
-	cd ${S}
-	local myconf
-	myconf="--disable-mga --enable-flac --with-gnu-ld \
-			--enable-a52 --enable-dvbpsi --enable-libmpeg2
-			--disable-kde"
-
-	#--enable-pth            GNU Pth support (default disabled)
-	#--enable-st             State Threads (default disabled)
-	#--enable-gprof          gprof profiling (default disabled)
-	#--enable-cprof          cprof profiling (default disabled)
-	#--enable-mostly-builtin most modules will be built-in (default disabled)
-	#--disable-optimizations disable compiler optimizations (default enabled)
-	#--enable-testsuite      build test modules (default disabled)
-	#--disable-plugins       make all plugins built-in (default plugins enabled)
-
-	use debug && myconf="${myconf} --enable-debug" \
-		|| myconf="${myconf} --enable-release"
-
-	(use imlib && use wxwindows) && myconf="${myconf} --enable-skins"
-
-	use mozilla \
-		&& myconf="${myconf} --enable-mozilla \
-		MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config \
-		XPIDL=/usr/bin/xpidl"
-
-	# vlc uses its own ultraoptimizaed CXXFLAGS
-	# and forcing custom ones generally fails building
-	export CXXFLAGS=""
-	export CFLAGS=""
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.6
-
-	myconf="${myconf} --enable-ffmpeg \
-		--with-ffmpeg-mp3lame \
-		--enable-livedotcom \
-		--with-livedotcom-tree=${SLIVE}"
-
-	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 aac 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 arts) \
-		$(use_enable gtk) $(use_enable gnome) \
-		$(use_enable oggvorbis ogg) $(use_enable oggvorbis vorbis) \
-		$(use_enable speex) \
-		$(use_enable matroska mkv) \
-		$(use_enable truetype freetype) \
-		$(use_enable bidi fribidi) \
-		$(use_enable svga svgalib) \
-		$(use_enable fbcon fb) \
-		$(use_enable aalib aa) $(use_enable aalib caca) \
-		$(use_enable xv xvideo) \
-		$(use_enable X x11) \
-		$(use_enable 3dfx glide) \
-		$(use_enable altivec) \
-		${myconf} || die "configure of VLC failed"
-
-	if [[ $(gcc-major-version) == 2 ]]; then
-		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die
-	fi
-
-	# parallel make doesn't work with our complicated makefile
-	# this is also the reason as why you shouldn't run autoconf
-	# or automake yourself. (or bootstrap for that matter)
-	MAKEOPTS="${MAKEOPTS} -j1"
-	emake || die "make of VLC failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL* \
-	MAINTAINERS NEWS README* THANKS doc/ChangeLog-*
-}
diff --git a/media-video/vlc/vlc-0.7.2-r1.ebuild b/media-video/vlc/vlc-0.7.2-r1.ebuild
deleted file mode 100644
index 259d92f04723..000000000000
--- a/media-video/vlc/vlc-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# 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-r1.ebuild,v 1.9 2005/03/23 16:18:35 seemant Exp $
-
-# Missing support for...
-#	tarkin - package not in portage yet - experimental
-#	tremor - package not in portage yet - experimental
-
-inherit libtool gcc eutils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="arts ncurses dvd gtk nls 3dfx svga fbcon esd X alsa ggi speex
-	oggvorbis gnome xv oss sdl aalib slp bidi truetype v4l lirc
-	wxwindows imlib matroska dvb mozilla debug aac theora
-	xosd altivec png dts"
-
-RDEPEND="X? ( virtual/x11 )
-	aalib? ( >=media-libs/aalib-1.4_rc4-r2
-			>=media-libs/libcaca-0.9 )
-	alsa? ( >=media-libs/alsa-lib-0.9_rc2 )
-	dvb? ( media-libs/libdvb
-		media-tv/linuxtv-dvb )
-	dvd? ( >=media-libs/libdvdread-0.9.4
-		>=media-libs/libdvdcss-1.2.8
-		>=media-libs/libdvdnav-0.1.9
-		>=media-libs/libdvdplay-1.0.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	aac? ( >=media-libs/faad2-2.0_rc3 )
-	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 )
-	lirc? ( app-misc/lirc )
-	mad? ( media-libs/libmad
-		media-libs/libid3tag )
-	matroska? ( >=media-libs/libmatroska-0.7 )
-	mozilla? ( >=www-client/mozilla-1.5 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0.1
-		>=media-libs/libogg-1.1 )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	slp? ( >=net-libs/openslp-1.0.11 )
-	bidi? ( >=dev-libs/fribidi-0.10.4 )
-	theora? ( media-libs/libtheora )
-	truetype? ( >=media-libs/freetype-2.1.4 )
-	wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
-	xosd? ( >=x11-libs/xosd-2.0 )
-	3dfx? ( !amd64? ( media-libs/glide-v3 ) )
-	png? ( >=media-libs/libpng-1.2.5 )
-	speex? ( >=media-libs/speex-1.1.5 )
-	dts? ( >=media-libs/libdts-0.0.2 )
-	svga? ( media-libs/svgalib )
-	>=media-sound/lame-3.96
-	>=media-libs/libdvbpsi-0.1.4
-	>=media-libs/a52dec-0.7.4
-	>=media-libs/libmpeg2-0.4.0
-	>=media-video/ffmpeg-0.4.8.20040222
-	>=media-plugins/live-2004.07.20
-	>=media-libs/flac-1.1.0"
-
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.5.8
-	>=sys-devel/automake-1.7.9"
-
-src_unpack() {
-	unpack ${A}
-
-	# We only have glide v3 in portage
-	cd ${S}
-	sed -i \
-		-e "s:/usr/include/glide:/usr/include/glide3:" \
-		-e "s:glide2x:glide3:" \
-		configure
-
-	# Fix the default font
-	sed -i -e "s:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/X11R6/lib/X11/fonts/truetype/timesbd.ttf:" modules/misc/freetype.c
-
-	cd ${S}/modules/video_output
-	epatch ${FILESDIR}/glide.patch
-	cd ${S}
-
-	# conforms vlc to recent api changes
-	epatch ${FILESDIR}/${P}-live.patch
-
-}
-
-src_compile() {
-	# Configure and build VLC
-	cd ${S}
-	local myconf
-	myconf="--disable-mga --enable-flac --with-gnu-ld \
-			--enable-a52 --enable-dvbpsi --enable-libmpeg2 \
-			--disable-qt --disable-kde --disable-gnome --disable-gtk \
-			--disable-libcdio --disable-libcddb --disable-vcdx \
-			--enable-ffmpeg --with-ffmpeg-mp3lame \
-			--enable-livedotcom --with-livedotcom-tree=/usr/lib/live --disable-skins --disable-skins2"
-
-	# qt, kde, gnome and gtk interfaces are deprecated and in a bad condition
-	# the same for mga video, libdv and xvid decoders 
-	# cddax and vcdx (which depend on libcdio and libcddb) are not ready yet
-
-	#--enable-pth				GNU Pth support (default disabled)
-	#--enable-st				State Threads (default disabled)
-	#--enable-gprof				gprof profiling (default disabled)
-	#--enable-cprof				cprof profiling (default disabled)
-	#--enable-mostly-builtin	most modules will be built-in (default enabled)
-	#--disable-optimizations	disable compiler optimizations (default disabled)
-	#--enable-testsuite			build test modules (default disabled)
-	#--disable-plugins			make all plugins built-in (default plugins enabled)
-
-	use debug && myconf="${myconf} --enable-debug" \
-		|| myconf="${myconf} --enable-release"
-
-	(use imlib && use wxwindows) && myconf="${myconf} --enable-skins --enable-skins2"
-
-	use mozilla \
-		&& myconf="${myconf} --enable-mozilla \
-		MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config \
-		XPIDL=/usr/bin/xpidl"
-
-	if [ "${ARCH}" = "ppc" ]; then
-		# Please post a bugreport on the next version bump
-		# to have a ppc dev test if AltiVec has been fixed!
-		ewarn "AltiVec is broken in this version of VLC"
-		myconf="${myconf} --disable-altivec"
-	fi
-
-	# vlc uses its own ultraoptimizaed CXXFLAGS
-	# and forcing custom ones generally fails building
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.6
-
-	# Avoid timestamp skews with autotools
-	touch configure.ac
-	touch aclocal.m4
-	touch configure
-	touch config.h.in
-	touch $(find . -name Makefile.in)
-
-#		$(use_enable dvb satellite) \
-#		$(use_enable altivec) \
-	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 aac faad) \
-		$(use_enable v4l) \
-		$(use_enable dvd) \
-		$(use_enable dvd vcd) \
-		$(use_enable dvd dvdread) \
-		$(use_enable dvd dvdplay) \
-		$(use_enable dvd dvdnav) \
-		$(use_enable dvb) \
-		$(use_enable dvb pvr) \
-		$(use_enable joystick) $(use_enable lirc) \
-		$(use_enable arts) \
-		$(use_enable oggvorbis ogg) $(use_enable oggvorbis vorbis) \
-		$(use_enable theora) \
-		$(use_enable speex) \
-		$(use_enable matroska mkv) \
-		$(use_enable truetype freetype) \
-		$(use_enable bidi fribidi) \
-		$(use_enable svga svgalib) \
-		$(use_enable fbcon fb) \
-		$(use_enable aalib aa) $(use_enable aalib caca) \
-		$(use_enable xv xvideo) \
-		$(use_enable X x11) \
-		$(use_enable 3dfx glide) \
-		$(use_enable dts) \
-		${myconf} || die "configure of VLC failed"
-
-	if [[ $(gcc-major-version) == 2 ]]; then
-		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
-	fi
-
-	# parallel make doesn't work with our complicated makefile
-	# this is also the reason as why you shouldn't run autoconf
-	# or automake yourself. (or bootstrap for that matter)
-	MAKEOPTS="${MAKEOPTS} -j1"
-	emake || die "make of VLC failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL* \
-	MAINTAINERS NEWS README* THANKS doc/ChangeLog-*
-}
diff --git a/media-video/vlc/vlc-0.8.0.ebuild b/media-video/vlc/vlc-0.8.0.ebuild
deleted file mode 100644
index 2c40c61a265b..000000000000
--- a/media-video/vlc/vlc-0.8.0.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# 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.0.ebuild,v 1.5 2005/03/23 16:18:35 seemant Exp $
-
-# Missing support for...
-#	tarkin - package not in portage yet - experimental
-#	tremor - package not in portage yet - experimental
-
-inherit libtool gcc eutils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="arts ncurses dvd gtk nls 3dfx svga fbcon esd X alsa ggi speex
-	oggvorbis gnome xv oss sdl aalib bidi truetype v4l lirc
-	wxwindows imlib matroska dvb mozilla debug aac theora
-	xosd altivec png dts" #slp
-
-RDEPEND="X? ( virtual/x11 )
-	aalib? ( >=media-libs/aalib-1.4_rc4-r2
-			>=media-libs/libcaca-0.9 )
-	alsa? ( >=media-libs/alsa-lib-0.9_rc2 )
-	dvb? ( media-libs/libdvb
-		media-tv/linuxtv-dvb )
-	dvd? ( >=media-libs/libdvdread-0.9.4
-		>=media-libs/libdvdcss-1.2.8
-		>=media-libs/libdvdnav-0.1.9
-		>=media-libs/libdvdplay-1.0.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	aac? ( >=media-libs/faad2-2.0_rc3 )
-	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 )
-	lirc? ( app-misc/lirc )
-	mad? ( media-libs/libmad
-		media-libs/libid3tag )
-	matroska? ( >=media-libs/libmatroska-0.7 )
-	mozilla? ( >=www-client/mozilla-1.5 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0.1
-		>=media-libs/libogg-1.1 )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	bidi? ( >=dev-libs/fribidi-0.10.4 )
-	theora? ( media-libs/libtheora )
-	truetype? ( >=media-libs/freetype-2.1.4 )
-	wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
-	xosd? ( >=x11-libs/xosd-2.0 )
-	3dfx? ( !amd64? ( media-libs/glide-v3 ) )
-	png? ( >=media-libs/libpng-1.2.5 )
-	speex? ( >=media-libs/speex-1.1.5 )
-	dts? ( >=media-libs/libdts-0.0.2 )
-	svga? ( media-libs/svgalib )
-	>=media-sound/lame-3.96
-	>=media-libs/libdvbpsi-0.1.4
-	>=media-libs/a52dec-0.7.4
-	>=media-libs/libmpeg2-0.4.0
-	>=media-video/ffmpeg-0.4.8.20040222
-	>=media-plugins/live-2004.07.20
-	>=media-libs/flac-1.1.0"
-#	slp? ( >=net-libs/openslp-1.0.11 )
-
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.5.8
-	>=sys-devel/automake-1.7.9"
-
-src_unpack() {
-	unpack ${A}
-
-	# We only have glide v3 in portage
-	cd ${S}
-	sed -i \
-		-e "s:/usr/include/glide:/usr/include/glide3:" \
-		-e "s:glide2x:glide3:" \
-		configure
-
-	# Fix the default font
-	sed -i -e "s:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/X11R6/lib/X11/fonts/truetype/timesbd.ttf:" modules/misc/freetype.c
-
-	cd ${S}/modules/video_output
-	epatch ${FILESDIR}/glide.patch
-	cd ${S}
-
-}
-
-src_compile() {
-	# Configure and build VLC
-	cd ${S}
-	local myconf
-	myconf="--disable-mga --enable-flac --with-gnu-ld \
-			--enable-a52 --enable-dvbpsi --enable-libmpeg2 \
-			--disable-qt --disable-kde --disable-gnome --disable-gtk \
-			--disable-libcdio --disable-libcddb --disable-vcdx \
-			--enable-ffmpeg --with-ffmpeg-mp3lame \
-			--enable-livedotcom --with-livedotcom-tree=/usr/lib/live --disable-skins --disable-skins2 --disable-slp"
-
-	# qt, kde, gnome and gtk interfaces are deprecated and in a bad condition
-	# the same for mga video, libdv and xvid decoders 
-	# cddax and vcdx (which depend on libcdio and libcddb) are not ready yet
-
-	#--enable-pth				GNU Pth support (default disabled)
-	#--enable-st				State Threads (default disabled)
-	#--enable-gprof				gprof profiling (default disabled)
-	#--enable-cprof				cprof profiling (default disabled)
-	#--enable-mostly-builtin	most modules will be built-in (default enabled)
-	#--disable-optimizations	disable compiler optimizations (default disabled)
-	#--enable-testsuite			build test modules (default disabled)
-	#--disable-plugins			make all plugins built-in (default plugins enabled)
-
-	use debug && myconf="${myconf} --enable-debug" \
-		|| myconf="${myconf} --enable-release"
-
-	(use imlib && use wxwindows) && myconf="${myconf} --enable-skins --enable-skins2"
-
-	use mozilla \
-		&& myconf="${myconf} --enable-mozilla \
-		MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config \
-		XPIDL=/usr/bin/xpidl"
-
-	if [ "${ARCH}" = "ppc" ]; then
-		# Please post a bugreport on the next version bump
-		# to have a ppc dev test if AltiVec has been fixed!
-		ewarn "AltiVec is broken in this version of VLC"
-		myconf="${myconf} --disable-altivec"
-	fi
-
-	# vlc uses its own ultraoptimizaed CXXFLAGS
-	# and forcing custom ones generally fails building
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.6
-
-	# Avoid timestamp skews with autotools
-	touch configure.ac
-	touch aclocal.m4
-	touch configure
-	touch config.h.in
-	touch $(find . -name Makefile.in)
-
-#		$(use_enable dvb satellite) \
-#		$(use_enable altivec) \
-	econf \
-		$(use_enable nls) \
-		$(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 aac faad) \
-		$(use_enable v4l) \
-		$(use_enable dvd) \
-		$(use_enable dvd vcd) \
-		$(use_enable dvd dvdread) \
-		$(use_enable dvd dvdplay) \
-		$(use_enable dvd dvdnav) \
-		$(use_enable dvb) \
-		$(use_enable dvb pvr) \
-		$(use_enable joystick) $(use_enable lirc) \
-		$(use_enable arts) \
-		$(use_enable oggvorbis ogg) $(use_enable oggvorbis vorbis) \
-		$(use_enable theora) \
-		$(use_enable speex) \
-		$(use_enable matroska mkv) \
-		$(use_enable truetype freetype) \
-		$(use_enable bidi fribidi) \
-		$(use_enable svga svgalib) \
-		$(use_enable fbcon fb) \
-		$(use_enable aalib aa) $(use_enable aalib caca) \
-		$(use_enable xv xvideo) \
-		$(use_enable X x11) \
-		$(use_enable 3dfx glide) \
-		$(use_enable dts) \
-		${myconf} || die "configure of VLC failed"
-#		$(use_enable slp) \ broken
-
-	if [[ $(gcc-major-version) == 2 ]]; then
-		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
-	fi
-
-	# parallel make doesn't work with our complicated makefile
-	# this is also the reason as why you shouldn't run autoconf
-	# or automake yourself. (or bootstrap for that matter)
-	MAKEOPTS="${MAKEOPTS} -j1"
-	emake || die "make of VLC failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL* \
-	MAINTAINERS NEWS README* THANKS doc/ChangeLog-*
-}