Fix usage of vm for amd64 arch. Bug #255453

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/games-fps/openarena/ChangeLog b/games-fps/openarena/ChangeLog
index f7d54b88645e270214253f48f84b5f9210cfb2ae..cda6afefd6047ed51e25d1e777726992b952cbe3 100644 (file)
--- a/games-fps/openarena/ChangeLog
+++ b/games-fps/openarena/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/openarena
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/openarena/ChangeLog,v 1.12 2010/03/10 09:54:08 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/openarena/ChangeLog,v 1.13 2010/03/11 11:21:33 tupone Exp $
+
+  11 Mar 2010; Tupone Alfredo <tupone@gentoo.org>
+  files/openarena-0.8.1-makefile.patch:
+  Fix usage of vm for amd64 arch. Bug #255453 by Zeev Tarantov
 
   10 Mar 2010; Tupone Alfredo <tupone@gentoo.org> openarena-0.8.1-r1.ebuild,
   +files/openarena-0.8.1-unbundling.patch,

diff --git a/games-fps/openarena/Manifest b/games-fps/openarena/Manifest
index 2165da6f290b13c2d984c1b8f2e449b91ecaf5d8..5cdc5f102386dda79af622d68b8bc57cb7bbfaaa 100644 (file)
--- a/games-fps/openarena/Manifest
+++ b/games-fps/openarena/Manifest
@@ -1,7 +1,7 @@
-AUX openarena-0.8.1-makefile.patch 858 RMD160 4243380e3aca2aa1fd916ba7633f9a01cf00f308 SHA1 93c15c8d453fcae7c2647bdcc04dd7dbab2caf9f SHA256 68ae0af3b94fa4ec013de43f23e85477d45932170c38c4661ccc2339f5377597
+AUX openarena-0.8.1-makefile.patch 992 RMD160 c2e219e704e78d414da1aea3e356e55a52c82780 SHA1 81ead814951c45b6d4bab42b693a77a545ee094b SHA256 ee10885e2d6e4d5d19589c05326d8557c93db3207f5dcbe16c7ef7f99d43415a
 AUX openarena-0.8.1-unbundling.patch 7274 RMD160 b09d6bcdabf640947a58a2c98112398dbb3af398 SHA1 13515c565f0956ea9c305553ba6b755d31f9e238 SHA256 4819e0b5531707b0a0224286765bc83065486fc700c2a201df49cf9e7191fb29
 DIST oa081.zip 318927645 RMD160 9009eaf581ad0bf19296418da1a16e2d43daec16 SHA1 526c39e51d0b53177b02bd490bf830f622f35ad5 SHA256 c96282de8bc2ac5781df58c6adbce4265376e36190af50d7528f51dc739b6d7d
 DIST openarena-engine-0.8.1-1.tar.bz2 2951703 RMD160 123e9f70621fd856385c6ca7ad0580b81454d687 SHA1 6de345c0bebd87e1406cb07189537db99a422808 SHA256 430ba9b691c8085b946e004f0cc890995c7f8295498bd8c8ce744293a87274d2
 EBUILD openarena-0.8.1-r1.ebuild 2299 RMD160 dc4d8a6af1dc9e062715cf206f4fe856b62fc8ca SHA1 88d0be1f8af65fbb9528f7c7e2922fb8007a592b SHA256 0ba31ce3e0ee1fb5fdca8b432a7f62e3654ac7b42ac8a3bc246bb7c4d073a73e
-MISC ChangeLog 2380 RMD160 97363458ff889161f35c917d7e5847e86d1f6240 SHA1 1bfba8d19202a82b18b4a1d6b17875432339701d SHA256 4b042ec61a930e51c48201c489ad98b8361aa80326287f1f4b2fdcaf0c0b2bcb
+MISC ChangeLog 2534 RMD160 36998aff1ed010d60ba430ebb50da0ef002b0e39 SHA1 b1b36365b4a3f15c44823a8d1b98dce9c75b398f SHA256 581500c93bef0924ebdd45e44305279b85df06a4127cb31c74adfeb13f5f1f09
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-fps/openarena/files/openarena-0.8.1-makefile.patch b/games-fps/openarena/files/openarena-0.8.1-makefile.patch
index eb6a6f6a93d658ac429b560cf63cbb0435f8c522..9c49b9458a7d6d16be2a16888b0ec17690e465ae 100644 (file)
--- a/games-fps/openarena/files/openarena-0.8.1-makefile.patch
+++ b/games-fps/openarena/files/openarena-0.8.1-makefile.patch
@@ -1,5 +1,16 @@
 --- openarena-engine-0.8.1/Makefile    2008-08-09 22:22:37.000000000 +0200
 +++ openarena-engine-0.8.1/Makefile.new        2009-01-07 19:33:31.000000000 +0100
+@@ -67,6 +67,10 @@
+ 
+ ifndef ARCH
+ ARCH=$(COMPILE_ARCH)
++else
++  ifeq ($(ARCH),amd64)
++    ARCH=x86_64
++  endif
+ endif
+ export ARCH
+ 
 @@ -231,8 +231,7 @@
    endif
    endif