clean up

(Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 i686)

6 files changed, 9 insertions, 244 deletions

diff --git a/app-emacs/slime/ChangeLog b/app-emacs/slime/ChangeLog
index 675cdacab926..28a0477e6731 100644
--- a/app-emacs/slime/ChangeLog
+++ b/app-emacs/slime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/slime
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.61 2008/08/27 08:41:25 ulm Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.62 2009/01/29 07:31:27 fauli Exp $
+
+  29 Jan 2009; Christian Faulhammer <fauli@gentoo.org>
+  -files/2.0_p20070816/70slime-gentoo.el,
+  -files/2.0_p20070816/changelog-date.patch,
+  -files/2.0_p20070816/save-restriction-if-possible.patch,
+  -files/2.0_p20070816/swank.asd, -slime-2.0_p20070816-r3.ebuild:
+  clean up
 
   27 Aug 2008; Ulrich Mueller <ulm@gentoo.org> slime-2.0_p20061118.ebuild,
   slime-2.0_p20070816-r3.ebuild, slime-2.0_p20080731.ebuild:
diff --git a/app-emacs/slime/files/2.0_p20070816/70slime-gentoo.el b/app-emacs/slime/files/2.0_p20070816/70slime-gentoo.el
deleted file mode 100644
index 9859b9b6ff78..000000000000
--- a/app-emacs/slime/files/2.0_p20070816/70slime-gentoo.el
+++ /dev/null
@@ -1,15 +0,0 @@
-
-;;; slime site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-
-(require 'slime-autoloads)
-(eval-after-load 'slime
-  (slime-setup))
-
-;; this allows us not to require dev-lisp/hyperspec
-;; (which is non-free) as a hard dependency
-(setq common-lisp-hyperspec-root
-      (if (file-exists-p "/usr/share/doc/hyperspec/HyperSpec")
-	  "file:///usr/share/doc/hyperspec/HyperSpec/"
-	"http://www.lispworks.com/reference/HyperSpec/"))
diff --git a/app-emacs/slime/files/2.0_p20070816/changelog-date.patch b/app-emacs/slime/files/2.0_p20070816/changelog-date.patch
deleted file mode 100644
index bf816bc771e2..000000000000
--- a/app-emacs/slime/files/2.0_p20070816/changelog-date.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- slime-2.0_p20070816-old/slime.el	2008-07-30 10:37:28.000000000 +0200
-+++ slime-2.0_p20070816/slime.el	2008-07-30 10:39:53.000000000 +0200
-@@ -113,13 +113,7 @@
-   (defun slime-changelog-date ()
-     "Return the datestring of the latest entry in the ChangeLog file.
- Return nil if the ChangeLog file cannot be found."
--    (let ((changelog (concat slime-path "ChangeLog")))
--      (if (file-exists-p changelog)
--          (with-temp-buffer 
--            (insert-file-contents changelog nil 0 100)
--            (goto-char (point-min))
--            (symbol-name (read (current-buffer))))
--        nil))))
-+    "@SLIME-CHANGELOG-DATE@"))
- 
- (defvar slime-protocol-version nil)
- (setq slime-protocol-version
diff --git a/app-emacs/slime/files/2.0_p20070816/save-restriction-if-possible.patch b/app-emacs/slime/files/2.0_p20070816/save-restriction-if-possible.patch
deleted file mode 100644
index 952b3a79c00d..000000000000
--- a/app-emacs/slime/files/2.0_p20070816/save-restriction-if-possible.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- slime-2.0_p20070816-orig/slime.el	2007-08-16 10:26:33.000000000 +0200
-+++ slime-2.0_p20070816/slime.el	2007-09-08 19:32:09.000000000 +0200
-@@ -5341,6 +5341,39 @@
-        (set-buffer buffer)
-        (goto-char (point-min))))))
- 
-+(defmacro save-restriction-if-possible (&rest body)
-+  "Very similiarly to `save-restriction'. The only difference is
-+that it's not enforcing the restriction as strictly: It's only
-+enforced if `point' was not moved outside of the restriction
-+after executing BODY.
-+
-+Example: 
-+
-+  (progn (goto-line 1000)
-+         (narrow-to-page) 
-+         (save-restriction-if-possible (widen) (goto-line 999)))
-+
-+  In this case, the buffer is narrowed to the current page, and
-+  point is on line 999.
-+
-+  (progn (goto-char 1000)
-+         (narrow-to-page) 
-+         (save-restriction-if-possible (widen) (goto-line 1)))
-+
-+  Whereas in this case, the buffer is widened and point is on
-+  line 1."
-+  (let ((gcfg (gensym "NARROWING-CFG+"))
-+        (gbeg (gensym "OLDBEG+"))
-+        (gend (gensym "OLDEND+")))
-+    `(let ((,gcfg (current-slime-narrowing-configuration)))
-+       (unwind-protect (progn ,@body)
-+         (let ((,gbeg (slime-narrowing-configuration.beg ,gcfg))
-+               (,gend (slime-narrowing-configuration.end ,gcfg)))
-+           (when (and (>= (point) ,gbeg) (<= (point) ,gend))
-+             (set-slime-narrowing-configuration ,gcfg)))))))
-+
-+(put 'save-restriction-if-possible 'lisp-indent-function 0)
-+
- (defun slime-goto-location-position (position)
-   (save-restriction-if-possible         ; try to keep restriction if possible.
-     (widen)
-@@ -11128,39 +11161,6 @@
-           (total (buffer-size)))
-       (or (/= beg 1) (/= end (1+ total))))))
- 
--(defmacro save-restriction-if-possible (&rest body)
--  "Very similiarly to `save-restriction'. The only difference is
--that it's not enforcing the restriction as strictly: It's only
--enforced if `point' was not moved outside of the restriction
--after executing BODY.
--
--Example: 
--
--  (progn (goto-line 1000)
--         (narrow-to-page) 
--         (save-restriction-if-possible (widen) (goto-line 999)))
--
--  In this case, the buffer is narrowed to the current page, and
--  point is on line 999.
--
--  (progn (goto-char 1000)
--         (narrow-to-page) 
--         (save-restriction-if-possible (widen) (goto-line 1)))
--
--  Whereas in this case, the buffer is widened and point is on
--  line 1."
--  (let ((gcfg (gensym "NARROWING-CFG+"))
--        (gbeg (gensym "OLDBEG+"))
--        (gend (gensym "OLDEND+")))
--    `(let ((,gcfg (current-slime-narrowing-configuration)))
--       (unwind-protect (progn ,@body)
--         (let ((,gbeg (slime-narrowing-configuration.beg ,gcfg))
--               (,gbeg (slime-narrowing-configuration.end ,gcfg)))
--           (when (and (>= (point) ,gbeg) (<= (point) ,gend))
--             (set-slime-current-narrowing-configuration ,gcfg)))))))
--
--(put 'save-restriction-if-possible 'lisp-indent-function 0)
--
- ;;;;; Common Lisp-style package-qualified symbols
- 
- (defun slime-cl-symbol-name (symbol)
diff --git a/app-emacs/slime/files/2.0_p20070816/swank.asd b/app-emacs/slime/files/2.0_p20070816/swank.asd
deleted file mode 100644
index 35c64b9ee2fb..000000000000
--- a/app-emacs/slime/files/2.0_p20070816/swank.asd
+++ /dev/null
@@ -1,63 +0,0 @@
-;;; -*- mode: lisp; syntax: common-lisp; package: common-lisp -*-
-
-(defpackage #:swank-system
-  (:use #:common-lisp #:asdf))
-
-(defpackage #:swank-loader
-  (:use #:common-lisp)
-  (:export #:*source-directory*))
-
-(in-package #:swank-system)
-
-(defun load-user-init-file ()
-  "Load the user init file, return NIL if it does not exist."
-  (load (merge-pathnames (user-homedir-pathname)
-			 (make-pathname :name ".swank" :type "lisp"))
-	:if-does-not-exist nil))
-
-(defun load-site-init-file ()
-  (load (make-pathname :name "site-init" :type "lisp"
-                       :defaults *load-truename*)
-        :if-does-not-exist nil))
-
-(defmacro define-swank-system (sysdep-files)
-  `(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-files)
-                    (:file "swank"))
-       :depends-on (#+sbcl sb-bsd-sockets)
-       :perform (load-op :after (op swank)
-                  (load-site-init-file)
-                  (load-user-init-file))))
-
-#+(or cmu scl sbcl openmcl lispworks allegro clisp armedbear cormanlisp ecl)
-(define-swank-system
-  #+cmu (swank-source-path-parser swank-source-file-cache swank-cmucl)
-  #+scl (swank-source-path-parser swank-source-file-cache swank-scl)
-  #+sbcl (swank-source-path-parser swank-source-file-cache swank-sbcl swank-gray)
-  #+openmcl (metering swank-openmcl swank-gray)
-  #+lispworks (swank-lispworks swank-gray)
-  #+allegro (swank-allegro swank-gray)
-  #+clisp (xref metering swank-clisp swank-gray)
-  #+armedbear (swank-abcl)
-  #+cormanlisp (swank-corman swank-gray)
-  #+ecl (swank-source-path-parser swank-source-file-cache swank-ecl swank-gray))
-
-#-(or cmu scl sbcl openmcl lispworks allegro clisp armedbear cormanlisp ecl)
-(error "Your CL implementation is not supported !")
-
-(in-package #:swank-loader)
-
-(defparameter *source-directory*
-  (asdf:component-pathname (asdf:find-system :swank)))
-
-;; (funcall (intern (string :warn-unimplemented-interfaces) :swank-backend))
-
-;; swank.asd ends here
diff --git a/app-emacs/slime/slime-2.0_p20070816-r3.ebuild b/app-emacs/slime/slime-2.0_p20070816-r3.ebuild
deleted file mode 100644
index 8597dde6605f..000000000000
--- a/app-emacs/slime/slime-2.0_p20070816-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20070816-r3.ebuild,v 1.5 2008/08/27 08:41:25 ulm Exp $
-
-inherit common-lisp elisp eutils
-
-DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
-HOMEPAGE="http://common-lisp.net/project/slime/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2 xref.lisp"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="virtual/commonlisp dev-lisp/cl-asdf"
-DEPEND="${RDEPEND}
-	doc? ( virtual/texi2dvi )"
-
-CLPACKAGE=swank
-SITEFILE=70${PN}-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}/changelog-date.patch
-	epatch "${FILESDIR}"/${PV}/save-restriction-if-possible.patch
-
-	# extract date of last update from ChangeLog, bug 233270
-	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
-	[ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
-
-	sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp \
-		|| die "sed swank.lisp failed"
-	sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el \
-		|| die "sed slime.el failed"
-}
-
-src_compile() {
-	elisp-compile *.el || die "elisp-compile failed"
-	emake -j1 -C doc slime.info || die "emake slime.info failed"
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts \
-			emake -j1 -C doc slime.{ps,pdf} || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	elisp-install ${PN} *.el{,c} "${FILESDIR}"/swank-loader.lisp \
-		|| die "Cannot install SLIME core"
-	elisp-site-file-install "${FILESDIR}"/${PV}/${SITEFILE} \
-		|| die "elisp-site-file-install failed"
-	insinto "${CLSOURCEROOT%/}"/swank
-	doins *.lisp "${FILESDIR}"/${PV}/swank.asd
-	dodir "${CLSYSTEMROOT}"
-	dosym "${CLSOURCEROOT%/}"/swank/swank.asd "${CLSYSTEMROOT}"
-	dosym "${SITELISP}"/${PN}/swank-version.el "${CLSOURCEROOT%/}"/swank
-
-	dodoc README* ChangeLog HACKING NEWS PROBLEMS || die "dodoc failed"
-	doinfo doc/slime.info
-	if use doc; then
-		dodoc doc/slime.{ps,pdf} || die "dodoc failed"
-	fi
-}