commit:     baf35ab2771c331b2b5dcd25323edfb7d735fdb1
Author:     Thomas Kahle <thomas.kahle <AT> ovgu <DOT> de>
AuthorDate: Wed Jun 11 13:18:08 2014 +0000
Commit:     Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Wed Jun 11 13:18:08 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=baf35ab2

Update live ebuild

Package-Manager: portage-2.2.8-r1

---
 sci-mathematics/Macaulay2/ChangeLog             |  3 +++
 sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 15 +++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sci-mathematics/Macaulay2/ChangeLog 
b/sci-mathematics/Macaulay2/ChangeLog
index d28de71..b54b9b7 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Jun 2014; Thomas Kahle <to...@gentoo.org> Macaulay2-9999.ebuild:
+  Update live ebuild
+
   10 Jun 2014; Thomas Kahle <to...@gentoo.org> Macaulay2-9999.ebuild:
   update live ebuild
 

diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild 
b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 888dc99..40b96f5 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -8,17 +8,16 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools elisp-common eutils flag-o-matic git-r3 python-single-r1 
toolchain-funcs
 
-# Those packages will be built internally.
-FACTORY="factory-4.0.0"
+FACTORY="factory-4.0.0+m4"
+FACTORY_GFTABLES="factory.4.0.1-gftables"
 
 DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
 HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/";
+BASE_URI="http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk";
 SRC_URI="
-       
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
-       
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${FACTORY}.tar.gz
-       
http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/gtest-1.7.0.tar.gz";
-#      
http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.8/Normaliz2.8.zip";
-# Need normaliz for an up to date normaliz.m2
+       ${BASE_URI}/${FACTORY}.tar.gz
+       ${BASE_URI}/${FACTORY_GFTABLES}.tar.gz
+       ${BASE_URI}/gtest-1.7.0.tar.gz"
 EGIT_REPO_URI="git://github.com/Macaulay2/M2.git"
 
 SLOT="0"
@@ -99,7 +98,7 @@ src_prepare() {
        # other program. We build it internally and don't install it.
        cp "${DISTDIR}/${FACTORY}.tar.gz" "${S}/BUILD/tarfiles/" \
                || die "copy failed"
-       cp "${DISTDIR}/factory-gftables.tar.gz" "${S}/BUILD/tarfiles/" \
+       cp "${DISTDIR}/${FACTORY_GFTABLES}.tar.gz" "${S}/BUILD/tarfiles/" \
                || die "copy failed"
        # Macaulay2 developers want that gtest is built internally because
        # the documentation says it may fail if build with options not the

Reply via email to