Patch to fix building with gcc-4.3 from Peter Alfredsen, bug #219427

Package-Manager: portage-2.1.5_rc6

4 files changed, 123 insertions, 10 deletions

diff --git a/games-action/rafkill/ChangeLog b/games-action/rafkill/ChangeLog
index ec79c48c8e4e..0099aabd6a51 100644
--- a/games-action/rafkill/ChangeLog
+++ b/games-action/rafkill/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/rafkill
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/rafkill/ChangeLog,v 1.4 2008/04/30 16:42:34 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/rafkill/ChangeLog,v 1.5 2008/04/30 16:46:31 nyhm Exp $
+
+  30 Apr 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/rafkill-1.2.3-gcc43.patch, rafkill-1.2.3.ebuild:
+  Patch to fix building with gcc-4.3 from Peter Alfredsen, bug #219427
 
   30 Apr 2008; Tristan Heaven <nyhm@gentoo.org>
   files/rafkill-1.2.3-build.patch:
diff --git a/games-action/rafkill/Manifest b/games-action/rafkill/Manifest
index 6315eae7981d..e86651d9ac93 100644
--- a/games-action/rafkill/Manifest
+++ b/games-action/rafkill/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA1
 
 AUX rafkill-1.2.3-build.patch 775 RMD160 99d96d0c70a487090a0432868170d8d8aaaa3b4b SHA1 ed7a4aebf6dfae5799615af0133c0691f3e2c944 SHA256 b9dfab867cede3dfca6dae571b205f5b0bf9c87d04c17e2777e06dac2d3d3ca4
+AUX rafkill-1.2.3-gcc43.patch 3780 RMD160 82eb196eda41446db07e8d935468f043687e3f27 SHA1 d52d8c99e3c90dc37c12b5e1a4dd1d087c771af0 SHA256 adc119bac173cebd1c03efa048dde0f0bbd20dd7dd4da2f6003e38b0aae27f86
 DIST rafkill-1.2.3.tar.gz 6221729 RMD160 2d0388e84c20a649618669bbfe5a2397521871b2 SHA1 6996615251f7273babc782ebbd34a416a52edbd1 SHA256 7d43026b33b63b2b01ea2d0169653749e6f8404b30ba5a2701e797bb16d0a63a
-EBUILD rafkill-1.2.3.ebuild 992 RMD160 baee9c96cdc264277fe55cd189976974a34232d7 SHA1 0a8f1e81d76a229c88700b8833ab08d5e59c7abd SHA256 ab604a2280de69cc4499b5c7a745cc4a905057f62357eff4d1acdf6dae8818a8
-MISC ChangeLog 842 RMD160 5b5597d776d151a53485a4351bb0294bdaa0e8fe SHA1 ada1c4d01a6909079b32193bc9b474e19666e982 SHA256 505c954935d82d14640adf146793b7242859a867d08af71accae870f979eb083
+EBUILD rafkill-1.2.3.ebuild 1023 RMD160 82985fdf06b59538515680aabfdae78a5c013ae9 SHA1 75d89999d27a50aa0ff74468645446c6e3775d5f SHA256 3271e9d7324c8a64f910ebd17946f908f1d0df44ca3c1e7b419bb3a6b02acae2
+MISC ChangeLog 1020 RMD160 b147a02b2a49c98e8712c6351eb00c4704568078 SHA1 a57022f7316e0ca35e94e38fc12aeae03823e862 SHA256 22db2c4725c425d3f76a456aeb9c4da6a5601a45932d0fc520e12ee70626306d
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgYoYAACgkQdz7hIScOURHJKgCghPrG8XlDs5xUVYxqmL5++20D
-vPwAoNc1TYyJ9o+mIGOPsY4xxx898oT7
-=b57e
+iEYEARECAAYFAkgYom0ACgkQdz7hIScOURH8qwCgycK099He1O6+1j71Nx/DM++y
+mNUAoI1/AZ9qU88poqsdrsNAO602WKEv
+=VmBD
 -----END PGP SIGNATURE-----
