Fix support for Python 2.7, taken from upstream, reported by Alessandro Guido <alessandro.guido+bugzilla AT gmail DOT com> in bug 347555

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

4 files changed, 58 insertions, 7 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index 5065a104967b..4ad8d487cd11 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/bzr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.12 2010/11/27 10:53:02 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.13 2010/12/07 07:55:27 fauli Exp $
+
+  07 Dec 2010; Christian Faulhammer <fauli@gentoo.org> bzr-2.2.2.ebuild,
+  +files/bzr-2.2.2-python-2.7.patch:
+  Fix support for Python 2.7, taken from upstream, reported by Alessandro
+  Guido <alessandro.guido+bugzilla AT gmail DOT com> in bug 347555
 
   27 Nov 2010; Christian Faulhammer <fauli@gentoo.org> -bzr-2.0.4.ebuild,
   -bzr-2.2.0.ebuild:
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index dc6c4d52637c..2a8c28fcda26 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -6,18 +6,19 @@ AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d
 AUX bzr-0.90-tests-sgid.patch 607 RMD160 d40336d5c98fb777bdc1366b42ae4fb00e9d56f1 SHA1 5608d6a2e2215453523441ff9890e11aebbc289e SHA256 8bff8a500f96bbade348a11fdc70d00f9166774b8cc0a08c8d8dd3e33326bbcc
 AUX bzr-1.8-no-pyrex.patch 918 RMD160 36de25bb174bc66b512bd6b25a6cfd8a2cbb1ca3 SHA1 a118057a6f34b9ff2ddc90f01945820d87a983f3 SHA256 f213cd8a2f0444dd130a13e65ede34cade2da33b2ad739c8f4fd48e912ed7ebb
 AUX bzr-2.2.0-no-pyrex-citon.patch 1191 RMD160 5096704ac9547fe44e40b954d780141186de70d2 SHA1 1eb07ce2b3847c3a792c603241d209da3b1fffe2 SHA256 e24852b7ef0f698d3c870b71ba615a9452c8a62c6a5e0ac7328e074d4d4adef2
+AUX bzr-2.2.2-python-2.7.patch 1442 RMD160 b3abc70fe110c395f0fe9ea048dd2a3601709254 SHA1 d1ca99405c5d55c62355f947ff9a897985d4f55c SHA256 0595c35539d1845ed21466aeab3115cecb07ee3e424d39ad2683267adc67d24f
 DIST bzr-2.0.1.tar.gz 6101477 RMD160 a48492a27942f1001c1270fc8bb974135328c4b5 SHA1 e19c05e052290746de54f65254e056e39ba5e018 SHA256 3438bd7b5d07486d85a63cf47a26f3532ef7fb4019770ca48faddfa9875e06c9
 DIST bzr-2.2.1.tar.gz 6898362 RMD160 da29aeaa63b7b172e6cfddfed2c57bf054b08b66 SHA1 31ca3be090f2d0953a74dd83f3682099d5d28782 SHA256 46804359f6e7012f0e0489f5bebd5bdb12557e7a2acac5790fb315d5ed82b5d0
 DIST bzr-2.2.2.tar.gz 6897175 RMD160 888e0f59c88e0fde26adf697a9422ed732cc3329 SHA1 9db8f061d94ba3f0b48dcd623c473c6e8b570b6a SHA256 734ee0c3a64e7b820d6632ae0e2a4bf91add908fdebe5c82865618c38175c8e3
 EBUILD bzr-2.0.1.ebuild 3546 RMD160 f718e751e157f5b53ca82ac429aba09c21374f8f SHA1 68154bfbc75413d3a4b7df24a727160c83f3b72e SHA256 b94c608d42a995f790a66158e1c9b3332da20bc96fd896a107ba29ffe9fbabd5
 EBUILD bzr-2.2.1.ebuild 3654 RMD160 8636e0334980f672f3ae4cac2ff70f6e3371ace0 SHA1 2b0f5e1b7cc739afc90cc4c138ed3c75811899ac SHA256 49d9d048efd46a03021bcea5226ed7c65258a561e256aea018e9e5fa42b3e12f
