*** empty log message ***

22 files changed, 115 insertions, 710 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index 0c2cacfc8f21..63efe5c7c81c 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-lisp/sbcl
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.25 2004/01/12 09:41:24 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.26 2004/01/29 03:54:31 mkennedy Exp $
+
+*sbcl-0.8.7-r1 (28 Jan 2004)
+
+  28 Jan 2004; <mkennedy@gentoo.org> sbcl-0.8.7-r1.ebuild,
+  files/0.8.7/customize-target-features.lisp,
+  files/0.8.7/customize-target-features.lisp.no-threads,
+  files/0.8.7/install-clc.lisp-gentoo.patch:
+  Move to stable for x86; metadata improvements; common lisp controller clean
+  up; inherit common-lisp-common for register-common-lisp-implementation; no 
+  longer enable :sb-doc in the features expression
+
+*sbcl-0.8.7-r1 (16 Jan 2004)
+
+  16 Jan 2004; <mkennedy@gentoo.org> sbcl-0.8.7-r1.ebuild:
+  Enhanced Common Lisp Controller support (install-clc.lisp); Fix ownership on
+  portage-timestamp-compensate unpack to be root
 
 *sbcl-0.8.7 (12 Jan 2004)
 
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index f97133bc95ae..db734c35c5bb 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -8,6 +8,7 @@ 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 0d220a5029f2c302fdeafadd3bd97b7f sbcl-0.8.5-r1.ebuild 4018
+MD5 351f3f82b3458dbced1fa223e452278d sbcl-0.8.7-r1.ebuild 4151
 MD5 141aeff5bf9d9e3d8beced995f0b36e1 sbcl-0.8.7.ebuild 4095
 MD5 ecf044f288fb93be779915b684e8d81f files/digest-sbcl-0.8.5 461
 MD5 1b52d1cb085fdfec090a08604c2fd4ed files/digest-sbcl-0.7.7 300
@@ -22,6 +23,8 @@ MD5 2821ba30af598f01018a43b370010e7c files/sbcl.rc 251
 MD5 149ae58f2a3254c2746b71452292abf2 files/sbcl.sh 2170
 MD5 ecf044f288fb93be779915b684e8d81f files/digest-sbcl-0.8.5-r1 461
 MD5 d4bfc144f303942ff574404fbd2e078d files/digest-sbcl-0.8.7 528
+MD5 d4bfc144f303942ff574404fbd2e078d files/digest-sbcl-0.8.7-r1 528
 MD5 f03239faafd7bab9fb5f858b3cdfdf3b files/0.8.7/posix-tests.lisp-sandbox-gentoo.patch 1860
 MD5 6bd69b507b65c1673290970c034a307c files/0.8.7/README.Gentoo 695
+MD5 d7683d4562e68effcb4149d5ffa4e1df files/0.8.7/install-clc.lisp-gentoo.patch 639
 MD5 6f7e5b88d5e1e5eb21b00e008b8a23b5 files/0.8.7/customize-target-features.lisp 532
diff --git a/dev-lisp/sbcl/files/0.8.7/customize-target-features.lisp b/dev-lisp/sbcl/files/0.8.7/customize-target-features.lisp
index 86bca46e687c..38bb1aa8851a 100644
--- a/dev-lisp/sbcl/files/0.8.7/customize-target-features.lisp
+++ b/dev-lisp/sbcl/files/0.8.7/customize-target-features.lisp
@@ -12,5 +12,6 @@
    	 (disable (x)
 	   (setf list (remove x list))))
     (enable :sb-thread)
-    (enable :sb-futex))
+    (enable :sb-futex)
+    (disable :sb-test))
   list)
