Clean up.

(Portage version: 2.1.3.19)

10 files changed, 12 insertions, 388 deletions

diff --git a/app-emacs/tramp/ChangeLog b/app-emacs/tramp/ChangeLog
index 33359828295e..3610c3177c55 100644
--- a/app-emacs/tramp/ChangeLog
+++ b/app-emacs/tramp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/tramp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/ChangeLog,v 1.59 2007/11/09 19:54:15 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/ChangeLog,v 1.60 2007/11/09 20:04:45 ulm Exp $
+
+  09 Nov 2007; Ulrich Mueller <ulm@gentoo.org>
+  -files/tramp-2.1.10-copy-tree-gentoo.patch,
+  -files/tramp-2.1.10-fix-texinfo.patch,
+  -files/tramp-2.1.10-make-tramp-temp-file.patch, -tramp-2.1.10-r2.ebuild,
+  -tramp-2.1.11.ebuild, tramp-2.1.11-r1.ebuild:
+  Clean up.
 
   09 Nov 2007; nixnut <nixnut@gentoo.org> tramp-2.1.11-r1.ebuild:
   Stable on ppc wrt bug 198243
diff --git a/app-emacs/tramp/files/digest-tramp-2.1.10-r2 b/app-emacs/tramp/files/digest-tramp-2.1.10-r2
deleted file mode 100644
index 74633d4d732f..000000000000
--- a/app-emacs/tramp/files/digest-tramp-2.1.10-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 668acbb5365caabd9ee4abea10944c63 tramp-2.1.10.tar.gz 328846
-RMD160 208ecfec5b9b45efca5abb5bb85a99189f9cb504 tramp-2.1.10.tar.gz 328846
-SHA256 856c5b7c2b3681ca0cc1cc31fe5c4f7bd4be5922f32af5e612c9263ae11b44b9 tramp-2.1.10.tar.gz 328846
diff --git a/app-emacs/tramp/files/digest-tramp-2.1.11 b/app-emacs/tramp/files/digest-tramp-2.1.11
deleted file mode 100644
index e4fb155157cf..000000000000
--- a/app-emacs/tramp/files/digest-tramp-2.1.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 878d1297877535ef920901160508a25d tramp-2.1.11.tar.gz 329099
-RMD160 533c8a342df099d8c01c6be9946a03f64da476f7 tramp-2.1.11.tar.gz 329099
-SHA256 c501e3292a0b264002e2fb619cea133c96dd181d567c51c3c8c190c781f4efc1 tramp-2.1.11.tar.gz 329099
diff --git a/app-emacs/tramp/files/tramp-2.1.10-copy-tree-gentoo.patch b/app-emacs/tramp/files/tramp-2.1.10-copy-tree-gentoo.patch
deleted file mode 100644
index e0b69e32e635..000000000000
--- a/app-emacs/tramp/files/tramp-2.1.10-copy-tree-gentoo.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- tramp-2.1.10-orig/lisp/tramp.el	2007-07-22 18:25:32.000000000 +0200
-+++ tramp-2.1.10/lisp/tramp.el	2007-09-25 09:13:47.000000000 +0200
-@@ -195,6 +195,29 @@
-   (unless (fboundp 'set-buffer-multibyte)
-     (defalias 'set-buffer-multibyte 'ignore)))
- 
-+;; `copy-tree' is not defined in plain Emacs 21
-+(eval-and-compile
-+  (if (fboundp 'copy-tree)
-+      (fset 'tramp-copy-tree 'copy-tree)
-+    ;; Taken from subr.el of Emacs 22.1.
-+    (defun tramp-copy-tree (tree &optional vecp)
-+      "Make a copy of TREE."
-+      (if (consp tree)
-+	  (let (result)
-+	    (while (consp tree)
-+	      (let ((newcar (car tree)))
-+		(if (or (consp (car tree)) (and vecp (vectorp (car tree))))
-+		    (setq newcar (tramp-copy-tree (car tree) vecp)))
-+		(push newcar result))
-+	      (setq tree (cdr tree)))
-+	    (nconc (nreverse result) tree))
-+	(if (and vecp (vectorp tree))
-+	    (let ((i (length (setq tree (copy-sequence tree)))))
-+	      (while (>= (setq i (1- i)) 0)
-+		(aset tree i (tramp-copy-tree (aref tree i) vecp)))
-+	      tree)
-+	  tree)))))
-+
- ;;; User Customizable Internal Variables:
- 
- (defgroup tramp nil
-@@ -2687,7 +2710,7 @@
-   (when (file-directory-p directory)
-     (setq directory (expand-file-name directory))
-     (let* ((temp
--	    (copy-tree
-+	    (tramp-copy-tree
- 	     (with-parsed-tramp-file-name directory nil
- 	       (with-file-property
- 		   v localname
-@@ -5083,7 +5106,7 @@
- 
-   (with-current-buffer (tramp-get-connection-buffer vec)
-     (set (make-local-variable 'tramp-remote-path)
--	 (copy-tree tramp-remote-path))
-+	 (tramp-copy-tree tramp-remote-path))
-     (let* ((elt (memq 'tramp-default-remote-path tramp-remote-path))
- 	   (tramp-default-remote-path
- 	    (with-connection-property vec "default-remote-path"
diff --git a/app-emacs/tramp/files/tramp-2.1.10-fix-texinfo.patch b/app-emacs/tramp/files/tramp-2.1.10-fix-texinfo.patch
deleted file mode 100644
index ee4a99114a6b..000000000000
--- a/app-emacs/tramp/files/tramp-2.1.10-fix-texinfo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tramp-2.1.10.orig/texi/tramp.texi	2007-07-22 13:28:32.000000000 +0200
-+++ tramp-2.1.10/texi/tramp.texi	2007-08-18 00:01:24.000000000 +0200
-@@ -2030,8 +2030,8 @@
- @cindex filename examples
- 
- To access the file @var{localname} on the remote machine @var{machine}
--you would specify the filename @file{@trampfn{, , @var{machine},
--@var{localname}}}.  This will connect to @var{machine} and transfer
-+you would specify the filename @file{@trampfn{, , machine,
-+localname}}.  This will connect to @var{machine} and transfer
- the file using the default method.  @xref{Default Method}.
- 
- Some examples of @value{tramp} filenames are shown below.
-@@ -2067,7 +2067,7 @@
- part of the filename.
- 
- To log in to the remote machine as a specific user, you use the syntax
--@file{@trampfn{, @var{user}, @var{machine}, @var{path/to.file}}}.
-+@file{@trampfn{, user, machine, path/to.file}}.
- That means that connecting to @code{melancholia} as @code{daniel} and
- editing @file{.emacs} in your home directory you would specify
- @file{@trampfn{, daniel, melancholia, .emacs}}.
diff --git a/app-emacs/tramp/files/tramp-2.1.10-make-tramp-temp-file.patch b/app-emacs/tramp/files/tramp-2.1.10-make-tramp-temp-file.patch
deleted file mode 100644
index 3c6cc948a25f..000000000000
--- a/app-emacs/tramp/files/tramp-2.1.10-make-tramp-temp-file.patch
+++ /dev/null
@@ -1,216 +0,0 @@
---- tramp-2.1.10-orig/lisp/tramp-fish.el	2007-07-16 22:26:17.000000000 +0200
-+++ tramp-2.1.10/lisp/tramp-fish.el	2007-10-06 16:49:34.000000000 +0200
-@@ -753,8 +753,8 @@
-     (error "Implementation does not handle immediate return"))
- 
-   (with-parsed-tramp-file-name default-directory nil
--    (let ((temp-name-prefix (tramp-make-tramp-temp-file v))
--	  command input output stderr outbuf tmpfil ret)
-+    (let (command input tmpinput output tmpoutput stderr tmpstderr
-+		  outbuf tmpfil ret)
-       ;; Compute command.
-       (setq command (mapconcat 'tramp-shell-quote-argument
- 			       (cons program args) " "))
-@@ -766,15 +766,14 @@
- 	    ;; INFILE is on the same remote host.
- 	    (setq input (with-parsed-tramp-file-name infile nil localname))
- 	  ;; INFILE must be copied to remote host.
--	  (setq input (concat temp-name-prefix ".in"))
--	  (copy-file
--	   infile
--	   (tramp-make-tramp-file-name method user host input)
--	   t)))
-+	  (setq input (tramp-make-tramp-temp-file v)
-+		tmpinput (tramp-make-tramp-file-name method user host input))
-+	  (copy-file infile tmpinput t)))
-       (when input (setq command (format "%s <%s" command input)))
- 
-       ;; Determine output.
--      (setq output (concat temp-name-prefix ".out"))
-+      (setq output (tramp-make-tramp-temp-file v)
-+	    tmpoutput (tramp-make-tramp-file-name method user host output))
-       (cond
-        ;; Just a buffer
-        ((bufferp destination)
-@@ -800,7 +799,9 @@
- 			       (cadr destination) nil localname))
- 	    ;; stderr must be copied to remote host.  The temporary
- 	    ;; file must be deleted after execution.
--	    (setq stderr (concat temp-name-prefix ".err"))))
-+	    (setq stderr (tramp-make-tramp-temp-file v)
-+		  tmpstderr (tramp-make-tramp-file-name
-+			     method user host stderr))))
- 	 ;; stderr to be discarded
- 	 ((null (cadr destination))
- 	  (setq stderr "/dev/null"))))
-@@ -809,9 +810,6 @@
- 	(setq outbuf (current-buffer))))
-       (when stderr (setq command (format "%s 2>%s" command stderr)))
- 
--      ;; If we have a temporary file, it must be removed after operation.
--      (when (and input (string-match temp-name-prefix input))
--	(setq command (format "%s; rm %s" command input)))
-       ;; Goto working directory.
-       (unless
- 	  (tramp-fish-send-command-and-check
-@@ -839,16 +837,15 @@
- 	    ;; We should show the output anyway.
- 	    (when outbuf
- 	      (with-current-buffer outbuf (insert-file-contents tmpfil))
--	      (when display (display-buffer outbuf)))
--	    ;; Remove output file.
--	    (delete-file (tramp-make-tramp-file-name method user host output)))
-+	      (when display (display-buffer outbuf))))
- 	;; When the user did interrupt, we should do it also.
- 	(error (setq ret 1)))
--      (unless ret
--	;; Provide error file.
--	(when (and stderr (string-match temp-name-prefix stderr))
--	  (rename-file (tramp-make-tramp-file-name method user host stderr)
--		       (cadr destination) t)))
-+
-+      ;; Provide error file.
-+      (when tmpstderr (rename-file tmpstderr (cadr destination) t))
-+      ;; Cleanup.
-+      (when tmpinput (delete-file tmpinput))
-+      (when tmpoutput (delete-file tmpoutput))
-       ;; Return exit status.
-       ret)))
- 
---- tramp-2.1.10-orig/lisp/tramp.el	2007-10-06 16:48:43.000000000 +0200
-+++ tramp-2.1.10/lisp/tramp.el	2007-10-06 16:49:34.000000000 +0200
-@@ -3069,7 +3069,7 @@
- 
-       ;; Compose copy command.
-       (setq spec `((?h . ,host) (?u . ,user) (?p . ,port)
--		   (?t . ,(tramp-make-tramp-temp-file v))
-+		   (?t . ,(tramp-make-tramp-temp-file v 'dont-create))
- 		   (?k . ,(if keep-date " " "")))
- 	    copy-program (tramp-get-method-parameter
- 			  method 'tramp-copy-program)
-@@ -3478,13 +3478,42 @@
- 			      (tramp-temporary-file-directory)))
-    (file-name-extension filename t)))
- 
--(defsubst tramp-make-tramp-temp-file (vec)
--  (format
--   "/tmp/%s%s"
--   tramp-temp-name-prefix
--   (if (get-buffer-process (tramp-get-connection-buffer vec))
--       (process-id (get-buffer-process (tramp-get-connection-buffer vec)))
--     (emacs-pid))))
-+(defsubst tramp-make-tramp-temp-file (vec &optional dont-create)
-+  "Create a temporary file on the remote host identified by VEC.
-+Return the local name of the temporary file.
-+If DONT-CREATE is non-nil, just the file name is returned without
-+creation of the temporary file.  This is not the preferred way to run,
-+but it is necessary during connection setup, because we cannot create
-+a remote file at this time.  This parameter shall NOT be set to
-+non-nil else."
-+  (if dont-create
-+      ;; It sounds a little bit stupid to create a LOCAL file name.
-+      ;; But we intend to use the remote directory "/tmp", and we have
-+      ;; no chance to check whether a temporary file exists already
-+      ;; remotely, because we have no working connection yet.
-+      (make-temp-name (expand-file-name tramp-temp-name-prefix "/tmp"))
-+
-+    (let ((prefix
-+	   (tramp-make-tramp-file-name
-+	    (tramp-file-name-method vec)
-+	    (tramp-file-name-user vec)
-+	    (tramp-file-name-host vec)
-+	    (expand-file-name tramp-temp-name-prefix "/tmp")))
-+	  result)
-+      (while (not result)
-+	;; `make-temp-file' would be the first choice for
-+	;; implementation.  But it calls `write-region' internally,
-+	;; which also needs a temporary file - we would end in an
-+	;; infinite loop.
-+	(setq result (make-temp-name prefix))
-+	(if (file-exists-p result)
-+	    (setq result nil)
-+	  ;; This creates the file by side effect.
-+	  (set-file-times result)
-+	  (set-file-modes result (tramp-octal-to-decimal "0700"))))
-+
-+      ;; Return the local part.
-+      (with-parsed-tramp-file-name result nil localname))))
- 
- (defun tramp-handle-executable-find (command)
-   "Like `executable-find' for Tramp files."
-@@ -3536,8 +3565,7 @@
-     (error "Implementation does not handle immediate return"))
- 
-   (with-parsed-tramp-file-name default-directory nil
--    (let ((temp-name-prefix (tramp-make-tramp-temp-file v))
--	  command input stderr outbuf ret)
-+    (let (command input tmpinput stderr tmpstderr outbuf ret)
-       ;; Compute command.
-       (setq command (mapconcat 'tramp-shell-quote-argument
- 			       (cons program args) " "))
-@@ -3549,11 +3577,9 @@
- 	    ;; INFILE is on the same remote host.
- 	    (setq input (with-parsed-tramp-file-name infile nil localname))
- 	  ;; INFILE must be copied to remote host.
--	  (setq input (concat temp-name-prefix ".in"))
--	  (copy-file
--	   infile
--	   (tramp-make-tramp-file-name method user host input)
--	   t)))
-+	  (setq input (tramp-make-tramp-temp-file v)
-+		tmpinput (tramp-make-tramp-file-name method user host input))
-+	  (copy-file infile tmpinput t)))
-       (when input (setq command (format "%s <%s" command input)))
- 
-       ;; Determine output.
-@@ -3582,7 +3608,9 @@
- 			       (cadr destination) nil localname))
- 	    ;; stderr must be copied to remote host.  The temporary
- 	    ;; file must be deleted after execution.
--	    (setq stderr (concat temp-name-prefix ".err"))))
-+	    (setq stderr (tramp-make-tramp-temp-file v)
-+		  tmpstderr (tramp-make-tramp-file-name
-+			     method user host stderr))))
- 	 ;; stderr to be discarded
- 	 ((null (cadr destination))
- 	  (setq stderr "/dev/null"))))
-@@ -3591,9 +3619,6 @@
- 	(setq outbuf (current-buffer))))
-       (when stderr (setq command (format "%s 2>%s" command stderr)))
- 
--      ;; If we have a temporary file, it must be removed after operation.
--      (when (and input (string-match temp-name-prefix input))
--	(setq command (format "%s; rm %s" command input)))
-       ;; Goto working directory.
-       (tramp-send-command
-        v (format "cd %s" (tramp-shell-quote-argument localname)))
-@@ -3610,13 +3635,13 @@
- 	(error
- 	 (kill-buffer (tramp-get-connection-buffer v))
- 	 (setq ret 1)))
--      (unless ret
--	;; Check return code.
--	(setq ret (tramp-send-command-and-check v nil))
--	;; Provide error file.
--	(when (and stderr (string-match temp-name-prefix stderr))
--	  (rename-file (tramp-make-tramp-file-name method user host stderr)
--		       (cadr destination) t)))
-+
-+      ;; Check return code.
-+      (unless ret (setq ret (tramp-send-command-and-check v nil)))
-+      ;; Provide error file.
-+      (when tmpstderr (rename-file tmpstderr (cadr destination) t))
-+      ;; Cleanup.
-+      (when tmpinput (delete-file tmpinput))
-       ;; Return exit status.
-       ret)))
- 
-@@ -6013,7 +6038,7 @@
- 	     l-user (or l-user "")
- 	     l-port (or l-port "")
- 	     spec `((?h . ,l-host) (?u . ,l-user) (?p . ,l-port)
--		    (?t . ,(tramp-make-tramp-temp-file vec)))
-+		    (?t . ,(tramp-make-tramp-temp-file vec 'dont-create)))
- 	     command
- 	     (concat
- 	      command " "
diff --git a/app-emacs/tramp/files/tramp-2.1.11-environment_fix.patch b/app-emacs/tramp/files/tramp-2.1.11-environment_fix.patch
index 4cd2017e3403..2296c53c638a 100644
--- a/app-emacs/tramp/files/tramp-2.1.11-environment_fix.patch
+++ b/app-emacs/tramp/files/tramp-2.1.11-environment_fix.patch
@@ -1,5 +1,5 @@
---- /var/tmp/portage/app-emacs/tramp-2.1.11/work/tramp-2.1.11/lisp/tramp.el	2007-10-10 06:28:46.000000000 +0200
-+++ /tmp/tramp.el	2007-10-30 18:50:14.000000000 +0100
+--- tramp-2.1.11-orig/lisp/tramp.el	2007-10-10 06:28:46.000000000 +0200
++++ tramp-2.1.11/lisp/tramp.el	2007-10-30 18:50:14.000000000 +0100
 @@ -6112,6 +6112,7 @@
        (when (and p (processp p))
  	(delete-process p))
diff --git a/app-emacs/tramp/tramp-2.1.10-r2.ebuild b/app-emacs/tramp/tramp-2.1.10-r2.ebuild
deleted file mode 100644
index f28db7b1c115..000000000000
--- a/app-emacs/tramp/tramp-2.1.10-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/tramp-2.1.10-r2.ebuild,v 1.5 2007/10/11 07:31:19 kingtaco Exp $
-
-inherit elisp eutils
-
-DESCRIPTION="Edit remote files like ange-ftp but with rlogin, telnet and/or ssh"
-HOMEPAGE="http://savannah.gnu.org/projects/tramp/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 FDL-1.2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE=""
-
-SITEFILE=51${PN}-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-fix-texinfo.patch"
-	epatch "${FILESDIR}/${P}-copy-tree-gentoo.patch"
-	epatch "${FILESDIR}/${P}-make-tramp-temp-file.patch"
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-	elisp-make-autoload-file lisp/${PN}-autoloads.el lisp \
-		|| die "elisp-make-autoload-file failed"
-}
-
-src_install() {
-	einstall lispdir="${D}${SITELISP}/tramp" || die
-
-	mv "${D}/usr/share/info/tramp" "${D}/usr/share/info/tramp-info"
-
-	dohtml texi/*.html
-	if [ -f texi/tramp.dvi ]; then
-		insinto /usr/share/doc/${PF}
-		doins texi/tramp.dvi
-	fi
-
-	elisp-install ${PN} lisp/${PN}-autoloads.el
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	dodoc README ChangeLog CONTRIBUTORS || die "dodoc failed"
-}
diff --git a/app-emacs/tramp/tramp-2.1.11-r1.ebuild b/app-emacs/tramp/tramp-2.1.11-r1.ebuild
index 9f82ae9b3ab9..a658d26bc926 100644
--- a/app-emacs/tramp/tramp-2.1.11-r1.ebuild
+++ b/app-emacs/tramp/tramp-2.1.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/tramp-2.1.11-r1.ebuild,v 1.4 2007/11/09 19:54:15 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/tramp-2.1.11-r1.ebuild,v 1.5 2007/11/09 20:04:45 ulm Exp $
 
 inherit elisp eutils
 
@@ -17,7 +17,7 @@ SITEFILE=51${PN}-gentoo.el
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}/lisp"
+	cd "${S}"
 	epatch "${FILESDIR}/${P}-environment_fix.patch"
 }
 
diff --git a/app-emacs/tramp/tramp-2.1.11.ebuild b/app-emacs/tramp/tramp-2.1.11.ebuild
deleted file mode 100644
index 565e6cc8243e..000000000000
--- a/app-emacs/tramp/tramp-2.1.11.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/tramp-2.1.11.ebuild,v 1.1 2007/10/10 17:30:05 ulm Exp $
-
-inherit elisp
-
-DESCRIPTION="Edit remote files like ange-ftp but with rlogin, telnet and/or ssh"
-HOMEPAGE="http://savannah.gnu.org/projects/tramp/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 FDL-1.2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-SITEFILE=51${PN}-gentoo.el
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-	elisp-make-autoload-file lisp/${PN}-autoloads.el lisp \
-		|| die "elisp-make-autoload-file failed"
-}
-
-src_install() {
-	einstall lispdir="${D}${SITELISP}/tramp" || die
-
-	mv "${D}"/usr/share/info/tramp{,.info}
-
-	dohtml texi/*.html
-	if [ -f texi/tramp.dvi ]; then
-		insinto /usr/share/doc/${PF}
-		doins texi/tramp.dvi
-	fi
-
-	elisp-install ${PN} lisp/${PN}-autoloads.el || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
-	dodoc README ChangeLog CONTRIBUTORS || die
-	newdoc lisp/ChangeLog ChangeLog-lisp || die
-	newdoc texi/ChangeLog ChangeLog-texi || die
-}