Rename patch and disable keyword substitution.

Package-Manager: portage-2.1.2_pre1

3 files changed, 81 insertions, 4 deletions

diff --git a/dev-python/soappy/ChangeLog b/dev-python/soappy/ChangeLog
index 35d930c72694..0cb9eff5a966 100644
--- a/dev-python/soappy/ChangeLog
+++ b/dev-python/soappy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/soappy
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/ChangeLog,v 1.13 2006/09/25 13:34:23 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/ChangeLog,v 1.14 2006/09/25 19:39:29 marienz Exp $
+
+  25 Sep 2006; Marien Zwart <marienz@gentoo.org>
+  -files/soappy-0.11.6-future-imports.patch,
+  +files/soappy-0.11.6-python-2.5-compat.patch, soappy-0.11.6-r1.ebuild:
+  Rename patch and disable keyword substitution.
 
 *soappy-0.11.6-r1 (25 Sep 2006)
 
diff --git a/dev-python/soappy/files/soappy-0.11.6-python-2.5-compat.patch b/dev-python/soappy/files/soappy-0.11.6-python-2.5-compat.patch
new file mode 100644
index 000000000000..b9888e8eb15a
--- /dev/null
+++ b/dev-python/soappy/files/soappy-0.11.6-python-2.5-compat.patch
@@ -0,0 +1,73 @@
+=== modified file 'SOAPpy/Client.py'
+--- SOAPpy/Client.py	2006-05-25 21:22:38 +0000
++++ SOAPpy/Client.py	2006-09-25 19:33:06 +0000
+@@ -40,11 +40,11 @@
+ ################################################################################
+ """
+ 
++from __future__ import nested_scopes
++
+ ident = '$Id: Client.py,v 1.20 2004/04/10 04:22:52 irjudson Exp $'
+ from version import __version__
+ 
+-from __future__ import nested_scopes
+-
+ #import xml.sax
+ import urllib
+ from types import *
+
+=== modified file 'SOAPpy/GSIServer.py'
+--- SOAPpy/GSIServer.py	2006-05-25 21:22:38 +0000
++++ SOAPpy/GSIServer.py	2006-09-25 19:32:56 +0000
+@@ -43,11 +43,11 @@
+ ################################################################################
+ """
+ 
++from __future__ import nested_scopes
++
+ ident = '$Id: GSIServer.py,v 1.4 2004/02/04 03:21:02 irjudson Exp $'
+ from version import __version__
+ 
+-from __future__ import nested_scopes
+-
+ #import xml.sax
+ import re
+ import socket
+
+=== modified file 'SOAPpy/Server.py'
+--- SOAPpy/Server.py	2006-05-25 21:22:38 +0000
++++ SOAPpy/Server.py	2006-09-25 19:32:44 +0000
+@@ -40,11 +40,11 @@
+ ################################################################################
+ """
+ 
+-ident = '$Id: Server.py,v 1.20 2004/04/28 21:47:10 warnes Exp $'
+-from version import __version__
+-
+ from __future__ import nested_scopes
+ 
++ident = '$Id: Server.py,v 1.20 2004/04/28 21:47:10 warnes Exp $'
++from version import __version__
++
+ #import xml.sax
+ import re
+ import socket
+
+=== modified file 'SOAPpy/Types.py'
+--- SOAPpy/Types.py	2006-05-25 21:22:38 +0000
++++ SOAPpy/Types.py	2006-09-25 19:32:21 +0000
+@@ -33,11 +33,11 @@
+ ################################################################################
+ """
+ 
++from __future__ import nested_scopes
++
+ ident = '$Id: Types.py,v 1.17 2004/09/11 03:03:33 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.11.6-r1.ebuild b/dev-python/soappy/soappy-0.11.6-r1.ebuild
index 0fdc78a5cefc..2d4afce2ebc4 100644
--- a/dev-python/soappy/soappy-0.11.6-r1.ebuild
+++ b/dev-python/soappy/soappy-0.11.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/soappy-0.11.6-r1.ebuild,v 1.1 2006/09/25 13:34:23 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/soappy-0.11.6-r1.ebuild,v 1.2 2006/09/25 19:39:29 marienz Exp $
 
 inherit distutils eutils
 
@@ -25,6 +25,5 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# python 2.5 compatibility
-	epatch "${FILESDIR}/${P}-future-imports.patch"
+	epatch "${FILESDIR}/${P}-python-2.5-compat.patch"
 }