gcc-4.3 build fixed. Bug #250831

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26-gentoo-r3 i686

4 files changed, 178 insertions, 7 deletions

diff --git a/dev-games/neoengine/ChangeLog b/dev-games/neoengine/ChangeLog
index ec04c047b55b..83446476b25c 100644
--- a/dev-games/neoengine/ChangeLog
+++ b/dev-games/neoengine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/neoengine
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/neoengine/ChangeLog,v 1.13 2008/05/13 05:54:54 mr_bones_ Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/neoengine/ChangeLog,v 1.14 2009/01/16 20:38:48 tupone Exp $
+
+  16 Jan 2009; Tupone Alfredo <tupone@gentoo.org>
+  +files/neoengine-0.8.2-gcc43.patch, neoengine-0.8.2.ebuild:
+  gcc-4.3 build fixed. Bug #250831 by flameeyes@gentoo.org
 
   13 May 2008; Michael Sterrett <mr_bones_@gentoo.org>
   neoengine-0.8.2.ebuild:
diff --git a/dev-games/neoengine/Manifest b/dev-games/neoengine/Manifest
index 683cf35f4e7c..4ccadc44ad23 100644
--- a/dev-games/neoengine/Manifest
+++ b/dev-games/neoengine/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX neoengine-0.8.2-gcc41.patch 568 RMD160 42483c4e7a23dd973e7962f00d6abd9dcdd9e15e SHA1 ced2d56b4e47926d4ab41512140ed451a6427f7e SHA256 b672fc46dbde145de1d08161f07ef17520537644103a36752ace6ff1ff4a9d28
+AUX neoengine-0.8.2-gcc43.patch 5798 RMD160 69b0227cc9136103d82417e79943080ab17c0fa8 SHA1 0b233c3532c574dde54194ad1b425d140d01eb98 SHA256 c3f07cd7b9e6457d1dce2d4394755b8121f7d94ef10868cde5c8caba0aaf06ba
 DIST neoengine-0.8.2.tar.bz2 1568596 RMD160 d60cf33d207274a709ac3f3943c81475660c1786 SHA1 1e3d9026ce20a8c18111e7d625f9baa09a62d492 SHA256 351d5efcf4e5b5aebad76a2696b1feaeb21678045b68cb553e0ee3377c3a1c26
