Version bump, closes bug #144312, thanks to Geoff Weber <janax99@yahoo.com>.

Package-Manager: portage-2.1.1_pre5-r3

6 files changed, 243 insertions, 35 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index 817cfd779d02..003576a50c63 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.17 2006/07/11 17:45:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.18 2006/08/24 18:46:31 marienz Exp $
+
+*bzr-0.9 (24 Aug 2006)
+
+  24 Aug 2006; Marien Zwart <marienz@gentoo.org>
+  +files/bzr-0.9-binary-diff.patch, +bzr-0.9.ebuild:
+  Version bump, closes bug #144312, thanks to Geoff Weber <janax99@yahoo.com>.
 
   11 Jul 2006; Aron Griffis <agriffis@gentoo.org> bzr-0.8.2-r1.ebuild:
   Mark 0.8.2-r1 ~ia64
diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest
index b516adb1ede1..c34bf5cebfda 100644
--- a/dev-util/bzr/Manifest
+++ b/dev-util/bzr/Manifest
@@ -1,33 +1,63 @@
-MD5 65ead38a3f7cfadb63ff7876c5ba6f67 ChangeLog 2982
-RMD160 fbad23b6a02e7d299b7c8f2eb9cb6839224f8b4a ChangeLog 2982
-SHA256 c62c34dc69428a6a0930eeba891498708809ce14d79653aa62bc4a70189a63a4 ChangeLog 2982
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 70bzr-gentoo.el 51 RMD160 6493432732fa0a735e8c9235ca087bc7afea6042 SHA1 4b7363c494cc67c303b095969f5275685c98e06d SHA256 f62b36bca53b70c8f2e828233187b9beb39bc604b1e51b910478f123e3fa7417
+MD5 ee593fd318e231f5c0ae698af0c09899 files/70bzr-gentoo.el 51
+RMD160 6493432732fa0a735e8c9235ca087bc7afea6042 files/70bzr-gentoo.el 51
+SHA256 f62b36bca53b70c8f2e828233187b9beb39bc604b1e51b910478f123e3fa7417 files/70bzr-gentoo.el 51
+AUX bzr-0.8-fix-manpage-location.patch 361 RMD160 1b93e88bc04a5f8c1c5f9c75720329e6077cc6de SHA1 ec0c0cc45ae717a6a8a998f64afdda9219a8ba6d SHA256 4bc85843e10660bb95cf12f758aaa92053db0c5ff82bd5479d8d4090a5935305
+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
+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
+AUX bzr-0.8.2-push-repository.patch 3321 RMD160 20881ad55ec1018ff921e64defc0c6063a6ac19c SHA1 9ee4fc6f0e925d7cf65a1be9c949f099b4056986 SHA256 e5c5d1cfe2ccf74241fe54236574196819fa2ab40390469eabe5541b5c710412
+MD5 345d91359f28e1ffaefa43963b0e9c9b files/bzr-0.8.2-push-repository.patch 3321
+RMD160 20881ad55ec1018ff921e64defc0c6063a6ac19c files/bzr-0.8.2-push-repository.patch 3321
+SHA256 e5c5d1cfe2ccf74241fe54236574196819fa2ab40390469eabe5541b5c710412 files/bzr-0.8.2-push-repository.patch 3321
+AUX bzr-0.9-binary-diff.patch 3660 RMD160 6272a1ae8b7bcbd52a02b7e2687167ff6b70bf50 SHA1 bafba7a423a7b969afed0f2e91da1c47fed776ba SHA256 a00e42dc7161d96a13e8f279862174ba2bd534e8da68d46c9a60f7308e96714b
+MD5 56bc12a57f4b60f074871a84be58d6b7 files/bzr-0.9-binary-diff.patch 3660
+RMD160 6272a1ae8b7bcbd52a02b7e2687167ff6b70bf50 files/bzr-0.9-binary-diff.patch 3660
+SHA256 a00e42dc7161d96a13e8f279862174ba2bd534e8da68d46c9a60f7308e96714b files/bzr-0.9-binary-diff.patch 3660
+DIST bzr-0.6.2.tar.gz 519926
+DIST bzr-0.7.tar.gz 569679 RMD160 e207ed79ffd9e88e5f7ab4b618bd584f4734fff4 SHA256 a9abf88785f0d2c397de9cf4ef02cb63462b1458f583d3ce48cd6f7c21e7a36b
+DIST bzr-0.8.2.tar.gz 720152 RMD160 5cdbfa3f9a87fc1b999e1bef187f1e83fc7cb251 SHA1 1aea6e0783219f0c2d074c9407ad09cb36b4ade2 SHA256 81d982a6aa875b30e4c1ba2d1ade17b34f90fa533e815e3a744bc244745e3144
+DIST bzr-0.8.tar.gz 711210 RMD160 feb6f6c4a4a7b3b5d4741c7567f918a34a393305 SHA256 018617c70ff979e25c89a6aa70a3751253d498e3666e775b464e3ccdc6c8b709
+DIST bzr-0.9.tar.gz 935724 RMD160 e01328785bae9d275cc71311627a11edb5a89224 SHA1 6150ce2b814a738a72e3aab6d081769f9d2e14fe SHA256 a50ec64ee581d9ecfb0b87098398b3fbbe19c9bd55a7782f75fe7232d83fcf90
+EBUILD bzr-0.6.2.ebuild 688 RMD160 176f7037e1667044212974a2c7dde0033b52f3dc SHA1 9bf0d2a0edfdb148def26eb67587c69c40f03a44 SHA256 126b060b2665d79e7c9f01de43b99dd0ec6d214e7777076285215120eb106b86
 MD5 bd513588df0e2bd410c43e79b6e2890e bzr-0.6.2.ebuild 688
 RMD160 176f7037e1667044212974a2c7dde0033b52f3dc bzr-0.6.2.ebuild 688
 SHA256 126b060b2665d79e7c9f01de43b99dd0ec6d214e7777076285215120eb106b86 bzr-0.6.2.ebuild 688
