Applying python 2.6 patch, bug 253582

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

4 files changed, 45 insertions, 10 deletions

diff --git a/kde-base/dcoppython/ChangeLog b/kde-base/dcoppython/ChangeLog
index 087db7b8e4e9..f715befc478d 100644
--- a/kde-base/dcoppython/ChangeLog
+++ b/kde-base/dcoppython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/dcoppython
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/ChangeLog,v 1.73 2008/09/13 23:57:14 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/ChangeLog,v 1.74 2009/04/16 19:19:41 tampakrap Exp $
+
+  16 Apr 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  +files/dcoppython-3.5.10-python-2.6.patch, dcoppython-3.5.10.ebuild:
+  Applying python-2.6 patch, bug 253582
 
 *dcoppython-3.5.10 (13 Sep 2008)
 
diff --git a/kde-base/dcoppython/Manifest b/kde-base/dcoppython/Manifest
index 3a5a0f418a8a..a025b588e37b 100644
--- a/kde-base/dcoppython/Manifest
+++ b/kde-base/dcoppython/Manifest
@@ -1,9 +1,10 @@
+AUX dcoppython-3.5.10-python-2.6.patch 1241 RMD160 4657fa78582e8a2446600b029ebc09b73336d6a8 SHA1 787dfb5b517a163c8b61dc6aa1750c8c35eca7cd SHA256 679d2c1b9f6b95437d1ed94b1795fb97233c5793b98cbde1ed21df9cf644cb42
 AUX dcoppython-3.5.5-python-2.5-compat.diff 344 RMD160 3bb751206caa57e119eeaa136a310e2a409521ab SHA1 047776da3bf7b9852559371bf66d8b6e437e407a SHA256 14bcb76dd5850ea3480d711719682b006009beaa4c2b2039acfdc6174adf0f9c
 AUX dcoppython-3.5.6-python-2.4.patch 640 RMD160 dddb1876406fe73fdc2987ac49a10a2887600777 SHA1 ebaef9c18e9c4d452f8b0b22414db601a74da18f SHA256 dee6b5f32babb0d2e3c8c982fa8a0d13df85ec92f64db9cc264f093707f3233d
 AUX no-gtk-glib-check.diff 949 RMD160 6df47b78e158fb7e38a49c30627421186d83e3da SHA1 234a650d3b629e41b2249ae99e6f7b0ee44fcf63 SHA256 f2721c8a1567ab9e259e216372a6552f8910fd33bc82390d8556aff00b0ba8df
 DIST kdebindings-3.5.10.tar.bz2 5735439 RMD160 0c6b4690455a131c90a1e27a3345aa2a2e9d6b99 SHA1 42946974889ec44a1eb9c54c8b0832d6f1af6719 SHA256 438fb601ec109f542aa721abad0d21b424e6225e3fd3081919981a69ad59b6ad
 DIST kdebindings-3.5.9.tar.bz2 5737416 RMD160 c2c906a61c72eb8edfb6f9b82d74b7cc2d0c222c SHA1 14fcec6c93bffa94b10201dd03d87ffcd6fb5281 SHA256 76e2c05970d1edd15fc3850296ae791d7da0b19759794209dbb743919f5434ea
-EBUILD dcoppython-3.5.10.ebuild 719 RMD160 7045b25696d607d8ee9c1730c739f7a278b93653 SHA1 cef8716469e296d8b67af40a93b4fe3b8eb90289 SHA256 ba9c884e082246623e8c8c450a96398eb99d570123066b74198cda9240ff43b7
+EBUILD dcoppython-3.5.10.ebuild 720 RMD160 912df2a113e9bf9e47fa732091812847612efdc8 SHA1 d532c501a4bcbb9d3c8cc24a0d1576b1fa68aa77 SHA256 8580ada185ca4e1dec85f063b5550b21cbd0c5c8a995ad5d10f3b0e9f3d62347
 EBUILD dcoppython-3.5.9.ebuild 713 RMD160 4d06e9f447086c1f9b589195351d07d3db920e58 SHA1 52287caf94eae59e3296fdd5fc5476572fa38340 SHA256 f52c399986944333e2cf3f587a3474222e3d0282f455772a5594c0c11d9ae586
