Added patch to fix syntax error. Removed older version. Closes bug #264490

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 78 insertions, 6 deletions

diff --git a/dev-python/ruledispatch/ChangeLog b/dev-python/ruledispatch/ChangeLog
index 8974ed875074..ce0ce3980401 100644
--- a/dev-python/ruledispatch/ChangeLog
+++ b/dev-python/ruledispatch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/ruledispatch
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ruledispatch/ChangeLog,v 1.5 2007/07/04 21:05:59 lucass Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ruledispatch/ChangeLog,v 1.6 2009/07/25 13:42:30 neurogeek Exp $
+
+*ruledispatch-0.5_pre2306-r1 (25 Jul 2009)
+
+  25 Jul 2009; Jesus Rivero <neurogeek@gentoo.org>
+  -ruledispatch-0.5_pre2306.ebuild, +ruledispatch-0.5_pre2306-r1.ebuild,
+  +files/ruledispatch_as_syntax_fix.patch:
+  Added patch to fix syntax error. Removed older version. Closes bug #264490
 
   04 Jul 2007; Lukasz Strzygowski <lucass@gentoo.org>
   -ruledispatch-0.5_pre2115.ebuild:
diff --git a/dev-python/ruledispatch/Manifest b/dev-python/ruledispatch/Manifest
index a369bfa428bb..d4aaa1c9c6e8 100644
--- a/dev-python/ruledispatch/Manifest
+++ b/dev-python/ruledispatch/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ruledispatch_as_syntax_fix.patch 1650 RMD160 a0d2ea748e1a7240754c400d901ff12132ce5b80 SHA1 e67332a1db517972fd991d221021afc122afa75a SHA256 39de21047c2a9d1e4f17338c2e9d3c3169f064e6cd343474413223b9beeee0b6
 DIST RuleDispatch-0.5a0.dev-r2306.tar.gz 186405 RMD160 6597a9f33e0faab576acaa189b47f797b10fe63d SHA1 323147531f95fe914174478b0c53656bbca31485 SHA256 0ce33a6ddda379f8a14c12e43286c31b54a24ccb1cf990078a634722c80d01c6
-EBUILD ruledispatch-0.5_pre2306.ebuild 861 RMD160 e8fb3b34dae243eba2117c755b86efac2b832e03 SHA1 ae56ab40472196256ca02033b1fd19328d5e64aa SHA256 648a46014e0cd23f0e2da28176b8fae3d10dbaa224faed391447333087cffebb
-MISC ChangeLog 1106 RMD160 d0110fbbb5b60c82a8ac8f067b22f60d5eb1181e SHA1 a04523bb5fcbc64cd563d53989dea89925b866c8 SHA256 0f44ef72331355fdbc4d84d7a5b14b220eb6e7b1c8132266d4d3a95338d63294
+EBUILD ruledispatch-0.5_pre2306-r1.ebuild 942 RMD160 e0fe5456d74a2eb7b2f33f1a0dc799ccb472fe67 SHA1 ff275f4d9364db483549631e1237fa755869c3e2 SHA256 50d9c8a68d2eb27ce7d2e4b8a576ce453d060bda40c2fd6d1694037e4953e9dc
+MISC ChangeLog 1398 RMD160 5e50eae7d8c5890cbb4d7c79f676ebd89994189a SHA1 1352cfa2293bce34af1b7949344c4630ef5c76cf SHA256 aae32a402e0e792079afd5ec3b4a55af15dd09d75f98314f098361e206297d06
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkprC9gACgkQdIssYB9vBoNvhgCdGdbf3VfYAw7QeD1/zQmaGVXE
+xHcAniJxJvHFJpxCoYqorGShViqBzag5
+=9VWC
+-----END PGP SIGNATURE-----
diff --git a/dev-python/ruledispatch/files/ruledispatch_as_syntax_fix.patch b/dev-python/ruledispatch/files/ruledispatch_as_syntax_fix.patch
new file mode 100644
index 000000000000..47960b3c23f5
--- /dev/null
+++ b/dev-python/ruledispatch/files/ruledispatch_as_syntax_fix.patch
@@ -0,0 +1,49 @@
+Added by: Jesus Rivero (Neurogeek)
+On: 25 Jul 2009
+Per Upstream bug: https://bugs.launchpad.net/ubuntu/+source/ruledispatch/+bug/342916
+
+diff -uNr RuleDispatch.orig/src/dispatch/__init__.py RuleDispatch/src/dispatch/__init__.py
+--- RuleDispatch.orig/src/dispatch/__init__.py  2009-07-25 13:25:08.000000000 +0000
++++ RuleDispatch/src/dispatch/__init__.py   2009-07-25 13:27:19.000000000 +0000
+@@ -95,7 +95,7 @@
+     return decorate_assignment(callback)
+ 
+ 
+-def as(*decorators):
++def as_(*decorators):
+     """Use Python 2.4 decorators w/Python 2.2+
+ 
+     Example:
+Files RuleDispatch.orig/src/dispatch/__init__.pyc and RuleDispatch/src/dispatch/__init__.pyc differ
+Files RuleDispatch.orig/src/dispatch/interfaces.pyc and RuleDispatch/src/dispatch/interfaces.pyc differ
+diff -uNr RuleDispatch.orig/src/dispatch/predicates.py RuleDispatch/src/dispatch/predicates.py
+--- RuleDispatch.orig/src/dispatch/predicates.py    2009-07-25 13:25:08.000000000 +0000
++++ RuleDispatch/src/dispatch/predicates.py 2009-07-25 13:27:58.000000000 +0000
+@@ -236,7 +236,7 @@
+ 
+         return or_, (EXPR_GETTER_ID,)
+ 
+-    [as(classmethod)]
++    [as_(classmethod)]
+     def immediate(klass,seq):
+         for item in seq:
+             if item:
+@@ -260,7 +260,7 @@
+ 
+         return and_, (EXPR_GETTER_ID,)
+ 
+-    [as(classmethod)]
++    [as_(classmethod)]
+     def immediate(klass,seq):
+         for item in seq:
+             if not item:
+@@ -278,7 +278,7 @@
+             return get(argIds[2])
+         return ifelse, (EXPR_GETTER_ID,)
+ 
+-    [as(classmethod)]
++    [as_(classmethod)]
+     def immediate(klass,seq):
+         if seq[1]: return seq[0]
+         return seq[2]
+
diff --git a/dev-python/ruledispatch/ruledispatch-0.5_pre2306.ebuild b/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r1.ebuild
index 2736e54d1bb6..7728d5e76e7c 100644
--- a/dev-python/ruledispatch/ruledispatch-0.5_pre2306.ebuild
+++ b/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 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/ruledispatch/ruledispatch-0.5_pre2306.ebuild,v 1.2 2007/05/05 19:51:41 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r1.ebuild,v 1.1 2009/07/25 13:42:30 neurogeek Exp $
 
+EAPI="2"
 NEED_PYTHON=2.4
 
 inherit distutils versionator
@@ -26,6 +27,10 @@ S="${WORKDIR}/${MY_PN}"
 
 PYTHON_MODNAME="dispatch"
 
+src_prepare(){
+	epatch "${FILESDIR}/${PN}_as_syntax_fix.patch"
+}
+
 src_test() {
 	PYTHONPATH=./src/ "${python}" setup.py test || die "tests failed"
 }