[gentoo-commits] gentoo-x86 commit in sci-mathematics/isabelle/files: isabelle-2012-graphbrowser.patch isabelle-2011.1-reverse-line-editor-order.patch isabelle-2011.1-gentoo-settings.patch isabelle-2012-reverse-line-editor-order.patch isabelle-2012-gentoo-settings.patch

[Mark Wright (gienah)]

gienah      12/05/30 00:45:06

  Added:                isabelle-2012-graphbrowser.patch
                        isabelle-2011.1-reverse-line-editor-order.patch
                        isabelle-2011.1-gentoo-settings.patch
                        isabelle-2012-reverse-line-editor-order.patch
                        isabelle-2012-gentoo-settings.patch
  Log:
  Bump to 2011.1-r1 and 2012. Add jedit use flag to build Isabelle/jEdit Prover IDE (PIDE) (2012 only, requires dev-lang/scala), ledit and readline use flags for the preferred tty line editor. Add dev-perl/libwww-perl dep. Add doc-src directory with use=doc (2012) as doc-src stuff is required when building doc some isabelle add on packages (sci-mathematics/haskabelle).
  
  (Portage version: 2.1.10.63/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-mathematics/isabelle/files/isabelle-2012-graphbrowser.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2012-graphbrowser.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2012-graphbrowser.patch?rev=1.1&content-type=text/plain

Index: isabelle-2012-graphbrowser.patch
===================================================================
--- Isabelle2012-orig/lib/browser/build	2012-05-20 19:34:33.000000000 +1000
+++ Isabelle2012/lib/browser/build	2012-05-26 22:18:41.952750622 +1000
@@ -6,6 +6,8 @@
 #
 # Requires proper Isabelle settings environment.
 
+ISABELLE_HOME="$(cd "$(dirname "${0}")/../.."; pwd -P)"
+source "$ISABELLE_HOME/lib/scripts/getsettings" || exit 2
 
 ## diagnostics
 



1.1                  sci-mathematics/isabelle/files/isabelle-2011.1-reverse-line-editor-order.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2011.1-reverse-line-editor-order.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2011.1-reverse-line-editor-order.patch?rev=1.1&content-type=text/plain

Index: isabelle-2011.1-reverse-line-editor-order.patch
===================================================================
--- Isabelle2011-1-orig/etc/settings	2011-10-10 01:47:58.000000000 +1100
+++ Isabelle2011-1/etc/settings	2012-05-27 23:28:37.283028668 +1000
@@ -66,8 +66,8 @@
 ###
 
 ISABELLE_LINE_EDITOR=""
-[ -z "$ISABELLE_LINE_EDITOR" ] && ISABELLE_LINE_EDITOR="$(type -p rlwrap)"
 [ -z "$ISABELLE_LINE_EDITOR" ] && ISABELLE_LINE_EDITOR="$(type -p ledit)"
+[ -z "$ISABELLE_LINE_EDITOR" ] && ISABELLE_LINE_EDITOR="$(type -p rlwrap)"
 
 
 ###



1.1                  sci-mathematics/isabelle/files/isabelle-2011.1-gentoo-settings.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2011.1-gentoo-settings.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2011.1-gentoo-settings.patch?rev=1.1&content-type=text/plain

Index: isabelle-2011.1-gentoo-settings.patch
===================================================================
--- Isabelle2011-1-orig/etc/settings	2011-10-10 01:47:58.000000000 +1100
+++ Isabelle2011-1/etc/settings	2012-01-01 16:33:27.922565527 +1100
@@ -24,9 +24,16 @@
   "/usr/share/polyml/$ML_PLATFORM" \
   "/opt/polyml/$ML_PLATFORM" \
   "")"
-ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
-ML_OPTIONS="-H 200"
-ML_SOURCES="$ML_HOME/../src"
+# ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
+# ML_OPTIONS="-H 200"
+# ML_SOURCES="$ML_HOME/../src"
+
+# Poly/ML 5.4.0 (64 bit)
+ML_PLATFORM=x86_64-linux
+ML_HOME=/usr/bin
+ML_SYSTEM=polyml-5.4.0
+ML_OPTIONS="-H 1000"
+#ML_SOURCES="$ML_HOME/../src"
 
 # Poly/ML 32 bit (manual settings)
 #ML_SYSTEM=polyml-5.4.0
@@ -106,7 +113,7 @@
 ISABELLE_TMP_PREFIX="/tmp/isabelle-$USER"
 
 # Heap input locations. ML system identifier is included in lookup.
-ISABELLE_PATH="$ISABELLE_HOME_USER/heaps:$ISABELLE_HOME/heaps"
+ISABELLE_PATH="$ISABELLE_HOME_USER/heaps:/usr/lib64/Isabelle2011-1/heaps"
 
 # Heap output location. ML system identifier is appended automatically later on.
 ISABELLE_OUTPUT="$ISABELLE_HOME_USER/heaps"