+EBUILD bzr-0.7.ebuild 1413 RMD160 d7da73ae2cb0b84b49152ae11837d99c3b5dd807 SHA1 2d6ca6da0927943a96dcf78d1b60508b7512a54a SHA256 783b958807653e4c05646948d888b293d4321b9a729d0c83ac06aa42d335254e
 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-r1.ebuild 1815 RMD160 97413db2fc655345d73b6435f686dc1cf7e4b5a1 SHA1 9763010a29c1358cb0a624db0cf8a614dfaebe47 SHA256 e3c9a28c0fff638fa94c599e472461586581c5cbcf85726ce09fcfe22cb99976
 MD5 09715f9e61dc61be48560397e763fecb bzr-0.8.2-r1.ebuild 1815
 RMD160 97413db2fc655345d73b6435f686dc1cf7e4b5a1 bzr-0.8.2-r1.ebuild 1815
 SHA256 e3c9a28c0fff638fa94c599e472461586581c5cbcf85726ce09fcfe22cb99976 bzr-0.8.2-r1.ebuild 1815
+EBUILD bzr-0.8.2.ebuild 1549 RMD160 d70397237d649c44e3eb9772a4b7305f6b99818d SHA1 457c460401fabbacebcb68947f541680cea00909 SHA256 0735257f8c32de69858e8d0e8ffad79e788d22cfaad0aca51525e40088bafa7a
 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
 MD5 9d211aa8b58d8fa33896c99daa71fa50 bzr-0.8.ebuild 1489
 RMD160 a9f3313c6a373bffd44a3613d6903885bb4f475d bzr-0.8.ebuild 1489
 SHA256 30c9ff192efd0039fc00fa95abc8d7f3871a79b68eef22ff1add5e0a6e106b1f bzr-0.8.ebuild 1489
