| 1 |
commit: b81b57d210d5179cb114b7bdfd038de92c278371 |
| 2 |
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Feb 1 02:59:56 2015 +0000 |
| 4 |
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sun Feb 1 02:59:56 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b81b57d2 |
| 7 |
|
| 8 |
sci-mathematics/scilab: more precise dependencies |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.15 |
| 11 |
|
| 12 |
--- |
| 13 |
sci-mathematics/scilab/ChangeLog | 5 ++++- |
| 14 |
sci-mathematics/scilab/scilab-5.5.1.ebuild | 26 +++++++++++++++++--------- |
| 15 |
2 files changed, 21 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog |
| 18 |
index d960f40..4a619b9 100644 |
| 19 |
--- a/sci-mathematics/scilab/ChangeLog |
| 20 |
+++ b/sci-mathematics/scilab/ChangeLog |
| 21 |
@@ -1,7 +1,10 @@ |
| 22 |
# ChangeLog for sci-mathematics/scilab |
| 23 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
+ 01 Feb 2015; Guillaume Horel <guillaume.horel@×××××.com> scilab-5.5.1.ebuild: |
| 28 |
+ sci-mathematics/scilab: more precise dependencies |
| 29 |
+ |
| 30 |
27 Jan 2015; Guillaume Horel <guillaume.horel@×××××.com> |
| 31 |
-files/scilab-5.3.3-as-needed.patch, -files/scilab-5.3.3-blas-libs.patch, |
| 32 |
-files/scilab-5.3.3-disable-build-help.patch, |
| 33 |
|
| 34 |
diff --git a/sci-mathematics/scilab/scilab-5.5.1.ebuild b/sci-mathematics/scilab/scilab-5.5.1.ebuild |
| 35 |
index 95cc93c..d01f52a 100644 |
| 36 |
--- a/sci-mathematics/scilab/scilab-5.5.1.ebuild |
| 37 |
+++ b/sci-mathematics/scilab/scilab-5.5.1.ebuild |
| 38 |
@@ -39,11 +39,14 @@ CDEPEND="dev-libs/libpcre |
| 39 |
sys-libs/ncurses |
| 40 |
sys-libs/readline |
| 41 |
virtual/lapack |
| 42 |
- emf? ( dev-java/freehep-graphicsio-emf ) |
| 43 |
+ emf? ( dev-java/freehep-graphicsio |
| 44 |
+ dev-java/freehep-graphicsio-emf |
| 45 |
+ dev-java/freehep-graphics2d |
| 46 |
+ dev-java/freehep-io |
| 47 |
+ dev-java/freehep-util ) |
| 48 |
fftw? ( sci-libs/fftw:3.0 ) |
| 49 |
gui? ( |
| 50 |
dev-java/avalon-framework:4.2 |
| 51 |
- dev-java/batik:1.7 |
| 52 |
dev-java/commons-io:1 |
| 53 |
dev-java/commons-logging:0 |
| 54 |
>=dev-java/flexdock-1.2.4:0 |
| 55 |
@@ -58,7 +61,9 @@ CDEPEND="dev-libs/libpcre |
| 56 |
>=dev-java/jrosetta-1.0.4:0 |
| 57 |
dev-java/skinlf:0 |
| 58 |
dev-java/xmlgraphics-commons:1.5 |
| 59 |
- virtual/opengl ) |
| 60 |
+ virtual/opengl |
| 61 |
+ xcos? ( dev-java/jgraphx:2.5 ) |
| 62 |
+ ) |
| 63 |
matio? ( >=sci-libs/matio-1.5 ) |
| 64 |
tk? ( dev-lang/tk ) |
| 65 |
umfpack? ( sci-libs/umfpack )" |
| 66 |
@@ -71,11 +76,12 @@ DEPEND="${CDEPEND} |
| 67 |
debug? ( dev-util/lcov ) |
| 68 |
gui? ( |
| 69 |
>=virtual/jdk-1.5 |
| 70 |
- doc? ( app-text/docbook-xsl-stylesheets |
| 71 |
+ doc? ( dev-java/batik:1.7 |
| 72 |
+ app-text/docbook-xsl-stylesheets |
| 73 |
dev-java/xml-commons-external:1.4 |
| 74 |
dev-java/saxon:9 ) |
| 75 |
- xcos? ( dev-lang/ocaml |
| 76 |
- dev-java/jgraphx:2.5 ) ) |
| 77 |
+ xcos? ( dev-lang/ocaml ) |
| 78 |
+ ) |
| 79 |
test? ( |
| 80 |
dev-java/junit:4 |
| 81 |
gui? ( ${VIRTUALX_DEPEND} ) )" |
| 82 |
@@ -155,13 +161,15 @@ src_prepare() { |
| 83 |
java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1 |
| 84 |
java-pkg_jar-from jogl-2.1 jogl-all.jar jogl2.jar |
| 85 |
java-pkg_jar-from gluegen-2.1 gluegen-rt.jar gluegen2-rt.jar |
| 86 |
- java-pkg_jar-from batik-1.7 batik-all.jar |
| 87 |
java-pkg_jar-from fop fop.jar |
| 88 |
java-pkg_jar-from javahelp jhall.jar |
| 89 |
java-pkg_jar-from jlatexmath-fop-1 |
| 90 |
- java-pkg_jar-from xml-commons-external-1.4 xml-apis-ext.jar |
| 91 |
use xcos && java-pkg_jar-from jgraphx-2.5 |
| 92 |
- use doc && java-pkg_jar-from saxon-9 saxon.jar saxon9he.jar |
| 93 |
+ if use doc; then |
| 94 |
+ java-pkg_jar-from --build-only batik-1.7 batik-all.jar |
| 95 |
+ java-pkg_jar-from --build-only saxon-9 saxon.jar saxon9he.jar |
| 96 |
+ java-pkg_jar-from --build-only xml-commons-external-1.4 xml-apis-ext.jar |
| 97 |
+ fi |
| 98 |
fi |
| 99 |
if use emf; then |
| 100 |
java-pkg_jar-from freehep-graphicsio-emf,freehep-graphics2d |
Archives