aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-java/gluegen/gluegen-1_p20080421.ebuild4
-rw-r--r--sci-mathematics/scilab/ChangeLog3
-rw-r--r--sci-mathematics/scilab/scilab-5.3.3-r1.ebuild23
3 files changed, 20 insertions, 10 deletions
diff --git a/dev-java/gluegen/gluegen-1_p20080421.ebuild b/dev-java/gluegen/gluegen-1_p20080421.ebuild
index 0da4d90f3..249ecad6d 100644
--- a/dev-java/gluegen/gluegen-1_p20080421.ebuild
+++ b/dev-java/gluegen/gluegen-1_p20080421.ebuild
@@ -2,11 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+EAPI="2"
+
# svn export -r "{2009-05-09}" https://gluegen.dev.java.net/svn/gluegen/trunk
# gluegen --username xxx --password xxx
-EAPI="2"
-
WANT_ANT_TASKS="ant-antlr"
JAVA_PKG_IUSE=""
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 0d75e37d0..c318d6181 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 May 2012; S├ębastien Fabbro <bicatali@gentoo.org> scilab-5.3.3-r1.ebuild:
+ More fixing for deps for gui and xcos
+
*scilab-5.3.3-r1 (25 May 2012)
25 May 2012; S├ębastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
index 7ccbbc09e..2791ec58f 100644
--- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild
@@ -49,16 +49,20 @@ CDEPEND="dev-libs/libpcre
virtual/lapack
fftw? ( sci-libs/fftw:3.0 )
gui? (
+ dev-java/avalon-framework
dev-java/batik
+ dev-java/commons-io
dev-java/commons-logging
dev-java/flexdock
dev-java/fop
+ =dev-java/gluegen-1*
dev-java/javahelp
dev-java/jeuclid-core
dev-java/jgoodies-looks
>=dev-java/jlatexmath-0.9.4
- dev-java/jogl
+ =dev-java/jogl-1*
dev-java/jrosetta
+ dev-java/skinlf
dev-java/xmlgraphics-commons
virtual/opengl
doc? ( dev-java/saxon:6.5 )
@@ -78,9 +82,9 @@ DEPEND="${CDEPEND}
debug? ( dev-util/lcov )
gui? (
>=virtual/jdk-1.5
- doc? (
- >=dev-java/jlatexmath-fop-0.9.4
- app-text/docbook-xsl-stylesheets )
+ 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} ) )"
@@ -155,14 +159,17 @@ src_prepare() {
-L$(java-config -i jogl)|" \
configure.ac || die
sed -i \
- -e "s|/usr/lib/jni|$(java-config -i hdf-java)|g" \
- m4/hdf5.m4 || die
-
- sed -i \
-e "/<\/librarypaths>/i\<path value=\"$(java-config -i gluegen)\"\/>" \
-e "/<\/librarypaths>/i\<path value=\"$(java-config -i jogl)\"\/>" \
+ etc/librarypath.xml || die
+ if use xcos; then
+ sed -i \
+ -e "s|/usr/lib/jni|$(java-config -i hdf-java)|g" \
+ m4/hdf5.m4 || die
+ sed -i \
-e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \
etc/librarypath.xml || die
+ fi
fi
java-pkg-opt-2_src_prepare
eautoreconf