-MD5 ee593fd318e231f5c0ae698af0c09899 files/70bzr-gentoo.el 51
-RMD160 6493432732fa0a735e8c9235ca087bc7afea6042 files/70bzr-gentoo.el 51
-SHA256 f62b36bca53b70c8f2e828233187b9beb39bc604b1e51b910478f123e3fa7417 files/70bzr-gentoo.el 51
-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
-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
-MD5 345d91359f28e1ffaefa43963b0e9c9b files/bzr-0.8.2-push-repository.patch 3321
-RMD160 20881ad55ec1018ff921e64defc0c6063a6ac19c files/bzr-0.8.2-push-repository.patch 3321
-SHA256 e5c5d1cfe2ccf74241fe54236574196819fa2ab40390469eabe5541b5c710412 files/bzr-0.8.2-push-repository.patch 3321
+EBUILD bzr-0.9.ebuild 1883 RMD160 934fdb9497b2f64e955ab81087b282c96bb1a87c SHA1 3376fe13a759f239a861effcb81f2796e95ac506 SHA256 7ec0dfc9f2de9785942f2f60a6af304be84c508283eec4b3acf7a8d6d5a6bec6
+MD5 6610b1201dad5f9b537bd74a0d828992 bzr-0.9.ebuild 1883
+RMD160 934fdb9497b2f64e955ab81087b282c96bb1a87c bzr-0.9.ebuild 1883
+SHA256 7ec0dfc9f2de9785942f2f60a6af304be84c508283eec4b3acf7a8d6d5a6bec6 bzr-0.9.ebuild 1883
+MISC ChangeLog 3187 RMD160 f94da9083dfe0171a1d1a9959f2b1d42eed658f1 SHA1 810d784dec9e80a8e7a665bad2c84ae544854e62 SHA256 300fbc84d910a005640d95a665bd2797531675d27642b4c9756dcdf032e2c5eb
+MD5 3d02ac1e95581414438cff1ffc6ca49e ChangeLog 3187
+RMD160 f94da9083dfe0171a1d1a9959f2b1d42eed658f1 ChangeLog 3187
+SHA256 300fbc84d910a005640d95a665bd2797531675d27642b4c9756dcdf032e2c5eb ChangeLog 3187
+MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2
+MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
+RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
+SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 metadata.xml 218
 MD5 61a5c235b1f05bbb3f8c606866941097 files/digest-bzr-0.6.2 61
 RMD160 6c3c5290e4cb86c78b030d69755635a4de8eaef1 files/digest-bzr-0.6.2 61
 SHA256 5c83e07b2c846c3235d8a68926c41c1a1df0ac5dd339b3b2774fbc9716c8da70 files/digest-bzr-0.6.2 61
@@ -43,6 +73,13 @@ SHA256 25d4d1bbe75418759a594aa64f16a162827e85556b5ee68645705fce67922b67 files/di
 MD5 d4d24a55ecf715cc1765e93869077983 files/digest-bzr-0.8.2-r1 229
 RMD160 d123b886d50cead37ab0b571d07fb1ce5e67517e files/digest-bzr-0.8.2-r1 229
 SHA256 25d4d1bbe75418759a594aa64f16a162827e85556b5ee68645705fce67922b67 files/digest-bzr-0.8.2-r1 229
-MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
-RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
-SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 metadata.xml 218
+MD5 186a8f6a71ee1958b19bf7c7e0075afe files/digest-bzr-0.9 223
+RMD160 4f39999920b2adeca251e36a5de025dfd6e496bd files/digest-bzr-0.9 223
+SHA256 61330a8f76d1dde491b11ea7a4df94e63de971500a477ebf73f6d23297e5967d files/digest-bzr-0.9 223
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE7fQmUElL7eJpfEQRAlp7AKCM7jwiAOH+O/sq2RsF9CXJGz5MPwCeP3Mo
+GRkjftv+6dH/6Os/vxMuIoo=
+=JVV6
+-----END PGP SIGNATURE-----
diff --git a/dev-util/bzr/bzr-0.9.ebuild b/dev-util/bzr/bzr-0.9.ebuild
new file mode 100644
index 000000000000..4fa8a67a3b9b
--- /dev/null
+++ b/dev-util/bzr/bzr-0.9.ebuild
@@ -0,0 +1,75 @@
+# 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.9.ebuild,v 1.1 2006/08/24 18:46:31 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 ~ia64 ~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"
+
+DOCS="HACKING NEWS NEWS.developers"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Make bzr work with recent versions of diffutils.
+	epatch "${FILESDIR}/${P}-binary-diff.patch"
+
+	# Install the manpage in /usr/share/man instead of /usr/man
+	epatch "${FILESDIR}/${PN}-0.8-fix-manpage-location.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
+
+	einfo "If you just upgraded from a version of bzr older than 0.9"
+	einfo "you should rename your ~/.bazaar/branches.conf to locations.conf"
+	einfo "(see /usr/share/doc/${PF}/NEWS.gz)"
+}
+
+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.9-binary-diff.patch b/dev-util/bzr/files/bzr-0.9-binary-diff.patch
new file mode 100644
index 000000000000..0c930677b30d
--- /dev/null
+++ b/dev-util/bzr/files/bzr-0.9-binary-diff.patch
@@ -0,0 +1,79 @@
+# Bazaar revision bundle v0.8
+#
+# message:
+#   Make the tests pass with recent versions of diffutils.
+# committer: Marien Zwart <marienz@gentoo.org>
+# date: Thu 2006-08-24 20:01:44.809999943 +0200
+
+=== modified file bzrlib/diff.py // last-changed:marienz@gentoo.org-20060824174
+... 709-83cf7a51d41c69f8
+--- bzrlib/diff.py
++++ bzrlib/diff.py
+@@ -166,8 +166,9 @@
+             # 'diff' gives retcode == 2 for all sorts of errors
+             # one of those is 'Binary files differ'.
+             # Bad options could also be the problem.
+-            # 'Binary files' is not a real error, so we suppress that error
+-            m = re.match('^binary files.*differ$', first_line, re.I)
++            # 'Binary files' is not a real error, so we suppress that error.
++            # Starting with diffutils 2.8.4 the word "binary" was dropped.
++            m = re.match('^(binary )?files.*differ$', first_line, re.I)
+             if not m:
+                 raise BzrError('external diff failed with exit code 2;'
+                                ' command: %r' % (diffcmd,))
+
+=== modified file bzrlib/tests/test_diff.py
+--- bzrlib/tests/test_diff.py
++++ bzrlib/tests/test_diff.py
+@@ -111,7 +111,11 @@
+ 
+     def test_external_diff_binary(self):
+         lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
+-        self.assertEqual(['Binary files old and new differ\n', '\n'], lines)
++        # Older versions of diffutils say "Binary files", newer
++        # versions just say "files".
++        self.assertContainsRe(lines[0],
++                              '(Binary f|F)iles old and new differ\n')
++        self.assertEquals(lines[1:], ['\n'])
+ 
+     def test_no_external_diff(self):
+         """Check that NoDiff is raised when diff is not available"""
+
+# revision id: marienz@gentoo.org-20060824180144-b5b013e11e5709f4
+# sha1: fd7d1ad679b4fde74c2d5927d4bb67b0e7dc6bac
+# inventory sha1: 18333f103b8c13ac42673e56e272805790a275c5
+# parent ids:
+#   marienz@gentoo.org-20060824174709-83cf7a51d41c69f8
+# base id: pqm@pqm.ubuntu.com-20060811102108-06a24f3a1d4e7d82
+# properties:
+#   branch-nick: bzr.0.9
+
+# message:
+#   Make external diff in binary mode work with recent versions of diffutils.
+# committer: Marien Zwart <marienz@gentoo.org>
+# date: Thu 2006-08-24 19:47:09.569000006 +0200
+
+=== modified file bzrlib/diff.py // encoding:base64
+LS0tIGJ6cmxpYi9kaWZmLnB5CisrKyBienJsaWIvZGlmZi5weQpAQCAtMTY2LDggKzE2Niw5IEBA
+CiAgICAgICAgICAgICAjICdkaWZmJyBnaXZlcyByZXRjb2RlID09IDIgZm9yIGFsbCBzb3J0cyBv
+ZiBlcnJvcnMKICAgICAgICAgICAgICMgb25lIG9mIHRob3NlIGlzICdCaW5hcnkgZmlsZXMgZGlm
+ZmVyJy4KICAgICAgICAgICAgICMgQmFkIG9wdGlvbnMgY291bGQgYWxzbyBiZSB0aGUgcHJvYmxl
+bS4KLSAgICAgICAgICAgICMgJ0JpbmFyeSBmaWxlcycgaXMgbm90IGEgcmVhbCBlcnJvciwgc28g
+d2Ugc3VwcHJlc3MgdGhhdCBlcnJvcgotICAgICAgICAgICAgbSA9IHJlLm1hdGNoKCdeYmluYXJ5
+IGZpbGVzLipkaWZmZXIkJywgZmlyc3RfbGluZSwgcmUuSSkKKyAgICAgICAgICAgICMgJ0JpbmFy
+eSBmaWxlcycgaXMgbm90IGEgcmVhbCBlcnJvciwgc28gd2Ugc3VwcHJlc3MgdGhhdCBlcnJvci4K
+KyAgICAgICAgICAgICMgU3RhcnRpbmcgd2l0aCBkaWZmdXRpbHMgMi44LjQgdGhlIHdvcmQgImJp
+bmFyeSIgd2FzIGRyb3BwZWQuCisgICAgICAgICAgICBtID0gcmUubWF0Y2goJ14oYmluYXJ5ICk/
+ZmlsZXMuKmRpZmZlciQnLCBmaXJzdF9saW5lLCByZS5JKQogICAgICAgICAgICAgaWYgbm90IG06
+CiAgICAgICAgICAgICAgICAgcmFpc2UgQnpyRXJyb3IoJ2V4dGVybmFsIGRpZmYgZmFpbGVkIHdp
+dGggZXhpdCBjb2RlIDI7JwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcgY29tbWFu
+ZDogJXInICUgKGRpZmZjbWQsKSkKCg==
+
+# revision id: marienz@gentoo.org-20060824174709-83cf7a51d41c69f8
+# sha1: a7a4000ddb2b723ba82c62a11104c4ed354abe13
+# inventory sha1: 03cc983b5e08ffbcdbb02fba0f4733c973d0a554
+# parent ids:
+#   pqm@pqm.ubuntu.com-20060811102108-06a24f3a1d4e7d82
+# properties:
+#   branch-nick: bzr.0.9
+
diff --git a/dev-util/bzr/files/digest-bzr-0.9 b/dev-util/bzr/files/digest-bzr-0.9
new file mode 100644
index 000000000000..9b5d633fc3f4
--- /dev/null
+++ b/dev-util/bzr/files/digest-bzr-0.9
@@ -0,0 +1,3 @@
+MD5 46a3320a7830b13516bef084bb87d86c bzr-0.9.tar.gz 935724
+RMD160 e01328785bae9d275cc71311627a11edb5a89224 bzr-0.9.tar.gz 935724
+SHA256 a50ec64ee581d9ecfb0b87098398b3fbbe19c9bd55a7782f75fe7232d83fcf90 bzr-0.9.tar.gz 935724
diff --git a/dev-util/bzrtools/Manifest b/dev-util/bzrtools/Manifest
index 2080ea2d46c1..2064846f5926 100644
--- a/dev-util/bzrtools/Manifest
+++ b/dev-util/bzrtools/Manifest
@@ -1,30 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX bzrtools-0.8-optional-pybaz.patch 748 RMD160 1b3fda42cf3b99cd74a74b1dcd1ca6bd9016837a SHA1 02ff32feca475a040b593fad52578b3be4edeed4 SHA256 48c3d3e1adee4cde794d0b967bffb5f55ffdc7691e15dfeac1921e9d3a27ef77 size 748
+AUX bzrtools-0.8-optional-pybaz.patch 748 RMD160 1b3fda42cf3b99cd74a74b1dcd1ca6bd9016837a SHA1 02ff32feca475a040b593fad52578b3be4edeed4 SHA256 48c3d3e1adee4cde794d0b967bffb5f55ffdc7691e15dfeac1921e9d3a27ef77
 MD5 e690aa10db0f15301549858c3f0ac956 files/bzrtools-0.8-optional-pybaz.patch 748
 RMD160 1b3fda42cf3b99cd74a74b1dcd1ca6bd9016837a files/bzrtools-0.8-optional-pybaz.patch 748
 SHA256 48c3d3e1adee4cde794d0b967bffb5f55ffdc7691e15dfeac1921e9d3a27ef77 files/bzrtools-0.8-optional-pybaz.patch 748
