Fixing bug #91950 on amd64

(Portage version: 2.1_pre6-r6)

5 files changed, 59 insertions, 12 deletions

diff --git a/games-rpg/daimonin-client/ChangeLog b/games-rpg/daimonin-client/ChangeLog
index 66a38bc093ae..2fb0d75418f5 100644
--- a/games-rpg/daimonin-client/ChangeLog
+++ b/games-rpg/daimonin-client/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/daimonin-client
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/ChangeLog,v 1.13 2006/03/13 21:18:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/ChangeLog,v 1.14 2006/03/24 19:02:00 tupone Exp $
+
+  24 Mar 2006; <Tupone@gentoo.org>
+  +files/daimonin-client-0.96.6_beta3-64bits.patch,
+  daimonin-client-0.96.6_beta3.ebuild:
+  Fixing bug #91950, die while loading. Thanks Daren Hayward for report 
+  and Raymond Lewis Rebbeck for solution
 
   13 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org>
   daimonin-client-0.95b-r2.ebuild, daimonin-client-0.96.6_beta3.ebuild:
diff --git a/games-rpg/daimonin-client/Manifest b/games-rpg/daimonin-client/Manifest
index 8721fac0aca8..abf85eac17b5 100644
--- a/games-rpg/daimonin-client/Manifest
+++ b/games-rpg/daimonin-client/Manifest
@@ -1,12 +1,12 @@
-MD5 029566e7d74887816a512b172d0dc600 ChangeLog 2353
-RMD160 71253b5377b64ba3fe300b316321ade6a4ff7058 ChangeLog 2353
-SHA256 7d0cf52e6272ccc9de8ddb524b6f6e1e55c2656c0b8e2ba702e49033c26d27bc ChangeLog 2353
+MD5 449349ba31149cc43a7d6bb54c4264c6 ChangeLog 2594
+RMD160 c026e9ea95e147561c276ccd9f158266b9625fb9 ChangeLog 2594
+SHA256 965ddcabbd319f285d918ce7d46c474a52584d616f84c39b8027cc4857307e99 ChangeLog 2594
 MD5 804b258e6fe9926ac45b13368e55d3ba daimonin-client-0.95b-r2.ebuild 1160
 RMD160 91b67a7c643d72d48eea65761d31c5b377d13172 daimonin-client-0.95b-r2.ebuild 1160
 SHA256 f53d365326b6580e41b3264c59aabbbda6ba00dbe1c7066e15c1817cff0040ea daimonin-client-0.95b-r2.ebuild 1160
-MD5 b67ae37e4224563045ce870f8366435f daimonin-client-0.96.6_beta3.ebuild 1488
-RMD160 c22a27e59eda08449adb604bc8a7731a61a43dc0 daimonin-client-0.96.6_beta3.ebuild 1488
-SHA256 8a38189cb7c5459a4fdeb54ee2c0d757b4aa6236d340799126a9188a4ff10d13 daimonin-client-0.96.6_beta3.ebuild 1488
+MD5 9bb9c55d6c4d3aa3efb2ae1b93d0a760 daimonin-client-0.96.6_beta3.ebuild 1634
+RMD160 e04d22f7af19c2ec5239e580410232c356bba649 daimonin-client-0.96.6_beta3.ebuild 1634
+SHA256 adfe9a0d86aef165079ee871c9c0f4b3b2f8d95f8641121e8208cb2fae7dc0d9 daimonin-client-0.96.6_beta3.ebuild 1634
 MD5 f0fea0494c9b50a88620443df60a150e files/0.95b-gcc3.patch 1664
 RMD160 22406cd9099cab6c178d51c003f1de9d2ef49499 files/0.95b-gcc3.patch 1664
 SHA256 6cb074342051667d0e6144526f6a7df0e589777fff643a59d87321b60b29d3d6 files/0.95b-gcc3.patch 1664
@@ -22,12 +22,15 @@ SHA256 534d2a5c40c2384d69d839b6d068a5a470a46fc14c8c7790157efbe28ad1331b files/0.
 MD5 8a41290909b2aa9cf1835f6aac36c738 files/0.96a_beta2-gentoo-paths.patch 3172
 RMD160 754eb5a9759ec2907847fc5ebd1f29bab24a93fd files/0.96a_beta2-gentoo-paths.patch 3172
 SHA256 534d2a5c40c2384d69d839b6d068a5a470a46fc14c8c7790157efbe28ad1331b files/0.96a_beta2-gentoo-paths.patch 3172
+MD5 7f2510d3c8a639a495b06c05e3a072f9 files/daimonin-client-0.96.6_beta3-64bits.patch 901
+RMD160 84e96c6864dd2a485e5b415524ffb434855d92ae files/daimonin-client-0.96.6_beta3-64bits.patch 901
+SHA256 89c40ec9dfef6498feda2665a9b4566063bd4fa7590fe7bf35a68e5f59489fbf files/daimonin-client-0.96.6_beta3-64bits.patch 901
 MD5 b7f58f6b5220a09dedb532eb977bd227 files/digest-daimonin-client-0.95b-r2 69
 RMD160 be1486eec22cf1becb243367f52ba1d631e72608 files/digest-daimonin-client-0.95b-r2 69
 SHA256 30efa39dd0e23467044366c364fa102ea87d78c4bc120bf6bf725c2498e6de09 files/digest-daimonin-client-0.95b-r2 69
