Ok, I bumped MPlayer so leave me alone now. I wish.. I know I'll get about 140000 bugs now. Oh well, here goes nothing.

6 files changed, 605 insertions, 35 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 3072f801f0c4..34720921476e 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.242 2004/12/19 17:13:25 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.243 2004/12/26 03:29:49 chriswhite Exp $
+
+*mplayer-1.0_pre6 (26 Dec 2004)
+
+  26 Dec 2004; Chris White <chriswhite@gentoo.org>
+  +files/mplayer-1.0_pre6-configure.patch,
+  +files/mplayer-1.0_pre6-ppc64.patch, +mplayer-1.0_pre6.ebuild:
+  Infamous 1.0_pre6 bump.
 
   19 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
   mplayer-1.0_pre5-r5.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 2d0af67da00b..f5435f4c6296 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,46 +1,40 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 65a0f011044de2f5d0640f777cec3de2 mplayer-1.0_pre5-r2.ebuild 14050
 MD5 ffb16a8442fc078dbc051b3d8dfb9efa ChangeLog 44597
+MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
 MD5 1c2c57d2df0ee1aa669ba11ce6092391 mplayer-1.0_pre4-r7.ebuild 12225
+MD5 65a0f011044de2f5d0640f777cec3de2 mplayer-1.0_pre5-r2.ebuild 14050
+MD5 e70c5ce8ecd9fb67ce243a1c59b64605 mplayer-1.0_pre5-r3.ebuild 14870
 MD5 06c6baca8520528027ac13d582b3df19 mplayer-1.0_pre5-r4.ebuild 16469
-MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
 MD5 ff39b2fac2ee666b68c61a6a8bf8c8e8 mplayer-1.0_pre5-r5.ebuild 16456
-MD5 e70c5ce8ecd9fb67ce243a1c59b64605 mplayer-1.0_pre5-r3.ebuild 14870
-MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
-MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
-MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459
-MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
-MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
-MD5 a657a67a5658b998acc23a00ffa3951e files/mplayer-1.0_pre5-r5-configure.patch 613
-MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
-MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
-MD5 f56773d6c12d0e9bf91edfe8a1f7551d files/digest-mplayer-1.0_pre5-r5 514
-MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
-MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r3 440
-MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
-MD5 f2d6c259271fd9abc036acd72a26d376 files/mplayer-1.0_pre5-r4-ppc64.patch 597
+MD5 e8aab294b695f5fd9cf251df1a444489 mplayer-1.0_pre6.ebuild 15572
+MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
 MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358
+MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440
+MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r3 440
 MD5 3e0467a312a41645fdc9e65b1caf6e83 files/digest-mplayer-1.0_pre5-r4 510
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
-MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
+MD5 f56773d6c12d0e9bf91edfe8a1f7551d files/digest-mplayer-1.0_pre5-r5 514
 MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
+MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
+MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
+MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
 MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
-MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
-MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
+MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
+MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459
+MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
 MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
-MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440
 MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
 MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
-MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
+MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
+MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
+MD5 f2d6c259271fd9abc036acd72a26d376 files/mplayer-1.0_pre5-r4-ppc64.patch 597
+MD5 a657a67a5658b998acc23a00ffa3951e files/mplayer-1.0_pre5-r5-configure.patch 613
+MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
+MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
+MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
+MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBxba+ugEuf3OQ0akRArctAJ9609cBNpBiJnrlI5ekkl0H28sHlACffVwQ
-c3xuxIzr2I6GV3UB1p7SERs=
-=Yag0
------END PGP SIGNATURE-----
+MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
+MD5 2fb3afbee86805cd9fc40fe975d179cf files/digest-mplayer-1.0_pre6 510
+MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534
+MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre6-ppc64.patch 353
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre6 b/media-video/mplayer/files/digest-mplayer-1.0_pre6
new file mode 100644
index 000000000000..3387daa0a06f
--- /dev/null
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre6
@@ -0,0 +1,7 @@
+MD5 4a628f87a7070e10ffea04a1598979a9 MPlayer-1.0pre6.tar.bz2 5624063
+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_pre6-configure.patch b/media-video/mplayer/files/mplayer-1.0_pre6-configure.patch
new file mode 100644
index 000000000000..ebc13356e399
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.0_pre6-configure.patch
@@ -0,0 +1,13 @@
+--- configure.old	2004-12-24 15:24:15.055125952 +0900
++++ configure	2004-12-24 15:25:14.480091984 +0900
+@@ -6308,10 +6308,6 @@
+ # Checking for CFLAGS
+ _stripbinaries=yes
+ if test "$_profile" != "" || test "$_debug" != "" ; then
+-  CFLAGS="-W -Wall -O2 $_march $_mcpu $_debug $_profile"
+-  if test "$_cc_major" -ge "3" ; then
+-    CFLAGS=`echo "$CFLAGS" | sed -e 's/\(-Wall\)/\1 -Wno-unused-parameter/'`
+-  fi
+   _stripbinaries=no
+ elif test -z "$CFLAGS" ; then
+     CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
diff --git a/media-video/mplayer/files/mplayer-1.0_pre6-ppc64.patch b/media-video/mplayer/files/mplayer-1.0_pre6-ppc64.patch
new file mode 100644
index 000000000000..2eeb52343dda
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.0_pre6-ppc64.patch
@@ -0,0 +1,11 @@
+--- configure.old	2004-12-25 00:19:51.396513200 +0900
++++ configure	2004-12-25 00:20:10.908546920 +0900
+@@ -469,7 +469,7 @@
+           host_arch=i386
+         fi
+       ;;
+-      macppc|ppc) host_arch=ppc ;;
++      macppc|ppc|ppc64) host_arch=ppc ;;
+       alpha) host_arch=alpha ;;
+       sparc) host_arch=sparc ;;
+       sparc64) host_arch=sparc64 ;;
diff --git a/media-video/mplayer/mplayer-1.0_pre6.ebuild b/media-video/mplayer/mplayer-1.0_pre6.ebuild
new file mode 100644
index 000000000000..a6d7bb6f5257
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.0_pre6.ebuild
@@ -0,0 +1,538 @@
+# Copyright 1999-2004 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.ebuild,v 1.1 2004/12/26 03:29:49 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 mmx2 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/_/}"
+MY_P="MPlayer-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://mplayer/releases/${MY_P}.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/${PN}-1.0_pre5-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 ${MY_P}.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}/${PF}-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
+
+	#adds mythtv support to mplayer
+	use mythtv && epatch ${FILESDIR}/mplayer-mythtv.patch
+
+	# 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
+	epatch ${FILESDIR}/${PN}-1.0_pre6-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 - Swedish"
+	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!
+	strip-flags
+
+	# 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 ladspa)"
+	#myconf="${myconf} $(use_enable dts)"
+	myconf="${myconf} $(use_enable lzo liblzo)"
+	myconf="${myconf} $(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 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
+
+	use live && myconf="${myconf} --with-livelibdir=/usr/$(get_libdir)/live"
+
+	#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 vo 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 vo="
+		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
+}
+