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

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

commit:     32beca628f4f65b13fbd4a7de9126abab84bdf84
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 02:24:36 2012 +0000
Commit:     Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Tue Nov 13 02:24:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=32beca62

Update live ebuild for latest Normaliz

---
 sci-mathematics/Macaulay2/Macaulay2-9999.ebuild |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index 72b4584..a2b1127 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