Ebuild cleanup, see bug 267124. Change to EAPI2; fix faad deps; fix jack deps; add libnut dep, use flag; fix rar dep; fix displaying svn version; remove hppa hack; add osdmenu use flag; disable apple-ir on no lirc; add shm use flag; unset more flags on custom-cflags use. Thanks to Andrew Savchenko for lots of hard work.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 80 insertions, 151 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 0498ce14499a..84f86e6c33ff 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.632 2009/05/27 10:35:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.633 2009/05/29 02:17:59 beandog Exp $
+
+  29 May 2009; Steve Dibb <beandog@gentoo.org>
+  mplayer-1.0_rc2_p28450.ebuild, mplayer-9999.ebuild, metadata.xml:
+  Ebuild cleanup, see bug 267124. Change to EAPI2; fix faad deps; fix jack
+  deps; add libnut dep, use flag; fix rar dep; fix displaying svn version;
+  remove hppa hack; add osdmenu use flag; disable apple-ir on no lirc; add
+  shm use flag; unset more flags on custom-cflags use. Thanks to Andrew
+  Savchenko for lots of hard work.
 
   27 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   mplayer-1.0_rc2_p20090322.ebuild,
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 5b2e822e17ba..5e588c8607c5 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mplayer-1.0_rc2_p20090322-fix-mp3lib-use-local-labels.patch 984 RMD160 8cd43ba4841036f6f8b19605144a8ed5f60065c1 SHA1 faa72c210ccff43b164d69f1e5996600c64a52d2 SHA256 cc87fe132e4494ab1131411a8f342d5589fedd017e227df2fe723686829011c8
 AUX mplayer-1.0_rc2_p20090322-fix-undeclared-spudec.patch 689 RMD160 a2a26ad4129bcfb4330ed6f1ee35e6ee1b73fb0d SHA1 918dee2cdff42297376d1afcb9eb9cff6f6f4094 SHA256 54b129ae19a1728981fef5530ba12828f163079201bb479afba7a74d4425e847
 AUX mplayer-1.0_rc2_p27725-libx264.patch 785 RMD160 ecbe6e80be98458af0723df6190c52f1e94b862d SHA1 b23ffc9c9563ad026f66ae57a402161be3e8031d SHA256 df837dd739a197e4ab1b7b5121e8e77e6dabc0cc1f53801b9fe6492f28974b47
@@ -21,14 +18,7 @@ EBUILD mplayer-1.0_rc2_p20090226.ebuild 19093 RMD160 d87618dd3bfe530439bdfea7692
 EBUILD mplayer-1.0_rc2_p20090322.ebuild 19451 RMD160 16a792dbae6e505204a794a37a54fd8ad336559f SHA1 50fbe16646eea316b2d65a24f0626db8e8533254 SHA256 1745d78e137bfc83c784b2e1459a148e5ec042b663e99d6be2c0e90d8129d33b
 EBUILD mplayer-1.0_rc2_p28058-r1.ebuild 18011 RMD160 e8cd4e085a85f0fbeb2833aee9478986bb746749 SHA1 4e561379851a82aa7352c443a59f6f13f69aff94 SHA256 baad154691f02acc6a8b85cc305aa1a3ab08366c977296f6241ffcf5cf032697
 EBUILD mplayer-1.0_rc2_p28288.ebuild 17846 RMD160 71a9e036e8369b0dfbe5e83760df592d9f4d725b SHA1 43a283d3a266cb2ff560e774016516c89bb2a665 SHA256 3784754239cb211cfdf4a7ec1cefffd21bf5085d82ea1ef67d1269009f7a23d1
