Rename mozilla useflag into nsplugin. Removed old (bugged) versions.

(Portage version: 2.0.51.22-r1)

14 files changed, 24 insertions, 736 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 161388f93d98..8650438e3973 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.97 2005/07/11 23:39:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.98 2005/07/12 16:49:53 flameeyes Exp $
+
+  12 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/mpeg2dec-20030612-configure.in-fpic.patch,
+  -files/0.6.2-mozilla-fix.patch, -files/glide.patch, -vlc-0.6.2.ebuild,
+  -vlc-0.6.2-r1.ebuild, -vlc-0.7.2.ebuild, vlc-0.8.1-r1.ebuild,
+  vlc-0.8.1-r2.ebuild, vlc-0.8.1-r3.ebuild, vlc-0.8.2.ebuild:
+  Rename mozilla useflag into nsplugin. Removed old (bugged) versions.
 
 *vlc-0.8.2-r1 (11 Jul 2005)
 
diff --git a/media-video/vlc/files/0.6.2-mozilla-fix.patch b/media-video/vlc/files/0.6.2-mozilla-fix.patch
deleted file mode 100644
index 9b71f7145f2a..000000000000
--- a/media-video/vlc/files/0.6.2-mozilla-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ruN vlc-0.6.2.orig/mozilla/vlcpeer.cpp vlc-0.6.2/mozilla/vlcpeer.cpp
---- vlc-0.6.2.orig/mozilla/vlcpeer.cpp	2003-11-22 05:27:06.000000000 +0100
-+++ vlc-0.6.2/mozilla/vlcpeer.cpp	2003-11-22 05:27:53.000000000 +0100
-@@ -26,6 +26,7 @@
-  *****************************************************************************/
- #include <vlc/vlc.h>
- 
-+#include <mozilla-config.h>
- #include <nsISupports.h>
- #include <nsMemory.h>
- #include <npapi.h>
-diff -ruN vlc-0.6.2.orig/mozilla/vlcplugin.cpp vlc-0.6.2/mozilla/vlcplugin.cpp
---- vlc-0.6.2.orig/mozilla/vlcplugin.cpp	2003-11-22 05:27:06.000000000 +0100
-+++ vlc-0.6.2/mozilla/vlcplugin.cpp	2003-11-22 05:28:04.000000000 +0100
-@@ -26,6 +26,7 @@
-  *****************************************************************************/
- #include <vlc/vlc.h>
- 
-+#include <mozilla-config.h>
- #include <nsISupports.h>
- #include <nsMemory.h>
- #include <npapi.h>
-diff -ruN vlc-0.6.2.orig/mozilla/vlcshell.cpp vlc-0.6.2/mozilla/vlcshell.cpp
---- vlc-0.6.2.orig/mozilla/vlcshell.cpp	2003-11-22 05:27:06.000000000 +0100
-+++ vlc-0.6.2/mozilla/vlcshell.cpp	2003-11-22 05:28:15.000000000 +0100
-@@ -37,6 +37,7 @@
- #endif
- 
- /* Mozilla stuff */
-+#include <mozilla-config.h>
- #include <nsISupports.h>
- #include <nsMemory.h>
- #include <npapi.h>
diff --git a/media-video/vlc/files/digest-vlc-0.6.2 b/media-video/vlc/files/digest-vlc-0.6.2
deleted file mode 100644
index 2affdd7a9dc3..000000000000
--- a/media-video/vlc/files/digest-vlc-0.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 54d554dd61e2bac8c9c3fbd0b5eba0c1 vlc-0.6.2.tar.bz2 2982103
diff --git a/media-video/vlc/files/digest-vlc-0.6.2-r1 b/media-video/vlc/files/digest-vlc-0.6.2-r1
deleted file mode 100644
index 4eac022d264a..000000000000
--- a/media-video/vlc/files/digest-vlc-0.6.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 54d554dd61e2bac8c9c3fbd0b5eba0c1 vlc-0.6.2.tar.bz2 2982103
-MD5 17b880eb8766a2e46834d2274882d284 mpeg2dec-20030612.tar.bz2 374723
-MD5 7cf66a413f64d930de1f498aac58d630 ffmpeg-20030813.tar.bz2 1123986
diff --git a/media-video/vlc/files/digest-vlc-0.7.2 b/media-video/vlc/files/digest-vlc-0.7.2
deleted file mode 100644
index 2fabdc869b72..000000000000
--- a/media-video/vlc/files/digest-vlc-0.7.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3749fb3a0aed1372d4975a5b962e72cc vlc-0.7.2.tar.bz2 4516835
diff --git a/media-video/vlc/files/glide.patch b/media-video/vlc/files/glide.patch
deleted file mode 100644
index 21140f701208..000000000000
--- a/media-video/vlc/files/glide.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- glide.c	2003-08-16 02:49:23.000000000 -0400
-+++ glide.c-modified	2003-08-16 02:46:13.000000000 -0400
-@@ -243,20 +243,11 @@
- 
- static int OpenDisplay( vout_thread_t *p_vout )
- {
--    static char version[80];
--    GrHwConfiguration hwconfig;
-     GrScreenResolution_t resolution = GR_RESOLUTION_800x600;
-     GrLfbInfo_t p_front_buffer_info;                    /* front buffer info */
- 
--    grGlideGetVersion( version );
-     grGlideInit();
- 
--    if( !grSstQueryHardware(&hwconfig) )
--    {
--        msg_Err( p_vout, "cannot get 3dfx hardware config" );
--        return( 1 );
--    }
--
-     grSstSelect( 0 );
-     if( !grSstWinOpen( 0, resolution, GR_REFRESH_60Hz,
-                        GR_COLORFORMAT_ABGR, GR_ORIGIN_UPPER_LEFT, 2, 1 ) )
diff --git a/media-video/vlc/files/mpeg2dec-20030612-configure.in-fpic.patch b/media-video/vlc/files/mpeg2dec-20030612-configure.in-fpic.patch
deleted file mode 100644
index f488c666296d..000000000000
--- a/media-video/vlc/files/mpeg2dec-20030612-configure.in-fpic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- aclocal.m4	2003-07-26 15:37:34.000000000 +0000
-+++ aclocal.m4	2004-01-07 09:04:13.505605717 +0000
-@@ -121,10 +121,12 @@
- 		-rpath / f.lo g.lo >/dev/null 2>&1 &&
- 	ac_cv_libtool_non_pic=yes
-     cd ..; rm -fr ac_test_libtool; AC_MSG_RESULT([$ac_cv_libtool_non_pic])
--    if test x"$ac_cv_libtool_non_pic" = x"yes"; then
-+    if test "$host_cpu" = "x86_64"; then
-+	ifelse([$2],[],[:],[$2])
-+    elif test x"$ac_cv_libtool_non_pic" = x"yes"; then
- 	ifelse([$1],[],[:],[$1])
-     else
--	ifelse([$2],[],[:],[$2])
-+	ifelse([$3],[],[:],[$3])
-     fi])
- 
- dnl AC_CHECK_GENERATE_INTTYPES_H (INCLUDE-DIRECTORY)
---- libmpeg2/configure.incl	2003-01-19 01:24:03.000000000 +0000
-+++ libmpeg2/configure.incl	2004-01-07 09:02:13.733060531 +0000
-@@ -2,7 +2,7 @@
- AC_SUBST([LIBMPEG2_LIBS])
- 
- dnl avoid -fPIC when possible
--AC_LIBTOOL_NON_PIC([LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -prefer-non-pic"])
-+AC_LIBTOOL_NON_PIC([LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -prefer-non-pic"], [LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -prefer-pic"])
- 
- dnl check for cpudetect
- AC_ARG_ENABLE([accel-detect],
diff --git a/media-video/vlc/vlc-0.6.2-r1.ebuild b/media-video/vlc/vlc-0.6.2-r1.ebuild
deleted file mode 100644
index 3ce63e5af495..000000000000
--- a/media-video/vlc/vlc-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,231 +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.2-r1.ebuild,v 1.21 2005/05/14 23:36:51 flameeyes Exp $
-
-# Missing support for...
-#	tarkin - package not in portage yet - experimental
-#	theora - package not in portage yet - experimental
-#	tremor - package not in portage yet - experimental
-
-inherit toolchain-funcs eutils libtool
-
-PFFM=ffmpeg-20030813
-PMPG=mpeg2dec-20030612
-
-SFFM=${WORKDIR}/${PFFM}
-SMPG=${WORKDIR}/${PMPG}
-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
-	http://www.videolan.org/pub/${PN}/${PV}/contrib/${PMPG}.tar.bz2
-	http://www.videolan.org/pub/${PN}/${PV}/contrib/${PFFM}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~x86"
-IUSE="3dfx X aalib alsa altivec arts debug dvb dvd dvdread esd aac fbcon flac
-	ggi gnome gtk imlib joystick kde lirc mad matroska mmx mozilla ncurses nls
-	ogg vorbis 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 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	ogg? ( >=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* )
-	3dfx? ( media-libs/glide-v3 )
-	>=media-libs/a52dec-0.7.4
-	flac? ( >=media-libs/flac-1.1.0 )
-	>=media-libs/libdv-0.98
-	>=media-libs/libdvbpsi-0.1.3"
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
-
-# mplayer is a required dependancy until the libpostproc code becomes
-# a separate packages or until ffmpeg gets 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}
-
-	# Mozilla plugin related fix
-	epatch ${FILESDIR}/${PV}-mozilla-fix.patch
-
-	cd ${S}
-
-	# 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}
-
-	# Patch libmpeg2
-	cd ${SMPG}
-	epatch ${FILESDIR}/${PMPG}-configure.in-fpic.patch
-
-	cd ${S}
-	touch configure.ac
-	touch aclocal.m4
-	touch configure
-	touch config.h.in
-	touch `find . -name Makefile.in`
-}
-
-src_compile() {
-	# first build the deps
-	# LibMPEG2:
-	cd ${SMPG}
-	autoconf
-	econf \
-		--disable-sdl \
-		--without-x \
-		`use_enable mmx` || die "libmpeg2 failed to configure"
-
-	emake OPT_CFLAGS="${CFLAGS}" || make OPT_CFLAGS="${CFLAGS}" || die
-
-	# ffMPEG
-	cd ${SFFM}
-	./configure \
-		--enable-mp3lame \
-		--disable-vorbis || die "ffmpeg failed to configure"
-
-	cd libavcodec
-	make || die "ffmpeg->libavcodec failed to compile"
-	cd libpostproc
-	make || die "ffmpeg->libpostproc failed to compile"
-
-	cd ${S}
-	local myconf
-	myconf="--disable-mga --enable-flac --with-gnu-ld \
-			--enable-a52 --enable-dvbpsi"
-
-	#--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"
-
-	export CXXFLAGS=""
-	export CFLAGS=""
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.6
-
-	myconf="${myconf} --enable-ffmpeg \
-		--with-ffmpeg-tree=${SFFM} \
-		--with-ffmpeg-mp3lame \
-		--enable-libmpeg2 \
-		--with-libmpeg2-tree=${SMPG}"
-
-	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 kde` `use_enable arts` \
-		`use_enable gtk` `use_enable gnome` \
-		`use_enable ogg` `use_enable 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
-	fi
-
-	MAKEOPTS="${MAKEOPTS} -j1"
-	make || die "make 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
deleted file mode 100644
index dab72093a847..000000000000
--- a/media-video/vlc/vlc-0.6.2.ebuild
+++ /dev/null
@@ -1,186 +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.2.ebuild,v 1.27 2005/05/14 23:36:51 flameeyes Exp $
-
-# Missing support for...
-#	tarkin - package not in portage yet - experimental
-#	theora - package not in portage yet - experimental
-#	tremor - package not in portage yet - experimental
-
-inherit toolchain-funcs 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 altivec arts debug dvb dvd dvdread esd aac fbcon ggi
-	gnome gtk imlib joystick kde lirc mad matroska mozilla ncurses nls ogg vorbis 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 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	ogg? ( >=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* )
-	3dfx? ( media-libs/glide-v3 )
-	>=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.7
-	=media-libs/libmpeg2-0.3*
-	>=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 gets 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}
-
-	# Mozilla plugin related fix
-	epatch ${FILESDIR}/${PV}-mozilla-fix.patch
-
-	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
-		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
-	)
-
-	# We only have glide v3 in portage
-	cd ${S}
-	sed -i -e "s:/usr/include/glide:/usr/include/glide3:" configure
-	sed -i -e "s:glide2x:glide3:" configure
-	cd ${S}/modules/video_output
-	epatch ${FILESDIR}/glide.patch
-	cd ${S}
-
-	touch configure.ac
-	touch aclocal.m4
-	touch configure
-	touch config.h.in
-	touch `find . -name Makefile.in`
-}
-
-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)
-	#--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"
-
-	export CXXFLAGS=""
-	export CFLAGS=""
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.6
-
-	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 kde` `use_enable arts` \
-		`use_enable gtk` `use_enable gnome` \
-		`use_enable ogg` `use_enable 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
-	fi
-
-	MAKEOPTS="${MAKEOPTS} -j1"
-	emake || die "make 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.ebuild b/media-video/vlc/vlc-0.7.2.ebuild
deleted file mode 100644
index 07429e40ad6e..000000000000
--- a/media-video/vlc/vlc-0.7.2.ebuild
+++ /dev/null
@@ -1,192 +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.ebuild,v 1.14 2005/07/11 21:00:33 swegener Exp $
-
-# Missing support for...
-#	tarkin - package not in portage yet - experimental
-#	tremor - package not in portage yet - experimental
-
-inherit libtool toolchain-funcs 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 ~x86"
-IUSE="arts ncurses dvd gtk nls 3dfx svga fbcon esd X alsa ggi speex
-	ogg vorbis gnome xv oss sdl aalib slp bidi truetype v4l lirc
-	wxwindows imlib matroska dvb mozilla debug aac theora
-	xosd png mad"
-
-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.4 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	ogg? ( >=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 )
-	theora? ( media-libs/libtheora )
-	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.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.03*
-	>=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
-
-	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 ogg) $(use_enable vorbis 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) \
-		${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.1-r1.ebuild b/media-video/vlc/vlc-0.8.1-r1.ebuild
index 4ceeb891f61f..4b4e4afbbdf7 100644
--- a/media-video/vlc/vlc-0.8.1-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.1-r1.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.8.1-r1.ebuild,v 1.13 2005/05/22 19:10:22 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r1.ebuild,v 1.14 2005/07/12 16:49:53 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -18,7 +18,7 @@ SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ppc sparc x86"
-IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows xosd lirc joystick mozilla hal stream mad xv bidi gtk2 sdl threads ssl"
+IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows xosd lirc joystick nsplugin hal stream mad xv bidi gtk2 sdl threads ssl"
 
 DEPEND="hal? ( =sys-apps/hal-0.4* )
 		cdio? ( >=dev-libs/libcdio-0.70 )
@@ -52,7 +52,7 @@ DEPEND="hal? ( =sys-apps/hal-0.4* )
 		wxwindows? ( =x11-libs/wxGTK-2.4* )
 		xosd? ( x11-libs/xosd )
 		lirc? ( app-misc/lirc )
-		mozilla? ( www-client/mozilla )
+		nsplugin? ( www-client/mozilla )
 		3dfx? ( media-libs/glide-v3 )
 		bidi? ( >=dev-libs/fribidi-0.10.4 )
 		gnutls? ( >=net-libs/gnutls-1.0.0 )
@@ -123,7 +123,7 @@ src_compile () {
 	# mozilla-config is not in ${PATH}
 	# so the configure script won't find it
 	# unless we setup the proper variable
-	if use mozilla ; then
+	if use nsplugin ; then
 		myconf="${myconf} --enable-mozilla MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config"
 	else
 		myconf="${myconf} --disable-mozilla"
@@ -190,7 +190,7 @@ src_compile () {
 	# looks for xpidl in /usr/lib/mozilla/xpidl
 	# and doesn't find it there because it's
 	# in /usr/bin! - ChrisWhite
-	if use mozilla; then
+	if use nsplugin; then
 		sed -e "s:^XPIDL = .*:XPIDL = /usr/bin/xpidl:" -i mozilla/Makefile \
 		|| die "could not fix XPIDL path"
 	fi
diff --git a/media-video/vlc/vlc-0.8.1-r2.ebuild b/media-video/vlc/vlc-0.8.1-r2.ebuild
index 89a0d7f0fbd0..14dfa3382894 100644
--- a/media-video/vlc/vlc-0.8.1-r2.ebuild
+++ b/media-video/vlc/vlc-0.8.1-r2.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.8.1-r2.ebuild,v 1.6 2005/05/22 15:33:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r2.ebuild,v 1.7 2005/07/12 16:49:53 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -17,7 +17,7 @@ SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick mozilla hal stream mad xv bidi gtk2 sdl ssl"
+IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick nsplugin hal stream mad xv bidi gtk2 sdl ssl"
 
 RDEPEND="hal? ( =sys-apps/hal-0.4* )
 		cdio? ( >=dev-libs/libcdio-0.70 )
@@ -52,7 +52,7 @@ RDEPEND="hal? ( =sys-apps/hal-0.4* )
 		ncurses? ( sys-libs/ncurses )
 		xosd? ( x11-libs/xosd )
 		lirc? ( app-misc/lirc )
-		mozilla? ( www-client/mozilla )
+		nsplugin? ( www-client/mozilla )
 		3dfx? ( media-libs/glide-v3 )
 		bidi? ( >=dev-libs/fribidi-0.10.4 )
 		gnutls? ( >=net-libs/gnutls-1.0.0 )
@@ -135,7 +135,7 @@ src_compile () {
 	# mozilla-config is not in ${PATH}
 	# so the configure script won't find it
 	# unless we setup the proper variable
-	if use mozilla ; then
+	if use nsplugin ; then
 		myconf="${myconf} --enable-mozilla MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config"
 	else
 		myconf="${myconf} --disable-mozilla"
@@ -203,7 +203,7 @@ src_compile () {
 	# looks for xpidl in /usr/lib/mozilla/xpidl
 	# and doesn't find it there because it's
 	# in /usr/bin! - ChrisWhite
-	if use mozilla; then
+	if use nsplugin; then
 		sed -e "s:^XPIDL = .*:XPIDL = /usr/bin/xpidl:" -i mozilla/Makefile \
 		|| die "could not fix XPIDL path"
 	fi
diff --git a/media-video/vlc/vlc-0.8.1-r3.ebuild b/media-video/vlc/vlc-0.8.1-r3.ebuild
index 38e6c9f1490a..89a14a3d3bbb 100644
--- a/media-video/vlc/vlc-0.8.1-r3.ebuild
+++ b/media-video/vlc/vlc-0.8.1-r3.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.8.1-r3.ebuild,v 1.5 2005/06/10 17:29:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r3.ebuild,v 1.6 2005/07/12 16:49:53 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -17,7 +17,7 @@ SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick mozilla hal stream mp3 xv bidi gtk2 sdl ssl"
+IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick nsplugin hal stream mp3 xv bidi gtk2 sdl ssl"
 
 RDEPEND="hal? ( =sys-apps/hal-0.4* )
 		cdio? ( >=dev-libs/libcdio-0.70 )
@@ -52,7 +52,7 @@ RDEPEND="hal? ( =sys-apps/hal-0.4* )
 		ncurses? ( sys-libs/ncurses )
 		xosd? ( x11-libs/xosd )
 		lirc? ( app-misc/lirc )
-		mozilla? ( www-client/mozilla )
+		nsplugin? ( www-client/mozilla )
 		3dfx? ( media-libs/glide-v3 )
 		bidi? ( >=dev-libs/fribidi-0.10.4 )
 		gnutls? ( >=net-libs/gnutls-1.0.0 )
@@ -133,7 +133,7 @@ src_compile () {
 	# mozilla-config is not in ${PATH}
 	# so the configure script won't find it
 	# unless we setup the proper variable
-	if use mozilla ; then
+	if use nsplugin ; then
 		myconf="${myconf} --enable-mozilla MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config"
 	else
 		myconf="${myconf} --disable-mozilla"
@@ -206,7 +206,7 @@ src_compile () {
 	# looks for xpidl in /usr/lib/mozilla/xpidl
 	# and doesn't find it there because it's
 	# in /usr/bin! - ChrisWhite
-	if use mozilla; then
+	if use nsplugin; then
 		sed -e "s:^XPIDL = .*:XPIDL = /usr/bin/xpidl:" -i mozilla/Makefile \
 		|| die "could not fix XPIDL path"
 	fi
diff --git a/media-video/vlc/vlc-0.8.2.ebuild b/media-video/vlc/vlc-0.8.2.ebuild
index 395b6a227c9b..06100a87e18b 100644
--- a/media-video/vlc/vlc-0.8.2.ebuild
+++ b/media-video/vlc/vlc-0.8.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.8.2.ebuild,v 1.4 2005/07/10 00:16:10 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2.ebuild,v 1.5 2005/07/12 16:49:53 flameeyes Exp $
 
 # Missing USE-flags due to missing deps:
 # media-vidoe/vlc:tremor - Enables Tremor decoder support
@@ -81,11 +81,6 @@ RDEPEND="hal? ( =sys-apps/hal-0.4* )
 		svg? ( >=gnome-base/librsvg-2.5.0 )"
 #		threads? ( dev-libs/pth )
 #		portaudio? ( >=media-libs/portaudio-0.19 )
-# 		mozilla? ( || (
-# 			www-client/mozilla
-# 			www-client/mozilla-firefox
-# 			net-libs/gecko-sdk
-# 			) )
 # 		slp? ( net-libs/openslp )
 
 DEPEND="${RDEPEND}
@@ -143,19 +138,6 @@ src_compile () {
 	# interface which isn't
 	myconf="${myconf} --disable-skins2"
 
-#	if use mozilla; then
-#		if has_version www-client/mozilla; then
-#			XPIDL="/usr/bin/xpidl"
-#			myconf="${myconf} MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config"
-#		elif has_version www-client/mozilla-firefox; then
-#			XPIDL="/usr/lib/MozillaFirefox/xpidl"
-#			append-flags "-I/usr/$(get_libdir)/MozillaFirefox/include"
-#		elif has_version net-libs/gecko-sdk; then
-#			XPIDL="/usr/share/gecko-sdk/bin/xpidl"
-#			append-flags "-I/usr/share/gecko-sdk/include"
-#		fi
-#	fi
-
 	if use wxwindows; then
 		myconf="${myconf} --with-wx-config=$(basename ${WX_CONFIG}) --with-wx-config-path=$(dirname ${WX_CONFIG})"
 	fi
@@ -244,9 +226,6 @@ src_compile () {
 		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
 	fi
 
-#	use mozilla && sed -i -e "s:^XPIDL = .*:XPIDL = ${XPIDL}:" mozilla/Makefile \
-#			|| die "could not fix XPIDL path"
-
 	emake -j1 || die "make of VLC failed"
 }