Update live dependencies

(Portage version: 2.1.11.9/git/Linux x86_64, unsigned Manifest commit)

3 files changed, 13 insertions, 12 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index f82041a9a..0cd176dcf 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Aug 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+  Update live dependencies
+
   02 May 2012; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
   Fix live ebuild
 
@@ -137,4 +140,3 @@
   +metadata.xml +files/70Macaulay2-gentoo.el +files/patch-3.1.0b
 
   Intial import (Bug #246095)
-
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 49cab70c5..0ef50e6a6 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -11,9 +11,9 @@ IUSE="emacs optimization"
 ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2"
 
 # Those packages will be built internally, Macaulay2 always wants the
-# latest and greatest
-BOEHM_GC="gc-7.3alpha1.2012.01.23"
+# latest and greatest (mostly git snapshots)
 GCLIBATOMIC_OPS="gc-libatomic_ops-7.3alpha2"
+GC="gc-20120729"
 FACTORY="factory-3-1-4-1"
 LIBFAC="libfac-3-1-4"
 
@@ -23,10 +23,8 @@ SRC_BASE="http://www.math.uiuc.edu/${PN}/Downloads/"
 SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
 		 ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
 		 http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
-		 http://www.math.uiuc.edu/Macaulay2/Extra/${BOEHM_GC}.tar.gz
+		 http://www.math.uiuc.edu/Macaulay2/Extra/${GC}.tar.gz
 		 http://www.math.uiuc.edu/Macaulay2/Extra/${GCLIBATOMIC_OPS}.tar.gz"
-# Somebody changed the tarball after release... grrr.
-#		 ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${FACTORY}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -84,10 +82,10 @@ src_prepare() {
 		|| die "copy failed"
 	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}/${BOEHM_GC}.tar.gz" "${S}/BUILD/tarfiles/" \
+	# Macaulay 2 insists on a git snapshot of gc We will let it build
+	# its internal version for now.  Note: The resulting QA warning is
+	# known.
+	cp "${DISTDIR}/${GC}.tar.gz" "${S}/BUILD/tarfiles/" \
 		|| die "copy failed"
 	cp "${DISTDIR}/${GCLIBATOMIC_OPS}.tar.gz" "${S}/BUILD/tarfiles/" \
 		|| die "copy failed"
@@ -114,7 +112,8 @@ src_configure (){
 
 src_compile() {
 	# Parallel build not supported yet
-	emake -j1 || die "failed to build Macaulay"
+	# For trunk builds, let's ignore example errors
+	emake IgnoreExampleErrors=true -j1 || die "failed to build Macaulay"
 
 	if use emacs; then
 		cd "${S}/Macaulay2/emacs"
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index d2d3fb35c..8d469acb4 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -1,5 +1,5 @@
 DIST factory-3-1-4-1.tar.gz 707733 SHA256 7691308866a47e405be0f26b15e553850ead6034f76b6bc311e7a84a4c6b3e6a SHA512 404ef7c3afa6c3f868efbd13e5d3e80f7655d6f0615dc6feb21892743d804057344174133497027f5f49ead0d48e792a4a9b0749311092c5883e22a4bba9dd4c WHIRLPOOL 79366c2bc1bec781affdaa36264d4c726f447f8faf2694e9ce7fa5169b2ba3949f26ac6c108579a34ba8aa09f76a5eddc652d14a34de7123ee5d4fe8d9998256
 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 gc-20120729.tar.gz 2285159 SHA256 7ca8190f487c21d28b320680158935cc3f8407940f1f278be83eba078b34e3ae SHA512 0f304516613a1702307c52e3741e31d9005659c64b5b03d6442b4a1dd55876f229a15698c53f916a1544b024e560e2a31c7cc6b1a2e5fcf0e74a2c45d3eedc7c WHIRLPOOL b5d27d95fadeef522c99691ab482de02f3d616f61890115f926ca5a888b95300029f0dffd3f59b89c898d2cef44bae5b887e3bdd04325e7104eea3e2b25fab4f
 DIST gc-libatomic_ops-7.3alpha2.tar.gz 1454218 SHA256 b51ae5de3c43186e6c54d820b5b823acffa497868f70d4bcf43a454cfc0cea05 SHA512 bd7ff73ce275823af8375ca5a0406bfce5c623b142d0ec42d6ec7a9d3849f6e4f6ee5fe60f048d8940b43592dd757bb712d034906138a734fd1b02056199bd4a WHIRLPOOL 5c09dc990138089beccb692c87d2e791e5efb41822ee48d990cbb0e68713e64622d61561b972a0d4a9f5762f2aaf6331e81e35b291a3da2a1e515b37a6e1d6bc
 DIST libfac-3-1-4.tar.gz 82499 SHA256 12e83baae591e2d2920d87d5fcbb079e9cdd95fa18d989c47df25fdeab339d50 SHA512 e7c155bd1e5b93a050574532f6630e5954ad9e7f010cd7e5a76b175bdf6b95866ac49f80409f6a0e7b41d8c3b052f89a02e77049211030f04ea8a5b47e669b49 WHIRLPOOL 91682eb69d632ac67a3897f62070b562a95903eba0ea6da01c85c540d5da3e0b645f61d787f7d8f6daee3b1b22de2c7826478016c309f8243a39f41f0dcf95eb