Version bump.

Package-Manager: portage-2.1.2.7

9 files changed, 153 insertions, 8 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index 35fff16c395a..db1d4197a635 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/bzr
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.31 2007/04/02 23:09:41 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.32 2007/05/11 01:59:44 marienz Exp $
+
+*bzr-0.16 (11 May 2007)
+
+  11 May 2007; Marien Zwart <marienz@gentoo.org>
+  +files/bzr-0.16-fix-manpage-location.patch,
+  +files/bzr-0.16-timed-tests-fix.patch, +bzr-0.16.ebuild:
+  Version bump.
 
   02 Apr 2007; Marien Zwart <marienz@gentoo.org>
   -files/bzr-0.8.2-paramiko-1.6-compat.patch,
diff --git a/dev-util/bzr/bzr-0.16.ebuild b/dev-util/bzr/bzr-0.16.ebuild
new file mode 100644
index 000000000000..e874a4f569a2
--- /dev/null
+++ b/dev-util/bzr/bzr-0.16.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.16.ebuild,v 1.1 2007/05/11 01:59:44 marienz Exp $
+
+inherit distutils bash-completion elisp-common eutils
+
+MY_P=${P/_rc/rc}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="next generation distributed version control"
+HOMEPAGE="http://bazaar-vcs.org/"
+SRC_URI="http://bazaar-vcs.org/releases/src/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="curl emacs test"
+
+python_rdep="dev-python/celementtree
+	>=dev-python/paramiko-1.5
+	curl? ( dev-python/pycurl )"
+DEPEND=">=dev-lang/python-2.4
+	emacs? ( virtual/emacs )
+	test? (
+		$python_rdep
+		dev-python/medusa
+	)"
+RDEPEND=">=dev-lang/python-2.4
+	$python_rdep"
+
+PYTHON_MODNAME="bzrlib"
+
+DOCS="HACKING NEWS NEWS.developers doc/*"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Install the manpage in /usr/share/man instead of /usr/man
+	epatch "${FILESDIR}/${PN}-0.16-fix-manpage-location.patch"
+
+	# Make a timing-sensitive test pass on a slow or heavily loaded box
+	epatch "${FILESDIR}/${PN}-0.16-timed-tests-fix.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
+
+	elog "If you just upgraded from a version of bzr older than 0.9"
+	elog "you should rename your ~/.bazaar/branches.conf to locations.conf"
+	elog "(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.16-fix-manpage-location.patch b/dev-util/bzr/files/bzr-0.16-fix-manpage-location.patch
new file mode 100644
index 000000000000..ed80ede4c89e
--- /dev/null
+++ b/dev-util/bzr/files/bzr-0.16-fix-manpage-location.patch
@@ -0,0 +1,13 @@
+=== modified file 'setup.py'
+--- setup.py	2007-03-11 23:34:27 +0000
++++ setup.py	2007-05-10 23:50:31 +0000
+@@ -236,7 +236,7 @@
+ else:
+     # std setup
+     ARGS = {'scripts': ['bzr'],
+-            'data_files': [('man/man1', ['bzr.1'])],
++            'data_files': [('share/man/man1', ['bzr.1'])],
+             'cmdclass': command_classes,
+             'ext_modules': ext_modules,
+            }
+
diff --git a/dev-util/bzr/files/bzr-0.16-timed-tests-fix.patch b/dev-util/bzr/files/bzr-0.16-timed-tests-fix.patch
new file mode 100644
index 000000000000..3c6c2aafc86e
--- /dev/null
+++ b/dev-util/bzr/files/bzr-0.16-timed-tests-fix.patch
@@ -0,0 +1,27 @@
+=== modified file 'bzrlib/tests/test_selftest.py'
+--- bzrlib/tests/test_selftest.py	2007-04-24 02:43:56 +0000
++++ bzrlib/tests/test_selftest.py	2007-05-11 00:31:22 +0000
+@@ -620,18 +620,19 @@
+         result.extractBenchmarkTime(self)
+         timed_string = result._testTimeString()
+         # without explicit benchmarking, we should get a simple time.
+-        self.assertContainsRe(timed_string, "^ *[ 1-9][0-9]ms$")
++        self.assertContainsRe(timed_string, "^ +(0|[1-9][0-9]*)ms$")
+         # if a benchmark time is given, we want a x of y style result.
+         self.time(time.sleep, 0.001)
+         result.extractBenchmarkTime(self)
+         timed_string = result._testTimeString()
+-        self.assertContainsRe(timed_string, "^ *[ 1-9][0-9]ms/ *[ 1-9][0-9]ms$")
++        self.assertContainsRe(
++            timed_string, "^ +(0|[1-9][0-9]*)ms/ +(0|[1-9][0-9]*)ms$")
+         # extracting the time from a non-bzrlib testcase sets to None
+         result._recordTestStartTime()
+         result.extractBenchmarkTime(
+             unittest.FunctionTestCase(self.test_elapsed_time_with_benchmarking))
+         timed_string = result._testTimeString()
+-        self.assertContainsRe(timed_string, "^ *[ 1-9][0-9]ms$")
++        self.assertContainsRe(timed_string, "^ +(0|[1-9][0-9]*)ms$")
+         # cheat. Yes, wash thy mouth out with soap.
+         self._benchtime = None
+ 
+
diff --git a/dev-util/bzr/files/digest-bzr-0.16 b/dev-util/bzr/files/digest-bzr-0.16
new file mode 100644
index 000000000000..f104be3b4f19
--- /dev/null
+++ b/dev-util/bzr/files/digest-bzr-0.16
@@ -0,0 +1,3 @@
+MD5 c72c4ae368d0ffe70cc6e3d49c299a0f bzr-0.16.tar.gz 1457816
+RMD160 4b1790b7b4107e576a0072af1248200a6f946ee8 bzr-0.16.tar.gz 1457816
+SHA256 bc9c7e11ece9ab8f4946238d7f3e67390a5c4a2c21fe27862395810e0ea0ae85 bzr-0.16.tar.gz 1457816
diff --git a/dev-util/bzrtools/ChangeLog b/dev-util/bzrtools/ChangeLog
index d870f1534dce..5a4ad86382ce 100644
--- a/dev-util/bzrtools/ChangeLog
+++ b/dev-util/bzrtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/bzrtools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/ChangeLog,v 1.20 2007/04/02 23:07:54 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/ChangeLog,v 1.21 2007/05/11 02:00:19 marienz Exp $
+
+*bzrtools-0.16.1 (11 May 2007)
+
+  11 May 2007; Marien Zwart <marienz@gentoo.org> -bzrtools-0.14.0.ebuild,
+  +bzrtools-0.16.1.ebuild:
+  Version bump.
 
 *bzrtools-0.15.4 (02 Apr 2007)
 
