Version bump (see bug #185481).

Package-Manager: portage-2.1.4

5 files changed, 117 insertions, 31 deletions

diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog
index 7ec4fa41a54c..cbd15f9423cb 100644
--- a/sci-mathematics/axiom/ChangeLog
+++ b/sci-mathematics/axiom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/axiom
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.14 2007/07/22 06:57:09 dberkholz Exp $
+# 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 $
+
+*axiom-200711 (23 Jan 2008)
+
+  23 Jan 2008; Markus Dittrich <markusle@gentoo.org> axiom-3.9-r1.ebuild,
+  +axiom-200711.ebuild:
+  Version bump (see bug #185481).
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; axiom-3.9-r1.ebuild:
   Drop virtual/x11 references.
diff --git a/sci-mathematics/axiom/Manifest b/sci-mathematics/axiom/Manifest
index 327e9b6e375f..9de49eca021b 100644
--- a/sci-mathematics/axiom/Manifest
+++ b/sci-mathematics/axiom/Manifest
@@ -23,18 +23,26 @@ MD5 ff71bb7ac45cae40335ecbfa0b89412c files/noweb-2.9-insecure-tmp-file.patch.inp
 RMD160 2afe80731bd3fcfa23e0ee799649886ce3fdd0af files/noweb-2.9-insecure-tmp-file.patch.input 4819
 SHA256 68bf232fd91b94fc9d08373d079afcb890a6af6991373da81089560ce21889a9 files/noweb-2.9-insecure-tmp-file.patch.input 4819
 DIST axiom-Sept2005-src.tgz 41447064 RMD160 ae0a63e4dc7d772183001e688d5a5561d689f7d4 SHA1 ba30056ab5af30a579a285480ca5058b11bf8fa6 SHA256 750da2f7960686c7f50fa4c6c859f51300909e4b488fe6395d75fe4405a1d1f3
-EBUILD axiom-3.9-r1.ebuild 3093 RMD160 7fdffb28ea06233fb43ec2c93c376ad935a0e4e9 SHA1 50e7392c806f5c6f606a9417649c222aeebc3bcd SHA256 729c6ed3ad0f8cb8ea8037cb786800dc354ba5adb9ca3d68757417a63031463a
-MD5 1510a4903d335bf20ca9f5ea41aeec1d axiom-3.9-r1.ebuild 3093
-RMD160 7fdffb28ea06233fb43ec2c93c376ad935a0e4e9 axiom-3.9-r1.ebuild 3093
-SHA256 729c6ed3ad0f8cb8ea8037cb786800dc354ba5adb9ca3d68757417a63031463a axiom-3.9-r1.ebuild 3093
-MISC ChangeLog 2121 RMD160 df2d647d56f82e3fa436e63b62fa4f3c9117d8fc SHA1 7a93ada7d60d841d241ea92279b55794436e8a2f SHA256 a5837802694737bc36556d81450349fab126fd6b1b50a8e91d896a6c6ce77688
-MD5 7502089d76067dfbb015c6f6b8f715d7 ChangeLog 2121
-RMD160 df2d647d56f82e3fa436e63b62fa4f3c9117d8fc ChangeLog 2121
-SHA256 a5837802694737bc36556d81450349fab126fd6b1b50a8e91d896a6c6ce77688 ChangeLog 2121
+DIST silver-nov2007-src.tgz 89646725 RMD160 b12d325030e3d9c047f763a46be713a00fd7ac18 SHA1 6a7b609a6b93781872bb239f93aef326185d97c0 SHA256 15389e631ceb1275aafdbceca47052352b6ae9c883fb232caf886c3c0bac90c8
+EBUILD axiom-200711.ebuild 1886 RMD160 2ecb005821b414c5c4599122210838497eda0793 SHA1 05095b3bc3418b3f4e62493ed1676800bbb19903 SHA256 c4c7ed7a99fdb9223ebb6afcac4464c7b105aaa6926b5f9112e1746fb53f69af
+MD5 bf5234a5e440b4d222d9fa75dbcd2604 axiom-200711.ebuild 1886
+RMD160 2ecb005821b414c5c4599122210838497eda0793 axiom-200711.ebuild 1886
+SHA256 c4c7ed7a99fdb9223ebb6afcac4464c7b105aaa6926b5f9112e1746fb53f69af axiom-200711.ebuild 1886
+EBUILD axiom-3.9-r1.ebuild 3142 RMD160 7c311cd661a46028e0dea56acdb0750c71639453 SHA1 1d5647ae87258227179cec38edf78cc0c79011d2 SHA256 a346aec7c8ffaefa5bf93e62e6234093188f87f23eb66ece7daefd6672306cbd
+MD5 f2c3eb0df02b2944a1993f06074c33f7 axiom-3.9-r1.ebuild 3142
+RMD160 7c311cd661a46028e0dea56acdb0750c71639453 axiom-3.9-r1.ebuild 3142
+SHA256 a346aec7c8ffaefa5bf93e62e6234093188f87f23eb66ece7daefd6672306cbd axiom-3.9-r1.ebuild 3142
+MISC ChangeLog 2282 RMD160 38c27bf65ad95d28bf2f366eea41bb0b176338a3 SHA1 6da83f89ab22f7da45ad3a0dd0a42571afe458c0 SHA256 de6326131738d7b0e54c236f16dfbe403abc73f05070c0d9ed286ee81fbc05b9
+MD5 c20b2dcf1a545a1f075acc8b01021ff4 ChangeLog 2282
+RMD160 38c27bf65ad95d28bf2f366eea41bb0b176338a3 ChangeLog 2282
+SHA256 de6326131738d7b0e54c236f16dfbe403abc73f05070c0d9ed286ee81fbc05b9 ChangeLog 2282
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
 MD5 30bc69a424d7634aae9c1e4203365d3d metadata.xml 168
 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 metadata.xml 168
 SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9 metadata.xml 168
+MD5 24de0825191ebaa482295473e053e3c7 files/digest-axiom-200711 253
+RMD160 99eaf9acacf9088b3aca8201738505d442287466 files/digest-axiom-200711 253
+SHA256 63c644d9b5fcd125b4b9db78a66272b40197d9468bd62dd4112cf226e8712f42 files/digest-axiom-200711 253
 MD5 f5325403baf7987627d722d86541cf13 files/digest-axiom-3.9-r1 253
 RMD160 7163e15cb0087c7bd6221d1f760fb6e8b9970035 files/digest-axiom-3.9-r1 253
 SHA256 10e35fdd3f04a38fbba5651b96ec5a78d461eafbb720f1f2f5253ee9fd99a7c8 files/digest-axiom-3.9-r1 253
diff --git a/sci-mathematics/axiom/axiom-200711.ebuild b/sci-mathematics/axiom/axiom-200711.ebuild
new file mode 100644
index 000000000000..7784774bafde
--- /dev/null
+++ b/sci-mathematics/axiom/axiom-200711.ebuild
@@ -0,0 +1,69 @@
+# 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.1 2008/01/23 16:42:25 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/silver-nov2007-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}"/silver
+
+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
+	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
index 65e2a1c6b063..528d68fd3708 100644
--- a/sci-mathematics/axiom/axiom-3.9-r1.ebuild
+++ b/sci-mathematics/axiom/axiom-3.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.5 2007/07/22 06:57:09 dberkholz Exp $
+# $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
 
@@ -32,22 +32,22 @@ src_compile() {
 	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!'
+	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}
+	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
+	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)
@@ -67,9 +67,9 @@ 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
+	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
@@ -79,11 +79,11 @@ src_install() {
 	EOF
 
 	# Get rid of /mnt/linux
-	cd ${D}/opt/axiom
+	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
+	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/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