Fix building with gcc-4.3

Package-Manager: portage-2.1.5_rc6

5 files changed, 45 insertions, 31 deletions

diff --git a/games-sports/foosball/ChangeLog b/games-sports/foosball/ChangeLog
index d8e2d6706649..99de0356c695 100644
--- a/games-sports/foosball/ChangeLog
+++ b/games-sports/foosball/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/foosball
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/foosball/ChangeLog,v 1.5 2007/05/28 22:39:06 tupone Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foosball/ChangeLog,v 1.6 2008/05/02 23:01:31 nyhm Exp $
+
+  02 May 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/foosball-0.92-gcc43.patch, foosball-0.92-r1.ebuild:
+  Fix building with gcc-4.3
 
 *foosball-0.92-r1 (28 May 2007)
 
diff --git a/games-sports/foosball/Manifest b/games-sports/foosball/Manifest
index 57d7769e1a63..f2042c23c7a9 100644
--- a/games-sports/foosball/Manifest
+++ b/games-sports/foosball/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX foosball-0.92-gcc43.patch 471 RMD160 c58fb2080b42805e71143cc1a46ec24fbfe26b2c SHA1 2c081c2f8c5d71d78f907e7467c113a5317df238 SHA256 d62a38810d429341862078ccbcf114de3be1bad2a07260b3630a5f4454f07865
 DIST foosball-0.92.tar.gz 533087 RMD160 ec0c17239870381caaa0d8a7a113e62ac8b9e1d3 SHA1 8dc904d54db0f8d613abeff15415388dd1497e15 SHA256 2dd23535861999181ed446d5b08fe6ca0fca0ed6884443ae265fbc8b98c86cad
-EBUILD foosball-0.92-r1.ebuild 655 RMD160 f75dbd7d3220c475be51d822d8538b6a458d4fbe SHA1 ae06bff01f160d507cb4d9aac30414414f172948 SHA256 4c1fd88fc262bf37e4b09c734eba31f3e89d330e67575b0132a88d04819a3d0e
-EBUILD foosball-0.92.ebuild 612 RMD160 15c5f1079aec96d57cfb0d9483cdd803ce5a9178 SHA1 14b7c08afbd7bb4f26d212f548eee57f097b9597 SHA256 b05123608c3502492643cbf592d57422fb79338f4b2862d0c2c3869f4d1d4a2c
-MISC ChangeLog 676 RMD160 e0daa76bba42be7fb04743fe01ebd61f39788965 SHA1 c7e2e1177e67797e53ca7e9b26e4b6d2005cc700 SHA256 384db374b4731113ba1e29200e17ff0d3d07415c987d207b8e6fd487c1f13f34
+EBUILD foosball-0.92-r1.ebuild 734 RMD160 adf84035ada65c0ebefd96ccae8e2997452124e1 SHA1 c60eeef95f0c3a8aca18616f583dffce27569e5f SHA256 1ccf57742309ba3a57a73c11398de4480bd11ffeef5a744740ea8c77d3f9dfbe
+MISC ChangeLog 812 RMD160 b31cd2e0236678498f85cb08d332564b975d6b4f SHA1 8bd1c2920d012cb63ebe77d898596e6ba4755b62 SHA256 99b26a67e591399a3b43c69ce99c14a3d02c865474e831ab369c09ba0be4ef1e
 MISC metadata.xml 410 RMD160 521b31d7495b8d6446c1612a95cb77fd853be8f6 SHA1 07661ce7a9c2e8a9a7d877383446c16810a2e9e2 SHA256 1bcff921c77c8e25425b607bf197c52df88de7198810a5d2914efbdb5b994845
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgbnVEACgkQdz7hIScOURH9HACZAeXtBjg1BXgFB8ZuDT+SHCl2
+ybAAoNXpsupgKiNGcKZEgcbQJCI65shN
+=0b08
+-----END PGP SIGNATURE-----
diff --git a/games-sports/foosball/files/foosball-0.92-gcc43.patch b/games-sports/foosball/files/foosball-0.92-gcc43.patch
new file mode 100644
index 000000000000..19c853179088
--- /dev/null
+++ b/games-sports/foosball/files/foosball-0.92-gcc43.patch
@@ -0,0 +1,16 @@
+--- foosball/foosball.hxx
++++ foosball/foosball.hxx
+@@ -15,9 +15,10 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
+- #include <stdio.h>
+- #include <stdlib.h>
+- #include <math.h>
++ #include <cstdio>
++ #include <cstdlib>
++ #include <cmath>
++ #include <cstring>
+  #include "sgw.hxx"
+  
+  #define PLAYER1    (0)                         // Left to Right Player
diff --git a/games-sports/foosball/foosball-0.92-r1.ebuild b/games-sports/foosball/foosball-0.92-r1.ebuild
index 1dbeb081d400..adbc48afecd4 100644
--- a/games-sports/foosball/foosball-0.92-r1.ebuild
+++ b/games-sports/foosball/foosball-0.92-r1.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-sports/foosball/foosball-0.92-r1.ebuild,v 1.1 2007/05/28 22:39:06 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foosball/foosball-0.92-r1.ebuild,v 1.2 2008/05/02 23:01:31 nyhm Exp $
 
 inherit eutils games
 
@@ -10,13 +10,19 @@ SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README TODO
 	make_desktop_entry ${PN} Foosball
 	prepgamesdirs
diff --git a/games-sports/foosball/foosball-0.92.ebuild b/games-sports/foosball/foosball-0.92.ebuild
deleted file mode 100644
index 0c11cda21466..000000000000
--- a/games-sports/foosball/foosball-0.92.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/foosball/foosball-0.92.ebuild,v 1.8 2006/07/16 16:27:46 dertobi123 Exp $
-
-inherit games
-
-DESCRIPTION="foosball game that uses SDL"
-HOMEPAGE="http://freshmeat.net/projects/foosball/"
-SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO
-	prepgamesdirs
-}