support for new clc code, move to x86 mask

4 files changed, 134 insertions, 4 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index ad08ceb1ed73..aefccd978bde 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/sbcl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.22 2003/10/31 01:19:53 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.23 2003/11/25 23:44:55 mkennedy Exp $
+
+*sbcl-0.8.5-r1 (25 Nov 2003)
+
+  25 Nov 2003; <mkennedy@gentoo.org> sbcl-0.8.5-r1.ebuild:
+  support for new clc code, move to x86 mask
 
 *sbcl-0.8.5 (30 Oct 2003)
 
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index d4f799b7bc41..a872e9ed50b5 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -1,4 +1,4 @@
-MD5 7023a195aa871998816d305c8966cdf1 ChangeLog 4377
+MD5 e502e010132d8709406f17c0764715c3 ChangeLog 4512
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
 MD5 1b2f87556d9e5807c5347c764e18642b sbcl-0.8.5.ebuild 3891
 MD5 3f7c2bc02639ca69e478db920d8b3704 sbcl-0.7.7.ebuild 1479
@@ -7,8 +7,7 @@ MD5 4978952373ffe97751bc64eef782aaa2 sbcl-0.8.3.ebuild 2562
 MD5 2842b64ad2353ca9b97ab1563ddb1e35 sbcl-0.8.4-r1.ebuild 3569
 MD5 e05c3beb6da60089ea8766a573324876 sbcl-0.8.4-r2.ebuild 3894
 MD5 c4fad0c97a08164fd44dea56a258a475 sbcl-0.8.4.ebuild 2560
