.

(Portage version: 2.0.51.22-r1)

9 files changed, 217 insertions, 3 deletions

diff --git a/app-emacs/slime/ChangeLog b/app-emacs/slime/ChangeLog
index e8f9fe233d5b..62df802252c4 100644
--- a/app-emacs/slime/ChangeLog
+++ b/app-emacs/slime/ChangeLog
@@ -1,6 +1,16 @@
 # 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.17 2005/05/26 02:24:53 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.18 2005/06/28 16:08:29 mkennedy Exp $
+
+*slime-1.2.1.20050610 (10 Jun 2005)
+
+  10 Jun 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/1.2.1.20050610/70slime-gentoo.el,
+  +files/1.2.1.20050610/README.Gentoo, +files/1.2.1.20050610/swank.asd,
+  +files/1.2.1.20050610/swank-loader.lisp, files/1.2.1/swank.asd,
+  +slime-1.2.1.20050610.ebuild:
+  Add Armed Bear support; Add OpenMCL support; Update 1.2.1 with patches to
+  2005-06-10 CVS.
 
 *slime-1.2.1-r1 (26 May 2005)
 
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index abf87a1b0607..f5de509798b7 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -1,4 +1,4 @@
-MD5 64ec9210e067bad2f2a177915a59b4c0 ChangeLog 3337
+MD5 d5862e7d9d2ed4dc35b3b0f73f33fd26 ChangeLog 3735
 MD5 185b50ff504c7da6807fffb4e73fc017 metadata.xml 1267
 MD5 c0a5f7317eb724d2e79c8a94b4352a7c slime-1.0.20041010.ebuild 1966
 MD5 b1b578e7c57b253d1fd49eeb57e5a5a1 slime-1.0.20050106.ebuild 2032
@@ -7,6 +7,7 @@ MD5 c25320cc54771e316c36cc77f4985d8a slime-1.0.ebuild 1556
 MD5 51dab10f85afab8d266061dcfb71b8f7 slime-1.0.20050303.ebuild 2030
 MD5 151e9c741269c1437af5183b67172bd2 slime-1.2.1.ebuild 2121
 MD5 8d8a5877737761e130c4da55a2f38a94 slime-1.2.1-r1.ebuild 2080
+MD5 36044a72acd4ad2435b120a7873ec9e6 slime-1.2.1.20050610.ebuild 2072
 MD5 910993d2e23f61b956f2df6fad49b657 files/70slime-gentoo.el 577
 MD5 7eb1b2947936cd494ee8dd07fc2fbc0f files/README.Gentoo 284
 MD5 0b5e3278ab8c3b8f5cfd7c96f947d302 files/digest-slime-1.0 61
@@ -18,6 +19,7 @@ MD5 4ea22499288a1d3aed28b7a885dfabea files/swank.asd 1239
 MD5 56884f9bea56deb1d0510930f7d6afc4 files/digest-slime-1.0.20050303 147
 MD5 4afafaded4b9fd3dbc6b81b7478bfd1c files/digest-slime-1.2.1 63
 MD5 4afafaded4b9fd3dbc6b81b7478bfd1c files/digest-slime-1.2.1-r1 63
+MD5 cd9fc87fe8d186f9ab37257456abdf35 files/digest-slime-1.2.1.20050610 150
 MD5 910993d2e23f61b956f2df6fad49b657 files/1.0.20050106/70slime-gentoo.el 577
 MD5 50dd21e3645cb3b1daba49d208904103 files/1.0.20050106/swank-loader-init.lisp 526
 MD5 9835cc99bd025c7544ab31cad4a0fab1 files/1.0.20050106/swank-loader.lisp 239
@@ -33,4 +35,8 @@ MD5 b3ba0a2b8052abb14c37d64c9c8c0e31 files/1.0.20050207/swank.asd 1637
 MD5 910993d2e23f61b956f2df6fad49b657 files/1.2.1/70slime-gentoo.el 577
 MD5 a6f665debad6ee005b99b5ae3d3aeedb files/1.2.1/README.Gentoo 349
 MD5 cd3eddef773c2bdc1eac336383f13ec6 files/1.2.1/swank-loader.lisp 68
