Build with gcc-4.7. Bug #423613

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

4 files changed, 128 insertions, 9 deletions

diff --git a/games-action/btanks/ChangeLog b/games-action/btanks/ChangeLog
index 5b8f17333bb1..1efc9ff2cfa5 100644
--- a/games-action/btanks/ChangeLog
+++ b/games-action/btanks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/btanks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/ChangeLog,v 1.25 2012/05/03 03:02:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/ChangeLog,v 1.26 2012/10/08 09:02:14 tupone Exp $
+
+  08 Oct 2012; Tupone Alfredo <tupone@gentoo.org> btanks-0.9.8083.ebuild,
+  +files/btanks-0.9.8083-gcc47.patch:
+  Build with gcc-4.7. Bug #423613 by Diego
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> btanks-0.9.8083.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/games-action/btanks/Manifest b/games-action/btanks/Manifest
index 9c4de5ca0fcd..7d211fe691f9 100644
--- a/games-action/btanks/Manifest
+++ b/games-action/btanks/Manifest
@@ -1,6 +1,17 @@
-AUX btanks-0.9.8083-gcc46.patch 284 RMD160 cc63129933274f040a8666e6bba8fe53409b0526 SHA1 33d920e4a58314c7bec2ae79b874a0faf44fce3d SHA256 f2ee8df34aeaf30ff2f0fa9b9581e722bd4baac89407d4c895fc02c0b0b6d7f8
-AUX btanks-0.9.8083-scons-blows.patch 3146 RMD160 562ea454f0de7d70be6a7efcd74555bee07a6dfe SHA1 d766e2b97f9eabffe8aaab35a5a3b233ecdbd9c4 SHA256 792bf72825939d33fa548cf995665104df06399820fc3eb85148d8fb722e8622
-DIST btanks-0.9.8083.tar.bz2 28754069 RMD160 e0eaebdfea636ddeabfba230315353036e06dfcb SHA1 e3f76e7cbda0a90a606e8358c6aa686cebba02d6 SHA256 3fd2ce6a2b45f7a60c3b114fa9aff13cb3dd9fbb6a65cdc9798b76c4fa2c4341
-EBUILD btanks-0.9.8083.ebuild 1468 RMD160 0ec674e6ff1d7756c7e8605a3d9534419553c98f SHA1 ad71c0759f7902d9c4ef740ad1fcf0e55e344761 SHA256 1eddf8934c8a7b991d6a0aaace0c94ed034082a9f01e1c1d526c0813f99159de
-MISC ChangeLog 4292 RMD160 38b088c9b5359a9625ded1bf3fda7de8aaa8b7b3 SHA1 4bda2d8a1e85db07cdd3f12c55feaefa0dde8738 SHA256 de81fa68a08c28c9837beb5f08f3a9aac66da66de510cdf56f38a6007105b431
-MISC metadata.xml 602 RMD160 7bcf0da779e8e1cc2a225f25cba147e7d743d671 SHA1 2a04ca616e925cb64cd5df0f4dd96e1512b4aeb0 SHA256 f2fba9fde47806ea5f4d7a16dfe1a5edd4869619118f28a30a91ec8a629cfb2c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX btanks-0.9.8083-gcc46.patch 284 SHA256 f2ee8df34aeaf30ff2f0fa9b9581e722bd4baac89407d4c895fc02c0b0b6d7f8 SHA512 114ddc0b5bbe0125389dee88ed3eef27b3ec260edc6d50eb04a86f93157f3b2f613cd1ba58f915ca7f8255d2cdc5d341a0a70bf22d5210160dba7604fd90c83d WHIRLPOOL d9db3d70b515e516efd84f4c8833377f8a3119518f0c37e7d4e1603fa1a45d66fe5c4160bb76d61ef9e0afd5654426501f96c8930ef07234cbcddb367d8cfb40
+AUX btanks-0.9.8083-gcc47.patch 5679 SHA256 291e3860c8071af1fcc3da97b314b571f583585ec2287a71ed31377bf709cfa9 SHA512 226869ef3031ddd4629bdd98880c85a4c0ff9f1619fd45372e60ccb2ebb50f0cd7b0ad60befa1859e475705d236144b1fd6e2286513cfbafaa0eba8c02918c9a WHIRLPOOL 65c1b09329fa613256aca97d5db7d0145e035da25e57217d09cd4133470a797ccc641dbfde09410519afce5a4ccce21f0f313161053d76703ec56428276a7120
+AUX btanks-0.9.8083-scons-blows.patch 3146 SHA256 792bf72825939d33fa548cf995665104df06399820fc3eb85148d8fb722e8622 SHA512 de42054c599d808ca1fb3491346602b4055157973f8138a2c258e64fb596d87d67b24ffe30edffbab30fec4b0e71bc541cbd2fb7d7866d079595b54af763a856 WHIRLPOOL fef4c6f50ab5c411c5af886f7d9593aa8302b43d0704072f309f2e58aadc064d9d8c2bdd0c5e8e7da93dca2d4e15e4a845fcdf697e1a503d7cade1265ae4e249
+DIST btanks-0.9.8083.tar.bz2 28754069 SHA256 3fd2ce6a2b45f7a60c3b114fa9aff13cb3dd9fbb6a65cdc9798b76c4fa2c4341 SHA512 beef8f480e4c20c4f3d29aaa63fd52b370b89cceb8a7dda92f0d0fa5517969abf1fce6b0109782300f1b5bb92cf3c599677b168cd66f3b44c2d2dd1742ce0241 WHIRLPOOL 5320ce692ae5c6a760121fb52120ff35632d06610dfa514897f6569f7b5a9c8246b824a81b50d74c649dff7c0cb84b9af537edbb5d2fc88b7bafdf92d0b1c749
+EBUILD btanks-0.9.8083.ebuild 1503 SHA256 d7a28774530c1054a6e93a8b09bf3824eccfbb2f0942889a30a3eddd515a8706 SHA512 d7d7590c7a9461e6a92b46436920ebf01153fd53ad885e742059de5c568b08f27711b55f0b39fd213b0ffd2fea966f9f2cacc83d5fb74c804fb89b6dd1419b70 WHIRLPOOL e40649d1ceb316ab5dc4c2a0c13da4e1e9a9f6bade67c03357d568395c45c26b02f1df3e9342aab833b7d463911109cbd65350b34833b3a3f8404442419118c6
+MISC ChangeLog 4448 SHA256 03f4bed8bc44541de69f38621e4b939cd5a1359a8b756a4c79421d9ff75824f7 SHA512 c6f440b0e8ea2da5014cd93aa87b8fcb3f2281d0af87b9fcf03cbfe234af9286c35ffafff66facbb977b1ff39b8df45df691849c077069f8b8c4010a519b2e5b WHIRLPOOL e1b4280ba687c3730efe825d8e0b071770abfc60e1e12d52381cb9c78e00cdcf0730e53753d8d07aae51cd6bc7b944db148d71120944c54cc5aef318c8817614
+MISC metadata.xml 602 SHA256 f2fba9fde47806ea5f4d7a16dfe1a5edd4869619118f28a30a91ec8a629cfb2c SHA512 a5b602f97356922f78fa05674560df266f3f15f397882a362094803188c3c8bc26ba63f02b0e9bade626e559af758abe55d2f58e7c2b61abad22f1520a623056 WHIRLPOOL 2aa27da6fda834481917eaee84cd517c5a09c9fa66312dc36cf9c2048240d8e0ecc445522de09973da0379bdf299510a47ce36e3c7d08923cb9a767cadabfd8f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBylpsACgkQIY77eQFFFC0Q5QCfYSh5A5Dhh3Gv1xjVY3M+yKzi
+S+wAn17Um8fR4Jr8X/eozqG3GmZBPGkG
+=gSew
+-----END PGP SIGNATURE-----
diff --git a/games-action/btanks/btanks-0.9.8083.ebuild b/games-action/btanks/btanks-0.9.8083.ebuild
index d6a49f8d9189..952b020cc13c 100644
--- a/games-action/btanks/btanks-0.9.8083.ebuild
+++ b/games-action/btanks/btanks-0.9.8083.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-action/btanks/btanks-0.9.8083.ebuild,v 1.5 2012/05/03 03:02:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/btanks-0.9.8083.ebuild,v 1.6 2012/10/08 09:02:14 tupone Exp $
 
 EAPI=2
 inherit eutils scons-utils games
