gcc-4 patch, bug #120839

(Portage version: 2.1_pre7-r3)

5 files changed, 110 insertions, 12 deletions

diff --git a/games-board/gnushogi/ChangeLog b/games-board/gnushogi/ChangeLog
index 54c44ee05b4b..ef809b3a8845 100644
--- a/games-board/gnushogi/ChangeLog
+++ b/games-board/gnushogi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/gnushogi
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnushogi/ChangeLog,v 1.11 2006/01/29 21:28:01 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnushogi/ChangeLog,v 1.12 2006/04/03 16:34:14 tupone Exp $
+
+  03 Apr 2006; <Tupone@gentoo.org> +files/gnushogi-1.3-gcc4.patch,
+  gnushogi-1.3.ebuild:
+  gcc-4 patch, bug #120839 by Joshua Baergen
 
   29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   gnushogi-1.3.ebuild:
diff --git a/games-board/gnushogi/Manifest b/games-board/gnushogi/Manifest
index c88a72428d9a..661d767c88b3 100644
--- a/games-board/gnushogi/Manifest
+++ b/games-board/gnushogi/Manifest
@@ -1,15 +1,18 @@
-MD5 bd03b7056b9c9163934b55675574b1c9 ChangeLog 1516
-RMD160 85048fd8924cb2489bca1b8549a7e8713f44b7e5 ChangeLog 1516
-SHA256 259298d6d48e8ac458438396c39b26bc06b1e12aec56fa03105a26522cc25489 ChangeLog 1516
+MD5 0fd3f0d5d0efefbd818cb9bff17210b4 ChangeLog 1652
+RMD160 42ab65cbeae3803fecd39d72dc71ea1477ebe6c8 ChangeLog 1652
+SHA256 14813ddb674fb9a95f528522b82fb40b0a973d125929c909da5b4435962b48a8 ChangeLog 1652
 MD5 97c87cb301c5365d234901fe7ea9456d files/1.3-errno.patch 304
 RMD160 2cbd468bab6a7e42a3cd3e1971216e2777b063b4 files/1.3-errno.patch 304
 SHA256 0fa129a571eaed3ff395d39acde806d0052554775195c434c134c0cb846bd5f7 files/1.3-errno.patch 304
-MD5 a46c4bdecc0df352e8f7735ee4e6e37b files/digest-gnushogi-1.3 64
-RMD160 96c60cd773d8def379efbd80160c1b06534c3b53 files/digest-gnushogi-1.3 64
-SHA256 c42eb5f084f68eb033041cbc59282b9223ea33f474307fd40428ee050fca78d4 files/digest-gnushogi-1.3 64
-MD5 e8975332060f7c37739527a7842b631c gnushogi-1.3.ebuild 1316
-RMD160 9bba09fc07e17eee10e98cfe36b592edbf3d5fba gnushogi-1.3.ebuild 1316
-SHA256 a01511d1b543582e1799225c45c92886dba78773c17b56ed1f3dc689fbc1c9a9 gnushogi-1.3.ebuild 1316
+MD5 0960ccb457f03ec2e49bc2a226ebca8a files/digest-gnushogi-1.3 238
+RMD160 c06706ab4a2fc46980ef8706b497421d2c6896e9 files/digest-gnushogi-1.3 238
+SHA256 70f5bf48a2c3c3e37c0c28ffb3d0ac0e0606cfb0104d60f9e08ac1cb07c7e410 files/digest-gnushogi-1.3 238
+MD5 cda999a188dbc272c31dd9ab75e28f7f files/gnushogi-1.3-gcc4.patch 2475
+RMD160 edbffd76f35b16fab93b5f11a30d269bd89362f2 files/gnushogi-1.3-gcc4.patch 2475
+SHA256 188edc814191f8c8b21165d60144ee04c8c575a57c6c7801ae0b477420f2f0b9 files/gnushogi-1.3-gcc4.patch 2475
+MD5 1e40b609247b3c51390744bbaf8fea51 gnushogi-1.3.ebuild 1350
+RMD160 787a466a7656c8132e5e9c1dc561b4a3b59e5afb gnushogi-1.3.ebuild 1350
+SHA256 7c0725dc52a48830a3d97e806f0abff4e0d99b39cb93313296bfc9e31adb7a15 gnushogi-1.3.ebuild 1350
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-board/gnushogi/files/digest-gnushogi-1.3 b/games-board/gnushogi/files/digest-gnushogi-1.3
index 4cac12518d00..dc034d3d0346 100644
--- a/games-board/gnushogi/files/digest-gnushogi-1.3
+++ b/games-board/gnushogi/files/digest-gnushogi-1.3
@@ -1 +1,3 @@
 MD5 592e9f3993ed483525b3c1bcd48b1ef9 gnushogi-1.3.tar.gz 558642
