Version bump with a patch to work with paramiko-1.6 a bit better.

Package-Manager: portage-2.1_rc1-r2

5 files changed, 107 insertions, 8 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index 9ff27f69a7b7..32dcd362e556 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/bzr
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.14 2006/05/14 16:40:59 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.15 2006/05/17 17:03:13 marienz Exp $
+
+*bzr-0.8.2 (17 May 2006)
+
+  17 May 2006; Marien Zwart <marienz@gentoo.org>
+  +files/bzr-0.8.2-paramiko-1.6-compat.patch, +bzr-0.8.2.ebuild:
+  Version bump with a patch to work with paramiko-1.6 a bit better.
 
 *bzr-0.8 (14 May 2006)
 
diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest
index e0cee34c0aa0..9f366b6b32df 100644
--- a/dev-util/bzr/Manifest
+++ b/dev-util/bzr/Manifest
@@ -9,8 +9,13 @@ AUX bzr-0.8-fix-manpage-location.patch 361 RMD160 1b93e88bc04a5f8c1c5f9c75720329
 MD5 4c2a989947fc7aeabffd234649aaf6c6 files/bzr-0.8-fix-manpage-location.patch 361
 RMD160 1b93e88bc04a5f8c1c5f9c75720329e6077cc6de files/bzr-0.8-fix-manpage-location.patch 361
 SHA256 4bc85843e10660bb95cf12f758aaa92053db0c5ff82bd5479d8d4090a5935305 files/bzr-0.8-fix-manpage-location.patch 361
+AUX bzr-0.8.2-paramiko-1.6-compat.patch 453 RMD160 68a27746ced96409d98b18e9122f98a98405f2ae SHA1 894f319d8928dfe60b6605717c21866061dc6981 SHA256 3b427ac695a5abacf214771f8f6589744555c1da08583d266975da770e262214 size 453
+MD5 c73fb29e757d273cdf2dd44c755a442a files/bzr-0.8.2-paramiko-1.6-compat.patch 453
+RMD160 68a27746ced96409d98b18e9122f98a98405f2ae files/bzr-0.8.2-paramiko-1.6-compat.patch 453
+SHA256 3b427ac695a5abacf214771f8f6589744555c1da08583d266975da770e262214 files/bzr-0.8.2-paramiko-1.6-compat.patch 453
 DIST bzr-0.6.2.tar.gz 519926 size 519926
 DIST bzr-0.7.tar.gz 569679 RMD160 e207ed79ffd9e88e5f7ab4b618bd584f4734fff4 SHA256 a9abf88785f0d2c397de9cf4ef02cb63462b1458f583d3ce48cd6f7c21e7a36b size 569679
+DIST bzr-0.8.2.tar.gz 720152 RMD160 5cdbfa3f9a87fc1b999e1bef187f1e83fc7cb251 SHA256 81d982a6aa875b30e4c1ba2d1ade17b34f90fa533e815e3a744bc244745e3144 size 720152
 DIST bzr-0.8.tar.gz 711210 RMD160 feb6f6c4a4a7b3b5d4741c7567f918a34a393305 SHA256 018617c70ff979e25c89a6aa70a3751253d498e3666e775b464e3ccdc6c8b709 size 711210
 EBUILD bzr-0.6.2.ebuild 688 RMD160 176f7037e1667044212974a2c7dde0033b52f3dc SHA1 9bf0d2a0edfdb148def26eb67587c69c40f03a44 SHA256 126b060b2665d79e7c9f01de43b99dd0ec6d214e7777076285215120eb106b86 size 688
 MD5 bd513588df0e2bd410c43e79b6e2890e bzr-0.6.2.ebuild 688
@@ -20,14 +25,18 @@ EBUILD bzr-0.7.ebuild 1413 RMD160 d7da73ae2cb0b84b49152ae11837d99c3b5dd807 SHA1
 MD5 78fc1443571af7893f8da6660885c271 bzr-0.7.ebuild 1413
 RMD160 d7da73ae2cb0b84b49152ae11837d99c3b5dd807 bzr-0.7.ebuild 1413
 SHA256 783b958807653e4c05646948d888b293d4321b9a729d0c83ac06aa42d335254e bzr-0.7.ebuild 1413
