From: Steve Dibb <beandog@gentoo.org>
Date: Thu, 22 Mar 2007 14:34:17 +0000 (+0000)
Subject: Remove some configuration changes, remove changing font options on mplayer.conf
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=13b6a3e6176c48f91a53cbeca050a474ad3afed2;p=gentoo.git

Remove some configuration changes, remove changing font options on mplayer.conf
Package-Manager: portage-2.1.2.2
---

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 800a08689323..1419786f1155 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.462 2007/03/22 07:09:36 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.463 2007/03/22 14:34:17 beandog Exp $
+
+*mplayer-1.0_rc2_pre20070321-r1 (22 Mar 2007)
+
+  22 Mar 2007; Steve Dibb <beandog@gentoo.org>
+  +mplayer-1.0_rc2_pre20070321-r1.ebuild:
+  Remove some configuration changes, remove changing font options on mplayer.conf
 
 *mplayer-1.0_rc2_pre20070321 (22 Mar 2007)
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 11799dec6c8d..0f7ec0cb2b99 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -45,14 +45,18 @@ EBUILD mplayer-1.0_rc1.ebuild 16252 RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54
 MD5 3499ce30257f8bb8cc53c5c91ec31025 mplayer-1.0_rc1.ebuild 16252
 RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54a58 mplayer-1.0_rc1.ebuild 16252
 SHA256 87528c199a11b40baff5e75d6fba5a83499c4bcb7e781fba3910db5423fb3e13 mplayer-1.0_rc1.ebuild 16252
+EBUILD mplayer-1.0_rc2_pre20070321-r1.ebuild 16824 RMD160 e86e238ede7ed358ce62d5746e9107e0a32164c5 SHA1 351abf791b2ce17e7f80162612351e80b4d1f8db SHA256 5e0cf2ed2af0e3efa7364b060e83fdfb82424f6effd7237847c8bf084ab3b599
+MD5 21c3306adc7b8ee5f026013214929f41 mplayer-1.0_rc2_pre20070321-r1.ebuild 16824
+RMD160 e86e238ede7ed358ce62d5746e9107e0a32164c5 mplayer-1.0_rc2_pre20070321-r1.ebuild 16824
+SHA256 5e0cf2ed2af0e3efa7364b060e83fdfb82424f6effd7237847c8bf084ab3b599 mplayer-1.0_rc2_pre20070321-r1.ebuild 16824
 EBUILD mplayer-1.0_rc2_pre20070321.ebuild 16938 RMD160 842d68d54bd8f1b6602a98affda2fd6f7d5c482d SHA1 3308eb105ebd6299d5d232cd63c8590457b54899 SHA256 0f323e5ff5381204e84cdce101dbc09ee6c7240c95d2712c1f0a52a99aaa7209
 MD5 72c1a061104279864f0e1bf69f45c643 mplayer-1.0_rc2_pre20070321.ebuild 16938
 RMD160 842d68d54bd8f1b6602a98affda2fd6f7d5c482d mplayer-1.0_rc2_pre20070321.ebuild 16938
 SHA256 0f323e5ff5381204e84cdce101dbc09ee6c7240c95d2712c1f0a52a99aaa7209 mplayer-1.0_rc2_pre20070321.ebuild 16938
