*** empty log message ***

9 files changed, 197 insertions, 10 deletions

diff --git a/app-emacs/slime/ChangeLog b/app-emacs/slime/ChangeLog
index f63bf4f017ff..ff3c0ae08cb2 100644
--- a/app-emacs/slime/ChangeLog
+++ b/app-emacs/slime/ChangeLog
@@ -1,6 +1,15 @@
 # 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.8 2005/01/01 14:01:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.9 2005/01/06 19:40:25 mkennedy Exp $
+
+*slime-1.0.20050106 (06 Jan 2005)
+
+  06 Jan 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/1.0.20050106/70slime-gentoo.el,
+  +files/1.0.20050106/swank-loader.lisp, +files/1.0.20050106/swank.asd,
+  slime-1.0.20041010.ebuild, +slime-1.0.20050106.ebuild:
+  New upstream version (patch from SLIME 1.0 to 2005-01-06); Moved Gentoo
+  files to ${FILESDIR}/${PV}; Mark 1.0.20041010 as stable for x86
 
 *slime-1.0.20041010 (10 Oct 2004)
 
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index 9ef9e2b91b2a..1ba316ce2625 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -1,16 +1,22 @@
-MD5 a7a261f6ce8322ba025b0fed770a5094 ChangeLog 1171
-MD5 1d3cd7b126c58b1963097af2cdf39c54 metadata.xml 183
 MD5 c0ec97213b361786a9b6d10f3c0a1e90 slime-0.13.ebuild 1906
 MD5 15bf8028fec5d6224e721313dab9a54d slime-1.0_alpha.ebuild 1233
-MD5 a0fd546f49a8ad787eeab56bf1e02d85 slime-1.0_beta.ebuild 1281
-MD5 1c739ce7504acd97f0eafc2e14a18100 slime-1.0.20041010.ebuild 1969
 MD5 c25320cc54771e316c36cc77f4985d8a slime-1.0.ebuild 1556
+MD5 26e48233a5e2b472b1ba8908867f6e3e slime-1.0.20041010.ebuild 1968
+MD5 a0fd546f49a8ad787eeab56bf1e02d85 slime-1.0_beta.ebuild 1281
+MD5 c0afc9904f6f52fb19d48b804952e0da ChangeLog 1570
+MD5 1d3cd7b126c58b1963097af2cdf39c54 metadata.xml 183
+MD5 05b8c0bb1cafdf27855636214adec9b0 slime-1.0.20050106.ebuild 2034
 MD5 910993d2e23f61b956f2df6fad49b657 files/70slime-gentoo.el 577
-MD5 909ff27dec8d97d16b944bf184b638b6 files/digest-slime-0.13 63
 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 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 0b5e3278ab8c3b8f5cfd7c96f947d302 files/digest-slime-1.0 61