@@ -170,6 +177,7 @@
   "/usr/local/ProofGeneral" \
   "/usr/share/ProofGeneral" \
   "/opt/ProofGeneral" \
+  "/usr/share/emacs/site-lisp/ProofGeneral" \
   "")"
 
 PROOFGENERAL_OPTIONS=""



1.1                  sci-mathematics/isabelle/files/isabelle-2012-reverse-line-editor-order.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2012-reverse-line-editor-order.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2012-reverse-line-editor-order.patch?rev=1.1&content-type=text/plain

Index: isabelle-2012-reverse-line-editor-order.patch
===================================================================
--- Isabelle2012-orig/etc/settings	2012-05-23 03:07:38.000000000 +1000
+++ Isabelle2012/etc/settings	2012-05-27 12:43:36.209715015 +1000
@@ -62,8 +62,8 @@
 ###
 
 ISABELLE_LINE_EDITOR=""
-[ -z "$ISABELLE_LINE_EDITOR" ] && ISABELLE_LINE_EDITOR="$(type -p rlwrap)"
 [ -z "$ISABELLE_LINE_EDITOR" ] && ISABELLE_LINE_EDITOR="$(type -p ledit)"
+[ -z "$ISABELLE_LINE_EDITOR" ] && ISABELLE_LINE_EDITOR="$(type -p rlwrap)"
 
 
 ###



1.1                  sci-mathematics/isabelle/files/isabelle-2012-gentoo-settings.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2012-gentoo-settings.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/files/isabelle-2012-gentoo-settings.patch?rev=1.1&content-type=text/plain

Index: isabelle-2012-gentoo-settings.patch
===================================================================
--- Isabelle2012-orig/etc/settings	2012-05-23 03:07:38.000000000 +1000
+++ Isabelle2012/etc/settings	2012-05-27 18:07:26.502878614 +1000
@@ -16,17 +16,24 @@
 # Only one of the sections below should be activated.
 
 # Poly/ML default (automated settings)
-ML_PLATFORM="$ISABELLE_PLATFORM"
-ML_HOME="$(choosefrom \
-  "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \
-  "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \
-  "/usr/local/polyml/$ML_PLATFORM" \
-  "/usr/share/polyml/$ML_PLATFORM" \
-  "/opt/polyml/$ML_PLATFORM" \
-  "")"
-ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
-ML_OPTIONS="-H 200"
-ML_SOURCES="$ML_HOME/../src"
+# ML_PLATFORM="$ISABELLE_PLATFORM"
+# ML_HOME="$(choosefrom \
+#   "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \
+#   "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \
+#   "/usr/local/polyml/$ML_PLATFORM" \
+#   "/usr/share/polyml/$ML_PLATFORM" \
+#   "/opt/polyml/$ML_PLATFORM" \
+#   "")"
+# ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
+# ML_OPTIONS="-H 200"
+# ML_SOURCES="$ML_HOME/../src"
+
+# Poly/ML Gentoo (x86_64)
+ML_PLATFORM=x86_64-linux
+ML_HOME="/usr/bin"
+ML_SYSTEM=polyml-5.4.0
+ML_OPTIONS="-H 1000"
+ML_SOURCES="/usr/src/debug/dev-lang/polyml-5.4.0"
 
 # Poly/ML 32 bit (manual settings)
 #ML_SYSTEM=polyml-5.4.1
@@ -102,7 +109,7 @@
 ISABELLE_TMP_PREFIX="/tmp/isabelle-$USER"
 
 # Heap input locations. ML system identifier is included in lookup.
-ISABELLE_PATH="$ISABELLE_HOME_USER/heaps:$ISABELLE_HOME/heaps"
+ISABELLE_PATH="$ISABELLE_HOME_USER/heaps:/usr/lib64/Isabelle2012/heaps"
 
 # Heap output location. ML system identifier is appended automatically later on.
 ISABELLE_OUTPUT="$ISABELLE_HOME_USER/heaps"
@@ -161,13 +168,7 @@
 ###
 
 # Proof General home, look in a variety of places
-PROOFGENERAL_HOME="$(choosefrom \
-  "$ISABELLE_HOME/contrib/ProofGeneral" \
-  "$ISABELLE_HOME/../ProofGeneral" \
-  "/usr/local/ProofGeneral" \
-  "/usr/share/ProofGeneral" \
-  "/opt/ProofGeneral" \
-  "")"
+PROOFGENERAL_HOME="/usr/share/emacs/site-lisp/ProofGeneral"
 
 PROOFGENERAL_OPTIONS=""
 #PROOFGENERAL_OPTIONS="-m no_brackets -m no_type_brackets"