-MISC ChangeLog 82177 RMD160 028c52bdf3ff8c1eb21ceda494fb43ec35107b9c SHA1 14f77e8086847467249472e4c32b6ebb8fd2849b SHA256 8b9457aa72a81989768f40e99676a82fb357663e0b6dc7262dad8480ee096eae
-MD5 47d2da200acddd260905d1e5f19ef893 ChangeLog 82177
-RMD160 028c52bdf3ff8c1eb21ceda494fb43ec35107b9c ChangeLog 82177
-SHA256 8b9457aa72a81989768f40e99676a82fb357663e0b6dc7262dad8480ee096eae ChangeLog 82177
+MISC ChangeLog 82396 RMD160 0a6d0ea6ed8dfb458484400f24e111c5d0a90436 SHA1 ed99aa7c008dba0257d56f24ddbc7fbdc131556d SHA256 ce2fe7411b16d8cb3a6717557035216344c9e00871f71f7a7ac4ae2a83313a8c
+MD5 b2a6067b366556b931a4d2ef86b6539a ChangeLog 82396
+RMD160 0a6d0ea6ed8dfb458484400f24e111c5d0a90436 ChangeLog 82396
+SHA256 ce2fe7411b16d8cb3a6717557035216344c9e00871f71f7a7ac4ae2a83313a8c ChangeLog 82396
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -75,3 +79,6 @@ SHA256 b0f6ba62381548cffb2eb17179cdb5927605e273c5d5b834b225cff495e9136a files/di
 MD5 6a0015f92b25db7a057386ae370908a6 files/digest-mplayer-1.0_rc2_pre20070321 2039
 RMD160 c342ef1a6c1999ec11f6b693724fb0de62a4dcd3 files/digest-mplayer-1.0_rc2_pre20070321 2039
 SHA256 a2ed6418258faf594cb47552c3544d04d114eab1e982be07e44a06ca8e27a4d7 files/digest-mplayer-1.0_rc2_pre20070321 2039