-EBUILD bzr-2.2.2.ebuild 3744 RMD160 2b4c8f1193b6d11d4fcfefe74df62bbd09363414 SHA1 b951c633fcd0cf96c1e7d5c079befc344c4dcc52 SHA256 2d9d571e4620d7b66be63f880715abba1b1bb7231e5c253a77f0860b50a71266
-MISC ChangeLog 20551 RMD160 effc68d688f345eb180ef7d60121aa3cdbf41644 SHA1 92f7aaba3769386c60cf22e40fdac5e17a2fe975 SHA256 ab2d66e9da8d713c5056f38a8240e2cc114a2d4b7821b2648d28e1d1c6a77101
+EBUILD bzr-2.2.2.ebuild 4014 RMD160 028d9bfa17ac68bbb7b984bc499e0b9bad0be02d SHA1 70af4f7407f9784516c41abe1d6ded7b6103dc39 SHA256 e1e2c1fac7b42d7d9fbe0a9f55f8ebc27df4e76e716453f9590c7ad01a132e7b
+MISC ChangeLog 20803 RMD160 c0db6634b958782dfd1fb766a72c6af12e9432d0 SHA1 1c6efab4bdf8ddf287d307d05cd0ff6b577bdb4b SHA256 7624fd87d8ce8d697fc89117a7aa16c4213cf43064fe909ed173456e5b3046af
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzw42YACgkQNQqtfCuFneNBtACfWjfh+7qYzXDGxLF42u+2b5nd
-dU8An2Et6VVffI7q9gbLnjyDyoBWrts+
-=I2BT
+iEYEARECAAYFAkz96OwACgkQNQqtfCuFneMuTwCeNN0STREZCJNwxmMn5BAgTJFW
+qe4AnjGOrMo0upRENTMSlFUnJ/hGvCeQ
+=/yXk
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.2.2.ebuild b/dev-vcs/bzr/bzr-2.2.2.ebuild
index 718119df0654..5575976e3ab6 100644
--- a/dev-vcs/bzr/bzr-2.2.2.ebuild
+++ b/dev-vcs/bzr/bzr-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.2.2.ebuild,v 1.1 2010/11/27 10:48:28 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.2.2.ebuild,v 1.2 2010/12/07 07:55:27 fauli Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -49,6 +49,11 @@ SITEFILE="71bzr-gentoo.el"
 src_prepare() {
 	distutils_src_prepare
 
+	# Fix for changed behaviour of Python 2.7, integrated into Bazaar
+	# 2.3, might be a regression in Python, see
+	# https://bugs.launchpad.net/bzr/+bug/612096
+	# http://psf.upfronthosting.co.za/roundup/tracker/issue8194
+	epatch "${FILESDIR}"/${PN}-2.2.2-python-2.7.patch
 	# 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
diff --git a/dev-vcs/bzr/files/bzr-2.2.2-python-2.7.patch b/dev-vcs/bzr/files/bzr-2.2.2-python-2.7.patch
new file mode 100644
index 000000000000..88e67e0c2580
--- /dev/null
+++ b/dev-vcs/bzr/files/bzr-2.2.2-python-2.7.patch
@@ -0,0 +1,40 @@
+=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
+--- bzrlib/transport/http/_urllib2_wrappers.py	2010-05-08 05:56:28 +0000
++++ bzrlib/transport/http/_urllib2_wrappers.py	2010-09-15 02:43:44 +0000
+@@ -75,6 +75,26 @@
+     )
+ 
+ 
++class addinfourl(urllib2.addinfourl):
++    '''Replacement addinfourl class compatible with python-2.7's xmlrpclib
++
++    In python-2.7, xmlrpclib expects that the response object that it receives
++    has a getheader method.  httplib.HTTPResponse provides this but
++    urllib2.addinfourl does not.  Add the necessary functions here, ported to
++    use the internal data structures of addinfourl.
++    '''
++
++    def getheader(self, name, default=None):
++        if self.headers is None:
++            raise httplib.ResponseNotReady()
++        return self.headers.getheader(name, default)
++
++    def getheaders(self):
++        if self.headers is None:
++            raise httplib.ResponseNotReady()
++        return self.headers.items()
++
++
+ class _ReportingFileSocket(object):
+ 
+     def __init__(self, filesock, report_activity=None):
+@@ -656,7 +676,7 @@
+             r = response
+             r.recv = r.read
+             fp = socket._fileobject(r, bufsize=65536)
+-            resp = urllib2.addinfourl(fp, r.msg, req.get_full_url())
++            resp = addinfourl(fp, r.msg, req.get_full_url())
+             resp.code = r.status
+             resp.msg = r.reason
+             resp.version = r.version
+