Fix building with gcc-4.3

Package-Manager: portage-2.1.5_rc6

4 files changed, 85 insertions, 9 deletions

diff --git a/games-board/xfreecell/ChangeLog b/games-board/xfreecell/ChangeLog
index 69189911ddcd..40918c38a8f6 100644
--- a/games-board/xfreecell/ChangeLog
+++ b/games-board/xfreecell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/xfreecell
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xfreecell/ChangeLog,v 1.9 2007/02/06 02:30:11 dang Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xfreecell/ChangeLog,v 1.10 2008/05/02 23:17:43 nyhm Exp $
+
+  02 May 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/xfreecell-1.0.5b-gcc43.patch, xfreecell-1.0.5b.ebuild:
+  Fix building with gcc-4.3
 
   06 Feb 2007; Daniel Gryniewicz <dang@gentoo.org> xfreecell-1.0.5b.ebuild:
   Marked stable on amd64 for bug #162573
diff --git a/games-board/xfreecell/Manifest b/games-board/xfreecell/Manifest
index 66f243f34504..977e484a8d33 100644
--- a/games-board/xfreecell/Manifest
+++ b/games-board/xfreecell/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xfreecell-1.0.5b-gcc43.patch 1104 RMD160 b1c481d353aa46e458d11c2c474a0742c68c759b SHA1 e3e62b7ec561071b90b3ec11ab2114aacb49b52f SHA256 4f874ae5de9b9828cd64ad58e5247ebafdbaf7d785eb335c65460ef0cfaa6776
 AUX xfreecell-1.0.5b-gentoo.patch 11172 RMD160 9689ab8672fa59ece326a348e3c0f259d0a983a2 SHA1 1486660dc66b932c04b863425420778f127a3ec5 SHA256 8dde3ed4dc2fea5719c0f4f1530e675a83ec4e17ded301969df7b11c990ca9b0
 DIST MSNumbers.gz 1212278 RMD160 a2f7fbd872722a8ae27ede416340c80c1fc534f8 SHA1 74989d4eabbbc978e020cf09931e453a4a2f87e3 SHA256 d3cdebbe409588f706f2480235b391f18f825a32233460aebbd0ca07d55f961b
 DIST xfreecell-1.0.5b.tgz 49367 RMD160 2629217bf29734bb25b30ca8aaec62ae19d0ff6f SHA1 b0453b09ea2211822a5f03f532097c9eb14db2a6 SHA256 ababb3bdc5055e1d013161f2c04c874bacb572f240d0175ff8eabbd88b5d1b78
-EBUILD xfreecell-1.0.5b.ebuild 892 RMD160 5a11357c4c4db197974717306c3cc8af64c80904 SHA1 eac92a39945bfb5d4dbbed14b52360c8aa69147f SHA256 14cd5bc405bdddf847459c62353807c51eac85c94fef2c50558d9b12fe7d7c27
-MISC ChangeLog 1211 RMD160 c00e82105c8a3051071c5ba064f2ed7200c72ff3 SHA1 d67377ae4f99eccee2c1f98c705d8be03b4ac5fd SHA256 ffb5f313bf2ed1349f3bf190e85fc0b2740dfd3f8b06687d5111f8e5570a9a10
+EBUILD xfreecell-1.0.5b.ebuild 931 RMD160 367772b5d74aee5b5c36278d67ee02eca2bd6fe9 SHA1 50593af14a84c8d164046b1103d3c8189f3e1c7c SHA256 5eb62111dcd5a6935cb8ef98353d2040ce66b827ea37f617227393c454001fc4
+MISC ChangeLog 1353 RMD160 7e0230bf679777a84ce00f9332a83c657e926b9c SHA1 bfb152c6af77b498f0087b3193c0439d704bba33 SHA256 27fb170b25b456eca49f6bf6f1e407f904aa5bc080253d696c1aa0edf5cf0638
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgboR0ACgkQdz7hIScOURER8wCgqMRNGTK8cxNYq8lsTZ9wAVRm
+ppMAn24AgW0YxO0yXHpyaDEaBhrakaqu
+=Lq4Z
+-----END PGP SIGNATURE-----
diff --git a/games-board/xfreecell/files/xfreecell-1.0.5b-gcc43.patch b/games-board/xfreecell/files/xfreecell-1.0.5b-gcc43.patch
new file mode 100644
index 000000000000..cf7e899d2856
--- /dev/null
+++ b/games-board/xfreecell/files/xfreecell-1.0.5b-gcc43.patch
@@ -0,0 +1,59 @@
+--- card.cpp
++++ card.cpp
+@@ -1,5 +1,6 @@
++#include <cstdlib>
+ #include <cstdio>
+-#include <math.h>
++#include <cmath>
+ #ifdef SHAPE
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+--- freecell.cpp
++++ freecell.cpp
+@@ -1,6 +1,7 @@
+ #include <dirent.h>
+ #include <fcntl.h>
+-#include <stdlib.h>
++#include <cstdlib>
++#include <cstring>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+--- option.cpp
++++ option.cpp
+@@ -3,7 +3,9 @@
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <unistd.h>
+-#include <stdio.h>
++#include <cstdlib>
++#include <cstdio>
++#include <cstring>
+ 
+ #include "general.h"
+ #include "option.h"
+--- subwindows.cpp
++++ subwindows.cpp
+@@ -3,7 +3,8 @@
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <unistd.h>
+-#include <stdio.h>
++#include <cstdlib>
++#include <cstdio>
+ 
+ #include "general.h"
+ #include "subwindows.h"
+--- widget/widget.h
++++ widget/widget.h
+@@ -4,7 +4,9 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/keysym.h>
+-#include <stdio.h>
++#include <cstdlib>
++#include <cstdio>
++#include <cstring>
+ #include <vector>
+ #include <string>
+ 
diff --git a/games-board/xfreecell/xfreecell-1.0.5b.ebuild b/games-board/xfreecell/xfreecell-1.0.5b.ebuild
index 6b97c20782d8..1e304801eb71 100644
--- a/games-board/xfreecell/xfreecell-1.0.5b.ebuild
+++ b/games-board/xfreecell/xfreecell-1.0.5b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xfreecell/xfreecell-1.0.5b.ebuild,v 1.12 2007/02/06 02:30:11 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xfreecell/xfreecell-1.0.5b.ebuild,v 1.13 2008/05/02 23:17:43 nyhm Exp $
 
 inherit eutils games
 
@@ -23,13 +23,15 @@ S=${WORKDIR}/${PN}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_install() {
 	dogamesbin xfreecell || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins "${WORKDIR}/MSNumbers" || die "doins failed"
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins "${WORKDIR}"/MSNumbers || die "doins failed"
 	dodoc CHANGES README mshuffle.txt
 	doman xfreecell.6
 	prepgamesdirs