* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2015-02-01 3:01 99% Guillaume Horel
0 siblings, 0 replies; 1+ results
From: Guillaume Horel @ 2015-02-01 3:01 UTC (permalink / raw
To: gentoo-commits
commit: 090811f27d48c68636513021ac82a7ed8e23286c
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Tue Jan 27 03:14:29 2015 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sun Feb 1 02:47:56 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=090811f2
sci-mathematics/scilab: remove old versions
Package-Manager: portage-2.2.15
---
sci-mathematics/scilab/ChangeLog | 16 ++
.../scilab/files/scilab-5.3.3-as-needed.patch | 42 ----
.../scilab/files/scilab-5.3.3-blas-libs.patch | 12 -
.../files/scilab-5.3.3-disable-build-help.patch | 12 -
.../scilab-5.3.3-fix-random-runtime-failures.patch | 98 --------
.../scilab/files/scilab-5.3.3-fortran-link.patch | 23 --
.../scilab/files/scilab-5.3.3-gui-no-xcos.patch | 26 ---
.../scilab/files/scilab-5.3.3-hdf18.patch | 13 --
.../scilab/files/scilab-5.3.3-java-heap.patch | 11 -
.../files/scilab-5.3.3-java-version-check.patch | 23 --
.../scilab/files/scilab-5.3.3-javadoc-utf8.patch | 25 --
.../scilab/files/scilab-5.3.3-jgrapx-min.patch | 0
.../scilab/files/scilab-5.3.3-jvm-detection.patch | 44 ----
.../scilab/files/scilab-5.3.3-matio15.patch | 25 --
.../scilab/files/scilab-5.3.3-no-lhpi.patch | 22 --
.../scilab/files/scilab-5.3.3-no-xcos-deps.patch | 90 --------
.../scilab-5.4.1-fix-random-runtime-failure.patch | 12 -
.../scilab/files/scilab-5.4.1-followlinks.patch | 12 -
.../scilab/files/scilab-5.4.1-gluegen.patch | 12 -
.../scilab/files/scilab-5.4.1-java-heap.patch | 14 --
sci-mathematics/scilab/scilab-5.3.3-r2.ebuild | 252 ---------------------
sci-mathematics/scilab/scilab-5.4.1.ebuild | 243 --------------------
22 files changed, 16 insertions(+), 1011 deletions(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 53eed59..d960f40 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,22 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 27 Jan 2015; Guillaume Horel <guillaume.horel@gmail.com>
+ -files/scilab-5.3.3-as-needed.patch, -files/scilab-5.3.3-blas-libs.patch,
+ -files/scilab-5.3.3-disable-build-help.patch,
+ -files/scilab-5.3.3-fix-random-runtime-failures.patch,
+ -files/scilab-5.3.3-fortran-link.patch, -files/scilab-5.3.3-gui-no-xcos.patch,
+ -files/scilab-5.3.3-hdf18.patch, -files/scilab-5.3.3-java-heap.patch,
+ -files/scilab-5.3.3-java-version-check.patch,
+ -files/scilab-5.3.3-javadoc-utf8.patch, -files/scilab-5.3.3-jgrapx-min.patch,
+ -files/scilab-5.3.3-jvm-detection.patch, -files/scilab-5.3.3-matio15.patch,
+ -files/scilab-5.3.3-no-lhpi.patch, -files/scilab-5.3.3-no-xcos-deps.patch,
+ -files/scilab-5.4.1-fix-random-runtime-failure.patch,
+ -files/scilab-5.4.1-followlinks.patch, -files/scilab-5.4.1-gluegen.patch,
+ -files/scilab-5.4.1-java-heap.patch, -scilab-5.3.3-r2.ebuild,
+ -scilab-5.4.1.ebuild:
+ sci-mathematics/scilab: remove old versions
+
29 Jun 2014; Guillaume Horel <guillaume.horel@gmail.com>
+files/scilab-5.5.0-jdk1.8.patch, scilab-5.5.0.ebuild:
sci-mathematics/scilab: support jdk1.8
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-as-needed.patch b/sci-mathematics/scilab/files/scilab-5.3.3-as-needed.patch
deleted file mode 100644
index 4df4258..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-as-needed.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- scilab-5.3.3.orig/modules/history_manager/Makefile.am 2012-04-16 21:18:43.000000000 +0100
-+++ scilab-5.3.3/modules/history_manager/Makefile.am 2012-05-23 20:17:50.000000000 +0100
-@@ -82,7 +82,7 @@
- INCLUDE_FLAGS = $(libscihistory_manager_la_CFLAGS)
-
- ## Libraries necessary
--libscihistory_manager_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/fileio/libscifileio.la
-+libscihistory_manager_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la
- modulename=history_manager
-
- #### history_manager : Conf files ####
---- scilab-5.3.3.orig/modules/commons/Makefile.am 2012-04-16 21:18:41.000000000 +0100
-+++ scilab-5.3.3/modules/commons/Makefile.am 2012-05-24 19:06:11.000000000 +0100
-@@ -80,7 +80,7 @@
- endif
-
- libscicommons_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la \
--$(top_builddir)/modules/output_stream/libscioutput_stream.la
-+$(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/core/libscicore.la
-
-
- #### commons : gateway declaration ####
---- scilab-5.3.3.orig/modules/Makefile.am 2012-04-16 21:18:41.000000000 +0100
-+++ scilab-5.3.3/modules/Makefile.am 2012-05-24 18:41:25.000000000 +0100
-@@ -23,7 +23,6 @@
- api_scilab \
- dynamic_link \
- fileio \
--history_manager \
- spreadsheet \
- tclsci \
- localization \
-@@ -88,7 +87,8 @@
- parallel \
- modules_manager \
- ui_data \
--history_browser
-+history_browser \
-+history_manager
-
- #umfpack
-
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-blas-libs.patch b/sci-mathematics/scilab/files/scilab-5.3.3-blas-libs.patch
deleted file mode 100644
index b2921f7..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-blas-libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
- upstream http://bugzilla.scilab.org/show_bug.cgi?id=9824
-
---- scilab-5.3.2-orig/m4/libsmath.m4 2011-09-19 14:08:11.167292730 -0400
-+++ scilab-5.3.2/m4/libsmath.m4 2011-09-19 14:08:26.477292283 -0400
-@@ -37,7 +37,6 @@
- AC_PREREQ(2.50)
- AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
- acx_blas_ok=no
--BLAS_LIBS=
- acx_blas_save_LIBS="$LIBS"
-
- AC_ARG_WITH(blas-library,
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-disable-build-help.patch b/sci-mathematics/scilab/files/scilab-5.3.3-disable-build-help.patch
deleted file mode 100644
index e503748..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-disable-build-help.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268
-
---- a/scilab/modules/scinotes/Makefile.am
-+++ b/scilab/modules/scinotes/Makefile.am
-@@ -112,5 +112,7 @@ libsciscinotes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
- libsciscinotes_la_sci_gateway_DATA = sci_gateway/scinotes_gateway.xml
-
- if GUI
-+if BUILD_HELP
- USEANT=1
- endif
-+endif
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-fix-random-runtime-failures.patch b/sci-mathematics/scilab/files/scilab-5.3.3-fix-random-runtime-failures.patch
deleted file mode 100644
index 6661989..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-fix-random-runtime-failures.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-fix random failures, triggered by gentoo qa scripts: missing declarations (headers), assigning NULL to int or double
-
-diff -Nur scilab-5.3.3.orig/modules/api_scilab/src/cpp/api_double.cpp scilab-5.3.3/modules/api_scilab/src/cpp/api_double.cpp
---- scilab-5.3.3.orig/modules/api_scilab/src/cpp/api_double.cpp 2012-04-16 21:18:42.000000000 +0100
-+++ scilab-5.3.3/modules/api_scilab/src/cpp/api_double.cpp 2012-05-23 23:26:09.000000000 +0100
-@@ -481,7 +481,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 -Nur scilab-5.3.3.orig/modules/api_scilab/src/cpp/api_list.cpp scilab-5.3.3/modules/api_scilab/src/cpp/api_list.cpp
---- scilab-5.3.3.orig/modules/api_scilab/src/cpp/api_list.cpp 2012-04-16 21:18:42.000000000 +0100
-+++ scilab-5.3.3/modules/api_scilab/src/cpp/api_list.cpp 2012-05-23 23:23:22.000000000 +0100
-@@ -1133,7 +1133,7 @@
- SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
- int* piAddr = NULL;
- int* piRoot = NULL;
-- int iNbItem = NULL;
-+ int iNbItem = 0;
-
- if(_piParent == NULL)
- {
-@@ -1329,7 +1329,7 @@
- SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
- int* piAddr = NULL;
- int* piRoot = NULL;
-- int iNbItem = NULL;
-+ int iNbItem = 0;
- int* piBool = NULL;
-
-
-@@ -1577,7 +1577,7 @@
- SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
- int* piAddr = NULL;
- int* piRoot = NULL;
-- int iNbItem = NULL;
-+ int iNbItem = 0;
-
- if(_piParent == NULL)
- {
-diff -Nur scilab-5.3.3.orig/modules/core/src/c/csignal.c scilab-5.3.3/modules/core/src/c/csignal.c
---- scilab-5.3.3.orig/modules/core/src/c/csignal.c 2012-04-16 21:18:43.000000000 +0100
-+++ scilab-5.3.3/modules/core/src/c/csignal.c 2012-05-23 23:18:19.000000000 +0100
-@@ -11,6 +11,7 @@
- *
- */
- #include <stdio.h>
-+#include <string.h>
- #include "banier.h"
- #include "csignal.h"
- #include "sigbas.h"
-diff -Nur scilab-5.3.3.orig/modules/functions/src/c/getmacroslist.c scilab-5.3.3/modules/functions/src/c/getmacroslist.c
---- scilab-5.3.3.orig/modules/functions/src/c/getmacroslist.c 2012-04-16 21:18:41.000000000 +0100
-+++ scilab-5.3.3/modules/functions/src/c/getmacroslist.c 2012-05-23 23:18:38.000000000 +0100
-@@ -11,6 +11,7 @@
- *
- */
- #include <stdlib.h>
-+#include <string.h>
- #include "api_scilab.h"
- #include "sci_types.h"
- #include "getmacroslist.h"
-diff -Nur scilab-5.3.3.orig/modules/localization/src/c/charEncoding.c scilab-5.3.3/modules/localization/src/c/charEncoding.c
---- scilab-5.3.3.orig/modules/localization/src/c/charEncoding.c 2012-04-16 21:18:43.000000000 +0100
-+++ scilab-5.3.3/modules/localization/src/c/charEncoding.c 2012-05-23 23:16:17.000000000 +0100
-@@ -16,6 +16,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <locale.h>
-+#include <wctype.h>
- #include "charEncoding.h"
- #include "MALLOC.h"
- /*--------------------------------------------------------------------------*/
-diff -Nur scilab-5.3.3.orig/modules/matio/src/c/CreateCharVariable.c scilab-5.3.3/modules/matio/src/c/CreateCharVariable.c
---- scilab-5.3.3.orig/modules/matio/src/c/CreateCharVariable.c 2012-04-16 21:18:43.000000000 +0100
-+++ scilab-5.3.3/modules/matio/src/c/CreateCharVariable.c 2012-05-23 23:19:36.000000000 +0100
-@@ -11,6 +11,7 @@
- *
- */
-
-+#include <string.h>
- #include "api_scilab.h"
- #include "CreateMatlabVariable.h"
- #include "freeArrayOfString.h"
---- scilab-5.3.3.orig/modules/graphics/src/c/getHandleProperty/set_log_flags_property.c 2012-04-16 21:18:41.000000000 +0100
-+++ scilab-5.3.3/modules/graphics/src/c/getHandleProperty/set_log_flags_property.c 2012-05-24 20:54:16.000000000 +0100
-@@ -18,6 +18,7 @@
- /* a handle */
- /*------------------------------------------------------------------------*/
- #include <string.h>
-+#define _GNU_SOURCE
- #include <math.h>
- #include "setHandleProperty.h"
- #include "SetProperty.h"
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-fortran-link.patch b/sci-mathematics/scilab/files/scilab-5.3.3-fortran-link.patch
deleted file mode 100644
index 707da3b..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-fortran-link.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- scilab-5.3.3.orig/configure.ac 2012-04-16 21:18:43.000000000 +0100
-+++ scilab-5.3.3/configure.ac 2012-05-23 00:54:55.000000000 +0100
-@@ -196,16 +196,16 @@
- if test -z "$F77"; then
- AC_MSG_ERROR([You asked me to use gfortran but i haven't been able to find it])
- fi
--fi
-
--if test "$with_intelcompilers" = yes; then
-+
-+elif test "$with_intelcompilers" = yes; then
- AC_PROG_F77(ifc ifort)
- if test -z "$F77"; then
- AC_MSG_ERROR([You asked me to use ifc (intel fortran compiler) but i haven't been able to find it])
- fi
--fi
-+else
-+
-
--if test -z "$F77"; then
- ## No Frotran compiler specified... We rely on Autoconf to find the best
- AC_PROG_F77
- fi
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-gui-no-xcos.patch b/sci-mathematics/scilab/files/scilab-5.3.3-gui-no-xcos.patch
deleted file mode 100644
index 82ebbde..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-gui-no-xcos.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur scilab-5.3.3.orig/modules/graph/Makefile.am scilab-5.3.3/modules/graph/Makefile.am
---- scilab-5.3.3.orig/modules/graph/Makefile.am 2012-05-29 18:59:31.000000000 +0100
-+++ scilab-5.3.3/modules/graph/Makefile.am 2012-05-29 19:02:11.000000000 +0100
-@@ -87,5 +87,7 @@
- libscigraph_la_sci_gateway_DATA =
-
- if GUI
-+if XCOS
- USEANT=1
- endif
-+endif
-diff -Nur scilab-5.3.3.orig/modules/hdf5/Makefile.am scilab-5.3.3/modules/hdf5/Makefile.am
---- scilab-5.3.3.orig/modules/hdf5/Makefile.am 2012-05-29 18:59:42.000000000 +0100
-+++ scilab-5.3.3/modules/hdf5/Makefile.am 2012-05-29 19:03:04.000000000 +0100
-@@ -10,9 +10,11 @@
- if HDF5
-
- if GUI
-+if XCOS
- # No GUI. Disable the Java build
- USEANT=1
- endif
-+endif
-
-
- HDF5_SOURCES = src/c/h5_fileManagement.c \
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-hdf18.patch b/sci-mathematics/scilab/files/scilab-5.3.3-hdf18.patch
deleted file mode 100644
index 7a7e6c2..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-hdf18.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
-===================================================================
---- modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java.orig
-+++ modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
-@@ -61,7 +61,7 @@ public final class Xcos {
- * Dependencies version
- */
- private static final List<String> MXGRAPH_VERSIONS = Arrays.asList("1.4.1.0");
-- private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]");
-+ private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]", "[1, 8, 7]", "[1, 8, 8]", "[1, 8, 9]","[1, 8, 10]");
- private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7");
-
- private static final String UNABLE_TO_LOAD_JGRAPHX =
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.3.3-java-heap.patch
deleted file mode 100644
index e493a3b..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-java-heap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scilab-5.3.3.orig//etc/jvm_options.xml 2011-05-25 23:20:12.145833420 -0400
-+++ scilab-5.3.3/etc/jvm_options.xml 2011-05-25 23:20:58.760833451 -0400
-@@ -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"/>
- <option value="-Dapple.laf.useScreenMenuBar=true" os="macosx"/>
- <!-- DISABLE Just In Time java compiler -->
- <!--
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-java-version-check.patch b/sci-mathematics/scilab/files/scilab-5.3.3-java-version-check.patch
deleted file mode 100644
index c5eb611..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-java-version-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naurp scilab-5.3.3-r1-orig/m4/java-thirdparty.m4 scilab-5.3.3-r1/m4/java-thirdparty.m4
---- scilab-5.3.3-r1-orig/m4/java-thirdparty.m4 2013-01-07 14:55:58.516374556 +0100
-+++ scilab-5.3.3-r1/m4/java-thirdparty.m4 2013-01-07 16:19:21.256370075 +0100
-@@ -38,9 +38,16 @@ AC_DEFUN([AC_JAVA_CHECK_VERSION_PACKAGE]
- AC_JAVA_TRY_COMPILE($2, [String minVersion="$4";
- $6
- System.out.println($5);
-- if (minVersion.compareTo($5) > 0) {
-- System.exit(-1);
-- } ]
-+ String[] minV = minVersion.split("\\.");
-+ String[] curV = $5.split("\\.");
-+ for (int i=0; i<Math.max(minV.length,curV.length); i++) {
-+ int mE = i<minV.length ? Integer.parseInt(minV[i]) : 0;
-+ int cE = i<curV.length ? Integer.parseInt(curV[i]) : 0;
-+ if (mE < cE)
-+ break;
-+ if (mE > cE)
-+ System.exit(-1);
-+ } ]
- , "yes", echo "yes" , AC_MSG_ERROR([Wrong version of $1. Expected at least $4. Found $STDOUT]))
- else
- AC_JAVA_TRY_COMPILE($2, [String minVersion="$4";
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-javadoc-utf8.patch b/sci-mathematics/scilab/files/scilab-5.3.3-javadoc-utf8.patch
deleted file mode 100644
index b4b2175..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-javadoc-utf8.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e42e4a78fa2e070bad79257f575d9a500547e809 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david@scilab-enterprises.com>
-Date: Mon, 31 Oct 2011 14:31:27 +0100
-Subject: [PATCH 4/8] fix javadoc encoding
-
----
- Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 1e4d590..7b905ae 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -163,7 +163,7 @@ macros:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
- # This is not done in the module itself because its needs also the "types"
- # module
- javadoc:
-- $(JAVADOC) -noindex -nohelp -nonavbar -notree \
-+ $(JAVADOC) -noindex -nohelp -nonavbar -notree -encoding "utf-8" \
- -d $(top_builddir)/modules/javasci/javadoc \
- -sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java \
- org.scilab.modules.javasci org.scilab.modules.types
---
-1.7.7
-
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-jgrapx-min.patch b/sci-mathematics/scilab/files/scilab-5.3.3-jgrapx-min.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-jvm-detection.patch b/sci-mathematics/scilab/files/scilab-5.3.3-jvm-detection.patch
deleted file mode 100644
index 4b3d852..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-jvm-detection.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-applied from upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268
-
-diff --git a/scilab/bin/scilab b/scilab/bin/scilab
-index 67f6474..7a4f6f5 100755
---- a/scilab/bin/scilab
-+++ b/scilab/bin/scilab
-@@ -355,7 +355,7 @@ detect_java_vm() {
- # uname -m Darwin
-
- # If the user has the variable JAVA_HOME in the ENV
-- if test -n "$JAVA_HOME" ; then
-+ if test -n "$JAVA_HOME" ; then
- if test $SCIVERBOSE -ne 0; then
- echo "Using specified vm: $JAVA_HOME"
- fi
-@@ -363,7 +363,7 @@ detect_java_vm() {
- echo "Cannot find $JAVA_HOME/bin/java"
- exit 1
- fi
-- fi
-+ else
-
- case $OS in
- *darwin* | *Darwin*)
-@@ -429,18 +429,17 @@ detect_java_vm() {
- done
- IFS=$as_save_IFS
- fi
-+ fi
- if test ! -z "$JAVA_HOME"; then
- if test $SCIVERBOSE -ne 0; then
- echo "JAVA_HOME : $JAVA_HOME"
- fi
--
- # Manage JRE & JDK because libjava.so and others are stored in the JRE
- if test -d $JAVA_HOME/jre; then
- JRE_HOME=$JAVA_HOME/jre
- else
- JRE_HOME=$JAVA_HOME
- fi
--
- # Configuring LD_LIBRARY_PATH for libjava.so libhpi.so and libxxxx.so
-
- case $OS in
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-matio15.patch b/sci-mathematics/scilab/files/scilab-5.3.3-matio15.patch
deleted file mode 100644
index 178b4bd..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-matio15.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nur scilab-5.3.3.orig/configure.ac scilab-5.3.3/configure.ac
---- scilab-5.3.3.orig/configure.ac 2012-04-16 21:18:43.000000000 +0100
-+++ scilab-5.3.3/configure.ac 2012-05-14 19:27:21.000000000 +0100
-@@ -1514,7 +1514,7 @@
- CFLAGS="$CFLAGS $MATIO_CFLAGS"
- LIBS="$LIBS $MATIO_LIBS"
-
-- AC_CHECK_HEADERS([matio.h matioConfig.h], [],
-+ AC_CHECK_HEADERS([matio.h], [],
- [AC_MSG_ERROR([Invalid MATIO_CFLAGS returned by pkg-config. Try to define MATIO_CFLAGS.])])
- AC_CHECK_LIB([matio], [Mat_Open], [],
- [AC_MSG_ERROR([Invalid MATIO_LIBS returned by pkg-config. Try to define MATIO_LIBS.])])
-diff -Nur scilab-5.3.3.orig/modules/core/includes/machine.h.in scilab-5.3.3/modules/core/includes/machine.h.in
---- scilab-5.3.3.orig/modules/core/includes/machine.h.in 2012-04-16 21:18:43.000000000 +0100
-+++ scilab-5.3.3/modules/core/includes/machine.h.in 2012-05-14 19:25:56.000000000 +0100
-@@ -176,9 +176,6 @@
- /* Define to 1 if you have the <malloc.h> header file. */
- #undef HAVE_MALLOC_H
-
--/* Define to 1 if you have the <matioConfig.h> header file. */
--#undef HAVE_MATIOCONFIG_H
--
- /* Define to 1 if you have the <matio.h> header file. */
- #undef HAVE_MATIO_H
-
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-no-lhpi.patch b/sci-mathematics/scilab/files/scilab-5.3.3-no-lhpi.patch
deleted file mode 100644
index ec48a17..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-no-lhpi.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fixed upstream
-
---- scilab-5.3.3.orig/m4/java.m4 2012-04-16 21:18:41.000000000 +0100
-+++ scilab-5.3.3/m4/java.m4 2012-05-23 22:07:31.000000000 +0100
-@@ -497,7 +497,7 @@
- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
- D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
- ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
-- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
-+ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D "
- fi
- fi
-
-@@ -598,7 +598,7 @@
- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
- D=$ac_java_jvm_dir/jre/lib/mipsel/native_threads
- ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
-- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
-+ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D "
- fi
- fi
-
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-no-xcos-deps.patch b/sci-mathematics/scilab/files/scilab-5.3.3-no-xcos-deps.patch
deleted file mode 100644
index 143e77e..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-no-xcos-deps.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 86ea77b316580c685263e54cd6564e4b939daf72 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david@scilab.org>
-Date: Wed, 14 Sep 2011 20:52:14 +0200
-Subject: [PATCH 3/8] Remove Xcos dependencies check
-
----
- .../src/java/org/scilab/modules/xcos/Xcos.java | 67 +------------------
- 1 files changed, 4 insertions(+), 63 deletions(-)
-
-diff --git a/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java b/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
-index 2417b06..35ed224 100644
---- a/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
-+++ b/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
-@@ -145,69 +145,10 @@ public final class Xcos {
- // CSOFF: IllegalCatch
- // CSOFF: MagicNumber
- private void checkDependencies() {
-- final ClassLoader loader = ClassLoader.getSystemClassLoader();
--
-- /* JGraphx */
-- String mxGraphVersion = "";
-- try {
-- final Class< ? > klass = loader.loadClass("com.mxgraph.view.mxGraph");
-- mxGraphVersion = (String) klass.getDeclaredField("VERSION").get(null);
--
-- if (!MXGRAPH_VERSIONS.contains(mxGraphVersion)) {
-- throw new Exception();
-- }
-- } catch (final Throwable e) {
-- throw new RuntimeException(String.format(UNABLE_TO_LOAD_JGRAPHX,
-- MXGRAPH_VERSIONS.get(0), mxGraphVersion), e);
-- }
--
-- /* HDF5 */
-- final int[] libVersion = new int[3];
-- try {
-- final Class< ? > klass = loader.loadClass("ncsa.hdf.hdf5lib.H5");
--
-- /* hdf5-java */
-- int ret = (Integer) klass.getMethod("H5get_libversion", libVersion.getClass())
-- .invoke(null, libVersion);
-- if (ret < 0) {
-- throw new Exception();
-- }
--
-- if (!HDF5_VERSIONS.contains(Arrays.toString(libVersion))) {
-- throw new Exception();
-- }
--
--
-- /* hdf5 */
-- ret = (Integer) klass.getMethod("H5check_version", int.class,
-- int.class, int.class).invoke(null, libVersion[0],
-- libVersion[1], libVersion[2]);
-- if (ret < 0) {
-- throw new RuntimeException(UNABLE_TO_LOAD_HDF5);
-- }
--
-- } catch (final Throwable e) {
-- if (!(e instanceof RuntimeException)) {
-- throw new RuntimeException(String.format(UNABLE_TO_LOAD_JHDF5,
-- HDF5_VERSIONS.get(0), Arrays.toString(libVersion)), e);
-- }
-- }
--
-- /* Batik */
-- String batikVersion = null;
-- try {
-- final Class< ? > klass = loader.loadClass("org.apache.batik.Version");
-- batikVersion = klass.getPackage().getImplementationVersion()
-- .split("\\+")[0];
--
-- if (!BATIK_VERSIONS.contains(batikVersion)) {
-- throw new Exception();
-- }
--
-- } catch (final Throwable e) {
-- throw new RuntimeException(String.format(UNABLE_TO_LOAD_BATIK,
-- BATIK_VERSIONS.get(0), batikVersion), e);
-- }
-+ LOG.trace("dependencies check removed");
-+ // Remove all dependencies check
-+ // It may cause some trouble in case of any API change but will
-+ // ease maintenance.
- }
- // CSON: MagicNumber
- // CSON: IllegalCatch
---
-1.7.7
-
diff --git a/sci-mathematics/scilab/files/scilab-5.4.1-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.4.1-fix-random-runtime-failure.patch
deleted file mode 100644
index 92ac453..0000000
--- a/sci-mathematics/scilab/files/scilab-5.4.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.4.1-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.4.1-followlinks.patch
deleted file mode 100644
index 118df3b..0000000
--- a/sci-mathematics/scilab/files/scilab-5.4.1-followlinks.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN scilab-orig/m4/java.m4 scilab/m4/java.m4
---- scilab-orig/m4/java.m4 2012-07-07 18:39:39.036716695 -0400
-+++ scilab/m4/java.m4 2012-07-07 18:40:54.479721514 -0400
-@@ -846,7 +846,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.4.1-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.4.1-gluegen.patch
deleted file mode 100644
index 64717a7..0000000
--- a/sci-mathematics/scilab/files/scilab-5.4.1-gluegen.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN scilab-orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
---- scilab-orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java 2012-07-09 23:14:03.261245376 -0400
-+++ scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java 2012-07-09 23:17:38.226239081 -0400
-@@ -73,7 +73,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.4.1-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.4.1-java-heap.patch
deleted file mode 100644
index ae9ec1a..0000000
--- a/sci-mathematics/scilab/files/scilab-5.4.1-java-heap.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN scilab-5.4.1-orig/etc/jvm_options.xml scilab-5.4.1/etc/jvm_options.xml
---- scilab-5.4.1-orig/etc/jvm_options.xml 2013-04-09 04:48:25.468385699 -0400
-+++ scilab-5.4.1/etc/jvm_options.xml 2013-04-09 04:49:17.608390887 -0400
-@@ -21,8 +21,8 @@
- <option value="-Djava.util.logging.config.file=$SCILAB/etc/logging.properties"/>
- <!-- ENABLE Just In Time java compiler -->
- <option value="-Djava.compiler=JIT"/>
-- <!-- Set Java Heap space to 256mb -->
-- <option value="-Xmx256m"/>
-+ <!-- Set Java Heap space to 512mb -->
-+ <option value="-Xmx512m"/>
-
- <!-- Set Java space for direct buffer allocation -->
- <!--
diff --git a/sci-mathematics/scilab/scilab-5.3.3-r2.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r2.ebuild
deleted file mode 100644
index e906dfd..0000000
--- a/sci-mathematics/scilab/scilab-5.3.3-r2.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=4
-
-JAVA_PKG_OPT_USE="gui"
-VIRTUALX_REQUIRED="manual"
-
-inherit eutils autotools check-reqs fdo-mime bash-completion-r1 \
- java-pkg-opt-2 fortran-2 flag-o-matic toolchain-funcs virtualx
-
-# TODO:
-# - work out src_test. do we need testng? (java-experimental overlay)
-# - emacs mode: http://forge.scilab.org/index.php/p/scilab-emacs/
-# - work out as-needed
-# - compatibility with matio >= 1.5
-# - apply extra patches? (fedora, mageia, debian, freebsd have some)
-# - do ebuilds for scilab packages: plotlib, scimax, scimysql, scivp, swt, ann,
-# celestlab, jims,...
-
-DESCRIPTION="Scientific software package for numerical computations"
-HOMEPAGE="http://www.scilab.org/"
-SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
-
-SLOT="0"
-LICENSE="CeCILL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion debug doc fftw +gui hdf5 +matio nls openmp
- static-libs test tk +umfpack xcos"
-REQUIRED_USE="xcos? ( hdf5 gui ) doc? ( gui )"
-
-# ALL_LINGUAS variable defined in configure.ac
-LINGUAS="fr_FR zh_CN zh_TW ca_ES es_ES pt_BR"
-for l in ${LINGUAS}; do
- IUSE="${IUSE} linguas_${l}"
-done
-LINGUASLONG="de_DE ja_JP it_IT uk_UA pl_PL ru_RU"
-for l in ${LINGUASLONG}; do
- IUSE="${IUSE} linguas_${l%_*}"
-done
-
-CDEPEND="
- dev-libs/libpcre
- dev-libs/libxml2:2
- sys-devel/gettext
- sys-libs/ncurses
- sys-libs/readline
- virtual/lapack
- fftw? ( sci-libs/fftw:3.0 )
- gui? (
- dev-java/avalon-framework
- dev-java/batik
- dev-java/commons-io
- dev-java/commons-logging
- dev-java/flexdock
- dev-java/fop
- =dev-java/gluegen-1*
- dev-java/javahelp
- dev-java/jeuclid-core
- dev-java/jgoodies-looks
- >=dev-java/jlatexmath-0.9.4
- =dev-java/jogl-1*
- dev-java/jrosetta
- dev-java/skinlf
- dev-java/xmlgraphics-commons
- virtual/opengl
- doc? ( dev-java/saxon:6.5 )
- hdf5? (
- dev-java/hdf-java
- xcos? ( =dev-java/jgraphx-1.4.1.0 ) ) )
- hdf5? ( sci-libs/hdf5 )
- 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/jlatexmath-fop-0.9.4
- dev-java/xml-commons-external )
- xcos? ( dev-lang/ocaml ) )
- test? ( gui? ( ${VIRTUALX_DEPEND} ) )"
-
-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
- java-pkg-opt-2_pkg_setup
- ALL_LINGUAS=
- for l in ${LINGUAS}; do
- use linguas_${l} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
- done
- for l in ${LINGUASLONG}; do
- use linguas_${l%_*} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
- done
- export ALL_LINGUAS
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-fortran-link.patch \
- "${FILESDIR}"/${P}-jvm-detection.patch \
- "${FILESDIR}"/${P}-disable-build-help.patch \
- "${FILESDIR}"/${P}-hdf18.patch \
- "${FILESDIR}"/${P}-no-lhpi.patch \
- "${FILESDIR}"/${P}-blas-libs.patch \
- "${FILESDIR}"/${P}-no-xcos-deps.patch \
- "${FILESDIR}"/${P}-javadoc-utf8.patch \
- "${FILESDIR}"/${P}-fix-random-runtime-failures.patch \
- "${FILESDIR}"/${P}-gui-no-xcos.patch \
- "${FILESDIR}"/${P}-java-version-check.patch
-
- # need serious as-needed work (inter-dependencies among modules)
- # "${FILESDIR}"/${P}-as-needed.patch \
- append-ldflags $(no-as-needed)
-
- # to apply with matio-1.5, unfortunately needs more work
- # "${FILESDIR}"/${P}-matio15.patch
-
- # increases java heap to 512M when building docs (sync with cheqreqs above)
- use doc && epatch "${FILESDIR}"/${P}-java-heap.patch
-
- # make sure library path are preloaded in binaries
- sed -i \
- -e "s|^LD_LIBRARY_PATH=|LD_LIBRARY_PATH=${EPREFIX}/usr/$(get_libdir)/scilab:|g" \
- bin/scilab* || die
-
- # fix jgraphx min version (fixed upstream)
- sed -i -e 's/\[=\]/\[\]/p' configure.ac || die
-
- # upstream http://bugzilla.scilab.org/show_bug.cgi?id=10244
- mv modules/call_scilab/examples/call_scilab/NET/VB.NET/My\ Project/ \
- modules/call_scilab/examples/call_scilab/NET/VB.NET/My_Project || die
-
- # gentoo bug #392363 (fixed upstream)
- sed -i \
- -e "s|Cl.*ment DAVID|Clement DAVID|g" \
- $(find . -iname '*.java') || die
-
- # add specific gentoo java directories
- if use gui; then
- sed -i -e "s|-L\$SCI_SRCDIR/bin/|-L\$SCI_SRCDIR/bin/ \
- -L$(java-config -i gluegen) \
- -L$(java-config -i jogl)|" \
- configure.ac || die
- sed -i \
- -e "/<\/librarypaths>/i\<path value=\"$(java-config -i gluegen)\"\/>" \
- -e "/<\/librarypaths>/i\<path value=\"$(java-config -i jogl)\"\/>" \
- etc/librarypath.xml || die
- if use xcos; then
- sed -i \
- -e "s|/usr/lib/jni|$(java-config -i hdf-java)|g" \
- m4/hdf5.m4 || die
- sed -i \
- -e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \
- etc/librarypath.xml || die
- fi
- fi
- java-pkg-opt-2_src_prepare
- eautoreconf
-}
-
-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}"
- # gentoo bug #302621
- use hdf5 && has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
- econf \
- --enable-relocatable \
- --disable-rpath \
- --with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \
- --without-pvm \
- $(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 fftw) \
- $(use_with gui) \
- $(use_with gui javasci) \
- $(use_with hdf5) \
- $(use_with matio) \
- $(use_with openmp) \
- $(use_with tk) \
- $(use_with umfpack) \
- $(use_with xcos) \
- $(use_with xcos modelica)
-}
-
-src_compile() {
- emake
- 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
- dodoc ACKNOWLEDGEMENTS README_Unix Readme_Visual.txt
- insinto /usr/share/mime/packages
- doins "${FILESDIR}"/${PN}.xml
- use bash-completion && newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
- fdo-mime_mime_database_update
-}
diff --git a/sci-mathematics/scilab/scilab-5.4.1.ebuild b/sci-mathematics/scilab/scilab-5.4.1.ebuild
deleted file mode 100644
index 79bcb83..0000000
--- a/sci-mathematics/scilab/scilab-5.4.1.ebuild
+++ /dev/null
@@ -1,243 +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
-# - can't build without docs (-doc)
-
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion debug +doc fftw +gui +matio nls openmp
- static-libs test tk +umfpack +xcos"
-REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
-
-# ALL_LINGUAS variable defined in configure.ac
-LINGUAS="fr_FR zh_CN zh_TW ca_ES es_ES pt_BR"
-for l in ${LINGUAS}; do
- IUSE="${IUSE} linguas_${l}"
-done
-LINGUASLONG="de_DE ja_JP it_IT uk_UA pl_PL ru_RU"
-for l in ${LINGUASLONG}; do
- IUSE="${IUSE} linguas_${l%_*}"
-done
-
-CDEPEND="dev-libs/libpcre
- dev-libs/libxml2:2
- sci-libs/hdf5
- >=sci-libs/arpack-3
- sys-devel/gettext
- sys-libs/ncurses
- sys-libs/readline
- virtual/lapack
- 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/flexdock-1.2.3:0
- dev-java/fop:0
- dev-java/gluegen:2
- dev-java/javahelp:0
- dev-java/jeuclid-core:0
- dev-java/jgoodies-looks:2.0
- dev-java/jgraphx:1.8
- >=dev-java/jlatexmath-1.0.2:1
- =dev-java/jogl-2.0_rc8-r1:2
- >=dev-java/jrosetta-1.0.4:0
- >=dev-java/scirenderer-1.1.0:1
- dev-java/skinlf:0
- dev-java/xmlgraphics-commons:1.5
- virtual/opengl
- doc? ( dev-java/saxon:6.5
- dev-java/jlatexmath-fop:1 )
- xcos? ( dev-java/commons-logging:0 ) )
- 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 )
- 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
- java-pkg-opt-2_pkg_setup
-
- ALL_LINGUAS="en_US"
- for l in ${LINGUAS}; do
- use linguas_${l} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
- done
- for l in ${LINGUASLONG}; do
- use linguas_${l%_*} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
- done
- export ALL_LINGUAS ALL_LINGUAS_DOC=$ALL_LINGUAS
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${P}-followlinks.patch" \
- "${FILESDIR}/${P}-gluegen.patch" \
- "${FILESDIR}/${P}-fix-random-runtime-failure.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|" \
- -e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2|" configure.ac || die
- sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2|" \
- -e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2|" \
- -e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \
- configure.ac || die
-
- sed -i -e "s/jogl2/jogl-2/" -e "s/gluegen2/gluegen-2/" \
- etc/librarypath.xml || die
- fi
-
- mkdir jar || die
- pushd jar
- java-pkg_jar-from jgraphx-1.8,jlatexmath-1,flexdock,skinlf
- java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer-1
- 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 jogl.all.jar jogl2.jar
- java-pkg_jar-from gluegen-2 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
- if use xcos; then
- java-pkg_jar-from commons-logging
- fi
- if use doc; then
- java-pkg_jar-from jlatexmath-fop-1,saxon-6.5
- java-pkg_jar-from xml-commons-external-1.4 xml-apis-ext.jar
- fi
- if use test; then
- java-pkg_jar-from junit-4 junit.jar junit4.jar
- 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}"
- # gentoo bug #302621
- has_version sci-libs/hdf5[mpi] && \
- export CXX=mpicxx CC=mpicc
-
- econf \
- --enable-relocatable \
- --disable-rpath \
- --with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \
- $(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 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)
-}
-
-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 "LD_LIBRARY_MASK=libverify.so
-SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
- > 50-"${PN}"
- insinto /etc/revdep-rebuild && doins "50-${PN}"
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
- fdo-mime_mime_database_update
-}
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-02-01 3:01 99% [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/ Guillaume Horel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox