Fix run on amd64. Bug #158415

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

4 files changed, 29 insertions, 9 deletions

diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog
index 4df46fbabb65..b03d012f7586 100644
--- a/games-fps/quake2-icculus/ChangeLog
+++ b/games-fps/quake2-icculus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake2-icculus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.43 2012/03/28 22:32:18 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.44 2012/04/01 17:08:10 tupone Exp $
+
+  01 Apr 2012; Tupone Alfredo <tupone@gentoo.org>
+  quake2-icculus-0.16.1-r1.ebuild,
+  +files/quake2-icculus-0.16.1-gnusource.patch:
+  Fix run on amd64. Bug #158415 by B Douglas Hilton
 
   28 Mar 2012; Tupone Alfredo <tupone@gentoo.org>
   quake2-icculus-0.16.1-r1.ebuild, +files/quake2-icculus-0.16.1-alsa.patch:
diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 33a2d9784ba9..31bf7cea1de7 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -8,6 +8,7 @@ AUX quake2-icculus-0.16.1-alsa.patch 4455 RMD160 8ab7af7a5a2c9b229ee8a91000c0483
 AUX quake2-icculus-0.16.1-amd64.patch 534 RMD160 ad9193d1977ac2c0036e30022b198e5ff8b850dd SHA1 16776e9c7edf09e190393dd5c6646db1c4680bd1 SHA256 e95aeace865f089b6c1c9e0c362da407d1bd603147fb6886b9c13b37218c3a37
 AUX quake2-icculus-0.16.1-gcc41.patch 364 RMD160 b85910d79a8e7e2cc71da21f5f22e331b94c0719 SHA1 3c80e62267223fbf83aa2f7ce73fcf6eba0297c9 SHA256 1010f97c15f202de682f56ac372cc342299f1e6c20e9072d8fa346a1469adf72
 AUX quake2-icculus-0.16.1-gentoo-paths.patch 7688 RMD160 db521205c1d787fb31262d1710a57b7da50194a9 SHA1 dcf87cd07cade4b31251a63834819c131cfb81c2 SHA256 22d47f76fe1f06028088d2b7d9b1bc0bf1c91c559149859373af29f467ed2ea9
+AUX quake2-icculus-0.16.1-gnusource.patch 482 RMD160 69b4320654bc483d9aa5794623506c66ae95aa5d SHA1 8dbad22fd9b135202feb109a3aed4cfcfc95eba8 SHA256 9ac34f2bebbb6d4a19c590e00db8e5b0034b3ffe2a245a595e28ab43d65d7617
 AUX quake2-icculus-0.16.1-ldflags.patch 1609 RMD160 3ac08c24bb2f32c3067f2a1e10b9ddb16b896ea2 SHA1 f634ef0807934341562041778a7281e2616e09fd SHA256 b161ab85ab2fd8a4bf5b20e8ac9a80429f735eb1bae611b79b92677f04eacc42
 AUX quake2-icculus-0.16.1-no-asm-io.patch 513 RMD160 0ae685e8f5d02511013b6f5b9106e11c024cc2a9 SHA1 53651b2175b9e547e8f01215bf9e6f94f3cee539 SHA256 05a648b32ce0c260046706ee2f4c6f49a0e7049ed07cd02fd895f6fd83556012
 AUX quake2.xpm 1234 RMD160 4afa56af8446c288b5779cf7e2c0b8dfe98e9bba SHA1 7adcc4c3242ea6468c259d181e9cd251ce1fd570 SHA256 0a5232384c56ccead145345a30e4ed7004bf36fe7656d43c46f1bed34d8fc2a9