@@ -28,7 +28,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	rm -rf sdlx/gfx
 	epatch "${FILESDIR}"/${P}-scons-blows.patch \
-		"${FILESDIR}"/${P}-gcc46.patch
+		"${FILESDIR}"/${P}-gcc46.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
 }
 
 src_compile() {
diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc47.patch b/games-action/btanks/files/btanks-0.9.8083-gcc47.patch
new file mode 100644
index 000000000000..13a4cf3723ae
--- /dev/null
+++ b/games-action/btanks/files/btanks-0.9.8083-gcc47.patch
@@ -0,0 +1,103 @@
+--- mrt/base_file.h.old	2012-10-08 10:16:43.941487723 +0200
++++ mrt/base_file.h	2012-10-08 10:18:55.788771445 +0200
+@@ -20,6 +20,7 @@
+ */
+ 
+ #include <string>
++#include <unistd.h>
+ #include "export_mrt.h"
+ 
+ namespace mrt {
+--- math/range_list.h.old	2012-10-08 09:49:34.283887937 +0200
++++ math/range_list.h	2012-10-08 09:50:36.258212096 +0200
+@@ -53,14 +53,14 @@
+ 			return;
+ 		}
+ 	
+-		typename parent_type::iterator i = lower_bound(value);
++		typename parent_type::iterator i = this->lower_bound(value);
+ 		if (i != parent_type::end()) {
+ 			if (i->first == value)
+ 				return;
+ 
+ 			if (value + 1 == i->first) {
+ 				T e = i->second;
+-				erase(i);
++				this->erase(i);
+ 				i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning
+ 				i = pack_left(i);
+ 			}
+--- engine/sl08/sl08.h.old	2012-10-04 09:50:37.845681514 +0200
++++ engine/sl08/sl08.h	2012-10-08 09:58:32.873166723 +0200
+@@ -272,7 +272,7 @@
+ 			inline slot1(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline return_type operator() (arg1_type a1) const { 
+ 				return (object->*func) (a1) ;
+@@ -293,7 +293,7 @@
+ 			inline slot1 () : object(NULL), func(NULL) {}
+ 			inline slot1 (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline void operator() (arg1_type a1) const { 
+ 				(object->*func) (a1); 
+@@ -447,7 +447,7 @@
+ 			inline slot2(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline return_type operator() (arg1_type a1, arg2_type a2) const { 
+ 				return (object->*func) (a1, a2) ;
+@@ -468,7 +468,7 @@
+ 			inline slot2 () : object(NULL), func(NULL) {}
+ 			inline slot2 (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline void operator() (arg1_type a1, arg2_type a2) const { 
+ 				(object->*func) (a1, a2); 
+@@ -643,7 +643,7 @@
+ 			inline slot3 () : object(NULL), func(NULL) {}
+ 			inline slot3 (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3) const { 
+ 				(object->*func) (a1, a2, a3); 
+@@ -797,7 +797,7 @@
+ 			inline slot4(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { 
+ 				return (object->*func) (a1, a2, a3, a4) ;
+@@ -818,7 +818,7 @@
+ 			inline slot4 () : object(NULL), func(NULL) {}
+ 			inline slot4 (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { 
+ 				(object->*func) (a1, a2, a3, a4); 
+@@ -972,7 +972,7 @@
+ 			inline slot5(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) const { 
+ 				return (object->*func) (a1, a2, a3, a4, a5) ;