-MISC ChangeLog 9754 RMD160 61efdd40bb8cd91d67263b36999b6ff5a11da810 SHA1 51c544be1d0e978439db36ed2fe22a528f135493 SHA256 7c2342df8552e4ec65ac03bf35b08e456b3e2b3708d1b292cea9d25a35a5734e
+MISC ChangeLog 9926 RMD160 a935c06fe7fe86172235a5a7399d8b95db5ea3a6 SHA1 aea4f6d81ed4f501bcb2ecb1e389ea9174e705ac SHA256 1dfca99511487f0a6f48fc1f6395136d6e602df456ab09a308fa85391a0e2c5a
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/dcoppython/dcoppython-3.5.10.ebuild b/kde-base/dcoppython/dcoppython-3.5.10.ebuild
index 29d764470f4c..bd0263e33c5d 100644
--- a/kde-base/dcoppython/dcoppython-3.5.10.ebuild
+++ b/kde-base/dcoppython/dcoppython-3.5.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.5.10.ebuild,v 1.1 2008/09/13 23:57:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.5.10.ebuild,v 1.2 2009/04/16 19:19:41 tampakrap Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -16,10 +16,10 @@ DEPEND="virtual/python"
 # and it installs into /usr entirely
 SLOT="0"
 
-PATCHES="$FILESDIR/no-gtk-glib-check.diff"
+PATCHES="$FILESDIR/no-gtk-glib-check.diff
+	 $FILESDIR/${P}-python-2.6.patch"
 
 src_compile() {
-	kde_src_compile myconf
-	myconf="$myconf --prefix=/usr"
-	kde_src_compile configure make
+	myconf="${myconf} --prefix=/usr"
+	kde_src_compile
 }
diff --git a/kde-base/dcoppython/files/dcoppython-3.5.10-python-2.6.patch b/kde-base/dcoppython/files/dcoppython-3.5.10-python-2.6.patch
new file mode 100644
index 000000000000..23f4553eaf25
--- /dev/null
+++ b/kde-base/dcoppython/files/dcoppython-3.5.10-python-2.6.patch
@@ -0,0 +1,30 @@
+diff -ur dcoppython-3.5.10.orig/dcoppython/shell/gen_marshal_code.py dcoppython-3.5.10/dcoppython/shell/gen_marshal_code.py
+--- dcoppython-3.5.10.orig/dcoppython/shell/gen_marshal_code.py	2005-09-10 10:16:13.000000000 +0200
++++ dcoppython-3.5.10/dcoppython/shell/gen_marshal_code.py	2009-01-03 15:44:08.000000000 +0100
+@@ -120,12 +120,12 @@
+     def __init__(self, type):
+         self.type = type
+         self.demarshal_as = None
+-        self.as = []
++        self.as_list = []
+         self.info = []
+ 
+-    def add_as(self, as):
+-        if self.demarshal_as == None: self.demarshal_as = as
+-        self.as += [as]
++    def add_as(self, _as):
++        if self.demarshal_as == None: self.demarshal_as = _as
++        self.as_list += [_as]
+ 
+     def add_info(self,info):
+         self.info += [info]
+@@ -133,7 +133,7 @@
+     def xml(self):
+         return ['<type dcoptype="%s">' % self.type,
+                 '  <demarshal-as>%s</demarshal-as>' % self.demarshal_as] + \
+-               ['  <marshal-as>%s</marshal-as>' % as for as in self.as ] + \
++               ['  <marshal-as>%s</marshal-as>' % _as for _as in self.as_list ] + \
+                ['  <info>%s</info>' % info for info in self.info ] + \
+                ['</type>']
+ 
+