+EBUILD bzr-0.8.2.ebuild 1549 RMD160 d70397237d649c44e3eb9772a4b7305f6b99818d SHA1 457c460401fabbacebcb68947f541680cea00909 SHA256 0735257f8c32de69858e8d0e8ffad79e788d22cfaad0aca51525e40088bafa7a size 1549
+MD5 fa17ea9329a68097c5670e8cfb6df329 bzr-0.8.2.ebuild 1549
+RMD160 d70397237d649c44e3eb9772a4b7305f6b99818d bzr-0.8.2.ebuild 1549
+SHA256 0735257f8c32de69858e8d0e8ffad79e788d22cfaad0aca51525e40088bafa7a bzr-0.8.2.ebuild 1549
 EBUILD bzr-0.8.ebuild 1489 RMD160 a9f3313c6a373bffd44a3613d6903885bb4f475d SHA1 2cc37fe96e0bc2c3139504f2e1e665b8e7f0fa27 SHA256 30c9ff192efd0039fc00fa95abc8d7f3871a79b68eef22ff1add5e0a6e106b1f size 1489
 MD5 9d211aa8b58d8fa33896c99daa71fa50 bzr-0.8.ebuild 1489
 RMD160 a9f3313c6a373bffd44a3613d6903885bb4f475d bzr-0.8.ebuild 1489
 SHA256 30c9ff192efd0039fc00fa95abc8d7f3871a79b68eef22ff1add5e0a6e106b1f bzr-0.8.ebuild 1489
-MISC ChangeLog 2364 RMD160 5705af4bedeb281f0b0c7f983d5938914d22841e SHA1 285e762707abc74f1570c9da71699809d841f63f SHA256 2ea70603d5ef036b57644a2bb2ef796a4c0b896be3c2245493a4dac02578f4eb size 2364
-MD5 5050996bf95247ae0a7ae039453ecf66 ChangeLog 2364
-RMD160 5705af4bedeb281f0b0c7f983d5938914d22841e ChangeLog 2364
-SHA256 2ea70603d5ef036b57644a2bb2ef796a4c0b896be3c2245493a4dac02578f4eb ChangeLog 2364
+MISC ChangeLog 2573 RMD160 3ab2b89af5f3762c591ea962b0efaa3688ee8bfc SHA1 1e3f1e4ffc42a9531664e4939ce789c7b4935e13 SHA256 339ed012726ea9eb61f9bbc90480812ecf950b60c1d7345d0c378975cba6f3e4 size 2573
+MD5 af2f16dc69c7910b43a1cac1670ee019 ChangeLog 2573
+RMD160 3ab2b89af5f3762c591ea962b0efaa3688ee8bfc ChangeLog 2573
+SHA256 339ed012726ea9eb61f9bbc90480812ecf950b60c1d7345d0c378975cba6f3e4 ChangeLog 2573
 MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 size 218
 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
@@ -41,10 +50,13 @@ SHA256 5a18788b3530e5eb6b81f637238246d44885fde9f2920e9f14803e80403aca5c files/di
 MD5 faca1051cdcb5bbfbd8097d23bbd135f files/digest-bzr-0.8 223
 RMD160 e3eba998e939dfd9c36aae9e3ca435bddfccff55 files/digest-bzr-0.8 223
 SHA256 d734e1283f7c1dfe69c7dc8f9d42322c448bd3879b6b1da4d3e920c7ffb57244 files/digest-bzr-0.8 223
+MD5 d4d24a55ecf715cc1765e93869077983 files/digest-bzr-0.8.2 229
+RMD160 d123b886d50cead37ab0b571d07fb1ce5e67517e files/digest-bzr-0.8.2 229
+SHA256 25d4d1bbe75418759a594aa64f16a162827e85556b5ee68645705fce67922b67 files/digest-bzr-0.8.2 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEZ12iW78445TWHXcRAgjXAJ9Rs088wc7akoCcfEDqX/IBBe1sgwCeNL0f
-azsoveJk1ODgqlDOu9KZhaU=
-=H8G+
+iD4DBQFEa1dYW78445TWHXcRAnF8AJjjZsuyzPP/2mjLY1R8sahevxD6AJ4k5D6g
+l47+3h25K5xb/DB6oJTRyQ==
+=5sNC
 -----END PGP SIGNATURE-----
diff --git a/dev-util/bzr/bzr-0.8.2.ebuild b/dev-util/bzr/bzr-0.8.2.ebuild
new file mode 100644
index 000000000000..02b270018fc3
--- /dev/null
+++ b/dev-util/bzr/bzr-0.8.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.8.2.ebuild,v 1.1 2006/05/17 17:03:13 marienz Exp $
+
+inherit distutils bash-completion elisp-common eutils
+
+DESCRIPTION="next generation distributed version control"
+HOMEPAGE="http://bazaar-vcs.org/"
+SRC_URI="http://bazaar-vcs.org/pkg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="emacs"
+
+DEPEND=">=dev-lang/python-2.4
+	dev-python/celementtree
+	emacs? ( virtual/emacs )
+	>=dev-python/paramiko-1.5"
+
+PYTHON_MODNAME="bzrlib"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.8-fix-manpage-location.patch"
+	epatch "${FILESDIR}/${P}-paramiko-1.6-compat.patch"
+}
+
+src_compile() {
+	distutils_src_compile
+	if use emacs; then
+		elisp-compile contrib/emacs/bzr-mode.el || die "Emacs modules failed!"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+	if use emacs; then
+		insinto "${SITELISP}"
+		doins contrib/emacs/bzr-mode.el*
+		elisp-site-file-install "${FILESDIR}/70bzr-gentoo.el"
+	fi
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh/_bzr
+	dobashcompletion contrib/bash/bzr
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	use emacs && elisp-site-regen
+	bash-completion_pkg_postinst
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	# regenerate site-gentoo if we are merged USE=emacs and unmerged
+	# USE=-emacs
+	has_version virtual/emacs && elisp-site-regen
+}
+
+src_test() {
+	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
+}
diff --git a/dev-util/bzr/files/bzr-0.8.2-paramiko-1.6-compat.patch b/dev-util/bzr/files/bzr-0.8.2-paramiko-1.6-compat.patch
new file mode 100644
index 000000000000..b5ef35ae059c
--- /dev/null
+++ b/dev-util/bzr/files/bzr-0.8.2-paramiko-1.6-compat.patch
@@ -0,0 +1,13 @@
+=== modified file 'bzrlib/transport/sftp.py'
+--- bzrlib/transport/sftp.py	
++++ bzrlib/transport/sftp.py	
+@@ -1019,6 +1019,8 @@
+                 return '1'
+             def get_hexdump(self):
+                 return False
++            def close(self):
++                pass
+ 
+         server = paramiko.SFTPServer(FakeChannel(), 'sftp', StubServer(self), StubSFTPServer,
+                                      root=self._root, home=self._server_homedir)
+
diff --git a/dev-util/bzr/files/digest-bzr-0.8.2 b/dev-util/bzr/files/digest-bzr-0.8.2
new file mode 100644
index 000000000000..bddfa5c5c678
--- /dev/null
+++ b/dev-util/bzr/files/digest-bzr-0.8.2
@@ -0,0 +1,3 @@
+MD5 9bcfcc2a60156a5a74e247846ebe7473 bzr-0.8.2.tar.gz 720152
+RMD160 5cdbfa3f9a87fc1b999e1bef187f1e83fc7cb251 bzr-0.8.2.tar.gz 720152
+SHA256 81d982a6aa875b30e4c1ba2d1ade17b34f90fa533e815e3a744bc244745e3144 bzr-0.8.2.tar.gz 720152