Version bump to 2.6.0. Needed for some of my tasks. Restrict tests as they fail and upstream does not care much. bug#487216.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

3 files changed, 120 insertions, 7 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index bf7e02295593..f343efa727cf 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/bzr
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.71 2013/11/19 18:50:51 grobian Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.72 2014/04/04 14:49:53 scarabeus Exp $
+
+*bzr-2.6.0 (04 Apr 2014)
+
+  04 Apr 2014; Tomáš Chvátal <scarabeus@gentoo.org> +bzr-2.6.0.ebuild:
+  Version bump to 2.6.0. Needed for some of my tasks. Restrict tests as they
+  fail and upstream does not care much. bug#487216.
 
   19 Nov 2013; Fabian Groffen <grobian@gentoo.org> bzr-2.5.1-r1.ebuild:
   Marked ~m68k-mint, bug #491080
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 18b8d9b6e1d1..c14bef909fb4 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -9,17 +9,29 @@ DIST bzr-2.4.1.tar.gz 7279631 SHA256 548bd4849e9e7fb3938277249fa026455e60054c789
 DIST bzr-2.4.2.tar.gz 7528721 SHA256 a5b8db77c61e54450680befdbb4795f8a972fa5a167123786360d898b752656f SHA512 7a54f242618adafea989d904cc4c5c0b8c53c40b4d5548cf393109a134b8319f19a57e72927e7c1b6872feacea8a17ed92df3cd0e36ca22dd1ad8959ad0c4294 WHIRLPOOL 3bf6f2db16dae3466d76537fc6cc8c37cb7872fa94dd6f0d6a6c2a2b3a4b76fce00b5fd673eeb6656a4d277b03b3647e76b208b06834e1dbacd5f7a9041653f9
 DIST bzr-2.5.0.tar.gz 9910498 SHA256 cb657fca640d3c36794a20e5a1d7398404189541b1290fa1bf19a5eb4e903133 SHA512 9c995e8e3b4a46cf4d4b77322db5428c4649fb99a080915a25b8d9f31b1b141f1a950fb214d80c01a2a0ab57635062cf5651d41ec86d82a8d6964848c1e3424e WHIRLPOOL c444a0515fa51be444f5dd0c674c2bd2cc9249946469397cfb20224f305f946d51ad3fb920f0e6785369bff0bab84178e51f1bb96192e5b78419f7cd9416a378
 DIST bzr-2.5.1.tar.gz 10451513 SHA256 967346fa6cc52971a8dfd5171ec22e1928cf455fb4317013b05b0915ff927982 SHA512 40700d0f4f61bb1609d85772812249114c9e7af619143aafec97163617cb58828e63bda22abf576704848b479463bb85c0b2dc7e5bb49108f48fa397c7bfe85c WHIRLPOOL 34e90eb01e49840bc2eedba6a664fe936ecc6fcc75e3f350a21a2d868609672984182e50f4f3f127da2e7e8b6dbf229aca587fc8dfe1522cf9bbe1d5c9272288
