--- /gentoo/portage/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild	2005-12-12 03:05:53.000000000 -0200
+++ /gentoo/overlay/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild	2005-12-01 22:17:27.000000000 -0200
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.16 2005/12/12 04:41:08 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.12 2005/11/06 23:23:32 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts bidi bl bindist
-cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dv
+IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts bidi bl cpudetection
+custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dv
 dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca
-lirc live livecd lzo mad matroska matrox mmx mmxext mythtv nas nls nvidia
-vorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype
-v4l v4l2 win32codecs X xanim xinerama xmms xv xvid xvmc"
+lirc live lzo mad matroska matrox mmx mmxext mythtv nas nls nvidia vorbis opengl
+oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2
+win32codecs X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -33,13 +33,12 @@
 # 'encode' in USE for MEncoder.
 RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	win32codecs? ( >=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 )
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
-	dga? ( || ( x11-libs/libXxf86dga virtual/x11 ) )
+	dga? ( virtual/x11 )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdts )
 	dvd? ( dvdread? ( media-libs/libdvdread ) )
@@ -48,16 +47,11 @@
 		dv? ( >=media-libs/libdv-0.9.5 )
 		)
 	esd? ( media-sound/esound )
-	gif? ( media-libs/giflib )
+	gif? ( || ( media-libs/giflib media-libs/libungif ) )
 	ggi? ( media-libs/libggi )
 	gtk? (
 		media-libs/libpng
-		|| ( ( x11-libs/libXxf86vm
-				x11-libs/libXext
-				x11-libs/libXi
-			)
 			virtual/x11
-		)
 		=x11-libs/gtk+-1.2*
 		=dev-libs/glib-1.2*
 		)
@@ -77,65 +71,19 @@
 	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
-			)
-			virtual/x11
-		)
-	)
+	xinerama? ( virtual/x11 )
 	jack? ( >=media-libs/bio2jack-0.4 )
 	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
-			)
-			virtual/x11
-		)
-	)
-	xvmc? ( || ( x11-libs/libXvMC virtual/x11 ) )
-	X? ( || ( ( x11-libs/libXxf86vm
-				x11-libs/libXext
-			)
-			virtual/x11
-		)
-	)"
+	sys-libs/ncurses"
 
 DEPEND="${RDEPEND}
-	app-arch/unzip
-	dga? ( || ( x11-proto/xf86dgaproto virtual/x11 ) )
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
-	xv? ( || ( ( x11-proto/videoproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
-	)
-	gtk? ( || ( ( x11-proto/xextproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
-	)
-	X? ( || ( ( x11-proto/xextproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
-	)"
+	app-arch/unzip"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
-pkg_setup() {
-	if use real && use x86; then
-				REALLIBDIR="/opt/RealPlayer/codecs"
-	fi
-}
-
 src_unpack() {
 
 	unpack ${MY_P}.tar.bz2 \
@@ -186,7 +134,7 @@
 	ewarn "First LINGUAS language to one of the following"
 	ewarn
 	ewarn "bg - Bulgarian"
-	ewarn "cs - Czech"
+	ewarn "cz - Czech"
 	ewarn "de - German"
 	ewarn "dk - Danish"
 	ewarn "el - Greek"
@@ -243,18 +191,25 @@
 		export LINGUAS="en ${LINGUAS}"
 	fi
 
+	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
+	else
+	unset CFLAGS CXXFLAGS
+	fi
 	#FIXME make it work in the snapshot
 	local myconf="--disable-x264"
 	################
 	#Optional features#
 	###############
-	if use cpudetection || use livecd || use bindist
-	then
-	myconf="${myconf} --enable-runtime-cpudetection"
-	fi
-
+	myconf="${myconf} $(use_enable cpudetection runtime-cpudetection)"
 	myconf="${myconf} $(use_enable bidi fribidi)"
 	myconf="${myconf} $(use_enable cdparanoia)"
 	if use dvd; then
@@ -317,8 +272,11 @@
 	myconf="${myconf} $(use_enable theora)"
 	myconf="${myconf} $(use_enable xmms)"
 	myconf="${myconf} $(use_enable xvid)"
-	use x86 && myconf="${myconf} $(use_enable real)"
 	myconf="${myconf} $(use_enable win32codecs win32)"
+	myconf="${myconf} $(use_enable real)"
+	if use real; then
+		myconf="${myconf} --with-reallibdir=/usr/lib/real"
+	fi
 
 	#############
 	# Video Output #
@@ -452,28 +410,14 @@
 	# 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
-	else
-	unset CFLAGS CXXFLAGS
-	fi
-
-	CFLAGS="$CFLAGS" ./configure \
+	./configure \
 		--prefix=/usr \
 		--confdir=/usr/share/mplayer \
 		--datadir=/usr/share/mplayer \
 		--enable-largefiles \
 		--enable-menu \
 		--enable-network --enable-ftp \
-		--with-reallibdir=${REALLIBDIR} \
+		--with-reallibdir=/usr/lib/real \
 		--with-x11incdir=/usr/X11R6/include \
 		--disable-external-faad \
 		${myconf} || die