Fix gcc-4.3 bug #255819

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r7 x86_64

4 files changed, 55 insertions, 17 deletions

diff --git a/dev-games/neotools/ChangeLog b/dev-games/neotools/ChangeLog
index 0e97b404a940..865cc3132a53 100644
--- a/dev-games/neotools/ChangeLog
+++ b/dev-games/neotools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/neotools
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/neotools/ChangeLog,v 1.13 2008/11/16 12:50:57 flameeyes Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/neotools/ChangeLog,v 1.14 2009/01/23 10:58:08 tupone Exp $
+
+  23 Jan 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/neotools-0.8.2-gcc43.patch, neotools-0.8.2.ebuild:
+  Fix gcc-4.3 bug #255819 by flameeyes@gentoo.org
 
   16 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/neotools-0.8.2-errno.patch:
diff --git a/dev-games/neotools/Manifest b/dev-games/neotools/Manifest
index 3d83ed720629..9e9cea13de8e 100644
--- a/dev-games/neotools/Manifest
+++ b/dev-games/neotools/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX neotools-0.8.2-errno.patch 221 RMD160 724d2c2ef8d96d53c5f235991e6f6099214893ae SHA1 e870a4d682fa48e3c281416c1f9ea8f63d849862 SHA256 826827311f4b1fefcdeed07ff81f5627e86e9b565c404ed058ed6ebd87ef5072
+AUX neotools-0.8.2-gcc43.patch 1264 RMD160 8cc08e83861f2a368dccb737fdc534e471c0f0e6 SHA1 4f97d18d10755dc48d8b2b52ae7e4977b95c0c4b SHA256 2669e548d82b7c4e0fa01ba8faf72bf61b0ca0168007304c47fe386cdf83aae8
 DIST neotools-0.8.2.tar.bz2 105475 RMD160 073667a8d497f488a792b6db006fde2167e196e0 SHA1 63484554f29f218f1e557931e564cb8de1285594 SHA256 38ca4a1a85bf23064d68649f423efefc377405bac1224a11dd9ce1edf9f165db
-EBUILD neotools-0.8.2.ebuild 907 RMD160 f5e7313181f4710883567470008f95e5e318e5ba SHA1 b1f7b0a96c061bd292d6282f08f51e86f0f93c25 SHA256 e3cd99e8a0df6a787441c87e2d8398454a6166e4966d06090282fd404278732f
-MISC ChangeLog 1594 RMD160 75cbaf5aa2910d721cecdaddaa84d94c387245e5 SHA1 02a610171d4bdbaa3c8fb014c59467fb208209e0 SHA256 6e89ab50544baedb96a6eb1a4794db8a509194955e841d7423868df3f21dc9c7
+EBUILD neotools-0.8.2.ebuild 939 RMD160 74e3fdacbc2788fcf04cfa6cdfa235815e89ccd3 SHA1 3b204b7990512d542d8f56028bc00487c9bbf62e SHA256 d94b0ecdb4722076cb98be6bb9069e20870cd0e15b2e9c2f08579910f38bdd53
+MISC ChangeLog 1752 RMD160 40ffd5cd4772653e500a19c29de7b15f0275e51a SHA1 0f027193b1ec188d8109be401992af0424b80ef5 SHA256 b2b663c5c29aa120507fb2fe41ec34059a90b54a2d0347e4087247d0f05f8691
 MISC metadata.xml 400 RMD160 9dee0fa3b24e7be19ba60cb1804e300c584a2e1e SHA1 177c948be9aa5870be8264bdceb6eaccec437dcc SHA256 c73a1d09ae225e19b9850a6308a579f47119a30b7d90efffae962d1eea336766
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkgFzAACgkQAiZjviIA2XgnJgCdHOM8T8YADZQUe8vI6TiS2Rgu
-An4An2eZQ/NPveNAB+A3M4QOk5gKRVaB
-=+oRy
------END PGP SIGNATURE-----
diff --git a/dev-games/neotools/files/neotools-0.8.2-gcc43.patch b/dev-games/neotools/files/neotools-0.8.2-gcc43.patch
new file mode 100644
index 000000000000..58f623189fac
--- /dev/null
+++ b/dev-games/neotools/files/neotools-0.8.2-gcc43.patch
@@ -0,0 +1,42 @@
+--- nscemake/md3.h.old  2009-01-23 11:25:56.000000000 +0100
++++ nscemake/md3.h      2009-01-23 11:26:12.000000000 +0100
+@@ -32,6 +32,8 @@
+ #ifndef __NSCEMAKE_MD3_H
+ #define __NSCEMAKE_MD3_H
+
++#include <cstdlib>
++#include <cstring>
+ #include "base.h"
+ #include "converter.h"
+
+--- nscemake/md5mesh.cpp.old    2009-01-23 11:36:28.000000000 +0100
++++ nscemake/md5mesh.cpp        2009-01-23 11:37:04.000000000 +0100
+@@ -30,6 +30,7 @@
+  ***************************************************************************/
+
+ #include "md5mesh.h"
++#include <cstdlib>
+
+ #include <neoengine/file.h>
+ #include <neoengine/nemath.h>
+--- nscemake/q3map.cpp.old      2009-01-23 11:39:43.000000000 +0100
++++ nscemake/q3map.cpp  2009-01-23 11:40:18.000000000 +0100
+@@ -30,6 +30,7 @@
+  ***************************************************************************/
+
+ #include "q3map.h"
++#include <cstdlib>
+ #include "q3maptypes.h"
+
+ #include <neoengine/vertex.h>
+--- nscemake/ut2.cpp.old        2009-01-23 11:41:29.000000000 +0100
++++ nscemake/ut2.cpp    2009-01-23 11:41:52.000000000 +0100
+@@ -30,6 +30,7 @@
+  ***************************************************************************/
+
+ #include "ut2.h"
++#include <cstring>
+
+ #include <neoengine/file.h>
+ #include <neoengine/logstream.h>
+
diff --git a/dev-games/neotools/neotools-0.8.2.ebuild b/dev-games/neotools/neotools-0.8.2.ebuild
index 83033752b4cb..6e7dd29f45a7 100644
--- a/dev-games/neotools/neotools-0.8.2.ebuild
+++ b/dev-games/neotools/neotools-0.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/neotools/neotools-0.8.2.ebuild,v 1.3 2008/02/14 05:49:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/neotools/neotools-0.8.2.ebuild,v 1.4 2009/01/23 10:58:08 tupone Exp $
 
 inherit eutils autotools
 
@@ -29,7 +29,8 @@ src_unpack() {
 		-e 's/ -Werror//' \
 		configure.in
 
-	epatch "${FILESDIR}"/${P}-errno.patch
+	epatch "${FILESDIR}"/${P}-errno.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 
 	eautoreconf || die "eautoreconf failed"
 }