gentoo resync : 06.04.2022

4 files changed, 122 insertions, 0 deletions

diff --git a/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p1.patch b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p1.patch
new file mode 100644
index 000000000000..b8d78d97e04e
--- /dev/null
+++ b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p1.patch
@@ -0,0 +1,45 @@
+commit 141018e777eecc064909c6f5429c8a0d0c048b5a
+Author: Kartik Singhal <ks@cs.uchicago.edu>
+Date:   Sat Feb 27 16:13:35 2021 -0600
+
+    Fix old-style backquotes, following https://github.com/ProofGeneral/PG/commit/ca601291ddf22739847c629f2d687ab3f68b4786
+
+diff --git a/emacs/twelf.el b/emacs/twelf.el
+index 1e4d46f..57b9cee 100644
+--- a/emacs/twelf.el
++++ b/emacs/twelf.el
+@@ -2884,7 +2884,7 @@ Mode map
+   (setq twelf-server-display-commands (not twelf-server-display-commands)))
+ 
+ (defconst twelf-options-menu
+-  (` ("Options"
++    `("Options"
+       (, (toggle "Display Commands" '(twelf-toggle-server-display-commands)
+ 		 'twelf-server-display-commands))
+       ("chatter"
+@@ -2922,7 +2922,7 @@ Mode map
+       ("Table."
+        ["strategy" (twelf-set-parm "Table.strategy") t]
+        ["strengthen" (twelf-set-parm "Table.strengthen") t])
+-      ["Reset Menubar" twelf-reset-menu t]))
++      ["Reset Menubar" twelf-reset-menu t])
+   "Menu to change options in Twelf mode.")
+ 
+ (defconst twelf-timers-menu
+@@ -2939,12 +2939,12 @@ Mode map
+   "Fontify current buffer using font-lock minor mode.")
+ 
+ (defconst twelf-syntax-menu
+-  (` ("Syntax Highlighting"
++    `("Syntax Highlighting"
+       ["Highlight Declaration" twelf-font-fontify-decl t]
+       ["Highlight Buffer" twelf-font-fontify-buffer t]
+-      ;(, (toggle "Immediate Highlighting" 'toggle-twelf-font-immediate
+-      ;'font-lock-mode))
+-      ))
++      ;;(, (toggle "Immediate Highlighting" 'toggle-twelf-font-immediate
++      ;;'font-lock-mode))
++      )
+   "Menu for syntax highlighting in Twelf mode.")
+ 
+ (easy-menu-define twelf-menu (list twelf-mode-map)
diff --git a/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p2.patch b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p2.patch
new file mode 100644
index 000000000000..aae0ef7b75e3
--- /dev/null
+++ b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p2.patch
@@ -0,0 +1,36 @@
+commit c1bec0d0b9fa506e36bb364b1765191b159e6c4c
+Author: Kartik Singhal <ks@cs.uchicago.edu>
+Date:   Sat Feb 27 16:24:24 2021 -0600
+
+    Argh, two more places
+
+diff --git a/emacs/twelf.el b/emacs/twelf.el
+index 57b9cee..0a04a35 100644
+--- a/emacs/twelf.el
++++ b/emacs/twelf.el
+@@ -2833,13 +2833,13 @@ Mode map
+   "Menu for printing commands.")
+ 
+ (defconst twelf-recon-menu
+-  (` ("Reconstruction"
++    `("Reconstruction"
+       (, (toggle "trace" '(twelf-toggle-recon-trace)
+ 		 '(string-equal twelf-recon-trace "true")))
+-      ["traceMode" (twelf-set-parm "Recon.traceMode") t])))
++      ["traceMode" (twelf-set-parm "Recon.traceMode") t]))
+ 
+ (defconst twelf-trace-menu
+-  (` ("Trace"
++    `("Trace"
+       ("trace"
+        ["All" twelf-trace-trace-all t]
+        ["None" twelf-trace-untrace t]
+@@ -2852,7 +2852,7 @@ Mode map
+       ("detail"
+        (, (radio "0" '(twelf-set "Trace.detail" "0") '(equal twelf-trace-detail "0")))
+        (, (radio "1*" '(twelf-set "Trace.detail" "1") '(equal twelf-trace-detail "1")))
+-       (, (radio "2" '(twelf-set "Trace.detail" "2") '(equal twelf-trace-detail "2")))))))
++       (, (radio "2" '(twelf-set "Trace.detail" "2") '(equal twelf-trace-detail "2"))))))
+ 
+ (defconst twelf-server-state-menu
+   '("Server State"
diff --git a/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p3.patch b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p3.patch
new file mode 100644
index 000000000000..e15d838942e7
--- /dev/null
+++ b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p3.patch
@@ -0,0 +1,28 @@
+diff --git a/emacs/auc-menu.el b/emacs/auc-menu.el
+index f6483b0..80fe660 100644
+--- a/emacs/auc-menu.el
++++ b/emacs/auc-menu.el
+@@ -92,10 +92,10 @@
+ (defmacro easy-menu-define (symbol maps doc menu)
+   "Define SYMBOL to be a menu for keymaps MAPS.
+ DOC is the documentation string, and MENU is a Lucid style menu."
+-  (` (progn
++    `(progn
+        (require 'auc-menu)		;For `easy-menu-do-define'.
+        (defvar (, symbol) nil (, doc))
+-       (easy-menu-do-define (quote (, symbol)) (, maps) (, doc) (, menu)))))
++       (easy-menu-do-define (quote (, symbol)) (, maps) (, doc) (, menu))))
+ 
+ (cond 
+ 
+@@ -212,8 +212,8 @@ DOC is the documentation string, and MENU is a Lucid style menu."
+ 
+ (defun easy-menu-do-define (symbol maps doc menu)
+   (set symbol (easy-menu-create-keymaps (car menu) (cdr menu)))
+-  (fset symbol (` (lambda (event) (, doc) (interactive "@e")
+-		    (easy-popup-menu event (, symbol)))))
++  (fset symbol `(lambda (event) (, doc) (interactive "@e")
++		    (easy-popup-menu event (, symbol))))
+   (mapcar (function (lambda (map) 
+ 	    (define-key map (vector 'menu-bar (intern (car menu)))
+ 	      (cons (car menu) (symbol-value symbol)))))
diff --git a/sci-mathematics/twelf/files/twelf-1.7.1-remove-svnversion.patch b/sci-mathematics/twelf/files/twelf-1.7.1-remove-svnversion.patch
new file mode 100644
index 000000000000..64d29f3cba31
--- /dev/null
+++ b/sci-mathematics/twelf/files/twelf-1.7.1-remove-svnversion.patch
@@ -0,0 +1,13 @@
+diff --git a/bin/buildid b/bin/buildid
+index bb60cd3..5972ac0 100755
+--- a/bin/buildid
++++ b/bin/buildid
+@@ -5,7 +5,7 @@
+ # William Lovas, 08-27-2010
+ #
+ 
+-REV=`svnversion`
++REV="1813"
+ DATE=`date "+%m/%d/%y at %H:%M:%S"`
+ HOST=`hostname`
+