*** empty log message ***

6 files changed, 134 insertions, 32 deletions

diff --git a/app-emacs/slime-cvs/ChangeLog b/app-emacs/slime-cvs/ChangeLog
index f8987031cbae..7574cfc6fc4f 100644
--- a/app-emacs/slime-cvs/ChangeLog
+++ b/app-emacs/slime-cvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/slime-cvs
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime-cvs/ChangeLog,v 1.3 2003/12/22 05:03:44 mkennedy Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime-cvs/ChangeLog,v 1.4 2004/01/26 18:10:54 mkennedy Exp $
+
+*slime-cvs-0-r1 (26 Jan 2004)
+
+  26 Jan 2004; <mkennedy@gentoo.org> slime-cvs-0-r1.ebuild,
+  slime-cvs-0.ebuild, files/swank.asd:
+  The Moon and stars have aligned just right, and now the ebuild works for
+  FAIRLY-STABLE and HEAD tags.
 
   21 Dec 2003; <mkennedy@gentoo.org> slime-cvs-0.ebuild:
   get source from the FAIRLY-STABLE tag
diff --git a/app-emacs/slime-cvs/Manifest b/app-emacs/slime-cvs/Manifest
index d8f965298ff5..fc2700099639 100644
--- a/app-emacs/slime-cvs/Manifest
+++ b/app-emacs/slime-cvs/Manifest
@@ -1,7 +1,9 @@
-MD5 1fe1c5ab495238a2dbabca0a22853ceb ChangeLog 679
-MD5 45a7d31e309723c45ee8c980b54ab7bf slime-cvs-0.ebuild 1669
+MD5 8458527f950049cf70dff2787202826b slime-cvs-0.ebuild 1681
+MD5 8fed806597194251a18c87757bebfba2 slime-cvs-0-r1.ebuild 2408
+MD5 7630788764f8c10fd1778d2f69d2b557 ChangeLog 916
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 2b946b67bc1c932cc436cec363a0487b files/swank.asd 1162
-MD5 e4086b50bade07de735b2e62d60c41cb files/swank-loader.lisp 50
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-slime-cvs-0 0
 MD5 910993d2e23f61b956f2df6fad49b657 files/70slime-gentoo.el 577
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-slime-cvs-0 0
+MD5 e4086b50bade07de735b2e62d60c41cb files/swank-loader.lisp 50
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-slime-cvs-0-r1 0
+MD5 0a7e63a0ecf409257b594ae1f1ba45f1 files/swank.asd 760
diff --git a/app-emacs/slime-cvs/files/digest-slime-cvs-0-r1 b/app-emacs/slime-cvs/files/digest-slime-cvs-0-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-emacs/slime-cvs/files/digest-slime-cvs-0-r1
diff --git a/app-emacs/slime-cvs/files/swank.asd b/app-emacs/slime-cvs/files/swank.asd
index 8e2fa8546bc9..4b26eed3484a 100644
--- a/app-emacs/slime-cvs/files/swank.asd
+++ b/app-emacs/slime-cvs/files/swank.asd
@@ -1,24 +1,28 @@
-;;; -*- mode: lisp; syntax: common-lisp; base: 10; package: common-lisp-user -*-
+;;; -*- mode: lisp; syntax: common-lisp; indent-tabs-mode: nil; package: cl-user -*-
 
