1 |
commit: fffe26e72fdc1d5ba88273ad244d0020434a5b9f |
2 |
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 8 19:25:21 2018 +0000 |
4 |
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 8 19:25:46 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fffe26e7 |
7 |
|
8 |
app-emacs/slime: Fix doc build |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
.../slime/files/slime-2.20-fix-doc-build.patch | 94 ++++++++++++++++++++++ |
13 |
app-emacs/slime/slime-2.20.ebuild | 18 +++-- |
14 |
2 files changed, 105 insertions(+), 7 deletions(-) |
15 |
|
16 |
diff --git a/app-emacs/slime/files/slime-2.20-fix-doc-build.patch b/app-emacs/slime/files/slime-2.20-fix-doc-build.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..c95608c7705 |
19 |
--- /dev/null |
20 |
+++ b/app-emacs/slime/files/slime-2.20-fix-doc-build.patch |
21 |
@@ -0,0 +1,94 @@ |
22 |
+diff -Nuar a/doc/slime.texi b/doc/slime.texi |
23 |
+--- a/doc/slime.texi 2017-08-28 13:51:57.000000000 +0200 |
24 |
++++ b/doc/slime.texi 2018-04-08 17:21:16.004697168 +0200 |
25 |
+@@ -1219,7 +1219,8 @@ |
26 |
+ Describe the slot at point. |
27 |
+ |
28 |
+ @kbditem{e, slime-inspector-eval} |
29 |
+-Evaluate an expression in the context of the inspected object. |
30 |
++Evaluate an expression in the context of the inspected object. The |
31 |
++variable @code{*} will be bound to the inspected object. |
32 |
+ |
33 |
+ @kbditem{v, slime-inspector-toggle-verbose} |
34 |
+ Toggle between verbose and terse mode. Default is determined by |
35 |
+@@ -1250,8 +1251,7 @@ |
36 |
+ Store the value under point in the variable `*'. This can |
37 |
+ then be used to access the object in the REPL. |
38 |
+ |
39 |
+-@kbditempair{TAB, S-TAB, slime-inspector-next-inspectable-object, |
40 |
+-slime-inspector-previous-inspectable-object} |
41 |
++@kbditempair{TAB, S-TAB, slime-inspector-next-inspectable-object, slime-inspector-previous-inspectable-object} |
42 |
+ |
43 |
+ Jump to the next and previous inspectable object respectively. |
44 |
+ |
45 |
+@@ -2016,7 +2016,7 @@ |
46 |
+ On the emacs side you will use something like |
47 |
+ @example |
48 |
+ (setq slime-net-coding-system 'utf-8-unix) |
49 |
+-(slime-connect "127.0.0.1" 4005)) |
50 |
++(slime-connect "localhost" 4005)) |
51 |
+ @end example |
52 |
+ to connect to this lisp image from the same machine. |
53 |
+ |
54 |
+@@ -2028,7 +2028,7 @@ |
55 |
+ remote machine. |
56 |
+ |
57 |
+ @example |
58 |
+-ssh -L4005:127.0.0.1:4005 username@@remote.example.com |
59 |
++ssh -L4005:localhost:4005 username@@remote.example.com |
60 |
+ @end example |
61 |
+ |
62 |
+ That ssh invocation creates an ssh tunnel between the port 4005 on our |
63 |
+@@ -2044,9 +2044,9 @@ |
64 |
+ @end example |
65 |
+ |
66 |
+ The @kbd{RET RET} sequence just means that we want to use the default |
67 |
+-host (@code{127.0.0.1}) and the default port (@code{4005}). Even |
68 |
++host (@code{localhost}) and the default port (@code{4005}). Even |
69 |
+ though we're connecting to a remote machine the ssh tunnel fools Emacs |
70 |
+-into thinking it's actually @code{127.0.0.1}. |
71 |
++into thinking it's actually @code{localhost}. |
72 |
+ |
73 |
+ @c ----------------------- |
74 |
+ @node Setting up pathname translations |
75 |
+@@ -2323,8 +2323,7 @@ |
76 |
+ |
77 |
+ @table @kbd |
78 |
+ |
79 |
+-@kbditempair{C-<up>, C-<down>, |
80 |
+- slime-repl-forward-input, slime-repl-backward-input} |
81 |
++@kbditempair{C-<up>, C-<down>, slime-repl-forward-input, slime-repl-backward-input} |
82 |
+ Go to the next/previous history item. |
83 |
+ |
84 |
+ @kbditempair{M-n, M-p, slime-repl-next-input, slime-repl-previous-input} |
85 |
+@@ -2333,16 +2332,14 @@ |
86 |
+ a row, the second invocation uses the same search pattern (even if the |
87 |
+ current input has changed). |
88 |
+ |
89 |
+-@kbditempair{M-s, M-r, |
90 |
+-slime-repl-next-matching-input, slime-repl-previous-matching-input} |
91 |
++@kbditempair{M-s, M-r, slime-repl-next-matching-input, slime-repl-previous-matching-input} |
92 |
+ Search forward/reverse through command history with regex |
93 |
+ |
94 |
+ @c @code{slime-repl-@{next,previous@}-input}@* |
95 |
+ @c @code{slime-repl-@{next,previous@}-matching-input}@* |
96 |
+ @c @code{comint}-style input history commands. |
97 |
+ |
98 |
+-@kbditempair{C-c C-n, C-c C-p, |
99 |
+-slime-repl-next-prompt, slime-repl-previous-prompt} |
100 |
++@kbditempair{C-c C-n, C-c C-p, slime-repl-next-prompt, slime-repl-previous-prompt} |
101 |
+ Move between the current and previous prompts in the @REPL{} buffer. |
102 |
+ Pressing RET on a line with old input copies that line to the newest |
103 |
+ prompt. |
104 |
+@@ -2655,6 +2652,11 @@ |
105 |
+ If @code{slime-autodoc-use-multiline-p} is set to non-nil, |
106 |
+ allow long autodoc messages to resize echo area display. |
107 |
+ |
108 |
++@vindex slime-autodoc-mode-string |
109 |
++@code{slime-autodoc-mode-string} is a string that will be displayed in |
110 |
++the mode line when autodoc-mode is enabled, or nil, if you prefer no |
111 |
++indication. You can customize this variable. |
112 |
++ |
113 |
+ @node ASDF |
114 |
+ @section ASDF |
115 |
+ |
116 |
|
117 |
diff --git a/app-emacs/slime/slime-2.20.ebuild b/app-emacs/slime/slime-2.20.ebuild |
118 |
index b8a5bdb9d7f..73d436c15fb 100644 |
119 |
--- a/app-emacs/slime/slime-2.20.ebuild |
120 |
+++ b/app-emacs/slime/slime-2.20.ebuild |
121 |
@@ -3,7 +3,7 @@ |
122 |
|
123 |
EAPI=6 |
124 |
|
125 |
-inherit elisp eutils |
126 |
+inherit elisp |
127 |
|
128 |
DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)" |
129 |
HOMEPAGE="http://common-lisp.net/project/slime/" |
130 |
@@ -25,22 +25,26 @@ CLPACKAGE=swank |
131 |
CLSYSTEMS=swank |
132 |
SITEFILE=70${PN}-gentoo.el |
133 |
|
134 |
+PATCHES=( |
135 |
+ # Should be fixed in >=app-emacs/slime-2.20 |
136 |
+ "${FILESDIR}/${PN}-2.20-fix-doc-build.patch" |
137 |
+) |
138 |
+ |
139 |
src_prepare() { |
140 |
+ default |
141 |
# Remove xref.lisp (which is non-free) unless USE flag is set |
142 |
use xref || rm -f xref.lisp |
143 |
- eapply_user |
144 |
} |
145 |
|
146 |
src_compile() { |
147 |
elisp-compile *.el || die |
148 |
BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \ |
149 |
elisp-compile contrib/*.el lib/*.el || die |
150 |
- emake -j1 -C doc slime.info || die "Cannot build info docs" |
151 |
|
152 |
- #if use doc; then |
153 |
- # VARTEXFONTS="${T}"/fonts \ |
154 |
- # emake -j1 -C doc slime.pdf || die "emake doc failed" |
155 |
- #fi |
156 |
+ if use doc ; then |
157 |
+ VARTEXFONTS="${T}"/fonts \ |
158 |
+ emake -C doc all |
159 |
+ fi |
160 |
} |
161 |
|
162 |
src_install() { |