closing out bugs #32606, #41482, and #30242, plus cleanup of configure statement, and shifting of IUSE after inherit due to bug #52160.

6 files changed, 144 insertions, 125 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 963ee7ecfbec..52a7be19662c 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,14 @@
 # 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.133 2004/05/26 11:26:12 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.134 2004/05/27 05:08:13 ferringb Exp $
+
+  27 May 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.ebuild:
+  Adding xvid, divx4linux use flags (bug #30242), bidi (bug #41482), and mad
+  (bug #32606). Bit of cleanup of myconf, moved IUSE after inherit for
+  1.0_pre4-r3 (portage 2.0.51_pre9 doesn't play nice w/ IUSE above inherit, see
+  bug #52160).
 
 *mplayer-1.0_pre4-r3 (26 May 2004)
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 1763ca251c93..03332df70310 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,37 +1,37 @@
-MD5 633cbda54fcb59b371bbfb86f475bd84 mplayer-1.0_pre3-r4.ebuild 11851
-MD5 82794a0de0cc0d942221b9233d86d47d mplayer-1.0_pre4-r3.ebuild 11669
-MD5 00c7c3b93985919e65ea36ea90e7828f mplayer-1.0_pre4.ebuild 11094
-MD5 95426d21a3f8920fc3b0d94ade8ad0bd mplayer-1.0_pre3-r3.ebuild 11549
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 06a993cb89fac55613aad364670c41fb mplayer-0.92-r1.ebuild 11570
 MD5 f98bc5b521254207cb231a9eb853f522 mplayer-1.0_pre2-r1.ebuild 11435
-MD5 89e741f074d9ea9fa32ad1b439adf0b3 mplayer-1.0_pre4-r2.ebuild 11449
+MD5 95426d21a3f8920fc3b0d94ade8ad0bd mplayer-1.0_pre3-r3.ebuild 11549
+MD5 e189dddc31fd84461d51996cdf176292 ChangeLog 23520
+MD5 6db29a06d978bafdedfa67804e960488 mplayer-1.0_pre4-r3.ebuild 11664
+MD5 633cbda54fcb59b371bbfb86f475bd84 mplayer-1.0_pre3-r4.ebuild 11851
 MD5 1a08c3bbc9cc90150bcf0228848ec76f mplayer-1.0_pre3-r5.ebuild 11525
-MD5 06a993cb89fac55613aad364670c41fb mplayer-0.92-r1.ebuild 11570
-MD5 36db8e5b14b86c2dc5c98d090c35d939 ChangeLog 23112
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 fc9edd731f660a6633ad81b8ae1127e2 mplayer-1.0_pre4-r1.ebuild 11026
-MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
-MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
-MD5 98c7d58f544829621b15427ad53b98e4 files/mga-kernel-2.6.patch 16767
-MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
-MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
+MD5 bafb9c82fa8f3a39f28bb8f1c2eea2f4 mplayer-1.0_pre4-r1.ebuild 11368
+MD5 e1ea94156aa7baa33df978435e05e0d1 mplayer-1.0_pre4-r2.ebuild 11548
+MD5 744333b8c3656249f927f7a5891c0def mplayer-1.0_pre4.ebuild 11137
 MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
-MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
-MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre3-alsa-gcc34.patch 299
-MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
-MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
-MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411
-MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4 358
-MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
-MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
-MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
+MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
 MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358
 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r3 358
 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r4 358
 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r5 358
+MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4 358
 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r1 358
 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r2 358
-MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r3 358
-MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
-MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.patch 5010
+MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
+MD5 98c7d58f544829621b15427ad53b98e4 files/mga-kernel-2.6.patch 16767
+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
+MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
+MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
+MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre3-alsa-gcc34.patch 299
+MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.patch 5010
+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 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 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r3 358
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild
index becf021fb1f4..c84a97234d08 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.4 2004/05/12 13:51:58 pappy Exp $
+# $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 $
 
-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"
+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"
 
 inherit eutils flag-o-matic
 
@@ -23,11 +23,13 @@ DESCRIPTION="Media Player for Linux"
 HOMEPAGE="http://www.mplayerhq.hu/"
 
 # 'encode' in USE for MEncoder.
-RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
-	amd64? ( >=media-libs/xvid-0.9.0 )
-	x86? ( >=media-libs/xvid-0.9.0
-	       >=media-libs/divx4linux-20030428
-	       >=media-libs/win32codecs-0.60 )
+RDEPEND="xvid? (
+		ppc? ( >=media-libs/xvid-0.9.0 )
+		amd64? ( >=media-libs/xvid-0.9.0 )
+		x86? ( >=media-libs/xvid-0.9.0 )
+	)
+	x86? ( >=media-libs/win32codecs-0.60
+		divx4linux? ( >=media-libs/divx4linux-20030428 ) )
 	gtk? ( media-libs/libpng
 	       virtual/x11
 			=x11-libs/gtk+-1.2*
@@ -58,6 +60,8 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	samba? ( >=net-fs/samba-2.2.8a )
 	theora? ( media-libs/libtheora )
 	live? ( >=media-plugins/live-2004.01.05 )
+	mad? ( media-libs/libmad )
+	bidi? ( dev-libs/fribidi )
 	>=sys-apps/portage-2.0.36"
 #	dvd? ( media-libs/libdvdnav )
 # Hardcode paranoia support for now, as there is no
@@ -157,6 +161,11 @@ src_compile() {
 		&& myconf="${myconf} --enable-gui --enable-x11 \
 		                     --enable-xv --enable-vm --enable-png"
 
+	myconf="${myconf} `use_enable xvid`"
+	( use xvid && use 3dfx ) \
+		&& myconf="${myconf} --enable-tdfxvid" \
+		|| myconf="${myconf} --disable-tdfxvid"
+
 	use encode \
 		&& myconf="${myconf} --enable-mencoder --enable-tv" \
 		|| myconf="${myconf} --disable-mencoder"
@@ -244,6 +253,9 @@ src_compile() {
 		`use_enable xmms` \
 		`use_enable ipv6 inet6` \
 		`use_enable live` \
+		`use_enable bidi fribidi` \
+		`use_enable mad` \
+		`use_enable divx4linux` \
 		${myconf} || die
 	# Breaks with gcc-2.95.3, bug #14479:
 	#  --enable-shared-pp \
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild
index f83caf01c183..c78470e7b866 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.1 2004/05/19 06:34:24 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild,v 1.2 2004/05/27 05:08:14 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"
+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"
 
 inherit eutils flag-o-matic check-kernel
 
@@ -23,11 +23,14 @@ DESCRIPTION="Media Player for Linux"
 HOMEPAGE="http://www.mplayerhq.hu/"
 
 # 'encode' in USE for MEncoder.
-RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
-	amd64? ( >=media-libs/xvid-0.9.0 )
-	x86? ( >=media-libs/xvid-0.9.0
-	       >=media-libs/divx4linux-20030428
-	       >=media-libs/win32codecs-0.60 )
+RDEPEND="xvid? ( ppc?  ( >=media-libs/xvid-0.9.0 )
+		amd64? ( >=media-libs/xvid-0.9.0 )
+		x86?   ( >=media-libs/xvid-0.9.0 )
+	)
+	x86? ( >=media-libs/win32codecs-0.60
+		divx4linux? ( >=media-libs/divx4linux-20030428 )
+	)
+
 	gtk? ( media-libs/libpng
 	       virtual/x11
 			=x11-libs/gtk+-1.2*
@@ -58,6 +61,8 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	samba? ( >=net-fs/samba-2.2.8a )
 	theora? ( media-libs/libtheora )
 	live? ( >=media-plugins/live-2004.01.05 )
+	mad? ( media-libs/libmad )
+	bidi? ( dev-libs/fribidi )
 	>=sys-apps/portage-2.0.36"
 #	dvd? ( media-libs/libdvdnav )
 # Hardcode paranoia support for now, as there is no
@@ -150,11 +155,6 @@ src_compile() {
 	use X || use gtk \
 		|| myconf="${myconf} --disable-gui --disable-x11 --disable-xv \
 				--disable-xmga --disable-png"
-	use jpeg \
-		|| myconf="${myconf} --disable-jpeg"
-
-	use gif \
-		|| myconf="${myconf} --disable-gif"
 
 	( use matrox && use X ) \
 		&& myconf="${myconf} --enable-xmga" \
@@ -163,22 +163,19 @@ src_compile() {
 	use gtk \
 		&& myconf="${myconf} --enable-gui --enable-x11 \
 		                     --enable-xv --enable-vm --enable-png"
+	use gif \
+		|| myconf="${myconf} --disable-gif"
 
-	use encode \
-		&& myconf="${myconf} --enable-mencoder --enable-tv" \
-		|| myconf="${myconf} --disable-mencoder"
-
-	use v4l \
-		&& myconf="${myconf} --enable-tv-v4l" \
-		|| myconf="${myconf} --disable-tv-v4l"
+	myconf="${myconf} `use_enable xvid`"
+	( use xvid && use 3dfx ) \
+		&& myconf="${myconf} --enable-tdfxvid" \
+		|| myconf="${myconf} --disable-tdfxvid"
 
-	use v4l2 \
-		&& myconf="${myconf} --enable-tv-v4l2" \
-		|| myconf="${myconf} --disable-tv-v4l2"
+	myconf="${myconf} `use_enable encode mencoder`"
+	use encode && myconf="${myconf} --enable-tv"
 
-	use dvd \
-		&& myconf="${myconf} --enable-mpdvdkit" \
-		|| myconf="${myconf} --disable-mpdvdkit --disable-dvdread"
+	myconf="${myconf} `use_enable dvd mpdvdkit`"
+	use dvd || myconf="${myconf} `use_enable dvdread`"
 	# Disable dvdnav support as its not considered to be
 	# functional anyhow, and will be removed.
 
@@ -186,9 +183,8 @@ src_compile() {
 		&& myconf="${myconf} --enable-external-faad" \
 		|| myconf="${myconf} --disable-external-faad"
 
-	use dvb \
-		&& myconf="${myconf} --enable-dvb" \
-		|| myconf="${myconf} --disable-dvb --disable-dvbhead"
+	myconf="${myconf} `use dvb`"
+	use dvb || myconf="${myconf} --disable-dvbhead"
 
 	use debug \
 		&& myconf="${myconf} --enable-debug"
@@ -251,6 +247,11 @@ src_compile() {
 		`use_enable xmms` \
 		`use_enable ipv6 inet6` \
 		`use_enable live` \
+		`use_enable mpeg external-faad` \
+		`use_enable v4l tv-v4l` \
+		`use_enable v4l2 tv-v4l2` \
+		`use_enable divx4linux` \
+		`use_enable jpeg` \
 		${myconf} || die
 	# Breaks with gcc-2.95.3, bug #14479:
 	#  --enable-shared-pp \
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild
index 3c1756e8ea7e..cf265ae9c4c1 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r3.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-r3.ebuild,v 1.1 2004/05/26 11:26:12 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild,v 1.2 2004/05/27 05:08:14 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"
+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"
 
 inherit eutils flag-o-matic kmod
 
@@ -23,11 +23,13 @@ DESCRIPTION="Media Player for Linux"
 HOMEPAGE="http://www.mplayerhq.hu/"
 
 # 'encode' in USE for MEncoder.
-RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
-	amd64? ( >=media-libs/xvid-0.9.0 )
-	x86? ( >=media-libs/xvid-0.9.0
-	       >=media-libs/divx4linux-20030428
-	       >=media-libs/win32codecs-0.60 )
+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 )
 	gtk? ( media-libs/libpng
 	       virtual/x11
 			=x11-libs/gtk+-1.2*
@@ -58,6 +60,8 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	samba? ( >=net-fs/samba-2.2.8a )
 	theora? ( media-libs/libtheora )
 	live? ( >=media-plugins/live-2004.01.05 )
+	mad? ( media-libs/libmad )
+	bidi? ( dev-libs/fribidi )
 	>=sys-apps/portage-2.0.36"
 #	dvd? ( media-libs/libdvdnav )
 # Hardcode paranoia support for now, as there is no
@@ -160,11 +164,6 @@ src_compile() {
 	use X || use gtk \
 		|| myconf="${myconf} --disable-gui --disable-x11 --disable-xv \
 				--disable-xmga --disable-png"
-	use jpeg \
-		|| myconf="${myconf} --disable-jpeg"
-
-	use gif \
-		|| myconf="${myconf} --disable-gif"
 
 	( use matrox && use X ) \
 		&& myconf="${myconf} --enable-xmga" \
@@ -174,31 +173,25 @@ src_compile() {
 		&& myconf="${myconf} --enable-gui --enable-x11 \
 		                     --enable-xv --enable-vm --enable-png"
 
-	use encode \
-		&& myconf="${myconf} --enable-mencoder --enable-tv" \
-		|| myconf="${myconf} --disable-mencoder"
-
-	use v4l \
-		&& myconf="${myconf} --enable-tv-v4l" \
-		|| myconf="${myconf} --disable-tv-v4l"
+	myconf="${myconf} `use_enable encode mencoder`"
+	use encode && myconf="${myconf} --enable-tv"
 
-	use v4l2 \
-		&& myconf="${myconf} --enable-tv-v4l2" \
-		|| myconf="${myconf} --disable-tv-v4l2"
+	myconf="${myconf} `use_enable dvd mpdvdkit`"
+	use dvd || myconf="${myconf} --disable-dvdread"
 
-	use dvd \
-		&& myconf="${myconf} --enable-mpdvdkit" \
-		|| myconf="${myconf} --disable-mpdvdkit --disable-dvdread"
 	# 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_enable dvb`"
+	use dvb || myconf="${myconf} --disable-dvbhead"
 
-	use dvb \
-		&& myconf="${myconf} --enable-dvb" \
-		|| myconf="${myconf} --disable-dvb --disable-dvbhead"
+	mconf="${myconf} `use_enable xvid`"
+	( use xvid && use 3dfx ) \
+		&& myconf="${myconf} --enable-tdfxvid" \
+		||  myconf="${myconf} --disable-tdfxvid"
+
+	use gif \
+		|| myconf="${myconf} --disable-gif"
 
 	use debug \
 		&& myconf="${myconf} --enable-debug"
@@ -261,6 +254,11 @@ src_compile() {
 		`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 jpeg` \
+		`use_enable divx4linux` \
 		${myconf} || die
 	# Breaks with gcc-2.95.3, bug #14479:
 	#  --enable-shared-pp \
diff --git a/media-video/mplayer/mplayer-1.0_pre4.ebuild b/media-video/mplayer/mplayer-1.0_pre4.ebuild
index e90d59241a4c..474a123c2e12 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.4 2004/05/12 13:51:58 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4.ebuild,v 1.5 2004/05/27 05:08:14 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"
+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"
 
 inherit eutils flag-o-matic
 
@@ -23,11 +23,14 @@ DESCRIPTION="Media Player for Linux"
 HOMEPAGE="http://www.mplayerhq.hu/"
 
 # 'encode' in USE for MEncoder.
-RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
-	amd64? ( >=media-libs/xvid-0.9.0 )
-	x86? ( >=media-libs/xvid-0.9.0
-	       >=media-libs/divx4linux-20030428
-	       >=media-libs/win32codecs-0.60 )
+RDEPEND="xvid? (
+		ppc? ( >=media-libs/xvid-0.9.0 )
+		amd64? ( >=media-libs/xvid-0.9.0 )
+		x86? ( >=media-libs/xvid-0.9.0 )
+	)
+	x86? ( >=media-libs/win32codecs-0.60
+		divx4linux? ( >=media-libs/divx4linux-20030428 )
+	)
 	gtk? ( media-libs/libpng
 	       virtual/x11
 			=x11-libs/gtk+-1.2*
@@ -57,6 +60,8 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
 	mpeg? ( media-libs/faad2 )
 	samba? ( >=net-fs/samba-2.2.8a )
 	theora? ( media-libs/libtheora )
+	mad? ( media-libs/libmad )
+	bidi? ( dev-libs/fribidi )
 	>=sys-apps/portage-2.0.36"
 #	dvd? ( media-libs/libdvdnav )
 # Hardcode paranoia support for now, as there is no
@@ -142,11 +147,6 @@ src_compile() {
 	use X || use gtk \
 		|| myconf="${myconf} --disable-gui --disable-x11 --disable-xv \
 				--disable-xmga --disable-png"
-	use jpeg \
-		|| myconf="${myconf} --disable-jpeg"
-
-	use gif \
-		|| myconf="${myconf} --disable-gif"
 
 	( use matrox && use X ) \
 		&& myconf="${myconf} --enable-xmga" \
@@ -156,31 +156,24 @@ src_compile() {
 		&& myconf="${myconf} --enable-gui --enable-x11 \
 		                     --enable-xv --enable-vm --enable-png"
 
-	use encode \
-		&& myconf="${myconf} --enable-mencoder --enable-tv" \
-		|| myconf="${myconf} --disable-mencoder"
-
-	use v4l \
-		&& myconf="${myconf} --enable-tv-v4l" \
-		|| myconf="${myconf} --disable-tv-v4l"
+	myconf="${myconf} `use_enable encode mencoder`"
+	use encode && myconf="${myconf} --enable-tv"
 
-	use v4l2 \
-		&& myconf="${myconf} --enable-tv-v4l2" \
-		|| myconf="${myconf} --disable-tv-v4l2"
+	myconf="${myconf} `use_enable dvd mpdvdkit`"
+	use dvd || myconf="${myconf} --disable-dvdread"
 
-	use dvd \
-		&& myconf="${myconf} --enable-mpdvdkit" \
-		|| myconf="${myconf} --disable-mpdvdkit --disable-dvdread"
 	# 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"
+	use gif || myconf="${myconf} --disable-gif"
+
+	myconf="${myconf} `use_enable xvid`"
+	( use xvid && use 3dfx ) \
+		&& myconf="${myconf} --enable-tdfxvid" \
+		|| myconf="${myconf} --disable-tdfxvid"
 
-	use dvb \
-		&& myconf="${myconf} --enable-dvb" \
-		|| myconf="${myconf} --disable-dvb --disable-dvbhead"
+	myconf="${myconf} `use_enable dvb`"
+	use dvb || myconf="${myconf} --disable-dvbhead"
 
 	use debug \
 		&& myconf="${myconf} --enable-debug"
@@ -248,6 +241,13 @@ src_compile() {
 		`use_enable matrox mga` \
 		`use_enable xmms` \
 		`use_enable ipv6 inet6` \
+		`use_enable mad` \
+		`use_enable bidi fribidi` \
+		`use_enable mpeg external-faad` \
+		`use_enable v4l tv-v4l` \
+		`use_enable v4l2 tv-v4l2` \
+		`use_enable divx4linux` \
+		`use_enable jpeg` \
 		${myconf} || die
 	# Breaks with gcc-2.95.3, bug #14479:
 	#  --enable-shared-pp \