Version bump (still in package.mask).

Package-Manager: portage-2.1.2_pre1-r2

4 files changed, 101 insertions, 8 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index 2f50a3a92557..6100ce854ce7 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,11 @@
 # 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.21 2006/09/25 16:02:42 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.22 2006/09/27 14:19:00 marienz Exp $
+
+*bzr-0.11_rc2 (27 Sep 2006)
+
+  27 Sep 2006; Marien Zwart <marienz@gentoo.org> +bzr-0.11_rc2.ebuild:
+  Version bump (still in package.mask).
 
 *bzr-0.11_rc1 (25 Sep 2006)
 
diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest
index 34e5ef83d02b..84ae430369a8 100644
--- a/dev-util/bzr/Manifest
+++ b/dev-util/bzr/Manifest
@@ -31,6 +31,7 @@ RMD160 6272a1ae8b7bcbd52a02b7e2687167ff6b70bf50 files/bzr-0.9-binary-diff.patch
 SHA256 a00e42dc7161d96a13e8f279862174ba2bd534e8da68d46c9a60f7308e96714b files/bzr-0.9-binary-diff.patch 3660
 DIST bzr-0.10.tar.gz 950911 RMD160 046dd9479e516b6e9b526df5f9baa2a7ec185a5b SHA1 d3cf0662e3b20678fb3161a0bb1cab4fa2d40e2a SHA256 4a9b5b2d0b2c33c91dabeb0831b3da660189eb38ad9c28c929ea64b79fecc20f
 DIST bzr-0.11rc1.tar.gz 1039733 RMD160 6ed38bf352c7ffdeb31841af52b42ae434e413d2 SHA1 661725f8fc346842e48035db73a1ed3a4a88cecd SHA256 a2d61bae15d561fdbdbd2a2091d23cf62026d24cc1bac9fef70fc007717b3151
+DIST bzr-0.11rc2.tar.gz 1040784 RMD160 3a990b6a4512294c6bf487947b52378afecd2d03 SHA1 72ad2665d3fde8c30687aa340331888f711b5b62 SHA256 408c32068433cbc5c4e883f57cf3008e05053d495533c5437a614448162a7072
 DIST bzr-0.9.tar.gz 935724 RMD160 e01328785bae9d275cc71311627a11edb5a89224 SHA1 6150ce2b814a738a72e3aab6d081769f9d2e14fe SHA256 a50ec64ee581d9ecfb0b87098398b3fbbe19c9bd55a7782f75fe7232d83fcf90
 EBUILD bzr-0.10-r1.ebuild 2048 RMD160 fcca7c85632376226ddba74149b61fe53b1161c8 SHA1 290745481e4d829ee2e2d62e8dab1080046ed847 SHA256 c18bae17227fb29cc92788968e3263f31dfa823566a2c499e22d7c1aa04dab2a
 MD5 a4fff8e769cf8f8a63774df2b364025b bzr-0.10-r1.ebuild 2048
@@ -44,14 +45,18 @@ EBUILD bzr-0.11_rc1.ebuild 1929 RMD160 0793af77d17a9a9af98e1da4860957856b4dbdfc
 MD5 cc8347d37dd539c9ad63a12f0a28cbb6 bzr-0.11_rc1.ebuild 1929
 RMD160 0793af77d17a9a9af98e1da4860957856b4dbdfc bzr-0.11_rc1.ebuild 1929
 SHA256 a84b100dfa51ff0cdf26d13f6cf7639a48d0a2f6fd750fb899662ef140b29f40 bzr-0.11_rc1.ebuild 1929
+EBUILD bzr-0.11_rc2.ebuild 1929 RMD160 f84f4fd1309cfa75a4d98e773d3842ec1749b47e SHA1 c661038e047ae5c4edbbb06bcf9fb5df27a88c51 SHA256 68298e8f6064ec1e4ee0e9d0f3db188d51b4cc5a2d8b5069a82010479ce6d1df
+MD5 7da62f168fa8fe0d7a84fceebc6e1ca3 bzr-0.11_rc2.ebuild 1929
+RMD160 f84f4fd1309cfa75a4d98e773d3842ec1749b47e bzr-0.11_rc2.ebuild 1929
+SHA256 68298e8f6064ec1e4ee0e9d0f3db188d51b4cc5a2d8b5069a82010479ce6d1df bzr-0.11_rc2.ebuild 1929
 EBUILD bzr-0.9.ebuild 1970 RMD160 52fddc843cc0d717f6da981a4daa0dd90f8513e2 SHA1 44e7695126fe93da50e9808568111fbd7eca0e64 SHA256 b7fdc41a3aba7c44f09ca14535cf9aae62a6bc432f2bdc7411cafd7d2018da33
 MD5 4e802871a8c23d8600489e887a028a62 bzr-0.9.ebuild 1970
 RMD160 52fddc843cc0d717f6da981a4daa0dd90f8513e2 bzr-0.9.ebuild 1970
 SHA256 b7fdc41a3aba7c44f09ca14535cf9aae62a6bc432f2bdc7411cafd7d2018da33 bzr-0.9.ebuild 1970
