Migrate to distutils-r1, bug 468796.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 111 insertions, 5 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index 71efdc54b9bc..9ebc1a6a1de3 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,11 @@
 # 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.68 2013/02/21 04:11:46 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.69 2013/05/07 17:55:44 floppym Exp $
+
+*bzr-2.5.1-r1 (07 May 2013)
+
+  07 May 2013; Mike Gilbert <floppym@gentoo.org> +bzr-2.5.1-r1.ebuild:
+  Migrate to distutils-r1, bug 468796.
 
   21 Feb 2013; Zac Medico <zmedico@gentoo.org> bzr-2.5.1.ebuild:
   Add ~arm-linux keyword.
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index a42fe0b09430..c899257f0193 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -12,13 +12,14 @@ DIST bzr-2.5.1.tar.gz 10451513 SHA256 967346fa6cc52971a8dfd5171ec22e1928cf455fb4
 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 2808 SHA256 3f7e393d0363bc757a88141259571a46b1f3e80a7996aa6222122b3ae34c7da8 SHA512 b5f121f096b5afc7b5a8430312b3524d1bf80af3a4068d55f2336d8f9ae9f8472147c9ddda898d4bcc00030d652e43864581a214b6920060b79d9565cf95d957 WHIRLPOOL 8fa3106c520ba2440f9dfb6354e65b774891fa94136dfb6430ee685314b003547cbf6bc5af4d72215bfa106d96c5480ba644b6318df23a2b045f3fca33b04933
 EBUILD bzr-2.5.1.ebuild 2464 SHA256 6ce7e6144949f463f3c24b17edd85853b538edf31445ab51e480d6edc6438151 SHA512 8972054e70e1fdaa80ada565d85138d62ebe7745784e93f6e1a1800c3a2dd56fdc4190eec93c9340286f14e844da46b979dd63a6d6e54b52c6a02329f16a82d7 WHIRLPOOL e19b98237c029d930e341f44567c68d6c43b566a9629a9d37c2e82601b0f2a88025477d8cdf8cdfc1eeaa9b821c7ba06d43e0d32d7cfb57dc31060559e41386f
-MISC ChangeLog 27474 SHA256 f372e1fe9f12ca498ebcded45ba4df51f4a89b5d500c4fc4d2f2ef1ef80bb99e SHA512 81c84ecbede7d92626c87d26988e5ee860201a3f05dc30b6f9b7f635386da93888f18f7633a60bffd66bbfa62663f0598d2b9ec40d5900b5eed88bb36b080c9b WHIRLPOOL 6d73ab23dc1ecd68a09a2a531ac8cb07bca7ce5cd82b47744a112a36971e78c91672dfac35520e7d4811a18a9f7cc33a57e5881ef602b7dfba8a7a12ec8440ae
+MISC ChangeLog 27614 SHA256 22a7c5f2244c5c1dfa2bba085f72ea83d6e1e86f3600398ed206f82633cbddec SHA512 a911387afe61a07e4718f86df8dbe939d85ba7087ab25941de9d0d916688880d221d6bb95d820f557e636bdbd3be10881914c2ed6eed60b273dcdf948729b04b WHIRLPOOL 808ce3b5a1211dbb750e02cdff6d046c0a464e98548bbe370f1871cdf0e45c284b9f8310bdbb78c532a4ea4f7d3d093c63ff6c78ca38ecdb5159f8aa1974ee97
 MISC metadata.xml 690 SHA256 62d739eb6428cc287b055f975c5aa73d82aed94510162e4cd6073f8afa2d4b16 SHA512 263f2818011bd953c361876912fe16b4ba6579f4b67817c17b3ee87280e485d6f891ad30b8f2552cbf9d03f32ef50377bc43b56febc9b940d93a097cad2573df WHIRLPOOL 5acc1a8be243101554d8db86d8887cd8816a108fb0924e2d515b6132cac4047223731eb465ff6d7f8f826311a9ba2a0c2857ac24414d238830ab900e6cd235ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlElnoQACgkQ/ejvha5XGaMIiQCfX+EGH3xhwaqCctq0nYny43aA
-z00AnRLw2Ci7MfOPd6CWyX6WJI9P/1lU
-=T8oC
+iF4EAREIAAYFAlGJQCEACgkQC77qH+pIQ6Tx1wD/aVojNl8XOnb8qVRAew3XbOKC
+Z0JjL/kYp/H3QDywIfcA/jw1afWDCQU0LadqLNPAtL7p2QA/LWL0oKLdsyRkKnTv
+=kGOs
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.5.1-r1.ebuild b/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..2c8b29685d33
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/05/07 17:55:44 floppym 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://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 ~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 ~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}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.2-no-pyrex-citon.patch"
+	"${FILESDIR}/${P}-sphinx-test-failures.patch"
+)
+
+src_compile() {
+	# Generate the locales first to avoid a race condition.
+	python_export_best
+	"${PYTHON}" setup.py build_mo || die
+
+	distutils-r1_src_compile
+}
+
+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
+}