diff options
| author |   Mark Wright <gienah@gentoo.org> | 2016-02-16 22:18:46 +1100 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2016-02-16 22:18:46 +1100 |
| commit | e03efabf52fd874c48d7e3bfdc6a436a044bd1a3 (patch) | |
| tree | 36b0ecf29fd9c65f5655a44e9834b27da64ef777 /sci-mathematics/isabelle/files | |
| parent | sci-mathematics/csdp: Add CSDP, A C Library for Semidefinite Programming (diff) | |
| download | gentoo-e03efabf52fd874c48d7e3bfdc6a436a044bd1a3.tar.gz gentoo-e03efabf52fd874c48d7e3bfdc6a436a044bd1a3.tar.bz2 gentoo-e03efabf52fd874c48d7e3bfdc6a436a044bd1a3.zip | |
sci-mathematics/isabelle: Bump to 2015, check diskspace and memory.
Thanks to Toralf F?rster for reporting the need to check diskspace, and Jonas Jelten for requesting the version bump.
Gentoo-Bugs: 548864 562864
Package-Manager: portage-2.2.27
Diffstat (limited to 'sci-mathematics/isabelle/files')
| -rw-r--r-- | sci-mathematics/isabelle/files/isabelle-2015-classpath.patch | 26 | ||||
| -rw-r--r-- | sci-mathematics/isabelle/files/isabelle-2015-jfreechart-classpath.patch | 16 |
2 files changed, 42 insertions, 0 deletions
diff --git a/sci-mathematics/isabelle/files/isabelle-2015-classpath.patch b/sci-mathematics/isabelle/files/isabelle-2015-classpath.patch new file mode 100644 index 000000000000..3783e46cb707 --- /dev/null +++ b/sci-mathematics/isabelle/files/isabelle-2015-classpath.patch @@ -0,0 +1,26 @@ +--- Isabelle2015-orig/lib/Tools/java 2015-05-25 20:06:24.000000000 +1000 ++++ Isabelle2015/lib/Tools/java 2015-07-07 16:00:19.283326554 +1000 +@@ -10,5 +10,5 @@ + unset CLASSPATH + + isabelle_java java "${JAVA_ARGS[@]}" \ +- -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@" ++ -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11)")" "$@" + +--- Isabelle2015-orig/lib/Tools/scala 2015-05-25 20:06:24.000000000 +1000 ++++ Isabelle2015/lib/Tools/scala 2015-07-07 16:00:45.926327297 +1000 +@@ -14,4 +14,4 @@ + done + + isabelle_scala scala "${SCALA_ARGS[@]}" \ +- -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@" ++ -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11)")" "$@" +--- Isabelle2015-orig/lib/Tools/scalac 2015-05-25 20:06:24.000000000 +1000 ++++ Isabelle2015/lib/Tools/scalac 2015-07-07 15:59:33.906325289 +1000 +@@ -7,5 +7,5 @@ + isabelle_admin_build jars || exit $? + + isabelle_scala scalac -Dfile.encoding=UTF-8 \ +- -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@" ++ -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11)")" "$@" + diff --git a/sci-mathematics/isabelle/files/isabelle-2015-jfreechart-classpath.patch b/sci-mathematics/isabelle/files/isabelle-2015-jfreechart-classpath.patch new file mode 100644 index 000000000000..9594d28c86a2 --- /dev/null +++ b/sci-mathematics/isabelle/files/isabelle-2015-jfreechart-classpath.patch @@ -0,0 +1,16 @@ +--- Isabelle2015-orig/contrib/jfreechart-1.0.14-1/etc/settings 2013-09-12 07:46:57.000000000 +1000 ++++ Isabelle2015/contrib/jfreechart-1.0.14-1/etc/settings 2015-07-07 17:22:55.716464804 +1000 +@@ -1,9 +1,8 @@ + # -*- shell-script -*- :mode=shellscript: + + JFREECHART_HOME="$COMPONENT" +-JFREECHART_JAR_NAMES="iText-2.1.5.jar jcommon-1.0.18.jar jfreechart-1.0.14.jar" +- +-classpath "$JFREECHART_HOME/lib/iText-2.1.5.jar" +-classpath "$JFREECHART_HOME/lib/jcommon-1.0.18.jar" +-classpath "$JFREECHART_HOME/lib/jfreechart-1.0.14.jar" ++JFREECHART_JAR_NAMES="$(java-config --classpath itext | sed -e 's@:@ @g' -e 's@/[^ ]*/@@g') $(java-config --classpath jcommon-1.0 | sed -e 's@:@ @g' -e 's@/[^ ]*/@@g') $(java-config --classpath jfreechart-1.0 | sed -e 's@:@ @g' -e 's@/[^ ]*/@@g')" + ++classpath "$(java-config --classpath itext)" ++classpath "$(java-config --classpath jcommon-1.0)" ++classpath "$(java-config --classpath jfreechart-1.0)" |