gentoo resync : 06.04.2022

6 files changed, 145 insertions, 15 deletions

diff --git a/sci-mathematics/twelf/Manifest b/sci-mathematics/twelf/Manifest
index 4e7a9d654384..29ec281c3e91 100644
--- a/sci-mathematics/twelf/Manifest
+++ b/sci-mathematics/twelf/Manifest
@@ -2,10 +2,14 @@ AUX 50twelf-gentoo.el 104 BLAKE2B 0cff252b443e4b24d0c4e3068f7d4d2d4c5cdd0213d7fe
 AUX twelf-1.7.1-Makefile.patch 1298 BLAKE2B fcbbb4d80e2d6da7594f3385bc38e4f1bf6be775e544797ccd303c1ccae28087cf92ef5e739ee1075015880461ff28e0c55304e9961f8a727edb2b526a05d162 SHA512 ffc7c147790b180c50eb645b896ad86c35b771ad516d2a85998f8edfd0e1ff1db98d1880b6e8b02e4ddcf8f218761ab26ddfee9bd5ab876b3bd1caa6a3e0e78e
 AUX twelf-1.7.1-doc-guide-Makefile.patch 498 BLAKE2B 68b3831aefab24bb6b194e640921b24cb05cee3e97351d2284f4aa412ef277d70f41a539991c6c04f0501a0716b96364a33b54ed11d8c5b6186a4fe826912c39 SHA512 240192028c9dd9a953ff9778bc9753a08dffa0f3332b72d4d2cd64a594f32fb183092ce1a4ace9fe9e0123d469be50983e4d081db989165beba33212de74b3d0
 AUX twelf-1.7.1-doc-guide-twelf-dot-texi.patch 386 BLAKE2B 3ce663a6c06fc8af04f16cf190d76e0c113e41263fbdc9a74a61d9a4ea9c3067659b417569b0d11d50cf16baca9aa91bac66e74f75a681e2704d2c7fef969d30 SHA512 60741e8df6e2b200f22c435ccf2d092624b601ad71ffc1a3388e9ae1bca6ef0d92092940075d9786efed6218d82cf1a344d3a433eabbdabe2514ff985a6948b7
+AUX twelf-1.7.1-emacs-fix-old-style-backquotes-p1.patch 1629 BLAKE2B 3cd06e6fd5b2739f7a95a028a202a4e241a055bab66ab967a4fe269d68d709b17c7333e011a659758443a42170ec6dcf17b206faf0d81a4848fa5efe5ef49fff SHA512 943df1dee70ff291e60ca3e5ca7215500c78339058f32ac1034a5f7f11a98df1563ab6bfb9303dbc7e0c4fb02b028721c37f37aaa5797c2baa6d74618a5d81b0
+AUX twelf-1.7.1-emacs-fix-old-style-backquotes-p2.patch 1263 BLAKE2B 1526af5385b1543e10ff504f082696e5349a90e8b3acc4b02b0e67e97cc9a77acded3a69d18ed55ec4a797418412518a381b643e93a69c56d2c57675dd6ead93 SHA512 5c5fd3565255ff12147431bd5e7c79b424411fcb09670ceb0fc9afa83675f9c3fb8c869cd7654c440c304cf0bd4b38c11b755fde68ee4f0801fe3a7cc36f5aa8
+AUX twelf-1.7.1-emacs-fix-old-style-backquotes-p3.patch 1169 BLAKE2B bd065c30c9f4b15a4dfca93c30282fbad638fd5926c38291a7afae2eeace59782b0fcdc8e4e06822d85bb7e6ff70808d6234cfcd348e5406ffc50caaff27c303 SHA512 18bf3c8574f93f209b7e666d95e5712e3b3e1e69a441b12513cfdff61276147de39fd0cb1518a02c8e7dbb609745cccb6c5d86c251e7c273133b13f1d8b0dc5f
 AUX twelf-1.7.1-emacs-twelf-init.patch 813 BLAKE2B ab5708bc5c259ed940eb2d427e190a3f3ed2e0624745aef0f08cb3ba42ae6ed1d37668cff37752480de8e5e42b8ed5f786dc14d2aa6be3a522a51ca4d380d054 SHA512 b45415b57dee44da7a38ea1f40b58526f0f69d012a16c316ebd6c3c9c856bbffd270f034d172b4ddeb083b7289c87eabf805a96fc9475f501038fb6c85a0f571
 AUX twelf-1.7.1-emacs-twelf.patch 602 BLAKE2B b4b7572bd3b87013332e26096aa92a698e0a1a7648021b93cf0db2e4443da6fd43a6b8909703e21e748c37b774d5c93cd1bc6bcf342354ee47fc1d8b4c94084a SHA512 e5fd550210b7107fdafc27906dcb22318d1b0b6044d2502cfb968fb3b5d4baca5535cd6ae995638f38395d08641e59f5b87c76eac190653a6dad89bf52eb1a97
 AUX twelf-1.7.1-mlton-20180207.patch 310 BLAKE2B b372c7ca65b4bb12983d84e590d4e303e4b41308ad6f6ccb3f28101e78e18a7138cb5a65011eeec8f04ba990e29804ec02d3faf11e4c6ca998f40f419bca3472 SHA512 4d8044248a28d92e961baa1a935de8f6f52751218e65abd2cae9a264c66e446608d73d6a993df07671330b003735d2fee4e75653e9a324844a0042333b28fdd1
 AUX twelf-1.7.1-mlton-mlb.patch 11244 BLAKE2B e07adfd1520179a8ca3c292638689c8cc344b8d01ebcf2ba9f668cbf2afa5b5132a88d0521ca4123a9165d8fea49cdbab20b48b791bd3e78610d54b534e9e596 SHA512 2d0f42399e444cbb736f38ad7bdc54f51322c17c010b273c365d9db9a1e6c045c19b872d4b5c1e50444559a981aa5569764ac859c7702c116c97c935fd959bfd
