new version

10 files changed, 310 insertions, 830 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index cd5c65f7b3ef..4a71d9b50f9e 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.30 2002/09/11 20:07:27 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.31 2002/09/15 20:49:57 azarah Exp $
+
+*mplayer-0.90_pre7 (15 Sep 2002)
+
+  15 Sep 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre7 :
+  Update version.
 
 *mplayer-0.90_pre6-r3 (12 Aug 2002)
 
diff --git a/media-video/mplayer/files/digest-mplayer-0.90_pre5 b/media-video/mplayer/files/digest-mplayer-0.90_pre5
deleted file mode 100644
index 5f7978a41b66..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.90_pre5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e5655c304af41b23701653eb7a810d3f MPlayer-0.90pre5.tar.bz2 2438747
-MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip 272659
-MD5 5e12e283eeeec6125523a6f4a60d07cf default-skin-0.1.tar.bz2 167697
diff --git a/media-video/mplayer/files/digest-mplayer-0.90_pre5-r1 b/media-video/mplayer/files/digest-mplayer-0.90_pre5-r1
deleted file mode 100644
index 5f7978a41b66..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.90_pre5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e5655c304af41b23701653eb7a810d3f MPlayer-0.90pre5.tar.bz2 2438747
-MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip 272659
-MD5 5e12e283eeeec6125523a6f4a60d07cf default-skin-0.1.tar.bz2 167697
diff --git a/media-video/mplayer/files/digest-mplayer-0.90_pre6-r2 b/media-video/mplayer/files/digest-mplayer-0.90_pre6-r2
deleted file mode 100644
index 9358dd6ed906..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.90_pre6-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 819b4db6133291886df34cadcc03e09d MPlayer-0.90pre6.tar.bz2 2599258
-MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip 272659
-MD5 5e12e283eeeec6125523a6f4a60d07cf default-skin-0.1.tar.bz2 167697
diff --git a/media-video/mplayer/files/digest-mplayer-0.90_pre7 b/media-video/mplayer/files/digest-mplayer-0.90_pre7
new file mode 100644
index 000000000000..a045ca31684a
--- /dev/null
+++ b/media-video/mplayer/files/digest-mplayer-0.90_pre7
@@ -0,0 +1,4 @@
+MD5 09a601241ba87c04d103b7afffb72def MPlayer-0.90pre7.tar.bz2 2623243
+MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip 272659
+MD5 a5e01dd5fe14d2418a6ee349ff7a1c4b mp-arial-iso-8859-2.zip 255907
+MD5 5e12e283eeeec6125523a6f4a60d07cf default-skin-0.1.tar.bz2 167697
diff --git a/media-video/mplayer/files/mplayer.desktop b/media-video/mplayer/files/mplayer.desktop
index 99d351e49398..9552ad1ecd20 100644
--- a/media-video/mplayer/files/mplayer.desktop
+++ b/media-video/mplayer/files/mplayer.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=MPlayer
 Comment=Media Player for Linux
-Exec=mplayer -gui
+Exec=gmplayer
 Icon=mplayer.xpm
 Terminal=0
 Type=Application
