New upstream version; Update dependencies for common-lisp-controller to >=dev-lisp/common-lisp-controller-4*; Resolves Bug #128717; Removed keyword masked sbcl-0.9.10.ebuild.

Package-Manager: portage-2.1_pre7-r1

9 files changed, 28 insertions, 22 deletions

diff --git a/dev-lisp/sbcl/files/0.9.10/README.Gentoo b/dev-lisp/sbcl/files/0.9.11/README.Gentoo
index 47d1671c83d5..f3083d45bf4d 100644
--- a/dev-lisp/sbcl/files/0.9.10/README.Gentoo
+++ b/dev-lisp/sbcl/files/0.9.11/README.Gentoo
@@ -1,4 +1,4 @@
--*- outline -*- $Id: README.Gentoo,v 1.1 2006/03/03 17:17:27 mkennedy Exp $
+-*- outline -*- $Id: README.Gentoo,v 1.1 2006/04/04 15:35:43 mkennedy Exp $
 
 Gentoo GNU/Linux specific notes for SBCL
 ----------------------------------------
diff --git a/dev-lisp/sbcl/files/0.9.10/customize-target-features.lisp-prefix b/dev-lisp/sbcl/files/0.9.11/customize-target-features.lisp-prefix
index 40f9a4fc85fa..40f9a4fc85fa 100644
--- a/dev-lisp/sbcl/files/0.9.10/customize-target-features.lisp-prefix
+++ b/dev-lisp/sbcl/files/0.9.11/customize-target-features.lisp-prefix
diff --git a/dev-lisp/sbcl/files/0.9.10/customize-target-features.lisp-suffix b/dev-lisp/sbcl/files/0.9.11/customize-target-features.lisp-suffix
index dbbde7adc44e..dbbde7adc44e 100644
--- a/dev-lisp/sbcl/files/0.9.10/customize-target-features.lisp-suffix
+++ b/dev-lisp/sbcl/files/0.9.11/customize-target-features.lisp-suffix
diff --git a/dev-lisp/sbcl/files/0.9.10/install-clc.lisp b/dev-lisp/sbcl/files/0.9.11/install-clc.lisp
index c8e0a93a729f..8ae9a3828dff 100644
--- a/dev-lisp/sbcl/files/0.9.10/install-clc.lisp
+++ b/dev-lisp/sbcl/files/0.9.11/install-clc.lisp
@@ -4,6 +4,10 @@
 ;;;
 ;;; License: LGPL v2
 ;;;
+
+;; This file is originally from the Debian project patch to SBCL
+;; upstream.
+
 (in-package "COMMON-LISP-USER")
 
 (handler-case
@@ -30,5 +34,4 @@
 (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))
+ (sb-ext:save-lisp-and-die "sbcl-new.core"))
diff --git a/dev-lisp/sbcl/files/0.9.10/sbcl-gentoo.patch b/dev-lisp/sbcl/files/0.9.11/sbcl-gentoo.patch
index d2ff4675155b..a4aacd5e102b 100644
--- a/dev-lisp/sbcl/files/0.9.10/sbcl-gentoo.patch
+++ b/dev-lisp/sbcl/files/0.9.11/sbcl-gentoo.patch
@@ -1,6 +1,6 @@
-diff -urN sbcl-0.9.10-orig/contrib/sb-bsd-sockets/sb-bsd-sockets.asd sbcl-0.9.10/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
---- sbcl-0.9.10-orig/contrib/sb-bsd-sockets/sb-bsd-sockets.asd	2004-08-02 06:42:56.000000000 -0500
-+++ sbcl-0.9.10/contrib/sb-bsd-sockets/sb-bsd-sockets.asd	2006-01-28 20:01:55.989010096 -0600
+diff -urN sbcl-0.9.11-orig/contrib/sb-bsd-sockets/sb-bsd-sockets.asd sbcl-0.9.11/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
+--- sbcl-0.9.11-orig/contrib/sb-bsd-sockets/sb-bsd-sockets.asd	2004-08-02 06:42:56.000000000 -0500
++++ sbcl-0.9.11/contrib/sb-bsd-sockets/sb-bsd-sockets.asd	2006-01-28 20:01:55.989010096 -0600
 @@ -102,15 +102,3 @@
  
  (defmethod perform :after ((o load-op) (c (eql (find-system :sb-bsd-sockets))))
@@ -17,9 +17,9 @@ diff -urN sbcl-0.9.10-orig/contrib/sb-bsd-sockets/sb-bsd-sockets.asd sbcl-0.9.10
 -(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 -urN sbcl-0.9.10-orig/contrib/sb-posix/sb-posix.asd sbcl-0.9.10/contrib/sb-posix/sb-posix.asd
---- sbcl-0.9.10-orig/contrib/sb-posix/sb-posix.asd	2006-01-24 11:14:50.000000000 -0600
-+++ sbcl-0.9.10/contrib/sb-posix/sb-posix.asd	2006-01-28 20:03:25.675375696 -0600
+diff -urN sbcl-0.9.11-orig/contrib/sb-posix/sb-posix.asd sbcl-0.9.11/contrib/sb-posix/sb-posix.asd
+--- sbcl-0.9.11-orig/contrib/sb-posix/sb-posix.asd	2006-01-24 11:14:50.000000000 -0600
++++ sbcl-0.9.11/contrib/sb-posix/sb-posix.asd	2006-01-28 20:03:25.675375696 -0600
 @@ -89,33 +89,5 @@
  		  :package :sb-posix :depends-on  ("defpackage"))
  		 (:file "interface" :depends-on ("constants" "macros" "designator" "alien"))))