+DIST bzr-2.6.0.tar.gz 11301124 SHA256 0994797182eb828867eee81cccc79480bd2946c99304266bc427b902cf91dab0 SHA512 f40d4380a837321c2ed168d15b0b5d31e9de6df93c0f8f2fd9b16c9351524b0afac5b8744740f587e9704efeb4cc004cae7f35aed47f73b5c796cbe2526af980 WHIRLPOOL a20f45bebb480e0d9d2052373b671ca32f39f52ef3a04800a5d0662248347cbde8a37d24dbaccc6809a7a046646d10bb62ab392302a3dfe983afca0479ce242e
 EBUILD bzr-2.4.1.ebuild 4614 SHA256 c800f95e7f7ac4c82df51fc7a2bb8a711f3d36e0c929a8adb92a735b4e16e001 SHA512 87be426832f371dc44b8c6d5b09ca405d55a1778934eaf155814940e2d430f945a2ca35377a4a94f31b68f1fdefe1fc71af375f0abf8547f5c706f7684bce349 WHIRLPOOL ec1a2f3ca9a74d0d249870bebdeb679a5aa082839b995988f593d2ff2243047fc82271792ecd798cf61f2925739254c59a938e1dc00aa63978d29bea15a6dd50
 EBUILD bzr-2.4.2.ebuild 3665 SHA256 afc7108f83b395335a94721a8d32f9c3b743bcd075ea59d68b2935753bbab305 SHA512 36e69155f9144ddcab1de375632f0aef397a9f2f50d4324ff7dd285e79510427aa3df8f5ac35896a852018585e4812a3aacb75df87550540ca4febecf52ba13e WHIRLPOOL 53cb581830c21df2e19604498156d4ab728d29292a4d930a2135f18c3319634108b2c94eaa98cb192fa705c6b49876b50e5d7c06708214c6f917a929682695e1
 EBUILD bzr-2.5.0.ebuild 2393 SHA256 9aa2b3749cd6174201fb540223f041154127500c20dddddc6cbda1bc70254c6f SHA512 721c8861b3598af94811d99d2879af951796e84270bf917464605f09e4d4bf946832402380b54724209301451fb41c014998b1a55d26f00f28c4154a9cd3ab28 WHIRLPOOL 4431b345b3bf846a6067479ae06bbc788929c75274ba2d252d901dc83bec43680755f8c14baf6e3d992c37e03ab730812a14bbc3ef42e6a4a758f1d4823969bb
 EBUILD bzr-2.5.1-r1.ebuild 2763 SHA256 2b56d208650ca66ea0ba7bac6fa9295e2f22e6c3587b1ed126da05004c82eb0d SHA512 ff2c3344187091360cbd2b4a178a7d8daec5afc3556c454c097a8723d0ff0e48ceca872f73aacc48ddd36fdbcacaa9530c6287b7adee46ca4d635c693edd02ea WHIRLPOOL 6678a739017c79cd8879243bd21b64b06d3d2e20ee3971a1fff9c80ec1e44f66ced43e6684d025d7a6154b65c819cfc28929f392a4c07c159d3beb9cdab18e97
 EBUILD bzr-2.5.1.ebuild 2464 SHA256 6ce7e6144949f463f3c24b17edd85853b538edf31445ab51e480d6edc6438151 SHA512 8972054e70e1fdaa80ada565d85138d62ebe7745784e93f6e1a1800c3a2dd56fdc4190eec93c9340286f14e844da46b979dd63a6d6e54b52c6a02329f16a82d7 WHIRLPOOL e19b98237c029d930e341f44567c68d6c43b566a9629a9d37c2e82601b0f2a88025477d8cdf8cdfc1eeaa9b821c7ba06d43e0d32d7cfb57dc31060559e41386f
-MISC ChangeLog 27915 SHA256 71bacc0466a3a0907398f7d2857d35005c036ab7603b636a4cafdad16b17b40f SHA512 714fd8d84cda5511ae9feb6cea4531287947f5756f573796bfd1e36d27dd4727d80589347f58943285954795aae10fd55608f87b84e68f2191742bd19e629026 WHIRLPOOL 65895191152c643deb419ab7f48a1d0d99225068e7ecb959db4e9ff2b55466760d311d2dfb90507292d19c99c81a16034df050b873b707ecbeb827f966f050c6
+EBUILD bzr-2.6.0.ebuild 2679 SHA256 b0652af059b521c854df3b28e4b1d380677d386a7b6a50af2b649dae9e425895 SHA512 66d6c2dc423086032a882eaefa12aa59a6cc60539c983b9a2914f9a0d48716c0d76fc064f1133533c73b0b598e2efa6d68812eb4a076f30c5af543c1e90042a6 WHIRLPOOL 0785b01163b7d933e7767a011918500dd85a8bc7f68d663d661a9ca6888c5c9b367827170aa48ca64d31cd1ca37381617b49c8a6f297852b8ff2b2e767f3d5cf
+MISC ChangeLog 28147 SHA256 d524c5753eb02c01d7630cbfc61dcd0b849e103bc6a9caea329490c5b677c397 SHA512 284aa79af956bf83fbc6e274d00b281acc09cdb25fb3e127cc05b9dd2d4233866b3c8a390d5bead821d357665af22ce4dd0ac8f9d3ea988909b91bb3b778c59c WHIRLPOOL 8a7be9b46eb06ea47f0130bcc60b9467bd8ad3c39e75061d71c5c716dd61644e0d5c83191ae10d6d25e79006880eb0befda8f568fba2704f3a8fd4470ddbc496
 MISC metadata.xml 690 SHA256 62d739eb6428cc287b055f975c5aa73d82aed94510162e4cd6073f8afa2d4b16 SHA512 263f2818011bd953c361876912fe16b4ba6579f4b67817c17b3ee87280e485d6f891ad30b8f2552cbf9d03f32ef50377bc43b56febc9b940d93a097cad2573df WHIRLPOOL 5acc1a8be243101554d8db86d8887cd8816a108fb0924e2d515b6132cac4047223731eb465ff6d7f8f826311a9ba2a0c2857ac24414d238830ab900e6cd235ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (Darwin)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKLsw0ACgkQX3X2B8XHTonEOQCeL5fqJYTomP0b5n/GGE32za1H
