correcting broken deps for ia64

4 files changed, 37 insertions, 14 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 6b81397f82ec..6f7bbac338ac 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # 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.169 2004/07/23 05:12:11 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.170 2004/07/23 05:33:18 ferringb Exp $
+
+  23 Jul 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r6.ebuild,
+  mplayer-1.0_pre5-r1.ebuild:
+  Fixed broken deps for media-plugins/live and media-libs/libtheora for ia64
 
   23 Jul 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r6.ebuild,
   mplayer-1.0_pre5-r1.ebuild, files/cachefill.patch:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 224c9eecd77d..72f6c27193de 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,4 @@
-MD5 16faf60086ca0d4b3280049c8540a4fe ChangeLog 30208
+MD5 00f9b24b331060fbaa97c4cf407beb5b ChangeLog 30395
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 b813a65769af5d2a2ca1ceba1347974d mplayer-0.92-r1.ebuild 11511
 MD5 7eeb1235c1263ecb110925e53de1eb06 mplayer-1.0_pre2-r1.ebuild 11375
@@ -10,8 +10,8 @@ MD5 fbdd96b2a3f0f78bdc8cbded3bb3927b mplayer-1.0_pre4-r2.ebuild 11948
 MD5 6b9e16c4f08ac48748812909ed431f31 mplayer-1.0_pre4-r3.ebuild 13034
 MD5 d13f33f9022f7abccfe9b14f96531057 mplayer-1.0_pre4-r4.ebuild 13157
 MD5 071a354aa3c0e9290b6dcfc8c3621d87 mplayer-1.0_pre4.ebuild 11319
-MD5 3fa61712958d8b67f800f8b4e978e904 mplayer-1.0_pre4-r6.ebuild 12389
-MD5 f1c5c1e37ed918f7494a276e674c0441 mplayer-1.0_pre5-r1.ebuild 12139
+MD5 e933e8c714424c7ee14ccede6f31cd63 mplayer-1.0_pre4-r6.ebuild 12539
+MD5 4cffd1dc7d517df5c14cac74aecf6602 mplayer-1.0_pre5-r1.ebuild 12288
 MD5 b0c29f18a794b9299a45b80f70cb5325 files/cachefill.patch 6053
 MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
 MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r6.ebuild
index 05723f5acb18..7c376fe10ba5 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.2 2004/07/23 05:12:11 ferringb Exp $
+# $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 $
 
 inherit eutils flag-o-matic kmod
 
@@ -49,7 +49,6 @@ RDEPEND="xvid? (
 	jpeg? ( media-libs/jpeg )
 	libcaca? ( media-libs/libcaca )
 	lirc? ( app-misc/lirc )
-	live? ( >=media-plugins/live-2004.03.27 )
 	lzo? ( dev-libs/lzo )
 	mad? ( media-libs/libmad )
 	matroska? ( >=media-libs/libmatroska-0.6.0 )
@@ -62,7 +61,10 @@ RDEPEND="xvid? (
 	samba? ( >=net-fs/samba-2.2.8a )
 	sdl? ( media-libs/libsdl )
 	svga? ( media-libs/svgalib )
-	theora? ( media-libs/libtheora )
+	!ia64? (
+		theora? ( media-libs/libtheora )
+		live? ( >=media-plugins/live-2004.03.27 )
+		)
 	truetype? ( >=media-libs/freetype-2.1 )
 	xinerama? ( virtual/x11 )
 	xmms? ( media-sound/xmms )
@@ -170,7 +172,11 @@ src_compile() {
 	myconf="${myconf} $(use_enable ipv6 inet6)"
 	myconf="${myconf} $(use_enable joystick)"
 	myconf="${myconf} $(use_enable lirc)"
-	myconf="${myconf} $(use_enable live)"
+	if use ia64; then
+		myconf="${myconf} --disable-live"
+	else
+		myconf="${myconf} $(use_enable live)"
+	fi
 	myconf="${myconf} $(use_enable network) $(use_enable network ftp)"
 	myconf="${myconf} $(use_enable rtc)"
 	myconf="${myconf} $(use_enable samba smb)"
@@ -188,7 +194,11 @@ src_compile() {
 	myconf="${myconf} $(use_enable matroska external-matroska) $(use_enable !matroska internal-matroska)"
 	myconf="${myconf} $(use_enable mpeg external-faad) $(use_enable !mpeg internal-faad)"
 	myconf="${myconf} $(use_enable oggvorbis vorbis)"
-	myconf="${myconf} $(use_enable theora)"
+	if use ia64; then
+		myconf="${myconf} --disable-theora"
+	else
+		myconf="${myconf} $(use_enable theora)"
+	fi
 	myconf="${myconf} $(use_enable xmms)"
 	myconf="${myconf} $(use_enable xvid)"
 
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild
index 1bd8b52b77c7..eaa8013a7541 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r1.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_pre5-r1.ebuild,v 1.2 2004/07/23 05:12:11 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r1.ebuild,v 1.3 2004/07/23 05:33:18 ferringb Exp $
 
 inherit eutils flag-o-matic kmod
 
@@ -49,7 +49,6 @@ RDEPEND="xvid? (
 	jpeg? ( media-libs/jpeg )
 	libcaca? ( media-libs/libcaca )
 	lirc? ( app-misc/lirc )
-	live? ( >=media-plugins/live-2004.03.27 )
 	lzo? ( dev-libs/lzo )
 	mad? ( media-libs/libmad )
 	matroska? ( >=media-libs/libmatroska-0.6.0 )
@@ -62,7 +61,9 @@ RDEPEND="xvid? (
 	samba? ( >=net-fs/samba-2.2.8a )
 	sdl? ( media-libs/libsdl )
 	svga? ( media-libs/svgalib )
-	theora? ( media-libs/libtheora )
+	!ia64? ( theora? ( media-libs/libtheora )
+		live? ( >=media-plugins/live-2004.03.27 )
+		)
 	truetype? ( >=media-libs/freetype-2.1 )
 	xinerama? ( virtual/x11 )
 	xmms? ( media-sound/xmms )
@@ -161,7 +162,11 @@ src_compile() {
 	myconf="${myconf} $(use_enable ipv6 inet6)"
 	myconf="${myconf} $(use_enable joystick)"
 	myconf="${myconf} $(use_enable lirc)"
-	myconf="${myconf} $(use_enable live)"
+	if use ia64; then
+		myconf="${myconf} --disable-live"
+	else
+		myconf="${myconf} $(use_enable live)"
+	fi
 	myconf="${myconf} $(use_enable network) $(use_enable network ftp)"
 	myconf="${myconf} $(use_enable rtc)"
 	myconf="${myconf} $(use_enable samba smb)"
@@ -179,7 +184,11 @@ src_compile() {
 	myconf="${myconf} $(use_enable matroska external-matroska) $(use_enable !matroska internal-matroska)"
 	myconf="${myconf} $(use_enable mpeg external-faad) $(use_enable !mpeg internal-faad)"
 	myconf="${myconf} $(use_enable oggvorbis vorbis)"
-	myconf="${myconf} $(use_enable theora)"
+	if use ia64;  then
+		myconf="${myconf} --disable-theora"
+	else
+		myconf="${myconf} $(use_enable theora)"
+	fi
 	myconf="${myconf} $(use_enable xmms)"
 	myconf="${myconf} $(use_enable xvid)"