Fix import from future error with Python 2.5

Package-Manager: portage-2.1.2_pre1

8 files changed, 70 insertions, 34 deletions

diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog
index 3903410ae2fc..3c8044b510f3 100644
--- a/dev-python/logilab-common/ChangeLog
+++ b/dev-python/logilab-common/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/logilab-common
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.27 2006/09/13 18:07:59 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.28 2006/09/20 17:25:11 pythonhead Exp $
+
+  20 Sep 2006; Rob Cakebread <pythonhead@gentoo.org>
+  +files/logilab-common-setup.py.patch, logilab-common-0.9.3.ebuild,
+  logilab-common-0.14.0.ebuild, logilab-common-0.14.1.ebuild,
+  logilab-common-0.15.0.ebuild:
+  Fixes from future import error in Python 2.5
 
   01 Aug 2006; Tom Gall <tgall@gentoo.org> logilab-common-0.15.0.ebuild:
   added ~ppc64
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
index c737c00ee012..6b3e8c03b1ae 100644
--- a/dev-python/logilab-common/Manifest
+++ b/dev-python/logilab-common/Manifest
@@ -5,30 +5,34 @@ AUX logilab-common-0.14.0-remove-broken-modutils-test.patch 760 RMD160 5a3aa1745
 MD5 bbf57c9fbfa420a2945ded153b5d4065 files/logilab-common-0.14.0-remove-broken-modutils-test.patch 760
 RMD160 5a3aa174592a14df5d8a2c1cb0c929a50279459d files/logilab-common-0.14.0-remove-broken-modutils-test.patch 760
 SHA256 de9210bea8acae9306d6ec3f60b297ca721c7db3f571dbfa9c2da87125ca4ae1 files/logilab-common-0.14.0-remove-broken-modutils-test.patch 760
-DIST common-0.14.0.tar.gz 141789 RMD160 888db7ad239e9f30401901b5066bc13897a0b18d SHA256 ba762be2a9e62cd9b46a58f0a51c054047c2fc6371382b80dbdb6d81c0fff903
-DIST common-0.14.1.tar.gz 141856 RMD160 7fbb0b1f59131f1b55d68c6bc6a58ea51aadaec0 SHA256 e29c14bd579229efb8840d7d4c0ef0b03f95869b0cae5ad7b32fd5ee73bdf5ba
+AUX logilab-common-setup.py.patch 623 RMD160 ac7c4b90d47d724843d6182a38d66927a16506a6 SHA1 198961cad33ecfdc5d9928e89f88ad64229c593c SHA256 4221b9becdcaca12aa2989ab2e7a8384d63a25fc576fedb680d2a155c727635d
+MD5 2ff3196fa9e5510d5b53819a82d51e9d files/logilab-common-setup.py.patch 623
+RMD160 ac7c4b90d47d724843d6182a38d66927a16506a6 files/logilab-common-setup.py.patch 623
+SHA256 4221b9becdcaca12aa2989ab2e7a8384d63a25fc576fedb680d2a155c727635d files/logilab-common-setup.py.patch 623
+DIST common-0.14.0.tar.gz 141789 RMD160 888db7ad239e9f30401901b5066bc13897a0b18d SHA1 ebef34c1ca0d3c47e565ea15eb5b9865c583f787 SHA256 ba762be2a9e62cd9b46a58f0a51c054047c2fc6371382b80dbdb6d81c0fff903
+DIST common-0.14.1.tar.gz 141856 RMD160 7fbb0b1f59131f1b55d68c6bc6a58ea51aadaec0 SHA1 2f173c22138c4631144f6e9452af3913f51546a6 SHA256 e29c14bd579229efb8840d7d4c0ef0b03f95869b0cae5ad7b32fd5ee73bdf5ba
 DIST common-0.15.0.tar.gz 140909 RMD160 c03fc7c7da4700c2320a78922ade833824d285a5 SHA1 5cb6df46c5bf47b1078885af636807fdf99cebd1 SHA256 c8bb306ec5dc7dfb9e6f3d61cf089bbac62e5e5fc22824ff41cb770fc8e8c2de