+MD5 6a0015f92b25db7a057386ae370908a6 files/digest-mplayer-1.0_rc2_pre20070321-r1 2039
+RMD160 c342ef1a6c1999ec11f6b693724fb0de62a4dcd3 files/digest-mplayer-1.0_rc2_pre20070321-r1 2039
+SHA256 a2ed6418258faf594cb47552c3544d04d114eab1e982be07e44a06ca8e27a4d7 files/digest-mplayer-1.0_rc2_pre20070321-r1 2039
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_rc2_pre20070321-r1 b/media-video/mplayer/files/digest-mplayer-1.0_rc2_pre20070321-r1
new file mode 100644
index 000000000000..8cac4a7078e1
--- /dev/null
+++ b/media-video/mplayer/files/digest-mplayer-1.0_rc2_pre20070321-r1
@@ -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 e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 222567
+RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb Blue-1.7.tar.bz2 222567
+SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8 Blue-1.7.tar.bz2 222567
+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 a589170a414a0daa5cdbef093fea1bd5 mplayer-1.0_rc2_pre20070321.tar.bz2 12985979
+RMD160 13715eb72303756c7aa2115daecde3570bcf13f5 mplayer-1.0_rc2_pre20070321.tar.bz2 12985979
+SHA256 98fe5747f5a5688243d9bc038aff9449dd6cb0c1bbacfe0d0ff0fc9d5a794c51 mplayer-1.0_rc2_pre20070321.tar.bz2 12985979
+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_rc2_pre20070321-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r1.ebuild
new file mode 100644
index 000000000000..ffb5634f7aeb
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r1.ebuild
@@ -0,0 +1,553 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r1.ebuild,v 1.1 2007/03/22 14:34:17 beandog Exp $
+
+inherit eutils flag-o-matic multilib
+
+RESTRICT="nostrip"
+IUSE="3dnow 3dnowext a52 aac aalib alsa altivec amr arts bidi bl bindist cddb
+cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dvdnav
+dv dvdread enca encode esd fbcon ftp gif ggi gtk iconv ipv6 ivtv jack joystick
+jpeg libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 musepack nas unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl speex srt sse sse2 svga theora tivo truetype v4l v4l2 win32codecs X x264 xanim xinerama xv xvid xvmc zoran"
+
+LANGS="bg cs da de el es fr hu it ja ko mk nb no pl ro ru sk sv tr uk pt_BR zh_CN zh_TW"
+
+VIDEO_CARDS="s3virge mga tdfx tga vesa"
+
+for X in ${LANGS}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+for X in ${VIDEO_CARDS}; do
+	IUSE="${IUSE} video_cards_${X}"
+done
+
+BLUV=1.7
+SVGV=1.9.17
+
+S="${WORKDIR}/${PN}"
+AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	!truetype? ( 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 )
+	!iconv? ( 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 )"
+
+DESCRIPTION="Media Player for Linux "
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+RDEPEND="sys-libs/ncurses
+	win32codecs? (
+		!livecd? (
+			!bindist? ( media-libs/win32codecs ) ) )
+	x86? ( real? ( !bindist? ( media-video/realplayer ) ) )
+	amd64? ( real? ( !bindist? ( media-libs/amd64codecs ) ) )
+	x86? ( mp2? ( media-sound/toolame ) )
+	amd64? ( mp2? ( media-sound/toolame ) )
+	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 )
+	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 )
+		x264? ( media-libs/x264-svn )
+		aac? ( media-libs/faac )
+		)
+	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* )
+	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 )
+	pnm? ( media-libs/netpbm )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? ( media-libs/speex )
+	srt? ( >=media-libs/freetype-2.1
+		media-libs/fontconfig )
+	svga? ( media-libs/svgalib )
+	!hppa? ( !ppc64? ( tdfx? ( x11-libs/libXxf86vm
+		x11-libs/libXext
+		x11-drivers/xf86-video-tdfx ) ) )
+	theora? ( media-libs/libtheora )
+	live? ( >=media-plugins/live-2007.02.20 )
+	truetype? ( >=media-libs/freetype-2.1
+		media-libs/fontconfig )
+	video_cards_mga? ( x11-libs/libXxf86vm
+		x11-libs/libXext
+		x11-drivers/xf86-video-mga )
+	video_cards_s3virge? ( x11-libs/libXxf86vm
+		x11-libs/libXext
+		x11-drivers/xf86-video-s3virge )
+	video_cards_tga? ( x11-libs/libXxf86vm
+		x11-libs/libXext
+		x11-drivers/xf86-video-tga )
+	video_cards_vesa? ( x11-libs/libXxf86vm
+		x11-libs/libXext
+		x11-drivers/xf86-video-vesa )
+	xinerama? ( x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/libXext )
+	xanim? ( media-video/xanim )
+	xv? ( x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/libXext
+		xvmc? ( x11-libs/libXvMC ) )
+	xvid? ( media-libs/xvid )
+	X? ( x11-libs/libXxf86vm
+		x11-libs/libXext
+		joystick? ( x11-drivers/xf86-input-joystick )
+	)"
+
+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 )"
+# Make sure the assembler USE flags are unmasked on amd64
+# Remove this once default-linux/amd64/2006.1 is deprecated
+DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )
+	ivtv? ( !x86-fbsd? ( <sys-kernel/linux-headers-2.6.20
+		media-tv/ivtv
+		>=sys-apps/portage-2.1.2 ) )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+src_unpack() {
+
+	unpack ${P}.tar.bz2
+
+	if ! use truetype ; then
+		unpack font-arial-iso-8859-1.tar.bz2 \
+			font-arial-iso-8859-2.tar.bz2 \
+			font-arial-cp1250.tar.bz2
+	fi
+
+	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() {
+
+	local myconf=" --disable-tv-bsdbt848 \
+		--disable-vidix-external \
+		--disable-faad-external \
+		--disable-libcdio"
+
+	# have fun with LINGUAS variable
+	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS/da/dk}
+	local myconf_linguas="--language=en"
+	for x in ${LANGS}; do
+		if use linguas_${x}; then
+			myconf_linguas="${myconf_linguas} --language=${x}"
+		fi
+	done
+	myconf="${myconf} ${myconf_linguas}"
+
+	################
+	#Optional features#
+	###############
+	if use cpudetection || use livecd || use bindist
+	then
+		myconf="${myconf} --enable-runtime-cpudetection"
+	fi
+
+	use bidi || myconf="${myconf} --disable-fribidi"
+	use bl && myconf="${myconf} --enable-bl"
+	use cddb || myconf="${myconf} --disable-cddb"
+	use cdparanoia || myconf="${myconf} --disable-cdparanoia"
+	use enca || myconf="${myconf} --disable-enca"
+	use ftp || myconf="${myconf} --disable-ftp"
+	use srt || myconf="${myconf} --disable-ass"
+	use tivo || myconf="${myconf} --disable-vstream"
+
+	if use iconv && use unicode; then
+		myconf="${myconf} --charset=UTF-8"
+	else
+		myconf="${myconf} --disable-iconv --charset=noconv"
+	fi
+
+	# DVD support
+	# dvdread and libdvdcss are internal libs
+	# http://www.mplayerhq.hu/DOCS/HTML/en/dvd.html
+	# You can optionally use external dvdread support, but against
+	# upstream's suggestion.  We don't.
+	# dvdnav support is known to be buggy, but it is the only option
+	# for accessing some DVDs.
+	if use dvd
+	then
+		use dvdread || myconf="${myconf} --disable-dvdread"
+		use dvdnav || myconf="${myconf} --disable-dvdnav"
+	else
+		myconf="${myconf} --disable-dvdnav --disable-dvdread"
+	fi
+
+	if use encode
+	then
+		use dv || myconf="${myconf} --disable-libdv"
+		use x264 || myconf="${myconf} --disable-x264"
+		use aac || myconf="${myconf} --disable-faac"
+	else
+		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264
+		--disable-faac"
+	fi
+
+	if ! use srt; then
+		use truetype || myconf="${myconf} --disable-freetype"
+	fi
+	use lirc || myconf="${myconf} --disable-lirc --disable-lircc"
+	myconf="${myconf} $(use_enable joystick)"
+	use ipv6 || myconf="${myconf} --disable-inet6"
+	use rar || myconf="${myconf} --disable-unrarlib"
+	use rtc || myconf="${myconf} --disable-rtc"
+	use samba || myconf="${myconf} --disable-smb"
+
+	# Video4Linux / Radio support
+	if ( use v4l || use v4l2 || use radio ); then
+		use v4l	|| myconf="${myconf} --disable-tv-v4l1"
+		use v4l2 || myconf="${myconf} --disable-tv-v4l2"
+		if use radio; then
+			myconf="${myconf} --enable-radio $(use_enable encode radio-capture)"
+		else
+			myconf="${myconf} --disable-radio-v4l2 --disable-radio-bsdbt848"
+		fi
+	else
+		myconf="${myconf} --disable-tv --disable-tv-v4l1 --disable-tv-v4l2 \
+			--disable-radio --disable-radio-v4l2 --disable-radio-bsdbt848"
+	fi
+
+	# disable PVR support
+	# The build will break if you have media-tv/ivtv installed and
+	# linux-headers != 2.6.18, which is currently not keyworded
+	# See also, bug 164748
+	myconf="${myconf} --disable-pvr"
+
+	#########
+	# Codecs #
+	########
+	for x in gif jpeg live mad musepack pnm speex theora xanim xvid; do
+		use ${x} || myconf="${myconf} --disable-${x}"
+	done
+	use aac || myconf="${myconf} --disable-faad-internal"
+	use a52 || myconf="${myconf} --disable-liba52"
+	use dts || myconf="${myconf} --disable-libdts"
+	! use png && ! use gtk && myconf="${myconf} --disable-png"
+	use lzo || myconf="${myconf} --disable-liblzo"
+	use mp2 || myconf="${myconf} --disable-twolame --disable-toolame"
+	use mp3 || myconf="${myconf} --disable-mp3lib"
+	use quicktime || myconf="${myconf} --disable-qtx"
+	use vorbis || myconf="${myconf} --disable-libvorbis"
+	use xanim && myconf="${myconf} --xanimcodecsdir=/usr/lib/xanim/mods"
+	if use x86 || use amd64; then
+		# Real codec support, only available on x86, amd64
+		if use real && use x86; then
+			myconf="${myconf} --realcodecsdir=/opt/RealPlayer/codecs"
+		elif use real && use amd64; then
+			myconf="${myconf} --realcodecsdir=/usr/$(get_libdir)/codecs"
+		else
+			myconf="${myconf} --disable-real"
+		fi
+		! use livecd && ! use bindist && \
+			myconf="${myconf} $(use_enable win32codecs win32dll)"
+	fi
+
+	#############
+	# Video Output #
+	#############
+
+	#use aalib && myconf="${myconf} --enable-aa"
+	for x in directfb ivtv ggi md5sum sdl xinerama; do
+		use ${x} || myconf="${myconf} --disable-${x}"
+	done
+	use aalib || myconf="${myconf} --disable-aa"
+	use dvb || myconf="${myconf} --disable-dvb --disable-dvbhead"
+	use fbcon || myconf="${myconf} --disable-fbdev"
+	use fbcon && use video_cards_s3virge && myconf="${myconf} --enable-s3fb"
+	use libcaca || myconf="${myconf} --disable-caca"
+	use opengl || myconf="${myconf} --disable-gl"
+	use svga ||	myconf="${myconf} --disable-vidix-internal"
+	use video_cards_mga || myconf="${myconf} --disable-mga"
+	( use X && use video_cards_mga ) || myconf="${myconf} --disable-xmga"
+	use video_cards_tga || myconf="${myconf} --disable-tga"
+	use video_cards_vesa || myconf="${myconf} --disable-vesa"
+	use zoran || myconf="${myconf} --disable-zr"
+
+	# GTK gmplayer gui
+	myconf="${myconf} $(use_enable gtk gui)"
+
+	if use xv; then
+		if use xvmc; then
+			myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCW"
+		else
+			myconf="${myconf} --disable-xvmc"
+		fi
+	else
+		myconf="${myconf} --disable-xv --disable-xvmc"
+	fi
+
+	if use video_cards_tdfx; then
+		myconf="${myconf} $(use_enable video_cards_tdfx tdfxvid) \
+			$(use_enable fbcon tdfxfb)"
+	else
+		myconf="${myconf} --disable-3dfx --disable-tdfxvid --disable-tdfxfb"
+	fi
+
+	#############
+	# Audio Output #
+	#############
+	for x in alsa arts esd jack nas openal; do
+		use ${x} || myconf="${myconf} --disable-${x}"
+	done
+	use oss || myconf="${myconf} --disable-ossaudio"
+
+	#################
+	# Advanced Options #
+	#################
+	# Platform specific flags, hardcoded on amd64 (see below)
+	for x in 3dnow 3dnowext mmx mmxext sse sse2; do
+		use ${x} || myconf="${myconf} --disable-${x}"
+	done
+	use debug && myconf="${myconf} --enable-debug=3"
+
+	if use ppc64 && use altivec; then
+		myconf="${myconf} --enable-altivec"
+		append-flags -maltivec -mabi=altivec
+	else
+		myconf="${myconf} --disable-altivec"
+	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
+
+	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 -O* -O2
+				filter-flags -fPIC -fPIE
+				use debug || append-flags -fomit-frame-pointer
+			fi
+		append-flags -D__STDC_LIMIT_MACROS
+	else
+		unset CFLAGS CXXFLAGS
+	fi
+
+	myconf="--cc=$(tc-getCC) \
+		--host-cc=$(tc-getBUILD_CC) \
+		--prefix=/usr \
+		--confdir=/usr/share/mplayer \
+		--datadir=/usr/share/mplayer \
+		--libdir=/usr/$(get_libdir) \
+		--enable-largefiles \
+		--enable-menu \
+		--enable-network \
+		${myconf}"
+	einfo "Running ./configure"
+	echo "CFLAGS=\"${CFLAGS}\" ./configure ${myconf}"
+	CFLAGS="${CFLAGS}" ./configure ${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/skins
+		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/skins/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
+
+	if ! use truetype; then
+		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
+	fi
+
+	insinto /etc
+	newins ${S}/etc/example.conf 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
+	dobin ${D}/usr/share/doc/${PF}/TOOLS/midentify
+
+	insinto /usr/share/mplayer
+	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 video_cards_mga; then
+		depmod -a &>/dev/null || :
+	fi
+
+	if use dvdnav && use dvd; then
+		ewarn "'dvdnav' support in MPlayer is known to be buggy, and will"
+		ewarn "break if you are using it in GUI mode.  It is only"
+		ewarn "included because some DVDs will only play with this feature."
+		ewarn "If using it for playback only (and not menu navigation),"
+		ewarn "specify the track # with your options."
+		ewarn "mplayer dvdnav://1"
+	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
+}