we have a changelog for this ;)

11 files changed, 35 insertions, 1325 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index b8a6f0c8a1d0..f67416ff8e8e 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.74 2003/09/03 20:52:11 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.75 2003/09/04 10:12:01 lanius Exp $
+
+  04 Sep 2003; Heinrich Wendel <lanius@gentoo.org> mplayer-0.90-r2.ebuild,
+  mplayer-0.90-r5.ebuild, mplayer-0.90_rc4.ebuild, mplayer-0.91.ebuild,
+  mplayer-1.0_pre1.ebuild, files/mplayer-0.90-fix-version.patch:
+  - removed old ebuilds
+  - fixed samba bug #25912
+  - fixed fs bug #12751
+  - marked 0.91 stable on x86 and ppc
 
 *mplayer-1.0_pre1 (04 Sep 2003)
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 172f09f0e9fe..c8c686a1adf9 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,20 +1,13 @@
-MD5 bfa391c640561586bdc6954f09785fca ChangeLog 13776
-MD5 333692f910b61bf63de546427bd77b95 mplayer-1.0_pre1.ebuild 11051
-MD5 cedc0d5a5bb2f38aa3a70c4d6b9714ea mplayer-0.90_rc4.ebuild 10413
-MD5 ed46c3720c527acc6c565b2a6923e323 mplayer-0.91.ebuild 11143
-MD5 8d0a05f4b6e745dab549385d12533ce7 mplayer-0.90-r2.ebuild 11750
-MD5 97f36b3c36b1d41fcd185f077c16e70e mplayer-0.90-r5.ebuild 11199
+MD5 595c2d77f13cd6119e33431f9e8bc246 ChangeLog 14101
+MD5 b6b2ba40de4fecc47793cc603c95b004 mplayer-0.91.ebuild 11158
+MD5 da541a431c3ee9740461e9fa5d701d69 mplayer-1.0_pre1.ebuild 11086
 MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
-MD5 5acc0011a4730f2f9b83777d607d655b files/digest-mplayer-0.90_rc4 286
-MD5 3a99e8f86899fc5356ae8d563af2ac9c files/digest-mplayer-1.0_pre1 358
-MD5 889423ecc224e52910bb0df6c78ca037 files/mplayer-0.90-fix-version.patch 261
+MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
+MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
 MD5 9e064190a914d26b0392a266753161ed files/mplayer-0.90-ppc-benh.patch 2029
 MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
 MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
-MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
-MD5 c2d1a4c1e84abf704a7b9686ea9309ae files/digest-mplayer-0.90-r2 283
-MD5 6de835d441b7d4e971653b7eb6e57fff files/digest-mplayer-0.90-r5 488
 MD5 611354a9a8c185e9ae1cda37d197c073 files/digest-mplayer-0.91 355
 MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
 MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
-MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
+MD5 3a99e8f86899fc5356ae8d563af2ac9c files/digest-mplayer-1.0_pre1 358
diff --git a/media-video/mplayer/files/digest-mplayer-0.90-r2 b/media-video/mplayer/files/digest-mplayer-0.90-r2
deleted file mode 100644
index 3f296539f88c..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.90-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 9a9f294bbaab2071ecbc327f4e870be8 MPlayer-0.90.tar.bz2 3436463
-MD5 6c3f032ddf401ca522900291de03fee5 font-arial-iso-8859-1.tar.bz2 234810
-MD5 0f9a5d53f836e2d2d2bde207dc641044 font-arial-iso-8859-2.tar.bz2 222677
-MD5 5e12e283eeeec6125523a6f4a60d07cf default-skin-0.1.tar.bz2 167697
diff --git a/media-video/mplayer/files/digest-mplayer-0.90-r5 b/media-video/mplayer/files/digest-mplayer-0.90-r5
deleted file mode 100644
index 5ad7ef0529fa..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.90-r5
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 9a9f294bbaab2071ecbc327f4e870be8 MPlayer-0.90.tar.bz2 3436463
-MD5 6c3f032ddf401ca522900291de03fee5 font-arial-iso-8859-1.tar.bz2 234810
-MD5 0f9a5d53f836e2d2d2bde207dc641044 font-arial-iso-8859-2.tar.bz2 222677
-MD5 2cd7baa4ea60c42251c3dceaab9ae9cb Blue-1.0.tar.bz2 218710
-MD5 5e12e283eeeec6125523a6f4a60d07cf default-skin-0.1.tar.bz2 167697
-MD5 2e251590e34ff941ee3c81daac6085a8 mplayerosx_logo.zip 287062
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/digest-mplayer-0.90_rc4 b/media-video/mplayer/files/digest-mplayer-0.90_rc4
deleted file mode 100644
index c944fef576b0..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.90_rc4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 4976575433d5b0ad526ca1733f5cab26 MPlayer-0.90rc4.tar.bz2 3390207
-MD5 6c3f032ddf401ca522900291de03fee5 font-arial-iso-8859-1.tar.bz2 234810
-MD5 0f9a5d53f836e2d2d2bde207dc641044 font-arial-iso-8859-2.tar.bz2 222677
-MD5 5e12e283eeeec6125523a6f4a60d07cf default-skin-0.1.tar.bz2 167697
diff --git a/media-video/mplayer/files/mplayer-0.90-fix-version.patch b/media-video/mplayer/files/mplayer-0.90-fix-version.patch
deleted file mode 100644
index f3a7271cdee4..000000000000
--- a/media-video/mplayer/files/mplayer-0.90-fix-version.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- MPlayer-0.90/version.sh.orig	2003-04-27 16:23:59.000000000 +0200
-+++ MPlayer-0.90/version.sh	2003-04-27 16:24:08.000000000 +0200
-@@ -1,3 +1,3 @@
- #!/bin/sh
- 
--echo "#define VERSION \"0.90rc5-$1 \"" >version.h
-+echo "#define VERSION \"0.90-$1 \"" >version.h
diff --git a/media-video/mplayer/mplayer-0.90-r2.ebuild b/media-video/mplayer/mplayer-0.90-r2.ebuild
deleted file mode 100644
index 28a2a526f8f2..000000000000
--- a/media-video/mplayer/mplayer-0.90-r2.ebuild
+++ /dev/null
@@ -1,451 +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/mplayer/mplayer-0.90-r2.ebuild,v 1.5 2003/08/24 07:43:56 azarah Exp $
-
-IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb"
-
-inherit eutils
-
-# NOTE to myself:  Test this thing with and without dvd/gtk+ support,
-#                  as it seems the mplayer guys dont really care to
-#                  make it work without dvd support.
-
-# Handle PREversions as well
-MY_PV="${PV/_/}"
-S="${WORKDIR}/MPlayer-${MY_PV}"
-# Only install Skin if GUI should be build (gtk as USE flag)
-SRC_URI="http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
-	http://mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
-	http://mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	http://mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	gtk? ( mirror://gentoo/distfiles/default-skin-0.1.tar.bz2 )"
-#	 This is to get the digest problem fixed.
-#	 gtk? ( ftp://mplayerhq.hu/MPlayer/Skin/default.tar.bz2 )"
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-# 'encode' in USE for MEncoder.
-# If 'dvd' in USE, only DEPEND on libdvdnav, as
-# we use libdvdkit that comes with.
-RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
-	x86? ( >=media-libs/xvid-0.9.0
-	       >=media-libs/divx4linux-20020418
-	       >=media-libs/win32codecs-0.60 )
-	gtk? ( !gtk2 ( =x11-libs/gtk+-1.2*
-	               =dev-libs/glib-1.2* )
-	       media-libs/libpng
-	       >=x11-base/xfree-4.2.1-r2 )
-	gtk2? ( >=x11-libs/gtk+-2.0.6
-	        >=dev-libs/glib-2.0.6 )
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib
-	       media-libs/libungif )
-	truetype? ( >=media-libs/freetype-2.1 )
-	esd? ( media-sound/esound )
-	ggi? ( media-libs/libggi )
-	sdl? ( media-libs/libsdl )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	nas? ( media-libs/nas )
-	svga? ( media-libs/svgalib )
-	encode? ( media-sound/lame
-	          >=media-libs/libdv-0.9.5 )
-	xmms? ( media-sound/xmms )
-	opengl? ( virtual/opengl )
-	directfb? ( dev-libs/DirectFB )
-	oggvorbis? ( media-libs/libvorbis )
-	nls? ( sys-devel/gettext )
-	media-sound/cdparanoia
-	mpeg? ( media-libs/faad2 )
-	>=sys-apps/portage-2.0.36"
-#	dvd? ( media-libs/libdvdnav )
-# Hardcode paranoia support for now, as there is no
-# related USE flag.
-
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	app-arch/unzip"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc"
-
-
-src_unpack() {
-
-	unpack MPlayer-${MY_PV}.tar.bz2
-
-	use truetype || \
-		unpack font-arial-iso-8859-1.tar.bz2 font-arial-iso-8859-1.tar.bz2
-
-	# Fix bug with the default Skin
-	if [ -n "`use gtk`" ]
-	then
-		unpack default-skin-0.1.tar.bz2
-		cd ${WORKDIR}/default
-		epatch ${FILESDIR}/default-skin.diff
-	fi
-
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.90_rc4-gtk2.patch
-
-	# Fix mencoder segfaulting with bad arguments
-	cd ${S}; epatch ${FILESDIR}/mencoder-segfault.patch
-
-	if [ -n "`use ppc`" ]
-	then
-		# Fix mplayer to detect detect/use altivec on benh kernels,
-		# bug #18511.
-		cd ${S}; epatch ${FILESDIR}/${P}-ppc-benh.patch
-	fi
-
-	# Fix version, bug #19691
-	epatch ${FILESDIR}/${P}-fix-version.patch
-
-	#Fixing divx 2003 API
-	if has_version  '>=media-libs/divx4linux-20030428'
-	then
-		einfo "DivX 20030428 found"
-		cd ${S}
-		epatch ${FILESDIR}/${P}-divx.patch
-	else
-		einfo "Old DivX Api found"
-	fi
-}
-
-src_compile() {
-
-	use matrox && check_KV
-
-	local myconf=""
-
-	use 3dnow \
-		|| myconf="${myconf} --disable-3dnow --disable-3dnowex"
-
-	use sse \
-		|| myconf="${myconf} --disable-sse --disable-sse2"
-
-	# Only disable MMX if 3DNOW or SSE is not in USE
-	use mmx || use 3dnow || use sse \
-		|| myconf="${myconf} --disable-mmx --disable-mmx2"
-
-	# Only disable X if gtk is not in USE
-	use X || use gtk \
-		|| myconf="${myconf} --disable-gui --disable-x11 --disable-xv \
-		                     --disable-xmga --disable-png"
-
-	use jpeg \
-		|| myconf="${myconf} --disable-jpeg"
-
-	use gif \
-		|| myconf="${myconf} --disable-gif"
-
-	( use matrox && use X ) \
-		&& myconf="${myconf} --enable-xmga" \
-		|| myconf="${myconf} --disable-xmga"
-
-	use gtk \
-		&& myconf="${myconf} --enable-gui --enable-x11 \
-		                     --enable-xv --enable-vm --enable-png"
-
-	( use gtk && use gtk2 ) \
-		&& myconf="${myconf} --enable-gtk2"
-
-	use truetype \
-		&& myconf="${myconf} --enable-freetype" \
-		|| myconf="${myconf} --disable-freetype"
-
-	use oss \
-		|| myconf="${myconf} --disable-ossaudio"
-
-	use opengl \
-		|| myconf="${myconf} --disable-gl"
-
-	use sdl \
-		|| myconf="${myconf} --disable-sdl"
-
-	use ggi \
-		|| myconf="${myconf} --disable-ggi"
-
-	use svga \
-		|| myconf="${myconf} --disable-svga"
-
-	use directfb \
-		|| myconf="${myconf} --disable-directfb"
-
-	use fbcon \
-		|| myconf="${myconf} --disable-fbdev"
-
-	use esd \
-		|| myconf="${myconf} --disable-esd"
-
-	use alsa \
-		|| myconf="${myconf} --disable-alsa"
-
-	use arts \
-		|| myconf="${myconf} --disable-arts"
-
-	use nas \
-		|| myconf="${myconf} --disable-nas"
-
-	use oggvorbis \
-		|| myconf="${myconf} --disable-vorbis"
-
-	use encode \
-		&& myconf="${myconf} --enable-mencoder --enable-tv" \
-		|| myconf="${myconf} --disable-mencoder"
-
-	use dvd \
-		&& myconf="${myconf} --enable-mpdvdkit --disable-dvdnav" \
-		|| myconf="${myconf} --disable-mpdvdkit --disable-dvdread \
-		                     --disable-css --disable-dvdnav"
-	# Disable dvdnav support as its not considered to be functional anyhow
-
-	use xmms \
-		&& myconf="${myconf} --enable-xmms"
-
-	use mpeg \
-		&& myconf="${myconf} --enable-faad" \
-		|| myconf="${myconf} --disable-faad"
-
-	use matrox \
-		&& myconf="${myconf} --enable-mga" \
-		|| myconf="${myconf} --disable-mga"
-
-	use 3dfx \
-		&& myconf="${myconf} --enable-3dfx --enable-tdfxfb"
-
-	use dvb \
-		&& myconf="${myconf} --enable-dvb" \
-		|| myconf="${myconf} --disable-dvb"
-
-	use nls \
-		&& myconf="${myconf} --enable-i18n" \
-		|| myconf="${myconf} --disable-i18n"
-
-	if [ -d /opt/RealPlayer9/Real/Codecs ]
-	then
-		einfo "Setting REALLIBDIR to /opt/RealPlayer9/Real/Codecs..."
-		REALLIBDIR="/opt/RealPlayer9/Real/Codecs"
-	elif [ -d /opt/RealPlayer8/Codecs ]
-	then
-		einfo "Setting REALLIBDIR to /opt/RealPlayer8/Codecs..."
-		REALLIBDIR="/opt/RealPlayer8/Codecs"
-	else
-		REALLIBDIR="/usr/lib/real"
-	fi
-
-	if has_version media-plugins/live
-	then
-		einfo "Enabling LIVE.COM Streaming Media..."
-		myconf="${myconf} --enable-live"
-	fi
-
-
-	# For lirc support as the auto-detect doesn't seem to work
-	if [ -f /usr/include/lirc/lirc_client.h ]
-	then
-		einfo "Enabling lirc support..."
-		myconf="${myconf} --enable-lirc"
-	else
-		myconf="${myconf} --disable-lirc"
-	fi
-
-	if [ -e /dev/.devfsd ]
-	then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	# Crashes on start when compiled with most optimizations.
-	# The code have CPU detection code now, with CPU specific
-	# optimizations, so extra should not be needed and is not
-	# recommended by the authors
-	unset CFLAGS CXXFLAGS
-	./configure --prefix=/usr \
-		--datadir=/usr/share/mplayer \
-		--confdir=/usr/share/mplayer \
-		--disable-runtime-cpudetection \
-		--enable-largefiles \
-		--enable-menu \
-		--enable-dynamic-plugins \
-		--enable-real \
-		--enable-smb \
-		--with-reallibdir=${REALLIBDIR} \
-		--with-x11incdir=/usr/X11R6/include \
-		${myconf} || die
-	# Breaks with gcc-2.95.3, bug #14479
-	# --enable-shared-pp \
-
-	# emake borks on fast boxes - Azarah (07 Aug 2002)
-	make all || die
-
-	if [ -n "`use matrox`" ]
-	then
-		cd drivers
-		make all || die
-	fi
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-	     BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/lib \
-	     CONFDIR=${D}/usr/share/mplayer \
-	     DATADIR=${D}/usr/share/mplayer \
-	     MANDIR=${D}/usr/share/man \
-	     install || die
-
-	# Some stuff like transcode can use this one.
-	if [ -f ${S}/postproc/libpostproc.a ]
-	then
-		dolib ${S}/postproc/libpostproc.a
-
-		if [ ! -f ${D}/usr/include/postproc/postprocess.h ]
-		then
-			insinto /usr/include/postproc
-			doins ${S}/postproc/postprocess.h
-		fi
-	fi
-
-	# Install the documentation; DOCS is all mixed up not just html
-	mkdir -p ${D}/usr/share/doc/${PF} || die
-	cp -r ${S}/DOCS ${D}/usr/share/doc/${PF}/ || die
- 	dodoc AUTHORS ChangeLog README
-
-	# Copy misc tools to documentation path, as they're not installed
-	# directly
-	cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die
-
-	# Install the default Skin and Gnome menu entry
-	if [ -n "`use gtk`" ]
-	then
-		insinto /usr/share/mplayer/Skin/default
-		doins ${WORKDIR}/default/*
-		# Permissions is fried by default
-		chmod a+rx ${D}/usr/share/mplayer/Skin/default/
-		chmod a+r ${D}/usr/share/mplayer/Skin/default/*
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym /usr/bin/mplayer /usr/bin/gmplayer
-	fi
-
-	if [ -n "`use gnome`" ]
-	then
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	fi
-
-	# Install the font used by OSD and the GUI
-	if [ -z "`use truetype`" ]
-	then
-		dodir /usr/share/mplayer/fonts
-		cp -a ${WORKDIR}/font-arial* ${D}/usr/share/mplayer/fonts
-		rm -rf ${D}/usr/share/mplayer/font
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	elif [ -f /usr/X11R6/lib/X11/fonts/truetype/arial.ttf ]
-	then
-		# For freetype we need a real truetype font in place ...
-		dosym ../../X11R6/lib/X11/fonts/truetype/arial.ttf \
-			/usr/share/mplayer/subfont.ttf
-	fi
-	if [ -n "`use truetype`" ]
-	then
-		rm -rf ${D}/usr/share/mplayer/font
-	fi
-
-	# This tries setting up mplayer.conf automagically
-	local video="" audio="sdl"
-	if [ -n "`use X`" ]
-	then
-		[ -z "${video}" ] && use sdl && video="sdl"
-		[ -z "${video}" ] && use xv && video="xv"
-		[ -z "${video}" ] && use opengl && video="gl"
-		[ -z "${video}" ] && use ggi && video="ggi"
-		[ -z "${video}" ] && use dga && video="dga"
-		[ -z "${video}" ] && video="x11"
-	else
-		[ -z "${video}" ] && use fbcon && video="fbdev"
-		[ -z "${video}" ] && use svga && video="svga"
-		[ -z "${video}" ] && use aalib && video="aa"
-		[ -z "${video}" ] && video="vesa"
-	fi
-
-	if [ -n "`use sdl`" ]
-	then
-		audio="sdl"
-	elif [ -n "`use alsa`" ]
-	then
-		if [ -e /usr/lib/libasound.so.2 ]
-		then
-			audio="alsa9"
-		else
-			audio="alsa5"
-		fi
-	elif [ -n "`use oss`" ]
-	then
-		audio="oss"
-	fi
-
-	# Note to myself:  do not change " into '
-	sed -e "s/^# vo=xv/vo=${video}/" \
-	    -e "s/^# ao=oss/ao=${audio}/" \
-	    -e 's/include =/#include =/' \
-	    ${S}/etc/example.conf > ${T}/mplayer.conf
-
-	insinto /etc
-	doins ${T}/mplayer.conf
-	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-	doins ${S}/etc/input.conf
-	doins ${S}/etc/menu.conf
-
-	if [ -n "`use matrox`" ]
-	then
-		check_KV
-		insinto /lib/modules/${KV}/kernel/drivers/char
-		doins ${S}/drivers/mga_vid.o
-	fi
-}
-
-pkg_postinst() {
-
-	if [ -n "`use truetype`" ]
-	then
-		einfo "Please note that with the new freetype support you need to"
-		einfo "copy a truetype (.ttf) font to ~/.mplayer/subfont.ttf"
-	fi
-
-	if [ -n "`use ppc`" ]
-	then
-		echo
-		einfo "When you see only GREEN salad on your G4 while playing"
-		einfo "a DivX, you should recompile _without_ altivec enabled."
-		einfo "Furher information: http://bugs.gentoo.org/show_bug.cgi?id=18511"
-		echo
-		einfo "If everything functions fine with watching DivX and"
-		einfo "altivec enabled, please drop a comment on the mentioned bug!"
-	fi
-
-	depmod -a &>/dev/null || :
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a \
-	     ! -e ${ROOT}/usr/share/mplayer/font ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
-	     ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}
diff --git a/media-video/mplayer/mplayer-0.90-r5.ebuild b/media-video/mplayer/mplayer-0.90-r5.ebuild
deleted file mode 100644
index a925242026e4..000000000000
--- a/media-video/mplayer/mplayer-0.90-r5.ebuild
+++ /dev/null
@@ -1,422 +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/mplayer/mplayer-0.90-r5.ebuild,v 1.2 2003/08/24 07:43:56 azarah Exp $
-
-IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2"
-
-inherit eutils
-
-# NOTE to myself:  Test this thing with and without dvd/gtk+ support,
-#                  as it seems the mplayer guys dont really care to
-#                  make it work without dvd support.
-
-# Handle PREversions as well
-MY_PV="${PV/_/}"
-S="${WORKDIR}/MPlayer-${MY_PV}"
-SRC_URI="http://mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
-	http://mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	http://mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-1.9.17-mplayer.tar.bz2 )
-	gtk? ( http://mplayerhq.hu/MPlayer/Skin/Blue-1.0.tar.bz2 )"
-# Only install Skin if GUI should be build (gtk as USE flag)
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-# 'encode' in USE for MEncoder.
-RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
-	x86? ( >=media-libs/xvid-0.9.0
-	       >=media-libs/divx4linux-20020418
-	       >=media-libs/win32codecs-0.60 )
-	gtk? ( !gtk2 ( =x11-libs/gtk+-1.2*
-	               =dev-libs/glib-1.2* )
-	       media-libs/libpng
-	       >=x11-base/xfree-4.2.1-r2 )
-	gtk2? ( >=x11-libs/gtk+-2.0.6
-	        >=dev-libs/glib-2.0.6 )
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib
-	       media-libs/libungif )
-	truetype? ( >=media-libs/freetype-2.1 )
-	esd? ( media-sound/esound )
-	ggi? ( media-libs/libggi )
-	sdl? ( media-libs/libsdl )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	nas? ( media-libs/nas )
-	svga? ( media-libs/svgalib )
-	encode? ( media-sound/lame
-	          >=media-libs/libdv-0.9.5 )
-	xmms? ( media-sound/xmms )
-	opengl? ( virtual/opengl )
-	directfb? ( dev-libs/DirectFB )
-	oggvorbis? ( media-libs/libvorbis )
-	nls? ( sys-devel/gettext )
-	media-sound/cdparanoia
-	mpeg? ( media-libs/faad2 )
-	>=sys-apps/portage-2.0.36"
-#	dvd? ( media-libs/libdvdnav )
-# Hardcode paranoia support for now, as there is no
-# related USE flag.
-
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	app-arch/unzip"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-
-src_unpack() {
-
-	unpack MPlayer-${MY_PV}.tar.bz2 \
-		font-arial-iso-8859-1.tar.bz2 font-arial-iso-8859-2.tar.bz2
-
-	use svga && unpack svgalib_helper-1.9.17-mplayer.tar.bz2
-
-	use gtk && unpack Blue-1.0.tar.bz2
-
-	# Use gtk-2.x
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.90_rc4-gtk2.patch
-
-	# Fix head/tail call for new coreutils
-	cd ${S}; epatch ${FILESDIR}/${P}-coreutils-fixup.patch
-
-	# Fix mencoder segfaulting with bad arguments
-	cd ${S}; epatch ${FILESDIR}/mencoder-segfault.patch
-
-	# Fix mplayer to detect detect/use altivec on benh kernels,
-	# bug #18511.
-	use ppc && \
-		(cd ${S}; epatch ${FILESDIR}/${P}-ppc-benh-2.patch)
-
-	# Fix version, bug #19691
-	epatch ${FILESDIR}/${P}-fix-version.patch
-
-	#Fixing divx 2003 API
-	if has_version '>=media-libs/divx4linux-20030428'
-	then
-		einfo "DivX 20030428 found"
-		cd ${S}; epatch ${FILESDIR}/${P}-divx.patch
-	else
-		einfo "Old DivX Api found"
-	fi
-	
-	if [ "`use svga`" ]
-	then
-		echo
-		einfo "Enabling vidix non-root mode."
-		einfo "(You need a proper svgalib_helper.o module for your kernel"
-		einfo " to actually use this)"
-		echo
-                                                                                                                            
-		mv ${WORKDIR}/svgalib_helper ${S}/libdha
-		cd ${S}/libdha
-		sed -i -e "s/^#CFLAGS/CFLAGS/" Makefile
-	fi
-
-	cp -r ${S}/postproc ${S}/postproc.so
-}
-
-src_compile() {
-
-	use matrox && check_KV
-
-	local myconf=
-
-	use 3dnow \
-		|| myconf="${myconf} --disable-3dnow --disable-3dnowex"
-
-	use sse \
-		|| myconf="${myconf} --disable-sse --disable-sse2"
-
-	# Only disable MMX if 3DNOW or SSE is not in USE
-	use mmx || use 3dnow || use sse \
-		|| myconf="${myconf} --disable-mmx --disable-mmx2"
-
-	# Only disable X if gtk is not in USE
-	use X || use gtk \
-		|| myconf="${myconf} --disable-gui --disable-x11 --disable-xv \
-		                     --disable-xmga --disable-png"
-
-	use jpeg \
-		|| myconf="${myconf} --disable-jpeg"
-
-	use gif \
-		|| myconf="${myconf} --disable-gif"
-
-	( use matrox && use X ) \
-		&& myconf="${myconf} --enable-xmga" \
-		|| myconf="${myconf} --disable-xmga"
-
-	use gtk \
-		&& myconf="${myconf} --enable-gui --enable-x11 \
-		                     --enable-xv --enable-vm --enable-png"
-
-	( use gtk && use gtk2 ) \
-		&& myconf="${myconf} --enable-gtk2"
-
-	use truetype \
-		&& myconf="${myconf} --enable-freetype" \
-		|| myconf="${myconf} --disable-freetype"
-
-	use oss \
-		|| myconf="${myconf} --disable-ossaudio"
-
-	use opengl \
-		|| myconf="${myconf} --disable-gl"
-
-	use sdl \
-		|| myconf="${myconf} --disable-sdl"
-
-	use ggi \
-		|| myconf="${myconf} --disable-ggi"
-
-	use svga \
-		|| myconf="${myconf} --disable-svga"
-
-	use directfb \
-		|| myconf="${myconf} --disable-directfb"
-
-	use fbcon \
-		|| myconf="${myconf} --disable-fbdev"
-
-	use esd \
-		|| myconf="${myconf} --disable-esd"
-
-	use alsa \
-		|| myconf="${myconf} --disable-alsa"
-
-	use arts \
-		|| myconf="${myconf} --disable-arts"
-
-	use nas \
-		|| myconf="${myconf} --disable-nas"
-
-	use oggvorbis \
-		|| myconf="${myconf} --disable-vorbis"
-
-	use encode \
-		&& myconf="${myconf} --enable-mencoder --enable-tv" \
-		|| myconf="${myconf} --disable-mencoder"
-
-	use dvd \
-		&& myconf="${myconf} --enable-mpdvdkit --disable-dvdnav" \
-		|| myconf="${myconf} --disable-mpdvdkit --disable-dvdread \
-		                     --disable-css --disable-dvdnav"
-	# Disable dvdnav support as its not considered to be
-	# functional anyhow, and will be removed.
-
-	use xmms \
-		&& myconf="${myconf} --enable-xmms"
-
-	use mpeg \
-		&& myconf="${myconf} --enable-faad" \
-		|| myconf="${myconf} --disable-faad"
-
-	use matrox \
-		&& myconf="${myconf} --enable-mga" \
-		|| myconf="${myconf} --disable-mga"
-
-	use 3dfx \
-		&& myconf="${myconf} --enable-tdfxfb"
-	# --enable-3dfx is broken according to the MPlayer guys.
-
-	use dvb \
-		&& myconf="${myconf} --enable-dvb" \
-		|| myconf="${myconf} --disable-dvb"
-
-	use nls \
-		&& myconf="${myconf} --enable-i18n" \
-		|| myconf="${myconf} --disable-i18n"
-
-	if [ -d /opt/RealPlayer9/Real/Codecs ]
-	then
-		einfo "Setting REALLIBDIR to /opt/RealPlayer9/Real/Codecs..."
-		REALLIBDIR="/opt/RealPlayer9/Real/Codecs"
-	elif [ -d /opt/RealPlayer8/Codecs ]
-	then
-		einfo "Setting REALLIBDIR to /opt/RealPlayer8/Codecs..."
-		REALLIBDIR="/opt/RealPlayer8/Codecs"
-	else
-		REALLIBDIR="/usr/lib/real"
-	fi
-
-	if has_version media-plugins/live
-	then
-		einfo "Enabling LIVE.COM Streaming Media..."
-		myconf="${myconf} --enable-live"
-	fi
-
-
-	# For lirc support as the auto-detect doesn't seem to work
-	if [ -f /usr/include/lirc/lirc_client.h ]
-	then
-		einfo "Enabling lirc support..."
-		myconf="${myconf} --enable-lirc"
-	else
-		myconf="${myconf} --disable-lirc"
-	fi
-
-	if [ -e /dev/.devfsd ]
-	then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	# Crashes on start when compiled with most optimizations.
-	# The code have CPU detection code now, with CPU specific
-	# optimizations, so extra should not be needed and is not
-	# recommended by the authors
-	unset CFLAGS CXXFLAGS
-	./configure --prefix=/usr \
-		--datadir=/usr/share/mplayer \
-		--confdir=/usr/share/mplayer \
-		--disable-runtime-cpudetection \
-		--enable-largefiles \
-		--enable-menu \
-		--enable-real \
-		--enable-smb \
-		--with-reallibdir=${REALLIBDIR} \
-		--with-x11incdir=/usr/X11R6/include \
-		${myconf} || die
-	# Breaks with gcc-2.95.3, bug #14479:
-	#  --enable-shared-pp \
-	# Enable untested and currently unused code:
-	#  --enable-dynamic-plugins \
-
-	# emake borks on fast boxes - Azarah (07 Aug 2002)
-	make all || die "Failed to build MPlayer!"
-
-	# We build the shared libpostproc.so here so that our
-	# mplayer binary is not linked to it, ensuring that we
-	# do not run into issues ... (bug #14479)
-	cd ${S}/postproc.so
-	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
-
-	if [ -n "`use matrox`" ]
-	then
-		cd ${S}/drivers
-		make all || die "Failed to build matrox driver!"
-	fi
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-	     BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/lib \
-	     CONFDIR=${D}/usr/share/mplayer \
-	     DATADIR=${D}/usr/share/mplayer \
-	     MANDIR=${D}/usr/share/man \
-	     install || die "Failed to install MPlayer!"
-
-	# Install our libpostproc.so ...
-	cd ${S}/postproc.so
-	make prefix=${D}/usr \
-	     SHARED_PP="yes" \
-	     install || die "Failed to install libpostproc.so!"
-	cd ${S}
-
-	# Some stuff like transcode can use this one.
-	if [ -f ${S}/postproc/libpostproc.a ]
-	then
-		dolib ${S}/postproc/libpostproc.a
-
-		if [ ! -f ${D}/usr/include/postproc/postprocess.h ]
-		then
-			insinto /usr/include/postproc
-			doins ${S}/postproc/postprocess.h
-		fi
-	fi
-
-	dodoc AUTHORS ChangeLog README
-	# Install the documentation; DOCS is all mixed up not just html
-	cp -r ${S}/DOCS ${D}/usr/share/doc/${PF}/ || die
-
-	# Copy misc tools to documentation path, as they're not installed
-	# directly
-	cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die
-
-	# Install the default Skin and Gnome menu entry
-	if [ -n "`use gtk`" ]
-	then
-		dodir /usr/share/mplayer/Skin
-		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
-		
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym mplayer /usr/bin/gmplayer
-	fi
-
-	if [ -n "`use gnome`" ]
-	then
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	fi
-
-	dodir /usr/share/mplayer/fonts
-	cp -a ${WORKDIR}/font-arial* ${D}/usr/share/mplayer/fonts
-	# Fix the font symlink ...
-	rm -rf ${D}/usr/share/mplayer/font
-	dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-
-	insinto /etc
-	newins ${S}/etc/example.conf mplayer.conf
-	dosed -e 's/include =/#include =/' /etc/mplayer.conf
-	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-	doins ${S}/etc/input.conf
-	doins ${S}/etc/menu.conf
-
-	if [ -n "`use matrox`" ]
-	then
-		check_KV
-		insinto /lib/modules/${KV}/kernel/drivers/char
-		doins ${S}/drivers/mga_vid.o
-	fi
-}
-
-pkg_preinst() {
-
-	if [ -d "${ROOT}/usr/share/mplayer/Skin/default" ]
-	then
-		rm -rf ${ROOT}/usr/share/mplayer/Skin/default
-	fi
-}
-
-pkg_postinst() {
-
-	if [ -n "`use ppc`" ]
-	then
-		echo
-		einfo "When you see only GREEN salad on your G4 while playing"
-		einfo "a DivX, you should recompile _without_ altivec enabled."
-		einfo "Furher information: http://bugs.gentoo.org/show_bug.cgi?id=18511"
-		echo
-		einfo "If everything functions fine with watching DivX and"
-		einfo "altivec enabled, please drop a comment on the mentioned bug!"
-	fi
-
-	depmod -a &>/dev/null || :
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a \
-	     ! -e ${ROOT}/usr/share/mplayer/font ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
-	     ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}
-
diff --git a/media-video/mplayer/mplayer-0.90_rc4.ebuild b/media-video/mplayer/mplayer-0.90_rc4.ebuild
deleted file mode 100644
index 5843100de509..000000000000
--- a/media-video/mplayer/mplayer-0.90_rc4.ebuild
+++ /dev/null
@@ -1,406 +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/mplayer/mplayer-0.90_rc4.ebuild,v 1.7 2003/08/24 07:43:56 azarah Exp $
-
-IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts"
-
-inherit eutils
-
-# NOTE to myself:  Test this thing with and without dvd/gtk+ support,
-#                  as it seems the mplayer guys dont really care to
-#                  make it work without dvd support.
-
-# Handle PREversions as well
-MY_PV="${PV/_/}"
-S="${WORKDIR}/MPlayer-${MY_PV}"
-# Only install Skin if GUI should be build (gtk as USE flag)
-SRC_URI="http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
-	http://mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
-	http://mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	http://mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	gtk? ( mirror://gentoo/distfiles/default-skin-0.1.tar.bz2 )"
-#	 This is to get the digest problem fixed.
-#	 gtk? ( ftp://mplayerhq.hu/MPlayer/Skin/default.tar.bz2 )"
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-# 'encode' in USE for MEncoder.
-# If 'dvd' in USE, only DEPEND on libdvdnav, as
-# we use libdvdkit that comes with.
-RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
-	x86? ( >=media-libs/xvid-0.9.0
-	       >=media-libs/divx4linux-20020418
-	       >=media-libs/win32codecs-0.60 )
-	dvd? ( =media-libs/libdvdnav-0.1.3 )
-	gtk? ( !gtk2 ( =x11-libs/gtk+-1.2*
-	               =dev-libs/glib-1.2* )
-	       media-libs/libpng
-	       >=x11-base/xfree-4.2.1-r2 )
-	gtk2? ( >=x11-libs/gtk+-2.0.6
-	        >=dev-libs/glib-2.0.6 )
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib
-	       media-libs/libungif )
-	truetype? ( >=media-libs/freetype-2.1 )
-	esd? ( media-sound/esound )
-	ggi? ( media-libs/libggi )
-	sdl? ( media-libs/libsdl )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	nas? ( media-libs/nas )
-	svga? ( media-libs/svgalib )
-	encode? ( media-sound/lame 
-	          >=media-libs/libdv-0.9.5 )
-	xmms? ( media-sound/xmms )
-	opengl? ( virtual/opengl )
-	directfb? ( dev-libs/DirectFB )
-	oggvorbis? ( media-libs/libvorbis )
-	nls? ( sys-devel/gettext )
-	media-sound/cdparanoia
-	>=sys-apps/portage-2.0.36"
-# Hardcode paranoia support for now, as there is no
-# related USE flag.
-
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	app-arch/unzip"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-
-src_unpack() {
-
-	unpack MPlayer-${MY_PV}.tar.bz2
-
-	use truetype || \
-		unpack font-arial-iso-8859-1.tar.bz2 font-arial-iso-8859-1.tar.bz2
-
-	# Fix bug with the default Skin
-	if [ -n "`use gtk`" ]
-	then
-		unpack default-skin-0.1.tar.bz2
-		cd ${WORKDIR}/default
-		epatch ${FILESDIR}/default-skin.diff
-	fi
-
-	# Fix mencoder segfaulting with bad arguments
-	cd ${S}; epatch ${FILESDIR}/mencoder-segfault.patch
-
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.90_rc4-gtk2.patch
-}
-
-src_compile() {
-
-	use matrox && check_KV
-        
-	local myconf=""
-
-	use 3dnow \
-		|| myconf="${myconf} --disable-3dnow --disable-3dnowex"
-
-	use sse	\
-		|| myconf="${myconf} --disable-sse --disable-sse2"
-
-	# Only disable MMX if 3DNOW or SSE is not in USE
-	use mmx || use 3dnow || use sse \
-		|| myconf="${myconf} --disable-mmx --disable-mmx2"
-
-	# Only disable X if gtk is not in USE
-	use X || use gtk \
-		|| myconf="${myconf} --disable-gui --disable-x11 --disable-xv \
-		                     --disable-xmga --disable-png"
-	
-	use jpeg \
-		|| myconf="${myconf} --disable-jpeg"
-	
-	use gif \
-		|| myconf="${myconf} --disable-gif"
-
-	( use matrox && use X ) \
-		&& myconf="${myconf} --enable-xmga" \
-		|| myconf="${myconf} --disable-xmga"
-
-	use gtk \
-		&& myconf="${myconf} --enable-gui --enable-x11 \
-		                     --enable-xv --enable-vm --enable-png"
-
-	( use gtk && use gtk2 ) \
-		&& myconf="${myconf} --enable-gtk2"
-
-	use truetype \
-		&& myconf="${myconf} --enable-freetype" \
-		|| myconf="${myconf} --disable-freetype"
-
-	use oss \
-		|| myconf="${myconf} --disable-ossaudio"
-
-	use opengl \
-		|| myconf="${myconf} --disable-gl"
-
-	use sdl \
-		|| myconf="${myconf} --disable-sdl"
-
-	use ggi \
-		|| myconf="${myconf} --disable-ggi"
-
-	use svga \
-		|| myconf="${myconf} --disable-svga"
-
-	use directfb \
-		|| myconf="${myconf} --disable-directfb"
-
-	use fbcon \
-		|| myconf="${myconf} --disable-fbdev"
-
-	use esd \
-		|| myconf="${myconf} --disable-esd"
-		
-	use alsa \
-		|| myconf="${myconf} --disable-alsa"
-
-	use arts \
-		|| myconf="${myconf} --disable-arts"
-
-	use nas \
-		|| myconf="${myconf} --disable-nas"
-
-	use oggvorbis \
-		|| myconf="${myconf} --disable-vorbis"
-
-	use encode \
-		&& myconf="${myconf} --enable-mencoder --enable-tv" \
-		|| myconf="${myconf} --disable-mencoder"
-
-	use dvd \
-		&& myconf="${myconf} --enable-mpdvdkit --enable-dvdnav" \
-		|| myconf="${myconf} --disable-mpdvdkit --disable-dvdread \
-		                     --disable-css --disable-dvdnav"
-
-	use xmms \
-		&& myconf="${myconf} --enable-xmms"
-
-	use matrox \
-		&& myconf="${myconf} --enable-mga" \
-		|| myconf="${myconf} --disable-mga"
-
-	use 3dfx \
-		&& myconf="${myconf} --enable-3dfx --enable-tdfxfb"
-
-	use nls \
-		&& myconf="${myconf} --enable-i18n" \
-		|| myconf="${myconf} --disable-i18n"
-
-	if [ -d /opt/RealPlayer9/Real/Codecs ]
-	then
-		einfo "Setting REALLIBDIR to /opt/RealPlayer9/Real/Codecs..."
-		REALLIBDIR="/opt/RealPlayer9/Real/Codecs"
-	elif [ -d /opt/RealPlayer8/Codecs ]
-	then
-		einfo "Setting REALLIBDIR to /opt/RealPlayer8/Codecs..."
-		REALLIBDIR="/opt/RealPlayer8/Codecs"
-	else
-		REALLIBDIR="/usr/lib/real"
-	fi
-
-	if has_version media-plugins/live
-	then
-		einfo "Enabling LIVE.COM Streaming Media..."
-		myconf="${myconf} --enable-live"
-	fi
-
-
-	# For lirc support as the auto-detect doesn't seem to work
-	if [ -f /usr/include/lirc/lirc_client.h ]
-	then
-		einfo "Enabling lirc support..."
-		myconf="${myconf} --enable-lirc"
-	else
-		myconf="${myconf} --disable-lirc"
-	fi
-
-	if [ -e /dev/.devfsd ]
-	then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	# Crashes on start when compiled with most optimizations.
-	# The code have CPU detection code now, with CPU specific
-	# optimizations, so extra should not be needed and is not
-	# recommended by the authors
-	unset CFLAGS CXXFLAGS
-	./configure --prefix=/usr \
-		--datadir=/usr/share/mplayer \
-		--confdir=/usr/share/mplayer \
-		--disable-runtime-cpudetection \
-		--enable-largefiles \
-		--enable-menu \
-		--enable-dynamic-plugins \
-		--enable-real \
-		--with-reallibdir=${REALLIBDIR} \
-		--with-x11incdir=/usr/X11R6/include \
-		${myconf} || die
-	# Breaks with gcc-2.95.3, bug #14479
-	# --enable-shared-pp \
-
-	# emake borks on fast boxes - Azarah (07 Aug 2002)
-	make all || die
-	
-	if [ -n "`use matrox`" ]
-	then
-		cd drivers 
-		make all || die
-	fi
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-	     BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/lib \
-	     CONFDIR=${D}/usr/share/mplayer \
-	     DATADIR=${D}/usr/share/mplayer \
-	     MANDIR=${D}/usr/share/man \
-	     install || die
-
-	# Some stuff like transcode can use this one.
-	if [ -f ${S}/postproc/libpostproc.a ]
-	then
-		dolib ${S}/postproc/libpostproc.a
-		
-		if [ ! -f ${D}/usr/include/postproc/postprocess.h ]
-		then
-			insinto /usr/include/postproc
-			doins ${S}/postproc/postprocess.h
-		fi
-	fi
-
-	# Install the documentation
-	dohtml -r ${S}/DOCS/*
-
-	dodoc AUTHORS ChangeLog README
-
-	# Install the default Skin and Gnome menu entry
-	if [ -n "`use gtk`" ]
-	then
-		insinto /usr/share/mplayer/Skin/default
-		doins ${WORKDIR}/default/*
-		# Permissions is fried by default
-		chmod a+rx ${D}/usr/share/mplayer/Skin/default/
-		chmod a+r ${D}/usr/share/mplayer/Skin/default/*
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym /usr/bin/mplayer /usr/bin/gmplayer
-	fi
-
-	if [ -n "`use gnome`" ]
-	then
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	fi
-
-	# Install the font used by OSD and the GUI
-	if [ -z "`use truetype`" ]
-	then
-		dodir /usr/share/mplayer/fonts
-		cp -a ${WORKDIR}/font-arial* ${D}/usr/share/mplayer/fonts
-		rm -rf ${D}/usr/share/mplayer/font
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	elif [ -f /usr/X11R6/lib/X11/fonts/truetype/arial.ttf ]
-	then
-		# For freetype we need a real truetype font in place ...
-		dosym ../../X11R6/lib/X11/fonts/truetype/arial.ttf \
-			/usr/share/mplayer/subfont.ttf
-	fi
-	if [ -n "`use truetype`" ]
-	then
-		rm -rf ${D}/usr/share/mplayer/font
-	fi
-
-	# This tries setting up mplayer.conf automagically
-	local video="" audio="sdl"
-	if [ -n "`use X`" ]
-	then
-		[ -z "${video}" ] && use sdl && video="sdl"
-		[ -z "${video}" ] && use xv && video="xv"
-		[ -z "${video}" ] && use opengl && video="gl"
-		[ -z "${video}" ] && use ggi && video="ggi"
-		[ -z "${video}" ] && use dga && video="dga"
-		[ -z "${video}" ] && video="x11"
-	else
-		[ -z "${video}" ] && use fbcon && video="fbdev"
-		[ -z "${video}" ] && use svga && video="svga"
-		[ -z "${video}" ] && use aalib && video="aa"
-		[ -z "${video}" ] && video="vesa"
-	fi
-
-	if [ -n "`use sdl`" ]
-	then
-		audio="sdl"
-	elif [ -n "`use alsa`" ]
-	then
-		if [ -e /usr/lib/libasound.so.2 ]
-		then
-			audio="alsa9"
-		else
-			audio="alsa5"
-		fi
-	elif [ -n "`use oss`" ]
-	then
-		audio="oss"
-	fi
-	
-	# Note to myself:  do not change " into '
-	sed -e "s/^# vo=xv/vo=${video}/" \
-	    -e "s/^# ao=oss/ao=${audio}/" \
-	    -e 's/include =/#include =/' \
-	    ${S}/etc/example.conf > ${T}/mplayer.conf
-
-	insinto /etc
-	doins ${T}/mplayer.conf
-	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-	
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-	doins ${S}/etc/input.conf
-	doins ${S}/etc/menu.conf
-
-	if [ -n "`use matrox`" ]
-	then
-		check_KV
-		insinto /lib/modules/${KV}/kernel/drivers/char
-		doins ${S}/drivers/mga_vid.o
-	fi
-}
-
-pkg_postinst() {
-
-	if [ -n "`use truetype`" ]
-	then
-		einfo "Please note that with the new freetype support you need to"
-		einfo "copy a truetype (.ttf) font to ~/.mplayer/subfont.ttf"
-	fi
-
-	depmod -a &>/dev/null || :
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a \
-	     ! -e ${ROOT}/usr/share/mplayer/font ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
-	     ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}
-
diff --git a/media-video/mplayer/mplayer-0.91.ebuild b/media-video/mplayer/mplayer-0.91.ebuild
index dbf873fd939d..495f7e6ebd41 100644
--- a/media-video/mplayer/mplayer-0.91.ebuild
+++ b/media-video/mplayer/mplayer-0.91.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/mplayer/mplayer-0.91.ebuild,v 1.2 2003/08/24 07:43:56 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.91.ebuild,v 1.3 2003/09/04 10:12:01 lanius Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2"
 
@@ -53,6 +53,7 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	nls? ( sys-devel/gettext )
 	media-sound/cdparanoia
 	mpeg? ( media-libs/faad2 )
+	samba? ( net-fs/samba )
 	>=sys-apps/portage-2.0.36"
 #	dvd? ( media-libs/libdvdnav )
 # Hardcode paranoia support for now, as there is no
@@ -64,7 +65,7 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc ~sparc"
 
 
 src_unpack() {
@@ -98,7 +99,7 @@ src_unpack() {
 	else
 		einfo "Old DivX Api found"
 	fi
-	
+
 	if [ "`use svga`" ]
 	then
 		echo
@@ -106,7 +107,7 @@ src_unpack() {
 		einfo "(You need a proper svgalib_helper.o module for your kernel"
 		einfo " to actually use this)"
 		echo
-                                                                                                                            
+
 		mv ${WORKDIR}/svgalib_helper ${S}/libdha
 		cd ${S}/libdha
 		sed -i -e "s/^#CFLAGS/CFLAGS/" Makefile
@@ -227,6 +228,10 @@ src_compile() {
 		&& myconf="${myconf} --enable-i18n" \
 		|| myconf="${myconf} --disable-i18n"
 
+	use samba \
+		&& myconf="${myconf} --enable-smb" \
+		|| myconf="${myconf} --disable-smb"
+
 	if [ -d /opt/RealPlayer9/Real/Codecs ]
 	then
 		einfo "Setting REALLIBDIR to /opt/RealPlayer9/Real/Codecs..."
@@ -272,7 +277,6 @@ src_compile() {
 		--enable-largefiles \
 		--enable-menu \
 		--enable-real \
-		--enable-smb \
 		--with-reallibdir=${REALLIBDIR} \
 		--with-x11incdir=/usr/X11R6/include \
 		${myconf} || die
@@ -339,7 +343,7 @@ src_install() {
 	then
 		dodir /usr/share/mplayer/Skin
 		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
-		
+
 		# Fix the symlink
 		rm -rf ${D}/usr/bin/gmplayer
 		dosym mplayer /usr/bin/gmplayer
@@ -362,6 +366,7 @@ src_install() {
 	insinto /etc
 	newins ${S}/etc/example.conf mplayer.conf
 	dosed -e 's/include =/#include =/' /etc/mplayer.conf
+	dosed -e 's/fs=yes/fs=no/' /etc/mplayer.conf
 	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
 
 	insinto /usr/share/mplayer
@@ -416,4 +421,3 @@ pkg_postrm() {
 		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
 	fi
 }
-
diff --git a/media-video/mplayer/mplayer-1.0_pre1.ebuild b/media-video/mplayer/mplayer-1.0_pre1.ebuild
index cb8512800666..6d48fe360db5 100644
--- a/media-video/mplayer/mplayer-1.0_pre1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre1.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/mplayer/mplayer-1.0_pre1.ebuild,v 1.1 2003/09/03 20:52:11 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre1.ebuild,v 1.2 2003/09/04 10:12:01 lanius Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2"
 
@@ -53,6 +53,7 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	nls? ( sys-devel/gettext )
 	media-sound/cdparanoia
 	mpeg? ( media-libs/faad2 )
+	samba? ( net-fs/samba )
 	>=sys-apps/portage-2.0.36"
 #	dvd? ( media-libs/libdvdnav )
 # Hardcode paranoia support for now, as there is no
@@ -97,7 +98,7 @@ src_unpack() {
 		einfo "(You need a proper svgalib_helper.o module for your kernel"
 		einfo " to actually use this)"
 		echo
-                                                                                                                            
+
 		mv ${WORKDIR}/svgalib_helper ${S}/libdha
 		cd ${S}/libdha
 		sed -i -e "s/^#CFLAGS/CFLAGS/" Makefile
@@ -218,6 +219,10 @@ src_compile() {
 		&& myconf="${myconf} --enable-i18n" \
 		|| myconf="${myconf} --disable-i18n"
 
+	use samba \
+		&& myconf="${myconf} --enable-smb" \
+		|| myconf="${myconf} --disable-smb"
+
 	if [ -d /opt/RealPlayer9/Real/Codecs ]
 	then
 		einfo "Setting REALLIBDIR to /opt/RealPlayer9/Real/Codecs..."
@@ -334,7 +339,7 @@ src_install() {
 	then
 		dodir /usr/share/mplayer/Skin
 		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
-		
+
 		# Fix the symlink
 		rm -rf ${D}/usr/bin/gmplayer
 		dosym mplayer /usr/bin/gmplayer
@@ -357,6 +362,7 @@ src_install() {
 	insinto /etc
 	newins ${S}/etc/example.conf mplayer.conf
 	dosed -e 's/include =/#include =/' /etc/mplayer.conf
+	dosed -e 's/fs=yes/fs=no/' /etc/mplayer.conf
 	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
 
 	insinto /usr/share/mplayer