-DIST common-0.9.3.tar.gz 156335
-EBUILD logilab-common-0.14.0.ebuild 1416 RMD160 857935bdadd07ab78161f755019ead1c9599d1af SHA1 92fda089f01afeb0a3d9754d5631893015b766bc SHA256 935c4e818a01f43323692be40d55e8c6f01f19c5993bad53dad7175746e0eb02
-MD5 02ce2b987def9426bf7ae93baf1bed6b logilab-common-0.14.0.ebuild 1416
-RMD160 857935bdadd07ab78161f755019ead1c9599d1af logilab-common-0.14.0.ebuild 1416
-SHA256 935c4e818a01f43323692be40d55e8c6f01f19c5993bad53dad7175746e0eb02 logilab-common-0.14.0.ebuild 1416
-EBUILD logilab-common-0.14.1.ebuild 1431 RMD160 ee75fccd22a01998bbf9baab27e3c8772066e42b SHA1 75439dcf45fea930b594307dc6409eb54f8e76ae SHA256 7de95faaa2551a21ec13e1335d0a24fc9d35443dca34225706a477d2c78bd9ec
-MD5 f07d841ba9378f36ebe85353e197045a logilab-common-0.14.1.ebuild 1431
-RMD160 ee75fccd22a01998bbf9baab27e3c8772066e42b logilab-common-0.14.1.ebuild 1431
-SHA256 7de95faaa2551a21ec13e1335d0a24fc9d35443dca34225706a477d2c78bd9ec logilab-common-0.14.1.ebuild 1431
-EBUILD logilab-common-0.15.0.ebuild 1536 RMD160 2007f2825a621873addf342e0dad8b99b4d4094b SHA1 0b914512218db9ceb6b3965440d0845ca189461a SHA256 db16c15074a7d24b720b717541f5e5d2e42c78f29cd80a949c7d2117ece71d7c
-MD5 fcb03e51e6c33b1132c8da5fcdc7f465 logilab-common-0.15.0.ebuild 1536
-RMD160 2007f2825a621873addf342e0dad8b99b4d4094b logilab-common-0.15.0.ebuild 1536
-SHA256 db16c15074a7d24b720b717541f5e5d2e42c78f29cd80a949c7d2117ece71d7c logilab-common-0.15.0.ebuild 1536
-EBUILD logilab-common-0.9.3.ebuild 717 RMD160 69997f5bb0aba0b71accc2292477c7125d2142ad SHA1 1fe12fb8e9d5b8dc087ec7601a8d6467b9e48120 SHA256 88d2229b0dd76b9274b999d2f829771ad22c9e93c0036b1e5ffd94c4aae9f45a
-MD5 eb5f92bc10fdc66effeb9008cc163f4d logilab-common-0.9.3.ebuild 717
-RMD160 69997f5bb0aba0b71accc2292477c7125d2142ad logilab-common-0.9.3.ebuild 717
-SHA256 88d2229b0dd76b9274b999d2f829771ad22c9e93c0036b1e5ffd94c4aae9f45a logilab-common-0.9.3.ebuild 717
-MISC ChangeLog 4460 RMD160 04f830a3721b713ba40c829333d55de946ba9566 SHA1 b707b280453055befc6d9676410d44a7379cc9ef SHA256 581cccff638505b719ff2ebbd040bd9618fe7eee051be4f84dd87abc06a28132
-MD5 8ebb10674c4b962b2810bd5a11d588d4 ChangeLog 4460
-RMD160 04f830a3721b713ba40c829333d55de946ba9566 ChangeLog 4460
-SHA256 581cccff638505b719ff2ebbd040bd9618fe7eee051be4f84dd87abc06a28132 ChangeLog 4460
+DIST common-0.9.3.tar.gz 156335 RMD160 cc26062a61f4d1dcd05feda9baa4ef22920b4aac SHA1 8bc58e8e2f6b211ca69175f512677552599628e4 SHA256 6794620f5663442246f6ae1bb6695fd120a1a6024c455da457ae4037b3ee6826
+EBUILD logilab-common-0.14.0.ebuild 1462 RMD160 f75072ee06e9591fa980a4e75ee6a4454eb28c6a SHA1 b9787154f437578a9223fd0b37db56e79f919cec SHA256 84a749aeb0caae12b2e3093b53f9423e3894a9afbe4fc7268f20fa9c4c2d07d6
+MD5 93636a287e024ec8d4574ad6aaec034a logilab-common-0.14.0.ebuild 1462
+RMD160 f75072ee06e9591fa980a4e75ee6a4454eb28c6a logilab-common-0.14.0.ebuild 1462
+SHA256 84a749aeb0caae12b2e3093b53f9423e3894a9afbe4fc7268f20fa9c4c2d07d6 logilab-common-0.14.0.ebuild 1462
+EBUILD logilab-common-0.14.1.ebuild 1476 RMD160 c5d8031beaddbc54d864e6eb276cc9c18fb98696 SHA1 064071d48b16da513d1b1fde64a047dc87528d6d SHA256 22130855639b6091c3c1dae1f9a353536711590ee0808daa60a04b032c41b0a6
+MD5 302026b2dad8594e1551cb1080e837bb logilab-common-0.14.1.ebuild 1476
+RMD160 c5d8031beaddbc54d864e6eb276cc9c18fb98696 logilab-common-0.14.1.ebuild 1476
+SHA256 22130855639b6091c3c1dae1f9a353536711590ee0808daa60a04b032c41b0a6 logilab-common-0.14.1.ebuild 1476
+EBUILD logilab-common-0.15.0.ebuild 1584 RMD160 46d4570ccfb6661104bf442e3e113e04af747938 SHA1 8385c72b23c394ca66200bd566831581e659e464 SHA256 fb71db0dbd41190365cef7fa49c86bdee64f6292e53686dc364e5cccf21a21ea
+MD5 13663993dd33d078a5ce026956cb0304 logilab-common-0.15.0.ebuild 1584
+RMD160 46d4570ccfb6661104bf442e3e113e04af747938 logilab-common-0.15.0.ebuild 1584
+SHA256 fb71db0dbd41190365cef7fa49c86bdee64f6292e53686dc364e5cccf21a21ea logilab-common-0.15.0.ebuild 1584
+EBUILD logilab-common-0.9.3.ebuild 807 RMD160 8ed2d828926ea08609391c3c33ccbac6f3280d8a SHA1 fe4e1eb341f6b34511a19061f274703b54fe0fc9 SHA256 f9f1b622987e3cdc166693822e6568c52d6133594ac2cab44422e4a0c526764e
+MD5 73f8ccc1541ec595ba6ba19efef21eee logilab-common-0.9.3.ebuild 807
+RMD160 8ed2d828926ea08609391c3c33ccbac6f3280d8a logilab-common-0.9.3.ebuild 807
+SHA256 f9f1b622987e3cdc166693822e6568c52d6133594ac2cab44422e4a0c526764e logilab-common-0.9.3.ebuild 807
+MISC ChangeLog 4730 RMD160 86389fb13f7519f364f4ca7a2b684ea2baece42a SHA1 1ee6a163f2a6d76f41ed37ef3d73b88a81d95bc2 SHA256 5f3e008692aa5e8006aeffa27aa595b152ba93f72a769b121cf117766096d3ac
+MD5 24a17a7847a0697397133a93701b8268 ChangeLog 4730
+RMD160 86389fb13f7519f364f4ca7a2b684ea2baece42a ChangeLog 4730
+SHA256 5f3e008692aa5e8006aeffa27aa595b152ba93f72a769b121cf117766096d3ac ChangeLog 4730
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -42,13 +46,13 @@ SHA256 42585eb8624454e058b47763aad013663afaec16c764ae48f57be965d570b098 files/di
 MD5 26951cda621519b1e1189fda17c81020 files/digest-logilab-common-0.15.0 241
 RMD160 ea2d900cac25f380cd8d6009a4f2dc645916bff4 files/digest-logilab-common-0.15.0 241
 SHA256 87ba593fe60b1c54120f4bba7c1a4636a10d0d4cc969288313b253e6a1fb8764 files/digest-logilab-common-0.15.0 241
