Fix syntax error with python2.4, bug 382761

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 44 insertions, 13 deletions

diff --git a/dev-python/werkzeug/ChangeLog b/dev-python/werkzeug/ChangeLog
index 9555e59939e7..44599a9530b1 100644
--- a/dev-python/werkzeug/ChangeLog
+++ b/dev-python/werkzeug/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/werkzeug
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/ChangeLog,v 1.25 2011/07/28 19:05:51 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/ChangeLog,v 1.26 2011/09/13 23:52:05 floppym Exp $
+
+*werkzeug-0.7.1-r1 (13 Sep 2011)
+
+  13 Sep 2011; Mike Gilbert <floppym@gentoo.org> -werkzeug-0.7.1.ebuild,
+  +werkzeug-0.7.1-r1.ebuild, +files/werkzeug-0.7.1-py24.patch:
+  Fix syntax error with python2.4, bug 382761
 
 *werkzeug-0.7.1 (28 Jul 2011)
 
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index e8959c1d1731..fae29c3e715b 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX werkzeug-0.7.1-py24.patch 753 RMD160 5553438943b29367d360ee4f673c60aa364c1e2b SHA1 cb7cb1d0f09c2a13c290d17a2632d60204655f4c SHA256 6e02739a87e9ceb1ad1ca70d0391a969da3e27c33997a003e5cbfe9d998752c9
 DIST Werkzeug-0.6.2.tar.gz 1720741 RMD160 19f24380f201385f379274a530dd9fe287341d19 SHA1 2056379ba01c7a46561280a14cb0a6bf40050ab9 SHA256 4a80c87db4c105f24bb6587b2fdc45a1844e6b0d185d698543b43f2cf900d27b
 DIST Werkzeug-0.7.1.tar.gz 1103388 RMD160 ce9be28200bda1f1703fb553f4b9f54c64c4cb31 SHA1 018265461cd8ceb6c777cf22b2df754f744aa131 SHA256 0682ada4e9b4018004be995fb3db01d9da47d0d5b488444e45a484f9e940d885
 EBUILD werkzeug-0.6.2.ebuild 920 RMD160 36600fc61c9181436b7bceb2cca0860598c339ce SHA1 8b8dbde094ea51c4610a9f415876fbe927230763 SHA256 e8d4e9a0a1e49ae39fe43b116e453f6455a4218557a321ef7e26595d6fb43588
-EBUILD werkzeug-0.7.1.ebuild 922 RMD160 62fbf0b4ea251ec66d8752b9f30a2c4288e37be0 SHA1 9f1ac1351a2c8285bbe0cf2212dada1bd61c6205 SHA256 1fba3d26bed3f34303e938ef3ab25fcb6b30c1e981a901fa0701a7b7ef464c4a
-MISC ChangeLog 3645 RMD160 5e80eec9803766d8d560e86bb805c380fe1f5c8e SHA1 ac79d4312bc39d22d6ab805e309d4c31bc452f1b SHA256 af3f9d46d49d59f40a72216395876b2b6c05ead50889f58c5bf98bbb3fc75839
+EBUILD werkzeug-0.7.1-r1.ebuild 1053 RMD160 c49570a364d38382b821133d4caf001582548747 SHA1 11cf98d719fbe8f80affc6378df433253b5b898f SHA256 36f6570fe894981edd5b5e5193defb50b85237375360443489b575dfcd2a1f87
+MISC ChangeLog 3856 RMD160 eb923552f5aa7f626050f6e320cc19e6c7eb57cc SHA1 2e53e123c53f846cb3107d7b8d96ba469aaa22f4 SHA256 2e9f5b06d4b74f22db2e7fcde9dc31d73291496a9c899dd9d7e82d4f905ca530
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOMbMfAAoJEMmH5mwCk1NvcegH/i3xAgxZBbfnkrvtJFX+6maz
-fvBnTEobQpmzswuzWQlxQJ0HCzzoP4VZ5DlYhOl+ToQoPl9ZOGkZRkIew2/5y3po
-t7+SmbP6zAGw/LZ7wc2GmMVAugGgOXwuERY4FcG3GY/CV5wPWuhH+PpVwcE+oG/s
-AXYQw7cbLF8lNvtESoYQ0WNfaoqbx233RwGKAzCVfA5IybEDS+/UuP4+wmCvgU4w
-xp/DhP/k6agy22/WNSoXszjEzKrAr6RwZ+2OiqVs5HP+7A0HuyRpRDuNNPaxGwgG
-rGXhYHl2/GK6+x3EU2uOAbj3WpnkN5cxge1rPSFs1jwEoG0sGDWMT+FizRKUuqs=
-=4WrE
+iF4EAREIAAYFAk5v7K8ACgkQC77qH+pIQ6TNeAEAobJCpTXNvnJTRa9M5Qu7RaqO
+OFi/i5Lri3U/WmhlkdcA/3lnj8O7IZd/0xdXTZc48lY78ytdVcyFr7kzM4QBxGmY
+=6Cog
 -----END PGP SIGNATURE-----
diff --git a/dev-python/werkzeug/files/werkzeug-0.7.1-py24.patch b/dev-python/werkzeug/files/werkzeug-0.7.1-py24.patch
new file mode 100644
index 000000000000..2b0e334e6e9f
--- /dev/null
+++ b/dev-python/werkzeug/files/werkzeug-0.7.1-py24.patch
@@ -0,0 +1,22 @@
+commit 5a3888cea7a40c7260e1994530a46977810459e7
+Author: Mike Gilbert <floppymaster@gmail.com>
+Date:   Tue Sep 13 19:24:09 2011 -0400
+
+    werkzeug/contrib/cache.py: Fix for python2.4
+
+diff --git a/werkzeug/contrib/cache.py b/werkzeug/contrib/cache.py
+index 7a68cb8..b0a89fd 100644
+--- a/werkzeug/contrib/cache.py
++++ b/werkzeug/contrib/cache.py
+@@ -79,8 +79,9 @@ def _items(mappingorseq):
+         ...    assert k*k == v
+ 
+     """
+-    return mappingorseq.iteritems() if hasattr(mappingorseq, 'iteritems') \
+-        else mappingorseq
++    if hasattr(mappingorseq, 'iteritems'):
++        return mappingorseq.iteritems()
++    return mappingorseq
+ 
+ class BaseCache(object):
+     """Baseclass for the cache systems.  All the cache systems implement this
diff --git a/dev-python/werkzeug/werkzeug-0.7.1.ebuild b/dev-python/werkzeug/werkzeug-0.7.1-r1.ebuild
index 9d980191ea9f..dc3daa2060d5 100644
--- a/dev-python/werkzeug/werkzeug-0.7.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.7.1.ebuild,v 1.1 2011/07/28 19:05:51 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.7.1-r1.ebuild,v 1.1 2011/09/13 23:52:05 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 DISTUTILS_SRC_TEST="nosetests"
 
-inherit distutils
+inherit distutils eutils
 
 MY_PN="Werkzeug"
 MY_P="${MY_PN}-${PV}"
@@ -30,6 +30,12 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS="CHANGES"
 
+src_prepare() {
+	# Bug 382761: Fix syntax error with python2.4
+	epatch "${FILESDIR}/${P}-py24.patch"
+	distutils_src_prepare
+}
+
 src_test() {
 	distutils_src_test -e '^test_app$' tests tests/contrib
 }