+RMD160 8cb34238cb175855e4bc2b29c2ae492a141576f9 gnushogi-1.3.tar.gz 558642
+SHA256 57148a89e4ab2702b2434c10f6e261bc26ea0954754c3d0b3e3eac67b589e5c2 gnushogi-1.3.tar.gz 558642
diff --git a/games-board/gnushogi/files/gnushogi-1.3-gcc4.patch b/games-board/gnushogi/files/gnushogi-1.3-gcc4.patch
new file mode 100644
index 000000000000..446285842a94
--- /dev/null
+++ b/games-board/gnushogi/files/gnushogi-1.3-gcc4.patch
@@ -0,0 +1,88 @@
+--- gnushogi/genmove.c.old	2006-01-29 11:45:31.000000000 -0700
++++ gnushogi/genmove.c	2006-01-29 11:46:22.000000000 -0700
+@@ -40,7 +40,7 @@
+ static short InCheck = false, GenerateAllMoves = false;
+ static short check_determined = false;
+ 
+-static short INCscore = 0;
++static short INCscore_local = 0;
+ 
+ short deepsearchcut = true;
+ short tas = false, taxs = false, ssa = false;
+@@ -261,7 +261,7 @@
+         node->reply = 0;
+         node->flags = local_flag;
+         node->score = s;
+-        node->INCscore = INCscore;
++        node->INCscore = INCscore_local;
+ 
+         if (GenerateAllMoves)
+         {
+@@ -504,7 +504,7 @@
+ 
+                 if ((boardu = board[u]) == king)
+                 {
+-                    s += 20; INCscore -= 18;
++                    s += 20; INCscore_local -= 18;
+                     *local_flag |= check; /* move threatens
+                                            * opponents king */
+                 }
+@@ -555,7 +555,7 @@
+     }
+     while (u != t);
+ 
+-    INCscore += s;
++    INCscore_local += s;
+ 
+     return s;
+ }
+@@ -620,7 +620,7 @@
+         return;
+     }
+ 
+-    INCscore = 0;
++    INCscore_local = 0;
+ 
+ #ifdef HISTORY
+     s += history[hindex(side, mv)];
+@@ -645,14 +645,14 @@
+         {
+             /* bonus for square near enemy king */
+             s += 15;
+-            INCscore += 2;
++            INCscore_local += 2;
+             local_flag |= kingattack;
+         }
+         else if (distance(t, OwnKing) <= 1)
+         {
+             /* bonus for square near own king */
+             s += 10;
+-            INCscore++;
++            INCscore_local++;
+             local_flag |= kingattack;
+         }
+     }
+@@ -765,7 +765,7 @@
+         {
+             /* bonus for promotions */
+             s++;
+-            INCscore += value[stage][promoted[piece]] - value[stage][piece];
++            INCscore_local += value[stage][promoted[piece]] - value[stage][piece];
+         }
+         else
+         {
+@@ -787,12 +787,12 @@
+                     if (piece == pawn || piece == bishop || piece == rook)
+                     {
+                         local_flag |= stupid;
+-                        INCscore -= 20;
++                        INCscore_local -= 20;
+                     }
+                     else
+                     {
+                         local_flag |= questionable;
+-                        INCscore -= 10;
++                        INCscore_local -= 10;
+                     }
+                 }
+             }
diff --git a/games-board/gnushogi/gnushogi-1.3.ebuild b/games-board/gnushogi/gnushogi-1.3.ebuild
index fe0b699e820b..a1d53ce7bf53 100644
--- a/games-board/gnushogi/gnushogi-1.3.ebuild
+++ b/games-board/gnushogi/gnushogi-1.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/games-board/gnushogi/gnushogi-1.3.ebuild,v 1.11 2006/01/29 21:28:01 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnushogi/gnushogi-1.3.ebuild,v 1.12 2006/04/03 16:34:14 tupone Exp $
 
 inherit eutils games
 
@@ -32,7 +32,8 @@ src_unpack() {
 			-e 's:-ltermcap:-lcurses:' ${f} \
 				|| die "sed ${f} failed"
 	done
-	epatch "${FILESDIR}/${PV}-errno.patch"
+	epatch "${FILESDIR}/${PV}-errno.patch" \
+		"${FILESDIR}/${P}"-gcc4.patch
 }
 
 src_compile() {