Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

5 files changed, 77 insertions, 5 deletions

diff --git a/app-emacs/tramp/ChangeLog b/app-emacs/tramp/ChangeLog
index fdebe0d00c86..df957319671a 100644
--- a/app-emacs/tramp/ChangeLog
+++ b/app-emacs/tramp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/tramp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/ChangeLog,v 1.91 2010/01/31 15:30:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/ChangeLog,v 1.92 2010/03/15 21:22:56 ulm Exp $
+
+*tramp-2.1.18 (15 Mar 2010)
+
+  15 Mar 2010; Ulrich Mueller <ulm@gentoo.org> +tramp-2.1.18.ebuild,
+  +files/tramp-2.1.18-fix-texinfo.patch:
+  Version bump.
 
   31 Jan 2010; Raúl Porcel <armin76@gentoo.org> tramp-2.1.17.ebuild:
   alpha/sparc stable wrt #301301
diff --git a/app-emacs/tramp/Manifest b/app-emacs/tramp/Manifest
index e38ec9a7218d..15483daff080 100644
--- a/app-emacs/tramp/Manifest
+++ b/app-emacs/tramp/Manifest
@@ -1,11 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50tramp-gentoo.el 202 RMD160 27c01cec081714c3185e9d9eddbbf4d726a49b60 SHA1 75db9806e768521e3c98e5353563bb9b40035965 SHA256 52cd06c2e9b07e84d26c0199c596331af732b523f7c6064ff07f99a07a1ffcae
 AUX 51tramp-gentoo.el 238 RMD160 638f1c965c45bb4409850a204e0ba4ebb7b3a199 SHA1 7b40325ed2573d9e06c5e1aec54117277e35f07d SHA256 76a0f36c84f56c899d0085c48dff791d25296fe3e915f28a7b772462c5e81577
 AUX tramp-2.0.56-configure.patch 1218 RMD160 a5beb9ec8bbc116788b0ca2159f51ad16efefaf4 SHA1 f1b1e4cd9cb85c0ad424024fdf5c3f58079b879c SHA256 289a26fbb79449965ca4b4b73cc3bd412ee6b736ae3cf563282ae376a9fc7077
+AUX tramp-2.1.18-fix-texinfo.patch 324 RMD160 ea6fc88ee2636b6bc2c1c8f1347951ee26377f49 SHA1 58b64fe6924dd788b59c9be3ac546a9a404c74f1 SHA256 89dae109a0ec2ea6f98ec577311d3d822a876ac657acc2a57abe00cf05ebe1bd
 DIST tramp-2.0.56.tar.gz 290941 RMD160 d081d018f532cbe4353147989646fb714b6eb625 SHA1 726a69309d832cec5d7a16c48dd2e69c477afe7e SHA256 c70cae3992bababf6270842360da7786b2aa5224f481bad578f1b3a156e5fd1e
 DIST tramp-2.1.16.tar.gz 413988 RMD160 7e9cff7a2501edd3b0925325e4daa02766153a6d SHA1 f203aeb52d647d05e78f16cb3609feb1ee7936ec SHA256 2c12a7c0c091a2c1e70146c34a9d2b16593c3f7afd26ac79d533be9545761a7d
 DIST tramp-2.1.17.tar.gz 437697 RMD160 516994015236e55837865c39ee4388114799e482 SHA1 62c9ad42e6b58f84e0cbfb177f4ca8dbe27d8b0d SHA256 5cd19491b40e9b7ad5b2cf6e693fd79c91a38e31eff70d45fa8958d9afc22561
+DIST tramp-2.1.18.tar.gz 444921 RMD160 d60fc3234576d8dc6320988d30e32526ff1b2a5c SHA1 106659962f3016816b8ffdcc2dcf8813df8517df SHA256 c93e3fce3a565f8cb356789e335378dceb0244e381e938c0a2a0c2833a2a67bc
 EBUILD tramp-2.0.56.ebuild 1224 RMD160 78dd650a97a13cc078c5827d6da438d05c3055a8 SHA1 ac1bd12c7a106196ad0c200be7d431959259a4ef SHA256 a19b8217af5aa54940e176551931998b26b961dac2d248f4be9fdd0a3c9901ae
 EBUILD tramp-2.1.16.ebuild 1160 RMD160 2c61f600a357a593e1264059ee1c64ca553e7a7f SHA1 20bc3f9aaadccc55e340147e1f4374f55765ae07 SHA256 f3a33f7a64aa52658f4c8ca410e06548dfca33c922ea95c2542acdd88f2fb91b
-EBUILD tramp-2.1.17.ebuild 1102 RMD160 e54d4e65fe4ca8dc1caf08d07ae77589af72fbc4 SHA1 9fe76b912c771e730efd44796bb7c0ee369407d6 SHA256 2161bc78bd42cc265ef9176425da0e5ee31d5d80a2554bea602118aec287e68c
-MISC ChangeLog 12763 RMD160 a6896dbd1df2422f8a39f70c02c815970163a03f SHA1 bd93459c47f4c35e06042cf5faa00457aee1d227 SHA256 2e4116cdc492ec94a25624b2a9fbb47b179cca5c18bfa17cadfecc59c5a8bd85
+EBUILD tramp-2.1.17.ebuild 1091 RMD160 54cb37ea43045e6f7baae6a8f5aa44864c5ef968 SHA1 12f3248a02c24d10051b18f6129b15b69c4a8133 SHA256 b47f54f0d64e883dd43e8ffd20fbe370e85f4d2d4d0556aa3b322131c5bdcdfd
+EBUILD tramp-2.1.18.ebuild 1134 RMD160 913d1283b7b16616768c0f0a57fa5f6cd61aab4a SHA1 eb239af05d7bee46157b52f15e51b1c12a247882 SHA256 3e4892659860b65cdd8fdd8009e47d53f86405397cd72ca8325ba20ab1b41f1f
+MISC ChangeLog 12915 RMD160 4ecd00f0e230eed232f85b4e193679033b41090f SHA1 ba496d5afd4e5a4fa2163bccc7b9c93568cd8ac6 SHA256 c317da1c28a8873e945b79b12bbf11120cc34707c6a6a734b808d80120e0733d
 MISC metadata.xml 451 RMD160 71e28c48af6ba4463496e89907df9629e4c7a47f SHA1 0984d540c0d2e6b2cd689050e5391db21e776450 SHA256 b07ccdfcaa084b9a03050ebb0c8fe83c71ecf2509f3b73e05135135f412cb410
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuepVsACgkQOeoy/oIi7uxsiwCgyDAaVW0nDNvEJ6eDPuDp8t6w
+0QQAniEnTqiENFiLhd4Zlv1bv/DpTr3u
+=mpOc
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/tramp/files/tramp-2.1.18-fix-texinfo.patch b/app-emacs/tramp/files/tramp-2.1.18-fix-texinfo.patch
new file mode 100644
index 000000000000..86cef32c6ce0
--- /dev/null
+++ b/app-emacs/tramp/files/tramp-2.1.18-fix-texinfo.patch
@@ -0,0 +1,11 @@
+--- tramp-2.1.18-orig/texi/tramp.texi
++++ tramp-2.1.18/texi/tramp.texi
+@@ -3339,7 +3339,7 @@
+ 
+ @example
+ #!/bin/sh
+-emacsclient @trampfn{ssh, `whoami`, `hostname --fqdn`, $1}
++emacsclient @trampfn{ssh, $(whoami), $(hostname --fqdn), $1}
+ @end example
+ 
+ Then you must set the environment variable @code{EDITOR} pointing to
diff --git a/app-emacs/tramp/tramp-2.1.17.ebuild b/app-emacs/tramp/tramp-2.1.17.ebuild
index d5f80cdefe2a..2c59b59dd868 100644
--- a/app-emacs/tramp/tramp-2.1.17.ebuild
+++ b/app-emacs/tramp/tramp-2.1.17.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/tramp-2.1.17.ebuild,v 1.5 2010/01/31 15:30:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/tramp-2.1.17.ebuild,v 1.6 2010/03/15 21:22:56 ulm Exp $
 
-inherit elisp eutils
+inherit elisp
 
 DESCRIPTION="Edit remote files like ange-ftp but with rlogin, telnet and/or ssh"
 HOMEPAGE="http://www.gnu.org/software/tramp/"
diff --git a/app-emacs/tramp/tramp-2.1.18.ebuild b/app-emacs/tramp/tramp-2.1.18.ebuild
new file mode 100644
index 000000000000..d6e964084b82
--- /dev/null
+++ b/app-emacs/tramp/tramp-2.1.18.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tramp/tramp-2.1.18.ebuild,v 1.1 2010/03/15 21:22:56 ulm Exp $
+
+inherit elisp
+
+DESCRIPTION="Edit remote files like ange-ftp but with rlogin, telnet and/or ssh"
+HOMEPAGE="http://www.gnu.org/software/tramp/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+ELISP_PATCHES="${P}-fix-texinfo.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	econf
+	emake || die "emake failed"
+	elisp-make-autoload-file lisp/${PN}-autoloads.el lisp || die
+}
+
+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
+}