Package-Manager: portage-2.0.51.19

6 files changed, 223 insertions, 9 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index 212a7fbd4094..82db08c076c0 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lisp/sbcl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.58 2005/04/07 03:01:00 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.59 2005/04/25 05:57:11 mkennedy Exp $
+
+  25 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org> :
+  Use /usr/$(get_libdir) instead of hardcoding /usr/lib
 
   07 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org> :
   New upstream version.
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index dfd474384cd9..9c5e0f54d44c 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -1,19 +1,21 @@
-MD5 484a5d56f7c6bcdfeb7e466f9948a640 ChangeLog 16667
+MD5 de61363ad6e58f198cd10b32e11a53ce ChangeLog 16779
 MD5 0c9bf11185a2a2f1916fc3dc72c0e89e metadata.xml 1037
 MD5 171a2860c8099c791c1a5d09a6de79d9 sbcl-0.8.14.ebuild 3882
 MD5 99471881a4600b3754568cf9a57da836 sbcl-0.8.15.ebuild 3941
 MD5 b1dc94cfc64e3f6a12ca8ddf43d87eb5 sbcl-0.8.16.ebuild 3940
 MD5 f44918ca491764cc17b42a6ab71e249d sbcl-0.8.18.ebuild 4127
 MD5 e1e082cd279eba46322bafddfe664760 sbcl-0.8.19.ebuild 4179
-MD5 8791989be9f9812246afa690f6eb695a sbcl-0.8.20.ebuild 5417
+MD5 c87e565c76b22aaf0c10a9002c94a459 sbcl-0.8.20.ebuild 5606
 MD5 4442b0e3a70d72ceb4576232673570ad sbcl-0.8.21.ebuild 5416
+MD5 569ed21ee77602b510794e0a9005b83f sbcl-0.8.21-r1.ebuild 5853
 MD5 c79912580313a9a43b0b9fd2aa794ba2 files/digest-sbcl-0.8.14 468
 MD5 74f94f11c31e6e9395b26994ebc70aa7 files/digest-sbcl-0.8.15 469
 MD5 a3c050d853b5f0484425c9e35fce226f files/digest-sbcl-0.8.16 469
 MD5 917041583d96efd479e31e2f3d84e71f files/digest-sbcl-0.8.18 469
 MD5 910f47ccbe38fb0a5f5e396c708ec60c files/digest-sbcl-0.8.19 469
 MD5 512426af57bd3f80459b5e4994072c0f files/digest-sbcl-0.8.20 620
-MD5 ee6131f03df732a0cf74557827efdf8c files/digest-sbcl-0.8.21 619
+MD5 da9d9fc53951b9ebed59706771ae6b78 files/digest-sbcl-0.8.21 624
+MD5 da9d9fc53951b9ebed59706771ae6b78 files/digest-sbcl-0.8.21-r1 624
 MD5 8fbb2dee1025c012114183e5567e05c6 files/0.8.20/README.Gentoo 1602
 MD5 683427165f7d0717333bbb9762972b8d files/0.8.20/customize-target-features.lisp-prefix 95
 MD5 7b753c4f6f63f1fc8630f3c9100a8ca9 files/0.8.20/customize-target-features.lisp-suffix 8
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.8.21 b/dev-lisp/sbcl/files/digest-sbcl-0.8.21
index 0dcc7f76a0ce..becf31638d32 100644
--- a/dev-lisp/sbcl/files/digest-sbcl-0.8.21
+++ b/dev-lisp/sbcl/files/digest-sbcl-0.8.21
@@ -1,7 +1,7 @@
 MD5 61a7e7c3c6be55e3155a901e67ff987a sbcl-0.8.21-source.tar.bz2 2448354
 MD5 a2e4c0e99428a16524669798bf479b14 sbcl-0.8.21-html.tar.bz2 12496
 MD5 6c193e328cdb472787ef78401ee5294c sbcl-0.8.1-x86-linux-binary.tar.bz2 6348098
