Fix build with gcc-4.7 Bug #424735

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

4 files changed, 38 insertions, 11 deletions

diff --git a/games-puzzle/ngstar/ChangeLog b/games-puzzle/ngstar/ChangeLog
index fc024048d662..ee13bd17b0ba 100644
--- a/games-puzzle/ngstar/ChangeLog
+++ b/games-puzzle/ngstar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/ngstar
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ngstar/ChangeLog,v 1.9 2011/06/19 21:53:04 mr_bones_ Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ngstar/ChangeLog,v 1.10 2012/07/21 20:33:46 tupone Exp $
+
+  21 Jul 2012; Tupone Alfredo <tupone@gentoo.org> ngstar-2.1.8-r2.ebuild,
+  +files/ngstar-2.1.8-gcc47.patch:
+  Fix build with gcc-4.7 Bug #424735 by Diego Elio Pettenò
 
   19 Jun 2011; Michael Sterrett <mr_bones_@gentoo.org> ngstar-2.1.8-r2.ebuild:
   upstream went away so update to other values for homepage and src_uri (bug
diff --git a/games-puzzle/ngstar/Manifest b/games-puzzle/ngstar/Manifest
index fb1dac3fa4a3..ef76feb1561a 100644
--- a/games-puzzle/ngstar/Manifest
+++ b/games-puzzle/ngstar/Manifest
@@ -1,7 +1,18 @@
-AUX ngstar-2.1.8-gcc43.patch 208 RMD160 7faeac72ec763882ee3bf967c7aa2d47fb1d3af0 SHA1 61ae648e24d2eb9d2de7ca97c133f242b673329b SHA256 627a182a862cfa5623f81707b8f41d6e1f2410fbe13a660d69e21e94abc488fe
-AUX ngstar-2.1.8-gentoo-path.patch 534 RMD160 b70dbfb7e719739cf6e6bdb0cadb6b78cf832f48 SHA1 f02021ee4198445794bf37a8ab6eb5a1eb0b260f SHA256 32d0998b7f9416995a30c8b448040d3427c1e59ce66c9d25495ac3d909e8f45a
-AUX ngstar-2.1.8-ldflags.patch 671 RMD160 216ba3889d13fe5888662048f730904b96950d0b SHA1 7a0510682a9a76feaf665bfd428dbc8ae486e988 SHA256 8776817c496771d64bf5a74e8a41d350a2957a502cce0f9753c3f4c1fe476b17
-DIST ngstar-2.1.8-src.tar.bz2 45851 RMD160 6b31bcbf0c5bcf385bca391fd9dea92e207e7321 SHA1 cff5ed2d53e2722a479804c81cd0f6d7c2694bee SHA256 c8a2cf84d2a4bb40280d4ce307ceaed8f97d2183f79f7a82b38b78aaedb73fb3
-EBUILD ngstar-2.1.8-r2.ebuild 1069 RMD160 f26c5c9bc3e111066b4880292a4c73f608de60eb SHA1 5e7e33038eac141454eac6e84a1332a9e45e0713 SHA256 dad829fe559686efecea6095059eb60ce7b65a65fd267a408a08939a6e216b94
-MISC ChangeLog 1612 RMD160 7481d80e0d395119873e3f02a39cfa92f2d1e684 SHA1 a992973207502334a1d1cad956cf4619cf8dcae9 SHA256 22f24d094fb0f26dcc593cc5be393d80e036db7c7985379b60a73a0b0dce1f6c
-MISC metadata.xml 442 RMD160 43e82d19b4aa5d88c93e1e0084d96ab1b3d89989 SHA1 81183c35f178ad7c125b6b2384a1cd2ccfd5b518 SHA256 f363cdb47a1e0f84e72df3275cb8f5540924558aab077551c9709adcbe92920d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX ngstar-2.1.8-gcc43.patch 208 SHA256 627a182a862cfa5623f81707b8f41d6e1f2410fbe13a660d69e21e94abc488fe SHA512 c01ae8cc19afb5d7bf24dbcfd6b82bd174e54848463363cf9718aac230b990e708df05a600ef3d689056f6e0018faaeda06cdaa9054673227f46143f84f22ea7 WHIRLPOOL b8b8d50bf5b6fbecc3fc647c02610e19def82ade38d6aaa15df56a5fa6def4a3a859eaa8c44127895c7342b0469148be252a052ac076070ae61632a2e8778145
+AUX ngstar-2.1.8-gcc47.patch 315 SHA256 8925d058dbc27ecb86321b99f95121642125ad8a7f8b89e976595293ac255152 SHA512 ee0b9d2f8fd989475c62371572091200acdb47fd2fc634763e729f51096786ef46a866cf2abd244502daf38b7503a0043146fd53590da4113a45841a2ac2db56 WHIRLPOOL ecbea3d5faabdec5054e07cc4072d0b00f240a5b34c1778eb9a0e42a21db29584dfa4073da3507e687841cc3c04cc5f7e72e02d8dcf14f23accb5f88908c0b59
+AUX ngstar-2.1.8-gentoo-path.patch 534 SHA256 32d0998b7f9416995a30c8b448040d3427c1e59ce66c9d25495ac3d909e8f45a SHA512 bca1216cb11122c19dc183b788215c50d9426e58e69bb20ebc5085121cdfe83af8d8e504440c7eacee4a82c4f5b7ef9a7c77fa783084b0f77bd1759cb45a51d7 WHIRLPOOL e882dfba9c46dd8f698af78adb447d4b993d58ad788696770d55d26c4bda228c8c7e2d733941c01a330fb3d99983226be6f54d7add1899a826e914de9f3ae0d2
+AUX ngstar-2.1.8-ldflags.patch 671 SHA256 8776817c496771d64bf5a74e8a41d350a2957a502cce0f9753c3f4c1fe476b17 SHA512 d1394affa00ee865d27b2dff8f7dfbbd284a145e4e9bca41cfe2f3d44db86ca3381a979ec8e7337250996793179cf9f5fc7d07e31e92477ae4ed9c406f8bf638 WHIRLPOOL 98cced6f440ced4409099c288fdb606991166d32090496a71474d6c0baecc41495abbc13ab6d1f26d7f3db27ab61a8baf44fad6cf203635abbf83fb5737d0822
+DIST ngstar-2.1.8-src.tar.bz2 45851 SHA256 c8a2cf84d2a4bb40280d4ce307ceaed8f97d2183f79f7a82b38b78aaedb73fb3 SHA512 c96031148720b5dcc004a5de68137bbbdd5af9c6f0b33ff8bcee3180cbf4732a4d6a92737ef99754d512bb61454bc0a17487efba4cdb00339d23e38edfe3cb28 WHIRLPOOL 05b6492a324e49c210174864b73194cef1ef3deb405d04d1c9352ae3cb3bb539e3c2b5c4d11f09f2ea32ffe37a542aaf2438185f6df1330af88de0b122d6e5aa
+EBUILD ngstar-2.1.8-r2.ebuild 1101 SHA256 bdf23ca4b7e77302dca0123f12f09ee896170b6fd4588ea38854a2a95e0815c7 SHA512 8a199ccc4b1cb4e80d39995a349353530f0c02ada11c4da8cfba01eda98f384fb62d8e59351a72a82ebedbb3bd71dcf478e42269d76ec6a0cd1d20b0ebdd5ca4 WHIRLPOOL 276d7909dd133be9653ef8862ac1ea69caadd1c34c7a4e30e29db5eb207ac4ff327ddd0690bc2a3d5ef6e171a311a8d41959efe1f316b05751688d6d479edeb1
+MISC ChangeLog 1780 SHA256 2646459e98799c1db4e4c24048c4d4413c3ea78dace96f489f8c2b30a93d483e SHA512 5deef2f83aba9b5414c88bcefe2f28134fc162f48a2fb09b148b226bb9951c5de3761e9b8b446894cd111ece0d1290836361b86b2c6cdafefda8f354600ded02 WHIRLPOOL cc29df3f2c806670c3f976f3a113ce5a06f52e27c2b65fd7f3e0c2767dcd0ff2fc122dfa8fcf00145598d390da4eaed18c320b581404cd0ee2a9420b7b7e8bde
+MISC metadata.xml 442 SHA256 f363cdb47a1e0f84e72df3275cb8f5540924558aab077551c9709adcbe92920d SHA512 6f897bc95103167b41495d3a9a885cd38b95a7d2b360dd175a071f53a34ddfc5c2a80731f95847326f3e4b5c1caa9e4609bc218df202461bb4c1c34a8e2cccd4 WHIRLPOOL 99236aeaa55276ae639d1972a45280e15ebd49cc9d149f87fab79f4baac2c5a4e0739767c24ee5ed903c6e92cc295e6c81c6b1cc8df2d9d5dbd50a2c580a54a5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlALEjQACgkQIY77eQFFFC0dfQCfTSF1GD1TozE0wgASr2mjwNrW
+wnUAoK5SYR77TlcLBmB0/v8ynoK1g8jI
+=7ukN
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/ngstar/files/ngstar-2.1.8-gcc47.patch b/games-puzzle/ngstar/files/ngstar-2.1.8-gcc47.patch
new file mode 100644
index 000000000000..2ddf0f53793d
--- /dev/null
+++ b/games-puzzle/ngstar/files/ngstar-2.1.8-gcc47.patch
@@ -0,0 +1,11 @@
+--- src/Ncurses_UI.cc.old	2012-07-21 22:25:16.421521521 +0200
++++ src/Ncurses_UI.cc	2012-07-21 22:26:01.008390914 +0200
+@@ -23,6 +23,8 @@
+ /* includes */
+ #include "Ncurses_UI.hh"
+ 
++#include <unistd.h>
++
+ using namespace ngstar2;
+ 
+ Ncurses_UI::Ncurses_UI( NGStar2 *engine, Configuration* config, Scores *scores )
diff --git a/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild b/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
index 7149b69de39c..4c4db3b6b78d 100644
--- a/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
+++ b/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild,v 1.8 2011/06/19 21:53:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild,v 1.9 2012/07/21 20:33:46 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -21,6 +21,7 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-gentoo-path.patch \
 		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc47.patch \
 		"${FILESDIR}"/${P}-ldflags.patch
 	sed -i \
 		-e "s:@GENTOO_DATA@:${GAMES_DATADIR}:" \