diff --git a/dev-util/bzrtools/bzrtools-0.14.0.ebuild b/dev-util/bzrtools/bzrtools-0.16.1.ebuild
index a5e200baa848..da7d00b24992 100644
--- a/dev-util/bzrtools/bzrtools-0.14.0.ebuild
+++ b/dev-util/bzrtools/bzrtools-0.16.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/bzrtools-0.14.0.ebuild,v 1.1 2007/01/26 20:50:46 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/bzrtools-0.16.1.ebuild,v 1.1 2007/05/11 02:00:19 marienz Exp $
+
+NEED_PYTHON=2.4
 
 inherit distutils versionator
 
@@ -13,9 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.4
-	=dev-util/bzr-$(get_version_component_range 1-2)*"
+DEPEND="=dev-util/bzr-$(get_version_component_range 1-2)*"
+RDEPEND="${DEPEND}"
 
 DOCS="CREDITS NEWS NEWS.Shelf README README.Shelf TODO TODO.Shelf"
 
 S="${WORKDIR}/${PN}"
+
+PYTHON_MODNAME=bzrlib
diff --git a/dev-util/bzrtools/files/digest-bzrtools-0.14.0 b/dev-util/bzrtools/files/digest-bzrtools-0.14.0
deleted file mode 100644
index a594650ab13f..000000000000
--- a/dev-util/bzrtools/files/digest-bzrtools-0.14.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5932729e81f19562a6a844be2555a115 bzrtools-0.14.0.tar.gz 72380
-RMD160 c63d9cc093c9646c9ae341a0d9a243cd7654bc19 bzrtools-0.14.0.tar.gz 72380
-SHA256 2034b01d355bdc531931fede4c900dcffd577339ccceafabc67cf14807c2a9e2 bzrtools-0.14.0.tar.gz 72380
diff --git a/dev-util/bzrtools/files/digest-bzrtools-0.16.1 b/dev-util/bzrtools/files/digest-bzrtools-0.16.1
new file mode 100644
index 000000000000..5e16d7edf6b5
--- /dev/null
+++ b/dev-util/bzrtools/files/digest-bzrtools-0.16.1
@@ -0,0 +1,3 @@
+MD5 8fd6adce20220f200d9e19c61e137cc5 bzrtools-0.16.1.tar.gz 77624
+RMD160 92d0d24d7818f99b5af9f74952012b0320248879 bzrtools-0.16.1.tar.gz 77624
+SHA256 cabed19bcb2087283ed51641473290dff6c911e6af30287e67689987482e334b bzrtools-0.16.1.tar.gz 77624