-EBUILD mplayer-1.0_rc2_p28450.ebuild 17828 RMD160 1ccf429ad33c8270c97c1bea680b48fa084f4e72 SHA1 982f6fa89623d0153720c5f7bcd5088a8f202361 SHA256 1a7813fc8e4c305806df17a5f841f1e8cfc064d8eac16f156ef8c21f5c7f8ed9
-EBUILD mplayer-9999.ebuild 19417 RMD160 e4a28c386e12ef2a222ccb72c64ec8800e0e0eb9 SHA1 20eb909267d4121bf962a3dc835ec66961e50424 SHA256 fe11372a5dada370c3c74ea656ac5920757e391b96d76d7071bdc5ced44f2bba
-MISC ChangeLog 111218 RMD160 a9dec5982e9bf5eb95c5c828ebf4b0709576d851 SHA1 a1491051ac1f57709686a4a14f440a238e2e2b96 SHA256 c06e18f06717f2ab27ab8288549754cdbf432e596a64a466efc58373489180e4
-MISC metadata.xml 3405 RMD160 80eb53c61be88852dfef126f31942fbb3aba068c SHA1 1f604d906473880b62670996d410d372101452ac SHA256 accafabc488d687ff224884e1df590a35c4b4151c2433abe7095b3a5dd2b5a38
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkodF2kACgkQAiZjviIA2XihxgCgl5I5n4aDKhCY7+9yU42ctbvb
-s38AnA6IHvuUMtJTA0LB+GowSneC/LhL
-=lDwl
------END PGP SIGNATURE-----
+EBUILD mplayer-1.0_rc2_p28450.ebuild 15785 RMD160 ad72bc718d233452902565f86749ffe793af6c60 SHA1 617803e7cbe56e6b067ea61a3bfe7874201d7720 SHA256 67303704e24f1a95a1d8d74aea10e98bfb931789e316884676111098fa50f56e
+EBUILD mplayer-9999.ebuild 19423 RMD160 d6b3521a5f06e0951af7f93bb94cd95e9e89f79d SHA1 7298fd3ce74c297eeec6021d10dbbd602706f969 SHA256 e656d8d8f3a35e0a0ac15098b9c54c198df6977a222818a9e97c3d2f379422bd
+MISC ChangeLog 111664 RMD160 fa3d88f6419a5ac3e2145e7b42d80094ae09d57c SHA1 84edb5f5141d5380fcac3ddb6854fee230111775 SHA256 b13d5be425d5b095833a9b13d9dab1dcb9d5959171a6d4250f4dfe0f16ed122d
+MISC metadata.xml 3605 RMD160 e0d5d5a083a9bc0b4b3f45073ca5049b5d8bf786 SHA1 ebd309a050a804e8924b2d7d1ae11bfc91347502 SHA256 1f96ecb6ef0193e24f8d7e3ad2af21315425d586e4b49d5eb639b1dcaa2043c9
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 578787868552..c526fb172644 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -28,6 +28,8 @@
     <flag name="mp2">Enables support for twolame, an MP2 audio library</flag>
     <flag name="nemesi">Enable Nemesi Streaming Media support</flag>
 	<flag name="network">Enables network streaming support</flag>
+	<flag name="nut">Enables support for the NUT container format</flag>
+	<flag name="osdmenu">Enables support for on-screen display (OSD) menus</flag>
     <flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag>
     <flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
     <flag name="radio">Enable V4L2 radio interface and support</flag>
@@ -36,6 +38,7 @@
     <flag name="realcodecs">External Real Player binary codec support (UNSUPPORTED)</flag>
     <flag name="rtc">Enables usage of the linux real time clock. The alternative is software emulation of rtc</flag>
     <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
+    <flag name="shm">Enable support for shm</flag>
     <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
     <flag name="teletext">Support for TV teletext interface</flag>
     <flag name="tga">Enables Targa video output</flag>
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p28450.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p28450.ebuild
index 06c3aba15739..0cb2b3b14ac1 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p28450.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p28450.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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_p28450.ebuild,v 1.9 2009/03/24 21:32:35 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p28450.ebuild,v 1.10 2009/05/29 02:17:59 beandog Exp $
 
 EAPI="1"
 
