Fixed compilation on amd64 and ~amd64 added

Package-Manager: portage-2.1.3.15

4 files changed, 85 insertions, 13 deletions

diff --git a/games-puzzle/magiccube4d/ChangeLog b/games-puzzle/magiccube4d/ChangeLog
index 9b3a598d405f..0bb41537962c 100644
--- a/games-puzzle/magiccube4d/ChangeLog
+++ b/games-puzzle/magiccube4d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/magiccube4d
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/magiccube4d/ChangeLog,v 1.9 2007/02/22 01:13:21 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/magiccube4d/ChangeLog,v 1.10 2007/10/22 20:30:05 angelos Exp $
+
+  22 Oct 2007; Christoph Mende <angelos@gentoo.org>
+  +files/magiccube4d-2.2-64bit-ptr.patch, magiccube4d-2.2.ebuild:
+  Fixed compilation on amd64 and ~amd64 added
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-puzzle/magiccube4d/Manifest b/games-puzzle/magiccube4d/Manifest
index d6a6e5bd828d..0ed801527d41 100644
--- a/games-puzzle/magiccube4d/Manifest
+++ b/games-puzzle/magiccube4d/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX magiccube4d-2.2-64bit-ptr.patch 1406 RMD160 41f0509ed945c3778e21081c0d184f4c230d1c2f SHA1 3671c92fb3e8c070d013d8a3bf900cdd731de6ed SHA256 05465f556602569b1e32360ffc74439bfeb4f060e4a2be9351a7ffbdfdd7623d
+MD5 f5322494b7f77e76cbf391089815a85d files/magiccube4d-2.2-64bit-ptr.patch 1406
+RMD160 41f0509ed945c3778e21081c0d184f4c230d1c2f files/magiccube4d-2.2-64bit-ptr.patch 1406
+SHA256 05465f556602569b1e32360ffc74439bfeb4f060e4a2be9351a7ffbdfdd7623d files/magiccube4d-2.2-64bit-ptr.patch 1406
 AUX magiccube4d-2.2-gcc41.patch 877 RMD160 d7465f4766d60c1ba848a3bbaaf43eff992278fc SHA1 653bafd8ec124b1ffed87f1ec8def5156755aec5 SHA256 b69cc3f95795e5c7c6885bf69ffa384695fe001270e6bb3837ec39568e0c9d1a
 MD5 8b10e471e230f7c055bfa08cf7ec3615 files/magiccube4d-2.2-gcc41.patch 877
 RMD160 d7465f4766d60c1ba848a3bbaaf43eff992278fc files/magiccube4d-2.2-gcc41.patch 877
@@ -7,14 +14,14 @@ MD5 90c881c0f91424913c40d79bc940e47d files/magiccube4d-EventHandler.patch 425
 RMD160 7def7090510bb0ff21bddfc1c392ba9629bd933d files/magiccube4d-EventHandler.patch 425
 SHA256 6bfdc4a34d560624da46f437f66f857c259dc8cf945feb0d989f4fc3a145a98b files/magiccube4d-EventHandler.patch 425
 DIST mc4d-src-2_2.tgz 144645 RMD160 c7bfabceb64c0c0515e94f01bcd528bd550f9b3e SHA1 dbf87d91c49f4d9d12ae814276af280c46162864 SHA256 79c7b62bbe7a132a2eacf58f92f80113ea63171d3eea59755bc828a1aa9daa44
-EBUILD magiccube4d-2.2.ebuild 950 RMD160 ebdd74552e90b726db10a926827db47e20fb077a SHA1 dd7a42f851456e4f931d285fe36c386e090fbc94 SHA256 344d5f5a3883711bdbe77f608e0ffe036d32d9c05289089412183f633a6e0f92
-MD5 b192c0b5d1337590ee1d456c68f57221 magiccube4d-2.2.ebuild 950
-RMD160 ebdd74552e90b726db10a926827db47e20fb077a magiccube4d-2.2.ebuild 950
-SHA256 344d5f5a3883711bdbe77f608e0ffe036d32d9c05289089412183f633a6e0f92 magiccube4d-2.2.ebuild 950
-MISC ChangeLog 1015 RMD160 a07a580759ae680922117dddfd3e41e00598efa6 SHA1 d60b5a1d0df6d6885fae1f145418d9f6402d882a SHA256 86517a56d6886a0b57111423a0b9ce16a4a8866d6174cce0b4ae6fed5ef3b6b5
-MD5 899faddb2a6c9dbb0d9a2f59bef95ef1 ChangeLog 1015
-RMD160 a07a580759ae680922117dddfd3e41e00598efa6 ChangeLog 1015
-SHA256 86517a56d6886a0b57111423a0b9ce16a4a8866d6174cce0b4ae6fed5ef3b6b5 ChangeLog 1015
+EBUILD magiccube4d-2.2.ebuild 996 RMD160 f4cd5744f7f656cad9b2edbefe8a1379b7d41e39 SHA1 63eb16d044ec2eaf4cea26e34b4aed3416797702 SHA256 5838f8c20b6f3c4dd93120995af5ed06c3bf72ef11dead4f63a62c4fdb50b29f
+MD5 a4175ea91d0727285a55799d4df9ff9a magiccube4d-2.2.ebuild 996
+RMD160 f4cd5744f7f656cad9b2edbefe8a1379b7d41e39 magiccube4d-2.2.ebuild 996
+SHA256 5838f8c20b6f3c4dd93120995af5ed06c3bf72ef11dead4f63a62c4fdb50b29f magiccube4d-2.2.ebuild 996
+MISC ChangeLog 1183 RMD160 bf9d9047024d4bfb44d596bc73a1e64480cc1fe8 SHA1 a049435a6c0fdaf87f2c509fb06d2928748b3e2a SHA256 dbbb34f7682c721043f2008263935fef3978f5a27898c0e00df37d852af8db40
+MD5 ba12c2def4f1115290915bc501cfc3a1 ChangeLog 1183
+RMD160 bf9d9047024d4bfb44d596bc73a1e64480cc1fe8 ChangeLog 1183
+SHA256 dbbb34f7682c721043f2008263935fef3978f5a27898c0e00df37d852af8db40 ChangeLog 1183
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -22,3 +29,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 3d5a7c62e39e67ad6d22106ed0c86f23 files/digest-magiccube4d-2.2 229
 RMD160 57a0f2b58a7ce7c7e392fbb2d677d2b7c34a6a85 files/digest-magiccube4d-2.2 229
 SHA256 ea458210c624c8df8260f3d545bf2506496f591c7ef63eaaefc16821726b512e files/digest-magiccube4d-2.2 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHHQhUKhnDs22gwa8RAvGXAJ9OhJMRJFnbkbqO2tN12PKWHxQljgCg2cC+
+cneUD946HLo66cMBaqPOrRk=
+=iUxx
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch
new file mode 100644
index 000000000000..7fbd52871887
--- /dev/null
+++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch
@@ -0,0 +1,53 @@
+diff -Nru magiccube4d-src-2_2.orig/EventHandler.cpp magiccube4d-src-2_2/EventHandler.cpp
+--- magiccube4d-src-2_2.orig/EventHandler.cpp	2007-09-30 12:01:46.503967712 +0200
++++ magiccube4d-src-2_2/EventHandler.cpp	2007-09-30 12:03:23.489172011 +0200
+@@ -20,6 +20,7 @@
+ #include <iostream>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <stdint.h>
+ 
+ #include "MagicCube.h"
+ #include "Puzzlest.h"
+@@ -415,7 +416,7 @@
+ void
+ EventHandler::undo_cb(void* argp)
+ {
+-    int arg = (int) argp;
++    int arg = (intptr_t) argp;
+     struct stickerspec grip;
+     int         dir;
+     int         slicesmask;
+@@ -461,7 +462,7 @@
+ void
+ EventHandler::redo_cb(void* argp)
+ {
+-    int arg = (int) argp;
++    int arg = (intptr_t) argp;
+     struct stickerspec grip;
+     int         dir;
+     int         slicesmask;
+@@ -507,7 +508,7 @@
+ void
+ EventHandler::scramble_cb(void *arg = NULL)
+ {
+-    int n = (int)arg;
++    int n = (intptr_t)arg;
+     struct stickerspec grip;
+     int i, previous_face = -1;
+     int ngrips = NFACES * 3 * 3 * 3;
+@@ -855,12 +856,12 @@
+ void
+ EventHandler::newPuzzle_cb(void* arg)
+ {
+-    if ((int)arg == preferences.getLength())
++    if ((intptr_t)arg == preferences.getLength())
+     {
+         reset_cb(0);
+         return;
+     }
+-    preferences.setLength((int)arg);
++    preferences.setLength((intptr_t)arg);
+     int length = preferences.getLength();
+ 
+     polymgr->reset(length);
diff --git a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild b/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
index 07e356521172..c7cae26eecd9 100644
--- a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
+++ b/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild,v 1.9 2006/12/06 17:10:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild,v 1.10 2007/10/22 20:30:05 angelos Exp $
 
 inherit eutils games
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.superliminal.com/cube/mc4d-src-${MY_PV}.tgz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND="x11-libs/libXaw"
@@ -22,7 +22,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-EventHandler.patch \
-		"${FILESDIR}/${P}"-gcc41.patch
+		"${FILESDIR}/${P}"-gcc41.patch \
+		"${FILESDIR}/${P}"-64bit-ptr.patch
 	sed -i -e "s:-Werror::" \
 		configure
 }