Package-Manager: portage-2.0.51-r15

8 files changed, 164 insertions, 38 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
+}