Minor updates

(Portage version: 2.0.51.21-r1)

3 files changed, 27 insertions, 19 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index dafa4ef85b4e..5ba923e02e85 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.308 2005/05/06 22:30:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.309 2005/05/09 15:24:52 lu_zero Exp $
+
+  09 May 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre6-r6.ebuild,
+  mplayer-1.0_pre7.ebuild:
+  Minor updates
 
   06 May 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre6-r6.ebuild,
   mplayer-1.0_pre7.ebuild:
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild
index 6749f4fc88b0..622404928220 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild
@@ -1,12 +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_pre6-r6.ebuild,v 1.6 2005/05/06 22:30:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild,v 1.7 2005/05/09 15:24:52 lu_zero Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts avi bidi bl cpudetection
-custom-cflags debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca 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 X xanim xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts bidi bl cpudetection
+custom-cflags debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv
+dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca
+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
@@ -28,11 +32,9 @@ HOMEPAGE="http://www.mplayerhq.hu/"
 
 # 'encode' in USE for MEncoder.
 RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
-	x86? (
-		divx4linux? (  >=media-libs/divx4linux-20030428 )
-		avi? ( >=media-libs/win32codecs-20040916 )
-		real? ( >=media-video/realplayer-10.0.3 )
-		)
+	divx4linux? (  >=media-libs/divx4linux-20030428 )
+	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 )
@@ -351,7 +353,7 @@ src_compile() {
 	myconf="${myconf} $(use_enable xmms)"
 	myconf="${myconf} $(use_enable xvid)"
 	use x86 && myconf="${myconf} $(use_enable real)"
-	use x86 && myconf="${myconf} $(use_enable avi win32)"
+	myconf="${myconf} $(use_enable win32codecs win32)"
 
 	#############
 	# Video Output #
diff --git a/media-video/mplayer/mplayer-1.0_pre7.ebuild b/media-video/mplayer/mplayer-1.0_pre7.ebuild
index c93ea1e1142b..51c636676ffe 100644
--- a/media-video/mplayer/mplayer-1.0_pre7.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre7.ebuild
@@ -1,12 +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.ebuild,v 1.7 2005/05/06 22:30:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7.ebuild,v 1.8 2005/05/09 15:24:52 lu_zero Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts avi bidi bl cpudetection
-custom-cflags debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca 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 X xanim xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts bidi bl cpudetection
+custom-cflags debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv
+dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca
+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
@@ -28,11 +32,9 @@ HOMEPAGE="http://www.mplayerhq.hu/"
 
 # 'encode' in USE for MEncoder.
 RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
-	x86? (
-		divx4linux? (  >=media-libs/divx4linux-20030428 )
-		avi? ( >=media-libs/win32codecs-20040916 )
-		real? ( >=media-video/realplayer-10.0.3 )
-		)
+	divx4linux? (  >=media-libs/divx4linux-20030428 )
+	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 )
@@ -334,7 +336,7 @@ src_compile() {
 	myconf="${myconf} $(use_enable xmms)"
 	myconf="${myconf} $(use_enable xvid)"
 	use x86 && myconf="${myconf} $(use_enable real)"
-	use x86 && myconf="${myconf} $(use_enable avi win32)"
+	myconf="${myconf} $(use_enable win32codecs win32)"
 
 	#############
 	# Video Output #