aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Gardiner <bog@khumba.net>2015-07-30 09:53:15 -0700
committerBryan Gardiner <bog@khumba.net>2015-07-30 11:11:14 -0700
commit24aef4dd4ce5a30545b252091b878276fc52aefe (patch)
tree9c8c3add6a9be365148c61fc526c784d3a8e345a
parentsci-mathematics/scilab: Patch to build with new versions of Java dependencies. (diff)
downloadsci-24aef4dd.tar.gz
sci-24aef4dd.tar.bz2
sci-24aef4dd.zip
sci-mathematics/scilab: Fix the conditions under which batik is a dependency.
Package-Manager: portage-2.2.20
-rw-r--r--sci-mathematics/scilab/ChangeLog4
-rw-r--r--sci-mathematics/scilab/scilab-5.5.2.ebuild4
2 files changed, 6 insertions, 2 deletions
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 27d3c2b8b..062b2e6ed 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 3e48d0bf9..8ead8de04 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 )