diff options
author | Sébastien Fabbro <sebfabbro@gmail.com> | 2012-05-25 22:52:49 +0100 |
---|---|---|
committer | Sébastien Fabbro <sebfabbro@gmail.com> | 2012-05-25 22:52:49 +0100 |
commit | 4dc3f7b8867d14824353cd0113e52fa4e7426cae (patch) | |
tree | 66befa8f45e946d9d76f01b382006759b6fdbf57 /sci-mathematics/scilab | |
parent | sci-physics/root: sync live ebuild with upstream (diff) | |
download | sci-4dc3f7b8867d14824353cd0113e52fa4e7426cae.tar.gz sci-4dc3f7b8867d14824353cd0113e52fa4e7426cae.tar.bz2 sci-4dc3f7b8867d14824353cd0113e52fa4e7426cae.zip |
sci-mathematics/scilab: complete ebuild revamp
(Portage version: 2.1.10.60/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sci-mathematics/scilab')
30 files changed, 682 insertions, 622 deletions
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog index b9e37345f..0d75e37d0 100644 --- a/sci-mathematics/scilab/ChangeLog +++ b/sci-mathematics/scilab/ChangeLog @@ -1,7 +1,37 @@ # ChangeLog for sci-mathematics/scilab -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*scilab-5.3.3-r1 (25 May 2012) + + 25 May 2012; Sébastien Fabbro <bicatali@gentoo.org> + +files/scilab.bash_completion, -files/bug_9268.diff, -scilab-5.2.1.ebuild, + -files/scilab-5.2.1-hdf-java-2.6.patch, -files/scilab-5.2.1-java-heap.patch, + -files/scilab-5.2.1-no-redef-exp10.patch, + -files/scilab-5.2.1-nojavacheckversion.patch, + -files/scilab-5.2.1-scilib-fix.patch, -scilab-5.3.2.ebuild, + -files/scilab-5.3.2-allow-hdf-1.8.7.patch, + -files/scilab-5.3.2-scilib-fix.patch, -files/java-heap-5.3.2.patch, + -scilab-5.3.3.ebuild, +scilab-5.3.3-r1.ebuild, + -files/scilab-5.3.3-allow-hdf-1.8.7.patch, + +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-hdf18.patch, + +files/scilab-5.3.3-java-heap.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.3.3-scilib-fix.patch, -files/java-heap-5.3.3.patch, + -files/disablebuildhelp.patch: + Completely revamped ebuild. Support linguas. Force matio < 1.5. Added + fortran eclass and patch to allow user to define F77. Added + bash-completion. Tests need X with gui. Re-order dependencies with use + flags. Added openmp flag with test of compiler. Added a debug flag. + Added a fix for hdf5 with mpi, bug #302621. Added a few more patches to + please Gentoo QA (random runtime failures), javadoc utf8 and re-organize + some sed's in patches. General cleanup and remove old versions. + 23 Dec 2011; Guillaume Horel <guillaume.horel@gmail.com> scilab-5.3.3.ebuild: Fixes for jdk-1.7 diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest index 3abaebcb3..ee6bad85e 100644 --- a/sci-mathematics/scilab/Manifest +++ b/sci-mathematics/scilab/Manifest @@ -1,3 +1 @@ -DIST scilab-5.2.1-src.tar.gz 54855137 RMD160 312ccc62f44bc3dbf8f25260a7090f62dc70818e SHA1 6fad986beb03a42cee6e8ef9bfa0b8976236b3f6 SHA256 f85aa3b7fde0e523f7f0159613da7cca7bd2d125860b50fa2ed00394c97075e0 -DIST scilab-5.3.2-src.tar.gz 47356102 RMD160 18cff3bbf0dd7e901de8879355b243c4c16fe9fb SHA1 c0d7a7db6ea3a6a35722b451c6ef99b799079896 SHA256 6b33aace70b0889a71a417a28530ff58b96042ea35cb033c37bb1ac7c9a4ec15 -DIST scilab-5.3.3-src.tar.gz 47253497 RMD160 c6002d369dcc4dd2a0f5f93c8c5c84e8f48474df SHA1 0bb26846737651a62565f877e2d660f90e2b4b26 SHA256 e6edd7d241f2a09bd2dadaaafff5c152509db240220933b87305875302401335 +DIST scilab-5.3.3-src.tar.gz 47253497 SHA256 e6edd7d241f2a09bd2dadaaafff5c152509db240220933b87305875302401335 SHA512 334ff05239efa2c9c378a86521a979aa5578f5a79324dc4f16805a995c673d5bd9656567de127939bf30409e2ba6f5904b75508046adfcfa4a5d6390f53d8ffa WHIRLPOOL 635666dbc52280fd797f01402c42429acd3e55c1bcdd9a2af584e349838e1bb935cef97f0f9f061d7b1c44f6078a0d84fb44f2c4cb17fcf9d3ba59e79c45493e diff --git a/sci-mathematics/scilab/files/disablebuildhelp.patch b/sci-mathematics/scilab/files/disablebuildhelp.patch deleted file mode 100644 index 4fbabd917..000000000 --- a/sci-mathematics/scilab/files/disablebuildhelp.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f4c20c8fb5d9540e4972ae75dbd2a34aa2a3622b Mon Sep 17 00:00:00 2001 -From: Sylvestre Ledru <sylvestre.ledru@scilab.org> -Date: Sat, 1 Oct 2011 00:15:59 +0200 -Subject: [PATCH] * bug 9883 fixed - Build with --disable-build-help was failing. - -Change-Id: I93da6b7312effb261fd95d90613f87e9988b35f9 ---- - scilab/modules/scinotes/Makefile.am | 2 ++ - scilab/modules/scinotes/Makefile.in | 2 +- - 2 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/scilab/modules/scinotes/Makefile.am b/scilab/modules/scinotes/Makefile.am -index 8ffad2d..ad5dbde 100644 ---- 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/scilab/modules/scinotes/Makefile.in b/scilab/modules/scinotes/Makefile.in -index 95b6f57..673fa4c 100644 ---- a/scilab/modules/scinotes/Makefile.in -+++ b/scilab/modules/scinotes/Makefile.in -@@ -565,7 +565,7 @@ libsciscinotes_la_LIBADD = libsciscinotes-algo.la - #### scinotes : gateway declaration #### - libsciscinotes_la_sci_gatewaydir = $(mydatadir)/sci_gateway - libsciscinotes_la_sci_gateway_DATA = sci_gateway/scinotes_gateway.xml --@GUI_TRUE@USEANT = 1 -+@BUILD_HELP_TRUE@@GUI_TRUE@USEANT = 1 - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - --- -1.7.2.3 - diff --git a/sci-mathematics/scilab/files/java-heap-5.3.3.patch b/sci-mathematics/scilab/files/java-heap-5.3.3.patch deleted file mode 100644 index 57d656b21..000000000 --- a/sci-mathematics/scilab/files/java-heap-5.3.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN scilab-5.3.2-orig//etc/jvm_options.xml scilab-5.3.2/etc/jvm_options.xml ---- scilab-5.3.2-orig//etc/jvm_options.xml 2011-05-25 23:20:12.145833420 -0400 -+++ scilab-5.3.2/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.2.1-hdf-java-2.6.patch b/sci-mathematics/scilab/files/scilab-5.2.1-hdf-java-2.6.patch deleted file mode 100644 index 034e98c93..000000000 --- a/sci-mathematics/scilab/files/scilab-5.2.1-hdf-java-2.6.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: scilab-5.2.0/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java -=================================================================== ---- scilab-5.2.0.orig/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java 2010-01-23 22:51:12.000000000 +0100 -+++ scilab-5.2.0/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java 2010-01-23 22:51:41.000000000 +0100 -@@ -53,7 +53,8 @@ - int nb_objs = H5.H5Gn_members(fileId, groupName); - String[] allObjectsName = new String[nb_objs]; - int[] allObjectsType = new int[nb_objs]; -- H5.H5Gget_obj_info_all(fileId, groupName, allObjectsName, allObjectsType); -+ long[] refs = new long[nb_objs]; -+ H5.H5Gget_obj_info_all(fileId, groupName, allObjectsName, allObjectsType, refs); - - for (int i = 0 ; i < nb_objs ; ++i) { - if (allObjectsType[i] == HDF5Constants.H5G_DATASET) { diff --git a/sci-mathematics/scilab/files/scilab-5.2.1-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.2.1-java-heap.patch deleted file mode 100644 index c72139d6c..000000000 --- a/sci-mathematics/scilab/files/scilab-5.2.1-java-heap.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- etc/jvm_options.xml.in.orig 2010-02-07 03:10:09.552580163 +0100 -+++ etc/jvm_options.xml.in 2010-02-07 03:10:39.474580024 +0100 -@@ -22,8 +22,8 @@ - <!-- 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"/> - - <option value="-Dapple.laf.useScreenMenuBar=true" os="macosx" /> - diff --git a/sci-mathematics/scilab/files/scilab-5.2.1-no-redef-exp10.patch b/sci-mathematics/scilab/files/scilab-5.2.1-no-redef-exp10.patch deleted file mode 100644 index c85d1839e..000000000 --- a/sci-mathematics/scilab/files/scilab-5.2.1-no-redef-exp10.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -urN scilab-5.2.1-orig//configure.ac scilab-5.2.1//configure.ac ---- scilab-5.2.1-orig//configure.ac 2010-02-17 03:06:08.000000000 -0500 -+++ scilab-5.2.1//configure.ac 2010-02-20 16:49:52.000000000 -0500 -@@ -953,12 +953,7 @@ - # Provided by math.h - - LDFLAGS="$LDFLAGS $LIBM" --AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor]) -- --AC_CHECK_FUNC([exp10],,[ -- AC_DEFINE([log_10_],[2.3025850929940456840179914546844],[Provide a macro to do exp10]) -- AC_DEFINE([exp10(x)],[exp( (log_10_) * (x) )],[Provide a macro to do exp10]) -- ]) -+AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor] [exp10]) - - ### If isinf exists or not (used to not be the case under Solaris) - ### See bug #4164 -diff -urN scilab-5.2.1-orig//modules/core/includes/core_math.h scilab-5.2.1//modules/core/includes/core_math.h ---- scilab-5.2.1-orig//modules/core/includes/core_math.h 2010-02-17 03:06:08.000000000 -0500 -+++ scilab-5.2.1//modules/core/includes/core_math.h 2010-02-20 16:49:52.000000000 -0500 -@@ -90,6 +90,11 @@ - #define M_PI 3.14159265358979323846 - #endif - -+#ifndef HAVE_EXP10 -+#define log_10_ 2.3025850929940456840179914546844 -+/* Provide a macro to do exp10 */ -+#define exp10(x) exp( (log_10_) * (x) ) -+#endif - - #endif /* __BASE_MATH_H__ */ - -diff -urN scilab-5.2.1-orig//modules/core/includes/machine.h.in scilab-5.2.1//modules/core/includes/machine.h.in ---- scilab-5.2.1-orig//modules/core/includes/machine.h.in 2010-02-17 03:06:08.000000000 -0500 -+++ scilab-5.2.1//modules/core/includes/machine.h.in 2010-02-20 16:49:52.000000000 -0500 -@@ -77,6 +77,9 @@ - /* Define to 1 if you have the `endpwent' function. */ - #undef HAVE_ENDPWENT - -+/* Define to 1 if you have the `exp10' function. */ -+#undef HAVE_EXP10 -+ - /* Define to 1 if you have the <fcntl.h> header file. */ - #undef HAVE_FCNTL_H - -@@ -515,9 +518,6 @@ - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const - --/* Provide a macro to do exp10 */ --#undef exp10 -- - /* Don't use getwd but getcwd */ - #undef getwd - -@@ -530,9 +530,6 @@ - /* Provide a macro to do isinf */ - #undef isinf - --/* Provide a macro to do exp10 */ --#undef log_10_ -- - - - #ifdef DIR_SEPARATOR diff --git a/sci-mathematics/scilab/files/scilab-5.2.1-nojavacheckversion.patch b/sci-mathematics/scilab/files/scilab-5.2.1-nojavacheckversion.patch deleted file mode 100644 index 26c47e0cb..000000000 --- a/sci-mathematics/scilab/files/scilab-5.2.1-nojavacheckversion.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN scilab-5.2.1-orig//configure.ac scilab-5.2.1/configure.ac ---- scilab-5.2.1-orig//configure.ac 2010-02-18 23:19:43.000000000 -0500 -+++ scilab-5.2.1/configure.ac 2010-02-19 00:16:05.000000000 -0500 -@@ -664,7 +664,7 @@ - JGRAPHX=$PACKAGE_JAR_FILE - AC_SUBST(JGRAPHX) - -- AC_JAVA_CHECK_VERSION_PACKAGE([jgraphx],[import com.mxgraph.view.mxGraph;],$JGRAPHX,[1.2.0.7],[mxGraph.VERSION]) -+ #AC_JAVA_CHECK_VERSION_PACKAGE([jgraphx],[import com.mxgraph.view.mxGraph;],$JGRAPHX,[1.2.0.7],[mxGraph.VERSION]) - - # Docking system - AC_JAVA_CHECK_PACKAGE([flexdock],[org.flexdock.docking.DockingManager],[Scilab Gui]) diff --git a/sci-mathematics/scilab/files/scilab-5.2.1-scilib-fix.patch b/sci-mathematics/scilab/files/scilab-5.2.1-scilib-fix.patch deleted file mode 100644 index 6d3c2e1cb..000000000 --- a/sci-mathematics/scilab/files/scilab-5.2.1-scilib-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bin/scilab.orig 2009-12-16 08:24:36.000000000 +0100 -+++ bin/scilab 2010-02-11 01:14:14.718781674 +0100 -@@ -508,7 +508,7 @@ - #fi - #export PVM_ARCH - --SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/ -+SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:/usr/lib64/scilab:/usr/lib/scilab - LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} - - case $OS in diff --git a/sci-mathematics/scilab/files/scilab-5.3.2-scilib-fix.patch b/sci-mathematics/scilab/files/scilab-5.3.2-scilib-fix.patch deleted file mode 100644 index 6d3c2e1cb..000000000 --- a/sci-mathematics/scilab/files/scilab-5.3.2-scilib-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bin/scilab.orig 2009-12-16 08:24:36.000000000 +0100 -+++ bin/scilab 2010-02-11 01:14:14.718781674 +0100 -@@ -508,7 +508,7 @@ - #fi - #export PVM_ARCH - --SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/ -+SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:/usr/lib64/scilab:/usr/lib/scilab - LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} - - case $OS in diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-allow-hdf-1.8.7.patch b/sci-mathematics/scilab/files/scilab-5.3.3-allow-hdf-1.8.7.patch deleted file mode 100644 index 868ec0996..000000000 --- a/sci-mathematics/scilab/files/scilab-5.3.3-allow-hdf-1.8.7.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]"); - 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-as-needed.patch b/sci-mathematics/scilab/files/scilab-5.3.3-as-needed.patch new file mode 100644 index 000000000..4df4258a3 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.3.3-as-needed.patch @@ -0,0 +1,42 @@ +--- 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 new file mode 100644 index 000000000..b2921f708 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.3.3-blas-libs.patch @@ -0,0 +1,12 @@ + 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 new file mode 100644 index 000000000..e5037489c --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.3.3-disable-build-help.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000..666198937 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.3.3-fix-random-runtime-failures.patch @@ -0,0 +1,98 @@ +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 new file mode 100644 index 000000000..707da3b6b --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.3.3-fortran-link.patch @@ -0,0 +1,23 @@ +--- 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.2-allow-hdf-1.8.7.patch b/sci-mathematics/scilab/files/scilab-5.3.3-hdf18.patch index 868ec0996..7a7e6c2d6 100644 --- a/sci-mathematics/scilab/files/scilab-5.3.2-allow-hdf-1.8.7.patch +++ b/sci-mathematics/scilab/files/scilab-5.3.3-hdf18.patch @@ -7,7 +7,7 @@ Index: modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java */ 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]"); ++ 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/java-heap-5.3.2.patch b/sci-mathematics/scilab/files/scilab-5.3.3-java-heap.patch index 57d656b21..e493a3bd1 100644 --- a/sci-mathematics/scilab/files/java-heap-5.3.2.patch +++ b/sci-mathematics/scilab/files/scilab-5.3.3-java-heap.patch @@ -1,6 +1,5 @@ -diff -urN scilab-5.3.2-orig//etc/jvm_options.xml scilab-5.3.2/etc/jvm_options.xml ---- scilab-5.3.2-orig//etc/jvm_options.xml 2011-05-25 23:20:12.145833420 -0400 -+++ scilab-5.3.2/etc/jvm_options.xml 2011-05-25 23:20:58.760833451 -0400 +--- 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"/> 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 new file mode 100644 index 000000000..b4b217577 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.3.3-javadoc-utf8.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.3.3-jgrapx-min.patch diff --git a/sci-mathematics/scilab/files/bug_9268.diff b/sci-mathematics/scilab/files/scilab-5.3.3-jvm-detection.patch index 8be3150de..4b3d852f6 100644 --- a/sci-mathematics/scilab/files/bug_9268.diff +++ b/sci-mathematics/scilab/files/scilab-5.3.3-jvm-detection.patch @@ -1,3 +1,5 @@ +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 diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-matio15.patch b/sci-mathematics/scilab/files/scilab-5.3.3-matio15.patch new file mode 100644 index 000000000..178b4bd79 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.3.3-matio15.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 000000000..ec48a171b --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.3.3-no-lhpi.patch @@ -0,0 +1,22 @@ +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 new file mode 100644 index 000000000..143e77ed6 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.3.3-no-xcos-deps.patch @@ -0,0 +1,90 @@ +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.3.3-scilib-fix.patch b/sci-mathematics/scilab/files/scilab-5.3.3-scilib-fix.patch deleted file mode 100644 index 6d3c2e1cb..000000000 --- a/sci-mathematics/scilab/files/scilab-5.3.3-scilib-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bin/scilab.orig 2009-12-16 08:24:36.000000000 +0100 -+++ bin/scilab 2010-02-11 01:14:14.718781674 +0100 -@@ -508,7 +508,7 @@ - #fi - #export PVM_ARCH - --SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/ -+SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:/usr/lib64/scilab:/usr/lib/scilab - LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} - - case $OS in diff --git a/sci-mathematics/scilab/files/scilab.bash_completion b/sci-mathematics/scilab/files/scilab.bash_completion new file mode 100644 index 000000000..c289e8632 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab.bash_completion @@ -0,0 +1,54 @@ +# 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/scilab-5.2.1.ebuild b/sci-mathematics/scilab/scilab-5.2.1.ebuild deleted file mode 100644 index 52c331dc7..000000000 --- a/sci-mathematics/scilab/scilab-5.2.1.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 -inherit autotools check-reqs eutils java-pkg-2 - -DESCRIPTION="Scientific software package for numerical computations" -LICENSE="CeCILL-2" -SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz" -HOMEPAGE="http://www.scilab.org/" - -SLOT="0" -IUSE="doc fftw +gui hdf5 +matio nls tk +umfpack xcos" -KEYWORDS="~amd64 ~x86" - -RDEPEND="virtual/lapack - tk? ( dev-lang/tk ) - xcos? ( dev-lang/ocaml ) - umfpack? ( sci-libs/umfpack ) - gui? ( >=virtual/jre-1.5 - dev-java/commons-logging - dev-java/flexdock - dev-java/gluegen - dev-java/jeuclid-core - dev-java/jlatexmath - >=dev-java/jgraphx-1.2.0.7 - dev-java/jogl - dev-java/jgoodies-looks - dev-java/skinlf - dev-java/jrosetta - dev-java/javahelp - hdf5? ( dev-java/hdf-java ) ) - fftw? ( sci-libs/fftw:3.0 ) - matio? ( sci-libs/matio ) - hdf5? ( sci-libs/hdf5 )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - doc? ( - ~dev-java/saxon-6.5.5 - dev-java/fop - dev-java/batik - app-text/docbook-xsl-stylesheets )" - -pkg_setup() { - CHECKREQS_MEMORY="512" - java-pkg-2_pkg_setup -} - -src_prepare() { - # avoid redefinition of exp10 - epatch "${FILESDIR}"/${P}-no-redef-exp10.patch - # Increases java heap to 512M when available, when building docs - check_reqs_conditional && epatch "${FILESDIR}"/${P}-java-heap.patch - # fix for hdf-java-2.6 - epatch "${FILESDIR}"/${P}-hdf-java-2.6.patch - # fix for jgraphx - epatch "${FILESDIR}"/${P}-scilib-fix.patch - epatch "${FILESDIR}"/${P}-nojavacheckversion.patch - - # apply blindly some debian patches - #for i in "${FILESDIR}"/*.diff; do - # epatch ${i} - #done - - # add the correct java directories to the config file - sed \ - -i "/^.DEFAULT_JAR_DIR/{s|=.*|=\"$(echo $(ls -d /usr/share/*/lib))\"|}" \ - m4/java.m4 || die - - sed -i "s|-L\$SCI_SRCDIR/bin/|-L\$SCI_SRCDIR/bin/ \ - -L$(java-config -i gluegen) \ - -L$(java-config -i hdf-java) \ - -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)\"\/>" \ - -e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \ - etc/librarypath.xml || die - eautoreconf - java-pkg-2_src_prepare -} - -src_configure() { - local myopts - use doc && myopts="--with-docbook=/usr/share/sgml/docbook/xsl-stylesheets" - export JAVA_HOME=$(java-config -O) - export BLAS_LIBS="$(pkg-config --libs blas)" - export LAPACK_LIBS="$(pkg-config --libs lapack)" - # mpi is only used for hdf5 i/o - if use hdf5 && has_version sci-libs/hdf5[mpi]; then - export CC=mpicc - export CXX=mpicxx - export FC=mpif90 - export F77=mpif77 - fi - econf \ - --disable-rpath \ - --without-pvm \ - $(use_enable doc build-help) \ - $(use_enable nls) \ - $(use_enable nls build-localization) \ - $(use_with fftw) \ - $(use_with gui)\ - $(use_with gui javasci)\ - $(use_with hdf5) \ - $(use_with matio) \ - $(use_with umfpack) \ - $(use_with tk) \ - $(use_with xcos scicos) \ - ${myopts} -} - -src_compile() { - emake || die "emake failed" - if use doc; then - emake doc || die "emake failed" - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # install docs - dodoc ACKNOWLEDGEMENTS CHANGES README_Unix RELEASE_NOTES \ - Readme_Visual.txt || die "failed to install docs" - - #install icon - newicon icons/scilab.xpm scilab.xpm - make_desktop_entry ${PN} "Scilab" ${PN} -} - -pkg_postinst() { - einfo "To tell Scilab about your printers, set the environment" - einfo "variable PRINTERS in the form:" - einfo - einfo "PRINTERS=\"firstPrinter:secondPrinter:anotherPrinter\"" -} diff --git a/sci-mathematics/scilab/scilab-5.3.2.ebuild b/sci-mathematics/scilab/scilab-5.3.2.ebuild deleted file mode 100644 index d4148fc3c..000000000 --- a/sci-mathematics/scilab/scilab-5.3.2.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 -inherit autotools check-reqs eutils fdo-mime flag-o-matic java-pkg-2 - -DESCRIPTION="Scientific software package for numerical computations" -LICENSE="CeCILL-2" -HOMEPAGE="http://www.scilab.org/" -SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz" - -SLOT="0" -IUSE="doc fftw +gui hdf5 +matio nls tk +umfpack xcos" -KEYWORDS="~amd64 ~x86" - -# hdf5 is required to compile (and use) xcos -# doc generation and xcos is disabled if gui is disabled -# see http://wiki.scilab.org/Description_of_configure_options - -# http://wiki.scilab.org/Dependencies_of_Scilab_5.X -RDEPEND="virtual/lapack - tk? ( dev-lang/tk ) - xcos? ( dev-lang/ocaml - dev-java/hdf-java ) - umfpack? ( sci-libs/umfpack ) - gui? ( >=virtual/jre-1.5 - dev-java/commons-logging - >=dev-java/flexdock-0.5.2 - >=dev-java/jeuclid-core-3.1 - >=dev-java/jlatexmath-0.9.4 - =dev-java/jgraphx-1.4.1.0 - dev-java/jogl - dev-java/jgoodies-looks - dev-java/jrosetta - dev-java/javahelp - dev-java/fop - >=dev-java/batik-1.7 - hdf5? ( dev-java/hdf-java ) ) - fftw? ( sci-libs/fftw:3.0 ) - matio? ( sci-libs/matio ) - hdf5? ( >=sci-libs/hdf5-1.8.4[-mpi] )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - doc? ( - >=dev-java/jlatexmath-fop-0.9.4 - ~dev-java/saxon-6.5.5 - app-text/docbook-xsl-stylesheets )" - -pkg_setup() { - use doc && CHECKREQS_MEMORY="512M" - check-reqs_pkg_setup - java-pkg-2_pkg_setup - - # temp Bug 6593 upstream, fixed - append-ldflags $(no-as-needed) -} - -src_prepare() { - # Increases java heap to 512M when available, when building docs - use doc && epatch "${FILESDIR}/java-heap-${PV}.patch" - # fix scilib path - epatch "${FILESDIR}/${P}-scilib-fix.patch" - # bug 9268 reported upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268 - epatch "${FILESDIR}"/bug_9268.diff - epatch "${FILESDIR}/${P}-allow-hdf-1.8.7.patch" - - #bug 9824 upstream - sed -i "/BLAS_LIBS=$/d" m4/libsmath.m4 - - sed -i "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)\"\/>" \ - -e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \ - etc/librarypath.xml || die - - eautoreconf - java-pkg-2_src_prepare -} - -src_configure() { - local myopts - use doc && myopts="--with-docbook=/usr/share/sgml/docbook/xsl-stylesheets" - # javac complained about (j)hdf - use hdf5 && myopts="$myopts --with-hdf5-library=$(java-config -i hdf-java)" - export JAVA_HOME="$(java-config -O)" - export BLAS_LIBS="$(pkg-config --libs blas)" - export LAPACK_LIBS="$(pkg-config --libs lapack)" - - econf \ - --disable-rpath \ - --without-pvm \ - $(use_enable doc build-help) \ - $(use_enable nls) \ - $(use_enable nls build-localization) \ - $(use_with fftw) \ - $(use_with gui)\ - $(use_with gui javasci)\ - $(use_with hdf5) \ - $(use_with matio) \ - $(use_with umfpack) \ - $(use_with tk) \ - $(use_with xcos) \ - ${myopts} -} - -src_compile() { - emake || die "emake failed" - if use doc; then - emake doc || die "emake failed" - fi -} - -src_install() { - emake DESTDIR="${ED}" install || die "emake install failed" - find "${ED}" -name '*.la' -delete || die - # install docs - dodoc ACKNOWLEDGEMENTS README_Unix Readme_Visual.txt \ - || die "failed to install docs" - insinto /usr/share/mime/packages - doins "${FILESDIR}/${PN}.xml" -} - -pkg_postinst() { - fdo-mime_mime_database_update -} diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild new file mode 100644 index 000000000..7ccbbc09e --- /dev/null +++ b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild @@ -0,0 +1,242 @@ +# Copyright 1999-2012 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" +LICENSE="CeCILL-2" +HOMEPAGE="http://www.scilab.org/" +SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz" + +SLOT="0" +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 + +KEYWORDS="~amd64 ~x86" + +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/batik + dev-java/commons-logging + dev-java/flexdock + dev-java/fop + dev-java/javahelp + dev-java/jeuclid-core + dev-java/jgoodies-looks + >=dev-java/jlatexmath-0.9.4 + dev-java/jogl + dev-java/jrosetta + dev-java/xmlgraphics-commons + virtual/opengl + doc? ( dev-java/saxon:6.5 ) + hdf5? ( dev-java/hdf-java + xcos? ( >=dev-java/jgraphx-1.4.1 ) ) ) + 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/fortran + virtual/pkgconfig + debug? ( dev-util/lcov ) + gui? ( + >=virtual/jdk-1.5 + doc? ( + >=dev-java/jlatexmath-fop-0.9.4 + app-text/docbook-xsl-stylesheets ) + 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 + + # 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 "s|/usr/lib/jni|$(java-config -i hdf-java)|g" \ + m4/hdf5.m4 || die + + sed -i \ + -e "/<\/librarypaths>/i\<path value=\"$(java-config -i gluegen)\"\/>" \ + -e "/<\/librarypaths>/i\<path value=\"$(java-config -i jogl)\"\/>" \ + -e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \ + etc/librarypath.xml || die + 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="$(pkg-config --libs blas)" + export LAPACK_LIBS="$(pkg-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 && dobashcomp "${FILESDIR}"/${PN}.bash_completion +} + +pkg_postinst() { + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_mime_database_update +} diff --git a/sci-mathematics/scilab/scilab-5.3.3.ebuild b/sci-mathematics/scilab/scilab-5.3.3.ebuild deleted file mode 100644 index c1fe41d90..000000000 --- a/sci-mathematics/scilab/scilab-5.3.3.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 -inherit autotools check-reqs eutils fdo-mime flag-o-matic java-pkg-2 - -DESCRIPTION="Scientific software package for numerical computations" -LICENSE="CeCILL-2" -HOMEPAGE="http://www.scilab.org/" -SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz" - -SLOT="0" -IUSE="doc fftw +gui hdf5 +matio nls tk +umfpack xcos" -KEYWORDS="~amd64 ~x86" - -# hdf5 is required to compile (and use) xcos -# doc generation and xcos is disabled if gui is disabled -# see http://wiki.scilab.org/Description_of_configure_options - -# http://wiki.scilab.org/Dependencies_of_Scilab_5.X -RDEPEND="virtual/lapack - tk? ( dev-lang/tk ) - xcos? ( dev-lang/ocaml - dev-java/hdf-java ) - umfpack? ( sci-libs/umfpack ) - gui? ( >=virtual/jre-1.5 - dev-java/commons-logging - >=dev-java/flexdock-0.5.2 - >=dev-java/jeuclid-core-3.1 - >=dev-java/jlatexmath-0.9.4 - =dev-java/jgraphx-1.4.1.0 - dev-java/jogl - dev-java/jgoodies-looks - dev-java/jrosetta - dev-java/javahelp - dev-java/fop - >=dev-java/batik-1.7 - hdf5? ( dev-java/hdf-java ) ) - fftw? ( sci-libs/fftw:3.0 ) - matio? ( sci-libs/matio ) - hdf5? ( >=sci-libs/hdf5-1.8.4[-mpi] )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - doc? ( - >=dev-java/jlatexmath-fop-0.9.4 - ~dev-java/saxon-6.5.5 - app-text/docbook-xsl-stylesheets )" - -pkg_setup() { - if use doc; then - CHECKREQS_MEMORY="512M" - check-reqs_pkg_setup - fi - java-pkg-2_pkg_setup - - # temp Bug 6593 upstream, fixed - append-ldflags $(no-as-needed) -} - -src_prepare() { - # Increases java heap to 512M when available, when building docs - use doc && epatch "${FILESDIR}/java-heap-${PV}.patch" - # fix scilib path - epatch "${FILESDIR}/${P}-scilib-fix.patch" - # bug 9268 reported upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268 - epatch "${FILESDIR}"/bug_9268.diff - #bug 9883 upstream - epatch "${FILESDIR}/disablebuildhelp.patch" - #bug 10244 upstream - mv modules/call_scilab/examples/call_scilab/NET/VB.NET/My\ Project/ \ - modules/call_scilab/examples/call_scilab/NET/VB.NET/My_Project||die - #bug 9824 upstream - sed -i "/BLAS_LIBS=$/d" m4/libsmath.m4 - epatch "${FILESDIR}/${P}-allow-hdf-1.8.7.patch" - #bug 392363 - sed -i -e "s|Clément DAVID|Clement DAVID|g" $(find . -iname '*.java') - sed -i -e "s/ -lhpi//g" m4/java.m4 - - sed -i "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)\"\/>" \ - -e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \ - etc/librarypath.xml || die - - eautoreconf - java-pkg-2_src_prepare -} - -src_configure() { - local myopts - use doc && myopts="--with-docbook=/usr/share/sgml/docbook/xsl-stylesheets" - # javac complained about (j)hdf - use hdf5 && myopts="$myopts --with-hdf5-library=$(java-config -i hdf-java)" - export JAVA_HOME="$(java-config -O)" - export BLAS_LIBS="$(pkg-config --libs blas)" - export LAPACK_LIBS="$(pkg-config --libs lapack)" - - econf \ - --disable-rpath \ - --without-pvm \ - $(use_enable doc build-help) \ - $(use_enable nls) \ - $(use_enable nls build-localization) \ - $(use_with fftw) \ - $(use_with gui)\ - $(use_with gui javasci)\ - $(use_with hdf5) \ - $(use_with matio) \ - $(use_with umfpack) \ - $(use_with tk) \ - $(use_with xcos) \ - ${myopts} -} - -src_compile() { - emake || die "emake failed" - if use doc; then - emake doc || die "emake failed" - fi -} - -src_install() { - emake DESTDIR="${ED}" install || die "emake install failed" - find "${ED}" -name '*.la' -delete || die - # install docs - dodoc ACKNOWLEDGEMENTS README_Unix Readme_Visual.txt \ - || die "failed to install docs" - insinto /usr/share/mime/packages - doins "${FILESDIR}/${PN}.xml" -} - -pkg_postinst() { - fdo-mime_mime_database_update -} |