Modernize the Emacs Slime site-lisp configuration by simply calling slime-setup.

Package-Manager: portage-2.1_pre7-r4

9 files changed, 75 insertions, 63 deletions

diff --git a/app-emacs/slime-cvs/ChangeLog b/app-emacs/slime-cvs/ChangeLog
index bb6e99971a0f..9f0e99e896cc 100644
--- a/app-emacs/slime-cvs/ChangeLog
+++ b/app-emacs/slime-cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/slime-cvs
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime-cvs/ChangeLog,v 1.18 2005/08/14 08:36:09 mkennedy Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime-cvs/ChangeLog,v 1.19 2006/04/12 16:47:17 mkennedy Exp $
+
+  12 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  files/70slime-gentoo.el, +files/README.Gentoo, files/swank.asd,
+  slime-cvs-0-r4.ebuild:
+  Modernize the Emacs Slime site-lisp configuration by simply calling
+  slime-setup.
 
   14 Aug 2005; Matthew Kennedy <mkennedy@gentoo.org>
   files/70slime-gentoo.el, -slime-cvs-0.ebuild, -slime-cvs-0-r1.ebuild,
diff --git a/app-emacs/slime-cvs/Manifest b/app-emacs/slime-cvs/Manifest
index 89cc14fe8335..88204cb5cce3 100644
--- a/app-emacs/slime-cvs/Manifest
+++ b/app-emacs/slime-cvs/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 12ba3cc8b079672ef33a628dc93f1529 ChangeLog 2784
-MD5 185b50ff504c7da6807fffb4e73fc017 metadata.xml 1267
-MD5 1caa527f86025f78b25c0a4667b74a64 slime-cvs-0-r4.ebuild 2223
 MD5 cbdca05ee34078c6bd9fb424fd4dda02 files/70slime-gentoo.el 563
-MD5 cd3eddef773c2bdc1eac336383f13ec6 files/swank-loader.lisp 68
-MD5 f728ed37ea34eb35320fb9544f3d5ed6 files/swank.asd 1934
+MD5 1ab5127efd37110d1dc0711ec5626a92 files/README.Gentoo 347
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-slime-cvs-0-r4 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC/wKtyiNZaEAZA+ARAqfVAJ9ZgLm3uaI6xnSIOn7wW/ynPDQqogCdEL78
-yGsx9fYsAzSMGuTTAxkpqYA=
-=CJAb
------END PGP SIGNATURE-----
+MD5 cd3eddef773c2bdc1eac336383f13ec6 files/swank-loader.lisp 68
+MD5 3db8ecc0c00fcdc30651f1a5fb9cb8bf files/swank.asd 2158
+MD5 185b50ff504c7da6807fffb4e73fc017 metadata.xml 1267
+MD5 275e94f10f804b49b39d158fd9d507d4 slime-cvs-0-r4.ebuild 1904
diff --git a/app-emacs/slime-cvs/files/70slime-gentoo.el b/app-emacs/slime-cvs/files/70slime-gentoo.el
index 6f829b1bc938..2687bb5c4f14 100644
--- a/app-emacs/slime-cvs/files/70slime-gentoo.el
+++ b/app-emacs/slime-cvs/files/70slime-gentoo.el
@@ -3,8 +3,7 @@
 
 (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)))
+(slime-setup)
 
 ;; this prevents us from requiring the user get dev-lisp/hyperspec
 ;; (which is non-free) as a hard dependency
