* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2013-01-29 3:51 Guillaume Horel
0 siblings, 0 replies; 15+ messages in thread
From: Guillaume Horel @ 2013-01-29 3:51 UTC (permalink / raw
To: gentoo-commits
commit: cbc8a6f63019234667fbdacf557dea130561cdff
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Tue Jan 29 03:40:43 2013 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Tue Jan 29 03:40:43 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cbc8a6f6
sci-mathematics/scilab cleanup ebuild
---
.../scilab/files/scilab-5.4.0-builddocs.patch | 353 ++++++++++++++++++++
sci-mathematics/scilab/scilab-5.4.0.ebuild | 22 +-
2 files changed, 361 insertions(+), 14 deletions(-)
diff --git a/sci-mathematics/scilab/files/scilab-5.4.0-builddocs.patch b/sci-mathematics/scilab/files/scilab-5.4.0-builddocs.patch
new file mode 100644
index 0000000..981bc9b
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.4.0-builddocs.patch
@@ -0,0 +1,353 @@
+diff --git a/scilab/modules/core/src/c/callDynamicGateway.c b/scilab/modules/core/src/c/callDynamicGateway.c
+index 91439a9..7485f4c 100644
+--- a/scilab/modules/core/src/c/callDynamicGateway.c
++++ b/scilab/modules/core/src/c/callDynamicGateway.c
+@@ -3,11 +3,11 @@
+ * Copyright (C) 2008 - INRIA - Allan CORNET
+ * Copyright (C) 2008 - INRIA - Sylvestre LEDRU
+ * Copyright (C) 2010 - DIGITEO - Allan CORNET
+- *
++ *
+ * 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
++ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+@@ -26,19 +26,18 @@
+ #include "charEncoding.h"
+ /*--------------------------------------------------------------------------*/
+ dynamic_gateway_error_code callDynamicGateway(char *moduleName,
+- char *dynLibName,
+- char *gw_name,
+- DynLibHandle *hlib,
+- PROC_GATEWAY *ptrGateway)
++ char *dynLibName,
++ char *gw_name,
++ DynLibHandle *hlib,
++ PROC_GATEWAY *ptrGateway)
+ {
+ if (*hlib == NULL)
+ {
+- /* Under Linux/Unix, load thanks to dlopen */
+ #ifdef _MSC_VER
+ wchar_t *wcdynLibName = to_wide_string(dynLibName);
+ if (wcdynLibName)
+ {
+- *hlib = LoadDynLibraryW(wcdynLibName);
++ *hlib = LoadDynLibraryW(wcdynLibName);
+ FREE(wcdynLibName);
+ wcdynLibName = NULL;
+ }
+@@ -47,52 +46,73 @@ dynamic_gateway_error_code callDynamicGateway(char *moduleName,
+ return DYN_GW_LOAD_LIBRARY_ERROR;
+ }
+ #else
+- *hlib = LoadDynLibrary(dynLibName);
+
+- if (*hlib == NULL)
+- {
+- char *previousError = GetLastDynLibError();
+-
+- /* Haven't been able to find the lib with dlopen...
+- * This can happen for two reasons:
+- * - the lib must be dynamically linked
+- * - Some silly issues under Suse (see bug #2875)
+- * Note that we are handling only the "source tree build"
+- * because libraries are split (they are in the same directory
+- * in the binary)
+- */
+- char *SciPath = getSCIpath();
++ /* First step, we are considering that we are in the source tree.
++ * Therefor, the lib should be in modules/xxx/.libs/
++ *
++ * Otherwise, dlopen will search in various places (for example, the install specified
++ * by --prefix).
++ * This leads to serious and unexpected bugs like #8883
++ * The original bug report for this issue was the bug #2875
++ */
++ char *SciPath = getSCIpath();
+ #define PATHTOMODULE "/modules/"
+ #ifndef LT_OBJDIR
+ #define LT_OBJDIR ".libs/"
+ #endif
+
+- /* Build the full path to the library */
+- char *pathToLib=(char*) MALLOC((strlen(SciPath)+strlen(PATHTOMODULE)+strlen(moduleName)+strlen("/")+strlen(LT_OBJDIR)+strlen(dynLibName)+1)*sizeof(char));
+- sprintf(pathToLib,"%s%s%s/%s%s",SciPath,PATHTOMODULE,moduleName,LT_OBJDIR,dynLibName);
++ /* Build the full path to the library */
++ char *pathToLib = (char*) MALLOC((strlen(SciPath) + strlen(PATHTOMODULE) + strlen(moduleName) + strlen("/") + strlen(LT_OBJDIR) + strlen(dynLibName) + 1) * sizeof(char));
++ sprintf(pathToLib, "%s%s%s/%s%s", SciPath, PATHTOMODULE, moduleName, LT_OBJDIR, dynLibName);
+
+- *hlib = LoadDynLibrary(pathToLib);
++ /* Load the library with the Scilab source-tree paths */
++ *hlib = LoadDynLibrary(pathToLib);
++
++ if (*hlib == NULL) /* Load of the hardcoded path to the lib failed */
++ {
+
+- if (*hlib == NULL)
++ /* Under Linux/Unix, load thanks to dlopen on the system.
++ * In the binary, the LD_LIBRARY_PATH is declared in the startup script (ie bin/scilab*)
++ * Note that it is not possible to update the LD_LIBRARY_PATH at run time.
++ */
++ *hlib = LoadDynLibrary(dynLibName);
++ if (*hlib == NULL)
+ {
++ char *previousError = GetLastDynLibError();
+ if (previousError != NULL)
+ {
+- sciprint("A previous error has been detected while loading %s: %s\n",dynLibName, previousError);
++ sciprint("A previous error has been detected while loading %s: %s\n", dynLibName, previousError);
++ }
++ if (SciPath)
++ {
++ FREE(SciPath);
++ SciPath = NULL;
++ }
++ if (pathToLib)
++ {
++ FREE(pathToLib);
++ pathToLib = NULL;
+ }
+- if (SciPath) {FREE(SciPath); SciPath = NULL;}
+- if (pathToLib) {FREE(pathToLib); pathToLib = NULL;}
+ return DYN_GW_LOAD_LIBRARY_ERROR;
+ }
+- if (SciPath) {FREE(SciPath); SciPath = NULL;}
+- if (pathToLib) {FREE(pathToLib); pathToLib = NULL;}
++ }
++ if (SciPath)
++ {
++ FREE(SciPath);
++ SciPath = NULL;
++ }
++ if (pathToLib)
++ {
++ FREE(pathToLib);
++ pathToLib = NULL;
+ }
+ #endif
+ }
+
+ if (*ptrGateway == NULL)
+ {
+- *ptrGateway = (PROC_GATEWAY) GetDynLibFuncPtr(*hlib,gw_name);
+- if (*ptrGateway == NULL)
++ *ptrGateway = (PROC_GATEWAY) GetDynLibFuncPtr(*hlib, gw_name);
++ if (*ptrGateway == NULL)
+ {
+ return DYN_GW_PTR_FUNCTION_ERROR ;
+ }
+@@ -110,49 +130,50 @@ dynamic_gateway_error_code callDynamicGateway(char *moduleName,
+ char *buildModuleDynLibraryName(char *modulename, dynlib_name_format iType)
+ {
+ char *dynlibname = NULL;
+- int lenName = (int)(strlen(modulename)+strlen(SHARED_LIB_EXT));
++ int lenName = (int)(strlen(modulename) + strlen(SHARED_LIB_EXT));
+ switch (iType)
+ {
+- case DYNLIB_NAME_FORMAT_AUTO: default:
++ case DYNLIB_NAME_FORMAT_AUTO:
++ default:
+ #ifdef _MSC_VER
+- lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_1);
++ lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_1);
+ #else
+- lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_3);
++ lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_3);
+ #endif
+- dynlibname = (char*)MALLOC(sizeof(char)*(lenName+1));
+- if (dynlibname)
+- {
++ dynlibname = (char*)MALLOC(sizeof(char) * (lenName + 1));
++ if (dynlibname)
++ {
+ #ifdef _MSC_VER
+- sprintf(dynlibname,FORMATGATEWAYLIBNAME_1,modulename,SHARED_LIB_EXT);
++ sprintf(dynlibname, FORMATGATEWAYLIBNAME_1, modulename, SHARED_LIB_EXT);
+ #else
+- sprintf(dynlibname,FORMATGATEWAYLIBNAME_3,modulename,SHARED_LIB_EXT);
++ sprintf(dynlibname, FORMATGATEWAYLIBNAME_3, modulename, SHARED_LIB_EXT);
+ #endif
+- }
+- break;
+- case DYNLIB_NAME_FORMAT_1:
+- lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_1);
+- dynlibname = (char*)MALLOC(sizeof(char)*(lenName+1));
+- if (dynlibname)
+- {
+- sprintf(dynlibname,FORMATGATEWAYLIBNAME_1,modulename,SHARED_LIB_EXT);
+- }
+- break;
+- case DYNLIB_NAME_FORMAT_2:
+- lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_2);
+- dynlibname = (char*)MALLOC(sizeof(char)*(lenName+1));
+- if (dynlibname)
+- {
+- sprintf(dynlibname,FORMATGATEWAYLIBNAME_2,modulename,SHARED_LIB_EXT);
+- }
+- break;
+- case DYNLIB_NAME_FORMAT_3:
+- lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_3);
+- dynlibname = (char*)MALLOC(sizeof(char)*(lenName+1));
+- if (dynlibname)
+- {
+- sprintf(dynlibname,FORMATGATEWAYLIBNAME_3,modulename,SHARED_LIB_EXT);
+- }
+- break;
++ }
++ break;
++ case DYNLIB_NAME_FORMAT_1:
++ lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_1);
++ dynlibname = (char*)MALLOC(sizeof(char) * (lenName + 1));
++ if (dynlibname)
++ {
++ sprintf(dynlibname, FORMATGATEWAYLIBNAME_1, modulename, SHARED_LIB_EXT);
++ }
++ break;
++ case DYNLIB_NAME_FORMAT_2:
++ lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_2);
++ dynlibname = (char*)MALLOC(sizeof(char) * (lenName + 1));
++ if (dynlibname)
++ {
++ sprintf(dynlibname, FORMATGATEWAYLIBNAME_2, modulename, SHARED_LIB_EXT);
++ }
++ break;
++ case DYNLIB_NAME_FORMAT_3:
++ lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_3);
++ dynlibname = (char*)MALLOC(sizeof(char) * (lenName + 1));
++ if (dynlibname)
++ {
++ sprintf(dynlibname, FORMATGATEWAYLIBNAME_3, modulename, SHARED_LIB_EXT);
++ }
++ break;
+ }
+ return dynlibname;
+ }
+@@ -160,36 +181,36 @@ char *buildModuleDynLibraryName(char *modulename, dynlib_name_format iType)
+ char *buildGatewayName(char *modulename)
+ {
+ /* example gw_scicos */
+-#define FORMATGATEWAYNAME "gw_%s"
++#define FORMATGATEWAYNAME "gw_%s"
+
+ char *gatewayname = NULL;
+- int lenName = (int)(strlen(modulename)+strlen(FORMATGATEWAYNAME));
+- gatewayname = (char*)MALLOC(sizeof(char)*(lenName+1));
++ int lenName = (int)(strlen(modulename) + strlen(FORMATGATEWAYNAME));
++ gatewayname = (char*)MALLOC(sizeof(char) * (lenName + 1));
+
+ if (gatewayname)
+ {
+- sprintf(gatewayname,FORMATGATEWAYNAME,modulename);
++ sprintf(gatewayname, FORMATGATEWAYNAME, modulename);
+ }
+
+ return gatewayname;
+ }
+ /*--------------------------------------------------------------------------*/
+-void displayErrorGateway(dynamic_gateway_error_code err,char *libraryname,char *functionname)
++void displayErrorGateway(dynamic_gateway_error_code err, char *libraryname, char *functionname)
+ {
+ switch (err)
+ {
+- case DYN_GW_NO_ERROR :
+- /* NO ERROR */
+- break;
+- case DYN_GW_LOAD_LIBRARY_ERROR :
+- Scierror(999,_("Impossible to load %s library: %s\n"),libraryname,GetLastDynLibError());
+- break;
+- case DYN_GW_PTR_FUNCTION_ERROR :
+- Scierror(999,_("Impossible to load %s function in %s library: %s\n"),functionname,libraryname, GetLastDynLibError());
+- break;
+- case DYN_GW_CALL_FUNCTION_ERROR :
+- Scierror(999,_("Impossible to call %s in %s library: %s\n"),functionname,libraryname,GetLastDynLibError());
+- break;
++ case DYN_GW_NO_ERROR :
++ /* NO ERROR */
++ break;
++ case DYN_GW_LOAD_LIBRARY_ERROR :
++ Scierror(999, _("Impossible to load %s library: %s\n"), libraryname, GetLastDynLibError());
++ break;
++ case DYN_GW_PTR_FUNCTION_ERROR :
++ Scierror(999, _("Impossible to load %s function in %s library: %s\n"), functionname, libraryname, GetLastDynLibError());
++ break;
++ case DYN_GW_CALL_FUNCTION_ERROR :
++ Scierror(999, _("Impossible to call %s in %s library: %s\n"), functionname, libraryname, GetLastDynLibError());
++ break;
+ }
+ }
+ /*--------------------------------------------------------------------------*/
+diff --git a/scilab/modules/core/src/c/gw_dynamic_generic.c b/scilab/modules/core/src/c/gw_dynamic_generic.c
+index e146235..09eb88d 100644
+--- a/scilab/modules/core/src/c/gw_dynamic_generic.c
++++ b/scilab/modules/core/src/c/gw_dynamic_generic.c
+@@ -1,11 +1,11 @@
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Allan CORNET
+- *
++ *
+ * 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
++ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+@@ -15,28 +15,28 @@
+ #include "gw_dynamic_generic.h"
+ /*--------------------------------------------------------------------------*/
+ int gw_dynamic_generic(char *moduleName,
+- char **dynlibName,
+- char **gatewayName,
+- DynLibHandle *hModuleLib,
+- PROC_GATEWAY *ptrGatewayFunction)
++ char **dynlibName,
++ char **gatewayName,
++ DynLibHandle *hModuleLib,
++ PROC_GATEWAY *ptrGatewayFunction)
+ {
+- dynamic_gateway_error_code err;
+- if (*dynlibName == NULL)
+- {
+- *dynlibName = buildModuleDynLibraryName(moduleName, DYNLIB_NAME_FORMAT_AUTO);
+- }
++ dynamic_gateway_error_code err;
++ if (*dynlibName == NULL)
++ {
++ *dynlibName = buildModuleDynLibraryName(moduleName, DYNLIB_NAME_FORMAT_AUTO);
++ }
++
++ if (*gatewayName == NULL)
++ {
++ *gatewayName = buildGatewayName(moduleName);
++ }
+
+- if (*gatewayName == NULL)
+- {
+- *gatewayName = buildGatewayName(moduleName);
+- }
++ err = callDynamicGateway(moduleName, *dynlibName,
++ *gatewayName,
++ hModuleLib,
++ ptrGatewayFunction);
++ displayErrorGateway(err, *dynlibName, *gatewayName);
+
+- err = callDynamicGateway(moduleName,*dynlibName,
+- *gatewayName,
+- hModuleLib,
+- ptrGatewayFunction);
+- displayErrorGateway(err,*dynlibName,*gatewayName);
+-
+- return 0;
++ return 0;
+ }
+ /*--------------------------------------------------------------------------*/
+--
+1.7.9.5
+
diff --git a/sci-mathematics/scilab/scilab-5.4.0.ebuild b/sci-mathematics/scilab/scilab-5.4.0.ebuild
index d62611f..f561637 100644
--- a/sci-mathematics/scilab/scilab-5.4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -10,15 +10,9 @@ 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
-# Comments:
-# - we don't rely on the configure script to find the right version of java
-# packages. This should fix bug #41821
# Things that don't work:
# - tests
# - can't build without docs (-doc)
-# - has to call eautoconf, and not eautoreconf, libtool fails otherwise
-# - needs to remove scilab-5.3.x before installing otherwise gets a DOCBOOK_ROOT
-# error
DESCRIPTION="Scientific software package for numerical computations"
LICENSE="CeCILL-2"
@@ -116,7 +110,6 @@ pkg_setup() {
for l in ${LINGUASLONG}; do
use linguas_${l%_*} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
done
-
export ALL_LINGUAS ALL_LINGUAS_DOC=$ALL_LINGUAS
}
@@ -125,20 +118,20 @@ src_prepare() {
"${FILESDIR}/${P}-fortran-link.patch" \
"${FILESDIR}/${P}-followlinks.patch" \
"${FILESDIR}/${P}-gluegen.patch" \
- "${FILESDIR}/${P}-fix-random-runtime-failure.patch"
+ "${FILESDIR}/${P}-fix-random-runtime-failure.patch" \
+ "${FILESDIR}/${P}-builddocs.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
- # 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
- # make sure it exports the DOCBOOK_ROOT variable
+
+ # 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/jogl|/usr/lib/jogl-2|" \
@@ -151,6 +144,7 @@ src_prepare() {
sed -i -e "s/jogl/jogl-2/" -e "s/gluegen/gluegen-2/" \
etc/librarypath.xml || die
fi
+
mkdir jar || die
pushd jar
java-pkg_jar-from jgraphx-1.8,jlatexmath-1,flexdock,skinlf
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2013-10-21 21:41 Christoph Junghans
0 siblings, 0 replies; 15+ messages in thread
From: Christoph Junghans @ 2013-10-21 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 75844044fbc53ab49a3626e381bdcae4315bc2f1
Author: quentin <quentin.minster <AT> gmail <DOT> com>
AuthorDate: Fri Oct 18 23:52:34 2013 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 23:52:34 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=75844044
Fix broken minimum version check in scilab-5.3.3
Check compares version strings lexicographically, which does not work
e.g. returns "4.2.8" > "4.2.10".
Instead, all numbers composing the version number should be compared one
by one.
---
.../files/scilab-5.3.3-java-version-check.patch | 23 ++++++++++++++++++++++
...ilab-5.3.3-r1.ebuild => scilab-5.3.3-r2.ebuild} | 3 ++-
2 files changed, 25 insertions(+), 1 deletion(-)
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
new file mode 100644
index 0000000..c5eb611
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-java-version-check.patch
@@ -0,0 +1,23 @@
+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/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r2.ebuild
similarity index 98%
rename from sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
rename to sci-mathematics/scilab/scilab-5.3.3-r2.ebuild
index 19fe80b..599a691 100644
--- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.3-r2.ebuild
@@ -125,7 +125,8 @@ src_prepare() {
"${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}-gui-no-xcos.patch \
+ "${FILESDIR}"/${P}-java-version-check.patch
# need serious as-needed work (inter-dependencies among modules)
# "${FILESDIR}"/${P}-as-needed.patch \
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2013-10-28 4:29 Guillaume Horel
0 siblings, 0 replies; 15+ messages in thread
From: Guillaume Horel @ 2013-10-28 4:29 UTC (permalink / raw
To: gentoo-commits
commit: 4ebeb746bd66d1e4a85d8e8d9304a8542a4a1dd0
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Fri Oct 25 13:02:25 2013 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Mon Oct 28 04:17:27 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4ebeb746
sci-mathematics/scilab new release
---
.../scilab-5.5.0-always-use-dynamic-stack.patch | 33 +++
.../scilab-5.5.0-fix-random-runtime-failure.patch | 12 +
.../scilab/files/scilab-5.5.0-followlinks.patch | 12 +
.../scilab/files/scilab-5.5.0-gluegen.patch | 12 +
.../scilab/files/scilab-5.5.0-java-heap.patch | 13 ++
sci-mathematics/scilab/scilab-5.5.0.ebuild | 249 +++++++++++++++++++++
6 files changed, 331 insertions(+)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-always-use-dynamic-stack.patch b/sci-mathematics/scilab/files/scilab-5.5.0-always-use-dynamic-stack.patch
new file mode 100644
index 0000000..309e45c
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.0-always-use-dynamic-stack.patch
@@ -0,0 +1,33 @@
+See https://bugzilla.redhat.com/show_bug.cgi?id=964307
+and http://bugzilla.scilab.org/show_bug.cgi?id=12625
+--- configure.ac.orig 2013-10-24 23:55:14.530698970 -0400
++++ configure.ac 2013-10-25 00:03:25.597684590 -0400
+@@ -698,15 +698,10 @@
+ SCILIBS_CXXFLAGS=''
+ SCILIBS_FFLAGS=''
+
+-if test $IS_64_BITS_CPU = true -o "$MACOSX" = "1"; then
+- if test $f90compatible = false; then
+- AC_MSG_ERROR([64 bits support needs a fortran 90 compiler (try --with-gfortran).])
+- fi
+ AC_DEFINE([USE_DYNAMIC_STACK], [], [If we are building a 64 bits version])
+-fi
+
+ AM_CONDITIONAL(IS_64_BITS_CPU, test $IS_64_BITS_CPU = true)
+-AM_CONDITIONAL(USE_DYNAMIC_STACK, test $IS_64_BITS_CPU = true -o "$MACOSX" = "1")
++AM_CONDITIONAL(USE_DYNAMIC_STACK, true)
+
+ ################
+ ## SSE
+@@ -1958,11 +1953,7 @@
+ AC_CONFIG_COMMANDS_POST([chmod +x $SCI_SRCDIR_FULL/modules/scicos_blocks/src/scripts/GenBlocks.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/scicompile.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/compilerDetection.sh $SCI_SRCDIR_FULL/modules/dynamic_link/src/scripts/configure])
+
+ # Generate stack.h
+-if test "$IS_64_BITS_CPU" = true -o "$MACOSX" = "1"; then
+ stack_h_cpp_flags=-DUSE_DYNAMIC_STACK
+-else
+- stack_h_cpp_flags=
+-fi
+
+ AC_CONFIG_COMMANDS([modules/core/includes/stack.h],
+ [if ! $CPP $stack_h_cpp_flags - < $srcdir/modules/core/includes/stack.h.in |\
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch
new file mode 100644
index 0000000..92ac453
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch
@@ -0,0 +1,12 @@
+diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp scilab/modules/api_scilab/src/cpp/api_double.cpp
+--- scilab-orig/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:26:31.342617365 -0400
++++ scilab/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:27:34.838621420 -0400
+@@ -497,7 +497,7 @@
+ /*--------------------------------------------------------------------------*/
+ int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)
+ {
+- return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL);
++ return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0);
+ }
+ /*--------------------------------------------------------------------------*/
+ int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch
new file mode 100644
index 0000000..118df3b
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch
@@ -0,0 +1,12 @@
+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.5.0-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.0-gluegen.patch
new file mode 100644
index 0000000..64717a7
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.0-gluegen.patch
@@ -0,0 +1,12 @@
+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.5.0-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.0-java-heap.patch
new file mode 100644
index 0000000..990f967
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.0-java-heap.patch
@@ -0,0 +1,13 @@
+--- etc/jvm_options.xml.orig 2013-07-08 22:46:24.092981137 -0400
++++ etc/jvm_options.xml 2013-07-08 22:50:23.788974118 -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.5.0.ebuild b/sci-mathematics/scilab/scilab-5.5.0.ebuild
new file mode 100644
index 0000000..7e69261
--- /dev/null
+++ b/sci-mathematics/scilab/scilab-5.5.0.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2013 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
+
+MY_PV="${PV}"-beta-1
+MY_P="$PN"-"$MY_PV"
+
+# 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/${MY_PV}/${MY_P}-src.tar.gz"
+
+LICENSE="CeCILL-2.1"
+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:2.1
+ dev-java/jlatexmath:1
+ dev-java/jogl:2
+ >=dev-java/jrosetta-1.0.4:0
+ dev-java/skinlf:0
+ dev-java/xmlgraphics-commons:1.5
+ virtual/opengl
+ doc? ( dev-java/saxon:9 )
+ 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
+ dev-java/jlatexmath-fop:1 )
+ xcos? ( dev-lang/ocaml ) )
+ test? (
+ dev-java/junit:4
+ gui? ( ${VIRTUALX_DEPEND} ) )"
+
+DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
+
+S="${WORKDIR}"/"${MY_P}"
+
+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" \
+ "${FILESDIR}/${P}-always-use-dynamic-stack.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-2.1,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 saxon-9 saxon.jar saxon9he.jar
+ java-pkg_jar-from jlatexmath-fop-1
+ 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" \
+ --disable-static-system-lib \
+ $(use_enable debug) \
+ $(use_enable debug code-coverage) \
+ $(use_enable debug debug-C) \
+ $(use_enable debug debug-CXX) \
+ $(use_enable debug debug-fortran) \
+ $(use_enable debug debug-java) \
+ $(use_enable debug debug-linker) \
+ $(use_enable doc build-help) \
+ $(use_enable nls) \
+ $(use_enable nls build-localization) \
+ $(use_enable static-libs static) \
+ $(use_enable test compilation-tests) \
+ $(use_with 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 && dobashcomp "${FILESDIR}"/${PN}.bash_completion
+ echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
+ > 50-"${PN}"
+ insinto /etc/revdep-rebuild && doins "50-${PN}"
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2013-10-28 5:40 Guillaume Horel
0 siblings, 0 replies; 15+ messages in thread
From: Guillaume Horel @ 2013-10-28 5:40 UTC (permalink / raw
To: gentoo-commits
commit: b84fd861c8109d5bc5365b8ae3b4e92d0f970d15
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Mon Oct 28 05:34:53 2013 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Mon Oct 28 05:34:53 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b84fd861
sci-mathematics/scilab add missing patch
---
.../scilab-5.5.0-disable-static-systemlib.patch | 20 ++++++++++++++++++++
sci-mathematics/scilab/scilab-5.5.0.ebuild | 5 +++--
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch b/sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch
new file mode 100644
index 0000000..ce5b032
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch
@@ -0,0 +1,20 @@
+X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fm4%2Fcompiler.m4;h=150a283c5ba4f30a997dceb7fd4cb529283b3d54;hp=dbd0180faee5f4f491205e8bd97e7fc6082930d7;hb=3147468d32d010c01036ecfe4a86b2d9c6c12bf0;hpb=a9218e259ed573228e1aa6732c6ff7ea3c21fae4
+
+diff --git a/scilab/m4/compiler.m4 b/scilab/m4/compiler.m4
+index dbd0180..150a283 100644
+--- a/scilab/m4/compiler.m4
++++ b/scilab/m4/compiler.m4
+@@ -38,6 +38,13 @@ saved_LDFLAGS="$LDFLAGS"
+ compiler_manage_static_libs=no
+ USE_STATIC_SYSTEM_LIB=yes
+
++
++if test "x$enable_static_system_lib" == "xno"; then
++# The user ask for an explicit disable.
++ USE_STATIC_SYSTEM_LIB=no
++fi
++
++
+ LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
+ AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
+ AC_LANG_PUSH(C++)
diff --git a/sci-mathematics/scilab/scilab-5.5.0.ebuild b/sci-mathematics/scilab/scilab-5.5.0.ebuild
index 7e69261..15b592e 100644
--- a/sci-mathematics/scilab/scilab-5.5.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.0.ebuild
@@ -10,7 +10,7 @@ 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
-MY_PV="${PV}"-beta-1
+MY_PV="${PV}-beta-1"
MY_P="$PN"-"$MY_PV"
# Things that don't work:
@@ -79,7 +79,7 @@ DEPEND="${CDEPEND}
gui? (
>=virtual/jdk-1.5
doc? ( app-text/docbook-xsl-stylesheets
- dev-java/xml-commons-external:1.4
+ dev-java/xml-commons-external:1.4
dev-java/jlatexmath-fop:1 )
xcos? ( dev-lang/ocaml ) )
test? (
@@ -121,6 +121,7 @@ src_prepare() {
"${FILESDIR}/${P}-followlinks.patch" \
"${FILESDIR}/${P}-gluegen.patch" \
"${FILESDIR}/${P}-fix-random-runtime-failure.patch" \
+ "${FILESDIR}/${P}-disable-static-systemlib.patch" \
"${FILESDIR}/${P}-always-use-dynamic-stack.patch"
append-ldflags $(no-as-needed)
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2013-10-30 5:47 Guillaume Horel
0 siblings, 0 replies; 15+ messages in thread
From: Guillaume Horel @ 2013-10-30 5:47 UTC (permalink / raw
To: gentoo-commits
commit: 12d50d52cb49e2c2a09586c9493249e7c3164ebe
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Wed Oct 30 05:46:37 2013 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Wed Oct 30 05:46:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=12d50d52
sci-mathematics/scilab small fixes to beta version
---
...tack.patch => scilab-5.5.0_beta1-always-use-dynamic-stack.patch} | 0
...mlib.patch => scilab-5.5.0_beta1-disable-static-systemlib.patch} | 0
...re.patch => scilab-5.5.0_beta1-fix-random-runtime-failure.patch} | 0
...5.5.0-followlinks.patch => scilab-5.5.0_beta1-followlinks.patch} | 0
...{scilab-5.5.0-gluegen.patch => scilab-5.5.0_beta1-gluegen.patch} | 0
...lab-5.5.0-java-heap.patch => scilab-5.5.0_beta1-java-heap.patch} | 0
.../scilab/{scilab-5.5.0.ebuild => scilab-5.5.0_beta1.ebuild} | 6 +++---
7 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-always-use-dynamic-stack.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-always-use-dynamic-stack.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.5.0-always-use-dynamic-stack.patch
rename to sci-mathematics/scilab/files/scilab-5.5.0_beta1-always-use-dynamic-stack.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-disable-static-systemlib.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch
rename to sci-mathematics/scilab/files/scilab-5.5.0_beta1-disable-static-systemlib.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-fix-random-runtime-failure.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch
rename to sci-mathematics/scilab/files/scilab-5.5.0_beta1-fix-random-runtime-failure.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-followlinks.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch
rename to sci-mathematics/scilab/files/scilab-5.5.0_beta1-followlinks.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-gluegen.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.5.0-gluegen.patch
rename to sci-mathematics/scilab/files/scilab-5.5.0_beta1-gluegen.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-java-heap.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.5.0-java-heap.patch
rename to sci-mathematics/scilab/files/scilab-5.5.0_beta1-java-heap.patch
diff --git a/sci-mathematics/scilab/scilab-5.5.0.ebuild b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
similarity index 98%
rename from sci-mathematics/scilab/scilab-5.5.0.ebuild
rename to sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
index 15b592e..eba79fa 100644
--- a/sci-mathematics/scilab/scilab-5.5.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
@@ -10,7 +10,7 @@ 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
-MY_PV="${PV}-beta-1"
+MY_PV="${PV/_beta1/-beta-1}"
MY_P="$PN"-"$MY_PV"
# Things that don't work:
@@ -51,7 +51,7 @@ CDEPEND="dev-libs/libpcre
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/flexdock-1.2.4:0
dev-java/fop:0
dev-java/gluegen:2
dev-java/javahelp:0
@@ -66,7 +66,7 @@ CDEPEND="dev-libs/libpcre
virtual/opengl
doc? ( dev-java/saxon:9 )
xcos? ( dev-java/commons-logging:0 ) )
- matio? ( <sci-libs/matio-1.5 )
+ matio? ( >=sci-libs/matio-1.5 )
tk? ( dev-lang/tk )
umfpack? ( sci-libs/umfpack )"
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2013-10-31 4:30 Guillaume Horel
0 siblings, 0 replies; 15+ messages in thread
From: Guillaume Horel @ 2013-10-31 4:30 UTC (permalink / raw
To: gentoo-commits
commit: 28029266d0cb9ea75efe44f1369f64438044df49
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Thu Oct 31 04:29:31 2013 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Thu Oct 31 04:29:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=28029266
sci-mathematics/scilab fix access violation
---
.../files/scilab-5.5.0_beta1-accessviolation.patch | 21 +++++++++++++++++++++
sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild | 3 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch
new file mode 100644
index 0000000..39b4302
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch
@@ -0,0 +1,21 @@
+--- bin/scilab.orig 2013-10-28 01:08:06.623143085 -0400
++++ bin/scilab 2013-10-30 22:57:00.781289235 -0400
+@@ -650,11 +650,13 @@
+ # libEGL may be partially supported by the closed-source NVIDIA driver.
+ # Until they release an EGL driver, we force the egl_glx driver.
+ # http://bugzilla.scilab.org/show_bug.cgi?id=12940
+-if test -x /usr/bin/glxinfo; then
+- NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
+- if test ! -z "$NVIDIA_GLX_VENDOR"; then
+- EGL_DRIVER=egl_glx
+- export EGL_DRIVER
++if test $SCILAB_MODE != "nw"; then
++ if test -x /usr/bin/glxinfo; then
++ NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
++ if test ! -z "$NVIDIA_GLX_VENDOR"; then
++ EGL_DRIVER=egl_glx
++ export EGL_DRIVER
++ fi
+ fi
+ fi
+
diff --git a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
index eba79fa..8816f26 100644
--- a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
@@ -122,7 +122,8 @@ src_prepare() {
"${FILESDIR}/${P}-gluegen.patch" \
"${FILESDIR}/${P}-fix-random-runtime-failure.patch" \
"${FILESDIR}/${P}-disable-static-systemlib.patch" \
- "${FILESDIR}/${P}-always-use-dynamic-stack.patch"
+ "${FILESDIR}/${P}-always-use-dynamic-stack.patch" \
+ "${FILESDIR}/${P}-accessviolation.patch"
append-ldflags $(no-as-needed)
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2013-11-16 17:00 Guillaume Horel
0 siblings, 0 replies; 15+ messages in thread
From: Guillaume Horel @ 2013-11-16 17:00 UTC (permalink / raw
To: gentoo-commits
commit: 8d24be2fb053f44a54366778e5f7a2816158d1f5
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sat Nov 16 16:58:37 2013 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sat Nov 16 16:58:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8d24be2f
sci-mathematics/scilab-5.5.0_beta1 ebuild fixes
---
.../files/scilab-5.5.0_beta1-accessviolation.patch | 2 +-
sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild | 28 ++++++++++------------
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch
index 39b4302..e065075 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch
@@ -9,7 +9,7 @@
- if test ! -z "$NVIDIA_GLX_VENDOR"; then
- EGL_DRIVER=egl_glx
- export EGL_DRIVER
-+if test $SCILAB_MODE != "nw"; then
++if test $SCILAB_MODE != "nw" -a $SCILAB_MODE != "nwni"; then
+ if test -x /usr/bin/glxinfo; then
+ NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
+ if test ! -z "$NVIDIA_GLX_VENDOR"; then
diff --git a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
index 0daba66..e6b96b6 100644
--- a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="http://www.scilab.org/download/${MY_PV}/${MY_P}-src.tar.gz"
LICENSE="CeCILL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion debug +doc fftw +gui +matio nls openmp
+IUSE="bash-completion debug +doc fftw +gui +matio mpi nls openmp
static-libs test tk +umfpack +xcos"
REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
@@ -40,7 +40,7 @@ done
CDEPEND="dev-libs/libpcre
dev-libs/libxml2:2
- sci-libs/hdf5
+ sci-libs/hdf5[mpi=]
>=sci-libs/arpack-3
sys-devel/gettext
sys-libs/ncurses
@@ -53,13 +53,13 @@ CDEPEND="dev-libs/libpcre
dev-java/commons-io:1
>=dev-java/flexdock-1.2.4:0
dev-java/fop:0
- dev-java/gluegen:2
+ dev-java/gluegen:2.1
dev-java/javahelp:0
dev-java/jeuclid-core:0
dev-java/jgoodies-looks:2.0
dev-java/jgraphx:2.1
dev-java/jlatexmath:1
- >=dev-java/jogl-2.0.2:2
+ dev-java/jogl:2.1
>=dev-java/jrosetta-1.0.4:0
dev-java/skinlf:0
dev-java/xmlgraphics-commons:1.5
@@ -138,14 +138,14 @@ src_prepare() {
#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|" \
+ sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.1|" \
+ -e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2.1|" configure.ac || die
+ sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2.1|" \
+ -e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2.1|" \
-e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \
configure.ac || die
- sed -i -e "s/jogl2/jogl-2/" -e "s/gluegen2/gluegen-2/" \
+ sed -i -e "s/jogl2/jogl-2.1/" -e "s/gluegen2/gluegen-2.1/" \
etc/librarypath.xml || die
fi
@@ -155,8 +155,8 @@ src_prepare() {
java-pkg_jar-from jgoodies-looks-2.0,jrosetta
java-pkg_jar-from avalon-framework-4.2,jeuclid-core
java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1
- java-pkg_jar-from jogl-2 jogl-all.jar jogl2.jar
- java-pkg_jar-from gluegen-2 gluegen-rt.jar gluegen2-rt.jar
+ java-pkg_jar-from jogl-2.1 jogl-all.jar jogl2.jar
+ java-pkg_jar-from gluegen-2.1 gluegen-rt.jar gluegen2-rt.jar
java-pkg_jar-from batik-1.7 batik-all.jar
java-pkg_jar-from fop fop.jar
java-pkg_jar-from javahelp jhall.jar
@@ -187,9 +187,6 @@ src_configure() {
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 \
@@ -216,7 +213,8 @@ src_configure() {
$(use_with tk) \
$(use_with umfpack) \
$(use_with xcos) \
- $(use_with xcos modelica)
+ $(use_with xcos modelica) \
+ $(use_with mpi)
}
src_compile() {
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2014-01-10 4:26 Guillaume Horel
0 siblings, 0 replies; 15+ messages in thread
From: Guillaume Horel @ 2014-01-10 4:26 UTC (permalink / raw
To: gentoo-commits
commit: 0d6371a2404d53149632b2b2b0c2bef5b5ee8066
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Fri Jan 10 04:24:26 2014 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Jan 10 04:24:26 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0d6371a2
sci-mathematics/scilab ebuild cleanup
should fix bugs #490356, #494718 and bug #497638
---
.../scilab/files/scilab-5.5.0_beta1-nogui.patch | 13 +++++
sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild | 64 +++++++++++-----------
2 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-nogui.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-nogui.patch
new file mode 100644
index 0000000..60cee5a
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-nogui.patch
@@ -0,0 +1,13 @@
+--- Makefile.in.orig 2014-01-09 22:29:06.534469383 -0500
++++ Makefile.in 2014-01-09 22:29:40.368471544 -0500
+@@ -2247,8 +2247,8 @@
+ @BUILD_HELP_TRUE@ done; \
+ @BUILD_HELP_TRUE@ fi
+ # Also install scirenderer.jar
+-@EXTERNAL_SCIRENDERER_FALSE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
+-@EXTERNAL_SCIRENDERER_FALSE@ $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
++@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
++@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@ $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
+
+ .PHONY: macros localization doc
+
diff --git a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
index e6b96b6..c733e94 100644
--- a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
@@ -28,15 +28,12 @@ IUSE="bash-completion debug +doc fftw +gui +matio mpi 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"
+LINGUAS="fr_FR zh_CN zh_TW ru_RU ca_ES de_DE es_ES pt_BR ja_JP it_IT uk_UA pl_PL cs_CZ"
+LINGUAS_DOC="fr_FR pt_BR ja_JP ru_RU"
+
for l in ${LINGUAS}; do
IUSE="${IUSE} linguas_${l}"
done
-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
@@ -51,21 +48,20 @@ CDEPEND="dev-libs/libpcre
dev-java/avalon-framework:4.2
dev-java/batik:1.7
dev-java/commons-io:1
+ dev-java/commons-logging:0
>=dev-java/flexdock-1.2.4:0
dev-java/fop:0
- dev-java/gluegen:2.1
+ =dev-java/gluegen-2.1.2:2.1
dev-java/javahelp:0
dev-java/jeuclid-core:0
dev-java/jgoodies-looks:2.0
- dev-java/jgraphx:2.1
dev-java/jlatexmath:1
- dev-java/jogl:2.1
+ dev-java/jlatexmath-fop:1
+ =dev-java/jogl-2.1.2:2.1
>=dev-java/jrosetta-1.0.4:0
dev-java/skinlf:0
dev-java/xmlgraphics-commons:1.5
- virtual/opengl
- doc? ( dev-java/saxon:9 )
- xcos? ( dev-java/commons-logging:0 ) )
+ virtual/opengl )
matio? ( >=sci-libs/matio-1.5 )
tk? ( dev-lang/tk )
umfpack? ( sci-libs/umfpack )"
@@ -80,8 +76,9 @@ DEPEND="${CDEPEND}
>=virtual/jdk-1.5
doc? ( app-text/docbook-xsl-stylesheets
dev-java/xml-commons-external:1.4
- dev-java/jlatexmath-fop:1 )
- xcos? ( dev-lang/ocaml ) )
+ dev-java/saxon:9 )
+ xcos? ( dev-lang/ocaml
+ dev-java/jgraphx:2.1 ) )
test? (
dev-java/junit:4
gui? ( ${VIRTUALX_DEPEND} ) )"
@@ -107,13 +104,14 @@ pkg_setup() {
java-pkg-opt-2_pkg_setup
ALL_LINGUAS="en_US"
+ ALL_LINGUAS_DOC="en_US"
for l in ${LINGUAS}; do
use linguas_${l} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
done
- for l in ${LINGUASLONG}; do
- use linguas_${l%_*} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
+ for l in ${LINGUAS_DOC}; do
+ use linguas_${l} && ALL_LINGUAS_DOC="${ALL_LINGUAS_DOC} ${l}"
done
- export ALL_LINGUAS ALL_LINGUAS_DOC=$ALL_LINGUAS
+ export ALL_LINGUAS ALL_LINGUAS_DOC
}
src_prepare() {
@@ -123,7 +121,8 @@ src_prepare() {
"${FILESDIR}/${P}-fix-random-runtime-failure.patch" \
"${FILESDIR}/${P}-disable-static-systemlib.patch" \
"${FILESDIR}/${P}-always-use-dynamic-stack.patch" \
- "${FILESDIR}/${P}-accessviolation.patch"
+ "${FILESDIR}/${P}-accessviolation.patch" \
+ "${FILESDIR}/${P}-nogui.patch"
append-ldflags $(no-as-needed)
@@ -150,26 +149,25 @@ src_prepare() {
fi
mkdir jar || die
- pushd jar
- java-pkg_jar-from jgraphx-2.1,jlatexmath-1,flexdock,skinlf
- java-pkg_jar-from jgoodies-looks-2.0,jrosetta
- java-pkg_jar-from avalon-framework-4.2,jeuclid-core
- java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1
- java-pkg_jar-from jogl-2.1 jogl-all.jar jogl2.jar
- java-pkg_jar-from gluegen-2.1 gluegen-rt.jar gluegen2-rt.jar
- java-pkg_jar-from batik-1.7 batik-all.jar
- java-pkg_jar-from fop fop.jar
- java-pkg_jar-from javahelp jhall.jar
- if use xcos; then
- java-pkg_jar-from commons-logging
- fi
- if use doc; then
- java-pkg_jar-from saxon-9 saxon.jar saxon9he.jar
+ pushd jar >/dev/null
+ if use gui; then
+ java-pkg_jar-from jlatexmath-1,flexdock,skinlf
+ java-pkg_jar-from jgoodies-looks-2.0,jrosetta
+ java-pkg_jar-from avalon-framework-4.2,jeuclid-core
+ java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1
+ java-pkg_jar-from jogl-2.1 jogl-all.jar jogl2.jar
+ java-pkg_jar-from gluegen-2.1 gluegen-rt.jar gluegen2-rt.jar
+ java-pkg_jar-from batik-1.7 batik-all.jar
+ java-pkg_jar-from fop fop.jar
+ java-pkg_jar-from javahelp jhall.jar
java-pkg_jar-from jlatexmath-fop-1
java-pkg_jar-from xml-commons-external-1.4 xml-apis-ext.jar
+ use xcos && java-pkg_jar-from jgraphx-2.1
+ use doc && java-pkg_jar-from saxon-9 saxon.jar saxon9he.jar
fi
if use test; then
java-pkg_jar-from junit-4 junit.jar junit4.jar
+ java-pkg_jar-from ant-junit
fi
popd
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2014-07-12 19:50 Guillaume Horel
0 siblings, 0 replies; 15+ messages in thread
From: Guillaume Horel @ 2014-07-12 19:50 UTC (permalink / raw
To: gentoo-commits
commit: b82d9befa586187dc593a3706f805c747c0078fc
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sat Jul 12 19:49:49 2014 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sat Jul 12 19:49:49 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b82d9bef
sci-mathematics/scilab fix access violation issue
---
.../files/scilab-5.5.0-accessviolation.patch | 32 +++++++++++-----------
sci-mathematics/scilab/scilab-5.5.0.ebuild | 4 +++
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch
index 39b4302..a84de9a 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch
@@ -1,21 +1,21 @@
---- bin/scilab.orig 2013-10-28 01:08:06.623143085 -0400
-+++ bin/scilab 2013-10-30 22:57:00.781289235 -0400
-@@ -650,11 +650,13 @@
- # libEGL may be partially supported by the closed-source NVIDIA driver.
- # Until they release an EGL driver, we force the egl_glx driver.
- # http://bugzilla.scilab.org/show_bug.cgi?id=12940
+diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab
+--- scilab-5.5.0-orig/bin/scilab 2014-07-12 15:24:17.105686656 -0400
++++ scilab-5.5.0/bin/scilab 2014-07-12 15:25:29.307725409 -0400
+@@ -647,17 +647,6 @@
+ GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g)
+ export GTK_MODULES
+
+-# libEGL may be partially supported by the closed-source NVIDIA driver.
+-# Until they release an EGL driver, we force the egl_glx driver.
+-# http://bugzilla.scilab.org/show_bug.cgi?id=12940
-if test -x /usr/bin/glxinfo; then
- NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
- if test ! -z "$NVIDIA_GLX_VENDOR"; then
- EGL_DRIVER=egl_glx
- export EGL_DRIVER
-+if test $SCILAB_MODE != "nw"; then
-+ if test -x /usr/bin/glxinfo; then
-+ NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
-+ if test ! -z "$NVIDIA_GLX_VENDOR"; then
-+ EGL_DRIVER=egl_glx
-+ export EGL_DRIVER
-+ fi
- fi
- fi
-
+- fi
+-fi
+-
+ if test $SCIVERBOSE -ne 0; then
+ echo "SCI : $SCI"
+ echo "SCIBIN : $SCIBIN"
diff --git a/sci-mathematics/scilab/scilab-5.5.0.ebuild b/sci-mathematics/scilab/scilab-5.5.0.ebuild
index 38ad3e4..3fe7558 100644
--- a/sci-mathematics/scilab/scilab-5.5.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.0.ebuild
@@ -241,6 +241,10 @@ src_install() {
pkg_postinst() {
fdo-mime_mime_database_update
+ einfo "If you are using the NVIDIA binary drivers, and run into graphics"
+ einfo "crashes, you may try to run scilab as follows:"
+ einfo "EGL_DRIVER=egl_glx scilab"
+ einfo "See upstream http://bugzilla.scilab.org/show_bug.cgi?id=12940"
}
pkg_postrm() {
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2014-10-10 3:26 Guillaume Horel
0 siblings, 0 replies; 15+ messages in thread
From: Guillaume Horel @ 2014-10-10 3:26 UTC (permalink / raw
To: gentoo-commits
commit: 7fe79314e17d813b0402f5ef0c32baafc1335e9a
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Fri Oct 10 03:26:31 2014 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Oct 10 03:26:31 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7fe79314
sci-mathematics/scilab version bump
---
.../files/scilab-5.5.1-accessviolation.patch | 21 ++
.../scilab-5.5.1-fix-random-runtime-failure.patch | 12 +
.../scilab/files/scilab-5.5.1-followlinks.patch | 11 +
.../scilab/files/scilab-5.5.1-gluegen.patch | 11 +
.../scilab/files/scilab-5.5.1-java-heap.patch | 11 +
.../scilab/files/scilab-5.5.1-missinglib.patch | 11 +
.../scilab/files/scilab-5.5.1-nogui.patch | 13 ++
sci-mathematics/scilab/scilab-5.5.1.ebuild | 250 +++++++++++++++++++++
8 files changed, 340 insertions(+)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.1-accessviolation.patch
new file mode 100644
index 0000000..a84de9a
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.1-accessviolation.patch
@@ -0,0 +1,21 @@
+diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab
+--- scilab-5.5.0-orig/bin/scilab 2014-07-12 15:24:17.105686656 -0400
++++ scilab-5.5.0/bin/scilab 2014-07-12 15:25:29.307725409 -0400
+@@ -647,17 +647,6 @@
+ GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g)
+ export GTK_MODULES
+
+-# libEGL may be partially supported by the closed-source NVIDIA driver.
+-# Until they release an EGL driver, we force the egl_glx driver.
+-# http://bugzilla.scilab.org/show_bug.cgi?id=12940
+-if test -x /usr/bin/glxinfo; then
+- NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
+- if test ! -z "$NVIDIA_GLX_VENDOR"; then
+- EGL_DRIVER=egl_glx
+- export EGL_DRIVER
+- fi
+-fi
+-
+ if test $SCIVERBOSE -ne 0; then
+ echo "SCI : $SCI"
+ echo "SCIBIN : $SCIBIN"
diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.1-fix-random-runtime-failure.patch
new file mode 100644
index 0000000..92ac453
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.1-fix-random-runtime-failure.patch
@@ -0,0 +1,12 @@
+diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp scilab/modules/api_scilab/src/cpp/api_double.cpp
+--- scilab-orig/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:26:31.342617365 -0400
++++ scilab/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:27:34.838621420 -0400
+@@ -497,7 +497,7 @@
+ /*--------------------------------------------------------------------------*/
+ int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)
+ {
+- return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL);
++ return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0);
+ }
+ /*--------------------------------------------------------------------------*/
+ int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.1-followlinks.patch
new file mode 100644
index 0000000..fd6aa7b
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.1-followlinks.patch
@@ -0,0 +1,11 @@
+--- m4/java.m4.orig 2014-02-11 23:43:03.030430258 -0500
++++ m4/java.m4 2014-02-11 23:43:54.008428766 -0500
+@@ -839,7 +839,7 @@
+ for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do
+
+ # TODO check the behaviour when spaces
+- jars_resolved=`ls $jar 2>/dev/null`
++ jars_resolved=$(realpath $(ls $jar 2>/dev/null) 2>/dev/null)
+ for jar_resolved in $jars_resolved; do # If several jars matches
+ if test -e "$jar_resolved"; then
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.1-gluegen.patch
new file mode 100644
index 0000000..1514439
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.1-gluegen.patch
@@ -0,0 +1,11 @@
+--- scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java.orig 2014-03-24 22:38:00.928934500 -0400
++++ scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:37:33.947567043 -0400
+@@ -157,7 +157,7 @@
+
+ static {
+ try {
+- System.loadLibrary("gluegen2-rt");
++ System.loadLibrary("gluegen-rt");
+ } catch (Exception e) {
+ System.err.println(e);
+ }
diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.1-java-heap.patch
new file mode 100644
index 0000000..31060d7
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.1-java-heap.patch
@@ -0,0 +1,11 @@
+--- etc/jvm_options.xml.orig 2014-02-12 00:05:34.323390688 -0500
++++ etc/jvm_options.xml 2014-02-12 00:05:53.977390112 -0500
+@@ -22,7 +22,7 @@
+ <!-- ENABLE Just In Time java compiler -->
+ <option value="-Djava.compiler=JIT"/>
+ <!-- Set Java Heap space to 256mb -->
+- <option value="-Xmx256m"/>
++ <option value="-Xmx512m"/>
+ <!-- Avoid jvm to handle sigint (& other signals) -->
+ <option value="-Xrs"/>
+
diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-missinglib.patch b/sci-mathematics/scilab/files/scilab-5.5.1-missinglib.patch
new file mode 100644
index 0000000..7f88068
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.1-missinglib.patch
@@ -0,0 +1,11 @@
+diff -urN scilab-5.5.1-orig/Makefile.am scilab-5.5.1/Makefile.am
+--- scilab-5.5.1-orig/Makefile.am 2014-10-09 18:22:21.994610695 -0400
++++ scilab-5.5.1/Makefile.am 2014-10-09 18:24:28.208333575 -0400
+@@ -74,6 +74,7 @@
+ if NEED_JAVA
+ scilab_bin_LDADD += \
+ $(top_builddir)/modules/console/libsciconsole.la \
++ $(top_builddir)/modules/console/libsciconsole-minimal.la \
+ $(top_builddir)/modules/jvm/libscijvm.la \
+ $(top_builddir)/modules/commons/libscicommons.la
+ else
diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-nogui.patch b/sci-mathematics/scilab/files/scilab-5.5.1-nogui.patch
new file mode 100644
index 0000000..60cee5a
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.1-nogui.patch
@@ -0,0 +1,13 @@
+--- Makefile.in.orig 2014-01-09 22:29:06.534469383 -0500
++++ Makefile.in 2014-01-09 22:29:40.368471544 -0500
+@@ -2247,8 +2247,8 @@
+ @BUILD_HELP_TRUE@ done; \
+ @BUILD_HELP_TRUE@ fi
+ # Also install scirenderer.jar
+-@EXTERNAL_SCIRENDERER_FALSE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
+-@EXTERNAL_SCIRENDERER_FALSE@ $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
++@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
++@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@ $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
+
+ .PHONY: macros localization doc
+
diff --git a/sci-mathematics/scilab/scilab-5.5.1.ebuild b/sci-mathematics/scilab/scilab-5.5.1.ebuild
new file mode 100644
index 0000000..130689f
--- /dev/null
+++ b/sci-mathematics/scilab/scilab-5.5.1.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+JAVA_PKG_OPT_USE="gui"
+VIRTUALX_REQUIRED="manual"
+
+inherit eutils autotools bash-completion-r1 check-reqs fdo-mime flag-o-matic \
+ fortran-2 java-pkg-opt-2 toolchain-funcs virtualx
+
+# Things that don't work:
+# - tests
+
+DESCRIPTION="Scientific software package for numerical computations"
+HOMEPAGE="http://www.scilab.org/"
+SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
+
+LICENSE="CeCILL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="bash-completion debug doc emf fftw +gui +matio mpi nls openmp
+ static-libs test tk +umfpack +xcos"
+REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
+
+LINGUAS="fr_FR zh_CN zh_TW ru_RU ca_ES de_DE es_ES pt_BR ja_JP it_IT uk_UA pl_PL cs_CZ"
+LINGUAS_DOC="fr_FR pt_BR ja_JP ru_RU"
+
+for l in ${LINGUAS}; do
+ IUSE="${IUSE} linguas_${l}"
+done
+
+CDEPEND="dev-libs/libpcre
+ dev-libs/libxml2:2
+ sci-libs/hdf5[mpi=]
+ >=sci-libs/arpack-3
+ sys-devel/gettext
+ sys-libs/ncurses
+ sys-libs/readline
+ virtual/lapack
+ emf? ( dev-java/freehep-graphicsio-emf )
+ fftw? ( sci-libs/fftw:3.0 )
+ gui? (
+ dev-java/avalon-framework:4.2
+ dev-java/batik:1.7
+ dev-java/commons-io:1
+ dev-java/commons-logging:0
+ >=dev-java/flexdock-1.2.4:0
+ dev-java/fop:0
+ =dev-java/gluegen-2.1.4:2.1
+ dev-java/javahelp:0
+ dev-java/jeuclid-core:0
+ dev-java/jgoodies-looks:2.6
+ >=dev-java/jlatexmath-1.0.3:1
+ >=dev-java/jlatexmath-fop-1.0.3:1
+ =dev-java/jogl-2.1.4:2.1
+ >=dev-java/jrosetta-1.0.4:0
+ dev-java/skinlf:0
+ dev-java/xmlgraphics-commons:1.5
+ virtual/opengl )
+ matio? ( >=sci-libs/matio-1.5 )
+ tk? ( dev-lang/tk )
+ umfpack? ( sci-libs/umfpack )"
+
+RDEPEND="${CDEPEND}
+ gui? ( >=virtual/jre-1.5 )"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ debug? ( dev-util/lcov )
+ gui? (
+ >=virtual/jdk-1.5
+ doc? ( app-text/docbook-xsl-stylesheets
+ dev-java/xml-commons-external:1.4
+ dev-java/saxon:9 )
+ xcos? ( dev-lang/ocaml
+ dev-java/jgraphx:2.5 ) )
+ test? (
+ dev-java/junit:4
+ gui? ( ${VIRTUALX_DEPEND} ) )"
+
+DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
+
+pkg_pretend() {
+ use doc && CHECKREQS_MEMORY="512M" check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ if use openmp; then
+ if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
+ ewarn "You are using a gcc without OpenMP capabilities"
+ die "Need an OpenMP capable compiler"
+ fi
+ FORTRAN_NEED_OPENMP=1
+ fi
+ FORTRAN_STANDARD="77 90"
+ fortran-2_pkg_setup
+ #bug 8053
+ unset F77
+ java-pkg-opt-2_pkg_setup
+
+ ALL_LINGUAS="en_US"
+ ALL_LINGUAS_DOC="en_US"
+ for l in ${LINGUAS}; do
+ use linguas_${l} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
+ done
+ for l in ${LINGUAS_DOC}; do
+ use linguas_${l} && ALL_LINGUAS_DOC="${ALL_LINGUAS_DOC} ${l}"
+ done
+ export ALL_LINGUAS ALL_LINGUAS_DOC
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}/${P}-followlinks.patch" \
+ "${FILESDIR}/${P}-gluegen.patch" \
+ "${FILESDIR}/${P}-fix-random-runtime-failure.patch" \
+ "${FILESDIR}/${P}-accessviolation.patch" \
+ "${FILESDIR}/${P}-nogui.patch" \
+ "${FILESDIR}/${P}-missinglib.patch"
+
+ # increases java heap to 512M when building docs (sync with cheqreqs above)
+ use doc && epatch "${FILESDIR}/${P}-java-heap.patch"
+
+ # use the LINGUAS variable that we set
+ sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac ||die
+
+ # make sure the DOCBOOK_ROOT variable is set
+ sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die
+
+ #add specific gentoo java directories
+ if use gui; then
+ sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.1|" \
+ -e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2.1|" configure.ac || die
+ sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2.1|" \
+ -e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2.1|" \
+ -e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \
+ configure.ac || die
+
+ sed -i -e "s/jogl2/jogl-2.1/" -e "s/gluegen2/gluegen-2.1/" \
+ etc/librarypath.xml || die
+ fi
+
+ mkdir jar || die
+ pushd jar >/dev/null
+ if use gui; then
+ java-pkg_jar-from jlatexmath-1,flexdock,skinlf
+ java-pkg_jar-from jgoodies-looks-2.6,jrosetta
+ java-pkg_jar-from avalon-framework-4.2,jeuclid-core
+ java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1
+ java-pkg_jar-from jogl-2.1 jogl-all.jar jogl2.jar
+ java-pkg_jar-from gluegen-2.1 gluegen-rt.jar gluegen2-rt.jar
+ java-pkg_jar-from batik-1.7 batik-all.jar
+ java-pkg_jar-from fop fop.jar
+ java-pkg_jar-from javahelp jhall.jar
+ java-pkg_jar-from jlatexmath-fop-1
+ java-pkg_jar-from xml-commons-external-1.4 xml-apis-ext.jar
+ use xcos && java-pkg_jar-from jgraphx-2.5
+ use doc && java-pkg_jar-from saxon-9 saxon.jar saxon9he.jar
+ fi
+ if use emf; then
+ java-pkg_jar-from freehep-graphicsio-emf,freehep-graphics2d
+ java-pkg_jar-from freehep-graphicsio,freehep-io,freehep-util
+ fi
+ if use test; then
+ java-pkg_jar-from junit-4 junit.jar junit4.jar
+ java-pkg_jar-from ant-junit
+ fi
+ popd
+
+ java-pkg-opt-2_src_prepare
+ eautoconf
+}
+
+src_configure() {
+ if use gui; then
+ export JAVA_HOME="$(java-config -O)"
+ else
+ unset JAVAC
+ fi
+
+ export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+ export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
+ export F77_LDFLAGS="${LDFLAGS}"
+
+ econf \
+ --enable-relocatable \
+ --disable-rpath \
+ --with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \
+ --disable-static-system-lib \
+ $(use_enable debug) \
+ $(use_enable debug code-coverage) \
+ $(use_enable debug debug-C) \
+ $(use_enable debug debug-CXX) \
+ $(use_enable debug debug-fortran) \
+ $(use_enable debug debug-java) \
+ $(use_enable debug debug-linker) \
+ $(use_enable doc build-help) \
+ $(use_enable nls) \
+ $(use_enable nls build-localization) \
+ $(use_enable static-libs static) \
+ $(use_enable test compilation-tests) \
+ $(use_with emf) \
+ $(use_with fftw) \
+ $(use_with gui) \
+ $(use_with gui javasci) \
+ $(use_with matio) \
+ $(use_with openmp) \
+ $(use_with tk) \
+ $(use_with umfpack) \
+ $(use_with xcos) \
+ $(use_with xcos modelica) \
+ $(use_with mpi)
+}
+
+src_compile() {
+ emake
+ use doc && emake doc
+}
+
+src_test() {
+ if use gui; then
+ Xemake check
+ else
+ emake check
+ fi
+}
+
+src_install() {
+ default
+ prune_libtool_files --all
+ rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
+ use bash-completion && newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
+ echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
+ > 50-"${PN}"
+ insinto /etc/revdep-rebuild && doins "50-${PN}"
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+ einfo "If you are using the NVIDIA binary drivers, and run into graphics"
+ einfo "crashes, you may try to run scilab as follows:"
+ einfo "EGL_DRIVER=egl_glx scilab"
+ einfo "See upstream http://bugzilla.scilab.org/show_bug.cgi?id=12940"
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2015-02-01 3:01 Guillaume Horel
0 siblings, 0 replies; 15+ messages in thread
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 [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2015-04-03 20:25 Guillaume Horel
0 siblings, 0 replies; 15+ messages in thread
From: Guillaume Horel @ 2015-04-03 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 43b68623b040f59c63c3e1f4037cf6d499edd6d0
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Fri Apr 3 18:09:24 2015 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Apr 3 18:09:24 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=43b68623
sci-mathematics/scilab: version bump
Package-Manager: portage-2.2.18
sci-mathematics/scilab/ChangeLog | 10 +
.../files/scilab-5.5.2-accessviolation.patch | 21 ++
.../scilab-5.5.2-fix-random-runtime-failure.patch | 12 +
.../scilab/files/scilab-5.5.2-followlinks.patch | 11 +
.../scilab/files/scilab-5.5.2-gluegen.patch | 11 +
.../scilab/files/scilab-5.5.2-java-heap.patch | 11 +
.../scilab/files/scilab-5.5.2-missinglib.patch | 11 +
.../scilab/files/scilab-5.5.2-nogui.patch | 13 +
sci-mathematics/scilab/scilab-5.5.2.ebuild | 261 +++++++++++++++++++++
9 files changed, 361 insertions(+)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 4a619b9..f6c4a45 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,16 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*scilab-5.5.2 (03 Apr 2015)
+
+ 03 Apr 2015; Guillaume Horel <guillaume.horel@gmail.com>
+ +files/scilab-5.5.2-accessviolation.patch,
+ +files/scilab-5.5.2-fix-random-runtime-failure.patch,
+ +files/scilab-5.5.2-followlinks.patch, +files/scilab-5.5.2-gluegen.patch,
+ +files/scilab-5.5.2-java-heap.patch, +files/scilab-5.5.2-missinglib.patch,
+ +files/scilab-5.5.2-nogui.patch, +scilab-5.5.2.ebuild:
+ sci-mathematics/scilab: version bump
+
01 Feb 2015; Guillaume Horel <guillaume.horel@gmail.com> scilab-5.5.1.ebuild:
sci-mathematics/scilab: more precise dependencies
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
new file mode 100644
index 0000000..a84de9a
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
@@ -0,0 +1,21 @@
+diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab
+--- scilab-5.5.0-orig/bin/scilab 2014-07-12 15:24:17.105686656 -0400
++++ scilab-5.5.0/bin/scilab 2014-07-12 15:25:29.307725409 -0400
+@@ -647,17 +647,6 @@
+ GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g)
+ export GTK_MODULES
+
+-# libEGL may be partially supported by the closed-source NVIDIA driver.
+-# Until they release an EGL driver, we force the egl_glx driver.
+-# http://bugzilla.scilab.org/show_bug.cgi?id=12940
+-if test -x /usr/bin/glxinfo; then
+- NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
+- if test ! -z "$NVIDIA_GLX_VENDOR"; then
+- EGL_DRIVER=egl_glx
+- export EGL_DRIVER
+- fi
+-fi
+-
+ if test $SCIVERBOSE -ne 0; then
+ echo "SCI : $SCI"
+ echo "SCIBIN : $SCIBIN"
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
new file mode 100644
index 0000000..92ac453
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
@@ -0,0 +1,12 @@
+diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp scilab/modules/api_scilab/src/cpp/api_double.cpp
+--- scilab-orig/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:26:31.342617365 -0400
++++ scilab/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:27:34.838621420 -0400
+@@ -497,7 +497,7 @@
+ /*--------------------------------------------------------------------------*/
+ int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)
+ {
+- return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL);
++ return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0);
+ }
+ /*--------------------------------------------------------------------------*/
+ int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch
new file mode 100644
index 0000000..fd6aa7b
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch
@@ -0,0 +1,11 @@
+--- m4/java.m4.orig 2014-02-11 23:43:03.030430258 -0500
++++ m4/java.m4 2014-02-11 23:43:54.008428766 -0500
+@@ -839,7 +839,7 @@
+ for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do
+
+ # TODO check the behaviour when spaces
+- jars_resolved=`ls $jar 2>/dev/null`
++ jars_resolved=$(realpath $(ls $jar 2>/dev/null) 2>/dev/null)
+ for jar_resolved in $jars_resolved; do # If several jars matches
+ if test -e "$jar_resolved"; then
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch
new file mode 100644
index 0000000..1514439
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch
@@ -0,0 +1,11 @@
+--- scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java.orig 2014-03-24 22:38:00.928934500 -0400
++++ scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:37:33.947567043 -0400
+@@ -157,7 +157,7 @@
+
+ static {
+ try {
+- System.loadLibrary("gluegen2-rt");
++ System.loadLibrary("gluegen-rt");
+ } catch (Exception e) {
+ System.err.println(e);
+ }
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch
new file mode 100644
index 0000000..31060d7
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch
@@ -0,0 +1,11 @@
+--- etc/jvm_options.xml.orig 2014-02-12 00:05:34.323390688 -0500
++++ etc/jvm_options.xml 2014-02-12 00:05:53.977390112 -0500
+@@ -22,7 +22,7 @@
+ <!-- ENABLE Just In Time java compiler -->
+ <option value="-Djava.compiler=JIT"/>
+ <!-- Set Java Heap space to 256mb -->
+- <option value="-Xmx256m"/>
++ <option value="-Xmx512m"/>
+ <!-- Avoid jvm to handle sigint (& other signals) -->
+ <option value="-Xrs"/>
+
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch b/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch
new file mode 100644
index 0000000..7f88068
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch
@@ -0,0 +1,11 @@
+diff -urN scilab-5.5.1-orig/Makefile.am scilab-5.5.1/Makefile.am
+--- scilab-5.5.1-orig/Makefile.am 2014-10-09 18:22:21.994610695 -0400
++++ scilab-5.5.1/Makefile.am 2014-10-09 18:24:28.208333575 -0400
+@@ -74,6 +74,7 @@
+ if NEED_JAVA
+ scilab_bin_LDADD += \
+ $(top_builddir)/modules/console/libsciconsole.la \
++ $(top_builddir)/modules/console/libsciconsole-minimal.la \
+ $(top_builddir)/modules/jvm/libscijvm.la \
+ $(top_builddir)/modules/commons/libscicommons.la
+ else
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-nogui.patch b/sci-mathematics/scilab/files/scilab-5.5.2-nogui.patch
new file mode 100644
index 0000000..60cee5a
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-nogui.patch
@@ -0,0 +1,13 @@
+--- Makefile.in.orig 2014-01-09 22:29:06.534469383 -0500
++++ Makefile.in 2014-01-09 22:29:40.368471544 -0500
+@@ -2247,8 +2247,8 @@
+ @BUILD_HELP_TRUE@ done; \
+ @BUILD_HELP_TRUE@ fi
+ # Also install scirenderer.jar
+-@EXTERNAL_SCIRENDERER_FALSE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
+-@EXTERNAL_SCIRENDERER_FALSE@ $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
++@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
++@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@ $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
+
+ .PHONY: macros localization doc
+
diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild b/sci-mathematics/scilab/scilab-5.5.2.ebuild
new file mode 100644
index 0000000..095281a
--- /dev/null
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+RESTRICT="test"
+
+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
+
+DESCRIPTION="Scientific software package for numerical computations"
+HOMEPAGE="http://www.scilab.org/"
+SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
+
+LICENSE="CeCILL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="bash-completion debug doc emf fftw +gui +matio mpi nls openmp
+ static-libs test tk +umfpack +xcos"
+REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
+
+LINGUAS="fr_FR zh_CN zh_TW ru_RU ca_ES de_DE es_ES pt_BR ja_JP it_IT uk_UA pl_PL cs_CZ"
+LINGUAS_DOC="fr_FR pt_BR ja_JP ru_RU"
+
+for l in ${LINGUAS}; do
+ IUSE="${IUSE} linguas_${l}"
+done
+
+CDEPEND="dev-libs/libpcre
+ dev-libs/libxml2:2
+ sci-libs/hdf5[mpi=]
+ >=sci-libs/arpack-3
+ sys-devel/gettext
+ sys-libs/ncurses
+ sys-libs/readline:0
+ virtual/lapack
+ emf? ( dev-java/freehep-graphicsio
+ dev-java/freehep-graphicsio-emf
+ dev-java/freehep-graphics2d
+ dev-java/freehep-io
+ dev-java/freehep-util )
+ fftw? ( sci-libs/fftw:3.0 )
+ gui? (
+ dev-java/avalon-framework:4.2
+ dev-java/commons-io:1
+ dev-java/commons-logging:0
+ >=dev-java/flexdock-1.2.4:0
+ dev-java/fop:0
+ =dev-java/gluegen-2.2.4:2.2
+ dev-java/javahelp:0
+ dev-java/jeuclid-core:0
+ dev-java/jgoodies-looks:2.6
+ >=dev-java/jlatexmath-1.0.3:1
+ >=dev-java/jlatexmath-fop-1.0.3:1
+ =dev-java/jogl-2.2.4:2.2
+ >=dev-java/jrosetta-1.0.4:0
+ dev-java/skinlf:0
+ dev-java/xmlgraphics-commons:1.5
+ virtual/opengl
+ xcos? ( dev-java/jgraphx:2.5 )
+ )
+ matio? ( >=sci-libs/matio-1.5 )
+ tk? ( dev-lang/tk:0 )
+ umfpack? ( sci-libs/umfpack )"
+
+RDEPEND="${CDEPEND}
+ gui? ( >=virtual/jre-1.5 )"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ debug? ( dev-util/lcov )
+ gui? (
+ >=virtual/jdk-1.5
+ doc? ( dev-java/batik:1.7
+ app-text/docbook-xsl-stylesheets
+ dev-java/xml-commons-external:1.4
+ dev-java/saxon:9 )
+ xcos? ( dev-lang/ocaml )
+ )
+ test? (
+ dev-java/junit:4
+ gui? ( ${VIRTUALX_DEPEND} ) )"
+
+DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
+
+pkg_pretend() {
+ use doc && CHECKREQS_MEMORY="512M" check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ if use openmp; then
+ if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
+ ewarn "You are using a gcc without OpenMP capabilities"
+ die "Need an OpenMP capable compiler"
+ fi
+ FORTRAN_NEED_OPENMP=1
+ fi
+ FORTRAN_STANDARD="77 90"
+ fortran-2_pkg_setup
+ #bug 8053
+ unset F77
+ java-pkg-opt-2_pkg_setup
+
+ ALL_LINGUAS="en_US"
+ ALL_LINGUAS_DOC="en_US"
+ for l in ${LINGUAS}; do
+ use linguas_${l} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
+ done
+ for l in ${LINGUAS_DOC}; do
+ use linguas_${l} && ALL_LINGUAS_DOC="${ALL_LINGUAS_DOC} ${l}"
+ done
+ export ALL_LINGUAS ALL_LINGUAS_DOC
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}/${P}-followlinks.patch" \
+ "${FILESDIR}/${P}-gluegen.patch" \
+ "${FILESDIR}/${P}-fix-random-runtime-failure.patch" \
+ "${FILESDIR}/${P}-accessviolation.patch" \
+ "${FILESDIR}/${P}-missinglib.patch"
+
+ # works for me on x86, but users are having
+ # trouble without see #282 on github
+ append-ldflags $(no-as-needed)
+
+ # increases java heap to 512M when building docs (sync with cheqreqs above)
+ use doc && epatch "${FILESDIR}/${P}-java-heap.patch"
+
+ # use the LINGUAS variable that we set
+ sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac ||die
+
+ # make sure the DOCBOOK_ROOT variable is set
+ sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die
+
+ #add specific gentoo java directories
+ if use gui; then
+ sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.2|" \
+ -e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2.2|" configure.ac || die
+ sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2.2|" \
+ -e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2.2|" \
+ -e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \
+ configure.ac || die
+
+ sed -i -e "s/jogl2/jogl-2.2/" -e "s/gluegen2/gluegen-2.2/" \
+ etc/librarypath.xml || die
+ fi
+
+ mkdir jar || die
+ pushd jar >/dev/null
+ if use gui; then
+ java-pkg_jar-from jlatexmath-1,flexdock,skinlf
+ java-pkg_jar-from jgoodies-looks-2.6,jrosetta
+ java-pkg_jar-from avalon-framework-4.2,jeuclid-core
+ java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1
+ java-pkg_jar-from jogl-2.2 jogl-all.jar jogl2.jar
+ java-pkg_jar-from gluegen-2.2 gluegen-rt.jar gluegen2-rt.jar
+ java-pkg_jar-from fop fop.jar
+ java-pkg_jar-from javahelp jhall.jar
+ java-pkg_jar-from jlatexmath-fop-1
+ use xcos && java-pkg_jar-from jgraphx-2.5
+ if use doc; then
+ java-pkg_jar-from --build-only batik-1.7 batik-all.jar
+ java-pkg_jar-from --build-only saxon-9 saxon.jar saxon9he.jar
+ java-pkg_jar-from --build-only xml-commons-external-1.4 xml-apis-ext.jar
+ fi
+ fi
+ if use emf; then
+ java-pkg_jar-from freehep-graphicsio-emf,freehep-graphics2d
+ java-pkg_jar-from freehep-graphicsio,freehep-io,freehep-util
+ fi
+ if use test; then
+ java-pkg_jar-from junit-4 junit.jar junit4.jar
+ java-pkg_jar-from ant-junit
+ fi
+ popd
+
+ java-pkg-opt-2_src_prepare
+ eautoconf
+}
+
+src_configure() {
+ if use gui; then
+ export JAVA_HOME="$(java-config -O)"
+ else
+ unset JAVAC
+ fi
+
+ export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+ export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
+ export F77_LDFLAGS="${LDFLAGS}"
+
+ econf \
+ --enable-relocatable \
+ --disable-rpath \
+ --with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \
+ --disable-static-system-lib \
+ $(use_enable debug) \
+ $(use_enable debug code-coverage) \
+ $(use_enable debug debug-C) \
+ $(use_enable debug debug-CXX) \
+ $(use_enable debug debug-fortran) \
+ $(use_enable debug debug-java) \
+ $(use_enable debug debug-linker) \
+ $(use_enable doc build-help) \
+ $(use_enable nls) \
+ $(use_enable nls build-localization) \
+ $(use_enable static-libs static) \
+ $(use_enable test compilation-tests) \
+ $(use_with emf) \
+ $(use_with fftw) \
+ $(use_with gui) \
+ $(use_with gui javasci) \
+ $(use_with matio) \
+ $(use_with openmp) \
+ $(use_with tk) \
+ $(use_with umfpack) \
+ $(use_with xcos) \
+ $(use_with xcos modelica) \
+ $(use_with mpi)
+}
+
+src_compile() {
+ addpredict /proc/mtrr
+ emake
+ use doc && emake doc
+}
+
+src_test() {
+ if use gui; then
+ Xemake check
+ else
+ emake check
+ fi
+}
+
+src_install() {
+ default
+ prune_libtool_files --all
+ rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
+ use bash-completion && newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
+ echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
+ > 50-"${PN}"
+ insinto /etc/revdep-rebuild && doins "50-${PN}"
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+ einfo "If you are using the NVIDIA binary drivers, and run into graphics"
+ einfo "crashes, you may try to run scilab as follows:"
+ einfo "EGL_DRIVER=egl_glx scilab"
+ einfo "See upstream http://bugzilla.scilab.org/show_bug.cgi?id=12940"
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2015-07-31 10:09 Justin Lecher
0 siblings, 0 replies; 15+ messages in thread
From: Justin Lecher @ 2015-07-31 10:09 UTC (permalink / raw
To: gentoo-commits
commit: 328a5d1163f96be4b0c58f4c018480da1df28666
Author: Bryan Gardiner <bog <AT> khumba <DOT> net>
AuthorDate: Thu Jul 30 16:49:05 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 10:09:53 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=328a5d11
sci-mathematics/scilab: Patch to build with new versions of Java dependencies.
Package-Manager: portage-2.2.20
sci-mathematics/scilab/ChangeLog | 5 ++
.../scilab/files/scilab-5.5.2-batik-1.8.patch | 98 ++++++++++++++++++++++
.../scilab/files/scilab-5.5.2-fop-2.0.patch | 38 +++++++++
.../scilab-5.5.2-xmlgraphics-common-2.0.patch | 91 ++++++++++++++++++++
sci-mathematics/scilab/scilab-5.5.2.ebuild | 17 ++--
5 files changed, 242 insertions(+), 7 deletions(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 9b9a0c2..27d3c2b 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jul 2015; Bryan Gardiner <bog@khumba.net> scilab-5.5.2.ebuild,
+ +files/scilab-5.5.2-batik-1.8.patch, +files/scilab-5.5.2-fop-2.0.patch,
+ +files/scilab-5.5.2-xmlgraphics-common-2.0.patch:
+ Patch Scilab to build with new versions of Java dependencies.
+
22 Jul 2015; Marius Brehler <marbre@linux.sungazer.de> scilab-5.5.2.ebuild:
sci-mathematics/scilab: Fix deps
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch
new file mode 100644
index 0000000..aaf4da8
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch
@@ -0,0 +1,98 @@
+From: Bryan Gardiner <bog@khumba.net>
+Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=13813
+Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456
+
+Updates Scilab to build against (and require) Batik >=1.8, fixing an API change
+with SAXSVGDocumentFactory being moved. This is not tested beyond "yes Scilab
+still links to Batik to export SVGs," as I'm not sure of a good test case, and
+it's awaiting upstream review.
+
+--- a/scilab/configure
++++ b/scilab/configure
+@@ -16600,8 +16600,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik used
+ fi
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.7) of batik" >&5
+-$as_echo_n "checking minimal version (1.7) of batik... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.8) of batik" >&5
++$as_echo_n "checking minimal version (1.8) of batik... " >&6; }
+ saved_ac_java_classpath=$ac_java_classpath
+ export ac_java_classpath="$BATIK:$ac_java_classpath"
+ if test "x" == "x"; then
+@@ -16614,7 +16614,7 @@ import org.apache.batik.Version;
+
+ public class conftest {
+ public static void main(String[] argv) {
+- String minVersion="1.7";
++ String minVersion="1.8";
+
+ System.out.println(Version.getVersion());
+ if (compare(minVersion, Version.getVersion()) > 0) {
+@@ -16663,7 +16663,7 @@ EOF
+ STDOUT=`cat conftest.java.output`
+ fi
+ echo "configure: CLASSPATH was $CLASSPATH" >&5
+- as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5
++ as_fn_error $? "Wrong version of batik. Expected at least 1.8. Found $STDOUT" "$LINENO" 5
+ fi
+ fi
+ if test -f conftest.java.output; then
+@@ -16673,7 +16673,7 @@ EOF
+ echo "configure: failed program was:" >&5
+ cat conftest.java >&5
+ echo "configure: CLASSPATH was $CLASSPATH" >&5
+- as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5
++ as_fn_error $? "Wrong version of batik. Expected at least 1.8. Found $STDOUT" "$LINENO" 5
+ fi
+
+ else
+@@ -16686,7 +16686,7 @@ import org.apache.batik.Version;
+
+ public class conftest {
+ public static void main(String[] argv) {
+- String minVersion="1.7";
++ String minVersion="1.8";
+
+ System.out.println(Version.getVersion());
+ if (compare(minVersion, Version.getVersion()) != 0) {
+@@ -16735,7 +16735,7 @@ EOF
+ STDOUT=`cat conftest.java.output`
+ fi
+ echo "configure: CLASSPATH was $CLASSPATH" >&5
+- as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5
++ as_fn_error $? "Wrong version of batik. Expected exact version 1.8. Found $STDOUT" "$LINENO" 5
+ fi
+ fi
+ if test -f conftest.java.output; then
+@@ -16745,7 +16745,7 @@ EOF
+ echo "configure: failed program was:" >&5
+ cat conftest.java >&5
+ echo "configure: CLASSPATH was $CLASSPATH" >&5
+- as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5
++ as_fn_error $? "Wrong version of batik. Expected exact version 1.8. Found $STDOUT" "$LINENO" 5
+ fi
+
+ fi
+--- a/scilab/configure.ac
++++ b/scilab/configure.ac
+@@ -1038,7 +1038,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version
+ BATIK=$PACKAGE_JAR_FILE
+ fi
+ AC_SUBST(BATIK)
+- AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.7],[Version.getVersion()])
++ AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.8],[Version.getVersion()])
+
+ # Commons I/O library
+ AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
+--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
++++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
+@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentLoader;
+ import org.apache.batik.bridge.GVTBuilder;
+ import org.apache.batik.bridge.UserAgent;
+ import org.apache.batik.bridge.UserAgentAdapter;
+-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
++import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+ import org.apache.batik.gvt.GraphicsNode;
+ import org.apache.batik.util.XMLResourceDescriptor;
+ import org.scilab.forge.jlatexmath.ParseException;
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch
new file mode 100644
index 0000000..83c6f6c
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch
@@ -0,0 +1,38 @@
+From: Bryan Gardiner <bog@khumba.net>
+Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=14009
+Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456
+
+Updates Scilab to build against FOP >=2.0. This is not tested, as I'm not sure
+of a test case, and it's awaiting upstream review.
+
+--- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
++++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
+@@ -43,10 +43,10 @@ public class FopConverter extends ContainerConverter {
+ String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase();
+
+ try {
+- FopFactory fopFactory = FopFactory.newInstance();
++ FopFactory fopFactory =
++ FopFactory.newInstance(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
+ fopFactory.addElementMapping(new JLaTeXMathElementMapping());
+ fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler());
+- fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
+
+ // Step 3: Construct fop with desired output format
+ OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName));
+--- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
++++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
+@@ -114,11 +114,11 @@ public class CodeExporter extends FOCodeConverter {
+ * @param format the page format
+ */
+ public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) {
+- FopFactory fopFactory = FopFactory.newInstance();
+ OutputStream out = null;
+
+ try {
+- fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
++ FopFactory fopFactory =
++ FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
+ FOUserAgent userAgent = fopFactory.newFOUserAgent();
+ userAgent.setProducer(CREATOR);
+ userAgent.setTitle(title);
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch
new file mode 100644
index 0000000..c12df96
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch
@@ -0,0 +1,91 @@
+From: Bryan Gardiner <bog@khumba.net>
+Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=13724
+Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456
+
+Updates Scilab 5.5.2 to build against xmlgraphics-common >=2.0. This is not
+tested, as I'm not sure of a test case, and a similar patch (where the
+super.processShape calls are passed cached=true) is already awaiting upstream
+review.
+
+--- a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
++++ b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
+@@ -857,7 +857,7 @@ public class Export {
+ }
+
+ @Override
+- public int processShape(Shape s) throws IOException {
++ public int processShape(Shape s, boolean cached) throws IOException {
+ if (s instanceof Ellipse2D.Double) {
+ Ellipse2D.Double ell = (Ellipse2D.Double) s;
+ if (ell.height == ell.width) {
+@@ -880,10 +880,10 @@ public class Export {
+ buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
+ it.next();
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+
+ for (; !it.isDone(); it.next()) {
+@@ -891,7 +891,7 @@ public class Export {
+ if (type == PathIterator.SEG_LINETO) {
+ buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+ }
+ buffer.append("] DP");
+@@ -899,7 +899,7 @@ public class Export {
+ return PathIterator.WIND_NON_ZERO;
+ }
+
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+ };
+ g2d.setGraphicContext(new GraphicContext());
+@@ -1029,7 +1029,7 @@ public class Export {
+ }
+
+ @Override
+- public int processShape(Shape s) throws IOException {
++ public int processShape(Shape s, boolean cached) throws IOException {
+ if (s instanceof Ellipse2D.Double) {
+ Ellipse2D.Double ell = (Ellipse2D.Double) s;
+ if (ell.height == ell.width) {
+@@ -1052,10 +1052,10 @@ public class Export {
+ buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
+ it.next();
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+
+ for (; !it.isDone(); it.next()) {
+@@ -1063,7 +1063,7 @@ public class Export {
+ if (type == PathIterator.SEG_LINETO) {
+ buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+ }
+ buffer.append("] DP");
+@@ -1071,7 +1071,7 @@ public class Export {
+ return PathIterator.WIND_NON_ZERO;
+ }
+
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+
+ };
diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 668f2fd..3e48d0b 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -49,7 +49,7 @@ CDEPEND="dev-libs/libpcre
dev-java/commons-io:1
dev-java/commons-logging:0
>=dev-java/flexdock-1.2.4:0
- dev-java/fop:0
+ >=dev-java/fop-2.0:0
=dev-java/gluegen-2.2.4:2.2
dev-java/javahelp:0
dev-java/jeuclid-core:0
@@ -74,8 +74,8 @@ DEPEND="${CDEPEND}
virtual/pkgconfig
debug? ( dev-util/lcov )
gui? (
- >=virtual/jdk-1.5
- doc? ( dev-java/batik:1.8
+ >=virtual/jdk-1.6
+ doc? ( >=dev-java/batik-1.8-r2:1.8
app-text/docbook-xsl-stylesheets
dev-java/xml-commons-external:1.4
dev-java/saxon:9 )
@@ -122,9 +122,12 @@ src_prepare() {
"${FILESDIR}/${P}-gluegen.patch" \
"${FILESDIR}/${P}-fix-random-runtime-failure.patch" \
"${FILESDIR}/${P}-accessviolation.patch" \
- "${FILESDIR}/${P}-missinglib.patch"
+ "${FILESDIR}/${P}-missinglib.patch" \
+ "${FILESDIR}/${P}-batik-1.8.patch" \
+ "${FILESDIR}/${P}-fop-2.0.patch" \
+ "${FILESDIR}/${P}-xmlgraphics-common-2.0.patch"
- # works for me on x86, but users are having
+ # works for me on x86, but users are having
# trouble without see #282 on github
append-ldflags $(no-as-needed)
@@ -156,7 +159,7 @@ src_prepare() {
java-pkg_jar-from jlatexmath-1,flexdock,skinlf
java-pkg_jar-from jgoodies-looks-2.6,jrosetta
java-pkg_jar-from avalon-framework-4.2,jeuclid-core
- java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1
+ java-pkg_jar-from xmlgraphics-commons-2,commons-io-1
java-pkg_jar-from jogl-2.2 jogl-all.jar jogl2.jar
java-pkg_jar-from gluegen-2.2 gluegen-rt.jar gluegen2-rt.jar
java-pkg_jar-from fop fop.jar
@@ -164,7 +167,7 @@ src_prepare() {
java-pkg_jar-from jlatexmath-fop-1
use xcos && java-pkg_jar-from jgraphx-2.5
if use doc; then
- java-pkg_jar-from --build-only batik-1.7 batik-all.jar
+ java-pkg_jar-from --build-only batik-1.8 batik-all.jar
java-pkg_jar-from --build-only saxon-9 saxon.jar saxon9he.jar
java-pkg_jar-from --build-only xml-commons-external-1.4 xml-apis-ext.jar
fi
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2018-01-27 20:25 Justin Lecher
0 siblings, 0 replies; 15+ messages in thread
From: Justin Lecher @ 2018-01-27 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 5acf363c71b1e17cc90caf09abb5a2697c406682
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 20:25:36 2018 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 20:25:36 2018 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=5acf363c
sci-mathematics/scilab: Update to new localization handling
Bump to EAPI=6
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.20, Repoman-2.3.6
.../files/scilab-5.5.2-accessviolation.patch | 4 +-
.../scilab/files/scilab-5.5.2-batik-1.8.patch | 13 ++--
.../scilab-5.5.2-fix-random-runtime-failure.patch | 4 +-
.../scilab/files/scilab-5.5.2-followlinks.patch | 4 +-
.../scilab/files/scilab-5.5.2-fop-2.0.patch | 8 +--
.../scilab/files/scilab-5.5.2-freehep.patch | 4 +-
.../scilab/files/scilab-5.5.2-gluegen.patch | 4 +-
.../scilab/files/scilab-5.5.2-java-heap.patch | 4 +-
.../scilab/files/scilab-5.5.2-missinglib.patch | 4 +-
.../scilab/files/scilab-5.5.2-nogui.patch | 4 +-
.../scilab-5.5.2-xmlgraphics-common-2.0.patch | 4 +-
sci-mathematics/scilab/scilab-5.5.2-r1.ebuild | 80 +++++++++++++---------
12 files changed, 78 insertions(+), 59 deletions(-)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
index a84de9a2b..a7e5c6d5f 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
@@ -1,6 +1,6 @@
diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab
---- scilab-5.5.0-orig/bin/scilab 2014-07-12 15:24:17.105686656 -0400
-+++ scilab-5.5.0/bin/scilab 2014-07-12 15:25:29.307725409 -0400
+--- a/bin/scilab 2014-07-12 15:24:17.105686656 -0400
++++ b/bin/scilab 2014-07-12 15:25:29.307725409 -0400
@@ -647,17 +647,6 @@
GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g)
export GTK_MODULES
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch
index aaf4da884..007d530ad 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch
@@ -7,8 +7,8 @@ with SAXSVGDocumentFactory being moved. This is not tested beyond "yes Scilab
still links to Batik to export SVGs," as I'm not sure of a good test case, and
it's awaiting upstream review.
---- a/scilab/configure
-+++ b/scilab/configure
+--- a/configure
++++ b/configure
@@ -16600,8 +16600,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik used
fi
@@ -74,8 +74,8 @@ it's awaiting upstream review.
fi
fi
---- a/scilab/configure.ac
-+++ b/scilab/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -1038,7 +1038,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version
BATIK=$PACKAGE_JAR_FILE
fi
@@ -85,8 +85,8 @@ it's awaiting upstream review.
# Commons I/O library
AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
---- a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
-+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
+--- a/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
++++ b/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentLoader;
import org.apache.batik.bridge.GVTBuilder;
import org.apache.batik.bridge.UserAgent;
@@ -96,3 +96,4 @@ it's awaiting upstream review.
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.util.XMLResourceDescriptor;
import org.scilab.forge.jlatexmath.ParseException;
+
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
index 92ac45339..da7b6e485 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
@@ -1,6 +1,6 @@
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
+--- a/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:26:31.342617365 -0400
++++ b/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:27:34.838621420 -0400
@@ -497,7 +497,7 @@
/*--------------------------------------------------------------------------*/
int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch
index fd6aa7bae..a3f60bee7 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch
@@ -1,5 +1,5 @@
---- m4/java.m4.orig 2014-02-11 23:43:03.030430258 -0500
-+++ m4/java.m4 2014-02-11 23:43:54.008428766 -0500
+--- a/m4/java.m4 2014-02-11 23:43:03.030430258 -0500
++++ b/m4/java.m4 2014-02-11 23:43:54.008428766 -0500
@@ -839,7 +839,7 @@
for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch
index 83c6f6ca4..18bdaac1d 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch
@@ -5,8 +5,8 @@ Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456
Updates Scilab to build against FOP >=2.0. This is not tested, as I'm not sure
of a test case, and it's awaiting upstream review.
---- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
-+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
+--- a/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
++++ b/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
@@ -43,10 +43,10 @@ public class FopConverter extends ContainerConverter {
String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase();
@@ -20,8 +20,8 @@ of a test case, and it's awaiting upstream review.
// Step 3: Construct fop with desired output format
OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName));
---- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
-+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
+--- a/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
++++ b/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
@@ -114,11 +114,11 @@ public class CodeExporter extends FOCodeConverter {
* @param format the page format
*/
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
index 3595902e7..46825cb29 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
@@ -1,6 +1,6 @@
diff -uNr scilab-5.5.2-orig/configure.ac scilab-5.5.2/configure.ac
---- scilab-5.5.2-orig/configure.ac 2016-06-05 12:30:06.582735449 -0400
-+++ scilab-5.5.2/configure.ac 2016-06-05 12:31:29.706708157 -0400
+--- a/configure.ac 2016-06-05 12:30:06.582735449 -0400
++++ b/configure.ac 2016-06-05 12:31:29.706708157 -0400
@@ -1024,7 +1024,7 @@
AC_SUBST(FREEHEP_IO)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch
index 151443926..d75c31e9a 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch
@@ -1,5 +1,5 @@
---- scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java.orig 2014-03-24 22:38:00.928934500 -0400
-+++ scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:37:33.947567043 -0400
+--- a/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:38:00.928934500 -0400
++++ b/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:37:33.947567043 -0400
@@ -157,7 +157,7 @@
static {
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch
index 31060d75a..ca17e52a6 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch
@@ -1,5 +1,5 @@
---- etc/jvm_options.xml.orig 2014-02-12 00:05:34.323390688 -0500
-+++ etc/jvm_options.xml 2014-02-12 00:05:53.977390112 -0500
+--- a/etc/jvm_options.xml 2014-02-12 00:05:34.323390688 -0500
++++ b/etc/jvm_options.xml 2014-02-12 00:05:53.977390112 -0500
@@ -22,7 +22,7 @@
<!-- ENABLE Just In Time java compiler -->
<option value="-Djava.compiler=JIT"/>
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch b/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch
index 7f88068c5..25b281820 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch
@@ -1,6 +1,6 @@
diff -urN scilab-5.5.1-orig/Makefile.am scilab-5.5.1/Makefile.am
---- scilab-5.5.1-orig/Makefile.am 2014-10-09 18:22:21.994610695 -0400
-+++ scilab-5.5.1/Makefile.am 2014-10-09 18:24:28.208333575 -0400
+--- a/Makefile.am 2014-10-09 18:22:21.994610695 -0400
++++ b/Makefile.am 2014-10-09 18:24:28.208333575 -0400
@@ -74,6 +74,7 @@
if NEED_JAVA
scilab_bin_LDADD += \
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-nogui.patch b/sci-mathematics/scilab/files/scilab-5.5.2-nogui.patch
index 60cee5a45..f83fa31d0 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-nogui.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-nogui.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2014-01-09 22:29:06.534469383 -0500
-+++ Makefile.in 2014-01-09 22:29:40.368471544 -0500
+--- a/Makefile.in 2014-01-09 22:29:06.534469383 -0500
++++ b/Makefile.in 2014-01-09 22:29:40.368471544 -0500
@@ -2247,8 +2247,8 @@
@BUILD_HELP_TRUE@ done; \
@BUILD_HELP_TRUE@ fi
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch
index c12df968f..4d90f30c7 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch
@@ -7,8 +7,8 @@ tested, as I'm not sure of a test case, and a similar patch (where the
super.processShape calls are passed cached=true) is already awaiting upstream
review.
---- a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
-+++ b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
+--- a/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
++++ b/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
@@ -857,7 +857,7 @@ public class Export {
}
diff --git a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
index c9f67ad06..c655c1324 100644
--- a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-
-RESTRICT="test"
+EAPI=6
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 pax-utils toolchain-funcs virtualx
+inherit autotools bash-completion-r1 check-reqs eutils flag-o-matic \
+ fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx xdg-utils
DESCRIPTION="Scientific software package for numerical computations"
HOMEPAGE="http://www.scilab.org/"
@@ -22,12 +20,29 @@ IUSE="bash-completion debug doc emf fftw +gui +matio mpi nls openmp
static-libs test tk +umfpack +xcos"
REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
-LINGUAS="fr_FR zh_CN zh_TW ru_RU ca_ES de_DE es_ES pt_BR ja_JP it_IT uk_UA pl_PL cs_CZ"
-LINGUAS_DOC="fr_FR pt_BR ja_JP ru_RU"
+RESTRICT="test"
-for l in ${LINGUAS}; do
- IUSE="${IUSE} linguas_${l}"
+IUSE_L10N="fr zh zh ru ca de es pt ja it uk pl cs"
+L10N_DOC="fr pt ja ru"
+
+map_lang() {
+ local lang=${1/_/-}
+ case $1 in
+ # Retain the following, which have a specific subtag
+ de_*|en_*|pt_*|zh_*) ;;
+ # Consider all other xx_XX as duplicates of the generic xx tag
+ *_*) lang=${1%%_*} ;;
+ esac
+ echo ${lang}
+}
+
+prev_l=
+for l in ${IUSE_L10N}; do
+ l=$(map_lang ${l})
+ [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
+ prev_l=${l}
done
+unset l prev_l
CDEPEND="
dev-libs/libpcre
@@ -89,6 +104,18 @@ DEPEND="${CDEPEND}
DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
+PATCHES=(
+ "${FILESDIR}/${P}-followlinks.patch"
+ "${FILESDIR}/${P}-gluegen.patch"
+ "${FILESDIR}/${P}-fix-random-runtime-failure.patch"
+ "${FILESDIR}/${P}-accessviolation.patch"
+ "${FILESDIR}/${P}-missinglib.patch"
+ "${FILESDIR}/${P}-batik-1.8.patch"
+ "${FILESDIR}/${P}-fop-2.0.patch"
+ "${FILESDIR}/${P}-xmlgraphics-common-2.0.patch"
+ "${FILESDIR}/${P}-freehep.patch"
+)
+
pkg_pretend() {
use doc && CHECKREQS_MEMORY="512M" check-reqs_pkg_pretend
}
@@ -107,37 +134,28 @@ pkg_setup() {
unset F77
java-pkg-opt-2_pkg_setup
- ALL_LINGUAS="en_US"
- ALL_LINGUAS_DOC="en_US"
- for l in ${LINGUAS}; do
- use linguas_${l} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
+ ALL_L10N="en_US"
+ ALL_L10N_DOC="en_US"
+ for l in ${IUSE_L10N}; do
+ use l10n_${l} && ALL_L10N="${ALL_L10N} ${l}"
done
- for l in ${LINGUAS_DOC}; do
- use linguas_${l} && ALL_LINGUAS_DOC="${ALL_LINGUAS_DOC} ${l}"
+ for l in ${L10N_DOC}; do
+ use l10n_${l} && ALL_L10N_DOC="${ALL_L10N_DOC} ${l}"
done
- export ALL_LINGUAS ALL_LINGUAS_DOC
+ export ALL_L10N ALL_L10N_DOC
}
src_prepare() {
- epatch \
- "${FILESDIR}/${P}-followlinks.patch" \
- "${FILESDIR}/${P}-gluegen.patch" \
- "${FILESDIR}/${P}-fix-random-runtime-failure.patch" \
- "${FILESDIR}/${P}-accessviolation.patch" \
- "${FILESDIR}/${P}-missinglib.patch" \
- "${FILESDIR}/${P}-batik-1.8.patch" \
- "${FILESDIR}/${P}-fop-2.0.patch" \
- "${FILESDIR}/${P}-xmlgraphics-common-2.0.patch" \
- "${FILESDIR}/${P}-freehep.patch"
+ default
# works for me on x86, but users are having
# trouble without see #282 on github
append-ldflags $(no-as-needed)
# increases java heap to 512M when building docs (sync with cheqreqs above)
- use doc && epatch "${FILESDIR}/${P}-java-heap.patch"
+ use doc && eapply "${FILESDIR}/${P}-java-heap.patch"
- # use the LINGUAS variable that we set
+ # use the L10N variable that we set
sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac ||die
# make sure the DOCBOOK_ROOT variable is set
@@ -260,7 +278,7 @@ src_install() {
}
pkg_postinst() {
- fdo-mime_mime_database_update
+ xdg_mimeinfo_database_update
einfo "If you are using the NVIDIA binary drivers, and run into graphics"
einfo "crashes, you may try to run scilab as follows:"
einfo "EGL_DRIVER=egl_glx scilab"
@@ -268,5 +286,5 @@ pkg_postinst() {
}
pkg_postrm() {
- fdo-mime_mime_database_update
+ xdg_mimeinfo_database_update
}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/
@ 2021-03-22 13:21 Andrew Ammerlaan
0 siblings, 0 replies; 15+ messages in thread
From: Andrew Ammerlaan @ 2021-03-22 13:21 UTC (permalink / raw
To: gentoo-commits
commit: 698d66d8d6b2f578c0a5a4685d7cd540221ea425
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Mar 22 13:19:45 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Mar 22 13:19:45 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=698d66d8
sci-mathematics/scilab: some progress
now it builds, but fails in the linker phase with
some undefined references in libscigraphics.so
Closes: https://github.com/gentoo/sci/issues/1060
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
sci-mathematics/scilab/files/scilab-6.1.0-followlinks.patch | 11 -----------
sci-mathematics/scilab/files/scilab-6.1.0-gluegen.patch | 11 -----------
sci-mathematics/scilab/files/scilab-6.1.0-java-heap.patch | 11 -----------
sci-mathematics/scilab/files/scilab-6.1.0-missinglib.patch | 11 -----------
sci-mathematics/scilab/scilab-5.5.2.ebuild | 3 ++-
sci-mathematics/scilab/scilab-6.0.2.ebuild | 13 +++++++++----
sci-mathematics/scilab/scilab-6.1.0.ebuild | 12 ++++++++----
7 files changed, 19 insertions(+), 53 deletions(-)
diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-followlinks.patch b/sci-mathematics/scilab/files/scilab-6.1.0-followlinks.patch
deleted file mode 100644
index a3f60bee7..000000000
--- a/sci-mathematics/scilab/files/scilab-6.1.0-followlinks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/java.m4 2014-02-11 23:43:03.030430258 -0500
-+++ b/m4/java.m4 2014-02-11 23:43:54.008428766 -0500
-@@ -839,7 +839,7 @@
- for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do
-
- # TODO check the behaviour when spaces
-- jars_resolved=`ls $jar 2>/dev/null`
-+ jars_resolved=$(realpath $(ls $jar 2>/dev/null) 2>/dev/null)
- for jar_resolved in $jars_resolved; do # If several jars matches
- if test -e "$jar_resolved"; then
- export ac_java_classpath="$jar_resolved:$ac_java_classpath"
diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-gluegen.patch b/sci-mathematics/scilab/files/scilab-6.1.0-gluegen.patch
deleted file mode 100644
index d75c31e9a..000000000
--- a/sci-mathematics/scilab/files/scilab-6.1.0-gluegen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:38:00.928934500 -0400
-+++ b/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:37:33.947567043 -0400
-@@ -157,7 +157,7 @@
-
- static {
- try {
-- System.loadLibrary("gluegen2-rt");
-+ System.loadLibrary("gluegen-rt");
- } catch (Exception e) {
- System.err.println(e);
- }
diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-java-heap.patch b/sci-mathematics/scilab/files/scilab-6.1.0-java-heap.patch
deleted file mode 100644
index ca17e52a6..000000000
--- a/sci-mathematics/scilab/files/scilab-6.1.0-java-heap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/etc/jvm_options.xml 2014-02-12 00:05:34.323390688 -0500
-+++ b/etc/jvm_options.xml 2014-02-12 00:05:53.977390112 -0500
-@@ -22,7 +22,7 @@
- <!-- ENABLE Just In Time java compiler -->
- <option value="-Djava.compiler=JIT"/>
- <!-- Set Java Heap space to 256mb -->
-- <option value="-Xmx256m"/>
-+ <option value="-Xmx512m"/>
- <!-- Avoid jvm to handle sigint (& other signals) -->
- <option value="-Xrs"/>
-
diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-missinglib.patch b/sci-mathematics/scilab/files/scilab-6.1.0-missinglib.patch
deleted file mode 100644
index 25b281820..000000000
--- a/sci-mathematics/scilab/files/scilab-6.1.0-missinglib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN scilab-5.5.1-orig/Makefile.am scilab-5.5.1/Makefile.am
---- a/Makefile.am 2014-10-09 18:22:21.994610695 -0400
-+++ b/Makefile.am 2014-10-09 18:24:28.208333575 -0400
-@@ -74,6 +74,7 @@
- if NEED_JAVA
- scilab_bin_LDADD += \
- $(top_builddir)/modules/console/libsciconsole.la \
-+ $(top_builddir)/modules/console/libsciconsole-minimal.la \
- $(top_builddir)/modules/jvm/libscijvm.la \
- $(top_builddir)/modules/commons/libscicommons.la
- else
diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 9c3a6a6e7..1226b4d76 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -78,6 +78,7 @@ CDEPEND="
~dev-java/jogl-2.2.4:2.2
>=dev-java/jrosetta-1.0.4:0
>dev-java/lucene-2:=[contrib(-)]
+ <dev-java/lucene-5:=[contrib(-)]
dev-java/skinlf:0
dev-java/xmlgraphics-commons:2
virtual/opengl
@@ -92,7 +93,6 @@ RDEPEND="${CDEPEND}
gui? ( >=virtual/jre-1.5 )"
DEPEND="${CDEPEND}
- virtual/pkgconfig
debug? ( dev-util/lcov )
gui? (
>=virtual/jdk-1.6
@@ -110,6 +110,7 @@ DEPEND="${CDEPEND}
dev-java/junit:4
dev-java/ant-junit4:0
gui? ( ${VIRTUALX_DEPEND} ) )"
+BDEPEND="virtual/pkgconfig"
DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
diff --git a/sci-mathematics/scilab/scilab-6.0.2.ebuild b/sci-mathematics/scilab/scilab-6.0.2.ebuild
index c2ea20de0..ed77b97bc 100644
--- a/sci-mathematics/scilab/scilab-6.0.2.ebuild
+++ b/sci-mathematics/scilab/scilab-6.0.2.ebuild
@@ -54,6 +54,7 @@ CDEPEND="
sys-devel/gettext
sys-libs/ncurses:0=
sys-libs/readline:0=
+ sys-process/time
emf? (
dev-java/freehep-graphicsio:0
dev-java/freehep-graphicsio-emf:0
@@ -78,6 +79,7 @@ CDEPEND="
~dev-java/jogl-2.2.4:2.2
>=dev-java/jrosetta-1.0.4:0
>dev-java/lucene-5:=[modules(-)]
+ <dev-java/lucene-7:=[modules(-)]
dev-java/skinlf:0
dev-java/xmlgraphics-commons:2
virtual/opengl
@@ -92,7 +94,6 @@ RDEPEND="${CDEPEND}
gui? ( >=virtual/jre-1.8 )"
DEPEND="${CDEPEND}
- virtual/pkgconfig
debug? ( dev-util/lcov )
gui? (
>=virtual/jdk-1.6
@@ -110,14 +111,16 @@ DEPEND="${CDEPEND}
dev-java/junit:4
dev-java/ant-junit4:0
gui? ( ${VIRTUALX_DEPEND} ) )"
+BDEPEND="virtual/pkgconfig"
DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
PATCHES=(
- "${FILESDIR}/${PN}-6.1.0-followlinks.patch"
- "${FILESDIR}/${PN}-6.1.0-gluegen.patch"
+ "${FILESDIR}/${PN}-5.5.2-followlinks.patch"
+ "${FILESDIR}/${PN}-5.5.2-gluegen.patch"
+ "${FILESDIR}/${PN}-5.5.2-ocaml-4.0.4.patch"
"${FILESDIR}/${PN}-6.1.0-accessviolation.patch"
- "${FILESDIR}/${PN}-6.1.0-missinglib.patch"
+ "${FILESDIR}/${PN}-5.5.2-missinglib.patch"
"${FILESDIR}/${PN}-6.1.0-freehep.patch"
"${FILESDIR}/${PN}-6.1.0-libxml.patch"
)
@@ -142,6 +145,8 @@ pkg_setup() {
# fails to compile in src/fortran/optml2.f:172:50 without this
test-flag-FC -fallow-argument-mismatch && append-fflags -fallow-argument-mismatch
+ # failure in src/cpp/GetSparseVariable.cpp:106:22
+ append-cxxflags -fpermissive
ALL_L10N="en_US"
ALL_L10N_DOC="en_US"
diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild b/sci-mathematics/scilab/scilab-6.1.0.ebuild
index 985cd5aa9..542930bdb 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.ebuild
@@ -54,6 +54,7 @@ CDEPEND="
sys-devel/gettext
sys-libs/ncurses:0=
sys-libs/readline:0=
+ sys-process/time
emf? (
dev-java/freehep-graphicsio:0
dev-java/freehep-graphicsio-emf:0
@@ -92,7 +93,6 @@ RDEPEND="${CDEPEND}
gui? ( >=virtual/jre-1.8 )"
DEPEND="${CDEPEND}
- virtual/pkgconfig
debug? ( dev-util/lcov )
gui? (
>=virtual/jdk-1.6
@@ -110,14 +110,16 @@ DEPEND="${CDEPEND}
dev-java/junit:4
dev-java/ant-junit4:0
gui? ( ${VIRTUALX_DEPEND} ) )"
+BDEPEND="virtual/pkgconfig"
DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
PATCHES=(
- "${FILESDIR}/${P}-followlinks.patch"
- "${FILESDIR}/${P}-gluegen.patch"
+ "${FILESDIR}/${PN}-5.5.2-followlinks.patch"
+ "${FILESDIR}/${PN}-5.5.2-gluegen.patch"
+ "${FILESDIR}/${PN}-5.5.2-ocaml-4.0.4.patch"
"${FILESDIR}/${P}-accessviolation.patch"
- "${FILESDIR}/${P}-missinglib.patch"
+ "${FILESDIR}/${PN}-5.5.2-missinglib.patch"
"${FILESDIR}/${P}-freehep.patch"
"${FILESDIR}/${P}-libxml.patch"
)
@@ -142,6 +144,8 @@ pkg_setup() {
# fails to compile in src/fortran/optml2.f:172:50 without this
test-flag-FC -fallow-argument-mismatch && append-fflags -fallow-argument-mismatch
+ # failure in src/cpp/GetSparseVariable.cpp:106:22
+ append-cxxflags -fpermissive
ALL_L10N="en_US"
ALL_L10N_DOC="en_US"
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2021-03-22 13:21 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-28 4:29 [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/ Guillaume Horel
-- strict thread matches above, loose matches on Subject: below --
2021-03-22 13:21 Andrew Ammerlaan
2018-01-27 20:25 Justin Lecher
2015-07-31 10:09 Justin Lecher
2015-04-03 20:25 Guillaume Horel
2015-02-01 3:01 Guillaume Horel
2014-10-10 3:26 Guillaume Horel
2014-07-12 19:50 Guillaume Horel
2014-01-10 4:26 Guillaume Horel
2013-11-16 17:00 Guillaume Horel
2013-10-31 4:30 Guillaume Horel
2013-10-30 5:47 Guillaume Horel
2013-10-28 5:40 Guillaume Horel
2013-10-21 21:41 Christoph Junghans
2013-01-29 3:51 Guillaume Horel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox