(Portage version: 2.0.51-r15)

23 files changed, 362 insertions, 208 deletions

diff --git a/app-emacs/slime-cvs/ChangeLog b/app-emacs/slime-cvs/ChangeLog
index 35c3e74e4f22..47882e3e8785 100644
--- a/app-emacs/slime-cvs/ChangeLog
+++ b/app-emacs/slime-cvs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.13 2005/01/01 14:01:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime-cvs/ChangeLog,v 1.14 2005/02/10 09:19:21 mkennedy Exp $
+
+*slime-cvs-0-r3 (07 Feb 2005)
+
+  07 Feb 2005; Matthew Kennedy <mkennedy@gentoo.org> metadata.xml,
+  files/70slime-gentoo.el, files/swank-loader.lisp, files/swank.asd,
+  +slime-cvs-0-r3.ebuild:
+  Support for =dev-lisp/common-lisp-controller-4*; Build documentation; Brand
+  new system definition file.
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/app-emacs/slime-cvs/Manifest b/app-emacs/slime-cvs/Manifest
index fdb1d0133a3a..c34aa8570ae5 100644
--- a/app-emacs/slime-cvs/Manifest
+++ b/app-emacs/slime-cvs/Manifest
@@ -1,11 +1,13 @@
-MD5 722aff0de5edc88c0440930083e87ccc ChangeLog 1804
-MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 1e57cc5d17eb2e048d20b7d711b69efe slime-cvs-0-r1.ebuild 1952
-MD5 89e7de3275fb35ed0dc6428ffa8b669c slime-cvs-0.ebuild 1682
+MD5 0ac5098d50493c5c39032a9612d0d6f6 slime-cvs-0-r3.ebuild 2203
 MD5 bd775715b698c7d39382726188b6b1cc slime-cvs-0-r2.ebuild 2054
-MD5 910993d2e23f61b956f2df6fad49b657 files/70slime-gentoo.el 577
+MD5 89e7de3275fb35ed0dc6428ffa8b669c slime-cvs-0.ebuild 1682
+MD5 1e57cc5d17eb2e048d20b7d711b69efe slime-cvs-0-r1.ebuild 1952
+MD5 7225546ede89a2fd6b13dd368a9baed5 ChangeLog 2106
+MD5 185b50ff504c7da6807fffb4e73fc017 metadata.xml 1267
+MD5 3469f2bfb76fc05b746ea35d0001d996 files/70slime-gentoo.el 571
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-slime-cvs-0 0
+MD5 cd3eddef773c2bdc1eac336383f13ec6 files/swank-loader.lisp 68
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-slime-cvs-0-r1 0
-MD5 e4086b50bade07de735b2e62d60c41cb files/swank-loader.lisp 50
-MD5 4ea22499288a1d3aed28b7a885dfabea files/swank.asd 1239
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-slime-cvs-0-r2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-slime-cvs-0-r3 0
+MD5 b3ba0a2b8052abb14c37d64c9c8c0e31 files/swank.asd 1637
diff --git a/app-emacs/slime-cvs/files/70slime-gentoo.el b/app-emacs/slime-cvs/files/70slime-gentoo.el
index 4fde74012ac1..ee7de2a5779b 100644
--- a/app-emacs/slime-cvs/files/70slime-gentoo.el
+++ b/app-emacs/slime-cvs/files/70slime-gentoo.el
@@ -3,10 +3,8 @@
 
 (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)))
