Version bump. Merged in bazaard herd.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 136 insertions, 11 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index f71cba8eea58..143db99e1099 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/bzr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.111 2009/10/06 17:30:34 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.112 2009/10/20 16:03:17 pva Exp $
+
+*bzr-2.0.1 (20 Oct 2009)
+
+  20 Oct 2009; Peter Volkov <pva@gentoo.org> +bzr-2.0.1.ebuild,
+  metadata.xml:
+  Version bump. Merged in bazaard herd.
 
   06 Oct 2009; Peter Volkov <pva@gentoo.org> bzr-2.0.0.ebuild:
   Updated tests: some were fixed, some new fail.
diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest
index 634c30063721..a5c6e6878e5e 100644
--- a/dev-util/bzr/Manifest
+++ b/dev-util/bzr/Manifest
@@ -5,8 +5,10 @@ AUX bzr-1.8-no-pyrex.patch 918 RMD160 36de25bb174bc66b512bd6b25a6cfd8a2cbb1ca3 S
 DIST bzr-1.15.1.tar.gz 4298555 RMD160 ed791a02d39a4aec1aa1ae0aef25e887da27ad6e SHA1 d340aea77e7a0a7c69b03ceb62b34f27a69c0568 SHA256 e7f5257cbfbca29f10ebf89d8b1a3d8e46ab699c71627d4417bd08167c875b93
 DIST bzr-1.18.tar.gz 5977774 RMD160 307fe8770b96b1cc67c97ec7bc62ba915a0238bb SHA1 0e738c089ad769eeea6f67befd3de93a402200a7 SHA256 80536a3b7980898f234d971a5b30c5f7d3233b1162a7920c6a1aeb845e32a949
 DIST bzr-2.0.0.tar.gz 6085108 RMD160 14ce780c90d24a432221ff0ac7c4625e1d7eef86 SHA1 ed71f73229c1327e09ab2f26cd3870fd5570ba6a SHA256 760cebe30cd2718f98b8790b2dfd33ee153709a14c91509d9e04716d70f482df
+DIST bzr-2.0.1.tar.gz 6101477 RMD160 a48492a27942f1001c1270fc8bb974135328c4b5 SHA1 e19c05e052290746de54f65254e056e39ba5e018 SHA256 3438bd7b5d07486d85a63cf47a26f3532ef7fb4019770ca48faddfa9875e06c9
 EBUILD bzr-1.15.1.ebuild 3984 RMD160 cb528a54a5831ab9df4c9e100ef2d77cf944130c SHA1 9ee6ba006e1954cdd2da4ccbc69ad16eec011634 SHA256 5aab314d3d5cff46c527cf453174b0950e1e0e8d10ae3b2e3ed04d3a86ace26b
 EBUILD bzr-1.18.ebuild 3838 RMD160 9d827c6ad05d544b58cd4001eac464cfb20b3e5d SHA1 2ba561c7abc059c1d1969df7779945968c98a861 SHA256 23b3409d31ad0570b64836a164f1a1cc3818f87a0fdb66baf3fbceb396eac6b7
 EBUILD bzr-2.0.0.ebuild 3517 RMD160 82ed495f5ac160c17a7192e980d0063576be813c SHA1 da115dd7ab8b1390e50a9c0b5185fe048e081849 SHA256 feb3c1b176f76098466c24b2b9a949314562b718ff20b974e9085d7515222c9f
