| 1 |
commit: df80daa4525164fe8f83ed7b113b462cbd1a7030 |
| 2 |
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jun 5 19:42:59 2016 +0000 |
| 4 |
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sun Jun 5 19:42:59 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=df80daa4 |
| 7 |
|
| 8 |
sci-mathematics/scilab: fix freehep dependency |
| 9 |
|
| 10 |
closes #627 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0_rc1 |
| 13 |
|
| 14 |
.../scilab/files/scilab-5.5.2-freehep.patch | 12 ++++++++++++ |
| 15 |
sci-mathematics/scilab/scilab-5.5.2-r1.ebuild | 21 +++++++++++++-------- |
| 16 |
2 files changed, 25 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..3595902 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch |
| 23 |
@@ -0,0 +1,12 @@ |
| 24 |
+diff -uNr scilab-5.5.2-orig/configure.ac scilab-5.5.2/configure.ac |
| 25 |
+--- scilab-5.5.2-orig/configure.ac 2016-06-05 12:30:06.582735449 -0400 |
| 26 |
++++ scilab-5.5.2/configure.ac 2016-06-05 12:31:29.706708157 -0400 |
| 27 |
+@@ -1024,7 +1024,7 @@ |
| 28 |
+ AC_SUBST(FREEHEP_IO) |
| 29 |
+ |
| 30 |
+ # Freehep Util |
| 31 |
+- AC_JAVA_CHECK_PACKAGE([freehep-util],[org.freehep.util.StringUtilities],[Freehep Util]) |
| 32 |
++ AC_JAVA_CHECK_PACKAGE([freehep-graphicsbase],[org.freehep.graphicsbase.util.UserProperties],[Freehep Util]) |
| 33 |
+ FREEHEP_UTIL=$PACKAGE_JAR_FILE |
| 34 |
+ AC_SUBST(FREEHEP_UTIL) |
| 35 |
+ fi |
| 36 |
|
| 37 |
diff --git a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild |
| 38 |
index fabaeb0..ee5dba3 100644 |
| 39 |
--- a/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild |
| 40 |
+++ b/sci-mathematics/scilab/scilab-5.5.2-r1.ebuild |
| 41 |
@@ -1,4 +1,4 @@ |
| 42 |
-# Copyright 1999-2015 Gentoo Foundation |
| 43 |
+# Copyright 1999-2016 Gentoo Foundation |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
# $Id$ |
| 46 |
|
| 47 |
@@ -40,11 +40,11 @@ CDEPEND=" |
| 48 |
sys-libs/readline:0= |
| 49 |
virtual/lapack |
| 50 |
emf? ( |
| 51 |
- dev-java/freehep-graphicsio |
| 52 |
- dev-java/freehep-graphicsio-emf |
| 53 |
- dev-java/freehep-graphics2d |
| 54 |
- dev-java/freehep-io |
| 55 |
- dev-java/freehep-util |
| 56 |
+ dev-java/freehep-graphicsio:0 |
| 57 |
+ dev-java/freehep-graphicsio-emf:0 |
| 58 |
+ dev-java/freehep-graphics2d:0 |
| 59 |
+ dev-java/freehep-io:0 |
| 60 |
+ dev-java/freehep-graphicsbase:0 |
| 61 |
) |
| 62 |
fftw? ( sci-libs/fftw:3.0 ) |
| 63 |
gui? ( |
| 64 |
@@ -128,7 +128,8 @@ src_prepare() { |
| 65 |
"${FILESDIR}/${P}-missinglib.patch" \ |
| 66 |
"${FILESDIR}/${P}-batik-1.8.patch" \ |
| 67 |
"${FILESDIR}/${P}-fop-2.0.patch" \ |
| 68 |
- "${FILESDIR}/${P}-xmlgraphics-common-2.0.patch" |
| 69 |
+ "${FILESDIR}/${P}-xmlgraphics-common-2.0.patch" \ |
| 70 |
+ "${FILESDIR}/${P}-freehep.patch" |
| 71 |
|
| 72 |
# works for me on x86, but users are having |
| 73 |
# trouble without see #282 on github |
| 74 |
@@ -143,6 +144,10 @@ src_prepare() { |
| 75 |
# make sure the DOCBOOK_ROOT variable is set |
| 76 |
sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die |
| 77 |
|
| 78 |
+ # remove self closing <br /> (error our with javadoc8) |
| 79 |
+ # already upstream commit 2103082c |
| 80 |
+ find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die |
| 81 |
+ |
| 82 |
#add specific gentoo java directories |
| 83 |
if use gui; then |
| 84 |
sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.2|" \ |
| 85 |
@@ -177,7 +182,7 @@ src_prepare() { |
| 86 |
fi |
| 87 |
if use emf; then |
| 88 |
java-pkg_jar-from freehep-graphicsio-emf,freehep-graphics2d |
| 89 |
- java-pkg_jar-from freehep-graphicsio,freehep-io,freehep-util |
| 90 |
+ java-pkg_jar-from freehep-graphicsio,freehep-io,freehep-graphicsbase |
| 91 |
fi |
| 92 |
if use test; then |
| 93 |
java-pkg_jar-from junit-4 junit.jar junit4.jar |
Archives