Fixed broken gcl configure (see bug #208326).

(Portage version: 2.1.4)

5 files changed, 29 insertions, 3 deletions

diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog
index cbd15f9423cb..a2dfe853205c 100644
--- a/sci-mathematics/axiom/ChangeLog
+++ b/sci-mathematics/axiom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/axiom
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.15 2008/01/23 16:42:25 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.16 2008/02/01 17:26:12 markusle Exp $
+
+  01 Feb 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/axiom-200711-gcl-configure.patch, axiom-200711.ebuild:
+  Fixed broken gcl configure (see bug #208326). Thanks much to
+  Martin Väth <vaeth@mathematik.uni-wuerzburg.de> for this fix.
 
 *axiom-200711 (23 Jan 2008)
 
diff --git a/sci-mathematics/axiom/axiom-200711.ebuild b/sci-mathematics/axiom/axiom-200711.ebuild
index 7aa97ba450ff..30f60d0599c1 100644
--- a/sci-mathematics/axiom/axiom-200711.ebuild
+++ b/sci-mathematics/axiom/axiom-200711.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-200711.ebuild,v 1.2 2008/01/23 18:25:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-200711.ebuild,v 1.3 2008/02/01 17:26:12 markusle Exp $
 
 inherit eutils multilib flag-o-matic
 
@@ -27,7 +27,11 @@ src_unpack() {
 	cd "${S}"
 
 	cp "${FILESDIR}"/noweb-2.9-insecure-tmp-file.patch.input \
-		"${S}"/zips/noweb-2.9-insecure-tmp-file.patch
+		"${S}"/zips/noweb-2.9-insecure-tmp-file.patch \
+		|| die "Failed to fix noweb"
+	cp "${FILESDIR}"/${P}-gcl-configure.patch \
+		"${S}"/zips/gcl-2.6.7.configure.in.patch \
+		|| die "Failed to fix gcl-2.6.7 configure"
 	epatch "${FILESDIR}"/noweb-2.9-insecure-tmp-file.Makefile.patch \
 		|| die "Failed to patch noweb security issue!"
 }
diff --git a/sci-mathematics/axiom/files/axiom-200711-gcl-configure.patch b/sci-mathematics/axiom/files/axiom-200711-gcl-configure.patch
new file mode 100644
index 000000000000..a5ecb58d7cc7
--- /dev/null
+++ b/sci-mathematics/axiom/files/axiom-200711-gcl-configure.patch
@@ -0,0 +1,11 @@
+--- configure	2008-02-01 09:06:15.000000000 -0500
++++ configure.new	2008-02-01 09:03:18.000000000 -0500
+@@ -1711,7 +1711,7 @@
+ 	# results, and the version is kept in special file).
+     
+ 	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-	    system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'`
++	    system=MP-RAS-`${AWK} '{print $3}' '/etc/.relid'`
+ 	fi
+ 	if test "`uname -s`" = "AIX" ; then
+ 	    system=AIX-`uname -v`.`uname -r`
diff --git a/sci-mathematics/axiom/files/digest-axiom-200711 b/sci-mathematics/axiom/files/digest-axiom-200711
new file mode 100644
index 000000000000..0c82e26e1e64
--- /dev/null
+++ b/sci-mathematics/axiom/files/digest-axiom-200711
@@ -0,0 +1,3 @@
+MD5 091996836e99869fe5765da77c0921ac silver-nov2007-src.tgz 89646725
+RMD160 b12d325030e3d9c047f763a46be713a00fd7ac18 silver-nov2007-src.tgz 89646725
+SHA256 15389e631ceb1275aafdbceca47052352b6ae9c883fb232caf886c3c0bac90c8 silver-nov2007-src.tgz 89646725
diff --git a/sci-mathematics/axiom/files/digest-axiom-3.9-r1 b/sci-mathematics/axiom/files/digest-axiom-3.9-r1
new file mode 100644
index 000000000000..26f751be5612
--- /dev/null
+++ b/sci-mathematics/axiom/files/digest-axiom-3.9-r1
@@ -0,0 +1,3 @@
+MD5 6b107a03b03595703d5e3e6bdd12f8c1 axiom-Sept2005-src.tgz 41447064
+RMD160 ae0a63e4dc7d772183001e688d5a5561d689f7d4 axiom-Sept2005-src.tgz 41447064
+SHA256 750da2f7960686c7f50fa4c6c859f51300909e4b488fe6395d75fe4405a1d1f3 axiom-Sept2005-src.tgz 41447064