subject:"\[gentoo\-commits\] proj\/sci\:master commit in\: sci\-mathematics\/scilab\/"

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab-bin/

2023-09-26 Thread Andrew Ammerlaan

commit: be746c92aa23f5f3de6eb15673510b39e8cdd115
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Sep 26 13:47:19 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Sep 26 13:47:19 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=be746c92

sci-mathematics/scilab-bin: add 2023.1.0

Closes: https://bugs.gentoo.org/911270
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../scilab-bin/scilab-bin-2023.1.0.ebuild  | 78 ++
 1 file changed, 78 insertions(+)

diff --git a/sci-mathematics/scilab-bin/scilab-bin-2023.1.0.ebuild 
b/sci-mathematics/scilab-bin/scilab-bin-2023.1.0.ebuild
new file mode 100644
index 0..83d189b8a
--- /dev/null
+++ b/sci-mathematics/scilab-bin/scilab-bin-2023.1.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg
+
+MY_PN="${PN//-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Scientific software package for numerical computations"
+HOMEPAGE="https://www.scilab.org/";
+SRC_URI="https://www.scilab.org/download/${PV}/${MY_P}.bin.x86_64-linux-gnu.tar.xz";
+S="${WORKDIR}/${P//-bin}"
+
+LICENSE="GPL-2 Apache-2.0 sun-bcla-jhall jing MPL-1.0 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+# Bundled dependencies not packaged in ::gentoo
+# sci-libs/hdf5[cxx]:0/9
+# libgluegen.so (in ::sci)
+# libjogl_desktop.so (in ::sci)
+# libOpenXLSX.so (in ::sci)
+#
+# Bundled dependencies in ::gentoo
+#  dev-lang/tcl
+#  dev-libs/openssl:0/1.1
+#  dev-libs/newt
+#  dev-libs/libpcre
+#  net-misc/curl
+#  sci-libs/amd
+#  sci-libs/arpack
+#  sci-libs/camd
+#  sci-libs/ccolamd
+#  sci-libs/cholmod
+#  sci-libs/colamd
+#  sci-libs/fftw:3.0/3
+#  sci-libs/lapack
+#  sci-libs/matio
+#  sci-libs/openblas
+#  sci-libs/umfpack
+
+RDEPEND="
+   sys-libs/ncurses-compat
+   virtual/jre:1.8
+"
+
+QA_PREBUILT=( "opt/${MY_PN}/*" )
+
+src_prepare() {
+   default
+   local SCILAB_HOME="/opt/${MY_PN}"
+   # fix the .pc file to reflect the dirs where we are installing stuff
+   sed -i -e "/^prefix=/c prefix=${SCILAB_HOME}" lib/pkgconfig/scilab.pc 
|| die
+
+   # move appdata to metainfo
+   mv share/appdata share/metainfo || die
+}
+
+src_install() {
+   local SCILAB_HOME="/opt/${MY_PN}"
+   dodir "${SCILAB_HOME}"
+
+   # make convenience symlinks in PATH
+   for file in bin/*; do
+   dosym "../${MY_PN}/${file}" "/opt/${file}"
+   done
+
+   # copy all the things
+   cp -r "${S}/"*  "${ED}/${SCILAB_HOME}" || die
+
+   # move out dekstop, icons etc
+   dodir /usr/share
+   mv 
"${ED}/${SCILAB_HOME}/share/"{metainfo,applications,icons,locale,mime} 
"${ED}/usr/share/" || die
+   dodir /usr/lib64/pkgconfig
+   mv "${ED}/${SCILAB_HOME}/lib/pkgconfig/scilab.pc" 
"${ED}/usr/lib64/pkgconfig/" || die
+}

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/, profiles/

2022-01-23 Thread Andrew Ammerlaan

commit: 1f907558ed2744d3d60161db712c1861b48017b5
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 13:02:18 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 13:02:18 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1f907558

sci-mathematics/scilab: remove scilab in favor of scilab-bin

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 profiles/package.mask  |   8 -
 .../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 --
 .../files/scilab-6.1.0-accessviolation.patch   |  22 --
 .../scilab/files/scilab-6.1.0-freehep.patch|  13 -
 .../scilab/files/scilab-6.1.0-libxml.patch |  66 -
 .../scilab/files/scilab-6.1.0-nogui.patch  |  13 -
 .../scilab/files/scilab.bash_completion|  54 
 sci-mathematics/scilab/files/scilab.xml|  13 -
 sci-mathematics/scilab/metadata.xml|  24 --
 sci-mathematics/scilab/scilab-5.5.2.ebuild | 311 -
 sci-mathematics/scilab/scilab-6.0.2.ebuild | 306 
 sci-mathematics/scilab/scilab-6.1.0.ebuild | 305 
 26 files changed, 1831 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index a142d09a4..d39812beb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,11 +29,3 @@
 ## app-misc/some-package
 
 #--- END OF EXAMPLES ---
-
-# Andrew Ammerlaan 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
deleted file mode 100644
index ce0cebbf3..0
--- a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.9.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-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

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2021-12-16 Thread Andrew Ammerlaan

commit: 4311e906c625413fbe8d2426d8527b7eebdbcd46
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Dec 16 10:53:46 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Dec 16 10:53:46 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4311e906

sci-mathematics/scilab: drop UnusedInherits

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-mathematics/scilab/scilab-5.5.2.ebuild | 2 +-
 sci-mathematics/scilab/scilab-6.0.2.ebuild | 2 +-
 sci-mathematics/scilab/scilab-6.1.0.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 1226b4d76..ba40aed5f 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 JAVA_PKG_OPT_USE="gui"
 VIRTUALX_REQUIRED="manual"
 
-inherit autotools bash-completion-r1 check-reqs eutils flag-o-matic \
+inherit autotools bash-completion-r1 check-reqs flag-o-matic \
fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx xdg-utils
 
 DESCRIPTION="Scientific software package for numerical computations"

diff --git a/sci-mathematics/scilab/scilab-6.0.2.ebuild 
b/sci-mathematics/scilab/scilab-6.0.2.ebuild
index ed77b97bc..2b2d76b4e 100644
--- a/sci-mathematics/scilab/scilab-6.0.2.ebuild
+++ b/sci-mathematics/scilab/scilab-6.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 JAVA_PKG_OPT_USE="gui"
 VIRTUALX_REQUIRED="manual"
 
-inherit autotools bash-completion-r1 check-reqs eutils flag-o-matic \
+inherit autotools bash-completion-r1 check-reqs flag-o-matic \
fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx xdg-utils
 
 DESCRIPTION="Scientific software package for numerical computations"

diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild 
b/sci-mathematics/scilab/scilab-6.1.0.ebuild
index 542930bdb..6b19924a6 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 JAVA_PKG_OPT_USE="gui"
 VIRTUALX_REQUIRED="manual"
 
-inherit autotools bash-completion-r1 check-reqs eutils flag-o-matic \
+inherit autotools bash-completion-r1 check-reqs flag-o-matic \
fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx xdg-utils
 
 DESCRIPTION="Scientific software package for numerical computations"

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/

2021-03-22 Thread Andrew Ammerlaan

commit: 698d66d8d6b2f578c0a5a4685d7cd540221ea425
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Mar 22 13:19:45 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Mar 22 13:19:45 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=698d66d8

sci-mathematics/scilab: some progress

now it builds, but fails in the linker phase with
some undefined references in libscigraphics.so

Closes: https://github.com/gentoo/sci/issues/1060
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/scilab/files/scilab-6.1.0-followlinks.patch | 11 ---
 sci-mathematics/scilab/files/scilab-6.1.0-gluegen.patch | 11 ---
 sci-mathematics/scilab/files/scilab-6.1.0-java-heap.patch   | 11 ---
 sci-mathematics/scilab/files/scilab-6.1.0-missinglib.patch  | 11 ---
 sci-mathematics/scilab/scilab-5.5.2.ebuild  |  3 ++-
 sci-mathematics/scilab/scilab-6.0.2.ebuild  | 13 +
 sci-mathematics/scilab/scilab-6.1.0.ebuild  | 12 
 7 files changed, 19 insertions(+), 53 deletions(-)

diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-followlinks.patch 
b/sci-mathematics/scilab/files/scilab-6.1.0-followlinks.patch
deleted file mode 100644
index a3f60bee7..0
--- a/sci-mathematics/scilab/files/scilab-6.1.0-followlinks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/m4/java.m4   2014-02-11 23:43:03.030430258 -0500
-+++ b/m4/java.m4   2014-02-11 23:43:54.008428766 -0500
-@@ -839,7 +839,7 @@
-   for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" 
"$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do
- 
- # TODO check the behaviour when spaces
--jars_resolved=`ls $jar 2>/dev/null`
-+jars_resolved=$(realpath $(ls $jar 2>/dev/null) 2>/dev/null)
- for jar_resolved in $jars_resolved; do # If several jars matches
-   if test -e "$jar_resolved"; then
- export ac_java_classpath="$jar_resolved:$ac_java_classpath"

diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-gluegen.patch 
b/sci-mathematics/scilab/files/scilab-6.1.0-gluegen.patch
deleted file mode 100644
index d75c31e9a..0
--- a/sci-mathematics/scilab/files/scilab-6.1.0-gluegen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/modules/gui/src/java/org/scilab/modules/gui/SwingView.java   
2014-03-24 22:38:00.928934500 -0400
-+++ b/modules/gui/src/java/org/scilab/modules/gui/SwingView.java   
2014-03-24 22:37:33.947567043 -0400
-@@ -157,7 +157,7 @@
- 
- static {
- try {
--System.loadLibrary("gluegen2-rt");
-+System.loadLibrary("gluegen-rt");
- } catch (Exception e) {
- System.err.println(e);
- }

diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-java-heap.patch 
b/sci-mathematics/scilab/files/scilab-6.1.0-java-heap.patch
deleted file mode 100644
index ca17e52a6..0
--- a/sci-mathematics/scilab/files/scilab-6.1.0-java-heap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/etc/jvm_options.xml  2014-02-12 00:05:34.323390688 -0500
-+++ b/etc/jvm_options.xml  2014-02-12 00:05:53.977390112 -0500
-@@ -22,7 +22,7 @@
- 
- 
- 
--
-+
- 
- 
- 

diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-missinglib.patch 
b/sci-mathematics/scilab/files/scilab-6.1.0-missinglib.patch
deleted file mode 100644
index 25b281820..0
--- a/sci-mathematics/scilab/files/scilab-6.1.0-missinglib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN scilab-5.5.1-orig/Makefile.am scilab-5.5.1/Makefile.am
 a/Makefile.am  2014-10-09 18:22:21.994610695 -0400
-+++ b/Makefile.am  2014-10-09 18:24:28.208333575 -0400
-@@ -74,6 +74,7 @@
- if NEED_JAVA
- scilab_bin_LDADD += \
-   $(top_builddir)/modules/console/libsciconsole.la \
-+  
$(top_builddir)/modules/console/libsciconsole-minimal.la \
-   $(top_builddir)/modules/jvm/libscijvm.la \
-   $(top_builddir)/modules/commons/libscicommons.la
- else

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 9c3a6a6e7..1226b4d76 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -78,6 +78,7 @@ CDEPEND="
~dev-java/jogl-2.2.4:2.2
>=dev-java/jrosetta-1.0.4:0
>dev-java/lucene-2:=[contrib(-)]
+   =dev-java/jrosetta-1.0.4:0
>dev-java/lucene-5:=[modules(-)]
+   =virtual/jre-1.8 )"
 
 DEPEND="${CDEPEND}
-   virtual/pkgconfig
debug? ( dev-util/lcov )
gui? (
>=virtual/jdk-1.6
@@ -110,14 +110,16 @@ DEPEND="${CDEPEND}
dev-java/junit:4
dev-java/ant-junit4:0
gui? ( ${VIRTUALX_DEPEND} ) )"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readm

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2021-03-21 Thread Andrew Ammerlaan

commit: e9569d9cce921133f05391ecdefea51ed5679967
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sun Mar 21 12:38:01 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Mar 21 12:38:01 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e9569d9c

sci-mathematics/scilab: fix dep on lucene

https://github.com/gentoo/sci/issues/1060

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/scilab/scilab-6.0.2.ebuild | 2 +-
 sci-mathematics/scilab/scilab-6.1.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-6.0.2.ebuild 
b/sci-mathematics/scilab/scilab-6.0.2.ebuild
index 9ea3ac772..c2ea20de0 100644
--- a/sci-mathematics/scilab/scilab-6.0.2.ebuild
+++ b/sci-mathematics/scilab/scilab-6.0.2.ebuild
@@ -77,7 +77,7 @@ 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/lucene-5:=[modules(-)]
dev-java/skinlf:0
dev-java/xmlgraphics-commons:2
virtual/opengl

diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild 
b/sci-mathematics/scilab/scilab-6.1.0.ebuild
index aa5f4571f..985cd5aa9 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.ebuild
@@ -77,7 +77,7 @@ 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/lucene-7:=[modules(-)]
dev-java/skinlf:0
dev-java/xmlgraphics-commons:2
virtual/opengl

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2021-01-25 Thread Andrew Ammerlaan

commit: d6955a0150bbce6007f0ffc7695c676f0c0cfef9
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Jan 25 08:45:53 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Jan 25 08:45:53 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d6955a01

sci-mathematics/scilab: only add -fallow-argument-mismatch if supported

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/scilab/scilab-5.5.2.ebuild | 2 +-
 sci-mathematics/scilab/scilab-6.0.2.ebuild | 2 +-
 sci-mathematics/scilab/scilab-6.1.0.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index dffd0383b..9c3a6a6e7 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -150,7 +150,7 @@ pkg_setup() {
java-pkg-opt-2_pkg_setup
 
# fails to compile in src/fortran/optml2.f:172:50 without this
-   append-fflags -fallow-argument-mismatch
+   test-flag-FC -fallow-argument-mismatch && append-fflags 
-fallow-argument-mismatch
 
ALL_L10N="en_US"
ALL_L10N_DOC="en_US"

diff --git a/sci-mathematics/scilab/scilab-6.0.2.ebuild 
b/sci-mathematics/scilab/scilab-6.0.2.ebuild
index 3779ab745..9ea3ac772 100644
--- a/sci-mathematics/scilab/scilab-6.0.2.ebuild
+++ b/sci-mathematics/scilab/scilab-6.0.2.ebuild
@@ -141,7 +141,7 @@ pkg_setup() {
java-pkg-opt-2_pkg_setup
 
# fails to compile in src/fortran/optml2.f:172:50 without this
-   append-fflags -fallow-argument-mismatch
+   test-flag-FC -fallow-argument-mismatch && append-fflags 
-fallow-argument-mismatch
 
ALL_L10N="en_US"
ALL_L10N_DOC="en_US"

diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild 
b/sci-mathematics/scilab/scilab-6.1.0.ebuild
index c1d097312..aa5f4571f 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.ebuild
@@ -141,7 +141,7 @@ pkg_setup() {
java-pkg-opt-2_pkg_setup
 
# fails to compile in src/fortran/optml2.f:172:50 without this
-   append-fflags -fallow-argument-mismatch
+   test-flag-FC -fallow-argument-mismatch && append-fflags 
-fallow-argument-mismatch
 
ALL_L10N="en_US"
ALL_L10N_DOC="en_US"

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2021-01-24 Thread Andrew Ammerlaan

commit: 3c7a8c6c96625d9bb4bf2bc3de4bf2b331cfb37f
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sun Jan 24 21:05:08 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 24 21:05:08 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=3c7a8c6c

sci-mathematics/scilab: merge fixes in 5.5.2 ebuild to the later versions

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/scilab/scilab-5.5.2.ebuild | 19 +-
 sci-mathematics/scilab/scilab-6.0.2.ebuild | 40 ++
 sci-mathematics/scilab/scilab-6.1.0.ebuild | 34 +
 3 files changed, 60 insertions(+), 33 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 7a753e397..dffd0383b 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -10,13 +10,13 @@ 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
+HOMEPAGE="https://www.scilab.org/";
+SRC_URI="https://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=""
+KEYWORDS="~amd64"
 IUSE="debug doc emf fftw +gui +matio mpi nls openmp
static-libs test tk +umfpack +xcos"
 REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
@@ -50,7 +50,7 @@ CDEPEND="
dev-libs/libxml2:2
sci-libs/hdf5[mpi=]
>=sci-libs/arpack-3
-   sci-libs/lapack[deprecated]
+   sci-libs/lapack[deprecated(-)]
sys-devel/gettext
sys-libs/ncurses:0=
sys-libs/readline:0=
@@ -77,6 +77,7 @@ 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
@@ -95,9 +96,11 @@ DEPEND="${CDEPEND}
debug? ( dev-util/lcov )
gui? (
>=virtual/jdk-1.6
-   doc? ( app-text/docbook-xsl-stylesheets
+   doc? (
+   app-text/docbook-xsl-stylesheets
dev-java/xml-commons-external:1.4
-   dev-java/saxon:9 )
+   dev-java/saxon:9
+   )
xcos? (
>=dev-lang/ocaml-4.06
dev-ml/num
@@ -105,6 +108,7 @@ DEPEND="${CDEPEND}
)
test? (
dev-java/junit:4
+   dev-java/ant-junit4:0
gui? ( ${VIRTUALX_DEPEND} ) )"
 
 DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
@@ -145,6 +149,9 @@ pkg_setup() {
unset F77
java-pkg-opt-2_pkg_setup
 
+   # fails to compile in src/fortran/optml2.f:172:50 without this
+   append-fflags -fallow-argument-mismatch
+
ALL_L10N="en_US"
ALL_L10N_DOC="en_US"
for l in ${IUSE_L10N}; do

diff --git a/sci-mathematics/scilab/scilab-6.0.2.ebuild 
b/sci-mathematics/scilab/scilab-6.0.2.ebuild
index 1345ca324..3779ab745 100644
--- a/sci-mathematics/scilab/scilab-6.0.2.ebuild
+++ b/sci-mathematics/scilab/scilab-6.0.2.ebuild
@@ -10,8 +10,8 @@ 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";
+HOMEPAGE="https://www.scilab.org/";
+SRC_URI="https://www.scilab.org/download/${PV}/${P}-src.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -50,10 +50,10 @@ CDEPEND="
dev-libs/libxml2:2
sci-libs/hdf5[mpi=]
>=sci-libs/arpack-3
+   sci-libs/lapack[deprecated(-)]
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
@@ -64,7 +64,7 @@ CDEPEND="
fftw? ( sci-libs/fftw:3.0 )
gui? (
dev-java/avalon-framework:4.2
-   >=dev-java/batik-1.8:=
+   >=dev-java/batik-1.9:1.9
dev-java/commons-io:1
dev-java/commons-logging:0
>=dev-java/flexdock-1.2.4:0
@@ -81,9 +81,10 @@ CDEPEND="
dev-java/skinlf:0
dev-java/xmlgraphics-commons:2
virtual/opengl
-   xcos? ( dev-ja

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/

2021-01-24 Thread Andrew Ammerlaan

commit: 0fad1730e56262ffe836aaeeafeed0e6780c175a
Author: Fabio Rossi  inwind  it>
AuthorDate: Sun Jan 24 17:11:03 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 24 20:47:42 2021 +
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  inwind.it>
Signed-off-by: Andrew Ammerlaan  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 0..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 0..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
+

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2021-01-24 Thread Andrew Ammerlaan

commit: 08b0577dd5a45f7529f71a43a52ec1132933fed3
Author: Fabio Rossi  inwind  it>
AuthorDate: Sun Jan 24 17:29:59 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 24 20:47:43 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=08b0577d

sci-mathematics/scilab: revert ban of --as-needed

The linker flag was banned a lot of time ago, on amd64 I don't
see problems at link- or run-time, so let's try without it. In case
this commit might be reverted later.

Signed-off-by: Fabio Rossi  inwind.it>
Closes: https://github.com/gentoo/sci/pull/1042
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/scilab/scilab-5.5.2.ebuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 4cc9bf0da..7a753e397 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -159,10 +159,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"

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2021-01-24 Thread Andrew Ammerlaan

commit: 90dce61a6a5f82dcbc7b49a9ed6df6d202447a13
Author: Fabio Rossi  inwind  it>
AuthorDate: Sun Jan 24 17:11:03 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 24 20:47:43 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=90dce61a

sci-mathematics/scilab: fix dependency needed for USE=mpi

Signed-off-by: Fabio Rossi  inwind.it>
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/scilab/scilab-5.5.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 5d205195d..35359d37c 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -83,6 +83,7 @@ CDEPEND="
xcos? ( dev-java/jgraphx:0 )
)
matio? ( >=sci-libs/matio-1.5 )
+   mpi? ( virtual/mpi[fortran] )
tk? ( dev-lang/tk:0= )
umfpack? ( sci-libs/umfpack )"

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2021-01-24 Thread Andrew Ammerlaan

commit: 6ad400f06d997567bdff5d7632e49b5228a2b27c
Author: Fabio Rossi  inwind  it>
AuthorDate: Sun Jan 24 17:11:03 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 24 20:47:43 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6ad400f0

sci-mathematics/scilab: bump to EAPI 7

Signed-off-by: Fabio Rossi  inwind.it>
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/scilab/scilab-5.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 43c338202..5d205195d 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -1,7 +1,7 @@
 # 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"

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2021-01-24 Thread Andrew Ammerlaan

commit: 7494df80f6775f0407855f51a114b469aa271755
Author: Fabio Rossi  inwind  it>
AuthorDate: Sun Jan 24 17:11:03 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 24 20:47:43 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7494df80

sci-mathematics/scilab: fix QA issues

Signed-off-by: Fabio Rossi  inwind.it>
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/scilab/scilab-5.5.2.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 35359d37c..4cc9bf0da 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -172,6 +172,9 @@ src_prepare() {
# make sure the DOCBOOK_ROOT variable is set
sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die
 
+   # fix QA for metainfo data installation path
+   sed -i.bkp -e "s:/appdata:/metainfo:" desktop/Makefile.in || die
+
# remove self closing  (error our with javadoc8)
# already upstream commit 2103082c
find . -name '*.java' -exec sed -i "s|||" {} \; ||die
@@ -280,7 +283,7 @@ src_test() {
 
 src_install() {
default
-   prune_libtool_files --all
+   find "${ED}" -name '*.la' -delete || die
rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
bashcomp_alias ${PN} ${PN}-cli ${PN}-adv-cli
@@ -291,6 +294,7 @@ src_install() {
 
 pkg_postinst() {
xdg_mimeinfo_database_update
+   xdg_desktop_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"
@@ -299,4 +303,5 @@ pkg_postinst() {
 
 pkg_postrm() {
xdg_mimeinfo_database_update
+   xdg_desktop_database_update
 }

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2021-01-24 Thread Andrew Ammerlaan

commit: 5fbdb9fb47d5eddc5734c342a9b5fdd6f4807ba8
Author: Fabio Rossi  inwind  it>
AuthorDate: Sun Jan 24 17:11:03 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 24 20:47:42 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=5fbdb9fb

sci-mathematics/scilab: remove USE=bash-completion

Install unconditionally bash-completion file to avoid useless rebuilds.
Fix also symlinks for bashcomp aliases.

Signed-off-by: Fabio Rossi  inwind.it>
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/scilab/scilab-5.5.2.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 98e5a37e4..43c338202 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz
 LICENSE="CeCILL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="bash-completion debug doc emf fftw +gui +matio mpi nls openmp
+IUSE="debug doc emf fftw +gui +matio mpi nls openmp
static-libs test tk +umfpack +xcos"
 REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
 
@@ -281,7 +281,8 @@ 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}"
+   newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
+   bashcomp_alias ${PN} ${PN}-cli ${PN}-adv-cli
echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
> 50-"${PN}"
insinto /etc/revdep-rebuild && doins "50-${PN}"

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2021-01-24 Thread Andrew Ammerlaan

commit: c8781a31365f88f0f06ee31d098790bb87e9fdbd
Author: Fabio Rossi  inwind  it>
AuthorDate: Sun Jan 24 17:11:03 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 24 20:47:42 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c8781a31

sci-mathematics/scilab: fix linking to deprecated lapack functions

Fix lapack dependency to have support for legacy functions to avoid
"undefined reference to [dz]geqpf_" linking errors

Signed-off-by: Fabio Rossi  inwind.it>
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/scilab/scilab-5.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 684a3df8b..98e5a37e4 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -50,10 +50,10 @@ CDEPEND="
dev-libs/libxml2:2
sci-libs/hdf5[mpi=]
>=sci-libs/arpack-3
+   sci-libs/lapack[deprecated]
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

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2021-01-19 Thread Andrew Ammerlaan

commit: 239e3a47a637630fad4a4ab8a6721a71bfbd6d13
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Tue Jan 19 16:55:57 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Tue Jan 19 16:55:57 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=239e3a47

sci-mathematics/scilab: add default for use flag

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 .../{scilab-6.1.0.ebuild => scilab-6.0.2.ebuild} | 20 
 sci-mathematics/scilab/scilab-6.1.0.ebuild   |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild 
b/sci-mathematics/scilab/scilab-6.0.2.ebuild
similarity index 94%
copy from sci-mathematics/scilab/scilab-6.1.0.ebuild
copy to sci-mathematics/scilab/scilab-6.0.2.ebuild
index c2a4bf0e5..1345ca324 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.0.2.ebuild
@@ -77,7 +77,7 @@ 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/lucene-2:=[contrib(-)]
dev-java/skinlf:0
dev-java/xmlgraphics-commons:2
virtual/opengl
@@ -108,12 +108,12 @@ DEPEND="${CDEPEND}
 DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
 
 PATCHES=(
-   "${FILESDIR}/${P}-followlinks.patch"
-   "${FILESDIR}/${P}-gluegen.patch"
-   "${FILESDIR}/${P}-accessviolation.patch"
-   "${FILESDIR}/${P}-missinglib.patch"
-   "${FILESDIR}/${P}-freehep.patch"
-   "${FILESDIR}/${P}-libxml.patch"
+   "${FILESDIR}/${PN}-6.1.0-followlinks.patch"
+   "${FILESDIR}/${PN}-6.1.0-gluegen.patch"
+   "${FILESDIR}/${PN}-6.1.0-accessviolation.patch"
+   "${FILESDIR}/${PN}-6.1.0-missinglib.patch"
+   "${FILESDIR}/${PN}-6.1.0-freehep.patch"
+   "${FILESDIR}/${PN}-6.1.0-libxml.patch"
 )
 
 pkg_pretend() {
@@ -131,7 +131,7 @@ pkg_setup() {
FORTRAN_STANDARD="77 90"
fortran-2_pkg_setup
#bug 8053
-   unset F77
+   #unset F77
java-pkg-opt-2_pkg_setup
 
# fails to compile in src/fortran/optml2.f:172:50 without this
@@ -151,6 +151,10 @@ 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"
 

diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild 
b/sci-mathematics/scilab/scilab-6.1.0.ebuild
index c2a4bf0e5..cbe726794 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.ebuild
@@ -77,7 +77,7 @@ 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/lucene-2:=[contrib(-)]
dev-java/skinlf:0
dev-java/xmlgraphics-commons:2
virtual/opengl

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2021-01-11 Thread Andrew Ammerlaan

commit: 1615cf4bf2d69b39cec4fe5b8926dc449f71ddbe
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Jan 11 18:12:30 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Jan 11 18:12:30 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1615cf4b

sci-mathematics/scilab: drop USE bash-completion, install unconditionally

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/scilab/scilab-6.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild 
b/sci-mathematics/scilab/scilab-6.1.0.ebuild
index a358fb7cd..c2a4bf0e5 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="bash-completion debug doc emf fftw +gui +matio mpi nls openmp
+IUSE="debug doc emf fftw +gui +matio mpi nls openmp
static-libs test tk +umfpack +xcos"
 REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
 
@@ -270,7 +270,7 @@ 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}"
+   newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
> 50-"${PN}"
insinto /etc/revdep-rebuild && doins "50-${PN}"

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2021-01-11 Thread Andrew Ammerlaan

commit: 111fc22aeb5ff6a130a666ef077555d8232c356b
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Jan 11 18:11:00 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Jan 11 18:11:00 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=111fc22a

sci-mathematics/scilab: fix argument mismatch in compilation

https://github.com/gentoo/sci/pull/1038

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/scilab/scilab-6.1.0.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild 
b/sci-mathematics/scilab/scilab-6.1.0.ebuild
index 4b3daa17c..a358fb7cd 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.ebuild
@@ -88,7 +88,7 @@ CDEPEND="
umfpack? ( sci-libs/umfpack )"
 
 RDEPEND="${CDEPEND}
-   gui? ( >=virtual/jre-1.5 )"
+   gui? ( >=virtual/jre-1.8 )"
 
 DEPEND="${CDEPEND}
virtual/pkgconfig
@@ -134,6 +134,9 @@ pkg_setup() {
unset F77
java-pkg-opt-2_pkg_setup
 
+   # fails to compile in src/fortran/optml2.f:172:50 without this
+   append-fflags -fallow-argument-mismatch
+
ALL_L10N="en_US"
ALL_L10N_DOC="en_US"
for l in ${IUSE_L10N}; do

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/

2021-01-11 Thread Andrew Ammerlaan

commit: 92beb1e7875d7df761c5995c2de6b38beee325a2
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Jan 11 17:23:25 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Jan 11 17:23:25 2021 +
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  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 0..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.0 +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 
+ #include 
+ #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.0 +0100
 scilab-6.1.0/modules/io/src/cpp/loadlib.cpp2020-06-13 
17:38:17.474133786 +0200
+@@ -17,6 +17,8 @@
+ #include "context.hxx"
+ #include "loadlib.hxx"
+ #include "macrofile.hxx"
++#include 
++#include 
+ extern "C"
+ {
+ #include "FileExist.h"
+@@ -26,8 +28,6 @@
+ #include "fullpath.h"
+ #include "PATH_MAX.h"
+ #include "pathconvert.h"
+-#include 
+-#include 
+ }
+ 
+ #define DEFAULT_ENCODING "UTF-8"
+--- orig/scilab-6.1.0/modules/xml/src/cpp/XMLDocument.hxx  2020-02-25 
11:00:18.0 +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.0 +0100
 scilab-6.1.0/modules/scicos/includes/XMIResource.hxx   2020-06-13 
18:13:54.985717732 +0200
+@@ -22,10 +22,8 @@
+ #include 
+ #include 
+ 
+-extern "C" {
+ #include 
+ #include 
+-}
+ 
+ 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() {

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/

2021-01-05 Thread Andrew Ammerlaan

commit: 92320771862c7de6de2b4cecd2477d0bc5aea0e8
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Fri Jan  1 16:39:00 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Tue Jan  5 18:26:47 2021 +
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  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..0
--- a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Bryan Gardiner 
-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 >&

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/

2018-01-27 Thread Justin Lecher

commit: 5acf363c71b1e17cc90caf09abb5a2697c406682
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Jan 27 20:25:36 2018 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jan 27 20:25:36 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=5acf363c

sci-mathematics/scilab: Update to new localization handling

Bump to EAPI=6

Signed-off-by: Justin Lecher  gentoo.org>
Package-Manager: Portage-2.3.20, Repoman-2.3.6

 .../files/scilab-5.5.2-accessviolation.patch   |  4 +-
 .../scilab/files/scilab-5.5.2-batik-1.8.patch  | 13 ++--
 .../scilab-5.5.2-fix-random-runtime-failure.patch  |  4 +-
 .../scilab/files/scilab-5.5.2-followlinks.patch|  4 +-
 .../scilab/files/scilab-5.5.2-fop-2.0.patch|  8 +--
 .../scilab/files/scilab-5.5.2-freehep.patch|  4 +-
 .../scilab/files/scilab-5.5.2-gluegen.patch|  4 +-
 .../scilab/files/scilab-5.5.2-java-heap.patch  |  4 +-
 .../scilab/files/scilab-5.5.2-missinglib.patch |  4 +-
 .../scilab/files/scilab-5.5.2-nogui.patch  |  4 +-
 .../scilab-5.5.2-xmlgraphics-common-2.0.patch  |  4 +-
 sci-mathematics/scilab/scilab-5.5.2-r1.ebuild  | 80 +-
 12 files changed, 78 insertions(+), 59 deletions(-)

diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch 
b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
index a84de9a2b..a7e5c6d5f 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
@@ -1,6 +1,6 @@
 diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab
 scilab-5.5.0-orig/bin/scilab   2014-07-12 15:24:17.105686656 -0400
-+++ scilab-5.5.0/bin/scilab2014-07-12 15:25:29.307725409 -0400
+--- a/bin/scilab   2014-07-12 15:24:17.105686656 -0400
 b/bin/scilab   2014-07-12 15:25:29.307725409 -0400
 @@ -647,17 +647,6 @@
  GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g)
  export GTK_MODULES

diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch 
b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch
index aaf4da884..007d530ad 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch
@@ -7,8 +7,8 @@ with SAXSVGDocumentFactory being moved.  This is not tested 
beyond "yes Scilab
 still links to Batik to export SVGs," as I'm not sure of a good test case, and
 it's awaiting upstream review.
 
 a/scilab/configure
-+++ b/scilab/configure
+--- a/configure
 b/configure
 @@ -16600,8 +16600,8 @@ $as_echo "$as_me: WARNING: Could not find or use the 
Java package/jar batik used
  fi
  
@@ -74,8 +74,8 @@ it's awaiting upstream review.
  fi
  
  fi
 a/scilab/configure.ac
-+++ b/scilab/configure.ac
+--- a/configure.ac
 b/configure.ac
 @@ -1038,7 +1038,7 @@ interface for JOGL2 - or libGL (OpenGL library) are 
installed and if the version
 BATIK=$PACKAGE_JAR_FILE
  fi
@@ -85,8 +85,8 @@ it's awaiting upstream review.
  
  # Commons I/O library
  
AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons
 I/O library])
 
a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
-+++ 
b/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
+--- 
a/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
 
b/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
 @@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentLoader;
  import org.apache.batik.bridge.GVTBuilder;
  import org.apache.batik.bridge.UserAgent;
@@ -96,3 +96,4 @@ it's awaiting upstream review.
  import org.apache.batik.gvt.GraphicsNode;
  import org.apache.batik.util.XMLResourceDescriptor;
  import org.scilab.forge.jlatexmath.ParseException;
+

diff --git 
a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch 
b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
index 92ac45339..da7b6e485 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
@@ -1,6 +1,6 @@
 diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp 
scilab/modules/api_scilab/src/cpp/api_double.cpp
 scilab-orig/modules/api_scilab/src/cpp/api_double.cpp  2012-08-06 
23:26:31.342617365 -0400
-+++ scilab/modules/api_scilab/src/cpp/api_double.cpp   2012-08-06 
23:27:34.838621420 -0400
+--- a/modules/api_scilab/src/cpp/api_double.cpp2012-08-06 
23:26:31.342617365 -0400
 b/modules/api_scilab/src/cpp/api_double.cpp2012-08-06 
23:27:34.838621420 -0400
 @@ -497,7 +497,7 @@
  /*--*/
  int create

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, dev-java/jeuclid-core/

2017-11-18 Thread Justin Lecher

commit: 54e904fc76c294ea93fec1b2856c32d01d21e481
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Nov 18 14:23:08 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Nov 18 14:23:08 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=54e904fc

Drop keyqords due to unmet dependecy

Signed-off-by: Justin Lecher  gentoo.org>

 dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild | 2 +-
 sci-mathematics/scilab/scilab-5.5.2-r1.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild 
b/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild
index a5c410ce9..73e4e85d6 100644
--- a/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild
+++ b/dev-java/jeuclid-core/jeuclid-core-3.1.9-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="mirror://sourceforge/jeuclid/jeuclid-parent-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="dev-java/ant-core

diff --git a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
index fd00648e8..c9f67ad06 100644
--- a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz";
 
 LICENSE="CeCILL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+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 )"

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/

2016-06-05 Thread Guillaume Horel

commit: df80daa4525164fe8f83ed7b113b462cbd1a7030
Author: Guillaume Horel  gmail  com>
AuthorDate: Sun Jun  5 19:42:59 2016 +
Commit: Guillaume Horel  gmail  com>
CommitDate: Sun Jun  5 19:42:59 2016 +
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 000..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  (error our with javadoc8)
+   # already upstream commit 2103082c
+   find . -name '*.java' -exec sed -i "s|||" {} \; ||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

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2015-09-21 Thread Justin Lecher

commit: 17a9787f624d03b730465cd5d8e339c36fc6b1d8
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Sep 21 18:55:50 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Sep 21 18:55:50 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=17a9787f

sci-mathematics/scilab: Add subslot operators

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher  gentoo.org>

 sci-mathematics/scilab/scilab-5.5.2-r1.ebuild | 21 -
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
index f6e2873..432ffdd 100644
--- a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
@@ -30,19 +30,22 @@ for l in ${LINGUAS}; do
IUSE="${IUSE} linguas_${l}"
 done
 
-CDEPEND="dev-libs/libpcre
+CDEPEND="
+   dev-libs/libpcre
dev-libs/libxml2:2
sci-libs/hdf5[mpi=]
>=sci-libs/arpack-3
sys-devel/gettext
-   sys-libs/ncurses
-   sys-libs/readline:0
+   sys-libs/ncurses:0=
+   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 )
+   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
@@ -65,7 +68,7 @@ CDEPEND="dev-libs/libpcre
xcos? ( dev-java/jgraphx:2.5 )
)
matio? ( >=sci-libs/matio-1.5 )
-   tk? ( dev-lang/tk:0 )
+   tk? ( dev-lang/tk:0= )
umfpack? ( sci-libs/umfpack )"
 
 RDEPEND="${CDEPEND}

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2015-09-01 Thread Justin Lecher

