gienah 15/04/17 14:41:21
Modified: isabelle-2013-classpath.patch
isabelle-2013.2-classpath.patch
Log:
Slot scala
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
618E971F)
Revision Changes Path
1.2
sci-mathematics/isabelle/files/isabelle-2013-classpath.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2013-classpath.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2013-classpath.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2013-classpath.patch?r1=1.1&r2=1.2
Index: isabelle-2013-classpath.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2013-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- isabelle-2013-classpath.patch 31 Aug 2013 09:24:13 -0000 1.1
+++ isabelle-2013-classpath.patch 17 Apr 2015 14:41:21 -0000 1.2
@@ -1,28 +1,28 @@
--- Isabelle2013-orig/lib/Tools/java 2013-02-13 00:31:02.000000000 +1100
-+++ Isabelle2013/lib/Tools/java 2013-08-18 14:07:51.704133000 +1000
++++ Isabelle2013/lib/Tools/java 2015-04-17 12:16:04.734716358 +1000
@@ -6,5 +6,5 @@
CLASSPATH="$(jvmpath "$CLASSPATH")"
isabelle_jdk java -Dfile.encoding=UTF-8 -server \
- "-Djava.ext.dirs=$(jvmpath
"$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext")" "$@"
-+ "-Djava.ext.dirs=$(jvmpath
"$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala | sed
's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
++ "-Djava.ext.dirs=$(jvmpath
"$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala-2.10
| sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
--- Isabelle2013-orig/lib/Tools/scala 2013-02-13 00:31:02.000000000 +1100
-+++ Isabelle2013/lib/Tools/scala 2013-08-18 14:07:00.795248000 +1000
++++ Isabelle2013/lib/Tools/scala 2015-04-17 12:12:21.606890256 +1000
@@ -8,4 +8,4 @@
CLASSPATH="$(jvmpath "$CLASSPATH")"
isabelle_scala scala -Dfile.encoding=UTF-8 \
- "-Djava.ext.dirs=$(jvmpath
"$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext")" "$@"
-+ "-Djava.ext.dirs=$(jvmpath
"$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala | sed
's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
++ "-Djava.ext.dirs=$(jvmpath
"$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala-2.10
| sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
--- Isabelle2013-orig/lib/Tools/scalac 2013-02-13 00:31:02.000000000 +1100
-+++ Isabelle2013/lib/Tools/scalac 2013-08-18 14:07:32.751448000 +1000
++++ Isabelle2013/lib/Tools/scalac 2015-04-17 12:12:36.895871214 +1000
@@ -8,5 +8,5 @@
CLASSPATH="$(jvmpath "$CLASSPATH")"
isabelle_scala scalac -Dfile.encoding=UTF-8 \
- "-Djava.ext.dirs=$(jvmpath
"$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext")" "$@"
-+ "-Djava.ext.dirs=$(jvmpath
"$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala | sed
's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
++ "-Djava.ext.dirs=$(jvmpath
"$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala-2.10
| sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
--- Isabelle2013-orig/src/Pure/build-jars 2013-02-13 00:31:15.000000000
+1100
+++ Isabelle2013/src/Pure/build-jars 2013-08-18 12:55:51.400924000 +1000
1.2
sci-mathematics/isabelle/files/isabelle-2013.2-classpath.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2013.2-classpath.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2013.2-classpath.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2013.2-classpath.patch?r1=1.1&r2=1.2
Index: isabelle-2013.2-classpath.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2013.2-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- isabelle-2013.2-classpath.patch 25 Jan 2015 13:08:28 -0000 1.1
+++ isabelle-2013.2-classpath.patch 17 Apr 2015 14:41:21 -0000 1.2
@@ -1,29 +1,29 @@
--- Isabelle2013-2-orig/lib/Tools/java 2013-12-06 02:18:34.000000000 +1100
-+++ Isabelle2013-2/lib/Tools/java 2014-02-09 20:53:30.085279943 +1100
++++ Isabelle2013-2/lib/Tools/java 2015-04-17 12:23:11.535463796 +1000
@@ -10,5 +10,5 @@
unset CLASSPATH
isabelle_jdk java "${JAVA_ARGS[@]}" \
- -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
-+ -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala | sed
's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
++ -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11 |
sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
--- Isabelle2013-2-orig/lib/Tools/scala 2013-12-06 02:18:34.000000000
+1100
-+++ Isabelle2013-2/lib/Tools/scala 2014-02-09 20:54:22.418737591 +1100
++++ Isabelle2013-2/lib/Tools/scala 2015-04-17 12:23:24.836455672 +1000
@@ -7,5 +7,5 @@
isabelle_admin_build jars || exit $?
isabelle_scala scala -Dfile.encoding=UTF-8 \
- -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
-+ -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala | sed
's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
++ -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11 |
sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
--- Isabelle2013-2-orig/lib/Tools/scalac 2013-12-06 02:18:34.000000000
+1100
-+++ Isabelle2013-2/lib/Tools/scalac 2014-02-09 20:55:03.999895037 +1100
++++ Isabelle2013-2/lib/Tools/scalac 2015-04-17 12:23:33.084450628 +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 | sed
's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
++ -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11 |
sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
--- Isabelle2013-2-orig/src/Tools/jEdit/lib/Tools/jedit 2013-12-06
02:19:04.000000000 +1100
+++ Isabelle2013-2/src/Tools/jEdit/lib/Tools/jedit 2014-02-09
20:59:14.026841490 +1100
