Fixed missing include version file for java option and forced -j1 until proper fix (bug #511856)

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

3 files changed, 46 insertions, 5 deletions

diff --git a/sci-mathematics/yacas/ChangeLog b/sci-mathematics/yacas/ChangeLog
index b59ac2b60ac0..e4f5b92d5ec4 100644
--- a/sci-mathematics/yacas/ChangeLog
+++ b/sci-mathematics/yacas/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/yacas
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.36 2014/05/28 17:44:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.37 2014/06/09 22:09:14 bicatali Exp $
+
+  09 Jun 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/yacas-1.3.4-java-version.patch, yacas-1.3.4.ebuild:
+  Fixed missing include version file for java option and forced -j1 until proper
+  fix (bug #511856)
 
 *yacas-1.3.4 (28 May 2014)
 
diff --git a/sci-mathematics/yacas/files/yacas-1.3.4-java-version.patch b/sci-mathematics/yacas/files/yacas-1.3.4-java-version.patch
new file mode 100644
index 000000000000..7f6ab2da5144
--- /dev/null
+++ b/sci-mathematics/yacas/files/yacas-1.3.4-java-version.patch
@@ -0,0 +1,29 @@
+--- JavaYacas/dumpversion.cpp.orig	2014-06-09 12:10:15.095959491 -0700
++++ JavaYacas/dumpversion.cpp	2014-06-09 12:11:09.565339056 -0700
+@@ -1,11 +1,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include "version.h"
++#include "yacas/yacas_version.h"
+ 
+ int main(int argc, char** argv)
+ {
+   printf("package net.sf.yacas;\n");
+-  printf("class CVersion { static String VERSION = \"%s\"; }\n", VERSION);
++  printf("class CVersion { static String VERSION = \"%s\"; }\n", YACAS_VERSION);
+   return 0;
+ }
+ 
+--- JavaYacas/makefile.yacas.orig	2014-06-09 12:11:47.516603467 -0700
++++ JavaYacas/makefile.yacas	2014-06-09 15:03:17.329987079 -0700
+@@ -32,8 +32,8 @@
+ .java.class:
+ 	$(JAVAC) $(JAVACFLAGS) $*.java 
+ 
+-net/sf/yacas/CVersion.java: ../src/version.h dumpversion.cpp
+-	$(CXX) $(CXXFLAGS) -I ../src dumpversion.cpp -o dumpversion
++net/sf/yacas/CVersion.java: ../include/yacas/yacas_version.h dumpversion.cpp
++	$(CXX) $(CXXFLAGS) -I ../include dumpversion.cpp -o dumpversion
+ 	./dumpversion > net/sf/yacas/CVersion.java
+ 
+ 
diff --git a/sci-mathematics/yacas/yacas-1.3.4.ebuild b/sci-mathematics/yacas/yacas-1.3.4.ebuild
index a5f1a1db5218..f95600be4de5 100644
--- a/sci-mathematics/yacas/yacas-1.3.4.ebuild
+++ b/sci-mathematics/yacas/yacas-1.3.4.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.3.4.ebuild,v 1.1 2014/05/28 17:44:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.3.4.ebuild,v 1.2 2014/06/09 22:09:14 bicatali Exp $
 
 EAPI=5
 
-inherit autotools-utils java-pkg-opt-2
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit java-pkg-opt-2 autotools-utils
 
 DESCRIPTION="General purpose computer algebra system"
 HOMEPAGE="http://yacas.sourceforge.net/"
@@ -18,17 +21,21 @@ IUSE="doc java static-libs server"
 DEPEND="java? ( >=virtual/jdk-1.6 )"
 RDEPEND="java? ( >=virtual/jre-1.6 )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-java-version.patch
+)
+
 src_configure() {
 	local myeconfargs=(
+		--with-html-dir="/usr/share/doc/${PF}/html"
 		$(use_enable doc html-doc)
 		$(use_enable server)
-		--with-html-dir="/usr/share/doc/${PF}/html"
 	)
 	autotools-utils_src_configure
 }
 
 src_compile() {
-	autotools-utils_src_compile
+	autotools-utils_src_compile -j1
 	if use java; then
 		cd "${BUILD_DIR}"/JavaYacas || die
 		# -j1 because of file generation dependence