commit: 85da2ab63a5f6d292875ebde4d0f42171eca6ccf
Author: Bryan Gardiner  khumba  net>
AuthorDate: Tue Sep  1 00:24:14 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Sep  1 00:29:51 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=85da2ab6

sci-mathematics/scilab: Add PaX mark required for Java binaries on hardened.

Package-Manager: portage-2.2.20.1

 sci-mathematics/scilab/ChangeLog| 6 ++
 .../scilab/{scilab-5.5.2.ebuild => scilab-5.5.2-r1.ebuild}  | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 2df0e75..65af606 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*scilab-5.5.2-r1 (01 Sep 2015)
+
+  01 Sep 2015; Bryan Gardiner  -scilab-5.5.2.ebuild,
+  +scilab-5.5.2-r1.ebuild:
+  Add PaX mark required for Java binaries on hardened.
+
   29 Jul 2015; Bryan Gardiner  scilab-5.5.2.ebuild:
   Fix the conditions under which batik is a dependency: it's required for the
   GUI to do graphic export at runtime as well as to build documentation.

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
similarity index 98%
rename from sci-mathematics/scilab/scilab-5.5.2.ebuild
rename to sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
index a5ab0b7..f6e2873 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
@@ -10,7 +10,7 @@ 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
+   fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx
 
 DESCRIPTION="Scientific software package for numerical computations"
 HOMEPAGE="http://www.scilab.org/";