-MD5 5ac5c8e1d72348115409654af5ab3584 files/digest-daimonin-client-0.96.6_beta3 77
-RMD160 901d1776cfd02b7e8ce0b39c0d3d658c2c2b609a files/digest-daimonin-client-0.96.6_beta3 77
-SHA256 2afcde0cb9f37eeb7033005fd833a3cc0ff11a91bff316feed3c75c9026ba44d files/digest-daimonin-client-0.96.6_beta3 77
+MD5 3f4cf988933206552386a7031d142214 files/digest-daimonin-client-0.96.6_beta3 277
+RMD160 461d29bfeccbd699be492ac36b72535008aba59e files/digest-daimonin-client-0.96.6_beta3 277
+SHA256 94a56194f41de4677a4da190dfbaf1996a229c9e470c55937a66e3a75c714487 files/digest-daimonin-client-0.96.6_beta3 277
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.ebuild b/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.ebuild
index 821a79bd081e..da764c1e6969 100644
--- a/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.ebuild
+++ b/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.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-rpg/daimonin-client/daimonin-client-0.96.6_beta3.ebuild,v 1.4 2006/03/13 21:18:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.ebuild,v 1.5 2006/03/24 19:02:00 tupone Exp $
 
 inherit eutils flag-o-matic games
 
@@ -24,7 +24,8 @@ S=${WORKDIR}/daimonin/client
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}-gentoo-paths.patch"
+	epatch "${FILESDIR}/${PV}-gentoo-paths.patch" \
+		"${FILESDIR}/${P}"-64bits.patch
 	chmod a+x make/linux/configure
 }
 
@@ -32,6 +33,10 @@ src_compile() {
 	append-flags \
 		-DGENTOO_DATADIR="'\"${GAMES_DATADIR}/${PN}\"'" \
 		-DGENTOO_STATEDIR="'\"${GAMES_STATEDIR}/${PN}\"'"
+	# Bug #91950 - compiler optimization is bad for the game on amd64
+	if use amd64; then
+		append-flags -O0
+	fi
 
 	cd make/linux
 	egamesconf || die
diff --git a/games-rpg/daimonin-client/files/daimonin-client-0.96.6_beta3-64bits.patch b/games-rpg/daimonin-client/files/daimonin-client-0.96.6_beta3-64bits.patch
new file mode 100644
index 000000000000..aa097abbb0a9
--- /dev/null
+++ b/games-rpg/daimonin-client/files/daimonin-client-0.96.6_beta3-64bits.patch
@@ -0,0 +1,31 @@
+--- ../../src/wrapper.c.orig	Thu Dec 18 22:43:08 2003
++++ ../../src/wrapper.c	Wed Feb 16 10:09:17 2005
+@@ -44,13 +44,15 @@
+         }
+         if(!logstream)		/* secure: we have no open stream*/
+                 flag = FALSE;
+-        va_start(ap, format);
+         if(flag)
+ 		{
++			va_start(ap, format);
+ 			vfprintf(stdout, format, ap);
++			va_end(ap);
++			va_start(ap, format);
+ 			vfprintf(logstream, format, ap);
++			va_end(ap);
+ 		}
+-        va_end(ap);
+         fflush(logstream);
+ 
+ #endif
+--- ../../src/uncompr.c.orig	Sun Nov 30 22:59:30 2003
++++ ../../src/uncompr.c	Wed Feb 16 22:11:32 2005
+@@ -39,7 +39,7 @@
+ 
+     stream.next_out = dest;
+     stream.avail_out = (uInt)*destLen;
+-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
++    if ((uLong)stream.avail_out != (uInt)*destLen) return Z_BUF_ERROR;
+ 
+     stream.zalloc = (alloc_func)0;
+     stream.zfree = (free_func)0;
diff --git a/games-rpg/daimonin-client/files/digest-daimonin-client-0.96.6_beta3 b/games-rpg/daimonin-client/files/digest-daimonin-client-0.96.6_beta3
index b88d7e43f84c..7b4e785a2898 100644
--- a/games-rpg/daimonin-client/files/digest-daimonin-client-0.96.6_beta3
+++ b/games-rpg/daimonin-client/files/digest-daimonin-client-0.96.6_beta3
@@ -1 +1,3 @@
 MD5 f15098816863537ed547b4f70d1413c2 daimonin_client-BETA3-0966.tgz 15101397
+RMD160 34a09d41cc4e468ce34a45e33a1b7d9c7ee09dff daimonin_client-BETA3-0966.tgz 15101397
+SHA256 f41a1f0068bdb6a6d77410097037e2e2901aff557109d136a570ce61b47c67d3 daimonin_client-BETA3-0966.tgz 15101397