-EBUILD neoengine-0.8.2.ebuild 1218 RMD160 d53925856de5786a66a3808743bdd6ff0169d6d8 SHA1 affa1880fdcc51cad8f30a010e3fa3eb80e1d661 SHA256 e7186ddd97fdb535d9b11ecb4da87c2c2af6349632cdf93d73b4e35babd384d6
-MISC ChangeLog 1747 RMD160 e1090ff7767e502061150045d41b7c5941dc1a4c SHA1 4c310f6937b41420f40ad129f1650542562e28d7 SHA256 4de1c1893c12f8a5f55d91fadb9ba8953c28638917afaf7613a4e72551c7860f
+EBUILD neoengine-0.8.2.ebuild 1250 RMD160 35a610c541bc5db52cdf2c2e20dcc0b7c1fc3dbf SHA1 100e09271afb2a5dc36add0ced054eee90576549 SHA256 0443c622341802cc67c8916103c238189e3d22fdf6b5c2085241cd78180c8b9d
+MISC ChangeLog 1916 RMD160 9d8a6527ed5d87af4c8cf884f33de91cde80a22d SHA1 579bb93429ac78e2763be0bb589e03bad2667b0a SHA256 ca445d3118b4689729e2bd4e9ac7b6a528a225f47db9327514527d96ff9f1464
 MISC metadata.xml 651 RMD160 4dbd18c8c424a075cc1f3d3125f1cb48ebe6ba2a SHA1 22aaa4831049df2f8f2a0a2b3a3a39f99efaf3ae SHA256 4399d7ce8eeaf78bfad76fc7acf7822b829034bb6a2ae22095e1c92e62557000
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklw8GQACgkQSYz9rjec82Z5vgCgvsM4RXIXULafBbO2E1aobkuO
+0KAAn2yHZp8CuVWfY90eQucVxwv84KcU
+=SQUh
+-----END PGP SIGNATURE-----
diff --git a/dev-games/neoengine/files/neoengine-0.8.2-gcc43.patch b/dev-games/neoengine/files/neoengine-0.8.2-gcc43.patch
new file mode 100644
index 000000000000..463a9e5bac90
--- /dev/null
+++ b/dev-games/neoengine/files/neoengine-0.8.2-gcc43.patch
@@ -0,0 +1,155 @@
+diff -Nurpa neoengine.orig/neoengine/core.cpp neoengine/neoengine/core.cpp
+--- neoengine.orig/neoengine/core.cpp	2008-12-16 09:43:18.000000000 +0300
++++ neoengine/neoengine/core.cpp	2008-12-16 09:48:05.000000000 +0300
+@@ -64,6 +64,8 @@
+ #  include <sys/sysctl.h>
+ #endif
+ 
++#include <cstdlib>
++
+ using namespace std;
+ 
+ 
+diff -Nurpa neoengine.orig/neoengine/hash.h neoengine/neoengine/hash.h
+--- neoengine.orig/neoengine/hash.h	2008-12-16 09:43:18.000000000 +0300
++++ neoengine/neoengine/hash.h	2008-12-16 09:46:50.000000000 +0300
+@@ -30,7 +30,7 @@
+ #include "base.h"
+ 
+ #include <string>
+-
++#include <cstring>
+  
+  /**
+   * \file hash.h
+diff -Nurpa neoengine.orig/neoengine/particle.cpp neoengine/neoengine/particle.cpp
+--- neoengine.orig/neoengine/particle.cpp	2008-12-16 09:43:17.000000000 +0300
++++ neoengine/neoengine/particle.cpp	2008-12-16 09:50:37.000000000 +0300
+@@ -29,6 +29,8 @@
+ #include "timer.h"
+ #include "logstream.h"
+ 
++#include <cstdlib>
++
+ using namespace std;
+ 
+ 
+diff -Nurpa neoengine.orig/neoengine/shader.cpp neoengine/neoengine/shader.cpp
+--- neoengine.orig/neoengine/shader.cpp	2008-12-16 09:43:18.000000000 +0300
++++ neoengine/neoengine/shader.cpp	2008-12-16 09:53:32.000000000 +0300
+@@ -32,6 +32,8 @@
+ #include "logstream.h"
+ #include "strutil.h"
+ 
++#include <cstdlib>
++
+ using namespace std;
+ 
+ 
+diff -Nurpa neoengine.orig/neoengine/strutil.cpp neoengine/neoengine/strutil.cpp
+--- neoengine.orig/neoengine/strutil.cpp	2008-12-16 09:43:18.000000000 +0300
++++ neoengine/neoengine/strutil.cpp	2008-12-16 09:54:23.000000000 +0300
+@@ -25,6 +25,7 @@
+  ***************************************************************************/
+ 
+ #include "strutil.h"
++#include <cstring>
+ 
+ using namespace std;
+ 
+diff -Nurpa neoengine.orig/neoengine/tcp.cpp neoengine/neoengine/tcp.cpp
+--- neoengine.orig/neoengine/tcp.cpp	2008-12-16 09:43:18.000000000 +0300
++++ neoengine/neoengine/tcp.cpp	2008-12-16 09:56:21.000000000 +0300
+@@ -54,6 +54,9 @@
+ #  define SOCKET_ERROR    -1
+ #endif /* __APPLE__ */
+ 
++#include <cstring>
++#include <cstdlib>
++
+ using namespace std;
+ 
+ 
+diff -Nurpa neoengine.orig/neoengine/udp.cpp neoengine/neoengine/udp.cpp
+--- neoengine.orig/neoengine/udp.cpp	2008-12-16 09:43:18.000000000 +0300
++++ neoengine/neoengine/udp.cpp	2008-12-16 09:57:05.000000000 +0300
+@@ -57,6 +57,8 @@
+ #  define SOCKET_ERROR    -1
+ #endif /* __APPLE__ */
+ 
++#include <cstring>
++
+ using namespace std;
+ 
+ 
+diff -Nurpa neoengine.orig/neochunkio/texlayer.cpp neoengine/neochunkio/texlayer.cpp
+--- neoengine.orig/neochunkio/texlayer.cpp	2004-03-27 22:25:18.000000000 +0300
++++ neoengine/neochunkio/texlayer.cpp	2008-12-17 01:27:41.000000000 +0300
+@@ -40,6 +40,7 @@
+ #include <vector>
+ #include <sstream>
+ #include <iomanip>
++#include <cstdlib>
+ 
+ using namespace std;
+ using namespace NeoEngine;
+diff -Nurpa neoengine.orig/neochunkio/vertexbuffer.cpp neoengine/neochunkio/vertexbuffer.cpp
+--- neoengine.orig/neochunkio/vertexbuffer.cpp	2004-03-15 10:35:50.000000000 +0300
++++ neoengine/neochunkio/vertexbuffer.cpp	2008-12-17 01:28:12.000000000 +0300
+@@ -37,7 +37,7 @@
+ 
+ #include <vector>
+ #include <string>
+-
++#include <cstdlib>
+ 
+ using namespace std;
+ using namespace NeoEngine;
+diff -Nurpa neoengine.orig/neodevopengl/extensions.h neoengine/neodevopengl/extensions.h
+--- neoengine.orig/neodevopengl/extensions.h	2004-06-12 20:47:42.000000000 +0400
++++ neoengine/neodevopengl/extensions.h	2008-12-16 23:17:49.000000000 +0300
+@@ -486,8 +486,8 @@ extern fpglGetProgramivARB              
+ typedef GLuint     (NEOGLAPIENTRY *                          fpglGenFragmentShadersATI)( GLuint );
+ typedef void       (NEOGLAPIENTRY *                          fpglBindFragmentShaderATI)( GLuint );
+ typedef void       (NEOGLAPIENTRY *                          fpglDeleteFragmentShaderATI)( GLuint );
+-typedef void       (NEOGLAPIENTRY *                          fpglBeginFragmentShaderATI)( GLvoid );
+-typedef void       (NEOGLAPIENTRY *                          fpglEndFragmentShaderATI)( GLvoid );
++typedef void       (NEOGLAPIENTRY *                          fpglBeginFragmentShaderATI)( void );
++typedef void       (NEOGLAPIENTRY *                          fpglEndFragmentShaderATI)( void );
+ typedef void       (NEOGLAPIENTRY *                          fpglPassTexCoordATI)( GLuint, GLuint, GLenum );
+ typedef void       (NEOGLAPIENTRY *                          fpglSampleMapATI)( GLuint, GLuint, GLenum );
+ typedef void       (NEOGLAPIENTRY *                          fpglColorFragmentOp1ATI)( GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint );
+diff -Nurpa neoengine.orig/neodevopengl/open.cpp neoengine/neodevopengl/open.cpp
+--- neoengine.orig/neodevopengl/open.cpp	2004-02-11 19:33:37.000000000 +0300
++++ neoengine/neodevopengl/open.cpp	2008-12-16 23:09:49.000000000 +0300
+@@ -32,6 +32,8 @@
+ 
+ #include <neoengine/logstream.h>
+ 
++#include <cstdlib>
++
+ using namespace std;
+ using namespace NeoEngine;
+ 
+diff -Nurpa neoengine.orig/neodevopengl/shader-ati.cpp neoengine/neodevopengl/shader-ati.cpp
+--- neoengine.orig/neodevopengl/shader-ati.cpp	2004-06-29 20:59:10.000000000 +0400
++++ neoengine/neodevopengl/shader-ati.cpp	2008-12-16 23:13:51.000000000 +0300
+@@ -29,6 +29,7 @@
+ #include <neoengine/scenenode.h>
+ #include <neoengine/strutil.h>
+ #include <neoengine/logstream.h>
++#include <cstdlib>
+ 
+ using namespace std;
+ using namespace NeoEngine;
+diff -Nurpa neoengine.orig/neodevopengl/vertexbuffer.cpp neoengine/neodevopengl/vertexbuffer.cpp
+--- neoengine.orig/neodevopengl/vertexbuffer.cpp	2004-06-12 08:02:02.000000000 +0400
++++ neoengine/neodevopengl/vertexbuffer.cpp	2008-12-17 01:08:40.000000000 +0300
+@@ -25,6 +25,7 @@
+  ***************************************************************************/
+ 
+ #include "vertexbuffer.h"
++#include <cstring>
+ 
+ using namespace NeoEngine;
+ 
diff --git a/dev-games/neoengine/neoengine-0.8.2.ebuild b/dev-games/neoengine/neoengine-0.8.2.ebuild
index def7c7a3df42..158b50fbc879 100644
--- a/dev-games/neoengine/neoengine-0.8.2.ebuild
+++ b/dev-games/neoengine/neoengine-0.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/neoengine/neoengine-0.8.2.ebuild,v 1.5 2008/05/13 05:54:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/neoengine/neoengine-0.8.2.ebuild,v 1.6 2009/01/16 20:38:49 tupone Exp $
 
 inherit eutils autotools
 
@@ -25,7 +25,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}"-gcc41.patch
+	epatch "${FILESDIR}/${P}"-gcc41.patch \
+		"${FILESDIR}/${P}"-gcc43.patch
 
 	./setbuildtype.sh dynamic