@@ -230,6 +230,7 @@ src_configure() {
 src_compile() {
addpredict /proc/mtrr
emake
+   pax-mark m .libs/scilab-bin
use doc && emake doc
 }

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/

2015-07-31 Thread Justin Lecher

commit: 274601551dff450e0f289351d73eaefab307e9ca
Author: Bryan Gardiner  khumba  net>
AuthorDate: Thu Jul 30 16:49:05 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Jul 30 18:10:37 2015 +
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  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  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 000..aaf4da8
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch
@@ -0,0 +1,98 @@
+From: Bryan Gardiner 
+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

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2015-07-31 Thread Justin Lecher

commit: 31eb8f3cfa5ec9a2f0ad5a0351474fdb73ed427e
Author: Bryan Gardiner  khumba  net>
AuthorDate: Thu Jul 30 16:53:15 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Jul 31 10:09:53 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=31eb8f3c

sci-mathematics/scilab: Fix the conditions under which batik is a dependency.

Package-Manager: portage-2.2.20

 sci-mathematics/scilab/ChangeLog   | 4 
 sci-mathematics/scilab/scilab-5.5.2.ebuild | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 27d3c2b..062b2e6 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Jul 2015; Bryan Gardiner  scilab-5.5.2.ebuild:
+  Fix the conditions under which batik is a dependency: it's required for the
+  GUI to do graphic export at runtime as well as to build documentation.
+
   25 Jul 2015; Bryan Gardiner  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:

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 3e48d0b..8ead8de 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -46,6 +46,7 @@ CDEPEND="dev-libs/libpcre
fftw? ( sci-libs/fftw:3.0 )
gui? (
dev-java/avalon-framework:4.2
+   >=dev-java/batik-1.8-r2:1.8
dev-java/commons-io:1
dev-java/commons-logging:0
>=dev-java/flexdock-1.2.4:0
@@ -75,8 +76,7 @@ DEPEND="${CDEPEND}
debug? ( dev-util/lcov )
gui? (
>=virtual/jdk-1.6
-   doc? ( >=dev-java/batik-1.8-r2:1.8
-  app-text/docbook-xsl-stylesheets
+   doc? ( app-text/docbook-xsl-stylesheets
   dev-java/xml-commons-external:1.4
   dev-java/saxon:9 )
xcos? ( dev-lang/ocaml )

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/

2015-07-31 Thread Justin Lecher

commit: 328a5d1163f96be4b0c58f4c018480da1df28666
Author: Bryan Gardiner  khumba  net>
AuthorDate: Thu Jul 30 16:49:05 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Jul 31 10:09:53 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=328a5d11

sci-mathematics/scilab: Patch to build with new versions of Java dependencies.

Package-Manager: portage-2.2.20

 sci-mathematics/scilab/ChangeLog   |  5 ++
 .../scilab/files/scilab-5.5.2-batik-1.8.patch  | 98 ++
 .../scilab/files/scilab-5.5.2-fop-2.0.patch| 38 +
 .../scilab-5.5.2-xmlgraphics-common-2.0.patch  | 91 
 sci-mathematics/scilab/scilab-5.5.2.ebuild | 17 ++--
 5 files changed, 242 insertions(+), 7 deletions(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 9b9a0c2..27d3c2b 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jul 2015; Bryan Gardiner  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  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 000..aaf4da8
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch
@@ -0,0 +1,98 @@
+From: Bryan Gardiner 
+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

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2015-07-31 Thread Justin Lecher

commit: 24aef4dd4ce5a30545b252091b878276fc52aefe
Author: Bryan Gardiner  khumba  net>
AuthorDate: Thu Jul 30 16:53:15 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Jul 30 18:11:14 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=24aef4dd

sci-mathematics/scilab: Fix the conditions under which batik is a dependency.

Package-Manager: portage-2.2.20

 sci-mathematics/scilab/ChangeLog   | 4 
 sci-mathematics/scilab/scilab-5.5.2.ebuild | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 27d3c2b..062b2e6 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Jul 2015; Bryan Gardiner  scilab-5.5.2.ebuild:
+  Fix the conditions under which batik is a dependency: it's required for the
+  GUI to do graphic export at runtime as well as to build documentation.
+
   25 Jul 2015; Bryan Gardiner  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:

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 3e48d0b..8ead8de 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -46,6 +46,7 @@ CDEPEND="dev-libs/libpcre
fftw? ( sci-libs/fftw:3.0 )
gui? (
dev-java/avalon-framework:4.2
+   >=dev-java/batik-1.8-r2:1.8
dev-java/commons-io:1
dev-java/commons-logging:0
>=dev-java/flexdock-1.2.4:0
@@ -75,8 +76,7 @@ DEPEND="${CDEPEND}
debug? ( dev-util/lcov )
gui? (
>=virtual/jdk-1.6
-   doc? ( >=dev-java/batik-1.8-r2:1.8
-  app-text/docbook-xsl-stylesheets
+   doc? ( app-text/docbook-xsl-stylesheets
   dev-java/xml-commons-external:1.4
   dev-java/saxon:9 )
xcos? ( dev-lang/ocaml )

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2015-07-23 Thread Jauhien Piatlicki

commit: 8e8e93495e8f56be5a0debda9594fb36b327b52f
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Wed Jul 22 19:45:00 2015 +
Commit: Jauhien Piatlicki  gentoo  org>
CommitDate: Wed Jul 22 19:45:00 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=8e8e9349

sci-mathematics/scilab: Fix deps

Package-Manager: portage-2.2.18

 sci-mathematics/scilab/ChangeLog   | 3 +++
 sci-mathematics/scilab/scilab-5.5.2.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 8d5cc39..9b9a0c2 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Jul 2015; Marius Brehler  scilab-5.5.2.ebuild:
+  sci-mathematics/scilab: Fix deps
+
   08 Jul 2015; Marius Brehler  scilab-5.5.2.ebuild:
   sci-mathematics/scilab: Blind fixing dependencies
 

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 430293e..668f2fd 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:2
+   dev-java/fop:0
=dev-java/gluegen-2.2.4:2.2
dev-java/javahelp:0
dev-java/jeuclid-core:0

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2015-07-09 Thread Nicolas Bock

commit: 6afd2aae94e117584561272d7db676ce55eb75ad
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Wed Jul  8 12:37:22 2015 +
Commit: Nicolas Bock  gentoo  org>
CommitDate: Wed Jul  8 12:37:22 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6afd2aae

sci-mathematics/scilab: Blind fixing dependencies

Package-Manager: portage-2.2.18

 sci-mathematics/scilab/ChangeLog   | 3 +++
 sci-mathematics/scilab/scilab-5.5.2.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 6c6f830..8d5cc39 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Jul 2015; Marius Brehler  scilab-5.5.2.ebuild:
+  sci-mathematics/scilab: Blind fixing dependencies
+
   22 Jun 2015; Justin Lecher 
   -files/scilab-5.5.0-accessviolation.patch,
   -files/scilab-5.5.0-fix-random-runtime-failure.patch,

diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild 
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 24b47b7..430293e 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
=dev-java/gluegen-2.2.4:2.2
dev-java/javahelp:0
dev-java/jeuclid-core:0
@@ -59,7 +59,7 @@ CDEPEND="dev-libs/libpcre
=dev-java/jogl-2.2.4:2.2
>=dev-java/jrosetta-1.0.4:0
dev-java/skinlf:0
-   dev-java/xmlgraphics-commons:1.5
+   dev-java/xmlgraphics-commons:2
virtual/opengl
xcos? ( dev-java/jgraphx:2.5 )
)

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/

2015-06-22 Thread Justin Lecher

commit: d4071cabdd51be441b8912c3a8470ffa424d570a
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Jun 22 11:41:27 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Jun 22 11:41:27 2015 +
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 
+  -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 

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..000
--- 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/scilab2014-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..000
--- 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

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/

2015-04-03 Thread Guillaume Horel

commit: 43b68623b040f59c63c3e1f4037cf6d499edd6d0
Author: Guillaume Horel  gmail  com>
AuthorDate: Fri Apr  3 18:09:24 2015 +
Commit: Guillaume Horel  gmail  com>
CommitDate: Fri Apr  3 18:09:24 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=43b68623

sci-mathematics/scilab: version bump

Package-Manager: portage-2.2.18

 sci-mathematics/scilab/ChangeLog   |  10 +
 .../files/scilab-5.5.2-accessviolation.patch   |  21 ++
 .../scilab-5.5.2-fix-random-runtime-failure.patch  |  12 +
 .../scilab/files/scilab-5.5.2-followlinks.patch|  11 +
 .../scilab/files/scilab-5.5.2-gluegen.patch|  11 +
 .../scilab/files/scilab-5.5.2-java-heap.patch  |  11 +
 .../scilab/files/scilab-5.5.2-missinglib.patch |  11 +
 .../scilab/files/scilab-5.5.2-nogui.patch  |  13 +
 sci-mathematics/scilab/scilab-5.5.2.ebuild | 261 +
 9 files changed, 361 insertions(+)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 4a619b9..f6c4a45 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*scilab-5.5.2 (03 Apr 2015)
+
+  03 Apr 2015; Guillaume Horel 
+  +files/scilab-5.5.2-accessviolation.patch,
+  +files/scilab-5.5.2-fix-random-runtime-failure.patch,
+  +files/scilab-5.5.2-followlinks.patch, +files/scilab-5.5.2-gluegen.patch,
+  +files/scilab-5.5.2-java-heap.patch, +files/scilab-5.5.2-missinglib.patch,
+  +files/scilab-5.5.2-nogui.patch, +scilab-5.5.2.ebuild:
+  sci-mathematics/scilab: version bump
+
   01 Feb 2015; Guillaume Horel  scilab-5.5.1.ebuild:
   sci-mathematics/scilab: more precise dependencies
 

diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch 
b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
new file mode 100644
index 000..a84de9a
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch
@@ -0,0 +1,21 @@
+diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab
+--- scilab-5.5.0-orig/bin/scilab   2014-07-12 15:24:17.105686656 -0400
 scilab-5.5.0/bin/scilab2014-07-12 15:25:29.307725409 -0400
+@@ -647,17 +647,6 @@
+ GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g)
+ export GTK_MODULES
+ 
+-# libEGL may be partially supported by the closed-source NVIDIA driver.
+-# Until they release an EGL driver, we force the egl_glx driver.
+-# http://bugzilla.scilab.org/show_bug.cgi?id=12940
+-if test -x /usr/bin/glxinfo; then
+-NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
+-if test ! -z "$NVIDIA_GLX_VENDOR"; then
+-EGL_DRIVER=egl_glx
+-export EGL_DRIVER
+-fi
+-fi
+-
+ if test $SCIVERBOSE -ne 0; then
+ echo "SCI : $SCI"
+ echo "SCIBIN : $SCIBIN"

diff --git 
a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch 
b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
new file mode 100644
index 000..92ac453
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch
@@ -0,0 +1,12 @@
+diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp 
scilab/modules/api_scilab/src/cpp/api_double.cpp
+--- scilab-orig/modules/api_scilab/src/cpp/api_double.cpp  2012-08-06 
23:26:31.342617365 -0400
 scilab/modules/api_scilab/src/cpp/api_double.cpp   2012-08-06 
23:27:34.838621420 -0400
+@@ -497,7 +497,7 @@
+ /*--*/
+ int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)
+ {
+-return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL);
++return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0);
+ }
+ /*--*/
+ int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, 
double _dblImg)

diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch 
b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch
new file mode 100644
index 000..fd6aa7b
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch
@@ -0,0 +1,11 @@
+--- m4/java.m4.orig2014-02-11 23:43:03.030430258 -0500
 m4/java.m4 2014-02-11 23:43:54.008428766 -0500
+@@ -839,7 +839,7 @@
+   for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" 
"$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do
+ 
+ # TODO check the behaviour when spaces
+-jars_resolved=`ls $jar 2>/dev/null`
++jars_resolved=$(realpath $(ls $jar 2>/dev/null) 2>/dev/null)
+ for jar_resolved in $jars_resolved; do # If several jars matches
+   if test -e "$jar_resolved"; then
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"

diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch 
b/sci-mathematics/scilab/files/sci

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2015-01-31 Thread Guillaume Horel

commit: b81b57d210d5179cb114b7bdfd038de92c278371
Author: Guillaume Horel  gmail  com>
AuthorDate: Sun Feb  1 02:59:56 2015 +
Commit: Guillaume Horel  gmail  com>
CommitDate: Sun Feb  1 02:59:56 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b81b57d2

sci-mathematics/scilab: more precise dependencies

Package-Manager: portage-2.2.15

---
 sci-mathematics/scilab/ChangeLog   |  5 -
 sci-mathematics/scilab/scilab-5.5.1.ebuild | 26 +-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index d960f40..4a619b9 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-mathematics/scilab
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Feb 2015; Guillaume Horel  scilab-5.5.1.ebuild:
+  sci-mathematics/scilab: more precise dependencies
+
   27 Jan 2015; Guillaume Horel 
   -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,

diff --git a/sci-mathematics/scilab/scilab-5.5.1.ebuild 
b/sci-mathematics/scilab/scilab-5.5.1.ebuild
index 95cc93c..d01f52a 100644
--- a/sci-mathematics/scilab/scilab-5.5.1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.1.ebuild
@@ -39,11 +39,14 @@ CDEPEND="dev-libs/libpcre
sys-libs/ncurses
sys-libs/readline
virtual/lapack
-   emf? ( dev-java/freehep-graphicsio-emf )
+   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/batik:1.7
dev-java/commons-io:1
dev-java/commons-logging:0
>=dev-java/flexdock-1.2.4:0
@@ -58,7 +61,9 @@ CDEPEND="dev-libs/libpcre
>=dev-java/jrosetta-1.0.4:0
dev-java/skinlf:0
dev-java/xmlgraphics-commons:1.5
-   virtual/opengl )
+   virtual/opengl
+   xcos? ( dev-java/jgraphx:2.5 )
+   )
matio? ( >=sci-libs/matio-1.5 )
tk? ( dev-lang/tk )
umfpack? ( sci-libs/umfpack )"
@@ -71,11 +76,12 @@ DEPEND="${CDEPEND}
debug? ( dev-util/lcov )
gui? (
>=virtual/jdk-1.5
-   doc? ( app-text/docbook-xsl-stylesheets
+   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
-   dev-java/jgraphx:2.5 ) )
+   xcos? ( dev-lang/ocaml )
+   )
test? (
dev-java/junit:4
gui? ( ${VIRTUALX_DEPEND} ) )"
@@ -155,13 +161,15 @@ src_prepare() {
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
+   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

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2015-01-31 Thread Guillaume Horel

commit: 854cb9e62b84934d29f544503b79f7287fdbd3a9
Author: Guillaume Horel  gmail  com>
AuthorDate: Sun Feb  1 02:56:50 2015 +
Commit: Guillaume Horel  gmail  com>
CommitDate: Sun Feb  1 02:56:50 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=854cb9e6

sci-mathematics/scilab: prevent access violation

---
 sci-mathematics/scilab/scilab-5.5.1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/scilab/scilab-5.5.1.ebuild 
b/sci-mathematics/scilab/scilab-5.5.1.ebuild
index 4b4c70d..95cc93c 100644
--- a/sci-mathematics/scilab/scilab-5.5.1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -219,6 +219,8 @@ src_configure() {
 }
 
 src_compile() {
+   #bug 531886 need to investigate what's using /proc/mtrr
+   addpredict /proc/mtrr
emake
use doc && emake doc
 }

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/

2015-01-31 Thread Guillaume Horel

commit: 090811f27d48c68636513021ac82a7ed8e23286c
Author: Guillaume Horel  gmail  com>
AuthorDate: Tue Jan 27 03:14:29 2015 +
Commit: Guillaume Horel  gmail  com>
CommitDate: Sun Feb  1 02:47:56 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=090811f2

sci-mathematics/scilab: remove old versions

Package-Manager: portage-2.2.15

---
 sci-mathematics/scilab/ChangeLog   |  16 ++
 .../scilab/files/scilab-5.3.3-as-needed.patch  |  42 
 .../scilab/files/scilab-5.3.3-blas-libs.patch  |  12 -
 .../files/scilab-5.3.3-disable-build-help.patch|  12 -
 .../scilab-5.3.3-fix-random-runtime-failures.patch |  98 
 .../scilab/files/scilab-5.3.3-fortran-link.patch   |  23 --
 .../scilab/files/scilab-5.3.3-gui-no-xcos.patch|  26 ---
 .../scilab/files/scilab-5.3.3-hdf18.patch  |  13 --
 .../scilab/files/scilab-5.3.3-java-heap.patch  |  11 -
 .../files/scilab-5.3.3-java-version-check.patch|  23 --
 .../scilab/files/scilab-5.3.3-javadoc-utf8.patch   |  25 --
 .../scilab/files/scilab-5.3.3-jgrapx-min.patch |   0
 .../scilab/files/scilab-5.3.3-jvm-detection.patch  |  44 
 .../scilab/files/scilab-5.3.3-matio15.patch|  25 --
 .../scilab/files/scilab-5.3.3-no-lhpi.patch|  22 --
 .../scilab/files/scilab-5.3.3-no-xcos-deps.patch   |  90 
 .../scilab-5.4.1-fix-random-runtime-failure.patch  |  12 -
 .../scilab/files/scilab-5.4.1-followlinks.patch|  12 -
 .../scilab/files/scilab-5.4.1-gluegen.patch|  12 -
 .../scilab/files/scilab-5.4.1-java-heap.patch  |  14 --
 sci-mathematics/scilab/scilab-5.3.3-r2.ebuild  | 252 -
 sci-mathematics/scilab/scilab-5.4.1.ebuild | 243 
 22 files changed, 16 insertions(+), 1011 deletions(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 53eed59..d960f40 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,22 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Jan 2015; Guillaume Horel 
+  -files/scilab-5.3.3-as-needed.patch, -files/scilab-5.3.3-blas-libs.patch,
+  -files/scilab-5.3.3-disable-build-help.patch,
+  -files/scilab-5.3.3-fix-random-runtime-failures.patch,
+  -files/scilab-5.3.3-fortran-link.patch, 
-files/scilab-5.3.3-gui-no-xcos.patch,
+  -files/scilab-5.3.3-hdf18.patch, -files/scilab-5.3.3-java-heap.patch,
+  -files/scilab-5.3.3-java-version-check.patch,
+  -files/scilab-5.3.3-javadoc-utf8.patch, -files/scilab-5.3.3-jgrapx-min.patch,
+  -files/scilab-5.3.3-jvm-detection.patch, -files/scilab-5.3.3-matio15.patch,
+  -files/scilab-5.3.3-no-lhpi.patch, -files/scilab-5.3.3-no-xcos-deps.patch,
+  -files/scilab-5.4.1-fix-random-runtime-failure.patch,
+  -files/scilab-5.4.1-followlinks.patch, -files/scilab-5.4.1-gluegen.patch,
+  -files/scilab-5.4.1-java-heap.patch, -scilab-5.3.3-r2.ebuild,
+  -scilab-5.4.1.ebuild:
+  sci-mathematics/scilab: remove old versions
+
   29 Jun 2014; Guillaume Horel 
   +files/scilab-5.5.0-jdk1.8.patch, scilab-5.5.0.ebuild:
   sci-mathematics/scilab: support jdk1.8

diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-as-needed.patch 
b/sci-mathematics/scilab/files/scilab-5.3.3-as-needed.patch
deleted file mode 100644
index 4df4258..000
--- a/sci-mathematics/scilab/files/scilab-5.3.3-as-needed.patch
+++ /dev/null
@@ -1,42 +0,0 @@
 scilab-5.3.3.orig/modules/history_manager/Makefile.am  2012-04-16 
21:18:43.0 +0100
-+++ scilab-5.3.3/modules/history_manager/Makefile.am   2012-05-23 
20:17:50.0 +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.0 +0100
-+++ scilab-5.3.3/modules/commons/Makefile.am   2012-05-24 19:06:11.0 
+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.0 
+0100
-+++ scilab-5.3.3/modules/Makefile.am   2012-05-24 18:41:25.0 +0100
-@@ -23,7 +23,6 @@
- api_scilab \
- dynamic_link \

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2014-11-01 Thread Guillaume Horel

commit: 51445a85fa34dda6901a7e525366b69a5259b64d
Author: Guillaume Horel  gmail  com>
AuthorDate: Sat Nov  1 16:44:23 2014 +
Commit: Guillaume Horel  gmail  com>
CommitDate: Sat Nov  1 16:44:23 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=51445a85

sci-mathematics/scilab bring back no-as-needed

---
 sci-mathematics/scilab/scilab-5.5.1.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/sci-mathematics/scilab/scilab-5.5.1.ebuild 
b/sci-mathematics/scilab/scilab-5.5.1.ebuild
index 130689f..4b4c70d 100644
--- a/sci-mathematics/scilab/scilab-5.5.1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.1.ebuild
@@ -120,6 +120,10 @@ src_prepare() {
"${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"

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/

2014-10-09 Thread Guillaume Horel

commit: 7fe79314e17d813b0402f5ef0c32baafc1335e9a
Author: Guillaume Horel  gmail  com>
AuthorDate: Fri Oct 10 03:26:31 2014 +
Commit: Guillaume Horel  gmail  com>
CommitDate: Fri Oct 10 03:26:31 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7fe79314

sci-mathematics/scilab version bump

---
 .../files/scilab-5.5.1-accessviolation.patch   |  21 ++
 .../scilab-5.5.1-fix-random-runtime-failure.patch  |  12 +
 .../scilab/files/scilab-5.5.1-followlinks.patch|  11 +
 .../scilab/files/scilab-5.5.1-gluegen.patch|  11 +
 .../scilab/files/scilab-5.5.1-java-heap.patch  |  11 +
 .../scilab/files/scilab-5.5.1-missinglib.patch |  11 +
 .../scilab/files/scilab-5.5.1-nogui.patch  |  13 ++
 sci-mathematics/scilab/scilab-5.5.1.ebuild | 250 +
 8 files changed, 340 insertions(+)

diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-accessviolation.patch 
b/sci-mathematics/scilab/files/scilab-5.5.1-accessviolation.patch
new file mode 100644
index 000..a84de9a
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.1-accessviolation.patch
@@ -0,0 +1,21 @@
+diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab
+--- scilab-5.5.0-orig/bin/scilab   2014-07-12 15:24:17.105686656 -0400
 scilab-5.5.0/bin/scilab2014-07-12 15:25:29.307725409 -0400
+@@ -647,17 +647,6 @@
+ GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g)
+ export GTK_MODULES
+ 
+-# libEGL may be partially supported by the closed-source NVIDIA driver.
+-# Until they release an EGL driver, we force the egl_glx driver.
+-# http://bugzilla.scilab.org/show_bug.cgi?id=12940
+-if test -x /usr/bin/glxinfo; then
+-NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
+-if test ! -z "$NVIDIA_GLX_VENDOR"; then
+-EGL_DRIVER=egl_glx
+-export EGL_DRIVER
+-fi
+-fi
+-
+ if test $SCIVERBOSE -ne 0; then
+ echo "SCI : $SCI"
+ echo "SCIBIN : $SCIBIN"

diff --git 
a/sci-mathematics/scilab/files/scilab-5.5.1-fix-random-runtime-failure.patch 
b/sci-mathematics/scilab/files/scilab-5.5.1-fix-random-runtime-failure.patch
new file mode 100644
index 000..92ac453
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.1-fix-random-runtime-failure.patch
@@ -0,0 +1,12 @@
+diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp 
scilab/modules/api_scilab/src/cpp/api_double.cpp
+--- scilab-orig/modules/api_scilab/src/cpp/api_double.cpp  2012-08-06 
23:26:31.342617365 -0400
 scilab/modules/api_scilab/src/cpp/api_double.cpp   2012-08-06 
23:27:34.838621420 -0400
+@@ -497,7 +497,7 @@
+ /*--*/
+ int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)
+ {
+-return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL);
++return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0);
+ }
+ /*--*/
+ int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, 
double _dblImg)

diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-followlinks.patch 
b/sci-mathematics/scilab/files/scilab-5.5.1-followlinks.patch
new file mode 100644
index 000..fd6aa7b
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.1-followlinks.patch
@@ -0,0 +1,11 @@
+--- m4/java.m4.orig2014-02-11 23:43:03.030430258 -0500
 m4/java.m4 2014-02-11 23:43:54.008428766 -0500
+@@ -839,7 +839,7 @@
+   for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" 
"$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do
+ 
+ # TODO check the behaviour when spaces
+-jars_resolved=`ls $jar 2>/dev/null`
++jars_resolved=$(realpath $(ls $jar 2>/dev/null) 2>/dev/null)
+ for jar_resolved in $jars_resolved; do # If several jars matches
+   if test -e "$jar_resolved"; then
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"

diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-gluegen.patch 
b/sci-mathematics/scilab/files/scilab-5.5.1-gluegen.patch
new file mode 100644
index 000..1514439
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.1-gluegen.patch
@@ -0,0 +1,11 @@
+--- scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java.orig 
2014-03-24 22:38:00.928934500 -0400
 scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java  
2014-03-24 22:37:33.947567043 -0400
+@@ -157,7 +157,7 @@
+ 
+ static {
+ try {
+-System.loadLibrary("gluegen2-rt");
++System.loadLibrary("gluegen-rt");
+ } catch (Exception e) {
+ System.err.println(e);
+ }

diff --git a/sci-mathematics/scilab/files/scilab-5.5.1-java-heap.patch 
b/sci-mathematics/scilab/files/scilab-5.5.1-java-heap.patch
new file mode 100644
index 000..31060d7
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.1-java-heap.patch
@@ -0,0 +1,11 @@
+--- etc/j

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/

2014-07-12 Thread Guillaume Horel

commit: b82d9befa586187dc593a3706f805c747c0078fc
Author: Guillaume Horel  gmail  com>
AuthorDate: Sat Jul 12 19:49:49 2014 +
Commit: Guillaume Horel  gmail  com>
CommitDate: Sat Jul 12 19:49:49 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b82d9bef

sci-mathematics/scilab fix access violation issue

---
 .../files/scilab-5.5.0-accessviolation.patch   | 32 +++---
 sci-mathematics/scilab/scilab-5.5.0.ebuild |  4 +++
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch 
b/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch
index 39b4302..a84de9a 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.0-accessviolation.patch
@@ -1,21 +1,21 @@
 bin/scilab.orig2013-10-28 01:08:06.623143085 -0400
-+++ bin/scilab 2013-10-30 22:57:00.781289235 -0400
-@@ -650,11 +650,13 @@
- # libEGL may be partially supported by the closed-source NVIDIA driver.
- # Until they release an EGL driver, we force the egl_glx driver.
- # http://bugzilla.scilab.org/show_bug.cgi?id=12940
+diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab
+--- scilab-5.5.0-orig/bin/scilab   2014-07-12 15:24:17.105686656 -0400
 scilab-5.5.0/bin/scilab2014-07-12 15:25:29.307725409 -0400
+@@ -647,17 +647,6 @@
+ GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g)
+ export GTK_MODULES
+ 
+-# libEGL may be partially supported by the closed-source NVIDIA driver.
+-# Until they release an EGL driver, we force the egl_glx driver.
+-# http://bugzilla.scilab.org/show_bug.cgi?id=12940
 -if test -x /usr/bin/glxinfo; then
 -NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
 -if test ! -z "$NVIDIA_GLX_VENDOR"; then
 -EGL_DRIVER=egl_glx
 -export EGL_DRIVER
