Patch to fix building with gcc-4.3 from Martin Väth, bug #218940

Package-Manager: portage-2.1.5_rc6

4 files changed, 47 insertions, 17 deletions

diff --git a/games-arcade/tomatoes/ChangeLog b/games-arcade/tomatoes/ChangeLog
index 48841e1930ce..ec81ccd0329f 100644
--- a/games-arcade/tomatoes/ChangeLog
+++ b/games-arcade/tomatoes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/tomatoes
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/ChangeLog,v 1.14 2006/12/23 01:14:01 chainsaw Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/ChangeLog,v 1.15 2008/05/01 15:53:35 nyhm Exp $
+
+  01 May 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/tomatoes-1.55-gcc43.patch, tomatoes-1.55-r2.ebuild:
+  Patch to fix building with gcc-4.3 from Martin Väth, bug #218940
 
   23 Dec 2006; Tony Vroon <chainsaw@gentoo.org> tomatoes-1.55-r2.ebuild:
   Keyword ~ppc64 now that mikmod works.
diff --git a/games-arcade/tomatoes/Manifest b/games-arcade/tomatoes/Manifest
index c40f48a6ac3a..91fc2fcce38a 100644
--- a/games-arcade/tomatoes/Manifest
+++ b/games-arcade/tomatoes/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tomatoes-1.55-c_str.patch 573 RMD160 a54c2ef6b5e5c25a31b11125cac2ea2414aae490 SHA1 2a5b04f72f2b4883d5bff8a6c392c2fa1b23055c SHA256 edc5f1804f4e287473a21d514f52f52cd020215878d8f22a7e5c51dc5a332499
+AUX tomatoes-1.55-gcc43.patch 278 RMD160 0b044049e09e577f3aaadb5078d178ed56ec1d1e SHA1 ab01a9966feb84c4409c1699af22574751396c5d SHA256 0f1b0962a9620e5b28fccf96f1a13762ed54f94b5c1b4597e0ae2c032ff6ea5d
 DIST tomatoes-linux-1.5.tar.bz2 8807421 RMD160 454591162df5266a6ecb88b0b67914a5c0348a04 SHA1 8dc306617800f7ccc1e8610fb39e87d8181c482d SHA256 69a3af1994cb58409be9b469e1aa4bdb91c405d99071c7431526640ec53d1300
 DIST tomatoes-linux-src-1.55.tar.bz2 62947 RMD160 a57881902e3c917733058e3b9c936d2db5ca0e3a SHA1 aa123a5fa9c8c0223c602c0cffe8a5bb0ebad60c SHA256 126d001532ee5b81cc95e1a86a274d11669b8c8f65c8235ae2e9b8fbdfab4a60
-EBUILD tomatoes-1.55-r2.ebuild 2117 RMD160 07491ff716ec271181d0c07bf69e84444dac9478 SHA1 2f130e9c59e65b29e0378ea3822a1d6d4ca5a57f SHA256 136df8a8b964a334232922dcb4ed90410b0d78db02ccbc3b0de4d7a95c1f11c6
-MISC ChangeLog 2332 RMD160 e4460c8e37b3cc6986b759ceb7ace382bf8fae95 SHA1 76afb54295330cea0749e8fde312df30051af689 SHA256 dad29bc36d8ee1e6d87ec56924f75656909a27dda3889dbf5ed59f4aeafffd80
+EBUILD tomatoes-1.55-r2.ebuild 2089 RMD160 7b6cfd315a8e5ef8e953eefe782befad8f220993 SHA1 80ea9da987ce3dc416b0caa427faccff9932778b SHA256 cfd736d4f5396e6f051940bca8891f6cf15fa25ec0816d78338d8c50d351725a
+MISC ChangeLog 2506 RMD160 1f63580793a5b2a72e46ab1efcbd020c4cce7770 SHA1 fed2434ce264882cff5a9cab046094ca291afaaf SHA256 9a5de35c2e7c7fe3bc1238dca71bf374b2ce3d4c80356f7b7ffbe96fdf2f64f9
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgZ54UACgkQdz7hIScOUREHhgCeIG55uqIGwdFfZbKqn+86HZwi
+VvQAn3EG7a2aFTXJm7FYWFlqysRE/AXX
+=S9rH
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch b/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch
new file mode 100644
index 000000000000..cd85e31e5936
--- /dev/null
+++ b/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch
@@ -0,0 +1,14 @@
+--- src/config.cpp
++++ src/config.cpp
+@@ -27,8 +27,9 @@
+ 
+ *************************************************************************/
+ 
+-#include <stdio.h>
+-#include <stdlib.h>
++#include <cstring>
++#include <cstdio>
++#include <cstdlib>
+ #include "config.h"
+ #include "init.h"
+ 
diff --git a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
index ce5169b51cd1..c18402281a19 100644
--- a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
+++ b/games-arcade/tomatoes/tomatoes-1.55-r2.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-arcade/tomatoes/tomatoes-1.55-r2.ebuild,v 1.4 2007/08/08 21:04:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild,v 1.5 2008/05/01 15:53:35 nyhm Exp $
 
 inherit eutils games
 
@@ -17,8 +17,8 @@ IUSE=""
 
 DEPEND="virtual/opengl
 	virtual/glu
-	>=media-libs/libsdl-1.2.7
-	>=media-libs/sdl-image-1.2.2
+	media-libs/libsdl
+	media-libs/sdl-image
 	media-libs/sdl-mixer"
 
 pkg_setup() {
@@ -49,26 +49,27 @@ src_unpack() {
 		makefile \
 		|| die "sed failed"
 
-	epatch "${FILESDIR}"/${P}-c_str.patch
+	epatch \
+		"${FILESDIR}"/${P}-c_str.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_install() {
 	dogamesbin tomatoes || die "dogamesbin failed"
-	dodir "${GAMES_DATADIR}/${PN}" "${GAMES_STATEDIR}/${PN}"
 	dodoc README README-src
 
-	cp -r tomatoes.mpk music/ "${D}${GAMES_DATADIR}/${PN}" \
-		|| die "failed to copy game data"
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r tomatoes.mpk music || die "doins data failed"
 
 	doicon ${PN}.png
 	make_desktop_entry tomatoes "I Have No Tomatoes"
 
-	touch "${D}${GAMES_STATEDIR}/${PN}/hiscore.lst" || die "touch failed"
-	fperms 660 "${GAMES_STATEDIR}/${PN}/hiscore.lst"
+	dodir "${GAMES_STATEDIR}"/${PN}
+	touch "${D}${GAMES_STATEDIR}"/${PN}/hiscore.lst || die "touch failed"
+	fperms 660 "${GAMES_STATEDIR}"/${PN}/hiscore.lst
 
-	insinto "${GAMES_SYSCONFDIR}/${PN}/"
-	insopts -m0640
-	doins config.cfg || die "failed to copy game config"
+	insinto "${GAMES_SYSCONFDIR}"/${PN}
+	doins config.cfg || die "doins config.cfg failed"
 
 	prepgamesdirs
 }