add the rest of the patch to fix bug #198807 and rev bump to force it out

Package-Manager: portage-2.1.3.19

5 files changed, 85 insertions, 13 deletions

diff --git a/games-board/pioneers/ChangeLog b/games-board/pioneers/ChangeLog
index 54bbbe9002a2..3a931d511ddd 100644
--- a/games-board/pioneers/ChangeLog
+++ b/games-board/pioneers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-board/pioneers
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/ChangeLog,v 1.14 2007/11/11 14:42:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/ChangeLog,v 1.15 2007/11/20 03:09:06 mr_bones_ Exp $
+
+*pioneers-0.11.3-r1 (20 Nov 2007)
+
+  20 Nov 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/pioneers-0.11.3-DOS.patch, -pioneers-0.11.3.ebuild,
+  +pioneers-0.11.3-r1.ebuild:
+  add the rest of the patch to fix bug #198807 and rev bump to force it out
 
   11 Nov 2007; Michael Sterrett <mr_bones_@gentoo.org>
   -pioneers-0.9.33.ebuild, -pioneers-0.10.2.ebuild, pioneers-0.11.3.ebuild:
diff --git a/games-board/pioneers/Manifest b/games-board/pioneers/Manifest
index 6ad58f3f3c38..5365184d6cc3 100644
--- a/games-board/pioneers/Manifest
+++ b/games-board/pioneers/Manifest
@@ -1,16 +1,20 @@
+AUX pioneers-0.11.3-DOS.patch 1416 RMD160 69b88c63b67ca42795030d2cb58650b3dd27c819 SHA1 56c68d4d2d8d171b21267aa7473e856daed09bd2 SHA256 3aa9da313971ed122a1f2e09dab27acd593fa9d33c35ca7e7217a5fb6ff84ff6
+MD5 bcbac06cf3fb5c10b87100658a0834f6 files/pioneers-0.11.3-DOS.patch 1416
+RMD160 69b88c63b67ca42795030d2cb58650b3dd27c819 files/pioneers-0.11.3-DOS.patch 1416
+SHA256 3aa9da313971ed122a1f2e09dab27acd593fa9d33c35ca7e7217a5fb6ff84ff6 files/pioneers-0.11.3-DOS.patch 1416
 DIST pioneers-0.11.3.tar.gz 2834584 RMD160 a72e4ae0b4489bf944dc30ab89039aabe04f8d7c SHA1 9a1131dd291e12367a870335a1e8c78da101d1ad SHA256 7b62c401594b2ebea310c5c63bd639811284cd2c7dbb87d6051850fcbae4cc39
-EBUILD pioneers-0.11.3.ebuild 873 RMD160 ca8da7bfe3b3bbe3227e8a7e34eeee68877f7217 SHA1 1411c27ce2a776cff67b63efb5ecded02406c8e4 SHA256 ed0fb94ed494280c8df99d52e05af555e41ac47db73f2c730c6d73739358a645
-MD5 f5405f587f1fe8a474da7c25a02dee18 pioneers-0.11.3.ebuild 873
-RMD160 ca8da7bfe3b3bbe3227e8a7e34eeee68877f7217 pioneers-0.11.3.ebuild 873
-SHA256 ed0fb94ed494280c8df99d52e05af555e41ac47db73f2c730c6d73739358a645 pioneers-0.11.3.ebuild 873
-MISC ChangeLog 3032 RMD160 4114f63a94ef65775491ef07ebadce231ab75fe0 SHA1 825bc91b3a2b502f4dae04959b88617eaac5c4a6 SHA256 adefd8b1bed97d33c3a30c93b6ceed0fe4b1a54592deff549f4e0ecb1080b22f
-MD5 b6f65c511552470ad3c4074f1043595c ChangeLog 3032
-RMD160 4114f63a94ef65775491ef07ebadce231ab75fe0 ChangeLog 3032
-SHA256 adefd8b1bed97d33c3a30c93b6ceed0fe4b1a54592deff549f4e0ecb1080b22f ChangeLog 3032
+EBUILD pioneers-0.11.3-r1.ebuild 963 RMD160 940d6ac3091876491655fe0aeada401e4d76d470 SHA1 cc7dbd8ed7eece4634a5c160f78edc6db251db0d SHA256 3b1d10449847a2c8d1fc726f5830560a6e5a69588ec5d3701fd28464e857ddf8
+MD5 b623d922e9a06df0996ccc17abe6082a pioneers-0.11.3-r1.ebuild 963
+RMD160 940d6ac3091876491655fe0aeada401e4d76d470 pioneers-0.11.3-r1.ebuild 963
+SHA256 3b1d10449847a2c8d1fc726f5830560a6e5a69588ec5d3701fd28464e857ddf8 pioneers-0.11.3-r1.ebuild 963
+MISC ChangeLog 3290 RMD160 6799f638449d86609a0da19c41a0ca31c8fe59f9 SHA1 d7c81b683fa02bff1bdad9054e9f1f6d7ac8a9ac SHA256 ab2ef34d735e84cf7c75c498474d968594859ec8dc59556762d548c0a63bd3c0
+MD5 327b5334862e7800573d9a9900c6a4cf ChangeLog 3290
+RMD160 6799f638449d86609a0da19c41a0ca31c8fe59f9 ChangeLog 3290
+SHA256 ab2ef34d735e84cf7c75c498474d968594859ec8dc59556762d548c0a63bd3c0 ChangeLog 3290
 MISC metadata.xml 263 RMD160 433f5f42829a25876c2fea81cb92729d52cdfa23 SHA1 469458f645348c105fe96d617b4c34183e07874b SHA256 9ba942b4fa266f8056ed86d55dd52885e7972692cd1ec20c54ea3222a81c09df
 MD5 de3b1e43fa1f75a6c293d00547f3364f metadata.xml 263
 RMD160 433f5f42829a25876c2fea81cb92729d52cdfa23 metadata.xml 263
 SHA256 9ba942b4fa266f8056ed86d55dd52885e7972692cd1ec20c54ea3222a81c09df metadata.xml 263
