New snapshot

Package-Manager: portage-2.1.2_pre3-r3

4 files changed, 585 insertions, 5 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index dd7de5995ad5..30f135802cc8 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.415 2006/10/19 08:41:08 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.416 2006/10/19 10:05:49 lu_zero Exp $
+
+*mplayer-1.0_pre20061019 (19 Oct 2006)
+
+  19 Oct 2006; Luca Barbato <lu_zero@gentoo.org>
+  +mplayer-1.0_pre20061019.ebuild:
+  New snapshot
 
   19 Oct 2006; Luca Barbato <lu_zero@gentoo.org>
   files/digest-mplayer-1.0_pre8, files/digest-mplayer-1.0_pre8-r1,
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 1f06c696758d..88c8d1b78002 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -14,11 +14,16 @@ DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb
 DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
 DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
 DIST mplayer-1.0_pre20060810.tar.bz2 7153828 RMD160 52c7669bfa21e6eaac20855ea4038107ba3eb1f4 SHA1 6081912bfaea2fb31458658756f46e54182e2e2b SHA256 d5bb05788db2462c77e8b4307a5c9d245b13170521e39e6b3335dc627495fe5b
+DIST mplayer-1.0_pre20061019.tar.bz2 7307497 RMD160 e444b78edfd754d11064fe82144bbab05b146781 SHA1 42638742e81d1d29a732ff8a0fb4ffdda29207dc SHA256 6540e590dc520711f06c892f19ba7a53973e5b8a64deb2a7376f8bc6bd0dc040
 DIST svgalib_helper-1.9.17-mplayer.tar.bz2 7234 RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 SHA1 d2d596f1ddd283188b2990417d22903c0b466d25 SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5
 EBUILD mplayer-1.0_pre20060810.ebuild 15415 RMD160 aa60f7e4ac449e5a486cd1b7f9d08861c5150634 SHA1 ba5bc6155a771d01b71035e8e2013a80f23697a6 SHA256 dc5b6d9cb36129734256d4a72a3272e654e0d0cbafbdaa49938cd49f83c6e287
 MD5 e86fbc7de0a00c42a91c69b8724d769e mplayer-1.0_pre20060810.ebuild 15415
 RMD160 aa60f7e4ac449e5a486cd1b7f9d08861c5150634 mplayer-1.0_pre20060810.ebuild 15415
 SHA256 dc5b6d9cb36129734256d4a72a3272e654e0d0cbafbdaa49938cd49f83c6e287 mplayer-1.0_pre20060810.ebuild 15415
+EBUILD mplayer-1.0_pre20061019.ebuild 15423 RMD160 3c82956deca7571c34d754e97aad74a93ac27e77 SHA1 1eaaadff92be60a43ad10b809b5785eb7acd7d75 SHA256 f18a429251b43bf527f19de79dee4867e26cb153879f1f965d6707664124bfd6
+MD5 a8c7bd40168e0c794c5b592b78dae8c6 mplayer-1.0_pre20061019.ebuild 15423
+RMD160 3c82956deca7571c34d754e97aad74a93ac27e77 mplayer-1.0_pre20061019.ebuild 15423
+SHA256 f18a429251b43bf527f19de79dee4867e26cb153879f1f965d6707664124bfd6 mplayer-1.0_pre20061019.ebuild 15423
 EBUILD mplayer-1.0_pre8-r1.ebuild 15511 RMD160 8e8c38674328cfff5c64c129c6fdf1acd0dcd59c SHA1 b5969b1e90d897423eb062622e0916c388993747 SHA256 1131bf2196cc557b852aa308c5240d40078909311fdc0ff40078482a18d631e8
 MD5 68c60231cce893caa378add422b6e763 mplayer-1.0_pre8-r1.ebuild 15511
 RMD160 8e8c38674328cfff5c64c129c6fdf1acd0dcd59c mplayer-1.0_pre8-r1.ebuild 15511
@@ -27,10 +32,10 @@ EBUILD mplayer-1.0_pre8.ebuild 15765 RMD160 ff16d2418b815b9112aebcfb592bcb75e5fd
 MD5 3a0e03c4ed420b4915bb86fbd2e9a1e4 mplayer-1.0_pre8.ebuild 15765
 RMD160 ff16d2418b815b9112aebcfb592bcb75e5fdb1d3 mplayer-1.0_pre8.ebuild 15765
 SHA256 52f7b6264ac1c2a2e6258cc531fe79e0f89123b730ab861ad2acab0797417fa0 mplayer-1.0_pre8.ebuild 15765
