aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Horel <guillaume.horel@gmail.com>2012-10-15 00:27:54 -0400
committerGuillaume Horel <guillaume.horel@gmail.com>2012-10-15 00:29:00 -0400
commit7c12e769fcddfd1d18b8c02a322a28d446112535 (patch)
tree8389a794a2309d915d919c4b0b584b022de15450
parentbump boehm-gc, fix python (diff)
downloadsci-7c12e769fcddfd1d18b8c02a322a28d446112535.tar.gz
sci-7c12e769fcddfd1d18b8c02a322a28d446112535.tar.bz2
sci-7c12e769fcddfd1d18b8c02a322a28d446112535.zip
[sci-mathematics/scilab] fix slot dependencies
-rw-r--r--dev-java/jlatexmath-fop/jlatexmath-fop-1.0.0.ebuild2
-rw-r--r--dev-java/scirenderer/scirenderer-1.0.2.ebuild4
-rw-r--r--sci-mathematics/scilab/scilab-5.4.0.ebuild12
3 files changed, 9 insertions, 9 deletions
diff --git a/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.0.ebuild b/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.0.ebuild
index 76f95070f..465f6f5bf 100644
--- a/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.0.ebuild
+++ b/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://forge.scilab.org/upload/jlatexmath/files/${MY_PN}-src-all-${PV}.
HOMEPAGE="http://forge.scilab.org/index.php/p/jlatexmath"
IUSE=""
-CDEPEND="dev-java/jlatexmath
+CDEPEND="dev-java/jlatexmath:1
dev-java/avalon-framework
dev-java/fop"
REPEND=">=virtual/jdk-1.5
diff --git a/dev-java/scirenderer/scirenderer-1.0.2.ebuild b/dev-java/scirenderer/scirenderer-1.0.2.ebuild
index df45d0aaa..cdc3a6e3d 100644
--- a/dev-java/scirenderer/scirenderer-1.0.2.ebuild
+++ b/dev-java/scirenderer/scirenderer-1.0.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://forge.scilab.org/index.php/p/scirenderer/"
IUSE="doc source"
DEPEND=">=virtual/jdk-1.5
dev-java/jogl:2
- dev-java/jlatexmath:0"
+ dev-java/jlatexmath:1"
RDEPEND=">=virtual/jre-1.5"
LICENSE="GPL-2"
@@ -29,7 +29,7 @@ java_prepare() {
-e "s|jogl2.jar =.*|jogl2.jar =$(java-pkg_getjar jogl-2 jogl.all.jar)|" \
-e "s|gluegen2-rt.jar =.*|gluegen2-rt.jar =$(java-pkg_getjar gluegen-2 \
gluegen-rt.jar)|" \
- -e "s|jlatexmath.jar =.*|jlatexmath.jar = $(java-pkg_getjars jlatexmath)|" \
+ -e "s|jlatexmath.jar =.*|jlatexmath.jar = $(java-pkg_getjars jlatexmath-1)|" \
scirenderer-libs.properties
}
diff --git a/sci-mathematics/scilab/scilab-5.4.0.ebuild b/sci-mathematics/scilab/scilab-5.4.0.ebuild
index 56ccebfba..090dbca5f 100644
--- a/sci-mathematics/scilab/scilab-5.4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.0.ebuild
@@ -59,7 +59,7 @@ 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:1
+ dev-java/jlatexmath:1
dev-java/jogl:2
>=dev-java/jrosetta-1.0.4:0
dev-java/scirenderer:1
@@ -82,7 +82,7 @@ DEPEND="${CDEPEND}
gui? (
>=virtual/jdk-1.5
doc? ( app-text/docbook-xsl-stylesheets
- >=dev-java/jlatexmath-fop-1.0.0:1
+ dev-java/jlatexmath-fop:1
dev-java/xml-commons-external:1.4 )
xcos? ( dev-lang/ocaml ) )
test? (
@@ -146,10 +146,10 @@ src_prepare() {
etc/librarypath.xml || die
fi
mkdir jar; cd jar
- java-pkg_jar-from jgraphx-1.8,jlatexmath,flexdock,skinlf
- java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer
+ 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
+ java-pkg_jar-from xmlgraphics-commons-1.3,commons-io-1,jlatexmath-fop-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
@@ -183,7 +183,7 @@ src_configure() {
econf \
--enable-relocatable \
--disable-rpath \
- -with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \
+ --with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \
$(use_enable debug) \
$(use_enable debug code-coverage) \
$(use_enable debug debug-C) \