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

["Thomas Kahle" <tom111@gmx.de>]

commit:     97d1c35866e2ca2fbb2d54b32d268bb833914544
Author:     Thomas Kahle <thomas.kahle <AT> ovgu <DOT> de>
AuthorDate: Tue Jun 10 21:04:26 2014 +0000
Commit:     Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Tue Jun 10 21:04:35 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=97d1c358

update live ebuild

Package-Manager: portage-2.2.8-r1

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

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 59afbfd..d28de71 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: $
 
+  10 Jun 2014; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+  update live ebuild
+
   29 Apr 2014; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
   Fix live ebuild
 

diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index b3a6e7f..888dc99 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -9,13 +9,11 @@ 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-3-1-6"
-LIBFAC="libfac-3-1-6"
+FACTORY="factory-4.0.0"
 
 DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
 HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
 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
 	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"
@@ -97,14 +95,12 @@ src_prepare() {
 	# Shortcircuit lapack tests
 	epatch "${FILESDIR}"/${PV}-lapack.patch
 
-	# 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
+	# Factory is a statically linked library which (in this flavor) are not used by any
+	# 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/" \
 		|| die "copy failed"
-	cp "${DISTDIR}/${LIBFAC}.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
 	# same as the tested program.
@@ -129,7 +125,7 @@ src_configure (){
 		--with-issue=Gentoo \
 		$(use_enable optimization optimize) \
 		$(use_enable debug) \
-		--enable-build-libraries="factory libfac" \
+		--enable-build-libraries="factory" \
 		--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
 		|| die "failed to configure Macaulay"
 }