@@ -54,9 +54,9 @@ diff -urN sbcl-0.9.10-orig/contrib/sb-posix/sb-posix.asd sbcl-0.9.10/contrib/sb-
 -       t)
 -      (t
 -       (error "non-errno tests failed!")))))
-diff -urN sbcl-0.9.10-orig/src/runtime/runtime.c sbcl-0.9.10/src/runtime/runtime.c
---- sbcl-0.9.10-orig/src/runtime/runtime.c	2006-01-24 11:15:45.000000000 -0600
-+++ sbcl-0.9.10/src/runtime/runtime.c	2006-01-28 20:04:04.549465936 -0600
+diff -urN sbcl-0.9.11-orig/src/runtime/runtime.c sbcl-0.9.11/src/runtime/runtime.c
+--- sbcl-0.9.11-orig/src/runtime/runtime.c	2006-01-24 11:15:45.000000000 -0600
++++ sbcl-0.9.11/src/runtime/runtime.c	2006-01-28 20:04:04.549465936 -0600
 @@ -68,7 +68,7 @@
  #endif
  
diff --git a/dev-lisp/sbcl/files/0.9.10/sbcl.sh b/dev-lisp/sbcl/files/0.9.11/sbcl.sh
index 66253874d2a3..6693bd9b4e8b 100644
--- a/dev-lisp/sbcl/files/0.9.10/sbcl.sh
+++ b/dev-lisp/sbcl/files/0.9.11/sbcl.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+# This file is originally from the Debian project patch to SBCL
+# upstream.  It has been modified by the Gentoo project to NOT use
+# /etc/sbcl.rc which has been confusing because SBCL docs refer
+# /etc/sbclrc.
+
 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.
@@ -19,7 +24,7 @@ case $1 in
 	    ( 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
+		   --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)
@@ -57,4 +62,4 @@ case $1 in
 	    ;;
 esac
 
-exit 0
+exit 0
\ No newline at end of file
diff --git a/dev-lisp/sbcl/files/0.9.10/sbclrc b/dev-lisp/sbcl/files/0.9.11/sbclrc
index 91f31720d896..bd0ab76b6adf 100644
--- a/dev-lisp/sbcl/files/0.9.10/sbclrc
+++ b/dev-lisp/sbcl/files/0.9.11/sbclrc
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CL-USER -*-
 
