1 |
commit: 90e382f66a63e9a06cfb100086a4507f93aceec1 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 3 21:19:29 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 4 08:47:57 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90e382f6 |
7 |
|
8 |
app-emacs/rudel: Drop 0.3_pre20110721-r1, EAPI6-- |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
app-emacs/rudel/Manifest | 1 - |
14 |
.../files/rudel-0.3_pre20110721-emacs25.patch | 341 --------------------- |
15 |
app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild | 49 --- |
16 |
3 files changed, 391 deletions(-) |
17 |
|
18 |
diff --git a/app-emacs/rudel/Manifest b/app-emacs/rudel/Manifest |
19 |
index 9b6d78e24e3..a599e10ac88 100644 |
20 |
--- a/app-emacs/rudel/Manifest |
21 |
+++ b/app-emacs/rudel/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
DIST rudel-0.3.1.tar.xz 418076 BLAKE2B e4a85abba24c3241cf5f8b468c6953662584256998c28cea6b1df59bcc943b364b9b1564787758c2d2c55ce61cbddf1e10c22714dc99c4b705831000eb5835f8 SHA512 b006745af5d5f607da78e910d226abfdd51343e806a14f1fbe340fc7b92503dba6b5d43668967da346bdf534b983d0de4b83d9039f5c5940b6b0d1c0fad3ad6b |
24 |
-DIST rudel-0.3_pre20110721.tar.xz 416060 BLAKE2B 813ec0dc034a0893c0cc540118d9471fcb353c232ce37b70816183ebc99ff82c16e80eddf015f5d5663c7380a93c29b153871bb1ca58f37f06d4e09bddd87912 SHA512 abf6c8eb4fcaf4acafb9bed7cafff5d3c8e19e3fecd2aa779065bfb11ce5cb198ef14cc9deed360ac895166ea159a821e24dc92dbeda4f5481d1bb3bc2f8c023 |
25 |
|
26 |
diff --git a/app-emacs/rudel/files/rudel-0.3_pre20110721-emacs25.patch b/app-emacs/rudel/files/rudel-0.3_pre20110721-emacs25.patch |
27 |
deleted file mode 100644 |
28 |
index 98aa38f370d..00000000000 |
29 |
--- a/app-emacs/rudel/files/rudel-0.3_pre20110721-emacs25.patch |
30 |
+++ /dev/null |
31 |
@@ -1,341 +0,0 @@ |
32 |
-Fix byte-compilation with Emacs 25. |
33 |
-https://bugs.gentoo.org/590340 |
34 |
- |
35 |
-This comprises parts of the following commits from ELPA: |
36 |
- |
37 |
-commit 9ec4b84e27f3faae8ad3eb5d3e96c523ce1fece2 |
38 |
-Author: Stefan Monnier <monnier@×××××××××××××.ca> |
39 |
-Date: Sun Jul 10 18:16:39 2016 -0400 |
40 |
- |
41 |
- * rudel-backend.el: Try and fix compilation problem |
42 |
- |
43 |
-commit 5e4f147f6b23c392505cb0cbb5f13384d6d96304 |
44 |
-Author: Stefan Monnier <monnier@×××××××××××××.ca> |
45 |
-Date: Mon May 12 02:23:00 2014 -0400 |
46 |
- |
47 |
- Fix up headers and compilation |
48 |
- |
49 |
---- rudel-orig/rudel-backend.el |
50 |
-+++ rudel/rudel-backend.el |
51 |
-@@ -46,8 +46,7 @@ |
52 |
- ;;; Code: |
53 |
- ;; |
54 |
- |
55 |
--(eval-when-compile |
56 |
-- (require 'cl)) |
57 |
-+(require 'cl) |
58 |
- |
59 |
- (require 'warnings) |
60 |
- |
61 |
-@@ -97,24 +96,34 @@ |
62 |
- "Factory class that holds an object for each known backend |
63 |
- category. Objects manage backend implementation for one backend |
64 |
- category each.") |
65 |
--(oset-default rudel-backend-factory factories |
66 |
-+(oset-default 'rudel-backend-factory factories |
67 |
- (make-hash-table :test #'eq)) |
68 |
- |
69 |
--(defmethod initialize-instance ((this rudel-backend-factory) &rest slots) |
70 |
-+(defmethod initialize-instance ((this rudel-backend-factory) &rest _slots) |
71 |
- "Initialize slots of THIS with SLOTS." |
72 |
- (when (next-method-p) |
73 |
- (call-next-method)) |
74 |
-- (oset this :backends (make-hash-table :test #'eq))) |
75 |
-+ (oset this backends (make-hash-table :test #'eq))) |
76 |
-+ |
77 |
-+;;;###autoload |
78 |
-+(progn |
79 |
-+(defmacro rudel--with-memoization (place &rest code) |
80 |
-+ (declare (indent 1) (debug t)) |
81 |
-+ (gv-letplace (getter setter) place |
82 |
-+ `(or ,getter |
83 |
-+ ,(macroexp-let2 nil val (macroexp-progn code) |
84 |
-+ `(progn |
85 |
-+ ,(funcall setter val) |
86 |
-+ ,val)))))) |
87 |
- |
88 |
- ;;;###autoload |
89 |
- (defmethod rudel-get-factory :static ((this rudel-backend-factory) |
90 |
- category) |
91 |
- "Return the factory responsible for CATEGORY. |
92 |
- If there is no responsible factory, create one and return it." |
93 |
-- (with-slots (factories) this |
94 |
-- (or (gethash category factories) |
95 |
-- (puthash category (rudel-backend-factory category) factories))) |
96 |
-- ) |
97 |
-+ (rudel--with-memoization |
98 |
-+ (gethash category (eieio-oref-default this 'factories)) |
99 |
-+ (make-instance 'rudel-backend-factory))) ;; category |
100 |
- |
101 |
- ;;;###autoload |
102 |
- (defmethod rudel-add-backend ((this rudel-backend-factory) |
103 |
-@@ -188,7 +197,8 @@ |
104 |
- (unless (object-p class) |
105 |
- (condition-case error |
106 |
- (puthash name (make-instance |
107 |
-- class (symbol-name name)) backends) |
108 |
-+ class (symbol-name name)) |
109 |
-+ backends) |
110 |
- (error |
111 |
- ;; Store this error on the name symbol of the backend for |
112 |
- ;; later display. |
113 |
-@@ -224,7 +234,7 @@ |
114 |
- ;;;###autoload |
115 |
- (defun rudel-backend-get-factory (category) |
116 |
- "A shortcut for getting the factory object for CATEGORY." |
117 |
-- (rudel-get-factory rudel-backend-factory category)) |
118 |
-+ (rudel-get-factory 'rudel-backend-factory category)) |
119 |
- |
120 |
- (defun rudel-backend-suitable-backends (category predicate) |
121 |
- "Return backends from category CATEGORY that satisfy PREDICATE. |
122 |
-@@ -290,15 +300,15 @@ |
123 |
- |
124 |
- ;; Insert all backends provided by this factory. |
125 |
- (dolist (backend (rudel-all-backends factory)) |
126 |
-- (if (or (object-p (cdr backend)) |
127 |
-- (null (get (car backend) |
128 |
-- 'rudel-backend-last-load-error))) |
129 |
-- (insert (rudel-backend--format-backend-normal backend)) |
130 |
-- (insert (rudel-backend--format-backend-error backend)))) |
131 |
-+ (insert (if (or (object-p (cdr backend)) |
132 |
-+ (null (get (car backend) |
133 |
-+ 'rudel-backend-last-load-error))) |
134 |
-+ (rudel-backend--format-backend-normal backend) |
135 |
-+ (rudel-backend--format-backend-error backend)))) |
136 |
- |
137 |
- ;; One empty line between backend categories. |
138 |
- (insert "\n")) |
139 |
-- (oref rudel-backend-factory factories)) |
140 |
-+ (oref-default 'rudel-backend-factory factories)) |
141 |
- (current-buffer)) |
142 |
- |
143 |
- (defun rudel-backend--format-backend-normal (backend) |
144 |
-@@ -316,7 +326,7 @@ |
145 |
- (propertize |
146 |
- (if (object-p (cdr backend)) |
147 |
- (mapconcat #'prin1-to-string |
148 |
-- (oref (cdr backend) :version) |
149 |
-+ (oref (cdr backend) version) |
150 |
- ".") |
151 |
- "?") |
152 |
- 'face 'font-lock-constant-face) |
153 |
-@@ -324,7 +334,7 @@ |
154 |
- (propertize |
155 |
- (if (object-p (cdr backend)) |
156 |
- (mapconcat #'prin1-to-string |
157 |
-- (oref (cdr backend) :capabilities) |
158 |
-+ (oref (cdr backend) capabilities) |
159 |
- " ") |
160 |
- "?") |
161 |
- 'face 'font-lock-constant-face)) |
162 |
---- rudel-orig/rudel-color.el |
163 |
-+++ rudel/rudel-color.el |
164 |
-@@ -46,6 +46,7 @@ |
165 |
- ;;; Code: |
166 |
- ;; |
167 |
- |
168 |
-+(eval-when-compile (require 'cl)) |
169 |
- |
170 |
- ;;; RGV <-> HSV conversion |
171 |
- ;; |
172 |
---- rudel-orig/rudel.el |
173 |
-+++ rudel/rudel.el |
174 |
-@@ -41,8 +41,7 @@ |
175 |
- ;;; Code: |
176 |
- ;; |
177 |
- |
178 |
--(eval-when-compile |
179 |
-- (require 'cl)) |
180 |
-+(require 'cl) |
181 |
- |
182 |
- (require 'eieio) |
183 |
- (require 'eieio-base) |
184 |
---- rudel-orig/rudel-icons.el |
185 |
-+++ rudel/rudel-icons.el |
186 |
-@@ -41,8 +41,9 @@ |
187 |
- ;;; Image constants |
188 |
- ;; |
189 |
- |
190 |
-+(eval-and-compile |
191 |
- (defconst rudel-icons-image-formats '(svg png) |
192 |
-- "Image formats to try (in that order) when loading Rudel icons.") |
193 |
-+ "Image formats to try (in that order) when loading Rudel icons.")) |
194 |
- |
195 |
- (defvar rudel-icons-directory |
196 |
- (file-name-as-directory |
197 |
---- rudel-orig/rudel-interactive.el |
198 |
-+++ rudel/rudel-interactive.el |
199 |
-@@ -38,6 +38,7 @@ |
200 |
- |
201 |
- ;;; Code: |
202 |
- ;; |
203 |
-+(require 'cl) |
204 |
- |
205 |
- (require 'rudel-compat) ;; for `read-color' replacement |
206 |
- (require 'rudel-backend) ;; for `rudel-backend-cons-p' |
207 |
-@@ -80,25 +81,29 @@ |
208 |
- (setq prompt "Session: ")) |
209 |
- ;; For presentation and identification of sessions, use the :name |
210 |
- ;; property. |
211 |
-- (flet ((to-string (session) |
212 |
-- (if (rudel-backend-cons-p session) |
213 |
-- (symbol-name (car session)) |
214 |
-- (plist-get session :name)))) |
215 |
-+ (let ((to-string |
216 |
-+ (lambda (session) |
217 |
-+ (if (rudel-backend-cons-p session) |
218 |
-+ (symbol-name (car session)) |
219 |
-+ (plist-get session :name))))) |
220 |
- ;; Read a session by name, then return that name or the |
221 |
- ;; corresponding session info. |
222 |
- (let ((session-name (completing-read prompt |
223 |
-- (mapcar #'to-string sessions) |
224 |
-+ (mapcar to-string sessions) |
225 |
- nil t))) |
226 |
- (cond |
227 |
- ((eq return 'object) |
228 |
- (find session-name sessions |
229 |
-- :key #'to-string :test #'string=)) |
230 |
-+ :key to-string :test #'string=)) |
231 |
- (t session-name)))) |
232 |
- ) |
233 |
- |
234 |
- (defvar rudel-read-user-name-history nil |
235 |
- "History of inputs read by `rudel-read-user-name'.") |
236 |
- |
237 |
-+(defvar rudel-default-username) |
238 |
-+(defvar rudel-current-session) |
239 |
-+ |
240 |
- (defun rudel-read-user-name () |
241 |
- "Read a username. |
242 |
- The default is taken from `rudel-default-username'." |
243 |
---- rudel-orig/rudel-mode.el |
244 |
-+++ rudel/rudel-mode.el |
245 |
-@@ -48,6 +48,7 @@ |
246 |
- ;;; Code: |
247 |
- ;; |
248 |
- |
249 |
-+(require 'cl) |
250 |
- (require 'easy-mmode) |
251 |
- (require 'easymenu) |
252 |
- |
253 |
-@@ -132,6 +133,8 @@ |
254 |
- (rudel-buffer-document)))) |
255 |
- (force-mode-line-update)) |
256 |
- |
257 |
-+(defvar rudel-header-subscriptions-minor-mode) |
258 |
-+ |
259 |
- (defun rudel-header-subscriptions--options-changed () |
260 |
- "Update headers in buffers that have header subscriptions mode enabled." |
261 |
- (dolist (buffer (buffer-list)) |
262 |
-@@ -228,8 +231,7 @@ |
263 |
- #'rudel-header-subscriptions--remove-user)) |
264 |
- |
265 |
- ;; Reset header line to default format. |
266 |
-- (setq header-line-format default-header-line-format) |
267 |
-- (force-mode-line-update)) ;; TODO remove all handlers |
268 |
-+ (kill-local-variable 'header-line-format)) ;; TODO remove all handlers |
269 |
- |
270 |
- ;; No buffer document |
271 |
- (t |
272 |
-@@ -237,8 +239,7 @@ |
273 |
- (setq rudel-header-subscriptions-minor-mode nil) |
274 |
- |
275 |
- ;; Reset header line to default format. |
276 |
-- (setq header-line-format default-header-line-format) |
277 |
-- (force-mode-line-update))) |
278 |
-+ (kill-local-variable 'header-line-format))) |
279 |
- ) |
280 |
- |
281 |
- |
282 |
-@@ -411,6 +412,8 @@ |
283 |
- (force-mode-line-update) |
284 |
- ) |
285 |
- |
286 |
-+(defvar rudel-mode-line-publish-state-minor-mode) |
287 |
-+ |
288 |
- (defun rudel-mode-line-publish-state--document-attach (document buffer) |
289 |
- "Handle attaching of DOCUMENT to BUFFER. |
290 |
- When `rudel-mode-line-publish-state-minor-mode' is enabled in |
291 |
---- rudel-orig/rudel-overlay.el |
292 |
-+++ rudel/rudel-overlay.el |
293 |
-@@ -36,8 +36,7 @@ |
294 |
- |
295 |
- (require 'custom) |
296 |
- |
297 |
--(eval-when-compile |
298 |
-- (require 'cl)) |
299 |
-+(require 'cl) |
300 |
- |
301 |
- (require 'eieio) |
302 |
- |
303 |
---- rudel-orig/rudel-session-initiation.el |
304 |
-+++ rudel/rudel-session-initiation.el |
305 |
-@@ -54,8 +54,7 @@ |
306 |
- ;;; Code: |
307 |
- ;; |
308 |
- |
309 |
--(eval-when-compile |
310 |
-- (require 'cl)) |
311 |
-+(require 'cl) |
312 |
- |
313 |
- (require 'eieio) |
314 |
- |
315 |
---- rudel-orig/rudel-speedbar.el |
316 |
-+++ rudel/rudel-speedbar.el |
317 |
-@@ -77,6 +77,8 @@ |
318 |
- '([ "Subscribe" #'ignore t]) |
319 |
- "Menu part in easymenu format used in speedbar while browsing objects.") |
320 |
- |
321 |
-+(defvar rudel-current-session) |
322 |
-+ |
323 |
- (defun rudel-speedbar-toplevel-buttons (dir) |
324 |
- "Return a list of objects to display in speedbar. |
325 |
- Argument DIR is the directory from which to derive the list of objects." |
326 |
---- rudel-orig/rudel-state-machine.el |
327 |
-+++ rudel/rudel-state-machine.el |
328 |
-@@ -41,8 +41,7 @@ |
329 |
- ;;; Code: |
330 |
- ;; |
331 |
- |
332 |
--(eval-when-compile |
333 |
-- (require 'cl)) |
334 |
-+(require 'cl) |
335 |
- |
336 |
- (require 'eieio) |
337 |
- |
338 |
---- rudel-orig/rudel-transport-util.el |
339 |
-+++ rudel/rudel-transport-util.el |
340 |
-@@ -48,7 +48,10 @@ |
341 |
- |
342 |
- ;;; Code: |
343 |
- ;; |
344 |
- |
345 |
-+(eval-when-compile (require 'cl)) |
346 |
-+(require 'eieio) |
347 |
-+(eval-when-compile (require 'rudel-util)) |
348 |
- (require 'rudel-errors) ;; for `rudel-error' |
349 |
- (require 'rudel-transport) |
350 |
- |
351 |
---- rudel-orig/rudel-util.el |
352 |
-+++ rudel/rudel-util.el |
353 |
-@@ -43,8 +43,7 @@ |
354 |
- ;;; Code: |
355 |
- ;; |
356 |
- |
357 |
--(eval-when-compile |
358 |
-- (require 'cl)) |
359 |
-+(require 'cl) |
360 |
- |
361 |
- (require 'eieio) |
362 |
- |
363 |
---- rudel-orig/rudel-xml.el |
364 |
-+++ rudel/rudel-xml.el |
365 |
-@@ -45,6 +45,7 @@ |
366 |
- ;;; Code: |
367 |
- ;; |
368 |
- |
369 |
-+(eval-when-compile (require 'cl)) |
370 |
- (require 'xml) |
371 |
- |
372 |
- |
373 |
|
374 |
diff --git a/app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild b/app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild |
375 |
deleted file mode 100644 |
376 |
index a1d42fd45fb..00000000000 |
377 |
--- a/app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild |
378 |
+++ /dev/null |
379 |
@@ -1,49 +0,0 @@ |
380 |
-# Copyright 1999-2016 Gentoo Foundation |
381 |
-# Distributed under the terms of the GNU General Public License v2 |
382 |
- |
383 |
-EAPI=6 |
384 |
-NEED_EMACS=24 |
385 |
- |
386 |
-inherit readme.gentoo-r1 elisp |
387 |
- |
388 |
-DESCRIPTION="Collaborative editing environment for GNU Emacs" |
389 |
-HOMEPAGE="http://rudel.sourceforge.net/ |
390 |
- https://www.emacswiki.org/emacs/Rudel" |
391 |
-# snapshot of bzr://rudel.bzr.sourceforge.net/bzrroot/rudel/trunk |
392 |
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" |
393 |
- |
394 |
-LICENSE="GPL-3+" |
395 |
-SLOT="0" |
396 |
-KEYWORDS="~amd64 ~x86" |
397 |
- |
398 |
-S="${WORKDIR}/${PN}" |
399 |
-ELISP_PATCHES="${P}-emacs25.patch" |
400 |
-SITEFILE="60${PN}-gentoo.el" |
401 |
- |
402 |
-src_compile() { |
403 |
- ${EMACS} ${EMACSFLAGS} -l rudel-compile.el || die |
404 |
-} |
405 |
- |
406 |
-src_install() { |
407 |
- local dir |
408 |
- |
409 |
- for dir in . adopted infinote jupiter obby socket telepathy tls \ |
410 |
- xmpp zeroconf |
411 |
- do |
412 |
- insinto "${SITELISP}/${PN}/${dir}" |
413 |
- doins ${dir}/*.{el,elc} |
414 |
- done |
415 |
- |
416 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
417 |
- |
418 |
- insinto "${SITEETC}/${PN}" |
419 |
- doins -r icons |
420 |
- |
421 |
- dodoc README INSTALL ChangeLog TODO doc/card.pdf |
422 |
- |
423 |
- DOC_CONTENTS="Connections to Gobby servers require the gnutls-cli program |
424 |
- (net-libs/gnutls). |
425 |
- \\n\\nThe Avahi daemon (net-dns/avahi) is required for automatic |
426 |
- session discovery and advertising." |
427 |
- readme.gentoo_create_doc |
428 |
-} |