-MD5 b5a5c93185ae03392ff6000a4a425222 sbcl-0.8.8-ppc-linux-binary.tar.bz2 6831954
+MD5 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 6656148
 MD5 7cb56cd42b1f5797d26316e79aaccb06 sbcl-0.7.13-sparc-linux-binary.tar.bz2 5670293
 MD5 29ad145f1fc45c65b8d65b39013bc43f sbcl-0.7.10-mips-linux-binary.tar.gz 7473873
 MD5 beba4861dc8de0a2420c483f15a93c05 sbcl-0.8.19-x86-64-linux-binary.tar.bz2 7466117
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.8.21-r1 b/dev-lisp/sbcl/files/digest-sbcl-0.8.21-r1
new file mode 100644
index 000000000000..becf31638d32
--- /dev/null
+++ b/dev-lisp/sbcl/files/digest-sbcl-0.8.21-r1
@@ -0,0 +1,8 @@
+MD5 61a7e7c3c6be55e3155a901e67ff987a sbcl-0.8.21-source.tar.bz2 2448354
+MD5 a2e4c0e99428a16524669798bf479b14 sbcl-0.8.21-html.tar.bz2 12496
+MD5 6c193e328cdb472787ef78401ee5294c sbcl-0.8.1-x86-linux-binary.tar.bz2 6348098
+MD5 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 6656148
+MD5 7cb56cd42b1f5797d26316e79aaccb06 sbcl-0.7.13-sparc-linux-binary.tar.bz2 5670293
+MD5 29ad145f1fc45c65b8d65b39013bc43f sbcl-0.7.10-mips-linux-binary.tar.gz 7473873
+MD5 beba4861dc8de0a2420c483f15a93c05 sbcl-0.8.19-x86-64-linux-binary.tar.bz2 7466117
+MD5 d964b7ddca50b23815cd9bd6891108f0 sbcl-af-2004-10-22.tgz 12408
diff --git a/dev-lisp/sbcl/sbcl-0.8.20.ebuild b/dev-lisp/sbcl/sbcl-0.8.20.ebuild
index a4bbe7f383fd..e21f765d8fa8 100644
--- a/dev-lisp/sbcl/sbcl-0.8.20.ebuild
+++ b/dev-lisp/sbcl/sbcl-0.8.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.8.20.ebuild,v 1.3 2005/04/07 07:59:30 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.8.20.ebuild,v 1.4 2005/04/25 05:55:06 mkennedy Exp $
 
 inherit common-lisp-common-2 eutils
 
@@ -26,7 +26,7 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~amd64"
 IUSE="threads doc nosource unicode ldb callbacks"
 
 DEPEND="=dev-lisp/common-lisp-controller-4*
@@ -37,8 +37,15 @@ DEPEND="=dev-lisp/common-lisp-controller-4*
 PROVIDE="virtual/commonlisp"
 
 pkg_setup() {
-	if use hardened; then
-		die 'So-called "hardened" USE features are incompatible with SBCL.'
+	if gcc-config -c |grep hardened; then
+		while read line; do einfo "${line}"; done <<EOF
+
+So-called "hardened" compiler features are incompatible with SBCL.	You must use
+gcc-config to select a profile with non-hardened features and "source
+/etc/profile" before continuing.
+
+EOF
+	die
 	fi
 }
 
