Fix #118633.

(Portage version: 2.1_pre3-r1)

5 files changed, 81 insertions, 7 deletions

diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog
index 4ddd7295ee9c..71483e1ef9fe 100644
--- a/sci-mathematics/axiom/ChangeLog
+++ b/sci-mathematics/axiom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/axiom
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.5 2005/12/30 18:43:55 plasmaroo Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.6 2006/01/22 14:19:41 plasmaroo Exp $
+
+  22 Jan 2006; <plasmaroo@gentoo.org> axiom-3.9.ebuild,
+  +files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch,
+  +files/gcl-2.6.7.fix-configure.in-gentoo.patch.input:
+  Fix #118633.
 
   30 Dec 2005; <plasmaroo@gentoo.org> axiom-3.9.ebuild, axiom-9999.ebuild:
   Fix #117216.
diff --git a/sci-mathematics/axiom/Manifest b/sci-mathematics/axiom/Manifest
index 053c877933c6..f3e3840e06c2 100644
--- a/sci-mathematics/axiom/Manifest
+++ b/sci-mathematics/axiom/Manifest
@@ -1,8 +1,10 @@
 MD5 ae337ca66ac1faff5e04f560510525a1 ChangeLog 933
+MD5 e6a47d0eb77a856da0425c03e079d79d axiom-3.9.ebuild 2631
 MD5 89a525a7281abca48480fd4289bcfb85 axiom-9999.ebuild 2630
-MD5 e49bb02132d2cd74ad4e6ee291e102d9 metadata.xml 220
-MD5 6f8b8d7059dc8f178213d2839cd07232 axiom-3.9.ebuild 2407
 MD5 5e0239b67a06d3ea02047349b2e48e0d files/digest-axiom-3.9 69
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-axiom-9999 0
+MD5 d258cd9bae8894176e8b19f6062392f4 files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch 1073
+MD5 e309d0438c4dbaf7883c48c5f12275b4 files/gcl-2.6.7.fix-configure.in-gentoo.patch.input 1227
 MD5 84829d019c500de4d62b6f0e79fa9e0f files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch 1422
 MD5 43fa5bf93354597104a9752dea29743f files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input 843
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-axiom-9999 0
+MD5 e49bb02132d2cd74ad4e6ee291e102d9 metadata.xml 220
diff --git a/sci-mathematics/axiom/axiom-3.9.ebuild b/sci-mathematics/axiom/axiom-3.9.ebuild
index ba2f0cd28fb0..125a983498ab 100644
--- a/sci-mathematics/axiom/axiom-3.9.ebuild
+++ b/sci-mathematics/axiom/axiom-3.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-3.9.ebuild,v 1.2 2005/12/30 18:43:55 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-3.9.ebuild,v 1.3 2006/01/22 14:19:41 plasmaroo Exp $
 
 inherit eutils
 
@@ -33,7 +33,9 @@ src_compile() {
 
 	# Fix gcl so the "real" Axiom can compile code after we're out of the chroot
 	cp ${FILESDIR}/gcl-2.6.7.fix-out-of-build-root-compile.patch.input ${S}/zips/gcl-2.6.7.fix-out-of-build-root-compile.patch
+	cp ${FILESDIR}/gcl-2.6.7.fix-configure.in-gentoo.patch.input ${S}/zips/gcl-2.6.7.fix-configure.in-gentoo.patch
 	epatch ${FILESDIR}/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch || die 'Failed to patch the lsp pamphlet!'
+	epatch ${FILESDIR}/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch || die 'Failed to patch the lsp pamphlet!'
 
 	# Sandbox happiness, fix noweb
 	cd ${WORKDIR}
diff --git a/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch b/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch
new file mode 100644
index 000000000000..8e525ed934a7
--- /dev/null
+++ b/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch
@@ -0,0 +1,25 @@
+--- lsp/Makefile.pamphlet~	2006-01-13 18:16:07.000000000 +0000
++++ lsp/Makefile.pamphlet	2006-01-13 18:15:33.000000000 +0000
+@@ -16,6 +16,14 @@
+ 
+ Patches are applied to the distribution before we do the configure.
+ \section{Gnu Common Lisp 2.6.7}
++\subsubsection{fix-configure.in-gentoo.patch}
++Fix a strange configure peculiarity; Gentoo bug #118633. Patch backported
++from the gcl fix by Matthew Kennedy.
++<<gcl-2.6.7.fix-configure.in-gentoo.patch>>=
++	@(cd ${GCLVERSION} ; \
++	  echo 30 applying fix-configure.in-gentoo.patch ; \
++	  ${PATCH} <${SPD}/zips/${GCLVERSION}.fix-configure.in-gentoo.patch )
++@
+ \subsubsection{fix-out-of-build-root-compile.patch}
+ GCL's compiler system includes a -I<gclbuildroot> flag in the gcc args;
+ which causes issues if <gclbuildroot> does not exist at a later date and
+@@ -1031,6 +1039,7 @@
+ <<gcl-2.6.7.tail-recursive.patch>>
+ <<gcl-2.6.7.collectfn.fix>>
+ <<gcl-2.6.7.fix-out-of-build-root-compile.patch>>
++<<gcl-2.6.7.fix-configure.in-gentoo.patch>>
+ <<gclConfigureMake>>
+ 	@echo 13 finished system build on `date` | tee >gcldir
+ 
diff --git a/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.patch.input b/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.patch.input
new file mode 100644
index 000000000000..b4f21ad68802
--- /dev/null
+++ b/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.patch.input
@@ -0,0 +1,40 @@
+--- gcl-2.6.7/configure~	2005-01-15 19:17:17.000000000 +0000
++++ gcl-2.6.7/configure	2006-01-13 18:13:29.000000000 +0000
+@@ -1697,11 +1697,9 @@
+ done
+ test -n "$MAKEINFO" || MAKEINFO=""false""
+ 
+-
+-
+-if test -f /usr/lib/NextStep/software_version; then
+-    system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
+-else
++# if test -f /usr/lib/NextStep/software_version; then
++#    system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
++# else
+     system=`uname -s`-`uname -r`
+     if test "$?" -ne 0 ; then
+ 	echo "$ac_t""unknown (can't find uname command)" 1>&6
+@@ -1710,15 +1708,15 @@
+ 	# Special check for weird MP-RAS system (uname returns weird
+ 	# 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'`
+-	fi
+-	if test "`uname -s`" = "AIX" ; then
+-	    system=AIX-`uname -v`.`uname -r`
+-	fi
++	# if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
++	#    system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'`
++	# fi
++	# if test "`uname -s`" = "AIX" ; then
++	#    system=AIX-`uname -v`.`uname -r`
++	# fi
+ 	echo "$ac_t""$system" 1>&6
+     fi
+-fi
++# fi
+ 
+ # sysconf
+