Cleanup, and 3dnowext in place

(Portage version: 2.0.51.19)

17 files changed, 28 insertions, 2067 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 9de81ce3ce43..953d6a058d0e 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.291 2005/04/12 08:09:31 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.292 2005/04/16 10:05:03 lu_zero Exp $
+
+  16 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
+  -files/mplayer-1.0_pre4-alsa-gcc34.patch,
+  -files/mplayer-1.0_pre4-altivec-gcc34.patch,
+  -files/mplayer-1.0_pre4-help_mp-ro.h.patch,
+  -files/mplayer-1.0_pre4-mpst.patch, -mplayer-1.0_pre4-r7.ebuild,
+  -mplayer-1.0_pre5-r2.ebuild, -mplayer-1.0_pre5-r3.ebuild,
+  -mplayer-1.0_pre5-r4.ebuild, mplayer-1.0_pre5-r5.ebuild,
+  mplayer-1.0_pre6-r1.ebuild, mplayer-1.0_pre6-r2.ebuild,
+  mplayer-1.0_pre6-r3.ebuild:
+  useflag move 3dnowex -> 3dnowext, global cleanup
 
 *mplayer-1.0_pre6-r3 (12 Apr 2005)
 
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r7 b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r7
deleted file mode 100644
index 18d8bea4d6ed..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r7
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 83ebac0f05b192516a41fca2350ca01a MPlayer-1.0pre4.tar.bz2 4913390
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-MD5 5fdc36704c4ec3a6dc6b57a536608180 Blue-1.4.tar.bz2 221734
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre5-r2 b/media-video/mplayer/files/digest-mplayer-1.0_pre5-r2
deleted file mode 100644
index 76f2c5d8eada..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre5-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fbe6919eb025526e8ed129cd61a49969 MPlayer-1.0pre5.tar.bz2 5072836
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 48493efca70c570f2cda0134e63cb5df mplayer-1.0_pre5-alsa-gui.patch.tar.bz2 5852
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-MD5 5fdc36704c4ec3a6dc6b57a536608180 Blue-1.4.tar.bz2 221734
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre5-r3 b/media-video/mplayer/files/digest-mplayer-1.0_pre5-r3
deleted file mode 100644
index 76f2c5d8eada..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre5-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fbe6919eb025526e8ed129cd61a49969 MPlayer-1.0pre5.tar.bz2 5072836
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 48493efca70c570f2cda0134e63cb5df mplayer-1.0_pre5-alsa-gui.patch.tar.bz2 5852
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-MD5 5fdc36704c4ec3a6dc6b57a536608180 Blue-1.4.tar.bz2 221734
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre5-r4 b/media-video/mplayer/files/digest-mplayer-1.0_pre5-r4
deleted file mode 100644
index 45d46df94051..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre5-r4
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 fbe6919eb025526e8ed129cd61a49969 MPlayer-1.0pre5.tar.bz2 5072836
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-MD5 48493efca70c570f2cda0134e63cb5df mplayer-1.0_pre5-alsa-gui.patch.tar.bz2 5852
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-MD5 5fdc36704c4ec3a6dc6b57a536608180 Blue-1.4.tar.bz2 221734
diff --git a/media-video/mplayer/files/mplayer-1.0_pre4-alsa-gcc34.patch b/media-video/mplayer/files/mplayer-1.0_pre4-alsa-gcc34.patch
deleted file mode 100644
index f733923c62a0..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre4-alsa-gcc34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libao2/ao_alsa9.c.org	2003-10-04 12:28:58.000000000 -0500
-+++ libao2/ao_alsa9.c	2004-04-10 15:28:37.057002080 -0500
-@@ -341,7 +341,7 @@
-             strcpy(devstr, "surround51");
-             alsa_device = devstr;
-            break;
--          default:
-+          default: ;
-         }
-     }
- 
diff --git a/media-video/mplayer/files/mplayer-1.0_pre4-altivec-gcc34.patch b/media-video/mplayer/files/mplayer-1.0_pre4-altivec-gcc34.patch
deleted file mode 100644
index 5dbdf2da1a01..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre4-altivec-gcc34.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN MPlayer-1.0pre4.orig/postproc/swscale_altivec_template.c MPlayer-1.0pre4/postproc/swscale_altivec_template.c
---- MPlayer-1.0pre4.orig/postproc/swscale_altivec_template.c	2004-06-17 12:44:17.139771408 +0200
-+++ MPlayer-1.0pre4/postproc/swscale_altivec_template.c	2004-06-17 12:45:47.890975128 +0200
-@@ -27,9 +27,9 @@
-   (vector unsigned int)(19, 19, 19, 19);
- #else
- static const vector signed int vzero =
--  (vector signed int){0,0,0,0};
-+  (vector const signed int){0,0,0,0};
- static const vector unsigned int altivec_vectorShiftInt19 =
--  (vector unsigned int){19, 19, 19, 19};
-+  (vector const unsigned int){19, 19, 19, 19};
- 
- #endif
- 
diff --git a/media-video/mplayer/files/mplayer-1.0_pre4-help_mp-ro.h.patch b/media-video/mplayer/files/mplayer-1.0_pre4-help_mp-ro.h.patch
deleted file mode 100644
index 176364422528..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre4-help_mp-ro.h.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- MPlayer-1.0pre4-orig/help/help_mp-ro.h	2004-04-27 11:24:31.000000000 -0500
-+++ MPlayer-1.0_pre4/help/help_mp-ro.h	2004-06-29 01:54:54.081359032 -0500
-@@ -32,7 +32,7 @@
- " -fs              afișare pe tot ecranul (sau -vm, -zoom, detalii în pagina man)\n"
- " -x <x> -y <y>    alege rezoluția (folosit pentru -vm sau -zoom)\n"
- " -sub <fișier>    specifică fișierul cu subtitrări folosit\n"
--                   (vezi și -subfps, -subdelay)\n"
-+"                   (vezi și -subfps, -subdelay)\n"
- " -playlist <fiș>  specifică playlist-ul\n"
- " -vid x -aid y    alege pista video (x) și audio (y)\n"
- " -fps x -srate y  schimbă rata video (x fps) și audio (y Hz)\n"
-@@ -67,9 +67,9 @@
- #define MSGTR_NoHomeDir "Nu găsesc directorul HOME.\n"
- #define MSGTR_GetpathProblem "get_path(\"config\") problem\n"
- #define MSGTR_CreatingCfgFile "Creez fișierul de configurare: %s\n"
--#define MSGTR_InvalidVOdriver "Numele driverului de ieșire video e greșit: %s\n"
-+#define MSGTR_InvalidVOdriver "Numele driverului de ieșire video e greșit: %s\n"\
- 	"Încearcă '-vo help' pentru o listă cu driveri video disponibili.\n"
--#define MSGTR_InvalidAOdriver "Numele driverului de ieșire audio e greșit: %s\n"
-+#define MSGTR_InvalidAOdriver "Numele driverului de ieșire audio e greșit: %s\n"\
- 	"Folosește '-ao help' pentru lista cu driveri audio disponibili.\n"
- #define MSGTR_BuiltinCodecsConf "Folosesc 'codecs.conf' built-in.\n"
- #define MSGTR_CantLoadFont "Nu pot încărca fontul: %s\n"
-@@ -109,7 +109,7 @@
- "  - Încearcă '-cache 8192'.\n"\
- "- Folosești -cache pentru fișiere AVI neinterleaved?\n"\
- "  - Încearcă '-nocache'.\n"\
--"Citește DOCS/HTML/en/devices.html pentru idei de reglare/accelerare.\n"\ //lang
-+"Citește DOCS/HTML/en/devices.html pentru idei de reglare/accelerare.\n"\
- "Dacă tot nu reușești, citește DOCS/HTML/en/bugreports.html.\n\n" //lang
- 
- #define MSGTR_NoGui "MPlayer a fost compilat FĂRĂ suport pentru GUI.\n"
-@@ -127,8 +127,7 @@
- #define MSGTR_CannotReadVideoProperties "Video: Nu pot citi proprietățile.\n"
- #define MSGTR_NoStreamFound "Nu am găsit nici un canal.\n"
- #define MSGTR_InitializingAudioCodec "Inițializez codecul audio...\n"
--#define MSGTR_ErrorInitializingVODevice
--"Eroare la activarea ieșirii video (-vo) aleasă.\n"
-+#define MSGTR_ErrorInitializingVODevice "Eroare la activarea ieșirii video (-vo) aleasă.\n"
- #define MSGTR_ForcedVideoCodec "Codec video forțat: %s\n"
- #define MSGTR_ForcedAudioCodec "Codec audio forțat: %s\n"
- #define MSGTR_AODescription_AOAuthor "AO: Descriere: %s\nAO: Autor: %s\n"
-@@ -202,7 +201,7 @@
- " padding=<0-2>\n"\
- "                0: de loc\n"\
- "                1: tot\n"\
--"                2: ajustează\n"\ // dunno
-+"                2: ajustează\n"\
- "\n"\
- " fast          Activează codare rapidă pentru următoarele preseturi VBR,\n"\
- "               la calitate puțin redusă și bitrate-uri crescute.\n"\
-@@ -476,7 +475,7 @@
- #define MSGTR_PREFERENCES_DXR3_FAME "Folosește FAME"
- #define MSGTR_PREFERENCES_FontEncoding1 "Unicode"
- 
--/* lang
-+// lang 
- #define MSGTR_PREFERENCES_FontEncoding2 "Limbi vest-europene (ISO-8859-1)"
- #define MSGTR_PREFERENCES_FontEncoding3 "Limbi vest-europene cu Euro (ISO-8859-15)"
- #define MSGTR_PREFERENCES_FontEncoding4 "Limbi central-europene sau slavice (ISO-8859-2)"
diff --git a/media-video/mplayer/files/mplayer-1.0_pre4-mpst.patch b/media-video/mplayer/files/mplayer-1.0_pre4-mpst.patch
deleted file mode 100644
index 1f17cf1508e0..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre4-mpst.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libmpdemux/open.c	11 Jun 2004 20:57:03 -0000	1.97
-+++ libmpdemux/open.c	25 Jun 2004 15:19:11 -0000	1.98
-@@ -484,6 +484,7 @@
-   if (strncmp("tv://", filename, 5) && strncmp("mf://", filename, 5) &&
-     strncmp("vcd://", filename, 6) && strncmp("dvb://", filename, 6) &&
-     strncmp("cdda://", filename, 7) && strncmp("cddb://", filename, 7) &&
-+    strncmp("mpst://", filename, 7) &&
-     strstr(filename, "://")) {
-      url = url_new(filename);
-     }
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
deleted file mode 100644
index 026d55a775cb..000000000000
--- a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.28 2005/03/18 21:23:54 chriswhite Exp $
-
-inherit eutils flag-o-matic kernel-mod
-
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad  matroska matrox mmx mmxext mpeg mythtv nas network nls oggvorbis opengl oss png real rtc samba sdl sse svga tga theora truetype v4l v4l2 xinerama X xmms xv xvid gnome"
-
-BLUV=1.4
-SVGV=1.9.17
-
-# Handle PREversions as well
-MY_PV="${PV/_/}"
-S="${WORKDIR}/MPlayer-${MY_PV}"
-SRC_URI="mirror://mplayer/releases/MPlayer-${MY_PV}.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
-	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )"
-# Only install Skin if GUI should be build (gtk as USE flag)
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-# 'encode' in USE for MEncoder.
-RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
-	x86? ( divx4linux? (  >=media-libs/divx4linux-20030428 )
-		 >=media-libs/win32codecs-0.60 )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	bidi? ( dev-libs/fribidi )
-	cdparanoia? ( media-sound/cdparanoia )
-	directfb? ( dev-libs/DirectFB )
-	dvdread? ( media-libs/libdvdread )
-	encode? ( media-sound/lame
-			>=media-libs/libdv-0.9.5 )
-	esd? ( media-sound/esound )
-	gif? ( media-libs/giflib
-		media-libs/libungif )
-	ggi? ( media-libs/libggi )
-	gtk? (
-		media-libs/libpng
-		virtual/x11
-		=x11-libs/gtk+-1.2*
-		=dev-libs/glib-1.2* )
-	jpeg? ( media-libs/jpeg )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	lzo? ( dev-libs/lzo )
-	mad? ( media-libs/libmad )
-	matroska? ( >=media-libs/libmatroska-0.6.0 )
-	mpeg? ( media-libs/faad2 )
-	nas? ( media-libs/nas )
-	nls? ( sys-devel/gettext )
-	oggvorbis? ( media-libs/libvorbis )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	samba? ( >=net-fs/samba-2.2.8a )
-	sdl? ( media-libs/libsdl )
-	svga? ( media-libs/svgalib )
-	!ia64? (
-		theora? ( media-libs/libtheora )
-		live? (
-			x86? ( >=media-plugins/live-2004.07.20 )
-			amd64? ( >=media-plugins/live-2004.03.27 )
-			alpha? ( >=media-plugins/live-2004.07.20 )
-		)
-	)
-	truetype? ( >=media-libs/freetype-2.1 )
-	xinerama? ( virtual/x11 )
-	xmms? ( media-sound/xmms )
-	>=sys-apps/portage-2.0.36
-	sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	app-arch/unzip"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha amd64 ~ia64 ~hppa ~sparc"
-
-src_unpack() {
-
-	unpack MPlayer-${MY_PV}.tar.bz2 \
-		font-arial-iso-8859-1.tar.bz2 font-arial-iso-8859-2.tar.bz2
-
-	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
-
-	use gtk && unpack Blue-${BLUV}.tar.bz2
-
-	cd ${S}
-
-	# fixes bug reported by email from Selwyn Tang
-	epatch ${FILESDIR}/${P}-mpst.patch
-
-	# fixes bug #55456 for amd64 and fullscreen Bug #43010
-	epatch ${FILESDIR}/gui_vuln_code.patch
-
-	# fixes missing str* linking bugs
-	cp ${FILESDIR}/strl.c ${S}/osdep
-	epatch ${FILESDIR}/str_undefined.patch
-
-	# Fix head/tail call for new coreutils
-	epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
-
-	#bug #49669, horrid syntax errors in help/help_mp-ro.h	
-	epatch ${FILESDIR}/mplayer-1.0_pre4-help_mp-ro.h.patch
-
-	#fixes bug #53634
-	epatch ${FILESDIR}/real_demux.patch
-
-	#Fixes an upstream bug with odml code
-	epatch ${FILESDIR}/mplayer-odml.patch
-
-	#adds mythtv support to mplayer
-	use mythtv && epatch ${FILESDIR}/mplayer-mythtv.patch
-
-	#fixes a live api bug
-	if use live && ( use x86 || use alpha )
-	then
-		epatch ${FILESDIR}/mplayer-1.0_pre5-live.patch
-	fi
-
-	# GCC 3.4 fixes
-	epatch ${FILESDIR}/mplayer-1.0_pre4-alsa-gcc34.patch
-
-	# bug #55936, patch from eradicator- fix caching problems.
-	epatch ${FILESDIR}/cachefill.patch
-
-	#bug #58082.  Fixes LANGUAGE variable issues
-	epatch ${FILESDIR}/mplayer-1.0_pre5-r1-conf_locale.patch
-
-	# Fix hppa compilation
-	if use hppa; then
-		sed -i -e "s/-O4/-O1/" "${S}/configure" || die "failed to sed configure"
-	fi
-
-	if use svga; then
-		echo
-		einfo "Enabling vidix non-root mode."
-		einfo "(You need a proper svgalib_helper.o module for your kernel"
-		einfo " to actually use this)"
-		echo
-
-		mv "${WORKDIR}/svgalib_helper" "${S}/libdha"
-	fi
-	#Remove kernel-2.6 workaround as the problem it works around is
-	#fixed, and the workaround breaks sparc
-	if use sparc; then
-		sed -i -e 's:#define __KERNEL__::' osdep/kerneltwosix.h || die "failed to apply kernel-2.6 workarround"
-	fi
-}
-
-src_compile() {
-
-	filter-flags -fPIE -fPIC -fstack-protector -fforce-addr -momit-leaf-frame-pointer -msse2 -falign-functions
-	local myconf=
-
-	# ugly optimizations cause MPlayer to cry on x86 systems!
-	if use x86 ; then
-		replace-flags -O0 -O2
-		replace-flags -O3 -O2
-	fi
-
-	if use dvd; then
-		myconf="${myconf} $(use_enable dvdread) $(use_enable !dvdread mpdvdkit)"
-	else
-		myconf="${myconf} --disable-dvdread --disable-mpdvdkit"
-	fi
-
-	if use !gtk && use !X && use !xv && use !xinerama; then
-		myconf="${myconf} --disable-gui --disable-x11 --disable-xv --disable-xmga --disable-xinerama --disable-vm --disable-xvmc"
-	else
-		#note we ain't touching --enable-vm.  That should be locked down in the future.
-		myconf="${myconf} --enable-x11 $(use_enable xinerama) $(use_enable xv) $(use_enable gtk gui)"
-	fi
-
-	#disable png *only* if the flag is off, and gtk gui isn't on.
-	if use png ||  use gtk; then
-		myconf="${myconf} --enable-png"
-	else
-		myconf="${myconf} --disable-png"
-	fi
-
-	if use ia64 || use !network; then
-		myconf="${myconf} --disable-live"
-	else
-		myconf="${myconf} $(use_enable live)"
-	fi
-
-	if use ia64; then
-		myconf="${myconf} --disable-theora"
-	else
-		myconf="${myconf} $(use_enable theora)"
-	fi
-
-	if use 3dfx; then
-		myconf="${myconf} --enable-tdfxvid"
-	else
-		myconf="${myconf} --disable-tdfxvid"
-	fi
-	if use matrox && use X; then
-		myconf="${myconf} $(use_enable matrox xmga)"
-	fi
-
-	if use svga
-	then
-		myconf="${myconf} --enable-svga"
-	else
-		myconf="${myconf} --disable-svga --disable-vidix"
-	fi
-
-	myconf="${myconf} $(use_enable matrox mga)"
-	myconf="${myconf} $(use_enable 3dnow)"
-	myconf="${myconf} $(use_enable 3dnowex)"
-	myconf="${myconf} $(use_enable sse)"
-	myconf="${myconf} $(use_enable mmx)"
-	myconf="${myconf} $(use_enable mmxext mmx2)"
-
-	if use real
-	then
-		if [ -d /usr/lib/win32 ]
-		then
-			REALLIBDIR="/usr/lib/win32"
-		else
-			eerror "Real libs not found!  Install a stable version of win32codecs"
-			die "Real libs not found"
-		fi
-	fi
-
-	if [ -e /dev/.devfsd ]; then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	# Build the matrox driver before mplayer configuration.
-	# That way the configure script sees it and builds the support
-	#build the matrox driver before the 
-	if use matrox && use x86; then
-		cd ${S}/drivers
-		unset ARCH
-		make all || die "Matrox build failed!  Your kernel may need to have `make mrproper` run on it before trying to use matrox support in this ebuild again."
-		cd ${S}
-	fi
-
-	./configure --prefix=/usr 		\
-		--confdir=/usr/share/mplayer	\
-		--datadir=/usr/share/mplayer	\
-		--disable-runtime-cpudetection	\
-		--enable-largefiles		\
-		--enable-menu			\
-		--enable-real			\
-		--with-reallibdir=${REALLIBDIR} 	\
-		--with-x11incdir=/usr/X11R6/include	\
-		${myconf} 			\
-		$(use_enable bidi fribidi)	\
-		$(use_enable cdparanoia)	\
-		$(use_enable edl)		\
-		$(use_enable encode mencoder)	\
-		$(use_enable ipv6 inet6)	\
-		$(use_enable joystick)		\
-		$(use_enable lirc)		\
-		$(use_enable network) 		\
-		$(use_enable network ftp)	\
-		$(use_enable rtc)		\
-		$(use_enable samba smb)		\
-		$(use_enable truetype freetype)	\
-		$(use_enable v4l tv-v4l)	\
-		$(use_enable v4l2 tv-v4l2)	\
-		$(use_enable divx4linux)	\
-		$(use_enable gif)		\
-		$(use_enable jpeg)		\
-		$(use_enable lzo liblzo)	\
-		$(use_enable matroska external-matroska) $(use_enable !matroska internal-matroska)	\
-		$(use_enable mpeg external-faad)         $(use_enable !mpeg internal-faad)		\
-		$(use_enable oggvorbis vorbis)	\
-		$(use_enable xmms)		\
-		$(use_enable xvid)		\
-		$(use_enable 3dfx)		\
-		$(use_enable aalib aa)		\
-		$(use_enable directfb)		\
-		$(use_enable dvb)		\
-		$(use_enable fbcon fbdev)		\
-		$(use_enable ggi)		\
-		$(use_enable libcaca caca) 	\
-		$(use_enable opengl gl) 	\
-		$(use_enable sdl) 		\
-		$(use_enable tga) 		\
-		$(use_enable alsa) 		\
-		$(use_enable arts) 		\
-		$(use_enable esd) 		\
-		$(use_enable mad) 		\
-		$(use_enable nas) 		\
-		$(use_enable oss ossaudio) 	\
-		$(use_enable altivec) 		\
-		$(use_enable debug) 		\
-		$(use_enable nls i18n) 		\
-		|| die
-
-		# when gif is autodetected, GIF_LIB is set correctly.  We're explicitly controlling it, and it doesn't behave correctly.
-		# so... we have to help it along.
-		if use gif; then
-			sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak || die "failed to apply GIF_LIB fix"
-		fi
-
-	make all || die "Failed to build MPlayer!"
-
-	# We build the shared libpostproc.so here so that our
-	# mplayer binary is not linked to it, ensuring that we
-	# do not run into issues ... (bug #14479)
-	cd "${S}/libavcodec/libpostproc"
-	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
-}
-
-src_install() {
-	make prefix=${D}/usr \
-	     BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/lib \
-	     CONFDIR=${D}/usr/share/mplayer \
-	     DATADIR=${D}/usr/share/mplayer \
-	     MANDIR=${D}/usr/share/man \
-	     install || die "Failed to install MPlayer!"
-
-	dodoc AUTHORS ChangeLog README
-
-	# Install the documentation; DOCS is all mixed up not just html
-	cp -r "${S}/DOCS" "${D}/usr/share/doc/${PF}/" || die
-	cp -r "${S}/TOOLS" "${D}/usr/share/doc/${PF}/" || die
-
-	find "${D}/usr/share/doc/${PF}" -type d | xargs -- chmod 0755
-	# and yes, we are nuking the +x bit.
-	find "${D}/usr/share/doc/${PF}" -type f | xargs -- chmod 0644
-
-
-	# Install the default Skin and Gnome menu entry
-	if use gtk; then
-		dodir /usr/share/mplayer/Skin
-		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym mplayer /usr/bin/gmplayer
-	fi
-
-	if use gnome; then
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	fi
-
-	dodir /usr/share/mplayer/fonts
-	local x=
-	# Do this generic, as the mplayer people like to change the structure
-	# of their zips ...
-	#this is ugly, fix it at some point.
-	for x in $(find ${WORKDIR}/ -type d -name 'font-arial-??-iso-*')
-	do
-		cp -Rd "${x}" "${D}/usr/share/mplayer/fonts"
-	done
-	# Fix the font symlink ...
-	rm -rf ${D}/usr/share/mplayer/font
-	dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-
-	insinto /etc
-	newins ${S}/etc/example.conf mplayer.conf
-	dosed   's/include =/#include =/' /etc/mplayer.conf || die "failed to dosed mplayer.conf"
-	dosed 	's/fs=yes/fs=no/' /etc/mplayer.conf || die "failed to fix the default mplayer.conf"
-
-	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	insinto /usr/share/mplayer
-	doins "${S}/etc/codecs.conf" "${S}/etc/input.conf" "${S}/etc/menu.conf"
-}
-
-pkg_preinst() {
-	if [ -d "${ROOT}/usr/share/mplayer/Skin/default" ]; then
-		rm -rf ${ROOT}/usr/share/mplayer/Skin/default
-	fi
-}
-
-pkg_postinst() {
-	if use ppc; then
-		echo
-		einfo "When you see only GREEN salad on your G4 while playing"
-		einfo "a DivX, you should recompile _without_ altivec enabled."
-		einfo "Further information: http://bugs.gentoo.org/show_bug.cgi?id=18511"
-		echo
-		einfo "If everything functions fine with watching DivX and"
-		einfo "altivec enabled, please drop a comment on the mentioned bug!"
-		echo
-		einfo "libpostproc is no longer installed by mplayer. If you have an"
-		einfo "application that depends on it, install >=ffmpeg-0.4.8.20040222"
-	fi
-
-	if use matrox; then
-		depmod -a &>/dev/null || true
-	fi
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a ! -e ${ROOT}/usr/share/mplayer/font ]; then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]; then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}
-
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild
deleted file mode 100644
index 80bcce925cfa..000000000000
--- a/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild
+++ /dev/null
@@ -1,464 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild,v 1.24 2005/01/05 23:24:19 chriswhite Exp $
-
-inherit eutils flag-o-matic kmod
-
-IUSE="3dfx 3dnow aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mythtv nas network nls oggvorbis opengl oss rtc samba sdl sse svga tga theora truetype v4l v4l2 X xinerama xmms xv xvid"
-
-BLUV=1.4
-SVGV=1.9.17
-
-# Handle PREversions as well
-MY_PV="${PV/_/}"
-S="${WORKDIR}/MPlayer-${MY_PV}"
-SRC_URI="mirror://mplayer/releases/MPlayer-${MY_PV}.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://gentoo/${P}-alsa-gui.patch.tar.bz2
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
-	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )"
-
-# Only install Skin if GUI should be build (gtk as USE flag)
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-# 'encode' in USE for MEncoder.
-RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
-	x86? (
-		divx4linux? (  >=media-libs/divx4linux-20030428 )
-		>=media-libs/win32codecs-0.60
-		)
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	bidi? ( dev-libs/fribidi )
-	cdparanoia? ( media-sound/cdparanoia )
-	directfb? ( dev-libs/DirectFB )
-	dvd? ( dvdread? ( media-libs/libdvdread ) )
-	encode? (
-		media-sound/lame
-		>=media-libs/libdv-0.9.5
-		)
-	esd? ( media-sound/esound )
-	gif? ( media-libs/giflib
-		media-libs/libungif )
-	ggi? ( media-libs/libggi )
-	gtk? (
-		media-libs/libpng
-		virtual/x11
-		=x11-libs/gtk+-1.2*
-		=dev-libs/glib-1.2*
-		)
-	jpeg? ( media-libs/jpeg )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	lzo? ( dev-libs/lzo )
-	mad? ( media-libs/libmad )
-	matroska? ( >=media-libs/libmatroska-0.6.0 )
-	mpeg? ( media-libs/faad2 )
-	nas? ( media-libs/nas )
-	nls? ( sys-devel/gettext )
-	oggvorbis? ( media-libs/libvorbis )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	samba? ( >=net-fs/samba-2.2.8a )
-	sdl? ( media-libs/libsdl )
-	svga? ( media-libs/svgalib )
-	!ia64? (
-		theora? ( media-libs/libtheora )
-		live? ( >=media-plugins/live-2004.03.27 )
-		)
-	truetype? ( >=media-libs/freetype-2.1 )
-	xinerama? ( virtual/x11 )
-	xmms? ( media-sound/xmms )
-	>=sys-apps/portage-2.0.36
-	sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	app-arch/unzip"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~ia64 ~hppa sparc"
-
-src_unpack() {
-
-	unpack MPlayer-${MY_PV}.tar.bz2 \
-		font-arial-iso-8859-1.tar.bz2 font-arial-iso-8859-2.tar.bz2
-
-	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
-
-	use gtk && unpack Blue-${BLUV}.tar.bz2
-
-	cd ${S}
-
-	if use !network; then
-		einfo "Please note, a new network USE flag was added for users"
-		einfo "with networkless installs.  If you use mplayer for streaming"
-		einfo "media, please enable the network USE flag or it will not work!"
-		einfo
-	fi
-
-	# Fix head/tail call for new coreutils
-	epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
-
-	#bug #49669, horrid syntax errors in help/help_mp-ro.h	
-	epatch ${FILESDIR}/mplayer-1.0_pre4-help_mp-ro.h.patch
-
-	#adds mythtv support to mplayer
-	use mythtv && epatch ${FILESDIR}/mplayer-mythtv.patch
-
-	# GCC 3.4 fixes
-	epatch ${FILESDIR}/mplayer-1.0_pre4-alsa-gcc34.patch
-
-	#Workaround for the altivec softscaler issues
-	epatch ${FILESDIR}/mplayer-1.0_pre5-yuv2rgb_fix.patch
-
-	#bug #55936, eradicator's cachefill patch.
-	epatch ${FILESDIR}/cachefill.patch
-
-	#bug #58082.  Fixes LANGUAGE variable issues
-	epatch ${FILESDIR}/mplayer-1.0_pre5-r1-conf_locale.patch
-
-	#fixes recent api changes to the latest live
-	use live && epatch ${FILESDIR}/${P}-live.patch
-
-	#mplayer gui uses oss all the time.
-	#this patch enables true alsa output in
-	#gmplayer.  Fixes Bug #58619.
-	use alsa && epatch ${DISTDIR}/${P}-alsa-gui.patch.tar.bz2
-
-	#Setup the matrox makefile
-	if use matrox; then
-		get_kernel_info
-		epatch ${FILESDIR}/${P}-mga-kernel-2.6.patch
-		sed -i -e \
-		"s:^#KERNEL_OUTPUT_PATH=: \
-		KERNEL_OUTPUT_PATH =${KV_OUTPUT}:" \
-		${S}/Makefile
-	fi # end of matrox related stuff
-
-	# Fix hppa compilation
-	[ "${ARCH}" = "hppa" ] && sed -i -e "s/-O4/-O1/" "${S}/configure"
-
-	if use svga
-	then
-		echo
-		einfo "Enabling vidix non-root mode."
-		einfo "(You need a proper svgalib_helper.o module for your kernel"
-		einfo " to actually use this)"
-		echo
-
-		mv ${WORKDIR}/svgalib_helper ${S}/libdha
-	fi
-
-	# Remove kernel-2.6 workaround as the problem it works around is
-	# fixed, and the workaround breaks sparc
-	use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
-}
-
-src_compile() {
-
-	filter-flags -fPIE -fPIC -falign-functions
-
-	local myconf=
-	################
-	#Optional features#
-	###############
-	myconf="${myconf} $(use_enable bidi fribidi)"
-	myconf="${myconf} $(use_enable cdparanoia)"
-	if use dvd; then
-		myconf="${myconf} $(use_enable dvdread) $(use_enable !dvdread mpdvdkit)"
-	else
-		myconf="${myconf} --disable-dvdread --disable-mpdvdkit"
-	fi
-	myconf="${myconf} $(use_enable edl)"
-	myconf="${myconf} $(use_enable encode mencoder)"
-	myconf="${myconf} $(use_enable gtk gui)"
-
-	if use !gtk && use !X && use !xv && use !xinerama; then
-		myconf="${myconf} --disable-gui --disable-x11 --disable-xv --disable-xmga --disable-xinerama --disable-vm --disable-xvmc"
-	else
-		#note we ain't touching --enable-vm.  That should be locked down in the future.
-		myconf="${myconf} --enable-x11 $(use_enable xinerama) $(use_enable xv) $(use_enable gtk gui)"
-	fi
-
-	# disable png *only* if gtk && png aren't on
-	if use png || use gtk; then
-		myconf="${myconf} --enable-png"
-	else
-		myconf="${myconf} --disable-png"
-	fi
-	myconf="${myconf} $(use_enable ipv6 inet6)"
-	myconf="${myconf} $(use_enable joystick)"
-	myconf="${myconf} $(use_enable lirc)"
-	if use ia64 || use !network; then
-		myconf="${myconf} --disable-live"
-	else
-		myconf="${myconf} $(use_enable live)"
-	fi
-	myconf="${myconf} $(use_enable network) $(use_enable network ftp)"
-	myconf="${myconf} $(use_enable rtc)"
-	myconf="${myconf} $(use_enable samba smb)"
-	myconf="${myconf} $(use_enable truetype freetype)"
-	myconf="${myconf} $(use_enable v4l tv-v4l)"
-	myconf="${myconf} $(use_enable v4l2 tv-v4l2)"
-
-	#########
-	# Codecs #
-	########
-	myconf="${myconf} $(use_enable divx4linux)"
-	myconf="${myconf} $(use_enable gif)"
-	myconf="${myconf} $(use_enable jpeg)"
-	myconf="${myconf} $(use_enable lzo liblzo)"
-	myconf="${myconf} $(use_enable matroska external-matroska) $(use_enable !matroska internal-matroska)"
-	myconf="${myconf} $(use_enable mpeg external-faad) $(use_enable !mpeg internal-faad)"
-	myconf="${myconf} $(use_enable oggvorbis vorbis)"
-	if use ia64; then
-		myconf="${myconf} --disable-theora"
-	else
-		myconf="${myconf} $(use_enable theora)"
-	fi
-	myconf="${myconf} $(use_enable xmms)"
-	myconf="${myconf} $(use_enable xvid)"
-
-	#############
-	# Video Output #
-	#############
-	myconf="${myconf} $(use_enable 3dfx)"
-	if use 3dfx; then
-		myconf="${myconf} --enable-tdfxvid"
-	else
-		myconf="${myconf} --disable-tdfxvid"
-	fi
-	if use fbcon && use 3dfx; then
-		myconf="${myconf} --enable-tdfxfb"
-	else
-		myconf="${myconf} --disable-tdfxfb"
-	fi
-	myconf="${myconf} $(use_enable aalib aa)"
-	myconf="${myconf} $(use_enable directfb)"
-	myconf="${myconf} $(use_enable dvb)"
-	myconf="${myconf} $(use_enable fbcon fbdev)"
-	myconf="${myconf} $(use_enable ggi)"
-	myconf="${myconf} $(use_enable libcaca caca)"
-	if use matrox && use X; then
-		myconf="${myconf} $(use_enable matrox xmga)"
-	fi
-	myconf="${myconf} $(use_enable opengl gl)"
-	myconf="${myconf} $(use_enable sdl)"
-	myconf="${myconf} $(use_enable svga)"
-	myconf="${myconf} $(use_enable tga)"
-
-	#############
-	# Audio Output #
-	#############
-	myconf="${myconf} $(use_enable alsa)"
-	myconf="${myconf} $(use_enable arts)"
-	myconf="${myconf} $(use_enable esd)"
-	myconf="${myconf} $(use_enable mad)"
-	myconf="${myconf} $(use_enable nas)"
-	myconf="${myconf} $(use_enable oss ossaudio)"
-
-	#################
-	# Advanced Options #
-	#################
-	if ! use 3dnow; then
-		myconf="${myconf} --disable-3dnow --disable-3dnowex";
-	fi
-	if ! use sse; then
-		myconf="${myconf} --disable-sse --disable-sse2";
-	fi
-	if use !mmx && use !3dnow && use !sse; then
-		myconf="${myconf} --disable-mmx --disable-mmx2"
-	fi
-	myconf="${myconf} $(use_enable 3dnow) $(use_enable 3dnow 3dnowex)"
-	myconf="${myconf} $(use_enable altivec)"
-	myconf="${myconf} $(use_enable debug)"
-	myconf="${myconf} $(use_enable nls i18n)"
-
-	if [ -d /opt/RealPlayer9/Real/Codecs ]
-	then
-		einfo "Setting REALLIBDIR to /opt/RealPlayer9/Real/Codecs..."
-		REALLIBDIR="/opt/RealPlayer9/Real/Codecs"
-	elif [ -d /opt/RealPlayer8/Codecs ]
-	then
-		einfo "Setting REALLIBDIR to /opt/RealPlayer8/Codecs..."
-		REALLIBDIR="/opt/RealPlayer8/Codecs"
-	else
-		REALLIBDIR="/usr/lib/real"
-	fi
-
-	if [ -e /dev/.devfsd ]
-	then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	# Build the matrox driver before mplayer configuration.
-	# That way the configure script sees it and builds the support
-	#build the matrox driver before the 
-	if use matrox ; then
-		if use x86 ; then
-			check_KV
-			cd ${S}/drivers
-			# bad hack, will be fixed later
-			addwrite /usr/src/linux/
-			unset ARCH
-			make all || die "Matrox build failed!  Your kernel may need to have `make mrproper` run on it before trying to use matrox support in this ebuild again."
-			cd ${S}
-		else
-			einfo "Not building matrox driver.  It doesn't seem to like other archs.  Please let me know at chriswhite@gentoo.org if you find out otherwise."
-		fi
-	fi
-
-	# leave this in place till the configure/compilation borkage is completely corrected back to pre4-r4 levels.
-	# it's intended for debugging so we can get the options we configure mplayer w/, rather then hunt about.
-	# it *will* be removed asap; in the meantime, doesn't hurt anything.
-	echo "${myconf}" > ${T}/configure-options
-
-	./configure --prefix=/usr \
-		--confdir=/usr/share/mplayer \
-		--datadir=/usr/share/mplayer \
-		--disable-runtime-cpudetection \
-		--enable-largefiles \
-		--enable-menu \
-		--enable-real \
-		--with-reallibdir=${REALLIBDIR} \
-		--with-x11incdir=/usr/X11R6/include \
-		${myconf} || die
-
-	# when gif is autodetected, GIF_LIB is set correctly.  We're explicitly controlling it, and it doesn't behave correctly.
-	# so... we have to help it along.
-	if use gif; then
-		sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak
-	fi
-
-	einfo "Make"
-	make all || die "Failed to build MPlayer!"
-	einfo "Make completed"
-
-	# We build the shared libpostproc.so here so that our
-	# mplayer binary is not linked to it, ensuring that we
-	# do not run into issues ... (bug #14479)
-	cd ${S}/libavcodec/libpostproc
-	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
-}
-
-src_install() {
-
-	einfo "Make install"
-	make prefix=${D}/usr \
-	     BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/lib \
-	     CONFDIR=${D}/usr/share/mplayer \
-	     DATADIR=${D}/usr/share/mplayer \
-	     MANDIR=${D}/usr/share/man \
-	     install || die "Failed to install MPlayer!"
-	einfo "Make install completed"
-
-	if use matrox; then
-		cd ${S}/drivers
-		insinto /lib/modules/${KV}/kernel/drivers/char
-		doins mga_vid.${KV_OBJ}
-	fi
-
-	dodoc AUTHORS ChangeLog README
-	# Install the documentation; DOCS is all mixed up not just html
-	find "${S}/DOCS" -type d | xargs -- chmod 0755
-	find "${S}/DOCS" -type f | xargs -- chmod 0644
-	cp -r "${S}/DOCS" "${D}/usr/share/doc/${PF}/" || die
-
-	# Copy misc tools to documentation path, as they're not installed directly
-	# and yes, we are nuking the +x bit.
-	find "${S}/TOOLS" -type d | xargs -- chmod 0755
-	find "${S}/TOOLS" -type f | xargs -- chmod 0644
-	cp -r "${S}/TOOLS" "${D}/usr/share/doc/${PF}/" || die
-
-	# Install the default Skin and Gnome menu entry
-	if use gtk; then
-		dodir /usr/share/mplayer/Skin
-		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym mplayer /usr/bin/gmplayer
-	fi
-
-	if use gnome; then
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	fi
-
-	dodir /usr/share/mplayer/fonts
-	local x=
-	# Do this generic, as the mplayer people like to change the structure
-	# of their zips ...
-	for x in $(find ${WORKDIR}/ -type d -name 'font-arial-??-iso-*')
-	do
-		cp -Rd ${x} ${D}/usr/share/mplayer/fonts
-	done
-	# Fix the font symlink ...
-	rm -rf ${D}/usr/share/mplayer/font
-	dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-
-	insinto /etc
-	newins ${S}/etc/example.conf mplayer.conf
-	dosed -e 's/include =/#include =/' /etc/mplayer.conf
-	dosed -e 's/fs=yes/fs=no/' /etc/mplayer.conf
-	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-	doins ${S}/etc/input.conf
-	doins ${S}/etc/menu.conf
-}
-
-pkg_preinst() {
-
-	if [ -d "${ROOT}/usr/share/mplayer/Skin/default" ]
-	then
-		rm -rf ${ROOT}/usr/share/mplayer/Skin/default
-	fi
-}
-
-pkg_postinst() {
-
-	if use ppc
-	then
-		echo
-		einfo "When you see only GREEN salad on your G4 while playing"
-		einfo "a DivX, you should recompile _without_ altivec enabled."
-		einfo "Further information: http://bugs.gentoo.org/show_bug.cgi?id=18511"
-		echo
-		einfo "If everything functions fine with watching DivX and"
-		einfo "altivec enabled, please drop a comment on the mentioned bug!"
-		echo
-		einfo "libpostproc is no longer installed by mplayer. If you have an"
-		einfo "application that depends on it, install >=ffmpeg-0.4.8.20040222"
-	fi
-
-	if use matrox; then
-		depmod -a &>/dev/null || :
-	fi
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a \
-	     ! -e ${ROOT}/usr/share/mplayer/font ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
-	     ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}
-
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild
deleted file mode 100644
index 19c01c8e4a8a..000000000000
--- a/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild
+++ /dev/null
@@ -1,492 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild,v 1.19 2005/03/18 21:23:54 chriswhite Exp $
-
-inherit eutils flag-o-matic kmod
-
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas network nls nvidia oggvorbis opengl oss png rtc samba sdl sse svga tga theora truetype v4l v4l2 X xinerama xmms xv xvid xvmc"
-
-BLUV=1.4
-SVGV=1.9.17
-
-# Handle PREversions as well
-MY_PV="${PV/_/}"
-S="${WORKDIR}/MPlayer-${MY_PV}"
-SRC_URI="mirror://mplayer/releases/MPlayer-${MY_PV}.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://gentoo/${P}-alsa-gui.patch.tar.bz2
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
-	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )"
-
-# Only install Skin if GUI should be build (gtk as USE flag)
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-# 'encode' in USE for MEncoder.
-RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
-	x86? (
-		divx4linux? (  >=media-libs/divx4linux-20030428 )
-		>=media-libs/win32codecs-0.60
-		)
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	bidi? ( dev-libs/fribidi )
-	cdparanoia? ( media-sound/cdparanoia )
-	directfb? ( dev-libs/DirectFB )
-	dvd? ( dvdread? ( media-libs/libdvdread ) )
-	encode? (
-		media-sound/lame
-		>=media-libs/libdv-0.9.5
-		)
-	esd? ( media-sound/esound )
-	gif? ( media-libs/giflib
-		media-libs/libungif )
-	ggi? ( media-libs/libggi )
-	gtk? (
-		media-libs/libpng
-		virtual/x11
-		=x11-libs/gtk+-1.2*
-		=dev-libs/glib-1.2*
-		)
-	jpeg? ( media-libs/jpeg )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	lzo? ( dev-libs/lzo )
-	mad? ( media-libs/libmad )
-	matroska? ( >=media-libs/libmatroska-0.7.0 )
-	mpeg? ( media-libs/faad2 )
-	nas? ( media-libs/nas )
-	nls? ( sys-devel/gettext )
-	oggvorbis? ( media-libs/libvorbis )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	samba? ( >=net-fs/samba-2.2.8a )
-	sdl? ( media-libs/libsdl )
-	svga? ( media-libs/svgalib )
-	!ia64? (
-		theora? ( media-libs/libtheora )
-		live? ( >=media-plugins/live-2004.07.20 )
-		)
-	truetype? ( >=media-libs/freetype-2.1 )
-	xinerama? ( virtual/x11 )
-	!mips? ( !hppa? ( jack? ( >=media-libs/bio2jack-0.3-r1 ) ) )
-	xmms? ( media-sound/xmms )
-	>=sys-apps/portage-2.0.36
-	sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	app-arch/unzip"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~ia64 ~hppa ~sparc ~mips"
-
-src_unpack() {
-
-	unpack MPlayer-${MY_PV}.tar.bz2 \
-		font-arial-iso-8859-1.tar.bz2 font-arial-iso-8859-2.tar.bz2
-
-	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
-
-	use gtk && unpack Blue-${BLUV}.tar.bz2
-
-	cd ${S}
-
-	if use !network; then
-		einfo "Please note, a new network USE flag was added for users"
-		einfo "with networkless installs.  If you use mplayer for streaming"
-		einfo "media, please enable the network USE flag or it will not work!"
-		einfo
-	fi
-
-	# Fix head/tail call for new coreutils
-	epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
-
-	#bug #49669, horrid syntax errors in help/help_mp-ro.h	
-	epatch ${FILESDIR}/mplayer-1.0_pre4-help_mp-ro.h.patch
-
-	#adds mythtv support to mplayer
-	use mythtv && epatch ${FILESDIR}/mplayer-mythtv.patch
-
-	# GCC 3.4 fixes
-	epatch ${FILESDIR}/mplayer-1.0_pre4-alsa-gcc34.patch
-
-	#Fix for the altivec softscaler issues
-	epatch ${FILESDIR}/mplayer-1.0_pre5-yuv2rgb_fix.patch
-
-	#bug #55936, eradicator's cachefill patch.
-	epatch ${FILESDIR}/cachefill.patch
-
-	#bug #58082.  Fixes LANGUAGE variable issues
-	epatch ${FILESDIR}/mplayer-1.0_pre5-r1-conf_locale.patch
-
-	#fixes recent api changes to the latest live
-	use live && epatch ${FILESDIR}/${P}-live.patch
-
-	#mplayer gui uses oss all the time.
-	#this patch enables true alsa output in
-	#gmplayer.  Fixes Bug #58619.
-	use alsa && epatch ${DISTDIR}/${P}-alsa-gui.patch.tar.bz2
-
-	#fix the configure script not recognizing mips64 systems
-	#fixes bug #61466
-	epatch ${FILESDIR}/${P}-mips64.patch
-
-	#Setup the matrox makefile
-	if use matrox; then
-		get_kernel_info
-		epatch ${FILESDIR}/${P}-mga-kernel-2.6.patch
-		sed -i -e \
-		"s:^#KERNEL_OUTPUT_PATH=: \
-		KERNEL_OUTPUT_PATH =${KV_OUTPUT}:" \
-		${S}/Makefile
-	fi # end of matrox related stuff
-
-	# Fix hppa compilation
-	[ "${ARCH}" = "hppa" ] && sed -i -e "s/-O4/-O1/" "${S}/configure"
-
-	if use svga
-	then
-		echo
-		einfo "Enabling vidix non-root mode."
-		einfo "(You need a proper svgalib_helper.o module for your kernel"
-		einfo " to actually use this)"
-		echo
-
-		mv ${WORKDIR}/svgalib_helper ${S}/libdha
-	fi
-
-	# Remove kernel-2.6 workaround as the problem it works around is
-	# fixed, and the workaround breaks sparc
-	use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
-
-	# Doesn't break if bio2jack is in
-	epatch ${FILESDIR}/${P}-bio2jack.patch
-
-	epatch ${FILESDIR}/${P}-gcc_detection.patch
-}
-
-src_compile() {
-
-	filter-flags -fPIE -fPIC
-
-	strip-flags
-
-	use mips && replace-flags -O? -O1
-
-	local myconf=
-	################
-	#Optional features#
-	###############
-	myconf="${myconf} $(use_enable bidi fribidi)"
-	myconf="${myconf} $(use_enable cdparanoia)"
-	if use dvd; then
-		myconf="${myconf} $(use_enable dvdread) $(use_enable !dvdread mpdvdkit)"
-	else
-		myconf="${myconf} --disable-dvdread --disable-mpdvdkit"
-	fi
-	myconf="${myconf} $(use_enable edl)"
-	myconf="${myconf} $(use_enable encode mencoder)"
-	myconf="${myconf} $(use_enable gtk gui)"
-
-	if use !gtk && use !X && use !xv && use !xinerama; then
-		myconf="${myconf} --disable-gui --disable-x11 --disable-xv --disable-xmga --disable-xinerama --disable-vm --disable-xvmc"
-	else
-		#note we ain't touching --enable-vm.  That should be locked down in the future.
-		myconf="${myconf} --enable-x11 $(use_enable xinerama) $(use_enable xv) $(use_enable gtk gui)"
-	fi
-
-	# disable png *only* if gtk && png aren't on
-	if use png || use gtk; then
-		myconf="${myconf} --enable-png"
-	else
-		myconf="${myconf} --disable-png"
-	fi
-	myconf="${myconf} $(use_enable ipv6 inet6)"
-	myconf="${myconf} $(use_enable joystick)"
-	myconf="${myconf} $(use_enable lirc)"
-	if use ia64 || use !network; then
-		myconf="${myconf} --disable-live"
-	else
-		myconf="${myconf} $(use_enable live)"
-	fi
-	myconf="${myconf} $(use_enable network) $(use_enable network ftp)"
-	myconf="${myconf} $(use_enable rtc)"
-	myconf="${myconf} $(use_enable samba smb)"
-	myconf="${myconf} $(use_enable truetype freetype)"
-	myconf="${myconf} $(use_enable v4l tv-v4l)"
-	myconf="${myconf} $(use_enable v4l2 tv-v4l2)"
-	myconf="${myconf} $(use_enable jack)"
-
-	#########
-	# Codecs #
-	########
-	myconf="${myconf} $(use_enable divx4linux)"
-	myconf="${myconf} $(use_enable gif)"
-	myconf="${myconf} $(use_enable jpeg)"
-	myconf="${myconf} $(use_enable lzo liblzo)"
-	myconf="${myconf} $(use_enable matroska external-matroska) $(use_enable !matroska internal-matroska)"
-	myconf="${myconf} $(use_enable mpeg external-faad) $(use_enable !mpeg internal-faad)"
-	myconf="${myconf} $(use_enable oggvorbis vorbis)"
-	if use ia64; then
-		myconf="${myconf} --disable-theora"
-	else
-		myconf="${myconf} $(use_enable theora)"
-	fi
-	myconf="${myconf} $(use_enable xmms)"
-	myconf="${myconf} $(use_enable xvid)"
-
-	#############
-	# Video Output #
-	#############
-	myconf="${myconf} $(use_enable 3dfx)"
-	if use 3dfx; then
-		myconf="${myconf} --enable-tdfxvid"
-	else
-		myconf="${myconf} --disable-tdfxvid"
-	fi
-	if use fbcon && use 3dfx; then
-		myconf="${myconf} --enable-tdfxfb"
-	else
-		myconf="${myconf} --disable-tdfxfb"
-	fi
-	myconf="${myconf} $(use_enable aalib aa)"
-	myconf="${myconf} $(use_enable directfb)"
-	myconf="${myconf} $(use_enable dvb)"
-	myconf="${myconf} $(use_enable fbcon fbdev)"
-	myconf="${myconf} $(use_enable ggi)"
-	myconf="${myconf} $(use_enable libcaca caca)"
-	if use matrox && use X; then
-		myconf="${myconf} $(use_enable matrox xmga)"
-	fi
-	myconf="${myconf} $(use_enable opengl gl)"
-	myconf="${myconf} $(use_enable sdl)"
-	myconf="${myconf} $(use_enable svga)"
-	myconf="${myconf} $(use_enable tga)"
-
-	( use xvmc && use nvidia ) \
-		&& myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCNVIDIA"
-
-	( use xvmc && use i8x0 ) \
-		&& myconf="${myconf} --enable-xvmc --with-xvmclib=I810XvMC"
-
-	( use xvmc && use nvidia && use i8x0 ) \
-		&& {
-			eerror "Invalid combination of USE flags"
-			eerror "When building support for xvmc, you may only"
-			eerror "include support for one video card:"
-			eerror "   nvidia, i8x0"
-			eerror ""
-			eerror "Emerge again with different USE flags"
-
-			exit 1
-		}
-
-	( use xvmc && ! use nvidia && ! use i8x0 ) && {
-		ewarn "You tried to build with xvmc support."
-		ewarn "No supported graphics hardware was specified."
-		ewarn ""
-		ewarn "No xvmc support will be included."
-		ewarn "Please one appropriate USE flag and re-emerge:"
-		ewarn "   nvidia or i8x0"
-
-		myconf="${myconf} --disable-xvmc"
-	}
-
-	#############
-	# Audio Output #
-	#############
-	myconf="${myconf} $(use_enable alsa)"
-	myconf="${myconf} $(use_enable arts)"
-	myconf="${myconf} $(use_enable esd)"
-	myconf="${myconf} $(use_enable mad)"
-	myconf="${myconf} $(use_enable nas)"
-	myconf="${myconf} $(use_enable oss ossaudio)"
-
-	#################
-	# Advanced Options #
-	#################
-	myconf="${myconf} $(use_enable 3dnow)"
-	myconf="${myconf} $(use_enable 3dnowex)";
-	myconf="${myconf} $(use_enable sse)"
-	myconf="${myconf} $(use_enable mmx)"
-	myconf="${myconf} $(use_enable mmxext mmx2)"
-	myconf="${myconf} $(use_enable 3dnow)"
-	myconf="${myconf} $(use_enable altivec)"
-	myconf="${myconf} $(use_enable debug)"
-	myconf="${myconf} $(use_enable nls i18n)"
-
-	if [ -d /opt/RealPlayer9/Real/Codecs ]
-	then
-		einfo "Setting REALLIBDIR to /opt/RealPlayer9/Real/Codecs..."
-		REALLIBDIR="/opt/RealPlayer9/Real/Codecs"
-	elif [ -d /opt/RealPlayer8/Codecs ]
-	then
-		einfo "Setting REALLIBDIR to /opt/RealPlayer8/Codecs..."
-		REALLIBDIR="/opt/RealPlayer8/Codecs"
-	else
-		REALLIBDIR="/usr/$(get_libdir)/real"
-	fi
-
-	if [ -e /dev/.devfsd ]
-	then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	# Build the matrox driver before mplayer configuration.
-	# That way the configure script sees it and builds the support
-	#build the matrox driver before the 
-	if use matrox ; then
-		if use x86 ; then
-			check_KV
-			cd ${S}/drivers
-			# bad hack, will be fixed later
-			addwrite /usr/src/linux/
-			unset ARCH
-			make all || die "Matrox build failed!  Your kernel may need to have `make mrproper` run on it before trying to use matrox support in this ebuild again."
-			cd ${S}
-		else
-			einfo "Not building matrox driver.  It doesn't seem to like other archs.  Please let me know at chriswhite@gentoo.org if you find out otherwise."
-		fi
-	fi
-
-	# leave this in place till the configure/compilation borkage is completely corrected back to pre4-r4 levels.
-	# it's intended for debugging so we can get the options we configure mplayer w/, rather then hunt about.
-	# it *will* be removed asap; in the meantime, doesn't hurt anything.
-	echo "${myconf}" > ${T}/configure-options
-
-	./configure --prefix=/usr \
-		--confdir=/usr/share/mplayer \
-		--datadir=/usr/share/mplayer \
-		--disable-runtime-cpudetection \
-		--enable-largefiles \
-		--enable-menu \
-		--enable-real \
-		--with-reallibdir=${REALLIBDIR} \
-		--with-x11incdir=/usr/X11R6/include \
-		${myconf} || die
-
-	# when gif is autodetected, GIF_LIB is set correctly.  We're explicitly controlling it, and it doesn't behave correctly.
-	# so... we have to help it along.
-	if use gif; then
-		sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak
-	fi
-
-	einfo "Make"
-	make all || die "Failed to build MPlayer!"
-	einfo "Make completed"
-
-	# We build the shared libpostproc.so here so that our
-	# mplayer binary is not linked to it, ensuring that we
-	# do not run into issues ... (bug #14479)
-	cd ${S}/libavcodec/libpostproc
-	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
-}
-
-src_install() {
-
-	einfo "Make install"
-	make prefix=${D}/usr \
-	     BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/$(get_libdir) \
-	     CONFDIR=${D}/usr/share/mplayer \
-	     DATADIR=${D}/usr/share/mplayer \
-	     MANDIR=${D}/usr/share/man \
-	     install || die "Failed to install MPlayer!"
-	einfo "Make install completed"
-
-	if use matrox; then
-		cd ${S}/drivers
-		insinto /$(get_libdir)/modules/${KV}/kernel/drivers/char
-		doins mga_vid.${KV_OBJ}
-	fi
-
-	dodoc AUTHORS ChangeLog README
-	# Install the documentation; DOCS is all mixed up not just html
-	if use doc ; then
-		find "${S}/DOCS" -type d | xargs -- chmod 0755
-		find "${S}/DOCS" -type f | xargs -- chmod 0644
-		cp -r "${S}/DOCS" "${D}/usr/share/doc/${PF}/" || die
-	fi
-
-	# Copy misc tools to documentation path, as they're not installed directly
-	# and yes, we are nuking the +x bit.
-	find "${S}/TOOLS" -type d | xargs -- chmod 0755
-	find "${S}/TOOLS" -type f | xargs -- chmod 0644
-	cp -r "${S}/TOOLS" "${D}/usr/share/doc/${PF}/" || die
-
-	# Install the default Skin and Gnome menu entry
-	if use gtk; then
-		dodir /usr/share/mplayer/Skin
-		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym mplayer /usr/bin/gmplayer
-	fi
-
-	if use gnome; then
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	fi
-
-	dodir /usr/share/mplayer/fonts
-	local x=
-	# Do this generic, as the mplayer people like to change the structure
-	# of their zips ...
-	for x in $(find ${WORKDIR}/ -type d -name 'font-arial-??-iso-*')
-	do
-		cp -Rd ${x} ${D}/usr/share/mplayer/fonts
-	done
-	# Fix the font symlink ...
-	rm -rf ${D}/usr/share/mplayer/font
-	dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-
-	insinto /etc
-	newins ${S}/etc/example.conf mplayer.conf
-	dosed -e 's/include =/#include =/' /etc/mplayer.conf
-	dosed -e 's/fs=yes/fs=no/' /etc/mplayer.conf
-	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-	doins ${S}/etc/input.conf
-	doins ${S}/etc/menu.conf
-}
-
-pkg_preinst() {
-
-	if [ -d "${ROOT}/usr/share/mplayer/Skin/default" ]
-	then
-		rm -rf ${ROOT}/usr/share/mplayer/Skin/default
-	fi
-}
-
-pkg_postinst() {
-
-	if use matrox; then
-		depmod -a &>/dev/null || :
-	fi
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a \
-	     ! -e ${ROOT}/usr/share/mplayer/font ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
-	     ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}
-
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
deleted file mode 100644
index 4c70449131e8..000000000000
--- a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
+++ /dev/null
@@ -1,562 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild,v 1.30 2005/03/18 21:23:54 chriswhite Exp $
-
-inherit eutils flag-o-matic kernel-mod
-
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas network nls nvidia oggvorbis opengl oss png real rtc samba sdl sse svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
-
-BLUV=1.4
-SVGV=1.9.17
-
-# Handle PREversions as well
-MY_PV="${PV/_/}"
-S="${WORKDIR}/MPlayer-${MY_PV}"
-SRC_URI="mirror://mplayer/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-	mirror://gentoo/${P}-alsa-gui.patch.tar.bz2
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
-	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )"
-
-# Only install Skin if GUI should be build (gtk as USE flag)
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-# 'encode' in USE for MEncoder.
-RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
-	x86? (
-		divx4linux? (  >=media-libs/divx4linux-20030428 )
-		>=media-libs/win32codecs-20040916
-		)
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	bidi? ( dev-libs/fribidi )
-	cdparanoia? ( media-sound/cdparanoia )
-	directfb? ( dev-libs/DirectFB )
-	dvd? ( dvdread? ( media-libs/libdvdread ) )
-	encode? (
-		media-sound/lame
-		>=media-libs/libdv-0.9.5
-		)
-	esd? ( media-sound/esound )
-	gif? ( media-libs/giflib
-		media-libs/libungif )
-	ggi? ( media-libs/libggi )
-	gtk? (
-		media-libs/libpng
-		virtual/x11
-		=x11-libs/gtk+-1.2*
-		=dev-libs/glib-1.2*
-		)
-	jpeg? ( media-libs/jpeg )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	lzo? ( dev-libs/lzo )
-	mad? ( media-libs/libmad )
-	matroska? ( >=media-libs/libmatroska-0.7.0 )
-	mpeg? ( media-libs/faad2 )
-	nas? ( media-libs/nas )
-	nls? ( sys-devel/gettext )
-	oggvorbis? ( media-libs/libvorbis )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	samba? ( >=net-fs/samba-2.2.8a )
-	sdl? ( media-libs/libsdl )
-	svga? ( media-libs/svgalib )
-	!ia64? (
-		theora? ( media-libs/libtheora )
-		live? ( >=media-plugins/live-2004.07.20 )
-		)
-	truetype? ( >=media-libs/freetype-2.1 )
-	xinerama? ( virtual/x11 )
-	jack? ( >=media-libs/bio2jack-0.3-r1 )
-	xmms? ( media-sound/xmms )
-	xanim? ( >=media-video/xanim-2.80.1-r4 )
-	>=sys-apps/portage-2.0.36
-	sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	app-arch/unzip"
-
-SLOT="0"
-LICENSE="GPL-2"
-#KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~ia64 ~hppa ~sparc"
-#agriffis - uncomment this when ia64 is ready - Chris
-KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~hppa ~sparc ppc64"
-
-src_unpack() {
-
-	unpack MPlayer-${MY_PV}.tar.bz2 \
-		font-arial-iso-8859-1.tar.bz2 font-arial-iso-8859-2.tar.bz2 \
-		font-arial-cp1250.tar.bz2
-
-	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
-
-	use gtk && unpack Blue-${BLUV}.tar.bz2
-
-	cd ${S}
-
-	# Custom CFLAGS
-	epatch ${FILESDIR}/${P}-configure.patch
-	sed -e 's:CFLAGS="custom":CFLAGS=${CFLAGS}:' -i configure
-
-	if use !network; then
-		einfo "Please note, a new network USE flag was added for users"
-		einfo "with networkless installs.  If you use mplayer for streaming"
-		einfo "media, please enable the network USE flag or it will not work!"
-		einfo
-	fi
-
-	# Fix head/tail call for new coreutils
-	epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
-
-	#bug #49669, horrid syntax errors in help/help_mp-ro.h	
-	epatch ${FILESDIR}/mplayer-1.0_pre4-help_mp-ro.h.patch
-
-	#adds mythtv support to mplayer
-	use mythtv && epatch ${FILESDIR}/mplayer-mythtv.patch
-
-	# GCC 3.4 fixes
-	epatch ${FILESDIR}/mplayer-1.0_pre4-alsa-gcc34.patch
-
-	#Workaround for the altivec softscaler issues
-	epatch ${FILESDIR}/mplayer-1.0_pre5-yuv2rgb_fix.patch
-
-	#bug #55936, eradicator's cachefill patch.
-	epatch ${FILESDIR}/cachefill.patch
-
-	#bug #58082.  Fixes LANGUAGE variable issues
-	epatch ${FILESDIR}/mplayer-1.0_pre5-r1-conf_locale.patch
-
-	#fixes recent api changes to the latest live
-	use live && epatch ${FILESDIR}/${P}-live.patch
-
-	#mplayer gui uses oss all the time.
-	#this patch enables true alsa output in
-	#gmplayer.  Fixes Bug #58619.
-	use alsa && epatch ${DISTDIR}/${P}-alsa-gui.patch.tar.bz2
-
-	# Fix hppa compilation
-	[ "${ARCH}" = "hppa" ] && sed -i -e "s/-O4/-O1/" "${S}/configure"
-
-	if use svga
-	then
-		echo
-		einfo "Enabling vidix non-root mode."
-		einfo "(You need a proper svgalib_helper.o module for your kernel"
-		einfo " to actually use this)"
-		echo
-
-		mv ${WORKDIR}/svgalib_helper ${S}/libdha
-	fi
-
-	# Remove kernel-2.6 workaround as the problem it works around is
-	# fixed, and the workaround breaks sparc
-	use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
-	# Doesn't break if bio2jack is in
-	epatch ${FILESDIR}/${P}-bio2jack.patch
-
-	use ppc64 && epatch ${FILESDIR}/${P}-r4-ppc64.patch
-}
-
-linguas_warn() {
-	ewarn "Language ${LANG[0]} or ${LANG_CC} not avaliable"
-	ewarn "Language set to English"
-	ewarn "If this is a mistake, please set the"
-	ewarn "First LINGUAS language to one of the following"
-	ewarn ""
-	ewarn "bg - Bulgarian"
-	ewarn "cz - Czech"
-	ewarn "de - German"
-	ewarn "dk - Danish"
-	ewarn "el - Greek"
-	ewarn "en - English"
-	ewarn "es - Spanish"
-	ewarn "fr - French"
-	ewarn "hu - Hungarian"
-	ewarn "ja - Japanese"
-	ewarn "ko - Korean"
-	ewarn "mk - FYRO Macedonian"
-	ewarn "nl - Dutch"
-	ewarn "no - Norwegian"
-	ewarn "pl - Polish"
-	ewarn "pt_BR - Portuguese - Brazil"
-	ewarn "ro - Romanian"
-	ewarn "ru - Russian"
-	ewarn "sk - Slovak"
-	ewarn "tr - Turkish"
-	ewarn "uk - Ukranian"
-	ewarn "zh_CN - Chinese - China"
-	ewarn "zh_TW - Chinese - Taiwan"
-	export LINGUAS="en ${LINGUAS}"
-}
-
-src_compile() {
-
-	# have fun with LINGUAS variable
-	if [[ -n $LINGUAS ]]
-	then
-		# LINGUAS has stuff in it, start the logic
-		LANG=( $LINGUAS )
-		if [ -e ${S}/help/help_mp-${LANG[0]}.h ]
-		then
-			einfo "Setting MPlayer messages to language: ${LANG[0]}"
-		else
-			LANG_CC=${LANG[0]}
-			if [ ${#LANG_CC} -ge 2 ]
-			then
-				LANG_CC=${LANG_CC:0:2}
-				if [ -e ${S}/help/help_mp-${LANG_CC}.h ]
-				then
-					einfo "Setting MPlayer messages to language ${LANG_CC}"
-					export LINGUAS="${LANG_CC} ${LINGUAS}"
-				else
-					linguas_warn
-				fi
-			else
-				linguas_warn
-			fi
-		fi
-	else
-		# sending blank LINGUAS, make it default to en
-		einfo "No LINGUAS given, defaulting to English"
-		export LINGUAS="en ${LINGUAS}"
-	fi
-
-	# let's play the filtration game!  MPlayer hates on all!
-	filter-flags -fPIE -fPIC -fstack-protector -fforce-addr -momit-leaf-frame-pointer -msse2 -falign-functions
-
-	# ugly optimizations cause MPlayer to cry on x86 systems!
-	if use x86 ; then
-		replace-flags -O0 -O2
-		replace-flags -O3 -O2
-	fi
-
-	local myconf=
-	################
-	#Optional features#
-	###############
-	myconf="${myconf} $(use_enable bidi fribidi)"
-	myconf="${myconf} $(use_enable cdparanoia)"
-	if use dvd; then
-		myconf="${myconf} $(use_enable dvdread) $(use_enable !dvdread mpdvdkit)"
-	else
-		myconf="${myconf} --disable-dvdread --disable-mpdvdkit"
-	fi
-	myconf="${myconf} $(use_enable edl)"
-	myconf="${myconf} $(use_enable encode mencoder)"
-	myconf="${myconf} $(use_enable gtk gui)"
-
-	if use !gtk && use !X && use !xv && use !xinerama; then
-		myconf="${myconf} --disable-gui --disable-x11 --disable-xv --disable-xmga --disable-xinerama --disable-vm --disable-xvmc"
-	else
-		#note we ain't touching --enable-vm.  That should be locked down in the future.
-		myconf="${myconf} --enable-x11 $(use_enable xinerama) $(use_enable xv) $(use_enable gtk gui)"
-	fi
-
-	# disable png *only* if gtk && png aren't on
-	if use png || use gtk; then
-		myconf="${myconf} --enable-png"
-	else
-		myconf="${myconf} --disable-png"
-	fi
-	myconf="${myconf} $(use_enable ipv6 inet6)"
-	myconf="${myconf} $(use_enable joystick)"
-	myconf="${myconf} $(use_enable lirc)"
-	if use ia64 || use !network; then
-		myconf="${myconf} --disable-live"
-	else
-		myconf="${myconf} $(use_enable live)"
-	fi
-	myconf="${myconf} $(use_enable network) $(use_enable network ftp)"
-	myconf="${myconf} $(use_enable rtc)"
-	myconf="${myconf} $(use_enable samba smb)"
-	myconf="${myconf} $(use_enable truetype freetype)"
-	myconf="${myconf} $(use_enable v4l tv-v4l)"
-	myconf="${myconf} $(use_enable v4l2 tv-v4l2)"
-	myconf="${myconf} $(use_enable jack)"
-
-	#########
-	# Codecs #
-	########
-	myconf="${myconf} $(use_enable divx4linux)"
-	myconf="${myconf} $(use_enable gif)"
-	myconf="${myconf} $(use_enable jpeg)"
-	myconf="${myconf} $(use_enable lzo liblzo)"
-	myconf="${myconf} $(use_enable matroska external-matroska) $(use_enable !matroska internal-matroska)"
-	myconf="${myconf} $(use_enable mpeg external-faad) $(use_enable !mpeg internal-faad)"
-	myconf="${myconf} $(use_enable oggvorbis vorbis)"
-	if use ia64; then
-		myconf="${myconf} --disable-theora"
-	else
-		myconf="${myconf} $(use_enable theora)"
-	fi
-	myconf="${myconf} $(use_enable xmms)"
-	myconf="${myconf} $(use_enable xvid)"
-
-	#############
-	# Video Output #
-	#############
-	myconf="${myconf} $(use_enable 3dfx)"
-	if use 3dfx; then
-		myconf="${myconf} --enable-tdfxvid"
-	else
-		myconf="${myconf} --disable-tdfxvid"
-	fi
-	if use fbcon && use 3dfx; then
-		myconf="${myconf} --enable-tdfxfb"
-	else
-		myconf="${myconf} --disable-tdfxfb"
-	fi
-	myconf="${myconf} $(use_enable aalib aa)"
-	myconf="${myconf} $(use_enable directfb)"
-	myconf="${myconf} $(use_enable dvb)"
-	myconf="${myconf} $(use_enable fbcon fbdev)"
-	myconf="${myconf} $(use_enable ggi)"
-	myconf="${myconf} $(use_enable libcaca caca)"
-	if use matrox && use X; then
-		myconf="${myconf} $(use_enable matrox xmga)"
-	fi
-	myconf="${myconf} $(use_enable matrox mga)"
-	myconf="${myconf} $(use_enable opengl gl)"
-	myconf="${myconf} $(use_enable sdl)"
-
-	if use svga
-	then
-		myconf="${myconf} --enable-svga"
-	else
-		myconf="${myconf} --disable-svga --disable-vidix"
-	fi
-
-	myconf="${myconf} $(use_enable tga)"
-
-	( use xvmc && use nvidia ) \
-		&& myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCNVIDIA"
-
-	( use xvmc && use i8x0 ) \
-		&& myconf="${myconf} --enable-xvmc --with-xvmclib=I810XvMC"
-
-	( use xvmc && use nvidia && use i8x0 ) \
-		&& {
-			eerror "Invalid combination of USE flags"
-			eerror "When building support for xvmc, you may only"
-			eerror "include support for one video card:"
-			eerror "   nvidia, i8x0"
-			eerror ""
-			eerror "Emerge again with different USE flags"
-
-			exit 1
-		}
-
-	( use xvmc && ! use nvidia && ! use i8x0 ) && {
-		ewarn "You tried to build with xvmc support."
-		ewarn "No supported graphics hardware was specified."
-		ewarn ""
-		ewarn "No xvmc support will be included."
-		ewarn "Please one appropriate USE flag and re-emerge:"
-		ewarn "   nvidia or i8x0"
-
-		myconf="${myconf} --disable-xvmc"
-	}
-
-	#############
-	# Audio Output #
-	#############
-	myconf="${myconf} $(use_enable alsa)"
-	myconf="${myconf} $(use_enable arts)"
-	myconf="${myconf} $(use_enable esd)"
-	myconf="${myconf} $(use_enable mad)"
-	myconf="${myconf} $(use_enable nas)"
-	myconf="${myconf} $(use_enable oss ossaudio)"
-
-	#################
-	# Advanced Options #
-	#################
-	myconf="${myconf} $(use_enable 3dnow)"
-	myconf="${myconf} $(use_enable 3dnowex)";
-	myconf="${myconf} $(use_enable sse)"
-	myconf="${myconf} $(use_enable mmx)"
-	myconf="${myconf} $(use_enable mmxext mmx2)"
-	myconf="${myconf} $(use_enable 3dnow)"
-	myconf="${myconf} $(use_enable debug)"
-	myconf="${myconf} $(use_enable nls i18n)"
-
-	if use ppc64
-	then
-		myconf="${myconf} --disable-altivec"
-	else
-		myconf="${myconf} $(use_enable altivec)"
-	fi
-
-	if use real
-	then
-		if [ -d /usr/$(get_libdir)/real ]
-		then
-			REALLIBDIR="/usr/$(get_libdir)/real"
-		else
-			eerror "Real libs not found!  Install win32codecs"
-			eerror "And ensure that real USE flag is enabled!"
-			die "Real libs not found"
-		fi
-	fi
-
-	if use xanim
-	then
-		myconf="${myconf} --with-xanimlibdir=/usr/lib/xanim/mods"
-	fi
-
-	if [ -e /dev/.devfsd ]
-	then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	#leave this in place till the configure/compilation borkage is completely corrected back to pre4-r4 levels.
-	# it's intended for debugging so we can get the options we configure mplayer w/, rather then hunt about.
-	# it *will* be removed asap; in the meantime, doesn't hurt anything.
-	echo "${myconf}" > ${T}/configure-options
-
-	./configure \
-		--prefix=/usr \
-		--confdir=/usr/share/mplayer \
-		--datadir=/usr/share/mplayer \
-		--disable-runtime-cpudetection \
-		--enable-largefiles \
-		--enable-menu \
-		--enable-real \
-		--with-reallibdir=${REALLIBDIR} \
-		--with-x11incdir=/usr/X11R6/include \
-		${myconf} || die
-
-	# when gif is autodetected, GIF_LIB is set correctly.  We're explicitly controlling it, and it doesn't behave correctly.
-	# so... we have to help it along.
-	if use gif; then
-		sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak
-	fi
-
-	einfo "Make"
-	make all || die "Failed to build MPlayer!"
-	einfo "Make completed"
-
-	# We build the shared libpostproc.so here so that our
-	# mplayer binary is not linked to it, ensuring that we
-	# do not run into issues ... (bug #14479)
-	cd ${S}/libavcodec/libpostproc
-	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
-}
-
-src_install() {
-
-	einfo "Make install"
-	make prefix=${D}/usr \
-	     BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/$(get_libdir) \
-	     CONFDIR=${D}/usr/share/mplayer \
-	     DATADIR=${D}/usr/share/mplayer \
-	     MANDIR=${D}/usr/share/man \
-	     install || die "Failed to install MPlayer!"
-	einfo "Make install completed"
-
-	dodoc AUTHORS ChangeLog README
-	# Install the documentation; DOCS is all mixed up not just html
-	if use doc ; then
-		find "${S}/DOCS" -type d | xargs -- chmod 0755
-		find "${S}/DOCS" -type f | xargs -- chmod 0644
-		cp -r "${S}/DOCS" "${D}/usr/share/doc/${PF}/" || die
-	fi
-
-	# Copy misc tools to documentation path, as they're not installed directly
-	# and yes, we are nuking the +x bit.
-	find "${S}/TOOLS" -type d | xargs -- chmod 0755
-	find "${S}/TOOLS" -type f | xargs -- chmod 0644
-	cp -r "${S}/TOOLS" "${D}/usr/share/doc/${PF}/" || die
-
-	# Install the default Skin and Gnome menu entry
-	if use gtk; then
-		dodir /usr/share/mplayer/Skin
-		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym mplayer /usr/bin/gmplayer
-	fi
-
-	if use gnome; then
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	fi
-
-	dodir /usr/share/mplayer/fonts
-	local x=
-	# Do this generic, as the mplayer people like to change the structure
-	# of their zips ...
-	for x in $(find ${WORKDIR}/ -type d -name 'font-arial-*')
-	do
-		cp -Rd ${x} ${D}/usr/share/mplayer/fonts
-	done
-	# Fix the font symlink ...
-	rm -rf ${D}/usr/share/mplayer/font
-	dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-
-	insinto /etc
-	newins ${S}/etc/example.conf mplayer.conf
-	dosed -e 's/include =/#include =/' /etc/mplayer.conf
-	dosed -e 's/fs=yes/fs=no/' /etc/mplayer.conf
-	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	#mv the midentify script to /usr/bin for emovix.
-	cp ${D}/usr/share/doc/${PF}/TOOLS/midentify ${D}/usr/bin
-	chmod a+x ${D}/usr/bin/midentify
-
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-	doins ${S}/etc/input.conf
-	doins ${S}/etc/menu.conf
-}
-
-pkg_preinst() {
-
-	if [ -d "${ROOT}/usr/share/mplayer/Skin/default" ]
-	then
-		rm -rf ${ROOT}/usr/share/mplayer/Skin/default
-	fi
-}
-
-pkg_postinst() {
-
-	if use matrox; then
-		depmod -a &>/dev/null || :
-	fi
-
-	if use alsa ; then
-		einfo "For those using alsa, please note the ao driver name is no longer"
-		einfo "alsa9x or alsa1x.  It is now just 'alsa' (omit quotes)."
-		einfo "The syntax for optional drivers has also changed.  For example"
-		einfo "if you use a dmix driver called 'dmixer,' use"
-		einfo "ao=alsa:device=dmixer instead of ao=alsa:dmixer"
-		einfo "Some users may not need to specify the extra driver with the ao="
-		einfo "command."
-	fi
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a \
-	     ! -e ${ROOT}/usr/share/mplayer/font ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
-	     ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}
-
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
index 063aec7c8423..ce2d255f13f8 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.29 2005/04/12 01:09:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.30 2005/04/16 10:05:03 lu_zero Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts win32codecs bidi debug dga divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas network nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowext aalib alsa altivec arts win32codecs bidi debug dga divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas network nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -291,7 +291,7 @@ src_compile() {
 	# check cpu flags
 	if use x86
 	then
-		CPU_FLAGS=( 3dnow 3dnowex mmx sse sse2 mmxext )
+		CPU_FLAGS=( 3dnow 3dnowext mmx sse sse2 mmxext )
 		ecpu_check CPU_FLAGS
 	fi
 
@@ -457,7 +457,7 @@ src_compile() {
 	# Advanced Options #
 	#################
 	myconf="${myconf} $(use_enable 3dnow)"
-	myconf="${myconf} $(use_enable 3dnowex)";
+	myconf="${myconf} $(use_enable 3dnowext 3dnowex)";
 	myconf="${myconf} $(use_enable sse)"
 	myconf="${myconf} $(use_enable sse2)"
 	myconf="${myconf} $(use_enable mmx)"
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild
index abcefdf6c979..cbd4415ce882 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild,v 1.7 2005/04/12 01:09:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild,v 1.8 2005/04/16 10:05:03 lu_zero Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts avi bidi debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowext aalib alsa altivec arts avi bidi debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -263,7 +263,7 @@ src_compile() {
 	# check cpu flags
 	if use x86
 	then
-		CPU_FLAGS=(3dnow 3dnowex mmx sse sse2 mmxext)
+		CPU_FLAGS=(3dnow 3dnowext mmx sse sse2 mmxext)
 		ecpu_check CPU_FLAGS
 	fi
 
@@ -443,7 +443,7 @@ src_compile() {
 	# Advanced Options #
 	#################
 	myconf="${myconf} $(use_enable 3dnow)"
-	myconf="${myconf} $(use_enable 3dnowex)";
+	myconf="${myconf} $(use_enable 3dnowext 3dnowex)";
 	myconf="${myconf} $(use_enable sse)"
 	myconf="${myconf} $(use_enable sse2)"
 	myconf="${myconf} $(use_enable mmx)"
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild
index a5af028ca187..8e4791730c1d 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild,v 1.7 2005/04/12 01:09:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild,v 1.8 2005/04/16 10:05:03 lu_zero Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts avi bidi bl debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowext aalib alsa altivec arts avi bidi bl debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -263,7 +263,7 @@ src_compile() {
 	# check cpu flags
 	if use x86
 	then
-		CPU_FLAGS=(3dnow 3dnowex mmx sse sse2 mmxext)
+		CPU_FLAGS=(3dnow 3dnowext mmx sse sse2 mmxext)
 		ecpu_check CPU_FLAGS
 	fi
 
@@ -443,7 +443,7 @@ src_compile() {
 	# Advanced Options #
 	#################
 	myconf="${myconf} $(use_enable 3dnow)"
-	myconf="${myconf} $(use_enable 3dnowex)";
+	myconf="${myconf} $(use_enable 3dnowext 3dnowex)";
 	myconf="${myconf} $(use_enable sse)"
 	myconf="${myconf} $(use_enable sse2)"
 	myconf="${myconf} $(use_enable mmx)"
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r3.ebuild
index 7e3e064756ab..ffa97cdc334c 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r3.ebuild,v 1.1 2005/04/12 08:09:31 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r3.ebuild,v 1.2 2005/04/16 10:05:03 lu_zero Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowex aac aalib alsa altivec arts avi bidi bl cpudetection
+IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts avi bidi bl cpudetection
 custom-cflags debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mmx mmxext mythtv nas nls nvidia vorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
@@ -264,7 +264,7 @@ src_compile() {
 	# check cpu flags
 	if use x86 && use !cpudetection
 	then
-		CPU_FLAGS=(3dnow 3dnowex mmx sse sse2 mmxext)
+		CPU_FLAGS=(3dnow 3dnowext mmx sse sse2 mmxext)
 		ecpu_check CPU_FLAGS
 	fi
 
@@ -439,7 +439,7 @@ src_compile() {
 	# Advanced Options #
 	#################
 	myconf="${myconf} $(use_enable 3dnow)"
-	myconf="${myconf} $(use_enable 3dnowex)";
+	myconf="${myconf} $(use_enable 3dnowext 3dnowex)";
 	myconf="${myconf} $(use_enable sse)"
 	myconf="${myconf} $(use_enable sse2)"
 	myconf="${myconf} $(use_enable mmx)"