-MISC ChangeLog 75390 RMD160 b557e91d2d6d15a56589ee410b5efdc523162e27 SHA1 7b35125453fb9d943c9f4d823e59f988037ef872 SHA256 60073cc2a673fed3cc96f97b030c5dbefd738f50dee8101bdd0cd151cb71230d
-MD5 b884c0ab0215f8ddf4df21d0b4ce62a9 ChangeLog 75390
-RMD160 b557e91d2d6d15a56589ee410b5efdc523162e27 ChangeLog 75390
-SHA256 60073cc2a673fed3cc96f97b030c5dbefd738f50dee8101bdd0cd151cb71230d ChangeLog 75390
+MISC ChangeLog 75530 RMD160 02a3094874558519a7676aa7fb5827ccc8ddc8a8 SHA1 b275aa9d242a1f5da21860785df8bb9ba39d7bd0 SHA256 a0e63ffa113e3ffd0b7ca412e217715343fea781c84e6b0d05468307d9814a0d
+MD5 da5a67583bf0f7de507057cf0b2bc596 ChangeLog 75530
+RMD160 02a3094874558519a7676aa7fb5827ccc8ddc8a8 ChangeLog 75530
+SHA256 a0e63ffa113e3ffd0b7ca412e217715343fea781c84e6b0d05468307d9814a0d ChangeLog 75530
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -38,6 +43,9 @@ SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 metadata
 MD5 f13f98d6b487f1a051fd2ecf394a1702 files/digest-mplayer-1.0_pre20060810 2024
 RMD160 0d479afec3f25b2c8ba1312b2c42ee19192631c6 files/digest-mplayer-1.0_pre20060810 2024
 SHA256 a485f124be7db62abc9a0084b6bd5df8bb4f9215af52bbe55970d5b3544fa7ca files/digest-mplayer-1.0_pre20060810 2024