+AUX twelf-1.7.1-remove-svnversion.patch 241 BLAKE2B f92db57c82d31fae8518d0a3947fd0ebf24ab06aa51fbf0e3a2b271eb30583904d5487f3f4b2605d5ca168f78ca7eed0fdcb4473604c4ae83a2807416341c99b SHA512 07bb5f88580dcb6ae722d7af98c58c96453871f8ce6eb107fbedafc6939a0d8871e3820e933cdc90aa6ca17d8909717f607e3819c34f5f852b7606a7680e7462
 DIST twelf-src-1.7.1.tar.gz 1147610 BLAKE2B 9fbb3c5a4823845a0c721112744330658be0e68784ef209a3d17fb72874ef50d7dbb434a7104704a5540f2f0bc30727bfe1ff602f986570f944454e77c24609d SHA512 1b4baa0f385b6b605583a9da312f23c775aab43e7398c6e151833a6b95c74112492530f44fcb7b14f8288774e9b63e2f9618a5debfbc4d34737bc2588f5850df
-EBUILD twelf-1.7.1-r1.ebuild 2431 BLAKE2B 08b4d3eccb106bbced79e7dba62852746ab6ce86ab016660f6236e2dd8d05a0f23df0bc40c64870f4c767cd2e307dfd324401a6bd995b6cc31e8e0bda499de66 SHA512 ebfc0684289e5a605df8588a15a01041c9daa6414e04dc0302726540faf67413b15f1fd7829f5dc972a8706621fb25185d923f34a0f4db36a9cf787cfb246ec9
+EBUILD twelf-1.7.1-r2.ebuild 2717 BLAKE2B 03351db21a04ed6555f7dd9b559d29ad03a10451a29740e92877d447c45da8baefc19256b8b8e0c98b7149dcde41cea25900249086fb460d955b75a5f0f9ef84 SHA512 2188bdc4a8299a0fd4dea45f3a3c9565ec2c546f7c895898190df7dd05545ca143658d6f4a5ec3bcdf4c5d4db6813e6f5a666da2b9f9ca50e320aad94b8ab73a
 MISC metadata.xml 447 BLAKE2B 1763b7e6e596780d5949b14698c9f6f95c503465b28d9ee9977d51ccc814bb9bfea89efaafb4ed6e605713ad2f22660247baccfcc36b7d1fc5e89454a5e12627 SHA512 db714b8a511dce8010f054d5b0857c17e632d66d08dfffe9f71d9cb8d042b599d5fa5589cd6779431f86e46415c0c114b81d06c98009297f0b95f323805829a3
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`
+ 
diff --git a/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild b/sci-mathematics/twelf/twelf-1.7.1-r2.ebuild
index 26846927797b..0a7237065277 100644
--- a/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild
+++ b/sci-mathematics/twelf/twelf-1.7.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="8"
 
-inherit elisp-common multilib
+inherit elisp-common
 
 MY_PN="${PN}-src"
 MY_P="${MY_PN}-${PV}"
@@ -36,22 +36,26 @@ S=${WORKDIR}/${PN}
 SITEFILE=50${PN}-gentoo.el
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.7.1-doc-guide-twelf-dot-texi.patch"
-	"${FILESDIR}/${PN}-1.7.1-doc-guide-Makefile.patch"
-	"${FILESDIR}/${PN}-1.7.1-emacs-twelf.patch"
-	"${FILESDIR}/${PN}-1.7.1-emacs-twelf-init.patch"
-	"${FILESDIR}/${PN}-1.7.1-Makefile.patch"
-	"${FILESDIR}/${PN}-1.7.1-mlton-mlb.patch"
-	"${FILESDIR}/${PN}-1.7.1-mlton-20180207.patch"
+	"${FILESDIR}"/${PN}-1.7.1-doc-guide-twelf-dot-texi.patch
+	"${FILESDIR}"/${PN}-1.7.1-doc-guide-Makefile.patch
+	"${FILESDIR}"/${PN}-1.7.1-emacs-twelf.patch
+	"${FILESDIR}"/${PN}-1.7.1-emacs-twelf-init.patch
+	"${FILESDIR}"/${PN}-1.7.1-Makefile.patch
+	"${FILESDIR}"/${PN}-1.7.1-mlton-mlb.patch
+	"${FILESDIR}"/${PN}-1.7.1-mlton-20180207.patch
+	"${FILESDIR}"/${PN}-1.7.1-remove-svnversion.patch                 # 728028
+	"${FILESDIR}"/${PN}-1.7.1-emacs-fix-old-style-backquotes-p1.patch # 803296
+	"${FILESDIR}"/${PN}-1.7.1-emacs-fix-old-style-backquotes-p2.patch
+	"${FILESDIR}"/${PN}-1.7.1-emacs-fix-old-style-backquotes-p3.patch
 )
 
 src_prepare() {
 	default
 	sed \
-		-e "s@/usr/bin@${ROOT}usr/bin@g" \
-		-e "s@/usr/share@${ROOT}usr/share@" \
+		-e "s@/usr/bin@${PREFIX}/usr/bin@g" \
+		-e "s@/usr/share@${PREFIIX}/usr/share@" \
 		-i "${S}"/emacs/twelf-init.el \
-		|| die "Could not set ROOT in ${S}/emacs/twelf-init.el"
+		|| die "Could not set PREFIX in ${S}/emacs/twelf-init.el"
 }
 
 src_compile() {
@@ -68,7 +72,7 @@ src_compile() {
 	fi
 	if use doc; then
 		pushd doc/guide
-		emake all
+		emake -j1
 		popd
 	fi
 }