commit: df80daa4525164fe8f83ed7b113b462cbd1a7030
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sun Jun 5 19:42:59 2016 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sun Jun 5 19:42:59 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=df80daa4
sci-mathematics/scilab: fix freehep dependency
closes #627
Package-Manager: portage-2.3.0_rc1
.../scilab/files/scilab-5.5.2-freehep.patch | 12 ++++++++++++
sci-mathematics/scilab/scilab-5.5.2-r1.ebuild | 21 +++++++++++++--------
2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
new file mode 100644
index 0000000..3595902
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch
@@ -0,0 +1,12 @@
+diff -uNr scilab-5.5.2-orig/configure.ac scilab-5.5.2/configure.ac
+--- scilab-5.5.2-orig/configure.ac 2016-06-05 12:30:06.582735449 -0400
++++ scilab-5.5.2/configure.ac 2016-06-05 12:31:29.706708157 -0400
+@@ -1024,7 +1024,7 @@
+ AC_SUBST(FREEHEP_IO)
+
+ # Freehep Util
+-
AC_JAVA_CHECK_PACKAGE([freehep-util],[org.freehep.util.StringUtilities],[Freehep
Util])
++
AC_JAVA_CHECK_PACKAGE([freehep-graphicsbase],[org.freehep.graphicsbase.util.UserProperties],[Freehep
Util])
+ FREEHEP_UTIL=$PACKAGE_JAR_FILE
+ AC_SUBST(FREEHEP_UTIL)
+ fi
diff --git a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
index fabaeb0..ee5dba3 100644
--- a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -40,11 +40,11 @@ CDEPEND="
sys-libs/readline:0=
virtual/lapack
emf? (
- dev-java/freehep-graphicsio
- dev-java/freehep-graphicsio-emf
- dev-java/freehep-graphics2d
- dev-java/freehep-io
- dev-java/freehep-util
+ dev-java/freehep-graphicsio:0
+ dev-java/freehep-graphicsio-emf:0
+ dev-java/freehep-graphics2d:0
+ dev-java/freehep-io:0
+ dev-java/freehep-graphicsbase:0
)
fftw? ( sci-libs/fftw:3.0 )
gui? (
@@ -128,7 +128,8 @@ src_prepare() {
"${FILESDIR}/${P}-missinglib.patch" \
"${FILESDIR}/${P}-batik-1.8.patch" \
"${FILESDIR}/${P}-fop-2.0.patch" \
- "${FILESDIR}/${P}-xmlgraphics-common-2.0.patch"
+ "${FILESDIR}/${P}-xmlgraphics-common-2.0.patch" \
+ "${FILESDIR}/${P}-freehep.patch"
# works for me on x86, but users are having
# trouble without see #282 on github
@@ -143,6 +144,10 @@ src_prepare() {
# make sure the DOCBOOK_ROOT variable is set
sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die
+ # remove self closing <br /> (error our with javadoc8)
+ # already upstream commit 2103082c
+ find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die
+
#add specific gentoo java directories
if use gui; then
sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.2|" \
@@ -177,7 +182,7 @@ src_prepare() {
fi
if use emf; then
java-pkg_jar-from freehep-graphicsio-emf,freehep-graphics2d
- java-pkg_jar-from freehep-graphicsio,freehep-io,freehep-util
+ java-pkg_jar-from
freehep-graphicsio,freehep-io,freehep-graphicsbase
fi
if use test; then
java-pkg_jar-from junit-4 junit.jar junit4.jar
