Fix building with gcc-4.3

Package-Manager: portage-2.1.5_rc6

4 files changed, 35 insertions, 8 deletions

diff --git a/games-arcade/gav/ChangeLog b/games-arcade/gav/ChangeLog
index 424a29f178db..4d6a9a438ade 100644
--- a/games-arcade/gav/ChangeLog
+++ b/games-arcade/gav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/gav
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/gav/ChangeLog,v 1.13 2007/04/24 14:40:37 drizzt Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gav/ChangeLog,v 1.14 2008/04/30 22:01:06 nyhm Exp $
+
+  30 Apr 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/gav-0.9.0-gcc43.patch, gav-0.9.0.ebuild:
+  Fix building with gcc-4.3
 
   24 Apr 2007; Timothy Redaelli <drizzt@gentoo.org> gav-0.9.0.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/games-arcade/gav/Manifest b/games-arcade/gav/Manifest
index 3f85ae183fb0..f9693f36e3d9 100644
--- a/games-arcade/gav/Manifest
+++ b/games-arcade/gav/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gav-0.9.0-gcc43.patch 201 RMD160 8313fc96b47aad6cf50f839a84818b50a69869f7 SHA1 f3a9cd78909a74ea7aadc25d8d472080a36ce1da SHA256 11c7bc2062c08133851bf4ec57d6534a203372c2e13b7b35c5d1598b2ba8dd2d
 DIST fabeach.tgz 163750 RMD160 3c64d719d2d39aca5b8772747e0388e81b5940e5 SHA1 42a51125a6ca27c890f08254fb5c66140bae9c54 SHA256 e479d25c3624ebb432d6ea272ce60d4f4de4deb47a9c4325ebd4b77b3a4ab9ab
 DIST florindo.tgz 175052 RMD160 60f83d4aff44529edb9aa1667a815bd0109899fa SHA1 d0a3573c42be3530929eafd91d997f902b331252 SHA256 d622ce2054a5f19243d7429dccfd036e51f8a7489cf692fb5181c670ef129a3e
 DIST gav-0.9.0.tar.gz 137729 RMD160 903bb61ebbb0eebd071d76d381431e1e658b34fa SHA1 7f1cc0a7bcac6fa92d89a3eacdfc6793dc0e8f6c SHA256 8f0deb8b2cd775b339229054f4f282583a4cfbcba9d27a6213cf910bab944f3e
@@ -6,6 +10,13 @@ DIST naive.tgz 80169 RMD160 9e703447af2f4020c5c8d66c45cf6e338830ebd5 SHA1 2b6a62
 DIST unnamed.tgz 156406 RMD160 beeda46ea716823e4daa808e2109464aefd27f08 SHA1 36de8faeb6d00d699cca27c3a1533d0e6535ca8e SHA256 e51f5ecf3046b29da3745713a7a9cd6af037bbf297e8bbe403d68ed9e0feec00
 DIST yisus.tgz 131021 RMD160 b22053d26a06ec07120c045db71953143e2c1d11 SHA1 16ec21132dc10b31518fdc8c31f2d5ba2d989989 SHA256 952e162a75ff235743ef89f8b90dde456a3494e245364b52a9c6092725a99dd2
 DIST yisus2.tgz 117923 RMD160 3d17c19a6b0dd4ebe0104ba5af215b2f4e3837b0 SHA1 c5572b91cf218df9224caac6653e42f08007fd67 SHA256 60939602a3ee52316204f64eb167839161aac4aff7b8f409e88d2543ebe733fc
-EBUILD gav-0.9.0.ebuild 1785 RMD160 3fd68270e6da213e398eba72807da60fba1b4fc8 SHA1 deee72f8204827ed55032eab2bb8528c005ae91c SHA256 9871b4e90162632fdd7a8c983645e9d2e099a7fef52357a8f3c06b5090220367
-MISC ChangeLog 1839 RMD160 3486f26c1674e869be3a70b1551e9b5f673dd7a2 SHA1 1adc1ec008000d9009acfcc2f3ec880bda7c3f01 SHA256 cda94528dce1e4cb039623b41274e040d332033ad02dc5fca803e28682205af9
+EBUILD gav-0.9.0.ebuild 1834 RMD160 5158f9d279b74dea52a2421611d967ae972e4886 SHA1 811397486fe52778c5229266025a1403c7c8fcda SHA256 c2bb0dd3df852418751ffd298ebc91781a55ca6b934cb790495e4c9506a76254
+MISC ChangeLog 1964 RMD160 f2fe95c78e0b5448ae0bb3d23c321b2d71ff9a61 SHA1 c87f5c6189f3286dfe9543b9cc3337663ed9ca37 SHA256 3381a20bcf1e66a8b41ffd7fc4ad77e260b3ef7b769db8bfc1389dccf8f6ab0d
 MISC metadata.xml 251 RMD160 f77a8fea97ab2a02ef2d9bf1cc7b390c5c19e6cb SHA1 8134d1f2611a2e4387a89e84580a2cb5c25f5649 SHA256 34f41062e84f1e12c08550faffc97632a2432df3579520cec76dbe8b08fb9cfe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgY7CgACgkQdz7hIScOURFKlwCff6BEYiZndU1LgMkeEJlf62gG
+hd0AoLoHQXEMxfvWsMjK0InPfcp5Z7Wx
+=abj5
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/gav/files/gav-0.9.0-gcc43.patch b/games-arcade/gav/files/gav-0.9.0-gcc43.patch
new file mode 100644
index 000000000000..06bc1a5d2542
--- /dev/null
+++ b/games-arcade/gav/files/gav-0.9.0-gcc43.patch
@@ -0,0 +1,10 @@
+--- Configuration.cpp
++++ Configuration.cpp
+@@ -25,6 +25,7 @@
+ #include <stdlib.h>
+ #include <string>
+ #include <iostream>
++#include <cstring>
+ #include "Configuration.h"
+ #include "ControlsArray.h"
+ 
diff --git a/games-arcade/gav/gav-0.9.0.ebuild b/games-arcade/gav/gav-0.9.0.ebuild
index 07d6ac2e7e78..8b1680588e36 100644
--- a/games-arcade/gav/gav-0.9.0.ebuild
+++ b/games-arcade/gav/gav-0.9.0.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/gav/gav-0.9.0.ebuild,v 1.2 2007/04/24 14:40:37 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gav/gav-0.9.0.ebuild,v 1.3 2008/04/30 22:01:06 nyhm Exp $
 
 inherit eutils games
 
@@ -35,6 +35,7 @@ src_unpack() {
 		cp ${d}/Makefile.Linux ${d}/Makefile || die "cp ${d}/Makefile failed"
 	done
 
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 	sed -i \
 		-e "s:/usr/bin:${GAMES_BINDIR}:" \
 		-e "/strip/d" \
@@ -65,8 +66,9 @@ src_compile() {
 
 src_install() {
 	dodir "${GAMES_BINDIR}"
-	make ROOT="${D}" install || die "make install failed"
-	cp -r sounds/ "${D}${GAMES_DATADIR}/${PN}" || die "cp failed"
+	emake ROOT="${D}" install || die "emake install failed"
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r sounds || die "doins failed"
 	dodoc CHANGELOG README
 	prepgamesdirs
 }