[gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/

[Thomas Kahle]

commit:     ec4d0cbf48fd6686e20d99708da842f1b9148935
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  1 16:32:43 2012 +0000
Commit:     Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Thu Mar  1 16:33:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ec4d0cbf

Update deps in M2 live ebuild

---
 sci-mathematics/Macaulay2/ChangeLog             |    5 ++++-
 sci-mathematics/Macaulay2/Macaulay2-9999.ebuild |   21 ++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index ab9d8e8..069f906 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-mathematics/Macaulay2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Mar 2012; Thomas Kahle <tomka@g.o> Macaulay2-9999.ebuild:
+  Update deps in M2-live ebuild
+
   25 Sep 2011; Thomas Kahle <tomka@g.o>
   files/9999-paths-of-external-programs.patch, Macaulay2-9999.ebuild:
   Fix live ebuild

diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index e313f60..6839fc3 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -10,12 +10,17 @@ IUSE="emacs optimization"
 
 ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2"
 
+BOEHM_GC="gc-7.3alpha1.2012.01.23"
+FACTORY="factory-3-1-4"
+LIBFAC="libfac-3-1-4"
+
 DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
 HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
 SRC_BASE="http://www.math.uiuc.edu/${PN}/Downloads/"
-SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/libfac-3-1-3.tar.gz
-		 ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-3-1-3.tar.gz
-		 http://www.math.uiuc.edu/Macaulay2/Extra/gc-7.2alpha7-2011-07-25.tar.gz"
+SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${FACTORY}.tar.gz
+		 ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
+		 ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${LIBFAC}.tar.gz
+		 http://www.math.uiuc.edu/Macaulay2/Extra/${BOEHM_GC}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -67,14 +72,16 @@ src_prepare() {
 	# Factory, and libfac are statically linked libraries which (in this flavor) are not used by any
 	# other program. We build them internally and don't install them
 	mkdir "${S}/BUILD/tarfiles" || die "Creation of directory failed"
-	cp "${DISTDIR}/factory-3-1-3.tar.gz" "${S}/BUILD/tarfiles/" \
+	cp "${DISTDIR}/${FACTORY}.tar.gz" "${S}/BUILD/tarfiles/" \
+		|| die "copy failed"
+	cp "${DISTDIR}/factory-gftables.tar.gz" "${S}/BUILD/tarfiles/" \
 		|| die "copy failed"
-	cp "${DISTDIR}/libfac-3-1-3.tar.gz" "${S}/BUILD/tarfiles/" \
+	cp "${DISTDIR}/${LIBFAC}.tar.gz" "${S}/BUILD/tarfiles/" \
 		|| die "copy failed"
 	# Macaulay 2 insists on a snapshot of boehm-gc that is not available elsewhere
 	# We will let it build its internal version for now.  Note:
 	# The resulting QA warning is known.
-	cp "${DISTDIR}/gc-7.2alpha7-2011-07-25.tar.gz" "${S}/BUILD/tarfiles/" \
+	cp "${DISTDIR}/${BOEHM_GC}.tar.gz" "${S}/BUILD/tarfiles/" \
 		|| die "copy failed"
 
 	eautoreconf