Fixed compilation w/ python-2.5 wrt bug #185819, thanks to Luis Medinas.

Package-Manager: portage-2.1.2.11

4 files changed, 51 insertions, 20 deletions

diff --git a/games-arcade/bub-n-bros/ChangeLog b/games-arcade/bub-n-bros/ChangeLog
index a0b23577ad5d..09ce60dff344 100644
--- a/games-arcade/bub-n-bros/ChangeLog
+++ b/games-arcade/bub-n-bros/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/bub-n-bros
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/ChangeLog,v 1.13 2007/06/08 11:54:03 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/ChangeLog,v 1.14 2007/08/13 19:14:10 coldwind Exp $
+
+  13 Aug 2007; Santiago M. Mola <coldwind@gentoo.org>
+  +files/bub-n-bros-1.5-python25.patch, bub-n-bros-1.5.ebuild:
+  Fixed compilation w/ python-2.5 wrt bug #185819, thanks to Luis Medinas.
 
 *bub-n-bros-1.5 (08 Jun 2007)
 
diff --git a/games-arcade/bub-n-bros/Manifest b/games-arcade/bub-n-bros/Manifest
index 614c17036e40..29a58c03b61b 100644
--- a/games-arcade/bub-n-bros/Manifest
+++ b/games-arcade/bub-n-bros/Manifest
@@ -1,24 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bub-n-bros-1.5-home.patch 1819 RMD160 81da0b47fe9d00e6317d0b176b1c50f8ef494fa4 SHA1 3c85bb4a921d6beb4ff8f9770a30257bdd0659de SHA256 14fc8284c3b1035fd4a5f578adb6d0ba3cabc53d476282c3ae6937b270e59f0c
 MD5 32402753b47dfe81a3376d34d17b837f files/bub-n-bros-1.5-home.patch 1819
 RMD160 81da0b47fe9d00e6317d0b176b1c50f8ef494fa4 files/bub-n-bros-1.5-home.patch 1819
 SHA256 14fc8284c3b1035fd4a5f578adb6d0ba3cabc53d476282c3ae6937b270e59f0c files/bub-n-bros-1.5-home.patch 1819
+AUX bub-n-bros-1.5-python25.patch 1086 RMD160 dfae82f172616e554cdb3206bc59160ddfd6388a SHA1 516bc50f007a1461ae7ef526b4889f3fcdb3645e SHA256 4b59b8f48d7828eef9e9c22934a0e1c2ef54ef99ad33e56c847e6befc06f7262
+MD5 48f45808d06f738af9c658cc42662b94 files/bub-n-bros-1.5-python25.patch 1086
+RMD160 dfae82f172616e554cdb3206bc59160ddfd6388a files/bub-n-bros-1.5-python25.patch 1086
+SHA256 4b59b8f48d7828eef9e9c22934a0e1c2ef54ef99ad33e56c847e6befc06f7262 files/bub-n-bros-1.5-python25.patch 1086
 DIST bub-n-bros-1.1.tar.gz 10499686 RMD160 ae53459210d3333b35b29a9eaca7a63f0ace9cfe SHA1 8485bb8f403921a818f73c758112b998cb785101 SHA256 27389b3095e7df0801f4c2c873f438a05ec5d3b129ccf802c57d1f73d8befd65
 DIST bubbros-1.5.tar.bz2 8856240 RMD160 dafe5004569ed4313d0e470627337810fefec820 SHA1 3da8dff63d3b14ec57ec483f64af5edec4a0f09e SHA256 91db9aa59f2adcd6f79cff475b457901aea82ffe0ebc557012eb3a0a36a3b05b
 EBUILD bub-n-bros-1.1.ebuild 1706 RMD160 afcb936bb51b39dc1c812b20d46b5d050d9a4d0f SHA1 25130987e5a1f899a852bc70cf4dc7c46f8032f9 SHA256 3eb66ed2ef604c2ba1e3a7f92f57630d45360bf47340984cb2d49c06b143306c
 MD5 db551957d5a03f601b484423e25c5edc bub-n-bros-1.1.ebuild 1706
 RMD160 afcb936bb51b39dc1c812b20d46b5d050d9a4d0f bub-n-bros-1.1.ebuild 1706
 SHA256 3eb66ed2ef604c2ba1e3a7f92f57630d45360bf47340984cb2d49c06b143306c bub-n-bros-1.1.ebuild 1706