-;;; This file is installed as /etc/sbcl.rc and run on every invocation
+;;; This file is installed as /etc/sbclrc and run on every invocation
 ;;; of SBCL
 
 (if (probe-file "/etc/lisp-config.lisp")
@@ -14,5 +14,3 @@
 (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/digest-sbcl-0.9.10 b/dev-lisp/sbcl/files/digest-sbcl-0.9.11
index bdb9f0d30a50..2551740033b4 100644
--- a/dev-lisp/sbcl/files/digest-sbcl-0.9.10
+++ b/dev-lisp/sbcl/files/digest-sbcl-0.9.11
@@ -7,12 +7,12 @@ SHA256 fef30a771530096c4f190c60d9d7c396844fc67a3ec2bbaae9b0ff497f925129 sbcl-0.8
 MD5 029b85186984d0bfc8b49c4de1e8e45e sbcl-0.8.15-sparc-linux-binary.tar.bz2 6903090
 RMD160 41015dcfb41caf93b54a02a0f55eec994309accf sbcl-0.8.15-sparc-linux-binary.tar.bz2 6903090
 SHA256 f0bc5fc11e9c0f1651ebe773b5c7e972da589cc4af2811d25438a099f490cc7d sbcl-0.8.15-sparc-linux-binary.tar.bz2 6903090
-RMD160 7313d23d8d8c0eb69f0eb16194f5de658939572f sbcl-0.9.10-source.tar.bz2 2712120
-SHA256 85f2e815ab1342251170ae2ad9c1793665fae7b8a9ffab1969fc9c680a4883b4 sbcl-0.9.10-source.tar.bz2 2712120
-MD5 58678d7081f32bdcd174c5233efba4f3 sbcl-0.9.10-source.tar.bz2 2712120
+MD5 b82c3b7cf5c351cbe97af5150c17ad27 sbcl-0.9.11-source.tar.bz2 2722766
+RMD160 821b2d9eed87abb1ab7a2bcad0f6bbd10e94927a sbcl-0.9.11-source.tar.bz2 2722766
+SHA256 fb69460d5e466e97c9c3787b97130728731a71c2feb46eccb4fae6d5dfd20e4c sbcl-0.9.11-source.tar.bz2 2722766
+MD5 900ae4d2353fd9371d6ebaef40180038 sbcl-0.9.8-x86-linux-binary.tar.bz2 7325645
 RMD160 1e0c1b6cdbe7dc51200e63bc4b5641c27270e9ff sbcl-0.9.8-x86-linux-binary.tar.bz2 7325645
 SHA256 85b7861a203747a7584107eedcbfc44c33dfe8b9ff528095398d5ed91e35cb2b sbcl-0.9.8-x86-linux-binary.tar.bz2 7325645
-MD5 900ae4d2353fd9371d6ebaef40180038 sbcl-0.9.8-x86-linux-binary.tar.bz2 7325645
 MD5 d9e4a6d95e255b3a24431f336fae236d sbcl-0.9.9-x86-64-linux-binary.tar.bz2 7102295
 RMD160 6899b82bda2af193783817a0f2ec054e76b08eeb sbcl-0.9.9-x86-64-linux-binary.tar.bz2 7102295
 SHA256 a2d7de87fbfcd7b19acd577ddefdf60adc69f80a15a0593a1e24aeee59aa048e sbcl-0.9.9-x86-64-linux-binary.tar.bz2 7102295
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.9.9 b/dev-lisp/sbcl/files/digest-sbcl-0.9.9
index b8b4d1755aa4..c10672e476ff 100644
--- a/dev-lisp/sbcl/files/digest-sbcl-0.9.9
+++ b/dev-lisp/sbcl/files/digest-sbcl-0.9.9
@@ -10,9 +10,9 @@ SHA256 f0bc5fc11e9c0f1651ebe773b5c7e972da589cc4af2811d25438a099f490cc7d sbcl-0.8
 MD5 900ae4d2353fd9371d6ebaef40180038 sbcl-0.9.8-x86-linux-binary.tar.bz2 7325645
 RMD160 1e0c1b6cdbe7dc51200e63bc4b5641c27270e9ff sbcl-0.9.8-x86-linux-binary.tar.bz2 7325645
 SHA256 85b7861a203747a7584107eedcbfc44c33dfe8b9ff528095398d5ed91e35cb2b sbcl-0.9.8-x86-linux-binary.tar.bz2 7325645
-MD5 4aafb2ce07bd7933f7edec29b404a595 sbcl-0.9.9-source.tar.bz2 2695081
 RMD160 e5d5a7a3b9853cb7e19dcc040e2b34adb465e09d sbcl-0.9.9-source.tar.bz2 2695081
 SHA256 117762d02aa4748964c814fb20b0481322fdec1948b748c9159b0942a675eb8c sbcl-0.9.9-source.tar.bz2 2695081
+MD5 4aafb2ce07bd7933f7edec29b404a595 sbcl-0.9.9-source.tar.bz2 2695081
 MD5 d9e4a6d95e255b3a24431f336fae236d sbcl-0.9.9-x86-64-linux-binary.tar.bz2 7102295
 RMD160 6899b82bda2af193783817a0f2ec054e76b08eeb sbcl-0.9.9-x86-64-linux-binary.tar.bz2 7102295
 SHA256 a2d7de87fbfcd7b19acd577ddefdf60adc69f80a15a0593a1e24aeee59aa048e sbcl-0.9.9-x86-64-linux-binary.tar.bz2 7102295