[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/twelf/files/

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/twelf/files/

[Mark Wright]

commit:     6c2708dd89c8d5b69db1bb9d97d499705762076a
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 13:40:59 2022 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 13:42:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c2708dd

sci-mathematics/twelf: Thanks to Jouni Kosonen for backquotes fix.

Thanks to Agostino Sarubbo and Sam James for reporting and helping.
Apply patch by Jouni Kosonen to fix old-style emacs backquotes.

Closes: https://bugs.gentoo.org/836270
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>

 ...f-1.7.1-emacs-fix-old-style-backquotes-p3.patch | 23 ++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

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
index b5f13b114456..e15d838942e7 100644
--- 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
@@ -1,13 +1,28 @@
 diff --git a/emacs/auc-menu.el b/emacs/auc-menu.el
-index f6483b0..602c6fc 100644
+index f6483b0..80fe660 100644
 --- a/emacs/auc-menu.el
 +++ b/emacs/auc-menu.el
-@@ -92,7 +92,7 @@
+@@ -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
++    `(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)))))
++       (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)))))

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/twelf/files/

[Mark Wright]

commit:     f40a7695d8e3107e5a61704ac558b5eb80951aa9
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 13:35:22 2022 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 13:42:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40a7695

sci-mathematics/twelf: emake -j1 is sufficient to fix doc build

Revert the previous change to twelf-1.7.1-doc-guide-Makefile.patch,
as the emake -j1 is sufficient to fix the doc build.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>

 sci-mathematics/twelf/files/twelf-1.7.1-doc-guide-Makefile.patch | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sci-mathematics/twelf/files/twelf-1.7.1-doc-guide-Makefile.patch b/sci-mathematics/twelf/files/twelf-1.7.1-doc-guide-Makefile.patch
index a63735cbe917..092b12b20dc0 100644
--- a/sci-mathematics/twelf/files/twelf-1.7.1-doc-guide-Makefile.patch
+++ b/sci-mathematics/twelf/files/twelf-1.7.1-doc-guide-Makefile.patch
@@ -1,6 +1,6 @@
 --- twelf-orig/doc/guide/Makefile	2002-09-24 13:59:23.000000000 +1000
-+++ twelf/doc/guide/Makefile	2022-03-27 16:45:03.547456767 +1100
-@@ -38,10 +38,12 @@
++++ twelf/doc/guide/Makefile	2012-12-10 00:51:02.758835185 +1100
+@@ -38,8 +38,8 @@
  
  twelf_toc.html : twelf.texi;
  	@echo "---------- Creating HTML: twelf_*.html"
@@ -10,8 +10,4 @@
 +#	$(texi2html) -check *.html;
  
  twelf.pdf : twelf.texi;
-+	@echo "---------- Removing old files: twelf.{aux,log}"
-+	rm -f twelf.{aux,log};
  	@echo "---------- Creating unindexed PDF: twelf.pdf"
- 	$(pdftex) twelf.texi;
- 	@echo "---------- Creating index twelf.cps"