version bump

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

3 files changed, 99 insertions, 6 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index 135af68f9597..dfad51ad7d88 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/bzr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.54 2012/04/11 21:30:18 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.55 2012/07/01 06:07:58 fauli Exp $
+
+*bzr-2.5.1 (01 Jul 2012)
+
+  01 Jul 2012; Christian Faulhammer <fauli@gentoo.org> +bzr-2.5.1.ebuild:
+  version bump
 
   11 Apr 2012; Christian Faulhammer <fauli@gentoo.org> bzr-2.5.0.ebuild:
   require ssl USE flag to be enabled on Python, see bug 409097
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 293fbbdec78f..44c4d2d50aaa 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -7,15 +7,17 @@ AUX bzr-2.4.2-no-pyrex-citon.patch 1203 RMD160 1be0b9a40f8b10542d49153c654789981
 DIST bzr-2.4.1.tar.gz 7279631 RMD160 539c5205fe9c1c6820ad6a87caddbdbe900f834c SHA1 5a9da32fe6dfdbd13826b293c007683c9858fcab SHA256 548bd4849e9e7fb3938277249fa026455e60054c78912d665694384af1f07fe6
 DIST bzr-2.4.2.tar.gz 7528721 RMD160 47ecfd1651d10aeea28c0dff3124c637dbbb93ab SHA1 3663b862dc8fb9729f9aae2427cbab2af9c901ad SHA256 a5b8db77c61e54450680befdbb4795f8a972fa5a167123786360d898b752656f
 DIST bzr-2.5.0.tar.gz 9910498 RMD160 3581accba3317b6f8b4ae889b0599d9546bb6877 SHA1 2eaf6340ffa35db425832419bbd88bb470d22af3 SHA256 cb657fca640d3c36794a20e5a1d7398404189541b1290fa1bf19a5eb4e903133
+DIST bzr-2.5.1.tar.gz 10451513 RMD160 c577d1aff17782774f0335d317d776a03a464d26 SHA1 7e2776e3aaf8fb48828026d3fc2a3047465eea5e SHA256 967346fa6cc52971a8dfd5171ec22e1928cf455fb4317013b05b0915ff927982
 EBUILD bzr-2.4.1.ebuild 4614 RMD160 529ee2b32c5717fa01dc2acdb195b4b35a2225b3 SHA1 8d072c9964ac3038d78d4ee2bcf5833b4c35938a SHA256 c800f95e7f7ac4c82df51fc7a2bb8a711f3d36e0c929a8adb92a735b4e16e001
 EBUILD bzr-2.4.2.ebuild 3665 RMD160 7475bfd411aec990083e83020a8eea3e3d9e33c1 SHA1 867e3113cd50955815055d7b6582961e7f41e4e1 SHA256 afc7108f83b395335a94721a8d32f9c3b743bcd075ea59d68b2935753bbab305
 EBUILD bzr-2.5.0.ebuild 2393 RMD160 5ac921126b97563a98a5d706c573311804e9323d SHA1 c8f3e5ab6d3bdf4805b45d85e3735677bd8e5681 SHA256 9aa2b3749cd6174201fb540223f041154127500c20dddddc6cbda1bc70254c6f
-MISC ChangeLog 25869 RMD160 be1a2d09dd40c9e40835178a6faafb9282f95074 SHA1 d11fa3ca2147a8f1292b44c6d3386d232550f81d SHA256 9464615cd777c5a3d17b342d087c5b943b9dfde2acbc02f06def132304a2b9ba
+EBUILD bzr-2.5.1.ebuild 2393 RMD160 4dcb83b433bd3819c97eb19b210550e4fcbb8468 SHA1 52299851496570763e87f0cfc1c7036c9f95f3ff SHA256 1fa8b3022b234acb75edc432308bf44300af57409e193452bf8fe3b35d50fc11
+MISC ChangeLog 25985 RMD160 dfa119ac1b872cc43b1a1df6372ebc0e5f2c8cb8 SHA1 cb3e71f3d4edb2461215cbf2b3c64fc6dd782b3d SHA256 002d1cc75df53b9378ec5831512474a47bcb40df6b382e925dc5ca1ff3fe20c1
 MISC metadata.xml 690 RMD160 da573c876cd74b8d239d525137a84cc32b713f13 SHA1 8171b00c0f55742ca55167875509927162743d2a SHA256 62d739eb6428cc287b055f975c5aa73d82aed94510162e4cd6073f8afa2d4b16
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+F9/AACgkQNQqtfCuFneNMpwCfWr5qr9P3tM/h8OErkR1AbIca
-Lu8An2eCQAL+eFpVWpv+p35cmIkNUzyP
-=wU7/
+iEYEARECAAYFAk/v6ZQACgkQNQqtfCuFneMXvwCfUfPwHg9BT/+jUAAWd2nVmTTI
+Ep0An3ul/ljKAcfLsDqL4D06TFudKndu
+=ezBW
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.5.1.ebuild b/dev-vcs/bzr/bzr-2.5.1.ebuild
new file mode 100644
index 000000000000..76bc1a2238d4
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.5.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.5.1.ebuild,v 1.1 2012/07/01 06:07:58 fauli Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="threads ssl"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45] 3.* 2.7-pypy-*"
+
+inherit bash-completion-r1 distutils 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 ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="curl doc +sftp test"
+
+RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-python/celementtree )
+	curl? ( dev-python/pycurl )
+	sftp? ( dev-python/paramiko )"
+
+DEPEND="test? (
+		${RDEPEND}
+		|| ( dev-python/pyftpdlib dev-python/medusa )
+		dev-python/subunit
+		>=dev-python/testtools-0.9.5
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+DOCS="doc/*.txt"
+PYTHON_MODNAME="bzrlib"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# Don't regenerate .c files from .pyx when pyrex is found.
+	epatch "${FILESDIR}/${PN}-2.4.2-no-pyrex-citon.patch"
+}
+
+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/850676
+	skip_tests+="per_transport.TransportTests.test_unicode_paths.*"
+	skip_tests+=")"
+	if [[ -n ${skip_tests} ]]; then
+		einfo "Skipping tests known to fail: ${skip_tests}"
+	fi
+
+	testing() {
+		LC_ALL="C" "$(PYTHON)" 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
+
+	dobashcomp contrib/bash/bzr || die
+}