From e4e387b4a5e6bfbb9d8cd69ebda2ee03cdd3aa43 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 8 Dec 2005 07:29:12 +0000 Subject: New upstream version; Resolves Bug #60106; Incidentally resolves Bug #101864. Package-Manager: portage-2.0.53 --- dev-lisp/cmucl/ChangeLog | 10 +- dev-lisp/cmucl/Manifest | 25 +-- dev-lisp/cmucl/cmucl-19c.ebuild | 171 +++++++++++++++++++++ dev-lisp/cmucl/files/19c/README.Gentoo | 31 ++++ dev-lisp/cmucl/files/19c/cmucl.sh | 95 ++++++++++++ .../cmucl/files/19c/herald-save.lisp-gentoo.patch | 18 +++ dev-lisp/cmucl/files/19c/install-clc.lisp | 55 +++++++ dev-lisp/cmucl/files/19c/site-init.lisp.in | 58 +++++++ dev-lisp/cmucl/files/digest-cmucl-19c | 3 + 9 files changed, 456 insertions(+), 10 deletions(-) create mode 100644 dev-lisp/cmucl/cmucl-19c.ebuild create mode 100644 dev-lisp/cmucl/files/19c/README.Gentoo create mode 100644 dev-lisp/cmucl/files/19c/cmucl.sh create mode 100644 dev-lisp/cmucl/files/19c/herald-save.lisp-gentoo.patch create mode 100644 dev-lisp/cmucl/files/19c/install-clc.lisp create mode 100644 dev-lisp/cmucl/files/19c/site-init.lisp.in create mode 100644 dev-lisp/cmucl/files/digest-cmucl-19c (limited to 'dev-lisp/cmucl') diff --git a/dev-lisp/cmucl/ChangeLog b/dev-lisp/cmucl/ChangeLog index 4ff3175fcc3c..2294707d4a00 100644 --- a/dev-lisp/cmucl/ChangeLog +++ b/dev-lisp/cmucl/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-lisp/cmucl # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.18 2005/08/18 02:41:35 mkennedy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.19 2005/12/08 07:29:12 mkennedy Exp $ + +*cmucl-19c (08 Dec 2005) + + 08 Dec 2005; Matthew Kennedy + +files/19c/README.Gentoo, +files/19c/cmucl.sh, + +files/19c/herald-save.lisp-gentoo.patch, +files/19c/install-clc.lisp, + +files/19c/site-init.lisp.in, +cmucl-19c.ebuild: + New upstream version; Resolves Bug #60106; Incidentally resolves Bug #101864. 18 Aug 2005; Matthew Kennedy cmucl-18e-r4.ebuild, cmucl-19a-r1.ebuild, cmucl-19b.ebuild: diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest index 90e5aa8672e0..3836a639248a 100644 --- a/dev-lisp/cmucl/Manifest +++ b/dev-lisp/cmucl/Manifest @@ -1,14 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 65d17ac13eef90dadb0dc0d9ecc7cac0 ChangeLog 3290 -MD5 10302f1464f3d8c0dc5fcddb26536441 cmucl-19b.ebuild 4848 +MD5 1f353266e9ad1b0651217d1e48455ac5 ChangeLog 3623 MD5 93ccb861f2d7f46f773ced90f3ed61ca cmucl-18e-r4.ebuild 2963 MD5 06e069d6d55039826fdd58ce9222ffa2 cmucl-19a-r1.ebuild 4683 -MD5 929688a2167434e2a4f0169de47e7428 metadata.xml 1107 -MD5 a7972648eda13df8cec3a330f29a45b9 files/digest-cmucl-19b 239 -MD5 df309c5d109052b9c57d79bb4aac5871 files/digest-cmucl-18e-r4 137 -MD5 6d03d3afa9c49f60a0aaa0e71597cfba files/digest-cmucl-19a-r1 240 +MD5 10302f1464f3d8c0dc5fcddb26536441 cmucl-19b.ebuild 4848 +MD5 6f9452314110a9d40614e6e89e16e663 cmucl-19c.ebuild 5114 MD5 997a2bfdcd98bc978f6c3b79ba8f2264 files/18e/README.Gentoo 848 MD5 306ba9e5615290fb688a46f7c0efdc07 files/18e/herald-save.lisp-gentoo.patch 751 MD5 379cf3aca883a7097c0410f96be55378 files/18e/install-clc.lisp-gentoo.patch 1294 @@ -23,10 +20,20 @@ MD5 14ccb382eaa0a2c94834328a413cc906 files/19b/cmucl.sh 2701 MD5 4db43f75da9d79658837b4ce0e7be3bb files/19b/herald-save.lisp-gentoo.patch 831 MD5 b23a0a0d355d92b1a2123de8acd61418 files/19b/install-clc.lisp 1749 MD5 190f38f6f6f33f3e1ceee848d2583573 files/19b/site-init.lisp.in 1935 +MD5 997a2bfdcd98bc978f6c3b79ba8f2264 files/19c/README.Gentoo 848 +MD5 14ccb382eaa0a2c94834328a413cc906 files/19c/cmucl.sh 2701 +MD5 c210b06bf993a0933938064db9c6f8ee files/19c/herald-save.lisp-gentoo.patch 830 +MD5 b23a0a0d355d92b1a2123de8acd61418 files/19c/install-clc.lisp 1749 +MD5 190f38f6f6f33f3e1ceee848d2583573 files/19c/site-init.lisp.in 1935 +MD5 df309c5d109052b9c57d79bb4aac5871 files/digest-cmucl-18e-r4 137 +MD5 6d03d3afa9c49f60a0aaa0e71597cfba files/digest-cmucl-19a-r1 240 +MD5 a7972648eda13df8cec3a330f29a45b9 files/digest-cmucl-19b 239 +MD5 764f277b179f1114309842862b1d79b0 files/digest-cmucl-19c 239 +MD5 929688a2167434e2a4f0169de47e7428 metadata.xml 1107 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDA/WYyiNZaEAZA+ARAvcyAJ4zBBMQcMgPFp+DGmQaa/C0sTNxJACeMGbg -aX40rtZBVmc4p72WIOrQPPM= -=zehu +iD8DBQFDl+DUyiNZaEAZA+ARAvzpAJ40x7UlMdxgf5zBtqQfSuLmd2dLYwCbB5B6 +4f0PPh+Ax2nAMRfeBPCSkto= +=D3V0 -----END PGP SIGNATURE----- diff --git a/dev-lisp/cmucl/cmucl-19c.ebuild b/dev-lisp/cmucl/cmucl-19c.ebuild new file mode 100644 index 000000000000..1c6fb526b868 --- /dev/null +++ b/dev-lisp/cmucl/cmucl-19c.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-19c.ebuild,v 1.1 2005/12/08 07:29:12 mkennedy Exp $ + +inherit common-lisp-common-2 eutils toolchain-funcs + +DEB_PV=1 +MY_PV=${PV}-release-20051115 + +DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp" +HOMEPAGE="http://www.cons.org/cmucl/ + http://packages.debian.org/unstable/devel/cmucl.html" +SRC_URI="http://ftp.debian.org/debian/pool/main/c/cmucl/cmucl_${MY_PV}.orig.tar.gz + http://ftp.debian.org/debian/pool/main/c/cmucl/cmucl_${MY_PV}-${DEB_PV}.diff.gz + ftp://ftp.common-lisp.net/pub/project/cmucl/release/${PV}/${P}-x86-linux.tar.bz2" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~x86" +IUSE="doc lesstif nosource" + +DEPEND="=dev-lisp/common-lisp-controller-4* + doc? ( virtual/tetex ) + lesstif? ( x11-libs/lesstif ) + !lesstif? ( x11-libs/openmotif ) + sys-devel/bc" + +PROVIDE="virtual/commonlisp" + +S=${WORKDIR}/cmucl-${MY_PV}.orig + +src_unpack() { + unpack ${A} + epatch cmucl_${MY_PV}-${DEB_PV}.diff || die + epatch ${FILESDIR}/${PV}/herald-save.lisp-gentoo.patch || die + + find ${S} -type f \( -name \*.sh -o -name linux-nm \) \ + -exec chmod +x '{}' \; +} + +src_compile() { + export SANDBOX_ON=0 + + # non-x86 maintainers, add to the the following and verify + + if use lesstif || test -d /usr/X11R6/include/lesstif; then + sed -i -e 's,-I/usr/X11R6/include,-I/usr/X11R6/include/lesstif,g' \ + -e 's,-L/usr/X11R6/lib,-L/usr/X11R6/lib/lesstif -L/usr/X11R6/lib,g' \ + src/motif/server/Config.x86 + fi + + sed -i -e "s,CC = .*,CC = $(tc-getCC),g" \ + src/lisp/Config.linux_gencgc + + PATH=${WORKDIR}/bin:$PATH CMUCLCORE=${WORKDIR}/lib/cmucl/lib/lisp.core make || die + + if use doc; then + make -C src/docs + fi +} + +src_install() { + insinto /usr/lib/cmucl/include + doins src/lisp/*.h target/lisp/*.h target/lisp/*.map target/lisp/*.nm + insinto /usr/lib/cmucl + cp target/lisp/lisp.core lisp-dist.core + doins lisp-dist.core + + dodoc target/lisp/lisp.{nm,map} + doman src/general-info/{cmucl,lisp}.1 + + dobin target/lisp/lisp + dobin own-work/Demos/lisp-start + + insinto /usr/lib/cmucl + doins own-work/install-clc.lisp + exeinto /usr/lib/common-lisp/bin + newexe own-work/cmucl-script.sh cmucl.sh + + insinto /etc/common-lisp/cmucl + sed "s,@PF@,${PF},g" <${FILESDIR}/${PV}/site-init.lisp.in >site-init.lisp + doins site-init.lisp + dosym /etc/common-lisp/cmucl/site-init.lisp /usr/lib/cmucl/site-init.lisp + + dodir /etc/env.d + cat >${D}/etc/env.d/50cmucl </proc/sys/fs/binfmt_misc/register + +Note: you need kernel support for this. A good place to put the +above command is in your /etc/conf.d/localstart. + +** Credit + +This Gentoo package, like many other Gentoo packages in the dev-lisp +category, benifit from the Debian Project's work. + + -- Matthew Kennedy + + +Local Variables: *** +mode: outline *** +End: *** diff --git a/dev-lisp/cmucl/files/19c/cmucl.sh b/dev-lisp/cmucl/files/19c/cmucl.sh new file mode 100644 index 000000000000..16772da268f0 --- /dev/null +++ b/dev-lisp/cmucl/files/19c/cmucl.sh @@ -0,0 +1,95 @@ +#!/bin/sh + +if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then + cat < /dev/null + ;; + install-defsystem|install-clc) + echo installing the clc... + ( cd /usr/lib/cmucl + [ -f $IMAGE ] && rm -f $IMAGE + /usr/bin/lisp \ + -core ${IMAGE%.core}-dist.core -load /usr/lib/cmucl/install-clc.lisp \ + -nositeinit -noinit -batch -quiet && \ + mv new-lisp.core $IMAGE || (echo FAILED ; ln ${IMAGE%.core}-dist.core $IMAGE ) ) + ;; + remove-defsystem|remove-clc) + [ -f $IMAGE ] && rm -f $IMAGE + ;; + make-user-image) + if [ ! -f $1 ] ; then + echo Cannot find file $1 to load and dump! + exit 321 + fi + /usr/bin/lisp -core $IMAGE -eval " +(load \"$1\") + ;; + ;; Enable the garbage collector. But first fake it into thinking that + ;; we don't need to garbage collect. The save-lisp is going to call + ;; purify so any garbage will be collected then. +#-gengc (setf lisp::*need-to-collect-garbage* nil) +(gc-on) + ;; + ;; Save the lisp. +(setf ext:*batch-mode* nil) +(save-lisp #p\"home:lisp.core\")" -nositeinit -noinit -batch -quiet && echo New image created + ;; + *) + echo $0 unkown command $1 + echo known commands: install-clc, remove-clc,rebuild and remove + exit 1 + ;; +esac + +exit 0 diff --git a/dev-lisp/cmucl/files/19c/herald-save.lisp-gentoo.patch b/dev-lisp/cmucl/files/19c/herald-save.lisp-gentoo.patch new file mode 100644 index 000000000000..adecda7f3e4f --- /dev/null +++ b/dev-lisp/cmucl/files/19c/herald-save.lisp-gentoo.patch @@ -0,0 +1,18 @@ +diff -ur cmucl-19c-release-20051115.orig.orig/src/code/save.lisp cmucl-19c-release-20051115.orig/src/code/save.lisp +--- cmucl-19c-release-20051115.orig.orig/src/code/save.lisp 2005-12-07 12:27:38.000000000 -0600 ++++ cmucl-19c-release-20051115.orig/src/code/save.lisp 2005-12-07 12:29:30.000000000 -0600 +@@ -297,11 +297,9 @@ + )) + + (setf (getf *herald-items* :bugs) +- '("For support see http://www.cons.org/cmucl/support.html Send bug reports to the debian BTS." +- terpri +- "or to " +- "pvaneynd@debian.org" terpri +- "type (help) for help, (quit) to exit, and (demo) to see the demos" terpri ++ '("For support see http://www.cons.org/cmucl/support.html" terpri ++ "Send bug reports to http://bugs.gentoo.org" terpri ++ "Type (help) for help or (quit) to exit." terpri + terpri + "Loaded subsystems:")) + diff --git a/dev-lisp/cmucl/files/19c/install-clc.lisp b/dev-lisp/cmucl/files/19c/install-clc.lisp new file mode 100644 index 000000000000..23642b16ffee --- /dev/null +++ b/dev-lisp/cmucl/files/19c/install-clc.lisp @@ -0,0 +1,55 @@ +;;; -*- Mode: LISP; Package: CL-USER -*- +;;; +;;; Copyright Peter Van Eynde, 2001 +;;; +;;; License: LGPL v2 +;;; +(in-package "COMMON-LISP-USER") + +(unless (ignore-errors + (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")) + (unix:unix-exit 1)) + +;; (unless (ignore-errors + (common-lisp-controller:init-common-lisp-controller + "/usr/lib/common-lisp/cmucl/" + :version 3) +;; t) +;; (format t "~%Error during init of common-lisp-controller~%") +;; (unix:unix-exit 1)) + +(in-package :common-lisp-controller) + +(defun send-clc-command (command package) + (let ((process + (ext:run-program "/usr/bin/clc-send-command" + (list + (ecase command + (:recompile "recompile") + (:remove "remove")) + (format nil "~A" package) + "cmucl" + "--quiet") + :wait t))) + (if (= (ext:process-exit-code process) + 0) + ;; no error + (values) + (error "An error happend during ~A of ~A for ~A~%Please see /usr/share/doc/common-lisp-controller/REPORTING-BUGS.gz" + (ecase command + (:recompile "recompilation") + (:remove "removal")) + package + "cmucl")))) + +(in-package "COMMON-LISP-USER") + +(unless (ignore-errors + ;; it loaded, configure it for common-lisp-controller use: + (format t "~%Saving to new-lisp.core...") + (ext:gc :full t) + (setf ext:*batch-mode* nil) + (ext:save-lisp "new-lisp.core" + :purify t)) + (unix:unix-exit 1)) + diff --git a/dev-lisp/cmucl/files/19c/site-init.lisp.in b/dev-lisp/cmucl/files/19c/site-init.lisp.in new file mode 100644 index 000000000000..ad145414ca43 --- /dev/null +++ b/dev-lisp/cmucl/files/19c/site-init.lisp.in @@ -0,0 +1,58 @@ +;;; -*- Mode: Lisp; Package: System -*- +;;; +;;; ********************************************************************** +;;; This code was written as part of the CMU Common Lisp project at +;;; Carnegie Mellon University, and has been placed in the public domain. +;;; + +;;; Heavy modifications by Peter Van Eynde + +;;; More modifications for Gentoo by Matthew Kennedy +;;; + +(in-package "SYSTEM") + +(if (probe-file "/etc/lisp-config.lisp") + (load "/etc/lisp-config.lisp") + (format t "~%;;; Warning: There is no /etc/lisp-config.lisp file (which should have been created during emerge")) + +;;; If you have sources installed on your system, un-comment the following form +;;; and change it to point to the source location. This will allow the Hemlock +;;; "Edit Definition" command and the debugger to find sources for functions in +;;; the core. +(setf (ext:search-list "target:") + '( + "/usr/share/common-lisp/source/cmucl/" ; object dir + )) + +(setf (ext:search-list "library:") '("/usr/lib/cmucl/")) +;;; for safety... + +;;; optional extentions to the lisp image: delete if you +;;; don't like them :-). +(in-package :common-lisp-user) + +;;; newbie functions, delete if you don't like them + +(defun help () + (format t "~ +Welcome to the Gentoo GNU/Linux port of CMUCL. + +If you aren't running this with ILISP (see: app-emacs/ilisp or +app-xemacs/ilisp) in Emacs, or don't intend to use Hemlock +(see: dev-lisp/cmucl-source) then you deserve to lose. :-) + +The CMUCL REPL does not have GNU Readline-like support, however +you may wish to install rlwap (see: app-misc/rlwrap) to achieve +the same effect. + +If you think you found a bug, please use http://bugs.gentoo.org + +Read the documentation in /usr/share/doc/@PF@. + +(quit) exit Lisp +(describe 'foo) gives information about foo +(inspect '*foo*) interactively inspects *foo* +(apropos \"foo\") briefly describe all symbols which match \"foo\" +")) + diff --git a/dev-lisp/cmucl/files/digest-cmucl-19c b/dev-lisp/cmucl/files/digest-cmucl-19c new file mode 100644 index 000000000000..69707ef18263 --- /dev/null +++ b/dev-lisp/cmucl/files/digest-cmucl-19c @@ -0,0 +1,3 @@ +MD5 04bf7da2a49a309080bf504d0b1e8c28 cmucl-19c-x86-linux.tar.bz2 7305922 +MD5 b36c4da92e315ec6403a52420156fdc6 cmucl_19c-release-20051115-1.diff.gz 1506111 +MD5 9f7d1bae564e50c7b64a2e2cf4ae5f59 cmucl_19c-release-20051115.orig.tar.gz 4654304 -- cgit v1.2.3-65-gdbad