@@ -464,100 +464,26 @@ src_compile() {
 	#echo "CFLAGS=\"${CFLAGS}\" ./configure ${myconf}"
 	CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died"
 
-	emake || die "Failed to build MPlayer!"
-	use doc && make -C DOCS/xml html-chunked
-}
-
-src_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" \
-		 INSTALLSTRIP="" \
-		 install || die "Failed to install MPlayer!"
-
-	dodoc AUTHORS Changelog README etc/codecs.conf
-	# 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 "cp docs died"
-	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 "cp docs died"
-
-	# 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 "cp skins died"
-
-		# Fix the symlink
-		rm -rf "${D}/usr/bin/gmplayer"
-		dosym mplayer /usr/bin/gmplayer
-	fi
-
-	if ! use ass && ! 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 ass || use truetype;	then
-		cat >> "${D}/etc/mplayer/mplayer.conf" << EOT
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-EOT
+	#use doc && make -C DOCS/xml html-chunked
+	if use doc; then
+		if [[ -z $LINGUAS ]]; then
+			make -C DOCS/xml html-chunked
+		else
+			# select available languages from $LINGUAS
+			LINGUAS=${LINGUAS/zh/zh_CN}
+			local a1=( cs de en es fr hu it pl ru zh_CN )
+			local a2=( $LINGUAS )
+			for (( i=0; i<${#a1[*]}; i++ )); do
+				for (( j=0; j<${#a1[*]}; j++ )); do
+				[[ ${a1[i]} == ${a2[j]} ]] && make -C DOCS/xml \
+					html-chunked-${a2[j]}
+				done
+			done
+		fi
 	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	newbin "${S}/TOOLS/midentify.sh" 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
+src_install() {
+	use doc && dohtml -r "${S}"/DOCS/HTML/*
 }
 
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L "${ROOT}/usr/share/mplayer/font" -a \
-		 ! -e "${ROOT}/usr/share/mplayer/font" ]
-	then
-		rm -f "${ROOT}/usr/share/mplayer/font"
-	fi
-
-	if [ -L "${ROOT}/usr/share/mplayer/subfont.ttf" -a \
-		 ! -e "${ROOT}/usr/share/mplayer/subfont.ttf" ]
-	then
-		rm -f "${ROOT}/usr/share/mplayer/subfont.ttf"
-	fi
-}
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index aade10c60729..6c5d2d5011b4 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.2 2009/03/24 21:32:35 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.3 2009/05/29 02:17:59 beandog Exp $
 
-EAPI="1"
+EAPI="2"
 
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
 inherit eutils flag-o-matic multilib subversion
 
 IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +amrnb +amrwb arts +ass
-bidi bindist bl +cddb +cdio cdparanoia -cpudetection -custom-cflags
--custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3
+bidi bindist bl +cddb +cdio cdparanoia cpudetection custom-cflags
+custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3
 +enca +encode esd +faac +faad fbcon ftp gif ggi -gtk +iconv ipv6 jack
 joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum +mmx
-mmxext mng +mp2 +mp3 musepack nas +nemesi +network openal +opengl oss png pnm
-pulseaudio pvr +quicktime radio +rar +real +rtc -samba
-+schroedinger sdl +speex sse sse2 ssse3 svga teletext tga +theora +tremor
-+truetype +unicode v4l v4l2 vdpau vidix +vorbis -win32codecs +X +x264 xanim
+mmxext mng +mp2 +mp3 musepack nas +nemesi +network nut openal +opengl +osdmenu
+oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba
++schroedinger sdl +shm +speex sse sse2 ssse3 svga teletext tga +theora +tremor
++truetype +unicode v4l v4l2 vdpau vidix +vorbis win32codecs +X +x264 xanim
 xinerama +xscreensaver +xv +xvid xvmc zoran"
 
 VIDEO_CARDS="s3virge mga tdfx nvidia vesa"
@@ -29,11 +29,11 @@ BLUV="1.7"
 SVGV="1.9.17"
 AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
 SRC_URI="!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 )
+		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 )
+		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 )"
 
@@ -72,7 +72,7 @@ RDEPEND="sys-libs/ncurses
 		)
 	esd? ( media-sound/esound )
 	enca? ( app-i18n/enca )
-	faad? ( media-libs/faad2 )
+	faad? ( !aac? ( media-libs/faad2 ) )
 	gif? ( media-libs/giflib )
 	ggi? ( media-libs/libggi
 		media-libs/libggiwmh )
@@ -81,6 +81,7 @@ RDEPEND="sys-libs/ncurses
 		x11-libs/libXext
 		x11-libs/libXi
 		x11-libs/gtk+:2 )
+	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg? ( media-libs/jpeg )
 	ladspa? ( media-libs/ladspa-sdk )
 	libcaca? ( media-libs/libcaca )
@@ -90,12 +91,14 @@ RDEPEND="sys-libs/ncurses
 	mng? ( media-libs/libmng )
 	musepack? ( >=media-libs/libmpcdec-1.2.2 )
 	nas? ( media-libs/nas )
+	nut? ( >=media-libs/libnut-661 )
 	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng )
 	pnm? ( media-libs/netpbm )
 	pulseaudio? ( media-sound/pulseaudio )
 	rar? ( || ( app-arch/unrar-gpl
-		app-arch/unrar ) )
+		app-arch/unrar
+		app-arch/rar ) )
 	samba? ( net-fs/samba )
 	schroedinger? ( media-libs/schroedinger )
 	sdl? ( media-libs/libsdl )
@@ -106,7 +109,7 @@ RDEPEND="sys-libs/ncurses
 	truetype? ( media-libs/freetype:2
 		media-libs/fontconfig )
 	video_cards_nvidia? (
-		vdpau? ( >=x11-drivers/nvidia-drivers-180.37 )
+		vdpau? ( >=x11-drivers/nvidia-drivers-180.51 )
 	)
 	vidix? ( x11-libs/libXxf86vm
 			 x11-libs/libXext )
@@ -125,6 +128,7 @@ RDEPEND="sys-libs/ncurses
 	)"
 
 DEPEND="${RDEPEND}
+	amd64? ( dev-lang/yasm )
 	doc? ( dev-libs/libxslt )
 	dga? ( x11-proto/xf86dgaproto )
 	dxr3? ( media-video/em8300-libraries )
@@ -135,6 +139,8 @@ DEPEND="${RDEPEND}
 		   x11-proto/xf86vidmodeproto )
 	X? ( x11-proto/xextproto
 		 x11-proto/xf86vidmodeproto )
+	x86? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
 	xscreensaver? ( x11-proto/scrnsaverproto )
 	iconv? ( virtual/libiconv )"
 
@@ -219,8 +225,9 @@ src_unpack() {
 
 	cd "${S}"
 
-	# Fix hppa compilation
-	use hppa && sed -i -e "s/-O4/-O1/" "${S}/configure"
+	# Set SVN version manually
+	subversion_wc_info
+	sed -i s/UNKNOWN/${ESVN_WC_REVISION}/ "${S}/version.sh"
 
 	if use svga; then
 		echo
@@ -231,12 +238,9 @@ src_unpack() {
 
 		mv "${WORKDIR}/svgalib_helper" "${S}/libdha"
 	fi
-
-	# Fix polish spelling errors
-	[[ -n ${LINGUAS} ]] && sed -e 's:Zarządano:Zażądano:' -i help/help_mp-pl.h
 }
 
-src_compile() {
+src_configure() {
 
 	local myconf=""
 
@@ -253,7 +257,6 @@ src_compile() {
 	################
 	#Optional features#
 	###############
-	myconf="${myconf} --enable-menu"
 	myconf="${myconf} $(use_enable network)"
 	use ass || myconf="${myconf} --disable-ass"
 	use bidi || myconf="${myconf} --disable-fribidi"
@@ -262,8 +265,11 @@ src_compile() {
 	use encode || myconf="${myconf} --disable-mencoder"
 	use ftp || myconf="${myconf} --disable-ftp"
 	use ipv6 || myconf="${myconf} --disable-inet6"
-	use lirc || myconf="${myconf} --disable-lirc --disable-lircc"
+	use lirc || myconf="${myconf} --disable-lirc --disable-lircc \
+		--disable-apple-ir"
 	use nemesi || myconf="${myconf} --disable-nemesi"
+	use nut || myconf="${myconf} --disable-libnut"
+	use osdmenu || myconf="${myconf} --disable-menu"
 	use rar || myconf="${myconf} --disable-unrarexec"
 	use rtc || myconf="${myconf} --disable-rtc"
 	use samba || myconf="${myconf} --disable-smb"
@@ -425,6 +431,7 @@ src_compile() {
 	done
 	use aalib || myconf="${myconf} --disable-aa"
 	use dga || myconf="${myconf} --disable-dga1 --disable-dga2"
+	use dxr3 || myconf="${myconf} --disable-dxr3"
 	use fbcon || myconf="${myconf} --disable-fbdev"
 	use fbcon && use video_cards_s3virge && myconf="${myconf} --enable-s3fb"
 	use libcaca || myconf="${myconf} --disable-caca"
@@ -434,10 +441,6 @@ src_compile() {
 	use vidix || myconf="${myconf} --disable-vidix --disable-vidix-pcidb"
 	use zoran || myconf="${myconf} --disable-zr"
 
-	# MPlayer incorrectly looks for DXR3 support, so forcibly enable
-	# if requested. See bug 223587
-	myconf="${myconf} $(use_enable dxr3)"
-
 	# GTK gmplayer gui
 	# Unsupported by Gentoo, upstream has dropped development
 	myconf="${myconf} $(use_enable gtk gui)"
@@ -487,22 +490,15 @@ src_compile() {
 	# specify which ones to use.  If disabled, mplayer will automatically
 	# enable all CPU optimizations that the host build supports.
 	if use custom-cpuopts; then
-		for x in 3dnow 3dnowext mmx mmxext sse sse2 ssse3; do
+		for x in 3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3; do
 			myconf="${myconf} $(use_enable $x)"
 		done
 	fi
 
 	use debug && myconf="${myconf} --enable-debug=3"
 
-	myconf="${myconf} $(use_enable altivec)"
-
 	if use custom-cflags; then
 
-		# Can't remember why this was in here, commented out, please
-		# document if you are going to re-enable it, bug 260064
-		# let's play the filtration game!  MPlayer hates on all!
-		# strip-flags
-
 		# ugly optimizations cause MPlayer to cry on x86 systems!
 			if use x86 || use x86-fbsd ; then
 				replace-flags -O* -O2
@@ -512,7 +508,7 @@ src_compile() {
 			fi
 		append-flags -D__STDC_LIMIT_MACROS
 	else
-		unset CFLAGS CXXFLAGS
+		unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS YASMFLAGS
 	fi
 
 	myconf="--cc=$(tc-getCC) \
@@ -526,6 +522,9 @@ src_compile() {
 	#echo "CFLAGS=\"${CFLAGS}\" ./configure ${myconf}"
 	CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died"
 
+}
+
+src_compile() {
 	emake || die "Failed to build MPlayer!"
 	use doc && make -C DOCS/xml html-chunked
 }
@@ -545,15 +544,18 @@ src_install() {
 
 	docinto tech/
 	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
-	docinto tech/realcodecs/
-	dodoc DOCS/tech/realcodecs/*
+	docinto TOOLS/
+	dodoc TOOLS/*
+	if use real; then
+		docinto tech/realcodecs/
+		dodoc DOCS/tech/realcodecs/*
+		docinto TOOLS/realcodecs/
+		dodoc TOOLS/realcodecs/*
+	fi
 	docinto tech/mirrors/
 	dodoc DOCS/tech/mirrors/*
 
-	docinto TOOLS/
-	dodoc TOOLS/*
-	docinto TOOLS/realcodecs/
-	dodoc TOOLS/realcodecs/*
+	use doc && dohtml -r "${S}"/DOCS/HTML/*
 
 	# Install the default Skin and Gnome menu entry
 	if use gtk; then
@@ -604,7 +606,7 @@ EOT
 
 	insinto /usr/share/mplayer
 	doins "${S}/etc/input.conf"
-	doins "${S}/etc/menu.conf"
+	use osdmenu && doins "${S}/etc/menu.conf"
 }
 
 pkg_preinst() {