Fix problem on x86_64 platform. Bug #195918 & Bug #201630

Package-Manager: portage-2.1.3.19

3 files changed, 22 insertions, 21 deletions

diff --git a/games-board/crafty/ChangeLog b/games-board/crafty/ChangeLog
index a9a75aabb864..b86a1b08dcd2 100644
--- a/games-board/crafty/ChangeLog
+++ b/games-board/crafty/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-board/crafty
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/ChangeLog,v 1.22 2007/12/07 22:33:56 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/ChangeLog,v 1.23 2007/12/09 10:25:17 tupone Exp $
+
+  09 Dec 2007; <atupone@gentoo.org> crafty-21.6.ebuild:
+  Fix problem on x86_64 platform.
+  Bug #195918 by HTS.
+  Bug #201630 by Chris Smith
 
 *crafty-21.6 (07 Dec 2007)
 
diff --git a/games-board/crafty/Manifest b/games-board/crafty/Manifest
index ba7fee2f4506..e15fdedcfd9d 100644
--- a/games-board/crafty/Manifest
+++ b/games-board/crafty/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST crafty-20.13.zip 422053 RMD160 65ae1a196376c697cd028ab818d5f2975682193c SHA1 4b9bd7d1f6098cfdbc2a7b5d854b5b1d37184bc9 SHA256 b80bbb7c72f8adb7dacf284eefd7e4dafdc2683eaf8d5255fc04c09a5b54de28
 DIST crafty-20.14.zip 422894 RMD160 a68e46b1d68ffa77c477d707e4003737c786e11f SHA1 5dbcbb9a6a3fc7fa8e8e874fc7cb39839fbe428a SHA256 9e4b90bde9c156ad537d6228c678d39dcaf790a0603125ab37ed48fb4662a01a
 DIST crafty-21.6.zip 423100 RMD160 d8fd129967638cbe614e7d3a90e9a4f53db93024 SHA1 330aa20db9b390d6b2802266daf557180059ada6 SHA256 be5ec37938f7b741e5f3bded193fb6e30e0cb69f910202b7cc01f01846b42b56
@@ -12,14 +9,14 @@ EBUILD crafty-20.14.ebuild 2319 RMD160 9631a70bd2b4d486d0709a6bd6fa062e73d9586c
 MD5 fcb4080c86846877184531d7655447eb crafty-20.14.ebuild 2319
 RMD160 9631a70bd2b4d486d0709a6bd6fa062e73d9586c crafty-20.14.ebuild 2319
 SHA256 ece86f0e7754801b3a8fa94c02d6332a96d4a66de33f524cbb3c0686aaf42940 crafty-20.14.ebuild 2319
-EBUILD crafty-21.6.ebuild 2340 RMD160 f88009468c423b4ec02615a1eebb66d1dee37a13 SHA1 a08fd10c06d10b082ca4b7ad81cd26dca5c15658 SHA256 d34caf3508e391dd85c3d42f1a811b1d423278f9b4278aa65ea6ae43d652dda9
-MD5 f1ce9be0b211fed62729f14b4cba27eb crafty-21.6.ebuild 2340
-RMD160 f88009468c423b4ec02615a1eebb66d1dee37a13 crafty-21.6.ebuild 2340
-SHA256 d34caf3508e391dd85c3d42f1a811b1d423278f9b4278aa65ea6ae43d652dda9 crafty-21.6.ebuild 2340
-MISC ChangeLog 3315 RMD160 4def13b94d63970423499e4be2cd676f5faf248e SHA1 e38fcc1502a312e767a9a8c75a012052bfa45e2b SHA256 b1c09be86ce60e058423b016c7d3b75aaad28bd50d080592e2406c59c98ceb7b
-MD5 f08b0b4be48a1da7eaea27d8f7bec616 ChangeLog 3315
-RMD160 4def13b94d63970423499e4be2cd676f5faf248e ChangeLog 3315
-SHA256 b1c09be86ce60e058423b016c7d3b75aaad28bd50d080592e2406c59c98ceb7b ChangeLog 3315
+EBUILD crafty-21.6.ebuild 2609 RMD160 095edb00a2005268cad04f6c65b05086286231d5 SHA1 e963484c189628851519831501d449852cc9d6fb SHA256 5171a15bd6d6d356febdbb9db551f35b85e2fc3a7ae76d70d7d6888ada8477c9
+MD5 d06b6536252f51d6c4054d12871303ac crafty-21.6.ebuild 2609
+RMD160 095edb00a2005268cad04f6c65b05086286231d5 crafty-21.6.ebuild 2609
+SHA256 5171a15bd6d6d356febdbb9db551f35b85e2fc3a7ae76d70d7d6888ada8477c9 crafty-21.6.ebuild 2609
+MISC ChangeLog 3457 RMD160 9c75604058d0baca08929044899db2b18b4119e6 SHA1 36872e1c23d2254d5fcbe727af2df775223c5d77 SHA256 8ce650376b327b05cae3ef2faf4f3102ec01c46aa58c20e58eaff7c5ec78b214
+MD5 777df9a677ab7d01053e9f3cb3875035 ChangeLog 3457
+RMD160 9c75604058d0baca08929044899db2b18b4119e6 ChangeLog 3457
+SHA256 8ce650376b327b05cae3ef2faf4f3102ec01c46aa58c20e58eaff7c5ec78b214 ChangeLog 3457
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -33,10 +30,3 @@ SHA256 60eb692ad89bf508b88799539e1f8c6a664e56d6f0485510af98f5dd4c80a2fb files/di
 MD5 35dde69bda71cf2496d3109b4c89f274 files/digest-crafty-21.6 226
 RMD160 9ac75bda894e494d55aa84165a8c3217cc48e49c files/digest-crafty-21.6 226
 SHA256 7dd86fa9bc00121b5c5f33815d08b539c15bd79ed41d92246094fd1393dfbb4e files/digest-crafty-21.6 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFHWcpa8qKy9+b2Hl0RAm8zAKDRfv24+vhwfG/fOcTVSegmiObLggCfaLn4
-ZPA/VTkQdmtlrOTpJCf/7b4=
-=r/DF
------END PGP SIGNATURE-----
diff --git a/games-board/crafty/crafty-21.6.ebuild b/games-board/crafty/crafty-21.6.ebuild
index f2dc99276ac6..779780ae428a 100644
--- a/games-board/crafty/crafty-21.6.ebuild
+++ b/games-board/crafty/crafty-21.6.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/crafty/crafty-21.6.ebuild,v 1.1 2007/12/07 22:33:56 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/crafty-21.6.ebuild,v 1.2 2007/12/09 10:25:17 tupone Exp $
 
 inherit flag-o-matic games
 
@@ -52,7 +52,13 @@ src_compile() {
 					-DFAST -DSMP -DCPUS=4 -DCLONE -DDGT
 				append-flags -fno-gcse \
 					-fomit-frame-pointer -mpreferred-stack-boundary=2
-				makeopts="${makeopts} CC=gcc CXX=g++ asm=X86.o"
+				makeopts="${makeopts} CC=gcc CXX=g++"
+			elif [[ "${CHOST}" == "x86_64-pc-linux-gnu" ]] ; then
+				append-flags -DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
+					-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B \
+					-DFAST -DSMP -DCPUS=4 -DCLONE -DDGT
+				append-flags -fomit-frame-pointer
+				makeopts="${makeopts} CC=gcc CXX=g++"
 			else
 				: # everything else :)
 			fi