fix URL's for fonts

17 files changed, 24 insertions, 1969 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index cfdc9f75535d..9ce17dcc0ad0 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # 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.53 2003/03/18 19:22:51 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.54 2003/03/30 19:28:07 azarah Exp $
+
+  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_rc5.ebuild :
+  Mark stable for x86.  Fix bug #18211, thanks to Philippe Lafoucri?re
+  <lafou@wanadoo.fr>.
 
 *mplayer-0.90_rc5 (18 Mar 2003)
 
diff --git a/media-video/mplayer/files/digest-mplayer-0.90_pre10 b/media-video/mplayer/files/digest-mplayer-0.90_pre10
deleted file mode 100644
index 3193c30d0332..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.90_pre10
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 cd972417e29cc7ca692dc7dd214a2cd0 MPlayer-0.90pre10.tar.bz2 2855776
-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/digest-mplayer-0.90_pre9 b/media-video/mplayer/files/digest-mplayer-0.90_pre9
deleted file mode 100644
index f618df9a03e4..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.90_pre9
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 527fe1559507f60bbbf9d887d07a0ea9 MPlayer-0.90pre9.tar.bz2 2758568
-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/digest-mplayer-0.90_rc1-r1 b/media-video/mplayer/files/digest-mplayer-0.90_rc1-r1
deleted file mode 100644
index 0105a37327fd..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.90_rc1-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 42224042b3b3c2f639c0e3c88eb3e810 MPlayer-0.90rc1.tar.bz2 3045416
-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/digest-mplayer-0.90_rc2 b/media-video/mplayer/files/digest-mplayer-0.90_rc2
deleted file mode 100644
index 1fab98f4eb34..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.90_rc2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 b6b6d83276ac7086702ad62ead1bcfe5 MPlayer-0.90rc2.tar.bz2 3121703
-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/digest-mplayer-0.90_rc3 b/media-video/mplayer/files/digest-mplayer-0.90_rc3
deleted file mode 100644
index 66e677bf6606..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.90_rc3
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 47a298ccd8d788ff88333c553ca81d07 MPlayer-0.90rc3.tar.bz2 3285759
-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/digest-mplayer-0.90_rc4 b/media-video/mplayer/files/digest-mplayer-0.90_rc4
index c2eb74b2cf60..c944fef576b0 100644
--- a/media-video/mplayer/files/digest-mplayer-0.90_rc4
+++ b/media-video/mplayer/files/digest-mplayer-0.90_rc4
@@ -1,4 +1,4 @@
 MD5 4976575433d5b0ad526ca1733f5cab26 MPlayer-0.90rc4.tar.bz2 3390207
-MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip 272659
-MD5 a5e01dd5fe14d2418a6ee349ff7a1c4b mp-arial-iso-8859-2.zip 255907
+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_rc5 b/media-video/mplayer/files/digest-mplayer-0.90_rc5
index bc145db3e539..4f6e1abe3542 100644
--- a/media-video/mplayer/files/digest-mplayer-0.90_rc5
+++ b/media-video/mplayer/files/digest-mplayer-0.90_rc5
@@ -1,4 +1,4 @@
 MD5 056c2cd23286ca5464a70defd4649134 MPlayer-0.90rc5.tar.bz2 3403602
-MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip 272659
-MD5 a5e01dd5fe14d2418a6ee349ff7a1c4b mp-arial-iso-8859-2.zip 255907
+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_pre9-no-dvd.patch b/media-video/mplayer/files/mplayer-0.90_pre9-no-dvd.patch
deleted file mode 100644
index 46bd58b80afc..000000000000
--- a/media-video/mplayer/files/mplayer-0.90_pre9-no-dvd.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- MPlayer-0.90pre9/Gui/mplayer/mw.h.orig	2002-10-27 21:04:25.000000000 +0200
-+++ MPlayer-0.90pre9/Gui/mplayer/mw.h	2002-10-27 21:07:38.000000000 +0200
-@@ -457,8 +457,15 @@
- 	  default: movie_aspect=-1;
- 	 }
- 	wsClearWindow( appMPlayer.subWindow );
-+#ifdef USE_DVDREAD
- 	if ( guiIntfStruct.StreamType == STREAMTYPE_DVD ) goto play_dvd_2;
--	 else guiIntfStruct.FilenameChanged=1;
-+	 else
-+	  {
-+#endif
-+		guiIntfStruct.FilenameChanged=1;
-+#ifdef USE_DVDREAD
-+	  }
-+#endif
- 	break;
- 
- // --- timer events
diff --git a/media-video/mplayer/files/mplayer-0.90_rc1-gtk2.patch b/media-video/mplayer/files/mplayer-0.90_rc1-gtk2.patch
deleted file mode 100644
index ae0846190684..000000000000
--- a/media-video/mplayer/files/mplayer-0.90_rc1-gtk2.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-diff -Naur Gui/mplayer/gtk/about.c Gui/mplayer/gtk/about.c
---- Gui/mplayer/gtk/about.c	2002-11-28 11:24:57.000000000 +0200
-+++ Gui/mplayer/gtk/about.c	2002-12-10 19:04:01.000000000 +0200
-@@ -25,6 +25,11 @@
-   GtkWidget     * AboutText;
-   GtkWidget     * Ok;
- 
-+#ifdef HAVE_GTK2_GUI
-+  GtkTextBuffer * AboutTextBuffer;
-+  GtkTextIter   iter;
-+#endif //HAVE_GTK2_GUI
-+
-   GtkStyle      * pixmapstyle;
-   GdkPixmap     * pixmapwid;
-   GdkBitmap     * mask;
-@@ -64,12 +69,25 @@
-   gtk_box_pack_start( GTK_BOX( vbox ),scrolledwindow1,TRUE,TRUE,0 );
-   gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow1 ),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC );
- 
--  AboutText=gtk_text_new( NULL,NULL );
-+#ifdef HAVE_GTK2_GUI
-+  AboutText = gtk_text_view_new();
-+  AboutTextBuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (AboutText));
-+  gtk_text_buffer_get_iter_at_offset (AboutTextBuffer, &iter, 0);  
-+#else  
-+  AboutText = gtk_text_new( NULL,NULL );
-+#endif //HAVE_GTK2_GUI
-+
-   gtk_widget_set_name( AboutText,"AboutText" );
-   gtk_widget_show( AboutText );
-   gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText );
-+
-+#ifdef HAVE_GTK2_GUI  
-+  gtk_text_buffer_insert (AboutTextBuffer, &iter,   
-+#else  
-   gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL,
--  	"\n" \
-+#endif //HAVE_GTK2_GUI  
-+    	
-+    	"\n" \
-   	"GUI development sponsored by UHU Linux\n" \
- 	"             (http://www.uhulinux.hu/)\n" \
- 	"\n" \
-@@ -139,7 +157,13 @@
- 	"     * Attila Kinali\n" \
- 	"     * Dirk Vornheder\n" \
- 	"     * Bohdan Horst (Nexus)\n" \
--	"\n",1481 );
-+	"\n",
-+
-+#ifdef HAVE_GTK2_GUI  
-+	-1);
-+#else
-+	1481);
-+#endif //HAVE_GTK2_GUI
- 
-   AddHSeparator( vbox );
-   Ok=AddButton( MSGTR_Ok,AddHButtonBox( vbox ) );
-diff -Naur configure configure
---- configure	2002-12-09 14:44:30.000000000 +0200
-+++ configure	2002-12-10 19:06:50.000000000 +0200
-@@ -130,6 +130,7 @@
- Optional features:
-   --disable-mencoder     disable mencoder (a/v encoder) compilation [enable]
-   --enable-gui           enable gmplayer compilation (gtk-1.2 GUI) [disable]
-+  --enable-gtk2          enable gtk2 port of the gui [disable]
-   --enable-largefiles    enable support for files > 2 GBytes [disable]
-   --enable-linux-devfs   set default devices to devfs ones [disable]
-   --enable-termcap       use termcap database for key codes [autodetect]
-@@ -1007,6 +1008,7 @@
- _opendivx=no
- _lirc=auto
- _gui=no
-+_gtk2=no
- _termcap=auto
- _termios=auto
- _3dfx=no
-@@ -1174,6 +1176,8 @@
-   --disable-lirc)	_lirc=no	;;
-   --enable-gui)		_gui=yes	;;
-   --disable-gui)	_gui=no		;;
-+  --enable-gtk2)	_gtk2=yes	;;
-+  --disable-gtk2)	_gtk2=no	;;
-   --enable-termcap)	_termcap=yes	;;
-   --disable-termcap)	_termcap=no	;;
-   --enable-termios)	_termios=yes    ;;
-@@ -4386,42 +4390,70 @@
-   fi
-   echores "$_xshape"
- 
-+  # Check for new GTK (2.x.x)
-+  if test "$_gtk2" = yes ; then 
-+  
-+    # Check for GTK:
-+    echocheck "GTK+ version"
- 
--  # Check for GTK:
--  echocheck "gtk version"
--  if test -z "$_gtkconfig" ; then
--    if ( gtk-config --version ) >/dev/null 2>&1 ; then
--      _gtkconfig="gtk-config"
--    elif ( gtk12-config --version ) >/dev/null 2>&1 ; then
--      _gtkconfig="gtk12-config"
--    else
--      die "the GUI requires GTK (which was not found)"
-+    _gtk=`pkg-config gtk+-2.0 --modversion 2>&1`
-+    _inc_gtk=`pkg-config gtk+-2.0 --cflags 2>&1`
-+    _ld_gtk=`pkg-config gtk+-2.0 --libs 2>&1`
-+    echores "$_gtk"
-+  
-+    # Check for GLIB
-+    echocheck "glib version"
-+    _glib=`pkg-config glib-2.0 --modversion 2>&1`
-+    _inc_glib=`pkg-config glib-2.0 --cflags 2>&1`
-+    _ld_glib=`pkg-config glib-2.0 --libs 2>&1`
-+    echores "$_glib"
-+
-+    _def_gui='#define HAVE_NEW_GUI 1'
-+    _def_gtk2_gui='#define HAVE_GTK2_GUI 1'
-+    _ld_gui='$(GTKLIB) $(GLIBLIB)'
-+
-+  # Check for "old" GTK (1.2.x)
-+  else 
-+  
-+    # Check for GTK:
-+    echocheck "GTK+ version"
-+    if test -z "$_gtkconfig" ; then
-+      if ( gtk-config --version ) >/dev/null 2>&1 ; then
-+        _gtkconfig="gtk-config"
-+      elif ( gtk12-config --version ) >/dev/null 2>&1 ; then
-+        _gtkconfig="gtk12-config"
-+      else
-+        die "the GUI requires GTK+ (which was not found)"
-+      fi
-     fi
--  fi
--  _gtk=`$_gtkconfig --version 2>&1`
--  _inc_gtk=`$_gtkconfig --cflags 2>&1`
--  _ld_gtk=`$_gtkconfig --libs 2>&1`
--  echores "$_gtk (using $_gtkconfig)"
--
--  # Check for GLIB
--  echocheck "glib version"
--  if test -z "$_glibconfig" ; then
--    if ( glib-config --version ) >/dev/null 2>&1 ; then
--      _glibconfig="glib-config"
--    elif ( glib12-config --version ) >/dev/null 2>&1 ; then
--      _glibconfig="glib12-config"
--    else
--      die "the GUI requires GLIB (which was not found)"
-+    _gtk=`$_gtkconfig --version 2>&1`
-+    _inc_gtk=`$_gtkconfig --cflags 2>&1`
-+    _ld_gtk=`$_gtkconfig --libs 2>&1`
-+    echores "$_gtk (using $_gtkconfig)"
-+  
-+    # Check for GLIB
-+    echocheck "glib version"
-+    if test -z "$_glibconfig" ; then
-+      if ( glib-config --version ) >/dev/null 2>&1 ; then
-+        _glibconfig="glib-config"
-+      elif ( glib12-config --version ) >/dev/null 2>&1 ; then
-+        _glibconfig="glib12-config"
-+      else
-+        die "the GUI requires GLIB (which was not found)"
-+      fi
-     fi
--  fi
--  _glib=`$_glibconfig --version 2>&1`
--  _inc_glib=`$_glibconfig --cflags 2>&1`
--  _ld_glib=`$_glibconfig --libs 2>&1`
--  echores "$_glib (using $_glibconfig)"
--
--  _def_gui='#define HAVE_NEW_GUI 1'
--  _ld_gui='$(GTKLIB) $(GLIBLIB)'
- 
-+    _glib=`$_glibconfig --version 2>&1`
-+    _inc_glib=`$_glibconfig --cflags 2>&1`
-+    _ld_glib=`$_glibconfig --libs 2>&1`
-+    echores "$_glib (using $_glibconfig)"
-+
-+    _def_gui='#define HAVE_NEW_GUI 1'
-+    _def_gtk2_gui='#undef HAVE_GTK2_GUI'
-+    _ld_gui='$(GTKLIB) $(GLIBLIB)'
-+  
-+  fi
-+  
-   echo "Creating Gui/config.mak"
-   cat > Gui/config.mak << EOF
- # -------- Generated by configure -----------
-@@ -4435,6 +4467,7 @@
- 
- else
-   _def_gui='#undef HAVE_NEW_GUI'
-+  _def_gtk2_gui='#undef HAVE_GTK2_GUI'
- fi
- # --------------- GUI specific tests end -------------------
- 
-@@ -4962,6 +4995,7 @@
- 
- /* gui support, please do not edit this option */
- $_def_gui
-+$_def_gtk2_gui
- 
- /* Audio output drivers */
- $_def_ossaudio
diff --git a/media-video/mplayer/mplayer-0.90_pre10.ebuild b/media-video/mplayer/mplayer-0.90_pre10.ebuild
deleted file mode 100644
index c7af7a0c2c4d..000000000000
--- a/media-video/mplayer/mplayer-0.90_pre10.ebuild
+++ /dev/null
@@ -1,327 +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_pre10.ebuild,v 1.5 2003/02/13 13:30:17 vapier Exp $
-
-IUSE="dga oss jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts"
-
-# 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://mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
-	http://mplayerhq.hu/MPlayer/releases/fonts/mp-arial-iso-8859-1.zip
-	http://mplayerhq.hu/MPlayer/releases/fonts/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 )
-	arts? ( kde-base/arts )
-	nas? ( media-libs/nas )
-	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 )
-	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 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" \
-		|| myconf="${myconf} --disable-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 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 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
-		REALLIBDIR="/opt/RealPlayer9/Real/Codecs"
-	elif [ -d /opt/RealPlayer8/Codecs ]
-	then
-		REALLIBDIR="/opt/RealPlayer8/Codecs"
-	else
-		REALLIBDIR="/usr/lib/real"
-	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-linux-devfs \
-		--enable-real \
-		--with-reallibdir=${REALLIBDIR} \
-		${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
-	doins ${S}/etc/input.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 || :
-}
-
diff --git a/media-video/mplayer/mplayer-0.90_pre9.ebuild b/media-video/mplayer/mplayer-0.90_pre9.ebuild
deleted file mode 100644
index 9336e69e0752..000000000000
--- a/media-video/mplayer/mplayer-0.90_pre9.ebuild
+++ /dev/null
@@ -1,326 +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_pre9.ebuild,v 1.4 2003/02/13 13:30:24 vapier Exp $
-
-IUSE="dga oss jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb"
-
-# 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://mplayerhq.hu/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
-	http://mplayerhq.hu/MPlayer/releases/fonts/mp-arial-iso-8859-1.zip
-	http://mplayerhq.hu/MPlayer/releases/fonts/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 )
-	nas? ( media-libs/nas )
-	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 )
-	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 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
-
-	# Fix compile without dvd support
-	cd ${S}; patch -p1 < ${FILESDIR}/${P}-no-dvd.patch || die
-}
-
-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 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 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 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
-		REALLIBDIR="/opt/RealPlayer9/Real/Codecs"
-	elif [ -d /opt/RealPlayer8/Codecs ]
-	then
-		REALLIBDIR="/opt/RealPlayer8/Codecs"
-	else
-		REALLIBDIR="/usr/lib/real"
-	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-linux-devfs \
-		--enable-real \
-		--with-reallibdir=${REALLIBDIR} \
-		${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
-	doins ${S}/etc/input.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 || :
-}
-
diff --git a/media-video/mplayer/mplayer-0.90_rc1-r1.ebuild b/media-video/mplayer/mplayer-0.90_rc1-r1.ebuild
deleted file mode 100644
index 2cecf36f83d3..000000000000
--- a/media-video/mplayer/mplayer-0.90_rc1-r1.ebuild
+++ /dev/null
@@ -1,340 +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_rc1-r1.ebuild,v 1.3 2003/02/13 13:30:46 vapier Exp $
-
-IUSE="dga oss 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/mp-arial-iso-8859-1.zip
-	http://mplayerhq.hu/MPlayer/releases/fonts/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/xvid-0.9.0 )
-	x86? ( >=media-libs/divx4linux-20020418
-	       >=media-libs/win32codecs-0.60 )
-	dvd? ( media-libs/libdvdnav )
-	gtk? ( !gtk2 ( =x11-libs/gtk+-1.2*
-	               =dev-libs/glib-1.2* )
-	       media-libs/libpng )
-	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 )
-	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 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
-		epatch ${FILESDIR}/default-skin.diff
-	fi
-
-	cd ${S}; epatch ${FILESDIR}/${P}-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 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 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
-		REALLIBDIR="/opt/RealPlayer9/Real/Codecs"
-	elif [ -d /opt/RealPlayer8/Codecs ]
-	then
-		REALLIBDIR="/opt/RealPlayer8/Codecs"
-	else
-		REALLIBDIR="/usr/lib/real"
-	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-linux-devfs \
-		--enable-real \
-		--with-reallibdir=${REALLIBDIR} \
-		${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
-	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 || :
-}
-
diff --git a/media-video/mplayer/mplayer-0.90_rc2.ebuild b/media-video/mplayer/mplayer-0.90_rc2.ebuild
deleted file mode 100644
index 974990474dbf..000000000000
--- a/media-video/mplayer/mplayer-0.90_rc2.ebuild
+++ /dev/null
@@ -1,355 +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_rc2.ebuild,v 1.5 2003/02/13 13:30:53 vapier Exp $
-
-IUSE="dga oss 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/mp-arial-iso-8859-1.zip
-	http://mplayerhq.hu/MPlayer/releases/fonts/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/xvid-0.9.0 )
-	x86? ( >=media-libs/divx4linux-20020418
-	       >=media-libs/win32codecs-0.60 )
-	dvd? ( media-libs/libdvdnav )
-	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 )
-	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 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
-		epatch ${FILESDIR}/default-skin.diff
-	fi
-
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.90_rc1-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 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 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
-		REALLIBDIR="/opt/RealPlayer9/Real/Codecs"
-	elif [ -d /opt/RealPlayer8/Codecs ]
-	then
-		REALLIBDIR="/opt/RealPlayer8/Codecs"
-	else
-		REALLIBDIR="/usr/lib/real"
-	fi
-	
-	# For lirc support as the auto-detect doesn't seem to work
-	if [ -f /usr/include/lirc/lirc_client.h ]
-	then
-		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-real \
-		--with-reallibdir=${REALLIBDIR} \
-		${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/*
-
-	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}/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
-	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 || :
-}
-
diff --git a/media-video/mplayer/mplayer-0.90_rc3.ebuild b/media-video/mplayer/mplayer-0.90_rc3.ebuild
deleted file mode 100644
index 4c8a7139b549..000000000000
--- a/media-video/mplayer/mplayer-0.90_rc3.ebuild
+++ /dev/null
@@ -1,359 +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_rc3.ebuild,v 1.6 2003/02/13 13:31:14 vapier Exp $
-
-IUSE="dga oss 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/mp-arial-iso-8859-1.zip
-	http://mplayerhq.hu/MPlayer/releases/fonts/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/xvid-0.9.0 )
-	x86? ( >=media-libs/divx4linux-20020418
-	       >=media-libs/win32codecs-0.60 )
-	dvd? ( media-libs/libdvdnav )
-	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 )
-	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 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
-		epatch ${FILESDIR}/default-skin.diff
-	fi
-
-	cd ${S}; epatch ${FILESDIR}/${PN}-0.90_rc1-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 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 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
-		REALLIBDIR="/opt/RealPlayer9/Real/Codecs"
-	elif [ -d /opt/RealPlayer8/Codecs ]
-	then
-		REALLIBDIR="/opt/RealPlayer8/Codecs"
-	else
-		REALLIBDIR="/usr/lib/real"
-	fi
-	
-	# For lirc support as the auto-detect doesn't seem to work
-	if [ -f /usr/include/lirc/lirc_client.h ]
-	then
-		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-shared-pp \
-		--enable-dynamic-plugins \
-		--enable-real \
-		--with-reallibdir=${REALLIBDIR} \
-		--with-x11incdir=/usr/X11R6/include \
-		${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/*
-
-	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}/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
-	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 || :
-}
-
diff --git a/media-video/mplayer/mplayer-0.90_rc4.ebuild b/media-video/mplayer/mplayer-0.90_rc4.ebuild
index 7360e6ab8947..6e988c201aef 100644
--- a/media-video/mplayer/mplayer-0.90_rc4.ebuild
+++ b/media-video/mplayer/mplayer-0.90_rc4.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.90_rc4.ebuild,v 1.3 2003/03/13 18:30:14 doctomoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_rc4.ebuild,v 1.4 2003/03/30 19:28:07 azarah Exp $
 
 IUSE="dga oss jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts"
 
@@ -16,8 +16,8 @@ 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/mp-arial-iso-8859-1.zip
-	http://mplayerhq.hu/MPlayer/releases/fonts/mp-arial-iso-8859-2.zip
+	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 )"
@@ -74,7 +74,8 @@ src_unpack() {
 
 	unpack MPlayer-${MY_PV}.tar.bz2
 
-	use truetype || unpack mp-arial-iso-8859-1.zip mp-arial-iso-8859-2.zip
+	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`" ]
@@ -303,9 +304,9 @@ src_install() {
 	if [ -z "`use truetype`" ]
 	then
 		dodir /usr/share/mplayer/fonts
-		cp -a ${WORKDIR}/iso-8859-[12]/ ${D}/usr/share/mplayer/fonts
+		cp -a ${WORKDIR}/font-arial* ${D}/usr/share/mplayer/fonts
 		rm -rf ${D}/usr/share/mplayer/font
-		dosym fonts/iso-8859-1/arial-14/ /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 ...
diff --git a/media-video/mplayer/mplayer-0.90_rc5.ebuild b/media-video/mplayer/mplayer-0.90_rc5.ebuild
index 495c894f9be6..ab76166cbbac 100644
--- a/media-video/mplayer/mplayer-0.90_rc5.ebuild
+++ b/media-video/mplayer/mplayer-0.90_rc5.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.90_rc5.ebuild,v 1.1 2003/03/18 19:22:51 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_rc5.ebuild,v 1.2 2003/03/30 19:28:07 azarah Exp $
 
 IUSE="dga oss jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts"
 
@@ -16,8 +16,8 @@ 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/mp-arial-iso-8859-1.zip
-	http://mplayerhq.hu/MPlayer/releases/fonts/mp-arial-iso-8859-2.zip
+	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 )"
@@ -67,14 +67,15 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+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
+	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`" ]
@@ -303,9 +304,9 @@ src_install() {
 	if [ -z "`use truetype`" ]
 	then
 		dodir /usr/share/mplayer/fonts
-		cp -a ${WORKDIR}/iso-8859-[12]/ ${D}/usr/share/mplayer/fonts
+		cp -a ${WORKDIR}/font-arial* ${D}/usr/share/mplayer/fonts
 		rm -rf ${D}/usr/share/mplayer/font
-		dosym fonts/iso-8859-1/arial-14/ /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 ...