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: dev-lisp/clisp/, dev-lisp/clisp/files/
Date: Mon, 19 Feb 2018 18:36:59
Message-Id: 1519065459.30bab251f0c9258dbe3029dd780bb59c6e638d09.nimiux@gentoo
1 commit: 30bab251f0c9258dbe3029dd780bb59c6e638d09
2 Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 19 18:37:39 2018 +0000
4 Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 19 18:37:39 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=30bab251
7
8 dev-lisp/clisp: Bumps version to 2.49.90
9
10 dev-lisp/clisp/clisp-2.49-r100.ebuild | 150 --------------------
11 dev-lisp/clisp/clisp-2.49-r101.ebuild | 153 ---------------------
12 .../{clisp-2.49.60.ebuild => clisp-2.49.90.ebuild} | 10 +-
13 dev-lisp/clisp/clisp-2.50_pre20130414.ebuild | 144 -------------------
14 .../clisp-2.49-bits_ipctypes_to_sys_ipc.patch | 21 ---
15 dev-lisp/clisp/files/clisp-2.49-get_hostname.patch | 56 --------
16 dev-lisp/clisp/files/clisp-2.49-readline-7.patch | 10 --
17 dev-lisp/clisp/files/clisp-2.49-tinfo.patch | 15 --
18 ...h => clisp-2.49.90-after_glibc_cfree_bdb.patch} | 80 ++++-------
19 ...2.50_pre20130414-bits_ipctypes_to_sys_ipc.patch | 12 --
20 dev-lisp/clisp/metadata.xml | 31 +++++
21 11 files changed, 63 insertions(+), 619 deletions(-)
22
23 diff --git a/dev-lisp/clisp/clisp-2.49-r100.ebuild b/dev-lisp/clisp/clisp-2.49-r100.ebuild
24 deleted file mode 100644
25 index 8210edc7..00000000
26 --- a/dev-lisp/clisp/clisp-2.49-r100.ebuild
27 +++ /dev/null
28 @@ -1,150 +0,0 @@
29 -# Copyright 1999-2016 Gentoo Foundation
30 -# Distributed under the terms of the GNU General Public License v2
31 -
32 -EAPI=5
33 -inherit eutils flag-o-matic multilib toolchain-funcs
34 -
35 -DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
36 -HOMEPAGE="http://clisp.sourceforge.net/"
37 -SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
38 -
39 -LICENSE="GPL-2"
40 -SLOT="2/7"
41 -KEYWORDS="~amd64 ~ppc ~sparc ~x86"
42 -IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
43 -# "jit" disabled ATM
44 -
45 -RDEPEND=">=dev-lisp/asdf-2.33-r3
46 - virtual/libiconv
47 - >=dev-libs/libsigsegv-2.4
48 - >=dev-libs/ffcall-1.10
49 - dbus? ( sys-apps/dbus )
50 - fastcgi? ( dev-libs/fcgi )
51 - gdbm? ( sys-libs/gdbm )
52 - gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 )
53 - pari? ( <sci-mathematics/pari-2.5.0 )
54 - postgres? ( >=dev-db/postgresql-8.0:* )
55 - readline? ( >=sys-libs/readline-7.0:0= )
56 - pcre? ( dev-libs/libpcre:3 )
57 - svm? ( sci-libs/libsvm )
58 - zlib? ( sys-libs/zlib )
59 - X? ( x11-libs/libXpm )
60 - hyperspec? ( dev-lisp/hyperspec )
61 - berkdb? ( sys-libs/db:4.8 )"
62 -# jit? ( >=dev-libs/lightning-1.2 )
63 -
64 -DEPEND="${RDEPEND}
65 - X? ( x11-misc/imake x11-proto/xextproto )"
66 -
67 -enable_modules() {
68 - [[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
69 - for m in "$@" ; do
70 - einfo "enabling module $m"
71 - myconf+=" --with-module=${m}"
72 - done
73 -}
74 -
75 -BUILDDIR="builddir"
76 -
77 -# modules not enabled:
78 -# * berkdb: must figure out a way to make the configure script pick up the
79 -# currect version of the library and headers
80 -# * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
81 -# * matlab, netica: not in portage
82 -# * oracle: can't install oracle-instantclient
83 -
84 -src_prepare() {
85 - # More than -O1 breaks alpha/ia64
86 - if use alpha || use ia64; then
87 - sed -i -e 's/-O2//g' src/makemake.in || die
88 - fi
89 - epatch "${FILESDIR}"/${P}-bits_ipctypes_to_sys_ipc.patch
90 - epatch "${FILESDIR}"/${P}-get_hostname.patch
91 - epatch "${FILESDIR}"/${P}-tinfo.patch
92 - # bug #594552
93 - epatch "${FILESDIR}"/${P}-readline-7.patch
94 -}
95 -
96 -src_configure() {
97 - # We need this to build on alpha/ia64
98 - if use alpha || use ia64; then
99 - replace-flags -O? -O1
100 - append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
101 - fi
102 -
103 - if use x86; then
104 - append-flags -falign-functions=4
105 - fi
106 -
107 - # QA issue with lisp.run
108 - append-flags -Wa,--noexecstack
109 -
110 - # built-in features
111 - local myconf="--with-ffcall --without-dynamic-modules"
112 -# There's a problem with jit_allocai function
113 -# if use jit; then
114 -# myconf+=" --with-jitc=lightning"
115 -# fi
116 - if use threads; then
117 - myconf+=" --with-threads=POSIX_THREADS"
118 - fi
119 -
120 - # default modules
121 - enable_modules wildcard rawsock
122 - # optional modules
123 - use elibc_glibc && enable_modules bindings/glibc
124 - use X && enable_modules clx/new-clx
125 - if use postgres; then
126 - enable_modules postgresql
127 - append-cppflags -I$(pg_config --includedir)
128 - fi
129 - if use berkdb; then
130 - enable_modules berkeley-db
131 - append-cppflags -I/usr/include/db4.8
132 - fi
133 - use dbus && enable_modules dbus
134 - use fastcgi && enable_modules fastcgi
135 - use gdbm && enable_modules gdbm
136 - use gtk && enable_modules gtk2
137 - use pari && enable_modules pari
138 - use pcre && enable_modules pcre
139 - use svm && enable_modules libsvm
140 - use zlib && enable_modules zlib
141 -
142 - if use hyperspec; then
143 - CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
144 - else
145 - CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
146 - fi
147 -
148 - # configure chokes on --sysconfdir option
149 - local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \
150 - $(use_with readline) $(use_with unicode) \
151 - ${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
152 - einfo "${configure}"
153 - ${configure} || die "./configure failed"
154 -
155 - IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
156 - sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
157 - "${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
158 -}
159 -
160 -src_compile() {
161 - export VARTEXFONTS="${T}"/fonts
162 - cd "${BUILDDIR}"
163 - # parallel build fails
164 - emake -j1
165 -}
166 -
167 -src_install() {
168 - pushd "${BUILDDIR}"
169 - make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
170 - doman clisp.1
171 - dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
172 - # stripping them removes common symbols (defined but uninitialised variables)
173 - # which are then needed to build modules...
174 - export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
175 - popd
176 - dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
177 - dodoc doc/{CLOS-guide,LISP-tutorial}.txt
178 -}
179
180 diff --git a/dev-lisp/clisp/clisp-2.49-r101.ebuild b/dev-lisp/clisp/clisp-2.49-r101.ebuild
181 deleted file mode 100644
182 index 8948b19a..00000000
183 --- a/dev-lisp/clisp/clisp-2.49-r101.ebuild
184 +++ /dev/null
185 @@ -1,153 +0,0 @@
186 -# Copyright 1999-2017 Gentoo Foundation
187 -# Distributed under the terms of the GNU General Public License v2
188 -
189 -EAPI=5
190 -inherit eutils flag-o-matic multilib toolchain-funcs
191 -
192 -DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
193 -HOMEPAGE="http://clisp.sourceforge.net/"
194 -SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
195 -
196 -LICENSE="GPL-2"
197 -SLOT="2/7"
198 -KEYWORDS="~amd64 ~ppc ~sparc ~x86"
199 -IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
200 -# "jit" disabled ATM
201 -
202 -RDEPEND=">=dev-lisp/asdf-2.33-r3
203 - virtual/libiconv
204 - >=dev-libs/libsigsegv-2.4
205 - >=dev-libs/ffcall-1.10
206 - dbus? ( sys-apps/dbus )
207 - fastcgi? ( dev-libs/fcgi )
208 - gdbm? ( sys-libs/gdbm )
209 - gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 )
210 - pari? ( <sci-mathematics/pari-2.5.0 )
211 - postgres? ( >=dev-db/postgresql-8.0:* )
212 - readline? ( >=sys-libs/readline-7.0:0= )
213 - pcre? ( dev-libs/libpcre:3 )
214 - svm? ( sci-libs/libsvm )
215 - zlib? ( sys-libs/zlib )
216 - X? ( x11-libs/libXpm )
217 - hyperspec? ( dev-lisp/hyperspec )
218 - berkdb? ( sys-libs/db:4.8 )"
219 -# jit? ( >=dev-libs/lightning-1.2 )
220 -
221 -DEPEND="${RDEPEND}
222 - X? ( x11-misc/imake x11-proto/xextproto )"
223 -
224 -enable_modules() {
225 - [[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
226 - for m in "$@" ; do
227 - einfo "enabling module $m"
228 - myconf+=" --with-module=${m}"
229 - done
230 -}
231 -
232 -BUILDDIR="builddir"
233 -
234 -# modules not enabled:
235 -# * berkdb: must figure out a way to make the configure script pick up the
236 -# currect version of the library and headers
237 -# * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
238 -# * matlab, netica: not in portage
239 -# * oracle: can't install oracle-instantclient
240 -
241 -src_prepare() {
242 - # More than -O1 breaks alpha/ia64
243 - if use alpha || use ia64; then
244 - sed -i -e 's/-O2//g' src/makemake.in || die
245 - fi
246 - epatch "${FILESDIR}"/${P}-bits_ipctypes_to_sys_ipc.patch
247 - epatch "${FILESDIR}"/${P}-get_hostname.patch
248 - epatch "${FILESDIR}"/${P}-tinfo.patch
249 - # bug #594552
250 - epatch "${FILESDIR}"/${P}-readline-7.patch
251 -}
252 -
253 -src_configure() {
254 - # Bug 618170. If anyone has a better idea...
255 - append-flags -fno-pie
256 -
257 - # We need this to build on alpha/ia64
258 - if use alpha || use ia64; then
259 - replace-flags -O? -O1
260 - append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
261 - fi
262 -
263 - if use x86; then
264 - append-flags -falign-functions=4
265 - fi
266 -
267 - # QA issue with lisp.run
268 - append-flags -Wa,--noexecstack
269 -
270 - # built-in features
271 - local myconf="--with-ffcall --without-dynamic-modules"
272 -# There's a problem with jit_allocai function
273 -# if use jit; then
274 -# myconf+=" --with-jitc=lightning"
275 -# fi
276 - if use threads; then
277 - myconf+=" --with-threads=POSIX_THREADS"
278 - fi
279 -
280 - # default modules
281 - enable_modules wildcard rawsock
282 - # optional modules
283 - use elibc_glibc && enable_modules bindings/glibc
284 - use X && enable_modules clx/new-clx
285 - if use postgres; then
286 - enable_modules postgresql
287 - append-cppflags -I$(pg_config --includedir)
288 - fi
289 - if use berkdb; then
290 - enable_modules berkeley-db
291 - append-cppflags -I/usr/include/db4.8
292 - fi
293 - use dbus && enable_modules dbus
294 - use fastcgi && enable_modules fastcgi
295 - use gdbm && enable_modules gdbm
296 - use gtk && enable_modules gtk2
297 - use pari && enable_modules pari
298 - use pcre && enable_modules pcre
299 - use svm && enable_modules libsvm
300 - use zlib && enable_modules zlib
301 -
302 - if use hyperspec; then
303 - CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
304 - else
305 - CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
306 - fi
307 -
308 - # configure chokes on --sysconfdir option
309 - local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \
310 - $(use_with readline) $(use_with unicode) \
311 - ${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
312 - einfo "${configure}"
313 - ${configure} || die "./configure failed"
314 -
315 - IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
316 - sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
317 - "${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
318 -}
319 -
320 -src_compile() {
321 - export VARTEXFONTS="${T}"/fonts
322 - cd "${BUILDDIR}"
323 - # parallel build fails
324 - emake -j1
325 -}
326 -
327 -src_install() {
328 - pushd "${BUILDDIR}"
329 - make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
330 - doman clisp.1
331 - dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
332 - # stripping them removes common symbols (defined but uninitialised variables)
333 - # which are then needed to build modules...
334 - export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
335 - popd
336 - dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
337 - dodoc doc/{CLOS-guide,LISP-tutorial}.txt
338 -}
339
340 diff --git a/dev-lisp/clisp/clisp-2.49.60.ebuild b/dev-lisp/clisp/clisp-2.49.90.ebuild
341 similarity index 94%
342 rename from dev-lisp/clisp/clisp-2.49.60.ebuild
343 rename to dev-lisp/clisp/clisp-2.49.90.ebuild
344 index 84dc47a3..e1167a08 100644
345 --- a/dev-lisp/clisp/clisp-2.49.60.ebuild
346 +++ b/dev-lisp/clisp/clisp-2.49.90.ebuild
347 @@ -1,4 +1,4 @@
348 -# Copyright 1999-2017 Gentoo Foundation
349 +# Copyright 1999-2018 Gentoo Foundation
350 # Distributed under the terms of the GNU General Public License v2
351
352 EAPI=6
353 @@ -7,10 +7,10 @@ inherit eutils flag-o-matic multilib toolchain-funcs
354
355 DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
356 HOMEPAGE="http://clisp.sourceforge.net/"
357 -SRC_URI="https://haible.de/bruno/gnu/clisp-2.49.60.tar.bz2"
358 +SRC_URI="https://haible.de/bruno/gnu/${P}.tar.bz2"
359
360 LICENSE="GPL-2"
361 -SLOT="2/7"
362 +SLOT="2/8"
363 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
364 IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
365 # "jit" disabled ATM
366 @@ -66,16 +66,12 @@ src_configure() {
367 # We need this to build on alpha/ia64
368 if use alpha || use ia64; then
369 replace-flags -O? -O1
370 - append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
371 fi
372
373 if use x86; then
374 append-flags -falign-functions=4
375 fi
376
377 - # QA issue with lisp.run
378 - append-flags -Wa,--noexecstack
379 -
380 # built-in features
381 local myconf="--with-ffcall --without-dynamic-modules"
382 # There's a problem with jit_allocai function
383
384 diff --git a/dev-lisp/clisp/clisp-2.50_pre20130414.ebuild b/dev-lisp/clisp/clisp-2.50_pre20130414.ebuild
385 deleted file mode 100644
386 index 013d2623..00000000
387 --- a/dev-lisp/clisp/clisp-2.50_pre20130414.ebuild
388 +++ /dev/null
389 @@ -1,144 +0,0 @@
390 -# Copyright 1999-2017 Gentoo Foundation
391 -# Distributed under the terms of the GNU General Public License v2
392 -
393 -EAPI=5
394 -inherit flag-o-matic eutils toolchain-funcs multilib
395 -
396 -DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
397 -HOMEPAGE="http://clisp.sourceforge.net/"
398 -SRC_URI="https://deneb.cddr.org/lisp/${P}.tar.bz2"
399 -
400 -LICENSE="GPL-2"
401 -SLOT="2"
402 -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
403 -IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
404 -# "jit" disabled ATM
405 -
406 -RDEPEND=">=dev-lisp/asdf-2.33-r3
407 - virtual/libiconv
408 - >=dev-libs/libsigsegv-2.4
409 - >=dev-libs/ffcall-1.10
410 - dbus? ( sys-apps/dbus )
411 - fastcgi? ( dev-libs/fcgi )
412 - gdbm? ( sys-libs/gdbm )
413 - gtk? ( >=x11-libs/gtk+-2.10 >=gnome-base/libglade-2.6 )
414 - pari? ( >=sci-mathematics/pari-2.3.0 )
415 - postgres? ( >=dev-db/postgresql-base-8.0 )
416 - readline? ( >=sys-libs/readline-5.0 )
417 - pcre? ( dev-libs/libpcre )
418 - svm? ( sci-libs/libsvm )
419 - zlib? ( sys-libs/zlib )
420 - X? ( x11-libs/libXpm )
421 - hyperspec? ( dev-lisp/hyperspec )
422 - berkdb? ( sys-libs/db:4.8 )"
423 -# jit? ( >=dev-libs/lightning-1.2 )
424 -
425 -DEPEND="${RDEPEND}
426 - X? ( x11-misc/imake x11-proto/xextproto )"
427 -
428 -enable_modules() {
429 - [[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
430 - for m in "$@" ; do
431 - einfo "enabling module $m"
432 - myconf+=" --with-module=${m}"
433 - done
434 -}
435 -
436 -BUILDDIR="builddir"
437 -
438 -# modules not enabled:
439 -# * berkdb: must figure out a way to make the configure script pick up the
440 -# currect version of the library and headers
441 -# * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
442 -# * matlab, netica: not in portage
443 -# * oracle: can't install oracle-instantclient
444 -
445 -src_prepare() {
446 - # More than -O1 breaks alpha/ia64
447 - if use alpha || use ia64; then
448 - sed -i -e 's/-O2//g' src/makemake.in || die
449 - fi
450 - epatch "${FILESDIR}/${P}-bits_ipctypes_to_sys_ipc.patch"
451 -
452 - cp /usr/share/common-lisp/source/asdf/build/asdf.lisp modules/asdf/ || die
453 -}
454 -
455 -src_configure() {
456 - # We need this to build on alpha/ia64
457 - if use alpha || use ia64; then
458 - replace-flags -O? -O1
459 - append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
460 - fi
461 -
462 - # QA issue with lisp.run
463 - append-flags -Wa,--noexecstack
464 -
465 - # built-in features
466 - local myconf="--with-ffcall --with-dynamic-modules"
467 -# There's a problem with jit_allocai function
468 -# if use jit; then
469 -# myconf+=" --with-jitc=lightning"
470 -# fi
471 - if use threads; then
472 - myconf+=" --with-threads=POSIX_THREADS"
473 - fi
474 -
475 - # default modules
476 - enable_modules asdf rawsock syscalls
477 - # optional modules
478 - use elibc_glibc && enable_modules bindings/glibc
479 - use X && enable_modules clx/new-clx
480 - if use postgres; then
481 - enable_modules postgresql
482 - append-cppflags -I$(pg_config --includedir)
483 - fi
484 - if use berkdb; then
485 - enable_modules berkeley-db
486 - append-cppflags -I/usr/include/db4.8
487 - fi
488 - use dbus && enable_modules dbus
489 - use fastcgi && enable_modules fastcgi
490 - use gdbm && enable_modules gdbm
491 - use gtk && enable_modules gtk2
492 - use pari && enable_modules pari
493 - use pcre && enable_modules pcre
494 - use svm && enable_modules libsvm
495 - use zlib && enable_modules zlib
496 -
497 - if use hyperspec; then
498 - CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
499 - else
500 - CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
501 - fi
502 -
503 - # configure chokes on --sysconfdir option
504 - local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \
505 - $(use_with readline) $(use_with unicode) \
506 - ${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
507 - einfo "${configure}"
508 - ${configure} || die "./configure failed"
509 -
510 - IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
511 - sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
512 - "${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
513 -}
514 -
515 -src_compile() {
516 - export VARTEXFONTS="${T}"/fonts
517 - cd "${BUILDDIR}"
518 - # parallel build fails
519 - emake -j1 || die "emake failed"
520 -}
521 -
522 -src_install() {
523 - pushd "${BUILDDIR}"
524 - make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
525 - doman clisp.1 || die
526 - dodoc SUMMARY README* NEWS MAGIC.add ANNOUNCE || die
527 - # stripping them removes common symbols (defined but uninitialised variables)
528 - # which are then needed to build modules...
529 - export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
530 - popd
531 - dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png || die
532 - dodoc doc/{CLOS-guide,LISP-tutorial}.txt || die
533 -}
534
535 diff --git a/dev-lisp/clisp/files/clisp-2.49-bits_ipctypes_to_sys_ipc.patch b/dev-lisp/clisp/files/clisp-2.49-bits_ipctypes_to_sys_ipc.patch
536 deleted file mode 100644
537 index 8037157c..00000000
538 --- a/dev-lisp/clisp/files/clisp-2.49-bits_ipctypes_to_sys_ipc.patch
539 +++ /dev/null
540 @@ -1,21 +0,0 @@
541 -diff -ru a/modules/bindings/glibc/linux.lisp b/modules/bindings/glibc/linux.lisp
542 ---- a/modules/bindings/glibc/linux.lisp 2008-10-08 19:36:19.000000000 +0300
543 -+++ b/modules/bindings/glibc/linux.lisp 2013-04-08 00:05:06.028305248 +0300
544 -@@ -67,7 +67,7 @@
545 - (def-c-type __daddr_t) ; int
546 - (def-c-type __caddr_t) ; c-pointer
547 - (def-c-type __time_t) ; long
548 --(def-c-type __swblk_t) ; long
549 -+;(def-c-type __swblk_t) ; long
550 -
551 - (def-c-type __fd_mask ulong)
552 - (eval-when (load compile eval)
553 -@@ -86,7 +86,7 @@
554 -
555 - (def-c-type __key_t) ; int
556 -
557 --(c-lines "#include <bits/ipctypes.h>~%")
558 -+(c-lines "#include <sys/ipc.h>~%")
559 - (def-c-type __ipc_pid_t) ; ushort
560 -
561 - ; --------------------------- <sys/types.h> -----------------------------------
562
563 diff --git a/dev-lisp/clisp/files/clisp-2.49-get_hostname.patch b/dev-lisp/clisp/files/clisp-2.49-get_hostname.patch
564 deleted file mode 100644
565 index 5db3a71e..00000000
566 --- a/dev-lisp/clisp/files/clisp-2.49-get_hostname.patch
567 +++ /dev/null
568 @@ -1,56 +0,0 @@
569 -diff -r -U1 clisp-2.49.orig/src/socket.d clisp-2.49/src/socket.d
570 ---- clisp-2.49.orig/src/socket.d 2009-10-08 21:45:13.000000000 +0700
571 -+++ clisp-2.49/src/socket.d 2013-04-20 16:24:11.133895050 +0700
572 -@@ -59,5 +59,5 @@
573 - Fetches the machine's host name.
574 -- get_hostname(host =);
575 -- The name is allocated on the stack, with dynamic extent.
576 -- < const char* host: The host name.
577 -+ get_hostname(hostname);
578 -+ where hostname is an array of MAXHOTNAMELEN+1 characters.
579 -+ < const char host[]: The host name.
580 - (Note: In some cases we could get away with less system calls by simply
581 -@@ -69,10 +69,8 @@
582 - /* present on all supported unix systems and on woe32 */
583 -- #define get_hostname(host_assignment) \
584 -- do { var char hostname[MAXHOSTNAMELEN+1]; \
585 -- begin_system_call(); \
586 -- if ( gethostname(&hostname[0],MAXHOSTNAMELEN) <0) { SOCK_error(); } \
587 -- end_system_call(); \
588 -- hostname[MAXHOSTNAMELEN] = '\0'; \
589 -- host_assignment &hostname[0]; \
590 -- } while(0)
591 -+static void get_hostname (char *hostname) {
592 -+ begin_system_call();
593 -+ if (gethostname(hostname,MAXHOSTNAMELEN) < 0) { ANSIC_error(); }
594 -+ end_system_call();
595 -+ hostname[MAXHOSTNAMELEN] = '\0';
596 -+}
597 - #else
598 -@@ -209,4 +207,4 @@
599 - (apply #'string-concat hostname " [" (inet-ntop address) "]"))) */
600 -- var const char* host;
601 -- get_hostname(host =);
602 -+ var char host[MAXHOSTNAMELEN+1];
603 -+ get_hostname(host);
604 - result = asciz_to_string(host,O(misc_encoding)); /* hostname as result */
605 -@@ -391,4 +389,4 @@
606 - if (eq(arg,S(Kdefault))) {
607 -- var char* host;
608 -- get_hostname(host =);
609 -+ var char host[MAXHOSTNAMELEN+1];
610 -+ get_hostname(host);
611 - begin_system_call();
612 -@@ -726,3 +724,4 @@
613 - if (host[0] == '\0') {
614 -- get_hostname(host =);
615 -+ var char host[MAXHOSTNAMELEN+1];
616 -+ get_hostname(host);
617 - fd = with_host_port(host,port,&connect_to_x_via_ip,NULL);
618 -@@ -800,4 +799,4 @@
619 - if (resolve_p) { /* Fill in hd->truename. */
620 -- var const char* host;
621 -- get_hostname(host =); /* was: host = "localhost"; */
622 -+ var char host[MAXHOSTNAMELEN+1];
623 -+ get_hostname(host);
624 - ASSERT(strlen(host) <= MAXHOSTNAMELEN);
625
626 diff --git a/dev-lisp/clisp/files/clisp-2.49-readline-7.patch b/dev-lisp/clisp/files/clisp-2.49-readline-7.patch
627 deleted file mode 100644
628 index 0be5bd8c..00000000
629 --- a/dev-lisp/clisp/files/clisp-2.49-readline-7.patch
630 +++ /dev/null
631 @@ -1,10 +0,0 @@
632 -diff -r -U2 clisp-2.49.orig/modules/readline/readline.lisp clisp-2.49/modules/readline/readline.lisp
633 ---- clisp-2.49.orig/modules/readline/readline.lisp 2010-01-07 04:18:03.000000000 +0600
634 -+++ clisp-2.49/modules/readline/readline.lisp 2016-09-29 22:23:53.837631568 +0700
635 -@@ -425,5 +425,5 @@
636 - (def-c-var gnu-readline-p (:name "rl_gnu_readline_p") (:type int)
637 - (:documentation "True if this is real GNU readline."))
638 --(def-c-var readline-state (:name "rl_readline_state") (:type int)
639 -+(def-c-var readline-state (:name "rl_readline_state") (:type ulong)
640 - (:documentation "Flags word encapsulating the current readline state."))
641 - (def-c-var editing-mode (:name "rl_editing_mode") (:type int)
642
643 diff --git a/dev-lisp/clisp/files/clisp-2.49-tinfo.patch b/dev-lisp/clisp/files/clisp-2.49-tinfo.patch
644 deleted file mode 100644
645 index 72f40d58..00000000
646 --- a/dev-lisp/clisp/files/clisp-2.49-tinfo.patch
647 +++ /dev/null
648 @@ -1,15 +0,0 @@
649 -clisp does not need a full blown ncurses, but it does require a termcap or tinfo
650 -I would have changed this in src/m4/termcap.m4 but configure.in fails terribly - JeR
651 -
652 -
653 ---- a/src/configure
654 -+++ b/src/configure
655 -@@ -28613,7 +28613,7 @@
656 - return 0;
657 - }
658 - _ACEOF
659 --for ac_lib in '' ncurses termcap; do
660 -+for ac_lib in '' tinfo ncurses termcap; do
661 - if test -z "$ac_lib"; then
662 - ac_res="none required"
663 - else
664
665 diff --git a/dev-lisp/clisp/files/clisp-2.49.60-after_glibc_cfree_bdb.patch b/dev-lisp/clisp/files/clisp-2.49.90-after_glibc_cfree_bdb.patch
666 similarity index 76%
667 rename from dev-lisp/clisp/files/clisp-2.49.60-after_glibc_cfree_bdb.patch
668 rename to dev-lisp/clisp/files/clisp-2.49.90-after_glibc_cfree_bdb.patch
669 index 3ab075ba..ae83bbb8 100644
670 --- a/dev-lisp/clisp/files/clisp-2.49.60-after_glibc_cfree_bdb.patch
671 +++ b/dev-lisp/clisp/files/clisp-2.49.90-after_glibc_cfree_bdb.patch
672 @@ -1,8 +1,7 @@
673 -diff --git a/modules/berkeley-db/bdb.c b/modules/berkeley-db/bdb.c
674 -index a266d41..942652a 100644
675 ---- a/modules/berkeley-db/bdb.c
676 -+++ b/modules/berkeley-db/bdb.c
677 -@@ -2216,7 +2216,13 @@ DEFUN(BDB:DB-COMPACT, db &key TRANSACTION :START STOP FREE FILL TIMEOUT \
678 +diff -r -U3 clisp-2.49.90.orig/modules/berkeley-db/bdb.c clisp-2.49.90/modules/berkeley-db/bdb.c
679 +--- clisp-2.49.90.orig/modules/berkeley-db/bdb.c 2018-01-27 12:03:01.000000000 +0100
680 ++++ clisp-2.49.90/modules/berkeley-db/bdb.c 2018-02-12 20:37:24.203803219 +0100
681 +@@ -2216,7 +2216,13 @@
682 c_data.compact_timeout = timeout;
683 c_data.compact_pages = pages;
684 SYSCALL(db->compact,(db,txn,pstart,pstop,&c_data,flags,&end));
685 @@ -17,10 +16,9 @@ index a266d41..942652a 100644
686 pushSTACK(uint32_to_I(c_data.compact_pages_free));
687 pushSTACK(uint32_to_I(c_data.compact_pages_examine));
688 pushSTACK(uint32_to_I(c_data.compact_levels));
689 -diff --git a/modules/bindings/glibc/linux.lisp b/modules/bindings/glibc/linux.lisp
690 -index c960753..2993990 100644
691 ---- a/modules/bindings/glibc/linux.lisp
692 -+++ b/modules/bindings/glibc/linux.lisp
693 +diff -r -U3 clisp-2.49.90.orig/modules/bindings/glibc/linux.lisp clisp-2.49.90/modules/bindings/glibc/linux.lisp
694 +--- clisp-2.49.90.orig/modules/bindings/glibc/linux.lisp 2018-01-10 00:32:25.000000000 +0100
695 ++++ clisp-2.49.90/modules/bindings/glibc/linux.lisp 2018-02-12 20:48:22.467775536 +0100
696 @@ -1,7 +1,7 @@
697 ;; Foreign functions provided by the Linux C library version 6,
698 ;; i.e. the GNU C library version 2.0.7.
699 @@ -30,15 +28,7 @@ index c960753..2993990 100644
700
701 ;; NB: quite a few functions here have more portable counterparts in POSIX
702
703 -@@ -649,7 +649,6 @@
704 - (def-call-out calloc (:arguments (nmemb size_t) (size size_t))
705 - (:return-type c-pointer))
706 - (def-call-out free (:arguments (ptr c-pointer)) (:return-type nil))
707 --(def-call-out cfree (:arguments (ptr c-pointer)) (:return-type nil))
708 - (def-call-out valloc (:arguments (size size_t)) (:return-type c-pointer))
709 -
710 - (def-call-out abort (:arguments) (:return-type nil))
711 -@@ -687,9 +686,8 @@
712 +@@ -686,9 +686,8 @@
713 (def-call-out system? (:arguments (null c-string))
714 (:return-type boolean) (:name "system"))
715
716 @@ -46,11 +36,11 @@ index c960753..2993990 100644
717 -; (def-call-out canonicalize_file_name (:arguments (name c-string))
718 -; (:return-type c-string :malloc-free))
719 +(def-call-out canonicalize_file_name (:arguments (name c-string))
720 -+ (:return-type c-string :malloc-free) (:guard "defined(__USE_GNU)"))
721 ++ (:return-type c-string :malloc-free))
722
723 (def-call-out realpath
724 (:arguments (name c-string)
725 -@@ -1041,9 +1039,8 @@
726 +@@ -1040,9 +1039,8 @@
727 (def-call-out access (:arguments (name c-string) (type int))
728 (:return-type int))
729
730 @@ -58,11 +48,11 @@ index c960753..2993990 100644
731 -; (def-call-out euidaccess (:arguments (name c-string) (type int))
732 -; (:return-type int))
733 +(def-call-out euidaccess (:arguments (name c-string) (type int))
734 -+ (:return-type int) (:guard "defined(__USE_GNU)"))
735 ++ (:return-type int))
736
737 (defconstant SEEK_SET 0)
738 (defconstant SEEK_CUR 1)
739 -@@ -1094,9 +1091,8 @@
740 +@@ -1093,9 +1091,8 @@
741 ;(def-call-out getcwd (:arguments (buf c-string :out) (size size_t)) ; ??
742 ; (:return-type c-string))
743
744 @@ -70,33 +60,31 @@ index c960753..2993990 100644
745 -; (def-call-out get_current_dir_name (:arguments)
746 -; (:return-type c-string :malloc-free))
747 +(def-call-out get_current_dir_name (:arguments)
748 -+ (:return-type c-string :malloc-free) (:guard "defined(__USE_GNU)"))
749 ++ (:return-type c-string :malloc-free))
750
751 ;(def-call-out getwd (:arguments (buf c-string :out)) ; ??
752 ; (:return-type c-string))
753 -@@ -1324,8 +1320,8 @@
754 +@@ -1323,8 +1320,7 @@
755 ; (:arguments (size int) (list (c-ptr (c-array gid_t ??)) :out)) ; ??
756 ; (:return-type int))
757
758 -; You can uncomment this if your compiler sets __USE_GNU
759 -; (def-call-out group_member (:arguments (gid gid_t)) (:return-type boolean))
760 -+(def-call-out group_member (:arguments (gid gid_t)) (:return-type boolean)
761 -+ (:guard "defined(__USE_GNU)"))
762 ++(def-call-out group_member (:arguments (gid gid_t)) (:return-type boolean))
763 (def-call-out setuid (:arguments (uid uid_t)) (:return-type int))
764 (def-call-out setreuid (:arguments (ruid uid_t) (euid uid_t))
765 (:return-type int))
766 -@@ -1822,8 +1818,8 @@
767 +@@ -1821,8 +1817,7 @@
768 (:return-type c-string :malloc-free))
769 (def-call-out ungetc (:arguments (c int) (fp FILE))
770 (:return-type int))
771 -; You can uncomment this if your compiler sets __USE_GNU
772 -; (def-call-out fcloseall (:arguments) (:return-type int))
773 -+(def-call-out fcloseall (:arguments) (:return-type int)
774 -+ (:guard "defined(__USE_GNU)"))
775 ++(def-call-out fcloseall (:arguments) (:return-type int))
776 (def-call-out fdopen (:arguments (fildes int) (mode c-string))
777 (:return-type c-pointer))
778 (def-call-out fileno (:arguments (fp FILE)) (:return-type int))
779 -@@ -1901,11 +1897,11 @@ typedef __off64_t clisp_dirent_off_t;
780 +@@ -1900,11 +1895,11 @@
781 (:return-type (c-ptr-null dirent)))
782 (def-call-out readdir64 (:arguments (dirp c-pointer))
783 (:return-type (c-ptr-null dirent64)))
784 @@ -110,13 +98,12 @@ index c960753..2993990 100644
785 (:arguments (dirp c-pointer) (entry (c-ptr dirent64) :out :alloca)
786 (result (c-ptr (c-ptr dirent64)) :out :alloca)) ; ??
787 (:return-type int))
788 -diff --git a/modules/bindings/glibc/test.tst b/modules/bindings/glibc/test.tst
789 -index f807389..b2c1222 100644
790 ---- a/modules/bindings/glibc/test.tst
791 -+++ b/modules/bindings/glibc/test.tst
792 -@@ -5,6 +5,16 @@
793 - (progn (require "linux") T) T
794 - (listp (show (multiple-value-list (ext:module-info "linux" t)) :pretty t)) T
795 +diff -r -U3 clisp-2.49.90.orig/modules/bindings/glibc/test.tst clisp-2.49.90/modules/bindings/glibc/test.tst
796 +--- clisp-2.49.90.orig/modules/bindings/glibc/test.tst 2018-01-10 00:04:26.000000000 +0100
797 ++++ clisp-2.49.90/modules/bindings/glibc/test.tst 2018-02-12 20:50:48.225769407 +0100
798 +@@ -14,6 +14,16 @@
799 + (= linux:DT_DIR (linux:dirent64-d_type (show (linux:readdir64 *d*)))) T
800 + (linux:closedir *d*) 0
801
802 +(stringp (show (linux:get-domain-name))) T
803 +(stringp (show (linux:get-host-name))) T
804 @@ -129,20 +116,11 @@ index f807389..b2c1222 100644
805 +T
806 +
807 (defparameter *d* (show (linux:opendir "."))) *D*
808 - (linux:dirent64-d_name (show (linux:readdir64 *d*))) "."
809 - (linux:dirent64-d_name (show (linux:readdir64 *d*))) ".."
810 -diff --git a/src/foreign1.lisp b/src/foreign1.lisp
811 -index 26a3ba5..0e43de7 100644
812 ---- a/src/foreign1.lisp
813 -+++ b/src/foreign1.lisp
814 -@@ -1,6 +1,6 @@
815 - ;;; Foreign function interface for CLISP
816 - ;;; Bruno Haible 19.2.1995
817 --;;; Sam Steingold 1998-2010
818 -+;;; Sam Steingold 1998-2010, 2017
819 -
820 - #+UNICODE
821 - (progn
822 + (linux:dirent-d_name (show (linux:readdir *d*))) "."
823 + (linux:dirent-d_name (show (linux:readdir *d*))) ".."
824 +diff -r -U3 clisp-2.49.90.orig/src/foreign1.lisp clisp-2.49.90/src/foreign1.lisp
825 +--- clisp-2.49.90.orig/src/foreign1.lisp 2018-01-10 00:04:26.000000000 +0100
826 ++++ clisp-2.49.90/src/foreign1.lisp 2018-02-12 21:03:56.768736245 +0100
827 @@ -805,14 +805,17 @@
828 c-name (to-c-string c-name) (third variable) (first variable))
829 (when *foreign-guard* (format *coutput-stream* "# endif~%"))))
830
831 diff --git a/dev-lisp/clisp/files/clisp-2.50_pre20130414-bits_ipctypes_to_sys_ipc.patch b/dev-lisp/clisp/files/clisp-2.50_pre20130414-bits_ipctypes_to_sys_ipc.patch
832 deleted file mode 100644
833 index 61d807e8..00000000
834 --- a/dev-lisp/clisp/files/clisp-2.50_pre20130414-bits_ipctypes_to_sys_ipc.patch
835 +++ /dev/null
836 @@ -1,12 +0,0 @@
837 -diff -ru a/modules/bindings/glibc/linux.lisp b/modules/bindings/glibc/linux.lisp
838 ---- a/modules/bindings/glibc/linux.lisp 2008-10-08 19:36:19.000000000 +0300
839 -+++ b/modules/bindings/glibc/linux.lisp 2013-04-08 00:05:06.028305248 +0300
840 -@@ -86,7 +86,7 @@
841 -
842 - (def-c-type __key_t) ; int
843 -
844 --(c-lines "#include <bits/ipctypes.h>~%")
845 -+(c-lines "#include <sys/ipc.h>~%")
846 - (def-c-type __ipc_pid_t) ; ushort
847 -
848 - ; --------------------------- <sys/types.h> -----------------------------------
849
850 diff --git a/dev-lisp/clisp/metadata.xml b/dev-lisp/clisp/metadata.xml
851 new file mode 100644
852 index 00000000..256106c8
853 --- /dev/null
854 +++ b/dev-lisp/clisp/metadata.xml
855 @@ -0,0 +1,31 @@
856 +<?xml version="1.0" encoding="UTF-8"?>
857 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
858 +<pkgmetadata>
859 + <maintainer type="project">
860 + <email>common-lisp@g.o</email>
861 + <name>Gentoo Common Lisp Project</name>
862 + </maintainer>
863 + <longdescription>
864 +CLISP is a Common Lisp implementation. It mostly supports the Lisp
865 +described in the ANSI Common Lisp standard. It includes an
866 +interpreter, a compiler, almost all of CLOS, a foreign language
867 +interface and a socket interface. An X11 interface is available
868 +through CLX and Garnet. Command line editing is provided by readline.
869 +CLISP runs on microcomputers (OS/2, Windows 95/98/NT/2000/XP, Amiga
870 +500-4000, Acorn RISC PC) as well as on Unix workstations (GNU/Linux,
871 +BSD, SVR4, Sun4, DEC Alpha OSF, HP-UX, NeXTstep, SGI, AIX, Sun3 and
872 +others) and needs only 2 MB of RAM. The user interface comes in
873 +German, English, French, Spanish, Dutch and Russian, and can be
874 +changed at run time.
875 +</longdescription>
876 + <use>
877 + <flag name="hyperspec">Use local hyperspec instead of online version</flag>
878 + <flag name="new-clx">Build CLISP with support for the NEW-CLX module which is a
879 +C binding to the Xorg libraries</flag>
880 + <flag name="pari">Build CLISP with support for the PARI Computer Algebra System</flag>
881 + <flag name="svm">Build CLISP with support for the Support Vector Machine module</flag>
882 + </use>
883 + <upstream>
884 + <remote-id type="sourceforge">clisp</remote-id>
885 + </upstream>
886 +</pkgmetadata>