sci-mathematics/scilab: remove scilab in favor of scilab-bin

Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>

26 files changed, 0 insertions, 1827 deletions

diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
deleted file mode 100644
index 4ceabfa75..000000000
--- a/sci-mathematics/scilab/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST scilab-5.5.2-bug15107.patch 38242 BLAKE2B fb4b91f4552fbf65f82d667ef6e78c668093e4c994e73ff25efbb265ff77d6260a574a5efa9a244dc720b51713827c1d109236026921096b0dbb49e0b47ffd85 SHA512 afbac90f00ed66eb1884aa86ec997945771d9b3a2959d72b096718d7fa427a5d12423892f77ef51fc8306131939aad642b180590ec9452cadfe01a8b4349492e
-DIST scilab-5.5.2-src.tar.gz 69626327 BLAKE2B 6180bb91d878e646838a085894dcf6da7127b60788a234f1900dc19b6a981af789c10e78f08ed1357fbec82b32d0fe0ba4b8ffe3350ac4a9f5ee0843bbb3b177 SHA512 7f00ac837e36b5524a9c9a3106bdaefebb71559eb2932b2a16e4fac53fa1f9e66b87eabf98b3006ede25f8ab1d16d6ef1c7561ed29b67ddb42c98610fa72fe79
-DIST scilab-6.0.2-src.tar.gz 76126980 BLAKE2B 477132ccff5ad6d5615be80e6e63f2fa66ff806b6675373cf85f4204bbe27cfaf0fa7071e24b3d11ea2549860429c18fe8458cfd622c76030a741c101598fc96 SHA512 194fbf02e83436e5be8949fadf67e7b9b739eaa02d876b01505634d59b2d02adbf2c48a50bc2fe61c25956cae6aea4f832f429506dcab26d4e110d1bcd9ddfef
-DIST scilab-6.1.0-src.tar.gz 80556033 BLAKE2B ccea329a5d24bf03a95ae4ab02098a3d3fcd592b59d1ca31fb82da41592a19b1a6240151099ec9be1db9b277d852a5310ee7c3be8fd551d5832863bd7f41890c SHA512 d88eadb97abbb95611235d13982e2831e3570766315eef9205cd7a5717765b1f554befee7c9f01938b87f412f14c4f57e79dd78065773d96dfa6f058fd3acb7c
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
deleted file mode 100644
index a7e5c6d5f..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab
---- a/bin/scilab	2014-07-12 15:24:17.105686656 -0400
-+++ b/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.2-batik-1.9.patch b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.9.patch
deleted file mode 100644
index ce0cebbf3..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.9.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Updates Scilab to build against (and require) Batik >=1.9, this has been
-adapted from Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456
-
---- a/configure
-+++ b/configure
-@@ -16600,8 +16600,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik used
-                 fi
- 
- 
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.7) of batik" >&5
--$as_echo_n "checking minimal version (1.7) of batik... " >&6; }
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.9) of batik" >&5
-+$as_echo_n "checking minimal version (1.9) of batik... " >&6; }
-    saved_ac_java_classpath=$ac_java_classpath
-    export ac_java_classpath="$BATIK:$ac_java_classpath"
-    if test "x" == "x"; then
-@@ -16614,7 +16614,7 @@ import org.apache.batik.Version;
- 
- public class conftest {
-     public static void main(String[] argv) {
--        String minVersion="1.7";
-+        String minVersion="1.9";
- 
-                             System.out.println(Version.getVersion());
-                                   if (compare(minVersion, Version.getVersion()) > 0) {
-@@ -16663,7 +16663,7 @@ EOF
-                    STDOUT=`cat conftest.java.output`
-                 fi
-                 echo "configure: CLASSPATH was $CLASSPATH" >&5
--                  as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5
-+                  as_fn_error $? "Wrong version of batik. Expected at least 1.9. Found $STDOUT" "$LINENO" 5
-                             fi
-         fi
-         if test -f conftest.java.output; then
-@@ -16673,7 +16673,7 @@ EOF
-         echo "configure: failed program was:" >&5
-         cat conftest.java >&5
-         echo "configure: CLASSPATH was $CLASSPATH" >&5
--          as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5
-+          as_fn_error $? "Wrong version of batik. Expected at least 1.9. Found $STDOUT" "$LINENO" 5
-             fi
- 
-    else
-@@ -16686,7 +16686,7 @@ import org.apache.batik.Version;
- 
- public class conftest {
-     public static void main(String[] argv) {
--        String minVersion="1.7";
-+        String minVersion="1.9";
- 
-                             System.out.println(Version.getVersion());
-                                   if (compare(minVersion, Version.getVersion()) != 0) {
-@@ -16735,7 +16735,7 @@ EOF
-                    STDOUT=`cat conftest.java.output`
-                 fi
-                 echo "configure: CLASSPATH was $CLASSPATH" >&5
--                  as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5
-+                  as_fn_error $? "Wrong version of batik. Expected exact version 1.9. Found $STDOUT" "$LINENO" 5
-                             fi
-         fi
-         if test -f conftest.java.output; then
-@@ -16745,7 +16745,7 @@ EOF
-         echo "configure: failed program was:" >&5
-         cat conftest.java >&5
-         echo "configure: CLASSPATH was $CLASSPATH" >&5
--          as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5
-+          as_fn_error $? "Wrong version of batik. Expected exact version 1.9. Found $STDOUT" "$LINENO" 5
-             fi
- 
-     fi
---- a/configure.ac
-+++ b/configure.ac
-@@ -1038,7 +1038,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version
-                    BATIK=$PACKAGE_JAR_FILE
-                 fi
-                 AC_SUBST(BATIK)
--                AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.7],[Version.getVersion()])
-+                AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.9],[Version.getVersion()])
- 
-                 # Commons I/O library
-                 AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
---- a/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
-+++ b/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
-@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentLoader;
- import org.apache.batik.bridge.GVTBuilder;
- import org.apache.batik.bridge.UserAgent;
- import org.apache.batik.bridge.UserAgentAdapter;
--import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
- import org.apache.batik.gvt.GraphicsNode;
- import org.apache.batik.util.XMLResourceDescriptor;
- import org.scilab.forge.jlatexmath.ParseException;
---- ./modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java	2021-01-24 16:26:14.686473112 +0100
-+++ ./modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java.new	2021-01-24 16:34:25.486426923 +0100
-@@ -100,7 +100,7 @@
-      * Dependencies version
-      */
-     private static final List<String> MXGRAPH_VERSIONS = null;
--    private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7", "1.8pre", "1.8");
-+    private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7", "1.8pre", "1.8", "1.9");
- 
-     private static final String UNABLE_TO_LOAD_JGRAPHX = Messages.gettext("Unable to load the jgraphx library.\nExpecting version %s ; Getting version %s .");
-     private static final String UNABLE_TO_LOAD_BATIK = Messages.gettext("Unable to load the Batik library. \nExpecting version %s ; Getting version %s .");
-
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-bug15449.patch b/sci-mathematics/scilab/files/scilab-5.5.2-bug15449.patch
deleted file mode 100644
index 6e58dd540..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-bug15449.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp	2015-03-31 11:31:43.000000000 +0200
-+++ ./modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp.new	2021-01-10 15:47:49.011858918 +0100
-@@ -54,7 +54,7 @@
-     {
-         // FIXME #7266 workaround
-         // check category emptyness
--        if (category == NULL || (lenCategory == 1 && *category == '\0'))
-+        if (category == NULL || (lenCategory == 1 && **category == 0))
-         {
-             Palette::loadPal(getScilabJavaVM(), name);
-         }
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
deleted file mode 100644
index da7b6e485..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-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
---- a/modules/api_scilab/src/cpp/api_double.cpp	2012-08-06 23:26:31.342617365 -0400
-+++ b/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.2-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch
deleted file mode 100644
index a3f60bee7..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-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-5.5.2-fop-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch
deleted file mode 100644
index 18bdaac1d..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Bryan Gardiner <bog@khumba.net>
-Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=14009
-Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456
-
-Updates Scilab to build against FOP >=2.0.  This is not tested, as I'm not sure
-of a test case, and it's awaiting upstream review.
-
---- a/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
-+++ b/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
-@@ -43,10 +43,10 @@ public class FopConverter extends ContainerConverter {
-         String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase();
- 
-         try {
--            FopFactory fopFactory = FopFactory.newInstance();
-+            FopFactory fopFactory =
-+                FopFactory.newInstance(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
-             fopFactory.addElementMapping(new JLaTeXMathElementMapping());
-             fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler());
--            fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
- 
-             // Step 3: Construct fop with desired output format
-             OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName));
---- a/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
-+++ b/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
-@@ -114,11 +114,11 @@ public class CodeExporter extends FOCodeConverter {
-      * @param format the page format
-      */
-     public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) {
--        FopFactory fopFactory = FopFactory.newInstance();
-         OutputStream out = null;
- 
-         try {
--            fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
-+            FopFactory fopFactory =
-+                FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
-             FOUserAgent userAgent = fopFactory.newFOUserAgent();
-             userAgent.setProducer(CREATOR);
-             userAgent.setTitle(title);
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fortran-gcc8.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fortran-gcc8.patch
deleted file mode 100644
index 31dcf52e7..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-fortran-gcc8.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From f49b185c678c07526ef59c1531d41575f9266bdc Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Cl=C3=A9ment=20DAVID?= <clement.david@esi-group.com>
-Date: Mon, 26 Feb 2018 23:43:14 +0100
-Subject: [PATCH] Fortran: fix errors with gfortran 8
-
-Change-Id: Ib890c6ea2dcba2f70d3c22dc86bbe38e4f22b061
---- a/modules/differential_equations/src/fortran/ddaskr.f
-+++ b/modules/differential_equations/src/fortran/ddaskr.f
-@@ -1409,6 +1409,7 @@ C
-       DIMENSION RWORK(LRW),IWORK(LIW)
-       DIMENSION RTOL(*),ATOL(*)
-       DIMENSION RPAR(*),IPAR(*)
-+      DIMENSION JROOT(NRT)
-       CHARACTER MSG*80
-       EXTERNAL  RES, JAC, PSOL, RT, DDASID, DDASIK, DNEDD, DNEDK
- C
-@@ -2530,7 +2531,8 @@ C Pointers into RWORK:
-       DOUBLE PRECISION TN, TOUT, Y, YP, PHI, PSI, R0, R1, RX, UROUND,
-      *  RWORK, RPAR
-       DIMENSION Y(*), YP(*), PHI(NEQ,*), PSI(*),
--     *          R0(*), R1(*), RX(*), JROOT(*), RWORK(*), IWORK(*)
-+     *          R0(*), R1(*), RX(*), JROOT(NRT), RWORK(*), IWORK(*),
-+     *          RPAR(*), IPAR(*)
-       INTEGER I, JFLAG
-       DOUBLE PRECISION H
-       DOUBLE PRECISION HMINR, T1, TEMP1, TEMP2, X, ZERO
---- a/modules/differential_equations/src/fortran/ddasrt.f
-+++ b/modules/differential_equations/src/fortran/ddasrt.f
-@@ -870,6 +870,7 @@ C
-       DIMENSION RWORK(*),IWORK(*)
-       DIMENSION RTOL(*),ATOL(*)
-       DIMENSION RPAR(*),IPAR(*)
-+      DIMENSION JROOT(NG)
-       CHARACTER MSG*80
- C
- C     SET POINTERS INTO IWORK
-@@ -1594,7 +1595,8 @@ C
-       DOUBLE PRECISION TN, TOUT, Y, YP, PHI, PSI, G0, G1, GX, UROUND,
-      *  RWORK, RPAR
-       DIMENSION  Y(*), YP(*), PHI(NEQ,*), PSI(*),
--     1  G0(*), G1(*), GX(*), JROOT(*), RWORK(*), IWORK(*)
-+     1  G0(*), G1(*), GX(*), JROOT(NG), RWORK(*), IWORK(*), RPAR(*),
-+     1  IPAR(*)
-       INTEGER I, JFLAG
-       DOUBLE PRECISION H
-       DOUBLE PRECISION HMING, T1, TEMP1, TEMP2, X
---- a/modules/differential_equations/src/fortran/twodq.f
-+++ b/modules/differential_equations/src/fortran/twodq.f
-@@ -900,7 +900,7 @@ C
-       END
- 
-       subroutine tridv(node,node1,node2,coef,rank)
--      double precision node(10),node1(10),node2(10),coef
-+      double precision node(9),node1(9),node2(9),coef
-       integer rank
-       double precision s(3),coef1,temp
-       integer t(3)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
deleted file mode 100644
index 46825cb29..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr scilab-5.5.2-orig/configure.ac scilab-5.5.2/configure.ac
---- a/configure.ac	2016-06-05 12:30:06.582735449 -0400
-+++ b/configure.ac	2016-06-05 12:31:29.706708157 -0400
-@@ -1024,7 +1024,7 @@
-                     AC_SUBST(FREEHEP_IO)
- 
-                     # Freehep Util
--                    AC_JAVA_CHECK_PACKAGE([freehep-util],[org.freehep.util.StringUtilities],[Freehep Util])
-+                    AC_JAVA_CHECK_PACKAGE([freehep-graphicsbase],[org.freehep.graphicsbase.util.UserProperties],[Freehep Util])
-                     FREEHEP_UTIL=$PACKAGE_JAR_FILE
-                     AC_SUBST(FREEHEP_UTIL)
-                 fi
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch
deleted file mode 100644
index d75c31e9a..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-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-5.5.2-hdf5-1.8.10.patch b/sci-mathematics/scilab/files/scilab-5.5.2-hdf5-1.8.10.patch
deleted file mode 100644
index 07e497939..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-hdf5-1.8.10.patch
+++ /dev/null
@@ -1,278 +0,0 @@
---- scilab-6.0.0.orig/modules/hdf5/src/cpp/H5ReferenceData.cpp	2017-02-14 12:40:34.000000000 +0100
-+++ scilab-6.0.0/modules/hdf5/src/cpp/H5ReferenceData.cpp	2017-02-15 20:08:00.761619371 +0100
-@@ -42,7 +42,11 @@
-     for (int i = 0; i < totalSize; i++)
-     {
-         void * ref = &(((void **)cdata)[i]);
--        hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-+        hid_t obj = H5Rdereference(file,
-+    #if H5_VERSION_GE(1,10,0)
-+                                   H5P_DATASET_ACCESS_DEFAULT,
-+    #endif
-+                                   datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-         H5O_info_t info;
-         H5Oget_info(obj, &info);
-         H5Oclose(obj);
-@@ -84,7 +88,11 @@
- 
-     file = getFile().getH5Id();
-     ref = &(((void **)cdata)[0]);
--    obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-+    obj = H5Rdereference(file,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-     if (obj < 0)
-     {
-         throw H5Exception(__LINE__, __FILE__, _("Cannot open object at the given position."));
-@@ -126,7 +134,11 @@
-     for (int i = 0; i < totalSize; i++)
-     {
-         void * ref = &(((void **)cdata)[i]);
--        hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-+        hid_t obj = H5Rdereference(file,
-+    #if H5_VERSION_GE(1,10,0)
-+                                   H5P_DATASET_ACCESS_DEFAULT,
-+    #endif
-+                                   datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-         objs[i] = &H5Object::getObject(getParent(), obj);
-     }
- 
-@@ -181,7 +193,11 @@
-     char * cdata = static_cast<char *>(data) + offset + pos * (stride ? stride : dataSize);
-     void ** ref = &(((void **)cdata)[0]);
-     hid_t file = getFile().getH5Id();
--    hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-+    hid_t obj = H5Rdereference(file,
-+#if H5_VERSION_GE(1,10,0)
-+                               H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                               datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-     if (obj < 0)
-     {
-         os << "NULL";
---- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile_v1.c	2017-02-14 12:40:34.000000000 +0100
-+++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c	2017-02-15 20:08:00.758286029 +0100
-@@ -474,7 +474,11 @@
-         }
- 
-         //Open the referenced object, get its name and type.
--        obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &Ref);
-+        obj = H5Rdereference(_iDatasetId,
-+    #if H5_VERSION_GE(1,10,0)
-+                             H5P_DATASET_ACCESS_DEFAULT,
-+    #endif
-+                             H5R_OBJECT, &Ref);
-         readDouble_v1(obj, _iRows, _iCols, _pdblData);
-     }
- 
-@@ -501,14 +505,22 @@
-     }
- 
-     //Open the referenced object, get its name and type.
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[0]);
-     status = readDouble_v1(obj, _iRows, _iCols, _pdblReal);
-     if (status < 0)
-     {
-         return -1;
-     }
- 
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[1]);
-     status = readDouble_v1(obj, _iRows, _iCols, _pdblImg);
-     if (status < 0)
-     {
-@@ -834,7 +846,11 @@
-         /*
-         * Open the referenced object, get its name and type.
-         */
--        obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]);
-+        obj = H5Rdereference(_iDatasetId,
-+    #if H5_VERSION_GE(1,10,0)
-+                             H5P_DATASET_ACCESS_DEFAULT,
-+    #endif
-+                             H5R_OBJECT, &pData[i]);
-         if (_iComplex)
-         {
-             status = readComplexPoly_v1(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]);
-@@ -1069,7 +1085,11 @@
-     }
- 
-     //read Row data
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[0]);
-     status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow);
-     if (status < 0)
-     {
-@@ -1077,7 +1097,11 @@
-     }
- 
-     //read cols data
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[1]);
-     status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos);
-     if (status < 0)
-     {
-@@ -1085,7 +1109,11 @@
-     }
- 
-     //read sparse data
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[2]);
- 
-     if (_iComplex)
-     {
-@@ -1131,7 +1159,11 @@
-     }
- 
-     //read Row data
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[0]);
-     status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow);
-     if (status < 0)
-     {
-@@ -1139,7 +1171,11 @@
-     }
- 
-     //read cols data
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[1]);
-     status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos);
-     if (status < 0)
-     {
-@@ -1234,7 +1270,11 @@
- {
-     hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos];
- 
--    *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef);
-+    *_piItemDataset = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                                     H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                                     H5R_OBJECT, &poRef);
- 
-     if (*_piItemDataset == 0)
-     {
---- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile.c	2017-02-14 12:40:34.000000000 +0100
-+++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile.c	2017-02-15 20:08:00.758286029 +0100
-@@ -742,7 +742,11 @@
-         /*
-          * Open the referenced object, get its name and type.
-          */
--        obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]);
-+        obj = H5Rdereference(_iDatasetId,
-+    #if H5_VERSION_GE(1,10,0)
-+                             H5P_DATASET_ACCESS_DEFAULT,
-+    #endif
-+                             H5R_OBJECT, &pData[i]);
-         if (_iComplex)
-         {
-             status = readComplexPoly(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]);
-@@ -976,7 +980,11 @@
-     }
- 
-     //read Row data
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[0]);
-     status = readInteger32Matrix(obj, _piNbItemRow);
-     if (status < 0)
-     {
-@@ -984,7 +992,11 @@
-     }
- 
-     //read cols data
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[1]);
-     status = readInteger32Matrix(obj, _piColPos);
-     if (status < 0)
-     {
-@@ -992,7 +1004,11 @@
-     }
- 
-     //read sparse data
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[2]);
- 
-     if (_iComplex)
-     {
-@@ -1043,7 +1059,11 @@
-     }
- 
-     //read Row data
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[0]);
-     status = readInteger32Matrix(obj, _piNbItemRow);
-     if (status < 0)
-     {
-@@ -1053,7 +1073,11 @@
-     if (_iNbItem != 0)
-     {
-         //read cols data
--        obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
-+        obj = H5Rdereference(_iDatasetId,
-+    #if H5_VERSION_GE(1,10,0)
-+                             H5P_DATASET_ACCESS_DEFAULT,
-+    #endif
-+                             H5R_OBJECT, &pRef[1]);
-         status = readInteger32Matrix(obj, _piColPos);
-         if (status < 0)
-         {
-@@ -1154,7 +1178,11 @@
- {
-     hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos];
- 
--    *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef);
-+    *_piItemDataset = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                                     H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                                     H5R_OBJECT, &poRef);
- 
-     if (*_piItemDataset == 0)
-     {
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch
deleted file mode 100644
index ca17e52a6..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-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-5.5.2-libxml-icu64.patch b/sci-mathematics/scilab/files/scilab-5.5.2-libxml-icu64.patch
deleted file mode 100644
index 1dc4fd079..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-libxml-icu64.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./modules/xml/src/cpp/XMLDocument.hxx	2015-03-31 11:31:45.000000000 +0200
-+++ ./modules/xml/src/cpp/XMLDocument.hxx.new	2021-01-10 15:18:51.172022465 +0100
-@@ -20,13 +20,10 @@
- 
- #include "dynlib_xml_scilab.h"
- 
--extern "C"
--{
- #include "xml.h"
- #ifndef XML_XPATH_CHECKNS
- #define XML_XPATH_CHECKNS
- #endif
--}
- 
- #include "XMLObject.hxx"
- 
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch b/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch
deleted file mode 100644
index 25b281820..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-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/files/scilab-5.5.2-ocaml-4.0.4.patch b/sci-mathematics/scilab/files/scilab-5.5.2-ocaml-4.0.4.patch
deleted file mode 100644
index dc8941ff0..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-ocaml-4.0.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./modules/scicos/src/modelica_compiler/optimization.ml.orig	2018-05-16 19:42:49.168681800 +0200
-+++ ./modules/scicos/src/modelica_compiler/optimization.ml	2018-05-16 19:44:53.999181477 +0200
-@@ -163,7 +163,8 @@
-     let m, e = frexp f in
-     let sm = string_of_float m in
-     let s = String.make 16 '0' in
--    String.blit sm 2 s 0 (String.length sm - 2);
-+    let sss = Bytes.make 16 '0' in
-+    String.blit sm 2 sss 0 (String.length sm - 2);
-     let e' = Num.power_num (Num.Int 2) (Num.num_of_int e) in
-     Num.div_num (Num.mult_num (Num.num_of_string s) e') scaling_factor
-   in
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch
deleted file mode 100644
index 4d90f30c7..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From: Bryan Gardiner <bog@khumba.net>
-Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=13724
-Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456
-
-Updates Scilab 5.5.2 to build against xmlgraphics-common >=2.0.  This is not
-tested, as I'm not sure of a test case, and a similar patch (where the
-super.processShape calls are passed cached=true) is already awaiting upstream
-review.
-
---- a/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
-+++ b/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
-@@ -857,7 +857,7 @@ public class Export {
-                     }
- 
-                     @Override
--                    public int processShape(Shape s) throws IOException {
-+                    public int processShape(Shape s, boolean cached) throws IOException {
-                         if (s instanceof Ellipse2D.Double) {
-                             Ellipse2D.Double ell = (Ellipse2D.Double) s;
-                             if (ell.height == ell.width) {
-@@ -880,10 +880,10 @@ public class Export {
-                                     buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
-                                     it.next();
-                                 } else {
--                                    return super.processShape(s);
-+                                    return super.processShape(s, cached);
-                                 }
-                             } else {
--                                return super.processShape(s);
-+                                return super.processShape(s, cached);
-                             }
- 
-                             for (; !it.isDone(); it.next()) {
-@@ -891,7 +891,7 @@ public class Export {
-                                 if (type == PathIterator.SEG_LINETO) {
-                                     buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
-                                 } else {
--                                    return super.processShape(s);
-+                                    return super.processShape(s, cached);
-                                 }
-                             }
-                             buffer.append("] DP");
-@@ -899,7 +899,7 @@ public class Export {
-                             return PathIterator.WIND_NON_ZERO;
-                         }
- 
--                        return super.processShape(s);
-+                        return super.processShape(s, cached);
-                     }
-                 };
-                 g2d.setGraphicContext(new GraphicContext());
-@@ -1029,7 +1029,7 @@ public class Export {
-                     }
- 
-                     @Override
--                    public int processShape(Shape s) throws IOException {
-+                    public int processShape(Shape s, boolean cached) throws IOException {
-                         if (s instanceof Ellipse2D.Double) {
-                             Ellipse2D.Double ell = (Ellipse2D.Double) s;
-                             if (ell.height == ell.width) {
-@@ -1052,10 +1052,10 @@ public class Export {
-                                     buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
-                                     it.next();
-                                 } else {
--                                    return super.processShape(s);
-+                                    return super.processShape(s, cached);
-                                 }
-                             } else {
--                                return super.processShape(s);
-+                                return super.processShape(s, cached);
-                             }
- 
-                             for (; !it.isDone(); it.next()) {
-@@ -1063,7 +1063,7 @@ public class Export {
-                                 if (type == PathIterator.SEG_LINETO) {
-                                     buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
-                                 } else {
--                                    return super.processShape(s);
-+                                    return super.processShape(s, cached);
-                                 }
-                             }
-                             buffer.append("] DP");
-@@ -1071,7 +1071,7 @@ public class Export {
-                             return PathIterator.WIND_NON_ZERO;
-                         }
- 
--                        return super.processShape(s);
-+                        return super.processShape(s, cached);
-                     }
- 
-                 };
diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-accessviolation.patch b/sci-mathematics/scilab/files/scilab-6.1.0-accessviolation.patch
deleted file mode 100644
index 940440563..000000000
--- a/sci-mathematics/scilab/files/scilab-6.1.0-accessviolation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/bin/scilab b/bin/scilab
-index 475457d6..d2b98cc0 100755
---- a/bin/scilab
-+++ b/bin/scilab
-@@ -720,17 +720,6 @@ fi
- 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 $SCILAB_MODE != "nwni" -a -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-6.1.0-freehep.patch b/sci-mathematics/scilab/files/scilab-6.1.0-freehep.patch
deleted file mode 100644
index 6f9587780..000000000
--- a/sci-mathematics/scilab/files/scilab-6.1.0-freehep.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index f6018580..d783ca96 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1076,7 +1076,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version
-                     AC_SUBST(FREEHEP_IO)
- 
-                     # Freehep Util
--                    AC_JAVA_CHECK_JAR([freehep-util],[org.freehep.util.StringUtilities],[Freehep Util])
-+                    AC_JAVA_CHECK_PACKAGE([freehep-graphicsbase],[org.freehep.graphicsbase.util.UserProperties],[Freehep Util])
-                     FREEHEP_UTIL=$PACKAGE_JAR_FILE
-                     AC_SUBST(FREEHEP_UTIL)
-                 fi
diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch b/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch
deleted file mode 100644
index 55d2e744a..000000000
--- a/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- orig/scilab-6.1.0/modules/functions_manager/src/cpp/dynamic_modules.cpp	2020-02-25 10:59:51.000000000 +0100
-+++ scilab-6.1.0/modules/functions_manager/src/cpp/dynamic_modules.cpp	2020-06-13 17:52:19.258491176 +0200
-@@ -22,13 +22,13 @@
- {
- #include "loadOnUseClassPath.h"
- #include "Scierror.h"
-+}
- 
-     //XML API
- #include <libxml/xpath.h>
- #include <libxml/xmlreader.h>
- #include "sci_malloc.h"
- #include "configvariable_interface.h"
--}
- 
- vectGateway loadGatewaysName(const std::wstring& _wstModuleName)
- {
---- orig/scilab-6.1.0/modules/io/src/cpp/loadlib.cpp	2020-02-25 10:59:59.000000000 +0100
-+++ scilab-6.1.0/modules/io/src/cpp/loadlib.cpp	2020-06-13 17:38:17.474133786 +0200
-@@ -17,6 +17,8 @@
- #include "context.hxx"
- #include "loadlib.hxx"
- #include "macrofile.hxx"
-+#include <libxml/xpath.h>
-+#include <libxml/xmlreader.h>
- extern "C"
- {
- #include "FileExist.h"
-@@ -26,8 +28,6 @@
- #include "fullpath.h"
- #include "PATH_MAX.h"
- #include "pathconvert.h"
--#include <libxml/xpath.h>
--#include <libxml/xmlreader.h>
- }
- 
- #define DEFAULT_ENCODING "UTF-8"
---- orig/scilab-6.1.0/modules/xml/src/cpp/XMLDocument.hxx	2020-02-25 11:00:18.000000000 +0100
-+++ scilab-6.1.0/modules/xml/src/cpp/XMLDocument.hxx	2020-06-13 17:45:02.443795087 +0200
-@@ -23,13 +23,10 @@
- 
- #include "dynlib_xml_scilab.h"
- 
--extern "C"
--{
- #include "xml.h"
- #ifndef XML_XPATH_CHECKNS
- #define XML_XPATH_CHECKNS
- #endif
--}
- 
- #include "XMLObject.hxx"
- 
---- orig/scilab-6.1.0/modules/scicos/includes/XMIResource.hxx	2020-02-25 11:00:08.000000000 +0100
-+++ scilab-6.1.0/modules/scicos/includes/XMIResource.hxx	2020-06-13 18:13:54.985717732 +0200
-@@ -22,10 +22,8 @@
- #include <string>
- #include <vector>
- 
--extern "C" {
- #include <libxml/xmlwriter.h>
- #include <libxml/xmlreader.h>
--}
- 
- namespace org_scilab_modules_scicos
- {
diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-nogui.patch b/sci-mathematics/scilab/files/scilab-6.1.0-nogui.patch
deleted file mode 100644
index f83fa31d0..000000000
--- a/sci-mathematics/scilab/files/scilab-6.1.0-nogui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in	2014-01-09 22:29:06.534469383 -0500
-+++ b/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.bash_completion b/sci-mathematics/scilab/files/scilab.bash_completion
deleted file mode 100644
index c289e8632..000000000
--- a/sci-mathematics/scilab/files/scilab.bash_completion
+++ /dev/null
@@ -1,54 +0,0 @@
-# Scilab completion
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-# Copyright (C) DIGITEO - 2010 - Sylvestre Ledru
-# This file must be used under the terms of the CeCILL.
-# This source file is licensed as described in the file COPYING, which
-# you should have received as part of this distribution.  The terms
-# are also available at    
-# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-
-_scilab()
-{
-    local cur prev options
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-
-    # List all options. Note that 
-    options='-ns -nb -nw -nwni -nogui -debug -debug-kdbg -d -display -profiling -profiling-visu -l -mem -version -e -f -nouserstartup -args -mem -h --help'
-
-    # Loop on the arguments to manage conflicting options
-    for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
-	#exclude some mutually exclusive options
-	[[ ${COMP_WORDS[i]} == '-nwni' ]] && options=${options/-nw}
-        [[ ${COMP_WORDS[i]} == '-nw' ]] && options=${options/-nwni}
-        [[ ${COMP_WORDS[i]} == '-e' ]] && options=${options/-f}
-    done
-    
-    case "$1" in
-    	 *scilab-cli*)
-		# Option -nw is not available
-            	options=${options/-nw}
-	;;
-    esac
-
-    case $prev in
-        -f)
-		_filedir '@(sci|sce|SCI|SCE|tst|TST)'
-		return 0
-            ;;
-        -e|-l|-d|-display|-mem)
-		cur=${cur#[\"\']}
-		eqext='='
-            ;;
-	
-        *)
-            COMPREPLY=( $( compgen -W "$options" | grep "^$cur" ) )
-            ;;
-    esac
-
-    return 0
-}
-complete -F _scilab $filenames scilab scilab-cli scilab-adv-cli
-
-
diff --git a/sci-mathematics/scilab/files/scilab.xml b/sci-mathematics/scilab/files/scilab.xml
deleted file mode 100644
index 8594e7bdc..000000000
--- a/sci-mathematics/scilab/files/scilab.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="text/x-sci">
-    <comment>Scilab Function</comment>
-        <sub-class-of type="text/plain"/>
-	<glob pattern="*.sci"/> 
-  </mime-type>
-  <mime-type type="text/x-sce">
-    <comment>Scilab Script</comment>
-        <sub-class-of type="text/plain"/>
-	<glob pattern="*.sce"/> 
-  </mime-type>
-</mime-info>
diff --git a/sci-mathematics/scilab/metadata.xml b/sci-mathematics/scilab/metadata.xml
deleted file mode 100644
index ef72c6a0f..000000000
--- a/sci-mathematics/scilab/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-mathematics@gentoo.org</email>
-		<name>Gentoo Mathematics Project</name>
-	</maintainer>
-	<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
-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
-simulator Xcos</flag>
-		<flag name="emf">Add suport for exporting to emf files</flag>
-	</use>
-</pkgmetadata>
diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild b/sci-mathematics/scilab/scilab-5.5.2.ebuild
deleted file mode 100644
index ba40aed5f..000000000
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_OPT_USE="gui"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools bash-completion-r1 check-reqs flag-o-matic \
-	fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Scientific software package for numerical computations"
-HOMEPAGE="https://www.scilab.org/"
-SRC_URI="https://www.scilab.org/download/${PV}/${P}-src.tar.gz
-	https://raw.githubusercontent.com/gentoo/sci/4c2a07c4629c61395a998633ccfcb34d72569529/sci-mathematics/scilab/files/${P}-bug15107.patch"
-
-LICENSE="CeCILL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug doc emf fftw +gui +matio mpi nls openmp
-	static-libs test tk +umfpack +xcos"
-REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
-
-RESTRICT="test"
-
-IUSE_L10N="fr zh zh ru ca de es pt ja it uk pl cs"
-L10N_DOC="fr pt ja ru"
-
-map_lang() {
-	local lang=${1/_/-}
-	case $1 in
-		# Retain the following, which have a specific subtag
-		de_*|en_*|pt_*|zh_*) ;;
-		# Consider all other xx_XX as duplicates of the generic xx tag
-		*_*) lang=${1%%_*} ;;
-	esac
-	echo ${lang}
-}
-
-prev_l=
-for l in ${IUSE_L10N}; do
-	l=$(map_lang ${l})
-	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
-	prev_l=${l}
-done
-unset l prev_l
-
-CDEPEND="
-	dev-libs/libpcre
-	dev-libs/libxml2:2
-	sci-libs/hdf5[mpi=]
-	>=sci-libs/arpack-3
-	sci-libs/lapack[deprecated(-)]
-	sys-devel/gettext
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	emf? (
-		dev-java/freehep-graphicsio:0
-		dev-java/freehep-graphicsio-emf:0
-		dev-java/freehep-graphics2d:0
-		dev-java/freehep-io:0
-		dev-java/freehep-graphicsbase:0
-	)
-	fftw? ( sci-libs/fftw:3.0 )
-	gui? (
-		dev-java/avalon-framework:4.2
-		>=dev-java/batik-1.9:1.9
-		dev-java/commons-io:1
-		dev-java/commons-logging:0
-		>=dev-java/flexdock-1.2.4:0
-		>=dev-java/fop-2.0:0
-		~dev-java/gluegen-2.2.4:2.2
-		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.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
-		xcos? ( dev-java/jgraphx:0 )
-		)
-	matio? ( >=sci-libs/matio-1.5 )
-	mpi? ( virtual/mpi[fortran] )
-	tk? ( dev-lang/tk:0= )
-	umfpack? ( sci-libs/umfpack )"
-
-RDEPEND="${CDEPEND}
-	gui? ( >=virtual/jre-1.5 )"
-
-DEPEND="${CDEPEND}
-	debug? ( dev-util/lcov )
-	gui? (
-		>=virtual/jdk-1.6
-		doc? (
-			app-text/docbook-xsl-stylesheets
-			dev-java/xml-commons-external:1.4
-			dev-java/saxon:9
-		)
-		xcos? (
-			>=dev-lang/ocaml-4.06
-			dev-ml/num
-		)
-	)
-	test? (
-		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}/${P}-fix-random-runtime-failure.patch"
-	"${FILESDIR}/${P}-accessviolation.patch"
-	"${FILESDIR}/${P}-missinglib.patch"
-	"${FILESDIR}/${P}-batik-1.9.patch"
-	"${FILESDIR}/${P}-fop-2.0.patch"
-	"${FILESDIR}/${P}-xmlgraphics-common-2.0.patch"
-	"${FILESDIR}/${P}-freehep.patch"
-	"${FILESDIR}/${P}-fortran-gcc8.patch" # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=232958
-	"${FILESDIR}/${P}-libxml-icu64.patch" # similar to https://bugzilla.scilab.org/show_bug.cgi?id=16588
-	"${FILESDIR}/${P}-hdf5-1.8.10.patch" # adapted from https://github.com/bartoszek/scilab
-	"${DISTDIR}/${P}-bug15107.patch" # http://bugzilla.scilab.org/show_bug.cgi?id=15107
-	"${FILESDIR}/${P}-bug15449.patch" # http://bugzilla.scilab.org/show_bug.cgi?id=15449
-	"${FILESDIR}/${P}-ocaml-4.0.4.patch" # https://github.com/bartoszek/scilab
-)
-
-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
-
-	# fails to compile in src/fortran/optml2.f:172:50 without this
-	test-flag-FC -fallow-argument-mismatch && append-fflags -fallow-argument-mismatch
-
-	ALL_L10N="en_US"
-	ALL_L10N_DOC="en_US"
-	for l in ${IUSE_L10N}; do
-		use l10n_${l} && ALL_L10N="${ALL_L10N} ${l}"
-	done
-	for l in ${L10N_DOC}; do
-		use l10n_${l} && ALL_L10N_DOC="${ALL_L10N_DOC} ${l}"
-	done
-	export ALL_L10N ALL_L10N_DOC
-}
-
-src_prepare() {
-	default
-
-	# increases java heap to 512M when building docs (sync with cheqreqs above)
-	use doc && eapply "${FILESDIR}/${P}-java-heap.patch"
-
-	# use the L10N 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
-
-	# fix QA for metainfo data installation path
-	sed -i.bkp -e "s:/appdata:/metainfo:" desktop/Makefile.in || die
-
-	# remove self closing <br /> (error our with javadoc8)
-	# already upstream commit 2103082c
-	find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die
-
-	#add specific gentoo java directories
-	if use gui; then
-		sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.2|" \
-			-e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2.2|" configure.ac || die
-		sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2.2|" \
-			-e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2.2|" \
-			-e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \
-			configure.ac || die
-
-		sed -i -e "s/jogl2/jogl-2.2/" -e "s/gluegen2/gluegen-2.2/" \
-			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-2,commons-io-1
-		java-pkg_jar-from jogl-2.2 jogl-all.jar jogl2.jar
-		java-pkg_jar-from gluegen-2.2 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
-		if use doc; then
-			java-pkg_jar-from --build-only batik-1.9 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-graphicsbase
-	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() {
-	addpredict /proc/mtrr
-	default
-	pax-mark m .libs/scilab-bin
-	use doc && emake doc
-}
-
-src_test() {
-	if use gui; then
-		Xemake check
-	else
-		emake check
-	fi
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-	rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
-	newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
-	bashcomp_alias ${PN} ${PN}-cli ${PN}-adv-cli
-	echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
-		> 50-"${PN}"
-	insinto /etc/revdep-rebuild && doins "50-${PN}"
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_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() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/sci-mathematics/scilab/scilab-6.0.2.ebuild b/sci-mathematics/scilab/scilab-6.0.2.ebuild
deleted file mode 100644
index 2b2d76b4e..000000000
--- a/sci-mathematics/scilab/scilab-6.0.2.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_OPT_USE="gui"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools bash-completion-r1 check-reqs flag-o-matic \
-	fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Scientific software package for numerical computations"
-HOMEPAGE="https://www.scilab.org/"
-SRC_URI="https://www.scilab.org/download/${PV}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-
-IUSE="debug doc emf fftw +gui +matio mpi nls openmp
-	static-libs test tk +umfpack +xcos"
-REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
-
-RESTRICT="test"
-
-IUSE_L10N="fr zh zh ru ca de es pt ja it uk pl cs"
-L10N_DOC="fr pt ja ru"
-
-map_lang() {
-	local lang=${1/_/-}
-	case $1 in
-		# Retain the following, which have a specific subtag
-		de_*|en_*|pt_*|zh_*) ;;
-		# Consider all other xx_XX as duplicates of the generic xx tag
-		*_*) lang=${1%%_*} ;;
-	esac
-	echo ${lang}
-}
-
-prev_l=
-for l in ${IUSE_L10N}; do
-	l=$(map_lang ${l})
-	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
-	prev_l=${l}
-done
-unset l prev_l
-
-CDEPEND="
-	dev-libs/libpcre
-	dev-libs/libxml2:2
-	sci-libs/hdf5[mpi=]
-	>=sci-libs/arpack-3
-	sci-libs/lapack[deprecated(-)]
-	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
-		dev-java/freehep-graphics2d:0
-		dev-java/freehep-io:0
-		dev-java/freehep-graphicsbase:0
-	)
-	fftw? ( sci-libs/fftw:3.0 )
-	gui? (
-		dev-java/avalon-framework:4.2
-		>=dev-java/batik-1.9:1.9
-		dev-java/commons-io:1
-		dev-java/commons-logging:0
-		>=dev-java/flexdock-1.2.4:0
-		>=dev-java/fop-2.0:0
-		~dev-java/gluegen-2.2.4:2.2
-		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.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
-		xcos? ( dev-java/jgraphx:0 )
-		)
-	matio? ( >=sci-libs/matio-1.5 )
-	mpi? ( virtual/mpi[fortran] )
-	tk? ( dev-lang/tk:0= )
-	umfpack? ( sci-libs/umfpack )"
-
-RDEPEND="${CDEPEND}
-	gui? ( >=virtual/jre-1.8 )"
-
-DEPEND="${CDEPEND}
-	debug? ( dev-util/lcov )
-	gui? (
-		>=virtual/jdk-1.6
-		doc? (
-			app-text/docbook-xsl-stylesheets
-			dev-java/xml-commons-external:1.4
-			dev-java/saxon:9
-		)
-		xcos? (
-			>=dev-lang/ocaml-4.06
-			dev-ml/num
-		)
-	)
-	test? (
-		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}-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}-5.5.2-missinglib.patch"
-	"${FILESDIR}/${PN}-6.1.0-freehep.patch"
-	"${FILESDIR}/${PN}-6.1.0-libxml.patch"
-)
-
-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
-
-	# 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"
-	for l in ${IUSE_L10N}; do
-		use l10n_${l} && ALL_L10N="${ALL_L10N} ${l}"
-	done
-	for l in ${L10N_DOC}; do
-		use l10n_${l} && ALL_L10N_DOC="${ALL_L10N_DOC} ${l}"
-	done
-	export ALL_L10N ALL_L10N_DOC
-}
-
-src_prepare() {
-	default
-
-	# increases java heap to 512M when building docs (sync with cheqreqs above)
-	use doc && eapply "${FILESDIR}/${P}-java-heap.patch"
-
-	# use the L10N 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
-
-	# fix QA for metainfo data installation path
-	sed -i.bkp -e "s:/appdata:/metainfo:" desktop/Makefile.in || die
-
-	# remove self closing <br /> (error our with javadoc8)
-	# already upstream commit 2103082c
-	find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die
-
-	#add specific gentoo java directories
-	if use gui; then
-		sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.2|" \
-			-e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2.2|" configure.ac || die
-		sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2.2|" \
-			-e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2.2|" \
-			-e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \
-			configure.ac || die
-
-		sed -i -e "s/jogl2/jogl-2.2/" -e "s/gluegen2/gluegen-2.2/" \
-			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-2,commons-io-1
-		java-pkg_jar-from jogl-2.2 jogl-all.jar jogl2.jar
-		java-pkg_jar-from gluegen-2.2 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
-		if use doc; then
-			java-pkg_jar-from --build-only batik-1.9 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-graphicsbase
-	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() {
-	addpredict /proc/mtrr
-	default
-	pax-mark m .libs/scilab-bin
-	use doc && emake doc
-}
-
-src_test() {
-	if use gui; then
-		Xemake check
-	else
-		emake check
-	fi
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-	rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
-	newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
-	bashcomp_alias ${PN} ${PN}-cli ${PN}-adv-cli
-	echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
-		> 50-"${PN}"
-	insinto /etc/revdep-rebuild && doins "50-${PN}"
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_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() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild b/sci-mathematics/scilab/scilab-6.1.0.ebuild
deleted file mode 100644
index 6b19924a6..000000000
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_OPT_USE="gui"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools bash-completion-r1 check-reqs flag-o-matic \
-	fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Scientific software package for numerical computations"
-HOMEPAGE="https://www.scilab.org/"
-SRC_URI="https://www.scilab.org/download/${PV}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-
-IUSE="debug doc emf fftw +gui +matio mpi nls openmp
-	static-libs test tk +umfpack +xcos"
-REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
-
-RESTRICT="test"
-
-IUSE_L10N="fr zh zh ru ca de es pt ja it uk pl cs"
-L10N_DOC="fr pt ja ru"
-
-map_lang() {
-	local lang=${1/_/-}
-	case $1 in
-		# Retain the following, which have a specific subtag
-		de_*|en_*|pt_*|zh_*) ;;
-		# Consider all other xx_XX as duplicates of the generic xx tag
-		*_*) lang=${1%%_*} ;;
-	esac
-	echo ${lang}
-}
-
-prev_l=
-for l in ${IUSE_L10N}; do
-	l=$(map_lang ${l})
-	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
-	prev_l=${l}
-done
-unset l prev_l
-
-CDEPEND="
-	dev-libs/libpcre
-	dev-libs/libxml2:2
-	sci-libs/hdf5[mpi=]
-	>=sci-libs/arpack-3
-	sci-libs/lapack[deprecated(-)]
-	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
-		dev-java/freehep-graphics2d:0
-		dev-java/freehep-io:0
-		dev-java/freehep-graphicsbase:0
-	)
-	fftw? ( sci-libs/fftw:3.0 )
-	gui? (
-		dev-java/avalon-framework:4.2
-		>=dev-java/batik-1.9:1.9
-		dev-java/commons-io:1
-		dev-java/commons-logging:0
-		>=dev-java/flexdock-1.2.4:0
-		>=dev-java/fop-2.0:0
-		~dev-java/gluegen-2.2.4:2.2
-		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.2.4:2.2
-		>=dev-java/jrosetta-1.0.4:0
-		>dev-java/lucene-7:=[modules(-)]
-		dev-java/skinlf:0
-		dev-java/xmlgraphics-commons:2
-		virtual/opengl
-		xcos? ( dev-java/jgraphx:0 )
-		)
-	matio? ( >=sci-libs/matio-1.5 )
-	mpi? ( virtual/mpi[fortran] )
-	tk? ( dev-lang/tk:0= )
-	umfpack? ( sci-libs/umfpack )"
-
-RDEPEND="${CDEPEND}
-	gui? ( >=virtual/jre-1.8 )"
-
-DEPEND="${CDEPEND}
-	debug? ( dev-util/lcov )
-	gui? (
-		>=virtual/jdk-1.6
-		doc? (
-			app-text/docbook-xsl-stylesheets
-			dev-java/xml-commons-external:1.4
-			dev-java/saxon:9
-		)
-		xcos? (
-			>=dev-lang/ocaml-4.06
-			dev-ml/num
-		)
-	)
-	test? (
-		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}-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}/${PN}-5.5.2-missinglib.patch"
-	"${FILESDIR}/${P}-freehep.patch"
-	"${FILESDIR}/${P}-libxml.patch"
-)
-
-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
-
-	# 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"
-	for l in ${IUSE_L10N}; do
-		use l10n_${l} && ALL_L10N="${ALL_L10N} ${l}"
-	done
-	for l in ${L10N_DOC}; do
-		use l10n_${l} && ALL_L10N_DOC="${ALL_L10N_DOC} ${l}"
-	done
-	export ALL_L10N ALL_L10N_DOC
-}
-
-src_prepare() {
-	default
-
-	# increases java heap to 512M when building docs (sync with cheqreqs above)
-	use doc && eapply "${FILESDIR}/${P}-java-heap.patch"
-
-	# use the L10N 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
-
-	# fix QA for metainfo data installation path
-	sed -i.bkp -e "s:/appdata:/metainfo:" desktop/Makefile.in || die
-
-	# remove self closing <br /> (error our with javadoc8)
-	# already upstream commit 2103082c
-	find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die
-
-	#add specific gentoo java directories
-	if use gui; then
-		sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.2|" \
-			-e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2.2|" configure.ac || die
-		sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2.2|" \
-			-e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2.2|" \
-			-e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \
-			configure.ac || die
-
-		sed -i -e "s/jogl2/jogl-2.2/" -e "s/gluegen2/gluegen-2.2/" \
-			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-2,commons-io-1
-		java-pkg_jar-from jogl-2.2 jogl-all.jar jogl2.jar
-		java-pkg_jar-from gluegen-2.2 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
-		if use doc; then
-			java-pkg_jar-from --build-only batik-1.9 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-graphicsbase
-	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() {
-	addpredict /proc/mtrr
-	default
-	pax-mark m .libs/scilab-bin
-	use doc && emake doc
-}
-
-src_test() {
-	if use gui; then
-		Xemake check
-	else
-		emake check
-	fi
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-	rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
-	newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
-	bashcomp_alias ${PN} ${PN}-cli ${PN}-adv-cli
-	echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
-		> 50-"${PN}"
-	insinto /etc/revdep-rebuild && doins "50-${PN}"
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_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() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}