Fixing final QA issue on sci-mathematics/Macaulay2

3 files changed, 26 insertions, 26 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index b29b2e1ae..4ec7885cd 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -2,23 +2,8 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-	26 Nov 2009; Thomas Kahle <tom111@gmx.de>
-	QA fixes
-
-	25 Nov 2009; Thomas Kahle <tom111@gmx.de>
-	+Macaulay2-1.3.1-r2.ebuild
-
-	New revision with completely split deps and without subversion
-
-	20 Nov 2009; Thomas Kahle <tom111@gmx.de>
-	+Macaulay2-1.3.1-r1.ebuild -Macaulay2-1.3.1.ebuild -Macaulay2-1.2-r2.ebuild
-
-	Documentation cache gets installed properly.
-	removed old versions.
-
-	16 Nov 2009; Thomas Kahle <tom111@gmx.de> +Macaulay2-1.3.1.ebuild
-
-	Version bump
+  17 Mar 2010; Thomas Kahle <tom111@gmx.de> Macaulay2-1.3.1-r3.ebuild:
+  Fixing QA issues
 
   17 Mar 2010; Thomas Kahle <tom111@gmx.de> files/70Macaulay2-gentoo.el,
   Macaulay2-1.3.1-r3.ebuild:
@@ -42,13 +27,24 @@
   Macaulay2-1.3.1-r1.ebuild, Macaulay2-1.3.1-r2.ebuild:
   change the dependencies from dev-libs/mpir to sci-libs/mpir as agreed.
 
-  26 Aug 2009; Thomas Kahle <tom111@gmx.de>
+  26 Nov 2009; Thomas Kahle <tom111@gmx.de>
+  QA fixes
+
+  25 Nov 2009; Thomas Kahle <tom111@gmx.de> +Macaulay2-1.3.1-r2.ebuild
+  New revision with completely split deps and without subversion
+
+  20 Nov 2009; Thomas Kahle <tom111@gmx.de> +Macaulay2-1.3.1-r1.ebuild
+  -Macaulay2-1.3.1.ebuild -Macaulay2-1.2-r2.ebuild
+  Documentation cache gets installed properly.  removed old versions.
 
+  16 Nov 2009; Thomas Kahle <tom111@gmx.de> +Macaulay2-1.3.1.ebuild
+  Version bump
+
+  26 Aug 2009; Thomas Kahle <tom111@gmx.de>
   Changed -r3 ebuild since #282174 was fixed and workarounds are not
 	needed anymore
 
   19 Aug 2009; Thomas Kahle <tom111@gmx.de> +Macaulay2-1.2-r3.ebuild
-
   Rewritten ebuild for QA
 
   06 May 2009; Thomas Kahle <tom111@gmx.de> -Macaulay2-1.2.ebuild
@@ -60,7 +56,8 @@
 
   Fixes an issue with the documentation
 
-  25 Apr 2009; Thomas Kahle <tom111@gmx.de> +Macaulay2-1.2.ebuild +metadata.xml +files/70Macaulay2-gentoo.el  +files/patch-3.1.0b
+  25 Apr 2009; Thomas Kahle <tom111@gmx.de> +Macaulay2-1.2.ebuild
+  +metadata.xml +files/70Macaulay2-gentoo.el +files/patch-3.1.0b
 
   Intial import (Bug #246095)
 
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r3.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r3.ebuild
index 2903c80bb..99d0b8fc1 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r3.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="sys-libs/gdbm
 	>=dev-libs/ntl-5.5.2
@@ -51,6 +51,9 @@ src_prepare() {
 	# /usr/bin
 	epatch "${FILESDIR}/paths-of-dependencies.patch"
 
+	# Fixing make warnings about unavailable jobserver:
+	sed -i "s/\$(MAKE)/+ \$(MAKE)/g" "${S}"/distributions/Makefile.in
+
 	eautoreconf
 }
 
@@ -71,7 +74,7 @@ src_configure (){
 }
 
 src_compile() {
-	# Parallel build not yet supported
+	# Parallel build not supported yet
 	emake -j1 || die "failed to build Macaulay"
 
 	if use emacs; then
@@ -85,8 +88,8 @@ src_test() {
 }
 
 src_install () {
-
-	emake install || die "install failed"
+	# Parallel install not supported yet
+	emake -j1 install || die "install failed"
 
 	# 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 02d5c5180..8fdde092c 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -1,6 +1,6 @@
 AUX 70Macaulay2-gentoo.el 597 RMD160 bdf3a30bb4d15a77e0dff86c866134d06c443fa0 SHA1 d4a4036042ab13bc20d8be90b559e9168bfc0ef5 SHA256 e5583d11e6ab662261abb32e90fcf31ccf6bd56f2b23b691b9255d1b8d8acb2f
 AUX paths-of-dependencies.patch 2437 RMD160 9b63baeee97428406bed8bfbf67cf6fead95974a SHA1 cf245ad8bcdbe119e127242119b2b96342100035 SHA256 bffbaaf077f99f1e135fe0eff61be702c6eb138f4b4ae715cec8c5be62ee8046
 DIST Macaulay2-1.3.1.tar.bz2 3737431 RMD160 ce29e95d5b1b5409e368054f2edf0e5bd04d0dd3 SHA1 5a0f6b830b7a3a7cf045ac10e64ca2e3cb199600 SHA256 c07104d3a0edb70d61d3a221f7c8b0d23e0cca2d30b27127fe8ec7f763a2b4b1
-EBUILD Macaulay2-1.3.1-r3.ebuild 2489 RMD160 6f7ca3274ab3f45b528c033f4ba800d4c9a79e57 SHA1 f525a578c8665fcd3706bbfbc718acb3b6854e70 SHA256 15dc9102a3eb9b6559b1186fa64855485a6830c8d54bceab5635c1c97b4bfed8
-MISC ChangeLog 2106 RMD160 6d679602fb5c8adbb640c78a9757ada8c4726bc2 SHA1 3f7522688244daec7dab8dbeb5405aaf3ef6dfba SHA256 d1676ed2dc3a06d1e72f92ba2d2a972e495d1a070b934db1021fd9f82a62aa8e
+EBUILD Macaulay2-1.3.1-r3.ebuild 2651 RMD160 ca4332c7ccbffd35ea516f968a77dfbc01e9c8eb SHA1 0551b9803cff0ff7993e4ca90d70b12eec628f6c SHA256 6f957b390ffadf97dce4c91ba30376cca016be8c3d93dedc83e4be23a2a96e92
+MISC ChangeLog 2201 RMD160 5843083e102d9470264a636de14f70a6a6bd7614 SHA1 74cab2ff21c4fec832b996d510647d20da08b45c SHA256 b0da6ee7107295ff2ede134fbe4e7c4cc91535c61cd76a6104905fea0fc6d1d9
 MISC metadata.xml 361 RMD160 273db3a009b85938f85e60ea0d34d6fc625f9477 SHA1 7f6e903d81af55b08c7dbb9feb4f7ad39852a23e SHA256 71a0f19b08b1e752e754bbc5faf15880601d00c5b9df2bc5ca5a3b8e93e83b7f