Version bump and removed old version.

Package-Manager: portage-2.1.4.4

8 files changed, 86 insertions, 219 deletions

diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog
index a2dfe853205c..b15afcf28fbc 100644
--- a/sci-mathematics/axiom/ChangeLog
+++ b/sci-mathematics/axiom/ChangeLog
@@ -1,6 +1,16 @@
 # 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.16 2008/02/01 17:26:12 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.17 2008/03/31 12:58:24 markusle Exp $
+
+*axiom-200803 (30 Mar 2008)
+
+  30 Mar 2008; Markus Dittrich <markusle@gentoo.org>
+  -files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch,
+  -files/gcl-2.6.7.fix-configure.in-gentoo.patch.input,
+  -files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch,
+  -files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input,
+  -axiom-3.9-r1.ebuild, +axiom-200803.ebuild:
+  Version bump and removed old version.
 
   01 Feb 2008; Markus Dittrich <markusle@gentoo.org>
   +files/axiom-200711-gcl-configure.patch, axiom-200711.ebuild:
diff --git a/sci-mathematics/axiom/Manifest b/sci-mathematics/axiom/Manifest
index 089344b9fe1d..e5f70992859e 100644
--- a/sci-mathematics/axiom/Manifest
+++ b/sci-mathematics/axiom/Manifest
@@ -1,13 +1,9 @@
 AUX axiom-200711-gcl-configure.patch 445 RMD160 c62109a2198b19d0770de49c08107cd884dc4c82 SHA1 569117c5ec07f2dfd6edeefc5af499b66e202b45 SHA256 1e56780436eae1f9c31e55ac3c2903a62837cd957fe323f995922e2a4629c4f9
-AUX gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch 1073 RMD160 960a81bb50ef0b62dbc49e08ada7b08e900934c3 SHA1 c04618a8fbc5b02a34c83878ea7275ae114436f0 SHA256 0324fdeb5dc9172e4c022bc7e99c9bc64ef991c617efacfa9d2cbff7b6c48d47
-AUX gcl-2.6.7.fix-configure.in-gentoo.patch.input 1227 RMD160 0ec6e8b0a207378b8c10a804d87e79009aa60b5e SHA1 60896b024222ea2380f4e40db1ec9e4f2ea75f16 SHA256 dadc568b55a805168043ca78b1c1974d74698c2e92e32e1c9dfdcee234984c3d
-AUX gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch 1422 RMD160 ea2e4f25456bab6c69e75d573362689b60de90e1 SHA1 2b024c16f747776ace2e6df8b5eabf161018167a SHA256 5a9388f09d6d380546f950ad17f9bc4b3977a192cd86a97e6416e6ad36f59a14
-AUX gcl-2.6.7.fix-out-of-build-root-compile.patch.input 843 RMD160 489ec75966dae4d7d2921fc93ab8a2655fee6e1e SHA1 d423bbcc6ae41f864a3e6caec07fea83be8065d3 SHA256 dfaae7ea24fb8fcb761ed9b540dc66eeb5b22b65e626e1e475c911eadeb8338e
 AUX noweb-2.9-insecure-tmp-file.Makefile.patch 439 RMD160 16cdc72fab65bab45c7728d374da60f7b4cccc65 SHA1 428d4380a17535939a59b5efd12556ab4cafde06 SHA256 3c4b5bea61620cb545e576d2e82dd8daa0478fc6c40ae0a93dbdac432aa9531d
 AUX noweb-2.9-insecure-tmp-file.patch.input 4819 RMD160 2afe80731bd3fcfa23e0ee799649886ce3fdd0af SHA1 23aff1cf0862618c7450704d0d47fcec2497de0b SHA256 68bf232fd91b94fc9d08373d079afcb890a6af6991373da81089560ce21889a9