-MD5 55fab3c1553d02e869770f3e5e83ac40 files/digest-slime-1.0.20041010 146
+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
diff --git a/app-emacs/slime/files/1.0.20050106/70slime-gentoo.el b/app-emacs/slime/files/1.0.20050106/70slime-gentoo.el
new file mode 100644
index 000000000000..4fde74012ac1
--- /dev/null
+++ b/app-emacs/slime/files/1.0.20050106/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.20050106/swank-loader-init.lisp b/app-emacs/slime/files/1.0.20050106/swank-loader-init.lisp
new file mode 100644
index 000000000000..c2e58ff4904c
--- /dev/null
+++ b/app-emacs/slime/files/1.0.20050106/swank-loader-init.lisp
@@ -0,0 +1,21 @@
+;; -*- lisp -*-
+
+;; This file is NOT part of SLIME.
+
+;; This file is provided by the Gentoo port to implement the
+;; user-init-file loader.
+;; 
+;; Matthew Kennedy <mkennedy@gentoo.org>
+
+(defpackage #:swank-loader
+  (:use #:common-lisp))
+
+(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)))
diff --git a/app-emacs/slime/files/1.0.20050106/swank-loader.lisp b/app-emacs/slime/files/1.0.20050106/swank-loader.lisp
new file mode 100644
index 000000000000..408415642b65
--- /dev/null
+++ b/app-emacs/slime/files/1.0.20050106/swank-loader.lisp
@@ -0,0 +1,10 @@
+;; -*- lisp -*-
+
+;; This file is NOT part of SLIME.
+
+;; This file is provided by the Gentoo port to load swank via an the
+;; ASDF system (rather than using swank's own system).
+;;
+;; Matthew Kennedy <mkennedy@gentoo.org>
+
+(require :swank)
diff --git a/app-emacs/slime/files/1.0.20050106/swank.asd b/app-emacs/slime/files/1.0.20050106/swank.asd
new file mode 100644
index 000000000000..989414b144ff
--- /dev/null
+++ b/app-emacs/slime/files/1.0.20050106/swank.asd
@@ -0,0 +1,54 @@
+;;; -*- mode: lisp; syntax: common-lisp; package: cl-user -*-
+
+;; This file is NOT part of SLIME.
+
+;; This file is provided by the Gentoo port to load swank via an the
+;; ASDF system (rather than using swank's own system).  This file is
+;; constucted from the knowledge encapsulated in SLIME's original
+;; swank-loader.lisp.
+;;
+;; Matthew Kennedy <mkennedy@gentoo.org>
+
+(defpackage #:swank-system
+  (:use #:common-lisp
+        #:asdf))
+
+(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))
+
+(defsystem #:swank
+    :name "Swank is the Common Lisp back-end to Slime"
+    :licence "GPL-2"
+    :components
+    #+cmu ((:file "swank-loader-init")
+           (:file "swank-backend")
+           (:file "nregex")
+           (:file "swank-source-path-parser")
+           (:file "swank-cmucl")
+           (:file "swank"))
+    #+sbcl ((:file "swank-loader-init")
+            (:file "swank-backend")
+            (:file "nregex")
+            (:file "swank-sbcl")
+	    (:file "swank-source-path-parser")
+	    (:file "swank-gray")
+	    (:unsafe-file "swank"))
+    #+clisp ((:file "swank-loader-init")
+             (:file "swank-backend")
+             (:file "nregex")
+             (:file "xref")
+             (:file "metering")
+	     (:file "swank-clisp")
+             (:file "swank-gray")
+	     (:file "swank"))
+    :depends-on (#+sbcl :sb-bsd-sockets))
+
+;; swank.asd ends here
diff --git a/app-emacs/slime/files/digest-slime-1.0.20050106 b/app-emacs/slime/files/digest-slime-1.0.20050106
new file mode 100644
index 000000000000..02994fbd234d
--- /dev/null
+++ b/app-emacs/slime/files/digest-slime-1.0.20050106
@@ -0,0 +1,2 @@
+MD5 90666e8860d8d26e3cfa36365544ffcf slime-1.0.tar.gz 309374
+MD5 a3e1809c2e5d88d440c793d8fda6b415 slime-1.0-CVS-2005-01-06-gentoo.patch.bz2 87621
diff --git a/app-emacs/slime/slime-1.0.20041010.ebuild b/app-emacs/slime/slime-1.0.20041010.ebuild
index 61884e7a13ec..c5f7b16d197c 100644
--- a/app-emacs/slime/slime-1.0.20041010.ebuild
+++ b/app-emacs/slime/slime-1.0.20041010.ebuild
@@ -1,6 +1,6 @@
 # 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.20041010.ebuild,v 1.2 2005/01/01 14:01:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-1.0.20041010.ebuild,v 1.3 2005/01/06 19:40:25 mkennedy Exp $
 
 inherit common-lisp elisp
 
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="x86"
 IUSE="doc"
 
 # The doc USE flag governs the creation of PostScript and PDF
diff --git a/app-emacs/slime/slime-1.0.20050106.ebuild b/app-emacs/slime/slime-1.0.20050106.ebuild
new file mode 100644
index 000000000000..5f43c4cbffa9
--- /dev/null
+++ b/app-emacs/slime/slime-1.0.20050106.ebuild
@@ -0,0 +1,69 @@
+# 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.20050106.ebuild,v 1.1 2005/01/06 19:40:25 mkennedy Exp $
+
+inherit common-lisp elisp 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"
+IUSE="doc"
+
+# The doc USE flag governs the creation of PostScript and PDF
+# documentation.  GNU Info format documentation will created
+# regardless.
+
+DEPEND="virtual/emacs
+	dev-lisp/common-lisp-controller
+	virtual/commonlisp
+	doc? ( virtual/tetex sys-apps/texinfo )"
+
+S=${WORKDIR}/${PN}-${MY_PV_BASE}
+
+CLPACKAGE=swank
+
+src_unpack() {
+	unpack ${A}
+	epatch slime-${MY_PV_BASE}-CVS-${MY_PV_CVS}-gentoo.patch || die
+}
+
+src_compile() {
+	# NOTE: slime.el wont byte compile currently (2004-10-10)
+#	emacs --batch -q -l <(echo "(add-to-list 'load-path \".\")") \
+#		-f batch-byte-compile hyperspec.el slime.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 ChangeLog HACKING NEWS PROBLEMS README
+	common-lisp-install *.lisp ${FILESDIR}/${PV}/swank.asd ${FILESDIR}/${PV}/swank-loader-init.lisp
+	common-lisp-system-symlink
+	insinto /usr/share/emacs/site-lisp/slime
+	doins ChangeLog
+	if use doc; then
+		dodoc doc/slime.{ps,pdf}
+		doinfo doc/slime.info
+	fi
+}
+
+pkg_postinst() {
+	common-lisp_pkg_postinst
+	elisp_pkg_postinst
+	while read line; do einfo "${line}"; done <${FILESDIR}/README.Gentoo
+	einfo "NOTE: dev-lisp/${P} includes a patch from SLIME ${MY_PV_BASE} to"
+	einfo "SLIME CVS ${MY_PV_CVS}."
+}
+
+pkg_postrm() {
+	common-lisp_pkg_postrm
+	elisp_pkg_postrm
+}