diff --git a/dev-lisp/sbcl/sbcl-0.8.21-r1.ebuild b/dev-lisp/sbcl/sbcl-0.8.21-r1.ebuild
new file mode 100644
index 000000000000..d306f56654d6
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-0.8.21-r1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.8.21-r1.ebuild,v 1.1 2005/04/25 05:55:06 mkennedy Exp $
+
+inherit common-lisp-common-2 eutils
+
+SBCL_AF_PV=2004-10-22
+
+BV_X86=0.8.1
+BV_PPC=0.8.15
+BV_SPARC=0.7.13
+BV_MIPS=0.7.10
+BV_AMD64=0.8.19
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	mirror://sourceforge/sbcl/${P}-html.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.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 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	callbacks? ( http://pinhead.music.uiuc.edu/~hkt/sbcl-af-${SBCL_AF_PV}.tgz )"
+
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="x86 ~ppc ~sparc ~mips ~amd64"
+IUSE="threads doc nosource unicode ldb callbacks"
+
+DEPEND="=dev-lisp/common-lisp-controller-4*
+	>=dev-lisp/cl-asdf-1.84
+	sys-apps/texinfo
+	doc? ( virtual/tetex )"
+
+PROVIDE="virtual/commonlisp"
+
+MY_WORK=${S}/my_work
+
+pkg_setup() {
+	if gcc-config -c |grep hardened; then
+		while read line; do einfo "${line}"; done <<EOF
+
+So-called "hardened" compiler features are incompatible with SBCL.	You must use
+gcc-config to select a profile with non-hardened features and "source
+/etc/profile" before continuing.
+
+EOF
+	die
+	fi
+}
+
+src_unpack() {
+	mkdir -p ${MY_WORK} && cp --verbose ${FILESDIR}/${PV}/* ${MY_WORK}
+	sed -i "s,/usr/lib,/usr/$(get_libdir),g" ${MY_WORK}/*
+
+	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}-powerpc-linux-binary.tar.bz2
+		mv ${PN}-${BV_PPC}-powerpc-linux ppc-binary
+	elif use sparc; then
+		unpack ${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2
+		echo mv ${PN}-${BV_SPARC} sparc-binary || die
+		mv ${PN}-${BV_SPARC} sparc-binary || die
+	elif use mips; then
+		unpack ${PN}-${BV_MIPS}-mips-linux-binary.tar.gz
+		mv ${PN}-${BV_MIPS}-mips-linux mips-binary
+	elif use amd64; then
+		unpack ${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2
+		mv ${PN}-${BV_AMD64}-x86-64-linux x86-64-binary
+	fi
+
+	unpack ${P}-source.tar.bz2
+	epatch ${MY_WORK}/sbcl-gentoo.patch
+	epatch ${MY_WORK}/sbcl-no-tests-gentoo.patch
+
+	cp ${MY_WORK}/customize-target-features.lisp-prefix \
+		${S}/customize-target-features.lisp
+	use x86 && use threads \
+		&& echo '(enable :sb-thread)' \
+		>>${S}/customize-target-features.lisp
+	use ldb \
+		&& echo '(enable :sb-ldb)' \
+		>>${S}/customize-target-features.lisp
+	use x86 \
+		&& echo '(enable :sb-futex)' \
+		>>${S}/customize-target-features.lisp
+	echo '(disable :sb-test)' >>${S}/customize-target-features.lisp
+	! use unicode \
+		&& echo '(disable :sb-unicode)' \
+		>>${S}/customize-target-features.lisp
+	cat ${MY_WORK}/customize-target-features.lisp-suffix \
+		>>${S}/customize-target-features.lisp
+	find ${S} -type f -name .cvsignore -exec rm -f '{}' \;
+	find ${S} -depth -type d -name CVS	-exec rm -rf '{}' \;
+	find ${S} -type f -name \*.c -exec chmod 644 '{}' \;
+
+	if use callbacks; then
+		einfo "You have specified the \"callbacks\" USE flag.  Callbacks may only work for x86."
+		einfo "Please refer to README.Gentoo for more information."
+		unpack sbcl-af-${SBCL_AF_PV}.tgz
+	fi
+}
+
+src_compile() {
+	local bindir=""
+
+	if use x86; then
+		bindir=../x86-binary
+	elif use ppc; then
+		bindir=../ppc-binary
+	elif use sparc; then
+		bindir=../sparc-binary
+	elif use mips; then
+		bindir=../mips-binary
+	elif use amd64; then
+		bindir=../x86-64-binary
+	fi
+
+	PATH=${bindir}/src/runtime:${PATH} SBCL_HOME=${bindir}/output GNUMAKE=make \
+		./make.sh 'sbcl
+			--sysinit /dev/null
+			--userinit /dev/null
+			--no-debugger
+			--core ${bindir}/output/sbcl.core' \
+				|| die
+	cd ${S}/doc/manual
+	make info
+	use doc && make ps pdf
+}
+
+src_install() {
+	unset SBCL_HOME
+
+	insinto /etc/
+	doins ${MY_WORK}/sbclrc	# Gentoo specific (from Debian)
+
+	exeinto /usr/$(get_libdir)/common-lisp/bin
+	doexe ${MY_WORK}/sbcl.sh	# Gentoo specific (from Debian)
+
+	dodir /usr/share/man
+	dodir /usr/share/doc/${PF}
+	INSTALL_ROOT=${D}/usr DOC_DIR=${D}/usr/share/doc/${PF} sh install.sh || die
+	mv ${D}/usr/$(get_libdir)/sbcl/sbcl.core ${D}/usr/$(get_libdir)/sbcl/sbcl-dist.core || die
+
+	insinto /usr/$(get_libdir)/sbcl
+	doins ${MY_WORK}/install-clc.lisp	# Gentoo specific (from Debian)
+
+	doman doc/sbcl-asdf-install.1
+
+	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE SUPPORT TLA TODO
+	dodoc ${MY_WORK}/README.Gentoo
+	dohtml doc/html/*
+
+	doinfo ${S}/doc/manual/*.info
+	use doc && dodoc ${S}/doc/manual/*.{pdf,ps}
+
+	keepdir /usr/$(get_libdir)/common-lisp/sbcl
+
+	if ! use nosource; then
+		# install the SBCL source
+		find ${S}/src -type f -name \*.fasl |xargs rm -f
+		mv ${S}/src ${D}/usr/$(get_libdir)/sbcl/
+	fi
+
+	impl-save-timestamp-hack sbcl || die
+}
+
+pkg_postinst() {
+	standard-impl-postinst sbcl
+	if use callbacks; then
+		mv /usr/$(get_libdir)/sbcl/sbcl.core /usr/$(get_libdir)/sbcl/sbcl-nocallbacks.core || die
+		pushd ${WORKDIR}/sbcl-af
+		sbcl --core /usr/$(get_libdir)/sbcl/sbcl-nocallbacks.core \
+			--load 'system' \
+			--eval "(sb-ext:save-lisp-and-die \"/usr/$(get_libdir)/sbcl/sbcl.core\")" || die
+		popd
+	fi
+# Image Summary
+# -------------
+# /usr/$(get_libdir)/sbcl/sbcl-dist.core		  - Plain SBCL image
+# /usr/$(get_libdir)/sbcl/sbcl-nocallbacks.core - CLC (Common Lisp Controller) image
+# /usr/$(get_libdir)/sbcl/sbcl.core			  - CLC image w/ callbacks support
+}
+
+pkg_postrm() {
+	standard-impl-postrm sbcl /usr/bin/sbcl
+	if [ ! -x /usr/bin/sbcl ]; then
+		rm -rf /usr/$(get_libdir)/sbcl/ || die
+	fi
+}