-DIST bzrtools-0.6.1.tar.gz 83961 size 83961
-DIST bzrtools-0.7.tar.gz 87811 size 87811
-DIST bzrtools-0.8.tar.gz 110940 RMD160 bfea650727814a041c92257577451a12b65230e9 SHA256 8c9b501ec4af50a79654f357eddd537083b4b2e4af7d72349fb231042eb48700 size 110940
-EBUILD bzrtools-0.6.1.ebuild 531 RMD160 fb32df8ea7d99ba64b7f7ad4b624aac7de140478 SHA1 9f3934f999863153bda6a042f715b12cdf92cef6 SHA256 80f0235a51a68fc2308abd16d702a8af8321e46935304011fd00fa5eb09cb524 size 531
+DIST bzrtools-0.6.1.tar.gz 83961
+DIST bzrtools-0.7.tar.gz 87811
+DIST bzrtools-0.8.tar.gz 110940 RMD160 bfea650727814a041c92257577451a12b65230e9 SHA256 8c9b501ec4af50a79654f357eddd537083b4b2e4af7d72349fb231042eb48700
+DIST bzrtools-0.9.1.tar.gz 70250 RMD160 abe527c59d8b0345378244ec9a24f1804507b37b SHA1 f784cd40298eefca0ba0b4cd0274daf9c265a5de SHA256 a28ffadc0a3723b45e2998f4c9201d785728af0903594540e28ac35a841759a3
+EBUILD bzrtools-0.6.1.ebuild 531 RMD160 fb32df8ea7d99ba64b7f7ad4b624aac7de140478 SHA1 9f3934f999863153bda6a042f715b12cdf92cef6 SHA256 80f0235a51a68fc2308abd16d702a8af8321e46935304011fd00fa5eb09cb524
 MD5 f86e5dd6d8957d6332117777f44c3da9 bzrtools-0.6.1.ebuild 531
 RMD160 fb32df8ea7d99ba64b7f7ad4b624aac7de140478 bzrtools-0.6.1.ebuild 531
 SHA256 80f0235a51a68fc2308abd16d702a8af8321e46935304011fd00fa5eb09cb524 bzrtools-0.6.1.ebuild 531
