4 files changed, 88 insertions, 1 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/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