| 1 |
commit: dab5f937cfec0bf39043e71a5faea3ed68fd1698 |
| 2 |
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue May 29 17:38:56 2012 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 29 17:38:56 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dab5f937 |
| 7 |
|
| 8 |
sci-mathematics/scilab: fixed gui/xcos deps |
| 9 |
|
| 10 |
--- |
| 11 |
dev-java/gluegen/gluegen-1_p20080421.ebuild | 4 ++-- |
| 12 |
sci-mathematics/scilab/ChangeLog | 3 +++ |
| 13 |
sci-mathematics/scilab/scilab-5.3.3-r1.ebuild | 23 +++++++++++++++-------- |
| 14 |
3 files changed, 20 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-java/gluegen/gluegen-1_p20080421.ebuild b/dev-java/gluegen/gluegen-1_p20080421.ebuild |
| 17 |
index 0da4d90..249ecad 100644 |
| 18 |
--- a/dev-java/gluegen/gluegen-1_p20080421.ebuild |
| 19 |
+++ b/dev-java/gluegen/gluegen-1_p20080421.ebuild |
| 20 |
@@ -2,11 +2,11 @@ |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
# $Header: $ |
| 23 |
|
| 24 |
+EAPI="2" |
| 25 |
+ |
| 26 |
# svn export -r "{2009-05-09}" https://gluegen.dev.java.net/svn/gluegen/trunk |
| 27 |
# gluegen --username xxx --password xxx |
| 28 |
|
| 29 |
-EAPI="2" |
| 30 |
- |
| 31 |
WANT_ANT_TASKS="ant-antlr" |
| 32 |
JAVA_PKG_IUSE="" |
| 33 |
|
| 34 |
|
| 35 |
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog |
| 36 |
index 0d75e37..c318d61 100644 |
| 37 |
--- a/sci-mathematics/scilab/ChangeLog |
| 38 |
+++ b/sci-mathematics/scilab/ChangeLog |
| 39 |
@@ -2,6 +2,9 @@ |
| 40 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 41 |
# $Header: $ |
| 42 |
|
| 43 |
+ 29 May 2012; Sébastien Fabbro <bicatali@g.o> scilab-5.3.3-r1.ebuild: |
| 44 |
+ More fixing for deps for gui and xcos |
| 45 |
+ |
| 46 |
*scilab-5.3.3-r1 (25 May 2012) |
| 47 |
|
| 48 |
25 May 2012; Sébastien Fabbro <bicatali@g.o> |
| 49 |
|
| 50 |
diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild |
| 51 |
index 7ccbbc0..2791ec5 100644 |
| 52 |
--- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild |
| 53 |
+++ b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild |
| 54 |
@@ -49,16 +49,20 @@ CDEPEND="dev-libs/libpcre |
| 55 |
virtual/lapack |
| 56 |
fftw? ( sci-libs/fftw:3.0 ) |
| 57 |
gui? ( |
| 58 |
+ dev-java/avalon-framework |
| 59 |
dev-java/batik |
| 60 |
+ dev-java/commons-io |
| 61 |
dev-java/commons-logging |
| 62 |
dev-java/flexdock |
| 63 |
dev-java/fop |
| 64 |
+ =dev-java/gluegen-1* |
| 65 |
dev-java/javahelp |
| 66 |
dev-java/jeuclid-core |
| 67 |
dev-java/jgoodies-looks |
| 68 |
>=dev-java/jlatexmath-0.9.4 |
| 69 |
- dev-java/jogl |
| 70 |
+ =dev-java/jogl-1* |
| 71 |
dev-java/jrosetta |
| 72 |
+ dev-java/skinlf |
| 73 |
dev-java/xmlgraphics-commons |
| 74 |
virtual/opengl |
| 75 |
doc? ( dev-java/saxon:6.5 ) |
| 76 |
@@ -78,9 +82,9 @@ DEPEND="${CDEPEND} |
| 77 |
debug? ( dev-util/lcov ) |
| 78 |
gui? ( |
| 79 |
>=virtual/jdk-1.5 |
| 80 |
- doc? ( |
| 81 |
- >=dev-java/jlatexmath-fop-0.9.4 |
| 82 |
- app-text/docbook-xsl-stylesheets ) |
| 83 |
+ doc? ( app-text/docbook-xsl-stylesheets |
| 84 |
+ >=dev-java/jlatexmath-fop-0.9.4 |
| 85 |
+ dev-java/xml-commons-external ) |
| 86 |
xcos? ( dev-lang/ocaml ) ) |
| 87 |
test? ( gui? ( ${VIRTUALX_DEPEND} ) )" |
| 88 |
|
| 89 |
@@ -155,14 +159,17 @@ src_prepare() { |
| 90 |
-L$(java-config -i jogl)|" \ |
| 91 |
configure.ac || die |
| 92 |
sed -i \ |
| 93 |
- -e "s|/usr/lib/jni|$(java-config -i hdf-java)|g" \ |
| 94 |
- m4/hdf5.m4 || die |
| 95 |
- |
| 96 |
- sed -i \ |
| 97 |
-e "/<\/librarypaths>/i\<path value=\"$(java-config -i gluegen)\"\/>" \ |
| 98 |
-e "/<\/librarypaths>/i\<path value=\"$(java-config -i jogl)\"\/>" \ |
| 99 |
+ etc/librarypath.xml || die |
| 100 |
+ if use xcos; then |
| 101 |
+ sed -i \ |
| 102 |
+ -e "s|/usr/lib/jni|$(java-config -i hdf-java)|g" \ |
| 103 |
+ m4/hdf5.m4 || die |
| 104 |
+ sed -i \ |
| 105 |
-e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \ |
| 106 |
etc/librarypath.xml || die |
| 107 |
+ fi |
| 108 |
fi |
| 109 |
java-pkg-opt-2_src_prepare |
| 110 |
eautoreconf |
Archives