Fixed a *massive amount* of broken configure behaviour, linkage, general crap that shouldn't have never made it into even unstable. Removed pre4-r6, pre5-r1, added pre4-r7, pre5-r2. These ebuilds are not to be modified unless it's a compilation fix or _minor_ tweak.

6 files changed, 156 insertions, 83 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index aade8a7f5a1d..54867813cc93 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.175 2004/07/24 07:58:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.176 2004/07/24 08:28:13 ferringb Exp $
+
+*mplayer-1.0_pre5-r2 mplayer-1.0_pre4-r7 (24 Jul 2004)
+
+  24 Jul 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r6.ebuild,
+  mplayer-1.0_pre4-r7.ebuild, mplayer-1.0_pre5-r2.ebuild:
+  As it stands, the stable ebuilds should now be just that, _stable_. Mplayer
+  1.0_pre4-r7 and 1.0_pre5-r2 are *not* to be fooled with, compilation fixes
+  are the only thing that should be added to these ebuilds- anything else
+  belongs in a unstable revbump. This fixes compilation issues w/
+  USE="-gtk png", USE="-gtk" and any of xv X xinerama, 
+  USE="gif" (compilation failure), USE="-gif" (unconditionally linking in 
+  libgif broken in previous fix for #58086), DOCS/TOOLS not being installed, 
+  removed dep on X for gif (it was caused by said fix), USE="dvdread -dvd" 
+  bring in dvdread and not using it, etc.  Pretty large amount of fixes.  
+  Versions 1.0_pre4-r6 and 1.0_pre5-r1 are removed from the tree, no user 
+  should be using them (borked badly).
 
   24 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   files/cachefill.patch:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index fffcf77702ad..048faba5096a 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,3 @@
-MD5 276ea1b9aa7a4f3466db54d46d497bcc ChangeLog 31585
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 b813a65769af5d2a2ca1ceba1347974d mplayer-0.92-r1.ebuild 11511
 MD5 7eeb1235c1263ecb110925e53de1eb06 mplayer-1.0_pre2-r1.ebuild 11375
@@ -10,8 +9,9 @@ MD5 fbdd96b2a3f0f78bdc8cbded3bb3927b mplayer-1.0_pre4-r2.ebuild 11948
 MD5 6b9e16c4f08ac48748812909ed431f31 mplayer-1.0_pre4-r3.ebuild 13034
 MD5 d13f33f9022f7abccfe9b14f96531057 mplayer-1.0_pre4-r4.ebuild 13157
 MD5 071a354aa3c0e9290b6dcfc8c3621d87 mplayer-1.0_pre4.ebuild 11319
-MD5 282bf14f562d5ca7be674653216716db mplayer-1.0_pre4-r6.ebuild 12921
-MD5 c56a63aa13614c3771ebf90f6e7357fa mplayer-1.0_pre5-r1.ebuild 12663
+MD5 41244b1ba72f548699bd697fe1eebb0e mplayer-1.0_pre5-r2.ebuild 13751
+MD5 f9a1be48b9c1bf3d52cfbece594b4842 ChangeLog 32546
+MD5 fd0b7601de4cce4219492e76b0e741db mplayer-1.0_pre4-r7.ebuild 14023
 MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
 MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
 MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358
@@ -24,7 +24,7 @@ MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r2 358
 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r3 358
 MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r4 358
 MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
-MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
 MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
 MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
 MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
@@ -35,24 +35,24 @@ MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.pat
 MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
 MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411
 MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
+MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
 MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
 MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
 MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
 MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
-MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
 MD5 aaadaff9756ff85c9855b2bbd50da184 files/mplayer-1.0_pre4-gcc34-mtune.patch 3493
 MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
-MD5 084f1aa4fbe48d34c3154d5a4f238579 files/amd64_fix_the_blue_love.patch 17751
-MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r6 358
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
+MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
 MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
-MD5 ad254e1f8a5166ae1c5b53bc3c76ffd2 files/mplayer-1.0_pre5-yuv2rbg_kludge.patch 12585
 MD5 d7d214ab46189ad1138a0a37eaa859d4 files/noenca.patch 289
+MD5 ad254e1f8a5166ae1c5b53bc3c76ffd2 files/mplayer-1.0_pre5-yuv2rbg_kludge.patch 12585
+MD5 084f1aa4fbe48d34c3154d5a4f238579 files/amd64_fix_the_blue_love.patch 17751
+MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358
+MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
 MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
 MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
 MD5 7dce8f2598e84e3d94186e2eb50f553b files/mplayer-1.0_pre4-mga-kernel2.6.patch 27826
-MD5 3aabe241ce3c7d60ea6f607cb7ab033a files/digest-mplayer-1.0_pre5-r1 358
-MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
+MD5 3aabe241ce3c7d60ea6f607cb7ab033a files/digest-mplayer-1.0_pre5-r2 358
+MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
 MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r6 b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r7
index 18d8bea4d6ed..18d8bea4d6ed 100644
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r6
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r7
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre5-r1 b/media-video/mplayer/files/digest-mplayer-1.0_pre5-r2
index a5d89e119968..a5d89e119968 100644
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre5-r1
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre5-r2
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
index aaa81ebb313d..faa2a54b6010 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild,v 1.5 2004/07/24 05:25:28 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.1 2004/07/24 08:28:13 ferringb Exp $
 
 inherit eutils flag-o-matic kmod
 
-IUSE="3dfx 3dnow aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd edl encode esd fbdev gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad  matroska matrox mmx mpeg mythtv nas network nls oggvorbis opengl oss rtc samba sdl sse svga tga theora truetype v4l v4l2 xinerama X xmms xvid gnome"
+IUSE="3dfx 3dnow aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd dvdread edl encode esd fbdev gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad  matroska matrox mmx mpeg mythtv nas network nls oggvorbis opengl oss png rtc samba sdl sse svga tga theora truetype v4l v4l2 xinerama X xmms xv xvid gnome"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -22,7 +22,11 @@ DESCRIPTION="Media Player for Linux"
 HOMEPAGE="http://www.mplayerhq.hu/"
 
 # 'encode' in USE for MEncoder.
-RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
+RDEPEND="xvid? (
+		ppc? ( >=media-libs/xvid-0.9.0 )
+		amd64? ( >=media-libs/xvid-0.9.0 )
+		x86? ( >=media-libs/xvid-0.9.0 )
+		)
 	x86? ( divx4linux? (  >=media-libs/divx4linux-20030428 )
 		 >=media-libs/win32codecs-0.60 )
 	aalib? ( media-libs/aalib )
