Removing full path from xmkmf call as it is not needed, and breaks systems with no X11R6 symlink, fixes bug 85797.

Package-Manager: portage-2.0.51.19

4 files changed, 19 insertions, 14 deletions

diff --git a/media-gfx/xli/ChangeLog b/media-gfx/xli/ChangeLog
index 02e4fc6bfab6..9cb03cced63a 100644
--- a/media-gfx/xli/ChangeLog
+++ b/media-gfx/xli/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/xli
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/ChangeLog,v 1.21 2005/03/17 19:44:30 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/ChangeLog,v 1.22 2005/03/18 23:39:25 cryos Exp $
+
+  18 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> xli-1.17.0-r1.ebuild,
+  xli-1.17.0.ebuild:
+  Removing full path from xmkmf call as it is not needed, and breaks systems
+  with no X11R6 symlink, bug 85797.
 
   17 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> xli-1.17.0-r1.ebuild:
   Marked stable on amd64 for gnupg-1.4.1, bug 85547.
@@ -11,7 +16,7 @@
   15 Mar 2005; Hardave Riar <hardave@gentoo.org> xli-1.17.0-r1.ebuild:
   Keyworded ~mips, bug #76234.
 
-  01 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> xli-1.17.0-r1.ebuild:
+  01 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> xli-1.17.0-r1.ebuild:
   Stable on alpha.
 
   28 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> xli-1.17.0-r1.ebuild:
@@ -23,7 +28,7 @@
   28 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> xli-1.17.0-r1.ebuild:
   Stable on sparc wrt #79762
 
-  28 Feb 2005; Olivier Crête <tester@gentoo.org> xli-1.17.0-r1.ebuild:
+  28 Feb 2005; Olivier Crête <tester@gentoo.org> xli-1.17.0-r1.ebuild:
   Stable on x86 per security bug #79762
 
 *xli-1.17.0-r1 (28 Feb 2005)
@@ -31,7 +36,7 @@
   28 Feb 2005; Tavis Ormandy <taviso@gentoo.org> +xli-1.17.0-r1.ebuild:
   new snapshot with security fixes.
 
-  05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> xli-1.17.0.ebuild:
+  05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> xli-1.17.0.ebuild:
   ~alpha keyworded, bug 76234.
 
   03 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> xli-1.17.0.ebuild:
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index 86375867b074..b2da99a26ec1 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 14d64b13af8b0159de950bf773e5019c xli-1.17.0-r1.ebuild 2211
-MD5 e8f42f1eb29e17efb719c0a03fbe751c ChangeLog 2335
+MD5 d00d85d03560cfd6ce5b093f3456a7ca xli-1.17.0-r1.ebuild 2212
+MD5 5e70eb876fe5cdec1ec26ade94de0c93 ChangeLog 2550
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 30914776e4be0070e5966a350f3d8586 xli-1.17.0.ebuild 2117
+MD5 3dfd4609226054038e49e9be9a9acb9f xli-1.17.0.ebuild 2114
 MD5 88664b266f34957e871e07457c605227 files/Xli.ad 123
 MD5 4f4d73aa9e90de9931e810d283ab6db6 files/digest-xli-1.17.0-r1 66
 MD5 56c2673ad567dbf5ca2163c932571234 files/digest-xli-1.17.0 62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFCOd4untT9W3vfTuoRAuoBAJ9+5bSKM14tbnv4C+pXvCYXicQaiQCgq1vk
-hJu5C2bVWbU3tKwN7x89u18=
-=YsZv
+iD8DBQFCO2bIntT9W3vfTuoRAgh4AKC18zgoiymHtleY3jUHNBZ7VbHcQgCfeq93
+9oHUNk4/gLZxGNDkexfVMGg=
+=77vc
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/xli/xli-1.17.0-r1.ebuild b/media-gfx/xli/xli-1.17.0-r1.ebuild
index 0b457ec54d9e..350f8f3fd38c 100644
--- a/media-gfx/xli/xli-1.17.0-r1.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r1.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-gfx/xli/xli-1.17.0-r1.ebuild,v 1.10 2005/03/17 19:44:30 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r1.ebuild,v 1.11 2005/03/18 23:39:25 cryos Exp $
 
 inherit alternatives
 
@@ -49,7 +49,7 @@ src_unpack() {
 }
 
 src_compile() {
-	/usr/X11R6/bin/xmkmf || die
+	xmkmf || die "xmkmf failed."
 
 	emake CDEBUGFLAGS="${CFLAGS}" || die
 }
diff --git a/media-gfx/xli/xli-1.17.0.ebuild b/media-gfx/xli/xli-1.17.0.ebuild
index 79f38ade634f..7392afcc4534 100644
--- a/media-gfx/xli/xli-1.17.0.ebuild
+++ b/media-gfx/xli/xli-1.17.0.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-gfx/xli/xli-1.17.0.ebuild,v 1.19 2005/03/16 20:22:50 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0.ebuild,v 1.20 2005/03/18 23:39:25 cryos Exp $
 
 inherit alternatives
 
@@ -45,7 +45,7 @@ src_unpack() {
 }
 
 src_compile() {
-	/usr/X11R6/bin/xmkmf || die
+	xmkmf || die "xmkmf died."
 
 	emake CDEBUGFLAGS="${CFLAGS}" || die
 }