@@ -15,13 +16,13 @@ DIST maxpak.pak 3282742 RMD160 6b5223fee63dbb2c886e3c1e39d9e157d65f589f SHA1 eca
 DIST quake2-r0.16.1.tar.gz 1525384 RMD160 dbbf9cad08ab381e0c2cd037e317104085455c23 SHA1 9226acadc896ddc9924c6b7f9b71857078af5dba SHA256 49f4d3d53772b6ffd7733506f5d121c7893bfd8884133bfc36a28039c0744642
 DIST roguesrc320.shar.Z 626769 RMD160 767c5b1a7a1123370e9c924282656dfdcc6cebba SHA1 7c5cadde75f5353622552cd28501ce60ac83dca2 SHA256 ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919
 DIST xatrixsrc320.shar.Z 455917 RMD160 357182dcd760a95b27942cdf807ba1242bcb1160 SHA1 ec67b6d2be623dd344c100869fc48bcbadea927a SHA256 94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589
-EBUILD quake2-icculus-0.16.1-r1.ebuild 5526 RMD160 f95a2789adb1d4815adeb13edf561f5767938aeb SHA1 e60e3f16a6bbefa720db1fecb52ac33d59397489 SHA256 697a5f65803939e1ca185fade1b01f39631fba56603a81ed72ff05d0ec9b7e43
-MISC ChangeLog 7748 RMD160 8629e15db7f6c6391831e4ab06b0fed5a8b4edda SHA1 5fe8217bc4cdce9aeb429ee8639f22877935f214 SHA256 ddf34a5c4407378df864ae4c047d5c9e98d7fe53974f496243a2341425a59b5c
+EBUILD quake2-icculus-0.16.1-r1.ebuild 5572 RMD160 6d63faf2aa47b9fd13eb70a4ede688f3c13600bb SHA1 d8f28729d44973cd9cfead8d9d5358e1952d7003 SHA256 ef23b69aab3384bebc4f29bc3b9055c451c360481428e7f634ed27e413398249
+MISC ChangeLog 7934 RMD160 d68abfc71afc07b580743c15cdd5a2501575d3da SHA1 599efc0db497c410253d412f9fd2c5f9be7f7d8d SHA256 f043b71434485c017fdd743bd8dd06ce13cb8e4801f989084541732103d5dec2
 MISC metadata.xml 513 RMD160 1dc52f937a6d3f1e62131171345cd429c4f080cf SHA1 01cfd49cdfd38befba81acae82c76c52edc38b31 SHA256 0608a118c068c5cb15473fc3ee2c6338b6a6330ee2063d1d2b6864c57a761e2c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9zkX0ACgkQIY77eQFFFC34swCfaqtARRBF7oXNlawlVtXShIci
-+pQAoJ+u1f4NdDN8QzGNMZuomBvrR5gL
-=GIaw
+iEYEARECAAYFAk94i4YACgkQIY77eQFFFC0+lACg0vIfWORJKrwP8IVK8q7XUB3N
+7uQAn099W4SuzHjDtiVZJJ/FybqK8SbA
+=JR6J
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
new file mode 100644
index 000000000000..cc7c8451293b
--- /dev/null
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
@@ -0,0 +1,13 @@
+diff -Naur quake2-r0.16.1/src/linux/q_shlinux.c quake2-r0.16.1-modified/src/linux/q_shlinux.c
+--- quake2-r0.16.1/src/linux/q_shlinux.c	2002-02-09 17:09:23.000000000 -0500
++++ quake2-r0.16.1-modified/src/linux/q_shlinux.c	2007-06-26 13:40:25.000000000 -0400
+@@ -17,6 +17,9 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ 
+ */
++#if !defined(_GNU_SOURCE)
++	#define _GNU_SOURCE
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <errno.h>
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index 0186fcef5b33..5663f4cf5ad6 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.24 2012/03/28 22:32:18 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.25 2012/04/01 17:08:10 tupone Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs games
@@ -15,7 +15,7 @@ SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ppc sparc x86 ~x86-fbsd"
 IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl svga X xatrix"
 
 UIDEPEND="aalib? ( media-libs/aalib )
@@ -80,6 +80,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gentoo-paths.patch \
 		"${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-no-asm-io.patch \
+		"${FILESDIR}"/${P}-gnusource.patch \
 		"${FILESDIR}"/${P}-alsa.patch
 
 	if use xatrix ; then