Version bump, bug 256752. Patches and swank.asd moved to mirrors.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

13 files changed, 134 insertions, 460 deletions

diff --git a/app-emacs/slime/ChangeLog b/app-emacs/slime/ChangeLog
index ea734072d77a..7f76be71cf7c 100644
--- a/app-emacs/slime/ChangeLog
+++ b/app-emacs/slime/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for app-emacs/slime
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.68 2010/02/03 19:24:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.69 2010/11/21 11:13:48 ulm Exp $
+
+*slime-2.0_p20101103 (21 Nov 2010)
+
+  21 Nov 2010; Ulrich Mueller <ulm@gentoo.org> slime-2.0_p20080731.ebuild,
+  slime-2.0_p20080731-r1.ebuild, +slime-2.0_p20101103.ebuild,
+  -files/2.0_p20080731/70slime-gentoo.el,
+  -files/2.0_p20080731/changelog-date.patch,
+  -files/2.0_p20080731/dont-call-init.patch,
+  -files/2.0_p20080731/fix-ecl.patch,
+  -files/2.0_p20080731/fix-slime-indentation.patch,
+  -files/2.0_p20080731/fix-swank-listener-hooks-contrib.patch,
+  -files/2.0_p20080731/inspect-presentations.patch,
+  -files/2.0_p20080731/module-load-gentoo.patch,
+  -files/2.0_p20080731/swank.asd, +files/70slime-gentoo.el:
+  Version bump, bug 256752. Thanks to Stelian Ionescu <sionescu@cddr.org>.
+  Patches and swank.asd moved to mirrors.
 
 *slime-2.0_p20080731-r1 (03 Feb 2010)
 
