Cleanup dvd use flags, bug 174721; don't disable a52 internal support unless -dvd is used, bug 181082

Package-Manager: portage-2.1.3_rc5

4 files changed, 584 insertions, 5 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 9d9441bf39cf..97209f5607c0 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,13 @@
 # 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.492 2007/06/24 19:01:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.493 2007/06/24 23:16:01 beandog Exp $
+
+*mplayer-1.0.20070622-r1 (24 Jun 2007)
+
+  24 Jun 2007; Steve Dibb <beandog@gentoo.org>
+  +mplayer-1.0.20070622-r1.ebuild:
+  Cleanup dvd use flags, bug 174721; don't disable a52 internal support unless
+  -dvd is used, bug 181082
 
   24 Jun 2007; Raúl Porcel <armin76@gentoo.org>
   mplayer-1.0.20070622.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 8cb51e0e671c..e7d48c6c7214 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -38,6 +38,10 @@ EBUILD mplayer-1.0.20070427.ebuild 17353 RMD160 24046021addce9f819bb1cb7b3eff4f1
 MD5 652e1c61ca9773037c62b3971ba6f989 mplayer-1.0.20070427.ebuild 17353
 RMD160 24046021addce9f819bb1cb7b3eff4f1a26a78dd mplayer-1.0.20070427.ebuild 17353
 SHA256 39d410de28bc40bd01841b91c359ac5af561fc7190e5da79f6ea953a3f85ddbc mplayer-1.0.20070427.ebuild 17353
+EBUILD mplayer-1.0.20070622-r1.ebuild 16763 RMD160 065e5420bdca1d5e78740c052659dbc40d943342 SHA1 44f11c83d94b1cab212755f630c6c296ff224f32 SHA256 9e77fac402866b887c4e15f67bc7308913a7ccc3d714ff1124e2cc8925f1428c
+MD5 7603c7989d7c3ebb11fe7d650de5daad mplayer-1.0.20070622-r1.ebuild 16763
+RMD160 065e5420bdca1d5e78740c052659dbc40d943342 mplayer-1.0.20070622-r1.ebuild 16763
+SHA256 9e77fac402866b887c4e15f67bc7308913a7ccc3d714ff1124e2cc8925f1428c mplayer-1.0.20070622-r1.ebuild 16763
 EBUILD mplayer-1.0.20070622.ebuild 16713 RMD160 eedaf10d0b3ecf724909fb2be4c3f2c062080e71 SHA1 8822cb9763438c4f591dc396ee279a9efeb049ea SHA256 c80f799343fae0a997f24cbe8ebab9ae564d872fba540cd494cbfc838f908cf2
 MD5 38e573a05f282041e2cca4932624e2d5 mplayer-1.0.20070622.ebuild 16713
 RMD160 eedaf10d0b3ecf724909fb2be4c3f2c062080e71 mplayer-1.0.20070622.ebuild 16713
@@ -46,10 +50,10 @@ EBUILD mplayer-1.0_rc1-r2.ebuild 16352 RMD160 57f141c7024127ef5b8f6f8cccf42048b8
 MD5 03d03c34d77877d5e6cc3f4a26f1c204 mplayer-1.0_rc1-r2.ebuild 16352
 RMD160 57f141c7024127ef5b8f6f8cccf42048b8af0495 mplayer-1.0_rc1-r2.ebuild 16352
 SHA256 76e51ecdbc5f226c539a5c6badf1267c615084779bd555ccb9da07c9fafa2e88 mplayer-1.0_rc1-r2.ebuild 16352
