Fix python 2.5 compatibility, bug 160653.

Package-Manager: portage-2.1.2_rc4-r6

4 files changed, 104 insertions, 10 deletions

diff --git a/dev-python/soappy/ChangeLog b/dev-python/soappy/ChangeLog
index 1d2577439d67..ce9cf776e1af 100644
--- a/dev-python/soappy/ChangeLog
+++ b/dev-python/soappy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/soappy
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/ChangeLog,v 1.16 2007/01/06 23:16:01 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/ChangeLog,v 1.17 2007/01/07 15:26:14 kloeri Exp $
+
+  07 Jan 2007; Bryan Østergaard <kloeri@gentoo.org>
+  +files/soappy-0.12.0-python-2.5-compat.patch, soappy-0.12.0.ebuild:
+  Fix python 2.5 compatibility, bug 160653.
 
 *soappy-0.12.0 (06 Jan 2007)
 
diff --git a/dev-python/soappy/Manifest b/dev-python/soappy/Manifest
index 74f5119279e1..481ddd85a656 100644
--- a/dev-python/soappy/Manifest
+++ b/dev-python/soappy/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX soappy-0.11.6-python-2.5-compat.patch 1943 RMD160 48bd716f855784184458e7d27f09d03e191391c2 SHA1 6f22d1e7f21e94eaf13269108c576f3170ff0899 SHA256 e67abd88987688f2748fe10a82e177319516ee764dd1ccf0f700255229884db1
 MD5 04453bb326dc82a4c67f6450e26dade8 files/soappy-0.11.6-python-2.5-compat.patch 1943
 RMD160 48bd716f855784184458e7d27f09d03e191391c2 files/soappy-0.11.6-python-2.5-compat.patch 1943
 SHA256 e67abd88987688f2748fe10a82e177319516ee764dd1ccf0f700255229884db1 files/soappy-0.11.6-python-2.5-compat.patch 1943
+AUX soappy-0.12.0-python-2.5-compat.patch 2131 RMD160 aa92a24afeb225ab3daf03df6cf4764b4b537160 SHA1 1dbf4a3a62a9c8272b7fcfeb28c589b70967dcb8 SHA256 de5a5fd50d49698840ea77d73f9602819998ec2d8c5ee19512316b988814e154
+MD5 9564a468690bd429b85424be9fdc22b7 files/soappy-0.12.0-python-2.5-compat.patch 2131
+RMD160 aa92a24afeb225ab3daf03df6cf4764b4b537160 files/soappy-0.12.0-python-2.5-compat.patch 2131
+SHA256 de5a5fd50d49698840ea77d73f9602819998ec2d8c5ee19512316b988814e154 files/soappy-0.12.0-python-2.5-compat.patch 2131
 DIST SOAPpy-0.11.3.tar.gz 128165 RMD160 729672e3d7c6f39cb5855c15cf61510a50599fef SHA1 6bb17533d4074b991c3d57863cbf8e00b8e3068a SHA256 a4a0984583c32fbf69e6f9495590b9e0c8a2a4aa42cb83f20b63a75208590845
 DIST SOAPpy-0.11.6.tar.gz 159078 RMD160 ba0c90f0229aa077976face8d5e50147b034f30c SHA1 59c91688f23de3b738bf504351bca89aab5cc203 SHA256 42c8cb3e42b439bc36b6ba3f090ddb72a214ca9264a2babf102c98731dea8e6a
 DIST SOAPpy-0.12.0.tar.gz 176199 RMD160 2dae5ada36dba2062a344cf0df38ee2d1fb62d0e SHA1 9129ef31d7ddbbe8c8d753ea85e501c0856c80a1 SHA256 2d1fdacc9ca74412e2b1b1c44310679b7bcd23edb0a84359b2803e90e3e54009
