Update live ebuild for latest Normaliz

2 files changed, 20 insertions, 4 deletions

diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 72b458400..a2b112795 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -16,12 +16,13 @@ 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}.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.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
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -41,7 +42,7 @@ DEPEND="
 	sci-mathematics/frobby
 	sci-mathematics/4ti2
 	sci-mathematics/nauty
-	>=sci-mathematics/normaliz-2.7
+	>=sci-mathematics/normaliz-2.8
 	sci-mathematics/gfan
 	>=sci-libs/mpir-2.1.1[cxx]
 	sci-libs/cdd+
@@ -55,7 +56,11 @@ DEPEND="
 	>=dev-libs/boehm-gc-7.2_alpha6[threads]
 	dev-libs/libatomic_ops
 	emacs? ( virtual/emacs )
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	app-arch/unzip
+	app-text/dos2unix"
+# Unzip and dos2unix just for normaliz
+
 RDEPEND="${DEPEND}"
 
 SITEFILE=70Macaulay2-gentoo.el
@@ -64,6 +69,11 @@ S="${WORKDIR}/${PN}-${PV}"
 
 RESTRICT="mirror"
 
+src_unpack (){
+	unpack "Normaliz2.8.zip"
+	subversion_src_unpack
+}
+
 pkg_setup () {
 		tc-export CC CPP CXX
 		append-cppflags "-I/usr/include/frobby"
@@ -72,6 +82,11 @@ pkg_setup () {
 }
 
 src_prepare() {
+	# Put updated Normaliz.m2 in place
+	cp "${WORKDIR}/Normaliz2.8/Macaulay2/Normaliz.m2" \
+		"${S}/Macaulay2/packages" || die
+	dos2unix ${S}/Macaulay2/packages/Normaliz.m2 || die
+
 	# Patching .m2 files to look for external programs in
 	# /usr/bin
 	epatch "${FILESDIR}"/${PV}-paths-of-external-programs.patch
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index 67e98a986..3828d4073 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -1,3 +1,4 @@
+DIST Normaliz2.8.zip 6168152 SHA256 ea1dfe07321027fc7cde6f229b2f047fa833ca39c15e1a5a4f9f4e7145c816b7 SHA512 17c8b9fb4d4fca1c74fb332139cbdd76af3157c28d30ff5f2f9bfbd4af6778ad3ab2c80548bffdce37a13e11d663c54becd9b2623572455f3a1ea75d9b726d25 WHIRLPOOL bbe16e1ad68ab26a841b52e8fd036b3850c612c38898a36bfe92379e95c48a9b91f0ca744c1a195422522bd0af80825e5581d870ea4f0a38439b443e9a03ea70
 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 gtest-1.6.0.tar.gz 956966 SHA256 d2346ad6f3b56763b3e18ffde7e69fd2fac11a434f5b12a70f16fabb133554d9 SHA512 b4926751cc3212eb3d3d567a35fd85ed5c8c8393f5781a302f712c56451bf79e596929e56aae0ddedd26d1de2e7ec706c33dd4ee2cfc77a12eb385f36b1da62c WHIRLPOOL 4209b769117486ad5e156625b051364e768338eb3f750e2dfa9149d6e1debebbb81cf3b8b96805dc4222352852a8f70eea3a9f3345ef3986bfacf2fada98581b