+(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
diff --git a/app-emacs/slime-cvs/files/digest-slime-cvs-0-r3 b/app-emacs/slime-cvs/files/digest-slime-cvs-0-r3
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-emacs/slime-cvs/files/digest-slime-cvs-0-r3
diff --git a/app-emacs/slime-cvs/files/swank-loader.lisp b/app-emacs/slime-cvs/files/swank-loader.lisp
index 497b877c7a36..4d9b157312e6 100644
--- a/app-emacs/slime-cvs/files/swank-loader.lisp
+++ b/app-emacs/slime-cvs/files/swank-loader.lisp
@@ -1,4 +1,4 @@
 
-;;; fake swank-loader.lisp file
+;; This file is NOT part of SLIME
 
-(require :swank)
\ No newline at end of file
+(asdf:oos 'asdf:load-op :swank)
diff --git a/app-emacs/slime-cvs/files/swank.asd b/app-emacs/slime-cvs/files/swank.asd
index 991c3822d637..39a42b7e5e65 100644
--- a/app-emacs/slime-cvs/files/swank.asd
+++ b/app-emacs/slime-cvs/files/swank.asd
@@ -1,9 +1,12 @@
-;;; -*- mode: lisp; syntax: common-lisp; indent-tabs-mode: nil; package: cl-user -*-
+;;; -*- 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
@@ -15,28 +18,32 @@
         (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))
+(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-cvs/metadata.xml b/app-emacs/slime-cvs/metadata.xml
index bc306fe58224..206871240493 100644
--- a/app-emacs/slime-cvs/metadata.xml
+++ b/app-emacs/slime-cvs/metadata.xml
@@ -2,4 +2,30 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>emacs</herd>
+<herd>common-lisp</herd>
+<longdescription>
+SLIME: The Superior Lisp Interaction Mode for Emacs.  SLIME is a
+fresh, new Emacs mode for Common Lisp development inspired by existing
+systems such Emacs Lisp and ILISP. Feature highlights include:
+
+  * slime-mode: An Emacs minor-mode to enhance lisp-mode with:
+    o Code evaluation, compilation, and macroexpansion.
+    o Online documentation (describe, apropos, hyperspec).
+    o Definition finding (aka Meta-Point aka M-.).
+    o Symbol and package name completion.
+    o Automatic macro indentation based on &amp;body.
+    o Cross-reference interface (WHO-CALLS, etc).
+    o ... and more.
+
+  * SLDB: Common Lisp debugger with an Emacs-based user interface.
+
+  * REPL: The Read-Eval-Print Loop ("top-level") is written in Emacs
+    Lisp for tighter integration with Emacs. The REPL also has builtin
+    "shortcut" commands similar those of the McCLIM Listener.
+
+  * Compilation notes: SLIME is able to take compiler messages and
+    annotate them directly into source buffers.
+
+  * Inspector: Interactive object-inspector in an Emacs buffer.
+</longdescription>
 </pkgmetadata>
diff --git a/app-emacs/slime-cvs/slime-cvs-0-r3.ebuild b/app-emacs/slime-cvs/slime-cvs-0-r3.ebuild
new file mode 100644
index 000000000000..1cd18e4e760b
--- /dev/null
+++ b/app-emacs/slime-cvs/slime-cvs-0-r3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2005 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-r3.ebuild,v 1.1 2005/02/10 09:19:21 mkennedy Exp $
+
+ECVS_SERVER="common-lisp.net:/project/slime/cvsroot"
+if [ -z "${ECVS_BRANCH}" ]; then
+	ECVS_BRANCH="HEAD"
+fi
+ECVS_MODULE="slime"
+ECVS_USER="anonymous"
+ECVS_PASS="anonymous"
+ECVS_CVS_OPTIONS="-dP"
+
+inherit elisp cvs
+
+DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
+HOMEPAGE="http://common-lisp.net/project/slime/"
+SRC_URI=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="doc"
+
+DEPEND="virtual/emacs
+	dev-lisp/common-lisp-controller
+	virtual/commonlisp
+	doc? ( virtual/tetex sys-apps/texinfo )"
+
+S="${WORKDIR}/slime"
+
+CLPACKAGE=swank
+
+src_compile() {
+	emacs --batch -q -l <(echo "(add-to-list 'load-path \".\")") \
+		-f batch-byte-compile *.el || die
+	use doc && make -C doc all slime.pdf
+}
+
+src_install() {
+	elisp-install ${PN} *.{el,elc} ${FILESDIR}/swank-loader.lisp
+	elisp-site-file-install ${FILESDIR}/70slime-gentoo.el
+	dodoc README* ChangeLog
+	zcat ${D}/usr/share/doc/${PF}/ChangeLog.gz \
+		>${D}/usr/share/emacs/site-lisp/slime-cvs/ChangeLog
+	insinto /usr/share/common-lisp/source/swank
+	doins *.lisp ${FILESDIR}/swank.asd
+	dodir /usr/share/common-lisp/systems
+	dosym /usr/share/common-lisp/source/swank/swank.asd \
+		/usr/share/common-lisp/systems
+	if use doc; then
+		dodoc doc/slime.{ps,pdf}
+		doinfo doc/slime.info
+	fi
+}
+
+pkg_preinst() {
+	unregister-common-lisp-source $CLPACKAGE || die
+}
+
+pkg_postrm() {
+	if ! [ -d /usr/share/common-lisp/source/$CLPACKAGE ]; then
+		unregister-common-lisp-source $CLPACKAGE || die
+	fi
+	elisp-site-regen || die
+}
+
+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
+}
diff --git a/app-emacs/slime/ChangeLog b/app-emacs/slime/ChangeLog
index ff3c0ae08cb2..ba06e60dff32 100644
--- a/app-emacs/slime/ChangeLog
+++ b/app-emacs/slime/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-emacs/slime
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.9 2005/01/06 19:40:25 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.10 2005/02/10 09:19:45 mkennedy Exp $
+
+*slime-1.0.20050207 (07 Feb 2005)
+
+  07 Feb 2005; Matthew Kennedy <mkennedy@gentoo.org> metadata.xml,
+  +files/1.0.20050207/70slime-gentoo.el, +files/1.0.20050207/README.Gentoo,
+  +files/1.0.20050207/swank-loader.lisp, +files/1.0.20050207/swank.asd,
+  -slime-0.13.ebuild, +slime-1.0.20050207.ebuild, -slime-1.0_alpha.ebuild,
+  -slime-1.0_beta.ebuild:
+  New upstream version; New system definition file; Use #'ASDF:OOS rather than
+  #'REQUIRE to support =dev-lisp/common-lisp-controller-4*; Expanded 
+  metadata.xml
 
 *slime-1.0.20050106 (06 Jan 2005)
 
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index b99a8bce598a..f7d2e3bc07ac 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -1,22 +1,22 @@
-MD5 c0ec97213b361786a9b6d10f3c0a1e90 slime-0.13.ebuild 1906
-MD5 15bf8028fec5d6224e721313dab9a54d slime-1.0_alpha.ebuild 1233
 MD5 c25320cc54771e316c36cc77f4985d8a slime-1.0.ebuild 1556
 MD5 c0a5f7317eb724d2e79c8a94b4352a7c slime-1.0.20041010.ebuild 1966
-MD5 a0fd546f49a8ad787eeab56bf1e02d85 slime-1.0_beta.ebuild 1281
+MD5 67cef652d514b72d65140a8de6d0cda3 slime-1.0.20050207.ebuild 1991
 MD5 e8ae7265f7fc7cf43334c9266b4e0df7 ChangeLog 1568
-MD5 1d3cd7b126c58b1963097af2cdf39c54 metadata.xml 183
+MD5 185b50ff504c7da6807fffb4e73fc017 metadata.xml 1267
 MD5 b1b578e7c57b253d1fd49eeb57e5a5a1 slime-1.0.20050106.ebuild 2032
 MD5 910993d2e23f61b956f2df6fad49b657 files/70slime-gentoo.el 577
 MD5 e4086b50bade07de735b2e62d60c41cb files/swank-loader.lisp 50
 MD5 4ea22499288a1d3aed28b7a885dfabea files/swank.asd 1239
 MD5 7eb1b2947936cd494ee8dd07fc2fbc0f files/README.Gentoo 284
-MD5 909ff27dec8d97d16b944bf184b638b6 files/digest-slime-0.13 63
 MD5 55fab3c1553d02e869770f3e5e83ac40 files/digest-slime-1.0.20041010 146
 MD5 be9acc04b4a1941a2b32e8027b931630 files/digest-slime-1.0.20050106 146
+MD5 d7222ed8d3e9c8a5f88d61d8037dfae0 files/digest-slime-1.0.20050207 146
 MD5 0b5e3278ab8c3b8f5cfd7c96f947d302 files/digest-slime-1.0 61
-MD5 702882777d51e5b941f4d14bc4bd4028 files/digest-slime-1.0_alpha 66
-MD5 f35cb3e504401b20a17265c68cc32802 files/digest-slime-1.0_beta 65
 MD5 910993d2e23f61b956f2df6fad49b657 files/1.0.20050106/70slime-gentoo.el 577
 MD5 9835cc99bd025c7544ab31cad4a0fab1 files/1.0.20050106/swank-loader.lisp 239
 MD5 50dd21e3645cb3b1daba49d208904103 files/1.0.20050106/swank-loader-init.lisp 526
 MD5 7afeaa3a16a2c20000633c9e57dc0a2f files/1.0.20050106/swank.asd 1636
+MD5 910993d2e23f61b956f2df6fad49b657 files/1.0.20050207/70slime-gentoo.el 577
+MD5 cd3eddef773c2bdc1eac336383f13ec6 files/1.0.20050207/swank-loader.lisp 68
+MD5 b3ba0a2b8052abb14c37d64c9c8c0e31 files/1.0.20050207/swank.asd 1637
+MD5 dbd05e3df3b1a437912c3dcd36a2b700 files/1.0.20050207/README.Gentoo 402
diff --git a/app-emacs/slime/files/1.0.20050207/70slime-gentoo.el b/app-emacs/slime/files/1.0.20050207/70slime-gentoo.el
new file mode 100644
index 000000000000..4fde74012ac1
--- /dev/null
+++ b/app-emacs/slime/files/1.0.20050207/70slime-gentoo.el
@@ -0,0 +1,16 @@
+
+;;; 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.20050207/README.Gentoo b/app-emacs/slime/files/1.0.20050207/README.Gentoo
new file mode 100644
index 000000000000..168f91cd98db
--- /dev/null
+++ b/app-emacs/slime/files/1.0.20050207/README.Gentoo
@@ -0,0 +1,12 @@
+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.20050207/swank-loader.lisp b/app-emacs/slime/files/1.0.20050207/swank-loader.lisp
new file mode 100644
index 000000000000..4d9b157312e6
--- /dev/null
+++ b/app-emacs/slime/files/1.0.20050207/swank-loader.lisp
@@ -0,0 +1,4 @@
+
+;; This file is NOT part of SLIME
+
+(asdf:oos 'asdf:load-op :swank)
diff --git a/app-emacs/slime/files/1.0.20050207/swank.asd b/app-emacs/slime/files/1.0.20050207/swank.asd
new file mode 100644
index 000000000000..39a42b7e5e65
--- /dev/null
+++ b/app-emacs/slime/files/1.0.20050207/swank.asd
@@ -0,0 +1,49 @@
+;;; -*- 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/digest-slime-0.13 b/app-emacs/slime/files/digest-slime-0.13
deleted file mode 100644
index 505c4fe37d93..000000000000
--- a/app-emacs/slime/files/digest-slime-0.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 183e8af3e4561dfbe801e23a44c5a4b4 slime-0.13.tar.bz2 198978
diff --git a/app-emacs/slime/files/digest-slime-1.0.20050207 b/app-emacs/slime/files/digest-slime-1.0.20050207
new file mode 100644
index 000000000000..9b2137dc67ba
--- /dev/null
+++ b/app-emacs/slime/files/digest-slime-1.0.20050207
@@ -0,0 +1,2 @@
+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_alpha b/app-emacs/slime/files/digest-slime-1.0_alpha
deleted file mode 100644
index 41d4160ca36a..000000000000
--- a/app-emacs/slime/files/digest-slime-1.0_alpha
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b208ec0b6a61a2d93a54a1939fbc469e slime-1.0alpha.tar.gz 294584
diff --git a/app-emacs/slime/files/digest-slime-1.0_beta b/app-emacs/slime/files/digest-slime-1.0_beta
deleted file mode 100644
index 431240e8b30d..000000000000
--- a/app-emacs/slime/files/digest-slime-1.0_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90d2e699875dc70205d019ea7d24cd96 slime-1.0beta.tar.gz 306270
diff --git a/app-emacs/slime/metadata.xml b/app-emacs/slime/metadata.xml
index 247bba1deff4..206871240493 100644
--- a/app-emacs/slime/metadata.xml
+++ b/app-emacs/slime/metadata.xml
@@ -3,4 +3,29 @@
 <pkgmetadata>
 <herd>emacs</herd>
 <herd>common-lisp</herd>
+<longdescription>
+SLIME: The Superior Lisp Interaction Mode for Emacs.  SLIME is a
+fresh, new Emacs mode for Common Lisp development inspired by existing
+systems such Emacs Lisp and ILISP. Feature highlights include:
+
+  * slime-mode: An Emacs minor-mode to enhance lisp-mode with:
+    o Code evaluation, compilation, and macroexpansion.
+    o Online documentation (describe, apropos, hyperspec).
+    o Definition finding (aka Meta-Point aka M-.).
+    o Symbol and package name completion.
+    o Automatic macro indentation based on &amp;body.
+    o Cross-reference interface (WHO-CALLS, etc).
+    o ... and more.
+
+  * SLDB: Common Lisp debugger with an Emacs-based user interface.
+
+  * REPL: The Read-Eval-Print Loop ("top-level") is written in Emacs
+    Lisp for tighter integration with Emacs. The REPL also has builtin
+    "shortcut" commands similar those of the McCLIM Listener.
+
+  * Compilation notes: SLIME is able to take compiler messages and
+    annotate them directly into source buffers.
+
+  * Inspector: Interactive object-inspector in an Emacs buffer.
+</longdescription>
 </pkgmetadata>
diff --git a/app-emacs/slime/slime-0.13.ebuild b/app-emacs/slime/slime-0.13.ebuild
deleted file mode 100644
index 56fc36d86399..000000000000
--- a/app-emacs/slime/slime-0.13.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-0.13.ebuild,v 1.8 2005/01/01 14:01:15 eradicator Exp $
-
-inherit elisp
-
-DESCRIPTION="SLIME: The Superior Lisp Interaction Mode for Emacs"
-HOMEPAGE="http://common-lisp.net/project/slime/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="|| ( GPL-2 public-domain LLGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-DEPEND="virtual/emacs
-	dev-lisp/common-lisp-controller
-	virtual/commonlisp"
-
-CLPACKAGE=swank
-
-src_compile() {
-	echo "(add-to-list 'load-path \".\")" >script
-	emacs --batch -q -l script -f batch-byte-compile hyperspec.el slime.el || die
-}
-
-src_install() {
-	elisp-install ${PN} hyperspec.el slime.el slime.elc ${FILESDIR}/swank-loader.lisp
-	elisp-site-file-install ${FILESDIR}/70slime-gentoo.el
-	dodoc README* ChangeLog
-	insinto /usr/share/common-lisp/source/swank
-	# ChangeLog is needed at compile time!!
-	doins *.lisp ${FILESDIR}/swank.asd ChangeLog
-	dodir /usr/share/common-lisp/systems
-	dosym /usr/share/common-lisp/source/swank/swank.asd \
-		/usr/share/common-lisp/systems
-}
-
-pkg_preinst() {
-	rm -rf /usr/lib/common-lisp/*/${CLPACKAGE} || true
-}
-
-pkg_postrm() {
-	rm -rf /usr/lib/common-lisp/*/${CLPACKAGE} || true
-	elisp-site-regen
-}
-
-pkg_postinst() {
-	/usr/sbin/register-common-lisp-source ${CLPACKAGE}
-	elisp-site-regen
-	while read line; do einfo "${line}"; done <<EOF
-
-SLIME notes for Gentoo
-----------------------
-
-Gentoo's port for SLIME uses its own swank.asd so that it fits more
-cleanly into the Gentoo Common Lisp Controller framework.  For this
-reason, DO NOT report problems to SLIME's upstream authors.	 Always
-report problems to the Gentoo Bugzilla at http://bugs.gentoo.org
-unless you are absolutely certain your problem it is not related to
-the Gentoo port of SLIME.
-
-Matthew Kennedy <mkennedy@gentoo.org>
-
-EOF
-}
diff --git a/app-emacs/slime/slime-1.0.20050207.ebuild b/app-emacs/slime/slime-1.0.20050207.ebuild
new file mode 100644
index 000000000000..e12ab5d283db
--- /dev/null
+++ b/app-emacs/slime/slime-1.0.20050207.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-1.0.20050207.ebuild,v 1.1 2005/02/10 09:19:45 mkennedy Exp $
+
+inherit elisp cvs eutils
+
+MY_PV_CVS=${PV:4:4}-${PV:8:2}-${PV:10:2}
+MY_PV_BASE=${PV:0:3}
+
+DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
+HOMEPAGE="http://common-lisp.net/project/slime/"
+SRC_URI="http://www.common-lisp.net/project/slime/slime-${MY_PV_BASE}.tar.gz
+	mirror://gentoo/slime-${MY_PV_BASE}-CVS-${MY_PV_CVS}-gentoo.patch.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="doc"
+
+DEPEND="virtual/emacs
+	dev-lisp/common-lisp-controller
+	virtual/commonlisp
+	doc? ( virtual/tetex sys-apps/texinfo )"
+
+S="${WORKDIR}/slime-${MY_PV_BASE}"
+
+CLPACKAGE=swank
+
+src_unpack() {
+	unpack ${A}
+	epatch slime-${MY_PV_BASE}-CVS-${MY_PV_CVS}-gentoo.patch || die
+}
+
+src_compile() {
+	emacs --batch -q -l <(echo "(add-to-list 'load-path \".\")") \
+		-f batch-byte-compile *.el || die
+	use doc && make -C doc all slime.pdf
+}
+
+src_install() {
+	elisp-install ${PN} *.{el,elc} ${FILESDIR}/${PV}/swank-loader.lisp
+	elisp-site-file-install ${FILESDIR}/${PV}/70slime-gentoo.el
+	dodoc README* ChangeLog
+	zcat ${D}/usr/share/doc/${PF}/ChangeLog.gz \
+		>${D}/usr/share/emacs/site-lisp/slime/ChangeLog
+	insinto /usr/share/common-lisp/source/swank
+	doins *.lisp ${FILESDIR}/${PV}/swank.asd
+	dodir /usr/share/common-lisp/systems
+	dosym /usr/share/common-lisp/source/swank/swank.asd \
+		/usr/share/common-lisp/systems
+	if use doc; then
+		dodoc doc/slime.{ps,pdf}
+		doinfo doc/slime.info
+	fi
+}
+
+pkg_preinst() {
+	unregister-common-lisp-source $CLPACKAGE || die
+}
+
+pkg_postrm() {
+	if ! [ -d /usr/share/common-lisp/source/$CLPACKAGE ]; then
+		unregister-common-lisp-source $CLPACKAGE || die
+	fi
+	elisp-site-regen || die
+}
+
+pkg_postinst() {
+	register-common-lisp-source $CLPACKAGE || die
+	elisp-site-regen || die
+	while read line; do einfo "${line}"; done <${FILESDIR}/${PV}/README.Gentoo
+}
diff --git a/app-emacs/slime/slime-1.0_alpha.ebuild b/app-emacs/slime/slime-1.0_alpha.ebuild
deleted file mode 100644
index 5e09099d5fa1..000000000000
--- a/app-emacs/slime/slime-1.0_alpha.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-1.0_alpha.ebuild,v 1.2 2005/01/01 14:01:15 eradicator Exp $
-
-inherit common-lisp elisp
-
-MY_PV=${PV/_/}
-DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
-HOMEPAGE="http://common-lisp.net/project/slime/"
-SRC_URI="http://www.common-lisp.net/project/slime/slime-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="virtual/emacs
-	dev-lisp/common-lisp-controller
-	virtual/commonlisp"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-CLPACKAGE=swank
-
-src_compile() {
-	echo "(add-to-list 'load-path \".\")" >script
-	emacs --batch -q -l script -f batch-byte-compile hyperspec.el slime.el || die
-}
-
-src_install() {
-	elisp-install ${PN} *.{el,elc} ${FILESDIR}/swank-loader.lisp
-	elisp-site-file-install ${FILESDIR}/70slime-gentoo.el
-	dodoc ChangeLog HACKING NEWS README*
-	common-lisp-install *.lisp ${FILESDIR}/swank.asd ChangeLog
-	common-lisp-system-symlink
-}
-
-pkg_postinst() {
-	common-lisp_pkg_postinst
-	elisp_pkg_postinst
-	while read line; do einfo "${line}"; done <${FILESDIR}/README.Gentoo
-}
-
-pkg_postrm() {
-	common-lisp_pkg_postrm
-	elisp_pkg_postrm
-}
diff --git a/app-emacs/slime/slime-1.0_beta.ebuild b/app-emacs/slime/slime-1.0_beta.ebuild
deleted file mode 100644
index a760ec6b8ce5..000000000000
--- a/app-emacs/slime/slime-1.0_beta.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-1.0_beta.ebuild,v 1.2 2005/01/01 14:01:15 eradicator Exp $
-
-inherit common-lisp elisp
-
-MY_PV=${PV/_/}
-DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
-HOMEPAGE="http://common-lisp.net/project/slime/"
-SRC_URI="http://www.common-lisp.net/project/slime/slime-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="virtual/emacs
-	dev-lisp/common-lisp-controller
-	virtual/commonlisp"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-CLPACKAGE=swank
-
-src_compile() {
-	echo "(add-to-list 'load-path \".\")" >script
-	emacs --batch -q -l script -f batch-byte-compile hyperspec.el slime.el || die
-}
-
-src_install() {
-	elisp-install ${PN} *.{el,elc} ${FILESDIR}/swank-loader.lisp
-	elisp-site-file-install ${FILESDIR}/70slime-gentoo.el
-	dodoc ChangeLog HACKING NEWS README*
-	common-lisp-install *.lisp ${FILESDIR}/swank.asd
-	common-lisp-system-symlink
-	insinto /usr/share/emacs/site-lisp/slime
-	doins ChangeLog
-}
-
-pkg_postinst() {
-	common-lisp_pkg_postinst
-	elisp_pkg_postinst
-	while read line; do einfo "${line}"; done <${FILESDIR}/README.Gentoo
-}
-
-pkg_postrm() {
-	common-lisp_pkg_postrm
-	elisp_pkg_postrm
-}