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

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

commit:     90feafe1f687ca6e95335828361b94ab792ac2bc
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 18 15:56:35 2013 +0000
Commit:     Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Mon Feb 18 15:57:01 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=90feafe1

Update live ebuild

Package-Manager: portage-2.1.11.52

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

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 2237d2e..3505a7e 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -5,6 +5,9 @@
   18 Feb 2013; Thomas Kahle <tomka@gentoo.org> Macaulay2-9999.ebuild:
   Update live ebuild
 
+  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 0bc34ec..3db0821 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -27,7 +27,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS=""
 
-DEPEND="
+DEPEND="sys-process/time
+	virtual/pkgconfig
+	app-arch/unzip
+	app-text/dos2unix"
+# Unzip and dos2unix just for normaliz
+
+RDEPEND="
 	sys-libs/gdbm
 	dev-libs/ntl
 	sci-mathematics/pari[gmp]
@@ -47,16 +53,9 @@ DEPEND="
 	virtual/lapack
 	dev-util/ctags
 	sys-libs/ncurses
-	sys-process/time
 	>=dev-libs/boehm-gc-7.2_alpha6[threads]
 	dev-libs/libatomic_ops
-	emacs? ( virtual/emacs )
-	virtual/pkgconfig
-	app-arch/unzip
-	app-text/dos2unix"
-# Unzip and dos2unix just for normaliz
-
-RDEPEND="${DEPEND}"
+	emacs? ( virtual/emacs )"
 
 SITEFILE=70Macaulay2-gentoo.el
 
@@ -84,7 +83,7 @@ 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
+	dos2unix "${S}/Macaulay2/packages/Normaliz.m2" || die
 
 	# Patching .m2 files to look for external programs in
 	# /usr/bin