Fix build with gcc-4.3

Package-Manager: portage-2.1.4.5

4 files changed, 87 insertions, 7 deletions

diff --git a/games-board/freedoko/ChangeLog b/games-board/freedoko/ChangeLog
index 992ab68e6fac..48bea13bb63c 100644
--- a/games-board/freedoko/ChangeLog
+++ b/games-board/freedoko/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/freedoko
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/ChangeLog,v 1.6 2008/09/03 08:57:42 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/ChangeLog,v 1.7 2008/11/12 19:41:19 tupone Exp $
+
+  12 Nov 2008; Tupone Alfredo <tupone@gentoo.org>
+  +files/freedoko-0.7.3-gcc43.patch, freedoko-0.7.3.ebuild:
+  Fix build with gcc-4.3
 
   03 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
   freedoko-0.7.3.ebuild:
diff --git a/games-board/freedoko/Manifest b/games-board/freedoko/Manifest
index 303cc3931052..cd23a4b9c555 100644
--- a/games-board/freedoko/Manifest
+++ b/games-board/freedoko/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX Fix_Cardset_Make.patch 498 RMD160 2000df1c9401800fd11abdfdaa6f459a3125c576 SHA1 c372123f4f101564cf749f340469566292d91481 SHA256 933b819fdd660a8a7ac5bec560f5b6047732351847c61970c8c9e40652cec39a
+AUX freedoko-0.7.3-gcc43.patch 2341 RMD160 84624fe9331b75ba4214240b1fc83183820ab08c SHA1 18847e1886b86196834c7af9877a37c8c96e14f4 SHA256 ad216056be382fc1d5eb01f0d737d0155e16149d05a8c1e1b5360f973f93bebb
 AUX nodoc.patch 368 RMD160 220eb20e38556d2b029092a91f698a0150bc9974 SHA1 471f5def092b812f49d2d7019c4e86eea7e70d6e SHA256 c31e2c78a9a6f81c2e0db5c8a5943ffd68146df6fcd2705410bff21b6236a3f6
 AUX nonet.patch 421 RMD160 c283ea36b61cda2e98fe9f89d21118e207fbf256 SHA1 f0fc2a78a438625382bc8d5f728a7792b0ab7e2e SHA256 72fe58f2afd6bff66776bfe6f7045b39e8264e684cf15a001a28bc992d041289
 AUX portage-cxx.patch 481 RMD160 629a23c217f468b9c4f30f1b713a03da3d6a472b SHA1 9b75cfa34f67cbdd1481ea459dc966643a69ee69 SHA256 cca8736b219e27d02b0ca82f11cbb8030b48128bf255d845b6277806347770d7
@@ -9,13 +10,13 @@ DIST FreeDoko_0.7.3.src.zip 2759310 RMD160 1c9a4c84d06a2941aa910438cfbd64afab34e
 DIST kdecarddecks.zip 3370611 RMD160 c99a94e52e697c49068a31a0fc10acca7f528c86 SHA1 d01d92bdeb6fa1c9d73987269484940319353970 SHA256 07b17aaef44c5643b12089da7ffd8f8b18f8f5541e7d01fc04e53c964780cdac
 DIST pysol.zip 26314316 RMD160 0ceb36c33e3de983e7a60df13367857fe14ddba7 SHA1 2ebe408cdfa9e40277727033fe7306438976c120 SHA256 94d0e2d6aa13e5b007efaf08af0f506f48708e3243186db77f23e2e4660c0aa6
 DIST xskat.zip 666085 RMD160 c4e10c6ca9753a544fa1197d45a6759363742f7e SHA1 af209c9b1b8b33bae657e049d146d58541296fad SHA256 77cd3d7b3305ef1c201963e512557637929b394f4c1b19d838395dda3c9f8a1d
-EBUILD freedoko-0.7.3.ebuild 2754 RMD160 4c6e76df689ab37c54ef00865999ea3216ce42a9 SHA1 98504e78b1f30c9408cc76bc10eaea17ecdb6b44 SHA256 61004b61c1d0fd37134bd259446aafca172d91969b4d6cf1d79aa5d11cf0189d
-MISC ChangeLog 1198 RMD160 517bf752c236900d582550209a66c2bcf50cbadb SHA1 e4a739ad411438ca8b98829f49cc928ae32270fe SHA256 55d1e0399c97d03e081901592284cf2c48449b84eabec3013c67fb2c4d3eb8b2
+EBUILD freedoko-0.7.3.ebuild 2791 RMD160 1b44a7f29ea3906f37ae9f45496663df9363325c SHA1 c8a0aa1834d6290f807078deb19563de3f39da5b SHA256 fc885deb01d8be67dfbce2692d9a716c7307ea3defac764938d68f167a073f7c
+MISC ChangeLog 1335 RMD160 0a61705041fcc1c5d4a0cab25ac7bc148d256156 SHA1 66a30fedf2d7ecb57c825c0d2d35e469fd1a9474 SHA256 2c4fd914778c833059c2fcba25e7ce22f9fd30f3968d8f982fc596a828e9077b
 MISC metadata.xml 580 RMD160 bf5e93ea7362a7694ef89b22a04ad8a05e27c50e SHA1 6b2e80c4b517fd0b1ea71c9754a179f286201110 SHA256 2f1b0c07f4dd8ed2e9c050cd126ebae9b9a59e476dc6c1e87fe3e201b713d373
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki+UbYACgkQNQqtfCuFneMyjgCfXhIoILypmC2Y1omg1VIY2WQc
-wIcAoI8bzJsgmII4/LFWRzqLpa3z9oU9
-=Arp+
+iEYEARECAAYFAkkbMWsACgkQSYz9rjec82aSYwCgi6AAxLM37C4V7tY2ucySlT8O
+jwYAoL4bOiKWWJa9Lo9YOhUlhR10qoPy
+=10XU
 -----END PGP SIGNATURE-----
