minor changes to support the new clc code

4 files changed, 135 insertions, 4 deletions

diff --git a/dev-lisp/cmucl/ChangeLog b/dev-lisp/cmucl/ChangeLog
index 7152d42460ac..d0f0728700a4 100644
--- a/dev-lisp/cmucl/ChangeLog
+++ b/dev-lisp/cmucl/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lisp/cmucl
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.1 2003/09/24 00:27:43 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.2 2003/11/25 07:20:13 mkennedy Exp $
+
+*cmucl-18e-r1 (25 Nov 2003)
+
+  25 Nov 2003; <mkennedy@gentoo.org> cmucl-18e-r1.ebuild:
+  minor changes to work with the new clc code
+
+*cmucl-18e-r1 (21 Nov 2003)
+
+  21 Nov 2003; <mkennedy@gentoo.org> cmucl-18e-r1.ebuild:
+  preserve file mtimes. changes for new controller
 
 *cmucl-18e (23 Sep 2003)
 
diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest
index f750a8f0972a..f0273b664ec8 100644
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@@ -1,8 +1,7 @@
-MD5 116e68a1775cacfa701db2d7e91b83f9 ChangeLog 311
+MD5 4932ceaf4babd817c0da2c3a5b51dc47 ChangeLog 584
 MD5 99ca05f54412d3c9b9cdf9b6b65048e5 cmucl-18e.ebuild 2663
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
-MD5 2e99e0e59019aeb357c4b7e503cec1a7 cmucl-18e-r1.ebuild 3229
-MD5 55a7ef36cfea15816287d5d66e90205b cmucl-18e-r1.ebuild~ 2954
+MD5 f9fdad24588fac0e9fdabe16d28bb8d1 cmucl-18e-r1.ebuild 3322
 MD5 3e3791768309ef2b15c4e342b300980b files/digest-cmucl-18e 205
 MD5 3e3791768309ef2b15c4e342b300980b files/digest-cmucl-18e-r1 205
 MD5 997a2bfdcd98bc978f6c3b79ba8f2264 files/18e/README.Gentoo 848
diff --git a/dev-lisp/cmucl/cmucl-18e-r1.ebuild b/dev-lisp/cmucl/cmucl-18e-r1.ebuild
new file mode 100644
index 000000000000..851593ef0233
--- /dev/null
+++ b/dev-lisp/cmucl/cmucl-18e-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-18e-r1.ebuild,v 1.1 2003/11/25 07:20:13 mkennedy Exp $
+
+# This package is a port of the Debian package of the same name.
+DEB_PV=7
+
+DESCRIPTION="CMUCL Lisp. This conforms to the ANSI Common Lisp Standard"
+HOMEPAGE="http://www.cons.org/cmucl/
+	http://packages.debian.org/unstable/devel/cmucl.html"
+LICENSE="public-domain"
+DEPEND="dev-lisp/common-lisp-controller
+	x11-libs/lesstif
+	doc? ( app-text/tetex )"
+#	X? ( x11-libs/lesstif )"
+IUSE="doc X"
+SLOT="0"
+KEYWORDS="~x86"
+SRC_URI="http://ftp.debian.org/debian/pool/main/c/cmucl/cmucl_${PV}.orig.tar.gz
+	http://ftp.debian.org/debian/pool/main/c/cmucl/cmucl_${PV}-${DEB_PV}.diff.gz
+	http://cmucl.cons.org/ftp-area/cmucl/release/18e/cmucl-${PV}-x86-linux.tar.bz2"
+
+PROVIDE="virtual/commonlisp"
+
+S=${WORKDIR}/${P}.orig
+
+src_unpack() {
+	unpack ${A}
+	epatch cmucl_${PV}-${DEB_PV}.diff
+	epatch ${FILESDIR}/${PV}/herald-save.lisp-gentoo.patch
+}
+
+src_compile() {
+	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
+	cp own-work/cmucl-script.sh cmucl.sh
+	doexe 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 <<EOF
+# CMUCLLIB=/usr/lib/cmucl
+EOF
+	[ -f /etc/lisp-config.lisp ] || touch ${D}/etc/lisp-config.lisp
+
+	insinto /usr/share/doc/${P}/html/Basic-tutorial
+	doins own-work/tutorials/Basic-tutorial/*
+	insinto /usr/share/doc/${P}/html/Clos
+	doins own-work/tutorials/Clos/*
+	docinto notes
+	dodoc own-work/tutorials/notes/*
+
+	insinto /usr/lib/cmucl
+	doins own-work/hemlock11.*
+
+	if use doc; then
+		dodoc src/docs/*/*.{ps,pdf}
+	fi
+
+	if use X; then
+		exeinto /usr/lib/cmucl
+		doexe target/motif/server/motifd
+		insinto /usr/lib/cmucl/subsystems/
+		doins target/interface/clm-library.x86f
+	fi
+
+	keepdir /usr/lib/common-lisp/cmucl
+
+	# BIG FAT HACK
+	#
+	# Since the Portage emerge step kills file timestamp information,
+	# we need to compensate by ensuring all .x86f files are more
+	# recent than their .lisp source.
+
+	dodir /usr/share/${PN}
+	tar cpvzf ${D}/usr/share/${PN}/portage-timestamp-compensate -C ${D}/usr/lib/${PN} .
+}
+
+pkg_postinst() {
+	chown cl-builder:cl-builder /usr/lib/common-lisp/cmucl
+	tar xvpzf /usr/share/${PN}/portage-timestamp-compensate -C /usr/lib/${PN}
+	rm -rf /usr/lib/common-lisp/${PN}/*
+	/usr/bin/clc-autobuild-impl ${PN} yes
+	/usr/sbin/register-common-lisp-implementation ${PN}
+
+}
+
+pkg_prerm() {
+	# Since we keep our own time stamps we must manually remove them
+	# here.
+	if [ ! -x /usr/bin/lisp ]; then
+		rm -rf /usr/lib/${PN}
+	fi
+	rm -rf /usr/lib/common-lisp/${PN}/*
+}
diff --git a/dev-lisp/cmucl/files/digest-cmucl-18e-r1 b/dev-lisp/cmucl/files/digest-cmucl-18e-r1
new file mode 100644
index 000000000000..d0cf150eb9d4
--- /dev/null
+++ b/dev-lisp/cmucl/files/digest-cmucl-18e-r1
@@ -0,0 +1,3 @@
+MD5 d834f9fa8539309bcc7ebc41c8b124e6 cmucl_18e.orig.tar.gz 4420172
+MD5 49d8ec3c68cb3f0f9c736644ba5d16cf cmucl_18e-7.diff.gz 1911127
+MD5 695f4a6abc5af6276f776a9739c2c7e7 cmucl-18e-x86-linux.tar.bz2 6404635