-MD5 55b1e1f6cc1b0ea4f879b66a0b991009 files/1.2.1/swank.asd 2340
+MD5 9b1d60c24d3e47f840d95b1913699950 files/1.2.1/swank.asd 2390
+MD5 910993d2e23f61b956f2df6fad49b657 files/1.2.1.20050610/70slime-gentoo.el 577
+MD5 a6f665debad6ee005b99b5ae3d3aeedb files/1.2.1.20050610/README.Gentoo 349
+MD5 cd3eddef773c2bdc1eac336383f13ec6 files/1.2.1.20050610/swank-loader.lisp 68
+MD5 b6d45d0225706ae7fc0f69bc25291f8b files/1.2.1.20050610/swank.asd 2470
diff --git a/app-emacs/slime/files/1.2.1.20050610/70slime-gentoo.el b/app-emacs/slime/files/1.2.1.20050610/70slime-gentoo.el
new file mode 100644
index 000000000000..4fde74012ac1
--- /dev/null
+++ b/app-emacs/slime/files/1.2.1.20050610/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.2.1.20050610/README.Gentoo b/app-emacs/slime/files/1.2.1.20050610/README.Gentoo
new file mode 100644
index 000000000000..168f91cd98db
--- /dev/null
+++ b/app-emacs/slime/files/1.2.1.20050610/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.2.1.20050610/swank-loader.lisp b/app-emacs/slime/files/1.2.1.20050610/swank-loader.lisp
new file mode 100644
index 000000000000..4d9b157312e6
--- /dev/null
+++ b/app-emacs/slime/files/1.2.1.20050610/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.2.1.20050610/swank.asd b/app-emacs/slime/files/1.2.1.20050610/swank.asd
new file mode 100644
index 000000000000..1218babe09ce
--- /dev/null
+++ b/app-emacs/slime/files/1.2.1.20050610/swank.asd
@@ -0,0 +1,87 @@
+;;; -*- 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-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")
+
+(in-package #:swank-loader)
+
+(defun user-init-file ()
+  "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"))))
+
+(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*)))
+
+;; The strategy for loading the site init file and the user init file here
+;; differs significantly from the original in swank-loader.lisp.
+;; swank-loader.lisp does:
+;; 
+;; (or (load-site-init-file)
+;;     (load-user-init-file))
+;; 
+;; But that has the effect of never loading the user init file, which is odd.
+;; Perhaps they mean PROGN rather than 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/1.2.1/swank.asd b/app-emacs/slime/files/1.2.1/swank.asd
index d1c2c40aa186..a4b0a765ebb1 100644
--- a/app-emacs/slime/files/1.2.1/swank.asd
+++ b/app-emacs/slime/files/1.2.1/swank.asd
@@ -49,6 +49,9 @@
 	  "swank-clisp"
 	  "swank-gray")
 
+#+armedbear (define-swank-system
+		"swank-abcl")
+
 (in-package #:swank-loader)
 
 (defun user-init-file ()
diff --git a/app-emacs/slime/files/digest-slime-1.2.1.20050610 b/app-emacs/slime/files/digest-slime-1.2.1.20050610
new file mode 100644
index 000000000000..cfbfabf38630
--- /dev/null
+++ b/app-emacs/slime/files/digest-slime-1.2.1.20050610
@@ -0,0 +1,2 @@
+MD5 f7fabc03e1ec5a4d380f0890141058d9 slime-1.2.1.tar.gz 373957
+MD5 bee8a0bb439d2745f6ea347eb7a983d0 slime-1.2.1-CVS-2005-06-10-gentoo.patch.bz2 35336
diff --git a/app-emacs/slime/slime-1.2.1.20050610.ebuild b/app-emacs/slime/slime-1.2.1.20050610.ebuild
new file mode 100644
index 000000000000..1f0a5124540f
--- /dev/null
+++ b/app-emacs/slime/slime-1.2.1.20050610.ebuild
@@ -0,0 +1,74 @@
+# 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.2.1.20050610.ebuild,v 1.1 2005/06/28 16:08:29 mkennedy Exp $
+
+inherit elisp eutils
+
+MY_PV_CVS=${PV:6:4}-${PV:10:2}-${PV:12:2}
+MY_PV_BASE=${PV:0:5}
+
+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"
+# SRC_URI="http://common-lisp.net/project/slime/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+IUSE="doc"
+
+DEPEND="virtual/emacs
+	dev-lisp/common-lisp-controller
+	virtual/commonlisp
+	doc? ( sys-apps/texinfo )"
+
+S="${WORKDIR}/slime-${MY_PV_BASE}"
+# S="${WORKDIR}/${P}"
+
+CLPACKAGE=swank
+
+src_unpack() {
+	unpack ${A}
+#	epatch slime-${MY_PV_BASE}-CVS-${MY_PV_CVS}-gentoo.patch || die
+}
+
+src_compile() {
+	echo "(add-to-list 'load-path \".\")" >load-path
+	emacs --batch -q -l load-path -f batch-byte-compile *.el || die
+	use doc && make -C doc slime.info
+}
+
+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
+		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
+}