-DIST axiom-Sept2005-src.tgz 41447064 RMD160 ae0a63e4dc7d772183001e688d5a5561d689f7d4 SHA1 ba30056ab5af30a579a285480ca5058b11bf8fa6 SHA256 750da2f7960686c7f50fa4c6c859f51300909e4b488fe6395d75fe4405a1d1f3
+DIST axiom-mar2008-src.tgz 206421514 RMD160 b3f55e1e4a4ead181743f14c812bc5ec9229847e SHA1 8ea4dbfffb316e204b72da3afcdb80b002ce3ce7 SHA256 fa51b08fb13ce8984b559a0bea6ec0bd9b4bde2b4a97f56011bf92a5e1164a78
 DIST silver-nov2007-src.tgz 89646725 RMD160 b12d325030e3d9c047f763a46be713a00fd7ac18 SHA1 6a7b609a6b93781872bb239f93aef326185d97c0 SHA256 15389e631ceb1275aafdbceca47052352b6ae9c883fb232caf886c3c0bac90c8
 EBUILD axiom-200711.ebuild 2053 RMD160 0d3eb53d04751183d554cffdedd1bbc6d70922ac SHA1 e1c5c69596ef28284f652f6b82d7f4eacb3764dc SHA256 db80b1b123a5eee3a6ae20b3450dfb61d1011fed4f1389a6f22e1affdc02e1e1
