Add a patch to fix backward compatibility for python <2.6, bug 363797.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

3 files changed, 99 insertions, 2 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 41f11f1ae995..5e28bef6a5e5 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.134 2011/04/17 18:43:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.135 2011/04/25 19:43:01 idl0r Exp $
+
+  25 Apr 2011; Christian Ruppert <idl0r@gentoo.org> layman-1.4.2.ebuild,
+  +files/layman-1.4.2-python-compatbility-fix.patch:
+  Add a patch to fix backward compatibility for python <2.6, bug 363797.
 
   17 Apr 2011; Jeroen Roovers <jer@gentoo.org> layman-1.4.1.ebuild:
   Stable for HPPA (bug #343309).
diff --git a/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch b/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch
new file mode 100644
index 000000000000..8b7d39a12f5b
--- /dev/null
+++ b/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch
@@ -0,0 +1,89 @@
+From a7aac809d740a7393c9fd20f701802a7786bba42 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <brian.dolbec@gmail.com>
+Date: Fri, 22 Apr 2011 23:53:19 -0700
+Subject: [PATCH] fix bug 363797 python-2.5 test errors.
+
+---
+ layman/overlays/bzr.py       |    2 +-
+ layman/overlays/cvs.py       |    4 ++--
+ layman/overlays/darcs.py     |    2 +-
+ layman/overlays/git.py       |    2 +-
+ layman/overlays/mercurial.py |    2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py
+index e73c2f4..4725c98 100644
+--- a/layman/overlays/bzr.py
++++ b/layman/overlays/bzr.py
+@@ -61,7 +61,7 @@ class BzrOverlay(OverlaySource):
+ 
+         # bzr pull --overwrite SOURCE
+         args = ['pull', '--overwrite', self.src]
+-        return self.run_command(*args, cwd=path([base, self.parent.name]))
++        return self.run_command(args, cwd=path([base, self.parent.name]))
+ 
+     def supported(self):
+         '''Overlay type supported?'''
+diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py
+index f8fc277..4924ca4 100644
+--- a/layman/overlays/cvs.py
++++ b/layman/overlays/cvs.py
+@@ -83,7 +83,7 @@ class CvsOverlay(OverlaySource):
+         args.append(self.parent.name)
+         args.append(self.subpath)
+ 
+-        return self.run_command(*args, cwd=base, env=dict(CVSROOT=self.src))
++        return self.run_command(args, cwd=base, env=dict(CVSROOT=self.src))
+ 
+     def sync(self, base, quiet = False):
+         '''Sync overlay.'''
+@@ -96,7 +96,7 @@ class CvsOverlay(OverlaySource):
+             args.append('-q')
+         args.append('update')
+         args.append('-d')
+-        return self.run_command(*args, cwd=path([base, self.parent.name]))
++        return self.run_command(args, cwd=path([base, self.parent.name]))
+ 
+     def supported(self):
+         '''Overlay type supported?'''
+diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py
+index 7d89477..12e75ec 100644
+--- a/layman/overlays/darcs.py
++++ b/layman/overlays/darcs.py
+@@ -60,7 +60,7 @@ class DarcsOverlay(OverlaySource):
+ 
+         # darcs pull --all SOURCE
+         args = ['pull', '--all', self.src]
+-        return self.run_command(*args, cwd=path([base, self.parent.name]))
++        return self.run_command(args, cwd=path([base, self.parent.name]))
+ 
+     def supported(self):
+         '''Overlay type supported?'''
+diff --git a/layman/overlays/git.py b/layman/overlays/git.py
+index caa73f4..8db6c51 100644
+--- a/layman/overlays/git.py
++++ b/layman/overlays/git.py
+@@ -70,7 +70,7 @@ class GitOverlay(OverlaySource):
+         args = ['pull']
+         if quiet:
+             args.append('-q')
+-        return self.run_command(*args, cwd=path([base, self.parent.name]))
++        return self.run_command(args, cwd=path([base, self.parent.name]))
+ 
+     def supported(self):
+         '''Overlay type supported?'''
+diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py
+index 06cf59d..ea3f9da 100644
+--- a/layman/overlays/mercurial.py
++++ b/layman/overlays/mercurial.py
+@@ -60,7 +60,7 @@ class MercurialOverlay(OverlaySource):
+ 
+         # hg pull -u SOURCE
+         args = ['pull', '-u', self.src]
+-        return self.run_command(*args, cwd=path([base, self.parent.name]))
++        return self.run_command(args, cwd=path([base, self.parent.name]))
+ 
+     def supported(self):
+         '''Overlay type supported?'''
+-- 
+1.7.3.4
diff --git a/app-portage/layman/layman-1.4.2.ebuild b/app-portage/layman/layman-1.4.2.ebuild
index c1672603ae77..a163d13eb4aa 100644
--- a/app-portage/layman/layman-1.4.2.ebuild
+++ b/app-portage/layman/layman-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.4.2.ebuild,v 1.4 2011/04/14 20:13:00 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.4.2.ebuild,v 1.5 2011/04/25 19:43:01 idl0r Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2:2.5"
@@ -34,6 +34,10 @@ RDEPEND="${COMMON_DEPS}
 	)"
 RESTRICT_PYTHON_ABIS="2.4 3.*"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python-compatbility-fix.patch"
+}
+
 # Prevent running make
 src_compile() {
 	: