missing dep for xinerama (and missing IUSE statement), missing mad use_enable (curious how that dissapeared), IUSE above inherit (again), -r2's screwed up use dvb statement (should've been use_enable dvb), and mpeg/matroska disabling internal support using external when use flags enabled. Also, *need* to get that has_version live hack out, it's *wrong* from a qa standpoint. Cleanup pretty much.

7 files changed, 62 insertions, 27 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 3cd4831c6ebf..3b6b492848d1 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.140 2004/06/01 09:04:10 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.141 2004/06/01 14:13:34 ferringb Exp $
+
+  01 Jun 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r1.ebuild,
+  mplayer-1.0_pre4-r2.ebuild, mplayer-1.0_pre4-r3.ebuild,
+  mplayer-1.0_pre4-r4.ebuild, mplayer-1.0_pre4.ebuild:
+  Added necessary --internal-(matroska|faad) for matroska (bug #50533) and mpeg.
+  MPlayer uses external libs when those flags are specified, otherwise,
+  internal. Also fixed missing IUSE flags.  Fixed use dvb syntax error in pre4-r2.
 
   01 Jun 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r4.ebuild,
   mplayer-1.0_pre4.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 4515457453ff..f2c37be38771 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -2,14 +2,14 @@ MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 06a993cb89fac55613aad364670c41fb mplayer-0.92-r1.ebuild 11570
 MD5 f98bc5b521254207cb231a9eb853f522 mplayer-1.0_pre2-r1.ebuild 11435
 MD5 95426d21a3f8920fc3b0d94ade8ad0bd mplayer-1.0_pre3-r3.ebuild 11549
-MD5 449c4e14b37da81e3eaa67692f962ca7 ChangeLog 24400
-MD5 2791b4c2f4261662ede094643a9da64e mplayer-1.0_pre4-r3.ebuild 12473
-MD5 1b898473e84ee7dc731f2b29248cbe3f mplayer-1.0_pre4-r4.ebuild 12736
+MD5 2108364bd1d620f5e9cfc009b36b50b1 ChangeLog 24810
 MD5 633cbda54fcb59b371bbfb86f475bd84 mplayer-1.0_pre3-r4.ebuild 11851
 MD5 1a08c3bbc9cc90150bcf0228848ec76f mplayer-1.0_pre3-r5.ebuild 11525
-MD5 bafb9c82fa8f3a39f28bb8f1c2eea2f4 mplayer-1.0_pre4-r1.ebuild 11368
-MD5 dbb5cd128ccc91306694cad891e45066 mplayer-1.0_pre4-r2.ebuild 11578
-MD5 f9b76fd8d432e45b633bd4617fd167a9 mplayer-1.0_pre4.ebuild 11244
+MD5 5c46afdeff660d1069cdc6be1fd69b0e mplayer-1.0_pre4-r1.ebuild 11509
+MD5 feb97d08822ad7b82afc5cd1021e60d8 mplayer-1.0_pre4-r2.ebuild 11708
+MD5 0d0dbe1f09b3bffcbb56e261500258b4 mplayer-1.0_pre4-r3.ebuild 12734
+MD5 c8fc6bdec479421ccc5f9f6f77049772 mplayer-1.0_pre4-r4.ebuild 12987
+MD5 3976d221350d536ed612551d3dcdc8a9 mplayer-1.0_pre4.ebuild 11458
 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
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild
index c84a97234d08..fdbf7994ddc5 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild,v 1.5 2004/05/27 05:08:14 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild,v 1.6 2004/06/01 14:13:34 ferringb Exp $
 
-IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick theora ipv6 v4l v4l2 live mad bidi divx4linux xvid"
+IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick theora ipv6 v4l v4l2 live mad bidi divx4linux xvid mpeg"
 
 inherit eutils flag-o-matic
 
@@ -184,9 +184,10 @@ src_compile() {
 	# Disable dvdnav support as its not considered to be
 	# functional anyhow, and will be removed.
 
-	use mpeg \
-		&& myconf="${myconf} --enable-external-faad" \
-		|| myconf="${myconf} --disable-external-faad"
+
+	# disable internal if external is enabled.
+	use matroska && myconf="${myconf} --disable-internal-matroska"
+	use mpeg && myconf="${myconf} --disable-internal-faad"
 
 	use dvb \
 		&& myconf="${myconf} --enable-dvb" \
@@ -255,6 +256,8 @@ src_compile() {
 		`use_enable live` \
 		`use_enable bidi fribidi` \
 		`use_enable mad` \
+		`use_enable mpeg external-faad` \
+		`use_enable matroska external-matroska` \
 		`use_enable divx4linux` \
 		${myconf} || die
 	# Breaks with gcc-2.95.3, bug #14479:
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild
index b10e7a1759ca..d883769d4364 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild,v 1.3 2004/06/01 09:17:54 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild,v 1.4 2004/06/01 14:13:34 ferringb Exp $
 
-IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick theora ipv6 v4l v4l2 live mad bidi xvid divx4linux"
+IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick theora ipv6 v4l v4l2 live mad bidi xvid divx4linux mpeg libcaca"
 
 inherit eutils flag-o-matic check-kernel
 
@@ -63,6 +63,7 @@ RDEPEND="xvid? ( ppc?  ( >=media-libs/xvid-0.9.0 )
 	live? ( >=media-plugins/live-2004.01.05 )
 	mad? ( media-libs/libmad )
 	bidi? ( dev-libs/fribidi )
+	libcaca? ( media-libs/libcaca )
 	>=sys-apps/portage-2.0.36"
 #	dvd? ( media-libs/libdvdnav )
 # Hardcode paranoia support for now, as there is no
@@ -179,11 +180,12 @@ src_compile() {
 	# Disable dvdnav support as its not considered to be
 	# functional anyhow, and will be removed.
 
-	use mpeg \
-		&& myconf="${myconf} --enable-external-faad" \
-		|| myconf="${myconf} --disable-external-faad"
 
-	myconf="${myconf} `use dvb`"
+	# Disable internal if external enabled.
+	use mpeg && myconf="${myconf} --disable-internal-faad"
+	use matroska && myconf="${myconf} --disable-internal-matroska"
+
+	myconf="${myconf} `use_enable dvb`"
 	use dvb || myconf="${myconf} --disable-dvbhead"
 
 	use debug \
@@ -241,6 +243,7 @@ src_compile() {
 		`use_enable lirc` \
 		`use_enable joystick` \
 		`use_enable theora` \
+		`use_enable libcaca caca` \
 		`use_enable bidi fribidi` \
 		`use_enable nas` \
 		`use_enable 3dfx tdfxfb` \
@@ -249,9 +252,11 @@ src_compile() {
 		`use_enable ipv6 inet6` \
 		`use_enable live` \
 		`use_enable mpeg external-faad` \
+		`use_enable matroska external-matroska` \
 		`use_enable v4l tv-v4l` \
 		`use_enable v4l2 tv-v4l2` \
 		`use_enable divx4linux` \
+		`use_enable mad` \
 		`use_enable jpeg` \
 		${myconf} || die
 	# Breaks with gcc-2.95.3, bug #14479:
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild
index fd38159ee784..9527fddd186a 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild,v 1.6 2004/06/01 09:17:54 ferringb Exp $
-
-IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick theora ipv6 v4l v4l2 live bidi mad xvid divx4linux"
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild,v 1.7 2004/06/01 14:13:34 ferringb Exp $
 
 inherit eutils flag-o-matic kmod
 
+IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick theora ipv6 v4l v4l2 live bidi mad xvid divx4linux mpeg"
+
 # NOTE to myself:  Test this thing with and without dvd/gtk+ support,
 #                  as it seems the mplayer guys dont really care to
 #                  make it work without dvd support.
@@ -34,6 +34,7 @@ RDEPEND="xvid? (
 	       virtual/x11
 			=x11-libs/gtk+-1.2*
 			=dev-libs/glib-1.2* )
+	xinerama? ( virtual/x11 )
 	jpeg? ( media-libs/jpeg )
 	gif? ( media-libs/giflib
 	       media-libs/libungif )
@@ -183,6 +184,10 @@ src_compile() {
 	# Disable dvdnav support as its not considered to be
 	# functional anyhow, and will be removed.
 
+	# Disable internal if external is enabled
+	use mpeg && myconf="${myconf} --disable-internal-faad"
+	use matroska && myconf="${myconf} --disable-internal-matroska"
+
 	myconf="${myconf} `use_enable dvb`"
 	use dvb || myconf="${myconf} --disable-dvbhead"
 
@@ -253,12 +258,14 @@ src_compile() {
 		`use_enable nas` \
 		`use_enable 3dfx tdfxfb` \
 		`use_enable matrox mga` \
+		`use_enable mad` \
 		`use_enable xmms` \
 		`use_enable ipv6 inet6` \
 		`use_enable live` \
 		`use_enable v4l tv-v4l` \
 		`use_enable v4l2 tv-v4l2` \
 		`use_enable mpeg external-faad` \
+		`use_enable matroska external-matroska` \
 		`use_enable jpeg` \
 		`use_enable divx4linux` \
 		${myconf} || die
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild
index bd008e563b07..792c1e2907ed 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild,v 1.4 2004/06/01 09:17:54 ferringb Exp $
-
-IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick theora ipv6 v4l v4l2 live bidi mad xvid divx4linux png xinerama libcaca"
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild,v 1.5 2004/06/01 14:13:34 ferringb Exp $
 
 inherit eutils flag-o-matic kmod
 
+IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick theora ipv6 v4l v4l2 live bidi mad xvid divx4linux png xinerama libcaca mpeg"
+
 # NOTE to myself:  Test this thing with and without dvd/gtk+ support,
 #                  as it seems the mplayer guys dont really care to
 #                  make it work without dvd support.
@@ -195,6 +195,10 @@ src_compile() {
 	myconf="${myconf} `use_enable dvb`"
 	use dvb || myconf="${myconf} --disable-dvbhead"
 
+	#if the flag is enabled, use external rather then internal
+	use matroska && myconf="${myconf} --disable-internal-matroska"
+	use mpeg && myconf="${myconf} --disable-internal-faad"
+
 	mconf="${myconf} `use_enable xvid`"
 	( use xvid && use 3dfx ) \
 		&& myconf="${myconf} --enable-tdfxvid" \
@@ -269,7 +273,9 @@ src_compile() {
 		`use_enable v4l tv-v4l` \
 		`use_enable v4l2 tv-v4l2` \
 		`use_enable mpeg external-faad` \
+		`use_enable matroska external-matroska` \
 		`use_enable jpeg` \
+		`use_enable mad` \
 		`use_enable divx4linux` \
 		${myconf} || die
 	# Breaks with gcc-2.95.3, bug #14479:
diff --git a/media-video/mplayer/mplayer-1.0_pre4.ebuild b/media-video/mplayer/mplayer-1.0_pre4.ebuild
index c0e07a01004a..85dbebdb0eab 100644
--- a/media-video/mplayer/mplayer-1.0_pre4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4.ebuild,v 1.6 2004/06/01 09:04:10 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4.ebuild,v 1.7 2004/06/01 14:13:34 ferringb Exp $
 
-IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick theora ipv6 v4l v4l2 mad bidi xvid divx4linux xinerama libcaca"
+IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick theora ipv6 v4l v4l2 mad bidi xvid divx4linux xinerama libcaca mpeg"
 
 inherit eutils flag-o-matic
 
@@ -169,6 +169,10 @@ src_compile() {
 
 	use gif || myconf="${myconf} --disable-gif"
 
+	# Disable internal if external is enabled.
+	use matroska && myconf="${myconf} --disable-internal-matroska"
+	use mpeg && myconf="${myconf} --disable-internal-faad"
+
 	myconf="${myconf} `use_enable xvid`"
 	( use xvid && use 3dfx ) \
 		&& myconf="${myconf} --enable-tdfxvid" \
@@ -192,7 +196,9 @@ src_compile() {
 		REALLIBDIR="/usr/lib/real"
 	fi
 
-	if has_version >=media-plugins/live-2004.01.05
+	# this is *really* evil.  soon as the necessary version is x86
+	# kill this.
+	if has_version '>=media-plugins/live-2004.01.05'
 	then
 		einfo "Enabling LIVE.COM Streaming Media..."
 		myconf="${myconf} --enable-live"
@@ -245,6 +251,7 @@ src_compile() {
 		`use_enable ipv6 inet6` \
 		`use_enable mad` \
 		`use_enable bidi fribidi` \
+		`use_enable matroska external-matroska` \
 		`use_enable mpeg external-faad` \
 		`use_enable v4l tv-v4l` \
 		`use_enable v4l2 tv-v4l2` \