@@ -13,14 +20,14 @@ EBUILD soappy-0.11.6-r1.ebuild 686 RMD160 7a985e39cbf132bfd16960224d5512671b2978
 MD5 cd3670d46a7ce1311cd980d4bab1b066 soappy-0.11.6-r1.ebuild 686
 RMD160 7a985e39cbf132bfd16960224d5512671b2978fe soappy-0.11.6-r1.ebuild 686
 SHA256 47f99789c9c6a0af6aaac0e957e8d5d3addde1e6150d4d722f1eddf51a6680b5 soappy-0.11.6-r1.ebuild 686
-EBUILD soappy-0.12.0.ebuild 1195 RMD160 51cdeae57e237996d0986bdcb1a2881dfc5cea63 SHA1 3fc9871f831b81547fba04f86fe9bf3ef38fbdd9 SHA256 3815b4c33958dd09690c85d60f348f05981d9554e5f3bea882e6bf8f287bf113
-MD5 7f8384da92c9be818cc32e0a5431d96e soappy-0.12.0.ebuild 1195
-RMD160 51cdeae57e237996d0986bdcb1a2881dfc5cea63 soappy-0.12.0.ebuild 1195
-SHA256 3815b4c33958dd09690c85d60f348f05981d9554e5f3bea882e6bf8f287bf113 soappy-0.12.0.ebuild 1195
-MISC ChangeLog 2221 RMD160 58097ac85385a87f084e2de7e5272175e8c83024 SHA1 0007424481139ba23490474a869892f993a374cf SHA256 8abeca409014e70dccf70bc28b77e4911a9b9594d7b910b5247ccb58d7fed569
-MD5 6f97ae354e914f48c8ad105bab141507 ChangeLog 2221
-RMD160 58097ac85385a87f084e2de7e5272175e8c83024 ChangeLog 2221
-SHA256 8abeca409014e70dccf70bc28b77e4911a9b9594d7b910b5247ccb58d7fed569 ChangeLog 2221
+EBUILD soappy-0.12.0.ebuild 1288 RMD160 fa8e67249e441cf28fb5ace1ded64fbe5246ac4e SHA1 536a9cf6f52789992a1d5f05147e25592ae161fe SHA256 794e5f13985da4407522502947bfb9db024d8eb5c51a7f4b80c3ce0a8d131b2b
+MD5 b2662727f69894d6ce43244625f49a8f soappy-0.12.0.ebuild 1288
+RMD160 fa8e67249e441cf28fb5ace1ded64fbe5246ac4e soappy-0.12.0.ebuild 1288
+SHA256 794e5f13985da4407522502947bfb9db024d8eb5c51a7f4b80c3ce0a8d131b2b soappy-0.12.0.ebuild 1288
+MISC ChangeLog 2387 RMD160 4d7b26187ac7593afca35d869a494f4b262a33c7 SHA1 8258d34db4936c03774ee4a0b7a4961d886b463c SHA256 16c14c9cece27ce17fb919a02241590ea4d0fcdf707849eb539a2485967c46be
+MD5 4a8f78bea6e5498b34428eee4082636e ChangeLog 2387
+RMD160 4d7b26187ac7593afca35d869a494f4b262a33c7 ChangeLog 2387
+SHA256 16c14c9cece27ce17fb919a02241590ea4d0fcdf707849eb539a2485967c46be ChangeLog 2387
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -34,3 +41,10 @@ SHA256 528de6ccf9fbd1068ab9f7d9d93722c7d6f23577af3376786282fa72cc803f20 files/di
 MD5 658df96230b05d5b506ff8fa42b170f6 files/digest-soappy-0.12.0 241
 RMD160 9bfd3ddad789b30fa344bf479f654222e29a96a6 files/digest-soappy-0.12.0 241
 SHA256 4df72509e1143e348b3186bf379ad35b828c934adf64ce191c72d98433808f0c files/digest-soappy-0.12.0 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFoRDPugEuf3OQ0akRAi0dAJ4go8vXYIyx2/Ghjl4tslx9TLHfpwCgjuZI