-MISC ChangeLog 3896 RMD160 66c744a6f2f7db064dd848fa5f605717872754ca SHA1 70aabf5790de720cabc110fe600a50ae26cab7a6 SHA256 8834ef28be6e17e08ed7b2a24c99736f717a4f244049faea89f4eb61c99ff50e
-MD5 8cf2371b96522d88be3e67a7186019de ChangeLog 3896
-RMD160 66c744a6f2f7db064dd848fa5f605717872754ca ChangeLog 3896
-SHA256 8834ef28be6e17e08ed7b2a24c99736f717a4f244049faea89f4eb61c99ff50e ChangeLog 3896
+MISC ChangeLog 4037 RMD160 a6dc414bfea3d9699f0c5cc301b3a7bb8bc77392 SHA1 e9bf1961dcbfbafbd4c53b395c0c1306024ee914 SHA256 bf9fd4b96d21ce82037510b032b68ba7585e74187bde9f2da536337423469062
+MD5 dc1d84be025bcd8559bc192aeabdab8c ChangeLog 4037
+RMD160 a6dc414bfea3d9699f0c5cc301b3a7bb8bc77392 ChangeLog 4037
+SHA256 bf9fd4b96d21ce82037510b032b68ba7585e74187bde9f2da536337423469062 ChangeLog 4037
 MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2
 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
@@ -65,13 +70,16 @@ SHA256 28ba75424157825714d6121567c2d8588c245052c1f491015ddea92ec5edea3c files/di
 MD5 65b3fb4af76c3548ae52341e5dcf4bad files/digest-bzr-0.11_rc1 238
 RMD160 02d8938005189a038482b47e6bcf737f382b7870 files/digest-bzr-0.11_rc1 238
 SHA256 f5a01aa7511fe41d1b11eb68d3fc8cd21addfeaa8e1b99ab874fac6b4694e6c9 files/digest-bzr-0.11_rc1 238
+MD5 dbe89c35670dc6062a0dfe16aeb6e9e6 files/digest-bzr-0.11_rc2 238
+RMD160 c5037f8362275cbb0577d7d4799ad25662ea3394 files/digest-bzr-0.11_rc2 238
+SHA256 8703e7bf1e38473fa4c78b1984c1ee3bcf1c318e1c2af82479ac09c7d1ebea6b files/digest-bzr-0.11_rc2 238
 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)
 
-iD8DBQFFF/2pUElL7eJpfEQRApGrAKCEuUbjinDd7kGfN3rUyA4QqQgUEACdGLP1
-AvgZIaFtKbt1EQ6zuzdRCGA=
-=O+MR
+iD8DBQFFGohdUElL7eJpfEQRApobAJ9nkyKzs+wYUXGxPr+xk8v+GA9juwCfSx4v
+L8nrgY9NOBISoStkTPbk01g=
+=nKqi
 -----END PGP SIGNATURE-----
diff --git a/dev-util/bzr/bzr-0.11_rc2.ebuild b/dev-util/bzr/bzr-0.11_rc2.ebuild
new file mode 100644
index 000000000000..4918643757d3
--- /dev/null
+++ b/dev-util/bzr/bzr-0.11_rc2.ebuild
@@ -0,0 +1,77 @@
+# 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.11_rc2.ebuild,v 1.1 2006/09/27 14:19:00 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 ~x86 ~x86-fbsd"
+IUSE="emacs test"
+
+python_rdep="dev-python/celementtree >=dev-python/paramiko-1.5"
+DEPEND=">=dev-lang/python-2.4
+	emacs? ( virtual/emacs )
+	test? ( $python_rdep )"
+RDEPEND=">=dev-lang/python-2.4
+	$python_rdep"
+
+PYTHON_MODNAME="bzrlib"
+
+DOCS="HACKING NEWS NEWS.developers"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Install the manpage in /usr/share/man instead of /usr/man
+	epatch "${FILESDIR}/${PN}-0.10-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/digest-bzr-0.11_rc2 b/dev-util/bzr/files/digest-bzr-0.11_rc2
new file mode 100644
index 000000000000..fb6186b8e822
--- /dev/null
+++ b/dev-util/bzr/files/digest-bzr-0.11_rc2
@@ -0,0 +1,3 @@
+MD5 bd5f8221b75e6844c147b7a69343bb7b bzr-0.11rc2.tar.gz 1040784
+RMD160 3a990b6a4512294c6bf487947b52378afecd2d03 bzr-0.11rc2.tar.gz 1040784
+SHA256 408c32068433cbc5c4e883f57cf3008e05053d495533c5437a614448162a7072 bzr-0.11rc2.tar.gz 1040784