-MD5 532c5af1f9cb47abbf7283f6ba517826 files/digest-logilab-common-0.9.3 64
-RMD160 2b217a3821adde86dad2168eb927717386bcb95b files/digest-logilab-common-0.9.3 64
-SHA256 ed5c7250f89a0ba9b72e91208eaab7f3939d49e9d38780f6a3b17f97bab2cc40 files/digest-logilab-common-0.9.3 64
+MD5 e2267579c2d4b9b2de4904840e9426a3 files/digest-logilab-common-0.9.3 238
+RMD160 8b0d8a67d51053dafb60b350a8d7fbc4d18603d0 files/digest-logilab-common-0.9.3 238
+SHA256 884bbd4d867f675457c45148373d28eb305c977e1c240e76a59bda75d9b7b1b1 files/digest-logilab-common-0.9.3 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFCEkDV3J2n04EauwRAlYwAKDHlXJg0ExXZfOKlVFvEayZDvfa2gCfUgks
-iNuFKwZG3cFPk2fD1pEpBuI=
-=grjx
+iD8DBQFFEXmWTry2jroju7wRAqNUAJ9hkX+w4Rzb/PZgLSRBhUSCSwXyiwCeJ1XG
+4u1047xWvE21jIM+w7PoMAo=
+=xTvT
 -----END PGP SIGNATURE-----
diff --git a/dev-python/logilab-common/files/digest-logilab-common-0.9.3 b/dev-python/logilab-common/files/digest-logilab-common-0.9.3
index e77aef27c6c0..98ac8c9100fe 100644
--- a/dev-python/logilab-common/files/digest-logilab-common-0.9.3
+++ b/dev-python/logilab-common/files/digest-logilab-common-0.9.3
@@ -1 +1,3 @@
 MD5 bfbe68606f2448b58836fb79b2582e71 common-0.9.3.tar.gz 156335
