Add fix from Debian for building with gcc-4.3 #218833 by Peter Alfredsen.

Package-Manager: portage-2.2_pre5

4 files changed, 90 insertions, 6 deletions

diff --git a/games-server/monopd/ChangeLog b/games-server/monopd/ChangeLog
index 83fcc9c2f78c..d44d46b28e73 100644
--- a/games-server/monopd/ChangeLog
+++ b/games-server/monopd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-server/monopd
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/ChangeLog,v 1.19 2008/02/09 04:30:00 mr_bones_ Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/ChangeLog,v 1.20 2008/05/10 11:12:08 vapier Exp $
+
+  10 May 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/monopd-0.9.3-gcc43.patch, monopd-0.9.3-r1.ebuild:
+  Add fix from Debian for building with gcc-4.3 #218833 by Peter Alfredsen.
 
   09 Feb 2008; Michael Sterrett <mr_bones_@gentoo.org>
   files/monopd-0.9.3-dosfix.patch:
diff --git a/games-server/monopd/Manifest b/games-server/monopd/Manifest
index 419aa9f8f4b6..e36d199373a1 100644
--- a/games-server/monopd/Manifest
+++ b/games-server/monopd/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX monopd 507 RMD160 e756da77333a0b0b5029751bfc0062b9e7ce25d6 SHA1 0b6180b457fc026485d8771f51e4cbc109dd5ee2 SHA256 4f806016a431f841f711bb9d8d09a78bebcf99a4c455d5d8e607569635f765e2
 AUX monopd-0.9.3-dosfix.patch 1008 RMD160 144bf605a8ca128287ace6ab6de13503f492a69e SHA1 fcff14509190d8c878d2233494a5d5c98e93c757 SHA256 8ba2de38c1f041fe5e62a1efefc02e278abcea85a1cc1c0d3ecd66fee95ffe2b
+AUX monopd-0.9.3-gcc43.patch 1568 RMD160 2b1069bf33a528436900675afa6a624916a5e528 SHA1 b4a0edf92fd144b74646ba639cd2df3dac27ae6c SHA256 3864d4832a836d9a5a1de32b067f3f5bb0764a4c7b00ff011d2df100a0898f3a
 DIST monopd-0.9.3.tar.bz2 110354 RMD160 ad698d7e4692f0b2446932f668d2eb9a2d8b3448 SHA1 244f6e0f2c8176fc57ab145c04aed3ed148e5976 SHA256 81fb6b267360b25d607da7846226c0976ed1df174d21e249b485ffc2feff5d77
-EBUILD monopd-0.9.3-r1.ebuild 964 RMD160 48103a806d74ee81b70fbc6e877abca9d93703ef SHA1 8f5490ae40a24c43d8b1c0d13b2b6b89519702fd SHA256 1336c3c7dd6f3cfb3cca9c78a1e922472976351afe8a7479105f78c51d3a4509
-MISC ChangeLog 3046 RMD160 a0b04261c3598bdb8bd09d26290b5da81bb5c4b6 SHA1 937635a82e70bec3fb60883e0a1d8db3e07a2768 SHA256 ea780dc0dd2a17409f6f7f81853be057e42bac7cc94c18a4bd939c7850cca2e0
+EBUILD monopd-0.9.3-r1.ebuild 1008 RMD160 ac5373927e491bc7f23097ad054804f193dfc144 SHA1 212c87722edc155701a504a4cc61d0876e4fcfaf SHA256 395c831e94a48617c62562125d772c15e8d4354d6edf3e569a2751a0370d96d0
+MISC ChangeLog 3229 RMD160 27de1fece19816725d6230a06ec420e0247ca2c3 SHA1 3b0770f187919068fd5e2c6dd5f7ac6e3454053f SHA256 403cf34a065c608383d7b84b26fc444e296359279b42929836bba21332cc1356
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIJYMOj9hvisErhMIRArm4AKCyMbp6ae9ac4dRiOSoaI+yfD/3egCeL5QZ
+M0Cufh+YqzCsgsfnvNHT9T0=
+=Mz4d
+-----END PGP SIGNATURE-----
diff --git a/games-server/monopd/files/monopd-0.9.3-gcc43.patch b/games-server/monopd/files/monopd-0.9.3-gcc43.patch
new file mode 100644
index 000000000000..553e17c81870
--- /dev/null
+++ b/games-server/monopd/files/monopd-0.9.3-gcc43.patch
@@ -0,0 +1,68 @@
+http://bugs.gentoo.org/218833
+
+fix building with gcc-4.3
+
+--- monopd-0.9.3/src/cardgroup.cpp
++++ monopd-0.9.3/src/cardgroup.cpp
+@@ -14,7 +14,7 @@
+ // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ // Boston, MA 02111-1307, USA.
+ 
+-#include <algo.h>
++#include <algorithm>
+ 
+ #include "card.h"
+ #include "cardgroup.h"
+--- monopd-0.9.3/src/estategroup.cpp
++++ monopd-0.9.3/src/estategroup.cpp
+@@ -14,6 +14,7 @@
+ // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ // Boston, MA 02111-1307, USA.
+ 
++#include <stdlib.h>
+ #include <iostream>
+ 
+ #include <math++/nodes.h>
+--- monopd-0.9.3/src/game.cpp
++++ monopd-0.9.3/src/game.cpp
+@@ -20,7 +20,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <syslog.h>
+-#include <algo.h> // libstdc++ from the gcc 2.95 has no #include <algo> yet :(
++#include <string.h>
++#include <algorithm> // libstdc++ from the gcc 2.95 has no #include <algo> yet :(
+ 
+ #include <map>
+ #include <string>
+--- monopd-0.9.3/src/main.cpp
++++ monopd-0.9.3/src/main.cpp
+@@ -18,6 +18,7 @@
+ #include <signal.h>
+ #include <syslog.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ 
+ #include <iostream>
+ #include <string>
+--- monopd-0.9.3/src/player.cpp
++++ monopd-0.9.3/src/player.cpp
+@@ -18,6 +18,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include <string>
+ 
+--- monopd-0.9.3/src/server.cpp
++++ monopd-0.9.3/src/server.cpp
+@@ -25,6 +25,8 @@
+ #include <netinet/in.h>
+ #include <syslog.h>
+ #include <unistd.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include <string>
+ 
diff --git a/games-server/monopd/monopd-0.9.3-r1.ebuild b/games-server/monopd/monopd-0.9.3-r1.ebuild
index b5971f76e8dd..63e50542465b 100644
--- a/games-server/monopd/monopd-0.9.3-r1.ebuild
+++ b/games-server/monopd/monopd-0.9.3-r1.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-server/monopd/monopd-0.9.3-r1.ebuild,v 1.2 2008/01/24 06:08:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/monopd-0.9.3-r1.ebuild,v 1.3 2008/05/10 11:12:08 vapier Exp $
 
 inherit eutils games
 
@@ -19,7 +19,8 @@ DEPEND=">=net-libs/libcapsinetwork-0.3.0
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-dosfix.patch"
+	epatch "${FILESDIR}"/${P}-gcc43.patch #218833
+	epatch "${FILESDIR}"/${P}-dosfix.patch
 	# make the example config better (bug #206740)
 	sed -i \
 		-e '/gatorhost/s/=.*/=monopd-gator.kde.org/' \