-MD5 f7e72359079d264e1b8307651c20102f sbcl-0.8.5-r1.ebuild 3976
-MD5 1b2f87556d9e5807c5347c764e18642b sbcl-0.8.5-r1.ebuild~ 3891
+MD5 2f40f379ac00624a9b401de6540b45fc sbcl-0.8.5-r1.ebuild 3979
 MD5 ecf044f288fb93be779915b684e8d81f files/digest-sbcl-0.8.5 461
 MD5 1b52d1cb085fdfec090a08604c2fd4ed files/digest-sbcl-0.7.7 300
 MD5 1821ff9718a8d902b416c691258c9a40 files/digest-sbcl-0.8.1 304
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.8.5-r1 b/dev-lisp/sbcl/files/digest-sbcl-0.8.5-r1
new file mode 100644
index 000000000000..3929c77d7e7b
--- /dev/null
+++ b/dev-lisp/sbcl/files/digest-sbcl-0.8.5-r1
@@ -0,0 +1,6 @@
+MD5 2d935319b1f985a32660412005085e42 sbcl_0.8.5.orig.tar.gz 2547892
+MD5 bac2013e2945cccca7323147941fdf12 sbcl_0.8.5-1.diff.gz 11438
+MD5 6c193e328cdb472787ef78401ee5294c sbcl-0.8.1-x86-linux-binary.tar.bz2 6348098
+MD5 1cbd667b28d6d5afabccc759315eea70 sbcl-0.7.13-binary-linux-ppc.tar.bz2 5339432
+MD5 7cb56cd42b1f5797d26316e79aaccb06 sbcl-0.7.13-sparc-linux-binary.tar.bz2 5670293
+MD5 29ad145f1fc45c65b8d65b39013bc43f sbcl-0.7.10-mips-linux-binary.tar.gz 7473873
diff --git a/dev-lisp/sbcl/sbcl-0.8.5-r1.ebuild b/dev-lisp/sbcl/sbcl-0.8.5-r1.ebuild
new file mode 100644
index 000000000000..ebab9396aacb
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-0.8.5-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.8.5-r1.ebuild,v 1.1 2003/11/25 23:44:55 mkennedy Exp $
+
+inherit common-lisp-common
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is a Open Source development system for ANSI Common Lisp. It provides an interactive environment including an integrated native compiler, interpreter, and debugger. (And it, and its generated code, can also play nicely with Unix when running noninteractively.)"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+BV_X86=0.8.1
+BV_PPC=0.7.13
+BV_SPARC=0.7.13
+BV_MIPS=0.7.10
+DEB_PV=1
+SRC_URI="http://ftp.debian.org/debian/pool/main/s/sbcl/sbcl_${PV}.orig.tar.gz
+	http://ftp.debian.org/debian/pool/main/s/sbcl/sbcl_${PV}-${DEB_PV}.diff.gz
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-binary-linux-ppc.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	mips? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.gz )"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips"
+PROVIDE="virtual/commonlisp"
+# the SRC_URI trickery needs this
+DEPEND=">=sys-apps/portage-2.0.27
+	dev-lisp/common-lisp-controller
+	doc? ( app-text/openjade )"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	if use x86; then
+		unpack ${PN}-${BV_X86}-x86-linux-binary.tar.bz2
+		mv ${PN}-${BV_X86} x86-binary
+	elif use ppc; then
+		unpack ${PN}-${BV_PPC}-ppc-binary-linux.tar.bz2
+		mv ${PN}-${BV_PPC}-ppc-linux ppc-binary
+	elif use sparc; then
+		unpack ${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2
+		mv ${PN}-${BV_SPARC}-sparc-linux sparc-binary
+	elif use mips; then
+		unpack ${PN}-${BV_SPARC}-mips-linux-binary.tar.gz
+		mv ${PN}-${BV_SPARC}-mips-linux mips-binary
+	fi
+	unpack sbcl_${PV}.orig.tar.gz
+	unpack sbcl_${PV}-${DEB_PV}.diff.gz
+	epatch sbcl_${PV}-${DEB_PV}.diff
+}
+
+src_compile() {
+	local bindir
+	use x86 && bindir=../x86-binary
+	use ppc && bindir=../ppc-binary
+	use sparc && bindir=../sparc-binary
+	use mips && bindir=../mips-binary
+	# TODO: allow the user to chose between SBCL, CMUCL and CLISP for bootstrapping
+	PATH=${bindir}/src/runtime:${PATH} SBCL_HOME=${bindir}/output GNUMAKE=make \
+		./make.sh 'sbcl --sysinit /dev/null --userinit /dev/null --noprogrammer --core ${bindir}/output/sbcl.core'
+	if use doc; then
+		cd doc && chmod +x make-doc.sh
+		./make-doc.sh
+	fi
+}
+
+src_install() {
+	unset SBCL_HOME
+
+	insinto /etc/
+	doins ${FILESDIR}/sbcl.rc
+
+	exeinto /usr/lib/common-lisp/bin
+	doexe ${FILESDIR}/sbcl.sh
+
+	INSTALL_ROOT=${D}/usr sh install.sh
+	dosym /usr/lib/sbcl/asdf-install/asdf-install /usr/bin/sbcl-asdf-install
+	mv ${D}/usr/lib/sbcl/sbcl.core ${D}/usr/lib/sbcl/sbcl-dist.core
+
+	insinto /usr/lib/sbcl
+	doins ${FILESDIR}/install-clc.lisp
+
+	dodir /usr/share
+	mv ${D}/usr/man ${D}/usr/share/
+	doman debian/sbcl-asdf-install.1
+
+	use doc && dohtml doc/html/*
+	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE TLA TODO
+
+	do-debian-credits
+
+	find ${D} -type f -name .cvsignore -exec rm -f '{}' \;
+	find ${D} -type f -name \*.c -exec chmod 644 '{}' \;
+
+	keepdir /usr/lib/common-lisp/sbcl
+
+	# BIG FAT HACK
+	#
+	# Since the Portage emerge step kills file timestamp information,
+	# we need to compensate by ensuring all .fasl 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/sbcl
+	tar xvpzf /usr/share/sbcl/portage-timestamp-compensate -C /usr/lib/sbcl
+	rm -rf /usr/lib/common-lisp/sbcl/* || true
+	/usr/bin/clc-autobuild-impl sbcl yes
+	/usr/sbin/register-common-lisp-implementation sbcl
+}
+
+pkg_postrm() {
+	# Since we keep our own time stamps we must manually remove them
+	# here.
+	if [ ! -x /usr/bin/sbcl ]; then
+		rm -rf /usr/lib/sbcl
+	fi
+	rm -rf /usr/lib/common-lisp/${PN}/*
+}