Fixes some strange issue with the .20 live plugins being pulled in, despite .27 being coded in. Re-Removed dvdread stuff.

4 files changed, 37 insertions, 31 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 00a918cf1aae..1f29488bfa11 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.171 2004/07/23 09:56:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.172 2004/07/23 15:56:56 chriswhite Exp $
+
+  23 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r6.ebuild,
+  mplayer-1.0_pre5-r1.ebuild:
+  Fixes some strange issue with the .20 live plugins being pulled in, despite
+  .27 being coded in. Re-Removed dvdread stuff.
 
   23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   mplayer-1.0_pre5-r1.ebuild:
@@ -14,6 +19,10 @@
   mplayer-1.0_pre5-r1.ebuild, files/cachefill.patch:
   Slipping eradicators cachefill patch in, bug #55936
 
+  23 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r6.ebuild,
+  mplayer-1.0_pre5-r1.ebuild:
+  Fixed an ia64 dependancy error.
+
 *mplayer-1.0_pre5-r1 (23 Jul 2004)
 
   23 Jul 2004; Chris White <chriswhite@gentoo.org>
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 4642af4a1139..2227f51ce780 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,4 @@
-MD5 718678758abbf3540d900c207b58651c ChangeLog 30522
+MD5 37ede7d8333c6d828ed557ece7ebb53c ChangeLog 30666
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 b813a65769af5d2a2ca1ceba1347974d mplayer-0.92-r1.ebuild 11511
 MD5 7eeb1235c1263ecb110925e53de1eb06 mplayer-1.0_pre2-r1.ebuild 11375
@@ -7,11 +7,16 @@ MD5 d40969fad743a58087e55fd5d27d3fcf mplayer-1.0_pre3-r4.ebuild 11799
 MD5 5d11f22039a718f19a725f676e614670 mplayer-1.0_pre3-r5.ebuild 11473
 MD5 1c2c6d32766ce3bf0974895533252491 mplayer-1.0_pre4-r1.ebuild 11659
 MD5 fbdd96b2a3f0f78bdc8cbded3bb3927b mplayer-1.0_pre4-r2.ebuild 11948
+MD5 5bbba9e78957683741410bf7ddc52a5c .#ChangeLog.1.169 30352
 MD5 6b9e16c4f08ac48748812909ed431f31 mplayer-1.0_pre4-r3.ebuild 13034
+MD5 87d813c39a56225c353cf6dc7a473a0a .#Manifest.1.195 4515
 MD5 d13f33f9022f7abccfe9b14f96531057 mplayer-1.0_pre4-r4.ebuild 13157
+MD5 ab26f75dc5bb3210b2b44fb2625a4066 .#mplayer-1.0_pre4-r6.ebuild.1.2 12404
+MD5 65c560d9f08eddd540601b26382cee1c mplayer-1.0_pre4-r6.ebuild 12538
 MD5 071a354aa3c0e9290b6dcfc8c3621d87 mplayer-1.0_pre4.ebuild 11319
-MD5 e933e8c714424c7ee14ccede6f31cd63 mplayer-1.0_pre4-r6.ebuild 12539
-MD5 3fad54c9cb186044cfdd8085eec65377 mplayer-1.0_pre5-r1.ebuild 12405
+MD5 3c6c27d4ab765f02bf4428ddd8f292b3 mplayer-1.0_pre5-r1.ebuild 12208
+MD5 54a28e40c2adaabfe4faf2608e640479 mplayer-1.0_pre5-r1.ebuild~ 12425
+MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
 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
@@ -24,7 +29,7 @@ MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r2 358
 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r3 358
 MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r4 358
 MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
-MD5 b0c29f18a794b9299a45b80f70cb5325 files/cachefill.patch 6053
+MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
 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
@@ -35,23 +40,22 @@ MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.pat
 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 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
 MD5 aaadaff9756ff85c9855b2bbd50da184 files/mplayer-1.0_pre4-gcc34-mtune.patch 3493
 MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