@@ -31,14 +35,15 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
 	directfb? ( dev-libs/DirectFB )
-	dvd? ( dvdread? ( media-libs/libdvdread ) )
+	dvdread? ( media-libs/libdvdread )
 	encode? ( media-sound/lame
 			>=media-libs/libdv-0.9.5 )
 	esd? ( media-sound/esound )
 	gif? ( media-libs/giflib
 		media-libs/libungif )
 	ggi? ( media-libs/libggi )
-	gtk? ( media-libs/libpng
+	gtk? (
+		media-libs/libpng
 		virtual/x11
 		=x11-libs/gtk+-1.2*
 		=dev-libs/glib-1.2* )
@@ -153,7 +158,6 @@ src_unpack() {
 
 		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
@@ -162,26 +166,44 @@ src_unpack() {
 src_compile() {
 
 	filter-flags -fPIE
-
 	local myconf=
 	################
 	#Optional features#
 	###############
 	myconf="${myconf} $(use_enable bidi fribidi)"
 	myconf="${myconf} $(use_enable cdparanoia)"
-	myconf="${myconf} $(use_enable dvd mpdvdkit)"
+
+	if use dvd; then
+		myconf="${myconf} $(use_enable dvdread) $(use_enable !dvdread mpdvdkit)"
+	else
+		myconf="${myconf} --disable-dvdread --disable-mpdvdkit"
+	fi
 	myconf="${myconf} $(use_enable edl)"
 	myconf="${myconf} $(use_enable encode mencoder)"
-	myconf="${myconf} $(use_enable gtk gui)"
-	myconf="${myconf} $(use_enable X x11) $(use_enable X xv) $(use_enable X vm)"
+
+	if use !gtk && use !X && use !xv && use !xinerama; then
+		myconf="${myconf} --disable-gui --disable-x11 --disable-xv --disable-xmga --disable-xinerama --disable-vm --disable-xvmc"
+	else
+		#note we ain't touching --enable-vm.  That should be locked down in the future.
+		myconf="${myconf} --enable-x11 $(use_enable xinerama) $(use_enable xv) $(use_enable gtk gui)"
+	fi
+
+	#disable png *only* if the flag is off, and gtk gui isn't on.
+	if use !png && use !gtk; then
+		myconf="${myconf} --disable-png"
+	else
+		myconf="${myconf} $(use_enable png)"
+	fi
 	myconf="${myconf} $(use_enable ipv6 inet6)"
 	myconf="${myconf} $(use_enable joystick)"
 	myconf="${myconf} $(use_enable lirc)"
+
 	if use ia64; then
 		myconf="${myconf} --disable-live"
 	else
 		myconf="${myconf} $(use_enable live)"
 	fi
+
 	myconf="${myconf} $(use_enable network) $(use_enable network ftp)"
 	myconf="${myconf} $(use_enable rtc)"
 	myconf="${myconf} $(use_enable samba smb)"
@@ -193,16 +215,11 @@ src_compile() {
 	# Codecs #
 	########
 	myconf="${myconf} $(use_enable divx4linux)"
-	# gif support needs X11 libs, don't build it if there is no X support
-	if use X && use gif ; then
-		myconf="${myconf} --enable-gif"
-	else
-		myconf="${myconf} --disable-gif"
-	fi
+	myconf="${myconf} $(use_enable gif)"
 	myconf="${myconf} $(use_enable jpeg)"
 	myconf="${myconf} $(use_enable lzo liblzo)"
 	myconf="${myconf} $(use_enable matroska external-matroska) $(use_enable !matroska internal-matroska)"
-	myconf="${myconf} $(use_enable mpeg external-faad) $(use_enable !mpeg internal-faad)"
+	myconf="${myconf} $(use_enable mpeg external-faad)         $(use_enable !mpeg internal-faad)"
 	myconf="${myconf} $(use_enable oggvorbis vorbis)"
 	if use ia64; then
 		myconf="${myconf} --disable-theora"
@@ -234,7 +251,6 @@ src_compile() {
 	myconf="${myconf} $(use_enable sdl)"
 	myconf="${myconf} $(use_enable svga)"
 	myconf="${myconf} $(use_enable tga)"
-	myconf="${myconf} $(use_enable xinerama)"
 
 	#############
 	# Audio Output #
@@ -249,12 +265,18 @@ src_compile() {
 	#################
 	# Advanced Options #
 	#################
-	myconf="${myconf} $(use_enable 3dnow) $(use_enable 3dnow 3dnowex)"
+	if ! use 3dnow; then
+		myconf="${myconf} --disable-3dnow --disable-3dnowex";
+	fi
+	if ! use sse; then
+		myconf="${myconf} --disable-sse --disable-sse2";
+	fi
+	if use !mmx && use !3dnow && use !sse; then
+		myconf="${myconf} --disable-mmx --disable-mmx2";
+	fi
 	myconf="${myconf} $(use_enable altivec)"
 	myconf="${myconf} $(use_enable debug)"
-	myconf="${myconf} $(use_enable mmx) --disable-mmx2"
 	myconf="${myconf} $(use_enable nls i18n)"
-	myconf="${myconf} $(use_enable sse) --disable-sse2"
 
 	if [ -d /opt/RealPlayer9/Real/Codecs ]
 	then
@@ -290,6 +312,10 @@ src_compile() {
 		fi
 	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
 	unset CFLAGS CXXFLAGS
 	./configure --prefix=/usr \
 		--confdir=/usr/share/mplayer \
@@ -302,14 +328,10 @@ src_compile() {
 		--with-x11incdir=/usr/X11R6/include \
 		${myconf} || die
 
-		# config.mak doesn't set GIF_LIB so gif related source files fail
-		if use gif && use X
-		then
-			if use gif ; then
-				sed -e "s:GIF_LIB =:GIF_LIB = -lgif:" -i config.mak
-			else
-				sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak
-			fi
+		# when gif is autodetected, GIF_LIB is set correctly.  We're explicitly controlling it, and it doesn't behave correctly.
+		# so... we have to help it along.
+		if use gif; then
+			sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak
 		fi
 
 	einfo "Make"
@@ -342,15 +364,22 @@ src_install() {
 	fi
 
 	dodoc AUTHORS ChangeLog README
+
 	# Install the documentation; DOCS is all mixed up not just html
-	docinto /usr/share/doc/${PF} ; dodoc -r ${S}/DOCS
+	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
 
 	# Copy misc tools to documentation path, as they're not installed
 	# directly
-	docinto /usr/share/doc/${PF} ; dodoc -r ${S}/TOOLS
+	# 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
+	if use gtk; then
 		dodir /usr/share/mplayer/Skin
 		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
 
@@ -359,8 +388,7 @@ src_install() {
 		dosym mplayer /usr/bin/gmplayer
 	fi
 
-	if use gnome
-	then
+	if use gnome; then
 		insinto /usr/share/pixmaps
 		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
 		insinto /usr/share/gnome/apps/Multimedia
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild
index 177fa72d1e66..a809bd2fc104 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild,v 1.8 2004/07/24 05:25:28 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild,v 1.1 2004/07/24 08:28:13 ferringb Exp $
 
 inherit eutils flag-o-matic kmod
 
@@ -17,14 +17,17 @@ SRC_URI="mirror://mplayer/MPlayer/releases/MPlayer-${MY_PV}.tar.bz2
 	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
 	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
 	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )"
+
 # Only install Skin if GUI should be build (gtk as USE flag)
 DESCRIPTION="Media Player for Linux"
 HOMEPAGE="http://www.mplayerhq.hu/"
 
 # 'encode' in USE for MEncoder.
 RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
-	x86? ( divx4linux? (  >=media-libs/divx4linux-20030428 )
-		 >=media-libs/win32codecs-0.60 )
+	x86? (
+		divx4linux? (  >=media-libs/divx4linux-20030428 )
+		>=media-libs/win32codecs-0.60
+		)
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
@@ -32,16 +35,20 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	cdparanoia? ( media-sound/cdparanoia )
 	directfb? ( dev-libs/DirectFB )
 	dvd? ( dvdread? ( media-libs/libdvdread ) )
-	encode? ( media-sound/lame
-			>=media-libs/libdv-0.9.5 )
+	encode? (
+		media-sound/lame
+		>=media-libs/libdv-0.9.5
+		)
 	esd? ( media-sound/esound )
 	gif? ( media-libs/giflib
 		media-libs/libungif )
 	ggi? ( media-libs/libggi )
-	gtk? ( media-libs/libpng
+	gtk? (
+		media-libs/libpng
 		virtual/x11
 		=x11-libs/gtk+-1.2*
-		=dev-libs/glib-1.2* )
+		=dev-libs/glib-1.2*
+		)
 	jpeg? ( media-libs/jpeg )
 	libcaca? ( media-libs/libcaca )
 	lirc? ( app-misc/lirc )
@@ -159,11 +166,28 @@ src_compile() {
 	###############
 	myconf="${myconf} $(use_enable bidi fribidi)"
 	myconf="${myconf} $(use_enable cdparanoia)"
-	myconf="${myconf} $(use_enable dvd mpdvdkit)"
+	if use dvd; then
+		myconf="${myconf} $(use_enable dvdread) $(use_enable !dvdread mpdvdkit)"
+	else
+		myconf="${myconf} --disable-dvdread --disable-mpdvdkit"
+	fi
 	myconf="${myconf} $(use_enable edl)"
 	myconf="${myconf} $(use_enable encode mencoder)"
 	myconf="${myconf} $(use_enable gtk gui)"
-	myconf="${myconf} $(use_enable X x11) $(use_enable X xv) $(use_enable X vm)"
+
+	if use !gtk && use !X && use !xv && use !xinerama; then
+		myconf="${myconf} --disable-gui --disable-x11 --disable-xv --disable-xmga --disable-xinerama --disable-vm --disable-xvmc"
+	else
+		#note we ain't touching --enable-vm.  That should be locked down in the future.
+		myconf="${myconf} --enable-x11 $(use_enable xinerama) $(use_enable xv) $(use_enable gtk gui)"
+	fi
+
+	# disable png *only* if gtk && png aren't on
+	if use png || use gtk; then
+		myconf="${myconf} --enable-png"
+	else
+		myconf="${myconf} --disable-png"
+	fi
 	myconf="${myconf} $(use_enable ipv6 inet6)"
 	myconf="${myconf} $(use_enable joystick)"
 	myconf="${myconf} $(use_enable lirc)"
@@ -183,12 +207,7 @@ src_compile() {
 	# Codecs #
 	########
 	myconf="${myconf} $(use_enable divx4linux)"
-	# gif support needs X11 libs, don't build it if there is no X support
-	if use X && use gif ; then
-		myconf="${myconf} --enable-gif"
-	else
-		myconf="${myconf} --disable-gif"
-	fi
+	myconf="${myconf} $(use_enable gif)"
 	myconf="${myconf} $(use_enable jpeg)"
 	myconf="${myconf} $(use_enable lzo liblzo)"
 	myconf="${myconf} $(use_enable matroska external-matroska) $(use_enable !matroska internal-matroska)"
@@ -224,7 +243,6 @@ src_compile() {
 	myconf="${myconf} $(use_enable sdl)"
 	myconf="${myconf} $(use_enable svga)"
 	myconf="${myconf} $(use_enable tga)"
-	myconf="${myconf} $(use_enable xinerama)"
 
 	#############
 	# Audio Output #
@@ -239,12 +257,19 @@ src_compile() {
 	#################
 	# Advanced Options #
 	#################
+	if ! use 3dnow; then
+		myconf="${myconf} --disable-3dnow --disable-3dnowex";
+	fi
+	if ! use sse; then
+		myconf="${myconf} --disable-sse --disable-sse2";
+	fi
+	if use !mmx && use !3dnow && use !sse; then
+		myconf="${myconf} --disable-mmx --disable-mmx2"
+	fi
 	myconf="${myconf} $(use_enable 3dnow) $(use_enable 3dnow 3dnowex)"
 	myconf="${myconf} $(use_enable altivec)"
 	myconf="${myconf} $(use_enable debug)"
-	myconf="${myconf} $(use_enable mmx) --disable-mmx2"
 	myconf="${myconf} $(use_enable nls i18n)"
-	myconf="${myconf} $(use_enable sse) --disable-sse2"
 
 	if [ -d /opt/RealPlayer9/Real/Codecs ]
 	then
@@ -279,6 +304,12 @@ src_compile() {
 			einfo "Not building matrox driver.  It doesn't seem to like other archs.  Please let me know at chriswhite@gentoo.org if you find out otherwise."
 		fi
 	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
+
 	unset CFLAGS CXXFLAGS
 	./configure --prefix=/usr \
 		--confdir=/usr/share/mplayer \
@@ -291,15 +322,11 @@ src_compile() {
 		--with-x11incdir=/usr/X11R6/include \
 		${myconf} || die
 
-		# config.mak doesn't set GIF_LIB so gif related source files fail
-		if use gif && use X
-		then
-			if use gif; then
-				sed -e "s:GIF_LIB =:GIF_LIB = -lgif:" -i config.mak
-			else
-				sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak
-			fi
-		fi
+	# when gif is autodetected, GIF_LIB is set correctly.  We're explicitly controlling it, and it doesn't behave correctly.
+	# so... we have to help it along.
+	if use gif; then
+		sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak
+	fi
 
 	einfo "Make"
 	make all || die "Failed to build MPlayer!"
@@ -332,15 +359,18 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog README
 	# Install the documentation; DOCS is all mixed up not just html
-	docinto /usr/share/doc/${PF} ; dodoc -r ${S}/DOCS
+	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
 
-	# Copy misc tools to documentation path, as they're not installed
-	# directly
-	docinto /usr/share/doc/${PF} ; dodoc -r ${S}/TOOLS
+	# 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
+	if use gtk; then
 		dodir /usr/share/mplayer/Skin
 		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
 
@@ -349,8 +379,7 @@ src_install() {
 		dosym mplayer /usr/bin/gmplayer
 	fi
 
-	if use gnome
-	then
+	if use gnome; then
 		insinto /usr/share/pixmaps
 		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
 		insinto /usr/share/gnome/apps/Multimedia