diff --git a/app-emacs/slime-cvs/files/README.Gentoo b/app-emacs/slime-cvs/files/README.Gentoo
new file mode 100644
index 000000000000..99353ee7aa29
--- /dev/null
+++ b/app-emacs/slime-cvs/files/README.Gentoo
@@ -0,0 +1,12 @@
+SLIME notes for Gentoo
+----------------------
+
+If you're interested in hacking this ebuild, Gentoo 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-cvs/files/swank.asd b/app-emacs/slime-cvs/files/swank.asd
index 323407a5bd6f..ddcd9f0c97ed 100644
--- a/app-emacs/slime-cvs/files/swank.asd
+++ b/app-emacs/slime-cvs/files/swank.asd
@@ -32,27 +32,50 @@
                     (:file "swank"))
        :depends-on (#+sbcl sb-bsd-sockets)))
 
-#+sbcl  (define-swank-system "swank-sbcl" "swank-source-path-parser" 
-	  "swank-source-file-cache" "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")
+#+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 load-user-init-file ()
   "Load the user init file, return NIL if it does not exist."
   (load (merge-pathnames (user-homedir-pathname)
-                         (make-pathname :name ".swank" :type "lisp"))
-        :if-does-not-exist nil))
-(export 'load-user-init-file)
+			 (make-pathname :name ".swank" :type "lisp"))
+	:if-does-not-exist nil))
 
 (defun load-site-init-file ()
   (load (make-pathname :name "site-init" :type "lisp"
                        :defaults *load-truename*)
         :if-does-not-exist nil))
 
-(or (load-site-init-file)
-    (load-user-init-file))
+;; (funcall (intern (string :warn-unimplemented-interfaces) :swank-backend))
+
+(load-site-init-file)
+(load-user-init-file)
 
 ;; swank.asd ends here
diff --git a/app-emacs/slime-cvs/slime-cvs-0-r4.ebuild b/app-emacs/slime-cvs/slime-cvs-0-r4.ebuild
index b5c448eaa3ab..a892d36b985a 100644
--- a/app-emacs/slime-cvs/slime-cvs-0-r4.ebuild
+++ b/app-emacs/slime-cvs/slime-cvs-0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime-cvs/slime-cvs-0-r4.ebuild,v 1.1 2005/04/06 07:24:17 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime-cvs/slime-cvs-0-r4.ebuild,v 1.2 2006/04/12 16:47:17 mkennedy Exp $
 
 ECVS_SERVER="common-lisp.net:/project/slime/cvsroot"
 if [ -z "${ECVS_BRANCH}" ]; then