-EBUILD axiom-3.9-r1.ebuild 3142 RMD160 7c311cd661a46028e0dea56acdb0750c71639453 SHA1 1d5647ae87258227179cec38edf78cc0c79011d2 SHA256 a346aec7c8ffaefa5bf93e62e6234093188f87f23eb66ece7daefd6672306cbd
-MISC ChangeLog 2528 RMD160 56fc5bda62d9ceaf6ac70d9865696a4877251b32 SHA1 15b8c400e985722f19391c1f7bc65f7eb28dfdbe SHA256 6ab9df8e4163ccf457f2c6340702f6455f7af8b01f231b791d166cd0fda8f51d
+EBUILD axiom-200803.ebuild 2059 RMD160 631931d50db907e883ff324cf3c8a8c0b16e4a4d SHA1 6408ec297b8b73397f0b0c65e463e6e310212653 SHA256 878b697b986803c9220143ba52aa50f1761f8d0d996985fec3e0f8624dfcce8e
+MISC ChangeLog 2939 RMD160 d2689c10f98adf2a8e7befd4c8c6f3fe002f79dc SHA1 1708c18696ccbf5fce4ae86067a86dabd68ef384 SHA256 fffe4396aedb0dae5a6c8478eb44091e27a344d06a5df487e24e1c2c32fab3d5
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
diff --git a/sci-mathematics/axiom/axiom-200803.ebuild b/sci-mathematics/axiom/axiom-200803.ebuild
new file mode 100644
index 000000000000..b555f600e9ef
--- /dev/null
+++ b/sci-mathematics/axiom/axiom-200803.ebuild
@@ -0,0 +1,72 @@
+# 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-200803.ebuild,v 1.1 2008/03/31 12:58:24 markusle Exp $
+
+inherit eutils multilib flag-o-matic
+
+DESCRIPTION="Axiom is a general purpose Computer Algebra system"
+HOMEPAGE="http://axiom.axiom-developer.org/"
+SRC_URI="http://www.axiom-developer.org/axiom-website/downloads/${PN}-mar2008-src.tgz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# NOTE: Do not strip since this seems to remove some crucial
+# runtime paths as well, thereby, breaking axiom
+RESTRICT="strip"
+
+DEPEND="virtual/latex-base
+	x11-libs/libXaw"
+
+S="${WORKDIR}"/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	cp "${FILESDIR}"/noweb-2.9-insecure-tmp-file.patch.input \
+		"${S}"/zips/noweb-2.9-insecure-tmp-file.patch \
+		|| die "Failed to fix noweb"
+	cp "${FILESDIR}"/${PN}-200711-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!"
+}
+
+src_compile() {
+	# lots of strict-aliasing badness
+	append-flags -fno-strict-aliasing
+
+	./configure || die "Failed to configure"
+	# use gcl 2.6.7
+	sed -e "s:GCLVERSION=gcl-2.6.8pre$:GCLVERSION=gcl-2.6.7:" \
+		-i Makefile.pamphlet Makefile \
+		|| die "Failed to select proper gcl"
+
+	# fix libXpm.a location
+	sed -e "s:X11R6/lib:$(get_libdir):g" -i Makefile.pamphlet \
+		|| die "Failed to fix libXpm lib paths"
+
+	# Let the fun begin...
+	AXIOM="${S}"/mnt/linux emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR="${D}"/opt/axiom COMMAND="${D}"/opt/axiom/mnt/linux/bin/axiom install \
+		|| die 'Failed to install Axiom!'
+
+	mv "${D}"/opt/axiom/mnt/linux/* "${D}"/opt/axiom
+	rm -fr "${D}"/opt/axiom/mnt
+
+	dodir /usr/bin
+	dosym /opt/axiom/bin/axiom /usr/bin/axiom
+
+	sed -e "2d;3i AXIOM=/opt/axiom" \
+		-i "${D}"/opt/axiom/bin/axiom \
+		|| die "Failed to patch axiom runscript!"
+
+	dodoc changelog readme faq
+}
diff --git a/sci-mathematics/axiom/axiom-3.9-r1.ebuild b/sci-mathematics/axiom/axiom-3.9-r1.ebuild
deleted file mode 100644
index 528d68fd3708..000000000000
--- a/sci-mathematics/axiom/axiom-3.9-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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-3.9-r1.ebuild,v 1.6 2008/01/23 16:42:25 markusle Exp $
-
-inherit eutils
-
-DESCRIPTION="Axiom is a general purpose Computer Algebra system"
-HOMEPAGE="http://axiom.axiom-developer.org/"
-SRC_URI="http://axiom.axiom-developer.org/axiom-website/DOWNLOADS/axiom-Sept2005-src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/tetex
-	x11-libs/libXaw"
-
-S="${WORKDIR}/axiom"
-
-src_setenv() {
-	export AXIOM=`pwd`/mnt/linux
-	export PATH=${AXIOM}/bin:${PATH}
-}
-
-src_compile() {
-	src_setenv
-
-	# Patch the lsp Makefile since GCL goes kaboom with newer BFDs
-	# from Portage, so we need to use the BFD distributed with GCL for
-	# things to compile and work.
-	sed -i -e 's/--enable-statsysbfd/--enable-locbfd --disable-statsysbfd/' Makefile.pamphlet || die 'Failed to patch the lsp Makefile!'
-
-	# 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
-	cp "${FILESDIR}"/noweb-2.9-insecure-tmp-file.patch.input "${S}"/zips/noweb-2.9-insecure-tmp-file.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!'
-	epatch "${FILESDIR}"/noweb-2.9-insecure-tmp-file.Makefile.patch || die 'Failed to patch noweb security issue!'
-
-	# Sandbox happiness, fix noweb
-	cd "${WORKDIR}"
-	mkdir noweb
-	cd noweb
-	tar zxf "${S}"/zips/noweb-2.10a.tgz
-	sed -i -e 's/-texhash || echo "Program texhash not found or failed"//' src/Makefile* "${S}"/zips/noweb.src.Makefile*
-	tar czf "${S}"/zips/noweb-2.10a.tgz *
-	cd "${S}"
-	rm "${WORKDIR}"/noweb -rf
-
-	# Fix compile bugs (if sed fails, it's fixed; so we don't || die :-])
-	#	(plasmaroo; 20050116)
-	sed -e 's/struct termio ptermio;/struct termios ptermio;/' -i src/clef/edible.c.pamphlet
-	mkdir src/graph/viewports
-
-	# Fix include paths for libXpm
-	# (Bug #143738)
-	sed -i -e '/^XLIB=/s:/X11R6::g' Makefile.pamphlet || die "Failed to fix XLIB in Makefile.pamphlet"
-
-	# Let the fun begin...
-	./configure
-	make || die # -jX breaks
-}
-
-src_install() {
-	src_setenv
-
-	dodir /usr/bin
-	einstall INSTALL="${D}"/opt/axiom COMMAND="${D}"/usr/bin/axiom || die 'Failed to install Axiom!'
-	sed -e '2d;3i AXIOM=/opt/axiom' -i "${D}"/usr/bin/axiom "${D}"/opt/axiom/mnt/linux/bin/axiom || die 'Failed to patch axiom runscript!'
-	cat <<- EOF > "${D}"/usr/bin/AXIOMsys
-		#!/bin/sh -
-		AXIOM=/opt/axiom
-		export AXIOM
-		PATH=\${AXIOM}/bin:\${PATH}
-		export PATH
-		exec \$AXIOM/bin/AXIOMsys \$*
-	EOF
-
-	# Get rid of /mnt/linux
-	cd "${D}"/opt/axiom
-	mv mnt/linux/* .
-	rm -rf mnt
-
-	sed -e 's/AXIOMsys/sman/g' "${D}"/usr/bin/axiom > "${D}"/usr/bin/sman
-	chmod +x "${D}"/usr/bin/sman
-	chmod +x "${D}"/usr/bin/AXIOMsys
-}
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
deleted file mode 100644
index 8e525ed934a7..000000000000
--- a/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
deleted file mode 100644
index b4f21ad68802..000000000000
--- a/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.patch.input
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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
- 
diff --git a/sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch b/sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch
deleted file mode 100644
index bc4e3fa8b5ec..000000000000
--- a/sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: Makefile.pamphlet
-===================================================================
-RCS file: /cvsroot/axiom/axiom/lsp/Makefile.pamphlet,v
-retrieving revision 1.16
-diff -u -r1.16 Makefile.pamphlet
---- lsp/Makefile.pamphlet	5 Sep 2005 23:44:08 -0000	1.16
-+++ lsp/Makefile.pamphlet	4 Dec 2005 21:25:58 -0000
-@@ -15,6 +15,17 @@
- over the gcl Makefiles.
- 
- Patches are applied to the distribution before we do the configure.
-+\section{Gnu Common Lisp 2.6.7}
-+\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
-+the Axiom user invokes a command that requires compilation - the gcc call
-+will fail and this patch rectifies the issue. Dec 4 2005, Tim Yamin.
-+<<gcl-2.6.7.fix-out-of-build-root-compile.patch>>=
-+	@(cd ${GCLVERSION}/cmpnew ; \
-+	  echo 29 applying fix-out-of-build-root-compile patch ; \
-+	  ${PATCH} <${SPD}/zips/${GCLVERSION}.fix-out-of-build-root-compile.patch )
-+@
- \section{Gnu Common Lisp 2.6.7pre}
- \subsection{run-process patch}
- The gcl-2.6.6.h.linux.h.patch has been accepted into the mainline lisp
-@@ -1019,6 +1030,7 @@
- <<gcl-2.6.7.toploop.patch>>
- <<gcl-2.6.7.tail-recursive.patch>>
- <<gcl-2.6.7.collectfn.fix>>
-+<<gcl-2.6.7.fix-out-of-build-root-compile.patch>>
- <<gclConfigureMake>>
- 	@echo 13 finished system build on `date` | tee >gcldir
- 
diff --git a/sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input b/sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input
deleted file mode 100644
index 9b73a20026ab..000000000000
--- a/sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input
+++ /dev/null
@@ -1,24 +0,0 @@
---- gcl_cmpmain.lsp	2005-05-06 22:56:55.000000000 +0100
-+++ gcl_cmpmain.lsp.new	2005-12-04 20:56:31.000000000 +0000
-@@ -545,9 +545,8 @@
-     (setq na  (namestring
- 	       (make-pathname :name name :type (pathname-type(first args)))))
-    #+(or dos winnt)
--      (format nil "~a -I~a ~a ~a -c -w ~s -o ~s"
-+      (format nil "~a ~a ~a -c -w ~s -o ~s"
- 	      *cc*
--	      (concatenate 'string si::*system-directory* "../h")
- 	      (if (and (boundp '*c-debug*) *c-debug*) " -g " "")
- 	      (case *speed*
- 		    (3 *opt-three* )
-@@ -558,9 +557,8 @@
- 	      )
- 
-    #-(or dos winnt)
--   (format nil  "~a -I~a ~a ~a -c ~s -o ~s ~a"
-+   (format nil  "~a ~a ~a -c ~s -o ~s ~a"
- 	   *cc*
--	   (concatenate 'string si::*system-directory* "../h")
- 	   (if (and (boundp '*c-debug*) *c-debug*) " -g " "")
-            (case *speed*
- 		 (3 *opt-three* )