sci-mathematics/scilab: Fix SLOT version of batik

Package-Manager: portage-2.2.20

20 files changed, 23 insertions, 773 deletions

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index f6c4a459d..6c6f830c0 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,19 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Jun 2015; Justin Lecher <jlec@gentoo.org>
+  -files/scilab-5.5.0-accessviolation.patch,
+  -files/scilab-5.5.0-fix-random-runtime-failure.patch,
+  -files/scilab-5.5.0-followlinks.patch, -files/scilab-5.5.0-gluegen.patch,
+  -files/scilab-5.5.0-java-heap.patch, -files/scilab-5.5.0-jdk1.8.patch,
+  -files/scilab-5.5.0-nogui.patch, -files/scilab-5.5.1-accessviolation.patch,
+  -files/scilab-5.5.1-fix-random-runtime-failure.patch,
+  -files/scilab-5.5.1-followlinks.patch, -files/scilab-5.5.1-gluegen.patch,
+  -files/scilab-5.5.1-java-heap.patch, -files/scilab-5.5.1-missinglib.patch,
+  -files/scilab-5.5.1-nogui.patch, -scilab-5.5.0.ebuild, -scilab-5.5.1.ebuild,
+  metadata.xml, scilab-5.5.2.ebuild:
+  sci-mathematics/scilab: Fix SLOT version of batik
+
 *scilab-5.5.2 (03 Apr 2015)
 
   03 Apr 2015; Guillaume Horel <guillaume.horel@gmail.com>
diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
index 59ce40909..55fd0ce85 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -1,3 +1 @@
-DIST scilab-5.5.0-src.tar.gz 68627863 SHA256 7896ef914e40f6c7ce93dd106e091c552b1822190a3986795ee8b412a53aa5c3 SHA512 b8c061fdb8ef4bd18b332c735b0b4fb91a3aaa35edbe06d69ff4e3f360feae0be9fa3982e5f968ee3f7f0c94f115d25ec34ee3416339d38cbc4a8efa19f7b367 WHIRLPOOL 4e995b43477468d70a392214d155fd173dc22fa06ca045a84d22d7d486b26ad432a2670a7e938b6256b7e91b9540c47f60b1eac1c82e11adb5bf3f72d1b0265d
-DIST scilab-5.5.1-src.tar.gz 69538169 SHA256 c056223e12f17434a17ce881d13651bdb1b79a793bde028a978ea8dc20806729 SHA512 8906e916edef2068578e55fd01d4978ce58cb3431f0b7e9574bdd7f88667bcb74f10703a0391633e2b4fcc9ba2506c385338273b48f0f802267257f07e34d974 WHIRLPOOL 5d9d8b270ba9a814957f96d4084ff87abc5343bbc63d4ca21ae07f630be91658a4f5d9ff457c24d8bd26b90fc7ac6dfae99643f67ac75c9763e67479f1f8279a
 DIST scilab-5.5.2-src.tar.gz 69626327 SHA256 a734519de96d35b8f081768a5584086e46db089ab11c021744897b22ec4d0f5e SHA512 7f00ac837e36b5524a9c9a3106bdaefebb71559eb2932b2a16e4fac53fa1f9e66b87eabf98b3006ede25f8ab1d16d6ef1c7561ed29b67ddb42c98610fa72fe79 WHIRLPOOL 6f2fbe086fe7bff8364f85ea3d63cddd607bf63a2273bfbde7b1f18d96bda54d0e7f5bd9982616643014edc69d6a337887f0d4aef3f4a3d4b8f03e756a705fdf
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch
deleted file mode 100644
index a84de9a2b..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab
---- scilab-5.5.0-orig/bin/scilab	2014-07-12 15:24:17.105686656 -0400
-+++ scilab-5.5.0/bin/scilab	2014-07-12 15:25:29.307725409 -0400
-@@ -647,17 +647,6 @@
- GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g)
- export GTK_MODULES
- 
--# libEGL may be partially supported by the closed-source NVIDIA driver.
--# Until they release an EGL driver, we force the egl_glx driver.
--# http://bugzilla.scilab.org/show_bug.cgi?id=12940
--if test -x /usr/bin/glxinfo; then
--    NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
--    if test ! -z "$NVIDIA_GLX_VENDOR"; then
--        EGL_DRIVER=egl_glx
--        export EGL_DRIVER
--    fi
--fi
--
- if test $SCIVERBOSE -ne 0; then
-     echo "SCI : $SCI"
-     echo "SCIBIN : $SCIBIN"
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch
deleted file mode 100644
index 92ac45339..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp scilab/modules/api_scilab/src/cpp/api_double.cpp
---- scilab-orig/modules/api_scilab/src/cpp/api_double.cpp	2012-08-06 23:26:31.342617365 -0400
-+++ scilab/modules/api_scilab/src/cpp/api_double.cpp	2012-08-06 23:27:34.838621420 -0400
-@@ -497,7 +497,7 @@
- /*--------------------------------------------------------------------------*/
- int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)
- {
--    return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL);
-+    return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0);
- }
- /*--------------------------------------------------------------------------*/
- int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch
deleted file mode 100644
index fd6aa7bae..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/java.m4.orig	2014-02-11 23:43:03.030430258 -0500
-+++ 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-5.5.0-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.0-gluegen.patch
deleted file mode 100644
index 151443926..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-gluegen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java.orig	2014-03-24 22:38:00.928934500 -0400
-+++ scilab/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-5.5.0-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.0-java-heap.patch
deleted file mode 100644
index 31060d75a..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-java-heap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc/jvm_options.xml.orig	2014-02-12 00:05:34.323390688 -0500
-+++ 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-5.5.0-jdk1.8.patch b/sci-mathematics/scilab/files/scilab-5.5.0-jdk1.8.patch
deleted file mode 100644
index 856b1fde0..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-jdk1.8.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -urN scilab-5.5.0-orig/build.incl.xml scilab-5.5.0/build.incl.xml
---- scilab-5.5.0-orig/build.incl.xml	2014-06-29 14:31:51.791054076 -0400
-+++ scilab-5.5.0/build.incl.xml	2014-06-29 14:33:12.733269635 -0400
-@@ -84,17 +84,12 @@
-     <target name="init">
-         <!-- Check the version of Java. If it changes after the configure
-          or if there is a mistake in the build system
--    -->
--        <fail message="JDK 1.6 or 1.7 required. Found ${ant.java.version}">
--            <condition>
--                <not>
--                    <or>
--                        <equals arg1="${ant.java.version}" arg2="1.6"/>
--                        <equals arg1="${ant.java.version}" arg2="1.7"/>
--                    </or>
--                </not>
--            </condition>
--        </fail>
-+         Note: all class names are the same as in m4/java.m4
-+        -->
-+        <available property="jdk1.6+" classname="java.util.ArrayDeque"/>
-+        <available property="jdk1.7+" classname="java.nio.file.Path"/>
-+        <available property="jdk1.8+" classname="java.util.stream.DoubleStream"/>
-+        <fail message="Require JDK 1.6 or higher. Found ${ant.java.version}" unless="jdk1.6+"/>
-         <mkdir dir="${classes.dir}"/>
-         <mkdir dir="${classes.test.dir}"/>
-         <mkdir dir="${build.jar.dir}"/>
-diff -urN scilab-5.5.0-orig/configure.ac scilab-5.5.0/configure.ac
---- scilab-5.5.0-orig/configure.ac	2014-06-29 14:32:03.700233944 -0400
-+++ scilab-5.5.0/configure.ac	2014-06-29 14:33:12.735269665 -0400
-@@ -805,7 +805,7 @@
-      AC_JAVA_WITH_JDK
-      AC_JAVA_DETECT_JVM
-      case "$ac_java_jvm_version" in
--        1.6 | 1.7)
-+        1.6 | 1.7 | 1.8)
-         ;;
-         *)
-             AC_MSG_ERROR([Wrong version of Java. Expected at least 1.6. Found $ac_java_jvm_version])
-diff -urN scilab-5.5.0-orig/m4/java.m4 scilab-5.5.0/m4/java.m4
---- scilab-5.5.0-orig/m4/java.m4	2014-06-29 14:32:03.840236057 -0400
-+++ scilab-5.5.0/m4/java.m4	2014-06-29 14:33:12.736269680 -0400
-@@ -223,7 +223,7 @@
- #
- # VARIABLES SET:
- #    JAVAC
--#    ac_java_jvm_version can be set to 1.4, 1.5, 1.6 or 1.7
-+#    ac_java_jvm_version can be set to 1.4, 1.5, 1.6, 1.7, 1.8
- #    ac_java_jvm_dir can be set to the jvm's root directory
- #
- # DEPENDS ON:
-@@ -307,6 +307,9 @@
-     # The class java.nio.file.Path is new to 1.7
-     AC_JAVA_TRY_COMPILE([import java.nio.file.Path;], , "no", ac_java_jvm_version=1.7)
- 
-+    # The class java.util.stream.DoubleStream is new to 1.8
-+    AC_JAVA_TRY_COMPILE([import java.util.stream.DoubleStream;], , "no", ac_java_jvm_version=1.8)
-+
-     if test "x$ac_java_jvm_version" = "x" ; then
-         AC_MSG_ERROR([Could not detect Java version, 1.4 or newer is required])
-     fi
-diff -urN scilab-5.5.0-orig/modules/javasci/Makefile.in scilab-5.5.0/modules/javasci/Makefile.in
---- scilab-5.5.0-orig/modules/javasci/Makefile.in	2014-06-29 14:32:00.613187355 -0400
-+++ scilab-5.5.0/modules/javasci/Makefile.in	2014-06-29 14:34:15.638203989 -0400
-@@ -976,10 +976,10 @@
- 	@echo "This command is intended for maintainers to use"
- 	@echo "it deletes files that may require special tools to rebuild."
- 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
--@JAVASCI_FALSE@distclean-local:
- @JAVASCI_FALSE@install-data-local:
- @JAVASCI_FALSE@install-html-local:
- @JAVASCI_FALSE@clean-local:
-+@JAVASCI_FALSE@distclean-local:
- clean: clean-am
- 
- clean-am: clean-generic clean-libtool clean-local \
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-nogui.patch b/sci-mathematics/scilab/files/scilab-5.5.0-nogui.patch
deleted file mode 100644
index 60cee5a45..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-nogui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	2014-01-09 22:29:06.534469383 -0500
-+++ Makefile.in	2014-01-09 22:29:40.368471544 -0500
-@@ -2247,8 +2247,8 @@
- @BUILD_HELP_TRUE@	done; \
- @BUILD_HELP_TRUE@	fi
- # Also install scirenderer.jar
--@EXTERNAL_SCIRENDERER_FALSE@	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
--@EXTERNAL_SCIRENDERER_FALSE@	$(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
-+@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
-+@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@	$(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
- 
- .PHONY: macros localization doc
- 
diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.1-accessviolation.patch
deleted file mode 100644
index a84de9a2b..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.1-accessviolation.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab
---- scilab-5.5.0-orig/bin/scilab	2014-07-12 15:24:17.105686656 -0400
-+++ scilab-5.5.0/bin/scilab	2014-07-12 15:25:29.307725409 -0400
-@@ -647,17 +647,6 @@
- GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g)
- export GTK_MODULES
- 
--# libEGL may be partially supported by the closed-source NVIDIA driver.
--# Until they release an EGL driver, we force the egl_glx driver.
--# http://bugzilla.scilab.org/show_bug.cgi?id=12940
--if test -x /usr/bin/glxinfo; then
--    NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
--    if test ! -z "$NVIDIA_GLX_VENDOR"; then
--        EGL_DRIVER=egl_glx
--        export EGL_DRIVER
--    fi
--fi
--
- if test $SCIVERBOSE -ne 0; then
-     echo "SCI : $SCI"
-     echo "SCIBIN : $SCIBIN"
diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.1-fix-random-runtime-failure.patch
deleted file mode 100644
index 92ac45339..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.1-fix-random-runtime-failure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp scilab/modules/api_scilab/src/cpp/api_double.cpp
---- scilab-orig/modules/api_scilab/src/cpp/api_double.cpp	2012-08-06 23:26:31.342617365 -0400
-+++ scilab/modules/api_scilab/src/cpp/api_double.cpp	2012-08-06 23:27:34.838621420 -0400
-@@ -497,7 +497,7 @@
- /*--------------------------------------------------------------------------*/
- int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)
- {
--    return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL);
-+    return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0);
- }
- /*--------------------------------------------------------------------------*/
- int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.1-followlinks.patch
deleted file mode 100644
index fd6aa7bae..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.1-followlinks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/java.m4.orig	2014-02-11 23:43:03.030430258 -0500
-+++ 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-5.5.1-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.1-gluegen.patch
deleted file mode 100644
index 151443926..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.1-gluegen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java.orig	2014-03-24 22:38:00.928934500 -0400
-+++ scilab/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-5.5.1-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.1-java-heap.patch
deleted file mode 100644
index 31060d75a..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.1-java-heap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc/jvm_options.xml.orig	2014-02-12 00:05:34.323390688 -0500
-+++ 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-5.5.1-missinglib.patch b/sci-mathematics/scilab/files/scilab-5.5.1-missinglib.patch
deleted file mode 100644
index 7f88068c5..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.1-missinglib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN scilab-5.5.1-orig/Makefile.am scilab-5.5.1/Makefile.am
---- scilab-5.5.1-orig/Makefile.am	2014-10-09 18:22:21.994610695 -0400
-+++ scilab-5.5.1/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/files/scilab-5.5.1-nogui.patch b/sci-mathematics/scilab/files/scilab-5.5.1-nogui.patch
deleted file mode 100644
index 60cee5a45..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.1-nogui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	2014-01-09 22:29:06.534469383 -0500
-+++ Makefile.in	2014-01-09 22:29:40.368471544 -0500
-@@ -2247,8 +2247,8 @@
- @BUILD_HELP_TRUE@	done; \
- @BUILD_HELP_TRUE@	fi
- # Also install scirenderer.jar
--@EXTERNAL_SCIRENDERER_FALSE@	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
--@EXTERNAL_SCIRENDERER_FALSE@	$(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
-+@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
-+@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@	$(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
- 
- .PHONY: macros localization doc
- 
diff --git a/sci-mathematics/scilab/metadata.xml b/sci-mathematics/scilab/metadata.xml
index 10d6dddc8..2b022cd17 100644
--- a/sci-mathematics/scilab/metadata.xml
+++ b/sci-mathematics/scilab/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
   Scilab is a matrix-based scientific software package. Scilab contains
   hundreds of built-in mathematical functions, rich data structures
   (including polynomials, rationals,linear systems, lists, etc...) and
   comes with a number of specific toolboxes for control, signal
   processing, ...
 </longdescription>
-<use>
-  <flag name='gui'>Build the Java base graphical interface</flag>
-  <flag name="umfpack">Adds support for sparse solving
+  <use>
+    <flag name="gui">Build the Java base graphical interface</flag>
+    <flag name="umfpack">Adds support for sparse solving
   with <pkg>sci-libs/umfpack</pkg></flag>
-  <flag name='matio'>Enable support for MATLAB file through <pkg>sci-libs/matio</pkg></flag>
-  <flag name='xcos'>Enable building hybrid dynamic systems modeler and
+    <flag name="matio">Enable support for MATLAB file through <pkg>sci-libs/matio</pkg></flag>
+    <flag name="xcos">Enable building hybrid dynamic systems modeler and
   simulator Xcos</flag>
-  <flag name='emf'>Add suport for exporting to emf files</flag>
-</use>
+    <flag name="emf">Add suport for exporting to emf files</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-mathematics/scilab/scilab-5.5.0.ebuild b/sci-mathematics/scilab/scilab-5.5.0.ebuild
deleted file mode 100644
index 3fe7558b5..000000000
--- a/sci-mathematics/scilab/scilab-5.5.0.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-JAVA_PKG_OPT_USE="gui"
-VIRTUALX_REQUIRED="manual"
-
-inherit eutils autotools bash-completion-r1 check-reqs fdo-mime flag-o-matic \
-	fortran-2 java-pkg-opt-2 toolchain-funcs virtualx
-
-# Things that don't work:
-# - tests
-
-DESCRIPTION="Scientific software package for numerical computations"
-HOMEPAGE="http://www.scilab.org/"
-SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
-
-LICENSE="CeCILL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion debug doc emf fftw +gui +matio mpi nls openmp
-	static-libs test tk +umfpack +xcos"
-REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
-
-LINGUAS="fr_FR zh_CN zh_TW ru_RU ca_ES de_DE es_ES pt_BR ja_JP it_IT uk_UA pl_PL cs_CZ"
-LINGUAS_DOC="fr_FR pt_BR ja_JP ru_RU"
-
-for l in ${LINGUAS}; do
-	IUSE="${IUSE} linguas_${l}"
-done
-
-CDEPEND="dev-libs/libpcre
-	dev-libs/libxml2:2
-	sci-libs/hdf5[mpi=]
-	>=sci-libs/arpack-3
-	sys-devel/gettext
-	sys-libs/ncurses
-	sys-libs/readline
-	virtual/lapack
-	emf? ( dev-java/freehep-graphicsio-emf )
-	fftw? ( sci-libs/fftw:3.0 )
-	gui? (
-		dev-java/avalon-framework:4.2
-		dev-java/batik:1.7
-		dev-java/commons-io:1
-		dev-java/commons-logging:0
-		>=dev-java/flexdock-1.2.4:0
-		dev-java/fop:0
-		=dev-java/gluegen-2.1.4:2.1
-		dev-java/javahelp:0
-		dev-java/jeuclid-core:0
-		dev-java/jgoodies-looks:2.0
-		>=dev-java/jlatexmath-1.0.3:1
-		>=dev-java/jlatexmath-fop-1.0.3:1
-		=dev-java/jogl-2.1.4:2.1
-		>=dev-java/jrosetta-1.0.4:0
-		dev-java/skinlf:0
-		dev-java/xmlgraphics-commons:1.5
-		virtual/opengl )
-	matio? ( >=sci-libs/matio-1.5 )
-	tk? ( dev-lang/tk )
-	umfpack? ( sci-libs/umfpack )"
-
-RDEPEND="${CDEPEND}
-	gui? ( >=virtual/jre-1.5 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	debug? ( dev-util/lcov )
-	gui? (
-		>=virtual/jdk-1.5
-		doc? ( app-text/docbook-xsl-stylesheets
-			   dev-java/xml-commons-external:1.4
-			   dev-java/saxon:9 )
-		xcos? ( dev-lang/ocaml
-				dev-java/jgraphx:2.5 ) )
-	test? (
-		dev-java/junit:4
-		gui? ( ${VIRTUALX_DEPEND} ) )"
-
-DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
-
-pkg_pretend() {
-	use doc && CHECKREQS_MEMORY="512M" check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
-			ewarn "You are using a gcc without OpenMP capabilities"
-			die "Need an OpenMP capable compiler"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-	FORTRAN_STANDARD="77 90"
-	fortran-2_pkg_setup
-	#bug 8053
-	unset F77
-	java-pkg-opt-2_pkg_setup
-
-	ALL_LINGUAS="en_US"
-	ALL_LINGUAS_DOC="en_US"
-	for l in ${LINGUAS}; do
-		use linguas_${l} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
-	done
-	for l in ${LINGUAS_DOC}; do
-		use linguas_${l} && ALL_LINGUAS_DOC="${ALL_LINGUAS_DOC} ${l}"
-	done
-	export ALL_LINGUAS ALL_LINGUAS_DOC
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-followlinks.patch" \
-		"${FILESDIR}/${P}-gluegen.patch" \
-		"${FILESDIR}/${P}-fix-random-runtime-failure.patch" \
-		"${FILESDIR}/${P}-accessviolation.patch" \
-		"${FILESDIR}/${P}-nogui.patch" \
-		"${FILESDIR}/${P}-jdk1.8.patch"
-
-	append-ldflags $(no-as-needed)
-
-	# increases java heap to 512M when building docs (sync with cheqreqs above)
-	use doc && epatch "${FILESDIR}/${P}-java-heap.patch"
-
-	# use the LINGUAS variable that we set
-	sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac ||die
-
-	# make sure the DOCBOOK_ROOT variable is set
-	sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die
-
-	#add specific gentoo java directories
-	if use gui; then
-		sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.1|" \
-			-e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2.1|" configure.ac || die
-		sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2.1|" \
-			-e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2.1|" \
-			-e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \
-			configure.ac || die
-
-		sed -i -e "s/jogl2/jogl-2.1/" -e "s/gluegen2/gluegen-2.1/" \
-			etc/librarypath.xml || die
-	fi
-
-	mkdir jar || die
-	pushd jar >/dev/null
-	if use gui; then
-		java-pkg_jar-from jlatexmath-1,flexdock,skinlf
-		java-pkg_jar-from jgoodies-looks-2.0,jrosetta
-		java-pkg_jar-from avalon-framework-4.2,jeuclid-core
-		java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1
-		java-pkg_jar-from jogl-2.1 jogl-all.jar jogl2.jar
-		java-pkg_jar-from gluegen-2.1 gluegen-rt.jar gluegen2-rt.jar
-		java-pkg_jar-from batik-1.7 batik-all.jar
-		java-pkg_jar-from fop fop.jar
-		java-pkg_jar-from javahelp jhall.jar
-		java-pkg_jar-from jlatexmath-fop-1
-		java-pkg_jar-from xml-commons-external-1.4 xml-apis-ext.jar
-		use xcos &&	java-pkg_jar-from jgraphx-2.5
-		use doc && java-pkg_jar-from saxon-9 saxon.jar saxon9he.jar
-	fi
-	if use emf; then
-		java-pkg_jar-from freehep-graphicsio-emf,freehep-graphics2d
-		java-pkg_jar-from freehep-graphicsio,freehep-io,freehep-util
-	fi
-	if use test; then
-		java-pkg_jar-from junit-4 junit.jar junit4.jar
-		java-pkg_jar-from ant-junit
-	fi
-	popd
-
-	java-pkg-opt-2_src_prepare
-	eautoconf
-}
-
-src_configure() {
-	if use gui; then
-		export JAVA_HOME="$(java-config -O)"
-	else
-		unset JAVAC
-	fi
-
-	export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
-	export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-	export F77_LDFLAGS="${LDFLAGS}"
-
-	econf \
-		--enable-relocatable \
-		--disable-rpath \
-		--with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \
-		--disable-static-system-lib \
-		$(use_enable debug) \
-		$(use_enable debug code-coverage) \
-		$(use_enable debug debug-C) \
-		$(use_enable debug debug-CXX) \
-		$(use_enable debug debug-fortran) \
-		$(use_enable debug debug-java) \
-		$(use_enable debug debug-linker) \
-		$(use_enable doc build-help) \
-		$(use_enable nls) \
-		$(use_enable nls build-localization) \
-		$(use_enable static-libs static) \
-		$(use_enable test compilation-tests) \
-		$(use_with emf) \
-		$(use_with fftw) \
-		$(use_with gui) \
-		$(use_with gui javasci) \
-		$(use_with matio) \
-		$(use_with openmp) \
-		$(use_with tk) \
-		$(use_with umfpack) \
-		$(use_with xcos) \
-		$(use_with xcos modelica) \
-		$(use_with mpi)
-}
-
-src_compile() {
-	emake
-	use doc && emake doc
-}
-
-src_test() {
-	if use gui; then
-		Xemake check
-	else
-		emake check
-	fi
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-	rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
-	use bash-completion && newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
-	echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
-		> 50-"${PN}"
-	insinto /etc/revdep-rebuild && doins "50-${PN}"
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	einfo "If you are using the NVIDIA binary drivers, and run into graphics"
-	einfo "crashes, you may try to run scilab as follows:"
-	einfo "EGL_DRIVER=egl_glx scilab"
-	einfo "See upstream http://bugzilla.scilab.org/show_bug.cgi?id=12940"
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-}
diff --git a/sci-mathematics/scilab/scilab-5.5.1.ebuild b/sci-mathematics/scilab/scilab-5.5.1.ebuild
deleted file mode 100644
index d01f52a79..000000000
--- a/sci-mathematics/scilab/scilab-5.5.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-JAVA_PKG_OPT_USE="gui"
-VIRTUALX_REQUIRED="manual"
-
-inherit eutils autotools bash-completion-r1 check-reqs fdo-mime flag-o-matic \
-	fortran-2 java-pkg-opt-2 toolchain-funcs virtualx
-
-# Things that don't work:
-# - tests
-
-DESCRIPTION="Scientific software package for numerical computations"
-HOMEPAGE="http://www.scilab.org/"
-SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
-
-LICENSE="CeCILL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="bash-completion debug doc emf fftw +gui +matio mpi nls openmp
-	static-libs test tk +umfpack +xcos"
-REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
-
-LINGUAS="fr_FR zh_CN zh_TW ru_RU ca_ES de_DE es_ES pt_BR ja_JP it_IT uk_UA pl_PL cs_CZ"
-LINGUAS_DOC="fr_FR pt_BR ja_JP ru_RU"
-
-for l in ${LINGUAS}; do
-	IUSE="${IUSE} linguas_${l}"
-done
-
-CDEPEND="dev-libs/libpcre
-	dev-libs/libxml2:2
-	sci-libs/hdf5[mpi=]
-	>=sci-libs/arpack-3
-	sys-devel/gettext
-	sys-libs/ncurses
-	sys-libs/readline
-	virtual/lapack
-	emf? (  dev-java/freehep-graphicsio
-			dev-java/freehep-graphicsio-emf
-			dev-java/freehep-graphics2d
-			dev-java/freehep-io
-			dev-java/freehep-util )
-	fftw? ( sci-libs/fftw:3.0 )
-	gui? (
-		dev-java/avalon-framework:4.2
-		dev-java/commons-io:1
-		dev-java/commons-logging:0
-		>=dev-java/flexdock-1.2.4:0
-		dev-java/fop:0
-		=dev-java/gluegen-2.1.4:2.1
-		dev-java/javahelp:0
-		dev-java/jeuclid-core:0
-		dev-java/jgoodies-looks:2.6
-		>=dev-java/jlatexmath-1.0.3:1
-		>=dev-java/jlatexmath-fop-1.0.3:1
-		=dev-java/jogl-2.1.4:2.1
-		>=dev-java/jrosetta-1.0.4:0
-		dev-java/skinlf:0
-		dev-java/xmlgraphics-commons:1.5
-		virtual/opengl
-		xcos? ( dev-java/jgraphx:2.5 )
-		)
-	matio? ( >=sci-libs/matio-1.5 )
-	tk? ( dev-lang/tk )
-	umfpack? ( sci-libs/umfpack )"
-
-RDEPEND="${CDEPEND}
-	gui? ( >=virtual/jre-1.5 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	debug? ( dev-util/lcov )
-	gui? (
-		>=virtual/jdk-1.5
-		doc? ( dev-java/batik:1.7
-			   app-text/docbook-xsl-stylesheets
-			   dev-java/xml-commons-external:1.4
-			   dev-java/saxon:9 )
-		xcos? ( dev-lang/ocaml )
-		)
-	test? (
-		dev-java/junit:4
-		gui? ( ${VIRTUALX_DEPEND} ) )"
-
-DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
-
-pkg_pretend() {
-	use doc && CHECKREQS_MEMORY="512M" check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
-			ewarn "You are using a gcc without OpenMP capabilities"
-			die "Need an OpenMP capable compiler"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-	FORTRAN_STANDARD="77 90"
-	fortran-2_pkg_setup
-	#bug 8053
-	unset F77
-	java-pkg-opt-2_pkg_setup
-
-	ALL_LINGUAS="en_US"
-	ALL_LINGUAS_DOC="en_US"
-	for l in ${LINGUAS}; do
-		use linguas_${l} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
-	done
-	for l in ${LINGUAS_DOC}; do
-		use linguas_${l} && ALL_LINGUAS_DOC="${ALL_LINGUAS_DOC} ${l}"
-	done
-	export ALL_LINGUAS ALL_LINGUAS_DOC
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-followlinks.patch" \
-		"${FILESDIR}/${P}-gluegen.patch" \
-		"${FILESDIR}/${P}-fix-random-runtime-failure.patch" \
-		"${FILESDIR}/${P}-accessviolation.patch" \
-		"${FILESDIR}/${P}-nogui.patch" \
-		"${FILESDIR}/${P}-missinglib.patch"
-
-	# works for me on x86, but users are having
-	# trouble without see #282 on github
-	append-ldflags $(no-as-needed)
-
-	# increases java heap to 512M when building docs (sync with cheqreqs above)
-	use doc && epatch "${FILESDIR}/${P}-java-heap.patch"
-
-	# use the LINGUAS variable that we set
-	sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac ||die
-
-	# make sure the DOCBOOK_ROOT variable is set
-	sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die
-
-	#add specific gentoo java directories
-	if use gui; then
-		sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.1|" \
-			-e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2.1|" configure.ac || die
-		sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2.1|" \
-			-e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2.1|" \
-			-e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \
-			configure.ac || die
-
-		sed -i -e "s/jogl2/jogl-2.1/" -e "s/gluegen2/gluegen-2.1/" \
-			etc/librarypath.xml || die
-	fi
-
-	mkdir jar || die
-	pushd jar >/dev/null
-	if use gui; then
-		java-pkg_jar-from jlatexmath-1,flexdock,skinlf
-		java-pkg_jar-from jgoodies-looks-2.6,jrosetta
-		java-pkg_jar-from avalon-framework-4.2,jeuclid-core
-		java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1
-		java-pkg_jar-from jogl-2.1 jogl-all.jar jogl2.jar
-		java-pkg_jar-from gluegen-2.1 gluegen-rt.jar gluegen2-rt.jar
-		java-pkg_jar-from fop fop.jar
-		java-pkg_jar-from javahelp jhall.jar
-		java-pkg_jar-from jlatexmath-fop-1
-		use xcos &&	java-pkg_jar-from jgraphx-2.5
-		if use doc; then
-			java-pkg_jar-from --build-only batik-1.7 batik-all.jar
-			java-pkg_jar-from --build-only saxon-9 saxon.jar saxon9he.jar
-			java-pkg_jar-from --build-only xml-commons-external-1.4 xml-apis-ext.jar
-		fi
-	fi
-	if use emf; then
-		java-pkg_jar-from freehep-graphicsio-emf,freehep-graphics2d
-		java-pkg_jar-from freehep-graphicsio,freehep-io,freehep-util
-	fi
-	if use test; then
-		java-pkg_jar-from junit-4 junit.jar junit4.jar
-		java-pkg_jar-from ant-junit
-	fi
-	popd
-
-	java-pkg-opt-2_src_prepare
-	eautoconf
-}
-
-src_configure() {
-	if use gui; then
-		export JAVA_HOME="$(java-config -O)"
-	else
-		unset JAVAC
-	fi
-
-	export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
-	export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-	export F77_LDFLAGS="${LDFLAGS}"
-
-	econf \
-		--enable-relocatable \
-		--disable-rpath \
-		--with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \
-		--disable-static-system-lib \
-		$(use_enable debug) \
-		$(use_enable debug code-coverage) \
-		$(use_enable debug debug-C) \
-		$(use_enable debug debug-CXX) \
-		$(use_enable debug debug-fortran) \
-		$(use_enable debug debug-java) \
-		$(use_enable debug debug-linker) \
-		$(use_enable doc build-help) \
-		$(use_enable nls) \
-		$(use_enable nls build-localization) \
-		$(use_enable static-libs static) \
-		$(use_enable test compilation-tests) \
-		$(use_with emf) \
-		$(use_with fftw) \
-		$(use_with gui) \
-		$(use_with gui javasci) \
-		$(use_with matio) \
-		$(use_with openmp) \
-		$(use_with tk) \
-		$(use_with umfpack) \
-		$(use_with xcos) \
-		$(use_with xcos modelica) \
-		$(use_with mpi)
-}
-
-src_compile() {
-	#bug 531886 need to investigate what's using /proc/mtrr
-	addpredict /proc/mtrr
-	emake
-	use doc && emake doc
-}
-
-src_test() {
-	if use gui; then
-		Xemake check
-	else
-		emake check
-	fi
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-	rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
-	use bash-completion && newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
-	echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
-		> 50-"${PN}"
-	insinto /etc/revdep-rebuild && doins "50-${PN}"
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	einfo "If you are using the NVIDIA binary drivers, and run into graphics"
-	einfo "crashes, you may try to run scilab as follows:"
-	einfo "EGL_DRIVER=egl_glx scilab"
-	einfo "See upstream http://bugzilla.scilab.org/show_bug.cgi?id=12940"
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-}
diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 095281a0c..24b47b7d7 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -75,7 +75,7 @@ DEPEND="${CDEPEND}
 	debug? ( dev-util/lcov )
 	gui? (
 		>=virtual/jdk-1.5
-		doc? ( dev-java/batik:1.7
+		doc? ( dev-java/batik:1.8
 			   app-text/docbook-xsl-stylesheets
 			   dev-java/xml-commons-external:1.4
 			   dev-java/saxon:9 )