Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lisp/sbcl/files/, dev-lisp/sbcl/
Date: Fri, 04 Mar 2022 23:58:59
Message-Id: 1646438308.ef728db1b1a5dc37165a9caf616896a754fa769a.sam@gentoo
1 commit: ef728db1b1a5dc37165a9caf616896a754fa769a
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 4 04:06:57 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 4 23:58:28 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef728db1
7
8 dev-lisp/sbcl: drop 1.3.11
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-lisp/sbcl/Manifest | 4 -
13 dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch | 350 ---------------------
14 dev-lisp/sbcl/files/concurrency-test-1.2.6.patch | 24 --
15 dev-lisp/sbcl/files/gentoo-fix_install_man.patch | 12 -
16 ...7-gentoo-fix_nopie_for_hardened_toolchain.patch | 22 --
17 dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch | 12 -
18 .../sbcl/files/sbcl-1.2.13-verbose-build.patch | 25 --
19 dev-lisp/sbcl/files/sbcl-1.3.11-config.patch | 16 -
20 dev-lisp/sbcl/sbcl-1.3.11.ebuild | 230 --------------
21 9 files changed, 695 deletions(-)
22
23 diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
24 index f574bf1933ee..dbf9c6c281c7 100644
25 --- a/dev-lisp/sbcl/Manifest
26 +++ b/dev-lisp/sbcl/Manifest
27 @@ -5,11 +5,7 @@ DIST sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 8217590 BLAKE2B 68da614df7d27ecf0
28 DIST sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 10038928 BLAKE2B b434f65e9e42341645ac91c8f35ffeb6d2d7f043544ca9af7c519a46df15cee6d2fe4d0a56c10643c6f263e8deb75bcfb00cc399d1f32c10d53c20a9842c45db SHA512 c271796f854fe884e0d8aa6504bbe2e6c078de1555fc9a823463640cfd8c793dbddcb3f32932788d84a41e2b8a085b95c97c13a15c43fc909dcaad18ce25f215
29 DIST sbcl-1.2.7-powerpc-linux-binary.tar.bz2 9884585 BLAKE2B 1870da882fc5e466eaf5e96ed46aed600660bdfe836eabe145cf9ea4713e537a7d45dd76538d899801d0e3ea944c4ccfff1c9688fc695890bb4cac69135ef046 SHA512 7b9fef12d3d6397adec6a0c26d1431a18b8d91b5bf009034eb2501de9fd60dc04dd2e3cd2d9feb9204d4631360aea88ba07a9ad75dad0767b5dcc5e62e84e790
30 DIST sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 10438955 BLAKE2B ca9cd3a55873c648940793ae9fb92dde5e4569b7392932771b31dc71da380267556b3ceb8b099f62576b76d77395123735232c43c0ed1f934d1e004a6194d0fa SHA512 9566cebf8fc29ead1f919309e3f98aeb618e97b34c80f53d1f739f1a3f4ef4cbaebd1c67f0b32172a0cdf14dc405eb75d0e916dedf3b8a758cdec2368d25f5c1
31 -DIST sbcl-1.2.7-x86-linux-binary.tar.bz2 10516485 BLAKE2B 4036684f398c0766d55a6089fb67ae23520fc949b39525b2ac005f2665cdee8c0901a638e5dfc8e78e5f80963331a5fe2ddd4b0108ddaea063fabfd1d5829f72 SHA512 ca09beeafeb40f21eb1a377f04a69d57feb5549fa63aadf2e39aa65f3875418bdab755e22b567b3f2c514fb94534b739a57606288912ffc5cddf370a400e9e5c
32 DIST sbcl-1.2.7-x86-solaris-binary.tar.bz2 10351529 BLAKE2B 9b7324c8177856c6024220ce71070a1a51b93fa9352fe692c3fd5afa9b6cdcbb361c54e354ab1cc1153e6bf15cb0c5fc267c3da03addd5d35fbec840f72a7c06 SHA512 b30d40f0095bb43719ba2e1a619f53fe5f0bccaa08a35481bc5feeb0dd5b540018a9ec9f61799de89991a85750577922cb4e56db4d7dab8f07e18bbc643bdad1
33 -DIST sbcl-1.3.11-source.tar.bz2 5790557 BLAKE2B d6b493d880ab2481f18381475165a3eed585fa46e626eb1e762cced29a6a7315be638df6f44ffdc694d8fb55509f912267a7dbe8892b6672eb56e839f55908ff SHA512 07cce0b33f1d41bc208827d228ae356b56165bb55fab72c48973a15a63e2e680aafc16db67d36cc4952f71101faaacafd9660276cd67673314f1699d6a91af82
34 -DIST sbcl-1.3.11-x86-64-linux-binary.tar.bz2 9248214 BLAKE2B f1f6ebbec168a47d7405c15c63a70f10afad2d271d17dfa461f94bd8b1a1c21506a3a9c1d7ffe2501cc70419406e0d73b53a34ff9ff003e4791170101b7b1293 SHA512 ffb443f9e3ede2f9dbdc1bf28554bd59ef1fd5ad855465ee10f9835221fde20211188e881be854b4760870b122dfc6c5ad5c8cad1bea613ffb3b6a6f67a36056
35 -DIST sbcl-1.3.9-armhf-linux-binary.tar.bz2 9161130 BLAKE2B 0dbfe39803d6e3955124fa1a619da7b6d4ec9e7d6eb78e868508c61bf478a980cb15ba427ef0b38d0f051ce38b881020534c0d37bfbcd81a8d763654283669ec SHA512 309e2ac7ef9ac95bf751432cf243af0de022c5b21054df2bf4e99da4ff087218af72b0ab3be69214eba3df1b6bbe707cc28840508e960c5d2ed2af0e86de3fdd
36 DIST sbcl-1.4.11-armhf-linux-binary.tar.bz2 9767589 BLAKE2B 2949338bc19973e0ca38f435caaa4c991a6c86d70dc092a4f1b6ec3eefa47af76f2a0c3fd8a4f8004127f4b8b3666a5cf4260b6ab56802308880067e4eaf8568 SHA512 297edddc36e9b9de080f9e25faa323e23877af234104b4b7e0fe2b74f0dd117d9cf0caa87b79718a8b071bcb5e97c8118f1d11af0e4aba2a961beb40c4dc99cb
37 DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01edc3bee7fe6c2aaf07b7bd1fc55d408dee7ac95e8f3761a194bf9e8efb734179a7eff04cdae2fe5ba4a9ba5ab06f7322ac1550d142cc SHA512 39bbd735b242aa0bbac05c6f4dbe28cb45e01684db7e5b4f1e51f995a9f9d5b484f63cc4243f472f72b3b1e6c4cd2268a7e812b15426eca5cf9a1fede10f44bb
38 DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38
39
40 diff --git a/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch b/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch
41 deleted file mode 100644
42 index 88f6fa588cee..000000000000
43 --- a/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch
44 +++ /dev/null
45 @@ -1,350 +0,0 @@
46 -diff -r -U2 sbcl-1.2.11.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-1.2.11/contrib/sb-bsd-sockets/tests.lisp
47 ---- sbcl-1.2.11.orig/contrib/sb-bsd-sockets/tests.lisp 2015-04-27 20:56:47.000000000 +0600
48 -+++ sbcl-1.2.11/contrib/sb-bsd-sockets/tests.lisp 2015-04-28 22:27:32.588146072 +0600
49 -@@ -36,13 +36,13 @@
50 - ;;; Apparently getprotobyname_r on FreeBSD says -1 and EINTR
51 - ;;; for unknown protocols...
52 --#-(and freebsd sb-thread)
53 --#-(and dragonfly sb-thread)
54 --(deftest get-protocol-by-name/error
55 -- (handler-case (get-protocol-by-name "nonexistent-protocol")
56 -- (unknown-protocol ()
57 -- t)
58 -- (:no-error ()
59 -- nil))
60 -- t)
61 -+;#-(and freebsd sb-thread)
62 -+;#-(and dragonfly sb-thread)
63 -+;(deftest get-protocol-by-name/error
64 -+; (handler-case (get-protocol-by-name "nonexistent-protocol")
65 -+; (unknown-protocol ()
66 -+; t)
67 -+; (:no-error ()
68 -+; nil))
69 -+; t)
70 -
71 - (deftest make-inet-socket.smoke
72 -@@ -92,19 +92,19 @@
73 - t)
74 -
75 --#-win32
76 --(deftest make-inet6-socket.smoke
77 -- (handler-case
78 -- (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
79 -- (> (socket-file-descriptor s) 1))
80 -- (address-family-not-supported () t))
81 -- t)
82 --
83 --#-win32
84 --(deftest make-inet6-socket.keyword
85 -- (handler-case
86 -- (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
87 -- (> (socket-file-descriptor s) 1))
88 -- (address-family-not-supported () t))
89 -- t)
90 -+;#-win32
91 -+;(deftest make-inet6-socket.smoke
92 -+; (handler-case
93 -+; (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
94 -+; (> (socket-file-descriptor s) 1))
95 -+; (address-family-not-supported () t))
96 -+; t)
97 -+
98 -+;#-win32
99 -+;(deftest make-inet6-socket.keyword
100 -+; (handler-case
101 -+; (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
102 -+; (> (socket-file-descriptor s) 1))
103 -+; (address-family-not-supported () t))
104 -+; t)
105 -
106 - (deftest* (non-block-socket)
107 -@@ -114,52 +114,52 @@
108 - t)
109 -
110 --(deftest inet-socket-bind
111 -- (let* ((tcp (get-protocol-by-name "tcp"))
112 -- (address (make-inet-address "127.0.0.1"))
113 -- (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
114 -- (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
115 -- (unwind-protect
116 -- ;; Given the functions we've got so far, if you can think of a
117 -- ;; better way to make sure the bind succeeded than trying it
118 -- ;; twice, let me know
119 -- (progn
120 -- (socket-bind s1 address 0)
121 -- (handler-case
122 -- (let ((port (nth-value 1 (socket-name s1))))
123 -- (socket-bind s2 address port)
124 -- nil)
125 -- (address-in-use-error () t)))
126 -- (socket-close s1)
127 -- (socket-close s2)))
128 -- t)
129 --
130 --#-win32
131 --(deftest inet6-socket-bind
132 -- (handler-case
133 -- (let* ((tcp (get-protocol-by-name "tcp"))
134 -- (address (make-inet6-address "::1"))
135 -- (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
136 -- (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
137 -- (unwind-protect
138 -- ;; Given the functions we've got so far, if you can think of a
139 -- ;; better way to make sure the bind succeeded than trying it
140 -- ;; twice, let me know
141 -- (handler-case
142 -- (socket-bind s1 address 0)
143 -- (socket-error ()
144 -- ;; This may mean no IPv6 support, can't fail a test
145 -- ;; because of that (address-family-not-supported doesn't catch that)
146 -- t)
147 -- (:no-error (x)
148 -- (declare (ignore x))
149 -- (handler-case
150 -- (let ((port (nth-value 1 (socket-name s1))))
151 -- (socket-bind s2 address port)
152 -- nil)
153 -- (address-in-use-error () t))))
154 -- (socket-close s1)
155 -- (socket-close s2)))
156 -- (address-family-not-supported () t))
157 -- t)
158 -+;(deftest inet-socket-bind
159 -+; (let* ((tcp (get-protocol-by-name "tcp"))
160 -+; (address (make-inet-address "127.0.0.1"))
161 -+; (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
162 -+; (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
163 -+; (unwind-protect
164 -+; ;; Given the functions we've got so far, if you can think of a
165 -+; ;; better way to make sure the bind succeeded than trying it
166 -+; ;; twice, let me know
167 -+; (progn
168 -+; (socket-bind s1 address 0)
169 -+; (handler-case
170 -+; (let ((port (nth-value 1 (socket-name s1))))
171 -+; (socket-bind s2 address port)
172 -+; nil)
173 -+; (address-in-use-error () t)))
174 -+; (socket-close s1)
175 -+; (socket-close s2)))
176 -+; t)
177 -+
178 -+;#-win32
179 -+;(deftest inet6-socket-bind
180 -+; (handler-case
181 -+; (let* ((tcp (get-protocol-by-name "tcp"))
182 -+; (address (make-inet6-address "::1"))
183 -+; (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
184 -+; (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
185 -+; (unwind-protect
186 -+; ;; Given the functions we've got so far, if you can think of a
187 -+; ;; better way to make sure the bind succeeded than trying it
188 -+; ;; twice, let me know
189 -+; (handler-case
190 -+; (socket-bind s1 address 0)
191 -+; (socket-error ()
192 -+; ;; This may mean no IPv6 support, can't fail a test
193 -+; ;; because of that (address-family-not-supported doesn't catch that)
194 -+; t)
195 -+; (:no-error (x)
196 -+; (declare (ignore x))
197 -+; (handler-case
198 -+; (let ((port (nth-value 1 (socket-name s1))))
199 -+; (socket-bind s2 address port)
200 -+; nil)
201 -+; (address-in-use-error () t))))
202 -+; (socket-close s1)
203 -+; (socket-close s2)))
204 -+; (address-family-not-supported () t))
205 -+; t)
206 -
207 - (deftest* (simple-sockopt-test)
208 -@@ -228,35 +228,35 @@
209 - ;;; the message ended up
210 -
211 --#-win32
212 --(deftest simple-local-client
213 -- (progn
214 -- ;; SunOS (Solaris) and Darwin systems don't have a socket at
215 -- ;; /dev/log. We might also be building in a chroot or
216 -- ;; something, so don't fail this test just because the file is
217 -- ;; unavailable, or if it's a symlink to some weird character
218 -- ;; device.
219 -- (when (block nil
220 -- (handler-bind ((sb-posix:syscall-error
221 -- (lambda (e)
222 -- (declare (ignore e))
223 -- (return nil))))
224 -- (sb-posix:s-issock
225 -- (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
226 -- (let ((s (make-instance 'local-socket :type :datagram)))
227 -- (format t "Connecting ~A... " s)
228 -- (finish-output)
229 -- (handler-case
230 -- (socket-connect s "/dev/log")
231 -- (sb-bsd-sockets::socket-error ()
232 -- (setq s (make-instance 'local-socket :type :stream))
233 -- (format t "failed~%Retrying with ~A... " s)
234 -- (finish-output)
235 -- (socket-connect s "/dev/log")))
236 -- (format t "ok.~%")
237 -- (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
238 -- (format stream
239 -- "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored"))))
240 -- t)
241 -- t)
242 -+;#-win32
243 -+;(deftest simple-local-client
244 -+; (progn
245 -+; ;; SunOS (Solaris) and Darwin systems don't have a socket at
246 -+; ;; /dev/log. We might also be building in a chroot or
247 -+; ;; something, so don't fail this test just because the file is
248 -+; ;; unavailable, or if it's a symlink to some weird character
249 -+; ;; device.
250 -+; (when (block nil
251 -+; (handler-bind ((sb-posix:syscall-error
252 -+; (lambda (e)
253 -+; (declare (ignore e))
254 -+; (return nil))))
255 -+; (sb-posix:s-issock
256 -+; (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
257 -+; (let ((s (make-instance 'local-socket :type :datagram)))
258 -+; (format t "Connecting ~A... " s)
259 -+; (finish-output)
260 -+; (handler-case
261 -+; (socket-connect s "/dev/log")
262 -+; (sb-bsd-sockets::socket-error ()
263 -+; (setq s (make-instance 'local-socket :type :stream))
264 -+; (format t "failed~%Retrying with ~A... " s)
265 -+; (finish-output)
266 -+; (socket-connect s "/dev/log")))
267 -+; (format t "ok.~%")
268 -+; (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
269 -+; (format stream
270 -+; "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored"))))
271 -+; t)
272 -+; t)
273 -
274 -
275 -@@ -373,58 +373,58 @@
276 - len address port (subseq buf 0 (min 10 len)))))))
277 -
278 --#+sb-thread
279 --(deftest interrupt-io
280 -- (let (result)
281 -- (labels
282 -- ((client (port)
283 -- (setf result
284 -- (let ((s (make-instance 'inet-socket
285 -- :type :stream
286 -- :protocol :tcp)))
287 -- (socket-connect s #(127 0 0 1) port)
288 -- (let ((stream (socket-make-stream s
289 -- :input t
290 -- :output t
291 -- :buffering :none)))
292 -- (handler-case
293 -- (prog1
294 -- (catch 'stop
295 -- (progn
296 -- (read-char stream)
297 -- (sleep 0.1)
298 -- (sleep 0.1)
299 -- (sleep 0.1)))
300 -- (close stream))
301 -- (error (c)
302 -- c))))))
303 -- (server ()
304 -- (let ((s (make-instance 'inet-socket
305 -- :type :stream
306 -- :protocol :tcp)))
307 -- (setf (sockopt-reuse-address s) t)
308 -- (socket-bind s (make-inet-address "127.0.0.1") 0)
309 -- (socket-listen s 5)
310 -- (multiple-value-bind (* port)
311 -- (socket-name s)
312 -- (let* ((client (sb-thread:make-thread
313 -- (lambda () (client port))))
314 -- (r (socket-accept s))
315 -- (stream (socket-make-stream r
316 -- :input t
317 -- :output t
318 -- :buffering :none))
319 -- (ok :ok))
320 -- (socket-close s)
321 -- (sleep 5)
322 -- (sb-thread:interrupt-thread client
323 -- (lambda () (throw 'stop ok)))
324 -- (sleep 5)
325 -- (setf ok :not-ok)
326 -- (write-char #\x stream)
327 -- (close stream)
328 -- (socket-close r))))))
329 -- (server))
330 -- result)
331 -- :ok)
332 -+;#+sb-thread
333 -+;(deftest interrupt-io
334 -+; (let (result)
335 -+; (labels
336 -+; ((client (port)
337 -+; (setf result
338 -+; (let ((s (make-instance 'inet-socket
339 -+; :type :stream
340 -+; :protocol :tcp)))
341 -+; (socket-connect s #(127 0 0 1) port)
342 -+; (let ((stream (socket-make-stream s
343 -+; :input t
344 -+; :output t
345 -+; :buffering :none)))
346 -+; (handler-case
347 -+; (prog1
348 -+; (catch 'stop
349 -+; (progn
350 -+; (read-char stream)
351 -+; (sleep 0.1)
352 -+; (sleep 0.1)
353 -+; (sleep 0.1)))
354 -+; (close stream))
355 -+; (error (c)
356 -+; c))))))
357 -+; (server ()
358 -+; (let ((s (make-instance 'inet-socket
359 -+; :type :stream
360 -+; :protocol :tcp)))
361 -+; (setf (sockopt-reuse-address s) t)
362 -+; (socket-bind s (make-inet-address "127.0.0.1") 0)
363 -+; (socket-listen s 5)
364 -+; (multiple-value-bind (* port)
365 -+; (socket-name s)
366 -+; (let* ((client (sb-thread:make-thread
367 -+; (lambda () (client port))))
368 -+; (r (socket-accept s))
369 -+; (stream (socket-make-stream r
370 -+; :input t
371 -+; :output t
372 -+; :buffering :none))
373 -+; (ok :ok))
374 -+; (socket-close s)
375 -+; (sleep 5)
376 -+; (sb-thread:interrupt-thread client
377 -+; (lambda () (throw 'stop ok)))
378 -+; (sleep 5)
379 -+; (setf ok :not-ok)
380 -+; (write-char #\x stream)
381 -+; (close stream)
382 -+; (socket-close r))))))
383 -+; (server))
384 -+; result)
385 -+; :ok)
386 -
387 - (defmacro with-client-and-server ((server-socket-var client-socket-var) &body body)
388 -@@ -485,4 +485,5 @@
389 - client server (unsigned-byte 8) ,direction)))))
390 -
391 -- (define-shutdown-tests :output)
392 -- (define-shutdown-tests :io))
393 -+; (define-shutdown-tests :output)
394 -+; (define-shutdown-tests :io))
395 -+)
396
397 diff --git a/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch b/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch
398 deleted file mode 100644
399 index b85fc168ed0e..000000000000
400 --- a/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch
401 +++ /dev/null
402 @@ -1,24 +0,0 @@
403 -diff -Nuar a/contrib/sb-concurrency/tests/test-frlock.lisp b/contrib/sb-concurrency/tests/test-frlock.lisp
404 ---- a/contrib/sb-concurrency/tests/test-frlock.lisp 2014-11-29 19:56:58.000000000 +0100
405 -+++ b/contrib/sb-concurrency/tests/test-frlock.lisp 2014-12-16 23:52:18.569947139 +0100
406 -@@ -22,9 +22,9 @@
407 - #+openbsd 0.01
408 - #-openbsd 0.0001)
409 -
410 --(defun test-frlocks (&key (reader-count 100) (read-count 1000000)
411 -+(defun test-frlocks (&key (reader-count 50) (read-count 500000)
412 - (outer-read-pause 0) (inner-read-pause 0)
413 -- (writer-count 10) (write-count (/ 1 *minimum-sleep*))
414 -+ (writer-count 10) (write-count 5000)
415 - (outer-write-pause *minimum-sleep*) (inner-write-pause 0))
416 - (let ((rw (make-frlock))
417 - (a 0)
418 -@@ -87,7 +87,7 @@
419 - #+sb-thread
420 - (deftest* (frlock.1 :fails-on :win32)
421 - (handler-case
422 -- (sb-ext:with-timeout 60 (test-frlocks))
423 -+ (sb-ext:with-timeout 240 (test-frlocks))
424 - (sb-ext:timeout (c)
425 - (error "~A" c)))
426 - nil
427
428 diff --git a/dev-lisp/sbcl/files/gentoo-fix_install_man.patch b/dev-lisp/sbcl/files/gentoo-fix_install_man.patch
429 deleted file mode 100644
430 index 87a5f43c0c13..000000000000
431 --- a/dev-lisp/sbcl/files/gentoo-fix_install_man.patch
432 +++ /dev/null
433 @@ -1,12 +0,0 @@
434 -diff --git a/install.sh b/install.sh
435 -index 1400791..ac149c1 100644
436 ---- a/install.sh
437 -+++ b/install.sh
438 -@@ -106,6 +106,7 @@ echo "Documentation:"
439 -
440 - # man
441 - cp doc/sbcl.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl.1"
442 -+cp doc/sbcl-asdf-install.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl-asdf-install.1"
443 -
444 - # info
445 - for info in doc/manual/*.info
446
447 diff --git a/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch b/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
448 deleted file mode 100644
449 index bf03ada518fe..000000000000
450 --- a/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
451 +++ /dev/null
452 @@ -1,22 +0,0 @@
453 ---- sbcl-1.1.17-orig/src/runtime/Config.x86-linux 2014-03-31 03:14:22.000000000 +1100
454 -+++ sbcl-1.1.17/src/runtime/Config.x86-linux 2014-04-28 15:34:59.822482441 +1000
455 -@@ -27,7 +27,7 @@
456 - # (You *are* encouraged to design and implement a coherent stable
457 - # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
458 - # working on one and it would be a nice thing to have.)
459 --LINKFLAGS += -Wl,--export-dynamic -m32
460 -+LINKFLAGS += -Wl,--export-dynamic -m32 -nopie
461 - OS_LIBS = -ldl
462 -
463 - ifdef LISP_FEATURE_LARGEFILE
464 ---- sbcl-1.1.17-orig/src/runtime/Config.x86-64-linux 2014-03-31 03:14:22.000000000 +1100
465 -+++ sbcl-1.1.17/src/runtime/Config.x86-64-linux 2014-04-28 15:35:22.364623003 +1000
466 -@@ -27,7 +27,7 @@
467 - # (You *are* encouraged to design and implement a coherent stable
468 - # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
469 - # working on one and it would be a nice thing to have.)
470 --LINKFLAGS += -Wl,--export-dynamic
471 -+LINKFLAGS += -Wl,--export-dynamic -nopie
472 - OS_LIBS = -ldl
473 -
474 - ifdef LISP_FEATURE_LARGEFILE
475
476 diff --git a/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch b/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch
477 deleted file mode 100644
478 index 850fd5d9dba7..000000000000
479 --- a/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch
480 +++ /dev/null
481 @@ -1,12 +0,0 @@
482 -diff -r -U2 sbcl-1.2.11.orig/src/runtime/Config.x86-sunos sbcl-1.2.11/src/runtime/Config.x86-sunos
483 ---- sbcl-1.2.11.orig/src/runtime/Config.x86-sunos 2015-04-27 20:56:50.000000000 +0600
484 -+++ sbcl-1.2.11/src/runtime/Config.x86-sunos 2015-04-28 22:38:01.569103626 +0600
485 -@@ -12,6 +12,6 @@
486 - CC=gcc
487 - CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
488 --NM = nm -xgp
489 --GREP = ggrep
490 -+NM = nm -t x -p
491 -+GREP = grep
492 -
493 - ASSEM_SRC = x86-assem.S ldso-stubs.S
494
495 diff --git a/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch b/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch
496 deleted file mode 100644
497 index ade4f0868c67..000000000000
498 --- a/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch
499 +++ /dev/null
500 @@ -1,25 +0,0 @@
501 -diff -r -U2 sbcl-1.2.13.orig/make.sh sbcl-1.2.13/make.sh
502 ---- sbcl-1.2.13.orig/make.sh 2015-06-29 01:24:03.000000000 +0600
503 -+++ sbcl-1.2.13/make.sh 2015-06-29 15:53:04.430927942 +0600
504 -@@ -25,5 +25,5 @@
505 - # any --xc-host parameter should be suitable for the host machine
506 - # instead of the target.
507 --sh make-config.sh "$@" || exit $?
508 -+sh -x make-config.sh "$@" || exit $?
509 -
510 - . output/prefix.def
511 -@@ -70,9 +70,9 @@
512 - # and the make-target-*.sh scripts will take care of transferring the
513 - # necessary files.
514 --time sh make-host-1.sh
515 --time sh make-target-1.sh
516 --time sh make-host-2.sh
517 --time sh make-target-2.sh
518 --time sh make-target-contrib.sh
519 -+time sh -x make-host-1.sh
520 -+time sh -x make-target-1.sh
521 -+time sh -x make-host-2.sh
522 -+time sh -x make-target-2.sh
523 -+time sh -x make-target-contrib.sh
524 -
525 - NCONTRIBS=`find contrib -name Makefile -print | wc -l`
526
527 diff --git a/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch b/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch
528 deleted file mode 100644
529 index e23f1e6d9bcb..000000000000
530 --- a/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch
531 +++ /dev/null
532 @@ -1,16 +0,0 @@
533 -diff -r -U2 sbcl-1.3.11.orig/src/runtime/Config.x86-64-linux sbcl-1.3.11/src/runtime/Config.x86-64-linux
534 ---- sbcl-1.3.11.orig/src/runtime/Config.x86-64-linux 2016-10-30 23:28:43.000000000 +0700
535 -+++ sbcl-1.3.11/src/runtime/Config.x86-64-linux 2016-11-16 23:27:37.248815622 +0700
536 -@@ -58,12 +58,4 @@
537 - endif
538 -
539 --# The following works for Ubuntu 16.10. There must be a better way to
540 --# do this across various flavors of linux.
541 --ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e no-pie),)
542 --CFLAGS += -fno-pie
543 --LINKFLAGS += -no-pie
544 --LDFLAGS += -no-pie
545 --endif
546 --
547 - # Nothing to do for after-grovel-headers.
548 - .PHONY: after-grovel-headers
549
550 diff --git a/dev-lisp/sbcl/sbcl-1.3.11.ebuild b/dev-lisp/sbcl/sbcl-1.3.11.ebuild
551 deleted file mode 100644
552 index 8e3fed30c22a..000000000000
553 --- a/dev-lisp/sbcl/sbcl-1.3.11.ebuild
554 +++ /dev/null
555 @@ -1,230 +0,0 @@
556 -# Copyright 1999-2022 Gentoo Authors
557 -# Distributed under the terms of the GNU General Public License v2
558 -
559 -EAPI=6
560 -inherit multilib flag-o-matic pax-utils toolchain-funcs
561 -
562 -#same order as http://www.sbcl.org/platform-table.html
563 -BV_X86=1.2.7
564 -BV_AMD64=1.3.11
565 -BV_PPC=1.2.7
566 -BV_SPARC=1.0.28
567 -BV_ALPHA=1.0.28
568 -BV_ARM=1.3.9
569 -BV_ARM64=1.3.11
570 -BV_PPC_MACOS=1.0.47
571 -BV_X64_MACOS=1.2.11
572 -BV_SPARC_SOLARIS=1.0.23
573 -BV_X86_SOLARIS=1.2.7
574 -BV_X64_SOLARIS=1.2.7
575 -
576 -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
577 -HOMEPAGE="http://sbcl.sourceforge.net/"
578 -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
579 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
580 - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
581 - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
582 - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
583 - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
584 - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
585 - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
586 - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
587 - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
588 - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
589 - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
590 -
591 -LICENSE="MIT"
592 -SLOT="0/${PV}"
593 -KEYWORDS="-* amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
594 -IUSE="debug doc source +threads +unicode zlib"
595 -
596 -CDEPEND=">=dev-lisp/asdf-3.1:="
597 -DEPEND="${CDEPEND}
598 - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
599 -RDEPEND="${CDEPEND}
600 - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
601 -
602 -# Disable warnings about executable stacks, as this won't be fixed soon by upstream
603 -QA_EXECSTACK="usr/bin/sbcl"
604 -
605 -CONFIG="${S}/customize-target-features.lisp"
606 -ENVD="${T}/50sbcl"
607 -
608 -# Prevent ASDF from using the system libraries
609 -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
610 -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
611 -
612 -usep() {
613 - use ${1} && echo "true" || echo "false"
614 -}
615 -
616 -sbcl_feature() {
617 - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
618 -}
619 -
620 -sbcl_apply_features() {
621 - sed 's/^X//' > "${CONFIG}" <<-'EOF'
622 - (lambda (list)
623 - X (flet ((enable (x) (pushnew x list))
624 - X (disable (x) (setf list (remove x list))))
625 - EOF
626 - if use x86 || use amd64; then
627 - sbcl_feature "$(usep threads)" ":sb-thread"
628 - fi
629 - sbcl_feature "true" ":sb-ldb"
630 - sbcl_feature "false" ":sb-test"
631 - sbcl_feature "$(usep unicode)" ":sb-unicode"
632 - sbcl_feature "$(usep zlib)" ":sb-core-compression"
633 - sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
634 - sed 's/^X//' >> "${CONFIG}" <<-'EOF'
635 - X )
636 - X list)
637 - EOF
638 - cat "${CONFIG}"
639 -}
640 -
641 -src_unpack() {
642 - unpack ${A}
643 - mv sbcl-*-* sbcl-binary || die
644 - cd "${S}"
645 -}
646 -
647 -src_prepare() {
648 - eapply "${FILESDIR}"/gentoo-fix_install_man.patch
649 - # bug #468482
650 - eapply "${FILESDIR}"/concurrency-test-1.2.6.patch
651 - # bugs #486552, #527666, #517004
652 - eapply "${FILESDIR}"/bsd-sockets-test-1.2.11.patch
653 - # bugs #560276, #561018
654 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
655 - # bug #599902
656 - eapply "${FILESDIR}"/${PN}-1.3.11-config.patch
657 -
658 - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
659 - eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
660 -
661 - # To make the hardened compiler NOT compile with -fPIE -pie
662 - if gcc-specs-pie ; then
663 - einfo "Disabling PIE..."
664 - eapply "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
665 - fi
666 -
667 - eapply_user
668 -
669 - # bug #526194
670 - sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
671 - -e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
672 - -i src/runtime/GNUmakefile || die
673 -
674 - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
675 - -i make-config.sh || die
676 -
677 - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
678 -
679 - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
680 -
681 - # Some shells(such as dash) don't have "time" as builtin
682 - # and we don't want to DEPEND on sys-process/time
683 - sed "s,^time ,," -i make.sh || die
684 - sed "s,/lib,/$(get_libdir),g" -i install.sh || die
685 - # #define SBCL_HOME ...
686 - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
687 - # change location of /etc/sbclrc ...
688 - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
689 -
690 - find . -type f -name .cvsignore -delete
691 -}
692 -
693 -src_configure() {
694 - # customizing SBCL version as per
695 - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
696 - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
697 -
698 - # applying customizations
699 - sbcl_apply_features
700 -}
701 -
702 -src_compile() {
703 - local bindir="${WORKDIR}"/sbcl-binary
704 -
705 - strip-unsupported-flags ; filter-flags -fomit-frame-pointer
706 -
707 - # clear the environment to get rid of non-ASCII strings, see bug 174702
708 - # set HOME for paludis
709 - env - HOME="${T}" PATH="${PATH}" \
710 - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
711 - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
712 - GNUMAKE=make ./make.sh \
713 - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
714 - || die "make failed"
715 -
716 - # need to set HOME because libpango(used by graphviz) complains about it
717 - if use doc; then
718 - env - HOME="${T}" PATH="${PATH}" \
719 - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
720 - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
721 - make -C doc/manual info html || die "Cannot build manual"
722 - env - HOME="${T}" PATH="${PATH}" \
723 - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
724 - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
725 - make -C doc/internals info html || die "Cannot build internal docs"
726 - fi
727 -}
728 -
729 -src_test() {
730 - ewarn "Unfortunately, it is known that some tests fail eg."
731 - ewarn "run-program.impure.lisp. This is an issue of the upstream's"
732 - ewarn "development and not of Gentoo's side. Please, before filing"
733 - ewarn "any bug(s) search for older submissions. Thank you."
734 - time ( cd tests && sh run-tests.sh )
735 -}
736 -
737 -src_install() {
738 - # install system-wide initfile
739 - dodir /etc/
740 - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
741 - ;;; The following is required if you want source location functions to
742 - ;;; work in SLIME, for example.
743 - X
744 - (setf (logical-pathname-translations "SYS")
745 - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
746 - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
747 - X
748 - ;;; Setup ASDF2
749 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
750 - EOF
751 -
752 - # Install documentation
753 - unset SBCL_HOME
754 - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
755 - sh install.sh || die "install.sh failed"
756 -
757 - # bug #517008
758 - pax-mark -mr "${D}"/usr/bin/sbcl
759 -
760 - # rm empty directories lest paludis complain about this
761 - find "${ED}" -empty -type d -exec rmdir -v {} +
762 -
763 - if use doc; then
764 - dodoc -r doc/internals/sbcl-internals
765 -
766 - doinfo doc/manual/*.info*
767 - doinfo doc/internals/sbcl-internals.info
768 -
769 - docinto internals-notes
770 - dodoc doc/internals-notes/*
771 - else
772 - rm -Rv "${ED}/usr/share/doc/${PF}" || die
773 - fi
774 -
775 - # install the SBCL source
776 - if use source; then
777 - ./clean.sh
778 - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
779 - fi
780 -
781 - # necessary for running newly-saved images
782 - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
783 - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
784 - doenvd "${ENVD}"
785 -}