Update deps in M2 live ebuild

3 files changed, 22 insertions, 11 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index ab9d8e80d..069f90632 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@gentoo.org> Macaulay2-9999.ebuild:
+  Update deps in M2-live ebuild
+
   25 Sep 2011; Thomas Kahle <tomka@gentoo.org>
   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 e313f6077..6839fc310 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
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index 61772db98..82988d944 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -1,3 +1,4 @@
-DIST factory-3-1-3.tar.gz 628001 RMD160 4e4b65247266b0cfb9a7bd8774879e60c1fdbc59 SHA1 3e4e5ddff2cb606ac784a02c2d9a7b5a30ffe07b SHA256 7e8976ac16f69ab72c1e1a94f69a185854f35f59f5db16a58e4a407ef36ff661
-DIST gc-7.2alpha7-2011-07-25.tar.gz 1318092 RMD160 dfbf3c54ec301c02831029bd7fb8c2d7a4abcec5 SHA1 cd4fc4731fe1ad09574185c13bee17f240b35e8c SHA256 2578feb8d0cba997794277c7da0a8898838b34bf313d16e95a302eae16d1ec29
-DIST libfac-3-1-3.tar.gz 84760 RMD160 dcb41afa852d782b64fdc05dde56d0d2e8699173 SHA1 d3fe1bf586331ae9d8c9bd7dc62899ef98159903 SHA256 17f63ebd74c36b22643c7b0e777e8759f7778ce716d8952b1f4aaed033f32b24
+DIST factory-3-1-4.tar.gz 677705 SHA256 c68940b7fe0ca6ea40a9bb8cba6803400e896c52fc4af75658837f3ab708bf78 SHA512 490451089fda66205943d9e734277bb53d097ea1772e895597d90be0cca8dd2d2963fdede4e623cbc65e917b9f13fdad0f06d8aa1423d38025b63265d0ab3915 WHIRLPOOL 50aea0f46f0092d6845a1685709d4b331bb7b33fe048b968c85d74684328f3a3f5af936a34891eec5732f00bad8988e5c42b69f7dd1ab710867c8e83bec471c2
+DIST factory-gftables.tar.gz 2961892 SHA256 4cd6b3de2fd5eea694a5d843328ab8f6dba1da05ae93efcd2ca0fa5d7658a6fb SHA512 49dfb52e030f04c0b940ce124eb633bb34dacb7ab2faf7f5fee82b3e1ce5331af600b9b684a53eb766c643e38a45f361028940cfd26b8a699c919cfb63d12535 WHIRLPOOL f5d15ac5dcb8e126ecffb42cde5bf5472dbb81e7cb7b2abc1306ee36ef8d85067d0c13b7fa58b65eb09b69da1409a81ea02c0f7ca0e3d1ac71f5c21d8e8b5f81
+DIST gc-7.3alpha1.2012.01.23.tar.gz 10520461 SHA256 c366975817bbbf8e070c715828212487d5a85e681550b441e8db9cefb4bc455e SHA512 dff823cf2374da6920d2b888d0bfdf2f9a8e101a72e0213ebbc50e0d38a6c73e1204857846ba0217f536ae0a59fcc3d379434bd67b365862d25151a7f753d45e WHIRLPOOL 8c6a60a6f565344c96a6f438aef9a4fb845d7a4dff631cf6565b72b589da0a22f32e98b70bac10143aba10a52c1001c911a2cc0ade4d9f76ca08a4700b506764
+DIST libfac-3-1-4.tar.gz 82499 SHA256 12e83baae591e2d2920d87d5fcbb079e9cdd95fa18d989c47df25fdeab339d50 SHA512 e7c155bd1e5b93a050574532f6630e5954ad9e7f010cd7e5a76b175bdf6b95866ac49f80409f6a0e7b41d8c3b052f89a02e77049211030f04ea8a5b47e669b49 WHIRLPOOL 91682eb69d632ac67a3897f62070b562a95903eba0ea6da01c85c540d5da3e0b645f61d787f7d8f6daee3b1b22de2c7826478016c309f8243a39f41f0dcf95eb