Gentoo Archives: gentoo-commits

From: "José María Alonso" <nimiux@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/lisp:master commit in: app-emacs/slime/files/2.0_p20130930/, app-emacs/slime/, ...
Date: Tue, 27 Feb 2018 20:02:23
Message-Id: 1519761762.bbe10d559923c0c9f977fb6cc9ed151e0629d1b5.nimiux@gentoo
1 commit: bbe10d559923c0c9f977fb6cc9ed151e0629d1b5
2 Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 27 20:02:42 2018 +0000
4 Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 27 20:02:42 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=bbe10d55
7
8 app-emacs/slime: Bumps version to 2.20. Drops old versions
9
10 .../2.0_p20110617/fix-inspect-presentations.patch | 47 -----------
11 .../2.0_p20110617/gentoo-changelog-date.patch | 22 -----
12 .../2.0_p20110617/gentoo-dont-call-init.patch | 16 ----
13 .../files/2.0_p20110617/gentoo-module-load.patch | 88 -------------------
14 app-emacs/slime/files/2.0_p20110617/swank.asd | 98 ----------------------
15 .../2.0_p20130214/gentoo-changelog-date.patch | 20 -----
16 .../files/2.0_p20130214/gentoo-module-load.patch | 84 -------------------
17 .../2.0_p20130930/gentoo-changelog-date.patch | 20 -----
18 .../slime/files/2.11/dont-load-sbcl-pprint.patch | 13 ---
19 .../slime/files/2.11/gentoo-changelog-date.patch | 20 -----
20 .../slime/files/2.15/gentoo-changelog-date.patch | 20 -----
21 .../files/{2.0_p20110617 => }/70slime-gentoo.el | 8 +-
22 app-emacs/slime/metadata.xml | 34 --------
23 app-emacs/slime/slime-2.0_p20110617.ebuild | 80 ------------------
24 app-emacs/slime/slime-2.0_p20130214.ebuild | 1 -
25 app-emacs/slime/slime-2.0_p20130930.ebuild | 96 ---------------------
26 app-emacs/slime/slime-2.11.ebuild | 1 -
27 app-emacs/slime/slime-2.12.ebuild | 1 -
28 app-emacs/slime/slime-2.15.ebuild | 1 -
29 app-emacs/slime/slime-2.20.ebuild | 66 +++++++++++++++
30 app-emacs/slime/slime-9999.ebuild | 5 +-
31 21 files changed, 71 insertions(+), 670 deletions(-)
32
33 diff --git a/app-emacs/slime/files/2.0_p20110617/fix-inspect-presentations.patch b/app-emacs/slime/files/2.0_p20110617/fix-inspect-presentations.patch
34 deleted file mode 100644
35 index 5a0bfc7a..00000000
36 --- a/app-emacs/slime/files/2.0_p20110617/fix-inspect-presentations.patch
37 +++ /dev/null
38 @@ -1,47 +0,0 @@
39 -Author: Stelian Ionescu <sionescu@××××.org>
40 -Date: 2007-08-20
41 -Status: Rejected
42 -Description: Enables slime-inspect to work with presentations at point
43 -
44 -diff --git a/contrib/slime-presentations.el b/contrib/slime-presentations.el
45 -index a462669..fd18edd 100644
46 ---- a/contrib/slime-presentations.el
47 -+++ b/contrib/slime-presentations.el
48 -@@ -57,6 +57,15 @@
49 - (make-variable-buffer-local
50 - (defvar slime-presentation-start-to-point (make-hash-table)))
51 -
52 -+(setq slime-inspector-value-provider
53 -+ (lambda ()
54 -+ (multiple-value-bind (presentation start end)
55 -+ (slime-presentation-around-point (point))
56 -+ (when presentation
57 -+ ;; Point is within a presentation, so don't prompt, just
58 -+ ;; inspect the presented object; don't play DWIM.
59 -+ (slime-presentation-expression presentation)))))
60 -+
61 - (defun slime-mark-presentation-start (id &optional target)
62 - "Mark the beginning of a presentation with the given ID.
63 - TARGET can be nil (regular process output) or :repl-result."
64 -diff --git a/slime.el b/slime.el
65 -index a168c3f..2faaea9 100644
66 ---- a/slime.el
67 -+++ b/slime.el
68 -@@ -6371,11 +6371,15 @@ was called originally."
69 - (defvar slime-inspector-mark-stack '())
70 - (defvar slime-saved-window-config)
71 -
72 -+(defvar slime-inspector-value-provider nil)
73 -+
74 - (defun slime-inspect (string)
75 - "Eval an expression and inspect the result."
76 - (interactive
77 -- (list (slime-read-from-minibuffer "Inspect value (evaluated): "
78 -- (slime-sexp-at-point))))
79 -+ (list (or (and slime-inspector-value-provider
80 -+ (funcall slime-inspector-value-provider))
81 -+ (slime-read-from-minibuffer "Inspect value (evaluated): "
82 -+ (slime-sexp-at-point)))))
83 - (slime-eval-async `(swank:init-inspector ,string) 'slime-open-inspector))
84 -
85 - (define-derived-mode slime-inspector-mode fundamental-mode
86
87 diff --git a/app-emacs/slime/files/2.0_p20110617/gentoo-changelog-date.patch b/app-emacs/slime/files/2.0_p20110617/gentoo-changelog-date.patch
88 deleted file mode 100644
89 index bbb70a99..00000000
90 --- a/app-emacs/slime/files/2.0_p20110617/gentoo-changelog-date.patch
91 +++ /dev/null
92 @@ -1,22 +0,0 @@
93 -diff --git a/slime.el b/slime.el
94 -index 437481d..2f086c2 100644
95 ---- a/slime.el
96 -+++ b/slime.el
97 -@@ -119,16 +119,7 @@ CONTRIBS is a list of contrib packages to load."
98 - "Return the datestring of the latest entry in the ChangeLog file.
99 - Return nil if the ChangeLog file cannot be found."
100 - (interactive "p")
101 -- (let ((changelog (concat slime-path "ChangeLog"))
102 -- (date nil))
103 -- (when (file-exists-p changelog)
104 -- (with-temp-buffer
105 -- (insert-file-contents-literally changelog nil 0 100)
106 -- (goto-char (point-min))
107 -- (setq date (symbol-name (read (current-buffer))))))
108 -- (when interactivep
109 -- (message "Slime ChangeLog dates %s." date))
110 -- date)))
111 -+ "@SLIME-CHANGELOG-DATE@"))
112 -
113 - (defvar slime-protocol-version nil)
114 - (setq slime-protocol-version
115
116 diff --git a/app-emacs/slime/files/2.0_p20110617/gentoo-dont-call-init.patch b/app-emacs/slime/files/2.0_p20110617/gentoo-dont-call-init.patch
117 deleted file mode 100644
118 index 410c3913..00000000
119 --- a/app-emacs/slime/files/2.0_p20110617/gentoo-dont-call-init.patch
120 +++ /dev/null
121 @@ -1,16 +0,0 @@
122 -Author: Stelian Ionescu <sionescu@××××.org>
123 -Date: 2010-05-14
124 -Status: Gentoo-only
125 -Description: Dont' call SWANK-LOADER:INIT on startup since we don't use
126 - the upstream swank-loader.lisp
127 -
128 ---- a/slime.el
129 -+++ b/slime.el
130 -@@ -1323,7 +1323,6 @@ See `slime-start'."
131 - `(progn
132 - (load ,(slime-to-lisp-filename (expand-file-name loader))
133 - :verbose t)
134 -- (funcall (read-from-string "swank-loader:init"))
135 - (funcall (read-from-string "swank:start-server")
136 - ,(slime-to-lisp-filename port-filename)
137 - :coding-system ,encoding)))))
138
139 diff --git a/app-emacs/slime/files/2.0_p20110617/gentoo-module-load.patch b/app-emacs/slime/files/2.0_p20110617/gentoo-module-load.patch
140 deleted file mode 100644
141 index c8e93b92..00000000
142 --- a/app-emacs/slime/files/2.0_p20110617/gentoo-module-load.patch
143 +++ /dev/null
144 @@ -1,88 +0,0 @@
145 -diff --git a/contrib/swank-arglists.lisp b/contrib/swank-arglists.lisp
146 -index d37ba83..7b3efc4 100644
147 ---- a/contrib/swank-arglists.lisp
148 -+++ b/contrib/swank-arglists.lisp
149 -@@ -9,8 +9,7 @@
150 -
151 - (in-package :swank)
152 -
153 --(eval-when (:compile-toplevel :load-toplevel :execute)
154 -- (swank-require :swank-c-p-c))
155 -+(swank-require :swank-c-p-c)
156 -
157 - ;;;; Utilities
158 -
159 -diff --git a/contrib/swank-fuzzy.lisp b/contrib/swank-fuzzy.lisp
160 -index d254489..1c11aaf 100644
161 ---- a/contrib/swank-fuzzy.lisp
162 -+++ b/contrib/swank-fuzzy.lisp
163 -@@ -10,8 +10,7 @@
164 -
165 - (in-package :swank)
166 -
167 --(eval-when (:compile-toplevel :load-toplevel :execute)
168 -- (swank-require :swank-c-p-c))
169 -+(swank-require :swank-c-p-c)
170 -
171 - ;;; For nomenclature of the fuzzy completion section, please read
172 - ;;; through the following docstring.
173 -diff --git a/contrib/swank-sbcl-exts.lisp b/contrib/swank-sbcl-exts.lisp
174 -index 6db3457..1d86594 100644
175 ---- a/contrib/swank-sbcl-exts.lisp
176 -+++ b/contrib/swank-sbcl-exts.lisp
177 -@@ -7,8 +7,7 @@
178 -
179 - (in-package :swank)
180 -
181 --(eval-when (:compile-toplevel :load-toplevel :execute)
182 -- (swank-require :swank-arglists))
183 -+(swank-require :swank-arglists)
184 -
185 - ;; We need to do this so users can place `slime-sbcl-exts' into their
186 - ;; ~/.emacs, and still use any implementation they want.
187 -diff --git a/swank.lisp b/swank.lisp
188 -index db666f6..8547cf0 100644
189 ---- a/swank.lisp
190 -+++ b/swank.lisp
191 -@@ -2912,12 +2912,15 @@ Record compiler notes signalled as `compiler-condition's."
192 - "Load the module MODULE."
193 - (dolist (module (ensure-list modules))
194 - (unless (member (string module) *modules* :test #'string=)
195 -- (require module (if filename
196 -- (filename-to-pathname filename)
197 -- (module-filename module)))))
198 -+ (let ((*load-print* nil)
199 -+ (*load-verbose* nil)
200 -+ #+cmu (ext:*gc-verbose* nil))
201 -+ (require module (if filename
202 -+ (filename-to-pathname filename)
203 -+ (module-filename module))))))
204 - *modules*)
205 -
206 --(defvar *find-module* 'find-module
207 -+(defvar *find-module* 'find-module-gentoo
208 - "Pluggable function to locate modules.
209 - The function receives a module name as argument and should return
210 - the filename of the module (or nil if the file doesn't exist).")
211 -@@ -2947,6 +2950,21 @@ the filename of the module (or nil if the file doesn't exist).")
212 - (some (lambda (dir) (some #'probe-file (module-canditates name dir)))
213 - *load-path*)))
214 -
215 -+(defun swank-fasl-pathname ()
216 -+ (make-pathname :name nil :type nil
217 -+ :defaults (car (asdf:output-files
218 -+ (make-instance 'asdf:compile-op)
219 -+ (car (asdf:module-components
220 -+ (asdf:find-system :swank)))))))
221 -+
222 -+(defun append-dir (pathname dir)
223 -+ (make-pathname :directory (append (pathname-directory pathname) dir)))
224 -+
225 -+(defun find-module-gentoo (module)
226 -+ (or (let ((*load-path* (list (append-dir (swank-fasl-pathname) '("contrib"))
227 -+ (append-dir swank-loader:*source-directory* '("contrib")))))
228 -+ (find-module module))
229 -+ (find-module module)))
230 -
231 - ;;;; Macroexpansion
232 -
233
234 diff --git a/app-emacs/slime/files/2.0_p20110617/swank.asd b/app-emacs/slime/files/2.0_p20110617/swank.asd
235 deleted file mode 100644
236 index b33ca6e6..00000000
237 --- a/app-emacs/slime/files/2.0_p20110617/swank.asd
238 +++ /dev/null
239 @@ -1,98 +0,0 @@
240 -;;;; -*- Mode: Lisp; indent-tabs-mode: nil -*-
241 -
242 -(defpackage #:swank-system
243 - (:use #:common-lisp #:asdf))
244 -
245 -(in-package #:swank-system)
246 -
247 -(defun load-user-init-file ()
248 - "Load the user init file, return NIL if it does not exist."
249 - (load (merge-pathnames (user-homedir-pathname)
250 - (make-pathname :name ".swank" :type "lisp"))
251 - :if-does-not-exist nil))
252 -
253 -(defun load-site-init-file ()
254 - (load (make-pathname :name "site-init" :type "lisp"
255 - :defaults (truename
256 - (asdf:system-definition-pathname
257 - (asdf:find-system :swank))))
258 - :if-does-not-exist nil))
259 -
260 -(defclass no-load-file (cl-source-file) ())
261 -
262 -(defmethod perform ((op load-op) (c no-load-file)) nil)
263 -
264 -(defmacro define-swank-system (sysdep-files)
265 - `(defsystem :swank
266 - :description "Swank is the Common Lisp back-end to SLIME"
267 - :serial t
268 - :components ((:file "swank-backend")
269 - (:file "nregex")
270 - ,@(mapcar #'(lambda (component)
271 - (if (atom component)
272 - (list :file component)
273 - component))
274 - sysdep-files)
275 - (:file "swank-match")
276 - (:file "swank-rpc")
277 - (:file "swank")
278 - (:module "contrib"
279 - :components ((:no-load-file "swank-c-p-c")
280 - (:no-load-file "swank-arglists"
281 - :depends-on ("swank-c-p-c"))
282 - (:no-load-file "swank-asdf")
283 - (:no-load-file "swank-clipboard")
284 - (:no-load-file "swank-fancy-inspector")
285 - (:no-load-file "swank-fuzzy"
286 - :depends-on ("swank-c-p-c"))
287 - (:no-load-file "swank-hyperdoc")
288 - (:no-load-file "swank-indentation")
289 - (:no-load-file "swank-listener-hooks")
290 - (:no-load-file "swank-media")
291 - (:no-load-file "swank-motd")
292 - (:no-load-file "swank-package-fu")
293 - (:no-load-file "swank-presentations")
294 - (:no-load-file "swank-presentation-streams"
295 - :depends-on ("swank-presentations"))
296 - (:no-load-file "swank-sbcl-exts"
297 - :depends-on ("swank-arglists"))
298 - (:no-load-file "swank-snapshot")
299 - (:no-load-file "swank-sprof"))))
300 - :depends-on (#+sbcl sb-bsd-sockets)
301 - :perform (load-op :after (op swank)
302 - (load-site-init-file)
303 - (load-user-init-file))))
304 -
305 -#+(or cmu scl sbcl openmcl clozurecl lispworks allegro clisp armedbear cormanlisp ecl)
306 -(define-swank-system
307 - #+cmu (swank-source-path-parser swank-source-file-cache swank-cmucl)
308 - #+scl (swank-source-path-parser swank-source-file-cache swank-scl)
309 - #+sbcl (swank-source-path-parser swank-source-file-cache swank-sbcl swank-gray)
310 - #+(or openmcl clozurecl) (metering
311 - #.(if (and (find-package "CCL")
312 - (fboundp (intern "COMPUTE-APPLICABLE-METHODS-USING-CLASSES" "CCL")))
313 - 'swank-ccl
314 - 'swank-openmcl)
315 - swank-gray)
316 - #+lispworks (swank-lispworks swank-gray)
317 - #+allegro (swank-allegro swank-gray)
318 - #+clisp (xref metering swank-clisp swank-gray)
319 - #+armedbear (swank-abcl)
320 - #+cormanlisp (swank-corman swank-gray)
321 - #+ecl (swank-source-path-parser swank-source-file-cache swank-ecl swank-gray))
322 -
323 -#-(or cmu scl sbcl openmcl clozurecl lispworks allegro clisp armedbear cormanlisp ecl)
324 -(error "Your CL implementation is not supported !")
325 -
326 -(defpackage #:swank-loader
327 - (:use #:common-lisp)
328 - (:export #:*source-directory*))
329 -
330 -(in-package #:swank-loader)
331 -
332 -(defparameter *source-directory*
333 - (asdf:component-pathname (asdf:find-system :swank)))
334 -
335 -;; (funcall (intern (string :warn-unimplemented-interfaces) :swank-backend))
336 -
337 -;; swank.asd ends here
338
339 diff --git a/app-emacs/slime/files/2.0_p20130214/gentoo-changelog-date.patch b/app-emacs/slime/files/2.0_p20130214/gentoo-changelog-date.patch
340 deleted file mode 100644
341 index 1acfbe5a..00000000
342 --- a/app-emacs/slime/files/2.0_p20130214/gentoo-changelog-date.patch
343 +++ /dev/null
344 @@ -1,20 +0,0 @@
345 ---- slime-9999-orig/slime.el 2013-02-13 18:27:14.000000000 +1100
346 -+++ slime-9999/slime.el 2013-02-14 21:46:01.558517480 +1100
347 -@@ -119,16 +119,7 @@
348 - "Return the datestring of the latest entry in the ChangeLog file.
349 - Return nil if the ChangeLog file cannot be found."
350 - (interactive "p")
351 -- (let ((changelog (expand-file-name "ChangeLog" slime-path))
352 -- (date nil))
353 -- (when (file-exists-p changelog)
354 -- (with-temp-buffer
355 -- (insert-file-contents-literally changelog nil 0 100)
356 -- (goto-char (point-min))
357 -- (setq date (symbol-name (read (current-buffer))))))
358 -- (when interactivep
359 -- (message "Slime ChangeLog dates %s." date))
360 -- date)))
361 -+ "@SLIME-CHANGELOG-DATE@"))
362 -
363 - (defvar slime-protocol-version nil)
364 - (setq slime-protocol-version
365
366 diff --git a/app-emacs/slime/files/2.0_p20130214/gentoo-module-load.patch b/app-emacs/slime/files/2.0_p20130214/gentoo-module-load.patch
367 deleted file mode 100644
368 index c25a248d..00000000
369 --- a/app-emacs/slime/files/2.0_p20130214/gentoo-module-load.patch
370 +++ /dev/null
371 @@ -1,84 +0,0 @@
372 ---- slime-9999-orig/contrib/swank-arglists.lisp 2012-08-14 06:50:34.000000000 +1000
373 -+++ slime-9999/contrib/swank-arglists.lisp 2013-02-14 21:33:26.879124163 +1100
374 -@@ -9,8 +9,7 @@
375 -
376 - (in-package :swank)
377 -
378 --(eval-when (:compile-toplevel :load-toplevel :execute)
379 -- (swank-require :swank-c-p-c))
380 -+(swank-require :swank-c-p-c)
381 -
382 - ;;;; Utilities
383 -
384 ---- slime-9999-orig/contrib/swank-fuzzy.lisp 2013-02-02 20:48:51.000000000 +1100
385 -+++ slime-9999/contrib/swank-fuzzy.lisp 2013-02-14 21:35:32.059873714 +1100
386 -@@ -10,9 +10,8 @@
387 -
388 - (in-package :swank)
389 -
390 --(eval-when (:compile-toplevel :load-toplevel :execute)
391 -- (swank-require :swank-util)
392 -- (swank-require :swank-c-p-c))
393 -+(swank-require :swank-util)
394 -+(swank-require :swank-c-p-c)
395 -
396 - ;;; For nomenclature of the fuzzy completion section, please read
397 - ;;; through the following docstring.
398 ---- slime-9999-orig/contrib/swank-sbcl-exts.lisp 2009-09-25 16:43:33.000000000 +1000
399 -+++ slime-9999/contrib/swank-sbcl-exts.lisp 2013-02-14 21:33:26.880124185 +1100
400 -@@ -7,8 +7,7 @@
401 -
402 - (in-package :swank)
403 -
404 --(eval-when (:compile-toplevel :load-toplevel :execute)
405 -- (swank-require :swank-arglists))
406 -+(swank-require :swank-arglists)
407 -
408 - ;; We need to do this so users can place `slime-sbcl-exts' into their
409 - ;; ~/.emacs, and still use any implementation they want.
410 ---- slime-9999-orig/swank.lisp 2013-01-11 20:00:30.000000000 +1100
411 -+++ slime-9999/swank.lisp 2013-02-14 22:15:39.624982175 +1100
412 -@@ -2535,14 +2535,17 @@
413 - "Load the module MODULE."
414 - (dolist (module (ensure-list modules))
415 - (unless (member (string module) *modules* :test #'string=)
416 -- (require module (if filename
417 -- (filename-to-pathname filename)
418 -- (module-filename module)))
419 -+ (let ((*load-print* nil)
420 -+ (*load-verbose* nil)
421 -+ #+cmu (ext:*gc-verbose* nil))
422 -+ (require module (if filename
423 -+ (filename-to-pathname filename)
424 -+ (module-filename module))))
425 - (assert (member (string module) *modules* :test #'string=)
426 - () "Required module ~s was not provided" module)))
427 - *modules*)
428 -
429 --(defvar *find-module* 'find-module
430 -+(defvar *find-module* 'find-module-gentoo
431 - "Pluggable function to locate modules.
432 - The function receives a module name as argument and should return
433 - the filename of the module (or nil if the file doesn't exist).")
434 -@@ -2572,6 +2575,21 @@
435 - (some (lambda (dir) (some #'probe-file (module-canditates name dir)))
436 - *load-path*)))
437 -
438 -+(defun swank-fasl-pathname ()
439 -+ (make-pathname :name nil :type nil
440 -+ :defaults (car (asdf:output-files
441 -+ (make-instance 'asdf:compile-op)
442 -+ (car (asdf:module-components
443 -+ (asdf:find-system :swank)))))))
444 -+
445 -+(defun append-dir (pathname dir)
446 -+ (make-pathname :directory (append (pathname-directory pathname) dir)))
447 -+
448 -+(defun find-module-gentoo (module)
449 -+ (or (let ((*load-path* (list (append-dir (swank-fasl-pathname) '("contrib"))
450 -+ (append-dir swank-loader:*source-directory* '("contrib")))))
451 -+ (find-module module))
452 -+ (find-module module)))
453 -
454 - ;;;; Macroexpansion
455 -
456
457 diff --git a/app-emacs/slime/files/2.0_p20130930/gentoo-changelog-date.patch b/app-emacs/slime/files/2.0_p20130930/gentoo-changelog-date.patch
458 deleted file mode 100644
459 index 6be737d8..00000000
460 --- a/app-emacs/slime/files/2.0_p20130930/gentoo-changelog-date.patch
461 +++ /dev/null
462 @@ -1,20 +0,0 @@
463 ---- slime-2013-09-30-orig/slime.el 2013-02-13 18:27:14.000000000 +1100
464 -+++ slime-2013-09-30/slime.el 2013-09-30 13:56:28.108894780 +1000
465 -@@ -119,16 +119,7 @@
466 - "Return the datestring of the latest entry in the ChangeLog file.
467 - Return nil if the ChangeLog file cannot be found."
468 - (interactive "p")
469 -- (let ((changelog (expand-file-name "ChangeLog" slime-path))
470 -- (date nil))
471 -- (when (file-exists-p changelog)
472 -- (with-temp-buffer
473 -- (insert-file-contents-literally changelog nil 0 100)
474 -- (goto-char (point-min))
475 -- (setq date (symbol-name (read (current-buffer))))))
476 -- (when interactivep
477 -- (message "Slime ChangeLog dates %s." date))
478 -- date)))
479 -+ "@SLIME-CHANGELOG-DATE@"))
480 -
481 - (defvar slime-protocol-version nil)
482 - (setq slime-protocol-version
483
484 diff --git a/app-emacs/slime/files/2.11/dont-load-sbcl-pprint.patch b/app-emacs/slime/files/2.11/dont-load-sbcl-pprint.patch
485 deleted file mode 100644
486 index c7dafb6c..00000000
487 --- a/app-emacs/slime/files/2.11/dont-load-sbcl-pprint.patch
488 +++ /dev/null
489 @@ -1,13 +0,0 @@
490 -diff --git a/contrib/swank-presentation-streams.lisp b/contrib/swank-presentation-streams.lisp
491 -index 0c24bda..bd5a990 100644
492 ---- a/contrib/swank-presentation-streams.lisp
493 -+++ b/contrib/swank-presentation-streams.lisp
494 -@@ -65,7 +65,7 @@ be sensitive and remember what object it is in the repl if predicate is true"
495 - (funcall ,continue)))))
496 -
497 - ;;; Get pretty printer patches for SBCL at load (not compile) time.
498 --#+sbcl
499 -+#+#:disable-dangerous-patching ; #+sbcl
500 - (eval-when (:load-toplevel)
501 - (handler-bind ((simple-error
502 - (lambda (c)
503
504 diff --git a/app-emacs/slime/files/2.11/gentoo-changelog-date.patch b/app-emacs/slime/files/2.11/gentoo-changelog-date.patch
505 deleted file mode 100644
506 index 4d7669a3..00000000
507 --- a/app-emacs/slime/files/2.11/gentoo-changelog-date.patch
508 +++ /dev/null
509 @@ -1,20 +0,0 @@
510 ---- slime-2.11-orig/slime.el 2014-12-01 21:05:54.000000000 +1100
511 -+++ slime-2.11/slime.el 2014-12-19 11:57:45.455393436 +1100
512 -@@ -134,16 +134,7 @@
513 - "Return the datestring of the latest entry in the ChangeLog file.
514 - Return nil if the ChangeLog file cannot be found."
515 - (interactive "p")
516 -- (let ((changelog (expand-file-name "ChangeLog" slime-path))
517 -- (date nil))
518 -- (when (file-exists-p changelog)
519 -- (with-temp-buffer
520 -- (insert-file-contents-literally changelog nil 0 100)
521 -- (goto-char (point-min))
522 -- (setq date (symbol-name (read (current-buffer))))))
523 -- (when interactivep
524 -- (message "Slime ChangeLog dates %s." date))
525 -- date)))
526 -+ "@SLIME-CHANGELOG-DATE@"))
527 -
528 - (defvar slime-protocol-version nil)
529 - (setq slime-protocol-version
530
531 diff --git a/app-emacs/slime/files/2.15/gentoo-changelog-date.patch b/app-emacs/slime/files/2.15/gentoo-changelog-date.patch
532 deleted file mode 100644
533 index c7e815f0..00000000
534 --- a/app-emacs/slime/files/2.15/gentoo-changelog-date.patch
535 +++ /dev/null
536 @@ -1,20 +0,0 @@
537 ---- slime-2.15-orig/slime.el 2015-08-31 07:46:47.000000000 +1000
538 -+++ slime-2.15/slime.el 2015-09-17 17:05:53.616659817 +1000
539 -@@ -138,16 +138,7 @@
540 - "Return the datestring of the latest entry in the ChangeLog file.
541 - Return nil if the ChangeLog file cannot be found."
542 - (interactive "p")
543 -- (let ((changelog (slime--changelog-file-name))
544 -- (date nil))
545 -- (when (file-exists-p changelog)
546 -- (with-temp-buffer
547 -- (insert-file-contents-literally changelog nil 0 100)
548 -- (goto-char (point-min))
549 -- (setq date (symbol-name (read (current-buffer))))))
550 -- (when interactivep
551 -- (message "Slime ChangeLog dates %s." date))
552 -- date)))
553 -+ "@SLIME-CHANGELOG-DATE@"))
554 -
555 - (defvar slime-protocol-version nil)
556 - (setq slime-protocol-version
557
558 diff --git a/app-emacs/slime/files/2.0_p20110617/70slime-gentoo.el b/app-emacs/slime/files/70slime-gentoo.el
559 similarity index 62%
560 rename from app-emacs/slime/files/2.0_p20110617/70slime-gentoo.el
561 rename to app-emacs/slime/files/70slime-gentoo.el
562 index 358af67d..6dfd5051 100644
563 --- a/app-emacs/slime/files/2.0_p20110617/70slime-gentoo.el
564 +++ b/app-emacs/slime/files/70slime-gentoo.el
565 @@ -1,8 +1,6 @@
566 -;;; site-lisp configuration for SLIME
567 -
568 (add-to-list 'load-path "@SITELISP@")
569 (add-to-list 'load-path "@SITELISP@/contrib")
570 -(autoload 'slime-highlight-edits-mode "slime-highlight-edits")
571 +(autoload 'slime-highlight-edits-mode "slime-highlight-edits" nil t)
572
573 (require 'slime-autoloads)
574 (slime-setup '(slime-fancy slime-asdf slime-banner))
575 @@ -11,5 +9,5 @@
576 ;; (which is non-free) as a hard dependency
577 (setq common-lisp-hyperspec-root
578 (if (file-exists-p "/usr/share/doc/hyperspec/HyperSpec")
579 - "file:///usr/share/doc/hyperspec/HyperSpec/"
580 - "http://www.lispworks.com/reference/HyperSpec/"))
581 + "file:///usr/share/doc/hyperspec/HyperSpec/"
582 + "http://www.lispworks.com/reference/HyperSpec/"))
583
584 diff --git a/app-emacs/slime/metadata.xml b/app-emacs/slime/metadata.xml
585 deleted file mode 100644
586 index d33d27c2..00000000
587 --- a/app-emacs/slime/metadata.xml
588 +++ /dev/null
589 @@ -1,34 +0,0 @@
590 -<?xml version="1.0" encoding="UTF-8"?>
591 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
592 -<pkgmetadata>
593 -<herd>emacs</herd>
594 -<herd>common-lisp</herd>
595 -<longdescription>
596 -SLIME: The Superior Lisp Interaction Mode for Emacs. SLIME is a
597 -fresh, new Emacs mode for Common Lisp development inspired by existing
598 -systems such Emacs Lisp and ILISP. Feature highlights include:
599 -
600 - * slime-mode: An Emacs minor-mode to enhance lisp-mode with:
601 - o Code evaluation, compilation, and macroexpansion.
602 - o Online documentation (describe, apropos, hyperspec).
603 - o Definition finding (aka Meta-Point aka M-.).
604 - o Symbol and package name completion.
605 - o Automatic macro indentation based on &amp;body.
606 - o Cross-reference interface (WHO-CALLS, etc).
607 - o ... and more.
608 -
609 - * SLDB: Common Lisp debugger with an Emacs-based user interface.
610 -
611 - * REPL: The Read-Eval-Print Loop ("top-level") is written in Emacs
612 - Lisp for tighter integration with Emacs. The REPL also has builtin
613 - "shortcut" commands similar those of the McCLIM Listener.
614 -
615 - * Compilation notes: SLIME is able to take compiler messages and
616 - annotate them directly into source buffers.
617 -
618 - * Inspector: Interactive object-inspector in an Emacs buffer.
619 -</longdescription>
620 -<use>
621 - <flag name='xref'>Install xref.lisp cross-referencing tool</flag>
622 -</use>
623 -</pkgmetadata>
624
625 diff --git a/app-emacs/slime/slime-2.0_p20110617.ebuild b/app-emacs/slime/slime-2.0_p20110617.ebuild
626 deleted file mode 100644
627 index 86b71b72..00000000
628 --- a/app-emacs/slime/slime-2.0_p20110617.ebuild
629 +++ /dev/null
630 @@ -1,80 +0,0 @@
631 -# Copyright 1999-2011 Gentoo Foundation
632 -# Distributed under the terms of the GNU General Public License v2
633 -# $Header: $
634 -
635 -EAPI=3
636 -inherit common-lisp-3 elisp eutils
637 -
638 -DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
639 -HOMEPAGE="http://common-lisp.net/project/slime/"
640 -SRC_URI="http://common-lisp.net/~sionescu/files/${P}.tar.bz2"
641 -
642 -LICENSE="GPL-2 xref.lisp"
643 -SLOT="0"
644 -KEYWORDS="~amd64 ~ppc ~sparc ~x86"
645 -IUSE="doc"
646 -
647 -RDEPEND="virtual/commonlisp
648 - dev-lisp/asdf"
649 -DEPEND="sys-apps/texinfo
650 - doc? ( virtual/texi2dvi )"
651 -
652 -CLPACKAGE=swank
653 -CLSYSTEMS=swank
654 -SITEFILE=70${PN}-gentoo.el
655 -
656 -src_prepare() {
657 - epatch "${FILESDIR}"/${PV}/fix-inspect-presentations.patch
658 - epatch "${FILESDIR}"/${PV}/gentoo-module-load.patch
659 - epatch "${FILESDIR}"/${PV}/gentoo-dont-call-init.patch
660 -
661 - # Eliminate Debian-specific rule
662 - sed -i '/^section :=/d' doc/Makefile || die "sed doc/Makefile failed"
663 -
664 - # extract date of last update from ChangeLog, bug 233270
665 - SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
666 - [ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
667 -
668 - # SLIME uses the changelog date to make sure that the emacs side and the CL side
669 - # are in sync. We hardcode it instead of letting slime determine it at runtime
670 - # because ChangeLog doesn't get installed to $EMACSDIR
671 - epatch "${FILESDIR}"/${PV}/gentoo-changelog-date.patch
672 - sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp \
673 - || die "sed swank.lisp failed"
674 - sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el \
675 - || die "sed slime.el failed"
676 -}
677 -
678 -src_compile() {
679 - emake -j1 -C doc slime.info || die "Cannot build info docs"
680 - if use doc; then
681 - VARTEXFONTS="${T}"/fonts \
682 - emake -j1 -C doc slime.pdf || die "emake doc failed"
683 - fi
684 -}
685 -
686 -src_install() {
687 - ## install core
688 - elisp-install ${PN} *.el "${FILESDIR}"/swank-loader.lisp \
689 - || die "Cannot install SLIME core"
690 - sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}"/${PV}/${SITEFILE} \
691 - >"${T}"/${SITEFILE} || die "sed failed"
692 - elisp-site-file-install "${T}"/${SITEFILE} || die
693 - cp "${FILESDIR}"/${PV}/swank.asd "${S}"
694 - # remove upstream swank-loader, since it won't be used
695 - rm "${S}"/swank-loader.lisp
696 - common-lisp-install-sources *.lisp
697 - common-lisp-install-asdf swank.asd
698 -
699 - ## install contribs
700 - elisp-install ${PN}/contrib/ contrib/*.{el,scm,goo} \
701 - || die "Cannot install contribs"
702 - common-lisp-install-sources contrib/*.lisp
703 -
704 - ## install docs
705 - dodoc README* ChangeLog HACKING NEWS PROBLEMS
706 - newdoc contrib/README README.contrib
707 - newdoc contrib/ChangeLog ChangeLog.contrib
708 - doinfo doc/slime.info
709 - use doc && dodoc doc/slime.pdf
710 -}
711
712 diff --git a/app-emacs/slime/slime-2.0_p20130214.ebuild b/app-emacs/slime/slime-2.0_p20130214.ebuild
713 deleted file mode 120000
714 index f61696a1..00000000
715 --- a/app-emacs/slime/slime-2.0_p20130214.ebuild
716 +++ /dev/null
717 @@ -1 +0,0 @@
718 -slime-2.0_p20130930.ebuild
719 \ No newline at end of file
720
721 diff --git a/app-emacs/slime/slime-2.0_p20130930.ebuild b/app-emacs/slime/slime-2.0_p20130930.ebuild
722 deleted file mode 100644
723 index c86f8c6b..00000000
724 --- a/app-emacs/slime/slime-2.0_p20130930.ebuild
725 +++ /dev/null
726 @@ -1,96 +0,0 @@
727 -# Copyright 1999-2014 Gentoo Foundation
728 -# Distributed under the terms of the GNU General Public License v2
729 -# $Header: $
730 -
731 -EAPI=5
732 -
733 -inherit common-lisp-3 elisp eutils
734 -
735 -DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
736 -HOMEPAGE="http://common-lisp.net/project/slime/"
737 -SRC_URI="http://dev.gentoo.org/~gienah/snapshots/${P}.tgz"
738 -S="${WORKDIR}/slime-${PV:5:4}-${PV:9:2}-${PV:11:2}"
739 -
740 -LICENSE="GPL-2 xref? ( xref.lisp )"
741 -SLOT="0"
742 -KEYWORDS="~amd64 ~ppc ~sparc ~x86"
743 -IUSE="doc xref"
744 -
745 -RDEPEND="virtual/commonlisp
746 - dev-lisp/asdf"
747 -DEPEND="${RDEPEND}
748 - sys-apps/texinfo
749 - doc? ( virtual/texi2dvi )"
750 -
751 -CLPACKAGE=swank
752 -CLSYSTEMS=swank
753 -SITEFILE=70${PN}-gentoo.el
754 -
755 -src_prepare() {
756 - epatch "${FILESDIR}"/2.0_p20110617/fix-inspect-presentations.patch
757 - epatch "${FILESDIR}"/2.0_p20130214/gentoo-module-load.patch
758 - epatch "${FILESDIR}"/2.0_p20110617/gentoo-dont-call-init.patch
759 -
760 - # Eliminate Debian-specific rule
761 - sed -i '/^section :=/d' doc/Makefile || die "sed doc/Makefile failed"
762 -
763 - # extract date of last update from ChangeLog, bug 233270
764 - SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
765 - [ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
766 -
767 - # SLIME uses the changelog date to make sure that the emacs side and the CL side
768 - # are in sync. We hardcode it instead of letting slime determine it at runtime
769 - # because ChangeLog doesn't get installed to $EMACSDIR
770 - epatch "${FILESDIR}"/2.0_p20130930/gentoo-changelog-date.patch
771 - if [[ "${PV}" != "2.0_p20130214" ]]; then
772 - # lately upstream have not updated ChangeLog, so hard code it to a later date.
773 - SLIME_CHANGELOG_DATE="2013-09-30"
774 - fi
775 - sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp \
776 - || die "sed swank.lisp failed"
777 - sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el \
778 - || die "sed slime.el failed"
779 - sed -i "s/@itemx INIT-FUNCTION/@item INIT-FUNCTION/" doc/slime.texi \
780 - || die "sed doc/slime.texi failed"
781 -
782 - # Remove xref.lisp (which is non-free) unless USE flag is set
783 - use xref || rm -f xref.lisp
784 -}
785 -
786 -src_compile() {
787 - elisp-compile *.el || die
788 - BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
789 - elisp-compile contrib/*.el || die
790 - emake -j1 -C doc slime.info || die "Cannot build info docs"
791 -
792 - if use doc; then
793 - VARTEXFONTS="${T}"/fonts \
794 - emake -j1 -C doc slime.pdf || die "emake doc failed"
795 - fi
796 -}
797 -
798 -src_install() {
799 - ## install core
800 - elisp-install ${PN} *.el "${FILESDIR}"/swank-loader.lisp \
801 - || die "Cannot install SLIME core"
802 - sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}"/2.0_p20110617/${SITEFILE} \
803 - >"${T}"/${SITEFILE} || die "sed failed"
804 - elisp-site-file-install "${T}"/${SITEFILE} || die
805 - cp "${FILESDIR}"/2.0_p20110617/swank.asd "${S}"
806 - # remove upstream swank-loader, since it won't be used
807 - rm "${S}"/swank-loader.lisp
808 - common-lisp-install-sources *.lisp
809 - common-lisp-install-asdf swank.asd
810 -
811 - ## install contribs
812 - elisp-install ${PN}/contrib/ contrib/*.{el,scm,goo} \
813 - || die "Cannot install contribs"
814 - common-lisp-install-sources contrib/*.lisp
815 -
816 - ## install docs
817 - dodoc README* ChangeLog HACKING NEWS PROBLEMS
818 - newdoc contrib/README README.contrib
819 - newdoc contrib/ChangeLog ChangeLog.contrib
820 - doinfo doc/slime.info
821 - use doc && dodoc doc/slime.pdf
822 -}
823
824 diff --git a/app-emacs/slime/slime-2.11.ebuild b/app-emacs/slime/slime-2.11.ebuild
825 deleted file mode 120000
826 index acf114bc..00000000
827 --- a/app-emacs/slime/slime-2.11.ebuild
828 +++ /dev/null
829 @@ -1 +0,0 @@
830 -slime-9999.ebuild
831 \ No newline at end of file
832
833 diff --git a/app-emacs/slime/slime-2.12.ebuild b/app-emacs/slime/slime-2.12.ebuild
834 deleted file mode 120000
835 index acf114bc..00000000
836 --- a/app-emacs/slime/slime-2.12.ebuild
837 +++ /dev/null
838 @@ -1 +0,0 @@
839 -slime-9999.ebuild
840 \ No newline at end of file
841
842 diff --git a/app-emacs/slime/slime-2.15.ebuild b/app-emacs/slime/slime-2.15.ebuild
843 deleted file mode 120000
844 index acf114bc..00000000
845 --- a/app-emacs/slime/slime-2.15.ebuild
846 +++ /dev/null
847 @@ -1 +0,0 @@
848 -slime-9999.ebuild
849 \ No newline at end of file
850
851 diff --git a/app-emacs/slime/slime-2.20.ebuild b/app-emacs/slime/slime-2.20.ebuild
852 new file mode 100644
853 index 00000000..b8a5bdb9
854 --- /dev/null
855 +++ b/app-emacs/slime/slime-2.20.ebuild
856 @@ -0,0 +1,66 @@
857 +# Copyright 1999-2018 Gentoo Foundation
858 +# Distributed under the terms of the GNU General Public License v2
859 +
860 +EAPI=6
861 +
862 +inherit elisp eutils
863 +
864 +DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
865 +HOMEPAGE="http://common-lisp.net/project/slime/"
866 +SRC_URI="https://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
867 +
868 +LICENSE="GPL-2 xref? ( xref.lisp )"
869 +SLOT="0"
870 +KEYWORDS="~amd64 ~ppc ~sparc ~x86"
871 +IUSE="doc xref"
872 +RESTRICT=test # tests fail to contact sbcl
873 +
874 +RDEPEND="virtual/commonlisp
875 + dev-lisp/asdf"
876 +DEPEND="${RDEPEND}
877 + >=sys-apps/texinfo-5.1
878 + doc? ( virtual/texi2dvi )"
879 +
880 +CLPACKAGE=swank
881 +CLSYSTEMS=swank
882 +SITEFILE=70${PN}-gentoo.el
883 +
884 +src_prepare() {
885 + # Remove xref.lisp (which is non-free) unless USE flag is set
886 + use xref || rm -f xref.lisp
887 + eapply_user
888 +}
889 +
890 +src_compile() {
891 + elisp-compile *.el || die
892 + BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
893 + elisp-compile contrib/*.el lib/*.el || die
894 + emake -j1 -C doc slime.info || die "Cannot build info docs"
895 +
896 + #if use doc; then
897 + # VARTEXFONTS="${T}"/fonts \
898 + # emake -j1 -C doc slime.pdf || die "emake doc failed"
899 + #fi
900 +}
901 +
902 +src_install() {
903 + ## install core
904 + elisp-install ${PN} *.{el,elc,lisp} || die "Cannot install SLIME core"
905 +
906 + ## install contribs
907 + elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo} \
908 + || die "Cannot install contribs"
909 +
910 + ## install lib
911 + elisp-install ${PN}/lib/ lib/*.{el,elc} || die "Cannot install libs"
912 +
913 + ## install swank
914 + elisp-install ${PN}/swank/ swank/*.lisp || die "Cannot install swank"
915 +
916 + elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
917 + ## install docs
918 + dodoc README.md CONTRIBUTING.md NEWS PROBLEMS
919 + newdoc contrib/README.md README-contrib.md
920 + doinfo doc/slime.info
921 + use doc && dodoc doc/*.pdf
922 +}
923
924 diff --git a/app-emacs/slime/slime-9999.ebuild b/app-emacs/slime/slime-9999.ebuild
925 index 72f8d257..c8a0d498 100644
926 --- a/app-emacs/slime/slime-9999.ebuild
927 +++ b/app-emacs/slime/slime-9999.ebuild
928 @@ -1,8 +1,7 @@
929 -# Copyright 1999-2015 Gentoo Foundation
930 +# Copyright 1999-2018 Gentoo Foundation
931 # Distributed under the terms of the GNU General Public License v2
932 -# $Id$
933
934 -EAPI=5
935 +EAPI=6
936
937 [[ ${PV} = *9999* ]] && GIT_ECLASS="git-r3" || GIT_ECLASS=""