@@ -67,19 +67,5 @@ pkg_postrm() {
 pkg_postinst() {
 	register-common-lisp-source $CLPACKAGE || die
 	elisp-site-regen || die
-	while read line; do einfo "${line}"; done <<EOF
-
-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>
-
-EOF
+	zcat /usr/share/doc/${PF}/README.Gentoo |while read line; do einfo "${line}"; done
 }
diff --git a/app-emacs/slime/ChangeLog b/app-emacs/slime/ChangeLog
index 08014b078cbd..35f08ed0ea12 100644
--- a/app-emacs/slime/ChangeLog
+++ b/app-emacs/slime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/slime
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.24 2006/02/05 08:51:07 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.25 2006/04/12 16:46:13 mkennedy Exp $
+
+  12 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  files/1.2.1.20060205/70slime-gentoo.el:
+  Modernize the Emacs Slime site-lisp configuration by simply calling
+  slime-setup.
 
 *slime-1.2.1.20060205 (05 Feb 2006)
 
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index 3ce6f80e919d..6fae751cc944 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 404664bcf03f57c8ccd06d5b10334a4a ChangeLog 6700
 RMD160 ba6d6e6cd078b433c8118743be5c72539d39401f ChangeLog 6700
 SHA256 2a76aa392ebb4b7b7ee8b1537717bbb3450b467a28a210cd7936321260b896a5 ChangeLog 6700
@@ -28,12 +25,15 @@ SHA256 1c42cd16fd6af8e377716c633adb9e0d6172df6001e2aa26eed6a33df420d015 files/1.
 MD5 2fb7f0df5e95786860d421a83618720a files/1.2.1.20051211/swank.asd 2161
 RMD160 57699bd2a0f8325b30715948dbd1dc688fd0f8c1 files/1.2.1.20051211/swank.asd 2161
 SHA256 e35f51cc7b91414bbc3df979de60245b4d4c7229d3f1f889f96718bb04482930 files/1.2.1.20051211/swank.asd 2161
-MD5 ee1f66aba753cb513ec91d33210dc246 files/1.2.1.20060205/70slime-gentoo.el 569
-RMD160 7133265dd0e38df42050bfedc57134c0db9c5b68 files/1.2.1.20060205/70slime-gentoo.el 569
-SHA256 6c3a331793138d5a1eb141738ce3353fdf4f77b9dd73ddb13a5a02c876d28992 files/1.2.1.20060205/70slime-gentoo.el 569
+MD5 0d610ac7f0c3daa87614b1b72a4d40fd files/1.2.1.20060205/70slime-gentoo.el 451
+RMD160 e15860be7553e588b8f9f547eae42804e2f1a214 files/1.2.1.20060205/70slime-gentoo.el 451
+SHA256 5816afae1dc4dbb77fe0413504688de0add083aab9217940edf9f6c8f2eb4f36 files/1.2.1.20060205/70slime-gentoo.el 451
 MD5 1ab5127efd37110d1dc0711ec5626a92 files/1.2.1.20060205/README.Gentoo 347
 RMD160 d14589acdadaa746e145fecf50382d6055c87ae1 files/1.2.1.20060205/README.Gentoo 347
 SHA256 fdc51ac5cea0e5cecc83eaed30d086da1f7aa60ded9b98c535445a062c0a3679 files/1.2.1.20060205/README.Gentoo 347
+MD5 5705d49745191b844ccbc45a91b886db files/1.2.1.20060205/semantic.cache 505
+RMD160 a965f57ef07353393eae82a4386850dce8f8fdb7 files/1.2.1.20060205/semantic.cache 505
+SHA256 36ed9d3272fe3c361fa1f478ba7f467995f338eba226f47ccfa7226d2827c238 files/1.2.1.20060205/semantic.cache 505
 MD5 cd3eddef773c2bdc1eac336383f13ec6 files/1.2.1.20060205/swank-loader.lisp 68
 RMD160 28a2624c60122f50ff758923c4ca2ee666ec25ee files/1.2.1.20060205/swank-loader.lisp 68
 SHA256 1c42cd16fd6af8e377716c633adb9e0d6172df6001e2aa26eed6a33df420d015 files/1.2.1.20060205/swank-loader.lisp 68
@@ -61,10 +61,3 @@ SHA256 fec1e1158384e8351f32020b5decbcfc25f63a8d2ed53ec7171f104fb7355392 slime-1.
 MD5 a64948ca07e6e5401d7635d1609c16d9 slime-1.2.1.20060205.ebuild 1643
 RMD160 65d74c3ea405c4c2f013e5863e0a26fd49565fcb slime-1.2.1.20060205.ebuild 1643
 SHA256 510aac2832c38feafc171fa68f7d7801dba44e50056f913d0c170c0c685c72cf slime-1.2.1.20060205.ebuild 1643
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD5byVyiNZaEAZA+ARAvQhAJ41jdgkhrjAHD3+ihBJ2A4ccfELwgCfX1yZ
-vHIeukMaF/bYluHIgpcsO8M=
-=hWRy
------END PGP SIGNATURE-----
diff --git a/app-emacs/slime/files/1.2.1.20060205/70slime-gentoo.el b/app-emacs/slime/files/1.2.1.20060205/70slime-gentoo.el
index 105a1c76e689..2687bb5c4f14 100644
--- a/app-emacs/slime/files/1.2.1.20060205/70slime-gentoo.el
+++ b/app-emacs/slime/files/1.2.1.20060205/70slime-gentoo.el
@@ -3,10 +3,7 @@
 
 (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)))
+(slime-setup)
 
 ;; this prevents us from requiring the user get dev-lisp/hyperspec
 ;; (which is non-free) as a hard dependency