-MISC ChangeLog 87326 RMD160 36420e1ff34505d0689bdcf010d6a23d833ec82d SHA1 49d70b5e8fafd68f66e6ece18077e787e8da20e5 SHA256 806000a0f11f2858185d0ba7ea8f3a1e7c164a504bce5d5e492899f26477e017
-MD5 d8a929ecb9494872fb09361b6c4c6113 ChangeLog 87326
-RMD160 36420e1ff34505d0689bdcf010d6a23d833ec82d ChangeLog 87326
-SHA256 806000a0f11f2858185d0ba7ea8f3a1e7c164a504bce5d5e492899f26477e017 ChangeLog 87326
+MISC ChangeLog 87555 RMD160 04e8d236c7719314cd1147b66cd834678c496dc6 SHA1 42929913a8b3b1c1760382a2af594e4efe9731ff SHA256 b48217fb0a8155bf82c71c659eb59b6fe0d43b33a4274c77ad80ae84b660a608
+MD5 dac75578c26c0af31c44e1f492338448 ChangeLog 87555
+RMD160 04e8d236c7719314cd1147b66cd834678c496dc6 ChangeLog 87555
+SHA256 b48217fb0a8155bf82c71c659eb59b6fe0d43b33a4274c77ad80ae84b660a608 ChangeLog 87555
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -66,6 +70,9 @@ SHA256 2109b605d48a82c43b70343c3568ffe59244b27f320e60d602e99623a34cb35f files/di
 MD5 038a8dfb2379f9d8221902da9c5a27c1 files/digest-mplayer-1.0.20070622 1563
 RMD160 e03134b892ac8ec4d63f44cfb01439be8dcec089 files/digest-mplayer-1.0.20070622 1563
 SHA256 0201774682322220ee404f4c2d31dcedaa258d113f8bf3f638794eb97cdc58d5 files/digest-mplayer-1.0.20070622 1563
+MD5 038a8dfb2379f9d8221902da9c5a27c1 files/digest-mplayer-1.0.20070622-r1 1563
+RMD160 e03134b892ac8ec4d63f44cfb01439be8dcec089 files/digest-mplayer-1.0.20070622-r1 1563
+SHA256 0201774682322220ee404f4c2d31dcedaa258d113f8bf3f638794eb97cdc58d5 files/digest-mplayer-1.0.20070622-r1 1563
 MD5 d7bbbcb7a88505edca78e82546995d4f files/digest-mplayer-1.0_rc1-r2 1997
 RMD160 95a72a90b4c19fc9063c6fab3bdb9647c6c5686f files/digest-mplayer-1.0_rc1-r2 1997
 SHA256 b0f6ba62381548cffb2eb17179cdb5927605e273c5d5b834b225cff495e9136a files/digest-mplayer-1.0_rc1-r2 1997