diff --git a/games-board/freedoko/files/freedoko-0.7.3-gcc43.patch b/games-board/freedoko/files/freedoko-0.7.3-gcc43.patch
new file mode 100644
index 000000000000..322b7e010fc4
--- /dev/null
+++ b/games-board/freedoko/files/freedoko-0.7.3-gcc43.patch
@@ -0,0 +1,74 @@
+--- src/misc/translator.h.old	2008-11-11 20:53:05.000000000 +0100
++++ src/misc/translator.h	2008-11-11 20:53:47.000000000 +0100
+@@ -80,15 +80,15 @@
+     Translator& operator=(Translator const&);
+ }; // class Translator
+ 
+-Translator::Translation operator+(Translator::Translation const& translation,
+-				  Translator::Translation const& translation);
++Translator::Translation operator+(Translator::Translation const& translation1,
++				  Translator::Translation const& translation2);
+ Translator::Translation operator+(Translator::Translation const& translation,
+ 				  string const& text);
+ Translator::Translation operator+(string const& text,
+ 				  Translator::Translation const& translation);
+ 
+-bool operator==(Translator::Translation const& translation,
+-		Translator::Translation const& translation);
++bool operator==(Translator::Translation const& translation1,
++		Translator::Translation const& translation2);
+ bool operator==(Translator::Translation const& translation,
+ 		string const& text);
+ bool operator==(string const& text,
+--- src/debug.h.old	2008-11-11 21:00:37.000000000 +0100
++++ src/debug.h	2008-11-11 21:00:53.000000000 +0100
+@@ -81,6 +81,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <string>
++#include <stdlib.h>
+ using namespace std;
+ 
+ #ifndef VOID
+--- src/constants.h.old	2008-11-11 21:11:09.000000000 +0100
++++ src/constants.h	2008-11-11 21:11:30.000000000 +0100
+@@ -44,6 +44,8 @@
+ #include <sstream>
+ #include <algorithm>
+ 
++#include <limits.h>
++#include <string.h>
+ // for temporary output
+ #define COUT cout
+ 
+--- src/class/getopt/option.cpp.old	2008-11-12 19:15:41.000000000 +0100
++++ src/class/getopt/option.cpp	2008-11-12 19:16:53.000000000 +0100
+@@ -26,6 +26,8 @@
+ #include "getopt.h"
+ 
+ #include <iostream>
++#include <stdlib.h>
++#include <limits.h>
+ 
+ using namespace GetOpt;
+ 
+--- src/utils/file.cpp.old	2008-11-12 19:54:40.000000000 +0100
++++ src/utils/file.cpp	2008-11-12 19:55:32.000000000 +0100
+@@ -32,6 +32,7 @@
+ // for getpwent
+ #include <pwd.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ #endif
+ 
+ using std::string;
+--- src/utils/date.cpp.old	2008-11-12 20:20:11.000000000 +0100
++++ src/utils/date.cpp	2008-11-12 20:21:32.000000000 +0100
+@@ -27,6 +27,7 @@
+ 
+ #include <fstream>
+ #include <sstream>
++#include <stdlib.h>
+ using std::ostream;
+ using std::istream;
+ using std::ifstream;
diff --git a/games-board/freedoko/freedoko-0.7.3.ebuild b/games-board/freedoko/freedoko-0.7.3.ebuild
index ba74616c7a88..3d98f9f6ac98 100644
--- a/games-board/freedoko/freedoko-0.7.3.ebuild
+++ b/games-board/freedoko/freedoko-0.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.3.ebuild,v 1.9 2008/09/03 08:57:42 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.3.ebuild,v 1.10 2008/11/12 19:41:19 tupone Exp $
 
 inherit eutils games
 
@@ -35,6 +35,7 @@ src_unpack() {
 	edos2unix src/Makefile.rules
 	epatch \
 		"${FILESDIR}"/portage-cxx.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/Fix_Cardset_Make.patch
 	use !doc && epatch "${FILESDIR}"/nodoc.patch
 	use !net && epatch "${FILESDIR}"/nonet.patch