Version bump.

(Portage version: 2.1.3.6)

8 files changed, 101 insertions, 16 deletions

diff --git a/app-emacs/tramp/ChangeLog b/app-emacs/tramp/ChangeLog
index 91b0af0b0587..570757777324 100644
--- a/app-emacs/tramp/ChangeLog
+++ b/app-emacs/tramp/ChangeLog
@@ -1,6 +1,14 @@
 # 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.37 2007/04/20 04:36:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/ChangeLog,v 1.38 2007/08/17 22:15:40 ulm Exp $
+
+*tramp-2.1.10 (17 Aug 2007)
+*tramp-2.0.55 (17 Aug 2007)
+
+  17 Aug 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/tramp-2.1.10-fix-texinfo.patch, +tramp-2.0.55.ebuild,
+  -tramp-2.1.9.ebuild, tramp-2.1.9-r1.ebuild, +tramp-2.1.10.ebuild:
+  Version bump. Fix texinfo, backported from upstream CVS. Remove old revision.
 
   20 Apr 2007; Ulrich Mueller <ulm@gentoo.org> -tramp-2.1.2.ebuild:
   Removed old version.
diff --git a/app-emacs/tramp/files/digest-tramp-2.0.55 b/app-emacs/tramp/files/digest-tramp-2.0.55
new file mode 100644
index 000000000000..a625bca781f6
--- /dev/null
+++ b/app-emacs/tramp/files/digest-tramp-2.0.55
@@ -0,0 +1,3 @@
+MD5 1cdd4df4ee4c1f5841f344cb0728e95f tramp-2.0.55.tar.gz 275399
+RMD160 7be593604461b59c1a014ef5e5722822d34a1bf5 tramp-2.0.55.tar.gz 275399
+SHA256 22f0cdea36405626ed94e03c6122020fb6f333406b673649165bbf50c936217c tramp-2.0.55.tar.gz 275399
diff --git a/app-emacs/tramp/files/digest-tramp-2.1.10 b/app-emacs/tramp/files/digest-tramp-2.1.10
new file mode 100644
index 000000000000..74633d4d732f
--- /dev/null
+++ b/app-emacs/tramp/files/digest-tramp-2.1.10
@@ -0,0 +1,3 @@
+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.9 b/app-emacs/tramp/files/digest-tramp-2.1.9
deleted file mode 100644
index 899e96847b5d..000000000000
--- a/app-emacs/tramp/files/digest-tramp-2.1.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ffac6a58ba098685451579db6f15e318 tramp-2.1.9.tar.gz 327782
-RMD160 86027b1d91b3ca793489d5b57f7c887fb3e7918d tramp-2.1.9.tar.gz 327782
-SHA256 17c43ec8396b3adcbb36dd3129709ecc517a9fe5a61a4f2247c6626945452775 tramp-2.1.9.tar.gz 327782
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
new file mode 100644
index 000000000000..ee4a99114a6b
--- /dev/null
+++ b/app-emacs/tramp/files/tramp-2.1.10-fix-texinfo.patch
@@ -0,0 +1,22 @@
+--- 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/tramp-2.1.9.ebuild b/app-emacs/tramp/tramp-2.0.55.ebuild
index 28f5362fe53d..eec50bc528c4 100644
--- a/app-emacs/tramp/tramp-2.1.9.ebuild
+++ b/app-emacs/tramp/tramp-2.0.55.ebuild
@@ -1,23 +1,25 @@
 # 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.9.ebuild,v 1.1 2007/04/10 20:36:45 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/tramp-2.0.55.ebuild,v 1.1 2007/08/17 22:15:40 ulm Exp $
 
-inherit elisp eutils
+inherit elisp
 
-DESCRIPTION="edit remote files like ange-ftp but with rlogin, telnet and/or ssh"
+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-2 FDL-1.2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~x86 ~alpha ~amd64 ~ppc"
 IUSE=""
-SITEFILE=50tramp-gentoo.el
 
-# this is needed; elisp.eclass redefines src_compile() from portage default
+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() {
@@ -30,12 +32,13 @@ src_install() {
 	mv "${D}/usr/share/info/tramp" "${D}/usr/share/info/tramp-info"
 
 	dohtml texi/*.html
-	if [ -f texi/tramp.dvi ] ; then
+	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
+	dodoc README ChangeLog CONTRIBUTORS || die "dodoc failed"
 }
diff --git a/app-emacs/tramp/tramp-2.1.10.ebuild b/app-emacs/tramp/tramp-2.1.10.ebuild
new file mode 100644
index 000000000000..ace951b4f555
--- /dev/null
+++ b/app-emacs/tramp/tramp-2.1.10.ebuild
@@ -0,0 +1,49 @@
+# 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.ebuild,v 1.1 2007/08/17 22:15:40 ulm 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"
+}
+
+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() {
+	dodir /usr/share/info
+	dodir /usr/share/emacs/etc
+	dodir /usr/share/emacs/site-lisp/tramp
+
+	einstall lispdir="${D}/usr/share/emacs/site-lisp/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.9-r1.ebuild b/app-emacs/tramp/tramp-2.1.9-r1.ebuild
index 2be30c20a7f9..b4e1c8d87a6e 100644
--- a/app-emacs/tramp/tramp-2.1.9-r1.ebuild
+++ b/app-emacs/tramp/tramp-2.1.9-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.9-r1.ebuild,v 1.1 2007/04/16 18:41:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/tramp-2.1.9-r1.ebuild,v 1.2 2007/08/17 22:15:40 ulm Exp $
 
-inherit elisp eutils
+inherit elisp
 
 DESCRIPTION="Edit remote files like ange-ftp but with rlogin, telnet and/or ssh"
 HOMEPAGE="http://savannah.gnu.org/projects/tramp/"
@@ -32,7 +32,7 @@ src_install() {
 	mv "${D}/usr/share/info/tramp" "${D}/usr/share/info/tramp-info"
 
 	dohtml texi/*.html
-	if [ -f texi/tramp.dvi ] ; then
+	if [ -f texi/tramp.dvi ]; then
 		insinto /usr/share/doc/${PF}
 		doins texi/tramp.dvi
 	fi
@@ -40,5 +40,5 @@ src_install() {
 	elisp-install ${PN} lisp/${PN}-autoloads.el
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 
-	dodoc README ChangeLog CONTRIBUTORS
+	dodoc README ChangeLog CONTRIBUTORS || die "dodoc failed"
 }