-MD5 91ab4043cced2ca9697def65a21daf18 files/digest-pioneers-0.11.3 250
-RMD160 d7dddcac88211177b84342f1f12e2bacb253fbec files/digest-pioneers-0.11.3 250
-SHA256 6816f2aa6e74dd8aa82a7dfaabd729ddf9b1161d225665d8def81eed07db1f60 files/digest-pioneers-0.11.3 250
+MD5 91ab4043cced2ca9697def65a21daf18 files/digest-pioneers-0.11.3-r1 250
+RMD160 d7dddcac88211177b84342f1f12e2bacb253fbec files/digest-pioneers-0.11.3-r1 250
+SHA256 6816f2aa6e74dd8aa82a7dfaabd729ddf9b1161d225665d8def81eed07db1f60 files/digest-pioneers-0.11.3-r1 250
diff --git a/games-board/pioneers/files/digest-pioneers-0.11.3 b/games-board/pioneers/files/digest-pioneers-0.11.3-r1
index 30a00aaaa642..30a00aaaa642 100644
--- a/games-board/pioneers/files/digest-pioneers-0.11.3
+++ b/games-board/pioneers/files/digest-pioneers-0.11.3-r1
diff --git a/games-board/pioneers/files/pioneers-0.11.3-DOS.patch b/games-board/pioneers/files/pioneers-0.11.3-DOS.patch
new file mode 100644
index 000000000000..d7241eddb501
--- /dev/null
+++ b/games-board/pioneers/files/pioneers-0.11.3-DOS.patch
@@ -0,0 +1,56 @@
+Index: common/state.c
+===================================================================
+--- common/state.c	(revision 1355)
++++ common/state.c	(working copy)
+@@ -68,10 +68,12 @@
+ 
+ static void route_event(StateMachine * sm, gint event)
+ {
+-	StateFunc curr_state;
++	StateFunc curr_state = NULL;
+ 	gpointer user_data;
+ 
+-	curr_state = sm_current(sm);
++	if (sm->stack_ptr >= 0)
++		curr_state = sm_current(sm);
++
+ 	user_data = sm->user_data;
+ 	if (user_data == NULL)
+ 		user_data = sm;
+@@ -89,20 +91,22 @@
+ 
+ 	switch (event) {
+ 	case SM_ENTER:
+-		curr_state(user_data, event);
++		if (curr_state)
++			curr_state(user_data, event);
+ 		break;
+ 	case SM_INIT:
+-		curr_state(user_data, event);
++		if (curr_state)
++			curr_state(user_data, event);
+ 		if (!sm->is_dead && sm->global !=NULL)
+ 			sm->global (user_data, event);
+ 		break;
+ 	case SM_RECV:
+ 		sm_cancel_prefix(sm);
+-		if (curr_state(user_data, event))
++		if (curr_state && curr_state(user_data, event))
+ 			break;
+ 		sm_cancel_prefix(sm);
+ 		if (!sm->is_dead
+-		    && sm->global !=NULL && sm->global (user_data, event))
++		    && sm->global != NULL && sm->global (user_data, event))
+ 			break;
+ 
+ 		sm_cancel_prefix(sm);
+@@ -112,7 +116,8 @@
+ 	case SM_NET_CLOSE:
+ 		sm_close(sm);
+ 	default:
+-		curr_state(user_data, event);
++		if (curr_state)
++			curr_state(user_data, event);
+ 		if (!sm->is_dead && sm->global !=NULL)
+ 			sm->global (user_data, event);
+ 		break;
diff --git a/games-board/pioneers/pioneers-0.11.3.ebuild b/games-board/pioneers/pioneers-0.11.3-r1.ebuild
index 76915b258114..fd2ac1790085 100644
--- a/games-board/pioneers/pioneers-0.11.3.ebuild
+++ b/games-board/pioneers/pioneers-0.11.3-r1.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-board/pioneers/pioneers-0.11.3.ebuild,v 1.3 2007/11/11 15:12:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/pioneers-0.11.3-r1.ebuild,v 1.1 2007/11/20 03:09:06 mr_bones_ Exp $
 
 inherit eutils gnome2
 
@@ -22,6 +22,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}/${P}-DOS.patch" #bug #198807
+}
+
 src_compile() {
 	gnome2_src_compile $(use_enable nls)
 }