sci-mathematics/scilab: some progress

now it builds, but fails in the linker phase with
some undefined references in libscigraphics.so

Closes: https://github.com/gentoo/sci/issues/1060
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>

7 files changed, 19 insertions, 53 deletions

diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-followlinks.patch b/sci-mathematics/scilab/files/scilab-6.1.0-followlinks.patch
deleted file mode 100644
index a3f60bee7..000000000
--- a/sci-mathematics/scilab/files/scilab-6.1.0-followlinks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/java.m4	2014-02-11 23:43:03.030430258 -0500
-+++ b/m4/java.m4	2014-02-11 23:43:54.008428766 -0500
-@@ -839,7 +839,7 @@
-       for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do
- 
- # TODO check the behaviour when spaces
--        jars_resolved=`ls $jar 2>/dev/null`
-+        jars_resolved=$(realpath $(ls $jar 2>/dev/null) 2>/dev/null)
-         for jar_resolved in $jars_resolved; do # If several jars matches
-           if test -e "$jar_resolved"; then
-             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-gluegen.patch b/sci-mathematics/scilab/files/scilab-6.1.0-gluegen.patch
deleted file mode 100644
index d75c31e9a..000000000
--- a/sci-mathematics/scilab/files/scilab-6.1.0-gluegen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/modules/gui/src/java/org/scilab/modules/gui/SwingView.java	2014-03-24 22:38:00.928934500 -0400
-+++ b/modules/gui/src/java/org/scilab/modules/gui/SwingView.java	2014-03-24 22:37:33.947567043 -0400
-@@ -157,7 +157,7 @@
- 
-     static {
-         try {
--            System.loadLibrary("gluegen2-rt");
-+            System.loadLibrary("gluegen-rt");
-         } catch (Exception e) {
-             System.err.println(e);
-         }
diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-java-heap.patch b/sci-mathematics/scilab/files/scilab-6.1.0-java-heap.patch
deleted file mode 100644
index ca17e52a6..000000000
--- a/sci-mathematics/scilab/files/scilab-6.1.0-java-heap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/etc/jvm_options.xml	2014-02-12 00:05:34.323390688 -0500
-+++ b/etc/jvm_options.xml	2014-02-12 00:05:53.977390112 -0500
-@@ -22,7 +22,7 @@
-     <!-- ENABLE Just In Time java compiler -->
-     <option value="-Djava.compiler=JIT"/>
-     <!-- Set Java Heap space to 256mb -->
--    <option value="-Xmx256m"/>
-+    <option value="-Xmx512m"/>
-     <!-- Avoid jvm to handle sigint (& other signals)  -->
-     <option value="-Xrs"/>
-     
diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-missinglib.patch b/sci-mathematics/scilab/files/scilab-6.1.0-missinglib.patch
deleted file mode 100644
index 25b281820..000000000
--- a/sci-mathematics/scilab/files/scilab-6.1.0-missinglib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN scilab-5.5.1-orig/Makefile.am scilab-5.5.1/Makefile.am
---- a/Makefile.am	2014-10-09 18:22:21.994610695 -0400
-+++ b/Makefile.am	2014-10-09 18:24:28.208333575 -0400
-@@ -74,6 +74,7 @@
- if NEED_JAVA
- scilab_bin_LDADD += \
- 			$(top_builddir)/modules/console/libsciconsole.la \
-+			$(top_builddir)/modules/console/libsciconsole-minimal.la \
- 			$(top_builddir)/modules/jvm/libscijvm.la \
- 			$(top_builddir)/modules/commons/libscicommons.la
- else
diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 9c3a6a6e7..1226b4d76 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -78,6 +78,7 @@ CDEPEND="
 		~dev-java/jogl-2.2.4:2.2
 		>=dev-java/jrosetta-1.0.4:0
 		>dev-java/lucene-2:=[contrib(-)]
+		<dev-java/lucene-5:=[contrib(-)]
 		dev-java/skinlf:0
 		dev-java/xmlgraphics-commons:2
 		virtual/opengl
@@ -92,7 +93,6 @@ RDEPEND="${CDEPEND}
 	gui? ( >=virtual/jre-1.5 )"
 
 DEPEND="${CDEPEND}
-	virtual/pkgconfig
 	debug? ( dev-util/lcov )
 	gui? (
 		>=virtual/jdk-1.6
@@ -110,6 +110,7 @@ DEPEND="${CDEPEND}
 		dev-java/junit:4
 		dev-java/ant-junit4:0
 		gui? ( ${VIRTUALX_DEPEND} ) )"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
 
diff --git a/sci-mathematics/scilab/scilab-6.0.2.ebuild b/sci-mathematics/scilab/scilab-6.0.2.ebuild
index c2ea20de0..ed77b97bc 100644
--- a/sci-mathematics/scilab/scilab-6.0.2.ebuild
+++ b/sci-mathematics/scilab/scilab-6.0.2.ebuild
@@ -54,6 +54,7 @@ CDEPEND="
 	sys-devel/gettext
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
+	sys-process/time
 	emf? (
 		dev-java/freehep-graphicsio:0
 		dev-java/freehep-graphicsio-emf:0
@@ -78,6 +79,7 @@ CDEPEND="
 		~dev-java/jogl-2.2.4:2.2
 		>=dev-java/jrosetta-1.0.4:0
 		>dev-java/lucene-5:=[modules(-)]
+		<dev-java/lucene-7:=[modules(-)]
 		dev-java/skinlf:0
 		dev-java/xmlgraphics-commons:2
 		virtual/opengl
@@ -92,7 +94,6 @@ RDEPEND="${CDEPEND}
 	gui? ( >=virtual/jre-1.8 )"
 
 DEPEND="${CDEPEND}
-	virtual/pkgconfig
 	debug? ( dev-util/lcov )
 	gui? (
 		>=virtual/jdk-1.6
@@ -110,14 +111,16 @@ DEPEND="${CDEPEND}
 		dev-java/junit:4
 		dev-java/ant-junit4:0
 		gui? ( ${VIRTUALX_DEPEND} ) )"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-6.1.0-followlinks.patch"
-	"${FILESDIR}/${PN}-6.1.0-gluegen.patch"
+	"${FILESDIR}/${PN}-5.5.2-followlinks.patch"
+	"${FILESDIR}/${PN}-5.5.2-gluegen.patch"
+	"${FILESDIR}/${PN}-5.5.2-ocaml-4.0.4.patch"
 	"${FILESDIR}/${PN}-6.1.0-accessviolation.patch"
-	"${FILESDIR}/${PN}-6.1.0-missinglib.patch"
+	"${FILESDIR}/${PN}-5.5.2-missinglib.patch"
 	"${FILESDIR}/${PN}-6.1.0-freehep.patch"
 	"${FILESDIR}/${PN}-6.1.0-libxml.patch"
 )
@@ -142,6 +145,8 @@ pkg_setup() {
 
 	# fails to compile in src/fortran/optml2.f:172:50 without this
 	test-flag-FC -fallow-argument-mismatch && append-fflags -fallow-argument-mismatch
+	# failure in src/cpp/GetSparseVariable.cpp:106:22
+	append-cxxflags -fpermissive
 
 	ALL_L10N="en_US"
 	ALL_L10N_DOC="en_US"
diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild b/sci-mathematics/scilab/scilab-6.1.0.ebuild
index 985cd5aa9..542930bdb 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.ebuild
@@ -54,6 +54,7 @@ CDEPEND="
 	sys-devel/gettext
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
+	sys-process/time
 	emf? (
 		dev-java/freehep-graphicsio:0
 		dev-java/freehep-graphicsio-emf:0
@@ -92,7 +93,6 @@ RDEPEND="${CDEPEND}
 	gui? ( >=virtual/jre-1.8 )"
 
 DEPEND="${CDEPEND}
-	virtual/pkgconfig
 	debug? ( dev-util/lcov )
 	gui? (
 		>=virtual/jdk-1.6
@@ -110,14 +110,16 @@ DEPEND="${CDEPEND}
 		dev-java/junit:4
 		dev-java/ant-junit4:0
 		gui? ( ${VIRTUALX_DEPEND} ) )"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
 
 PATCHES=(
-	"${FILESDIR}/${P}-followlinks.patch"
-	"${FILESDIR}/${P}-gluegen.patch"
+	"${FILESDIR}/${PN}-5.5.2-followlinks.patch"
+	"${FILESDIR}/${PN}-5.5.2-gluegen.patch"
+	"${FILESDIR}/${PN}-5.5.2-ocaml-4.0.4.patch"
 	"${FILESDIR}/${P}-accessviolation.patch"
-	"${FILESDIR}/${P}-missinglib.patch"
+	"${FILESDIR}/${PN}-5.5.2-missinglib.patch"
 	"${FILESDIR}/${P}-freehep.patch"
 	"${FILESDIR}/${P}-libxml.patch"
 )
@@ -142,6 +144,8 @@ pkg_setup() {
 
 	# fails to compile in src/fortran/optml2.f:172:50 without this
 	test-flag-FC -fallow-argument-mismatch && append-fflags -fallow-argument-mismatch
+	# failure in src/cpp/GetSparseVariable.cpp:106:22
+	append-cxxflags -fpermissive
 
 	ALL_L10N="en_US"
 	ALL_L10N_DOC="en_US"