Update live ebuild

Package-Manager: portage-2.1.11.52

3 files changed, 12 insertions, 20 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index f97fdc7fd..2237d2edd 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2013; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
+  Update live ebuild
+
   10 Jan 2013; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
   migrate to git-2 eclass, fix lapack support
 
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 008034019..0bc34ec8f 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -19,7 +19,6 @@ 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
 		 http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
-		 http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/mpfr-3.0.1.tar.gz
 		 http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz
 		 http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.8/Normaliz2.8.zip"
 # Need normaliz for an up to date normaliz.m2
@@ -28,15 +27,10 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS=""
 
-# Macaulay2 is broken with >=mpfr-3.1, to not force a downgrade on users
-# we let it built an internal copy :(
-# This dep was removed:
-# >=dev-libs/mpfr-3.0.0
-
 DEPEND="
 	sys-libs/gdbm
-	>=dev-libs/ntl-5.5.2
-	>=sci-mathematics/pari-2.3.4[gmp]
+	dev-libs/ntl
+	sci-mathematics/pari[gmp]
 	>=sys-libs/readline-6.1
 	dev-libs/libxml2:2
 	sci-mathematics/frobby
@@ -44,7 +38,8 @@ DEPEND="
 	sci-mathematics/nauty
 	>=sci-mathematics/normaliz-2.8
 	sci-mathematics/gfan
-	>=sci-libs/mpir-2.1.1[cxx]
+	sci-libs/mpir[cxx]
+	dev-libs/mpfr
 	sci-libs/cdd+
 	sci-libs/cddlib
 	sci-libs/lrslib[gmp]
@@ -95,9 +90,6 @@ src_prepare() {
 	# /usr/bin
 	epatch "${FILESDIR}"/${PV}-paths-of-external-programs.patch
 
-	# Fixing make warnings about unavailable jobserver:
-	sed -i "s/\$(MAKE)/+ \$(MAKE)/g" "${S}"/distributions/Makefile.in
-
 	# Shortcircuit lapack tests
 	epatch "${FILESDIR}"/${PV}-lapack.patch
 
@@ -115,9 +107,6 @@ src_prepare() {
 	# same as the tested program.
 	cp "${DISTDIR}/gtest-1.6.0.tar.gz" "${S}/BUILD/tarfiles/" \
 		|| die "copy failed"
-	# Temporary internal build of mpfr-3.0:
-	cp "${DISTDIR}/mpfr-3.0.1.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
 
 	eautoreconf
 }
@@ -136,16 +125,16 @@ src_configure (){
 		--disable-strip \
 		$(use_enable optimization optimize) \
 		$(use_enable debug) \
-		--enable-build-libraries="factory libfac mpfr" \
+		--enable-build-libraries="factory libfac" \
 		--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
 		|| die "failed to configure Macaulay"
 }
 
 src_compile() {
 	# Parallel build not supported yet
-	emake -j1
+	# emake -j1
 	# For trunk builds we may wish to ignore example errors
-	# emake IgnoreExampleErrors=true -j1
+	emake IgnoreExampleErrors=true -j1
 
 	if use emacs; then
 		cd "${S}/Macaulay2/emacs"
@@ -161,7 +150,8 @@ src_test() {
 
 src_install () {
 	# Parallel install not supported yet
-	emake -j1 install
+	# NumericalAlgebraicGeometry fails (during install too?)
+	emake IgnoreExampleErrors=true -j1 install
 
 	# Remove emacs files and install them in the
 	# correct place if use emacs
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index 3828d4073..383193d28 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -3,4 +3,3 @@ DIST factory-3-1-4-1.tar.gz 707733 SHA256 7691308866a47e405be0f26b15e553850ead60
 DIST factory-gftables.tar.gz 2961892 SHA256 4cd6b3de2fd5eea694a5d843328ab8f6dba1da05ae93efcd2ca0fa5d7658a6fb SHA512 49dfb52e030f04c0b940ce124eb633bb34dacb7ab2faf7f5fee82b3e1ce5331af600b9b684a53eb766c643e38a45f361028940cfd26b8a699c919cfb63d12535 WHIRLPOOL f5d15ac5dcb8e126ecffb42cde5bf5472dbb81e7cb7b2abc1306ee36ef8d85067d0c13b7fa58b65eb09b69da1409a81ea02c0f7ca0e3d1ac71f5c21d8e8b5f81
 DIST gtest-1.6.0.tar.gz 956966 SHA256 d2346ad6f3b56763b3e18ffde7e69fd2fac11a434f5b12a70f16fabb133554d9 SHA512 b4926751cc3212eb3d3d567a35fd85ed5c8c8393f5781a302f712c56451bf79e596929e56aae0ddedd26d1de2e7ec706c33dd4ee2cfc77a12eb385f36b1da62c WHIRLPOOL 4209b769117486ad5e156625b051364e768338eb3f750e2dfa9149d6e1debebbb81cf3b8b96805dc4222352852a8f70eea3a9f3345ef3986bfacf2fada98581b
 DIST libfac-3-1-4.tar.gz 82499 SHA256 12e83baae591e2d2920d87d5fcbb079e9cdd95fa18d989c47df25fdeab339d50 SHA512 e7c155bd1e5b93a050574532f6630e5954ad9e7f010cd7e5a76b175bdf6b95866ac49f80409f6a0e7b41d8c3b052f89a02e77049211030f04ea8a5b47e669b49 WHIRLPOOL 91682eb69d632ac67a3897f62070b562a95903eba0ea6da01c85c540d5da3e0b645f61d787f7d8f6daee3b1b22de2c7826478016c309f8243a39f41f0dcf95eb
-DIST mpfr-3.0.1.tar.gz 1478243 SHA256 df67386b66c98adb0e5dc75c926b836a862da50b1e37c576328bb2d78e8bccc7 SHA512 a99ae1063b2f28bf19b5f76dd06f58e6a5bd6e36820d50e75d2c160a5713ddd0bdfc1371298e6025285a6a749ad59eced30797a6f9395a37565d5db083531e4e WHIRLPOOL 941fd9e728e52384aab9bdc38bd20f0a43743a452153438f0b49ee9dbe0eeeba1f95c6e15c14f70ae87996c05ba27bae4a7fbc6f4203485a8e990e36371259ca