diff --git a/media-video/mplayer/mplayer-0.90_pre5-r1.ebuild b/media-video/mplayer/mplayer-0.90_pre5-r1.ebuild
deleted file mode 100644
index d9fc16684e17..000000000000
--- a/media-video/mplayer/mplayer-0.90_pre5-r1.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_pre5-r1.ebuild,v 1.5 2002/09/10 17:02:39 gerk Exp $
-
-# 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="ftp://mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
-	 ftp://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-1.zip
-	 gtk? ( http://www.ibiblio.org/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
-RDEPEND=">=media-libs/divx4linux-20020418
-	x86? ( >=media-libs/win32codecs-0.60 )
-	dvd? ( media-libs/libdvdread
-	       media-libs/libdvdcss )
-	gtk? ( =x11-libs/gtk+-1.2*
-	       media-libs/libpng )
-	esd? ( media-sound/esound )
-	ggi? ( media-libs/libggi )
-	sdl? ( media-libs/libsdl )
-	alsa? ( media-libs/alsa-lib )
-	svga? ( media-libs/svgalib )
-	encode? ( media-sound/lame 
-	          >=media-libs/libdv-0.9.5 )
-	opengl? ( virtual/opengl )
-	directfb? ( dev-libs/DirectFB )
-	oggvorbis? ( media-libs/libvorbis )
-	>=sys-apps/portage-1.9.10"
-
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	app-arch/unzip"
-
-SLOT="0"
-LICENSE="GPL"
-KEYWORDS="x86"
-
-
-src_unpack() {
-
-	unpack MPlayer-${MY_PV}.tar.bz2 mp-arial-iso-8859-1.zip
-
-	# Fix bug with the default Skin
-	use gtk && ( \
-		unpack default-skin-0.1.tar.bz2
-		cd ${WORKDIR}/default
-		patch < ${FILESDIR}/default-skin.diff || die "gtk patch failed"
-	)
-
-	cd ${S}
-	# Fixes some compile problems, thanks to Gwenn Gueguen
-	patch -p0 <${FILESDIR}/${P}-widget.patch || die "widget patch failed"
-	# Fixes include problem - Azarah (10 Jun 2002)
-	patch -p1 <${FILESDIR}/${P}-stream-include.patch || die
-	# Fixes install location for vidix drivers, thanks to Mezei Zoltan.
-	patch -p1 <${FILESDIR}/${P}-vidix-destpath.patch || die
-	# Fix missing subtitles for some regions (4), bug #3679, thanks
-	# to Bernardo Silva
-	patch -p1 <${FILESDIR}/${P}-spudec.c.patch || die
-}
-
-src_compile() {
-
-	if use matrox; then
-	        check_KV
-	fi
-        
-	local myconf=""
-
-	# Some people have compile problems with the vidix stuff
-#	myconf="${myconf} --disable-vidix"
-
-	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-x11 --disable-xv --disable-xmga --disable-png"
-
-	use matrox && use X \
-		&& myconf="${myconf} --enable-xmga"
-
-	use gtk \
-		&& myconf="${myconf} --enable-gui --enable-x11 --enable-xv --enable-png"
-
-	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 alsa \
-		|| myconf="${myconf} --disable-alsa"
-
-	use oggvorbis \
-		|| myconf="${myconf} --disable-vorbis"
-
-	use encode \
-		&& myconf="${myconf} --enable-mencoder --enable-tv" \
-		|| myconf="${myconf} --disable-mencoder"
-
-	use dvd \
-		&& myconf="${myconf} --enable-dvdread --enable-css" \
-		|| myconf="${myconf} --disable-mpdvdkit --disable-dvdread --disable-css"
-
-	use matrox \
-		&& myconf="${myconf} --enable-mga" \
-		|| myconf="${myconf} --disable-mga"
-
-	use 3dfx \
-		&& myconf="${myconf} --enable-3dfx --enable-tdfxfb"
-
-	# 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
-	CFLAGS="" \
-	CXXFLAGS="" \
-	./configure --prefix=/usr \
-		--disable-runtime-cpudetection \
-		--enable-largefiles \
-		--enable-linux-devfs \
-		${myconf} || die
-
-	CFLAGS="" \ 
-	CXXFLAGS="" \
-	emake all || die
-	
-	use matrox && ( \
-		cd drivers 
-		emake all || die
-	)
-}
-
-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
-	
-	# MAN pages are already installed ...
-	rm DOCS/*.1
-	# Install the rest of the documentation
-	dodir /usr/share/doc/${PF}
-	cp -a DOCS/* ${D}/usr/share/doc/${PF}
-	doalldocs
-
-	# Install the default Skin and Gnome menu entry
-	use gtk && ( \
-		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
-	)
-
-	use gnome && ( \
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/icon.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	)
-
-	# Install the font used by OSD and the GUI
-	dodir /usr/share/mplayer/fonts
-	cp -a ${WORKDIR}/iso-8859-1/ ${D}/usr/share/mplayer/fonts
-	rm -rf ${D}/usr/share/mplayer/font
-	dosym /usr/share/mplayer/fonts/iso-8859-1/arial-14/ /usr/share/mplayer/font
-
-	# This tries setting up mplayer.conf automagically
-	local video="sdl" audio="sdl"
-	use X && (
-		use gtk && video="xv" \
-		|| use sdl && video="sdl" \
-		|| use xv && video="xv" \
-		|| use opengl && video="gl" \
-		|| use ggi && video="ggi" \
-		|| use dga && video="dga" \
-		|| video="x11"
-	) || (
-		use fbcon && video="fbdev" \
-		|| use svga && video="svga" \
-		|| use aalib && video="aa"
-	)
-
-	use sdl && audio="sdl" \
-	|| use alsa && (
-		[ -e /usr/lib/libasound.so.2 ] && audio="alsa9" \
-		|| audio="alsa5"
-	) || use oss audio="oss" \
-	
-	# 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 
-	
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-
-	use matrox && ( \
-		dodir /lib/modules/${KV}/kernel/drivers/char
-		cp ${S}/drivers/mga_vid.o ${D}/lib/modules/${KV}/kernel/drivers/char
-	)
-}
-
-pkg_postinst() {
-
-	echo
-	echo '######################################################################'
-	echo '# MPlayer users that are going to use the GUI, please note the       #'
-	echo '# following:                                                         #'
-	echo '#                                                                    #'
-	echo '#   The GUI works best with mplayer -vo xv -gui, but since there is  #'
-	echo '#   no USE flag for XVideo, or for using the GUI, the autodetection  #'
-	echo '#   process cannot detect this by default (SDL will be used rather). #'
-	echo '#   So, if your setup supports XVideo (xvinfo should give output),   #'
-	echo '#   maybe do something like:                                         #'
-	echo '#                                                                    #'
-	echo '#     echo "vo = xv" >~/.mplayer/config                              #'
-	echo '#     echo "gui = 1" >>~/.mplayer/config                             #'
-	echo '#                                                                    #'
-	echo '#   after launching mplayer for the first time.                      #'
-	echo '#                                                                    #'
-	use gtk &>/dev/null \
-		|| echo '# NB: the GUI needs "gtk" as USE flag to build.                      #'
-	echo '######################################################################'
-	echo
-	depmod -a
-}
diff --git a/media-video/mplayer/mplayer-0.90_pre5.ebuild b/media-video/mplayer/mplayer-0.90_pre5.ebuild
deleted file mode 100644
index caf12f7e46ae..000000000000
--- a/media-video/mplayer/mplayer-0.90_pre5.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_pre5.ebuild,v 1.5 2002/07/16 11:36:53 seemant Exp $
-
-# 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="ftp://mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
-	 ftp://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-1.zip
-	 gtk? ( http://www.ibiblio.org/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
-RDEPEND=">=media-libs/divx4linux-20020418
-	>=media-libs/win32codecs-0.60
-	dvd? ( media-libs/libdvdread
-	       media-libs/libdvdcss )
-	gtk? ( =x11-libs/gtk+-1.2*
-	       media-libs/libpng )
-	esd? ( media-sound/esound )
-	ggi? ( media-libs/libggi )
-	sdl? ( media-libs/libsdl )
-	alsa? ( media-libs/alsa-lib )
-	svga? ( media-libs/svgalib )
-	encode? ( media-sound/lame 
-	          >=media-libs/libdv-0.9.5 )
-	opengl? ( virtual/opengl )
-	directfb? ( dev-libs/DirectFB )
-	oggvorbis? ( media-libs/libvorbis )
-	>=sys-apps/portage-1.9.10"
-
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	app-arch/unzip"
-
-SLOT="0"
-LICENSE="GPL"
-KEYWORDS="x86"
-
-
-src_unpack() {
-
-	unpack MPlayer-${MY_PV}.tar.bz2 mp-arial-iso-8859-1.zip
-
-	# Fix bug with the default Skin
-	use gtk && ( \
-		unpack default-skin-0.1.tar.bz2
-		cd ${WORKDIR}/default
-		patch < ${FILESDIR}/default-skin.diff || die "gtk patch failed"
-	)
-
-	cd ${S}
-	# Fixes some compile problems, thanks to Gwenn Gueguen
-	patch -p0 <${FILESDIR}/${P}-widget.patch || die "widget patch failed"
-	# Fixes include problem - Azarah (10 Jun 2002)
-	patch -p1 <${FILESDIR}/${P}-stream-include.patch || die
-	# Fixes install location for vidix drivers, thanks to Mezei Zoltan.
-	patch -p1 <${FILESDIR}/${P}-vidix-destpath.patch || die
-}
-
-src_compile() {
-
-	if use matrox; then
-	        check_KV
-	fi
-        
-	local myconf=""
-
-	# Some people have compile problems with the vidix stuff
-#	myconf="${myconf} --disable-vidix"
-
-	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-x11 --disable-xv --disable-xmga --disable-png"
-
-	use matrox && use X \
-		&& myconf="${myconf} --enable-xmga"
-
-	use gtk \
-		&& myconf="${myconf} --enable-gui --enable-x11 --enable-xv --enable-png"
-
-	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 alsa \
-		|| myconf="${myconf} --disable-alsa"
-
-	use oggvorbis \
-		|| myconf="${myconf} --disable-vorbis"
-
-	use encode \
-		&& myconf="${myconf} --enable-mencoder --enable-tv" \
-		|| myconf="${myconf} --disable-mencoder"
-
-	use dvd \
-		&& myconf="${myconf} --enable-dvdread --enable-css" \
-		|| myconf="${myconf} --disable-mpdvdkit --disable-dvdread --disable-css"
-
-	use matrox \
-		&& myconf="${myconf} --enable-mga" \
-		|| myconf="${myconf} --disable-mga"
-
-	use 3dfx \
-		&& myconf="${myconf} --enable-3dfx --enable-tdfxfb"
-
-	# 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
-	CFLAGS="" \
-	CXXFLAGS="" \
-	./configure --prefix=/usr \
-		--disable-runtime-cpudetection \
-		--enable-largefiles \
-		--enable-linux-devfs \
-		${myconf} || die
-
-	CFLAGS="" \ 
-	CXXFLAGS="" \
-	emake all || die
-	
-	use matrox && ( \
-		cd drivers 
-		emake all || die
-	)
-}
-
-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
-	
-	# MAN pages are already installed ...
-	rm DOCS/*.1
-	# Install the rest of the documentation
-	dodir /usr/share/doc/${PF}
-	cp -a DOCS/* ${D}/usr/share/doc/${PF}
-	doalldocs
-
-	# Install the default Skin and Gnome menu entry
-	use gtk && ( \
-		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
-	)
-
-	use gnome && ( \
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/icon.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	)
-
-	# Install the font used by OSD and the GUI
-	dodir /usr/share/mplayer/fonts
-	cp -a ${WORKDIR}/iso-8859-1/ ${D}/usr/share/mplayer/fonts
-	rm -rf ${D}/usr/share/mplayer/font
-	dosym /usr/share/mplayer/fonts/iso-8859-1/arial-14/ /usr/share/mplayer/font
-
-	# This tries setting up mplayer.conf automagically
-	local video="sdl" audio="sdl"
-	use X && (
-		use gtk && video="xv" \
-		|| use sdl && video="sdl" \
-		|| use xv && video="xv" \
-		|| use opengl && video="gl" \
-		|| use ggi && video="ggi" \
-		|| use dga && video="dga" \
-		|| video="x11"
-	) || (
-		use fbcon && video="fbdev" \
-		|| use svga && video="svga" \
-		|| use aalib && video="aa"
-	)
-
-	use sdl && audio="sdl" \
-	|| use alsa && (
-		[ -e /usr/lib/libasound.so.2 ] && audio="alsa9" \
-		|| audio="alsa5"
-	) || use oss audio="oss" \
-	
-	# 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 
-	
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-
-	use matrox && ( \
-		dodir /lib/modules/${KV}/kernel/drivers/char
-		cp ${S}/drivers/mga_vid.o ${D}/lib/modules/${KV}/kernel/drivers/char
-	)
-}
-
-pkg_postinst() {
-
-	echo
-	echo '######################################################################'
-	echo '# MPlayer users that are going to use the GUI, please note the       #'
-	echo '# following:                                                         #'
-	echo '#                                                                    #'
-	echo '#   The GUI works best with mplayer -vo xv -gui, but since there is  #'
-	echo '#   no USE flag for XVideo, or for using the GUI, the autodetection  #'
-	echo '#   process cannot detect this by default (SDL will be used rather). #'
-	echo '#   So, if your setup supports XVideo (xvinfo should give output),   #'
-	echo '#   maybe do something like:                                         #'
-	echo '#                                                                    #'
-	echo '#     echo "vo = xv" >~/.mplayer/config                              #'
-	echo '#     echo "gui = 1" >>~/.mplayer/config                             #'
-	echo '#                                                                    #'
-	echo '#   after launching mplayer for the first time.                      #'
-	echo '#                                                                    #'
-	use gtk &>/dev/null \
-		|| echo '# NB: the GUI needs "gtk" as USE flag to build.                      #'
-	echo '######################################################################'
-	echo
-	depmod -a
-}
diff --git a/media-video/mplayer/mplayer-0.90_pre6-r2.ebuild b/media-video/mplayer/mplayer-0.90_pre6-r2.ebuild
deleted file mode 100644
index 91cf83718dde..000000000000
--- a/media-video/mplayer/mplayer-0.90_pre6-r2.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_pre6-r2.ebuild,v 1.1 2002/08/07 20:34:32 azarah Exp $
-
-# 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="ftp://mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
-	 ftp://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-1.zip
-	 gtk? ( http://www.ibiblio.org/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
-RDEPEND=">=media-libs/divx4linux-20020418
-	>=media-libs/win32codecs-0.60
-	dvd? ( media-libs/libdvdread
-		   !=media-libs/libdvdnav-0.1.3 )
-	gtk? ( =x11-libs/gtk+-1.2*
-	       media-libs/libpng )
-	esd? ( media-sound/esound )
-	ggi? ( media-libs/libggi )
-	sdl? ( media-libs/libsdl )
-	alsa? ( media-libs/alsa-lib )
-	svga? ( media-libs/svgalib )
-	encode? ( media-sound/lame 
-	          >=media-libs/libdv-0.9.5 )
-	opengl? ( virtual/opengl )
-	directfb? ( dev-libs/DirectFB )
-	oggvorbis? ( media-libs/libvorbis )
-	>=sys-apps/portage-1.9.10"
-
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	app-arch/unzip"
-
-SLOT="0"
-LICENSE="GPL"
-KEYWORDS="x86"
-
-
-src_unpack() {
-
-	unpack MPlayer-${MY_PV}.tar.bz2 mp-arial-iso-8859-1.zip
-
-	# Fix bug with the default Skin
-	use gtk && ( \
-		unpack default-skin-0.1.tar.bz2
-		cd ${WORKDIR}/default
-		patch < ${FILESDIR}/default-skin.diff || die "gtk patch failed"
-	)
-
-	cd ${S}
-	# Fixes some compile problems, thanks to Gwenn Gueguen
-	patch -p0 < ${FILESDIR}/mplayer-0.90_pre5-widget.patch || die
-	# Fixes include problem - Azarah (10 Jun 2002)
-	# Update for pre6 - Azarah (07 Aug 2002)
-	patch -p1 < ${FILESDIR}/${P}-stream-include.patch || die
-	# Fixes install location for vidix drivers, thanks to Mezei Zoltan.
-	patch -p1 < ${FILESDIR}/mplayer-0.90_pre5-vidix-destpath.patch || die
-	# Fix missing subtitles for some regions (4), bug #3679, thanks
-	# to Bernardo Silva
-	patch -p1 < ${FILESDIR}/mplayer-0.90_pre5-spudec.c.patch || die
-	# Fixes intermittant problems where vidix drivers do not get build,
-	# and causes the install to fail - Azarah (06 Aug 2002)
-	patch -p1 < ${FILESDIR}/${P}-vidix-fail-install.patch || die
-	# Fixes compile problems if dvd support not enabled.
-	# Azarah (07 Aug 2002)
-	patch -p1 < ${FILESDIR}/${P}-no-dvd.patch || die
-}
-
-src_compile() {
-
-	if use matrox; then
-	        check_KV
-	fi
-        
-	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 matrox && use X \
-		&& myconf="${myconf} --enable-xmga"
-
-	use gtk \
-		&& myconf="${myconf} --enable-gui --enable-x11 --enable-xv --enable-png"
-
-	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 alsa \
-		|| myconf="${myconf} --disable-alsa"
-
-	use oggvorbis \
-		|| myconf="${myconf} --disable-vorbis"
-
-	use encode \
-		&& myconf="${myconf} --enable-mencoder --enable-tv" \
-		|| myconf="${myconf} --disable-mencoder"
-
-# Currently libdvdnav do not compile on gcc-3.1.1
-#	use dvd \
-#		&& myconf="${myconf} --enable-dvdread --enable-dvdnav" \
-#		|| myconf="${myconf} --disable-mpdvdkit --disable-dvdread \
-#       		             --disable-css --disable-dvdnav"
-	use dvd \
-		&& myconf="${myconf} --enable-dvdread" \
-		|| myconf="${myconf} --disable-mpdvdkit --disable-dvdread \
-		                     --disable-css --disable-dvdnav"
-
-	use matrox \
-		&& myconf="${myconf} --enable-mga" \
-		|| myconf="${myconf} --disable-mga"
-
-	use 3dfx \
-		&& myconf="${myconf} --enable-3dfx --enable-tdfxfb"
-
-	# 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
-	unset CXXFLAGS
-	./configure --prefix=/usr \
-		--disable-runtime-cpudetection \
-		--enable-largefiles \
-		--enable-linux-devfs \
-		${myconf} || die
-
-	# emake borks on fast boxes - Azarah (07 Aug 2002)
-	make all || die
-	
-	use matrox && ( \
-		cd drivers 
-		make all || die
-	)
-}
-
-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
-	
-	# MAN pages are already installed ...
-	rm DOCS/*.1
-	# Install the rest of the documentation
-	dodir /usr/share/doc/${PF}
-	cp -a DOCS/* ${D}/usr/share/doc/${PF}
-	doalldocs
-
-	# Install the default Skin and Gnome menu entry
-	use gtk && ( \
-		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
-	)
-
-	use gnome && ( \
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/icon.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	)
-
-	# Install the font used by OSD and the GUI
-	dodir /usr/share/mplayer/fonts
-	cp -a ${WORKDIR}/iso-8859-1/ ${D}/usr/share/mplayer/fonts
-	rm -rf ${D}/usr/share/mplayer/font
-	dosym /usr/share/mplayer/fonts/iso-8859-1/arial-14/ /usr/share/mplayer/font
-
-	# This tries setting up mplayer.conf automagically
-	local video="sdl" audio="sdl"
-	use X && (
-		use gtk && video="xv" \
-		|| use sdl && video="sdl" \
-		|| use xv && video="xv" \
-		|| use opengl && video="gl" \
-		|| use ggi && video="ggi" \
-		|| use dga && video="dga" \
-		|| video="x11"
-	) || (
-		use fbcon && video="fbdev" \
-		|| use svga && video="svga" \
-		|| use aalib && video="aa"
-	)
-
-	use sdl && audio="sdl" \
-	|| use alsa && (
-		[ -e /usr/lib/libasound.so.2 ] && audio="alsa9" \
-		|| audio="alsa5"
-	) || use oss audio="oss" \
-	
-	# 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 
-	
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-
-	use matrox && ( \
-		dodir /lib/modules/${KV}/kernel/drivers/char
-		cp ${S}/drivers/mga_vid.o ${D}/lib/modules/${KV}/kernel/drivers/char
-	)
-}
-
-pkg_postinst() {
-
-	echo
-	echo '######################################################################'
-	echo '# MPlayer users that are going to use the GUI, please note the       #'
-	echo '# following:                                                         #'
-	echo '#                                                                    #'
-	echo '#   The GUI works best with mplayer -vo xv -gui, but since there is  #'
-	echo '#   no USE flag for XVideo, or for using the GUI, the autodetection  #'
-	echo '#   process cannot detect this by default (SDL will be used rather). #'
-	echo '#   So, if your setup supports XVideo (xvinfo should give output),   #'
-	echo '#   maybe do something like:                                         #'
-	echo '#                                                                    #'
-	echo '#     echo "vo = xv" >~/.mplayer/config                              #'
-	echo '#     echo "gui = 1" >>~/.mplayer/config                             #'
-	echo '#                                                                    #'
-	echo '#   after launching mplayer for the first time.                      #'
-	echo '#                                                                    #'
-	use gtk &>/dev/null \
-		|| echo '# NB: the GUI needs "gtk" as USE flag to build.                      #'
-	echo '######################################################################'
-	echo
-	depmod -a &>/dev/null || :
-}
-
diff --git a/media-video/mplayer/mplayer-0.90_pre7.ebuild b/media-video/mplayer/mplayer-0.90_pre7.ebuild
new file mode 100644
index 000000000000..a20ad8d95e9d
--- /dev/null
+++ b/media-video/mplayer/mplayer-0.90_pre7.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_pre7.ebuild,v 1.1 2002/09/15 20:49:57 azarah Exp $
+
+# 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="ftp://mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
+	ftp://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-1.zip
+	ftp://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-2.zip
+	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="x86? ( >=media-libs/divx4linux-20020418 )
+	x86? ( >=media-libs/win32codecs-0.60 )
+	dvd? ( media-libs/libdvdnav )
+	gtk? ( =x11-libs/gtk+-1.2*
+	       media-libs/libpng ) 
+	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 )
+	svga? ( media-libs/svgalib )
+	encode? ( media-sound/lame 
+	          >=media-libs/libdv-0.9.5 )
+	opengl? ( virtual/opengl )
+	directfb? ( dev-libs/DirectFB )
+	oggvorbis? ( media-libs/libvorbis )
+	>=sys-apps/portage-2.0.36"
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	app-arch/unzip"
+
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
+
+
+src_unpack() {
+
+	unpack MPlayer-${MY_PV}.tar.bz2
+
+	use truetype || unpack mp-arial-iso-8859-1.zip mp-arial-iso-8859-2.zip
+
+	# Fix bug with the default Skin
+	if [ -n "`use gtk`" ]
+	then
+		unpack default-skin-0.1.tar.bz2
+		cd ${WORKDIR}/default
+		patch < ${FILESDIR}/default-skin.diff || die "gtk patch failed"
+	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"
+
+	use gtk \
+		&& myconf="${myconf} --enable-gui --enable-x11 \
+		                     --enable-xv --enable-vm --enable-png"
+
+	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 alsa \
+		|| myconf="${myconf} --disable-alsa"
+
+	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 matrox \
+		&& myconf="${myconf} --enable-mga" \
+		|| myconf="${myconf} --disable-mga"
+
+	use 3dfx \
+		&& myconf="${myconf} --enable-3dfx --enable-tdfxfb"
+
+	# 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-linux-devfs \
+		${myconf} || die
+
+	# 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
+		insinto /usr/include
+		doins ${S}/postproc/postprocess.h
+	fi
+
+	# Install the documentation
+	dohtml -r ${S}/DOCS/*
+
+	# 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/icon.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}/iso-8859-[12]/ ${D}/usr/share/mplayer/fonts
+		rm -rf ${D}/usr/share/mplayer/font
+		dosym /usr/share/mplayer/fonts/iso-8859-1/arial-14/ /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 /usr/X11R6/lib/X11/fonts/truetype/arial.ttf \
+			/usr/share/mplayer/subfont.ttf
+	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
+
+	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
+		einfo "***************************************************************"
+		einfo " Please note that with the new freetype support you need to"
+		einfo " copy a truetype (.ttf) font to ~/.mplayer/subfont.ttf"
+		einfo "***************************************************************"
+		einfo
+	fi
+
+	depmod -a &>/dev/null || :
+}
+