commit: 6bd45e6e3978870a2a1052d648a1f225dd320ef3 Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> AuthorDate: Tue Apr 22 23:29:12 2014 +0000 Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> CommitDate: Tue Apr 22 23:46:37 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6bd45e6e
sci-mathematics/scilab: version bump Package-Manager: portage-2.2.10 --- sci-mathematics/scilab/ChangeLog | 12 +++++++- ...on.patch => scilab-5.5.0-accessviolation.patch} | 2 +- ... scilab-5.5.0-fix-random-runtime-failure.patch} | 0 ...wlinks.patch => scilab-5.5.0-followlinks.patch} | 7 ++--- .../scilab/files/scilab-5.5.0-gluegen.patch | 11 ++++++++ .../scilab/files/scilab-5.5.0-java-heap.patch | 11 ++++++++ ..._beta1-nogui.patch => scilab-5.5.0-nogui.patch} | 0 ...ilab-5.5.0_beta1-always-use-dynamic-stack.patch | 33 ---------------------- ...ilab-5.5.0_beta1-disable-static-systemlib.patch | 20 ------------- .../scilab/files/scilab-5.5.0_beta1-gluegen.patch | 12 -------- .../files/scilab-5.5.0_beta1-java-heap.patch | 13 --------- sci-mathematics/scilab/metadata.xml | 17 +++++------ ...ilab-5.5.0_beta1.ebuild => scilab-5.5.0.ebuild} | 28 +++++++++--------- 13 files changed, 60 insertions(+), 106 deletions(-) diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog index 6d0b612..32e608d 100644 --- a/sci-mathematics/scilab/ChangeLog +++ b/sci-mathematics/scilab/ChangeLog @@ -1,7 +1,17 @@ # ChangeLog for sci-mathematics/scilab -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*scilab-5.5.0 (22 Apr 2014) + + 22 Apr 2014; Guillaume Horel <[email protected]> + +files/scilab-5.5.0-accessviolation.patch, + +files/scilab-5.5.0-fix-random-runtime-failure.patch, + +files/scilab-5.5.0-followlinks.patch, +files/scilab-5.5.0-gluegen.patch, + +files/scilab-5.5.0-java-heap.patch, +files/scilab-5.5.0-nogui.patch, + +scilab-5.5.0.ebuild, -scilab-5.5.0_beta1.ebuild, metadata.xml: + version bump + 22 Feb 2013; Justin Lecher <[email protected]> scilab-5.3.3-r1.ebuild, scilab-5.4.0.ebuild, metadata.xml: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config diff --git a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch similarity index 92% rename from sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch rename to sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch index e065075..39b4302 100644 --- a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch +++ b/sci-mathematics/scilab/files/scilab-5.5.0-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" -a $SCILAB_MODE != "nwni"; then ++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 diff --git a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch similarity index 100% rename from sci-mathematics/scilab/files/scilab-5.5.0_beta1-fix-random-runtime-failure.patch rename to sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch diff --git a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch similarity index 70% rename from sci-mathematics/scilab/files/scilab-5.5.0_beta1-followlinks.patch rename to sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch index 118df3b..fd6aa7b 100644 --- a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-followlinks.patch +++ b/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch @@ -1,7 +1,6 @@ -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 @@ +--- 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 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..1514439 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.0-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.0-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.0-java-heap.patch new file mode 100644 index 0000000..31060d7 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.0-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.0_beta1-nogui.patch b/sci-mathematics/scilab/files/scilab-5.5.0-nogui.patch similarity index 100% rename from sci-mathematics/scilab/files/scilab-5.5.0_beta1-nogui.patch rename to sci-mathematics/scilab/files/scilab-5.5.0-nogui.patch diff --git a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-always-use-dynamic-stack.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-always-use-dynamic-stack.patch deleted file mode 100644 index 309e45c..0000000 --- a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-always-use-dynamic-stack.patch +++ /dev/null @@ -1,33 +0,0 @@ -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_beta1-disable-static-systemlib.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-disable-static-systemlib.patch deleted file mode 100644 index ce5b032..0000000 --- a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-disable-static-systemlib.patch +++ /dev/null @@ -1,20 +0,0 @@ -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/files/scilab-5.5.0_beta1-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-gluegen.patch deleted file mode 100644 index 64717a7..0000000 --- a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-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.5.0_beta1-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-java-heap.patch deleted file mode 100644 index 990f967..0000000 --- a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-java-heap.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/metadata.xml b/sci-mathematics/scilab/metadata.xml index 9e49669..10d6ddd 100644 --- a/sci-mathematics/scilab/metadata.xml +++ b/sci-mathematics/scilab/metadata.xml @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <herd>sci-mathematics</herd> - <longdescription lang="en"> +<herd>sci-mathematics</herd> +<longdescription lang="en"> Scilab is a matrix-based scientific software package. Scilab contains hundreds of built-in mathematical functions, rich data structures (including polynomials, rationals,linear systems, lists, etc...) and comes with a number of specific toolboxes for control, signal processing, ... </longdescription> - <use> - <flag name="gui">Build the Java base graphical interface</flag> - <flag name="umfpack">Adds support for sparse solving +<use> + <flag name='gui'>Build the Java base graphical interface</flag> + <flag name="umfpack">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag> - <flag name="matio">Enable support for MATLAB file through <pkg>sci-libs/matio</pkg></flag> - <flag name="xcos">Enable building hybrid dynamic systems modeler and + <flag name='matio'>Enable support for MATLAB file through <pkg>sci-libs/matio</pkg></flag> + <flag name='xcos'>Enable building hybrid dynamic systems modeler and simulator Xcos</flag> - </use> + <flag name='emf'>Add suport for exporting to emf files</flag> +</use> </pkgmetadata> diff --git a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild b/sci-mathematics/scilab/scilab-5.5.0.ebuild similarity index 92% rename from sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild rename to sci-mathematics/scilab/scilab-5.5.0.ebuild index c721eab..8cf71ee 100644 --- a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild +++ b/sci-mathematics/scilab/scilab-5.5.0.ebuild @@ -10,21 +10,17 @@ 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/_beta1/-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"; +SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"; LICENSE="CeCILL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="bash-completion debug +doc fftw +gui +matio mpi nls openmp +IUSE="bash-completion debug doc emf fftw +gui +matio mpi nls openmp static-libs test tk +umfpack +xcos" REQUIRED_USE="xcos? ( gui ) doc? ( gui )" @@ -43,6 +39,7 @@ CDEPEND="dev-libs/libpcre 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 @@ -51,13 +48,13 @@ CDEPEND="dev-libs/libpcre dev-java/commons-logging:0 >=dev-java/flexdock-1.2.4:0 dev-java/fop:0 - =dev-java/gluegen-2.1.2:2.1 + =dev-java/gluegen-2.1.4:2.1 dev-java/javahelp:0 dev-java/jeuclid-core:0 dev-java/jgoodies-looks:2.0 dev-java/jlatexmath:1 dev-java/jlatexmath-fop:1 - =dev-java/jogl-2.1.2:2.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 @@ -78,15 +75,13 @@ DEPEND="${CDEPEND} dev-java/xml-commons-external:1.4 dev-java/saxon:9 ) xcos? ( dev-lang/ocaml - dev-java/jgraphx:2.1 ) ) + dev-java/jgraphx:2.5 ) ) 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 } @@ -101,6 +96,8 @@ pkg_setup() { fi FORTRAN_STANDARD="77 90" fortran-2_pkg_setup + #bug 8053 + unset F77 java-pkg-opt-2_pkg_setup ALL_LINGUAS="en_US" @@ -119,8 +116,6 @@ 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" \ "${FILESDIR}/${P}-accessviolation.patch" \ "${FILESDIR}/${P}-nogui.patch" @@ -162,9 +157,13 @@ src_prepare() { 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 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 @@ -203,6 +202,7 @@ src_configure() { $(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) \
