1 |
commit: 2e4fece2319bee38e08022d4f9db122763d06b46 |
2 |
Author: Mark Wright <gienah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 27 06:22:24 2022 +0000 |
4 |
Commit: Mark Wright <gienah <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 27 06:23:08 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e4fece2 |
7 |
|
8 |
sci-mathematics/twelf: Fix ROOT in src_prepare, old-style backquotes |
9 |
|
10 |
Thanks to Sam James and Toralf Forster for reporting. |
11 |
|
12 |
Fix: calls svnversion command that does not exist, thanks to Agostino Sarubbo |
13 |
for reporting. |
14 |
|
15 |
Closes: https://bugs.gentoo.org/836112 |
16 |
Closes: https://bugs.gentoo.org/803296 |
17 |
Closes: https://bugs.gentoo.org/728028 |
18 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
19 |
Signed-off-by: Mark Wright <gienah <AT> gentoo.org> |
20 |
|
21 |
.../files/twelf-1.7.1-doc-guide-Makefile.patch | 8 +++- |
22 |
...f-1.7.1-emacs-fix-old-style-backquotes-p1.patch | 45 ++++++++++++++++++++++ |
23 |
...f-1.7.1-emacs-fix-old-style-backquotes-p2.patch | 36 +++++++++++++++++ |
24 |
...f-1.7.1-emacs-fix-old-style-backquotes-p3.patch | 13 +++++++ |
25 |
.../files/twelf-1.7.1-remove-svnversion.patch | 13 +++++++ |
26 |
...twelf-1.7.1-r1.ebuild => twelf-1.7.1-r2.ebuild} | 32 ++++++++------- |
27 |
6 files changed, 131 insertions(+), 16 deletions(-) |
28 |
|
29 |
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 |
30 |
index 092b12b20dc0..a63735cbe917 100644 |
31 |
--- a/sci-mathematics/twelf/files/twelf-1.7.1-doc-guide-Makefile.patch |
32 |
+++ b/sci-mathematics/twelf/files/twelf-1.7.1-doc-guide-Makefile.patch |
33 |
@@ -1,6 +1,6 @@ |
34 |
--- twelf-orig/doc/guide/Makefile 2002-09-24 13:59:23.000000000 +1000 |
35 |
-+++ twelf/doc/guide/Makefile 2012-12-10 00:51:02.758835185 +1100 |
36 |
-@@ -38,8 +38,8 @@ |
37 |
++++ twelf/doc/guide/Makefile 2022-03-27 16:45:03.547456767 +1100 |
38 |
+@@ -38,10 +38,12 @@ |
39 |
|
40 |
twelf_toc.html : twelf.texi; |
41 |
@echo "---------- Creating HTML: twelf_*.html" |
42 |
@@ -10,4 +10,8 @@ |
43 |
+# $(texi2html) -check *.html; |
44 |
|
45 |
twelf.pdf : twelf.texi; |
46 |
++ @echo "---------- Removing old files: twelf.{aux,log}" |
47 |
++ rm -f twelf.{aux,log}; |
48 |
@echo "---------- Creating unindexed PDF: twelf.pdf" |
49 |
+ $(pdftex) twelf.texi; |
50 |
+ @echo "---------- Creating index twelf.cps" |
51 |
|
52 |
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 |
53 |
new file mode 100644 |
54 |
index 000000000000..b8d78d97e04e |
55 |
--- /dev/null |
56 |
+++ b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p1.patch |
57 |
@@ -0,0 +1,45 @@ |
58 |
+commit 141018e777eecc064909c6f5429c8a0d0c048b5a |
59 |
+Author: Kartik Singhal <ks@×××××××××××.edu> |
60 |
+Date: Sat Feb 27 16:13:35 2021 -0600 |
61 |
+ |
62 |
+ Fix old-style backquotes, following https://github.com/ProofGeneral/PG/commit/ca601291ddf22739847c629f2d687ab3f68b4786 |
63 |
+ |
64 |
+diff --git a/emacs/twelf.el b/emacs/twelf.el |
65 |
+index 1e4d46f..57b9cee 100644 |
66 |
+--- a/emacs/twelf.el |
67 |
++++ b/emacs/twelf.el |
68 |
+@@ -2884,7 +2884,7 @@ Mode map |
69 |
+ (setq twelf-server-display-commands (not twelf-server-display-commands))) |
70 |
+ |
71 |
+ (defconst twelf-options-menu |
72 |
+- (` ("Options" |
73 |
++ `("Options" |
74 |
+ (, (toggle "Display Commands" '(twelf-toggle-server-display-commands) |
75 |
+ 'twelf-server-display-commands)) |
76 |
+ ("chatter" |
77 |
+@@ -2922,7 +2922,7 @@ Mode map |
78 |
+ ("Table." |
79 |
+ ["strategy" (twelf-set-parm "Table.strategy") t] |
80 |
+ ["strengthen" (twelf-set-parm "Table.strengthen") t]) |
81 |
+- ["Reset Menubar" twelf-reset-menu t])) |
82 |
++ ["Reset Menubar" twelf-reset-menu t]) |
83 |
+ "Menu to change options in Twelf mode.") |
84 |
+ |
85 |
+ (defconst twelf-timers-menu |
86 |
+@@ -2939,12 +2939,12 @@ Mode map |
87 |
+ "Fontify current buffer using font-lock minor mode.") |
88 |
+ |
89 |
+ (defconst twelf-syntax-menu |
90 |
+- (` ("Syntax Highlighting" |
91 |
++ `("Syntax Highlighting" |
92 |
+ ["Highlight Declaration" twelf-font-fontify-decl t] |
93 |
+ ["Highlight Buffer" twelf-font-fontify-buffer t] |
94 |
+- ;(, (toggle "Immediate Highlighting" 'toggle-twelf-font-immediate |
95 |
+- ;'font-lock-mode)) |
96 |
+- )) |
97 |
++ ;;(, (toggle "Immediate Highlighting" 'toggle-twelf-font-immediate |
98 |
++ ;;'font-lock-mode)) |
99 |
++ ) |
100 |
+ "Menu for syntax highlighting in Twelf mode.") |
101 |
+ |
102 |
+ (easy-menu-define twelf-menu (list twelf-mode-map) |
103 |
|
104 |
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 |
105 |
new file mode 100644 |
106 |
index 000000000000..aae0ef7b75e3 |
107 |
--- /dev/null |
108 |
+++ b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p2.patch |
109 |
@@ -0,0 +1,36 @@ |
110 |
+commit c1bec0d0b9fa506e36bb364b1765191b159e6c4c |
111 |
+Author: Kartik Singhal <ks@×××××××××××.edu> |
112 |
+Date: Sat Feb 27 16:24:24 2021 -0600 |
113 |
+ |
114 |
+ Argh, two more places |
115 |
+ |
116 |
+diff --git a/emacs/twelf.el b/emacs/twelf.el |
117 |
+index 57b9cee..0a04a35 100644 |
118 |
+--- a/emacs/twelf.el |
119 |
++++ b/emacs/twelf.el |
120 |
+@@ -2833,13 +2833,13 @@ Mode map |
121 |
+ "Menu for printing commands.") |
122 |
+ |
123 |
+ (defconst twelf-recon-menu |
124 |
+- (` ("Reconstruction" |
125 |
++ `("Reconstruction" |
126 |
+ (, (toggle "trace" '(twelf-toggle-recon-trace) |
127 |
+ '(string-equal twelf-recon-trace "true"))) |
128 |
+- ["traceMode" (twelf-set-parm "Recon.traceMode") t]))) |
129 |
++ ["traceMode" (twelf-set-parm "Recon.traceMode") t])) |
130 |
+ |
131 |
+ (defconst twelf-trace-menu |
132 |
+- (` ("Trace" |
133 |
++ `("Trace" |
134 |
+ ("trace" |
135 |
+ ["All" twelf-trace-trace-all t] |
136 |
+ ["None" twelf-trace-untrace t] |
137 |
+@@ -2852,7 +2852,7 @@ Mode map |
138 |
+ ("detail" |
139 |
+ (, (radio "0" '(twelf-set "Trace.detail" "0") '(equal twelf-trace-detail "0"))) |
140 |
+ (, (radio "1*" '(twelf-set "Trace.detail" "1") '(equal twelf-trace-detail "1"))) |
141 |
+- (, (radio "2" '(twelf-set "Trace.detail" "2") '(equal twelf-trace-detail "2"))))))) |
142 |
++ (, (radio "2" '(twelf-set "Trace.detail" "2") '(equal twelf-trace-detail "2")))))) |
143 |
+ |
144 |
+ (defconst twelf-server-state-menu |
145 |
+ '("Server State" |
146 |
|
147 |
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 |
148 |
new file mode 100644 |
149 |
index 000000000000..b5f13b114456 |
150 |
--- /dev/null |
151 |
+++ b/sci-mathematics/twelf/files/twelf-1.7.1-emacs-fix-old-style-backquotes-p3.patch |
152 |
@@ -0,0 +1,13 @@ |
153 |
+diff --git a/emacs/auc-menu.el b/emacs/auc-menu.el |
154 |
+index f6483b0..602c6fc 100644 |
155 |
+--- a/emacs/auc-menu.el |
156 |
++++ b/emacs/auc-menu.el |
157 |
+@@ -92,7 +92,7 @@ |
158 |
+ (defmacro easy-menu-define (symbol maps doc menu) |
159 |
+ "Define SYMBOL to be a menu for keymaps MAPS. |
160 |
+ DOC is the documentation string, and MENU is a Lucid style menu." |
161 |
+- (` (progn |
162 |
++ `( (progn |
163 |
+ (require 'auc-menu) ;For `easy-menu-do-define'. |
164 |
+ (defvar (, symbol) nil (, doc)) |
165 |
+ (easy-menu-do-define (quote (, symbol)) (, maps) (, doc) (, menu))))) |
166 |
|
167 |
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 |
168 |
new file mode 100644 |
169 |
index 000000000000..64d29f3cba31 |
170 |
--- /dev/null |
171 |
+++ b/sci-mathematics/twelf/files/twelf-1.7.1-remove-svnversion.patch |
172 |
@@ -0,0 +1,13 @@ |
173 |
+diff --git a/bin/buildid b/bin/buildid |
174 |
+index bb60cd3..5972ac0 100755 |
175 |
+--- a/bin/buildid |
176 |
++++ b/bin/buildid |
177 |
+@@ -5,7 +5,7 @@ |
178 |
+ # William Lovas, 08-27-2010 |
179 |
+ # |
180 |
+ |
181 |
+-REV=`svnversion` |
182 |
++REV="1813" |
183 |
+ DATE=`date "+%m/%d/%y at %H:%M:%S"` |
184 |
+ HOST=`hostname` |
185 |
+ |
186 |
|
187 |
diff --git a/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild b/sci-mathematics/twelf/twelf-1.7.1-r2.ebuild |
188 |
similarity index 68% |
189 |
rename from sci-mathematics/twelf/twelf-1.7.1-r1.ebuild |
190 |
rename to sci-mathematics/twelf/twelf-1.7.1-r2.ebuild |
191 |
index 26846927797b..0a7237065277 100644 |
192 |
--- a/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild |
193 |
+++ b/sci-mathematics/twelf/twelf-1.7.1-r2.ebuild |
194 |
@@ -1,9 +1,9 @@ |
195 |
-# Copyright 1999-2021 Gentoo Authors |
196 |
+# Copyright 1999-2022 Gentoo Authors |
197 |
# Distributed under the terms of the GNU General Public License v2 |
198 |
|
199 |
-EAPI="6" |
200 |
+EAPI="8" |
201 |
|
202 |
-inherit elisp-common multilib |
203 |
+inherit elisp-common |
204 |
|
205 |
MY_PN="${PN}-src" |
206 |
MY_P="${MY_PN}-${PV}" |
207 |
@@ -36,22 +36,26 @@ S=${WORKDIR}/${PN} |
208 |
SITEFILE=50${PN}-gentoo.el |
209 |
|
210 |
PATCHES=( |
211 |
- "${FILESDIR}/${PN}-1.7.1-doc-guide-twelf-dot-texi.patch" |
212 |
- "${FILESDIR}/${PN}-1.7.1-doc-guide-Makefile.patch" |
213 |
- "${FILESDIR}/${PN}-1.7.1-emacs-twelf.patch" |
214 |
- "${FILESDIR}/${PN}-1.7.1-emacs-twelf-init.patch" |
215 |
- "${FILESDIR}/${PN}-1.7.1-Makefile.patch" |
216 |
- "${FILESDIR}/${PN}-1.7.1-mlton-mlb.patch" |
217 |
- "${FILESDIR}/${PN}-1.7.1-mlton-20180207.patch" |
218 |
+ "${FILESDIR}"/${PN}-1.7.1-doc-guide-twelf-dot-texi.patch |
219 |
+ "${FILESDIR}"/${PN}-1.7.1-doc-guide-Makefile.patch |
220 |
+ "${FILESDIR}"/${PN}-1.7.1-emacs-twelf.patch |
221 |
+ "${FILESDIR}"/${PN}-1.7.1-emacs-twelf-init.patch |
222 |
+ "${FILESDIR}"/${PN}-1.7.1-Makefile.patch |
223 |
+ "${FILESDIR}"/${PN}-1.7.1-mlton-mlb.patch |
224 |
+ "${FILESDIR}"/${PN}-1.7.1-mlton-20180207.patch |
225 |
+ "${FILESDIR}"/${PN}-1.7.1-remove-svnversion.patch # 728028 |
226 |
+ "${FILESDIR}"/${PN}-1.7.1-emacs-fix-old-style-backquotes-p1.patch # 803296 |
227 |
+ "${FILESDIR}"/${PN}-1.7.1-emacs-fix-old-style-backquotes-p2.patch |
228 |
+ "${FILESDIR}"/${PN}-1.7.1-emacs-fix-old-style-backquotes-p3.patch |
229 |
) |
230 |
|
231 |
src_prepare() { |
232 |
default |
233 |
sed \ |
234 |
- -e "s@/usr/bin@${ROOT}usr/bin@g" \ |
235 |
- -e "s@/usr/share@${ROOT}usr/share@" \ |
236 |
+ -e "s@/usr/bin@${PREFIX}/usr/bin@g" \ |
237 |
+ -e "s@/usr/share@${PREFIIX}/usr/share@" \ |
238 |
-i "${S}"/emacs/twelf-init.el \ |
239 |
- || die "Could not set ROOT in ${S}/emacs/twelf-init.el" |
240 |
+ || die "Could not set PREFIX in ${S}/emacs/twelf-init.el" |
241 |
} |
242 |
|
243 |
src_compile() { |
244 |
@@ -68,7 +72,7 @@ src_compile() { |
245 |
fi |
246 |
if use doc; then |
247 |
pushd doc/guide |
248 |
- emake all |
249 |
+ emake -j1 |
250 |
popd |
251 |
fi |
252 |
} |