Added release candidate, hardmasked, bug #233713, thank kiorky for report. Added myself to metadata.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 i686

4 files changed, 122 insertions, 3 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index aaf01686be55..72098825c841 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/bzr
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.54 2008/05/22 16:46:05 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.55 2008/08/23 07:06:36 pva Exp $
+
+*bzr-1.6_rc5 (23 Aug 2008)
+
+  23 Aug 2008; Peter Volkov <pva@gentoo.org> metadata.xml,
+  +bzr-1.6_rc5.ebuild:
+  Added release candidate, hardmasked, bug #233713, thank kiorky for report.
+  Added myself to metadata.
 
 *bzr-1.5 (22 May 2008)
 
diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest
index f50ccfa1fa9c..4e343356f4fa 100644
--- a/dev-util/bzr/Manifest
+++ b/dev-util/bzr/Manifest
@@ -9,10 +9,12 @@ DIST bzr-1.1.tar.gz 3425781 RMD160 1a57f127bb452aa842d6c1a41578cea964bc1bf3 SHA1
 DIST bzr-1.3.tar.gz 3477457 RMD160 e7be7c90e448bf22ec58c811505c6dd1519a7e4b SHA1 e6a92ab0abfe54bfc0fa492f11dc65bb759acb47 SHA256 45ae1d20b8a0cb1d450443d969fb5175b90bc5e6e183a65484936cf8be046b7c
 DIST bzr-1.4.tar.gz 3506804 RMD160 70f3686aa1aaa6e36b93962fe24b955aa0bd5552 SHA1 167460c57ca0d2983ccb9e9ecf8b673f4ca7566d SHA256 b353e5cd0bec6cd62219c704858d5ada79b13e589e8b56c6d6d3a5845a10877e
 DIST bzr-1.5.tar.gz 3535058 RMD160 6a63e69f1d77ff389f11f33f7bddd824d134fc5e SHA1 24fa534e64d5a0060b38fb0a40d1752f50274a41 SHA256 7b01ee4faeeb16e236bae2b93136cf1e1501b1c34c8e8fd9dcf1161a6d954c71
+DIST bzr-1.6rc5.tar.gz 3667360 RMD160 77d60ab522c9bda44b24ed400b43cd642e5c7484 SHA1 b101a5844ee1da21b5b837977097c70db4c11d04 SHA256 ac89c783c3cd302c1b85a2c591f8fcb67b5f3ebbd42d97cf14ad055a2dc0184a
 EBUILD bzr-0.17.ebuild 1804 RMD160 5ec6d8ebd1c269f6164bd8772f9ce57eee068c97 SHA1 23d96bd58546d5fed51f9c8874d6f555621adcd6 SHA256 c38c26beb493d615d9e733f291236160ddd44a265b97e06b962eeeb24b1d6cc3
 EBUILD bzr-1.1.ebuild 2664 RMD160 d49d2c2bc5394fd9d025dfbe79ddce01d64de701 SHA1 00084492be3d01dc3bf6666ef883a0cfe226e328 SHA256 01415e38629c58cb93877679526864db6e6fa0e7dd9aad9b4759b9b8027392d4
 EBUILD bzr-1.3.ebuild 2838 RMD160 a365d611b8dd2b91a2fed5c8d4a23f0fa52ff46f SHA1 02a0ac7550ea4802c24a8357ff4f31c4e010dbe3 SHA256 790c4392f82ee7edb053e5c608d3b2b41cf66604d57baae8069d7234aa010ce0
 EBUILD bzr-1.4.ebuild 2791 RMD160 ae7fabc3e6fb5a80e50d218469ceb2f486b0482e SHA1 410f4f9154f4a05211af532523f7c27f36139ca7 SHA256 96ed6f98b0327033008f57c8d79b8a11561822fa2e1cdc3a9f9cb8348ce6eb4f
 EBUILD bzr-1.5.ebuild 2947 RMD160 bb8feb52413136e4baa7a91035f2353ebf8246d1 SHA1 5e66d0830a7a2cea1cc086ad8ea3574fca413953 SHA256 8be410c953e671bac54c5cbfe10217c3f1aa09d378e053aa9660eb7ce22bf4a3
-MISC ChangeLog 8984 RMD160 b47676c0b0d569c788f81ad08e6bc69f3832ab99 SHA1 f303251a257193293b04be8985e2fa37895bac87 SHA256 2c9abb157b10c90b375f5736d39befcaee31dc5e5f55fba6ecd9c3e9c4372864
-MISC metadata.xml 769 RMD160 69fab44c435ad0fa7baf5f9ff0856d7f616a2f12 SHA1 51919da1471c134979f4364ad7f4047efa938e57 SHA256 e92fe2803216c22e2ba0459ccb7e192b398a65379b2527eca3d9f5568a9ff77c
+EBUILD bzr-1.6_rc5.ebuild 2947 RMD160 35a3007876f766e27f6bbe84ab3642bbf3318a5a SHA1 a845bf59a73b801d0ab9819375a7cc49aee67358 SHA256 e7dddd8118aa7cd8e2d89bcfcfc6769967e1404e6d619a176905cb4aefea98c5
+MISC ChangeLog 9196 RMD160 2c7e37d290c1a9a5d6ead4cac612f14f12eac661 SHA1 0e5bb11da4e331786990d68b9965d9eb496b1688 SHA256 dc534086b36d45749d768f968e44c703f69c98810eb39272a85cf071ade83160
+MISC metadata.xml 860 RMD160 98865988f16354ad7610236ea23edc1413944bf6 SHA1 b6aaf1352b5ecfec4ac3721bc6284d131ba45247 SHA256 71854455dc212e6bb7a361619da8278c06e6d4439a19cf5ec0b1082a994be972
diff --git a/dev-util/bzr/bzr-1.6_rc5.ebuild b/dev-util/bzr/bzr-1.6_rc5.ebuild
new file mode 100644
index 000000000000..6c2b3685fd2e
--- /dev/null
+++ b/dev-util/bzr/bzr-1.6_rc5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-1.6_rc5.ebuild,v 1.1 2008/08/23 07:06:36 pva Exp $
+
+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 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="curl emacs sftp test"
+
+RDEPEND="|| ( dev-python/celementtree >=dev-lang/python-2.5 )
+	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}-0.92-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
+
+	docinto developers
+	dodoc doc/developers/*
+	for doc in mini-tutorial tutorials user-{guide,reference}; do
+		docinto $doc
+		dodoc doc/en/$doc/*
+	done
+
+	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() {
+	# Some tests expect the usual pyc compiling behaviour.
+	unset PYTHON_DONTCOMPILE
+	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
+	# Just to make sure we don't hit any errors on later stages.
+	export PYTHON_DONTCOMPILE=1
+}
diff --git a/dev-util/bzr/metadata.xml b/dev-util/bzr/metadata.xml
index ac78b9eba1d4..a11fd5bed0cb 100644
--- a/dev-util/bzr/metadata.xml
+++ b/dev-util/bzr/metadata.xml
@@ -6,6 +6,10 @@
     <email>hawking@gentoo.org</email>
     <name>Ali Polatel</name>
   </maintainer>
+  <maintainer>
+  	<email>pva@gentoo.org</email>
+	<name>Peter Volkov</name>
+  </maintainer>
   <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