-EBUILD bzrtools-0.7.ebuild 603 RMD160 506bbfa0afec4f62538c50849fa89ffe53aab22c SHA1 25461b12df55ba08071dc122bdc652348db60669 SHA256 8fdc2cf404876393eb7c60fc28d3d3e7f07e31ef301060d994ee09c5e727c7e2 size 603
+EBUILD bzrtools-0.7.ebuild 603 RMD160 506bbfa0afec4f62538c50849fa89ffe53aab22c SHA1 25461b12df55ba08071dc122bdc652348db60669 SHA256 8fdc2cf404876393eb7c60fc28d3d3e7f07e31ef301060d994ee09c5e727c7e2
 MD5 8fb9bf41d277bf25934765335e0efc11 bzrtools-0.7.ebuild 603
 RMD160 506bbfa0afec4f62538c50849fa89ffe53aab22c bzrtools-0.7.ebuild 603
 SHA256 8fdc2cf404876393eb7c60fc28d3d3e7f07e31ef301060d994ee09c5e727c7e2 bzrtools-0.7.ebuild 603
-EBUILD bzrtools-0.8.ebuild 771 RMD160 6f6ee6b007014bbb79ac027201439184a5d7f56a SHA1 b4fbe74918a040207b7f5019af6dc45cf9ae1b4d SHA256 87d78c3a91106a170969592caa6b912935d7832d580100e30f26278a6af1a76c size 771
+EBUILD bzrtools-0.8.ebuild 771 RMD160 6f6ee6b007014bbb79ac027201439184a5d7f56a SHA1 b4fbe74918a040207b7f5019af6dc45cf9ae1b4d SHA256 87d78c3a91106a170969592caa6b912935d7832d580100e30f26278a6af1a76c
 MD5 203a2f1da8ea6ae6f67158a387147ba8 bzrtools-0.8.ebuild 771
 RMD160 6f6ee6b007014bbb79ac027201439184a5d7f56a bzrtools-0.8.ebuild 771
 SHA256 87d78c3a91106a170969592caa6b912935d7832d580100e30f26278a6af1a76c bzrtools-0.8.ebuild 771
