Fix compatibility with Python 2.6 (without fixing of deprecation warnings) (bug #283167).

Package-Manager: portage-14170-svn/cvs/Linux x86_64

4 files changed, 145 insertions, 7 deletions

diff --git a/dev-python/simpleparse/ChangeLog b/dev-python/simpleparse/ChangeLog
index 24eab46bd610..a043a0fcef6b 100644
--- a/dev-python/simpleparse/ChangeLog
+++ b/dev-python/simpleparse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/simpleparse
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simpleparse/ChangeLog,v 1.14 2008/03/01 15:45:01 dev-zero Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpleparse/ChangeLog,v 1.15 2009/08/30 21:47:08 arfrever Exp $
+
+  30 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  simpleparse-2.1.0_alpha1.ebuild,
+  +files/simpleparse-2.1.0_alpha1-python-2.6.patch:
+  Fix compatibility with Python 2.6 (without fixing of deprecation warnings)
+  (bug #283167).
 
 *simpleparse-2.1.0_alpha1 (01 Mar 2008)
 
diff --git a/dev-python/simpleparse/Manifest b/dev-python/simpleparse/Manifest
index 46e3a6c4cc59..fd45d11a3fd1 100644
--- a/dev-python/simpleparse/Manifest
+++ b/dev-python/simpleparse/Manifest
@@ -1,8 +1,9 @@
+AUX simpleparse-2.1.0_alpha1-python-2.6.patch 4673 RMD160 d70df4f9598da3d7001ceca10c6d87245efd914e SHA1 d8dffae534d368e3a12ce38a690145df5d2a1687 SHA256 c2774b1b815020ab3b07615cc8792159b2aed8e53a9db41f85cc83e049123db9
 DIST SimpleParse-1.0.zip 57044 RMD160 553abfe4585a9e144b1725ef9cb1f75cb18b812b SHA1 1b35e2f545bbd06af831b192a389b2d69ecf91a0 SHA256 dd00364dcbf227e7c30d3e81e5beabd02e68018b86066dc6ff05dc058135978d
 DIST SimpleParse-2.0.0.zip 301542 RMD160 ef58a52970aaebd8a26aa1e35ddb7ef1c60ffef5 SHA1 06a43ef9e121dd0b5a8ea5d8d902e196a9c6f3ac SHA256 9aaebadcfd8881b154bfb78b716b66d3033cde56fec3430e405ea59920dc0089
 DIST SimpleParse-2.1.0a1.zip 501216 RMD160 42e4c3e90ec2772c01edf0ccb3bcc4077ced588e SHA1 198ce1a94e55a41ca9265128f5ab0d7bc6a324c0 SHA256 905fabf2b427614265b97d9631283d14b277fd11276679ef33e6c93ad16862f3
 EBUILD simpleparse-1.0.ebuild 655 RMD160 2daa192e72dca2da89f57dfe083d12aae09dcd28 SHA1 329ca04c8d6085e13fd11976cdb749b29a579cb9 SHA256 b1e983ca3685fe477a1ca9f03c5ee73438d389add35f6b2d4248153e9ef3463c
 EBUILD simpleparse-2.0.0.ebuild 672 RMD160 6643f699bd7796aaa9d925b13544e0fda74c9988 SHA1 af0c42fa589e16f471330653c6e5367a87a87cea SHA256 51b0bd0cee902d771bd1605bb57f02bb5e1dea31f444f4a1e4abc8715d42a8c0
-EBUILD simpleparse-2.1.0_alpha1.ebuild 1311 RMD160 f019a20a67baaace22dcf54119899bba4991ec27 SHA1 563a868cbc66d8a4a4376478717fb7955fa471c3 SHA256 0cbaacf13f80a96cc1f2fc99f287b526cbd98baae2961b9b7b9837c7aed5e0ce
-MISC ChangeLog 2397 RMD160 d0257fbe066afc8eee7675f1efb6c5148d2a76d8 SHA1 a98673f68de8c1ba5b8902cdac454aa1b64c9a33 SHA256 6d6c366f3c10560caf4c5f6fdd784a60e95468ce490e57da125476545630142a
+EBUILD simpleparse-2.1.0_alpha1.ebuild 1363 RMD160 9502fcbf98c7940e23a2d4ffadd1f0b49c27bad6 SHA1 f86d351122929e6815759b96ce59e947b7453f25 SHA256 4085f74cca45802ffd42b3fd3b1b2a94cf9e7c05d8f28f21d09dd28376c2d510
+MISC ChangeLog 2652 RMD160 98e4c0b5d2a7ba310f108db69a5bf0a95ff8e6c9 SHA1 528b7bf431aa7e1334de2dd2f9cda829a8595ffc SHA256 4eb5c80ea92ce65a1ffed4f0c7b9aee036f7aafbf290c03498ffec23bf633081
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/simpleparse/files/simpleparse-2.1.0_alpha1-python-2.6.patch b/dev-python/simpleparse/files/simpleparse-2.1.0_alpha1-python-2.6.patch
new file mode 100644
index 000000000000..440021b207f6
--- /dev/null
+++ b/dev-python/simpleparse/files/simpleparse-2.1.0_alpha1-python-2.6.patch
@@ -0,0 +1,129 @@
+--- stt/TextTools/TextTools.py
++++ stt/TextTools/TextTools.py
+@@ -167,7 +167,7 @@
+ # Extra stuff useful in combination with the C functions
+ #
+ 
+-def replace(text,what,with,start=0,stop=None,
++def replace(text,what,with_,start=0,stop=None,
+ 
+             SearchObject=TextSearch,join=join,joinlist=joinlist,tag=tag,
+             string_replace=string.replace,type=type,
+@@ -188,11 +188,11 @@
+         what = so.match
+     if stop is None:
+         if start == 0 and len(what) < 2:
+-            return string_replace(text,what,with)
++            return string_replace(text,what,with_)
+         stop = len(text)
+     t = ((text,sWordStart,so,+2),
+          # Found something, replace and continue searching
+-         (with,Skip+AppendTagobj,len(what),-1,-1),
++         (with_,Skip+AppendTagobj,len(what),-1,-1),
+          # Rest of text
+          (text,Move,ToEOF)
+          )
+@@ -203,13 +203,13 @@
+ 
+ # Alternative (usually slower) versions using different techniques:
+ 
+-def _replace2(text,what,with,start=0,stop=None,
++def _replace2(text,what,with_,start=0,stop=None,
+ 
+               join=join,joinlist=joinlist,tag=tag,
+               TextSearchType=TextSearchType,TextSearch=TextSearch):
+ 
+     """Analogon to string.replace; returns a string with all occurences
+-       of what in text[start:stop] replaced by with.
++       of what in text[start:stop] replaced by with_.
+        
+        This version uses a one entry tag-table and a
+        Boyer-Moore-Search-object.  what can be a string or a
+@@ -226,13 +226,13 @@
+         stop = len(text)
+     if type(what) is not TextSearchType:
+         what=TextSearch(what)
+-    t = ((with,sFindWord,what,+1,+0),)
++    t = ((with_,sFindWord,what,+1,+0),)
+     found,taglist,last = tag(text,t,start,stop)
+     if not found: 
+         return text
+     return join(joinlist(text,taglist))
+ 
+-def _replace3(text,what,with,
++def _replace3(text,what,with_,
+ 
+               join=string.join,TextSearch=TextSearch,
+               TextSearchType=TextSearchType):
+@@ -245,12 +245,12 @@
+     l = []
+     x = 0
+     for left,right in slices:
+-        l.append(text[x:left] + with)
++        l.append(text[x:left] + with_)
+         x = right
+     l.append(text[x:])
+     return join(l,'')
+ 
+-def _replace4(text,what,with,
++def _replace4(text,what,with_,
+ 
+               join=join,joinlist=joinlist,tag=tag,TextSearch=TextSearch,
+               TextSearchType=TextSearchType):
+@@ -262,7 +262,7 @@
+         return text
+     repl = [None]*len(slices)
+     for i in range(len(slices)):
+-        repl[i] = (with,)+slices[i]
++        repl[i] = (with_,)+slices[i]
+     return join(joinlist(text,repl))
+ 
+ def multireplace(text,replacements,start=0,stop=None,
+@@ -569,16 +569,16 @@
+         print 'Replacing strings'
+         print '-'*72
+         print
+-        for what,with in (('m','M'),('mx','MX'),('mxText','MXTEXT'),
++        for what,with_ in (('m','M'),('mx','MX'),('mxText','MXTEXT'),
+                           ('hmm','HMM'),('hmmm','HMM'),('hmhmm','HMM')):
+-            print 'Replace "%s" with "%s"' % (what,with)
++            print 'Replace "%s" with "%s"' % (what,with_)
+             t.start()
+             for i in range(100):
+-                rtext = string.replace(text,what,with)
++                rtext = string.replace(text,what,with_)
+             print 'with string.replace:',t.stop(),'sec.'
+             t.start()
+             for i in range(100):
+-                ttext = replace(text,what,with)
++                ttext = replace(text,what,with_)
+             print 'with tag.replace:',t.stop(),'sec.'
+             if ttext != rtext:
+                 print 'results are NOT ok !'
+@@ -586,7 +586,7 @@
+                 mismatch(rtext,ttext)
+             t.start()
+             for i in range(100):
+-                ttext = _replace2(text,what,with)
++                ttext = _replace2(text,what,with_)
+             print 'with tag._replace2:',t.stop(),'sec.'
+             if ttext != rtext:
+                 print 'results are NOT ok !'
+@@ -594,7 +594,7 @@
+                 print rtext
+             t.start()
+             for i in range(100):
+-                ttext = _replace3(text,what,with)
++                ttext = _replace3(text,what,with_)
+             print 'with tag._replace3:',t.stop(),'sec.'
+             if ttext != rtext:
+                 print 'results are NOT ok !'
+@@ -602,7 +602,7 @@
+                 print rtext
+             t.start()
+             for i in range(100):
+-                ttext = _replace4(text,what,with)
++                ttext = _replace4(text,what,with_)
+             print 'with tag._replace4:',t.stop(),'sec.'
+             if ttext != rtext:
+                 print 'results are NOT ok !'
diff --git a/dev-python/simpleparse/simpleparse-2.1.0_alpha1.ebuild b/dev-python/simpleparse/simpleparse-2.1.0_alpha1.ebuild
index 06ee3fac4d85..3e10cd2afb28 100644
--- a/dev-python/simpleparse/simpleparse-2.1.0_alpha1.ebuild
+++ b/dev-python/simpleparse/simpleparse-2.1.0_alpha1.ebuild
@@ -1,8 +1,8 @@
-# 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/dev-python/simpleparse/simpleparse-2.1.0_alpha1.ebuild,v 1.1 2008/03/01 15:45:01 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpleparse/simpleparse-2.1.0_alpha1.ebuild,v 1.2 2009/08/30 21:47:08 arfrever Exp $
 
-inherit distutils
+inherit distutils eutils
 
 MY_P="SimpleParse-${PV/_alpha/a}"
 
@@ -33,6 +33,8 @@ src_unpack() {
 		setup.py || die "sed failed"
 
 	rm {examples,tests}/__init__.py
+
+	epatch "${FILESDIR}/${P}-python-2.6.patch"
 }
 
 src_install() {