* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2011-06-10 17:06 Guillaume Horel
0 siblings, 0 replies; 18+ messages in thread
From: Guillaume Horel @ 2011-06-10 17:06 UTC (permalink / raw
To: gentoo-commits
commit: d9a7e888ff853614a80558674b020f5ce14661be
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Fri Jun 10 16:33:04 2011 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Jun 10 16:33:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d9a7e888
[sci-mathematics/scilab] version bump
---
sci-mathematics/scilab/ChangeLog | 8 +-
sci-mathematics/scilab/files/bug_9268.diff | 42 ++++++
sci-mathematics/scilab/files/java-heap-5.3.2.patch | 12 ++
sci-mathematics/scilab/scilab-5.3.2.ebuild | 133 ++++++++++++++++++++
4 files changed, 194 insertions(+), 1 deletions(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 9022ab0..e767c01 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for sci-mathematics/scilab
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*scilab-5.3.2 (10 Jun 2011)
+
+ 10 Jun 2011; Guillaume Horel <guillaume.horel@gmail.com>
+ +files/bug_9268.diff, +scilab-5.3.2.ebuild, +files/java-heap-5.3.2.patch:
+ Version bump and ebuild cleanup
+
*scilab-5.2.1 (25 Feb 2010)
25 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-mathematics/scilab/files/bug_9268.diff b/sci-mathematics/scilab/files/bug_9268.diff
new file mode 100644
index 0000000..8be3150
--- /dev/null
+++ b/sci-mathematics/scilab/files/bug_9268.diff
@@ -0,0 +1,42 @@
+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/java-heap-5.3.2.patch b/sci-mathematics/scilab/files/java-heap-5.3.2.patch
new file mode 100644
index 0000000..57d656b
--- /dev/null
+++ b/sci-mathematics/scilab/files/java-heap-5.3.2.patch
@@ -0,0 +1,12 @@
+diff -urN scilab-5.3.2-orig//etc/jvm_options.xml scilab-5.3.2/etc/jvm_options.xml
+--- scilab-5.3.2-orig//etc/jvm_options.xml 2011-05-25 23:20:12.145833420 -0400
++++ scilab-5.3.2/etc/jvm_options.xml 2011-05-25 23:20:58.760833451 -0400
+@@ -22,7 +22,7 @@
+ <!-- ENABLE Just In Time java compiler -->
+ <option value="-Djava.compiler=JIT"/>
+ <!-- Set Java Heap space to 256mb -->
+- <option value="-Xmx256m"/>
++ <option value="-Xmx512m"/>
+ <option value="-Dapple.laf.useScreenMenuBar=true" os="macosx"/>
+ <!-- DISABLE Just In Time java compiler -->
+ <!--
diff --git a/sci-mathematics/scilab/scilab-5.3.2.ebuild b/sci-mathematics/scilab/scilab-5.3.2.ebuild
new file mode 100644
index 0000000..8548043
--- /dev/null
+++ b/sci-mathematics/scilab/scilab-5.3.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+inherit eutils autotools java-pkg-2 check-reqs flag-o-matic
+
+DESCRIPTION="Scientific software package for numerical computations"
+LICENSE="CeCILL-2"
+HOMEPAGE="http://www.scilab.org/"
+SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
+
+SLOT="0"
+IUSE="doc fftw +gui hdf5 +matio nls tk +umfpack xcos"
+KEYWORDS="~amd64 ~x86"
+
+# hdf5 is required to compile (and use) xcos
+# doc generation and xcos is disabled if gui is disabled
+# see http://wiki.scilab.org/Description_of_configure_options
+
+# http://wiki.scilab.org/Dependencies_of_Scilab_5.X
+RDEPEND="virtual/lapack
+ tk? ( dev-lang/tk )
+ xcos? ( dev-lang/ocaml )
+ umfpack? ( sci-libs/umfpack )
+ gui? ( >=virtual/jre-1.5
+ dev-java/commons-logging
+ >=dev-java/flexdock-0.5.2
+ >=dev-java/jeuclid-core-3.1
+ >=dev-java/jlatexmath-0.9.4
+ ~dev-java/jgraphx-1.4.1.0
+ dev-java/jogl
+ dev-java/jgoodies-looks
+ dev-java/jrosetta
+ dev-java/javahelp
+ dev-java/fop
+ >=dev-java/batik-1.7
+ hdf5? ( dev-java/hdf-java ) )
+ fftw? ( sci-libs/fftw:3.0 )
+ matio? ( sci-libs/matio )
+ hdf5? ( >=sci-libs/hdf5-1.8.4 )"
+
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ doc? (
+ >=dev-java/jlatexmath-fop-0.9.4
+ ~dev-java/saxon-6.5.5
+ app-text/docbook-xsl-stylesheets )"
+
+pkg_setup() {
+ CHECKREQS_MEMORY="512"
+ java-pkg-2_pkg_setup
+
+ # temp Bug 6593 upstream, fixed
+ append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+ # Increases java heap to 512M when available, when building docs
+ check_reqs_conditional && epatch "${FILESDIR}"/java-heap-${PV}.patch
+ # fix scilib path
+ epatch "${FILESDIR}"/scilib-fix.patch
+ # bug 9268 reported upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268
+ epatch "${FILESDIR}"/bug_9268.diff
+
+ sed -i "s|-L\$SCI_SRCDIR/bin/|-L\$SCI_SRCDIR/bin/ \
+ -L$(java-config -i gluegen) \
+ -L$(java-config -i jogl)|" \
+ configure.ac || die
+
+ sed -i \
+ -e "/<\/librarypaths>/i\<path value=\"$(java-config -i gluegen)\"\/>" \
+ -e "/<\/librarypaths>/i\<path value=\"$(java-config -i jogl)\"\/>" \
+ -e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \
+ etc/librarypath.xml || die
+
+ eautoreconf
+ java-pkg-2_src_prepare
+}
+
+src_configure() {
+ local myopts
+ use doc && myopts="--with-docbook=/usr/share/sgml/docbook/xsl-stylesheets"
+ # javac complained about (j)hdf
+ use hdf5 && myopts="$myopts --with-hdf5-library=$(java-config -i hdf-java)"
+ export JAVA_HOME=$(java-config -O)
+ export BLAS_LIBS="$(pkg-config --libs blas)"
+ export LAPACK_LIBS="$(pkg-config --libs lapack)"
+ # mpi is only used for hdf5 i/o
+ if use hdf5 && has_version sci-libs/hdf5[mpi]; then
+ export CC=mpicc
+ export CXX=mpicxx
+ export FC=mpif90
+ export F77=mpif77
+ fi
+ econf \
+ --disable-rpath \
+ --without-pvm \
+ $(use_enable doc build-help) \
+ $(use_enable nls) \
+ $(use_enable nls build-localization) \
+ $(use_with fftw) \
+ $(use_with gui)\
+ $(use_with gui javasci)\
+ $(use_with hdf5) \
+ $(use_with matio) \
+ $(use_with umfpack) \
+ $(use_with tk) \
+ $(use_with xcos scicos) \
+ ${myopts}
+}
+
+src_compile() {
+ emake || die "emake failed"
+ if use doc; then
+ emake doc || die "emake failed"
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install || die "emake install failed"
+
+ # install docs
+ dodoc ACKNOWLEDGEMENTS README_Unix Readme_Visual.txt \
+ || die "failed to install docs"
+}
+
+pkg_postinst() {
+ einfo "To tell Scilab about your printers, set the environment"
+ einfo "variable PRINTERS in the form:"
+ einfo
+ einfo "PRINTERS=\"firstPrinter:secondPrinter:anotherPrinter\""
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2011-06-16 3:32 Guillaume Horel
0 siblings, 0 replies; 18+ messages in thread
From: Guillaume Horel @ 2011-06-16 3:32 UTC (permalink / raw
To: gentoo-commits
commit: 7fc4a56390b18faff3ddd8ffe95ae721763447a2
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Fri Jun 10 17:01:11 2011 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Jun 10 17:01:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7fc4a563
[sci-mathematics/scilab] version bump to 5.3.2
---
sci-mathematics/scilab/ChangeLog | 8 +-
sci-mathematics/scilab/files/bug_9268.diff | 42 ++++++
sci-mathematics/scilab/files/java-heap-5.3.2.patch | 12 ++
sci-mathematics/scilab/scilab-5.3.2.ebuild | 133 ++++++++++++++++++++
4 files changed, 194 insertions(+), 1 deletions(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 9022ab0..e767c01 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for sci-mathematics/scilab
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*scilab-5.3.2 (10 Jun 2011)
+
+ 10 Jun 2011; Guillaume Horel <guillaume.horel@gmail.com>
+ +files/bug_9268.diff, +scilab-5.3.2.ebuild, +files/java-heap-5.3.2.patch:
+ Version bump and ebuild cleanup
+
*scilab-5.2.1 (25 Feb 2010)
25 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-mathematics/scilab/files/bug_9268.diff b/sci-mathematics/scilab/files/bug_9268.diff
new file mode 100644
index 0000000..8be3150
--- /dev/null
+++ b/sci-mathematics/scilab/files/bug_9268.diff
@@ -0,0 +1,42 @@
+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/java-heap-5.3.2.patch b/sci-mathematics/scilab/files/java-heap-5.3.2.patch
new file mode 100644
index 0000000..57d656b
--- /dev/null
+++ b/sci-mathematics/scilab/files/java-heap-5.3.2.patch
@@ -0,0 +1,12 @@
+diff -urN scilab-5.3.2-orig//etc/jvm_options.xml scilab-5.3.2/etc/jvm_options.xml
+--- scilab-5.3.2-orig//etc/jvm_options.xml 2011-05-25 23:20:12.145833420 -0400
++++ scilab-5.3.2/etc/jvm_options.xml 2011-05-25 23:20:58.760833451 -0400
+@@ -22,7 +22,7 @@
+ <!-- ENABLE Just In Time java compiler -->
+ <option value="-Djava.compiler=JIT"/>
+ <!-- Set Java Heap space to 256mb -->
+- <option value="-Xmx256m"/>
++ <option value="-Xmx512m"/>
+ <option value="-Dapple.laf.useScreenMenuBar=true" os="macosx"/>
+ <!-- DISABLE Just In Time java compiler -->
+ <!--
diff --git a/sci-mathematics/scilab/scilab-5.3.2.ebuild b/sci-mathematics/scilab/scilab-5.3.2.ebuild
new file mode 100644
index 0000000..8548043
--- /dev/null
+++ b/sci-mathematics/scilab/scilab-5.3.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+inherit eutils autotools java-pkg-2 check-reqs flag-o-matic
+
+DESCRIPTION="Scientific software package for numerical computations"
+LICENSE="CeCILL-2"
+HOMEPAGE="http://www.scilab.org/"
+SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
+
+SLOT="0"
+IUSE="doc fftw +gui hdf5 +matio nls tk +umfpack xcos"
+KEYWORDS="~amd64 ~x86"
+
+# hdf5 is required to compile (and use) xcos
+# doc generation and xcos is disabled if gui is disabled
+# see http://wiki.scilab.org/Description_of_configure_options
+
+# http://wiki.scilab.org/Dependencies_of_Scilab_5.X
+RDEPEND="virtual/lapack
+ tk? ( dev-lang/tk )
+ xcos? ( dev-lang/ocaml )
+ umfpack? ( sci-libs/umfpack )
+ gui? ( >=virtual/jre-1.5
+ dev-java/commons-logging
+ >=dev-java/flexdock-0.5.2
+ >=dev-java/jeuclid-core-3.1
+ >=dev-java/jlatexmath-0.9.4
+ ~dev-java/jgraphx-1.4.1.0
+ dev-java/jogl
+ dev-java/jgoodies-looks
+ dev-java/jrosetta
+ dev-java/javahelp
+ dev-java/fop
+ >=dev-java/batik-1.7
+ hdf5? ( dev-java/hdf-java ) )
+ fftw? ( sci-libs/fftw:3.0 )
+ matio? ( sci-libs/matio )
+ hdf5? ( >=sci-libs/hdf5-1.8.4 )"
+
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ doc? (
+ >=dev-java/jlatexmath-fop-0.9.4
+ ~dev-java/saxon-6.5.5
+ app-text/docbook-xsl-stylesheets )"
+
+pkg_setup() {
+ CHECKREQS_MEMORY="512"
+ java-pkg-2_pkg_setup
+
+ # temp Bug 6593 upstream, fixed
+ append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+ # Increases java heap to 512M when available, when building docs
+ check_reqs_conditional && epatch "${FILESDIR}"/java-heap-${PV}.patch
+ # fix scilib path
+ epatch "${FILESDIR}"/scilib-fix.patch
+ # bug 9268 reported upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268
+ epatch "${FILESDIR}"/bug_9268.diff
+
+ sed -i "s|-L\$SCI_SRCDIR/bin/|-L\$SCI_SRCDIR/bin/ \
+ -L$(java-config -i gluegen) \
+ -L$(java-config -i jogl)|" \
+ configure.ac || die
+
+ sed -i \
+ -e "/<\/librarypaths>/i\<path value=\"$(java-config -i gluegen)\"\/>" \
+ -e "/<\/librarypaths>/i\<path value=\"$(java-config -i jogl)\"\/>" \
+ -e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \
+ etc/librarypath.xml || die
+
+ eautoreconf
+ java-pkg-2_src_prepare
+}
+
+src_configure() {
+ local myopts
+ use doc && myopts="--with-docbook=/usr/share/sgml/docbook/xsl-stylesheets"
+ # javac complained about (j)hdf
+ use hdf5 && myopts="$myopts --with-hdf5-library=$(java-config -i hdf-java)"
+ export JAVA_HOME=$(java-config -O)
+ export BLAS_LIBS="$(pkg-config --libs blas)"
+ export LAPACK_LIBS="$(pkg-config --libs lapack)"
+ # mpi is only used for hdf5 i/o
+ if use hdf5 && has_version sci-libs/hdf5[mpi]; then
+ export CC=mpicc
+ export CXX=mpicxx
+ export FC=mpif90
+ export F77=mpif77
+ fi
+ econf \
+ --disable-rpath \
+ --without-pvm \
+ $(use_enable doc build-help) \
+ $(use_enable nls) \
+ $(use_enable nls build-localization) \
+ $(use_with fftw) \
+ $(use_with gui)\
+ $(use_with gui javasci)\
+ $(use_with hdf5) \
+ $(use_with matio) \
+ $(use_with umfpack) \
+ $(use_with tk) \
+ $(use_with xcos scicos) \
+ ${myopts}
+}
+
+src_compile() {
+ emake || die "emake failed"
+ if use doc; then
+ emake doc || die "emake failed"
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install || die "emake install failed"
+
+ # install docs
+ dodoc ACKNOWLEDGEMENTS README_Unix Readme_Visual.txt \
+ || die "failed to install docs"
+}
+
+pkg_postinst() {
+ einfo "To tell Scilab about your printers, set the environment"
+ einfo "variable PRINTERS in the form:"
+ einfo
+ einfo "PRINTERS=\"firstPrinter:secondPrinter:anotherPrinter\""
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2011-06-16 3:32 Guillaume Horel
0 siblings, 0 replies; 18+ messages in thread
From: Guillaume Horel @ 2011-06-16 3:32 UTC (permalink / raw
To: gentoo-commits
commit: 744f34afa2d465b240ed1fd8726d512ebbb352eb
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Thu Jun 16 03:28:50 2011 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Thu Jun 16 03:28:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=744f34af
sci-mathematics/scilab-5.3.2.ebuild: ebuild fixes
---
sci-mathematics/scilab/ChangeLog | 4 ++++
.../scilab/files/scilib-5.3.2-scilib-fix.patch | 11 +++++++++++
sci-mathematics/scilab/scilab-5.3.2.ebuild | 16 +++++-----------
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index e767c01..e742125 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 16 Jun 2011; Guillaume Horel <guillaume.horel@gmail.com> scilab-5.3.2.ebuild,
+ +files/scilib-5.3.2-scilib-fix.patch:
+ Fixed jgraphx version dependency and disabled mpi support in hdf
+
*scilab-5.3.2 (10 Jun 2011)
10 Jun 2011; Guillaume Horel <guillaume.horel@gmail.com>
diff --git a/sci-mathematics/scilab/files/scilib-5.3.2-scilib-fix.patch b/sci-mathematics/scilab/files/scilib-5.3.2-scilib-fix.patch
new file mode 100644
index 0000000..6d3c2e1
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilib-5.3.2-scilib-fix.patch
@@ -0,0 +1,11 @@
+--- bin/scilab.orig 2009-12-16 08:24:36.000000000 +0100
++++ bin/scilab 2010-02-11 01:14:14.718781674 +0100
+@@ -508,7 +508,7 @@
+ #fi
+ #export PVM_ARCH
+
+-SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
++SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:/usr/lib64/scilab:/usr/lib/scilab
+ LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+
+ case $OS in
diff --git a/sci-mathematics/scilab/scilab-5.3.2.ebuild b/sci-mathematics/scilab/scilab-5.3.2.ebuild
index 8548043..db423ef 100644
--- a/sci-mathematics/scilab/scilab-5.3.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.2.ebuild
@@ -28,7 +28,7 @@ RDEPEND="virtual/lapack
>=dev-java/flexdock-0.5.2
>=dev-java/jeuclid-core-3.1
>=dev-java/jlatexmath-0.9.4
- ~dev-java/jgraphx-1.4.1.0
+ =dev-java/jgraphx-1.4.1*
dev-java/jogl
dev-java/jgoodies-looks
dev-java/jrosetta
@@ -38,7 +38,7 @@ RDEPEND="virtual/lapack
hdf5? ( dev-java/hdf-java ) )
fftw? ( sci-libs/fftw:3.0 )
matio? ( sci-libs/matio )
- hdf5? ( >=sci-libs/hdf5-1.8.4 )"
+ hdf5? ( >=sci-libs/hdf5-1.8.4[-mpi] )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
@@ -57,9 +57,9 @@ pkg_setup() {
src_prepare() {
# Increases java heap to 512M when available, when building docs
- check_reqs_conditional && epatch "${FILESDIR}"/java-heap-${PV}.patch
+ check_reqs_conditional && epatch "${FILESDIR}/java-heap-${PV}.patch"
# fix scilib path
- epatch "${FILESDIR}"/scilib-fix.patch
+ epatch "${FILESDIR}/${P}-scilib-fix.patch"
# bug 9268 reported upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268
epatch "${FILESDIR}"/bug_9268.diff
@@ -86,13 +86,7 @@ src_configure() {
export JAVA_HOME=$(java-config -O)
export BLAS_LIBS="$(pkg-config --libs blas)"
export LAPACK_LIBS="$(pkg-config --libs lapack)"
- # mpi is only used for hdf5 i/o
- if use hdf5 && has_version sci-libs/hdf5[mpi]; then
- export CC=mpicc
- export CXX=mpicxx
- export FC=mpif90
- export F77=mpif77
- fi
+
econf \
--disable-rpath \
--without-pvm \
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2011-09-19 22:06 Guillaume Horel
0 siblings, 0 replies; 18+ messages in thread
From: Guillaume Horel @ 2011-09-19 22:06 UTC (permalink / raw
To: gentoo-commits
commit: c1674ae9f47919337ef44f6cc01f72252bd2d528
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Mon Sep 19 22:04:50 2011 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Mon Sep 19 22:04:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c1674ae9
[sci-mathematics/scilab] install scilab mimetype
---
sci-mathematics/scilab/ChangeLog | 4 ++++
.../files/scilab-5.3.2-allow-hdf-1.8.7.patch | 13 +++++++++++++
sci-mathematics/scilab/files/scilab.xml | 13 +++++++++++++
sci-mathematics/scilab/scilab-5.3.2.ebuild | 17 +++++++++--------
4 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index b889a95..d5cc783 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 19 Sep 2011; Guillaume Horel <guillaume.horel@gmail.com> scilab-5.3.2.ebuild,
+ +files/scilab-5.3.2-allow-hdf-1.8.7.patch, +files/scilab.xml:
+ cleanup and import fixes from the opensuse rpm.
+
19 Sep 2011; Guillaume Horel <guillaume.horel@gmail.com> scilab-5.3.2.ebuild:
make sure the BLAS_LIBS variable is used
see #373565
diff --git a/sci-mathematics/scilab/files/scilab-5.3.2-allow-hdf-1.8.7.patch b/sci-mathematics/scilab/files/scilab-5.3.2-allow-hdf-1.8.7.patch
new file mode 100644
index 0000000..868ec09
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.2-allow-hdf-1.8.7.patch
@@ -0,0 +1,13 @@
+Index: modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+===================================================================
+--- modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java.orig
++++ modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+@@ -61,7 +61,7 @@ public final class Xcos {
+ * Dependencies version
+ */
+ private static final List<String> MXGRAPH_VERSIONS = Arrays.asList("1.4.1.0");
+- private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]");
++ private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]", "[1, 8, 7]");
+ private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7");
+
+ private static final String UNABLE_TO_LOAD_JGRAPHX =
diff --git a/sci-mathematics/scilab/files/scilab.xml b/sci-mathematics/scilab/files/scilab.xml
new file mode 100644
index 0000000..8594e7b
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="text/x-sci">
+ <comment>Scilab Function</comment>
+ <sub-class-of type="text/plain"/>
+ <glob pattern="*.sci"/>
+ </mime-type>
+ <mime-type type="text/x-sce">
+ <comment>Scilab Script</comment>
+ <sub-class-of type="text/plain"/>
+ <glob pattern="*.sce"/>
+ </mime-type>
+</mime-info>
diff --git a/sci-mathematics/scilab/scilab-5.3.2.ebuild b/sci-mathematics/scilab/scilab-5.3.2.ebuild
index adddadb..d4148fc 100644
--- a/sci-mathematics/scilab/scilab-5.3.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.2.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit autotools check-reqs eutils flag-o-matic java-pkg-2
+inherit autotools check-reqs eutils fdo-mime flag-o-matic java-pkg-2
DESCRIPTION="Scientific software package for numerical computations"
LICENSE="CeCILL-2"
@@ -21,7 +21,8 @@ KEYWORDS="~amd64 ~x86"
# http://wiki.scilab.org/Dependencies_of_Scilab_5.X
RDEPEND="virtual/lapack
tk? ( dev-lang/tk )
- xcos? ( dev-lang/ocaml )
+ xcos? ( dev-lang/ocaml
+ dev-java/hdf-java )
umfpack? ( sci-libs/umfpack )
gui? ( >=virtual/jre-1.5
dev-java/commons-logging
@@ -63,6 +64,7 @@ src_prepare() {
epatch "${FILESDIR}/${P}-scilib-fix.patch"
# bug 9268 reported upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268
epatch "${FILESDIR}"/bug_9268.diff
+ epatch "${FILESDIR}/${P}-allow-hdf-1.8.7.patch"
#bug 9824 upstream
sed -i "/BLAS_LIBS=$/d" m4/libsmath.m4
@@ -104,7 +106,7 @@ src_configure() {
$(use_with matio) \
$(use_with umfpack) \
$(use_with tk) \
- $(use_with xcos scicos) \
+ $(use_with xcos) \
${myopts}
}
@@ -117,15 +119,14 @@ src_compile() {
src_install() {
emake DESTDIR="${ED}" install || die "emake install failed"
-
+ find "${ED}" -name '*.la' -delete || die
# install docs
dodoc ACKNOWLEDGEMENTS README_Unix Readme_Visual.txt \
|| die "failed to install docs"
+ insinto /usr/share/mime/packages
+ doins "${FILESDIR}/${PN}.xml"
}
pkg_postinst() {
- einfo "To tell Scilab about your printers, set the environment"
- einfo "variable PRINTERS in the form:"
- einfo
- einfo "PRINTERS=\"firstPrinter:secondPrinter:anotherPrinter\""
+ fdo-mime_mime_database_update
}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2011-11-15 22:08 Guillaume Horel
0 siblings, 0 replies; 18+ messages in thread
From: Guillaume Horel @ 2011-11-15 22:08 UTC (permalink / raw
To: gentoo-commits
commit: 40aa6d1571d5f00d6640f0b27ddf08a22c9cc381
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Tue Nov 15 22:06:50 2011 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Tue Nov 15 22:06:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=40aa6d15
[sci-mathematics/scilab] 5.3.3 version bump
---
sci-mathematics/scilab/ChangeLog | 12 ++
sci-mathematics/scilab/files/addchapter.diff | 16 ---
sci-mathematics/scilab/files/adddemo.diff | 23 ----
sci-mathematics/scilab/files/buildDocPT_BR.diff | 14 --
.../scilab/files/disablebuildhelp.patch | 39 ++++++
sci-mathematics/scilab/files/full_support.diff | 24 ----
sci-mathematics/scilab/files/java-heap-5.3.3.patch | 12 ++
.../scilab/files/missingaddchapter.diff | 25 ----
.../scilab/files/modelicac-not-available.diff | 36 -----
sci-mathematics/scilab/files/renesas-sh.diff | 34 -----
.../scilab/files/s390javadetection.diff | 14 --
.../files/scilab-5.3.3-allow-hdf-1.8.7.patch | 13 ++
.../scilab/files/scilab-5.3.3-scilib-fix.patch | 11 ++
sci-mathematics/scilab/files/sparc64.diff | 40 ------
sci-mathematics/scilab/scilab-5.3.3.ebuild | 138 ++++++++++++++++++++
15 files changed, 225 insertions(+), 226 deletions(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index d5cc783..c41856e 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,18 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*scilab-5.3.3 (15 Nov 2011)
+
+ 15 Nov 2011; Guillaume Horel <guillaume.horel@gmail.com>
+ +scilab-5.3.3.ebuild, +files/scilab-5.3.3-allow-hdf-1.8.7.patch,
+ +files/scilab-5.3.3-scilib-fix.patch, +files/java-heap-5.3.3.patch,
+ +files/disablebuildhelp.patch, -files/addchapter.diff, -files/adddemo.diff,
+ -files/buildDocPT_BR.diff, -files/full_support.diff,
+ -files/missingaddchapter.diff, -files/modelicac-not-available.diff,
+ -files/renesas-sh.diff, -files/s390javadetection.diff, -files/sparc64.diff:
+ version bump. Thanks to security0ff for most of the changes!
+ see #390221
+
19 Sep 2011; Guillaume Horel <guillaume.horel@gmail.com> scilab-5.3.2.ebuild,
+files/scilab-5.3.2-allow-hdf-1.8.7.patch, +files/scilab.xml:
cleanup and import fixes from the opensuse rpm.
diff --git a/sci-mathematics/scilab/files/addchapter.diff b/sci-mathematics/scilab/files/addchapter.diff
deleted file mode 100644
index b2d71ac..0000000
--- a/sci-mathematics/scilab/files/addchapter.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur scilab-5.1.1.orig/modules/helptools/macros/add_module_help_chapter.sci scilab-5.1.1/modules/helptools/macros/add_module_help_chapter.sci
---- scilab-5.1.1.orig/modules/helptools/macros/add_module_help_chapter.sci 2009-04-14 09:30:56.000000000 +0200
-+++ scilab-5.1.1/modules/helptools/macros/add_module_help_chapter.sci 2009-04-14 18:07:23.000000000 +0200
-@@ -19,10 +19,8 @@
- path_addchapter = SCI+"/modules/"+modulename+"/help/"+getdefaultlanguage()+"/addchapter.sce";
- end
-
-- //try
-+ if ( fileinfo(path_addchapter) <> [] ) then
- exec(path_addchapter);
-- //catch
-- // warning(gettext("Incorrect module path ")+path_addchapter);
-- //end
-+ end
-
- endfunction
\ No newline at end of file
diff --git a/sci-mathematics/scilab/files/adddemo.diff b/sci-mathematics/scilab/files/adddemo.diff
deleted file mode 100644
index e8e7f1c..0000000
--- a/sci-mathematics/scilab/files/adddemo.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur scilab-5.1.1.orig/modules/core/macros/add_demo.sci scilab-5.1.1/modules/core/macros/add_demo.sci
---- scilab-5.1.1.orig/modules/core/macros/add_demo.sci 2009-04-14 09:30:44.000000000 +0200
-+++ scilab-5.1.1/modules/core/macros/add_demo.sci 2009-04-14 17:54:41.000000000 +0200
-@@ -17,9 +17,7 @@
-
- path=pathconvert(path,%f,%t);
-
-- if fileinfo(path)==[] then
-- error(msprintf(gettext("%s: The file %s does not exist.\n"),"add_demo",path));
-- end
-+ if fileinfo(path) <> [] then
-
- if isdir(path) then
- error(msprintf(gettext("%s: Wrong input argument #%d: Path to a scilab script file expected.\n"),"add_demo",2));
-@@ -33,7 +31,7 @@
- k1=find(demolist(k,2)==path)
- if k1==[] then demolist=[demolist;demotitle+" ("+string(size(k,"*"))+")",path],end
- end
--
-+ end
- clear demolist
-
- endfunction
\ No newline at end of file
diff --git a/sci-mathematics/scilab/files/buildDocPT_BR.diff b/sci-mathematics/scilab/files/buildDocPT_BR.diff
deleted file mode 100644
index 411e9e5..0000000
--- a/sci-mathematics/scilab/files/buildDocPT_BR.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: scilab-5.2.0/Makefile.am
-===================================================================
---- scilab-5.2.0.orig/Makefile.am 2010-02-03 16:08:18.000000000 +0100
-+++ scilab-5.2.0/Makefile.am 2010-02-03 16:09:33.000000000 +0100
-@@ -151,6 +151,9 @@
- echo "-- Building documentation (French) --"; \
- echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'fr_FR');exit;\""; \
- SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltojar([],[],'fr_FR');exit;"; \
-+ echo "-- Building documentation (portugues do Brasil) --"; \
-+ echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'pt_BR');exit;\""; \
-+ SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltojar([],[],'pt_BR');exit;"; \
- else \
- echo "Cannot find Scilab-adv-cli binary"; \
- fi
diff --git a/sci-mathematics/scilab/files/disablebuildhelp.patch b/sci-mathematics/scilab/files/disablebuildhelp.patch
new file mode 100644
index 0000000..4fbabd9
--- /dev/null
+++ b/sci-mathematics/scilab/files/disablebuildhelp.patch
@@ -0,0 +1,39 @@
+From f4c20c8fb5d9540e4972ae75dbd2a34aa2a3622b Mon Sep 17 00:00:00 2001
+From: Sylvestre Ledru <sylvestre.ledru@scilab.org>
+Date: Sat, 1 Oct 2011 00:15:59 +0200
+Subject: [PATCH] * bug 9883 fixed - Build with --disable-build-help was failing.
+
+Change-Id: I93da6b7312effb261fd95d90613f87e9988b35f9
+---
+ scilab/modules/scinotes/Makefile.am | 2 ++
+ scilab/modules/scinotes/Makefile.in | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/scilab/modules/scinotes/Makefile.am b/scilab/modules/scinotes/Makefile.am
+index 8ffad2d..ad5dbde 100644
+--- a/scilab/modules/scinotes/Makefile.am
++++ b/scilab/modules/scinotes/Makefile.am
+@@ -112,5 +112,7 @@ libsciscinotes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+ libsciscinotes_la_sci_gateway_DATA = sci_gateway/scinotes_gateway.xml
+
+ if GUI
++if BUILD_HELP
+ USEANT=1
+ endif
++endif
+diff --git a/scilab/modules/scinotes/Makefile.in b/scilab/modules/scinotes/Makefile.in
+index 95b6f57..673fa4c 100644
+--- a/scilab/modules/scinotes/Makefile.in
++++ b/scilab/modules/scinotes/Makefile.in
+@@ -565,7 +565,7 @@ libsciscinotes_la_LIBADD = libsciscinotes-algo.la
+ #### scinotes : gateway declaration ####
+ libsciscinotes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+ libsciscinotes_la_sci_gateway_DATA = sci_gateway/scinotes_gateway.xml
+-@GUI_TRUE@USEANT = 1
++@BUILD_HELP_TRUE@@GUI_TRUE@USEANT = 1
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
+
+--
+1.7.2.3
+
diff --git a/sci-mathematics/scilab/files/full_support.diff b/sci-mathematics/scilab/files/full_support.diff
deleted file mode 100644
index 9d7554e..0000000
--- a/sci-mathematics/scilab/files/full_support.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 409faec413e7491450f51059af02b0469cbb01eb
-Author: Sylvestre Ledru <sylvestre.ledru@scilab.org>
-Date: Fri Feb 19 23:42:38 2010 +0100
-
- full support of sparc64
-
-diff --git a/scilab/bin/scilab b/scilab/bin/scilab
-index c4d6548..7ec4bbc 100755
---- a/scilab/bin/scilab
-+++ b/scilab/bin/scilab
-@@ -371,9 +371,12 @@ fi
- "ppc")
- proc="ppc"
- ;;
-- "alpha")
-+ "alpha")
- proc="alpha"
- ;;
-+ "sparc64")
-+ proc="sparc"
-+ ;;
- *)
- echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
- ;;
diff --git a/sci-mathematics/scilab/files/java-heap-5.3.3.patch b/sci-mathematics/scilab/files/java-heap-5.3.3.patch
new file mode 100644
index 0000000..57d656b
--- /dev/null
+++ b/sci-mathematics/scilab/files/java-heap-5.3.3.patch
@@ -0,0 +1,12 @@
+diff -urN scilab-5.3.2-orig//etc/jvm_options.xml scilab-5.3.2/etc/jvm_options.xml
+--- scilab-5.3.2-orig//etc/jvm_options.xml 2011-05-25 23:20:12.145833420 -0400
++++ scilab-5.3.2/etc/jvm_options.xml 2011-05-25 23:20:58.760833451 -0400
+@@ -22,7 +22,7 @@
+ <!-- ENABLE Just In Time java compiler -->
+ <option value="-Djava.compiler=JIT"/>
+ <!-- Set Java Heap space to 256mb -->
+- <option value="-Xmx256m"/>
++ <option value="-Xmx512m"/>
+ <option value="-Dapple.laf.useScreenMenuBar=true" os="macosx"/>
+ <!-- DISABLE Just In Time java compiler -->
+ <!--
diff --git a/sci-mathematics/scilab/files/missingaddchapter.diff b/sci-mathematics/scilab/files/missingaddchapter.diff
deleted file mode 100644
index 5b96359..0000000
--- a/sci-mathematics/scilab/files/missingaddchapter.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-commit aad7b644ccc97638598c2831d550edb51bdb13f1
-Author: Sylvestre Ledru <sylvestre.ledru@scilab.org>
-Date: Mon Apr 27 15:16:20 2009 +0200
-
- Missing addchapter.sce
-
-diff --git a/scilab/modules/call_scilab/help/en_US/addchapter.sce b/scilab/modules/call_scilab/help/en_US/addchapter.sce
-new file mode 100644
-index 0000000..29d4a54
---- /dev/null
-+++ b/scilab/modules/call_scilab/help/en_US/addchapter.sce
-@@ -0,0 +1,13 @@
-+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-+// Copyright (C) 2007-2008 - INRIA - Allan CORNET
-+// Copyright (C) 2009 - DIGITEO
-+//
-+// This file must be used under the terms of the CeCILL.
-+// This source file is licensed as described in the file COPYING, which
-+// you should have received as part of this distribution. The terms
-+// are also available at
-+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-+
-+path = SCI+"/modules/call_scilab/help/en_US";
-+add_help_chapter("call_scilab API",path,%T);
-+clear path add_help_chapter;
diff --git a/sci-mathematics/scilab/files/modelicac-not-available.diff b/sci-mathematics/scilab/files/modelicac-not-available.diff
deleted file mode 100644
index 2e3bea7..0000000
--- a/sci-mathematics/scilab/files/modelicac-not-available.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/build_block.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/build_block.sci
---- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/build_block.sci 2009-04-14 09:31:05.000000000 +0200
-+++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/build_block.sci 2009-04-30 11:28:37.000000000 +0200
-@@ -72,7 +72,7 @@
- //++ Check that modelica compiler is available
- //++ Otherwise, give some feedback and quit
- if ~with_modelica_compiler() then
-- messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable."), "build_block"),"modal","error");
-+ messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.")+" This is probably due to the non support of ocamlopt on your architecture.", "build_block"),"modal","error");
- ok = %f
- end
-
-diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/MODCOM.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/MODCOM.sci
---- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/MODCOM.sci 2009-04-14 09:31:05.000000000 +0200
-+++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/MODCOM.sci 2009-04-30 11:28:37.000000000 +0200
-@@ -80,7 +80,7 @@
- //++ Check that modelica compiler is available
- //++ Otherwise, give some feedback and quit
- if ~with_modelica_compiler() then
-- messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable."), "MODCOM"),"modal","error");
-+ messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.")+" This is probably due to the non support of ocamlopt on your architecture.", "MODCOM"),"modal","error");
- ok = %f
- break
- end
-diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/genmoc.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/genmoc.sci
---- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/genmoc.sci 2009-11-09 15:53:03.000000000 +0100
-+++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/genmoc.sci 2009-11-09 15:53:37.000000000 +0100
-@@ -29,7 +29,7 @@
- //++ Check that modelica compiler is available
- //++ Otherwise, give some feedback and quit
- if ~with_modelica_compiler() then
-- error(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable."), "genmoc"))
-+ error(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.\n")+" This is probably due to the non support of ocamlopt on your architecture.", "genmoc"))
- return
- end
-
diff --git a/sci-mathematics/scilab/files/renesas-sh.diff b/sci-mathematics/scilab/files/renesas-sh.diff
deleted file mode 100644
index 7aa655f..0000000
--- a/sci-mathematics/scilab/files/renesas-sh.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 9586bf474819f11734927d5138056c0c837b9bdb
-Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
-Date: Fri Feb 19 23:44:51 2010 +0100
-
- Support of Renesas SH(sh4)
-
-diff --git a/scilab/bin/scilab b/scilab/bin/scilab
-index 7ec4bbc..f453f9a 100755
---- a/scilab/bin/scilab
-+++ b/scilab/bin/scilab
-@@ -377,6 +377,9 @@ fi
- "sparc64")
- proc="sparc"
- ;;
-+ sh*)
-+ proc="sh"
-+ ;;
- *)
- echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
- ;;
-diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
-index 469019b..918fbf7 100644
---- a/scilab/m4/java.m4
-+++ b/scilab/m4/java.m4
-@@ -446,6 +446,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
- s390x) # s390 arch can also returns s390x
- machine=s390
- ;;
-+ sh*)
-+ machine=sh
-+ ;;
- esac
-
- AC_MSG_LOG([Looking for JNI libs with $machine as machine hardware name])
diff --git a/sci-mathematics/scilab/files/s390javadetection.diff b/sci-mathematics/scilab/files/s390javadetection.diff
deleted file mode 100644
index 940f229..0000000
--- a/sci-mathematics/scilab/files/s390javadetection.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
-index 294de10..52c571f 100644
---- a/scilab/m4/java.m4
-+++ b/scilab/m4/java.m4
-@@ -425,6 +425,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
- powerpc|ppc64)
- machine=ppc
- ;;
-+ s390x) # s390 arch can also returns s390x
-+ machine=s390
-+ ;;
- esac
-
- # Check for known JDK installation layouts
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-allow-hdf-1.8.7.patch b/sci-mathematics/scilab/files/scilab-5.3.3-allow-hdf-1.8.7.patch
new file mode 100644
index 0000000..868ec09
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-allow-hdf-1.8.7.patch
@@ -0,0 +1,13 @@
+Index: modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+===================================================================
+--- modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java.orig
++++ modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+@@ -61,7 +61,7 @@ public final class Xcos {
+ * Dependencies version
+ */
+ private static final List<String> MXGRAPH_VERSIONS = Arrays.asList("1.4.1.0");
+- private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]");
++ private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]", "[1, 8, 7]");
+ private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7");
+
+ private static final String UNABLE_TO_LOAD_JGRAPHX =
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-scilib-fix.patch b/sci-mathematics/scilab/files/scilab-5.3.3-scilib-fix.patch
new file mode 100644
index 0000000..6d3c2e1
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-scilib-fix.patch
@@ -0,0 +1,11 @@
+--- bin/scilab.orig 2009-12-16 08:24:36.000000000 +0100
++++ bin/scilab 2010-02-11 01:14:14.718781674 +0100
+@@ -508,7 +508,7 @@
+ #fi
+ #export PVM_ARCH
+
+-SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
++SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:/usr/lib64/scilab:/usr/lib/scilab
+ LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+
+ case $OS in
diff --git a/sci-mathematics/scilab/files/sparc64.diff b/sci-mathematics/scilab/files/sparc64.diff
deleted file mode 100644
index ab852d2..0000000
--- a/sci-mathematics/scilab/files/sparc64.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 82bc3daabc423d8fa472308ace64979587c80f92
-Author: Sylvestre Ledru <sylvestre.ledru@scilab.org>
-Date: Fri Feb 19 12:08:35 2010 +0100
-
- Support of Linux sparc64 (debian)
-
-diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
-index 9b75699..469019b 100644
---- a/scilab/m4/java.m4
-+++ b/scilab/m4/java.m4
-@@ -433,7 +433,7 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
- # Solaris 10 x86
- machine=i386
- ;;
-- sun*)
-+ sun*|sparc64)
- # Sun
- machine=sparc
- ;;
---- a/scilab/bin/scilab 2010-02-19 23:59:34.000000000 +0100
-+++ b/scilab/bin/scilab 2010-02-20 00:00:23.000000000 +0100
-@@ -374,6 +374,9 @@
- "alpha")
- proc="alpha"
- ;;
-+ "sparc64")
-+ proc="sparc"
-+ ;;
- *)
- echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
- ;;
-@@ -392,7 +395,7 @@
- proc="i386"
- ;;
- # check for the 64 bits syntax
-- "sparc")
-+ "sparc"|"sparc64")
- proc="sparc"
- ;;
- *)
diff --git a/sci-mathematics/scilab/scilab-5.3.3.ebuild b/sci-mathematics/scilab/scilab-5.3.3.ebuild
new file mode 100644
index 0000000..a6d2050
--- /dev/null
+++ b/sci-mathematics/scilab/scilab-5.3.3.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+inherit autotools check-reqs eutils fdo-mime flag-o-matic java-pkg-2
+
+DESCRIPTION="Scientific software package for numerical computations"
+LICENSE="CeCILL-2"
+HOMEPAGE="http://www.scilab.org/"
+SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
+
+SLOT="0"
+IUSE="doc fftw +gui hdf5 +matio nls tk +umfpack xcos"
+KEYWORDS="~amd64 ~x86"
+
+# hdf5 is required to compile (and use) xcos
+# doc generation and xcos is disabled if gui is disabled
+# see http://wiki.scilab.org/Description_of_configure_options
+
+# http://wiki.scilab.org/Dependencies_of_Scilab_5.X
+RDEPEND="virtual/lapack
+ tk? ( dev-lang/tk )
+ xcos? ( dev-lang/ocaml
+ dev-java/hdf-java )
+ umfpack? ( sci-libs/umfpack )
+ gui? ( >=virtual/jre-1.5
+ dev-java/commons-logging
+ >=dev-java/flexdock-0.5.2
+ >=dev-java/jeuclid-core-3.1
+ >=dev-java/jlatexmath-0.9.4
+ =dev-java/jgraphx-1.4.1.0
+ dev-java/jogl
+ dev-java/jgoodies-looks
+ dev-java/jrosetta
+ dev-java/javahelp
+ dev-java/fop
+ >=dev-java/batik-1.7
+ hdf5? ( dev-java/hdf-java ) )
+ fftw? ( sci-libs/fftw:3.0 )
+ matio? ( sci-libs/matio )
+ hdf5? ( >=sci-libs/hdf5-1.8.4[-mpi] )"
+
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ doc? (
+ >=dev-java/jlatexmath-fop-0.9.4
+ ~dev-java/saxon-6.5.5
+ app-text/docbook-xsl-stylesheets )"
+
+pkg_setup() {
+ if use doc; then
+ CHECKREQS_MEMORY="512M"
+ check-reqs_pkg_setup
+ fi
+ java-pkg-2_pkg_setup
+
+ # temp Bug 6593 upstream, fixed
+ append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+ # Increases java heap to 512M when available, when building docs
+ use doc && epatch "${FILESDIR}/java-heap-${PV}.patch"
+ # fix scilib path
+ epatch "${FILESDIR}/${P}-scilib-fix.patch"
+ # bug 9268 reported upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268
+ epatch "${FILESDIR}"/bug_9268.diff
+ #bug 9883 upstream
+ epatch "${FILESDIR}/disablebuildhelp.patch"
+ #bug 10244 upstream
+ mv modules/call_scilab/examples/call_scilab/NET/VB.NET/My\ Project/ \
+ modules/call_scilab/examples/call_scilab/NET/VB.NET/My_Project||die
+ #bug 9824 upstream
+ sed -i "/BLAS_LIBS=$/d" m4/libsmath.m4
+ epatch "${FILESDIR}/${P}-allow-hdf-1.8.7.patch"
+
+ sed -i "s|-L\$SCI_SRCDIR/bin/|-L\$SCI_SRCDIR/bin/ \
+ -L$(java-config -i gluegen) \
+ -L$(java-config -i jogl)|" \
+ configure.ac || die
+
+ sed -i \
+ -e "/<\/librarypaths>/i\<path value=\"$(java-config -i gluegen)\"\/>" \
+ -e "/<\/librarypaths>/i\<path value=\"$(java-config -i jogl)\"\/>" \
+ -e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \
+ etc/librarypath.xml || die
+
+ eautoreconf
+ java-pkg-2_src_prepare
+}
+
+src_configure() {
+ local myopts
+ use doc && myopts="--with-docbook=/usr/share/sgml/docbook/xsl-stylesheets"
+ # javac complained about (j)hdf
+ use hdf5 && myopts="$myopts --with-hdf5-library=$(java-config -i hdf-java)"
+ export JAVA_HOME="$(java-config -O)"
+ export BLAS_LIBS="$(pkg-config --libs blas)"
+ export LAPACK_LIBS="$(pkg-config --libs lapack)"
+
+ econf \
+ --disable-rpath \
+ --without-pvm \
+ $(use_enable doc build-help) \
+ $(use_enable nls) \
+ $(use_enable nls build-localization) \
+ $(use_with fftw) \
+ $(use_with gui)\
+ $(use_with gui javasci)\
+ $(use_with hdf5) \
+ $(use_with matio) \
+ $(use_with umfpack) \
+ $(use_with tk) \
+ $(use_with xcos) \
+ ${myopts}
+}
+
+src_compile() {
+ emake || die "emake failed"
+ if use doc; then
+ emake doc || die "emake failed"
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install || die "emake install failed"
+ find "${ED}" -name '*.la' -delete || die
+ # install docs
+ dodoc ACKNOWLEDGEMENTS README_Unix Readme_Visual.txt \
+ || die "failed to install docs"
+ insinto /usr/share/mime/packages
+ doins "${FILESDIR}/${PN}.xml"
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2012-05-25 21:53 Sebastien Fabbro
0 siblings, 0 replies; 18+ messages in thread
From: Sebastien Fabbro @ 2012-05-25 21:53 UTC (permalink / raw
To: gentoo-commits
commit: 4dc3f7b8867d14824353cd0113e52fa4e7426cae
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Fri May 25 21:52:49 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri May 25 21:52:49 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4dc3f7b8
sci-mathematics/scilab: complete ebuild revamp
(Portage version: 2.1.10.60/git/Linux x86_64, unsigned Manifest commit)
---
sci-mathematics/scilab/ChangeLog | 32 +++-
.../scilab/files/disablebuildhelp.patch | 39 ---
sci-mathematics/scilab/files/java-heap-5.3.2.patch | 12 -
.../scilab/files/scilab-5.2.1-hdf-java-2.6.patch | 14 --
.../scilab/files/scilab-5.2.1-java-heap.patch | 13 -
.../scilab/files/scilab-5.2.1-no-redef-exp10.patch | 65 ------
.../files/scilab-5.2.1-nojavacheckversion.patch | 12 -
.../scilab/files/scilab-5.2.1-scilib-fix.patch | 11 -
.../scilab/files/scilab-5.3.2-scilib-fix.patch | 11 -
.../files/scilab-5.3.3-allow-hdf-1.8.7.patch | 13 -
.../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 ++
...ow-hdf-1.8.7.patch => scilab-5.3.3-hdf18.patch} | 2 +-
...ap-5.3.3.patch => scilab-5.3.3-java-heap.patch} | 5 +-
.../scilab/files/scilab-5.3.3-javadoc-utf8.patch | 25 ++
..._9268.diff => scilab-5.3.3-jvm-detection.patch} | 2 +
.../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/files/scilab-5.3.3-scilib-fix.patch | 11 -
.../scilab/files/scilab.bash_completion | 54 +++++
sci-mathematics/scilab/scilab-5.2.1.ebuild | 140 -----------
sci-mathematics/scilab/scilab-5.3.2.ebuild | 132 -----------
sci-mathematics/scilab/scilab-5.3.3-r1.ebuild | 242 ++++++++++++++++++++
sci-mathematics/scilab/scilab-5.3.3.ebuild | 141 ------------
28 files changed, 681 insertions(+), 619 deletions(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index b9e3734..0d75e37 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,7 +1,37 @@
# ChangeLog for sci-mathematics/scilab
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*scilab-5.3.3-r1 (25 May 2012)
+
+ 25 May 2012; Sébastien Fabbro <bicatali@gentoo.org>
+ +files/scilab.bash_completion, -files/bug_9268.diff, -scilab-5.2.1.ebuild,
+ -files/scilab-5.2.1-hdf-java-2.6.patch, -files/scilab-5.2.1-java-heap.patch,
+ -files/scilab-5.2.1-no-redef-exp10.patch,
+ -files/scilab-5.2.1-nojavacheckversion.patch,
+ -files/scilab-5.2.1-scilib-fix.patch, -scilab-5.3.2.ebuild,
+ -files/scilab-5.3.2-allow-hdf-1.8.7.patch,
+ -files/scilab-5.3.2-scilib-fix.patch, -files/java-heap-5.3.2.patch,
+ -scilab-5.3.3.ebuild, +scilab-5.3.3-r1.ebuild,
+ -files/scilab-5.3.3-allow-hdf-1.8.7.patch,
+ +files/scilab-5.3.3-as-needed.patch, +files/scilab-5.3.3-blas-libs.patch,
+ +files/scilab-5.3.3-disable-build-help.patch,
+ +files/scilab-5.3.3-fix-random-runtime-failures.patch,
+ +files/scilab-5.3.3-fortran-link.patch, +files/scilab-5.3.3-hdf18.patch,
+ +files/scilab-5.3.3-java-heap.patch, +files/scilab-5.3.3-javadoc-utf8.patch,
+ +files/scilab-5.3.3-jgrapx-min.patch,
+ +files/scilab-5.3.3-jvm-detection.patch, +files/scilab-5.3.3-matio15.patch,
+ +files/scilab-5.3.3-no-lhpi.patch, +files/scilab-5.3.3-no-xcos-deps.patch,
+ -files/scilab-5.3.3-scilib-fix.patch, -files/java-heap-5.3.3.patch,
+ -files/disablebuildhelp.patch:
+ Completely revamped ebuild. Support linguas. Force matio < 1.5. Added
+ fortran eclass and patch to allow user to define F77. Added
+ bash-completion. Tests need X with gui. Re-order dependencies with use
+ flags. Added openmp flag with test of compiler. Added a debug flag.
+ Added a fix for hdf5 with mpi, bug #302621. Added a few more patches to
+ please Gentoo QA (random runtime failures), javadoc utf8 and re-organize
+ some sed's in patches. General cleanup and remove old versions.
+
23 Dec 2011; Guillaume Horel <guillaume.horel@gmail.com> scilab-5.3.3.ebuild:
Fixes for jdk-1.7
diff --git a/sci-mathematics/scilab/files/disablebuildhelp.patch b/sci-mathematics/scilab/files/disablebuildhelp.patch
deleted file mode 100644
index 4fbabd9..0000000
--- a/sci-mathematics/scilab/files/disablebuildhelp.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f4c20c8fb5d9540e4972ae75dbd2a34aa2a3622b Mon Sep 17 00:00:00 2001
-From: Sylvestre Ledru <sylvestre.ledru@scilab.org>
-Date: Sat, 1 Oct 2011 00:15:59 +0200
-Subject: [PATCH] * bug 9883 fixed - Build with --disable-build-help was failing.
-
-Change-Id: I93da6b7312effb261fd95d90613f87e9988b35f9
----
- scilab/modules/scinotes/Makefile.am | 2 ++
- scilab/modules/scinotes/Makefile.in | 2 +-
- 2 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/scilab/modules/scinotes/Makefile.am b/scilab/modules/scinotes/Makefile.am
-index 8ffad2d..ad5dbde 100644
---- a/scilab/modules/scinotes/Makefile.am
-+++ b/scilab/modules/scinotes/Makefile.am
-@@ -112,5 +112,7 @@ libsciscinotes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
- libsciscinotes_la_sci_gateway_DATA = sci_gateway/scinotes_gateway.xml
-
- if GUI
-+if BUILD_HELP
- USEANT=1
- endif
-+endif
-diff --git a/scilab/modules/scinotes/Makefile.in b/scilab/modules/scinotes/Makefile.in
-index 95b6f57..673fa4c 100644
---- a/scilab/modules/scinotes/Makefile.in
-+++ b/scilab/modules/scinotes/Makefile.in
-@@ -565,7 +565,7 @@ libsciscinotes_la_LIBADD = libsciscinotes-algo.la
- #### scinotes : gateway declaration ####
- libsciscinotes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
- libsciscinotes_la_sci_gateway_DATA = sci_gateway/scinotes_gateway.xml
--@GUI_TRUE@USEANT = 1
-+@BUILD_HELP_TRUE@@GUI_TRUE@USEANT = 1
- all: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) all-am
-
---
-1.7.2.3
-
diff --git a/sci-mathematics/scilab/files/java-heap-5.3.2.patch b/sci-mathematics/scilab/files/java-heap-5.3.2.patch
deleted file mode 100644
index 57d656b..0000000
--- a/sci-mathematics/scilab/files/java-heap-5.3.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN scilab-5.3.2-orig//etc/jvm_options.xml scilab-5.3.2/etc/jvm_options.xml
---- scilab-5.3.2-orig//etc/jvm_options.xml 2011-05-25 23:20:12.145833420 -0400
-+++ scilab-5.3.2/etc/jvm_options.xml 2011-05-25 23:20:58.760833451 -0400
-@@ -22,7 +22,7 @@
- <!-- ENABLE Just In Time java compiler -->
- <option value="-Djava.compiler=JIT"/>
- <!-- Set Java Heap space to 256mb -->
-- <option value="-Xmx256m"/>
-+ <option value="-Xmx512m"/>
- <option value="-Dapple.laf.useScreenMenuBar=true" os="macosx"/>
- <!-- DISABLE Just In Time java compiler -->
- <!--
diff --git a/sci-mathematics/scilab/files/scilab-5.2.1-hdf-java-2.6.patch b/sci-mathematics/scilab/files/scilab-5.2.1-hdf-java-2.6.patch
deleted file mode 100644
index 034e98c..0000000
--- a/sci-mathematics/scilab/files/scilab-5.2.1-hdf-java-2.6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: scilab-5.2.0/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java
-===================================================================
---- scilab-5.2.0.orig/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java 2010-01-23 22:51:12.000000000 +0100
-+++ scilab-5.2.0/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java 2010-01-23 22:51:41.000000000 +0100
-@@ -53,7 +53,8 @@
- int nb_objs = H5.H5Gn_members(fileId, groupName);
- String[] allObjectsName = new String[nb_objs];
- int[] allObjectsType = new int[nb_objs];
-- H5.H5Gget_obj_info_all(fileId, groupName, allObjectsName, allObjectsType);
-+ long[] refs = new long[nb_objs];
-+ H5.H5Gget_obj_info_all(fileId, groupName, allObjectsName, allObjectsType, refs);
-
- for (int i = 0 ; i < nb_objs ; ++i) {
- if (allObjectsType[i] == HDF5Constants.H5G_DATASET) {
diff --git a/sci-mathematics/scilab/files/scilab-5.2.1-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.2.1-java-heap.patch
deleted file mode 100644
index c72139d..0000000
--- a/sci-mathematics/scilab/files/scilab-5.2.1-java-heap.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- etc/jvm_options.xml.in.orig 2010-02-07 03:10:09.552580163 +0100
-+++ etc/jvm_options.xml.in 2010-02-07 03:10:39.474580024 +0100
-@@ -22,8 +22,8 @@
- <!-- ENABLE Just In Time java compiler -->
- <option value="-Djava.compiler=JIT"/>
-
--<!-- Set Java Heap space to 256mb -->
--<option value="-Xmx256m"/>
-+<!-- Set Java Heap space to 512mb -->
-+<option value="-Xmx512m"/>
-
- <option value="-Dapple.laf.useScreenMenuBar=true" os="macosx" />
-
diff --git a/sci-mathematics/scilab/files/scilab-5.2.1-no-redef-exp10.patch b/sci-mathematics/scilab/files/scilab-5.2.1-no-redef-exp10.patch
deleted file mode 100644
index c85d183..0000000
--- a/sci-mathematics/scilab/files/scilab-5.2.1-no-redef-exp10.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -urN scilab-5.2.1-orig//configure.ac scilab-5.2.1//configure.ac
---- scilab-5.2.1-orig//configure.ac 2010-02-17 03:06:08.000000000 -0500
-+++ scilab-5.2.1//configure.ac 2010-02-20 16:49:52.000000000 -0500
-@@ -953,12 +953,7 @@
- # Provided by math.h
-
- LDFLAGS="$LDFLAGS $LIBM"
--AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor])
--
--AC_CHECK_FUNC([exp10],,[
-- AC_DEFINE([log_10_],[2.3025850929940456840179914546844],[Provide a macro to do exp10])
-- AC_DEFINE([exp10(x)],[exp( (log_10_) * (x) )],[Provide a macro to do exp10])
-- ])
-+AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor] [exp10])
-
- ### If isinf exists or not (used to not be the case under Solaris)
- ### See bug #4164
-diff -urN scilab-5.2.1-orig//modules/core/includes/core_math.h scilab-5.2.1//modules/core/includes/core_math.h
---- scilab-5.2.1-orig//modules/core/includes/core_math.h 2010-02-17 03:06:08.000000000 -0500
-+++ scilab-5.2.1//modules/core/includes/core_math.h 2010-02-20 16:49:52.000000000 -0500
-@@ -90,6 +90,11 @@
- #define M_PI 3.14159265358979323846
- #endif
-
-+#ifndef HAVE_EXP10
-+#define log_10_ 2.3025850929940456840179914546844
-+/* Provide a macro to do exp10 */
-+#define exp10(x) exp( (log_10_) * (x) )
-+#endif
-
- #endif /* __BASE_MATH_H__ */
-
-diff -urN scilab-5.2.1-orig//modules/core/includes/machine.h.in scilab-5.2.1//modules/core/includes/machine.h.in
---- scilab-5.2.1-orig//modules/core/includes/machine.h.in 2010-02-17 03:06:08.000000000 -0500
-+++ scilab-5.2.1//modules/core/includes/machine.h.in 2010-02-20 16:49:52.000000000 -0500
-@@ -77,6 +77,9 @@
- /* Define to 1 if you have the `endpwent' function. */
- #undef HAVE_ENDPWENT
-
-+/* Define to 1 if you have the `exp10' function. */
-+#undef HAVE_EXP10
-+
- /* Define to 1 if you have the <fcntl.h> header file. */
- #undef HAVE_FCNTL_H
-
-@@ -515,9 +518,6 @@
- /* Define to empty if `const' does not conform to ANSI C. */
- #undef const
-
--/* Provide a macro to do exp10 */
--#undef exp10
--
- /* Don't use getwd but getcwd */
- #undef getwd
-
-@@ -530,9 +530,6 @@
- /* Provide a macro to do isinf */
- #undef isinf
-
--/* Provide a macro to do exp10 */
--#undef log_10_
--
-
-
- #ifdef DIR_SEPARATOR
diff --git a/sci-mathematics/scilab/files/scilab-5.2.1-nojavacheckversion.patch b/sci-mathematics/scilab/files/scilab-5.2.1-nojavacheckversion.patch
deleted file mode 100644
index 26c47e0..0000000
--- a/sci-mathematics/scilab/files/scilab-5.2.1-nojavacheckversion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN scilab-5.2.1-orig//configure.ac scilab-5.2.1/configure.ac
---- scilab-5.2.1-orig//configure.ac 2010-02-18 23:19:43.000000000 -0500
-+++ scilab-5.2.1/configure.ac 2010-02-19 00:16:05.000000000 -0500
-@@ -664,7 +664,7 @@
- JGRAPHX=$PACKAGE_JAR_FILE
- AC_SUBST(JGRAPHX)
-
-- AC_JAVA_CHECK_VERSION_PACKAGE([jgraphx],[import com.mxgraph.view.mxGraph;],$JGRAPHX,[1.2.0.7],[mxGraph.VERSION])
-+ #AC_JAVA_CHECK_VERSION_PACKAGE([jgraphx],[import com.mxgraph.view.mxGraph;],$JGRAPHX,[1.2.0.7],[mxGraph.VERSION])
-
- # Docking system
- AC_JAVA_CHECK_PACKAGE([flexdock],[org.flexdock.docking.DockingManager],[Scilab Gui])
diff --git a/sci-mathematics/scilab/files/scilab-5.2.1-scilib-fix.patch b/sci-mathematics/scilab/files/scilab-5.2.1-scilib-fix.patch
deleted file mode 100644
index 6d3c2e1..0000000
--- a/sci-mathematics/scilab/files/scilab-5.2.1-scilib-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/scilab.orig 2009-12-16 08:24:36.000000000 +0100
-+++ bin/scilab 2010-02-11 01:14:14.718781674 +0100
-@@ -508,7 +508,7 @@
- #fi
- #export PVM_ARCH
-
--SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
-+SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:/usr/lib64/scilab:/usr/lib/scilab
- LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
-
- case $OS in
diff --git a/sci-mathematics/scilab/files/scilab-5.3.2-scilib-fix.patch b/sci-mathematics/scilab/files/scilab-5.3.2-scilib-fix.patch
deleted file mode 100644
index 6d3c2e1..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.2-scilib-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/scilab.orig 2009-12-16 08:24:36.000000000 +0100
-+++ bin/scilab 2010-02-11 01:14:14.718781674 +0100
-@@ -508,7 +508,7 @@
- #fi
- #export PVM_ARCH
-
--SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
-+SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:/usr/lib64/scilab:/usr/lib/scilab
- LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
-
- case $OS in
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-allow-hdf-1.8.7.patch b/sci-mathematics/scilab/files/scilab-5.3.3-allow-hdf-1.8.7.patch
deleted file mode 100644
index 868ec09..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-allow-hdf-1.8.7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
-===================================================================
---- modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java.orig
-+++ modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
-@@ -61,7 +61,7 @@ public final class Xcos {
- * Dependencies version
- */
- private static final List<String> MXGRAPH_VERSIONS = Arrays.asList("1.4.1.0");
-- private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]");
-+ private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]", "[1, 8, 7]");
- private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7");
-
- private static final String UNABLE_TO_LOAD_JGRAPHX =
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-as-needed.patch b/sci-mathematics/scilab/files/scilab-5.3.3-as-needed.patch
new file mode 100644
index 0000000..4df4258
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-as-needed.patch
@@ -0,0 +1,42 @@
+--- scilab-5.3.3.orig/modules/history_manager/Makefile.am 2012-04-16 21:18:43.000000000 +0100
++++ scilab-5.3.3/modules/history_manager/Makefile.am 2012-05-23 20:17:50.000000000 +0100
+@@ -82,7 +82,7 @@
+ INCLUDE_FLAGS = $(libscihistory_manager_la_CFLAGS)
+
+ ## Libraries necessary
+-libscihistory_manager_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/fileio/libscifileio.la
++libscihistory_manager_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la
+ modulename=history_manager
+
+ #### history_manager : Conf files ####
+--- scilab-5.3.3.orig/modules/commons/Makefile.am 2012-04-16 21:18:41.000000000 +0100
++++ scilab-5.3.3/modules/commons/Makefile.am 2012-05-24 19:06:11.000000000 +0100
+@@ -80,7 +80,7 @@
+ endif
+
+ libscicommons_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la \
+-$(top_builddir)/modules/output_stream/libscioutput_stream.la
++$(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/core/libscicore.la
+
+
+ #### commons : gateway declaration ####
+--- scilab-5.3.3.orig/modules/Makefile.am 2012-04-16 21:18:41.000000000 +0100
++++ scilab-5.3.3/modules/Makefile.am 2012-05-24 18:41:25.000000000 +0100
+@@ -23,7 +23,6 @@
+ api_scilab \
+ dynamic_link \
+ fileio \
+-history_manager \
+ spreadsheet \
+ tclsci \
+ localization \
+@@ -88,7 +87,8 @@
+ parallel \
+ modules_manager \
+ ui_data \
+-history_browser
++history_browser \
++history_manager
+
+ #umfpack
+
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-blas-libs.patch b/sci-mathematics/scilab/files/scilab-5.3.3-blas-libs.patch
new file mode 100644
index 0000000..b2921f7
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-blas-libs.patch
@@ -0,0 +1,12 @@
+ upstream http://bugzilla.scilab.org/show_bug.cgi?id=9824
+
+--- scilab-5.3.2-orig/m4/libsmath.m4 2011-09-19 14:08:11.167292730 -0400
++++ scilab-5.3.2/m4/libsmath.m4 2011-09-19 14:08:26.477292283 -0400
+@@ -37,7 +37,6 @@
+ AC_PREREQ(2.50)
+ AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
+ acx_blas_ok=no
+-BLAS_LIBS=
+ acx_blas_save_LIBS="$LIBS"
+
+ AC_ARG_WITH(blas-library,
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-disable-build-help.patch b/sci-mathematics/scilab/files/scilab-5.3.3-disable-build-help.patch
new file mode 100644
index 0000000..e503748
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-disable-build-help.patch
@@ -0,0 +1,12 @@
+upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268
+
+--- a/scilab/modules/scinotes/Makefile.am
++++ b/scilab/modules/scinotes/Makefile.am
+@@ -112,5 +112,7 @@ libsciscinotes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+ libsciscinotes_la_sci_gateway_DATA = sci_gateway/scinotes_gateway.xml
+
+ if GUI
++if BUILD_HELP
+ USEANT=1
+ endif
++endif
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-fix-random-runtime-failures.patch b/sci-mathematics/scilab/files/scilab-5.3.3-fix-random-runtime-failures.patch
new file mode 100644
index 0000000..6661989
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-fix-random-runtime-failures.patch
@@ -0,0 +1,98 @@
+fix random failures, triggered by gentoo qa scripts: missing declarations (headers), assigning NULL to int or double
+
+diff -Nur scilab-5.3.3.orig/modules/api_scilab/src/cpp/api_double.cpp scilab-5.3.3/modules/api_scilab/src/cpp/api_double.cpp
+--- scilab-5.3.3.orig/modules/api_scilab/src/cpp/api_double.cpp 2012-04-16 21:18:42.000000000 +0100
++++ scilab-5.3.3/modules/api_scilab/src/cpp/api_double.cpp 2012-05-23 23:26:09.000000000 +0100
+@@ -481,7 +481,7 @@
+ /*--------------------------------------------------------------------------*/
+ int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)
+ {
+- return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL);
++ return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0);
+ }
+ /*--------------------------------------------------------------------------*/
+ int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg)
+diff -Nur scilab-5.3.3.orig/modules/api_scilab/src/cpp/api_list.cpp scilab-5.3.3/modules/api_scilab/src/cpp/api_list.cpp
+--- scilab-5.3.3.orig/modules/api_scilab/src/cpp/api_list.cpp 2012-04-16 21:18:42.000000000 +0100
++++ scilab-5.3.3/modules/api_scilab/src/cpp/api_list.cpp 2012-05-23 23:23:22.000000000 +0100
+@@ -1133,7 +1133,7 @@
+ SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+ int* piAddr = NULL;
+ int* piRoot = NULL;
+- int iNbItem = NULL;
++ int iNbItem = 0;
+
+ if(_piParent == NULL)
+ {
+@@ -1329,7 +1329,7 @@
+ SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+ int* piAddr = NULL;
+ int* piRoot = NULL;
+- int iNbItem = NULL;
++ int iNbItem = 0;
+ int* piBool = NULL;
+
+
+@@ -1577,7 +1577,7 @@
+ SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+ int* piAddr = NULL;
+ int* piRoot = NULL;
+- int iNbItem = NULL;
++ int iNbItem = 0;
+
+ if(_piParent == NULL)
+ {
+diff -Nur scilab-5.3.3.orig/modules/core/src/c/csignal.c scilab-5.3.3/modules/core/src/c/csignal.c
+--- scilab-5.3.3.orig/modules/core/src/c/csignal.c 2012-04-16 21:18:43.000000000 +0100
++++ scilab-5.3.3/modules/core/src/c/csignal.c 2012-05-23 23:18:19.000000000 +0100
+@@ -11,6 +11,7 @@
+ *
+ */
+ #include <stdio.h>
++#include <string.h>
+ #include "banier.h"
+ #include "csignal.h"
+ #include "sigbas.h"
+diff -Nur scilab-5.3.3.orig/modules/functions/src/c/getmacroslist.c scilab-5.3.3/modules/functions/src/c/getmacroslist.c
+--- scilab-5.3.3.orig/modules/functions/src/c/getmacroslist.c 2012-04-16 21:18:41.000000000 +0100
++++ scilab-5.3.3/modules/functions/src/c/getmacroslist.c 2012-05-23 23:18:38.000000000 +0100
+@@ -11,6 +11,7 @@
+ *
+ */
+ #include <stdlib.h>
++#include <string.h>
+ #include "api_scilab.h"
+ #include "sci_types.h"
+ #include "getmacroslist.h"
+diff -Nur scilab-5.3.3.orig/modules/localization/src/c/charEncoding.c scilab-5.3.3/modules/localization/src/c/charEncoding.c
+--- scilab-5.3.3.orig/modules/localization/src/c/charEncoding.c 2012-04-16 21:18:43.000000000 +0100
++++ scilab-5.3.3/modules/localization/src/c/charEncoding.c 2012-05-23 23:16:17.000000000 +0100
+@@ -16,6 +16,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <locale.h>
++#include <wctype.h>
+ #include "charEncoding.h"
+ #include "MALLOC.h"
+ /*--------------------------------------------------------------------------*/
+diff -Nur scilab-5.3.3.orig/modules/matio/src/c/CreateCharVariable.c scilab-5.3.3/modules/matio/src/c/CreateCharVariable.c
+--- scilab-5.3.3.orig/modules/matio/src/c/CreateCharVariable.c 2012-04-16 21:18:43.000000000 +0100
++++ scilab-5.3.3/modules/matio/src/c/CreateCharVariable.c 2012-05-23 23:19:36.000000000 +0100
+@@ -11,6 +11,7 @@
+ *
+ */
+
++#include <string.h>
+ #include "api_scilab.h"
+ #include "CreateMatlabVariable.h"
+ #include "freeArrayOfString.h"
+--- scilab-5.3.3.orig/modules/graphics/src/c/getHandleProperty/set_log_flags_property.c 2012-04-16 21:18:41.000000000 +0100
++++ scilab-5.3.3/modules/graphics/src/c/getHandleProperty/set_log_flags_property.c 2012-05-24 20:54:16.000000000 +0100
+@@ -18,6 +18,7 @@
+ /* a handle */
+ /*------------------------------------------------------------------------*/
+ #include <string.h>
++#define _GNU_SOURCE
+ #include <math.h>
+ #include "setHandleProperty.h"
+ #include "SetProperty.h"
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-fortran-link.patch b/sci-mathematics/scilab/files/scilab-5.3.3-fortran-link.patch
new file mode 100644
index 0000000..707da3b
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-fortran-link.patch
@@ -0,0 +1,23 @@
+--- scilab-5.3.3.orig/configure.ac 2012-04-16 21:18:43.000000000 +0100
++++ scilab-5.3.3/configure.ac 2012-05-23 00:54:55.000000000 +0100
+@@ -196,16 +196,16 @@
+ if test -z "$F77"; then
+ AC_MSG_ERROR([You asked me to use gfortran but i haven't been able to find it])
+ fi
+-fi
+
+-if test "$with_intelcompilers" = yes; then
++
++elif test "$with_intelcompilers" = yes; then
+ AC_PROG_F77(ifc ifort)
+ if test -z "$F77"; then
+ AC_MSG_ERROR([You asked me to use ifc (intel fortran compiler) but i haven't been able to find it])
+ fi
+-fi
++else
++
+
+-if test -z "$F77"; then
+ ## No Frotran compiler specified... We rely on Autoconf to find the best
+ AC_PROG_F77
+ fi
diff --git a/sci-mathematics/scilab/files/scilab-5.3.2-allow-hdf-1.8.7.patch b/sci-mathematics/scilab/files/scilab-5.3.3-hdf18.patch
similarity index 89%
rename from sci-mathematics/scilab/files/scilab-5.3.2-allow-hdf-1.8.7.patch
rename to sci-mathematics/scilab/files/scilab-5.3.3-hdf18.patch
index 868ec09..7a7e6c2 100644
--- a/sci-mathematics/scilab/files/scilab-5.3.2-allow-hdf-1.8.7.patch
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-hdf18.patch
@@ -7,7 +7,7 @@ Index: modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
*/
private static final List<String> MXGRAPH_VERSIONS = Arrays.asList("1.4.1.0");
- private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]");
-+ private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]", "[1, 8, 7]");
++ private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]", "[1, 8, 7]", "[1, 8, 8]", "[1, 8, 9]","[1, 8, 10]");
private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7");
private static final String UNABLE_TO_LOAD_JGRAPHX =
diff --git a/sci-mathematics/scilab/files/java-heap-5.3.3.patch b/sci-mathematics/scilab/files/scilab-5.3.3-java-heap.patch
similarity index 62%
rename from sci-mathematics/scilab/files/java-heap-5.3.3.patch
rename to sci-mathematics/scilab/files/scilab-5.3.3-java-heap.patch
index 57d656b..e493a3b 100644
--- a/sci-mathematics/scilab/files/java-heap-5.3.3.patch
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-java-heap.patch
@@ -1,6 +1,5 @@
-diff -urN scilab-5.3.2-orig//etc/jvm_options.xml scilab-5.3.2/etc/jvm_options.xml
---- scilab-5.3.2-orig//etc/jvm_options.xml 2011-05-25 23:20:12.145833420 -0400
-+++ scilab-5.3.2/etc/jvm_options.xml 2011-05-25 23:20:58.760833451 -0400
+--- scilab-5.3.3.orig//etc/jvm_options.xml 2011-05-25 23:20:12.145833420 -0400
++++ scilab-5.3.3/etc/jvm_options.xml 2011-05-25 23:20:58.760833451 -0400
@@ -22,7 +22,7 @@
<!-- ENABLE Just In Time java compiler -->
<option value="-Djava.compiler=JIT"/>
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-javadoc-utf8.patch b/sci-mathematics/scilab/files/scilab-5.3.3-javadoc-utf8.patch
new file mode 100644
index 0000000..b4b2175
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-javadoc-utf8.patch
@@ -0,0 +1,25 @@
+From e42e4a78fa2e070bad79257f575d9a500547e809 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david@scilab-enterprises.com>
+Date: Mon, 31 Oct 2011 14:31:27 +0100
+Subject: [PATCH 4/8] fix javadoc encoding
+
+---
+ Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 1e4d590..7b905ae 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -163,7 +163,7 @@ macros:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
+ # This is not done in the module itself because its needs also the "types"
+ # module
+ javadoc:
+- $(JAVADOC) -noindex -nohelp -nonavbar -notree \
++ $(JAVADOC) -noindex -nohelp -nonavbar -notree -encoding "utf-8" \
+ -d $(top_builddir)/modules/javasci/javadoc \
+ -sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java \
+ org.scilab.modules.javasci org.scilab.modules.types
+--
+1.7.7
+
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-jgrapx-min.patch b/sci-mathematics/scilab/files/scilab-5.3.3-jgrapx-min.patch
new file mode 100644
index 0000000..e69de29
diff --git a/sci-mathematics/scilab/files/bug_9268.diff b/sci-mathematics/scilab/files/scilab-5.3.3-jvm-detection.patch
similarity index 94%
rename from sci-mathematics/scilab/files/bug_9268.diff
rename to sci-mathematics/scilab/files/scilab-5.3.3-jvm-detection.patch
index 8be3150..4b3d852 100644
--- a/sci-mathematics/scilab/files/bug_9268.diff
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-jvm-detection.patch
@@ -1,3 +1,5 @@
+applied from upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268
+
diff --git a/scilab/bin/scilab b/scilab/bin/scilab
index 67f6474..7a4f6f5 100755
--- a/scilab/bin/scilab
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-matio15.patch b/sci-mathematics/scilab/files/scilab-5.3.3-matio15.patch
new file mode 100644
index 0000000..178b4bd
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-matio15.patch
@@ -0,0 +1,25 @@
+diff -Nur scilab-5.3.3.orig/configure.ac scilab-5.3.3/configure.ac
+--- scilab-5.3.3.orig/configure.ac 2012-04-16 21:18:43.000000000 +0100
++++ scilab-5.3.3/configure.ac 2012-05-14 19:27:21.000000000 +0100
+@@ -1514,7 +1514,7 @@
+ CFLAGS="$CFLAGS $MATIO_CFLAGS"
+ LIBS="$LIBS $MATIO_LIBS"
+
+- AC_CHECK_HEADERS([matio.h matioConfig.h], [],
++ AC_CHECK_HEADERS([matio.h], [],
+ [AC_MSG_ERROR([Invalid MATIO_CFLAGS returned by pkg-config. Try to define MATIO_CFLAGS.])])
+ AC_CHECK_LIB([matio], [Mat_Open], [],
+ [AC_MSG_ERROR([Invalid MATIO_LIBS returned by pkg-config. Try to define MATIO_LIBS.])])
+diff -Nur scilab-5.3.3.orig/modules/core/includes/machine.h.in scilab-5.3.3/modules/core/includes/machine.h.in
+--- scilab-5.3.3.orig/modules/core/includes/machine.h.in 2012-04-16 21:18:43.000000000 +0100
++++ scilab-5.3.3/modules/core/includes/machine.h.in 2012-05-14 19:25:56.000000000 +0100
+@@ -176,9 +176,6 @@
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #undef HAVE_MALLOC_H
+
+-/* Define to 1 if you have the <matioConfig.h> header file. */
+-#undef HAVE_MATIOCONFIG_H
+-
+ /* Define to 1 if you have the <matio.h> header file. */
+ #undef HAVE_MATIO_H
+
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-no-lhpi.patch b/sci-mathematics/scilab/files/scilab-5.3.3-no-lhpi.patch
new file mode 100644
index 0000000..ec48a17
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-no-lhpi.patch
@@ -0,0 +1,22 @@
+fixed upstream
+
+--- scilab-5.3.3.orig/m4/java.m4 2012-04-16 21:18:41.000000000 +0100
++++ scilab-5.3.3/m4/java.m4 2012-05-23 22:07:31.000000000 +0100
+@@ -497,7 +497,7 @@
+ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+ D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
+ ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D "
+ fi
+ fi
+
+@@ -598,7 +598,7 @@
+ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+ D=$ac_java_jvm_dir/jre/lib/mipsel/native_threads
+ ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D "
+ fi
+ fi
+
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-no-xcos-deps.patch b/sci-mathematics/scilab/files/scilab-5.3.3-no-xcos-deps.patch
new file mode 100644
index 0000000..143e77e
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-no-xcos-deps.patch
@@ -0,0 +1,90 @@
+From 86ea77b316580c685263e54cd6564e4b939daf72 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david@scilab.org>
+Date: Wed, 14 Sep 2011 20:52:14 +0200
+Subject: [PATCH 3/8] Remove Xcos dependencies check
+
+---
+ .../src/java/org/scilab/modules/xcos/Xcos.java | 67 +------------------
+ 1 files changed, 4 insertions(+), 63 deletions(-)
+
+diff --git a/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java b/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+index 2417b06..35ed224 100644
+--- a/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
++++ b/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+@@ -145,69 +145,10 @@ public final class Xcos {
+ // CSOFF: IllegalCatch
+ // CSOFF: MagicNumber
+ private void checkDependencies() {
+- final ClassLoader loader = ClassLoader.getSystemClassLoader();
+-
+- /* JGraphx */
+- String mxGraphVersion = "";
+- try {
+- final Class< ? > klass = loader.loadClass("com.mxgraph.view.mxGraph");
+- mxGraphVersion = (String) klass.getDeclaredField("VERSION").get(null);
+-
+- if (!MXGRAPH_VERSIONS.contains(mxGraphVersion)) {
+- throw new Exception();
+- }
+- } catch (final Throwable e) {
+- throw new RuntimeException(String.format(UNABLE_TO_LOAD_JGRAPHX,
+- MXGRAPH_VERSIONS.get(0), mxGraphVersion), e);
+- }
+-
+- /* HDF5 */
+- final int[] libVersion = new int[3];
+- try {
+- final Class< ? > klass = loader.loadClass("ncsa.hdf.hdf5lib.H5");
+-
+- /* hdf5-java */
+- int ret = (Integer) klass.getMethod("H5get_libversion", libVersion.getClass())
+- .invoke(null, libVersion);
+- if (ret < 0) {
+- throw new Exception();
+- }
+-
+- if (!HDF5_VERSIONS.contains(Arrays.toString(libVersion))) {
+- throw new Exception();
+- }
+-
+-
+- /* hdf5 */
+- ret = (Integer) klass.getMethod("H5check_version", int.class,
+- int.class, int.class).invoke(null, libVersion[0],
+- libVersion[1], libVersion[2]);
+- if (ret < 0) {
+- throw new RuntimeException(UNABLE_TO_LOAD_HDF5);
+- }
+-
+- } catch (final Throwable e) {
+- if (!(e instanceof RuntimeException)) {
+- throw new RuntimeException(String.format(UNABLE_TO_LOAD_JHDF5,
+- HDF5_VERSIONS.get(0), Arrays.toString(libVersion)), e);
+- }
+- }
+-
+- /* Batik */
+- String batikVersion = null;
+- try {
+- final Class< ? > klass = loader.loadClass("org.apache.batik.Version");
+- batikVersion = klass.getPackage().getImplementationVersion()
+- .split("\\+")[0];
+-
+- if (!BATIK_VERSIONS.contains(batikVersion)) {
+- throw new Exception();
+- }
+-
+- } catch (final Throwable e) {
+- throw new RuntimeException(String.format(UNABLE_TO_LOAD_BATIK,
+- BATIK_VERSIONS.get(0), batikVersion), e);
+- }
++ LOG.trace("dependencies check removed");
++ // Remove all dependencies check
++ // It may cause some trouble in case of any API change but will
++ // ease maintenance.
+ }
+ // CSON: MagicNumber
+ // CSON: IllegalCatch
+--
+1.7.7
+
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-scilib-fix.patch b/sci-mathematics/scilab/files/scilab-5.3.3-scilib-fix.patch
deleted file mode 100644
index 6d3c2e1..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-scilib-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/scilab.orig 2009-12-16 08:24:36.000000000 +0100
-+++ bin/scilab 2010-02-11 01:14:14.718781674 +0100
-@@ -508,7 +508,7 @@
- #fi
- #export PVM_ARCH
-
--SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
-+SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:/usr/lib64/scilab:/usr/lib/scilab
- LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
-
- case $OS in
diff --git a/sci-mathematics/scilab/files/scilab.bash_completion b/sci-mathematics/scilab/files/scilab.bash_completion
new file mode 100644
index 0000000..c289e86
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab.bash_completion
@@ -0,0 +1,54 @@
+# Scilab completion
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) DIGITEO - 2010 - Sylvestre Ledru
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+_scilab()
+{
+ local cur prev options
+ COMPREPLY=()
+ cur=${COMP_WORDS[COMP_CWORD]}
+ prev=${COMP_WORDS[COMP_CWORD-1]}
+
+ # List all options. Note that
+ options='-ns -nb -nw -nwni -nogui -debug -debug-kdbg -d -display -profiling -profiling-visu -l -mem -version -e -f -nouserstartup -args -mem -h --help'
+
+ # Loop on the arguments to manage conflicting options
+ for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
+ #exclude some mutually exclusive options
+ [[ ${COMP_WORDS[i]} == '-nwni' ]] && options=${options/-nw}
+ [[ ${COMP_WORDS[i]} == '-nw' ]] && options=${options/-nwni}
+ [[ ${COMP_WORDS[i]} == '-e' ]] && options=${options/-f}
+ done
+
+ case "$1" in
+ *scilab-cli*)
+ # Option -nw is not available
+ options=${options/-nw}
+ ;;
+ esac
+
+ case $prev in
+ -f)
+ _filedir '@(sci|sce|SCI|SCE|tst|TST)'
+ return 0
+ ;;
+ -e|-l|-d|-display|-mem)
+ cur=${cur#[\"\']}
+ eqext='='
+ ;;
+
+ *)
+ COMPREPLY=( $( compgen -W "$options" | grep "^$cur" ) )
+ ;;
+ esac
+
+ return 0
+}
+complete -F _scilab $filenames scilab scilab-cli scilab-adv-cli
+
+
diff --git a/sci-mathematics/scilab/scilab-5.2.1.ebuild b/sci-mathematics/scilab/scilab-5.2.1.ebuild
deleted file mode 100644
index 52c331d..0000000
--- a/sci-mathematics/scilab/scilab-5.2.1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit autotools check-reqs eutils java-pkg-2
-
-DESCRIPTION="Scientific software package for numerical computations"
-LICENSE="CeCILL-2"
-SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
-HOMEPAGE="http://www.scilab.org/"
-
-SLOT="0"
-IUSE="doc fftw +gui hdf5 +matio nls tk +umfpack xcos"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/lapack
- tk? ( dev-lang/tk )
- xcos? ( dev-lang/ocaml )
- umfpack? ( sci-libs/umfpack )
- gui? ( >=virtual/jre-1.5
- dev-java/commons-logging
- dev-java/flexdock
- dev-java/gluegen
- dev-java/jeuclid-core
- dev-java/jlatexmath
- >=dev-java/jgraphx-1.2.0.7
- dev-java/jogl
- dev-java/jgoodies-looks
- dev-java/skinlf
- dev-java/jrosetta
- dev-java/javahelp
- hdf5? ( dev-java/hdf-java ) )
- fftw? ( sci-libs/fftw:3.0 )
- matio? ( sci-libs/matio )
- hdf5? ( sci-libs/hdf5 )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- doc? (
- ~dev-java/saxon-6.5.5
- dev-java/fop
- dev-java/batik
- app-text/docbook-xsl-stylesheets )"
-
-pkg_setup() {
- CHECKREQS_MEMORY="512"
- java-pkg-2_pkg_setup
-}
-
-src_prepare() {
- # avoid redefinition of exp10
- epatch "${FILESDIR}"/${P}-no-redef-exp10.patch
- # Increases java heap to 512M when available, when building docs
- check_reqs_conditional && epatch "${FILESDIR}"/${P}-java-heap.patch
- # fix for hdf-java-2.6
- epatch "${FILESDIR}"/${P}-hdf-java-2.6.patch
- # fix for jgraphx
- epatch "${FILESDIR}"/${P}-scilib-fix.patch
- epatch "${FILESDIR}"/${P}-nojavacheckversion.patch
-
- # apply blindly some debian patches
- #for i in "${FILESDIR}"/*.diff; do
- # epatch ${i}
- #done
-
- # add the correct java directories to the config file
- sed \
- -i "/^.DEFAULT_JAR_DIR/{s|=.*|=\"$(echo $(ls -d /usr/share/*/lib))\"|}" \
- m4/java.m4 || die
-
- sed -i "s|-L\$SCI_SRCDIR/bin/|-L\$SCI_SRCDIR/bin/ \
- -L$(java-config -i gluegen) \
- -L$(java-config -i hdf-java) \
- -L$(java-config -i jogl)|" \
- configure.ac || die
- sed -i \
- -e "/<\/librarypaths>/i\<path value=\"$(java-config -i gluegen)\"\/>" \
- -e "/<\/librarypaths>/i\<path value=\"$(java-config -i jogl)\"\/>" \
- -e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \
- etc/librarypath.xml || die
- eautoreconf
- java-pkg-2_src_prepare
-}
-
-src_configure() {
- local myopts
- use doc && myopts="--with-docbook=/usr/share/sgml/docbook/xsl-stylesheets"
- export JAVA_HOME=$(java-config -O)
- export BLAS_LIBS="$(pkg-config --libs blas)"
- export LAPACK_LIBS="$(pkg-config --libs lapack)"
- # mpi is only used for hdf5 i/o
- if use hdf5 && has_version sci-libs/hdf5[mpi]; then
- export CC=mpicc
- export CXX=mpicxx
- export FC=mpif90
- export F77=mpif77
- fi
- econf \
- --disable-rpath \
- --without-pvm \
- $(use_enable doc build-help) \
- $(use_enable nls) \
- $(use_enable nls build-localization) \
- $(use_with fftw) \
- $(use_with gui)\
- $(use_with gui javasci)\
- $(use_with hdf5) \
- $(use_with matio) \
- $(use_with umfpack) \
- $(use_with tk) \
- $(use_with xcos scicos) \
- ${myopts}
-}
-
-src_compile() {
- emake || die "emake failed"
- if use doc; then
- emake doc || die "emake failed"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # install docs
- dodoc ACKNOWLEDGEMENTS CHANGES README_Unix RELEASE_NOTES \
- Readme_Visual.txt || die "failed to install docs"
-
- #install icon
- newicon icons/scilab.xpm scilab.xpm
- make_desktop_entry ${PN} "Scilab" ${PN}
-}
-
-pkg_postinst() {
- einfo "To tell Scilab about your printers, set the environment"
- einfo "variable PRINTERS in the form:"
- einfo
- einfo "PRINTERS=\"firstPrinter:secondPrinter:anotherPrinter\""
-}
diff --git a/sci-mathematics/scilab/scilab-5.3.2.ebuild b/sci-mathematics/scilab/scilab-5.3.2.ebuild
deleted file mode 100644
index d4148fc..0000000
--- a/sci-mathematics/scilab/scilab-5.3.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-inherit autotools check-reqs eutils fdo-mime flag-o-matic java-pkg-2
-
-DESCRIPTION="Scientific software package for numerical computations"
-LICENSE="CeCILL-2"
-HOMEPAGE="http://www.scilab.org/"
-SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
-
-SLOT="0"
-IUSE="doc fftw +gui hdf5 +matio nls tk +umfpack xcos"
-KEYWORDS="~amd64 ~x86"
-
-# hdf5 is required to compile (and use) xcos
-# doc generation and xcos is disabled if gui is disabled
-# see http://wiki.scilab.org/Description_of_configure_options
-
-# http://wiki.scilab.org/Dependencies_of_Scilab_5.X
-RDEPEND="virtual/lapack
- tk? ( dev-lang/tk )
- xcos? ( dev-lang/ocaml
- dev-java/hdf-java )
- umfpack? ( sci-libs/umfpack )
- gui? ( >=virtual/jre-1.5
- dev-java/commons-logging
- >=dev-java/flexdock-0.5.2
- >=dev-java/jeuclid-core-3.1
- >=dev-java/jlatexmath-0.9.4
- =dev-java/jgraphx-1.4.1.0
- dev-java/jogl
- dev-java/jgoodies-looks
- dev-java/jrosetta
- dev-java/javahelp
- dev-java/fop
- >=dev-java/batik-1.7
- hdf5? ( dev-java/hdf-java ) )
- fftw? ( sci-libs/fftw:3.0 )
- matio? ( sci-libs/matio )
- hdf5? ( >=sci-libs/hdf5-1.8.4[-mpi] )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- doc? (
- >=dev-java/jlatexmath-fop-0.9.4
- ~dev-java/saxon-6.5.5
- app-text/docbook-xsl-stylesheets )"
-
-pkg_setup() {
- use doc && CHECKREQS_MEMORY="512M"
- check-reqs_pkg_setup
- java-pkg-2_pkg_setup
-
- # temp Bug 6593 upstream, fixed
- append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
- # Increases java heap to 512M when available, when building docs
- use doc && epatch "${FILESDIR}/java-heap-${PV}.patch"
- # fix scilib path
- epatch "${FILESDIR}/${P}-scilib-fix.patch"
- # bug 9268 reported upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268
- epatch "${FILESDIR}"/bug_9268.diff
- epatch "${FILESDIR}/${P}-allow-hdf-1.8.7.patch"
-
- #bug 9824 upstream
- sed -i "/BLAS_LIBS=$/d" m4/libsmath.m4
-
- sed -i "s|-L\$SCI_SRCDIR/bin/|-L\$SCI_SRCDIR/bin/ \
- -L$(java-config -i gluegen) \
- -L$(java-config -i jogl)|" \
- configure.ac || die
-
- sed -i \
- -e "/<\/librarypaths>/i\<path value=\"$(java-config -i gluegen)\"\/>" \
- -e "/<\/librarypaths>/i\<path value=\"$(java-config -i jogl)\"\/>" \
- -e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \
- etc/librarypath.xml || die
-
- eautoreconf
- java-pkg-2_src_prepare
-}
-
-src_configure() {
- local myopts
- use doc && myopts="--with-docbook=/usr/share/sgml/docbook/xsl-stylesheets"
- # javac complained about (j)hdf
- use hdf5 && myopts="$myopts --with-hdf5-library=$(java-config -i hdf-java)"
- export JAVA_HOME="$(java-config -O)"
- export BLAS_LIBS="$(pkg-config --libs blas)"
- export LAPACK_LIBS="$(pkg-config --libs lapack)"
-
- econf \
- --disable-rpath \
- --without-pvm \
- $(use_enable doc build-help) \
- $(use_enable nls) \
- $(use_enable nls build-localization) \
- $(use_with fftw) \
- $(use_with gui)\
- $(use_with gui javasci)\
- $(use_with hdf5) \
- $(use_with matio) \
- $(use_with umfpack) \
- $(use_with tk) \
- $(use_with xcos) \
- ${myopts}
-}
-
-src_compile() {
- emake || die "emake failed"
- if use doc; then
- emake doc || die "emake failed"
- fi
-}
-
-src_install() {
- emake DESTDIR="${ED}" install || die "emake install failed"
- find "${ED}" -name '*.la' -delete || die
- # install docs
- dodoc ACKNOWLEDGEMENTS README_Unix Readme_Visual.txt \
- || die "failed to install docs"
- insinto /usr/share/mime/packages
- doins "${FILESDIR}/${PN}.xml"
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
-}
diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
new file mode 100644
index 0000000..7ccbbc0
--- /dev/null
+++ b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+JAVA_PKG_OPT_USE="gui"
+VIRTUALX_REQUIRED="manual"
+
+inherit eutils autotools check-reqs fdo-mime bash-completion-r1 \
+ java-pkg-opt-2 fortran-2 flag-o-matic toolchain-funcs virtualx
+
+# TODO:
+# - work out src_test. do we need testng? (java-experimental overlay)
+# - emacs mode: http://forge.scilab.org/index.php/p/scilab-emacs/
+# - work out as-needed
+# - compatibility with matio >= 1.5
+# - apply extra patches? (fedora, mageia, debian, freebsd have some)
+# - do ebuilds for scilab packages: plotlib, scimax, scimysql, scivp, swt, ann,
+# celestlab, jims,...
+
+DESCRIPTION="Scientific software package for numerical computations"
+LICENSE="CeCILL-2"
+HOMEPAGE="http://www.scilab.org/"
+SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
+
+SLOT="0"
+IUSE="bash-completion debug doc fftw +gui hdf5 +matio nls openmp
+ static-libs test tk +umfpack xcos"
+REQUIRED_USE="xcos? ( hdf5 gui ) doc? ( gui )"
+
+# ALL_LINGUAS variable defined in configure.ac
+LINGUAS="fr_FR zh_CN zh_TW ca_ES es_ES pt_BR"
+for l in ${LINGUAS}; do
+ IUSE="${IUSE} linguas_${l}"
+done
+LINGUASLONG="de_DE ja_JP it_IT uk_UA pl_PL ru_RU"
+for l in ${LINGUASLONG}; do
+ IUSE="${IUSE} linguas_${l%_*}"
+done
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-libs/libpcre
+ dev-libs/libxml2:2
+ sys-devel/gettext
+ sys-libs/ncurses
+ sys-libs/readline
+ virtual/lapack
+ fftw? ( sci-libs/fftw:3.0 )
+ gui? (
+ dev-java/batik
+ dev-java/commons-logging
+ dev-java/flexdock
+ dev-java/fop
+ dev-java/javahelp
+ dev-java/jeuclid-core
+ dev-java/jgoodies-looks
+ >=dev-java/jlatexmath-0.9.4
+ dev-java/jogl
+ dev-java/jrosetta
+ dev-java/xmlgraphics-commons
+ virtual/opengl
+ doc? ( dev-java/saxon:6.5 )
+ hdf5? ( dev-java/hdf-java
+ xcos? ( >=dev-java/jgraphx-1.4.1 ) ) )
+ hdf5? ( sci-libs/hdf5 )
+ matio? ( <sci-libs/matio-1.5 )
+ tk? ( dev-lang/tk )
+ umfpack? ( sci-libs/umfpack )"
+
+RDEPEND="${CDEPEND}
+ gui? ( >=virtual/jre-1.5 )"
+
+DEPEND="${CDEPEND}
+ virtual/fortran
+ virtual/pkgconfig
+ debug? ( dev-util/lcov )
+ gui? (
+ >=virtual/jdk-1.5
+ doc? (
+ >=dev-java/jlatexmath-fop-0.9.4
+ app-text/docbook-xsl-stylesheets )
+ xcos? ( dev-lang/ocaml ) )
+ test? ( gui? ( ${VIRTUALX_DEPEND} ) )"
+
+pkg_pretend() {
+ use doc && CHECKREQS_MEMORY="512M" check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ if use openmp; then
+ if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
+ ewarn "You are using a gcc without OpenMP capabilities"
+ die "Need an OpenMP capable compiler"
+ fi
+ FORTRAN_NEED_OPENMP=1
+ fi
+ FORTRAN_STANDARD="77 90"
+ fortran-2_pkg_setup
+ java-pkg-opt-2_pkg_setup
+ ALL_LINGUAS=
+ for l in ${LINGUAS}; do
+ use linguas_${l} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
+ done
+ for l in ${LINGUASLONG}; do
+ use linguas_${l%_*} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
+ done
+ export ALL_LINGUAS
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-fortran-link.patch \
+ "${FILESDIR}"/${P}-jvm-detection.patch \
+ "${FILESDIR}"/${P}-disable-build-help.patch \
+ "${FILESDIR}"/${P}-hdf18.patch \
+ "${FILESDIR}"/${P}-no-lhpi.patch \
+ "${FILESDIR}"/${P}-blas-libs.patch \
+ "${FILESDIR}"/${P}-no-xcos-deps.patch \
+ "${FILESDIR}"/${P}-javadoc-utf8.patch \
+ "${FILESDIR}"/${P}-fix-random-runtime-failures.patch
+
+ # need serious as-needed work (inter-dependencies among modules)
+ # "${FILESDIR}"/${P}-as-needed.patch \
+ append-ldflags $(no-as-needed)
+
+ # to apply with matio-1.5, unfortunately needs more work
+ # "${FILESDIR}"/${P}-matio15.patch
+
+ # increases java heap to 512M when building docs (sync with cheqreqs above)
+ use doc && epatch "${FILESDIR}"/${P}-java-heap.patch
+
+ # make sure library path are preloaded in binaries
+ sed -i \
+ -e "s|^LD_LIBRARY_PATH=|LD_LIBRARY_PATH=${EPREFIX}/usr/$(get_libdir)/scilab:|g" \
+ bin/scilab* || die
+
+ # fix jgraphx min version (fixed upstream)
+ sed -i -e 's/\[=\]/\[\]/p' configure.ac || die
+
+ # upstream http://bugzilla.scilab.org/show_bug.cgi?id=10244
+ mv modules/call_scilab/examples/call_scilab/NET/VB.NET/My\ Project/ \
+ modules/call_scilab/examples/call_scilab/NET/VB.NET/My_Project || die
+
+ # gentoo bug #392363 (fixed upstream)
+ sed -i \
+ -e "s|Cl.*ment DAVID|Clement DAVID|g" \
+ $(find . -iname '*.java') || die
+
+ # add specific gentoo java directories
+ if use gui; then
+ sed -i -e "s|-L\$SCI_SRCDIR/bin/|-L\$SCI_SRCDIR/bin/ \
+ -L$(java-config -i gluegen) \
+ -L$(java-config -i jogl)|" \
+ configure.ac || die
+ sed -i \
+ -e "s|/usr/lib/jni|$(java-config -i hdf-java)|g" \
+ m4/hdf5.m4 || die
+
+ sed -i \
+ -e "/<\/librarypaths>/i\<path value=\"$(java-config -i gluegen)\"\/>" \
+ -e "/<\/librarypaths>/i\<path value=\"$(java-config -i jogl)\"\/>" \
+ -e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \
+ etc/librarypath.xml || die
+ fi
+ java-pkg-opt-2_src_prepare
+ eautoreconf
+}
+
+src_configure() {
+ if use gui; then
+ export JAVA_HOME="$(java-config -O)"
+ else
+ unset JAVAC
+ fi
+
+ export BLAS_LIBS="$(pkg-config --libs blas)"
+ export LAPACK_LIBS="$(pkg-config --libs lapack)"
+ export F77_LDFLAGS="${LDFLAGS}"
+ # gentoo bug #302621
+ use hdf5 && has_version sci-libs/hdf5[mpi] && \
+ export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+ econf \
+ --enable-relocatable \
+ --disable-rpath \
+ --with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \
+ --without-pvm \
+ $(use_enable debug) \
+ $(use_enable debug code-coverage) \
+ $(use_enable debug debug-C) \
+ $(use_enable debug debug-CXX) \
+ $(use_enable debug debug-fortran) \
+ $(use_enable debug debug-java) \
+ $(use_enable debug debug-linker) \
+ $(use_enable doc build-help) \
+ $(use_enable nls) \
+ $(use_enable nls build-localization) \
+ $(use_enable static-libs static) \
+ $(use_enable test compilation-tests) \
+ $(use_with fftw) \
+ $(use_with gui) \
+ $(use_with gui javasci) \
+ $(use_with hdf5) \
+ $(use_with matio) \
+ $(use_with openmp) \
+ $(use_with tk) \
+ $(use_with umfpack) \
+ $(use_with xcos) \
+ $(use_with xcos modelica)
+}
+
+src_compile() {
+ emake
+ use doc && emake doc
+}
+
+src_test() {
+ if use gui; then
+ Xemake check
+ else
+ emake check
+ fi
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+ dodoc ACKNOWLEDGEMENTS README_Unix Readme_Visual.txt
+ insinto /usr/share/mime/packages
+ doins "${FILESDIR}"/${PN}.xml
+ use bash-completion && dobashcomp "${FILESDIR}"/${PN}.bash_completion
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
diff --git a/sci-mathematics/scilab/scilab-5.3.3.ebuild b/sci-mathematics/scilab/scilab-5.3.3.ebuild
deleted file mode 100644
index c1fe41d..0000000
--- a/sci-mathematics/scilab/scilab-5.3.3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-inherit autotools check-reqs eutils fdo-mime flag-o-matic java-pkg-2
-
-DESCRIPTION="Scientific software package for numerical computations"
-LICENSE="CeCILL-2"
-HOMEPAGE="http://www.scilab.org/"
-SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
-
-SLOT="0"
-IUSE="doc fftw +gui hdf5 +matio nls tk +umfpack xcos"
-KEYWORDS="~amd64 ~x86"
-
-# hdf5 is required to compile (and use) xcos
-# doc generation and xcos is disabled if gui is disabled
-# see http://wiki.scilab.org/Description_of_configure_options
-
-# http://wiki.scilab.org/Dependencies_of_Scilab_5.X
-RDEPEND="virtual/lapack
- tk? ( dev-lang/tk )
- xcos? ( dev-lang/ocaml
- dev-java/hdf-java )
- umfpack? ( sci-libs/umfpack )
- gui? ( >=virtual/jre-1.5
- dev-java/commons-logging
- >=dev-java/flexdock-0.5.2
- >=dev-java/jeuclid-core-3.1
- >=dev-java/jlatexmath-0.9.4
- =dev-java/jgraphx-1.4.1.0
- dev-java/jogl
- dev-java/jgoodies-looks
- dev-java/jrosetta
- dev-java/javahelp
- dev-java/fop
- >=dev-java/batik-1.7
- hdf5? ( dev-java/hdf-java ) )
- fftw? ( sci-libs/fftw:3.0 )
- matio? ( sci-libs/matio )
- hdf5? ( >=sci-libs/hdf5-1.8.4[-mpi] )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- doc? (
- >=dev-java/jlatexmath-fop-0.9.4
- ~dev-java/saxon-6.5.5
- app-text/docbook-xsl-stylesheets )"
-
-pkg_setup() {
- if use doc; then
- CHECKREQS_MEMORY="512M"
- check-reqs_pkg_setup
- fi
- java-pkg-2_pkg_setup
-
- # temp Bug 6593 upstream, fixed
- append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
- # Increases java heap to 512M when available, when building docs
- use doc && epatch "${FILESDIR}/java-heap-${PV}.patch"
- # fix scilib path
- epatch "${FILESDIR}/${P}-scilib-fix.patch"
- # bug 9268 reported upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268
- epatch "${FILESDIR}"/bug_9268.diff
- #bug 9883 upstream
- epatch "${FILESDIR}/disablebuildhelp.patch"
- #bug 10244 upstream
- mv modules/call_scilab/examples/call_scilab/NET/VB.NET/My\ Project/ \
- modules/call_scilab/examples/call_scilab/NET/VB.NET/My_Project||die
- #bug 9824 upstream
- sed -i "/BLAS_LIBS=$/d" m4/libsmath.m4
- epatch "${FILESDIR}/${P}-allow-hdf-1.8.7.patch"
- #bug 392363
- sed -i -e "s|Clément DAVID|Clement DAVID|g" $(find . -iname '*.java')
- sed -i -e "s/ -lhpi//g" m4/java.m4
-
- sed -i "s|-L\$SCI_SRCDIR/bin/|-L\$SCI_SRCDIR/bin/ \
- -L$(java-config -i gluegen) \
- -L$(java-config -i jogl)|" \
- configure.ac || die
-
- sed -i \
- -e "/<\/librarypaths>/i\<path value=\"$(java-config -i gluegen)\"\/>" \
- -e "/<\/librarypaths>/i\<path value=\"$(java-config -i jogl)\"\/>" \
- -e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \
- etc/librarypath.xml || die
-
- eautoreconf
- java-pkg-2_src_prepare
-}
-
-src_configure() {
- local myopts
- use doc && myopts="--with-docbook=/usr/share/sgml/docbook/xsl-stylesheets"
- # javac complained about (j)hdf
- use hdf5 && myopts="$myopts --with-hdf5-library=$(java-config -i hdf-java)"
- export JAVA_HOME="$(java-config -O)"
- export BLAS_LIBS="$(pkg-config --libs blas)"
- export LAPACK_LIBS="$(pkg-config --libs lapack)"
-
- econf \
- --disable-rpath \
- --without-pvm \
- $(use_enable doc build-help) \
- $(use_enable nls) \
- $(use_enable nls build-localization) \
- $(use_with fftw) \
- $(use_with gui)\
- $(use_with gui javasci)\
- $(use_with hdf5) \
- $(use_with matio) \
- $(use_with umfpack) \
- $(use_with tk) \
- $(use_with xcos) \
- ${myopts}
-}
-
-src_compile() {
- emake || die "emake failed"
- if use doc; then
- emake doc || die "emake failed"
- fi
-}
-
-src_install() {
- emake DESTDIR="${ED}" install || die "emake install failed"
- find "${ED}" -name '*.la' -delete || die
- # install docs
- dodoc ACKNOWLEDGEMENTS README_Unix Readme_Visual.txt \
- || die "failed to install docs"
- insinto /usr/share/mime/packages
- doins "${FILESDIR}/${PN}.xml"
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2012-05-29 18:15 Sebastien Fabbro
0 siblings, 0 replies; 18+ messages in thread
From: Sebastien Fabbro @ 2012-05-29 18:15 UTC (permalink / raw
To: gentoo-commits
commit: 6e72cf55459ff6f744f963001d1c957c94d30554
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Tue May 29 18:15:11 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue May 29 18:15:11 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6e72cf55
sci-mathematics/scilab: fix bug #375769
(Portage version: 2.1.10.63/git/Linux x86_64, unsigned Manifest commit)
---
sci-mathematics/scilab/ChangeLog | 4 +++
.../scilab/files/scilab-5.3.3-gui-no-xcos.patch | 26 ++++++++++++++++++++
sci-mathematics/scilab/scilab-5.3.3-r1.ebuild | 3 +-
3 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index c318d61..71aae68 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 May 2012; Sébastien Fabbro <bicatali@gentoo.org> scilab-5.3.3-r1.ebuild,
+ +files/scilab-5.3.3-gui-no-xcos.patch:
+ fix bug #375769
+
29 May 2012; Sébastien Fabbro <bicatali@gentoo.org> scilab-5.3.3-r1.ebuild:
More fixing for deps for gui and xcos
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
new file mode 100644
index 0000000..82ebbde
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-gui-no-xcos.patch
@@ -0,0 +1,26 @@
+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/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
index 2791ec5..69e71e9 100644
--- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
@@ -123,7 +123,8 @@ src_prepare() {
"${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}-fix-random-runtime-failures.patch \
+ "${FILESDIR}"/${P}-gui-no-xcos.patch
# need serious as-needed work (inter-dependencies among modules)
# "${FILESDIR}"/${P}-as-needed.patch \
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2012-07-11 4:55 Guillaume Horel
0 siblings, 0 replies; 18+ messages in thread
From: Guillaume Horel @ 2012-07-11 4:55 UTC (permalink / raw
To: gentoo-commits
commit: aa1b836b8796a1cdb25583ded94133771f59b7d2
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Wed Jul 11 04:52:05 2012 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Wed Jul 11 04:54:39 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=aa1b836b
[sci-mathematics/scilab-5.3.999] test ebuild for 5.4 branch
---
sci-mathematics/scilab/ChangeLog | 9 +
.../scilab/files/scilab-5.3.999-blas-libs.patch | 12 +
.../scilab/files/scilab-5.3.999-followlinks.patch | 12 +
.../scilab/files/scilab-5.3.999-fortran-link.patch | 22 ++
.../scilab/files/scilab-5.3.999-gluegen.patch | 12 +
.../scilab/files/scilab-5.3.999-java-heap.patch | 11 +
sci-mathematics/scilab/scilab-5.3.999.ebuild | 244 ++++++++++++++++++++
7 files changed, 322 insertions(+), 0 deletions(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 10428af..a47ca98 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*scilab-5.3.999 (11 Jul 2012)
+
+ 11 Jul 2012; Guillaume Horel <guillaume.horel@gmail.com>
+ +scilab-5.3.999.ebuild, +files/scilab-5.3.999-blas-libs.patch,
+ +files/scilab-5.3.999-followlinks.patch,
+ +files/scilab-5.3.999-fortran-link.patch,
+ +files/scilab-5.3.999-gluegen.patch, +files/scilab-5.3.999-java-heap.patch:
+ new ebuild for the 5.4 branch
+
30 May 2012; Guillaume Horel <guillaume.horel@gmail.com>
scilab-5.3.3-r1.ebuild:
force exact version of jgraphx
diff --git a/sci-mathematics/scilab/files/scilab-5.3.999-blas-libs.patch b/sci-mathematics/scilab/files/scilab-5.3.999-blas-libs.patch
new file mode 100644
index 0000000..b2921f7
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.999-blas-libs.patch
@@ -0,0 +1,12 @@
+ upstream http://bugzilla.scilab.org/show_bug.cgi?id=9824
+
+--- scilab-5.3.2-orig/m4/libsmath.m4 2011-09-19 14:08:11.167292730 -0400
++++ scilab-5.3.2/m4/libsmath.m4 2011-09-19 14:08:26.477292283 -0400
+@@ -37,7 +37,6 @@
+ AC_PREREQ(2.50)
+ AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
+ acx_blas_ok=no
+-BLAS_LIBS=
+ acx_blas_save_LIBS="$LIBS"
+
+ AC_ARG_WITH(blas-library,
diff --git a/sci-mathematics/scilab/files/scilab-5.3.999-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.3.999-followlinks.patch
new file mode 100644
index 0000000..118df3b
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.999-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.3.999-fortran-link.patch b/sci-mathematics/scilab/files/scilab-5.3.999-fortran-link.patch
new file mode 100644
index 0000000..5327778
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.999-fortran-link.patch
@@ -0,0 +1,22 @@
+diff -urN scilab-orig/configure.ac scilab/configure.ac
+--- scilab-orig/configure.ac 2012-06-14 22:30:33.438115959 -0400
++++ scilab/configure.ac 2012-06-14 22:37:57.229102963 -0400
+@@ -200,16 +200,14 @@
+ 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
+
+-if test -z "$F77"; then
++elif test -z "$F77"; then
+ ## No Fortran compiler specified... Prefer gfortran and intel compilers
+ AC_PROG_F77([gfortran ifc ifort])
+ if test -z "$F77"; then
diff --git a/sci-mathematics/scilab/files/scilab-5.3.999-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.3.999-gluegen.patch
new file mode 100644
index 0000000..64717a7
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.999-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.3.999-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch
new file mode 100644
index 0000000..e493a3b
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch
@@ -0,0 +1,11 @@
+--- 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/scilab-5.3.999.ebuild b/sci-mathematics/scilab/scilab-5.3.999.ebuild
new file mode 100644
index 0000000..83f7518
--- /dev/null
+++ b/sci-mathematics/scilab/scilab-5.3.999.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+JAVA_PKG_OPT_USE="gui"
+VIRTUALX_REQUIRED="manual"
+
+inherit eutils autotools check-reqs eutils fdo-mime flag-o-matic \
+ java-pkg-opt-2 fortran-2 flag-o-matic 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
+# - libxml2 needs -icu otherwise fails during compilation of xml module
+# (upstream is aware of it)
+# - can't build without help
+# - has to call eautoconf, and not eautoreconf, libtool fails otherwise
+# - --as-needed still doesn't work
+# - 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"
+HOMEPAGE="http://www.scilab.org/"
+SRC_URI="http://guillaume.horel.free.fr/${P}.tar.gz"
+
+SLOT="0"
+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
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-libs/libpcre
+ dev-libs/libxml2:2[-icu]
+ sys-devel/gettext
+ sys-libs/ncurses
+ sys-libs/readline
+ virtual/lapack
+ dev-java/hdf-java
+ 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: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/jlatexmath-0.9.4:0
+ dev-java/jogl:2
+ >=dev-java/jrosetta-1.0.4:0
+ dev-java/scirenderer:0
+ dev-java/skinlf:0
+ dev-java/xmlgraphics-commons:1.3
+ virtual/opengl
+ doc? ( dev-java/saxon:6.5 )
+ xcos? ( dev-java/jgraphx:1.8 ) )
+ matio? ( <sci-libs/matio-1.5 )
+ tk? ( dev-lang/tk )
+ umfpack? ( sci-libs/umfpack )"
+
+RDEPEND="${CDEPEND}
+ gui? ( >=virtual/jre-1.5 )"
+
+DEPEND="${CDEPEND}
+ virtual/fortran
+ virtual/pkgconfig
+ debug? ( dev-util/lcov )
+ gui? (
+ >=virtual/jdk-1.5
+ doc? ( app-text/docbook-xsl-stylesheets
+ >=dev-java/jlatexmath-fop-0.9.4
+ dev-java/xml-commons-external )
+ xcos? ( dev-lang/ocaml ) )
+ test? (
+ dev-java/junit
+ gui? ( ${VIRTUALX_DEPEND} ) )"
+
+S="${WORKDIR}/${PN}"
+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=
+ 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}-blas-libs.patch \
+ "${FILESDIR}"/${P}-followlinks.patch \
+ "${FILESDIR}"/${P}-gluegen.patch
+
+ # need serious as-needed work (inter-dependencies among modules)
+ # "${FILESDIR}"/${P}-as-needed.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
+
+ # 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
+
+ #add specific gentoo java directories
+ if use gui; then
+ sed -i -e "s|/usr/lib/jogl|/usr/lib/jogl-2|" \
+ -e "s|/usr/lib64/jogl|/usr/lib64/jogl-2|" configure.ac || die
+ sed -i -e "s|/usr/lib/gluegen|/usr/lib/gluegen-2|" \
+ -e "s|/usr/lib64/gluegen|/usr/lib64/gluegen-2|" \
+ -e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \
+ configure.ac || die
+
+ sed -i -e "s/jogl/jogl-2/" -e "s/gluegen/gluegen-2/" \
+ -e "s/jhdf5/hdf-java/" etc/librarypath.xml || die
+ sed -i -e "s|/jhdf5|/hdf-java|g" m4/hdf5.m4
+ fi
+ mkdir jar; cd jar
+ java-pkg_jar-from jgraphx-1.8,jlatexmath,hdf-java,flexdock,skinlf
+ java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer
+ java-pkg_jar-from avalon-framework-4.2,saxon-6.5,jeuclid-core
+ java-pkg_jar-from xmlgraphics-commons-1.3,commons-io-1,jlatexmath-fop
+ 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 xml-commons-external-1.4 xml-apis-ext.jar
+ java-pkg_jar-from commons-logging commons-logging.jar
+ java-pkg_jar-from fop fop.jar
+ java-pkg_jar-from javahelp jhall.jar
+ if use test; then
+ java-pkg_jar-from junit-4 junit.jar junit4.jar
+ fi
+ cd ..
+
+ 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="$(pkg-config --libs blas)"
+ export LAPACK_LIBS="$(pkg-config --libs lapack)"
+ export F77_LDFLAGS="${LDFLAGS}"
+ # gentoo bug #302621
+ 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" \
+ $(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
+ use bash-completion && dobashcomp "${FILESDIR}"/${PN}.bash_completion
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2012-07-28 19:15 Guillaume Horel
0 siblings, 0 replies; 18+ messages in thread
From: Guillaume Horel @ 2012-07-28 19:15 UTC (permalink / raw
To: gentoo-commits
commit: 8e9759b050014c56fae8cd12aa46f23621047edf
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sat Jul 28 18:54:14 2012 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sat Jul 28 18:54:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8e9759b0
sci-mathematics/scilab live ebuild update
---
sci-mathematics/scilab/ChangeLog | 5 +++++
.../scilab/files/scilab-5.3.999-blas-libs.patch | 12 ------------
.../scilab/files/scilab-5.3.999-java-heap.patch | 4 ++--
sci-mathematics/scilab/scilab-5.3.999.ebuild | 13 +++++++------
4 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index a47ca98..9dedb94 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 28 Jul 2012; Guillaume Horel <guillaume.horel@gmail.com>
+ scilab-5.3.999.ebuild, -files/scilab-5.3.999-blas-libs.patch,
+ files/scilab-5.3.999-java-heap.patch:
+ live ebuild update
+
*scilab-5.3.999 (11 Jul 2012)
11 Jul 2012; Guillaume Horel <guillaume.horel@gmail.com>
diff --git a/sci-mathematics/scilab/files/scilab-5.3.999-blas-libs.patch b/sci-mathematics/scilab/files/scilab-5.3.999-blas-libs.patch
deleted file mode 100644
index b2921f7..0000000
--- a/sci-mathematics/scilab/files/scilab-5.3.999-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.999-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch
index e493a3b..5e4baae 100644
--- a/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch
+++ b/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch
@@ -1,5 +1,5 @@
---- 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
+--- scilab-orig/etc/jvm_options.xml 2011-05-25 23:20:12.145833420 -0400
++++ scilab/etc/jvm_options.xml 2011-05-25 23:20:58.760833451 -0400
@@ -22,7 +22,7 @@
<!-- ENABLE Just In Time java compiler -->
<option value="-Djava.compiler=JIT"/>
diff --git a/sci-mathematics/scilab/scilab-5.3.999.ebuild b/sci-mathematics/scilab/scilab-5.3.999.ebuild
index 83f7518..6e74de4 100644
--- a/sci-mathematics/scilab/scilab-5.3.999.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.999.ebuild
@@ -7,7 +7,7 @@ EAPI=4
JAVA_PKG_OPT_USE="gui"
VIRTUALX_REQUIRED="manual"
-inherit eutils autotools check-reqs eutils fdo-mime flag-o-matic \
+inherit eutils autotools check-reqs eutils fdo-mime flag-o-matic git-2\
java-pkg-opt-2 fortran-2 flag-o-matic toolchain-funcs virtualx
# Comments:
@@ -26,7 +26,8 @@ inherit eutils autotools check-reqs eutils fdo-mime flag-o-matic \
DESCRIPTION="Scientific software package for numerical computations"
LICENSE="CeCILL-2"
HOMEPAGE="http://www.scilab.org/"
-SRC_URI="http://guillaume.horel.free.fr/${P}.tar.gz"
+#SRC_URI="http://guillaume.horel.free.fr/${P}.tar.gz"
+EGIT_REPO_URI="git://git.scilab.org/scilab"
SLOT="0"
IUSE="bash-completion debug doc fftw +gui +matio nls openmp
@@ -68,7 +69,7 @@ CDEPEND="dev-libs/libpcre
>=dev-java/jrosetta-1.0.4:0
dev-java/scirenderer:0
dev-java/skinlf:0
- dev-java/xmlgraphics-commons:1.3
+ dev-java/xmlgraphics-commons:1.5
virtual/opengl
doc? ( dev-java/saxon:6.5 )
xcos? ( dev-java/jgraphx:1.8 ) )
@@ -93,7 +94,8 @@ DEPEND="${CDEPEND}
dev-java/junit
gui? ( ${VIRTUALX_DEPEND} ) )"
-S="${WORKDIR}/${PN}"
+EGIT_SOURCEDIR="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}/${PN}"
DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
pkg_pretend() {
@@ -124,7 +126,6 @@ pkg_setup() {
src_prepare() {
epatch \
"${FILESDIR}"/${P}-fortran-link.patch \
- "${FILESDIR}"/${P}-blas-libs.patch \
"${FILESDIR}"/${P}-followlinks.patch \
"${FILESDIR}"/${P}-gluegen.patch
@@ -157,7 +158,7 @@ src_prepare() {
java-pkg_jar-from jgraphx-1.8,jlatexmath,hdf-java,flexdock,skinlf
java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer
java-pkg_jar-from avalon-framework-4.2,saxon-6.5,jeuclid-core
- java-pkg_jar-from xmlgraphics-commons-1.3,commons-io-1,jlatexmath-fop
+ java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1,jlatexmath-fop
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
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2012-08-08 3:13 Guillaume Horel
0 siblings, 0 replies; 18+ messages in thread
From: Guillaume Horel @ 2012-08-08 3:13 UTC (permalink / raw
To: gentoo-commits
commit: 6eeb434108605fd4daaf58f84370a40b60d99dfc
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Wed Aug 8 03:13:19 2012 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Wed Aug 8 03:13:19 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6eeb4341
[sci-mathematics/scilab] live ebuild update
---
sci-mathematics/scilab/ChangeLog | 6 +++++
...scilab-5.3.999-fix-random-runtime-failure.patch | 12 ++++++++++
.../scilab/files/scilab-5.3.999-java-heap.patch | 21 +++++++++--------
sci-mathematics/scilab/scilab-5.3.999.ebuild | 24 ++++++++-----------
4 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 9dedb94..51074f7 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 07 Aug 2012; Guillaume Horel <guillaume.horel@gmail.com>
+ scilab-5.3.999.ebuild,
+ +files/scilab-5.3.999-fix-random-runtime-failure.patch,
+ files/scilab-5.3.999-java-heap.patch:
+ fix compile failure with libxml2 and icu
+
28 Jul 2012; Guillaume Horel <guillaume.horel@gmail.com>
scilab-5.3.999.ebuild, -files/scilab-5.3.999-blas-libs.patch,
files/scilab-5.3.999-java-heap.patch:
diff --git a/sci-mathematics/scilab/files/scilab-5.3.999-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.3.999-fix-random-runtime-failure.patch
new file mode 100644
index 0000000..92ac453
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.3.999-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.3.999-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch
index 5e4baae..3523dae 100644
--- a/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch
+++ b/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch
@@ -1,11 +1,12 @@
---- scilab-orig/etc/jvm_options.xml 2011-05-25 23:20:12.145833420 -0400
-+++ scilab/etc/jvm_options.xml 2011-05-25 23:20:58.760833451 -0400
+diff -urN scilab-orig/etc/jvm_options.xml scilab/etc/jvm_options.xml
+--- scilab-orig/etc/jvm_options.xml 2012-08-06 20:47:17.116007011 -0400
++++ scilab/etc/jvm_options.xml 2012-08-06 20:59:02.889052072 -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 -->
- <!--
+ <!-- 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="-Dawt.useSystemAAFontSettings=on" os="linux"/>
+ <option value="-Dapple.laf.useScreenMenuBar=true" os="macosx"/>
+
diff --git a/sci-mathematics/scilab/scilab-5.3.999.ebuild b/sci-mathematics/scilab/scilab-5.3.999.ebuild
index 6e74de4..1d14b09 100644
--- a/sci-mathematics/scilab/scilab-5.3.999.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.999.ebuild
@@ -7,19 +7,16 @@ EAPI=4
JAVA_PKG_OPT_USE="gui"
VIRTUALX_REQUIRED="manual"
-inherit eutils autotools check-reqs eutils fdo-mime flag-o-matic git-2\
- java-pkg-opt-2 fortran-2 flag-o-matic toolchain-funcs virtualx
+inherit eutils autotools bash-completion-r1 check-reqs fdo-mime flag-o-matic \
+ fortran-2 git-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
-# - libxml2 needs -icu otherwise fails during compilation of xml module
-# (upstream is aware of it)
-# - can't build without help
+# - can't build without docs (-doc)
# - has to call eautoconf, and not eautoreconf, libtool fails otherwise
-# - --as-needed still doesn't work
# - needs to remove scilab-5.3.x before installing otherwise gets a DOCBOOK_ROOT
# error
@@ -47,7 +44,7 @@ done
KEYWORDS="~amd64 ~x86"
CDEPEND="dev-libs/libpcre
- dev-libs/libxml2:2[-icu]
+ dev-libs/libxml2:2
sys-devel/gettext
sys-libs/ncurses
sys-libs/readline
@@ -69,7 +66,7 @@ CDEPEND="dev-libs/libpcre
>=dev-java/jrosetta-1.0.4:0
dev-java/scirenderer:0
dev-java/skinlf:0
- dev-java/xmlgraphics-commons:1.5
+ dev-java/xmlgraphics-commons:1.3
virtual/opengl
doc? ( dev-java/saxon:6.5 )
xcos? ( dev-java/jgraphx:1.8 ) )
@@ -125,12 +122,11 @@ pkg_setup() {
src_prepare() {
epatch \
- "${FILESDIR}"/${P}-fortran-link.patch \
- "${FILESDIR}"/${P}-followlinks.patch \
- "${FILESDIR}"/${P}-gluegen.patch
+ "${FILESDIR}/${P}-fortran-link.patch" \
+ "${FILESDIR}/${P}-followlinks.patch" \
+ "${FILESDIR}/${P}-gluegen.patch" \
+ "${FILESDIR}/${P}-fix-random-runtime-failure.patch"
- # need serious as-needed work (inter-dependencies among modules)
- # "${FILESDIR}"/${P}-as-needed.patch \
append-ldflags $(no-as-needed)
# increases java heap to 512M when building docs (sync with cheqreqs above)
@@ -158,7 +154,7 @@ src_prepare() {
java-pkg_jar-from jgraphx-1.8,jlatexmath,hdf-java,flexdock,skinlf
java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer
java-pkg_jar-from avalon-framework-4.2,saxon-6.5,jeuclid-core
- java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1,jlatexmath-fop
+ java-pkg_jar-from xmlgraphics-commons-1.3,commons-io-1,jlatexmath-fop
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
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2014-04-22 23:48 Guillaume Horel
0 siblings, 0 replies; 18+ messages in thread
From: Guillaume Horel @ 2014-04-22 23:48 UTC (permalink / raw
To: gentoo-commits
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 <guillaume.horel@gmail.com>
+ +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 <jlec@gentoo.org> 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) \
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2014-06-29 19:00 Guillaume Horel
0 siblings, 0 replies; 18+ messages in thread
From: Guillaume Horel @ 2014-06-29 19:00 UTC (permalink / raw
To: gentoo-commits
commit: 03814a8eb7cb48d814fc13210687f45bc32da2b0
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sun Jun 29 18:58:59 2014 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sun Jun 29 19:00:15 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=03814a8e
sci-mathematics/scilab: support jdk1.8
Package-Manager: portage-2.2.10
---
sci-mathematics/scilab/ChangeLog | 4 ++
.../scilab/files/scilab-5.5.0-jdk1.8.patch | 76 ++++++++++++++++++++++
sci-mathematics/scilab/scilab-5.5.0.ebuild | 3 +-
3 files changed, 82 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index cdfa696..53eed59 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 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
+
05 May 2014; Quentin Minster <quentin@minster.io> scilab-5.5.0.ebuild:
sci-mathematics/scilab: Fix minimum version dependency for jlatexmath
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-jdk1.8.patch b/sci-mathematics/scilab/files/scilab-5.5.0-jdk1.8.patch
new file mode 100644
index 0000000..856b1fd
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.0-jdk1.8.patch
@@ -0,0 +1,76 @@
+diff -urN scilab-5.5.0-orig/build.incl.xml scilab-5.5.0/build.incl.xml
+--- scilab-5.5.0-orig/build.incl.xml 2014-06-29 14:31:51.791054076 -0400
++++ scilab-5.5.0/build.incl.xml 2014-06-29 14:33:12.733269635 -0400
+@@ -84,17 +84,12 @@
+ <target name="init">
+ <!-- Check the version of Java. If it changes after the configure
+ or if there is a mistake in the build system
+- -->
+- <fail message="JDK 1.6 or 1.7 required. Found ${ant.java.version}">
+- <condition>
+- <not>
+- <or>
+- <equals arg1="${ant.java.version}" arg2="1.6"/>
+- <equals arg1="${ant.java.version}" arg2="1.7"/>
+- </or>
+- </not>
+- </condition>
+- </fail>
++ Note: all class names are the same as in m4/java.m4
++ -->
++ <available property="jdk1.6+" classname="java.util.ArrayDeque"/>
++ <available property="jdk1.7+" classname="java.nio.file.Path"/>
++ <available property="jdk1.8+" classname="java.util.stream.DoubleStream"/>
++ <fail message="Require JDK 1.6 or higher. Found ${ant.java.version}" unless="jdk1.6+"/>
+ <mkdir dir="${classes.dir}"/>
+ <mkdir dir="${classes.test.dir}"/>
+ <mkdir dir="${build.jar.dir}"/>
+diff -urN scilab-5.5.0-orig/configure.ac scilab-5.5.0/configure.ac
+--- scilab-5.5.0-orig/configure.ac 2014-06-29 14:32:03.700233944 -0400
++++ scilab-5.5.0/configure.ac 2014-06-29 14:33:12.735269665 -0400
+@@ -805,7 +805,7 @@
+ AC_JAVA_WITH_JDK
+ AC_JAVA_DETECT_JVM
+ case "$ac_java_jvm_version" in
+- 1.6 | 1.7)
++ 1.6 | 1.7 | 1.8)
+ ;;
+ *)
+ AC_MSG_ERROR([Wrong version of Java. Expected at least 1.6. Found $ac_java_jvm_version])
+diff -urN scilab-5.5.0-orig/m4/java.m4 scilab-5.5.0/m4/java.m4
+--- scilab-5.5.0-orig/m4/java.m4 2014-06-29 14:32:03.840236057 -0400
++++ scilab-5.5.0/m4/java.m4 2014-06-29 14:33:12.736269680 -0400
+@@ -223,7 +223,7 @@
+ #
+ # VARIABLES SET:
+ # JAVAC
+-# ac_java_jvm_version can be set to 1.4, 1.5, 1.6 or 1.7
++# ac_java_jvm_version can be set to 1.4, 1.5, 1.6, 1.7, 1.8
+ # ac_java_jvm_dir can be set to the jvm's root directory
+ #
+ # DEPENDS ON:
+@@ -307,6 +307,9 @@
+ # The class java.nio.file.Path is new to 1.7
+ AC_JAVA_TRY_COMPILE([import java.nio.file.Path;], , "no", ac_java_jvm_version=1.7)
+
++ # The class java.util.stream.DoubleStream is new to 1.8
++ AC_JAVA_TRY_COMPILE([import java.util.stream.DoubleStream;], , "no", ac_java_jvm_version=1.8)
++
+ if test "x$ac_java_jvm_version" = "x" ; then
+ AC_MSG_ERROR([Could not detect Java version, 1.4 or newer is required])
+ fi
+diff -urN scilab-5.5.0-orig/modules/javasci/Makefile.in scilab-5.5.0/modules/javasci/Makefile.in
+--- scilab-5.5.0-orig/modules/javasci/Makefile.in 2014-06-29 14:32:00.613187355 -0400
++++ scilab-5.5.0/modules/javasci/Makefile.in 2014-06-29 14:34:15.638203989 -0400
+@@ -976,10 +976,10 @@
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+-@JAVASCI_FALSE@distclean-local:
+ @JAVASCI_FALSE@install-data-local:
+ @JAVASCI_FALSE@install-html-local:
+ @JAVASCI_FALSE@clean-local:
++@JAVASCI_FALSE@distclean-local:
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-local \
diff --git a/sci-mathematics/scilab/scilab-5.5.0.ebuild b/sci-mathematics/scilab/scilab-5.5.0.ebuild
index 3ea9058..38ad3e4 100644
--- a/sci-mathematics/scilab/scilab-5.5.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.0.ebuild
@@ -117,7 +117,8 @@ src_prepare() {
"${FILESDIR}/${P}-gluegen.patch" \
"${FILESDIR}/${P}-fix-random-runtime-failure.patch" \
"${FILESDIR}/${P}-accessviolation.patch" \
- "${FILESDIR}/${P}-nogui.patch"
+ "${FILESDIR}/${P}-nogui.patch" \
+ "${FILESDIR}/${P}-jdk1.8.patch"
append-ldflags $(no-as-needed)
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2015-06-22 11:42 Justin Lecher
0 siblings, 0 replies; 18+ messages in thread
From: Justin Lecher @ 2015-06-22 11:42 UTC (permalink / raw
To: gentoo-commits
commit: d4071cabdd51be441b8912c3a8470ffa424d570a
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 11:41:27 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 11:41:27 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d4071cab
sci-mathematics/scilab: Fix SLOT version of batik
Package-Manager: portage-2.2.20
sci-mathematics/scilab/ChangeLog | 13 +
.../files/scilab-5.5.0-accessviolation.patch | 21 --
.../scilab-5.5.0-fix-random-runtime-failure.patch | 12 -
.../scilab/files/scilab-5.5.0-followlinks.patch | 11 -
.../scilab/files/scilab-5.5.0-gluegen.patch | 11 -
.../scilab/files/scilab-5.5.0-java-heap.patch | 11 -
.../scilab/files/scilab-5.5.0-jdk1.8.patch | 76 ------
.../scilab/files/scilab-5.5.0-nogui.patch | 13 -
.../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/metadata.xml | 18 +-
sci-mathematics/scilab/scilab-5.5.0.ebuild | 252 --------------------
sci-mathematics/scilab/scilab-5.5.1.ebuild | 264 ---------------------
sci-mathematics/scilab/scilab-5.5.2.ebuild | 2 +-
19 files changed, 23 insertions(+), 771 deletions(-)
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index f6c4a45..6c6f830 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,19 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ -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-jdk1.8.patch,
+ -files/scilab-5.5.0-nogui.patch, -files/scilab-5.5.1-accessviolation.patch,
+ -files/scilab-5.5.1-fix-random-runtime-failure.patch,
+ -files/scilab-5.5.1-followlinks.patch, -files/scilab-5.5.1-gluegen.patch,
+ -files/scilab-5.5.1-java-heap.patch, -files/scilab-5.5.1-missinglib.patch,
+ -files/scilab-5.5.1-nogui.patch, -scilab-5.5.0.ebuild, -scilab-5.5.1.ebuild,
+ metadata.xml, scilab-5.5.2.ebuild:
+ sci-mathematics/scilab: Fix SLOT version of batik
+
*scilab-5.5.2 (03 Apr 2015)
03 Apr 2015; Guillaume Horel <guillaume.horel@gmail.com>
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch
deleted file mode 100644
index a84de9a..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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.0-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch
deleted file mode 100644
index 92ac453..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-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.5.0-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch
deleted file mode 100644
index fd6aa7b..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.0-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.0-gluegen.patch
deleted file mode 100644
index 1514439..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-gluegen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 31060d7..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-java-heap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-jdk1.8.patch b/sci-mathematics/scilab/files/scilab-5.5.0-jdk1.8.patch
deleted file mode 100644
index 856b1fd..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-jdk1.8.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -urN scilab-5.5.0-orig/build.incl.xml scilab-5.5.0/build.incl.xml
---- scilab-5.5.0-orig/build.incl.xml 2014-06-29 14:31:51.791054076 -0400
-+++ scilab-5.5.0/build.incl.xml 2014-06-29 14:33:12.733269635 -0400
-@@ -84,17 +84,12 @@
- <target name="init">
- <!-- Check the version of Java. If it changes after the configure
- or if there is a mistake in the build system
-- -->
-- <fail message="JDK 1.6 or 1.7 required. Found ${ant.java.version}">
-- <condition>
-- <not>
-- <or>
-- <equals arg1="${ant.java.version}" arg2="1.6"/>
-- <equals arg1="${ant.java.version}" arg2="1.7"/>
-- </or>
-- </not>
-- </condition>
-- </fail>
-+ Note: all class names are the same as in m4/java.m4
-+ -->
-+ <available property="jdk1.6+" classname="java.util.ArrayDeque"/>
-+ <available property="jdk1.7+" classname="java.nio.file.Path"/>
-+ <available property="jdk1.8+" classname="java.util.stream.DoubleStream"/>
-+ <fail message="Require JDK 1.6 or higher. Found ${ant.java.version}" unless="jdk1.6+"/>
- <mkdir dir="${classes.dir}"/>
- <mkdir dir="${classes.test.dir}"/>
- <mkdir dir="${build.jar.dir}"/>
-diff -urN scilab-5.5.0-orig/configure.ac scilab-5.5.0/configure.ac
---- scilab-5.5.0-orig/configure.ac 2014-06-29 14:32:03.700233944 -0400
-+++ scilab-5.5.0/configure.ac 2014-06-29 14:33:12.735269665 -0400
-@@ -805,7 +805,7 @@
- AC_JAVA_WITH_JDK
- AC_JAVA_DETECT_JVM
- case "$ac_java_jvm_version" in
-- 1.6 | 1.7)
-+ 1.6 | 1.7 | 1.8)
- ;;
- *)
- AC_MSG_ERROR([Wrong version of Java. Expected at least 1.6. Found $ac_java_jvm_version])
-diff -urN scilab-5.5.0-orig/m4/java.m4 scilab-5.5.0/m4/java.m4
---- scilab-5.5.0-orig/m4/java.m4 2014-06-29 14:32:03.840236057 -0400
-+++ scilab-5.5.0/m4/java.m4 2014-06-29 14:33:12.736269680 -0400
-@@ -223,7 +223,7 @@
- #
- # VARIABLES SET:
- # JAVAC
--# ac_java_jvm_version can be set to 1.4, 1.5, 1.6 or 1.7
-+# ac_java_jvm_version can be set to 1.4, 1.5, 1.6, 1.7, 1.8
- # ac_java_jvm_dir can be set to the jvm's root directory
- #
- # DEPENDS ON:
-@@ -307,6 +307,9 @@
- # The class java.nio.file.Path is new to 1.7
- AC_JAVA_TRY_COMPILE([import java.nio.file.Path;], , "no", ac_java_jvm_version=1.7)
-
-+ # The class java.util.stream.DoubleStream is new to 1.8
-+ AC_JAVA_TRY_COMPILE([import java.util.stream.DoubleStream;], , "no", ac_java_jvm_version=1.8)
-+
- if test "x$ac_java_jvm_version" = "x" ; then
- AC_MSG_ERROR([Could not detect Java version, 1.4 or newer is required])
- fi
-diff -urN scilab-5.5.0-orig/modules/javasci/Makefile.in scilab-5.5.0/modules/javasci/Makefile.in
---- scilab-5.5.0-orig/modules/javasci/Makefile.in 2014-06-29 14:32:00.613187355 -0400
-+++ scilab-5.5.0/modules/javasci/Makefile.in 2014-06-29 14:34:15.638203989 -0400
-@@ -976,10 +976,10 @@
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
--@JAVASCI_FALSE@distclean-local:
- @JAVASCI_FALSE@install-data-local:
- @JAVASCI_FALSE@install-html-local:
- @JAVASCI_FALSE@clean-local:
-+@JAVASCI_FALSE@distclean-local:
- clean: clean-am
-
- clean-am: clean-generic clean-libtool clean-local \
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-nogui.patch b/sci-mathematics/scilab/files/scilab-5.5.0-nogui.patch
deleted file mode 100644
index 60cee5a..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.0-nogui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/files/scilab-5.5.1-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.1-accessviolation.patch
deleted file mode 100644
index a84de9a..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.1-accessviolation.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 92ac453..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.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.5.1-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.1-followlinks.patch
deleted file mode 100644
index fd6aa7b..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.1-followlinks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 1514439..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.1-gluegen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 31060d7..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.1-java-heap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 7f88068..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.1-missinglib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 60cee5a..0000000
--- a/sci-mathematics/scilab/files/scilab-5.5.1-nogui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/metadata.xml b/sci-mathematics/scilab/metadata.xml
index 10d6ddd..2b022cd 100644
--- a/sci-mathematics/scilab/metadata.xml
+++ b/sci-mathematics/scilab/metadata.xml
@@ -1,21 +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>
- <flag name='emf'>Add suport for exporting to emf files</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.ebuild b/sci-mathematics/scilab/scilab-5.5.0.ebuild
deleted file mode 100644
index 3fe7558..0000000
--- a/sci-mathematics/scilab/scilab-5.5.0.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=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="~amd64 ~x86"
-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.0
- >=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}-jdk1.8.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.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.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.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
-}
diff --git a/sci-mathematics/scilab/scilab-5.5.1.ebuild b/sci-mathematics/scilab/scilab-5.5.1.ebuild
deleted file mode 100644
index d01f52a..0000000
--- a/sci-mathematics/scilab/scilab-5.5.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2015 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
- 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.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
- xcos? ( dev-java/jgraphx:2.5 )
- )
- 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? ( 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}-nogui.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.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 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() {
- #bug 531886 need to investigate what's using /proc/mtrr
- 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
-}
diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 095281a..24b47b7 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -75,7 +75,7 @@ DEPEND="${CDEPEND}
debug? ( dev-util/lcov )
gui? (
>=virtual/jdk-1.5
- doc? ( dev-java/batik:1.7
+ doc? ( dev-java/batik:1.8
app-text/docbook-xsl-stylesheets
dev-java/xml-commons-external:1.4
dev-java/saxon:9 )
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2015-07-31 10:09 Justin Lecher
0 siblings, 0 replies; 18+ messages in thread
From: Justin Lecher @ 2015-07-31 10:09 UTC (permalink / raw
To: gentoo-commits
commit: 274601551dff450e0f289351d73eaefab307e9ca
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: Thu Jul 30 18:10:37 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=27460155
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] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2016-06-05 19:44 Guillaume Horel
0 siblings, 0 replies; 18+ messages in thread
From: Guillaume Horel @ 2016-06-05 19:44 UTC (permalink / raw
To: gentoo-commits
commit: df80daa4525164fe8f83ed7b113b462cbd1a7030
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sun Jun 5 19:42:59 2016 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sun Jun 5 19:42:59 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=df80daa4
sci-mathematics/scilab: fix freehep dependency
closes #627
Package-Manager: portage-2.3.0_rc1
.../scilab/files/scilab-5.5.2-freehep.patch | 12 ++++++++++++
sci-mathematics/scilab/scilab-5.5.2-r1.ebuild | 21 +++++++++++++--------
2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
new file mode 100644
index 0000000..3595902
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
@@ -0,0 +1,12 @@
+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
+@@ -1024,7 +1024,7 @@
+ AC_SUBST(FREEHEP_IO)
+
+ # Freehep Util
+- AC_JAVA_CHECK_PACKAGE([freehep-util],[org.freehep.util.StringUtilities],[Freehep Util])
++ AC_JAVA_CHECK_PACKAGE([freehep-graphicsbase],[org.freehep.graphicsbase.util.UserProperties],[Freehep Util])
+ FREEHEP_UTIL=$PACKAGE_JAR_FILE
+ AC_SUBST(FREEHEP_UTIL)
+ fi
diff --git a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
index fabaeb0..ee5dba3 100644
--- a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -40,11 +40,11 @@ CDEPEND="
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
+ dev-java/freehep-graphicsio:0
+ dev-java/freehep-graphicsio-emf:0
+ dev-java/freehep-graphics2d:0
+ dev-java/freehep-io:0
+ dev-java/freehep-graphicsbase:0
)
fftw? ( sci-libs/fftw:3.0 )
gui? (
@@ -128,7 +128,8 @@ src_prepare() {
"${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}-xmlgraphics-common-2.0.patch" \
+ "${FILESDIR}/${P}-freehep.patch"
# works for me on x86, but users are having
# trouble without see #282 on github
@@ -143,6 +144,10 @@ src_prepare() {
# make sure the DOCBOOK_ROOT variable is set
sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die
+ # remove self closing <br /> (error our with javadoc8)
+ # already upstream commit 2103082c
+ find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die
+
#add specific gentoo java directories
if use gui; then
sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.2|" \
@@ -177,7 +182,7 @@ src_prepare() {
fi
if use emf; then
java-pkg_jar-from freehep-graphicsio-emf,freehep-graphics2d
- java-pkg_jar-from freehep-graphicsio,freehep-io,freehep-util
+ java-pkg_jar-from freehep-graphicsio,freehep-io,freehep-graphicsbase
fi
if use test; then
java-pkg_jar-from junit-4 junit.jar junit4.jar
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2021-01-05 18:28 Andrew Ammerlaan
0 siblings, 0 replies; 18+ messages in thread
From: Andrew Ammerlaan @ 2021-01-05 18:28 UTC (permalink / raw
To: gentoo-commits
commit: 92320771862c7de6de2b4cecd2477d0bc5aea0e8
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Jan 1 16:39:00 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan 5 18:26:47 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=92320771
sci-mathematics/scilab: inital attemps at fixing this
- version bumped
- EAPI bumped
- added deps
Do not add keywords yet, needs more fixing but at
least it is less broken now
Closes: https://github.com/gentoo/sci/pull/1026
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
.../scilab/files/scilab-5.5.2-batik-1.8.patch | 99 ----------------------
.../scilab-5.5.2-fix-random-runtime-failure.patch | 12 ---
.../scilab/files/scilab-5.5.2-fop-2.0.patch | 38 ---------
.../scilab-5.5.2-xmlgraphics-common-2.0.patch | 91 --------------------
...on.patch => scilab-6.1.0-accessviolation.patch} | 11 +--
...wlinks.patch => scilab-6.1.0-followlinks.patch} | 0
....2-freehep.patch => scilab-6.1.0-freehep.patch} | 11 +--
....2-gluegen.patch => scilab-6.1.0-gluegen.patch} | 0
...ava-heap.patch => scilab-6.1.0-java-heap.patch} | 0
...singlib.patch => scilab-6.1.0-missinglib.patch} | 0
...-5.5.2-nogui.patch => scilab-6.1.0-nogui.patch} | 0
...{scilab-5.5.2-r1.ebuild => scilab-6.1.0.ebuild} | 23 ++---
12 files changed, 21 insertions(+), 264 deletions(-)
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
deleted file mode 100644
index 007d530ad..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-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/configure
-+++ b/configure
-@@ -16600,8 +16600,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik used
- fi
-
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.7) of batik" >&5
--$as_echo_n "checking minimal version (1.7) of batik... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.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/configure.ac
-+++ b/configure.ac
-@@ -1038,7 +1038,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version
- BATIK=$PACKAGE_JAR_FILE
- fi
- AC_SUBST(BATIK)
-- AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.7],[Version.getVersion()])
-+ AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.8],[Version.getVersion()])
-
- # Commons I/O library
- AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
---- a/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
-+++ b/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
-@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentLoader;
- import org.apache.batik.bridge.GVTBuilder;
- import org.apache.batik.bridge.UserAgent;
- import org.apache.batik.bridge.UserAgentAdapter;
--import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
- import org.apache.batik.gvt.GraphicsNode;
- import org.apache.batik.util.XMLResourceDescriptor;
- import org.scilab.forge.jlatexmath.ParseException;
-
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
deleted file mode 100644
index da7b6e485..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp scilab/modules/api_scilab/src/cpp/api_double.cpp
---- a/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:26:31.342617365 -0400
-+++ b/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:27:34.838621420 -0400
-@@ -497,7 +497,7 @@
- /*--------------------------------------------------------------------------*/
- int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)
- {
-- return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL);
-+ return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0);
- }
- /*--------------------------------------------------------------------------*/
- int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch
deleted file mode 100644
index 18bdaac1d..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Bryan Gardiner <bog@khumba.net>
-Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=14009
-Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456
-
-Updates Scilab to build against FOP >=2.0. This is not tested, as I'm not sure
-of a test case, and it's awaiting upstream review.
-
---- a/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
-+++ b/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
-@@ -43,10 +43,10 @@ public class FopConverter extends ContainerConverter {
- String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase();
-
- try {
-- FopFactory fopFactory = FopFactory.newInstance();
-+ FopFactory fopFactory =
-+ FopFactory.newInstance(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
- fopFactory.addElementMapping(new JLaTeXMathElementMapping());
- fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler());
-- fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
-
- // Step 3: Construct fop with desired output format
- OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName));
---- a/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
-+++ b/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
-@@ -114,11 +114,11 @@ public class CodeExporter extends FOCodeConverter {
- * @param format the page format
- */
- public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) {
-- FopFactory fopFactory = FopFactory.newInstance();
- OutputStream out = null;
-
- try {
-- fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
-+ FopFactory fopFactory =
-+ FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
- FOUserAgent userAgent = fopFactory.newFOUserAgent();
- userAgent.setProducer(CREATOR);
- userAgent.setTitle(title);
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch
deleted file mode 100644
index 4d90f30c7..000000000
--- a/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From: Bryan Gardiner <bog@khumba.net>
-Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=13724
-Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456
-
-Updates Scilab 5.5.2 to build against xmlgraphics-common >=2.0. This is not
-tested, as I'm not sure of a test case, and a similar patch (where the
-super.processShape calls are passed cached=true) is already awaiting upstream
-review.
-
---- a/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
-+++ b/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
-@@ -857,7 +857,7 @@ public class Export {
- }
-
- @Override
-- public int processShape(Shape s) throws IOException {
-+ public int processShape(Shape s, boolean cached) throws IOException {
- if (s instanceof Ellipse2D.Double) {
- Ellipse2D.Double ell = (Ellipse2D.Double) s;
- if (ell.height == ell.width) {
-@@ -880,10 +880,10 @@ public class Export {
- buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
- it.next();
- } else {
-- return super.processShape(s);
-+ return super.processShape(s, cached);
- }
- } else {
-- return super.processShape(s);
-+ return super.processShape(s, cached);
- }
-
- for (; !it.isDone(); it.next()) {
-@@ -891,7 +891,7 @@ public class Export {
- if (type == PathIterator.SEG_LINETO) {
- buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
- } else {
-- return super.processShape(s);
-+ return super.processShape(s, cached);
- }
- }
- buffer.append("] DP");
-@@ -899,7 +899,7 @@ public class Export {
- return PathIterator.WIND_NON_ZERO;
- }
-
-- return super.processShape(s);
-+ return super.processShape(s, cached);
- }
- };
- g2d.setGraphicContext(new GraphicContext());
-@@ -1029,7 +1029,7 @@ public class Export {
- }
-
- @Override
-- public int processShape(Shape s) throws IOException {
-+ public int processShape(Shape s, boolean cached) throws IOException {
- if (s instanceof Ellipse2D.Double) {
- Ellipse2D.Double ell = (Ellipse2D.Double) s;
- if (ell.height == ell.width) {
-@@ -1052,10 +1052,10 @@ public class Export {
- buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
- it.next();
- } else {
-- return super.processShape(s);
-+ return super.processShape(s, cached);
- }
- } else {
-- return super.processShape(s);
-+ return super.processShape(s, cached);
- }
-
- for (; !it.isDone(); it.next()) {
-@@ -1063,7 +1063,7 @@ public class Export {
- if (type == PathIterator.SEG_LINETO) {
- buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
- } else {
-- return super.processShape(s);
-+ return super.processShape(s, cached);
- }
- }
- buffer.append("] DP");
-@@ -1071,7 +1071,7 @@ public class Export {
- return PathIterator.WIND_NON_ZERO;
- }
-
-- return super.processShape(s);
-+ return super.processShape(s, cached);
- }
-
- };
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch b/sci-mathematics/scilab/files/scilab-6.1.0-accessviolation.patch
similarity index 70%
rename from sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
rename to sci-mathematics/scilab/files/scilab-6.1.0-accessviolation.patch
index a7e5c6d5f..940440563 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
+++ b/sci-mathematics/scilab/files/scilab-6.1.0-accessviolation.patch
@@ -1,14 +1,15 @@
-diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab
---- a/bin/scilab 2014-07-12 15:24:17.105686656 -0400
-+++ b/bin/scilab 2014-07-12 15:25:29.307725409 -0400
-@@ -647,17 +647,6 @@
+diff --git a/bin/scilab b/bin/scilab
+index 475457d6..d2b98cc0 100755
+--- a/bin/scilab
++++ b/bin/scilab
+@@ -720,17 +720,6 @@ fi
GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g)
export GTK_MODULES
-# libEGL may be partially supported by the closed-source NVIDIA driver.
-# Until they release an EGL driver, we force the egl_glx driver.
-# http://bugzilla.scilab.org/show_bug.cgi?id=12940
--if test -x /usr/bin/glxinfo; then
+-if test $SCILAB_MODE != "nwni" -a -x /usr/bin/glxinfo; then
- NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
- if test ! -z "$NVIDIA_GLX_VENDOR"; then
- EGL_DRIVER=egl_glx
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch b/sci-mathematics/scilab/files/scilab-6.1.0-followlinks.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch
rename to sci-mathematics/scilab/files/scilab-6.1.0-followlinks.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch b/sci-mathematics/scilab/files/scilab-6.1.0-freehep.patch
similarity index 50%
rename from sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
rename to sci-mathematics/scilab/files/scilab-6.1.0-freehep.patch
index 46825cb29..6f9587780 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
+++ b/sci-mathematics/scilab/files/scilab-6.1.0-freehep.patch
@@ -1,11 +1,12 @@
-diff -uNr scilab-5.5.2-orig/configure.ac scilab-5.5.2/configure.ac
---- a/configure.ac 2016-06-05 12:30:06.582735449 -0400
-+++ b/configure.ac 2016-06-05 12:31:29.706708157 -0400
-@@ -1024,7 +1024,7 @@
+diff --git a/configure.ac b/configure.ac
+index f6018580..d783ca96 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1076,7 +1076,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version
AC_SUBST(FREEHEP_IO)
# Freehep Util
-- AC_JAVA_CHECK_PACKAGE([freehep-util],[org.freehep.util.StringUtilities],[Freehep Util])
+- AC_JAVA_CHECK_JAR([freehep-util],[org.freehep.util.StringUtilities],[Freehep Util])
+ AC_JAVA_CHECK_PACKAGE([freehep-graphicsbase],[org.freehep.graphicsbase.util.UserProperties],[Freehep Util])
FREEHEP_UTIL=$PACKAGE_JAR_FILE
AC_SUBST(FREEHEP_UTIL)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch b/sci-mathematics/scilab/files/scilab-6.1.0-gluegen.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch
rename to sci-mathematics/scilab/files/scilab-6.1.0-gluegen.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch b/sci-mathematics/scilab/files/scilab-6.1.0-java-heap.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch
rename to sci-mathematics/scilab/files/scilab-6.1.0-java-heap.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch b/sci-mathematics/scilab/files/scilab-6.1.0-missinglib.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch
rename to sci-mathematics/scilab/files/scilab-6.1.0-missinglib.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-nogui.patch b/sci-mathematics/scilab/files/scilab-6.1.0-nogui.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.5.2-nogui.patch
rename to sci-mathematics/scilab/files/scilab-6.1.0-nogui.patch
diff --git a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild b/sci-mathematics/scilab/scilab-6.1.0.ebuild
similarity index 93%
rename from sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
rename to sci-mathematics/scilab/scilab-6.1.0.ebuild
index 4bbbde779..190b3f105 100644
--- a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_OPT_USE="gui"
VIRTUALX_REQUIRED="manual"
@@ -13,9 +13,10 @@ 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"
+LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
+
IUSE="bash-completion debug doc emf fftw +gui +matio mpi nls openmp
static-libs test tk +umfpack +xcos"
REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
@@ -63,7 +64,7 @@ CDEPEND="
fftw? ( sci-libs/fftw:3.0 )
gui? (
dev-java/avalon-framework:4.2
- >=dev-java/batik-1.8-r2:1.8
+ >=dev-java/batik-1.8:=
dev-java/commons-io:1
dev-java/commons-logging:0
>=dev-java/flexdock-1.2.4:0
@@ -76,10 +77,11 @@ CDEPEND="
>=dev-java/jlatexmath-fop-1.0.3:1
~dev-java/jogl-2.2.4:2.2
>=dev-java/jrosetta-1.0.4:0
+ >dev-java/lucene-2:=[contrib]
dev-java/skinlf:0
dev-java/xmlgraphics-commons:2
virtual/opengl
- xcos? ( dev-java/jgraphx:2.5 )
+ xcos? ( dev-java/jgraphx:= )
)
matio? ( >=sci-libs/matio-1.5 )
tk? ( dev-lang/tk:0= )
@@ -100,6 +102,7 @@ DEPEND="${CDEPEND}
)
test? (
dev-java/junit:4
+ dev-java/ant-junit4:0
gui? ( ${VIRTUALX_DEPEND} ) )"
DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
@@ -107,12 +110,8 @@ 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"
)
@@ -148,10 +147,6 @@ pkg_setup() {
src_prepare() {
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 && eapply "${FILESDIR}/${P}-java-heap.patch"
@@ -190,7 +185,7 @@ src_prepare() {
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
+ use xcos && java-pkg_jar-from jgraphx
if use doc; then
java-pkg_jar-from --build-only batik-1.8 batik-all.jar
java-pkg_jar-from --build-only saxon-9 saxon.jar saxon9he.jar
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2021-01-11 17:23 Andrew Ammerlaan
0 siblings, 0 replies; 18+ messages in thread
From: Andrew Ammerlaan @ 2021-01-11 17:23 UTC (permalink / raw
To: gentoo-commits
commit: 92beb1e7875d7df761c5995c2de6b38beee325a2
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Jan 11 17:23:25 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Jan 11 17:23:25 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=92beb1e7
sci-mathematics/scilab: add libxml patch
thanks to @efferre79
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
.../scilab/files/scilab-6.1.0-libxml.patch | 66 ++++++++++++++++++++++
sci-mathematics/scilab/scilab-6.1.0.ebuild | 1 +
2 files changed, 67 insertions(+)
diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch b/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch
new file mode 100644
index 000000000..55d2e744a
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch
@@ -0,0 +1,66 @@
+--- orig/scilab-6.1.0/modules/functions_manager/src/cpp/dynamic_modules.cpp 2020-02-25 10:59:51.000000000 +0100
++++ scilab-6.1.0/modules/functions_manager/src/cpp/dynamic_modules.cpp 2020-06-13 17:52:19.258491176 +0200
+@@ -22,13 +22,13 @@
+ {
+ #include "loadOnUseClassPath.h"
+ #include "Scierror.h"
++}
+
+ //XML API
+ #include <libxml/xpath.h>
+ #include <libxml/xmlreader.h>
+ #include "sci_malloc.h"
+ #include "configvariable_interface.h"
+-}
+
+ vectGateway loadGatewaysName(const std::wstring& _wstModuleName)
+ {
+--- orig/scilab-6.1.0/modules/io/src/cpp/loadlib.cpp 2020-02-25 10:59:59.000000000 +0100
++++ scilab-6.1.0/modules/io/src/cpp/loadlib.cpp 2020-06-13 17:38:17.474133786 +0200
+@@ -17,6 +17,8 @@
+ #include "context.hxx"
+ #include "loadlib.hxx"
+ #include "macrofile.hxx"
++#include <libxml/xpath.h>
++#include <libxml/xmlreader.h>
+ extern "C"
+ {
+ #include "FileExist.h"
+@@ -26,8 +28,6 @@
+ #include "fullpath.h"
+ #include "PATH_MAX.h"
+ #include "pathconvert.h"
+-#include <libxml/xpath.h>
+-#include <libxml/xmlreader.h>
+ }
+
+ #define DEFAULT_ENCODING "UTF-8"
+--- orig/scilab-6.1.0/modules/xml/src/cpp/XMLDocument.hxx 2020-02-25 11:00:18.000000000 +0100
++++ scilab-6.1.0/modules/xml/src/cpp/XMLDocument.hxx 2020-06-13 17:45:02.443795087 +0200
+@@ -23,13 +23,10 @@
+
+ #include "dynlib_xml_scilab.h"
+
+-extern "C"
+-{
+ #include "xml.h"
+ #ifndef XML_XPATH_CHECKNS
+ #define XML_XPATH_CHECKNS
+ #endif
+-}
+
+ #include "XMLObject.hxx"
+
+--- orig/scilab-6.1.0/modules/scicos/includes/XMIResource.hxx 2020-02-25 11:00:08.000000000 +0100
++++ scilab-6.1.0/modules/scicos/includes/XMIResource.hxx 2020-06-13 18:13:54.985717732 +0200
+@@ -22,10 +22,8 @@
+ #include <string>
+ #include <vector>
+
+-extern "C" {
+ #include <libxml/xmlwriter.h>
+ #include <libxml/xmlreader.h>
+-}
+
+ namespace org_scilab_modules_scicos
+ {
diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild b/sci-mathematics/scilab/scilab-6.1.0.ebuild
index 190b3f105..4b3daa17c 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.ebuild
@@ -113,6 +113,7 @@ PATCHES=(
"${FILESDIR}/${P}-accessviolation.patch"
"${FILESDIR}/${P}-missinglib.patch"
"${FILESDIR}/${P}-freehep.patch"
+ "${FILESDIR}/${P}-libxml.patch"
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/
@ 2021-01-24 21:05 Andrew Ammerlaan
0 siblings, 0 replies; 18+ messages in thread
From: Andrew Ammerlaan @ 2021-01-24 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 0fad1730e56262ffe836aaeeafeed0e6780c175a
Author: Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Sun Jan 24 17:11:03 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jan 24 20:47:42 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=0fad1730
sci-mathematics/scilab: re-add previous version 5.5.2
As latest version 6.1.0 requires more work (missing deps in portage),
re-add the old one. Ebuild is not mergeable yet.
Signed-off-by: Fabio Rossi <rossi.f <AT> inwind.it>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
.../files/scilab-5.5.2-accessviolation.patch | 21 ++
.../scilab/files/scilab-5.5.2-batik-1.9.patch | 104 +++++++
.../scilab/files/scilab-5.5.2-bug15449.patch | 11 +
.../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-fop-2.0.patch | 38 +++
.../scilab/files/scilab-5.5.2-fortran-gcc8.patch | 57 ++++
.../scilab/files/scilab-5.5.2-freehep.patch | 12 +
.../scilab/files/scilab-5.5.2-gluegen.patch | 11 +
.../scilab/files/scilab-5.5.2-hdf5-1.8.10.patch | 278 +++++++++++++++++++
.../scilab/files/scilab-5.5.2-java-heap.patch | 11 +
.../scilab/files/scilab-5.5.2-libxml-icu64.patch | 16 ++
.../scilab/files/scilab-5.5.2-missinglib.patch | 11 +
.../scilab/files/scilab-5.5.2-ocaml-4.0.4.patch | 12 +
.../scilab-5.5.2-xmlgraphics-common-2.0.patch | 91 +++++++
sci-mathematics/scilab/scilab-5.5.2.ebuild | 300 +++++++++++++++++++++
16 files changed, 996 insertions(+)
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 000000000..a7e5c6d5f
--- /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
+--- a/bin/scilab 2014-07-12 15:24:17.105686656 -0400
++++ b/bin/scilab 2014-07-12 15:25:29.307725409 -0400
+@@ -647,17 +647,6 @@
+ GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g)
+ export GTK_MODULES
+
+-# libEGL may be partially supported by the closed-source NVIDIA driver.
+-# Until they release an EGL driver, we force the egl_glx driver.
+-# http://bugzilla.scilab.org/show_bug.cgi?id=12940
+-if test -x /usr/bin/glxinfo; then
+- NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
+- if test ! -z "$NVIDIA_GLX_VENDOR"; then
+- EGL_DRIVER=egl_glx
+- export EGL_DRIVER
+- fi
+-fi
+-
+ if test $SCIVERBOSE -ne 0; then
+ echo "SCI : $SCI"
+ echo "SCIBIN : $SCIBIN"
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.9.patch b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.9.patch
new file mode 100644
index 000000000..ce0cebbf3
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.9.patch
@@ -0,0 +1,104 @@
+Updates Scilab to build against (and require) Batik >=1.9, this has been
+adapted from Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456
+
+--- a/configure
++++ b/configure
+@@ -16600,8 +16600,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik used
+ fi
+
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.7) of batik" >&5
+-$as_echo_n "checking minimal version (1.7) of batik... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.9) of batik" >&5
++$as_echo_n "checking minimal version (1.9) of batik... " >&6; }
+ saved_ac_java_classpath=$ac_java_classpath
+ export ac_java_classpath="$BATIK:$ac_java_classpath"
+ if test "x" == "x"; then
+@@ -16614,7 +16614,7 @@ import org.apache.batik.Version;
+
+ public class conftest {
+ public static void main(String[] argv) {
+- String minVersion="1.7";
++ String minVersion="1.9";
+
+ System.out.println(Version.getVersion());
+ if (compare(minVersion, Version.getVersion()) > 0) {
+@@ -16663,7 +16663,7 @@ EOF
+ STDOUT=`cat conftest.java.output`
+ fi
+ echo "configure: CLASSPATH was $CLASSPATH" >&5
+- as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5
++ as_fn_error $? "Wrong version of batik. Expected at least 1.9. Found $STDOUT" "$LINENO" 5
+ fi
+ fi
+ if test -f conftest.java.output; then
+@@ -16673,7 +16673,7 @@ EOF
+ echo "configure: failed program was:" >&5
+ cat conftest.java >&5
+ echo "configure: CLASSPATH was $CLASSPATH" >&5
+- as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5
++ as_fn_error $? "Wrong version of batik. Expected at least 1.9. Found $STDOUT" "$LINENO" 5
+ fi
+
+ else
+@@ -16686,7 +16686,7 @@ import org.apache.batik.Version;
+
+ public class conftest {
+ public static void main(String[] argv) {
+- String minVersion="1.7";
++ String minVersion="1.9";
+
+ System.out.println(Version.getVersion());
+ if (compare(minVersion, Version.getVersion()) != 0) {
+@@ -16735,7 +16735,7 @@ EOF
+ STDOUT=`cat conftest.java.output`
+ fi
+ echo "configure: CLASSPATH was $CLASSPATH" >&5
+- as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5
++ as_fn_error $? "Wrong version of batik. Expected exact version 1.9. Found $STDOUT" "$LINENO" 5
+ fi
+ fi
+ if test -f conftest.java.output; then
+@@ -16745,7 +16745,7 @@ EOF
+ echo "configure: failed program was:" >&5
+ cat conftest.java >&5
+ echo "configure: CLASSPATH was $CLASSPATH" >&5
+- as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5
++ as_fn_error $? "Wrong version of batik. Expected exact version 1.9. Found $STDOUT" "$LINENO" 5
+ fi
+
+ fi
+--- a/configure.ac
++++ b/configure.ac
+@@ -1038,7 +1038,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version
+ BATIK=$PACKAGE_JAR_FILE
+ fi
+ AC_SUBST(BATIK)
+- AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.7],[Version.getVersion()])
++ AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.9],[Version.getVersion()])
+
+ # Commons I/O library
+ AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
+--- a/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
++++ b/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
+@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentLoader;
+ import org.apache.batik.bridge.GVTBuilder;
+ import org.apache.batik.bridge.UserAgent;
+ import org.apache.batik.bridge.UserAgentAdapter;
+-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
++import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+ import org.apache.batik.gvt.GraphicsNode;
+ import org.apache.batik.util.XMLResourceDescriptor;
+ import org.scilab.forge.jlatexmath.ParseException;
+--- ./modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java 2021-01-24 16:26:14.686473112 +0100
++++ ./modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java.new 2021-01-24 16:34:25.486426923 +0100
+@@ -100,7 +100,7 @@
+ * Dependencies version
+ */
+ private static final List<String> MXGRAPH_VERSIONS = null;
+- private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7", "1.8pre", "1.8");
++ private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7", "1.8pre", "1.8", "1.9");
+
+ private static final String UNABLE_TO_LOAD_JGRAPHX = Messages.gettext("Unable to load the jgraphx library.\nExpecting version %s ; Getting version %s .");
+ private static final String UNABLE_TO_LOAD_BATIK = Messages.gettext("Unable to load the Batik library. \nExpecting version %s ; Getting version %s .");
+
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-bug15449.patch b/sci-mathematics/scilab/files/scilab-5.5.2-bug15449.patch
new file mode 100644
index 000000000..6e58dd540
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-bug15449.patch
@@ -0,0 +1,11 @@
+--- ./modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp 2015-03-31 11:31:43.000000000 +0200
++++ ./modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp.new 2021-01-10 15:47:49.011858918 +0100
+@@ -54,7 +54,7 @@
+ {
+ // FIXME #7266 workaround
+ // check category emptyness
+- if (category == NULL || (lenCategory == 1 && *category == '\0'))
++ if (category == NULL || (lenCategory == 1 && **category == 0))
+ {
+ Palette::loadPal(getScilabJavaVM(), name);
+ }
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
new file mode 100644
index 000000000..da7b6e485
--- /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
+--- a/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:26:31.342617365 -0400
++++ b/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:27:34.838621420 -0400
+@@ -497,7 +497,7 @@
+ /*--------------------------------------------------------------------------*/
+ int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)
+ {
+- return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL);
++ return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0);
+ }
+ /*--------------------------------------------------------------------------*/
+ int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch
new file mode 100644
index 000000000..a3f60bee7
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch
@@ -0,0 +1,11 @@
+--- a/m4/java.m4 2014-02-11 23:43:03.030430258 -0500
++++ b/m4/java.m4 2014-02-11 23:43:54.008428766 -0500
+@@ -839,7 +839,7 @@
+ for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do
+
+ # TODO check the behaviour when spaces
+- jars_resolved=`ls $jar 2>/dev/null`
++ jars_resolved=$(realpath $(ls $jar 2>/dev/null) 2>/dev/null)
+ for jar_resolved in $jars_resolved; do # If several jars matches
+ if test -e "$jar_resolved"; then
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch
new file mode 100644
index 000000000..18bdaac1d
--- /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/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
++++ b/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
+@@ -43,10 +43,10 @@ public class FopConverter extends ContainerConverter {
+ String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase();
+
+ try {
+- FopFactory fopFactory = FopFactory.newInstance();
++ FopFactory fopFactory =
++ FopFactory.newInstance(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
+ fopFactory.addElementMapping(new JLaTeXMathElementMapping());
+ fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler());
+- fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
+
+ // Step 3: Construct fop with desired output format
+ OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName));
+--- a/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
++++ b/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
+@@ -114,11 +114,11 @@ public class CodeExporter extends FOCodeConverter {
+ * @param format the page format
+ */
+ public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) {
+- FopFactory fopFactory = FopFactory.newInstance();
+ OutputStream out = null;
+
+ try {
+- fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
++ FopFactory fopFactory =
++ FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
+ FOUserAgent userAgent = fopFactory.newFOUserAgent();
+ userAgent.setProducer(CREATOR);
+ userAgent.setTitle(title);
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fortran-gcc8.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fortran-gcc8.patch
new file mode 100644
index 000000000..31dcf52e7
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-fortran-gcc8.patch
@@ -0,0 +1,57 @@
+From f49b185c678c07526ef59c1531d41575f9266bdc Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Cl=C3=A9ment=20DAVID?= <clement.david@esi-group.com>
+Date: Mon, 26 Feb 2018 23:43:14 +0100
+Subject: [PATCH] Fortran: fix errors with gfortran 8
+
+Change-Id: Ib890c6ea2dcba2f70d3c22dc86bbe38e4f22b061
+--- a/modules/differential_equations/src/fortran/ddaskr.f
++++ b/modules/differential_equations/src/fortran/ddaskr.f
+@@ -1409,6 +1409,7 @@ C
+ DIMENSION RWORK(LRW),IWORK(LIW)
+ DIMENSION RTOL(*),ATOL(*)
+ DIMENSION RPAR(*),IPAR(*)
++ DIMENSION JROOT(NRT)
+ CHARACTER MSG*80
+ EXTERNAL RES, JAC, PSOL, RT, DDASID, DDASIK, DNEDD, DNEDK
+ C
+@@ -2530,7 +2531,8 @@ C Pointers into RWORK:
+ DOUBLE PRECISION TN, TOUT, Y, YP, PHI, PSI, R0, R1, RX, UROUND,
+ * RWORK, RPAR
+ DIMENSION Y(*), YP(*), PHI(NEQ,*), PSI(*),
+- * R0(*), R1(*), RX(*), JROOT(*), RWORK(*), IWORK(*)
++ * R0(*), R1(*), RX(*), JROOT(NRT), RWORK(*), IWORK(*),
++ * RPAR(*), IPAR(*)
+ INTEGER I, JFLAG
+ DOUBLE PRECISION H
+ DOUBLE PRECISION HMINR, T1, TEMP1, TEMP2, X, ZERO
+--- a/modules/differential_equations/src/fortran/ddasrt.f
++++ b/modules/differential_equations/src/fortran/ddasrt.f
+@@ -870,6 +870,7 @@ C
+ DIMENSION RWORK(*),IWORK(*)
+ DIMENSION RTOL(*),ATOL(*)
+ DIMENSION RPAR(*),IPAR(*)
++ DIMENSION JROOT(NG)
+ CHARACTER MSG*80
+ C
+ C SET POINTERS INTO IWORK
+@@ -1594,7 +1595,8 @@ C
+ DOUBLE PRECISION TN, TOUT, Y, YP, PHI, PSI, G0, G1, GX, UROUND,
+ * RWORK, RPAR
+ DIMENSION Y(*), YP(*), PHI(NEQ,*), PSI(*),
+- 1 G0(*), G1(*), GX(*), JROOT(*), RWORK(*), IWORK(*)
++ 1 G0(*), G1(*), GX(*), JROOT(NG), RWORK(*), IWORK(*), RPAR(*),
++ 1 IPAR(*)
+ INTEGER I, JFLAG
+ DOUBLE PRECISION H
+ DOUBLE PRECISION HMING, T1, TEMP1, TEMP2, X
+--- a/modules/differential_equations/src/fortran/twodq.f
++++ b/modules/differential_equations/src/fortran/twodq.f
+@@ -900,7 +900,7 @@ C
+ END
+
+ subroutine tridv(node,node1,node2,coef,rank)
+- double precision node(10),node1(10),node2(10),coef
++ double precision node(9),node1(9),node2(9),coef
+ integer rank
+ double precision s(3),coef1,temp
+ integer t(3)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
new file mode 100644
index 000000000..46825cb29
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
@@ -0,0 +1,12 @@
+diff -uNr scilab-5.5.2-orig/configure.ac scilab-5.5.2/configure.ac
+--- a/configure.ac 2016-06-05 12:30:06.582735449 -0400
++++ b/configure.ac 2016-06-05 12:31:29.706708157 -0400
+@@ -1024,7 +1024,7 @@
+ AC_SUBST(FREEHEP_IO)
+
+ # Freehep Util
+- AC_JAVA_CHECK_PACKAGE([freehep-util],[org.freehep.util.StringUtilities],[Freehep Util])
++ AC_JAVA_CHECK_PACKAGE([freehep-graphicsbase],[org.freehep.graphicsbase.util.UserProperties],[Freehep Util])
+ FREEHEP_UTIL=$PACKAGE_JAR_FILE
+ AC_SUBST(FREEHEP_UTIL)
+ fi
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch
new file mode 100644
index 000000000..d75c31e9a
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch
@@ -0,0 +1,11 @@
+--- a/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:38:00.928934500 -0400
++++ b/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:37:33.947567043 -0400
+@@ -157,7 +157,7 @@
+
+ static {
+ try {
+- System.loadLibrary("gluegen2-rt");
++ System.loadLibrary("gluegen-rt");
+ } catch (Exception e) {
+ System.err.println(e);
+ }
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-hdf5-1.8.10.patch b/sci-mathematics/scilab/files/scilab-5.5.2-hdf5-1.8.10.patch
new file mode 100644
index 000000000..07e497939
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-hdf5-1.8.10.patch
@@ -0,0 +1,278 @@
+--- scilab-6.0.0.orig/modules/hdf5/src/cpp/H5ReferenceData.cpp 2017-02-14 12:40:34.000000000 +0100
++++ scilab-6.0.0/modules/hdf5/src/cpp/H5ReferenceData.cpp 2017-02-15 20:08:00.761619371 +0100
+@@ -42,7 +42,11 @@
+ for (int i = 0; i < totalSize; i++)
+ {
+ void * ref = &(((void **)cdata)[i]);
+- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
++ hid_t obj = H5Rdereference(file,
++ #if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++ #endif
++ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
+ H5O_info_t info;
+ H5Oget_info(obj, &info);
+ H5Oclose(obj);
+@@ -84,7 +88,11 @@
+
+ file = getFile().getH5Id();
+ ref = &(((void **)cdata)[0]);
+- obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
++ obj = H5Rdereference(file,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
+ if (obj < 0)
+ {
+ throw H5Exception(__LINE__, __FILE__, _("Cannot open object at the given position."));
+@@ -126,7 +134,11 @@
+ for (int i = 0; i < totalSize; i++)
+ {
+ void * ref = &(((void **)cdata)[i]);
+- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
++ hid_t obj = H5Rdereference(file,
++ #if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++ #endif
++ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
+ objs[i] = &H5Object::getObject(getParent(), obj);
+ }
+
+@@ -181,7 +193,11 @@
+ char * cdata = static_cast<char *>(data) + offset + pos * (stride ? stride : dataSize);
+ void ** ref = &(((void **)cdata)[0]);
+ hid_t file = getFile().getH5Id();
+- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
++ hid_t obj = H5Rdereference(file,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
+ if (obj < 0)
+ {
+ os << "NULL";
+--- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2017-02-14 12:40:34.000000000 +0100
++++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2017-02-15 20:08:00.758286029 +0100
+@@ -474,7 +474,11 @@
+ }
+
+ //Open the referenced object, get its name and type.
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &Ref);
++ obj = H5Rdereference(_iDatasetId,
++ #if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++ #endif
++ H5R_OBJECT, &Ref);
+ readDouble_v1(obj, _iRows, _iCols, _pdblData);
+ }
+
+@@ -501,14 +505,22 @@
+ }
+
+ //Open the referenced object, get its name and type.
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
++ obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ H5R_OBJECT, &pRef[0]);
+ status = readDouble_v1(obj, _iRows, _iCols, _pdblReal);
+ if (status < 0)
+ {
+ return -1;
+ }
+
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
++ obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ H5R_OBJECT, &pRef[1]);
+ status = readDouble_v1(obj, _iRows, _iCols, _pdblImg);
+ if (status < 0)
+ {
+@@ -834,7 +846,11 @@
+ /*
+ * Open the referenced object, get its name and type.
+ */
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]);
++ obj = H5Rdereference(_iDatasetId,
++ #if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++ #endif
++ H5R_OBJECT, &pData[i]);
+ if (_iComplex)
+ {
+ status = readComplexPoly_v1(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]);
+@@ -1069,7 +1085,11 @@
+ }
+
+ //read Row data
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
++ obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ H5R_OBJECT, &pRef[0]);
+ status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow);
+ if (status < 0)
+ {
+@@ -1077,7 +1097,11 @@
+ }
+
+ //read cols data
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
++ obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ H5R_OBJECT, &pRef[1]);
+ status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos);
+ if (status < 0)
+ {
+@@ -1085,7 +1109,11 @@
+ }
+
+ //read sparse data
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]);
++ obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ H5R_OBJECT, &pRef[2]);
+
+ if (_iComplex)
+ {
+@@ -1131,7 +1159,11 @@
+ }
+
+ //read Row data
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
++ obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ H5R_OBJECT, &pRef[0]);
+ status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow);
+ if (status < 0)
+ {
+@@ -1139,7 +1171,11 @@
+ }
+
+ //read cols data
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
++ obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ H5R_OBJECT, &pRef[1]);
+ status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos);
+ if (status < 0)
+ {
+@@ -1234,7 +1270,11 @@
+ {
+ hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos];
+
+- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef);
++ *_piItemDataset = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ H5R_OBJECT, &poRef);
+
+ if (*_piItemDataset == 0)
+ {
+--- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile.c 2017-02-14 12:40:34.000000000 +0100
++++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile.c 2017-02-15 20:08:00.758286029 +0100
+@@ -742,7 +742,11 @@
+ /*
+ * Open the referenced object, get its name and type.
+ */
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]);
++ obj = H5Rdereference(_iDatasetId,
++ #if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++ #endif
++ H5R_OBJECT, &pData[i]);
+ if (_iComplex)
+ {
+ status = readComplexPoly(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]);
+@@ -976,7 +980,11 @@
+ }
+
+ //read Row data
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
++ obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ H5R_OBJECT, &pRef[0]);
+ status = readInteger32Matrix(obj, _piNbItemRow);
+ if (status < 0)
+ {
+@@ -984,7 +992,11 @@
+ }
+
+ //read cols data
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
++ obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ H5R_OBJECT, &pRef[1]);
+ status = readInteger32Matrix(obj, _piColPos);
+ if (status < 0)
+ {
+@@ -992,7 +1004,11 @@
+ }
+
+ //read sparse data
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]);
++ obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ H5R_OBJECT, &pRef[2]);
+
+ if (_iComplex)
+ {
+@@ -1043,7 +1059,11 @@
+ }
+
+ //read Row data
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
++ obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ H5R_OBJECT, &pRef[0]);
+ status = readInteger32Matrix(obj, _piNbItemRow);
+ if (status < 0)
+ {
+@@ -1053,7 +1073,11 @@
+ if (_iNbItem != 0)
+ {
+ //read cols data
+- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
++ obj = H5Rdereference(_iDatasetId,
++ #if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++ #endif
++ H5R_OBJECT, &pRef[1]);
+ status = readInteger32Matrix(obj, _piColPos);
+ if (status < 0)
+ {
+@@ -1154,7 +1178,11 @@
+ {
+ hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos];
+
+- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef);
++ *_piItemDataset = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++ H5P_DATASET_ACCESS_DEFAULT,
++#endif
++ H5R_OBJECT, &poRef);
+
+ if (*_piItemDataset == 0)
+ {
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch
new file mode 100644
index 000000000..ca17e52a6
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch
@@ -0,0 +1,11 @@
+--- a/etc/jvm_options.xml 2014-02-12 00:05:34.323390688 -0500
++++ b/etc/jvm_options.xml 2014-02-12 00:05:53.977390112 -0500
+@@ -22,7 +22,7 @@
+ <!-- ENABLE Just In Time java compiler -->
+ <option value="-Djava.compiler=JIT"/>
+ <!-- Set Java Heap space to 256mb -->
+- <option value="-Xmx256m"/>
++ <option value="-Xmx512m"/>
+ <!-- Avoid jvm to handle sigint (& other signals) -->
+ <option value="-Xrs"/>
+
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-libxml-icu64.patch b/sci-mathematics/scilab/files/scilab-5.5.2-libxml-icu64.patch
new file mode 100644
index 000000000..1dc4fd079
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-libxml-icu64.patch
@@ -0,0 +1,16 @@
+--- ./modules/xml/src/cpp/XMLDocument.hxx 2015-03-31 11:31:45.000000000 +0200
++++ ./modules/xml/src/cpp/XMLDocument.hxx.new 2021-01-10 15:18:51.172022465 +0100
+@@ -20,13 +20,10 @@
+
+ #include "dynlib_xml_scilab.h"
+
+-extern "C"
+-{
+ #include "xml.h"
+ #ifndef XML_XPATH_CHECKNS
+ #define XML_XPATH_CHECKNS
+ #endif
+-}
+
+ #include "XMLObject.hxx"
+
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch b/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch
new file mode 100644
index 000000000..25b281820
--- /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
+--- a/Makefile.am 2014-10-09 18:22:21.994610695 -0400
++++ b/Makefile.am 2014-10-09 18:24:28.208333575 -0400
+@@ -74,6 +74,7 @@
+ if NEED_JAVA
+ scilab_bin_LDADD += \
+ $(top_builddir)/modules/console/libsciconsole.la \
++ $(top_builddir)/modules/console/libsciconsole-minimal.la \
+ $(top_builddir)/modules/jvm/libscijvm.la \
+ $(top_builddir)/modules/commons/libscicommons.la
+ else
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-ocaml-4.0.4.patch b/sci-mathematics/scilab/files/scilab-5.5.2-ocaml-4.0.4.patch
new file mode 100644
index 000000000..dc8941ff0
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-ocaml-4.0.4.patch
@@ -0,0 +1,12 @@
+--- ./modules/scicos/src/modelica_compiler/optimization.ml.orig 2018-05-16 19:42:49.168681800 +0200
++++ ./modules/scicos/src/modelica_compiler/optimization.ml 2018-05-16 19:44:53.999181477 +0200
+@@ -163,7 +163,8 @@
+ let m, e = frexp f in
+ let sm = string_of_float m in
+ let s = String.make 16 '0' in
+- String.blit sm 2 s 0 (String.length sm - 2);
++ let sss = Bytes.make 16 '0' in
++ String.blit sm 2 sss 0 (String.length sm - 2);
+ let e' = Num.power_num (Num.Int 2) (Num.num_of_int e) in
+ Num.div_num (Num.mult_num (Num.num_of_string s) e') scaling_factor
+ in
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch
new file mode 100644
index 000000000..4d90f30c7
--- /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/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
++++ b/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
+@@ -857,7 +857,7 @@ public class Export {
+ }
+
+ @Override
+- public int processShape(Shape s) throws IOException {
++ public int processShape(Shape s, boolean cached) throws IOException {
+ if (s instanceof Ellipse2D.Double) {
+ Ellipse2D.Double ell = (Ellipse2D.Double) s;
+ if (ell.height == ell.width) {
+@@ -880,10 +880,10 @@ public class Export {
+ buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
+ it.next();
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+
+ for (; !it.isDone(); it.next()) {
+@@ -891,7 +891,7 @@ public class Export {
+ if (type == PathIterator.SEG_LINETO) {
+ buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+ }
+ buffer.append("] DP");
+@@ -899,7 +899,7 @@ public class Export {
+ return PathIterator.WIND_NON_ZERO;
+ }
+
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+ };
+ g2d.setGraphicContext(new GraphicContext());
+@@ -1029,7 +1029,7 @@ public class Export {
+ }
+
+ @Override
+- public int processShape(Shape s) throws IOException {
++ public int processShape(Shape s, boolean cached) throws IOException {
+ if (s instanceof Ellipse2D.Double) {
+ Ellipse2D.Double ell = (Ellipse2D.Double) s;
+ if (ell.height == ell.width) {
+@@ -1052,10 +1052,10 @@ public class Export {
+ buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
+ it.next();
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+
+ for (; !it.isDone(); it.next()) {
+@@ -1063,7 +1063,7 @@ public class Export {
+ if (type == PathIterator.SEG_LINETO) {
+ buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
+ } else {
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+ }
+ buffer.append("] DP");
+@@ -1071,7 +1071,7 @@ public class Export {
+ return PathIterator.WIND_NON_ZERO;
+ }
+
+- return super.processShape(s);
++ return super.processShape(s, cached);
+ }
+
+ };
diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild b/sci-mathematics/scilab/scilab-5.5.2.ebuild
new file mode 100644
index 000000000..684a3df8b
--- /dev/null
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_OPT_USE="gui"
+VIRTUALX_REQUIRED="manual"
+
+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/"
+SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz
+ https://raw.githubusercontent.com/gentoo/sci/4c2a07c4629c61395a998633ccfcb34d72569529/sci-mathematics/scilab/files/${P}-bug15107.patch"
+
+LICENSE="CeCILL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="bash-completion debug doc emf fftw +gui +matio mpi nls openmp
+ static-libs test tk +umfpack +xcos"
+REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
+
+RESTRICT="test"
+
+IUSE_L10N="fr zh zh ru ca de es pt ja it uk pl cs"
+L10N_DOC="fr pt ja ru"
+
+map_lang() {
+ local lang=${1/_/-}
+ case $1 in
+ # Retain the following, which have a specific subtag
+ de_*|en_*|pt_*|zh_*) ;;
+ # Consider all other xx_XX as duplicates of the generic xx tag
+ *_*) lang=${1%%_*} ;;
+ esac
+ echo ${lang}
+}
+
+prev_l=
+for l in ${IUSE_L10N}; do
+ l=$(map_lang ${l})
+ [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
+ prev_l=${l}
+done
+unset l prev_l
+
+CDEPEND="
+ dev-libs/libpcre
+ dev-libs/libxml2:2
+ sci-libs/hdf5[mpi=]
+ >=sci-libs/arpack-3
+ sys-devel/gettext
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ virtual/lapack
+ emf? (
+ dev-java/freehep-graphicsio:0
+ dev-java/freehep-graphicsio-emf:0
+ dev-java/freehep-graphics2d:0
+ dev-java/freehep-io:0
+ dev-java/freehep-graphicsbase:0
+ )
+ fftw? ( sci-libs/fftw:3.0 )
+ gui? (
+ dev-java/avalon-framework:4.2
+ >=dev-java/batik-1.9:1.9
+ dev-java/commons-io:1
+ dev-java/commons-logging:0
+ >=dev-java/flexdock-1.2.4:0
+ >=dev-java/fop-2.0:0
+ ~dev-java/gluegen-2.2.4:2.2
+ dev-java/javahelp:0
+ dev-java/jeuclid-core:0
+ dev-java/jgoodies-looks:2.6
+ >=dev-java/jlatexmath-1.0.3:1
+ >=dev-java/jlatexmath-fop-1.0.3:1
+ ~dev-java/jogl-2.2.4:2.2
+ >=dev-java/jrosetta-1.0.4:0
+ dev-java/skinlf:0
+ dev-java/xmlgraphics-commons:2
+ virtual/opengl
+ xcos? ( dev-java/jgraphx:0 )
+ )
+ 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.6
+ doc? ( app-text/docbook-xsl-stylesheets
+ dev-java/xml-commons-external:1.4
+ dev-java/saxon:9 )
+ xcos? (
+ >=dev-lang/ocaml-4.06
+ dev-ml/num
+ )
+ )
+ test? (
+ dev-java/junit:4
+ gui? ( ${VIRTUALX_DEPEND} ) )"
+
+DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
+
+PATCHES=(
+ "${FILESDIR}/${P}-followlinks.patch"
+ "${FILESDIR}/${P}-gluegen.patch"
+ "${FILESDIR}/${P}-fix-random-runtime-failure.patch"
+ "${FILESDIR}/${P}-accessviolation.patch"
+ "${FILESDIR}/${P}-missinglib.patch"
+ "${FILESDIR}/${P}-batik-1.9.patch"
+ "${FILESDIR}/${P}-fop-2.0.patch"
+ "${FILESDIR}/${P}-xmlgraphics-common-2.0.patch"
+ "${FILESDIR}/${P}-freehep.patch"
+ "${FILESDIR}/${P}-fortran-gcc8.patch" # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=232958
+ "${FILESDIR}/${P}-libxml-icu64.patch" # similar to https://bugzilla.scilab.org/show_bug.cgi?id=16588
+ "${FILESDIR}/${P}-hdf5-1.8.10.patch" # adapted from https://github.com/bartoszek/scilab
+ "${DISTDIR}/${P}-bug15107.patch" # http://bugzilla.scilab.org/show_bug.cgi?id=15107
+ "${FILESDIR}/${P}-bug15449.patch" # http://bugzilla.scilab.org/show_bug.cgi?id=15449
+ "${FILESDIR}/${P}-ocaml-4.0.4.patch" # https://github.com/bartoszek/scilab
+)
+
+pkg_pretend() {
+ use doc && CHECKREQS_MEMORY="512M" check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ if use openmp; then
+ if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
+ ewarn "You are using a gcc without OpenMP capabilities"
+ die "Need an OpenMP capable compiler"
+ fi
+ FORTRAN_NEED_OPENMP=1
+ fi
+ FORTRAN_STANDARD="77 90"
+ fortran-2_pkg_setup
+ #bug 8053
+ unset F77
+ java-pkg-opt-2_pkg_setup
+
+ ALL_L10N="en_US"
+ ALL_L10N_DOC="en_US"
+ for l in ${IUSE_L10N}; do
+ use l10n_${l} && ALL_L10N="${ALL_L10N} ${l}"
+ done
+ for l in ${L10N_DOC}; do
+ use l10n_${l} && ALL_L10N_DOC="${ALL_L10N_DOC} ${l}"
+ done
+ export ALL_L10N ALL_L10N_DOC
+}
+
+src_prepare() {
+ default
+
+ # 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 && eapply "${FILESDIR}/${P}-java-heap.patch"
+
+ # use the L10N variable that we set
+ sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac ||die
+
+ # make sure the DOCBOOK_ROOT variable is set
+ sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die
+
+ # remove self closing <br /> (error our with javadoc8)
+ # already upstream commit 2103082c
+ find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die
+
+ #add specific gentoo java directories
+ if use gui; then
+ sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.2|" \
+ -e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2.2|" configure.ac || die
+ sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2.2|" \
+ -e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2.2|" \
+ -e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \
+ configure.ac || die
+
+ sed -i -e "s/jogl2/jogl-2.2/" -e "s/gluegen2/gluegen-2.2/" \
+ etc/librarypath.xml || die
+ fi
+
+ mkdir jar || die
+ pushd jar >/dev/null
+ if use gui; then
+ java-pkg_jar-from jlatexmath-1,flexdock,skinlf
+ java-pkg_jar-from jgoodies-looks-2.6,jrosetta
+ java-pkg_jar-from avalon-framework-4.2,jeuclid-core
+ java-pkg_jar-from xmlgraphics-commons-2,commons-io-1
+ java-pkg_jar-from jogl-2.2 jogl-all.jar jogl2.jar
+ java-pkg_jar-from gluegen-2.2 gluegen-rt.jar gluegen2-rt.jar
+ java-pkg_jar-from fop fop.jar
+ java-pkg_jar-from javahelp jhall.jar
+ java-pkg_jar-from jlatexmath-fop-1
+ use xcos && java-pkg_jar-from jgraphx
+ if use doc; then
+ java-pkg_jar-from --build-only batik-1.9 batik-all.jar
+ java-pkg_jar-from --build-only saxon-9 saxon.jar saxon9he.jar
+ java-pkg_jar-from --build-only xml-commons-external-1.4 xml-apis-ext.jar
+ fi
+ fi
+ if use emf; then
+ java-pkg_jar-from freehep-graphicsio-emf,freehep-graphics2d
+ java-pkg_jar-from freehep-graphicsio,freehep-io,freehep-graphicsbase
+ fi
+ if use test; then
+ java-pkg_jar-from junit-4 junit.jar junit4.jar
+ java-pkg_jar-from ant-junit
+ fi
+ popd
+
+ java-pkg-opt-2_src_prepare
+ eautoconf
+}
+
+src_configure() {
+ if use gui; then
+ export JAVA_HOME="$(java-config -O)"
+ else
+ unset JAVAC
+ fi
+
+ export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+ export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
+ export F77_LDFLAGS="${LDFLAGS}"
+
+ econf \
+ --enable-relocatable \
+ --disable-rpath \
+ --with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \
+ --disable-static-system-lib \
+ $(use_enable debug) \
+ $(use_enable debug code-coverage) \
+ $(use_enable debug debug-C) \
+ $(use_enable debug debug-CXX) \
+ $(use_enable debug debug-fortran) \
+ $(use_enable debug debug-java) \
+ $(use_enable debug debug-linker) \
+ $(use_enable doc build-help) \
+ $(use_enable nls) \
+ $(use_enable nls build-localization) \
+ $(use_enable static-libs static) \
+ $(use_enable test compilation-tests) \
+ $(use_with emf) \
+ $(use_with fftw) \
+ $(use_with gui) \
+ $(use_with gui javasci) \
+ $(use_with matio) \
+ $(use_with openmp) \
+ $(use_with tk) \
+ $(use_with umfpack) \
+ $(use_with xcos) \
+ $(use_with xcos modelica) \
+ $(use_with mpi)
+}
+
+src_compile() {
+ addpredict /proc/mtrr
+ default
+ pax-mark m .libs/scilab-bin
+ use doc && emake doc
+}
+
+src_test() {
+ if use gui; then
+ Xemake check
+ else
+ emake check
+ fi
+}
+
+src_install() {
+ default
+ 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() {
+ 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"
+ einfo "See upstream http://bugzilla.scilab.org/show_bug.cgi?id=12940"
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2021-01-24 21:06 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-28 19:15 [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/ Guillaume Horel
-- strict thread matches above, loose matches on Subject: below --
2021-01-24 21:05 Andrew Ammerlaan
2021-01-11 17:23 Andrew Ammerlaan
2021-01-05 18:28 Andrew Ammerlaan
2016-06-05 19:44 Guillaume Horel
2015-07-31 10:09 Justin Lecher
2015-06-22 11:42 Justin Lecher
2014-06-29 19:00 Guillaume Horel
2014-04-22 23:48 Guillaume Horel
2012-08-08 3:13 Guillaume Horel
2012-07-11 4:55 Guillaume Horel
2012-05-29 18:15 Sebastien Fabbro
2012-05-25 21:53 Sebastien Fabbro
2011-11-15 22:08 Guillaume Horel
2011-09-19 22:06 Guillaume Horel
2011-06-16 3:32 Guillaume Horel
2011-06-16 3:32 Guillaume Horel
2011-06-10 17:06 Guillaume Horel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox