New upstream version; Resolves Bug #103899; Keywording stable amd64, sparc and x86 for =dev-lisp/sbcl-0.9.3; Resolves Bug #103902; Remove older ebuilds: <=dev-lisp/sbcl-0.9.1; Remove ppc keywords from >=dev-lisp/sbcl-0.9.3 (see Bug #99456).

(Portage version: 2.0.51.22-r2)

33 files changed, 104 insertions, 1072 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index 170ec2900cd3..68eea3f34827 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,35 @@
 # 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.69 2005/08/07 12:47:42 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.70 2005/09/01 18:40:49 mkennedy Exp $
+
+*sbcl-0.9.4 (01 Sep 2005)
+
+  01 Sep 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  -files/0.8.21/README.Gentoo, -files/0.8.21/sbcl.sh, -files/0.9.0/sbcl.sh,
+  -files/0.8.21/customize-target-features.lisp-prefix,
+  -files/0.8.21/sbcl-gentoo.patch, -files/0.9.0/sbcl-gentoo.patch,
+  -files/0.8.21/customize-target-features.lisp-suffix,
+  -files/0.8.21/sbcl-no-tests-gentoo.patch, -files/0.9.0/sbclrc,
+  -files/0.8.21/install-clc.lisp, -files/0.8.21/sbclrc,
+  -files/0.9.1/README.Gentoo, -files/0.9.0/README.Gentoo,
+  -files/0.9.1/customize-target-features.lisp-prefix,
+  -files/0.9.0/customize-target-features.lisp-prefix,
+  -files/0.9.0/customize-target-features.lisp-suffix,
+  -files/0.9.0/install-clc.lisp,
+  -files/0.9.1/customize-target-features.lisp-suffix,
+  -files/0.9.1/install-clc.lisp, -files/0.9.1/sbcl.sh,
+  -files/0.9.1/sbcl-gentoo.patch, -files/0.9.1/sbclrc,
+  +files/0.9.4/README.Gentoo,
+  +files/0.9.4/customize-target-features.lisp-prefix,
+  +files/0.9.4/customize-target-features.lisp-suffix,
+  +files/0.9.4/install-clc.lisp, +files/0.9.4/sbcl.sh,
+  +files/0.9.4/sbcl-gentoo.patch, +files/0.9.4/sbclrc,
+  -sbcl-0.8.21-r1.ebuild, -sbcl-0.9.0.ebuild, -sbcl-0.9.1.ebuild,
+  -sbcl-0.9.1-r1.ebuild, sbcl-0.9.3.ebuild, +sbcl-0.9.4.ebuild:
+  New upstream version; Resolves Bug #103899; Keywording stable amd64, sparc
+  and x86 for =dev-lisp/sbcl-0.9.3; Resolves Bug #103902; Remove older
+  ebuilds: <=dev-lisp/sbcl-0.9.1; Remove ppc keywords from
+  >=dev-lisp/sbcl-0.9.3 (see Bug #99456).
 
   07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> sbcl-0.9.2.ebuild:
   Stable on ppc.
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 818fdf21578d..db337be99d2d 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -1,50 +1,59 @@
-MD5 d93898e868f1160965b5cfac146789c0 sbcl-0.9.1-r1.ebuild 5018
+MD5 e98c40083b96afb7ce5007082d208854 ChangeLog 18922
 MD5 0c9bf11185a2a2f1916fc3dc72c0e89e metadata.xml 1037
-MD5 72b4289f5478472db2dede0d8f28bf1c sbcl-0.9.2.ebuild 5020
 MD5 0a80c35d69a5c87181c5bda1f38e07d4 sbcl-0.8.21-r1.ebuild 5007
-MD5 e98c40083b96afb7ce5007082d208854 ChangeLog 18922
-MD5 07478a3017c769402e01170fcf225027 sbcl-0.9.3.ebuild 5049
-MD5 e8b7794e8ab90fa985511191366360c1 sbcl-0.9.1.ebuild 5087
 MD5 362a221b06cfe29428cc594435fb88e7 sbcl-0.9.0.ebuild 4864
-MD5 c62393dcb29e00ef8e61621eb49078f6 files/digest-sbcl-0.9.2 557
+MD5 d93898e868f1160965b5cfac146789c0 sbcl-0.9.1-r1.ebuild 5018
+MD5 e8b7794e8ab90fa985511191366360c1 sbcl-0.9.1.ebuild 5087
+MD5 72b4289f5478472db2dede0d8f28bf1c sbcl-0.9.2.ebuild 5020
+MD5 07478a3017c769402e01170fcf225027 sbcl-0.9.3.ebuild 5049
+MD5 07478a3017c769402e01170fcf225027 sbcl-0.9.4.ebuild 5049
+MD5 d18264bffb7b1a60421ea17c1862106f files/digest-sbcl-0.8.21-r1 558
 MD5 804f3eded447b0c1d9a238ca5533b058 files/digest-sbcl-0.9.0 557
+MD5 ad2b50cc0044a102b5eba7a50c597745 files/digest-sbcl-0.9.1 557
 MD5 ad2b50cc0044a102b5eba7a50c597745 files/digest-sbcl-0.9.1-r1 557
-MD5 d18264bffb7b1a60421ea17c1862106f files/digest-sbcl-0.8.21-r1 558
+MD5 c62393dcb29e00ef8e61621eb49078f6 files/digest-sbcl-0.9.2 557
 MD5 41c44af5374afae0f627457c2406ce35 files/digest-sbcl-0.9.3 557
-MD5 ad2b50cc0044a102b5eba7a50c597745 files/digest-sbcl-0.9.1 557
-MD5 7447a308f36b4ad14626357d8f2c8db6 files/0.9.1/sbcl.sh 1512
-MD5 f2071db9468694928756b219dad5c84e files/0.9.1/sbcl-gentoo.patch 3810
-MD5 7b753c4f6f63f1fc8630f3c9100a8ca9 files/0.9.1/customize-target-features.lisp-suffix 8
-MD5 3869dca83085d07e01386eda00c05943 files/0.9.1/install-clc.lisp 980
-MD5 ae674398012ba5e2737be7b08f8ac944 files/0.9.1/README.Gentoo 1060
-MD5 683427165f7d0717333bbb9762972b8d files/0.9.1/customize-target-features.lisp-prefix 95
-MD5 653f804ebcd167d167f8163756b7da17 files/0.9.1/sbclrc 639
-MD5 7447a308f36b4ad14626357d8f2c8db6 files/0.9.3/sbcl.sh 1512
-MD5 fa37ba308cbdad5cf330525fd1ebcd28 files/0.9.3/sbcl-gentoo.patch 3810
-MD5 7b753c4f6f63f1fc8630f3c9100a8ca9 files/0.9.3/customize-target-features.lisp-suffix 8
-MD5 3869dca83085d07e01386eda00c05943 files/0.9.3/install-clc.lisp 980
-MD5 a525c50480694091f6a6688c1472ab10 files/0.9.3/README.Gentoo 1060
-MD5 683427165f7d0717333bbb9762972b8d files/0.9.3/customize-target-features.lisp-prefix 95
-MD5 653f804ebcd167d167f8163756b7da17 files/0.9.3/sbclrc 639
-MD5 7447a308f36b4ad14626357d8f2c8db6 files/0.8.21/sbcl.sh 1512
-MD5 2a2e9f5c84cf4c30cb8cf9910c9b122d files/0.8.21/sbcl-gentoo.patch 1172
-MD5 7b753c4f6f63f1fc8630f3c9100a8ca9 files/0.8.21/customize-target-features.lisp-suffix 8
-MD5 3869dca83085d07e01386eda00c05943 files/0.8.21/install-clc.lisp 980
+MD5 d118e40afe2da4c015ff893db4ae12c3 files/digest-sbcl-0.9.4 557
+MD5 a525c50480694091f6a6688c1472ab10 files/0.9.4/README.Gentoo 1060
+MD5 683427165f7d0717333bbb9762972b8d files/0.9.4/customize-target-features.lisp-prefix 95
+MD5 7b753c4f6f63f1fc8630f3c9100a8ca9 files/0.9.4/customize-target-features.lisp-suffix 8
+MD5 3869dca83085d07e01386eda00c05943 files/0.9.4/install-clc.lisp 980
+MD5 5adaa789503e3fecd45ee5724d33584c files/0.9.4/sbcl-gentoo.patch 3810
+MD5 7447a308f36b4ad14626357d8f2c8db6 files/0.9.4/sbcl.sh 1512
+MD5 653f804ebcd167d167f8163756b7da17 files/0.9.4/sbclrc 639
 MD5 ae674398012ba5e2737be7b08f8ac944 files/0.8.21/README.Gentoo 1060
 MD5 683427165f7d0717333bbb9762972b8d files/0.8.21/customize-target-features.lisp-prefix 95
+MD5 7b753c4f6f63f1fc8630f3c9100a8ca9 files/0.8.21/customize-target-features.lisp-suffix 8
+MD5 3869dca83085d07e01386eda00c05943 files/0.8.21/install-clc.lisp 980
+MD5 2a2e9f5c84cf4c30cb8cf9910c9b122d files/0.8.21/sbcl-gentoo.patch 1172
 MD5 fc134245ed4a6ec677c07784e618f992 files/0.8.21/sbcl-no-tests-gentoo.patch 2609
+MD5 7447a308f36b4ad14626357d8f2c8db6 files/0.8.21/sbcl.sh 1512
 MD5 653f804ebcd167d167f8163756b7da17 files/0.8.21/sbclrc 639
-MD5 7447a308f36b4ad14626357d8f2c8db6 files/0.9.2/sbcl.sh 1512
-MD5 23b47e03a456e33b5d3c74354e95ac5c files/0.9.2/sbcl-gentoo.patch 3810
-MD5 7b753c4f6f63f1fc8630f3c9100a8ca9 files/0.9.2/customize-target-features.lisp-suffix 8
-MD5 3869dca83085d07e01386eda00c05943 files/0.9.2/install-clc.lisp 980
-MD5 918b12b7b742be8cf2e22a3a41f53b0c files/0.9.2/README.Gentoo 1060
-MD5 683427165f7d0717333bbb9762972b8d files/0.9.2/customize-target-features.lisp-prefix 95
-MD5 653f804ebcd167d167f8163756b7da17 files/0.9.2/sbclrc 639
-MD5 7447a308f36b4ad14626357d8f2c8db6 files/0.9.0/sbcl.sh 1512
-MD5 10ad0f13649512a6ec6746bcb16e8774 files/0.9.0/sbcl-gentoo.patch 3810
-MD5 7b753c4f6f63f1fc8630f3c9100a8ca9 files/0.9.0/customize-target-features.lisp-suffix 8
-MD5 3869dca83085d07e01386eda00c05943 files/0.9.0/install-clc.lisp 980
 MD5 ae674398012ba5e2737be7b08f8ac944 files/0.9.0/README.Gentoo 1060
 MD5 683427165f7d0717333bbb9762972b8d files/0.9.0/customize-target-features.lisp-prefix 95
+MD5 7b753c4f6f63f1fc8630f3c9100a8ca9 files/0.9.0/customize-target-features.lisp-suffix 8
+MD5 3869dca83085d07e01386eda00c05943 files/0.9.0/install-clc.lisp 980
+MD5 10ad0f13649512a6ec6746bcb16e8774 files/0.9.0/sbcl-gentoo.patch 3810
+MD5 7447a308f36b4ad14626357d8f2c8db6 files/0.9.0/sbcl.sh 1512
 MD5 653f804ebcd167d167f8163756b7da17 files/0.9.0/sbclrc 639
+MD5 ae674398012ba5e2737be7b08f8ac944 files/0.9.1/README.Gentoo 1060
+MD5 683427165f7d0717333bbb9762972b8d files/0.9.1/customize-target-features.lisp-prefix 95
+MD5 7b753c4f6f63f1fc8630f3c9100a8ca9 files/0.9.1/customize-target-features.lisp-suffix 8
+MD5 3869dca83085d07e01386eda00c05943 files/0.9.1/install-clc.lisp 980
+MD5 f2071db9468694928756b219dad5c84e files/0.9.1/sbcl-gentoo.patch 3810
+MD5 7447a308f36b4ad14626357d8f2c8db6 files/0.9.1/sbcl.sh 1512
+MD5 653f804ebcd167d167f8163756b7da17 files/0.9.1/sbclrc 639
+MD5 918b12b7b742be8cf2e22a3a41f53b0c files/0.9.2/README.Gentoo 1060
+MD5 683427165f7d0717333bbb9762972b8d files/0.9.2/customize-target-features.lisp-prefix 95
+MD5 7b753c4f6f63f1fc8630f3c9100a8ca9 files/0.9.2/customize-target-features.lisp-suffix 8
+MD5 3869dca83085d07e01386eda00c05943 files/0.9.2/install-clc.lisp 980
+MD5 23b47e03a456e33b5d3c74354e95ac5c files/0.9.2/sbcl-gentoo.patch 3810
+MD5 7447a308f36b4ad14626357d8f2c8db6 files/0.9.2/sbcl.sh 1512
+MD5 653f804ebcd167d167f8163756b7da17 files/0.9.2/sbclrc 639
+MD5 a525c50480694091f6a6688c1472ab10 files/0.9.3/README.Gentoo 1060
+MD5 683427165f7d0717333bbb9762972b8d files/0.9.3/customize-target-features.lisp-prefix 95
+MD5 7b753c4f6f63f1fc8630f3c9100a8ca9 files/0.9.3/customize-target-features.lisp-suffix 8
+MD5 3869dca83085d07e01386eda00c05943 files/0.9.3/install-clc.lisp 980
+MD5 fa37ba308cbdad5cf330525fd1ebcd28 files/0.9.3/sbcl-gentoo.patch 3810
+MD5 7447a308f36b4ad14626357d8f2c8db6 files/0.9.3/sbcl.sh 1512
+MD5 653f804ebcd167d167f8163756b7da17 files/0.9.3/sbclrc 639
diff --git a/dev-lisp/sbcl/files/0.8.21/sbcl-gentoo.patch b/dev-lisp/sbcl/files/0.8.21/sbcl-gentoo.patch
deleted file mode 100644
index 98a9ee85c35f..000000000000
--- a/dev-lisp/sbcl/files/0.8.21/sbcl-gentoo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru sbcl-0.8.21.orig/contrib/sb-posix/posix-tests.lisp sbcl-0.8.21/contrib/sb-posix/posix-tests.lisp
---- sbcl-0.8.21.orig/contrib/sb-posix/posix-tests.lisp	2004-03-15 09:24:53.000000000 -0600
-+++ sbcl-0.8.21/contrib/sb-posix/posix-tests.lisp	2004-04-28 14:47:50.179460512 -0500
-@@ -96,7 +96,7 @@
-       (sb-posix:syscall-errno c)))
-   #.sb-posix::eexist)
- 
--(deftest mkdir.error.2
-+#+nil (deftest mkdir.error.2
-   (handler-case
-       (sb-posix:mkdir "/" 0)
-     (sb-posix:syscall-error (c)
-@@ -149,7 +149,7 @@
-       (sb-posix:syscall-errno c)))
-   #.sb-posix::enotdir)
- 
--(deftest rmdir.error.3
-+#+nil (deftest rmdir.error.3
-   (handler-case
-       (sb-posix:rmdir "/")
-     (sb-posix:syscall-error (c)
-diff -ru sbcl-0.8.21.orig/src/runtime/GNUmakefile sbcl-0.8.21/src/runtime/GNUmakefile
---- sbcl-0.8.21.orig/src/runtime/GNUmakefile	2004-04-10 08:37:23.000000000 -0500
-+++ sbcl-0.8.21/src/runtime/GNUmakefile	2004-04-28 14:46:29.556717032 -0500
-@@ -33,6 +33,7 @@
- # symlink to Config-foo.
- include Config
- 
-+CFLAGS += -DSBCL_HOME='"/usr/lib/sbcl"'
- 
- C_SRCS = alloc.c backtrace.c breakpoint.c coreparse.c \
- 	dynbind.c gc-common.c globals.c interr.c interrupt.c \
diff --git a/dev-lisp/sbcl/files/0.8.21/sbcl-no-tests-gentoo.patch b/dev-lisp/sbcl/files/0.8.21/sbcl-no-tests-gentoo.patch
deleted file mode 100644
index bf34ce4ad328..000000000000
--- a/dev-lisp/sbcl/files/0.8.21/sbcl-no-tests-gentoo.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ur sbcl-0.8.21.orig/contrib/sb-bsd-sockets/sb-bsd-sockets.asd sbcl-0.8.21/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
---- sbcl-0.8.21.orig/contrib/sb-bsd-sockets/sb-bsd-sockets.asd	2004-02-11 05:00:40.000000000 -0600
-+++ sbcl-0.8.21/contrib/sb-bsd-sockets/sb-bsd-sockets.asd	2004-07-11 15:30:52.230966464 -0500
-@@ -103,14 +103,3 @@
- (defmethod perform :after ((o load-op) (c (eql (find-system :sb-bsd-sockets))))
-   (provide 'sb-bsd-sockets))
- 
--(defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets))))
--  (operate 'load-op 'sb-bsd-sockets-tests)
--  (operate 'test-op 'sb-bsd-sockets-tests))
--
--(defsystem sb-bsd-sockets-tests
--  :depends-on (sb-rt sb-bsd-sockets sb-posix)
--  :components ((:file "tests")))
--
--(defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets-tests))))
--  (or (funcall (intern "DO-TESTS" (find-package "SB-RT")))
--      (error "test-op failed")))
-diff -ur sbcl-0.8.21.orig/contrib/sb-posix/sb-posix.asd sbcl-0.8.21/contrib/sb-posix/sb-posix.asd
---- sbcl-0.8.21.orig/contrib/sb-posix/sb-posix.asd	2003-11-29 14:41:47.000000000 -0600
-+++ sbcl-0.8.21/contrib/sb-posix/sb-posix.asd	2004-07-11 15:52:38.766342896 -0500
-@@ -86,34 +86,3 @@
- 		  "constants"
- 		  :package :sb-posix :depends-on  ("defpackage"))
- 		 (:file "interface" :depends-on ("constants" "macros" "designator" "alien"))))
--
--(defsystem sb-posix-tests
--    :depends-on (sb-rt)
--    :components ((:file "posix-tests")))
--
--(defmethod perform :after ((o load-op) (c (eql (find-system :sb-posix))))
--  (provide 'sb-posix))
--
--(defmethod perform ((o test-op) (c (eql (find-system :sb-posix))))
--  (operate 'load-op 'sb-posix-tests)
--  (operate 'test-op 'sb-posix-tests))
--
--(defmethod perform ((o test-op) (c (eql (find-system :sb-posix-tests))))
--  (funcall (intern "DO-TESTS" (find-package "SB-RT")))
--  (let ((failures (funcall (intern "PENDING-TESTS" "SB-RT")))
--	(ignored-failures (loop for sym being the symbols of :sb-posix-tests
--			        if (search ".ERROR" (symbol-name sym))
--			        collect sym)))
--    (cond
--      ((null failures)
--       t)	     
--      ((null (set-difference failures ignored-failures))
--       (warn "~@<some POSIX implementations return incorrect error values for ~
--              failing calls, but there is legitimate variation between ~
--              implementations too.  If you think the errno ~
--              from your platform is valid, please contact the sbcl ~
--              developers; otherwise, please submit a bug report to your ~
--              kernel distributor~@:>")
--       t)
--      (t
--       (error "non-errno tests failed!")))))
diff --git a/dev-lisp/sbcl/files/0.9.0/README.Gentoo b/dev-lisp/sbcl/files/0.9.0/README.Gentoo
deleted file mode 100644
index 6f4f84da9289..000000000000
--- a/dev-lisp/sbcl/files/0.9.0/README.Gentoo
+++ /dev/null
@@ -1,29 +0,0 @@
--*- outline -*- $Id: README.Gentoo,v 1.2 2005/06/01 03:24:45 mkennedy Exp $
-
-Gentoo GNU/Linux specific notes for SBCL
-----------------------------------------
-
-This is the README.Gentoo file from /usr/share/doc/@PF@/ directory.
-
-  * The Gentoo port uses patches from the Debian project's SBCL port.
-
-  * An SBCL with support for multi-threading on GNU/Linux for x86 is available
-    with 'USE="threads" emerge dev-lisp/sbcl'
-
-  * asdf-install is installed as sbcl-asdf-install (the man-page is similarly
-    named).
-
-  * Support for the Common Lisp Controller is available.
-
-  * If "nosource" is in your USE flags, then SBCL's source will not be installed
-    (in /usr/lib/sbcl/src).
-
-  * If "unicode" is in your USE flags, then support for SBCL
-    Unicode will be included.
-
-  * If "ldb" is in your USE flags, then support for the SBCL low-level debugger
-    will be included.
-
-If you encounter any problems or have suggestions, use http://bugs.gentoo.org.
-Please don't bother the upstream authors unless you are absolutely certain it is
-not Gentoo-related.
diff --git a/dev-lisp/sbcl/files/0.9.0/customize-target-features.lisp-prefix b/dev-lisp/sbcl/files/0.9.0/customize-target-features.lisp-prefix
deleted file mode 100644
index 40f9a4fc85fa..000000000000
--- a/dev-lisp/sbcl/files/0.9.0/customize-target-features.lisp-prefix
+++ /dev/null
@@ -1,5 +0,0 @@
-(lambda (list)
-(flet ((enable (x)
-(pushnew x list))
-(disable (x)
-(setf list (remove x list))))
diff --git a/dev-lisp/sbcl/files/0.9.0/customize-target-features.lisp-suffix b/dev-lisp/sbcl/files/0.9.0/customize-target-features.lisp-suffix
deleted file mode 100644
index dbbde7adc44e..000000000000
--- a/dev-lisp/sbcl/files/0.9.0/customize-target-features.lisp-suffix
+++ /dev/null
@@ -1,2 +0,0 @@
-)
-list)
diff --git a/dev-lisp/sbcl/files/0.9.0/install-clc.lisp b/dev-lisp/sbcl/files/0.9.0/install-clc.lisp
deleted file mode 100644
index c8e0a93a729f..000000000000
--- a/dev-lisp/sbcl/files/0.9.0/install-clc.lisp
+++ /dev/null
@@ -1,34 +0,0 @@
-;;; -*- Mode: LISP; Package: CL-USER -*-
-;;;
-;;; Copyright (C) Peter Van Eynde 2001 and Kevin Rosenberg 2002-2003
-;;;
-;;; License: LGPL v2
-;;;
-(in-package "COMMON-LISP-USER")
-
-(handler-case
-    (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
-  (error (e)
-    (format t "~%Error during load of common-lisp-controller.lisp: ~A~%" e)
-    (sb-unix:unix-exit 1)))
-
-(handler-case
-    (common-lisp-controller:init-common-lisp-controller-v4 "sbcl")
-  (error (e)
-    (format t "~%Error running init-common-lisp-controller-v4: ~A~%" e)
-    (sb-unix:unix-exit 1)))
-
-(when (probe-file #p"/etc/lisp.config")
-  (load #p"/etc/lisp.config"))
-
-(setf (logical-pathname-translations "SYS")
-      '(("SYS:SRC;**;*.*.*"
-	 #P"/usr/share/sbcl/src/**/*.*")
-	("SYS:CONTRIB;**;*.*.*"
-	 #P"/usr/share/sbcl/**/*.*")))
-       
-(ignore-errors
- (format t "~%Saving to sbcl-new.core...")
- (sb-ext:gc :full t)
- (sb-ext:save-lisp-and-die "sbcl-new.core"
-			   :purify t))
diff --git a/dev-lisp/sbcl/files/0.9.0/sbcl.sh b/dev-lisp/sbcl/files/0.9.0/sbcl.sh
deleted file mode 100644
index 66253874d2a3..000000000000
--- a/dev-lisp/sbcl/files/0.9.0/sbcl.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
-  cat <<EOF
-$0: cannot find the common-lisp-controller source.
-EOF
-  exit 0
-fi
-
-build_error()
-{
-    echo "Build failure $1"
-    exit 1
-}
-
-case $1 in
-    install-clc)
-	    echo $0 loading and dumping clc.
-	    ( cd /usr/lib/sbcl
-	      /usr/bin/sbcl --core /usr/lib/sbcl/sbcl-dist.core \
-		   --noinform --sysinit /etc/sbclrc --userinit /dev/null \
-		   --load "/usr/lib/sbcl/install-clc.lisp" 2> /dev/null
-              mv sbcl-new.core sbcl.core || (echo FAILED ; cp sbcl-dist.core sbcl.core ) )
-	    ;;
-    remove-clc)
-	    echo $0 removing clc-enabled image
-	    cp /usr/lib/sbcl/sbcl-dist.core /usr/lib/sbcl/sbcl.core
-	    ;;
-    rebuild)
-	    echo $0 rebuilding...
-	    shift
-	    echo rebuilding $1
-	    /usr/bin/sbcl --noinform --sysinit /etc/sbclrc --userinit /dev/null \
-	         --disable-debugger \
-	         --eval \
-"(handler-case
-     (progn
-       (asdf:operate 'asdf:compile-op (quote $1))
-       (sb-unix:unix-exit 0))
-    (error (e)
-      (ignore-errors (format t \"~&Build error: ~A~%\" e))
-      (finish-output)
-      (sb-unix:unix-exit 1)))" || build_error
-	    ;;
-     remove)
-	    echo $0 removing packages...
-	    shift
-	    while [ ! -z "$1" ] ; do
-		rm -rf "/var/cache/common-lisp-controller/*/sbcl/${1}"
-		shift
- 	    done
-	    ;;
-    *)
-	    echo $0 unkown command $1
-	    echo known commands: rebuild, remove, install-clc, and remove-clc
-	    exit 1
-	    ;;
-esac
-
-exit 0
diff --git a/dev-lisp/sbcl/files/0.9.0/sbclrc b/dev-lisp/sbcl/files/0.9.0/sbclrc
deleted file mode 100644
index 91f31720d896..000000000000
--- a/dev-lisp/sbcl/files/0.9.0/sbclrc
+++ /dev/null
@@ -1,18 +0,0 @@
-;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CL-USER -*-
-
-;;; This file is installed as /etc/sbcl.rc and run on every invocation
-;;; of SBCL
-
-(if (probe-file "/etc/lisp-config.lisp")
-    (load "/etc/lisp-config.lisp")
-    (format t "~%;;; Warning: there is no /etc/lisp-config.lisp file"))
-
-;;; The following is required if you want source location functions to
-;;; work (such as those called when you use M-. (edit definition) in
-;;; ILISP or SLIME)
-
-(setf (logical-pathname-translations "SYS")
-      '(("SYS:SRC;**;*.*.*" #p"/usr/lib/sbcl/src/**/*.*")
-	("SYS:CONTRIB;**;*.*.*" #p"/usr/lib/sbcl/**/*.*")))
-
-;;; sbclrc ends here
diff --git a/dev-lisp/sbcl/files/0.9.1/README.Gentoo b/dev-lisp/sbcl/files/0.9.1/README.Gentoo
deleted file mode 100644
index 6f4f84da9289..000000000000
--- a/dev-lisp/sbcl/files/0.9.1/README.Gentoo
+++ /dev/null
@@ -1,29 +0,0 @@
--*- outline -*- $Id: README.Gentoo,v 1.2 2005/06/01 03:24:45 mkennedy Exp $
-
-Gentoo GNU/Linux specific notes for SBCL
-----------------------------------------
-
-This is the README.Gentoo file from /usr/share/doc/@PF@/ directory.
-
-  * The Gentoo port uses patches from the Debian project's SBCL port.
-
-  * An SBCL with support for multi-threading on GNU/Linux for x86 is available
-    with 'USE="threads" emerge dev-lisp/sbcl'
-
-  * asdf-install is installed as sbcl-asdf-install (the man-page is similarly
-    named).
-
-  * Support for the Common Lisp Controller is available.
-
-  * If "nosource" is in your USE flags, then SBCL's source will not be installed
-    (in /usr/lib/sbcl/src).
-
-  * If "unicode" is in your USE flags, then support for SBCL
-    Unicode will be included.
-
-  * If "ldb" is in your USE flags, then support for the SBCL low-level debugger
-    will be included.
-
-If you encounter any problems or have suggestions, use http://bugs.gentoo.org.
-Please don't bother the upstream authors unless you are absolutely certain it is
-not Gentoo-related.
diff --git a/dev-lisp/sbcl/files/0.9.1/customize-target-features.lisp-prefix b/dev-lisp/sbcl/files/0.9.1/customize-target-features.lisp-prefix
deleted file mode 100644
index 40f9a4fc85fa..000000000000
--- a/dev-lisp/sbcl/files/0.9.1/customize-target-features.lisp-prefix
+++ /dev/null
@@ -1,5 +0,0 @@
-(lambda (list)
-(flet ((enable (x)
-(pushnew x list))
-(disable (x)
-(setf list (remove x list))))
diff --git a/dev-lisp/sbcl/files/0.9.1/customize-target-features.lisp-suffix b/dev-lisp/sbcl/files/0.9.1/customize-target-features.lisp-suffix
deleted file mode 100644
index dbbde7adc44e..000000000000
--- a/dev-lisp/sbcl/files/0.9.1/customize-target-features.lisp-suffix
+++ /dev/null
@@ -1,2 +0,0 @@
-)
-list)
diff --git a/dev-lisp/sbcl/files/0.9.1/install-clc.lisp b/dev-lisp/sbcl/files/0.9.1/install-clc.lisp
deleted file mode 100644
index c8e0a93a729f..000000000000
--- a/dev-lisp/sbcl/files/0.9.1/install-clc.lisp
+++ /dev/null
@@ -1,34 +0,0 @@
-;;; -*- Mode: LISP; Package: CL-USER -*-
-;;;
-;;; Copyright (C) Peter Van Eynde 2001 and Kevin Rosenberg 2002-2003
-;;;
-;;; License: LGPL v2
-;;;
-(in-package "COMMON-LISP-USER")
-
-(handler-case
-    (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
-  (error (e)
-    (format t "~%Error during load of common-lisp-controller.lisp: ~A~%" e)
-    (sb-unix:unix-exit 1)))
-
-(handler-case
-    (common-lisp-controller:init-common-lisp-controller-v4 "sbcl")
-  (error (e)
-    (format t "~%Error running init-common-lisp-controller-v4: ~A~%" e)
-    (sb-unix:unix-exit 1)))
-
-(when (probe-file #p"/etc/lisp.config")
-  (load #p"/etc/lisp.config"))
-
-(setf (logical-pathname-translations "SYS")
-      '(("SYS:SRC;**;*.*.*"
-	 #P"/usr/share/sbcl/src/**/*.*")
-	("SYS:CONTRIB;**;*.*.*"
-	 #P"/usr/share/sbcl/**/*.*")))
-       
-(ignore-errors
- (format t "~%Saving to sbcl-new.core...")
- (sb-ext:gc :full t)
- (sb-ext:save-lisp-and-die "sbcl-new.core"
-			   :purify t))
diff --git a/dev-lisp/sbcl/files/0.9.1/sbcl-gentoo.patch b/dev-lisp/sbcl/files/0.9.1/sbcl-gentoo.patch
deleted file mode 100644
index 758722694ca0..000000000000
--- a/dev-lisp/sbcl/files/0.9.1/sbcl-gentoo.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -ur --exclude '*~' sbcl-0.9.1.orig/contrib/sb-bsd-sockets/sb-bsd-sockets.asd sbcl-0.9.1/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
---- sbcl-0.9.1.orig/contrib/sb-bsd-sockets/sb-bsd-sockets.asd	2004-08-02 06:42:56.000000000 -0500
-+++ sbcl-0.9.1/contrib/sb-bsd-sockets/sb-bsd-sockets.asd	2005-04-25 11:08:42.000000000 -0500
-@@ -102,15 +102,3 @@
- 
- (defmethod perform :after ((o load-op) (c (eql (find-system :sb-bsd-sockets))))
-   (provide 'sb-bsd-sockets))
--
--(defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets))))
--  (operate 'load-op 'sb-bsd-sockets-tests)
--  (operate 'test-op 'sb-bsd-sockets-tests))
--
--(defsystem sb-bsd-sockets-tests
--  :depends-on (sb-rt sb-bsd-sockets sb-posix)
--  :components ((:file "tests")))
--
--(defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets-tests))))
--  (or (funcall (intern "DO-TESTS" (find-package "SB-RT")))
--      (error "test-op failed")))
-diff -ur --exclude '*~' sbcl-0.9.1.orig/contrib/sb-posix/posix-tests.lisp sbcl-0.9.1/contrib/sb-posix/posix-tests.lisp
---- sbcl-0.9.1.orig/contrib/sb-posix/posix-tests.lisp	2005-01-06 06:47:57.000000000 -0600
-+++ sbcl-0.9.1/contrib/sb-posix/posix-tests.lisp	2005-04-25 11:06:50.000000000 -0500
-@@ -96,7 +96,7 @@
-       (sb-posix:syscall-errno c)))
-   #.sb-posix::eexist)
- 
--(deftest mkdir.error.2
-+#+nil (deftest mkdir.error.2
-   (handler-case
-       (sb-posix:mkdir "/" 0)
-     (sb-posix:syscall-error (c)
-@@ -149,7 +149,7 @@
-       (sb-posix:syscall-errno c)))
-   #.sb-posix::enotdir)
- 
--(deftest rmdir.error.3
-+#+nil (deftest rmdir.error.3
-   (handler-case
-       (sb-posix:rmdir "/")
-     (sb-posix:syscall-error (c)
-diff -ur --exclude '*~' sbcl-0.9.1.orig/contrib/sb-posix/sb-posix.asd sbcl-0.9.1/contrib/sb-posix/sb-posix.asd
---- sbcl-0.9.1.orig/contrib/sb-posix/sb-posix.asd	2004-08-04 05:54:18.000000000 -0500
-+++ sbcl-0.9.1/contrib/sb-posix/sb-posix.asd	2005-04-25 11:10:09.000000000 -0500
-@@ -88,33 +88,5 @@
- 		  :package :sb-posix :depends-on  ("defpackage"))
- 		 (:file "interface" :depends-on ("constants" "macros" "designator" "alien"))))
- 
--(defsystem sb-posix-tests
--    :depends-on (sb-rt)
--    :components ((:file "posix-tests")))
--
- (defmethod perform :after ((o load-op) (c (eql (find-system :sb-posix))))
-   (provide 'sb-posix))
--
--(defmethod perform ((o test-op) (c (eql (find-system :sb-posix))))
--  (operate 'load-op 'sb-posix-tests)
--  (operate 'test-op 'sb-posix-tests))
--
--(defmethod perform ((o test-op) (c (eql (find-system :sb-posix-tests))))
--  (funcall (intern "DO-TESTS" (find-package "SB-RT")))
--  (let ((failures (funcall (intern "PENDING-TESTS" "SB-RT")))
--	(ignored-failures (loop for sym being the symbols of :sb-posix-tests
--			        if (search ".ERROR" (symbol-name sym))
--			        collect sym)))
--    (cond
--      ((null failures)
--       t)	     
--      ((null (set-difference failures ignored-failures))
--       (warn "~@<some POSIX implementations return incorrect error values for ~
--              failing calls, but there is legitimate variation between ~
--              implementations too.  If you think the errno ~
--              from your platform is valid, please contact the sbcl ~
--              developers; otherwise, please submit a bug report to your ~
--              kernel distributor~@:>")
--       t)
--      (t
--       (error "non-errno tests failed!")))))
-diff -ur --exclude '*~' sbcl-0.9.1.orig/src/runtime/GNUmakefile sbcl-0.9.1/src/runtime/GNUmakefile
---- sbcl-0.9.1.orig/src/runtime/GNUmakefile	2005-04-10 10:34:59.000000000 -0500
-+++ sbcl-0.9.1/src/runtime/GNUmakefile	2005-04-25 11:06:50.000000000 -0500
-@@ -33,6 +33,7 @@
- # symlink to Config-foo.
- include Config
- 
-+CFLAGS += -DSBCL_HOME='"/usr/lib/sbcl"'
- 
- C_SRCS = alloc.c backtrace.c breakpoint.c coreparse.c \
- 	dynbind.c gc-common.c globals.c interr.c interrupt.c \
diff --git a/dev-lisp/sbcl/files/0.9.1/sbcl.sh b/dev-lisp/sbcl/files/0.9.1/sbcl.sh
deleted file mode 100644
index 66253874d2a3..000000000000
--- a/dev-lisp/sbcl/files/0.9.1/sbcl.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
-  cat <<EOF
-$0: cannot find the common-lisp-controller source.
-EOF
-  exit 0
-fi
-
-build_error()
-{
-    echo "Build failure $1"
-    exit 1
-}
-
-case $1 in
-    install-clc)
-	    echo $0 loading and dumping clc.
-	    ( cd /usr/lib/sbcl
-	      /usr/bin/sbcl --core /usr/lib/sbcl/sbcl-dist.core \
-		   --noinform --sysinit /etc/sbclrc --userinit /dev/null \
-		   --load "/usr/lib/sbcl/install-clc.lisp" 2> /dev/null
-              mv sbcl-new.core sbcl.core || (echo FAILED ; cp sbcl-dist.core sbcl.core ) )
-	    ;;
-    remove-clc)
-	    echo $0 removing clc-enabled image
-	    cp /usr/lib/sbcl/sbcl-dist.core /usr/lib/sbcl/sbcl.core
-	    ;;
-    rebuild)
-	    echo $0 rebuilding...
-	    shift
-	    echo rebuilding $1
-	    /usr/bin/sbcl --noinform --sysinit /etc/sbclrc --userinit /dev/null \
-	         --disable-debugger \
-	         --eval \
-"(handler-case
-     (progn
-       (asdf:operate 'asdf:compile-op (quote $1))
-       (sb-unix:unix-exit 0))
-    (error (e)
-      (ignore-errors (format t \"~&Build error: ~A~%\" e))
-      (finish-output)
-      (sb-unix:unix-exit 1)))" || build_error
-	    ;;
-     remove)
-	    echo $0 removing packages...
-	    shift
-	    while [ ! -z "$1" ] ; do
-		rm -rf "/var/cache/common-lisp-controller/*/sbcl/${1}"
-		shift
- 	    done
-	    ;;
-    *)
-	    echo $0 unkown command $1
-	    echo known commands: rebuild, remove, install-clc, and remove-clc
-	    exit 1
-	    ;;
-esac
-
-exit 0
diff --git a/dev-lisp/sbcl/files/0.9.1/sbclrc b/dev-lisp/sbcl/files/0.9.1/sbclrc
deleted file mode 100644
index 91f31720d896..000000000000
--- a/dev-lisp/sbcl/files/0.9.1/sbclrc
+++ /dev/null
@@ -1,18 +0,0 @@
-;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CL-USER -*-
-
-;;; This file is installed as /etc/sbcl.rc and run on every invocation
-;;; of SBCL
-
-(if (probe-file "/etc/lisp-config.lisp")
-    (load "/etc/lisp-config.lisp")
-    (format t "~%;;; Warning: there is no /etc/lisp-config.lisp file"))
-
-;;; The following is required if you want source location functions to
-;;; work (such as those called when you use M-. (edit definition) in
-;;; ILISP or SLIME)
-
-(setf (logical-pathname-translations "SYS")
-      '(("SYS:SRC;**;*.*.*" #p"/usr/lib/sbcl/src/**/*.*")
-	("SYS:CONTRIB;**;*.*.*" #p"/usr/lib/sbcl/**/*.*")))
-
-;;; sbclrc ends here
diff --git a/dev-lisp/sbcl/files/0.8.21/README.Gentoo b/dev-lisp/sbcl/files/0.9.4/README.Gentoo
index 6f4f84da9289..06f27a49054a 100644
--- a/dev-lisp/sbcl/files/0.8.21/README.Gentoo
+++ b/dev-lisp/sbcl/files/0.9.4/README.Gentoo
@@ -1,4 +1,4 @@
--*- outline -*- $Id: README.Gentoo,v 1.2 2005/06/01 03:24:45 mkennedy Exp $
+-*- outline -*- $Id: README.Gentoo,v 1.1 2005/09/01 18:40:50 mkennedy Exp $
 
 Gentoo GNU/Linux specific notes for SBCL
 ----------------------------------------
diff --git a/dev-lisp/sbcl/files/0.8.21/customize-target-features.lisp-prefix b/dev-lisp/sbcl/files/0.9.4/customize-target-features.lisp-prefix
index 40f9a4fc85fa..40f9a4fc85fa 100644
--- a/dev-lisp/sbcl/files/0.8.21/customize-target-features.lisp-prefix
+++ b/dev-lisp/sbcl/files/0.9.4/customize-target-features.lisp-prefix
diff --git a/dev-lisp/sbcl/files/0.8.21/customize-target-features.lisp-suffix b/dev-lisp/sbcl/files/0.9.4/customize-target-features.lisp-suffix
index dbbde7adc44e..dbbde7adc44e 100644
--- a/dev-lisp/sbcl/files/0.8.21/customize-target-features.lisp-suffix
+++ b/dev-lisp/sbcl/files/0.9.4/customize-target-features.lisp-suffix
diff --git a/dev-lisp/sbcl/files/0.8.21/install-clc.lisp b/dev-lisp/sbcl/files/0.9.4/install-clc.lisp
index c8e0a93a729f..c8e0a93a729f 100644
--- a/dev-lisp/sbcl/files/0.8.21/install-clc.lisp
+++ b/dev-lisp/sbcl/files/0.9.4/install-clc.lisp
diff --git a/dev-lisp/sbcl/files/0.9.0/sbcl-gentoo.patch b/dev-lisp/sbcl/files/0.9.4/sbcl-gentoo.patch
index 86f7b1cb7074..0e7d12379a6e 100644
--- a/dev-lisp/sbcl/files/0.9.0/sbcl-gentoo.patch
+++ b/dev-lisp/sbcl/files/0.9.4/sbcl-gentoo.patch
@@ -1,6 +1,6 @@
-diff -ur --exclude '*~' sbcl-0.9.0.orig/contrib/sb-bsd-sockets/sb-bsd-sockets.asd sbcl-0.9.0/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
---- sbcl-0.9.0.orig/contrib/sb-bsd-sockets/sb-bsd-sockets.asd	2004-08-02 06:42:56.000000000 -0500
-+++ sbcl-0.9.0/contrib/sb-bsd-sockets/sb-bsd-sockets.asd	2005-04-25 11:08:42.000000000 -0500
+diff -ur --exclude '*~' sbcl-0.9.4.orig/contrib/sb-bsd-sockets/sb-bsd-sockets.asd sbcl-0.9.4/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
+--- sbcl-0.9.4.orig/contrib/sb-bsd-sockets/sb-bsd-sockets.asd	2004-08-02 06:42:56.000000000 -0500
++++ sbcl-0.9.4/contrib/sb-bsd-sockets/sb-bsd-sockets.asd	2005-04-25 11:08:42.000000000 -0500
 @@ -102,15 +102,3 @@
  
  (defmethod perform :after ((o load-op) (c (eql (find-system :sb-bsd-sockets))))
@@ -17,9 +17,9 @@ diff -ur --exclude '*~' sbcl-0.9.0.orig/contrib/sb-bsd-sockets/sb-bsd-sockets.as
 -(defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets-tests))))
 -  (or (funcall (intern "DO-TESTS" (find-package "SB-RT")))
 -      (error "test-op failed")))
-diff -ur --exclude '*~' sbcl-0.9.0.orig/contrib/sb-posix/posix-tests.lisp sbcl-0.9.0/contrib/sb-posix/posix-tests.lisp
---- sbcl-0.9.0.orig/contrib/sb-posix/posix-tests.lisp	2005-01-06 06:47:57.000000000 -0600
-+++ sbcl-0.9.0/contrib/sb-posix/posix-tests.lisp	2005-04-25 11:06:50.000000000 -0500
+diff -ur --exclude '*~' sbcl-0.9.4.orig/contrib/sb-posix/posix-tests.lisp sbcl-0.9.4/contrib/sb-posix/posix-tests.lisp
+--- sbcl-0.9.4.orig/contrib/sb-posix/posix-tests.lisp	2005-01-06 06:47:57.000000000 -0600
++++ sbcl-0.9.4/contrib/sb-posix/posix-tests.lisp	2005-04-25 11:06:50.000000000 -0500
 @@ -96,7 +96,7 @@
        (sb-posix:syscall-errno c)))
    #.sb-posix::eexist)
@@ -38,9 +38,9 @@ diff -ur --exclude '*~' sbcl-0.9.0.orig/contrib/sb-posix/posix-tests.lisp sbcl-0
    (handler-case
        (sb-posix:rmdir "/")
      (sb-posix:syscall-error (c)
-diff -ur --exclude '*~' sbcl-0.9.0.orig/contrib/sb-posix/sb-posix.asd sbcl-0.9.0/contrib/sb-posix/sb-posix.asd
---- sbcl-0.9.0.orig/contrib/sb-posix/sb-posix.asd	2004-08-04 05:54:18.000000000 -0500
-+++ sbcl-0.9.0/contrib/sb-posix/sb-posix.asd	2005-04-25 11:10:09.000000000 -0500
+diff -ur --exclude '*~' sbcl-0.9.4.orig/contrib/sb-posix/sb-posix.asd sbcl-0.9.4/contrib/sb-posix/sb-posix.asd
+--- sbcl-0.9.4.orig/contrib/sb-posix/sb-posix.asd	2004-08-04 05:54:18.000000000 -0500
++++ sbcl-0.9.4/contrib/sb-posix/sb-posix.asd	2005-04-25 11:10:09.000000000 -0500
 @@ -88,33 +88,5 @@
  		  :package :sb-posix :depends-on  ("defpackage"))
  		 (:file "interface" :depends-on ("constants" "macros" "designator" "alien"))))
@@ -75,9 +75,9 @@ diff -ur --exclude '*~' sbcl-0.9.0.orig/contrib/sb-posix/sb-posix.asd sbcl-0.9.0
 -       t)
 -      (t
 -       (error "non-errno tests failed!")))))
-diff -ur --exclude '*~' sbcl-0.9.0.orig/src/runtime/GNUmakefile sbcl-0.9.0/src/runtime/GNUmakefile
---- sbcl-0.9.0.orig/src/runtime/GNUmakefile	2005-04-10 10:34:59.000000000 -0500
-+++ sbcl-0.9.0/src/runtime/GNUmakefile	2005-04-25 11:06:50.000000000 -0500
+diff -ur --exclude '*~' sbcl-0.9.4.orig/src/runtime/GNUmakefile sbcl-0.9.4/src/runtime/GNUmakefile
+--- sbcl-0.9.4.orig/src/runtime/GNUmakefile	2005-04-10 10:34:59.000000000 -0500
++++ sbcl-0.9.4/src/runtime/GNUmakefile	2005-04-25 11:06:50.000000000 -0500
 @@ -33,6 +33,7 @@
  # symlink to Config-foo.
  include Config
diff --git a/dev-lisp/sbcl/files/0.8.21/sbcl.sh b/dev-lisp/sbcl/files/0.9.4/sbcl.sh
index 66253874d2a3..66253874d2a3 100644
--- a/dev-lisp/sbcl/files/0.8.21/sbcl.sh
+++ b/dev-lisp/sbcl/files/0.9.4/sbcl.sh
diff --git a/dev-lisp/sbcl/files/0.8.21/sbclrc b/dev-lisp/sbcl/files/0.9.4/sbclrc
index 91f31720d896..91f31720d896 100644
--- a/dev-lisp/sbcl/files/0.8.21/sbclrc
+++ b/dev-lisp/sbcl/files/0.9.4/sbclrc
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.8.21-r1 b/dev-lisp/sbcl/files/digest-sbcl-0.8.21-r1
deleted file mode 100644
index bd51ed3f8590..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.8.21-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-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
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.9.1 b/dev-lisp/sbcl/files/digest-sbcl-0.9.1
deleted file mode 100644
index e6b3bad98edd..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.9.1
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 4eb4b14112c8582b567a80e87eb11298 sbcl-0.9.1-source.tar.bz2 2458526
-MD5 e1c8fcd10e97331c2c8c889046be0e8f sbcl-0.9.1-html.tar.bz2 110799
-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 029b85186984d0bfc8b49c4de1e8e45e sbcl-0.8.15-sparc-linux-binary.tar.bz2 6903090
-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.9.1-r1 b/dev-lisp/sbcl/files/digest-sbcl-0.9.1-r1
deleted file mode 100644
index e6b3bad98edd..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.9.1-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 4eb4b14112c8582b567a80e87eb11298 sbcl-0.9.1-source.tar.bz2 2458526
-MD5 e1c8fcd10e97331c2c8c889046be0e8f sbcl-0.9.1-html.tar.bz2 110799
-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 029b85186984d0bfc8b49c4de1e8e45e sbcl-0.8.15-sparc-linux-binary.tar.bz2 6903090
-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.9.0 b/dev-lisp/sbcl/files/digest-sbcl-0.9.4
index 2efa0496f6f9..b75c936e51e3 100644
--- a/dev-lisp/sbcl/files/digest-sbcl-0.9.0
+++ b/dev-lisp/sbcl/files/digest-sbcl-0.9.4
@@ -1,5 +1,5 @@
-MD5 9544e79998980bfc1f555cfb900399d7 sbcl-0.9.0-source.tar.bz2 2454858
-MD5 69b3f7da7cdbb77cf50083c93e2d824a sbcl-0.9.0-html.tar.bz2 110432
+MD5 a0420dc6236efece72c1c80ee15873c9 sbcl-0.9.4-source.tar.bz2 2607058
+MD5 14d8bad2281caf37693ffe487a156b74 sbcl-0.9.4-html.tar.bz2 115151
 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 029b85186984d0bfc8b49c4de1e8e45e sbcl-0.8.15-sparc-linux-binary.tar.bz2 6903090
diff --git a/dev-lisp/sbcl/sbcl-0.8.21-r1.ebuild b/dev-lisp/sbcl/sbcl-0.8.21-r1.ebuild
deleted file mode 100644
index 3174a1aa207f..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.21-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# 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.3 2005/07/14 22:49:57 agriffis Exp $
-
-inherit common-lisp-common-2 eutils
-
-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 )"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="x86 ~ppc ~sparc ~mips ~amd64"
-IUSE="doc hardened ldb nosource threads unicode"
-
-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 use hardened && gcc-config -c |grep -qv vanilla; 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
-(the "vanilla" profile) 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 '{}' \;
-}
-
-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
-}
-
-pkg_postrm() {
-	standard-impl-postrm sbcl /usr/bin/sbcl
-	if [ ! -x /usr/bin/sbcl ]; then
-		rm -rf /usr/$(get_libdir)/sbcl/ || die
-	fi
-}
diff --git a/dev-lisp/sbcl/sbcl-0.9.0.ebuild b/dev-lisp/sbcl/sbcl-0.9.0.ebuild
deleted file mode 100644
index f8fee26b5aa1..000000000000
--- a/dev-lisp/sbcl/sbcl-0.9.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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.9.0.ebuild,v 1.4 2005/07/14 22:49:57 agriffis Exp $
-
-inherit common-lisp-common-2 eutils
-
-BV_X86=0.8.1
-BV_PPC=0.8.15
-BV_SPARC=0.8.15
-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 )"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~amd64"
-IUSE="doc ldb nosource threads unicode"
-
-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 ${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
-		mv ${PN}-${BV_SPARC}-sparc-linux 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 || die
-
-	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 '{}' \;
-}
-
-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
-}
-
-pkg_postrm() {
-	standard-impl-postrm sbcl /usr/bin/sbcl
-	if [ ! -x /usr/bin/sbcl ]; then
-		rm -rf /usr/$(get_libdir)/sbcl/ || die
-	fi
-}
diff --git a/dev-lisp/sbcl/sbcl-0.9.1.ebuild b/dev-lisp/sbcl/sbcl-0.9.1.ebuild
deleted file mode 100644
index f8f30f46c360..000000000000
--- a/dev-lisp/sbcl/sbcl-0.9.1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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.9.1.ebuild,v 1.5 2005/07/14 22:49:57 agriffis Exp $
-
-inherit common-lisp-common-2 eutils
-
-BV_X86=0.8.1
-BV_PPC=0.8.15
-BV_SPARC=0.8.15
-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 )"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="x86 ~ppc ~sparc ~mips ~amd64"
-IUSE="doc hardened ldb nosource threads unicode"
-
-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 use hardened && gcc-config -c |grep -qv vanilla; 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
-(the "vanilla" profile) and "source /etc/profile" before continuing.
-
-EOF
-		die
-	fi
-
-	# FIXME Maybe something should be done in the case where a user requests
-	# threads on a non-NPTL system
-}
-
-src_unpack() {
-	mkdir -p ${MY_WORK} && cp ${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
-		mv ${PN}-${BV_SPARC}-sparc-linux 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 || die
-	sed -i "s,/lib,/$(get_libdir),g" ${S}/install.sh
-
-	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 '{}' \;
-}
-
-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
-
-	LANG=C PATH=${bindir}/src/runtime:${PATH} SBCL_HOME=${bindir}/output GNUMAKE=make \
-		./make.sh 'sbcl
-			--sysinit /dev/null
-			--userinit /dev/null
-			--disable-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
-}
-
-pkg_postrm() {
-	standard-impl-postrm sbcl /usr/bin/sbcl
-	if [ ! -x /usr/bin/sbcl ]; then
-		rm -rf /usr/$(get_libdir)/sbcl/ || die
-	fi
-}
diff --git a/dev-lisp/sbcl/sbcl-0.9.3.ebuild b/dev-lisp/sbcl/sbcl-0.9.3.ebuild
index 2f08aff8834a..3cc5b59a054e 100644
--- a/dev-lisp/sbcl/sbcl-0.9.3.ebuild
+++ b/dev-lisp/sbcl/sbcl-0.9.3.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.9.3.ebuild,v 1.2 2005/07/28 17:16:35 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.9.3.ebuild,v 1.3 2005/09/01 18:40:50 mkennedy Exp $
 
 inherit common-lisp-common-2 eutils
 
@@ -23,7 +23,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="hardened ldb nosource threads unicode"
 
 DEPEND="=dev-lisp/common-lisp-controller-4*
diff --git a/dev-lisp/sbcl/sbcl-0.9.1-r1.ebuild b/dev-lisp/sbcl/sbcl-0.9.4.ebuild
index 833f5ba616b2..d03f6bdc1659 100644
--- a/dev-lisp/sbcl/sbcl-0.9.1-r1.ebuild
+++ b/dev-lisp/sbcl/sbcl-0.9.4.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.9.1-r1.ebuild,v 1.2 2005/07/14 22:49:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.9.4.ebuild,v 1.1 2005/09/01 18:40:50 mkennedy Exp $
 
 inherit common-lisp-common-2 eutils
 
@@ -23,7 +23,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="hardened ldb nosource threads unicode"
 
 DEPEND="=dev-lisp/common-lisp-controller-4*
@@ -77,15 +77,16 @@ src_unpack() {
 
 	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
+	if use x86 || use amd64; then
+		use threads && echo '(enable :sb-thread)' \
+			>>${S}/customize-target-features.lisp
+	fi
 	use ldb \
 		&& echo '(enable :sb-ldb)' \
 		>>${S}/customize-target-features.lisp
-	use x86 \
-		&& echo '(enable :sb-futex)' \
-		>>${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)' \
@@ -120,7 +121,7 @@ src_compile() {
 			--core ${bindir}/output/sbcl.core' \
 				|| die
 	cd ${S}/doc/manual
-	LANG=C make info html
+	LANG=C make info html || die
 }
 
 src_install() {
@@ -145,6 +146,7 @@ src_install() {
 	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
 
 	keepdir /usr/$(get_libdir)/common-lisp/sbcl