-(in-package #:common-lisp-user)
+(defpackage #:swank-system
+  (:use #:common-lisp
+        #:asdf))
 
-(defpackage #:swank                                                                           
-  (:use #:asdf                                                                                
-        #:common-lisp)                                                                        
-  (:export #:start-server #:create-swank-server                                               
-           #:*sldb-pprint-frames*))
-
-(in-package #:swank)
+(in-package #:swank-system)
 
 (defsystem #:swank
-  :name "Swank is the Common Lisp back-end to Slime"
-  :author "Matthew Kennedy <mkennedy@gentoo.org>"
-  :maintainer "Matthew Kennedy <mkennedy@gentoo.org>"
-  :licence "GPL-2"
-  :components ((:file "swank")
-	       (:file "swank-backend" :depends-on ("swank"))
-	       (:file "null-swank-impl" :depends-on ("swank-backend"))
-;; 	       (:file "swank-backend" :depends-on ("null-swank-impl"))
-;; 	       (:file "null-swank-impl" :depends-on ("swank"))
-	       #+cmu (:file "swank-cmucl" :depends-on ("null-swank-impl"))
-	       #+sbcl (:file "swank-sbcl" :depends-on ("null-swank-impl"))))
+    :name "Swank is the Common Lisp back-end to Slime"
+    :licence "GPL-2"
+    :components
+    #+cmu ((:file "swank-backend")
+           (:file "swank")
+           (:file "swank-source-path-parser")
+           (:file "swank-cmucl"))
+    #+sbcl ((:file "swank-backend")
+            (:file "swank")
+	    (:file "swank-source-path-parser")
+	    (:file "swank-sbcl")
+	    (:file "swank-gray"))
+    #+clisp ((:file "swank-backend")
+             (:file "swank")
+	     (:file "xref")
+	     (:file "swank-clisp")
+	     (:file "swank-gray")))
+
+;; swank.asd ends here
diff --git a/app-emacs/slime-cvs/slime-cvs-0-r1.ebuild b/app-emacs/slime-cvs/slime-cvs-0-r1.ebuild
new file mode 100644
index 000000000000..a2b0895536a9
--- /dev/null
+++ b/app-emacs/slime-cvs/slime-cvs-0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime-cvs/slime-cvs-0-r1.ebuild,v 1.1 2004/01/26 18:10:54 mkennedy Exp $
+
+ECVS_SERVER="common-lisp.net:/project/slime/cvsroot"
+if [ -z "${ECVS_BRANCH}" ]; then # user configurable
+	ECVS_BRANCH="FAIRLY-STABLE"
+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"
+
+DEPEND="virtual/emacs
+	dev-lisp/common-lisp-controller
+	virtual/commonlisp"
+
+S="${WORKDIR}/slime"
+
+CLPACKAGE=swank
+
+# TODO: ilisp and slime both provide a hyperspec.el.  Erik Naggum's
+# hyperspec.el doesn't seem to be accessible anymore, but it would be
+# best to compare differences and provide app-emacs/hyperspec
+
+src_compile() {
+	elisp-comp hyperspec.el slime.el 2>/dev/null || 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
+----------------------
+
+You can elect to set the ECVS_BRANCH environment variable when
+emerging slime-cvs.	 If unset, the default is to pull the
+FAIRLY-STABLE tag. eg.
+
+   ECVS_BRANCH=HEAD emerge slime-cvs
+
+While this ebuild attempts to work for the FAIRLY-STABLE tag, it may
+not always work with CVS HEAD.
+
+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-cvs/slime-cvs-0.ebuild b/app-emacs/slime-cvs/slime-cvs-0.ebuild
index 0ea1c6910547..f5a656d71aac 100644
--- a/app-emacs/slime-cvs/slime-cvs-0.ebuild
+++ b/app-emacs/slime-cvs/slime-cvs-0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime-cvs/slime-cvs-0.ebuild,v 1.3 2003/12/22 05:03:44 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime-cvs/slime-cvs-0.ebuild,v 1.4 2004/01/26 18:10:54 mkennedy Exp $
 
 ECVS_SERVER="common-lisp.net:/project/slime/cvsroot"
-ECVS_BRANCH="FAIRLY-STABLE"
+if [ -z "${ECVS_BRANCH}" ]; then
+	ECVS_BRANCH="FAIRLY-STABLE"
+fi
 ECVS_MODULE="slime"
 ECVS_USER="anonymous"
 ECVS_PASS="anonymous"
@@ -17,7 +19,6 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
 
 DEPEND="virtual/emacs
 	dev-lisp/common-lisp-controller"
@@ -39,7 +40,8 @@ src_install() {
 	elisp-site-file-install ${FILESDIR}/70slime-gentoo.el
 	dodoc README* ChangeLog
 	insinto /usr/share/common-lisp/source/swank
-	doins null-swank-impl.lisp swank-backend.lisp swank-{cmucl,sbcl}.lisp swank.lisp ${FILESDIR}/swank.asd
+	# 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