+MD5 66414431c2919268295b51a530a48e71 files/digest-mplayer-1.0_pre20061019 2024
+RMD160 4cb655195879770392731f961b4b9afbb93aa2a9 files/digest-mplayer-1.0_pre20061019 2024
+SHA256 7e9f480408e885c2f90433134c67ea95c6c7e37cc0ea3d4c8ed80ac4ca506a3b files/digest-mplayer-1.0_pre20061019 2024
 MD5 4c3ce9f6ced0ec6f46d94af644b26ba3 files/digest-mplayer-1.0_pre8 1560
 RMD160 17bd38c2a567629cf82872c5459c7a1cae287e56 files/digest-mplayer-1.0_pre8 1560
 SHA256 4cb7e07037e8fb90c07d27408a2fb61e3eb4d709770e0c42aeace9a06a095d3b files/digest-mplayer-1.0_pre8 1560
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre20061019 b/media-video/mplayer/files/digest-mplayer-1.0_pre20061019
new file mode 100644
index 000000000000..5678eb3dbe4d
--- /dev/null
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre20061019
@@ -0,0 +1,24 @@
+MD5 9b575d01f94f50dd4dcf570cd8a14dda 26104-510.zip 291836
+RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca 26104-510.zip 291836
+SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-510.zip 291836
+MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
+RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
+SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
+MD5 1813f8537c8be56c1aa4946a2fd938a9 Blue-1.6.tar.bz2 225883
+RMD160 33fcd3812bd12e0369614e0c1c5d4c571784df3e Blue-1.6.tar.bz2 225883
+SHA256 394333a50184fc9ea78eba726204a5dbb653a07e30c94d335c52e2a4e1be0568 Blue-1.6.tar.bz2 225883
+MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
+RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
+SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
+MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
+RMD160 666697cd5efd9387057a898c714175e7c2aacbcd font-arial-iso-8859-1.tar.bz2 234242
+SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-arial-iso-8859-1.tar.bz2 234242
+MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
+RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208
+SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208
+MD5 f64805423d51b34966e2d76141e2cba9 mplayer-1.0_pre20061019.tar.bz2 7307497
+RMD160 e444b78edfd754d11064fe82144bbab05b146781 mplayer-1.0_pre20061019.tar.bz2 7307497
+SHA256 6540e590dc520711f06c892f19ba7a53973e5b8a64deb2a7376f8bc6bd0dc040 mplayer-1.0_pre20061019.tar.bz2 7307497
+MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
+RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
+SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/mplayer-1.0_pre20061019.ebuild b/media-video/mplayer/mplayer-1.0_pre20061019.ebuild
new file mode 100644
index 000000000000..fa387a7cef7f
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.0_pre20061019.ebuild
@@ -0,0 +1,542 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre20061019.ebuild,v 1.1 2006/10/19 10:05:49 lu_zero Exp $
+
+inherit eutils flag-o-matic
+
+RESTRICT="nostrip"
+IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec amr arts bidi bl bindist
+cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd
+dv dvdread enca encode esd fbcon gif ggi gtk iconv ipv6 jack joystick jpeg
+libcaca lirc live livecd lzo mad matrox mmx mmxext musepack nas unicode
+vorbis opengl openal oss png real rtc samba sdl speex sse sse2 svga tga
+theora truetype v4l v4l2 win32codecs X x264 xanim xinerama xmms xv xvid
+xvmc"
+
+LANGS="bg cs de da el en es fr hu ja ko mk nl no pl pt_BR ro ru sk tr uk zh_CN
+zh_TW"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+BLUV=1.6
+SVGV=1.9.17
+
+# Handle PREversions as well
+S="${WORKDIR}/mplayer"
+AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
+SRC_URI="mirror://mplayer/releases/${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
+	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
+	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
+	amr? ( ${AMR_URI}/26_series/26.104/26104-510.zip
+		   ${AMR_URI}/26_series/26.204/26204-510.zip )"
+
+# 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 )
+	win32codecs? (
+		!livecd? (
+			!bindist? ( >=media-libs/win32codecs-20040916 ) ) )
+	x86? ( real? ( >=media-video/realplayer-10.0.3 ) )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	openal? ( media-libs/openal )
+	bidi? ( dev-libs/fribidi )
+	cdparanoia? ( media-sound/cdparanoia )
+	dga? ( x11-libs/libXxf86dga )
+	directfb? ( dev-libs/DirectFB )
+	dts? ( media-libs/libdts )
+	dvb? ( media-tv/linuxtv-dvb-headers )
+	dvd? ( dvdread? ( media-libs/libdvdread ) )
+	encode? (
+		media-sound/lame
+		dv? ( >=media-libs/libdv-0.9.5 )
+		x264? ( >=media-libs/x264-svn-20061014 )
+		)
+	esd? ( media-sound/esound )
+	enca? ( app-i18n/enca )
+	gif? ( media-libs/giflib )
+	ggi? ( media-libs/libggi )
+	gtk? ( media-libs/libpng
+		   x11-libs/libXxf86vm
+		   x11-libs/libXext
+		   x11-libs/libXi
+		   =x11-libs/gtk+-2*
+		   =dev-libs/glib-2* )
+	jpeg? ( media-libs/jpeg )
+	libcaca? ( media-libs/libcaca )
+	lirc? ( app-misc/lirc )
+	lzo? ( =dev-libs/lzo-1* )
+	mad? ( media-libs/libmad )
+	musepack? ( >=media-libs/libmpcdec-1.2.2 )
+	nas? ( media-libs/nas )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng )
+	samba? ( >=net-fs/samba-2.2.8a )
+	sdl? ( media-libs/libsdl )
+	speex? ( media-libs/speex )
+	svga? ( media-libs/svgalib )
+	theora? ( media-libs/libtheora )
+	live? ( >=media-plugins/live-2004.07.20 )
+	truetype? ( >=media-libs/freetype-2.1 )
+	xinerama? ( x11-libs/libXinerama
+				x11-libs/libXxf86vm
+				x11-libs/libXext )
+	xmms? ( media-sound/xmms )
+	xanim? ( >=media-video/xanim-2.80.1-r4 )
+	sys-libs/ncurses
+	xv? ( x11-libs/libXv
+		  x11-libs/libXxf86vm
+		  x11-libs/libXext
+		  xvmc? ( x11-libs/libXvMC ) )
+	X? ( x11-libs/libXxf86vm
+		 x11-libs/libXext )
+	"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( >=app-text/docbook-sgml-dtd-4.1.2
+		   app-text/docbook-xml-dtd
+		   >=app-text/docbook-xml-simple-dtd-1.50.0
+		   dev-libs/libxslt
+		   )
+	dga? ( x11-proto/xf86dgaproto )
+	xinerama? ( x11-proto/xineramaproto )
+	xv? ( x11-proto/videoproto
+		  x11-proto/xf86vidmodeproto )
+	gtk? ( x11-proto/xextproto
+		   x11-proto/xf86vidmodeproto )
+	X? ( x11-proto/xextproto
+		 x11-proto/xf86vidmodeproto )
+	iconv? ( virtual/libiconv )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+
+pkg_setup() {
+	if use real && use x86; then
+		REALLIBDIR="/opt/RealPlayer/codecs"
+	fi
+}
+
+src_unpack() {
+
+	unpack ${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
+
+	use amr && unpack 26104-510.zip && unpack 26204-510.zip
+
+	# amr (float) support
+	if use amr; then
+		einfo "Including amr wide and narrow band (float) support ... "
+
+		# narrow band codec
+		mkdir ${S}/libavcodec/amr_float
+		cd ${S}/libavcodec/amr_float
+		unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
+		# wide band codec
+		mkdir ${S}/libavcodec/amrwb_float
+		cd ${S}/libavcodec/amrwb_float
+		unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
+	fi
+
+	cd ${S}
+
+	# 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
+
+	# minor fix
+	sed -i -e "s:-O4:-O4 -D__STDC_LIMIT_MACROS:" configure
+
+}
+
+src_compile() {
+
+	# have fun with LINGUAS variable
+	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS//da/dk}
+
+	local myconf=" --disable-tv-bsdbt848"
+	myconf="${myconf} --disable-vidix-external"
+	################
+	#Optional features#
+	###############
+	if use cpudetection || use livecd || use bindist
+	then
+	myconf="${myconf} --enable-runtime-cpudetection"
+	fi
+
+	myconf="${myconf} $(use_enable bidi fribidi)"
+
+	if use iconv
+	then
+		use unicode && myconf="${myconf} --charset=UTF-8"
+	else
+		myconf="${myconf} --disable-iconv"
+		myconf="${myconf} --charset=noconv"
+	fi
+
+	use enca || myconf="${myconf} --disable-enca"
+
+	use cdparanoia || myconf="${myconf} --disable-cdparanoia"
+
+	if use dvd
+	then
+		use dvdread && myconf="${myconf} --disable-mpdvdkit"
+		use dvdread || myconf="${myconf} --disable-dvdread"
+	else
+		myconf="${myconf} --disable-dvdread --disable-mpdvdkit"
+	fi
+
+	if use encode
+	then
+		myconf="${myconf} --enable-mencoder"
+		use dv || myconf="${myconf} --disable-libdv"
+		use x264 || myconf="${myconf} --disable-x264"
+	else
+		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264"
+	fi
+
+	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
+
+	# this looks like a hack, but the
+	# --enable-dga needs a paramter, but there's no surefire
+	# way to tell what it is.. so I'm letting MPlayer decide
+	# the enable part
+	if ! use dga && ! use 3dfx
+	then
+		myconf="${myconf} --disable-dga"
+	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)"
+	myconf="${myconf} $(use_enable live)"
+	myconf="${myconf} $(use_enable rtc)"
+	myconf="${myconf} $(use_enable samba smb)"
+	myconf="${myconf} $(use_enable truetype freetype)"
+	use v4l  || myconf="${myconf} --disable-tv-v4l1"
+	use v4l2 || myconf="${myconf} --disable-tv-v4l2"
+	use jack || myconf="${myconf} --disable-jack"
+
+	#########
+	# Codecs #
+	########
+	myconf="${myconf} $(use_enable gif)"
+	myconf="${myconf} $(use_enable jpeg)"
+	#myconf="${myconf} $(use_enable ladspa)"
+	myconf="${myconf} $(use_enable dts libdts)"
+	myconf="${myconf} $(use_enable lzo liblzo)"
+	myconf="${myconf} $(use_enable musepack)"
+	myconf="${myconf} $(use_enable aac faad-internal)"
+	use vorbis || myconf="${myconf} --disable-libvorbis"
+	myconf="${myconf} $(use_enable theora)"
+	use speex || myconf="${myconf} --disable-speex"
+	myconf="${myconf} $(use_enable xmms)"
+	myconf="${myconf} $(use_enable xvid)"
+	use x86 && myconf="${myconf} $(use_enable real)"
+	! use livecd && ! use bindist && \
+		myconf="${myconf} $(use_enable win32codecs win32)"
+
+	#############
+	# 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
+
+	if use dvb
+	then
+		myconf="${myconf} --enable-dvbhead"
+	else
+		myconf="${myconf} --disable-dvbhead"
+	fi
+
+	use aalib || myconf="${myconf} --disable-aa"
+	myconf="${myconf} $(use_enable directfb)"
+	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-internal"
+	fi
+
+	myconf="${myconf} $(use_enable tga)"
+
+	if use xv && use xvmc
+	then
+		myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCW"
+	else
+		myconf="${myconf} --disable-xvmc"
+	fi
+
+	#############
+	# Audio Output #
+	#############
+	use alsa || myconf="${myconf} --disable-alsa"
+	use arts || myconf="${myconf} --disable-arts"
+	use esd || myconf="${myconf} --disable-esd"
+	use mad || myconf="${myconf} --disable-mad"
+	use nas || myconf="${myconf} --disable-nas"
+	use openal || myconf="${myconf} --disable-openal"
+	use oss || myconf="${myconf} --disable-ossaudio"
+
+	#################
+	# Advanced Options #
+	#################
+	# Platform specific flags, hardcoded on amd64 (see below)
+	use x86 && myconf="${myconf} $(use_enable 3dnow)"
+	use x86 && myconf="${myconf} $(use_enable 3dnowext)";
+	use x86 && myconf="${myconf} $(use_enable sse)"
+	use x86 && myconf="${myconf} $(use_enable sse2)"
+	use x86 && myconf="${myconf} $(use_enable mmx)"
+	use x86 && myconf="${myconf} $(use_enable mmxext)"
+	use debug && myconf="${myconf} --enable-debug=3"
+
+	# mplayer now contains SIMD assembler code for amd64
+	# AMD64 Team decided to hardenable SIMD assembler for all users
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/01/11
+	if use amd64; then
+		myconf="${myconf} --enable-3dnow --enable-3dnowext --enable-sse --enable-sse2 --enable-mmx --enable-mmxext"
+	fi
+
+	if use ppc64
+	then
+		myconf="${myconf} --disable-altivec"
+	else
+		myconf="${myconf} $(use_enable altivec)"
+		use altivec && append-flags -maltivec -mabi=altivec
+	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 xmms && myconf="${myconf} --with-xmmslibdir=/usr/$(get_libdir)"
+
+	use live && myconf="${myconf} --with-livelibdir=/usr/$(get_libdir)/live"
+
+	# support for blinkenlights
+	use bl && myconf="${myconf} --enable-bl"
+
+	#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
+
+	if use custom-cflags
+	then
+	# 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
+			filter-flags -fPIC -fPIE
+		fi
+	append-flags -D__STDC_LIMIT_MACROS
+	else
+	unset CFLAGS CXXFLAGS
+	fi
+
+	CFLAGS="$CFLAGS" ./configure \
+		--prefix=/usr \
+		--confdir=/usr/share/mplayer \
+		--datadir=/usr/share/mplayer \
+		--enable-largefiles \
+		--enable-menu \
+		--enable-network --enable-ftp \
+		--with-reallibdir=${REALLIBDIR} \
+		--disable-faad-external \
+		${myconf} || die
+
+	# we run into problems if -jN > -j1
+	# see #86245
+	MAKEOPTS="${MAKEOPTS} -j1"
+
+	einfo "Make"
+	emake || die "Failed to build MPlayer!"
+	use doc && make -C DOCS/xml html-chunked
+	einfo "Make completed"
+}
+
+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
+
+		insinto /usr/share/pixmaps
+		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
+		insinto /usr/share/applications
+		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 -pPR ${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
+}
+