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

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

[Justin Lecher]

commit:     24aef4dd4ce5a30545b252091b878276fc52aefe
Author:     Bryan Gardiner <bog <AT> khumba <DOT> net>
AuthorDate: Thu Jul 30 16:53:15 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 18:11:14 2015 +0000
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 <bog@khumba.net> 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 <bog@khumba.net> scilab-5.5.2.ebuild,
   +files/scilab-5.5.2-batik-1.8.patch, +files/scilab-5.5.2-fop-2.0.patch,
   +files/scilab-5.5.2-xmlgraphics-common-2.0.patch:

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/

[Andrew Ammerlaan]

commit:     4311e906c625413fbe8d2426d8527b7eebdbcd46
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 10:53:46 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 10:53:46 2021 +0000
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 <andrewammerlaan <AT> 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/

[Andrew Ammerlaan]

commit:     e9569d9cce921133f05391ecdefea51ed5679967
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Mar 21 12:38:01 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Mar 21 12:38:01 2021 +0000
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 <andrewammerlaan <AT> 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/

[Andrew Ammerlaan]

commit:     d6955a0150bbce6007f0ffc7695c676f0c0cfef9
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Jan 25 08:45:53 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Jan 25 08:45:53 2021 +0000
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 <andrewammerlaan <AT> 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/

[Andrew Ammerlaan]

commit:     08b0577dd5a45f7529f71a43a52ec1132933fed3
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Sun Jan 24 17:29:59 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jan 24 20:47:43 2021 +0000
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 <rossi.f <AT> inwind.it>
Closes: https://github.com/gentoo/sci/pull/1042
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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/

[Andrew Ammerlaan]

commit:     5fbdb9fb47d5eddc5734c342a9b5fdd6f4807ba8
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Sun Jan 24 17:11:03 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jan 24 20:47:42 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=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 <rossi.f <AT> inwind.it>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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/

[Andrew Ammerlaan]

commit:     90dce61a6a5f82dcbc7b49a9ed6df6d202447a13
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Sun Jan 24 17:11:03 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jan 24 20:47:43 2021 +0000
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 <rossi.f <AT> inwind.it>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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/

[Andrew Ammerlaan]

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

sci-mathematics/scilab: fix QA issues

Signed-off-by: Fabio Rossi <rossi.f <AT> inwind.it>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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 <br /> (error our with javadoc8)
 	# already upstream commit 2103082c
 	find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||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/

[Andrew Ammerlaan]

commit:     c8781a31365f88f0f06ee31d098790bb87e9fdbd
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Sun Jan 24 17:11:03 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jan 24 20:47:42 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=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 <rossi.f <AT> inwind.it>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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/

[Andrew Ammerlaan]

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

sci-mathematics/scilab: bump to EAPI 7

Signed-off-by: Fabio Rossi <rossi.f <AT> inwind.it>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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/

[Andrew Ammerlaan]

commit:     3c7a8c6c96625d9bb4bf2bc3de4bf2b331cfb37f
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Jan 24 21:05:08 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jan 24 21:05:08 2021 +0000
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 <andrewammerlaan <AT> 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-java/jgraphx:= )
+		xcos? ( dev-java/jgraphx:0 )
 		)
 	matio? ( >=sci-libs/matio-1.5 )
+	mpi? ( virtual/mpi[fortran] )
 	tk? ( dev-lang/tk:0= )
 	umfpack? ( sci-libs/umfpack )"
 
@@ -95,11 +96,16 @@ DEPEND="${CDEPEND}
 	debug? ( dev-util/lcov )
 	gui? (
 		>=virtual/jdk-1.6
-		doc? ( app-text/docbook-xsl-stylesheets
-			   dev-java/xml-commons-external:1.4
-			   dev-java/saxon:9 )
-		xcos? ( dev-lang/ocaml )
+		doc? (
+			app-text/docbook-xsl-stylesheets
+			dev-java/xml-commons-external:1.4
+			dev-java/saxon:9
 		)
+		xcos? (
+			>=dev-lang/ocaml-4.06
+			dev-ml/num
+		)
+	)
 	test? (
 		dev-java/junit:4
 		dev-java/ant-junit4:0
@@ -131,7 +137,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,10 +157,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"
 
@@ -164,6 +166,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 <br /> (error our with javadoc8)
 	# already upstream commit 2103082c
 	find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die
@@ -195,7 +200,7 @@ src_prepare() {
 		java-pkg_jar-from jlatexmath-fop-1
 		use xcos &&	java-pkg_jar-from jgraphx
 		if use doc; then
-			java-pkg_jar-from --build-only batik-1.8 batik-all.jar
+			java-pkg_jar-from --build-only batik-1.9 batik-all.jar
 			java-pkg_jar-from --build-only saxon-9 saxon.jar saxon9he.jar
 			java-pkg_jar-from --build-only xml-commons-external-1.4 xml-apis-ext.jar
 		fi
@@ -272,9 +277,10 @@ 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
 	echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
 		> 50-"${PN}"
 	insinto /etc/revdep-rebuild && doins "50-${PN}"
@@ -282,6 +288,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"
@@ -290,4 +297,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
 }

diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild b/sci-mathematics/scilab/scilab-6.1.0.ebuild
index cbe726794..c1d097312 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.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-java/jgraphx:= )
+		xcos? ( dev-java/jgraphx:0 )
 		)
 	matio? ( >=sci-libs/matio-1.5 )
+	mpi? ( virtual/mpi[fortran] )
 	tk? ( dev-lang/tk:0= )
 	umfpack? ( sci-libs/umfpack )"
 