-MD5 084f1aa4fbe48d34c3154d5a4f238579 files/amd64_fix_the_blue_love.patch 17751
-MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r6 358
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
 MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
 MD5 ad254e1f8a5166ae1c5b53bc3c76ffd2 files/mplayer-1.0_pre5-yuv2rbg_kludge.patch 12585
+MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
 MD5 d7d214ab46189ad1138a0a37eaa859d4 files/noenca.patch 289
-MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
+MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
+MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
+MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
+MD5 b0c29f18a794b9299a45b80f70cb5325 files/cachefill.patch 6053
+MD5 3aabe241ce3c7d60ea6f607cb7ab033a files/digest-mplayer-1.0_pre5-r1 358
 MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
+MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
+MD5 084f1aa4fbe48d34c3154d5a4f238579 files/amd64_fix_the_blue_love.patch 17751
 MD5 7dce8f2598e84e3d94186e2eb50f553b files/mplayer-1.0_pre4-mga-kernel2.6.patch 27826
-MD5 3aabe241ce3c7d60ea6f607cb7ab033a files/digest-mplayer-1.0_pre5-r1 358
-MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r6 358
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild
index 7c376fe10ba5..d8b4d39543e0 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild,v 1.3 2004/07/23 05:33:18 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild,v 1.4 2004/07/23 15:56:56 chriswhite Exp $
 
 inherit eutils flag-o-matic kmod
 
@@ -63,7 +63,7 @@ RDEPEND="xvid? (
 	svga? ( media-libs/svgalib )
 	!ia64? (
 		theora? ( media-libs/libtheora )
-		live? ( >=media-plugins/live-2004.03.27 )
+		live? ( =media-plugins/live-2004.03.27 )
 		)
 	truetype? ( >=media-libs/freetype-2.1 )
 	xinerama? ( virtual/x11 )
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild
index 50cb5855d760..54eb52244859 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild,v 1.5 2004/07/23 11:10:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild,v 1.6 2004/07/23 15:56:56 chriswhite Exp $
 
 inherit eutils flag-o-matic kmod
 
-IUSE="3dfx 3dnow aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd dvdread edl encode esd fbdev gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mythtv nas network nls oggvorbis opengl oss rtc samba sdl sse svga tga theora truetype v4l v4l2 X xinerama xmms xvid"
+IUSE="3dfx 3dnow aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd edl encode esd fbdev gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mythtv nas network nls oggvorbis opengl oss rtc samba sdl sse svga tga theora truetype v4l v4l2 X xinerama xmms xvid"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -57,8 +57,9 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	samba? ( >=net-fs/samba-2.2.8a )
 	sdl? ( media-libs/libsdl )
 	svga? ( media-libs/svgalib )
-	!ia64? ( theora? ( media-libs/libtheora )
-		live? ( >=media-plugins/live-2004.03.27 )
+	!ia64? ( 
+		theora? ( media-libs/libtheora )
+		live? ( =media-plugins/live-2004.03.27 )
 		)
 	truetype? ( >=media-libs/freetype-2.1 )
 	xinerama? ( virtual/x11 )
@@ -151,15 +152,7 @@ src_compile() {
 	###############
 	myconf="${myconf} $(use_enable bidi fribidi)"
 	myconf="${myconf} $(use_enable cdparanoia)"
-	if use dvd; then
-		if use dvdread; then
-			myconf="${myconf} --enable-dvdread --disable-mpdvdkit"
-		else
-			myconf="${myconf} --disable-dvdread --enable-mpdvdkit"
-		fi
-	else
-			myconf="${myconf} --disable-dvdread --disable-mpdvdkit"
-	fi
+	myconf="${myconf} $(use_enable dvd mpdvdkit)"
 	myconf="${myconf} $(use_enable edl)"
 	myconf="${myconf} $(use_enable encode mencoder)"
 	myconf="${myconf} $(use_enable gtk gui) $(use_enable gtk x11) $(use_enable gtk xv) $(use_enable gtk vm)"