.

(Portage version: 2.0.51.22-r2)

22 files changed, 38 insertions, 267 deletions

diff --git a/app-emacs/slime/files/1.0.20050106/swank-loader-init.lisp b/app-emacs/slime/files/1.0.20050106/swank-loader-init.lisp
deleted file mode 100644
index c2e58ff4904c..000000000000
--- a/app-emacs/slime/files/1.0.20050106/swank-loader-init.lisp
+++ /dev/null
@@ -1,21 +0,0 @@
-;; -*- lisp -*-
-
-;; This file is NOT part of SLIME.
-
-;; This file is provided by the Gentoo port to implement the
-;; user-init-file loader.
-;; 
-;; Matthew Kennedy <mkennedy@gentoo.org>
-
-(defpackage #:swank-loader
-  (:use #:common-lisp))
-
-(in-package #:swank-loader)
-
-(defun user-init-file ()
-  "Return the name of the user init file or nil."
-  (probe-file (merge-pathnames (user-homedir-pathname)
-                               (make-pathname :name ".swank" :type "lisp"))))
-
-(when (user-init-file)
-  (load (user-init-file)))
diff --git a/app-emacs/slime/files/1.0.20050106/swank-loader.lisp b/app-emacs/slime/files/1.0.20050106/swank-loader.lisp
deleted file mode 100644
index 408415642b65..000000000000
--- a/app-emacs/slime/files/1.0.20050106/swank-loader.lisp
+++ /dev/null
@@ -1,10 +0,0 @@
-;; -*- lisp -*-
-
-;; This file is NOT part of SLIME.
-
-;; This file is provided by the Gentoo port to load swank via an the
-;; ASDF system (rather than using swank's own system).
-;;
-;; Matthew Kennedy <mkennedy@gentoo.org>
-
-(require :swank)
diff --git a/app-emacs/slime/files/1.0.20050106/swank.asd b/app-emacs/slime/files/1.0.20050106/swank.asd
deleted file mode 100644
index 989414b144ff..000000000000
--- a/app-emacs/slime/files/1.0.20050106/swank.asd
+++ /dev/null
@@ -1,54 +0,0 @@
-;;; -*- mode: lisp; syntax: common-lisp; package: cl-user -*-
-
-;; This file is NOT part of SLIME.
-
-;; This file is provided by the Gentoo port to load swank via an the
-;; ASDF system (rather than using swank's own system).  This file is
-;; constucted from the knowledge encapsulated in SLIME's original
-;; swank-loader.lisp.
-;;
-;; Matthew Kennedy <mkennedy@gentoo.org>
-
-(defpackage #:swank-system
-  (:use #:common-lisp
-        #:asdf))
-
-(in-package #:swank-system)
-
-;; http://www.caddr.com/macho/archives/sbcl-devel/2004-3/3014.html
-
-(defclass unsafe-file (cl-source-file) ())
-
-(defmethod perform :around ((op compile-op) (c unsafe-file))
-  (setf (operation-on-warnings op) :ignore
-        (operation-on-failure op) :warn) ; adjust to taste
-  (call-next-method))
-
-(defsystem #:swank
-    :name "Swank is the Common Lisp back-end to Slime"
-    :licence "GPL-2"
-    :components
-    #+cmu ((:file "swank-loader-init")
-           (:file "swank-backend")
-           (:file "nregex")
-           (:file "swank-source-path-parser")
-           (:file "swank-cmucl")
-           (:file "swank"))
-    #+sbcl ((:file "swank-loader-init")
-            (:file "swank-backend")
-            (:file "nregex")
-            (:file "swank-sbcl")
-	    (:file "swank-source-path-parser")
-	    (:file "swank-gray")
-	    (:unsafe-file "swank"))
-    #+clisp ((:file "swank-loader-init")
-             (:file "swank-backend")
-             (:file "nregex")
-             (:file "xref")
-             (:file "metering")
-	     (:file "swank-clisp")
-             (:file "swank-gray")
-	     (:file "swank"))
-    :depends-on (#+sbcl :sb-bsd-sockets))
-
-;; swank.asd ends here
diff --git a/app-emacs/slime/files/1.0.20050207/70slime-gentoo.el b/app-emacs/slime/files/1.0.20050207/70slime-gentoo.el
deleted file mode 100644
index 4fde74012ac1..000000000000
--- a/app-emacs/slime/files/1.0.20050207/70slime-gentoo.el
+++ /dev/null
@@ -1,16 +0,0 @@
-
-;;; site-lisp configuration for slime-cvs
-
-(add-to-list 'load-path "@SITELISP@")
-(require 'slime)
-(add-hook 'lisp-mode-hook
-	  (lambda () (slime-mode t)))
-(add-hook 'inferior-lisp-mode-hook
-	  (lambda () (inferior-slime-mode t)))
-
-;; this prevents us from requiring the user get dev-lisp/hyperspec
-;; (which is non-free) as a hard dependency
-
-(if (file-exists-p "/usr/share/doc/hyperspec-6.0/HyperSpec")
-    (setq common-lisp-hyperspec-root "file:///usr/share/doc/hyperspec-6.0/HyperSpec/")
-  (setq common-lisp-hyperspec-root "http://www.lispworks.com/reference/HyperSpec/"))
diff --git a/app-emacs/slime/files/1.0.20050303/70slime-gentoo.el b/app-emacs/slime/files/1.0.20050303/70slime-gentoo.el
deleted file mode 100644
index 4fde74012ac1..000000000000
--- a/app-emacs/slime/files/1.0.20050303/70slime-gentoo.el
+++ /dev/null
@@ -1,16 +0,0 @@
-
-;;; site-lisp configuration for slime-cvs
-
-(add-to-list 'load-path "@SITELISP@")
-(require 'slime)
-(add-hook 'lisp-mode-hook
-	  (lambda () (slime-mode t)))
-(add-hook 'inferior-lisp-mode-hook
-	  (lambda () (inferior-slime-mode t)))
-
-;; this prevents us from requiring the user get dev-lisp/hyperspec
-;; (which is non-free) as a hard dependency
-
-(if (file-exists-p "/usr/share/doc/hyperspec-6.0/HyperSpec")
-    (setq common-lisp-hyperspec-root "file:///usr/share/doc/hyperspec-6.0/HyperSpec/")
-  (setq common-lisp-hyperspec-root "http://www.lispworks.com/reference/HyperSpec/"))
diff --git a/app-emacs/slime/files/1.0.20050303/README.Gentoo b/app-emacs/slime/files/1.0.20050303/README.Gentoo
deleted file mode 100644
index 168f91cd98db..000000000000
--- a/app-emacs/slime/files/1.0.20050303/README.Gentoo
+++ /dev/null
@@ -1,12 +0,0 @@
-SLIME notes for Gentoo
-----------------------
-
-If you're interested in hacking this ebuild, slime-cvs uses its own
-swank.asd system definition file and swank-loader.lisp.
-
-As always with CVS ebuilds, DO NOT report problems to upstream.
-Always report problems to the Gentoo Bugzilla at
-http://bugs.gentoo.org.
-
-Matthew Kennedy <mkennedy@gentoo.org>
-
diff --git a/app-emacs/slime/files/1.0.20050303/swank-loader.lisp b/app-emacs/slime/files/1.0.20050303/swank-loader.lisp
deleted file mode 100644
index 4d9b157312e6..000000000000
--- a/app-emacs/slime/files/1.0.20050303/swank-loader.lisp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-;; This file is NOT part of SLIME
-
-(asdf:oos 'asdf:load-op :swank)
diff --git a/app-emacs/slime/files/1.0.20050303/swank.asd b/app-emacs/slime/files/1.0.20050303/swank.asd
deleted file mode 100644
index 39a42b7e5e65..000000000000
--- a/app-emacs/slime/files/1.0.20050303/swank.asd
+++ /dev/null
@@ -1,49 +0,0 @@
-;;; -*- mode: lisp; syntax: common-lisp; package: common-lisp -*-
-
-(defpackage #:swank-system
-  (:use #:common-lisp
-        #:asdf))
-
-(defpackage #:swank-loader
-  (:use #:common-lisp))
-
-(in-package #:swank-system)
-
-;; http://www.caddr.com/macho/archives/sbcl-devel/2004-3/3014.html
-
-(defclass unsafe-file (cl-source-file) ())
-
-(defmethod perform :around ((op compile-op) (c unsafe-file))
-  (setf (operation-on-warnings op) :ignore
-        (operation-on-failure op) :warn) ; adjust to taste
-  (call-next-method))
-
-(defmacro define-swank-system (&rest sysdep-components)
-  `(defsystem swank
-       :name "Swank is the Common Lips back-end to SLIME"
-       :serial t
-       :components ((:file "swank-backend")
-                    (:file "nregex")
-                    ,@(mapcar #'(lambda (component)
-                                  (if (atom component)
-                                      (list :file component)
-                                      component))
-                              sysdep-components)
-                    (:file "swank"))
-       :depends-on (#+sbcl sb-bsd-sockets)))
-
-#+sbcl  (define-swank-system "swank-sbcl" "swank-source-path-parser" "swank-gray")
-#+cmu   (define-swank-system "swank-source-path-parser" "swank-cmucl")
-#+clisp (define-swank-system "xref" "metering" "swank-clisp" "swank-gray")
-
-(in-package #:swank-loader)
-
-(defun user-init-file ()
-  "Return the name of the user init file or nil."
-  (probe-file (merge-pathnames (user-homedir-pathname)
-                               (make-pathname :name ".swank" :type "lisp"))))
-
-(when (user-init-file)
-  (load (user-init-file)))
-
-;; swank.asd ends here
diff --git a/app-emacs/slime/files/1.0.20050106/70slime-gentoo.el b/app-emacs/slime/files/1.2.1.20050804/70slime-gentoo.el
index 4fde74012ac1..4fde74012ac1 100644
--- a/app-emacs/slime/files/1.0.20050106/70slime-gentoo.el
+++ b/app-emacs/slime/files/1.2.1.20050804/70slime-gentoo.el
diff --git a/app-emacs/slime/files/1.0.20050207/README.Gentoo b/app-emacs/slime/files/1.2.1.20050804/README.Gentoo
index 168f91cd98db..168f91cd98db 100644
--- a/app-emacs/slime/files/1.0.20050207/README.Gentoo
+++ b/app-emacs/slime/files/1.2.1.20050804/README.Gentoo
diff --git a/app-emacs/slime/files/1.0.20050207/swank-loader.lisp b/app-emacs/slime/files/1.2.1.20050804/swank-loader.lisp
index 4d9b157312e6..4d9b157312e6 100644
--- a/app-emacs/slime/files/1.0.20050207/swank-loader.lisp
+++ b/app-emacs/slime/files/1.2.1.20050804/swank-loader.lisp
diff --git a/app-emacs/slime/files/1.0.20050207/swank.asd b/app-emacs/slime/files/1.2.1.20050804/swank.asd
index 39a42b7e5e65..452f02fc0d89 100644
--- a/app-emacs/slime/files/1.0.20050207/swank.asd
+++ b/app-emacs/slime/files/1.2.1.20050804/swank.asd
@@ -32,18 +32,48 @@
                     (:file "swank"))
        :depends-on (#+sbcl sb-bsd-sockets)))
 
-#+sbcl  (define-swank-system "swank-sbcl" "swank-source-path-parser" "swank-gray")
-#+cmu   (define-swank-system "swank-source-path-parser" "swank-cmucl")
-#+clisp (define-swank-system "xref" "metering" "swank-clisp" "swank-gray")
+#+sbcl  (define-swank-system
+	  "swank-sbcl"
+	  "swank-source-path-parser"
+	  "swank-source-file-cache" 
+	  "swank-gray")
+
+#+openmcl (define-swank-system
+	    "metering"
+	    "swank-openmcl"
+	    "swank-gray")
+
+#+cmu (define-swank-system
+	"swank-source-path-parser" 
+	"swank-source-file-cache"
+	"swank-cmucl")
+
+#+clisp (define-swank-system
+	  "xref"
+	  "metering"
+	  "swank-clisp"
+	  "swank-gray")
+
+#+armedbear (define-swank-system
+		"swank-abcl")
+
+#+ecl (define-swank-system
+	  "swank-ecl" "swank-gray")
 
 (in-package #:swank-loader)
 
 (defun user-init-file ()
-  "Return the name of the user init file or nil."
+  "Return the name of the user init file or NIL if it does not exist."
   (probe-file (merge-pathnames (user-homedir-pathname)
                                (make-pathname :name ".swank" :type "lisp"))))
 
-(when (user-init-file)
-  (load (user-init-file)))
+(defun site-init-file ()
+  "Return the name of the site init file or NIL if it does not exist."
+  (probe-file (make-pathname :name "site-init" :type "lisp" :defaults *load-truename*)))
+
+(or  (when (site-init-file)
+       (load (site-init-file)))
+     (when (user-init-file)
+       (load (user-init-file))))
 
 ;; swank.asd ends here
diff --git a/app-emacs/slime/files/70slime-gentoo.el b/app-emacs/slime/files/70slime-gentoo.el
deleted file mode 100644
index 4fde74012ac1..000000000000
--- a/app-emacs/slime/files/70slime-gentoo.el
+++ /dev/null
@@ -1,16 +0,0 @@
-
-;;; site-lisp configuration for slime-cvs
-
-(add-to-list 'load-path "@SITELISP@")
-(require 'slime)
-(add-hook 'lisp-mode-hook
-	  (lambda () (slime-mode t)))
-(add-hook 'inferior-lisp-mode-hook
-	  (lambda () (inferior-slime-mode t)))
-
-;; this prevents us from requiring the user get dev-lisp/hyperspec
-;; (which is non-free) as a hard dependency
-
-(if (file-exists-p "/usr/share/doc/hyperspec-6.0/HyperSpec")
-    (setq common-lisp-hyperspec-root "file:///usr/share/doc/hyperspec-6.0/HyperSpec/")
-  (setq common-lisp-hyperspec-root "http://www.lispworks.com/reference/HyperSpec/"))
diff --git a/app-emacs/slime/files/README.Gentoo b/app-emacs/slime/files/README.Gentoo
deleted file mode 100644
index 1290bad759ab..000000000000
--- a/app-emacs/slime/files/README.Gentoo
+++ /dev/null
@@ -1,8 +0,0 @@
-SLIME notes for Gentoo
-----------------------
-
-If you're interested in hacking this port, please note that this port
-uses its own swank.asd and swank-loader.lisp.  For this reason, always
-report problems to the Gentoo Bugzilla http://bugs.gentoo.org and not
-to the upstream authors.
-
diff --git a/app-emacs/slime/files/digest-slime-1.0 b/app-emacs/slime/files/digest-slime-1.0
deleted file mode 100644
index 2969beeb0be1..000000000000
--- a/app-emacs/slime/files/digest-slime-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90666e8860d8d26e3cfa36365544ffcf slime-1.0.tar.gz 309374
diff --git a/app-emacs/slime/files/digest-slime-1.0.20041010 b/app-emacs/slime/files/digest-slime-1.0.20041010
deleted file mode 100644
index af5f98ef5519..000000000000
--- a/app-emacs/slime/files/digest-slime-1.0.20041010
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 90666e8860d8d26e3cfa36365544ffcf slime-1.0.tar.gz 309374
-MD5 6fc1b58c28acbddadc297d2222645c00 slime-1.0-CVS-2004-10-10-gentoo.patch.bz2 47595
diff --git a/app-emacs/slime/files/digest-slime-1.0.20050106 b/app-emacs/slime/files/digest-slime-1.0.20050106
deleted file mode 100644
index 02994fbd234d..000000000000
--- a/app-emacs/slime/files/digest-slime-1.0.20050106
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 90666e8860d8d26e3cfa36365544ffcf slime-1.0.tar.gz 309374
-MD5 a3e1809c2e5d88d440c793d8fda6b415 slime-1.0-CVS-2005-01-06-gentoo.patch.bz2 87621
diff --git a/app-emacs/slime/files/digest-slime-1.0.20050207 b/app-emacs/slime/files/digest-slime-1.0.20050207
deleted file mode 100644
index 9b2137dc67ba..000000000000
--- a/app-emacs/slime/files/digest-slime-1.0.20050207
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 90666e8860d8d26e3cfa36365544ffcf slime-1.0.tar.gz 309374
-MD5 5fb84e0d49e30c6aee3e8aefd7fac32e slime-1.0-CVS-2005-02-07-gentoo.patch.bz2 93508
diff --git a/app-emacs/slime/files/digest-slime-1.0.20050303 b/app-emacs/slime/files/digest-slime-1.0.20050303
deleted file mode 100644
index 34260b161e5f..000000000000
--- a/app-emacs/slime/files/digest-slime-1.0.20050303
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 90666e8860d8d26e3cfa36365544ffcf slime-1.0.tar.gz 309374
-MD5 a3bcfee796731a14546d9867df45979e slime-1.0-CVS-2005-03-03-gentoo.patch.bz2 103501
diff --git a/app-emacs/slime/files/digest-slime-1.2.1.20050804 b/app-emacs/slime/files/digest-slime-1.2.1.20050804
new file mode 100644
index 000000000000..877d809ec049
--- /dev/null
+++ b/app-emacs/slime/files/digest-slime-1.2.1.20050804
@@ -0,0 +1,2 @@
+MD5 f7fabc03e1ec5a4d380f0890141058d9 slime-1.2.1.tar.gz 373957
+MD5 1a40921d3ea14c21e8745ee1fed9d2f4 slime-1.2.1-CVS-2005-08-04-gentoo.patch.bz2 35674
diff --git a/app-emacs/slime/files/swank-loader.lisp b/app-emacs/slime/files/swank-loader.lisp
deleted file mode 100644
index 497b877c7a36..000000000000
--- a/app-emacs/slime/files/swank-loader.lisp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-;;; fake swank-loader.lisp file
-
-(require :swank)
\ No newline at end of file
diff --git a/app-emacs/slime/files/swank.asd b/app-emacs/slime/files/swank.asd
deleted file mode 100644
index 991c3822d637..000000000000
--- a/app-emacs/slime/files/swank.asd
+++ /dev/null
@@ -1,42 +0,0 @@
-;;; -*- mode: lisp; syntax: common-lisp; indent-tabs-mode: nil; package: cl-user -*-
-
-(defpackage #:swank-system
-  (:use #:common-lisp
-        #:asdf))
-
-(in-package #:swank-system)
-
-;; http://www.caddr.com/macho/archives/sbcl-devel/2004-3/3014.html
-
-(defclass unsafe-file (cl-source-file) ())
-
-(defmethod perform :around ((op compile-op) (c unsafe-file))
-  (setf (operation-on-warnings op) :ignore
-        (operation-on-failure op) :warn) ; adjust to taste
-  (call-next-method))
-
-(defsystem #:swank
-    :name "Swank is the Common Lisp back-end to Slime"
-    :licence "GPL-2"
-    :components
-    #+cmu ((:file "swank-backend")
-           (:file "nregex")
-           (:file "swank-source-path-parser")
-           (:file "swank-cmucl")
-           (:file "swank"))
-    #+sbcl ((:file "swank-backend")
-            (:file "swank-sbcl")
-            (:file "nregex")
-	    (:file "swank-source-path-parser")
-	    (:file "swank-gray")
-	    (:unsafe-file "swank"))
-    #+clisp ((:file "swank-backend")
-             (:file "nregex")
-             (:file "xref")
-             (:file "metering")
-	     (:file "swank-clisp")
-             (:file "swank-gray")
-	     (:file "swank"))
-    #+sbcl :depends-on #+sbcl (:sb-bsd-sockets))
-
-;; swank.asd ends here