Fixed bug #80564 with a patch by nickc and removed uneeded deps on portage and nasm.

(Portage version: 2.0.51-r15)

4 files changed, 23 insertions, 7 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index f2e03a98bf8a..f432ec8a82af 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.267 2005/02/05 15:51:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.268 2005/02/06 06:30:35 chriswhite Exp $
+
+  06 Feb 2005; Chris White <chriswhite@gentoo.org> +files/mplayer-x11.patch,
+  mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild:
+  Fixed bug #80564 with a patch by nickc and removed uneeded deps on portage and
+  nasm.
 
   06 Feb 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r5.ebuild,
   mplayer-1.0_pre6.ebuild:
diff --git a/media-video/mplayer/files/mplayer-x11.patch b/media-video/mplayer/files/mplayer-x11.patch
new file mode 100644
index 000000000000..d75d37449f6c
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-x11.patch
@@ -0,0 +1,11 @@
+--- configure.orig      2005-02-03 11:34:09.173887311 +0000
++++ configure   2005-02-03 11:57:59.202194624 +0000
+@@ -3134,7 +3134,7 @@
+
+ echocheck "X11 libs presence"
+ if test -z "$_ld_x11" ; then
+-  for I in /usr/X11R6/lib /usr/lib/X11R6 /usr/X11/lib /usr/lib32 /usr/openwin/lib /usr/X11R6/lib64 ; do
++  for I in /usr/X11R6/lib /usr/lib/X11R6 /usr/X11/lib /usr/lib32 /usr/openwin/lib /usr/X11R6/lib64 /usr/lib/X11; do
+     if test -d "$I" && ( test -f "$I/libX11.so" || test -f "$I/libX11.a" || test -f "$I/libX11.dll.a" ) ; then
+       _ld_x11="-L$I"
+       echores "yes (using $I)"
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
index 55b0aec18380..98eee05f974f 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
@@ -1,6 +1,6 @@
 # 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_pre5-r5.ebuild,v 1.21 2005/02/05 15:51:41 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.22 2005/02/06 06:30:35 chriswhite Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -76,11 +76,9 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	jack? ( >=media-libs/bio2jack-0.3-r1 )
 	xmms? ( media-sound/xmms )
 	xanim? ( >=media-video/xanim-2.80.1-r4 )
-	>=sys-apps/portage-2.0.36
 	sys-libs/ncurses"
 
 DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
 	app-arch/unzip"
 
 SLOT="0"
@@ -166,6 +164,10 @@ src_unpack() {
 	# backport the gif recognition from pre6...
 	# yay! - Chris
 	epatch ${FILESDIR}/${PN}-gif.patch
+
+	# fixes 80564 involved in x11 lib directory
+	# detection
+	epatch ${FILESDIR}/${PN}-x11.patch
 }
 
 linguas_warn() {
diff --git a/media-video/mplayer/mplayer-1.0_pre6.ebuild b/media-video/mplayer/mplayer-1.0_pre6.ebuild
index 65491b19d854..adc101368919 100644
--- a/media-video/mplayer/mplayer-1.0_pre6.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.23 2005/02/05 15:51:41 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.24 2005/02/06 06:30:35 chriswhite Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -78,11 +78,9 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	jack? ( >=media-libs/bio2jack-0.4 )
 	xmms? ( media-sound/xmms )
 	xanim? ( >=media-video/xanim-2.80.1-r4 )
-	>=sys-apps/portage-2.0.36
 	sys-libs/ncurses"
 
 DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
 	app-arch/unzip"
 
 SLOT="0"