-MISC ChangeLog 16447 RMD160 e652878597a47a7a827339fe970850441e0c6cfb SHA1 b24008ce82778f517ca3645f8daf63b45ee653f1 SHA256 c0f7fa764236293a91ad12d34683563633bdacadb6912ee984fc4c296c35c3ea
-MISC metadata.xml 890 RMD160 20a0b377b9d83d4a59813fc61237ac1ae3a163b8 SHA1 3f06ccc8ac2d3bff0e47bda1b85c10015a86410e SHA256 5f7a2215128eaa41f1e121036f4b3af779deeaa4a8476d0d0219f9a46c089cb9
+EBUILD bzr-2.0.1.ebuild 3517 RMD160 b392767d10ecaf546355da7c31e7bc57822a9ad7 SHA1 ab3991ab94def60ad78873a973646e3ba3b599a6 SHA256 f965154f790a36052af9cb8ed168355cca587b773476c266e662e0aa0c8a52b8
+MISC ChangeLog 16594 RMD160 177d606c93fdaa9f75109777bdcc04b049821a7a SHA1 1061b1820f4232f93db9f1a618b703452f8fa84c SHA256 03423393e696a9e353f2cfc19d7d75d79060a11f0844c2f2ba7dc0b5b96de2ed
+MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
diff --git a/dev-util/bzr/bzr-2.0.1.ebuild b/dev-util/bzr/bzr-2.0.1.ebuild
new file mode 100644
index 000000000000..f6d017fa8de9
--- /dev/null
+++ b/dev-util/bzr/bzr-2.0.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.0.1.ebuild,v 1.1 2009/10/20 16:03:17 pva Exp $
+
+EAPI=1
+
+NEED_PYTHON=2.4
+
+inherit distutils bash-completion elisp-common eutils versionator
+
+MY_PV=${PV/_rc/rc}
+MY_P=${PN}-${MY_PV}
+SERIES=$(get_version_component_range 1-2)
+
+DESCRIPTION="Bazaar is a next generation distributed version control system."
+HOMEPAGE="http://bazaar-vcs.org/"
+#SRC_URI="http://bazaar-vcs.org/releases/src/${MY_P}.tar.gz"
+SRC_URI="http://launchpad.net/bzr/${SERIES}/${MY_PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="curl doc emacs +sftp test"
+
+RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree )
+	curl? ( dev-python/pycurl )
+	sftp? ( dev-python/paramiko )"
+
+DEPEND="emacs? ( virtual/emacs )
+	test? (
+		$RDEPEND
+		dev-python/medusa
+	)"
+
+S="${WORKDIR}/${MY_P}"
+PYTHON_MODNAME="bzrlib"
+SITEFILE=71bzr-gentoo.el
+DOCS="doc/*.txt"
+
+src_unpack() {
+	distutils_src_unpack
+
+	# Don't regenerate .c files from .pyx when pyrex is found.
+	epatch "${FILESDIR}/${PN}-1.8-no-pyrex.patch"
+	# Don't run lock permission tests when running as root
+	epatch "${FILESDIR}/${PN}-0.90-tests-fix_root.patch"
+	# Fix permission errors when run under directories with setgid set.
+	epatch "${FILESDIR}/${PN}-0.90-tests-sgid.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 --install-data /usr/share
+
+	if use doc; then
+		docinto developers
+		dodoc doc/developers/* || die "dodoc failed"
+		for doc in mini-tutorial tutorials user-{guide,reference}; do
+			docinto $doc
+			dodoc doc/en/$doc/* || die "dodoc failed"
+		done
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.el* || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die "elisp-site-file-install failed"
+
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${D}${SITELISP}/${PN}/.nosearch"
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh/_bzr
+	dobashcompletion contrib/bash/bzr
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	bash-completion_pkg_postinst
+
+	if use emacs; then
+		elisp-site-regen
+		elog "If you are using a GNU Emacs version greater than 22.1, bzr support"
+		elog "is already included.  This ebuild does not automatically activate bzr support"
+		elog "in versions below, but prepares it in a way you can load it from your ~/.emacs"
+		elog "file by adding"
+		elog "       (load \"bzr-mode\")"
+	fi
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}
+
+src_test() {
+	export LC_ALL=C
+	# Define tests which are known to fail below.
+	local skip_tests="("
+	# Not reproducible in current dev version, so check and drop with version
+	# bump
+	skip_tests+="bzrlib.tests.test_osutils.TestWalkDirs|"
+	# https://bugs.launchpad.net/bzr/+bug/392127
+	skip_tests+="test_http.*"
+	skip_tests+=")"
+	# Some tests expect the usual pyc compiling behaviour.
+	python_enable_pyc
+	if [[ -n ${skip_tests} ]]; then
+		einfo "Skipping tests known to fail: ${skip_tests}"
+		"${python}" bzr --no-plugins selftest -x ${skip_tests} || die "bzr selftest failed"
+	else
+		"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
+	fi
+	# Just to make sure we don't hit any errors on later stages.
+	python_disable_pyc
+}
diff --git a/dev-util/bzr/metadata.xml b/dev-util/bzr/metadata.xml
index c938649feef8..ada4a1a18fef 100644
--- a/dev-util/bzr/metadata.xml
+++ b/dev-util/bzr/metadata.xml
@@ -2,14 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
-  <maintainer>
-    <email>pva@gentoo.org</email>
-    <name>Peter Volkov</name>
-  </maintainer>
-  <maintainer>
-    <email>fauli@gentoo.org</email>
-    <name>Christian Faulhammer</name>
-  </maintainer>
+  <herd>bazaar</herd>
   <longdescription lang="en">
     Bazaar (``bzr``) is a decentralized revision control system, designed to be
     easy for developers and end users alike.  Bazaar is part of the GNU project