diff --git a/games-action/rafkill/files/rafkill-1.2.3-gcc43.patch b/games-action/rafkill/files/rafkill-1.2.3-gcc43.patch
new file mode 100644
index 000000000000..7284a74a1ac5
--- /dev/null
+++ b/games-action/rafkill/files/rafkill-1.2.3-gcc43.patch
@@ -0,0 +1,106 @@
+Index: rafkill-1.2.2/src/guns/gun_findgun.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/guns/gun_findgun.cpp	2006-05-07 15:50:04.000000000 +0100
++++ rafkill-1.2.2/src/guns/gun_findgun.cpp	2008-04-09 22:54:54.000000000 +0100
+@@ -5,6 +5,7 @@
+ #include "weaponobj.h"
+ #include "hulls/hull_weapon_machine.h"
+ #include "spaceobj.h"
++#include <cstdlib>
+ #include <vector>
+ #include <math.h>
+ 
+Index: rafkill-1.2.2/src/guns/gun_machine_circle.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/guns/gun_machine_circle.cpp	2006-05-02 02:50:40.000000000 +0100
++++ rafkill-1.2.2/src/guns/gun_machine_circle.cpp	2008-04-09 22:54:54.000000000 +0100
+@@ -3,6 +3,7 @@
+ #include "weaponobj.h"
+ #include "hulls/hull_weapon_machine.h"
+ #include "trigtable.h"
++#include <cstdlib>
+ 
+ // #define d_circle_move (2.9*8)
+ 
+Index: rafkill-1.2.2/src/guns/gun_saber.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/guns/gun_saber.cpp	2006-05-02 02:52:23.000000000 +0100
++++ rafkill-1.2.2/src/guns/gun_saber.cpp	2008-04-09 22:54:54.000000000 +0100
+@@ -5,6 +5,7 @@
+ #include "weapons/weapon_beam.h"
+ #include "spaceobj.h"
+ #include "ebox.h"
++#include <cstdlib>
+ #include <vector>
+ 
+ using namespace std;
+Index: rafkill-1.2.2/src/menu.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/menu.cpp	2008-04-09 22:53:35.000000000 +0100
++++ rafkill-1.2.2/src/menu.cpp	2008-04-09 22:54:54.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <cstdlib>
+ #include "defs.h"
+ #include "menu.h"
+ #include "loadsave.h"
+Index: rafkill-1.2.2/src/weapons/weapon_follow.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/weapons/weapon_follow.cpp	2006-03-25 23:29:05.000000000 +0000
++++ rafkill-1.2.2/src/weapons/weapon_follow.cpp	2008-04-09 22:54:54.000000000 +0100
+@@ -3,6 +3,7 @@
+ #include "weapon_follow.h"
+ #include "hulls/hull_weapon_follow.h"
+ #include "spaceobj.h"
++#include <cstdlib>
+ #include <vector>
+ 
+ using namespace std;
+Index: rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/hulls/hull_weapon_beam.cpp	2006-05-02 03:12:50.000000000 +0100
++++ rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp	2008-04-09 22:54:54.000000000 +0100
+@@ -4,6 +4,7 @@
+ #include "hull_weapon_beam.h"
+ #include "trigtable.h"
+ #include "ebox.h"
++#include <cstdlib>
+ 
+ #ifndef debug
+ #include <iostream>
+Index: rafkill-1.2.2/src/drawer.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/drawer.cpp	2008-04-09 22:55:06.000000000 +0100
++++ rafkill-1.2.2/src/drawer.cpp	2008-04-09 22:55:55.000000000 +0100
+@@ -11,6 +11,7 @@
+ #include "trigtable.h"
+ #include "pck.h"
+ #include <iostream>
++#include <cstring>
+ 
+ /* TODO:
+  * Add weapon icons to HUD
+Index: rafkill-1.2.2/src/loadsave.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/loadsave.cpp	2008-04-09 22:55:19.000000000 +0100
++++ rafkill-1.2.2/src/loadsave.cpp	2008-04-09 22:55:55.000000000 +0100
+@@ -7,6 +7,7 @@
+ #include "spaceobj.h"
+ #include "strings.h"
+ #include <string>
++#include <cstring>
+ #include <vector>
+ #include "gunobj.h"
+ #include "hull.h"
+Index: rafkill-1.2.2/src/system.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/system.cpp	2008-04-09 22:55:29.000000000 +0100
++++ rafkill-1.2.2/src/system.cpp	2008-04-09 22:55:55.000000000 +0100
+@@ -1,6 +1,7 @@
+ #include "system.h"
+ #include <strings.h>
+ #include <string>
++#include <cstring>
+ 
+ #ifdef WINDOWS
+ static const char * type(){
diff --git a/games-action/rafkill/rafkill-1.2.3.ebuild b/games-action/rafkill/rafkill-1.2.3.ebuild
index 3f1fdc52113d..b96cdef94ed9 100644
--- a/games-action/rafkill/rafkill-1.2.3.ebuild
+++ b/games-action/rafkill/rafkill-1.2.3.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-action/rafkill/rafkill-1.2.3.ebuild,v 1.2 2007/07/03 20:26:42 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/rafkill/rafkill-1.2.3.ebuild,v 1.3 2008/04/30 16:46:31 nyhm Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc x86"
 IUSE=""
 
-RDEPEND=">=media-libs/allegro-4.0.0
+RDEPEND="media-libs/allegro
 	media-libs/aldumb"
 DEPEND="${RDEPEND}
 	dev-util/scons"
@@ -22,7 +22,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	rm -f {data,music}/.sconsign
-	epatch "${FILESDIR}"/${P}-build.patch
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 	sed -i "/^#define INSTALL_DIR/s:\.:${GAMES_DATADIR}:" \
 		src/defs.cpp || die "sed failed"
 }