-8MoAnRYREg+aVfowjaoKVrugxggg5wU8
-=A1T1
+iQIcBAEBCAAGBQJTPsdVAAoJEOSiRoyO7jvoEUUP/0NxukacP9d/R/MhkXX4RgWW
+jmxJEY5Dv1vpi6bqyQ/Mj2hq5hmUCHUUFK5foFD6meOYTKYz1CKXkylgChxILAg5
+WJWGXnQqkqOp3iQQfV6lKsuTm16jdYvcw5xDRArIqdkknIXIxB7gWTeDDq2UFGLJ
+RJ2LFk9reUU/nhlupNdC1zOXNMHU6pwVzo4pJ9HPe0xrjm+9iWpIqX5Q78g4svce
+TY0+hI1ZgtKql6keO5gYFsRysah80Ep57uYCN20ZAMb+k7vYMVVyT+yetT/d9rEr
+yjVjIsFY5es35pZC2f52KPezOUormXt36Jw2VTuMTOse0CIbeBvmZIqnEDGqB6FM
+Pnt4N+LlflRjR0Y+4NQiT2JUsTTXxnntng+zQ5sCT+0LwCmHzrXHPhWh5yEF0BOH
+olQrL6N3s5qY7TO/0qMQmkwznroEP9s3toSdxgKzU7+japN73KND1wXRwjVHtPNu
+/mC874GeIbXV7Hup7CuR4WpQBHRy2f82t9mLSI4jIHAItvMpgtTCmZ5lY7ZCZrUb
+qO6IN089W8Z44bPLsfC8f55PoArsQk3u0TMngSk51r0rFpA15fOp1P3N++VdWcw3
+xnhiYyrwcU3U8mPgt6ZWcYBISYCG4kxsUJGl4TkdukQmo9oSv0VF9CVuQd9pcLHN
+LK6VVB5l3SsVtHe1DS7x
+=QwAI
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.6.0.ebuild b/dev-vcs/bzr/bzr-2.6.0.ebuild
new file mode 100644
index 000000000000..f85ea5ba64c5
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.6.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.6.0.ebuild,v 1.1 2014/04/04 14:49:53 scarabeus Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="threads,ssl,xml"
+
+inherit bash-completion-r1 distutils-r1 eutils flag-o-matic 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://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE="curl doc +sftp test"
+
+RDEPEND="curl? ( dev-python/pycurl[${PYTHON_USEDEP}] )
+	sftp? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
+
+DEPEND="test? (
+		${RDEPEND}
+		>=dev-python/pyftpdlib-0.7.0[${PYTHON_USEDEP}]
+		dev-python/subunit
+		>=dev-python/testtools-0.9.5[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+# Fails tests bug#487216
+# Upstream is not exactly keen on fixing it
+RESTRICT="test"
+
+python_configure_all() {
+	# Generate the locales first to avoid a race condition.
+	esetup.py build_mo
+}
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+src_test() {
+	# Race due to conflicting ports in
+	# blackbox.test_serve.TestBzrServe.test_bzr_serve*.
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
+python_test() {
+	# Some tests expect the usual pyc compiling behaviour.
+	local -x PYTHONDONTWRITEBYTECODE
+
+	# 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
+
+	LC_ALL="C" "${PYTHON}" bzr --no-plugins selftest -v \
+		${skip_tests:+-x} "${skip_tests}" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# Fixup manpages manually; passing --install-data causes locales to be
+	# installed in /usr/share/share/locale
+	dodir /usr/share
+	mv "${ED%/}"/usr/{man,share/man} || die
+
+	dodoc doc/*.txt
+
+	if use doc; then
+		docinto developers
+		dodoc -r doc/developers/* || die
+		for doc in mini-tutorial tutorials user-{guide,reference}; do
+			docinto ${doc}
+			dodoc -r doc/en/${doc}/* || die
+		done
+	fi
+
+	dobashcomp contrib/bash/bzr || die
+}