-+if test $SCILAB_MODE != "nw"; then
-+if test -x /usr/bin/glxinfo; then
-+  NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
-+  if test ! -z "$NVIDIA_GLX_VENDOR"; then
-+EGL_DRIVER=egl_glx
-+export EGL_DRIVER
-+  fi
- fi
- fi
- 
+-fi
+-fi
+-
+ if test $SCIVERBOSE -ne 0; then
+ echo "SCI : $SCI"
+ echo "SCIBIN : $SCIBIN"

diff --git a/sci-mathematics/scilab/scilab-5.5.0.ebuild 
b/sci-mathematics/scilab/scilab-5.5.0.ebuild
index 38ad3e4..3fe7558 100644
--- a/sci-mathematics/scilab/scilab-5.5.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.0.ebuild
@@ -241,6 +241,10 @@ src_install() {
 
 pkg_postinst() {
fdo-mime_mime_database_update
+   einfo "If you are using the NVIDIA binary drivers, and run into 
graphics"
+   einfo "crashes, you may try to run scilab as follows:"
+   einfo "EGL_DRIVER=egl_glx scilab"
+   einfo "See upstream http://bugzilla.scilab.org/show_bug.cgi?id=12940";
 }
 
 pkg_postrm() {

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/

2014-06-29 Thread Guillaume Horel

commit: 03814a8eb7cb48d814fc13210687f45bc32da2b0
Author: Guillaume Horel  gmail  com>
AuthorDate: Sun Jun 29 18:58:59 2014 +
Commit: Guillaume Horel  gmail  com>
CommitDate: Sun Jun 29 19:00:15 2014 +
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 
+  +files/scilab-5.5.0-jdk1.8.patch, scilab-5.5.0.ebuild:
+  sci-mathematics/scilab: support jdk1.8
+
   05 May 2014; Quentin Minster  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 000..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.xml2014-06-29 14:33:12.733269635 -0400
+@@ -84,17 +84,12 @@
+ 
+ 
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
++ Note: all class names are the same as in m4/java.m4
++-->
++
++
++
++
+ 
+ 
+ 
+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.m42014-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)

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

2014-05-05 Thread Guillaume Horel

commit: b3505ec19657c6763e7b07e39cbdaac1cf64da58
Author: quentin  minster  io>
AuthorDate: Mon May  5 15:41:38 2014 +
Commit: Guillaume Horel  gmail  com>
CommitDate: Mon May  5 15:41:38 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b3505ec1

sci-mathematics/scilab: Fix minimum version dependency for jlatexmath

Package-Manager: portage-2.2.8-r1

---
 sci-mathematics/scilab/ChangeLog   | 3 +++
 sci-mathematics/scilab/scilab-5.5.0.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 32e608d..cdfa696 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 May 2014; Quentin Minster  scilab-5.5.0.ebuild:
+  sci-mathematics/scilab: Fix minimum version dependency for jlatexmath
+
 *scilab-5.5.0 (22 Apr 2014)
 
   22 Apr 2014; Guillaume Horel 

diff --git a/sci-mathematics/scilab/scilab-5.5.0.ebuild 
b/sci-mathematics/scilab/scilab-5.5.0.ebuild
index 8cf71ee..3ea9058 100644
--- a/sci-mathematics/scilab/scilab-5.5.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.0.ebuild
@@ -52,8 +52,8 @@ CDEPEND="dev-libs/libpcre
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/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

[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/

2014-04-22 Thread Guillaume Horel

commit: 6bd45e6e3978870a2a1052d648a1f225dd320ef3
Author: Guillaume Horel  gmail  com>
AuthorDate: Tue Apr 22 23:29:12 2014 +
Commit: Guillaume Horel  gmail  com>
CommitDate: Tue Apr 22 23:46:37 2014 +
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 
+  +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  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.orig2014-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 000..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.9

41 matches

Mail list logo