+RMD160 cc26062a61f4d1dcd05feda9baa4ef22920b4aac common-0.9.3.tar.gz 156335
+SHA256 6794620f5663442246f6ae1bb6695fd120a1a6024c455da457ae4037b3ee6826 common-0.9.3.tar.gz 156335
diff --git a/dev-python/logilab-common/files/logilab-common-setup.py.patch b/dev-python/logilab-common/files/logilab-common-setup.py.patch
new file mode 100644
index 000000000000..fe384d264f02
--- /dev/null
+++ b/dev-python/logilab-common/files/logilab-common-setup.py.patch
@@ -0,0 +1,15 @@
+--- setup.py.orig	2006-09-20 09:26:15.000000000 -0700
++++ setup.py	2006-09-20 09:26:50.000000000 -0700
+@@ -15,11 +15,11 @@
+ # You should have received a copy of the GNU General Public License along with
+ # this program; if not, write to the Free Software Foundation, Inc.,
+ # 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
++from __future__ import nested_scopes
+ """ Generic Setup script, takes package info from __pkginfo__.py file """
+ 
+ __revision__ = '$Id: setup.py,v 1.23 2004/05/27 12:07:23 syt Exp $'
+ 
+-from __future__ import nested_scopes
+ import os
+ import sys
+ import shutil
diff --git a/dev-python/logilab-common/logilab-common-0.14.0.ebuild b/dev-python/logilab-common/logilab-common-0.14.0.ebuild
index 81642c930d72..e8e3af866363 100644
--- a/dev-python/logilab-common/logilab-common-0.14.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.14.0.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/logilab-common/logilab-common-0.14.0.ebuild,v 1.1 2006/03/06 17:21:21 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.14.0.ebuild,v 1.2 2006/09/20 17:25:11 pythonhead Exp $
 
 inherit distutils
 
@@ -26,6 +26,7 @@ src_unpack() {
 	# the permissions for this file are 400 in the tarball for no
 	# obvious reason
 	chmod 444 test/data/noendingnewline.py || die "chmod failed"
+	epatch "${FILESDIR}/${PN}-setup.py.patch"
 }
 
 src_install() {
diff --git a/dev-python/logilab-common/logilab-common-0.14.1.ebuild b/dev-python/logilab-common/logilab-common-0.14.1.ebuild
index 3c589f31ec9d..506136d625b3 100644
--- a/dev-python/logilab-common/logilab-common-0.14.1.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.14.1.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/logilab-common/logilab-common-0.14.1.ebuild,v 1.2 2006/04/01 15:06:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.14.1.ebuild,v 1.3 2006/09/20 17:25:11 pythonhead Exp $
 
 inherit distutils
 
@@ -26,6 +26,7 @@ src_unpack() {
 	# the permissions for this file are 400 in the tarball for no
 	# obvious reason
 	chmod 444 test/data/noendingnewline.py || die "chmod failed"
+	epatch "${FILESDIR}/${PN}-setup.py.patch"
 }
 
 src_install() {
diff --git a/dev-python/logilab-common/logilab-common-0.15.0.ebuild b/dev-python/logilab-common/logilab-common-0.15.0.ebuild
index d131459dba3e..c49b82361812 100644
--- a/dev-python/logilab-common/logilab-common-0.15.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.15.0.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/logilab-common/logilab-common-0.15.0.ebuild,v 1.2 2006/08/02 03:23:29 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.15.0.ebuild,v 1.3 2006/09/20 17:25:11 pythonhead Exp $
 
 inherit distutils
 
@@ -26,6 +26,7 @@ src_unpack() {
 	# the permissions for this file are 400 in the tarball for no
 	# obvious reason
 	chmod 444 test/data/noendingnewline.py || die "chmod failed"
+	epatch "${FILESDIR}/${PN}-setup.py.patch"
 }
 
 src_install() {
diff --git a/dev-python/logilab-common/logilab-common-0.9.3.ebuild b/dev-python/logilab-common/logilab-common-0.9.3.ebuild
index 4bdf0a3ab13a..269fe5377394 100644
--- a/dev-python/logilab-common/logilab-common-0.9.3.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.9.3.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/logilab-common/logilab-common-0.9.3.ebuild,v 1.5 2006/02/06 20:59:34 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.9.3.ebuild,v 1.6 2006/09/20 17:25:11 pythonhead Exp $
 
 inherit distutils
 
@@ -19,6 +19,12 @@ S=${WORKDIR}/${P#logilab-}
 
 PYTHON_MODNAME="logilab"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-setup.py.patch"
+}
+
 src_install() {
 	distutils_src_install