diff --git a/app-emacs/slime/files/2.0_p20080731/changelog-date.patch b/app-emacs/slime/files/2.0_p20080731/changelog-date.patch
deleted file mode 100644
index 8b70c017e523..000000000000
--- a/app-emacs/slime/files/2.0_p20080731/changelog-date.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- slime-2.0_p20080731-old/slime.el	2008-08-01 15:48:07.000000000 +0200
-+++ slime-2.0_p20080731/slime.el	2008-08-01 15:51:15.000000000 +0200
-@@ -97,13 +97,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-literally 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_p20080731/dont-call-init.patch b/app-emacs/slime/files/2.0_p20080731/dont-call-init.patch
deleted file mode 100644
index 8f300474fc9b..000000000000
--- a/app-emacs/slime/files/2.0_p20080731/dont-call-init.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur slime.orig/slime.el slime/slime.el
---- slime.orig/slime.el	2008-02-18 14:16:13.000000000 +0100
-+++ slime/slime.el	2008-02-18 14:19:55.000000000 +0100
-@@ -1432,7 +1432,6 @@
-     (format "%S\n\n"
-             `(progn
-                (load ,(expand-file-name loader) :verbose t)
--               (funcall (read-from-string "swank-loader:init"))
-                (funcall (read-from-string "swank:start-server")
-                         ,port-filename
-                         :coding-system ,encoding)))))
-Only in slime: slime.el.~1.905.~
diff --git a/app-emacs/slime/files/2.0_p20080731/fix-ecl.patch b/app-emacs/slime/files/2.0_p20080731/fix-ecl.patch
deleted file mode 100644
index 42a0b24547e2..000000000000
--- a/app-emacs/slime/files/2.0_p20080731/fix-ecl.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/swank-ecl.lisp b/swank-ecl.lisp
-index 6d3786f..c6ddbd5 100644
---- a/swank-ecl.lisp
-+++ b/swank-ecl.lisp
-@@ -12,6 +12,7 @@
- 
- (defvar *tmp*)
- 
-+(eval-when (:compile-toplevel)
- (if (find-package :gray)
-   (import-from :gray *gray-stream-symbols* :swank-backend)
-   (import-from :ext *gray-stream-symbols* :swank-backend))
-@@ -21,12 +22,13 @@
-    :eql-specializer-object
-    :generic-function-declarations
-    :specializer-direct-methods
--   :compute-applicable-methods-using-classes))
-+   :compute-applicable-methods-using-classes)))
- 
- 
- ;;;; TCP Server
- 
--(require 'sockets)
-+(eval-when (:compile-toplevel :load-toplevel :execute)
-+  (require 'sockets))
- 
- (defun resolve-hostname (name)
-   (car (sb-bsd-sockets:host-ent-addresses
-@@ -206,23 +208,24 @@
- 
- ;;; Debugging
- 
--(import
-- '(si::*break-env*
--   si::*ihs-top*
--   si::*ihs-current*
--   si::*ihs-base*
--   si::*frs-base*
--   si::*frs-top*
--   si::*tpl-commands*
--   si::*tpl-level*
--   si::frs-top
--   si::ihs-top
--   si::ihs-fun
--   si::ihs-env
--   si::sch-frs-base
--   si::set-break-env
--   si::set-current-ihs
--   si::tpl-commands))
-+(eval-when (:compile-toplevel)
-+  (import
-+   '(si::*break-env*
-+     si::*ihs-top*
-+     si::*ihs-current*
-+     si::*ihs-base*
-+     si::*frs-base*
-+     si::*frs-top*
-+     si::*tpl-commands*
-+     si::*tpl-level*
-+     si::frs-top
-+     si::ihs-top
-+     si::ihs-fun
-+     si::ihs-env
-+     si::sch-frs-base
-+     si::set-break-env
-+     si::set-current-ihs
-+     si::tpl-commands)))
- 
- (defvar *backtrace* '())
- 
-@@ -230,10 +233,10 @@
-   (and
-    (symbolp x)
-    (member (symbol-package x)
--           (list #.(find-package :swank)
--                 #.(find-package :swank-backend)
--                 #.(ignore-errors (find-package :swank-mop))
--                 #.(ignore-errors (find-package :swank-loader))))
-+           (list (find-package :swank)
-+                 (find-package :swank-backend)
-+                 (ignore-errors (find-package :swank-mop))
-+                 (ignore-errors (find-package :swank-loader))))
-    t))
- 
- (defun is-swank-source-p (name)
-diff --git a/swank.lisp b/swank.lisp
-index 8c6ef3a..38479ea 100644
---- a/swank.lisp
-+++ b/swank.lisp
-@@ -1419,7 +1419,7 @@ converted to lower case."
-                   (process-form-for-emacs (cdr form))))
-     (character (format nil "?~C" form))
-     (symbol (concatenate 'string (when (eq (symbol-package form)
--                                           #.(find-package "KEYWORD"))
-+                                           (find-package "KEYWORD"))
-                                    ":")
-                          (string-downcase (symbol-name form))))
-     (number (let ((*print-base* 10))
diff --git a/app-emacs/slime/files/2.0_p20080731/fix-slime-indentation.patch b/app-emacs/slime/files/2.0_p20080731/fix-slime-indentation.patch
deleted file mode 100644
index f66d5777fb00..000000000000
--- a/app-emacs/slime/files/2.0_p20080731/fix-slime-indentation.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/contrib/slime-indentation.el b/contrib/slime-indentation.el
-index d30478c..9cdc817 100644
---- a/contrib/slime-indentation.el
-+++ b/contrib/slime-indentation.el
-@@ -1031,27 +1031,27 @@ stored."
- 
- (mapcar #'define-cl-indent
- 	'((block 1)
--	  (case		(4 &rest (&whole 2 &rest 3)))
-+	  (case		(4 &rest (&whole 2 &rest 1)))
- 	  (ccase . case) (ecase . case)
- 	  (typecase . case) (etypecase . case) (ctypecase . case)
--	  (handler-bind . let)
--	  (handler-case (4 &rest (&whole 2 4 &rest 2)))
- 	  (catch 1)
- 	  (cond		cl-indent:indent-cond)
- 	  (defvar	(4 2 2))
--	  (defconstant . defvar) (defparameter . defvar)
--	  (defclass	(6 6 (&whole 2 &rest 1) &rest 2))
--	  (define-modify-macro
--			(4 &body))
-+	  (defconstant . defvar)
-+      (defparameter . defvar)
-+	  (defclass	(6 4 (&whole 2 &rest 1) &rest 2 &rest 1)) (define-condition  . defclass)
-+      (define-modify-macro (4 (&whole 4 &rest 1) &body))
- 	  (defsetf	(4 (&whole 4 &rest 1) 4 &body))
- 	  (defun	(4 (&whole 4 &rest 1) &body))
--	  (defmacro . defun) (define-setf-method . defun) (deftype . defun)
-+      (define-setf-method . defun)
-+      (define-setf-expander . defun)
-+      (defmacro . defun) (deftype . defun)
-           (defgeneric   cl-indent:indent-defgeneric)
- 	  (defmethod	cl-indent:indent-defmethod)
-+      (defpackage  (4 2))
- 	  (defstruct	((&whole 4 &rest (&whole 2 &rest 1))
- 			 &rest (&whole 2 &rest 1)))
--	  (destructuring-bind
--			((&whole 6 &rest 1) 4 &body))
-+	  (destructuring-bind ((&whole 6 &rest 1) 4 &body))
- 	  (do		((&whole 4 &rest (&whole 1 &rest 2)) ; ((arg step incr))
- 			 (&whole 4 &rest 3) ; result: ((condition) (form) ...)
- 			 &rest cl-indent:indent-do))
-@@ -1062,27 +1062,26 @@ stored."
- 	  (dolist	((&whole 4 2 1) &body))
- 	  (dotimes . dolist)
- 	  (eval-when 1)
--	  (flet		((&whole 4 &rest (&whole 1 (&whole 4 &rest 1) &body))
--			 &body))
-+	  (flet		((&whole 4 &rest (&whole 1 (&whole 4 &rest 1) &body)) &body))
- 	  (labels . flet) (macrolet . flet)
--	  (if		(&rest 2))
-+	  (handler-case (4 &rest (&whole 2 4 &rest 2)))
-+	  (if		(&rest 4))
- 	  ;; FIXME: Which of those do I really want?
- 	  ;; (lambda	((&whole 4 &rest 1) &body))
--	  (lambda	((&whole 4 &rest 1)
--			 &rest cl-indent:indent-function-lambda-hack))
-+	  (lambda	((&whole 4 &rest 1) &rest cl-indent:indent-function-lambda-hack))
- 	  (let		((&whole 4 &rest (&whole 1 1 2)) &body))
- 	  (let* . let) (compiler-let . let)
-+      (handler-bind . let) (restart-bind . let)
- 	  (locally 1)
- 	  (loop cl-indent::indent-loop-macro)
--	  (multiple-value-bind
--			((&whole 6 &rest 1) 4 &body))
--	  (multiple-value-call
--			(4 &body))
-+      (:method ((&whole 4 &rest 1) &body)) ; in `defgeneric'
-+	  (multiple-value-bind ((&whole 6 &rest 1) 4 &body))
-+	  (multiple-value-call (4 &body))
- 	  (multiple-value-list 1)
- 	  (multiple-value-prog1 1)
--	  (multiple-value-setq
--			(4 2))
--	  (print-unreadable-object 1)
-+	  (multiple-value-setq (4 2))
-+      (multiple-value-setf . multiple-value-setq)
-+      (print-unreadable-object ((&whole 4 1 &rest 1) &body))
- 	  ;; Combines the worst features of BLOCK, LET and TAGBODY
- 	  (prog		((&whole 4 &rest 1) &rest cl-indent:indent-tagbody))
- 	  (prog* . prog)
-@@ -1093,14 +1092,15 @@ stored."
-           (restart-case . handler-case)
- 	  (return 0)
- 	  (return-from	(nil &body))
-+      (symbol-macrolet . let)
- 	  (tagbody	cl-indent:indent-tagbody)
- 	  (throw 1)
- 	  (unless 1)
--	  (unwind-protect
--			(5 &body))
-+	  (unwind-protect (5 &body))
- 	  (values 0)
- 	  (when 1)
--          (with-accessors (6 4 &body))
-+      (with-accessors . multiple-value-bind)
-+      (with-condition-restarts . multiple-value-bind)
-           (with-compilation-unit (4 &body))
-           (with-hash-table-iterator (4 &body))
-           (with-output-to-string (4 &body))
-@@ -1109,7 +1109,8 @@ stored."
-           (with-open-stream . with-open-file)
-           (with-package-iterator (4 &body))
-           (with-simple-restart (4 &body))
--          (with-slots (6 4 &body))))
-+      (with-slots . multiple-value-bind)
-+      (with-standard-io-syntax (2))))
- 
- ;; OK, we're almost finished.
- ;;
diff --git a/app-emacs/slime/files/2.0_p20080731/fix-swank-listener-hooks-contrib.patch b/app-emacs/slime/files/2.0_p20080731/fix-swank-listener-hooks-contrib.patch
deleted file mode 100644
index 1e4d4281f85f..000000000000
--- a/app-emacs/slime/files/2.0_p20080731/fix-swank-listener-hooks-contrib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/contrib/swank-listener-hooks.lisp b/contrib/swank-listener-hooks.lisp
-index 64dd7cb..81e6eff 100644
---- a/contrib/swank-listener-hooks.lisp
-+++ b/contrib/swank-listener-hooks.lisp
-@@ -5,6 +5,8 @@
- ;; I guess that only Alan Ruttenberg knows how to use this code.  It
- ;; was in swank.lisp for a long time, so here it is. -- Helmut Eller
- 
-+(in-package :swank)
-+
- (defvar *slime-repl-advance-history* nil 
-   "In the dynamic scope of a single form typed at the repl, is set to nil to 
-    prevent the repl from advancing the history - * ** *** etc.")
diff --git a/app-emacs/slime/files/2.0_p20080731/inspect-presentations.patch b/app-emacs/slime/files/2.0_p20080731/inspect-presentations.patch
deleted file mode 100644
index 2a1cfae16545..000000000000
--- a/app-emacs/slime/files/2.0_p20080731/inspect-presentations.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur slime.old/contrib/slime-presentations.el slime/contrib/slime-presentations.el
---- slime.old/contrib/slime-presentations.el	2007-10-28 22:21:39.000000000 +0100
-+++ slime/contrib/slime-presentations.el	2007-10-28 22:22:31.000000000 +0100
-@@ -44,6 +44,15 @@
- (make-variable-buffer-local
-  (defvar slime-presentation-start-to-point (make-hash-table)))
- 
-+(setq slime-inspector-value-provider
-+      (lambda ()
-+        (multiple-value-bind (presentation start end)
-+            (slime-presentation-around-point (point))
-+          (when presentation
-+            ;; Point is within a presentation, so don't prompt, just 
-+            ;; inspect the presented object; don't play DWIM.
-+            (slime-presentation-expression presentation)))))
-+
- (defun slime-mark-presentation-start (id &optional target)
-   "Mark the beginning of a presentation with the given ID.
- TARGET can be nil (regular process output) or :repl-result."
-diff -Naur slime.old/slime.el slime/slime.el
---- slime.old/slime.el	2007-10-28 22:21:38.000000000 +0100
-+++ slime/slime.el	2007-10-28 22:22:31.000000000 +0100
-@@ -7454,11 +7454,15 @@
- (defvar slime-inspector-mark-stack '())
- (defvar slime-saved-window-config)
- 
-+(defvar slime-inspector-value-provider nil)
-+
- (defun slime-inspect (string)
-   "Eval an expression and inspect the result."
-   (interactive 
--   (list (slime-read-from-minibuffer "Inspect value (evaluated): "
--				     (slime-sexp-at-point))))
-+   (list (or (and slime-inspector-value-provider
-+                  (funcall slime-inspector-value-provider))
-+             (slime-read-from-minibuffer "Inspect value (evaluated): "
-+                                         (slime-sexp-at-point)))))
-   (slime-eval-async `(swank:init-inspector ,string) 'slime-open-inspector))
- 
- (define-derived-mode slime-inspector-mode fundamental-mode "Slime-Inspector"
diff --git a/app-emacs/slime/files/2.0_p20080731/module-load-gentoo.patch b/app-emacs/slime/files/2.0_p20080731/module-load-gentoo.patch
deleted file mode 100644
index e2b29c5a5456..000000000000
--- a/app-emacs/slime/files/2.0_p20080731/module-load-gentoo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/swank.lisp b/swank.lisp
-index 8c6ef3a..3ef640a 100644
---- a/swank.lisp
-+++ b/swank.lisp
-@@ -2270,10 +2270,13 @@ Record compiler notes signalled as `compiler-condition's."
-   "Load the module MODULE."
-   (dolist (module (if (listp modules) modules (list modules)))
-     (unless (member (string module) *modules* :test #'string=)
--      (require module (or filename (module-filename module)))))
-+      (let ((*load-print* nil)
-+            (*load-verbose* nil)
-+            #+cmu (ext:*gc-verbose* nil))
-+        (require module (or filename (module-filename module))))))
-   *modules*)
- 
--(defvar *find-module* 'find-module
-+(defvar *find-module* 'find-module-gentoo
-   "Pluggable function to locate modules.
- The function receives a module name as argument and should return
- the filename of the module (or nil if the file doesn't exist).")
-@@ -2303,6 +2306,21 @@ the filename of the module (or nil if the file doesn't exist).")
-     (some (lambda (dir) (some #'probe-file (module-canditates name dir)))
-           *load-path*)))
- 
-+(defun swank-fasl-pathname ()
-+  (make-pathname :name nil :type nil
-+                 :defaults (car (asdf:output-files
-+                                 (make-instance 'asdf:compile-op)
-+                                 (car (asdf:module-components
-+                                       (asdf:find-system :swank)))))))
-+
-+(defun append-dir (pathname dir)
-+  (make-pathname :directory (append (pathname-directory pathname) dir)))
-+
-+(defun find-module-gentoo (module)
-+  (or (let ((*load-path* (list (append-dir (swank-fasl-pathname) '("contrib"))
-+                               (append-dir swank-loader:*source-directory* '("contrib")))))
-+        (find-module module))
-+      (find-module module)))
- 
- ;;;; Macroexpansion
- 
diff --git a/app-emacs/slime/files/2.0_p20080731/swank.asd b/app-emacs/slime/files/2.0_p20080731/swank.asd
deleted file mode 100644
index 8285c6874915..000000000000
--- a/app-emacs/slime/files/2.0_p20080731/swank.asd
+++ /dev/null
@@ -1,78 +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))
-
-(defclass no-load-file (cl-source-file) ())
-
-(defmethod perform ((op load-op) (c no-load-file)) 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")
-                    (:module "contrib"
-                     :components ((:no-load-file "swank-arglists")
-                                  (:no-load-file "swank-asdf")
-                                  (:no-load-file "swank-c-p-c")
-                                  (:no-load-file "swank-fancy-inspector")
-                                  (:no-load-file "swank-fuzzy")
-                                  (:no-load-file "swank-indentation")
-                                  (:no-load-file "swank-listener-hooks")
-                                  (:no-load-file "swank-motd")
-                                  (:no-load-file "swank-presentations")
-                                  (:no-load-file "swank-presentation-streams"))))
-       :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/files/2.0_p20080731/70slime-gentoo.el b/app-emacs/slime/files/70slime-gentoo.el
index 6dfd505133e2..6dfd505133e2 100644
--- a/app-emacs/slime/files/2.0_p20080731/70slime-gentoo.el
+++ b/app-emacs/slime/files/70slime-gentoo.el
diff --git a/app-emacs/slime/slime-2.0_p20080731-r1.ebuild b/app-emacs/slime/slime-2.0_p20080731-r1.ebuild
index 7421ce5202eb..b45b37352a26 100644
--- a/app-emacs/slime/slime-2.0_p20080731-r1.ebuild
+++ b/app-emacs/slime/slime-2.0_p20080731-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20080731-r1.ebuild,v 1.2 2010/02/03 19:27:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20080731-r1.ebuild,v 1.3 2010/11/21 11:13:48 ulm Exp $
 
 EAPI=3
 
@@ -8,14 +8,16 @@ 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"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${P}-patches.tar.bz2"
 
 LICENSE="GPL-2 xref? ( xref.lisp )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc xref"
 
-RDEPEND="virtual/commonlisp dev-lisp/cl-asdf"
+RDEPEND="virtual/commonlisp
+	dev-lisp/cl-asdf"
 DEPEND="${RDEPEND}
 	doc? ( virtual/texi2dvi )"
 
@@ -23,64 +25,55 @@ CLPACKAGE=swank
 SITEFILE="70${PN}-gentoo.el"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}/module-load-gentoo.patch
-	epatch "${FILESDIR}"/${PV}/dont-call-init.patch
-	epatch "${FILESDIR}"/${PV}/inspect-presentations.patch
-	epatch "${FILESDIR}"/${PV}/fix-ecl.patch
-	epatch "${FILESDIR}"/${PV}/fix-swank-listener-hooks-contrib.patch
-	epatch "${FILESDIR}"/${PV}/fix-slime-indentation.patch
-	epatch "${FILESDIR}"/${PV}/changelog-date.patch
+	EPATCH_SUFFIX=patch epatch
+	mv "${WORKDIR}/swank.asd" "${S}" || die
 
 	# 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"
+	sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp || die
+	sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el || die
 
 	# Remove xref.lisp (which is non-free) unless USE flag is set
 	use xref || rm -f xref.lisp
 }
 
 src_compile() {
-	elisp-compile *.el || die "Cannot compile core Elisp files"
+	elisp-compile *.el || die
 	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
-		elisp-compile contrib/*.el || die "Cannot compile contrib Elisp files"
-	emake -j1 -C doc slime.info || die "Cannot build info docs"
+		elisp-compile contrib/*.el || die
+	emake -j1 -C doc slime.info || die
+
 	if use doc; then
-		VARTEXFONTS="${T}"/fonts \
-			emake -j1 -C doc slime.{ps,pdf} || die "emake doc failed"
+		VARTEXFONTS="${T}/fonts" emake -j1 -C doc slime.{ps,pdf} || die
 	fi
 }
 
 src_install() {
 	## install core
-	elisp-install ${PN} *.el{,c} "${FILESDIR}"/swank-loader.lisp \
-		|| die "Cannot install SLIME core"
-	sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}"/${PV}/${SITEFILE} \
-		>"${T}"/${SITEFILE} || die "sed failed"
-	elisp-site-file-install "${T}"/${SITEFILE} || die
-	cp "${FILESDIR}"/${PV}/swank.asd "${S}"
+	elisp-install ${PN} *.{el,elc} "${FILESDIR}/swank-loader.lisp" || die
+	sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}/${SITEFILE}" >"${T}/${SITEFILE}" \
+		|| die
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
 	# remove upstream swank-loader, since it won't be used
-	rm "${S}"/swank-loader.lisp
-	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
+	rm "${S}/swank-loader.lisp"
+
+	insinto "${CLSOURCEROOT%/}/swank"
+	doins *.lisp swank.asd || die
+	dodir "${CLSYSTEMROOT}" || die
+	dosym "${CLSOURCEROOT%/}/swank/swank.asd" "${CLSYSTEMROOT}" || die
 
 	## install contribs
-	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo} \
-		|| die "Cannot install contribs"
-	insinto "${CLSOURCEROOT%/}"/swank/contrib
-	doins contrib/*.lisp
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo} || die
+	insinto "${CLSOURCEROOT%/}/swank/contrib"
+	doins contrib/*.lisp || die
 
 	## install docs
+	doinfo doc/slime.info || die
 	dodoc README* ChangeLog HACKING NEWS PROBLEMS
 	newdoc contrib/README README.contrib
 	newdoc contrib/ChangeLog ChangeLog.contrib
-	doinfo doc/slime.info
 	use doc && dodoc doc/slime.{ps,pdf}
 }
diff --git a/app-emacs/slime/slime-2.0_p20080731.ebuild b/app-emacs/slime/slime-2.0_p20080731.ebuild
index eea2f0c6df0e..c29a2e154938 100644
--- a/app-emacs/slime/slime-2.0_p20080731.ebuild
+++ b/app-emacs/slime/slime-2.0_p20080731.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20080731.ebuild,v 1.6 2009/02/19 19:25:45 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20080731.ebuild,v 1.7 2010/11/21 11:13:48 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"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${P}-patches.tar.bz2"
 
 LICENSE="GPL-2 xref.lisp"
 SLOT="0"
@@ -24,13 +25,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PV}/module-load-gentoo.patch
-	epatch "${FILESDIR}"/${PV}/dont-call-init.patch
-	epatch "${FILESDIR}"/${PV}/inspect-presentations.patch
-	epatch "${FILESDIR}"/${PV}/fix-ecl.patch
-	epatch "${FILESDIR}"/${PV}/fix-swank-listener-hooks-contrib.patch
-	epatch "${FILESDIR}"/${PV}/fix-slime-indentation.patch
-	epatch "${FILESDIR}"/${PV}/changelog-date.patch
+	EPATCH_SUFFIX=patch epatch
+	mv "${WORKDIR}/swank.asd" "${S}" || die
 
 	# extract date of last update from ChangeLog, bug 233270
 	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
@@ -57,13 +53,12 @@ src_install() {
 	## install core
 	elisp-install ${PN} *.el{,c} "${FILESDIR}"/swank-loader.lisp \
 		|| die "Cannot install SLIME core"
-	elisp-site-file-install "${FILESDIR}"/${PV}/${SITEFILE} \
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE} \
 		|| die "elisp-site-file-install failed"
-	cp "${FILESDIR}"/${PV}/swank.asd "${S}"
 	# remove upstream swank-loader, since it won't be used
 	rm "${S}"/swank-loader.lisp
 	insinto "${CLSOURCEROOT%/}"/swank
-	doins *.lisp "${FILESDIR}"/${PV}/swank.asd
+	doins *.lisp swank.asd
 	dodir "${CLSYSTEMROOT}"
 	dosym "${CLSOURCEROOT%/}"/swank/swank.asd "${CLSYSTEMROOT}"
 	dosym "${SITELISP}"/${PN}/swank-version.el "${CLSOURCEROOT%/}"/swank
diff --git a/app-emacs/slime/slime-2.0_p20101103.ebuild b/app-emacs/slime/slime-2.0_p20101103.ebuild
new file mode 100644
index 000000000000..3a039091b560
--- /dev/null
+++ b/app-emacs/slime/slime-2.0_p20101103.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20101103.ebuild,v 1.1 2010/11/21 11:13:48 ulm Exp $
+
+EAPI=3
+
+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
+	mirror://gentoo/${P}-patches.tar.bz2"
+
+LICENSE="GPL-2 xref? ( xref.lisp )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc xref"
+
+RDEPEND="virtual/commonlisp
+	dev-lisp/cl-asdf"
+DEPEND="${RDEPEND}
+	doc? ( virtual/texi2dvi )"
+
+CLPACKAGE=swank
+SITEFILE="70${PN}-gentoo.el"
+
+src_prepare() {
+	EPATCH_SUFFIX=patch epatch
+	mv "${WORKDIR}/swank.asd" "${S}" || die
+
+	# 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 '/^section :=/d' doc/Makefile || die
+	sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp || die
+	sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el || die
+
+	# Remove xref.lisp (which is non-free) unless USE flag is set
+	use xref || rm -f xref.lisp
+}
+
+src_compile() {
+	elisp-compile *.el || die
+	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
+		elisp-compile contrib/*.el || die
+	emake -j1 -C doc slime.info || die
+
+	if use doc; then
+		VARTEXFONTS="${T}/fonts" emake -j1 -C doc slime.pdf || die
+	fi
+}
+
+src_install() {
+	## install core
+	elisp-install ${PN} *.{el,elc} "${FILESDIR}/swank-loader.lisp" || die
+	sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}/${SITEFILE}" >"${T}/${SITEFILE}" \
+		|| die
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	# remove upstream swank-loader, since it won't be used
+	rm "${S}/swank-loader.lisp"
+
+	insinto "${CLSOURCEROOT%/}/swank"
+	doins *.lisp swank.asd || die
+	dodir "${CLSYSTEMROOT}" || die
+	dosym "${CLSOURCEROOT%/}/swank/swank.asd" "${CLSYSTEMROOT}" || die
+
+	## install contribs
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo} || die
+	insinto "${CLSOURCEROOT%/}/swank/contrib"
+	doins contrib/*.lisp || die
+
+	## install docs
+	doinfo doc/slime.info || die
+	dodoc README* ChangeLog HACKING NEWS PROBLEMS
+	newdoc contrib/README README.contrib
+	newdoc contrib/ChangeLog ChangeLog.contrib
+	use doc && dodoc doc/slime.pdf
+}