Version bump, fixes part of bug #132984.

(Portage version: 2.1_rc1)

4 files changed, 66 insertions, 1 deletions

diff --git a/dev-util/bzrtools/ChangeLog b/dev-util/bzrtools/ChangeLog
index afb435e85c8c..5316a5d3747e 100644
--- a/dev-util/bzrtools/ChangeLog
+++ b/dev-util/bzrtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/bzrtools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/ChangeLog,v 1.5 2006/04/15 00:24:53 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/ChangeLog,v 1.6 2006/05/14 16:42:26 marienz Exp $
+
+*bzrtools-0.8 (14 May 2006)
+
+  14 May 2006; Marien Zwart <marienz@gentoo.org>
+  +files/bzrtools-0.8-optional-pybaz.patch, +bzrtools-0.8.ebuild:
+  Version bump, fixes part of bug #132984.
 
   14 Apr 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
   bzrtools-0.7.ebuild:
diff --git a/dev-util/bzrtools/bzrtools-0.8.ebuild b/dev-util/bzrtools/bzrtools-0.8.ebuild
new file mode 100644
index 000000000000..5d1473539ecf
--- /dev/null
+++ b/dev-util/bzrtools/bzrtools-0.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/bzrtools-0.8.ebuild,v 1.1 2006/05/14 16:42:26 marienz Exp $
+
+inherit distutils eutils
+
+DESCRIPTION="bzrtools is a useful collection of utilities for bzr."
+HOMEPAGE="http://bazaar.canonical.com/BzrTools"
+SRC_URI="http://panoramicfeedback.com/opensource/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.4
+	=dev-util/bzr-0.8*"
+
+DOCS="CREDITS NEWS NEWS.Shelf README README.Shelf TODO TODO.Shelf"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-optional-pybaz.patch"
+}
+
+src_test() {
+	./test.py build/lib/bzrlib/plugins || die "test failed"
+}
diff --git a/dev-util/bzrtools/files/bzrtools-0.8-optional-pybaz.patch b/dev-util/bzrtools/files/bzrtools-0.8-optional-pybaz.patch
new file mode 100644
index 000000000000..fd47c4d9b90e
--- /dev/null
+++ b/dev-util/bzrtools/files/bzrtools-0.8-optional-pybaz.patch
@@ -0,0 +1,26 @@
+=== modified file '__init__.py'
+--- __init__.py	
++++ __init__.py	
+@@ -415,7 +415,6 @@
+ 
+ 
+ def test_suite():
+-    import baz_import
+     from bzrlib.tests.TestUtil import TestLoader
+     import tests
+     from doctest import DocTestSuite, ELLIPSIS
+@@ -427,7 +426,12 @@
+     result = TestSuite()
+     result.addTest(DocTestSuite(bzrtools, optionflags=ELLIPSIS))
+     result.addTest(clean_tree.test_suite())
+-    result.addTest(DocTestSuite(baz_import))
++    try:
++        import baz_import
++    except NoPyBaz:
++        pass
++    else:
++        result.addTest(DocTestSuite(baz_import))
+     result.addTest(tests.test_suite())
+     result.addTest(TestLoader().loadTestsFromModule(tests.shelf_tests))
+     result.addTest(tests.blackbox.test_suite())
+
diff --git a/dev-util/bzrtools/files/digest-bzrtools-0.8 b/dev-util/bzrtools/files/digest-bzrtools-0.8
new file mode 100644
index 000000000000..4659d4ee7224
--- /dev/null
+++ b/dev-util/bzrtools/files/digest-bzrtools-0.8
@@ -0,0 +1,3 @@
+MD5 5498ec8762c9b3e02e2489f1f3f50402 bzrtools-0.8.tar.gz 110940
+RMD160 bfea650727814a041c92257577451a12b65230e9 bzrtools-0.8.tar.gz 110940
+SHA256 8c9b501ec4af50a79654f357eddd537083b4b2e4af7d72349fb231042eb48700 bzrtools-0.8.tar.gz 110940