@@ -95,11 +96,16 @@ DEPEND="${CDEPEND}
 	debug? ( dev-util/lcov )
 	gui? (
 		>=virtual/jdk-1.6
-		doc? ( app-text/docbook-xsl-stylesheets
-			   dev-java/xml-commons-external:1.4
-			   dev-java/saxon:9 )
-		xcos? ( dev-lang/ocaml )
+		doc? (
+			app-text/docbook-xsl-stylesheets
+			dev-java/xml-commons-external:1.4
+			dev-java/saxon:9
 		)
+		xcos? (
+			>=dev-lang/ocaml-4.06
+			dev-ml/num
+		)
+	)
 	test? (
 		dev-java/junit:4
 		dev-java/ant-junit4:0
@@ -160,6 +166,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 <br /> (error our with javadoc8)
 	# already upstream commit 2103082c
 	find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die
@@ -191,7 +200,7 @@ src_prepare() {
 		java-pkg_jar-from jlatexmath-fop-1
 		use xcos &&	java-pkg_jar-from jgraphx
 		if use doc; then
-			java-pkg_jar-from --build-only batik-1.8 batik-all.jar
+			java-pkg_jar-from --build-only batik-1.9 batik-all.jar
 			java-pkg_jar-from --build-only saxon-9 saxon.jar saxon9he.jar
 			java-pkg_jar-from --build-only xml-commons-external-1.4 xml-apis-ext.jar
 		fi
@@ -268,9 +277,10 @@ 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
 	echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
 		> 50-"${PN}"
 	insinto /etc/revdep-rebuild && doins "50-${PN}"
@@ -278,6 +288,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"
@@ -286,4 +297,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
 }

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

[Andrew Ammerlaan]

commit:     239e3a47a637630fad4a4ab8a6721a71bfbd6d13
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan 19 16:55:57 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan 19 16:55:57 2021 +0000
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 <andrewammerlaan <AT> 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/

[Andrew Ammerlaan]

commit:     1615cf4bf2d69b39cec4fe5b8926dc449f71ddbe
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Jan 11 18:12:30 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Jan 11 18:12:30 2021 +0000
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 <andrewammerlaan <AT> 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/

[Andrew Ammerlaan]

commit:     111fc22aeb5ff6a130a666ef077555d8232c356b
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Jan 11 18:11:00 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Jan 11 18:11:00 2021 +0000
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 <andrewammerlaan <AT> 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/

[Justin Lecher]

commit:     17a9787f624d03b730465cd5d8e339c36fc6b1d8
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 18:55:50 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 18:55:50 2015 +0000
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 <jlec <AT> 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/

[Justin Lecher]

commit:     85da2ab63a5f6d292875ebde4d0f42171eca6ccf
Author:     Bryan Gardiner <bog <AT> khumba <DOT> net>
AuthorDate: Tue Sep  1 00:24:14 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 00:29:51 2015 +0000
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 <bog@khumba.net> -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 <bog@khumba.net> 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/

[Justin Lecher]

commit:     31eb8f3cfa5ec9a2f0ad5a0351474fdb73ed427e
Author:     Bryan Gardiner <bog <AT> khumba <DOT> net>
AuthorDate: Thu Jul 30 16:53:15 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 10:09:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=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 <bog@khumba.net> 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 <bog@khumba.net> scilab-5.5.2.ebuild,
   +files/scilab-5.5.2-batik-1.8.patch, +files/scilab-5.5.2-fop-2.0.patch,
   +files/scilab-5.5.2-xmlgraphics-common-2.0.patch:

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/

[Jauhien Piatlicki]

commit:     8e8e93495e8f56be5a0debda9594fb36b327b52f
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Jul 22 19:45:00 2015 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Wed Jul 22 19:45:00 2015 +0000
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 <marbre@linux.sungazer.de> scilab-5.5.2.ebuild:
+  sci-mathematics/scilab: Fix deps
+
   08 Jul 2015; Marius Brehler <marbre@linux.sungazer.de> 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/

[Nicolas Bock]

commit:     6afd2aae94e117584561272d7db676ce55eb75ad
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Jul  8 12:37:22 2015 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Jul  8 12:37:22 2015 +0000
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 <marbre@linux.sungazer.de> scilab-5.5.2.ebuild:
+  sci-mathematics/scilab: Blind fixing dependencies
+
   22 Jun 2015; Justin Lecher <jlec@gentoo.org>
   -files/scilab-5.5.0-accessviolation.patch,
   -files/scilab-5.5.0-fix-random-runtime-failure.patch,

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/

[Guillaume Horel]

commit:     854cb9e62b84934d29f544503b79f7287fdbd3a9
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sun Feb  1 02:56:50 2015 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sun Feb  1 02:56:50 2015 +0000
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/

[Guillaume Horel]

commit:     b81b57d210d5179cb114b7bdfd038de92c278371
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sun Feb  1 02:59:56 2015 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sun Feb  1 02:59:56 2015 +0000
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 <guillaume.horel@gmail.com> scilab-5.5.1.ebuild:
+  sci-mathematics/scilab: more precise dependencies
+
   27 Jan 2015; Guillaume Horel <guillaume.horel@gmail.com>
   -files/scilab-5.3.3-as-needed.patch, -files/scilab-5.3.3-blas-libs.patch,
   -files/scilab-5.3.3-disable-build-help.patch,

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/

[Guillaume Horel]

commit:     51445a85fa34dda6901a7e525366b69a5259b64d
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sat Nov  1 16:44:23 2014 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sat Nov  1 16:44:23 2014 +0000
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/

[Guillaume Horel]

commit:     b3505ec19657c6763e7b07e39cbdaac1cf64da58
Author:     quentin <quentin <AT> minster <DOT> io>
AuthorDate: Mon May  5 15:41:38 2014 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Mon May  5 15:41:38 2014 +0000
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 <quentin@minster.io> 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 <guillaume.horel@gmail.com>

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/

[Guillaume Horel]

commit:     4abf3a9d68d0b9d2faf22d012b3d07b2d412fb9e
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Fri Nov  1 01:58:31 2013 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Nov  1 01:58:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4abf3a9d

sci-mathematics/scilab fix bash completion

---
 sci-mathematics/scilab/scilab-5.3.3-r2.ebuild    | 2 +-
 sci-mathematics/scilab/scilab-5.4.1.ebuild       | 2 +-
 sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.3.3-r2.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r2.ebuild
index 599a691..de3ff5b 100644
--- a/sci-mathematics/scilab/scilab-5.3.3-r2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.3-r2.ebuild
@@ -240,7 +240,7 @@ src_install() {
 	dodoc ACKNOWLEDGEMENTS README_Unix Readme_Visual.txt
 	insinto /usr/share/mime/packages
 	doins "${FILESDIR}"/${PN}.xml
-	use bash-completion && dobashcomp "${FILESDIR}"/${PN}.bash_completion
+	use bash-completion && newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
 }
 
 pkg_postinst() {

diff --git a/sci-mathematics/scilab/scilab-5.4.1.ebuild b/sci-mathematics/scilab/scilab-5.4.1.ebuild
index a9ec305..e054247 100644
--- a/sci-mathematics/scilab/scilab-5.4.1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.1.ebuild
@@ -227,7 +227,7 @@ src_install() {
 	default
 	prune_libtool_files --all
 	rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
-	use bash-completion && dobashcomp "${FILESDIR}"/${PN}.bash_completion
+	use bash-completion && newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
 	echo "LD_LIBRARY_MASK=libverify.so
 SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
 		> 50-"${PN}"

diff --git a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
index 44b06f7..9dfc63f 100644
--- a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
@@ -236,7 +236,7 @@ src_install() {
 	default
 	prune_libtool_files --all
 	rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
-	use bash-completion && dobashcomp "${FILESDIR}"/${PN}.bash_completion
+	use bash-completion && newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
 	echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
 		> 50-"${PN}"
 	insinto /etc/revdep-rebuild && doins "50-${PN}"

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

[Guillaume Horel]

commit:     35a94bb1f64247c0884457512a1f5d31c2d87376
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Fri Nov  1 01:39:12 2013 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Nov  1 01:39:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=35a94bb1

sci-mathematics/scilab remove unneeded dependency

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

diff --git a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
index 8816f26..44b06f7 100644
--- a/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
@@ -152,7 +152,7 @@ src_prepare() {
 	mkdir jar || die
 	pushd jar
 	java-pkg_jar-from jgraphx-2.1,jlatexmath-1,flexdock,skinlf
-	java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer-1
+	java-pkg_jar-from jgoodies-looks-2.0,jrosetta
 	java-pkg_jar-from avalon-framework-4.2,jeuclid-core
 	java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1
 	java-pkg_jar-from jogl-2 jogl-all.jar jogl2.jar

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

[Christoph Junghans]

commit:     6a2dfed6b3b3dedf316934608645ca8085bd502b
Author:     quentin <quentin.minster <AT> gmail <DOT> com>
AuthorDate: Sun Oct 20 17:58:05 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 17:58:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6a2dfed6

Fix false positive from revdep-rebuild for scilab-5.4.1

The scilab-bin binary links against some Java libraries that are not
present in the regular path, hence resulting in revdep-rebuild reporting
them as missing. However these are false positive since the scilab
script sets the right path before invoking scilab-bin.

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

diff --git a/sci-mathematics/scilab/scilab-5.4.1.ebuild b/sci-mathematics/scilab/scilab-5.4.1.ebuild
index 507dcee..a9ec305 100644
--- a/sci-mathematics/scilab/scilab-5.4.1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.1.ebuild
@@ -228,7 +228,8 @@ src_install() {
 	prune_libtool_files --all
 	rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
 	use bash-completion && dobashcomp "${FILESDIR}"/${PN}.bash_completion
-	echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
+	echo "LD_LIBRARY_MASK=libverify.so
+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/

[Christoph Junghans]

commit:     d3d4c0cb45f1504e7a1135fc6f8633b065fd2751
Author:     Andreas Zuber <zuber <AT> puzzle <DOT> ch>
AuthorDate: Mon Jun  3 14:24:53 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 14:30:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d3d4c0cb

update minimal versions of some dependencies for scilab

---
 sci-mathematics/scilab/scilab-5.4.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.4.1.ebuild b/sci-mathematics/scilab/scilab-5.4.1.ebuild
index 3be7871..507dcee 100644
--- a/sci-mathematics/scilab/scilab-5.4.1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.1.ebuild
@@ -48,17 +48,17 @@ CDEPEND="dev-libs/libpcre
 		dev-java/avalon-framework:4.2
 		dev-java/batik:1.7
 		dev-java/commons-io:1
-		>=dev-java/flexdock-1.2.2:0
+		>=dev-java/flexdock-1.2.3:0
 		dev-java/fop:0
 		dev-java/gluegen:2
 		dev-java/javahelp:0
 		dev-java/jeuclid-core:0
 		dev-java/jgoodies-looks:2.0
 		dev-java/jgraphx:1.8
-		dev-java/jlatexmath:1
+		>=dev-java/jlatexmath-1.0.2:1
 		dev-java/jogl:2
 		>=dev-java/jrosetta-1.0.4:0
-		dev-java/scirenderer:1
+		>=dev-java/scirenderer-1.1.0:1
 		dev-java/skinlf:0
 		dev-java/xmlgraphics-commons:1.5
 		virtual/opengl

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

[Guillaume Horel]

commit:     f230d8ab44053b483dd9bf1a1d482d3306cd1c8d
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Fri May 10 00:31:40 2013 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri May 10 00:33:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f230d8ab

sci-mathematics/scilab version bump as 5.4.0 has been pulled upstream

---
 .../{scilab-5.4.0.ebuild => scilab-5.4.1.ebuild}   |   45 ++++++++++----------
 1 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.4.0.ebuild b/sci-mathematics/scilab/scilab-5.4.1.ebuild
similarity index 86%
rename from sci-mathematics/scilab/scilab-5.4.0.ebuild
rename to sci-mathematics/scilab/scilab-5.4.1.ebuild
index bffe76e..3be7871 100644
--- a/sci-mathematics/scilab/scilab-5.4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 JAVA_PKG_OPT_USE="gui"
 VIRTUALX_REQUIRED="manual"
@@ -12,17 +12,17 @@ inherit eutils autotools bash-completion-r1 check-reqs fdo-mime flag-o-matic \
 
 # Things that don't work:
 # - tests
-# - can't build without docs (-doc)
+# - can't build without docs (-doc) 
 
 DESCRIPTION="Scientific software package for numerical computations"
 HOMEPAGE="http://www.scilab.org/"
 SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
 
-SLOT="0"
 LICENSE="CeCILL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bash-completion debug +doc fftw +gui +matio nls openmp
-	static-libs test tk +umfpack xcos"
+	static-libs test tk +umfpack +xcos"
 REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
 
 # ALL_LINGUAS variable defined in configure.ac
@@ -35,8 +35,7 @@ for l in ${LINGUASLONG}; do
 	IUSE="${IUSE} linguas_${l%_*}"
 done
 
-CDEPEND="
-	dev-libs/libpcre
+CDEPEND="dev-libs/libpcre
 	dev-libs/libxml2:2
 	sci-libs/hdf5
 	>=sci-libs/arpack-3
@@ -49,7 +48,7 @@ CDEPEND="
 		dev-java/avalon-framework:4.2
 		dev-java/batik:1.7
 		dev-java/commons-io:1
-		>=dev-java/flexdock-1.2:0
+		>=dev-java/flexdock-1.2.2:0
 		dev-java/fop:0
 		dev-java/gluegen:2
 		dev-java/javahelp:0
@@ -61,9 +60,10 @@ CDEPEND="
 		>=dev-java/jrosetta-1.0.4:0
 		dev-java/scirenderer:1
 		dev-java/skinlf:0
-		dev-java/xmlgraphics-commons:1.3
+		dev-java/xmlgraphics-commons:1.5
 		virtual/opengl
-		doc? ( dev-java/saxon:6.5 )
+		doc? ( dev-java/saxon:6.5
+		       dev-java/jlatexmath-fop:1 )
 		xcos? ( dev-java/commons-logging:0 ) )
 	matio? ( <sci-libs/matio-1.5 )
 	tk? ( dev-lang/tk )
@@ -77,10 +77,8 @@ DEPEND="${CDEPEND}
 	debug? ( dev-util/lcov )
 	gui? (
 		>=virtual/jdk-1.5
-		doc? (
-			app-text/docbook-xsl-stylesheets
-			dev-java/jlatexmath-fop:1
-			dev-java/xml-commons-external:1.4 )
+		doc? ( app-text/docbook-xsl-stylesheets
+			   dev-java/xml-commons-external:1.4 )
 		xcos? ( dev-lang/ocaml ) )
 	test? (
 		dev-java/junit:4
@@ -116,11 +114,9 @@ pkg_setup() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}/${P}-fortran-link.patch" \
 		"${FILESDIR}/${P}-followlinks.patch" \
 		"${FILESDIR}/${P}-gluegen.patch" \
-		"${FILESDIR}/${P}-fix-random-runtime-failure.patch" \
-		"${FILESDIR}/${P}-builddocs.patch"
+		"${FILESDIR}/${P}-fix-random-runtime-failure.patch"
 
 	append-ldflags $(no-as-needed)
 
@@ -128,21 +124,21 @@ src_prepare() {
 	use doc && epatch "${FILESDIR}/${P}-java-heap.patch"
 
 	# use the LINGUAS variable that we set
-	sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac
+	sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac ||die
 
 	# make sure the DOCBOOK_ROOT variable is set
 	sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die
 
 	#add specific gentoo java directories
 	if use gui; then
-		sed -i -e "s|/usr/lib/jogl|/usr/lib/jogl-2|" \
-			-e "s|/usr/lib64/jogl|/usr/lib64/jogl-2|" configure.ac || die
-		sed -i -e "s|/usr/lib/gluegen|/usr/lib/gluegen-2|" \
-			-e "s|/usr/lib64/gluegen|/usr/lib64/gluegen-2|" \
+		sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2|" \
+			-e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2|" configure.ac || die
+		sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2|" \
+			-e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2|" \
 			-e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \
 			configure.ac || die
 
-		sed -i -e "s/jogl/jogl-2/" -e "s/gluegen/gluegen-2/" \
+		sed -i -e "s/jogl2/jogl-2/" -e "s/gluegen2/gluegen-2/" \
 			etc/librarypath.xml || die
 	fi
 
@@ -151,7 +147,7 @@ src_prepare() {
 	java-pkg_jar-from jgraphx-1.8,jlatexmath-1,flexdock,skinlf
 	java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer-1
 	java-pkg_jar-from avalon-framework-4.2,jeuclid-core
-	java-pkg_jar-from xmlgraphics-commons-1.3,commons-io-1
+	java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1
 	java-pkg_jar-from jogl-2 jogl.all.jar jogl2.jar
 	java-pkg_jar-from gluegen-2 gluegen-rt.jar gluegen2-rt.jar
 	java-pkg_jar-from batik-1.7 batik-all.jar
@@ -232,6 +228,9 @@ src_install() {
 	prune_libtool_files --all
 	rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
 	use bash-completion && dobashcomp "${FILESDIR}"/${PN}.bash_completion
+	echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
+		> 50-"${PN}"
+	insinto /etc/revdep-rebuild && doins "50-${PN}"
 }
 
 pkg_postinst() {

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

[Justin Lecher]

commit:     eaf3cb37466102348bffec03089d522286db7721
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 09:28:33 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 09:28:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=eaf3cb37

sci-mathematics/scilab: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config

Package-Manager: portage-2.2.0_alpha163
RepoMan-Options: --force

---
 sci-mathematics/scilab/ChangeLog              |    6 ++++-
 sci-mathematics/scilab/metadata.xml           |   16 +++++++-------
 sci-mathematics/scilab/scilab-5.3.3-r1.ebuild |   26 +++++++++++++-----------
 sci-mathematics/scilab/scilab-5.4.0.ebuild    |   19 +++++++++--------
 4 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 840b142..6d0b612 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-mathematics/scilab
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Feb 2013; Justin Lecher <jlec@gentoo.org> scilab-5.3.3-r1.ebuild,
+  scilab-5.4.0.ebuild, metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
+
   18 Oct 2012; Guillaume Horel <guillaume.horel@gmail.com>
   scilab-5.3.3-r1.ebuild, scilab-5.4.0.ebuild:
   remove virtual/fortran as intended with the updated fortran-2 eclass

diff --git a/sci-mathematics/scilab/metadata.xml b/sci-mathematics/scilab/metadata.xml
index e87dba0..9e49669 100644
--- a/sci-mathematics/scilab/metadata.xml
+++ b/sci-mathematics/scilab/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
   Scilab is a matrix-based scientific software package. Scilab contains
   hundreds of built-in mathematical functions, rich data structures
   (including polynomials, rationals,linear systems, lists, etc...) and
   comes with a number of specific toolboxes for control, signal
   processing, ...
 </longdescription>
-<use>
-  <flag name='gui'>Build the Java base graphical interface</flag>
-  <flag name="umfpack">Adds support for sparse solving
+  <use>
+    <flag name="gui">Build the Java base graphical interface</flag>
+    <flag name="umfpack">Adds support for sparse solving
   with <pkg>sci-libs/umfpack</pkg></flag>
-  <flag name='matio'>Enable support for MATLAB file through <pkg>sci-libs/matio</pkg></flag>
-  <flag name='xcos'>Enable building hybrid dynamic systems modeler and
+    <flag name="matio">Enable support for MATLAB file through <pkg>sci-libs/matio</pkg></flag>
+    <flag name="xcos">Enable building hybrid dynamic systems modeler and
   simulator Xcos</flag>
-</use>
+  </use>
 </pkgmetadata>

diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
index a9883ea..19fe80b 100644
--- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -20,11 +20,12 @@ inherit eutils autotools check-reqs fdo-mime bash-completion-r1 \
 #   celestlab, jims,...
 
 DESCRIPTION="Scientific software package for numerical computations"
-LICENSE="CeCILL-2"
 HOMEPAGE="http://www.scilab.org/"
 SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
 
 SLOT="0"
+LICENSE="CeCILL-2"
+KEYWORDS="~amd64 ~x86"
 IUSE="bash-completion debug doc fftw +gui hdf5 +matio nls openmp
 	static-libs test tk +umfpack xcos"
 REQUIRED_USE="xcos? ( hdf5 gui ) doc? ( gui )"
@@ -39,9 +40,8 @@ for l in ${LINGUASLONG}; do
 	IUSE="${IUSE} linguas_${l%_*}"
 done
 
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-libs/libpcre
+CDEPEND="
+	dev-libs/libpcre
 	dev-libs/libxml2:2
 	sys-devel/gettext
 	sys-libs/ncurses
@@ -66,8 +66,9 @@ CDEPEND="dev-libs/libpcre
 		dev-java/xmlgraphics-commons
 		virtual/opengl
 		doc? ( dev-java/saxon:6.5 )
-		hdf5? ( dev-java/hdf-java
-				xcos? ( =dev-java/jgraphx-1.4.1.0 ) ) )
+		hdf5? (
+			dev-java/hdf-java
+			xcos? ( =dev-java/jgraphx-1.4.1.0 ) ) )
 	hdf5? ( sci-libs/hdf5 )
 	matio? ( <sci-libs/matio-1.5 )
 	tk? ( dev-lang/tk )
@@ -81,9 +82,10 @@ DEPEND="${CDEPEND}
 	debug? ( dev-util/lcov )
 	gui? (
 		>=virtual/jdk-1.5
-		doc? ( app-text/docbook-xsl-stylesheets
-			   >=dev-java/jlatexmath-fop-0.9.4
-			   dev-java/xml-commons-external )
+		doc? (
+			app-text/docbook-xsl-stylesheets
+			>=dev-java/jlatexmath-fop-0.9.4
+			dev-java/xml-commons-external )
 		xcos? ( dev-lang/ocaml ) )
 	test? ( gui? ( ${VIRTUALX_DEPEND} ) )"
 
@@ -182,8 +184,8 @@ src_configure() {
 		unset JAVAC
 	fi
 
-	export BLAS_LIBS="$(pkg-config --libs blas)"
-	export LAPACK_LIBS="$(pkg-config --libs lapack)"
+	export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+	export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
 	export F77_LDFLAGS="${LDFLAGS}"
 	# gentoo bug #302621
 	use hdf5 && has_version sci-libs/hdf5[mpi] && \

diff --git a/sci-mathematics/scilab/scilab-5.4.0.ebuild b/sci-mathematics/scilab/scilab-5.4.0.ebuild
index f561637..bffe76e 100644
--- a/sci-mathematics/scilab/scilab-5.4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,14 +12,15 @@ inherit eutils autotools bash-completion-r1 check-reqs fdo-mime flag-o-matic \
 
 # Things that don't work:
 # - tests
-# - can't build without docs (-doc) 
+# - can't build without docs (-doc)
 
 DESCRIPTION="Scientific software package for numerical computations"
-LICENSE="CeCILL-2"
 HOMEPAGE="http://www.scilab.org/"
 SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
 
 SLOT="0"
+LICENSE="CeCILL-2"
+KEYWORDS="~amd64 ~x86"
 IUSE="bash-completion debug +doc fftw +gui +matio nls openmp
 	static-libs test tk +umfpack xcos"
 REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
@@ -34,9 +35,8 @@ for l in ${LINGUASLONG}; do
 	IUSE="${IUSE} linguas_${l%_*}"
 done
 
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-libs/libpcre
+CDEPEND="
+	dev-libs/libpcre
 	dev-libs/libxml2:2
 	sci-libs/hdf5
 	>=sci-libs/arpack-3
@@ -77,9 +77,10 @@ DEPEND="${CDEPEND}
 	debug? ( dev-util/lcov )
 	gui? (
 		>=virtual/jdk-1.5
-		doc? ( app-text/docbook-xsl-stylesheets
-			   dev-java/jlatexmath-fop:1
-			   dev-java/xml-commons-external:1.4 )
+		doc? (
+			app-text/docbook-xsl-stylesheets
+			dev-java/jlatexmath-fop:1
+			dev-java/xml-commons-external:1.4 )
 		xcos? ( dev-lang/ocaml ) )
 	test? (
 		dev-java/junit:4

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

[Guillaume Horel]

commit:     c22717ff704dfc765e16144d6d5e7c0e0f566eab
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sat Jan 19 17:33:05 2013 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sat Jan 19 17:45:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c22717ff

sci-mathematics/scilab update dependencies

fixes bug #451624

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

diff --git a/sci-mathematics/scilab/scilab-5.4.0.ebuild b/sci-mathematics/scilab/scilab-5.4.0.ebuild
index 5d4183f..d62611f 100644
--- a/sci-mathematics/scilab/scilab-5.4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.0.ebuild
@@ -45,6 +45,7 @@ KEYWORDS="~amd64 ~x86"
 CDEPEND="dev-libs/libpcre
 	dev-libs/libxml2:2
 	sci-libs/hdf5
+	>=sci-libs/arpack-3
 	sys-devel/gettext
 	sys-libs/ncurses
 	sys-libs/readline
@@ -54,7 +55,7 @@ CDEPEND="dev-libs/libpcre
 		dev-java/avalon-framework:4.2
 		dev-java/batik:1.7
 		dev-java/commons-io:1
-		dev-java/flexdock:0
+		>=dev-java/flexdock-1.2:0
 		dev-java/fop:0
 		dev-java/gluegen:2
 		dev-java/javahelp:0
@@ -234,7 +235,7 @@ src_test() {
 src_install() {
 	default
 	prune_libtool_files --all
-	rm -rf "${D}"/usr/share/scilab/modules/*/tests
+	rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
 	use bash-completion && dobashcomp "${FILESDIR}"/${PN}.bash_completion
 }
 

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

[Guillaume Horel]

commit:     e79a3890d7e120ee4637c933af0d68782c79e2d9
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Tue Jan  8 02:26:37 2013 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Tue Jan  8 02:26:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e79a3890

sci-mathematics/scilab-5.4.0 cleanup dependencies

---
 sci-mathematics/scilab/scilab-5.4.0.ebuild |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.4.0.ebuild b/sci-mathematics/scilab/scilab-5.4.0.ebuild
index 6b7a7fe..5d4183f 100644
--- a/sci-mathematics/scilab/scilab-5.4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -44,6 +44,7 @@ KEYWORDS="~amd64 ~x86"
 
 CDEPEND="dev-libs/libpcre
 	dev-libs/libxml2:2
+	sci-libs/hdf5
 	sys-devel/gettext
 	sys-libs/ncurses
 	sys-libs/readline
@@ -59,6 +60,7 @@ CDEPEND="dev-libs/libpcre
 		dev-java/javahelp:0
 		dev-java/jeuclid-core:0
 		dev-java/jgoodies-looks:2.0
+		dev-java/jgraphx:1.8
 		dev-java/jlatexmath:1
 		dev-java/jogl:2
 		>=dev-java/jrosetta-1.0.4:0
@@ -67,7 +69,7 @@ CDEPEND="dev-libs/libpcre
 		dev-java/xmlgraphics-commons:1.3
 		virtual/opengl
 		doc? ( dev-java/saxon:6.5 )
-		xcos? ( dev-java/jgraphx:1.8 ) )
+		xcos? ( dev-java/commons-logging:0 ) )
 	matio? ( <sci-libs/matio-1.5 )
 	tk? ( dev-lang/tk )
 	umfpack? ( sci-libs/umfpack )"
@@ -105,14 +107,15 @@ pkg_setup() {
 	FORTRAN_STANDARD="77 90"
 	fortran-2_pkg_setup
 	java-pkg-opt-2_pkg_setup
+
 	ALL_LINGUAS="en_US"
-	ALL_LINGUAS_DOC="en_US"
 	for l in ${LINGUAS}; do
 		use linguas_${l} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
 	done
 	for l in ${LINGUASLONG}; do
 		use linguas_${l%_*} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
 	done
+
 	export ALL_LINGUAS ALL_LINGUAS_DOC=$ALL_LINGUAS
 }
 
@@ -151,15 +154,20 @@ src_prepare() {
 	pushd jar
 	java-pkg_jar-from jgraphx-1.8,jlatexmath-1,flexdock,skinlf
 	java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer-1
-	java-pkg_jar-from avalon-framework-4.2,saxon-6.5,jeuclid-core
-	java-pkg_jar-from xmlgraphics-commons-1.3,commons-io-1,jlatexmath-fop-1
+	java-pkg_jar-from avalon-framework-4.2,jeuclid-core
+	java-pkg_jar-from xmlgraphics-commons-1.3,commons-io-1
 	java-pkg_jar-from jogl-2 jogl.all.jar jogl2.jar
 	java-pkg_jar-from gluegen-2 gluegen-rt.jar gluegen2-rt.jar
 	java-pkg_jar-from batik-1.7 batik-all.jar
-	java-pkg_jar-from xml-commons-external-1.4 xml-apis-ext.jar
-	java-pkg_jar-from commons-logging commons-logging.jar
 	java-pkg_jar-from fop fop.jar
 	java-pkg_jar-from javahelp jhall.jar
+	if use xcos; then
+		java-pkg_jar-from commons-logging
+	fi
+	if use doc; then
+		java-pkg_jar-from jlatexmath-fop-1,saxon-6.5
+		java-pkg_jar-from xml-commons-external-1.4 xml-apis-ext.jar
+	fi
 	if use test; then
 		java-pkg_jar-from junit-4 junit.jar junit4.jar
 	fi
@@ -176,12 +184,12 @@ src_configure() {
 		unset JAVAC
 	fi
 
-	export BLAS_LIBS="$(pkg-config --libs blas)"
-	export LAPACK_LIBS="$(pkg-config --libs lapack)"
+	export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+	export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
 	export F77_LDFLAGS="${LDFLAGS}"
 	# gentoo bug #302621
 	has_version sci-libs/hdf5[mpi] && \
-		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+		export CXX=mpicxx CC=mpicc
 
 	econf \
 		--enable-relocatable \

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

[Guillaume Horel]

commit:     5e0372b6e22e7499c65c0fc01a3532797e8a12b4
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Tue Nov 27 03:26:51 2012 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Tue Nov 27 03:29:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5e0372b6

sci-mathematics/scilab various fixes

- make sure the linguas variables have an effect
- scilab startup script didn't set DOCBOOK_ROOT variable

---
 sci-mathematics/scilab/scilab-5.4.0.ebuild |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.4.0.ebuild b/sci-mathematics/scilab/scilab-5.4.0.ebuild
index f2e4e6c..6b7a7fe 100644
--- a/sci-mathematics/scilab/scilab-5.4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.0.ebuild
@@ -105,14 +105,15 @@ pkg_setup() {
 	FORTRAN_STANDARD="77 90"
 	fortran-2_pkg_setup
 	java-pkg-opt-2_pkg_setup
-	ALL_LINGUAS=
+	ALL_LINGUAS="en_US"
+	ALL_LINGUAS_DOC="en_US"
 	for l in ${LINGUAS}; do
 		use linguas_${l} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
 	done
 	for l in ${LINGUASLONG}; do
 		use linguas_${l%_*} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
 	done
-	export ALL_LINGUAS
+	export ALL_LINGUAS ALL_LINGUAS_DOC=$ALL_LINGUAS
 }
 
 src_prepare() {
@@ -127,11 +128,13 @@ src_prepare() {
 	# increases java heap to 512M when building docs (sync with cheqreqs above)
 	use doc && epatch "${FILESDIR}/${P}-java-heap.patch"
 
+	sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac
 	# make sure library path are preloaded in binaries
 	sed -i \
 		-e "s|^LD_LIBRARY_PATH=|LD_LIBRARY_PATH=${EPREFIX}/usr/$(get_libdir)/scilab:|g" \
 		bin/scilab* || die
-
+	# make sure it exports the DOCBOOK_ROOT variable
+	sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die
 	#add specific gentoo java directories
 	if use gui; then
 		sed -i -e "s|/usr/lib/jogl|/usr/lib/jogl-2|" \
@@ -144,7 +147,8 @@ src_prepare() {
 		sed -i -e "s/jogl/jogl-2/" -e "s/gluegen/gluegen-2/" \
 			etc/librarypath.xml || die
 	fi
-	mkdir jar; cd jar
+	mkdir jar || die
+	pushd jar
 	java-pkg_jar-from jgraphx-1.8,jlatexmath-1,flexdock,skinlf
 	java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer-1
 	java-pkg_jar-from avalon-framework-4.2,saxon-6.5,jeuclid-core
@@ -159,7 +163,7 @@ src_prepare() {
 	if use test; then
 		java-pkg_jar-from junit-4 junit.jar junit4.jar
 	fi
-	cd ..
+	popd
 
 	java-pkg-opt-2_src_prepare
 	eautoconf

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

[Guillaume Horel]

commit:     772b10e89a1c8f16862d3b25b076e68eaa4ee360
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Thu Oct 18 14:06:26 2012 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Thu Oct 18 14:06:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=772b10e8

[sci-mathematics/scilab] revert part of commit 033255b367

---
 sci-mathematics/scilab/scilab-5.3.3-r1.ebuild |    4 ++++
 sci-mathematics/scilab/scilab-5.4.0.ebuild    |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
index 912bb81..a9883ea 100644
--- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
@@ -93,6 +93,10 @@ pkg_pretend() {
 
 pkg_setup() {
 	if use openmp; then
+		if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
+			ewarn "You are using a gcc without OpenMP capabilities"
+			die "Need an OpenMP capable compiler"
+		fi
 		FORTRAN_NEED_OPENMP=1
 	fi
 	FORTRAN_STANDARD="77 90"

diff --git a/sci-mathematics/scilab/scilab-5.4.0.ebuild b/sci-mathematics/scilab/scilab-5.4.0.ebuild
index 0b245d6..f2e4e6c 100644
--- a/sci-mathematics/scilab/scilab-5.4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.0.ebuild
@@ -96,6 +96,10 @@ pkg_pretend() {
 
 pkg_setup() {
 	if use openmp; then
+		if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
+			ewarn "You are using a gcc without OpenMP capabilities"
+			die "Need an OpenMP capable compiler"
+		fi
 		FORTRAN_NEED_OPENMP=1
 	fi
 	FORTRAN_STANDARD="77 90"

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

[Guillaume Horel]

commit:     033255b3676064abddcd346d04f255e5d592a18b
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Thu Oct 18 04:28:12 2012 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Thu Oct 18 04:31:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=033255b3

[sci-mathematics/scilab] remove virtual/fortran

---
 sci-mathematics/scilab/ChangeLog              |    4 ++++
 sci-mathematics/scilab/scilab-5.3.3-r1.ebuild |    5 -----
 sci-mathematics/scilab/scilab-5.4.0.ebuild    |    5 -----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 241fe4e..840b142 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Oct 2012; Guillaume Horel <guillaume.horel@gmail.com>
+  scilab-5.3.3-r1.ebuild, scilab-5.4.0.ebuild:
+  remove virtual/fortran as intended with the updated fortran-2 eclass
+
 *scilab-5.4.0 (02 Oct 2012)
 
   02 Oct 2012; Guillaume Horel <guillaume.horel@gmail.com>

diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
index 758eda7..912bb81 100644
--- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
@@ -77,7 +77,6 @@ RDEPEND="${CDEPEND}
 	gui? ( >=virtual/jre-1.5 )"
 
 DEPEND="${CDEPEND}
-	virtual/fortran
 	virtual/pkgconfig
 	debug? ( dev-util/lcov )
 	gui? (
@@ -94,10 +93,6 @@ pkg_pretend() {
 
 pkg_setup() {
 	if use openmp; then
-		if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
-			ewarn "You are using a gcc without OpenMP capabilities"
-			die "Need an OpenMP capable compiler"
-		fi
 		FORTRAN_NEED_OPENMP=1
 	fi
 	FORTRAN_STANDARD="77 90"

diff --git a/sci-mathematics/scilab/scilab-5.4.0.ebuild b/sci-mathematics/scilab/scilab-5.4.0.ebuild
index 090dbca..0b245d6 100644
--- a/sci-mathematics/scilab/scilab-5.4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.0.ebuild
@@ -76,7 +76,6 @@ RDEPEND="${CDEPEND}
 	gui? ( >=virtual/jre-1.5 )"
 
 DEPEND="${CDEPEND}
-	virtual/fortran
 	virtual/pkgconfig
 	debug? ( dev-util/lcov )
 	gui? (
@@ -97,10 +96,6 @@ pkg_pretend() {
 
 pkg_setup() {
 	if use openmp; then
-		if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
-			ewarn "You are using a gcc without OpenMP capabilities"
-			die "Need an OpenMP capable compiler"
-		fi
 		FORTRAN_NEED_OPENMP=1
 	fi
 	FORTRAN_STANDARD="77 90"

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

[Guillaume Horel]

commit:     54c7dbeb89d9342622e9be5d7be56e6f824c1086
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Thu Oct 18 04:28:12 2012 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Thu Oct 18 04:28:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=54c7dbeb

[sci-mathematics/scilab] remove virtual/fortran

---
 sci-mathematics/scilab/ChangeLog              |    4 ++++
 sci-mathematics/scilab/scilab-5.3.3-r1.ebuild |    5 -----
 sci-mathematics/scilab/scilab-5.4.0.ebuild    |    5 -----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 241fe4e..840b142 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Oct 2012; Guillaume Horel <guillaume.horel@gmail.com>
+  scilab-5.3.3-r1.ebuild, scilab-5.4.0.ebuild:
+  remove virtual/fortran as intended with the updated fortran-2 eclass
+
 *scilab-5.4.0 (02 Oct 2012)
 
   02 Oct 2012; Guillaume Horel <guillaume.horel@gmail.com>

diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
index 758eda7..912bb81 100644
--- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
@@ -77,7 +77,6 @@ RDEPEND="${CDEPEND}
 	gui? ( >=virtual/jre-1.5 )"
 
 DEPEND="${CDEPEND}
-	virtual/fortran
 	virtual/pkgconfig
 	debug? ( dev-util/lcov )
 	gui? (
@@ -94,10 +93,6 @@ pkg_pretend() {
 
 pkg_setup() {
 	if use openmp; then
-		if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
-			ewarn "You are using a gcc without OpenMP capabilities"
-			die "Need an OpenMP capable compiler"
-		fi
 		FORTRAN_NEED_OPENMP=1
 	fi
 	FORTRAN_STANDARD="77 90"

diff --git a/sci-mathematics/scilab/scilab-5.4.0.ebuild b/sci-mathematics/scilab/scilab-5.4.0.ebuild
index 090dbca..0b245d6 100644
--- a/sci-mathematics/scilab/scilab-5.4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.0.ebuild
@@ -76,7 +76,6 @@ RDEPEND="${CDEPEND}
 	gui? ( >=virtual/jre-1.5 )"
 
 DEPEND="${CDEPEND}
-	virtual/fortran
 	virtual/pkgconfig
 	debug? ( dev-util/lcov )
 	gui? (
@@ -97,10 +96,6 @@ pkg_pretend() {
 
 pkg_setup() {
 	if use openmp; then
-		if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
-			ewarn "You are using a gcc without OpenMP capabilities"
-			die "Need an OpenMP capable compiler"
-		fi
 		FORTRAN_NEED_OPENMP=1
 	fi
 	FORTRAN_STANDARD="77 90"

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

[Guillaume Horel]

commit:     76b4d99ee13c248a161423acfed9a49ea6e4286c
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Tue Oct  2 05:48:20 2012 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Tue Oct  2 05:48:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=76b4d99e

[sci-mathematics/scilab] fix errors in previous commit

---
 sci-mathematics/scilab/scilab-5.4.0.ebuild |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.4.0.ebuild b/sci-mathematics/scilab/scilab-5.4.0.ebuild
index 1fcbd3d..56ccebf 100644
--- a/sci-mathematics/scilab/scilab-5.4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.0.ebuild
@@ -59,10 +59,10 @@ CDEPEND="dev-libs/libpcre
 		dev-java/javahelp:0
 		dev-java/jeuclid-core:0
 		dev-java/jgoodies-looks:2.0
-		>=dev-java/jlatexmath-1.0.0:0
+		>=dev-java/jlatexmath-1.0.0:1
 		dev-java/jogl:2
 		>=dev-java/jrosetta-1.0.4:0
-		dev-java/scirenderer:0
+		dev-java/scirenderer:1
 		dev-java/skinlf:0
 		dev-java/xmlgraphics-commons:1.3
 		virtual/opengl
@@ -83,10 +83,10 @@ DEPEND="${CDEPEND}
 		>=virtual/jdk-1.5
 		doc? ( app-text/docbook-xsl-stylesheets
 			   >=dev-java/jlatexmath-fop-1.0.0:1
-			   dev-java/xml-commons-external )
+			   dev-java/xml-commons-external:1.4 )
 		xcos? ( dev-lang/ocaml ) )
 	test? (
-		dev-java/junit
+		dev-java/junit:4
 		gui? ( ${VIRTUALX_DEPEND} ) )"
 
 DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
@@ -123,7 +123,7 @@ src_prepare() {
 		"${FILESDIR}/${P}-gluegen.patch" \
 		"${FILESDIR}/${P}-fix-random-runtime-failure.patch"
 
-	#append-ldflags $(no-as-needed)
+	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/

[Guillaume Horel]

commit:     e517ab407f98ad515da80b971ac120da4f5ce237
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Tue Sep 25 05:59:52 2012 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Tue Sep 25 06:07:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e517ab40

[sci-mathematics/scilab] update dependencies

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

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 5de66d4..ad03349 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Sep 2012; Guillaume Horel <guillaume.horel@gmail.com>
+  scilab-5.3.999.ebuild:
+  update dependencies
+
   11 Aug 2012; Guillaume Horel <guillaume.horel@gmail.com>
   scilab-5.3.999.ebuild:
   drop dependency on hdf-java

diff --git a/sci-mathematics/scilab/scilab-5.3.999.ebuild b/sci-mathematics/scilab/scilab-5.3.999.ebuild
index b25dbab..7a04b54 100644
--- a/sci-mathematics/scilab/scilab-5.3.999.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.999.ebuild
@@ -60,10 +60,10 @@ CDEPEND="dev-libs/libpcre
 		dev-java/javahelp:0
 		dev-java/jeuclid-core:0
 		dev-java/jgoodies-looks:2.0
-		>=dev-java/jlatexmath-0.9.4:0
+		dev-java/jlatexmath:1
 		dev-java/jogl:2
 		>=dev-java/jrosetta-1.0.4:0
-		dev-java/scirenderer:0
+		dev-java/scirenderer:1
 		dev-java/skinlf:0
 		dev-java/xmlgraphics-commons:1.3
 		virtual/opengl
@@ -83,11 +83,11 @@ DEPEND="${CDEPEND}
 	gui? (
 		>=virtual/jdk-1.5
 		doc? ( app-text/docbook-xsl-stylesheets
-			   >=dev-java/jlatexmath-fop-0.9.4
-			   dev-java/xml-commons-external )
+			   dev-java/jlatexmath-fop:1
+			   dev-java/xml-commons-external:1.4 )
 		xcos? ( dev-lang/ocaml ) )
 	test? (
-		dev-java/junit
+		dev-java/junit:4
 		gui? ( ${VIRTUALX_DEPEND} ) )"
 
 EGIT_SOURCEDIR="${WORKDIR}/${PN}"
@@ -153,7 +153,7 @@ src_prepare() {
 	java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer
 	java-pkg_jar-from avalon-framework-4.2,saxon-6.5,jeuclid-core
 	java-pkg_jar-from xmlgraphics-commons-1.3,commons-io-1,jlatexmath-fop
-	java-pkg_jar-from jogl-2 jogl.all.jar jogl2.jar
+	java-pkg_jar-from jogl-2 jogl-all.jar jogl2.jar
 	java-pkg_jar-from gluegen-2 gluegen-rt.jar gluegen2-rt.jar
 	java-pkg_jar-from batik-1.7 batik-all.jar
 	java-pkg_jar-from xml-commons-external-1.4 xml-apis-ext.jar

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

[Guillaume Horel]

commit:     c887ce113a1b6344f4f6f4bcdedc53e1426c6881
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sat Aug 11 22:22:15 2012 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sat Aug 11 22:22:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c887ce11

[sci-mathematics/scilab] version bump

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

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 51074f7..5de66d4 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Aug 2012; Guillaume Horel <guillaume.horel@gmail.com>
+  scilab-5.3.999.ebuild:
+  drop dependency on hdf-java
+
   07 Aug 2012; Guillaume Horel <guillaume.horel@gmail.com>
   scilab-5.3.999.ebuild,
   +files/scilab-5.3.999-fix-random-runtime-failure.patch,

diff --git a/sci-mathematics/scilab/scilab-5.3.999.ebuild b/sci-mathematics/scilab/scilab-5.3.999.ebuild
index 1d14b09..b25dbab 100644
--- a/sci-mathematics/scilab/scilab-5.3.999.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.999.ebuild
@@ -49,7 +49,6 @@ CDEPEND="dev-libs/libpcre
 	sys-libs/ncurses
 	sys-libs/readline
 	virtual/lapack
-	dev-java/hdf-java
 	fftw? ( sci-libs/fftw:3.0 )
 	gui? (
 		dev-java/avalon-framework:4.2
@@ -147,11 +146,10 @@ src_prepare() {
 			configure.ac || die
 
 		sed -i -e "s/jogl/jogl-2/" -e "s/gluegen/gluegen-2/" \
-			-e "s/jhdf5/hdf-java/" etc/librarypath.xml || die
-		sed -i -e "s|/jhdf5|/hdf-java|g" m4/hdf5.m4
+			etc/librarypath.xml || die
 	fi
 	mkdir jar; cd jar
-	java-pkg_jar-from jgraphx-1.8,jlatexmath,hdf-java,flexdock,skinlf
+	java-pkg_jar-from jgraphx-1.8,jlatexmath,flexdock,skinlf
 	java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer
 	java-pkg_jar-from avalon-framework-4.2,saxon-6.5,jeuclid-core
 	java-pkg_jar-from xmlgraphics-commons-1.3,commons-io-1,jlatexmath-fop

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

[Guillaume Horel]

commit:     2dd94991b1552a209eb4eb8a01f59d797dd7ef2d
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Wed May 30 01:26:05 2012 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Wed May 30 01:26:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2dd94991

[sci-mathematics/scilab] force jgraphx version

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

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 71aae68..10428af 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 May 2012; Guillaume Horel <guillaume.horel@gmail.com>
+  scilab-5.3.3-r1.ebuild:
+  force exact version of jgraphx
+
   29 May 2012; Sébastien Fabbro <bicatali@gentoo.org> scilab-5.3.3-r1.ebuild,
   +files/scilab-5.3.3-gui-no-xcos.patch:
   fix bug #375769

diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
index 69e71e9..758eda7 100644
--- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
@@ -67,7 +67,7 @@ CDEPEND="dev-libs/libpcre
 		virtual/opengl
 		doc? ( dev-java/saxon:6.5 )
 		hdf5? ( dev-java/hdf-java
-				xcos? ( >=dev-java/jgraphx-1.4.1 ) ) )
+				xcos? ( =dev-java/jgraphx-1.4.1.0 ) ) )
 	hdf5? ( sci-libs/hdf5 )
 	matio? ( <sci-libs/matio-1.5 )
 	tk? ( dev-lang/tk )

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

[Guillaume Horel]

commit:     4dc510378f434a4c63acce9d34e165afb3b009aa
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Fri Dec 23 01:00:51 2011 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Dec 23 01:00:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4dc51037

sci-mathematics/scilab-5.3.3 fixes for jdk-1.7

---
 sci-mathematics/scilab/ChangeLog           |    3 +++
 sci-mathematics/scilab/scilab-5.3.3.ebuild |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index c41856e..b9e3734 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Dec 2011; Guillaume Horel <guillaume.horel@gmail.com> scilab-5.3.3.ebuild:
+  Fixes for jdk-1.7
+
 *scilab-5.3.3 (15 Nov 2011)
 
   15 Nov 2011; Guillaume Horel <guillaume.horel@gmail.com>

diff --git a/sci-mathematics/scilab/scilab-5.3.3.ebuild b/sci-mathematics/scilab/scilab-5.3.3.ebuild
index a6d2050..c1fe41d 100644
--- a/sci-mathematics/scilab/scilab-5.3.3.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.3.ebuild
@@ -74,6 +74,9 @@ src_prepare() {
 	#bug 9824 upstream
 	sed -i "/BLAS_LIBS=$/d" m4/libsmath.m4
 	epatch "${FILESDIR}/${P}-allow-hdf-1.8.7.patch"
+	#bug 392363 
+	sed -i -e "s|Clément DAVID|Clement DAVID|g" $(find . -iname '*.java')
+	sed -i -e "s/ -lhpi//g" m4/java.m4
 
 	sed -i "s|-L\$SCI_SRCDIR/bin/|-L\$SCI_SRCDIR/bin/ \
 		-L$(java-config -i gluegen) \

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

[Guillaume Horel]

commit:     cd3f889832beb61ac6c19b19c48bd833f9c5a084
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Mon Sep 19 03:44:38 2011 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Mon Sep 19 03:44:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cd3f8898

[sci-libs/scilab] Various fixes

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

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 9916297..b889a95 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Sep 2011; Guillaume Horel <guillaume.horel@gmail.com> scilab-5.3.2.ebuild:
+  make sure the BLAS_LIBS variable is used
+  see #373565
+
   30 Jun 2011; Guillaume Horel <guillaume.horel@gmail.com> scilab-5.3.2.ebuild:
   Added hdf-java dependency to xcos
 

diff --git a/sci-mathematics/scilab/scilab-5.3.2.ebuild b/sci-mathematics/scilab/scilab-5.3.2.ebuild
index 72ea6aa..adddadb 100644
--- a/sci-mathematics/scilab/scilab-5.3.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.2.ebuild
@@ -21,8 +21,7 @@ KEYWORDS="~amd64 ~x86"
 # http://wiki.scilab.org/Dependencies_of_Scilab_5.X
 RDEPEND="virtual/lapack
 	tk? ( dev-lang/tk )
-	xcos? ( dev-lang/ocaml
-			dev-java/hdf-java )
+	xcos? ( dev-lang/ocaml )
 	umfpack? ( sci-libs/umfpack )
 	gui? ( >=virtual/jre-1.5
 		dev-java/commons-logging
@@ -49,7 +48,8 @@ DEPEND="${RDEPEND}
 		app-text/docbook-xsl-stylesheets )"
 
 pkg_setup() {
-	CHECKREQS_MEMORY="512"
+	use doc && CHECKREQS_MEMORY="512M"
+	check-reqs_pkg_setup
 	java-pkg-2_pkg_setup
 
 	# temp Bug 6593 upstream, fixed
@@ -58,12 +58,15 @@ pkg_setup() {
 
 src_prepare() {
 	# Increases java heap to 512M when available, when building docs
-	check_reqs_conditional && epatch "${FILESDIR}/java-heap-${PV}.patch"
+	use doc && epatch "${FILESDIR}/java-heap-${PV}.patch"
 	# fix scilib path
 	epatch "${FILESDIR}/${P}-scilib-fix.patch"
 	# bug 9268 reported upstream http://bugzilla.scilab.org/show_bug.cgi?id=9268
 	epatch "${FILESDIR}"/bug_9268.diff
 
+	#bug 9824 upstream
+	sed -i "/BLAS_LIBS=$/d" m4/libsmath.m4
+
 	sed -i "s|-L\$SCI_SRCDIR/bin/|-L\$SCI_SRCDIR/bin/ \
 		-L$(java-config -i gluegen) \
 		-L$(java-config -i jogl)|" \
@@ -84,7 +87,7 @@ src_configure() {
 	use doc && myopts="--with-docbook=/usr/share/sgml/docbook/xsl-stylesheets"
 	# javac complained about (j)hdf
 	use hdf5 && myopts="$myopts --with-hdf5-library=$(java-config -i hdf-java)"
-	export JAVA_HOME=$(java-config -O)
+	export JAVA_HOME="$(java-config -O)"
 	export BLAS_LIBS="$(pkg-config --libs blas)"
 	export LAPACK_LIBS="$(pkg-config --libs lapack)"
 
@@ -101,7 +104,7 @@ src_configure() {
 		$(use_with matio) \
 		$(use_with umfpack) \
 		$(use_with tk) \
-		$(use_with xcos) \
+		$(use_with xcos scicos) \
 		${myopts}
 }
 

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

[Guillaume Horel]

commit:     3d0f377fa0fac9ce7c56e12d8b32a11ca13d0784
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Thu Jun 30 13:40:25 2011 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Thu Jun 30 13:40:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3d0f377f

[scilab-5.3.2] fixed xcos dependency

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

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 084c3f2..9916297 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Jun 2011; Guillaume Horel <guillaume.horel@gmail.com> scilab-5.3.2.ebuild:
+  Added hdf-java dependency to xcos
+
   24 Jun 2011; Justin Lecher <jlec@gentoo.org> scilab-5.2.1.ebuild,
   scilab-5.3.2.ebuild:
   Sort inherit and/or USE

diff --git a/sci-mathematics/scilab/scilab-5.3.2.ebuild b/sci-mathematics/scilab/scilab-5.3.2.ebuild
index 1a6db48..72ea6aa 100644
--- a/sci-mathematics/scilab/scilab-5.3.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.2.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 # http://wiki.scilab.org/Dependencies_of_Scilab_5.X
 RDEPEND="virtual/lapack
 	tk? ( dev-lang/tk )
-	xcos? ( dev-lang/ocaml 
+	xcos? ( dev-lang/ocaml
 			dev-java/hdf-java )
 	umfpack? ( sci-libs/umfpack )
 	gui? ( >=virtual/jre-1.5

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

[Guillaume Horel]

commit:     6e58c735554dc36cb4261d953517093c5248a786
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Wed Jun 29 23:31:43 2011 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Wed Jun 29 23:31:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6e58c735

test

---
 sci-mathematics/scilab/scilab-5.3.2.ebuild |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-5.3.2.ebuild b/sci-mathematics/scilab/scilab-5.3.2.ebuild
index db423ef..295c30f 100644
--- a/sci-mathematics/scilab/scilab-5.3.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.2.ebuild
@@ -21,7 +21,8 @@ KEYWORDS="~amd64 ~x86"
 # http://wiki.scilab.org/Dependencies_of_Scilab_5.X
 RDEPEND="virtual/lapack
 	tk? ( dev-lang/tk )
-	xcos? ( dev-lang/ocaml )
+	xcos? ( dev-lang/ocaml 
+			dev-java/hdf-java )
 	umfpack? ( sci-libs/umfpack )
 	gui? ( >=virtual/jre-1.5
 		dev-java/commons-logging

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

[Justin Lecher]

commit:     fe3d2dea8fdf210a5d6b6c500dbd2da2e7291107
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 15:10:51 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 15:10:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fe3d2dea

Sort inherit and/or USE

(Portage version: 2.2.0_alpha41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)

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

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index e742125..084c3f2 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Jun 2011; Justin Lecher <jlec@gentoo.org> scilab-5.2.1.ebuild,
+  scilab-5.3.2.ebuild:
+  Sort inherit and/or USE
+
   16 Jun 2011; Guillaume Horel <guillaume.horel@gmail.com> scilab-5.3.2.ebuild,
   +files/scilib-5.3.2-scilib-fix.patch:
   Fixed jgraphx version dependency and disabled mpi support in hdf

diff --git a/sci-mathematics/scilab/scilab-5.2.1.ebuild b/sci-mathematics/scilab/scilab-5.2.1.ebuild
index c120969..52c331d 100644
--- a/sci-mathematics/scilab/scilab-5.2.1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=2
-inherit eutils autotools java-pkg-2 check-reqs
+inherit autotools check-reqs eutils java-pkg-2
 
 DESCRIPTION="Scientific software package for numerical computations"
 LICENSE="CeCILL-2"

diff --git a/sci-mathematics/scilab/scilab-5.3.2.ebuild b/sci-mathematics/scilab/scilab-5.3.2.ebuild
index db423ef..1c3f40e 100644
--- a/sci-mathematics/scilab/scilab-5.3.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.2.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit eutils autotools java-pkg-2 check-reqs flag-o-matic
+inherit autotools check-reqs eutils flag-o-matic java-pkg-2
 
 DESCRIPTION="Scientific software package for numerical computations"
 LICENSE="CeCILL-2"