+H2AQ5BDV1EGnHjlZuFLyYZQ=
+=kzfY
+-----END PGP SIGNATURE-----
diff --git a/dev-python/soappy/files/soappy-0.12.0-python-2.5-compat.patch b/dev-python/soappy/files/soappy-0.12.0-python-2.5-compat.patch
new file mode 100644
index 000000000000..297bcc4b0c23
--- /dev/null
+++ b/dev-python/soappy/files/soappy-0.12.0-python-2.5-compat.patch
@@ -0,0 +1,68 @@
+diff -urN SOAPpy.orig/Client.py SOAPpy/Client.py
+--- SOAPpy.orig/Client.py	2005-02-21 21:27:09.000000000 +0100
++++ SOAPpy/Client.py	2007-01-07 15:46:13.000000000 +0100
+@@ -40,11 +40,11 @@
+ ################################################################################
+ """
+ 
++from __future__ import nested_scopes
++
+ ident = '$Id: Client.py,v 1.27 2005/02/21 20:27:09 warnes Exp $'
+ from version import __version__
+ 
+-from __future__ import nested_scopes
+-
+ #import xml.sax
+ import urllib
+ from types import *
+diff -urN SOAPpy.orig/GSIServer.py SOAPpy/GSIServer.py
+--- SOAPpy.orig/GSIServer.py	2005-02-15 17:32:22.000000000 +0100
++++ SOAPpy/GSIServer.py	2007-01-07 15:46:38.000000000 +0100
+@@ -43,11 +43,11 @@
+ ################################################################################
+ """
+ 
++from __future__ import nested_scopes
++
+ ident = '$Id: GSIServer.py,v 1.5 2005/02/15 16:32:22 warnes Exp $'
+ from version import __version__
+ 
+-from __future__ import nested_scopes
+-
+ #import xml.sax
+ import re
+ import socket
+diff -urN SOAPpy.orig/Server.py SOAPpy/Server.py
+--- SOAPpy.orig/Server.py	2005-02-15 17:32:22.000000000 +0100
++++ SOAPpy/Server.py	2007-01-07 15:46:59.000000000 +0100
+@@ -40,11 +40,11 @@
+ ################################################################################
+ """
+ 
++from __future__ import nested_scopes
++
+ ident = '$Id: Server.py,v 1.21 2005/02/15 16:32:22 warnes Exp $'
+ from version import __version__
+ 
+-from __future__ import nested_scopes
+-
+ #import xml.sax
+ import re
+ import socket
+diff -urN SOAPpy.orig/Types.py SOAPpy/Types.py
+--- SOAPpy.orig/Types.py	2005-02-22 05:29:43.000000000 +0100
++++ SOAPpy/Types.py	2007-01-07 15:47:17.000000000 +0100
+@@ -33,11 +33,11 @@
+ ################################################################################
+ """
+ 
++from __future__ import nested_scopes
++
+ ident = '$Id: Types.py,v 1.19 2005/02/22 04:29:43 warnes Exp $'
+ from version import __version__
+ 
+-from __future__ import nested_scopes
+-
+ import UserList
+ import base64
+ import cgi
diff --git a/dev-python/soappy/soappy-0.12.0.ebuild b/dev-python/soappy/soappy-0.12.0.ebuild
index d7e7cb361e65..94887123d791 100644
--- a/dev-python/soappy/soappy-0.12.0.ebuild
+++ b/dev-python/soappy/soappy-0.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/soappy-0.12.0.ebuild,v 1.1 2007/01/06 23:16:01 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/soappy-0.12.0.ebuild,v 1.2 2007/01/07 15:26:14 kloeri Exp $
 
 inherit distutils
 
@@ -34,6 +34,14 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-python-2.5-compat.patch"
+}
+
+
 src_install() {
 	distutils_src_install
 	dodoc docs/*