-MISC ChangeLog 975 RMD160 02d8d47d2530302ef083d922820d42263c1839ea SHA1 e6efaa5fbf6c8b9950563565bb42b8c3766e083f SHA256 9bc7491152b370f72f7252ffcb13c4900fea8d4274c76923a548dc2baacc2c15 size 975
-MD5 5a0352f41f43b374e61c5113e0edf239 ChangeLog 975
-RMD160 02d8d47d2530302ef083d922820d42263c1839ea ChangeLog 975
-SHA256 9bc7491152b370f72f7252ffcb13c4900fea8d4274c76923a548dc2baacc2c15 ChangeLog 975
-MISC metadata.xml 222 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 SHA1 95963907e0f22bc3795213303a68a2155b1ba78a SHA256 6e5dda05386711c829057f65bfd0e3ae693232628949c1612163ce9915963a63 size 222
+EBUILD bzrtools-0.9.1.ebuild 609 RMD160 02b4f39d87360bf20e61e9066af8753b1d20c741 SHA1 66f6966dfc0f8fbbba26b45d4364e02cba11412c SHA256 f6f52c843d607c0b4bcb898a8febb6e97ee82ec96d6d6f9e0e255f69309bb184
+MD5 436f1698078f94b3520a85c6156bc9e4 bzrtools-0.9.1.ebuild 609
+RMD160 02b4f39d87360bf20e61e9066af8753b1d20c741 bzrtools-0.9.1.ebuild 609
+SHA256 f6f52c843d607c0b4bcb898a8febb6e97ee82ec96d6d6f9e0e255f69309bb184 bzrtools-0.9.1.ebuild 609
+MISC ChangeLog 1159 RMD160 d0e0863fa46ec7b78dd9e75cfd7b36f1cbde3519 SHA1 4ebc84b7233f056b9b49dffd04b8271298d85e57 SHA256 a9920f44500e01e5619fbb6218f5a1ecd13f056466d1921ba53d126a6485d512
+MD5 58161a93c3ec1f9419b397043ea64b04 ChangeLog 1159
+RMD160 d0e0863fa46ec7b78dd9e75cfd7b36f1cbde3519 ChangeLog 1159
+SHA256 a9920f44500e01e5619fbb6218f5a1ecd13f056466d1921ba53d126a6485d512 ChangeLog 1159
+MISC metadata.xml 222 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 SHA1 95963907e0f22bc3795213303a68a2155b1ba78a SHA256 6e5dda05386711c829057f65bfd0e3ae693232628949c1612163ce9915963a63
 MD5 5dff6cc33967055cfde969cbcb7b6d5d metadata.xml 222
 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 metadata.xml 222
 SHA256 6e5dda05386711c829057f65bfd0e3ae693232628949c1612163ce9915963a63 metadata.xml 222
@@ -37,10 +42,13 @@ SHA256 c213a378c54308e35501158e6147ff4975396448bac7c8749ce0571013fd88b8 files/di
 MD5 3bcdd4d56c2f507b097f65a435c57635 files/digest-bzrtools-0.8 238
 RMD160 ccbc62b4f29c8d6a947a577e99e8a86433844c13 files/digest-bzrtools-0.8 238
 SHA256 77db5a3cb78b58a806a861f11162ec62a25a183245dbacbbf9743d03ba6c080d files/digest-bzrtools-0.8 238
+MD5 210cdbc35085660fca7f785f4895e415 files/digest-bzrtools-0.9.1 241
+RMD160 b777e80d2e6ac04987c9d5fed7216637751bd2f0 files/digest-bzrtools-0.9.1 241
+SHA256 77276b673a72de4d81efc0b35a8ce322fa1a4588e0679c3167d4c8bbc2bdfd0d files/digest-bzrtools-0.9.1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEZ135W78445TWHXcRApLvAJ0Xf+oV/iPVpC7KtRY3LA5dJEd4DQCcCwPc
-+DZALepY61PL4vC0iaClqtY=
-=0DxX
+iD8DBQFE7fSZUElL7eJpfEQRAuXuAJ92sYasrqadIV+agCUlHLghKbPSXQCeJU1f
+nMeF5crPm9cWXjz5tGkG1vg=
+=6Oy9
 -----END PGP SIGNATURE-----