version bump

Package-Manager: portage-2.1.9.42/cvs/Linux i686

3 files changed, 146 insertions, 6 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index a980a5222b37..148cdd45ccfd 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/bzr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.23 2011/02/25 22:28:08 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.24 2011/03/22 20:19:17 fauli Exp $
+
+*bzr-2.3.1 (22 Mar 2011)
+
+  22 Mar 2011; Christian Faulhammer <fauli@gentoo.org> +bzr-2.3.1.ebuild:
+  version bump
 
   25 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
   -files/bzr-1.8-no-pyrex.patch, -bzr-2.0.1.ebuild, -bzr-2.2.1.ebuild:
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index ded796f0a96c..5a6711d624df 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -9,15 +9,17 @@ AUX bzr-2.2.2-python-2.7.patch 1442 RMD160 b3abc70fe110c395f0fe9ea048dd2a3601709
 DIST bzr-2.2.2.tar.gz 6897175 RMD160 888e0f59c88e0fde26adf697a9422ed732cc3329 SHA1 9db8f061d94ba3f0b48dcd623c473c6e8b570b6a SHA256 734ee0c3a64e7b820d6632ae0e2a4bf91add908fdebe5c82865618c38175c8e3
 DIST bzr-2.2.4.tar.gz 6900607 RMD160 57b5daa0ac94d727dee003a66fabea251d49324a SHA1 f63b93bde9372acd792e23c598789ea4c8c35577 SHA256 3ba84414cce4435dd34f4f1d7c94691587e6aa0b6677c361af17d74fb90a657e
 DIST bzr-2.3.0.tar.gz 7025246 RMD160 ce7d70c683f6b6186e26e73a856648846ab6b90c SHA1 42a5b270e75a57883ead3cee9e623e087f16afd8 SHA256 579c21e0d29e6bac80e53bef9f220cae7675407208c5ca967302f31370d0faee
+DIST bzr-2.3.1.tar.gz 7026390 RMD160 f284b61ae93e7db6a34107a309005ebb2be7f55f SHA1 49b9dfb5a01ffd87a120f8a7abf4833a482ba245 SHA256 a35ca8e0118ee21ff226cb7f3bb167f56e8eccd3d4b5e9d94266e34778207d1e
 EBUILD bzr-2.2.2-r1.ebuild 4015 RMD160 10416782f02e340b752c6e96f625f87fcee3acca SHA1 ba43414a6a8f8e46c7986657ba701970c29a990f SHA256 c989c954a81235bf6e55044e55802c61d06132e2fd3baaace2d6f58f94f4ab52
 EBUILD bzr-2.2.4.ebuild 4014 RMD160 407c33aeb19274ad617f4788f7548e3f0bf0ebb5 SHA1 808caee54c1841a8137b86ab0ff5c73b8e7b3779 SHA256 8e992be8cadaf825c07dd392eb524cddca535ab745f0770539446e5adea13b3a
 EBUILD bzr-2.3.0.ebuild 3709 RMD160 923c4972af7f74576983f2511c206eebb3625ccf SHA1 c534e65ad7580a5ea6e9ce1b67df8d9c72d8ee7c SHA256 14a5089ff9d4d6eaebd818486ea10aff80027fa07d9c5e04ef109f294ce07026
-MISC ChangeLog 22030 RMD160 254cd63549794db6f4604bfd3a2edef8758d4671 SHA1 63de84ee1d4cf38a5c6f2d738eb2b21f9e274eed SHA256 e9529babf60afb9bb4104ae29179d85fd3e6369625cff9d5159d4c4d54c14d30
+EBUILD bzr-2.3.1.ebuild 3709 RMD160 10db0f24e950dd9f8d74034409c91abc51878955 SHA1 93485e179ba95405b19019436b6045d4d641ffc7 SHA256 f73624c73a1212771122939bc1a5d4792ffe02b6f46064fd7af84fb1fe8ffd95
+MISC ChangeLog 22146 RMD160 ee8e96d39194566e0e9aa39237fb0f11d67db943 SHA1 f512f6af4fe666f7bcc6de1e27e79479fc51c216 SHA256 be07a5ae9c65b4f83278ded55f0cb02c9711e75a9552772ae07c11878bd7813d
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1oLQIACgkQNQqtfCuFneNvzQCfa69odUelwL2TgbjR+/safDhk
-2kEAnAqP721/vtfWRcz0kXT1qR3CJo/g
-=7m7j
+iEYEARECAAYFAk2JBF0ACgkQNQqtfCuFneOFPwCeOSt1rakCfuH+eXnPS/IirBKQ
+G8gAoIF9X3duaoLn8h3+EbRpa+bm3ahr
+=2Tdc
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.3.1.ebuild b/dev-vcs/bzr/bzr-2.3.1.ebuild
new file mode 100644
index 000000000000..c653012dfd73
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.3.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.3.1.ebuild,v 1.1 2011/03/22 20:19:17 fauli Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit bash-completion distutils elisp-common eutils versionator
+
+MY_P=${PN}-${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}/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="curl doc emacs +sftp test"
+
+# Disable until https://bugs.launchpad.net/bzr/+bug/656170 is fixed.
+RESTRICT="test"
+
+RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-lang/python:2.5[xml] dev-python/celementtree )
+	curl? ( dev-python/pycurl )
+	sftp? ( dev-python/paramiko )"
+
+DEPEND="emacs? ( virtual/emacs )
+	test? (
+		${RDEPEND}
+		dev-python/medusa
+		dev-python/subunit
+		dev-python/testtools
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+DOCS="doc/*.txt"
+PYTHON_MODNAME="bzrlib"
+SITEFILE="71bzr-gentoo.el"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# Don't regenerate .c files from .pyx when pyrex is found.
+	epatch "${FILESDIR}/${PN}-2.2.0-no-pyrex-citon.patch"
+	# Don't run lock permission tests when running as root
+	# Has to be backported, tests are restricted anyway
+#	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
+	fi
+}
+
+src_test() {
+	# Some tests expect the usual pyc compiling behaviour.
+	python_enable_pyc
+
+	# Define tests which are known to fail below.
+	local skip_tests="("
+	# https://bugs.launchpad.net/bzr/+bug/456471
+	skip_tests+="bzrlib.tests.blackbox.test_version.*|"
+	# https://bugs.launchpad.net/bzr/+bug/392127
+	skip_tests+="test_http.*"
+	skip_tests+=")"
+	if [[ -n ${skip_tests} ]]; then
+		einfo "Skipping tests known to fail: ${skip_tests}"
+	fi
+
+	testing() {
+		LC_ALL="C" "$(PYTHON -2)" bzr --no-plugins selftest ${skip_tests:+-x} ${skip_tests}
+	}
+	python_execute_function testing
+
+	# Just to make sure we don't hit any errors on later stages.
+	python_disable_pyc
+}
+
+src_install() {
+	distutils_src_install --install-data "${EPREFIX}/usr/share"
+
+	if use doc; then
+		docinto developers
+		dodoc doc/developers/* || die
+		for doc in mini-tutorial tutorials user-{guide,reference}; do
+			docinto $doc
+			dodoc doc/en/$doc/* || die
+		done
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.el* || die
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/.nosearch"
+	fi
+
+	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
+}