Minor updates

Package-Manager: portage-2.0.51.21-r1

4 files changed, 30 insertions, 22 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/Manifest b/media-video/mplayer/Manifest
index b71985d797ee..aa0d34a6b038 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,8 +1,8 @@
-MD5 a228df65c38746feec51ea05767e671c mplayer-1.0_pre7.ebuild 17860
+MD5 25f292b7d1ae0639c135b78968a7c838 mplayer-1.0_pre7.ebuild 17867
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 c6102d4fbc512bdb7aca087029c8b2ac mplayer-1.0_pre6-r6.ebuild 18364
+MD5 d10de91896a9db50b63fe42ecea6dced mplayer-1.0_pre6-r6.ebuild 18371
 MD5 211ad7e953c470d98d76ced823f35c47 mplayer-1.0_pre6-r4.ebuild 18378
-MD5 c1097ab844287ebc17b5e4f6bf12dd2d ChangeLog 57932
+MD5 95edf48a6ef2c3ab979d8ce9d686b524 ChangeLog 58053
 MD5 a4a22d4a21e777cdb8092558f341b81f mplayer-1.0_pre6-r5.ebuild 18466
 MD5 c08980a7e7ffcb5793e929cf25cf349e files/mplayer-1.0_pre7-gcc_detection.patch 788
 MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r4 429
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 #