diff --git a/media-video/mplayer/files/digest-mplayer-1.0.20070622-r1 b/media-video/mplayer/files/digest-mplayer-1.0.20070622-r1
new file mode 100644
index 000000000000..0ce1a6e14aac
--- /dev/null
+++ b/media-video/mplayer/files/digest-mplayer-1.0.20070622-r1
@@ -0,0 +1,18 @@
+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 a43c125563b07210e65c244af6c16604 mplayer-20070622.tar.bz2 7623148
+RMD160 637abb1d9bbe1791b29c2abf3b11f10e0729f912 mplayer-20070622.tar.bz2 7623148
+SHA256 982da74bfb397f77f093650efc254c0bc340dd58f34f7f9d8b8c9f9c8ce11e8e mplayer-20070622.tar.bz2 7623148
+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.20070622-r1.ebuild b/media-video/mplayer/mplayer-1.0.20070622-r1.ebuild
new file mode 100644
index 000000000000..b85a2e57096b
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.0.20070622-r1.ebuild
@@ -0,0 +1,547 @@
+# 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.20070622-r1.ebuild,v 1.1 2007/06/24 23:16:01 beandog Exp $
+
+inherit eutils flag-o-matic multilib
+
+RESTRICT="nostrip"
+IUSE="3dnow 3dnowext a52 aac aalib alsa altivec amrnb amrwb arts bidi bl bindist cddb cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dvdnav dv 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 tga theora tivo truetype v4l v4l2 vidix win32codecs X x264 xanim xinerama xv xvid xvmc zoran"
+
+VIDEO_CARDS="s3virge mga tdfx vesa"
+
+for X in ${VIDEO_CARDS}; do
+	IUSE="${IUSE} video_cards_${X}"
+done
+
+BLUV=1.7
+SVGV=1.9.17
+MY_PV="20070622"
+S="${WORKDIR}/${PN}-${MY_PV}"
+AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
+SRC_URI="mirror://gentoo/${PN}-${MY_PV}.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 )
+	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
+	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )"
+
+DESCRIPTION="Media Player for Linux "
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+RDEPEND="sys-libs/ncurses
+	!livecd? (
+		!bindist? (
+			x86? (
+				win32codecs? ( media-libs/win32codecs )
+				real? ( media-libs/win32codecs
+					media-video/realplayer )
+				)
+			amd64? ( real? ( media-libs/amd64codecs ) )
+		)
+	)
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	amrnb? ( media-libs/amrnb )
+	amrwb? ( media-libs/amrwb )
+	arts? ( kde-base/arts )
+	openal? ( media-libs/openal )
+	bidi? ( dev-libs/fribidi )
+	cdparanoia? ( media-sound/cdparanoia )
+	directfb? ( dev-libs/DirectFB )
+	dts? ( media-libs/libdts )
+	dv? ( media-libs/libdv )
+	dvb? ( media-tv/linuxtv-dvb-headers )
+	dvd? ( dvdnav? ( media-libs/libdvdnav ) )
+	encode? (
+		aac? ( media-libs/faac )
+		mp2? ( media-sound/twolame )
+		mp3? ( media-sound/lame )
+		)
+	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-2 )
+	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-1.1.7 )
+	srt? ( >=media-libs/freetype-2.1
+		media-libs/fontconfig )
+	svga? ( media-libs/svgalib )
+	theora? ( media-libs/libtheora )
+	live? ( >=media-plugins/live-2007.02.20 )
+	truetype? ( >=media-libs/freetype-2.1
+		media-libs/fontconfig )
+	vidix? ( x11-libs/libXxf86vm
+			 x11-libs/libXext )
+	x264? ( media-libs/x264-svn )
+	xanim? ( media-video/xanim )
+	xinerama? ( x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/libXext )
+	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
+	)"
+#	video_cards_vesa? ( sys-apps/vbetool ) restrict on x86 first
+
+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 )
+	mp2? ( >=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"
+
+pkg_setup() {
+
+	if [[ -n ${LINGUAS} ]]; then
+		elog "For MPlayer's language support, the configuration will"
+		elog "use your LINGUAS variable from /etc/make.conf.  If you have more"
+		elog "than one language enabled, then the first one in the list will"
+		elog "be used to output the messages, if a translation is available."
+		elog "man pages will be created for all languages where translations"
+		elog "are also available."
+	fi
+
+}
+
+src_unpack() {
+
+	unpack ${PN}-${MY_PV}.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 gtk && unpack Blue-${BLUV}.tar.bz2
+
+	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
+
+	cd ${S}
+
+	# Fix hppa compilation
+	use 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
+
+	# Fix XShape detection
+	epatch ${FILESDIR}/${PN}-xshape.patch
+
+}
+
+src_compile() {
+
+	local myconf=" --disable-tv-bsdbt848 \
+		--disable-faad-external \
+		--disable-libcdio"
+
+	# MPlayer reads in the LINGUAS variable from make.conf, and sets
+	# the languages accordingly.  Some will have to be altered to match
+	# upstream's naming scheme.
+	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS/da/dk}
+
+	################
+	#Optional features#
+	###############
+	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 tivo || myconf="${myconf} --disable-vstream"
+
+
+	# 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 dvdnav || myconf="${myconf} --disable-dvdnav"
+	else
+		myconf="${myconf} --disable-dvdnav --disable-dvdread"
+
+		# Don't disable a52 support since it's native to libavcodec, and is
+		# going to be needed on most DVDs.
+		use a52 || myconf="${myconf} --disable-liba52"
+	fi
+
+	if use encode; then
+		use aac || myconf="${myconf} --disable-faac"
+		use dv || myconf="${myconf} --disable-libdv"
+		use x264 || myconf="${myconf} --disable-x264"
+	else
+		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264 \
+			--disable-faac"
+	fi
+
+	# SRT (subtitles) requires freetype support
+	# freetype support requires iconv
+	# iconv optionally can use unicode
+	if ! use srt; then
+		myconf="${myconf} --disable-ass"
+		if ! use truetype; then
+			myconf="${myconf} --disable-freetype"
+			if ! use iconv; then
+				myconf="${myconf} --disable-iconv --charset=noconv"
+			fi
+		fi
+	fi
+	use iconv && use unicode && myconf="${myconf} --charset=UTF-8"
+
+	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"
+
+	# DVB / Video4Linux / Radio support
+	if ( use dvb || use v4l || use v4l2 || use radio ); then
+		use dvb || myconf="${myconf} --disable-dvb --disable-dvbhead"
+		use v4l	|| myconf="${myconf} --disable-tv-v4l1"
+		use v4l2 || myconf="${myconf} --disable-tv-v4l2"
+		if ( use dvb || use v4l || use v4l2 ) && 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 \
+			--disable-dvb --disable-dvbhead"
+	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 tga theora xanim xvid; do
+		use ${x} || myconf="${myconf} --disable-${x}"
+	done
+	use aac || myconf="${myconf} --disable-faad-internal"
+	use amrnb || myconf="${myconf} --disable-libamr_nb"
+	use amrwb || myconf="${myconf} --disable-libamr_wb"
+	! use png && ! use gtk && myconf="${myconf} --disable-png"
+	use lzo || myconf="${myconf} --disable-liblzo"
+	use encode && 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
+		if ! use livecd && ! use bindist && ! use real; then
+			myconf="${myconf} $(use_enable win32codecs win32dll)"
+		fi
+	fi
+
+	#############
+	# Video Output #
+	#############
+
+	for x in directfb ivtv ggi md5sum sdl xinerama; do
+		use ${x} || myconf="${myconf} --disable-${x}"
+	done
+	use aalib || myconf="${myconf} --disable-aa"
+	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 video_cards_mga || myconf="${myconf} --disable-mga"
+	( use X && use video_cards_mga ) || myconf="${myconf} --disable-xmga"
+	use video_cards_vesa || myconf="${myconf} --disable-vesa"
+	use vidix || myconf="${myconf} --disable-vidix-internal \
+		--disable-vidix-external"
+	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
+	if ! use radio; then
+		use oss || myconf="${myconf} --disable-ossaudio"
+	fi
+
+	#################
+	# Advanced Options #
+	#################
+	# Platform specific flags, hardcoded on amd64 (see below)
+	if use x86 || use amd64 || use ppc; then
+		if use cpudetection || use livecd || use bindist; then
+			myconf="${myconf} --enable-runtime-cpudetection"
+		fi
+	fi
+	if use mmx; then
+		for x in 3dnow 3dnowext mmxext sse sse2; do
+			use ${x} || myconf="${myconf} --disable-${x}"
+		done
+	else
+		myconf="${myconf} --disable-mmx --disable-mmxext --disable-sse \
+		--disable-sse2 --disable-3dnow --disable-3dnowext"
+	fi
+	use debug && myconf="${myconf} --enable-debug=3"
+
+	if use altivec; then
+		myconf="${myconf} --enable-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=/etc/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
+	# This should have long ago been fixed, commenting out
+	#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}/etc/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
+	fi
+
+	if ! use srt && ! 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/mplayer
+	newins ${S}/etc/example.conf mplayer.conf
+
+	if use srt || use truetype;	then
+		cat >> ${D}/etc/mplayer/mplayer.conf << EOT
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+EOT
+	fi
+
+	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
+}