diff --git a/dev-lisp/sbcl/files/0.8.7/customize-target-features.lisp.no-threads b/dev-lisp/sbcl/files/0.8.7/customize-target-features.lisp.no-threads
new file mode 100644
index 000000000000..72ecfbeac2ba
--- /dev/null
+++ b/dev-lisp/sbcl/files/0.8.7/customize-target-features.lisp.no-threads
@@ -0,0 +1,17 @@
+;;;; This is the features customization lambda form we will use if the
+;;;; user has "threads" in USE *and* they are building for the x86
+;;;; architecture.
+
+;;;; :sb-futex is dependent on the presence of a Linux 2.6.x kernel.
+;;;; For users of Linux 2.4.x kernels, this is still okay to enable,
+;;;; as SBCL will fall back if the futex system-call is not present.
+
+(lambda (list)
+  (flet ((enable (x)
+	   (pushnew x list))
+   	 (disable (x)
+	   (setf list (remove x list))))
+    (disable :sb-thread)
+    (disable :sb-futex)
+    (disable :sb-test))
+  list)
diff --git a/dev-lisp/sbcl/files/0.8.7/install-clc.lisp-gentoo.patch b/dev-lisp/sbcl/files/0.8.7/install-clc.lisp-gentoo.patch
new file mode 100644
index 000000000000..6b4105eb6016
--- /dev/null
+++ b/dev-lisp/sbcl/files/0.8.7/install-clc.lisp-gentoo.patch
@@ -0,0 +1,22 @@
+--- sbcl-0.8.7/debian/install-clc.lisp.original	2004-01-15 10:50:15.000000000 -0600
++++ sbcl-0.8.7/debian/install-clc.lisp	2004-01-15 10:51:39.346695144 -0600
+@@ -18,7 +18,9 @@
+   (format t "~%Error during init of common-lisp-controller~%")
+   (sb-unix:unix-exit 1))
+ 
+-(defun common-lisp-controller:send-clc-command (command package)
++(in-package :common-lisp-controller)
++
++(defun send-clc-command (command package)
+   (let ((process
+ 	 (sb-ext:run-program "/usr/bin/clc-send-command"
+ 			     (list
+@@ -38,6 +40,8 @@
+ 	       package
+ 	       "sbcl"))))
+ 
++(in-package :common-lisp-user)
++
+ (ignore-errors
+  (format t "~%Saving to sbcl-new.core...")
+  (sb-ext:gc :full t)
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.7.7 b/dev-lisp/sbcl/files/digest-sbcl-0.7.7
deleted file mode 100644
index 5a2c5b60e26c..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.7.7
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 6e400532739edc78958f6ad17a4a7ff1 sbcl-0.7.7-source.tar.bz2 1820432
-MD5 7ae3698787a39bb6b7338bb088f3d80a sbcl-0.7.2-x86-linux-binary.tar.bz2 5420822
-MD5 4c3f54f6c3ed9195b87d3a34b6ac91a5 sbcl-0.7.6-ppc-linux-binary.tar.bz2 4890140
-MD5 e1ca52201ade36b9006edd94f9db76a6 sbcl-0.7.7-html.tar.bz2 37764
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.8.1 b/dev-lisp/sbcl/files/digest-sbcl-0.8.1
deleted file mode 100644
index 5ced64391800..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.8.1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 884771bd1ac26bc78c897ae6510541d9 sbcl-0.8.1-source.tar.bz2 1952843
-MD5 7916755351ad6908cf61055f6e57b282 sbcl-0.8.0.24-x86-linux-binary.tar.bz2 6308726
-MD5 1cbd667b28d6d5afabccc759315eea70 sbcl-0.7.13-binary-linux-ppc.tar.bz2 5339432
-MD5 bcc7b26487c947b0cccfeb0d0a6d709e sbcl-0.8.1-html.tar.bz2 45272
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.8.3 b/dev-lisp/sbcl/files/digest-sbcl-0.8.3
deleted file mode 100644
index 11a7dd0771ca..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.8.3
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 5989896de7eba3827556b1a11e297c91 sbcl-0.8.3-source.tar.bz2 2001385
-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 b377256bca8ccdb9cc8170a104b227fd sbcl-0.8.3-html.tar.bz2 45551
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.8.4 b/dev-lisp/sbcl/files/digest-sbcl-0.8.4
deleted file mode 100644
index 9b57f3d48c3b..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.8.4
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 d4abd72b2ff6609edf13db0c8be74753 sbcl_0.8.4.orig.tar.gz 2532894
-MD5 6f50fc5c69c48ed3e1183ff5953346b5 sbcl_0.8.4-1.diff.gz 11384
-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 695e6f894223c1487063164856e54a5a sbcl-0.8.4-html.tar.bz2 46397
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.8.4-r2 b/dev-lisp/sbcl/files/digest-sbcl-0.8.4-r2
deleted file mode 100644
index d5e860ee71b3..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.8.4-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 d4abd72b2ff6609edf13db0c8be74753 sbcl_0.8.4.orig.tar.gz 2532894
-MD5 6f50fc5c69c48ed3e1183ff5953346b5 sbcl_0.8.4-1.diff.gz 11384
-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
-MD5 695e6f894223c1487063164856e54a5a sbcl-0.8.4-html.tar.bz2 46397
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.8.5 b/dev-lisp/sbcl/files/digest-sbcl-0.8.5
deleted file mode 100644
index 3929c77d7e7b..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.8.5
+++ /dev/null
@@ -1,6 +0,0 @@
-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/files/digest-sbcl-0.8.5-r1 b/dev-lisp/sbcl/files/digest-sbcl-0.8.5-r1
deleted file mode 100644
index 3929c77d7e7b..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.8.5-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-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/files/digest-sbcl-0.8.4-r1 b/dev-lisp/sbcl/files/digest-sbcl-0.8.7-r1
index d5e860ee71b3..99d80d011a97 100644
--- a/dev-lisp/sbcl/files/digest-sbcl-0.8.4-r1
+++ b/dev-lisp/sbcl/files/digest-sbcl-0.8.7-r1
@@ -1,7 +1,7 @@
-MD5 d4abd72b2ff6609edf13db0c8be74753 sbcl_0.8.4.orig.tar.gz 2532894
-MD5 6f50fc5c69c48ed3e1183ff5953346b5 sbcl_0.8.4-1.diff.gz 11384
+MD5 df0b8d53af18e0a0379ed04286a5aa6d sbcl_0.8.7.orig.tar.gz 2599415
+MD5 2f00663b646b2615f12c984e3435d478 sbcl-0.8.7-html.tar.bz2 47069
+MD5 240b5807f7e7ae4c7bc7840b26ce2ab7 sbcl_0.8.7-1.diff.gz 11542
 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
-MD5 695e6f894223c1487063164856e54a5a sbcl-0.8.4-html.tar.bz2 46397
diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml
index f418045b09c8..b57518b82781 100644
--- a/dev-lisp/sbcl/metadata.xml
+++ b/dev-lisp/sbcl/metadata.xml
@@ -2,4 +2,22 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>common-lisp</herd>
+<longdescription>
+Steel Bank Common Lisp is an open source Common Lisp
+implementation. It provides an integrated native compiler,
+interpreter, and debugger.
+
+SBCL is a fork off of the main branch of CMUCL. SBCL is distinguished
+from CMUCL by a greater emphasis on maintainability. In particular,
+the SBCL system can be built directly from its source code, so that
+the output corresponds to the source code in a controlled, verifiable
+way, and arbitrary changes can be made to the system without causing
+bootstrapping problems. SBCL also places less emphasis than CMU CL
+does on new non-ANSI extensions, or on backward compatibility with old
+non-ANSI features.
+
+Support for native threading on GNU/Linux is available for the x86
+platform, including support for the new futex system call available in
+2.6.x kernels.
+</longdescription>
 </pkgmetadata>
diff --git a/dev-lisp/sbcl/sbcl-0.7.7.ebuild b/dev-lisp/sbcl/sbcl-0.7.7.ebuild
deleted file mode 100644
index 21d85f8d8482..000000000000
--- a/dev-lisp/sbcl/sbcl-0.7.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.7.7.ebuild,v 1.8 2003/09/11 01:10:52 msterret Exp $
-
-DESCRIPTION="Steel Bank Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-0.7.2-x86-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-0.7.6-ppc-linux-binary.tar.bz2 )
-	mirror://sourceforge/sbcl/${P}-html.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="x86 ~ppc -sparc "
-PROVIDE="virtual/commonlisp"
-# the SRC_URI trickery needs this
-DEPEND=">=sys-apps/portage-2.0.27"
-
-src_unpack() {
-
-	if ( use x86 ) ; then
-		unpack ${PN}-0.7.2-x86-linux-binary.tar.bz2
-		mv ${PN}-0.7.2 x86-binary
-	elif ( use ppc ) ; then
-		unpack ${PN}-0.7.6-ppc-linux-binary.tar.bz2
-		mv ${PN}-0.7.6-ppc-linux ppc-binary
-	fi
-
-	unpack ${P}-source.tar.bz2
-	unpack ${P}-html.tar.bz2
-}
-
-src_compile() {
-	local bindir
-	use x86 && bindir=x86-binary
-	use ppc && bindir=ppc-binary
-
-	export SBCL_HOME="../${bindir}/output/"
-	export GNUMAKE="make"
-
-	sh make.sh "../${bindir}/src/runtime/sbcl" || die
-}
-
-src_install() {
-	local LIB=${DESTTREE}/lib/sbcl
-
-	doman doc/sbcl.1
-	dobin src/runtime/sbcl
-
-	dodoc BUGS CREDITS NEWS README INSTALL COPYING
-	dohtml doc/html/*
-
-	dodir ${LIB}
-	insinto ${LIB}
-	doins output/sbcl.core
-
-	dodir /etc/env.d
-
-	echo "SBCL_HOME=${LIB}" > ${D}/etc/env.d/10sbcl
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.1.ebuild b/dev-lisp/sbcl/sbcl-0.8.1.ebuild
deleted file mode 100644
index 7d73f9dc56ab..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.1.ebuild,v 1.4 2003/09/11 01:10:52 msterret Exp $
-
-DESCRIPTION="Steel Bank Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-BV_X86=0.8.0.24
-BC_PPC=0.7.13
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-binary-linux-ppc.tar.bz2 )
-	mirror://sourceforge/sbcl/${P}-html.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~ppc -sparc "
-PROVIDE="virtual/commonlisp"
-# the SRC_URI trickery needs this
-DEPEND=">=sys-apps/portage-2.0.27"
-
-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-linux-binary.tar.bz2
-		mv ${PN}-${BV_PPC}-ppc-linux ppc-binary
-	fi
-
-	unpack ${P}-source.tar.bz2
-	unpack ${P}-html.tar.bz2
-}
-
-src_compile() {
-	local bindir
-	use x86 && bindir=x86-binary
-	use ppc && bindir=ppc-binary
-
-	export SBCL_HOME="../${bindir}/output/"
-	export GNUMAKE="make"
-
-	sh make.sh "../${bindir}/src/runtime/sbcl" || die
-}
-
-src_install() {
-	local LIB=${DESTTREE}/lib/sbcl
-
-	doman doc/sbcl.1
-	dobin src/runtime/sbcl
-
-	dodoc BUGS CREDITS NEWS README INSTALL COPYING
-	dohtml doc/html/*
-
-	dodir ${LIB}
-	insinto ${LIB}
-	doins output/sbcl.core
-
-	dodir /etc/env.d
-
-	echo "SBCL_HOME=${LIB}" > ${D}/etc/env.d/10sbcl
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.3.ebuild b/dev-lisp/sbcl/sbcl-0.8.3.ebuild
deleted file mode 100644
index 97637b856d21..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.3.ebuild,v 1.2 2003/11/14 11:41:53 seemant Exp $
-
-DESCRIPTION="Steel Bank Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-BV_X86=0.8.1
-BV_PPC=0.7.13
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-binary-linux-ppc.tar.bz2 )
-	mirror://sourceforge/sbcl/${P}-html.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~ppc -sparc "
-PROVIDE="virtual/commonlisp"
-# the SRC_URI trickery needs this
-DEPEND=">=sys-apps/portage-2.0.27
-	dev-lisp/common-lisp-controller"
-
-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-linux-binary.tar.bz2
-		mv ${PN}-${BV_PPC}-ppc-linux ppc-binary
-	fi
-
-	unpack ${P}-source.tar.bz2
-	unpack ${P}-html.tar.bz2
-}
-
-src_compile() {
-	local bindir
-	use x86 && bindir=x86-binary
-	use ppc && bindir=ppc-binary
-
-	#export INSTALL_ROOT=${D}/usr
-	#export SBCL_HOME=${D}/usr/lib/sbcl
-	export SBCL_HOME=../${bindir}/output
-	export GNUMAKE="make"
-
-	sh make.sh "../${bindir}/src/runtime/sbcl" || die
-	sh make-target-contrib.sh || die
-}
-
-src_install() {
-	local LIB=${DESTTREE}/lib/sbcl
-
-	doman doc/sbcl.1
-	dobin src/runtime/sbcl
-
-	dodoc BUGS CREDITS NEWS README INSTALL COPYING
-	dohtml doc/html/*
-
-	dodir ${LIB}
-	insinto ${LIB}
-	cp -r output/* ${D}/${LIB}
-	doins output/sbcl.core
-	newins output/sbcl.core sbcl-dist.core
-
-	insinto /usr/lib/sbcl
-	doins ${FILESDIR}/install-clc.lisp
-
-	exeinto /usr/lib/common-lisp/bin
-	cp ${FILESDIR}/sbcl.sh sbcl.sh
-	doexe sbcl.sh
-
-	insinto /etc
-	doins ${FILESDIR}/sbcl.rc
-
-	dodir /usr/share/common-lisp/source/sbcl
-	cp -r src/* ${D}/usr/share/common-lisp/source/sbcl
-
-	dodir /etc/env.d
-
-	echo "SBCL_HOME=${LIB}" > ${D}/etc/env.d/10sbcl
-
-	export INSTALL_ROOT=${D}/usr
-	export SBCL_HOME=${D}/usr/lib/sbcl
-	export GNUMAKE="make"
-
-	sh install.sh || die
-}
-
-pkg_postinst() {
-	einfo ">>> Fixing permissions for executables and directories..."
-	find /usr/share/common-lisp/source -type d -o \( -type f -perm +111 \) \
-		|xargs chmod 755
-	einfo ">>> fix permissions for non-executable files..."
-	find /usr/share/common-lisp/source -type f ! -perm -111 \
-		|xargs chmod 644
-
-	/usr/sbin/register-common-lisp-implementation sbcl
-}
-
-pkg_postrm() {
-	/usr/sbin/unregister-common-lisp-implementation sbcl
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.4-r1.ebuild b/dev-lisp/sbcl/sbcl-0.8.4-r1.ebuild
deleted file mode 100644
index c2ff26b28baa..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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.4-r1.ebuild,v 1.1 2003/10/09 19:37:33 mkennedy Exp $
-
-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 )
-	mirror://sourceforge/sbcl/sbcl-${PV}-html.tar.bz2"
-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
-	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 \
-		debian/README.Debian debian/changelog debian/copyright
-
-	find ${D} -type f -name .cvsignore |xargs rm -f
-}
-
-pkg_postinst() {
-	einfo ">>> Fixing permissions for executables and directories..."
-	find /usr/share/common-lisp/source -type d -o \( -type f -perm +111 \) |xargs chmod 755
-	einfo ">>> fix permissions for non-executable files..."
-	find /usr/share/common-lisp/source -type f ! -perm -111 |xargs chmod 644
-	rm -rf /usr/lib/common-lisp/sbcl/
-	/usr/sbin/register-common-lisp-implementation sbcl
-}
-
-pkg_prerm() {
-	/usr/sbin/unregister-common-lisp-implementation sbcl
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.4-r2.ebuild b/dev-lisp/sbcl/sbcl-0.8.4-r2.ebuild
deleted file mode 100644
index f0cb258bd142..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.4-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.4-r2.ebuild,v 1.6 2003/10/31 01:19:53 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 '{}' \;
-
-	# 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() {
-	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
-	rm -rf /usr/lib/common-lisp/${PN} || true
-	/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
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.4.ebuild b/dev-lisp/sbcl/sbcl-0.8.4.ebuild
deleted file mode 100644
index 966a15604b10..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.4.ebuild,v 1.1 2003/10/08 11:12:57 pyrania Exp $
-
-DESCRIPTION="Steel Bank Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-BV_X86=0.8.1
-BV_PPC=0.7.13
-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 )
-	mirror://sourceforge/sbcl/sbcl-${PV}-html.tar.bz2"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~ppc -sparc "
-PROVIDE="virtual/commonlisp"
-# the SRC_URI trickery needs this
-DEPEND=">=sys-apps/portage-2.0.27
-	dev-lisp/common-lisp-controller"
-
-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-linux-binary.tar.bz2
-		mv ${PN}-${BV_PPC}-ppc-linux ppc-binary
-	fi
-	unpack sbcl_${PV}.orig.tar.gz
-	unpack sbcl_${PV}-${DEB_PV}.diff.gz
-	unpack sbcl-${PV}-html.tar.bz2
-}
-
-src_compile() {
-	local bindir
-	use x86 && bindir=../x86-binary
-	use ppc && bindir=../ppc-binary
-	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'
-}
-
-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
-	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
-
-	dohtml doc/html/*
-	dodoc BUGS CREDITS NEWS README INSTALL COPYING \
-		debian/README.Debian debian/changelog debian/copyright
-
-	find ${D} -type f -name .cvsignore |xargs rm -f
-}
-
-pkg_postinst() {
-	einfo ">>> Fixing permissions for executables and directories..."
-	find /usr/share/common-lisp/source -type d -o \( -type f -perm +111 \) \
-		|xargs chmod 755
-	einfo ">>> fix permissions for non-executable files..."
-	find /usr/share/common-lisp/source -type f ! -perm -111 \
-		|xargs chmod 644
-
-	rm -rf /usr/lib/common-lisp/sbcl/
-	/usr/sbin/register-common-lisp-implementation sbcl
-}
-
-pkg_prerm() {
-	/usr/sbin/unregister-common-lisp-implementation sbcl
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.5.ebuild b/dev-lisp/sbcl/sbcl-0.8.5.ebuild
deleted file mode 100644
index fb82fa4d3b67..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.ebuild,v 1.1 2003/10/31 01:19:53 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 '{}' \;
-
-	# 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() {
-	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
-	rm -rf /usr/lib/common-lisp/${PN} || true
-	/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
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.5-r1.ebuild b/dev-lisp/sbcl/sbcl-0.8.7-r1.ebuild
index 9a36b384bdc3..8eba9d331151 100644
--- a/dev-lisp/sbcl/sbcl-0.8.5-r1.ebuild
+++ b/dev-lisp/sbcl/sbcl-0.8.7-r1.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.3 2003/12/27 17:28:16 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.8.7-r1.ebuild,v 1.1 2004/01/29 03:54:31 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.)"
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
 HOMEPAGE="http://sbcl.sourceforge.net/"
+IUSE="threads"
 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
+	mirror://sourceforge/sbcl/${P}-html.tar.bz2
 	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 )
@@ -21,10 +23,7 @@ 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 )"
+DEPEND="dev-lisp/common-lisp-controller"
 
 S=${WORKDIR}/${P}
 
@@ -46,6 +45,19 @@ src_unpack() {
 	unpack sbcl_${PV}.orig.tar.gz
 	unpack sbcl_${PV}-${DEB_PV}.diff.gz
 	epatch sbcl_${PV}-${DEB_PV}.diff
+
+	epatch ${FILESDIR}/${PV}/posix-tests.lisp-sandbox-gentoo.patch
+	epatch ${FILESDIR}/${PV}/install-clc.lisp-gentoo.patch
+
+	# Currently, thread support is only available for x86.	These
+	# features expressions also disable :sb-test.
+	if use x86 && use threads; then
+		cp ${FILESDIR}/${PV}/customize-target-features.lisp \
+			${S}/customize-target-features.lisp
+	else
+		cp ${FILESDIR}/${PV}/customize-target-features.lisp.no-threads \
+			${S}/customize-target-features.lisp
+	fi
 }
 
 src_compile() {
@@ -55,38 +67,34 @@ src_compile() {
 	use sparc && bindir=../sparc-binary
 	use mips && bindir=../mips-binary
 	# TODO: allow the user to chose between SBCL, CMUCL and CLISP for bootstrapping
+	# build with previous SBCL
 	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
+	# build with CMUCL
+#	GNUMAKE=make ./make.sh 'lisp -batch'
 }
 
 src_install() {
 	unset SBCL_HOME
 
 	insinto /etc/
-	doins ${FILESDIR}/sbcl.rc
+	doins ${FILESDIR}/sbcl.rc	# Gentoo specific messages, hence ${FILESDIR}
 
 	exeinto /usr/lib/common-lisp/bin
-	doexe ${FILESDIR}/sbcl.sh
+	doexe debian/sbcl.sh
 
+	dodir /usr/share/man
 	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
+	doins debian/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
-
+	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE SUPPORT TLA TODO
 	do-debian-credits
+	dodoc ${FILESDIR}/${PV}/README.Gentoo
+	dohtml doc/html/*
 
 	find ${D} -type f -name .cvsignore -exec rm -f '{}' \;
 	find ${D} -type f -name \*.c -exec chmod 644 '{}' \;
@@ -100,15 +108,16 @@ src_install() {
 	# recent than their .lisp source.
 
 	dodir /usr/share/${PN}
-	tar cpvzf ${D}/usr/share/${PN}/portage-timestamp-compensate -C ${D}/usr/lib/${PN} .
+	tar cpjf ${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
+	tar xvjpfo /usr/share/sbcl/portage-timestamp-compensate -C /usr/lib/sbcl
+	chown -R root:root /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
+	register-common-lisp-implementation sbcl
 }
 
 pkg_postrm() {