Merge lp:~fauli/bzr-gentoo-overlay/bzr-live-overhaul into lp:bzr-gentoo-overlay

[Christian Faulhammer]

Updated the live ebuilds for bzr and bzr-difftools.

[Martin von Gagern (gagern)]

Looks like a definite improvement. difftools should probably support multiple ABIs as well, and the bzr ebuild will fail for FEATURES=bash-completion, but even so it's already an improvement. Will merge and push, and address the other issues in a week or two unless you beat me to it.

review: Approve

[Vincent Ladeuil (vila)]

Coming from bug #830405 and giving a quick look (I don't understand most of the stuff here :-/) but still:

53 +test_dep=">=dev-python/testtools-0.9.2

I'm pretty sure we require *at least* 0.9.5 (though older (circa 2.0 era) bzr selftest may not like it)

54 + dev-python/medusa

This was needed for the ftp tests but we now prefer pyftplib (see bug #781140 too),

=== modified file 'dev-vcs/bzr-difftools/Manifest'
--- dev-vcs/bzr-difftools/Manifest	2010-11-27 11:11:12 +0000
+++ dev-vcs/bzr-difftools/Manifest	2011-08-21 17:30:25 +0000
@@ -1,2 +1,2 @@
-EBUILD bzr-difftools-9999.ebuild 545 RMD160 9cdbd1347a6bbc0f1c8ac5ba1f6718807079cdef SHA1 3b6b306f533a819b44afa18a9379b99a198d30cb SHA256 c31ba941e62f937d474c32e710b51ca1b299546d15502f660634e49fc8f06a56
+EBUILD bzr-difftools-9999.ebuild 548 RMD160 9d4e75c17cb33de608d93c095c816a3d0802f1d0 SHA1 a976e7b6f3cb2ee0d9a359bd391d621f9337638b SHA256 c778befd39ba30d93c8459a63540498209757e9e8ab840719806136231ab5563
 MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4

=== modified file 'dev-vcs/bzr-difftools/bzr-difftools-9999.ebuild'
--- dev-vcs/bzr-difftools/bzr-difftools-9999.ebuild	2010-11-27 11:11:12 +0000
+++ dev-vcs/bzr-difftools/bzr-difftools-9999.ebuild	2011-08-21 17:30:25 +0000
@@ -23,6 +23,6 @@
 RDEPEND="${DEPEND}"
 
 src_install() {
-	insinto $(python_get_sitedir)/bzrlib/plugins/difftools
+	insinto $(python_get_sitedir -f)/bzrlib/plugins/difftools
 	doins *
 }

=== modified file 'dev-vcs/bzr/Manifest'
--- dev-vcs/bzr/Manifest	2010-12-20 18:28:01 +0000
+++ dev-vcs/bzr/Manifest	2011-08-21 17:30:25 +0000
@@ -1,5 +1,5 @@
 AUX 71bzr-gentoo.el 83 RMD160 409d99a9841616acedb77766074f65fe02c71ef0 SHA1 41ed64ffdbf3ab80a3fd054ca868ed82f3622da2 SHA256 4c60e63d561d32420b34d6749fed1b93dbfca7f235ec1c46402fc368ca707d1c
 AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d2ea566 SHA1 a41671354dcf7498039c421e81bc7d9fbbc7bb29 SHA256 b2275d04401bd4ba36c0a565f5e6b7c8471ca50acd48bbf5f5d1995b197809ec
 AUX bzr-0.90-tests-sgid.patch 611 RMD160 09a40cb4424e7dc86b48a577152cc7297c6333db SHA1 b7c42cb9b5cd5de4ebe11378870c6cf8eae52591 SHA256 e7514aa51c23405ba619c323b1bd6dbafffe5c584d8274d4e1df0c2347fd55a7
-EBUILD bzr-9999.ebuild 2960 RMD160 dec6241851375b228b6e2d8b8a6d35ba9a26da78 SHA1 1bcf46469813615121422e2c38462d92ae53c7cb SHA256 dd5b4d10fc5636eeb06a2665ef1c6bcddc777056e99962f3f08fdc96b0327a64
+EBUILD bzr-9999.ebuild 2967 RMD160 a7fddd7a6989997354a89ec2d58aa5d029b24a8e SHA1 2687d449dd1375f6e4f8fad7a49fa06135a092d2 SHA256 5a56410e03683d1e9e9222f5197c748e3af824b05326b046b3f8e30cbe32699e
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb

=== modified file 'dev-vcs/bzr/bzr-9999.ebuild'
--- dev-vcs/bzr/bzr-9999.ebuild	2010-11-27 11:11:12 +0000
+++ dev-vcs/bzr/bzr-9999.ebuild	2011-08-21 17:30:25 +0000
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -19,44 +19,45 @@
 KEYWORDS=""
 IUSE="curl doc emacs kerberos +sftp test"
 
-python_rdep="|| ( >=dev-lang/python-2.5 dev-python/celementtree )
+python_rdep="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-lang/python:2.5[xml] dev-python/celementtree )
 	sftp? ( >=dev-python/paramiko-1.5 )
 	curl? ( dev-python/pycurl )
-	kerberos? ( dev-python/pykerberos )
-	sys-libs/zlib"
-test_dep=">=dev-python/testtools-0.9.2"
+	kerberos? ( dev-python/pykerberos )"
+test_dep=">=dev-python/testtools-0.9.2
+	dev-python/medusa
+	dev-python/subunit"
 DEPEND="dev-python/pyrex
 	!=dev-python/pyrex-0.9.6.3
 	emacs? ( virtual/emacs )
 	test? (
 		${python_rdep}
 		${test_dep}
-		|| ( dev-python/pyftpdlib dev-python/medusa )
 	)"
 RDEPEND="${python_rdep}
 	test? ( ${test_dep} )"
 
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+DOCS="doc/*.txt"
+
 PYTHON_MODNAME="bzrlib"
 SITEFILE=71${PN}-gentoo.el
 
-DOCS="README NEWS doc/*.txt"
-
 src_prepare() {
-	# Don't run lock permission tests when running as root
-	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
+	distutils_src_prepare
 }
 
 src_compile() {
 	distutils_src_compile
+
 	if use emacs; then
 		elisp-compile contrib/emacs/bzr-mode.el || die
 	fi
 }
 
 src_install() {
-	distutils_src_install --install-data /usr/share
+	distutils_src_install --install-data "${EPREFIX}/usr/share"
+
 	if use doc; then
 		docinto developers
 		dodoc doc/developers/*
@@ -83,7 +84,7 @@
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 		# don't add automatically to the load-path, so the sitefile
 		# can do a conditional loading
-		touch "${D}${SITELISP}/${PN}/.nosearch"
+		touch "${ED}${SITELISP}/${PN}/.nosearch"
 	fi
 	insinto /usr/share/zsh/site-functions
 	doins contrib/zsh/_bzr
@@ -93,6 +94,7 @@
 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"
@@ -109,6 +111,11 @@
 }
 
 src_test() {
-	PYTHONPATH="build/lib*" "${python}" "${S}"/bzr --no-plugins selftest \
-		|| die
+	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
 }