-EBUILD bub-n-bros-1.5.ebuild 1455 RMD160 489dba78acab336f68129883d7e10533c27f0834 SHA1 eb5ffdaf70beee4c2f9257dd63733a666b0fd346 SHA256 3e51183e76a6d8b766be3bbb9d4d37b5ff74d73942aa47f809a771aeade6cab7
-MD5 d1ddedfd119254b52381a3116156df95 bub-n-bros-1.5.ebuild 1455
-RMD160 489dba78acab336f68129883d7e10533c27f0834 bub-n-bros-1.5.ebuild 1455
-SHA256 3e51183e76a6d8b766be3bbb9d4d37b5ff74d73942aa47f809a771aeade6cab7 bub-n-bros-1.5.ebuild 1455
-MISC ChangeLog 1432 RMD160 c57e207aaca613f9b98f953a6bd7ef127133cd68 SHA1 fe295eb49f8159d67df8629513e316bc4c10aed8 SHA256 d041e424f5f3e928f6e7b184c0512432c6d96e7f13bbef046ffb7c472aadfd38
-MD5 059781fd35db67d5bbaa73ee88389314 ChangeLog 1432
-RMD160 c57e207aaca613f9b98f953a6bd7ef127133cd68 ChangeLog 1432
-SHA256 d041e424f5f3e928f6e7b184c0512432c6d96e7f13bbef046ffb7c472aadfd38 ChangeLog 1432
+EBUILD bub-n-bros-1.5.ebuild 1501 RMD160 9d509a3174d12148f7ffbd70cec9bbdb64483dd6 SHA1 e490bdca105e2b5541cafad5b2c82eaf8c182310 SHA256 eb2d911de9688533c31059e0d71005b6ae15dc4d279f78cefc237168e495fe6f
+MD5 49c6c5c10a3928c01579436dc753167a bub-n-bros-1.5.ebuild 1501
+RMD160 9d509a3174d12148f7ffbd70cec9bbdb64483dd6 bub-n-bros-1.5.ebuild 1501
+SHA256 eb2d911de9688533c31059e0d71005b6ae15dc4d279f78cefc237168e495fe6f bub-n-bros-1.5.ebuild 1501
+MISC ChangeLog 1629 RMD160 c1463940e55d6c2f14ff4bef9e4e6d394d9b7c5d SHA1 63c43344ba8ac6f2925ec644d117cd0328278fd1 SHA256 34779f2b3d8759f17517da56cbb67e11972dced5fdafea31e43ad465f553d0f4
+MD5 4515678f21e76380555616d7476c4d28 ChangeLog 1629
+RMD160 c1463940e55d6c2f14ff4bef9e4e6d394d9b7c5d ChangeLog 1629
+SHA256 34779f2b3d8759f17517da56cbb67e11972dced5fdafea31e43ad465f553d0f4 ChangeLog 1629
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -29,10 +30,3 @@ SHA256 c516739b17293c0b2aff50de788f86f8f7172c57cde311910b5158d021e17c57 files/di
 MD5 77d35850968bf7f10ed3b03a48517225 files/digest-bub-n-bros-1.5 241
 RMD160 8417f3bb962231ab102f9f7bc29653a95f8b7d02 files/digest-bub-n-bros-1.5 241
 SHA256 9713f3aa67a98b68645726209ad54cc2e0c5764d19fcf656f1f13f539cdbfe2e files/digest-bub-n-bros-1.5 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGaUNgdz7hIScOURERAqA0AKDupsjn03omqWUNpZJRW5MCNbumLACg1xZq
-6W0SJT3WAzgevXIk6u7XpKU=
-=zXnV
------END PGP SIGNATURE-----
diff --git a/games-arcade/bub-n-bros/bub-n-bros-1.5.ebuild b/games-arcade/bub-n-bros/bub-n-bros-1.5.ebuild
index 7d114a2b543e..7b2f2b5010e2 100644
--- a/games-arcade/bub-n-bros/bub-n-bros-1.5.ebuild
+++ b/games-arcade/bub-n-bros/bub-n-bros-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/bub-n-bros-1.5.ebuild,v 1.1 2007/06/08 01:02:10 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/bub-n-bros-1.5.ebuild,v 1.2 2007/08/13 19:14:10 coldwind Exp $
 
 inherit eutils games
 
@@ -23,6 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-home.patch
+	epatch "${FILESDIR}"/${P}-python25.patch
 }
 
 src_compile() {
diff --git a/games-arcade/bub-n-bros/files/bub-n-bros-1.5-python25.patch b/games-arcade/bub-n-bros/files/bub-n-bros-1.5-python25.patch
new file mode 100644
index 000000000000..447d51527cdc
--- /dev/null
+++ b/games-arcade/bub-n-bros/files/bub-n-bros-1.5-python25.patch
@@ -0,0 +1,32 @@
+diff -ur bubbros-1.5.orig/bubbob/statesaver.c bubbros-1.5/bubbob/statesaver.c
+--- bubbros-1.5.orig/bubbob/statesaver.c	2007-08-13 18:08:58.000000000 +0200
++++ bubbros-1.5/bubbob/statesaver.c	2007-08-13 18:09:32.000000000 +0200
+@@ -44,7 +44,7 @@
+     Py_INCREF(g);  /* exhausted -- can return 'g' itself */
+     return g;
+   }
+-  if (f->f_nfreevars || f->f_ncells) {
++  if (PySequence_Length(co->co_freevars) || PySequence_Length(co->co_cellvars)) {
+     PyErr_SetString(PyExc_ValueError, "generator has cell or free vars");
+     return NULL;
+   }
+@@ -67,6 +67,8 @@
+   PyFrameObject* f;
+   PyFrameObject* f2;
+   PyCodeObject* co;
++  PyCodeObject* code;
++  PyCodeObject* code2;
+   int i, res;
+ 
+   if (g != g2)
+@@ -94,8 +96,8 @@
+         PyErr_SetString(PyExc_TypeError, "returned gi_frame");
+         return -1;
+       }
+-      f2 = (PyFrameObject*) x;
+-      if (f2->f_stacksize != f->f_stacksize) {
++      code2 = (PyFrameObject*) x;
++      if (code2->co_stacksize != code->co_stacksize) {
+         PyErr_SetString(PyExc_TypeError, "stack size mismatch");
+         return -1;
+       }