gcc-4.1 fix and purging old patches

(Portage version: 2.1_pre7-r5)

6 files changed, 39 insertions, 108 deletions

diff --git a/dev-games/neoengine/ChangeLog b/dev-games/neoengine/ChangeLog
index abb316de9bbc..5d2a6a874775 100644
--- a/dev-games/neoengine/ChangeLog
+++ b/dev-games/neoengine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/neoengine
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/neoengine/ChangeLog,v 1.10 2006/03/03 20:26:37 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/neoengine/ChangeLog,v 1.11 2006/04/15 01:00:58 tupone Exp $
+
+  15 Apr 2006; <Tupone@gentoo.org> -files/0.7.0-execute.patch,
+  -files/0.7.0-ppc.patch, +files/neoengine-0.8.2-gcc41.patch,
+  neoengine-0.8.2.ebuild:
+  Fix for gcc-4.1.
+  Purge old patches
 
   03 Mar 2006; <Tupone@gentoo.org> neoengine-0.8.2.ebuild:
   Forget to die
diff --git a/dev-games/neoengine/Manifest b/dev-games/neoengine/Manifest
index 8ed7be55d93b..ad6e45082630 100644
--- a/dev-games/neoengine/Manifest
+++ b/dev-games/neoengine/Manifest
@@ -1,24 +1,21 @@
-MD5 77f25527b9d381210bc599433021ebaf ChangeLog 1294
-RMD160 7d4fb9e112ff85a0e1729fab708ca63dbdb2bcad ChangeLog 1294
-SHA256 95781a7bb2e45d20b9448b9192ef43b8d93c716da87fe6ddbaf28aa97f704b12 ChangeLog 1294
-MD5 0b91b355776c52a872ecc19ddf88983d files/0.7.0-execute.patch 1091
-RMD160 c04c0cfe61a0fdb6b28860a7878d4c6d58186658 files/0.7.0-execute.patch 1091
-SHA256 7f77c315b40d0f75cadffeacbaa2161bbac930e12f7cf1bf9715fdf323fc4af8 files/0.7.0-execute.patch 1091
-MD5 990103eb9645b5e60de0ddba37697ee4 files/0.7.0-ppc.patch 1906
-RMD160 a19ef5c8fd4b132bcde0d99c9a845a8d2593ee31 files/0.7.0-ppc.patch 1906
-SHA256 5b00090b4e6d7ea7f7c14f33dde5d898cfee62ff37f5c3eabb4e442fe7345d22 files/0.7.0-ppc.patch 1906
+MD5 00be05e41684cb2053e1cb2c356c854b ChangeLog 1485
+RMD160 c60cf7e8b041643211c26163759abb88609ea483 ChangeLog 1485
+SHA256 8991efa4d1e7e4ecd6107c36728d4897fee71e685a23d3342797cd9c677e838b ChangeLog 1485
 MD5 5b830b64facde8a5b6569e9372495ea6 files/digest-neoengine-0.8.1 70
 RMD160 817f6605c71c4d8e5754385bbe0dfa213fe482b6 files/digest-neoengine-0.8.1 70
 SHA256 2719772980b94c56579ed6ffa1a9df6894585d2c1d1f3fe7929aa183b22b8704 files/digest-neoengine-0.8.1 70
 MD5 e02c6c668c021039aea5184321987ed0 files/digest-neoengine-0.8.2 253
 RMD160 5383c644d447eef12c7005da9c51d5465207a777 files/digest-neoengine-0.8.2 253
 SHA256 744749db2a13bfa30fc29a2ed6fd875a0a0c4d4a2d7640718eae1858c08f9598 files/digest-neoengine-0.8.2 253
+MD5 3c58785fa4510943f47cc4bb098ff08b files/neoengine-0.8.2-gcc41.patch 568
+RMD160 42483c4e7a23dd973e7962f00d6abd9dcdd9e15e files/neoengine-0.8.2-gcc41.patch 568
+SHA256 b672fc46dbde145de1d08161f07ef17520537644103a36752ace6ff1ff4a9d28 files/neoengine-0.8.2-gcc41.patch 568
 MD5 cb4362fd483552bef1fd270bf9e9d2ce metadata.xml 719
 RMD160 36432ff05f9e3e48294c7114c274bc6dc3316db0 metadata.xml 719
 SHA256 4e25e53f7298a6ee26457ebba7783cd325f6c5917a7bed4c522dac998249dc68 metadata.xml 719
 MD5 8fef31e36e9b5803196f6d76fdc566b6 neoengine-0.8.1.ebuild 991
 RMD160 9d1fb3371c861fb5727eea4afa2ccbd797da8e68 neoengine-0.8.1.ebuild 991
 SHA256 8207233f4f14d962c6eaf743123f8707005eade6d36bfec47a09db1d39255463 neoengine-0.8.1.ebuild 991
-MD5 2f8af8a0c0c406cfc4ed1bbfb366048d neoengine-0.8.2.ebuild 1139
-RMD160 3bc5cd57bfd50f1efaa7a9b583f03f94f2cf2bd6 neoengine-0.8.2.ebuild 1139
-SHA256 db9806240bcc371a35aec130a11e3255364c915c177bbf473fbcbd186cdf2f37 neoengine-0.8.2.ebuild 1139
+MD5 cb1751ce0f310ed2c5d68746ec565c53 neoengine-0.8.2.ebuild 1179
+RMD160 6a40ee0e43cc1c8a513a3582fd7d03f08423ad57 neoengine-0.8.2.ebuild 1179
+SHA256 1120b6c70bf8c018bfde94c87337b38ca41f44ac297ec36502ca8f5c3fc20418 neoengine-0.8.2.ebuild 1179
diff --git a/dev-games/neoengine/files/0.7.0-execute.patch b/dev-games/neoengine/files/0.7.0-execute.patch
deleted file mode 100644
index 144b4b612797..000000000000
--- a/dev-games/neoengine/files/0.7.0-execute.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- neoengine-0.7.0/neodevopengl/execute.cpp.orig	2004-01-22 21:52:19.000000000 +0100
-+++ neoengine-0.7.0/neodevopengl/execute.cpp	2004-03-22 00:33:19.000000000 +0100
-@@ -190,7 +190,7 @@
- 
- 			Program *pkProgram = static_cast< Program* >( (NeoEngine::Program*)pkMat->m_pkVertexProgram );
- 
--            pkProgram->Bind( pkOp );
-+			pkProgram->Bind( pkOp );
- 
- 			m_pkDevice->m_pkVertexProgram = pkProgram;
- 		}
-@@ -310,7 +310,7 @@
- 						for( ; uiLayer < m_pkDevice->m_uiNumTMUs; ++uiLayer )
- 						{
- 							m_pkDevice->m_ppkTMU[ uiLayer ]->Disable();
--							m_pkDevice->m_pkVertexBufferManager->SetTexLayerPointer( 0, uiLayer, 0 );
-+							m_pkDevice->m_pkVertexBufferManager->SetTexLayerPointer( pkVertexBuffer, uiLayer, 0 );
- 						}
- 
- 						//Render up to this layer
-@@ -357,7 +357,7 @@
- 			for( ; uiLayer < m_pkDevice->m_uiNumTMUs; ++uiLayer )
- 			{
- 				m_pkDevice->m_ppkTMU[ uiLayer ]->Disable();
--				m_pkDevice->m_pkVertexBufferManager->SetTexLayerPointer( 0, uiLayer, 0 );
-+				m_pkDevice->m_pkVertexBufferManager->SetTexLayerPointer( pkVertexBuffer, uiLayer, 0 );
- 			}
- 		}
- 
diff --git a/dev-games/neoengine/files/0.7.0-ppc.patch b/dev-games/neoengine/files/0.7.0-ppc.patch
deleted file mode 100644
index 167df64aaf3d..000000000000
--- a/dev-games/neoengine/files/0.7.0-ppc.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Naur neoengine-0.7.0.orig/neoengine/core.cpp neoengine-0.7.0/neoengine/core.cpp
---- neoengine-0.7.0.orig/neoengine/core.cpp	2004-01-22 21:53:18.000000000 +0100
-+++ neoengine-0.7.0/neoengine/core.cpp	2004-03-22 10:55:49.000000000 +0100
-@@ -55,11 +55,11 @@
- #  include <windows.h>
- #  include <winsock2.h>
- #  undef ERROR
--#elif defined(POSIX) || defined(__APPLE__)
-+#elif defined(POSIX) || defined(ARCH_PPC)
- #  include <sys/time.h>
- #endif
- 
--#ifdef __APPLE__
-+#ifdef ARCH_PPC
- #  include <sys/sysctl.h>
- #endif
- 
-@@ -102,7 +102,7 @@
- 
- 
- Core::Core() :
--#ifdef __APPLE__
-+#ifdef ARCH_PPC
- 	m_iHasAltiVec( 0 ),
- #endif
- 
-@@ -142,7 +142,7 @@
- #ifdef WIN32
- 	QueryPerformanceCounter( (LARGE_INTEGER*)&Timer::s_uliOldHeartbeatClock );
- 	QueryPerformanceFrequency( (LARGE_INTEGER*)&Timer::s_uliDivisor );
--#elif defined(POSIX) || defined(__APPLE__)
-+#elif defined(POSIX) || defined(ARCH_PPC)
- 	timeval tv;
- 
- 	gettimeofday( &tv, 0 );
-@@ -287,7 +287,7 @@
- 	       << ( m_iHas3DNow ? "3DNow " : "" )
- 	       << ( m_iHas3DNowEx ? "3DNowEx " : "" ) << endl;
- 
--#elif defined(ARCH_PPC)
-+#elif defined(__APPLE__)
- 
- 	int aiSel[2]    = { CTL_HW, HW_VECTORUNIT };
- 	int iHasVecUnit = 0;
-@@ -356,7 +356,7 @@
- 			neolog << LogLevel( DEBUG ) << "  ... setting working directory to [" << strPath << "]" << endl;
- #ifdef WIN32
- 			SetCurrentDirectory( strPath.c_str() );
--#elif defined(POSIX) || defined(__APPLE__)
-+#elif defined(POSIX) || defined(ARCH_PPC)
- 			chdir( strPath.c_str() );
- #endif
- 		}
-diff -Naur neoengine-0.7.0.orig/neoengine/core.h neoengine-0.7.0/neoengine/core.h
---- neoengine-0.7.0.orig/neoengine/core.h	2004-01-21 09:40:51.000000000 +0100
-+++ neoengine-0.7.0/neoengine/core.h	2004-03-22 10:55:15.000000000 +0100
-@@ -121,7 +121,7 @@
- #endif
- 
- 
--#ifdef __APPLE__
-+#ifdef ARCH_PPC
- 
- 		/*! Flag indicating AltiVec support in CPU */
- 		int                                           m_iHasAltiVec;
diff --git a/dev-games/neoengine/files/neoengine-0.8.2-gcc41.patch b/dev-games/neoengine/files/neoengine-0.8.2-gcc41.patch
new file mode 100644
index 000000000000..80475a031c70
--- /dev/null
+++ b/dev-games/neoengine/files/neoengine-0.8.2-gcc41.patch
@@ -0,0 +1,20 @@
+--- neoengine/logstream.h.old	2006-04-15 02:04:46.000000000 +0200
++++ neoengine/logstream.h	2006-04-15 02:06:19.000000000 +0200
+@@ -259,6 +259,7 @@
+ 		virtual void                                Write( const std::string &rstrMsg );
+ };
+ 
++class NEOENGINE_API LogSource;
+ 
+ /**
+   * \brief Stream buffer for the log source
+--- neoengine/font.h.old	2006-04-15 02:10:55.000000000 +0200
++++ neoengine/font.h	2006-04-15 02:11:13.000000000 +0200
+@@ -85,6 +85,7 @@
+ 
+ 
+ 
++class NEOENGINE_API FontManager;
+ 
+ /**
+   * \brief Font abstraction. Loads, prints and other methods.
diff --git a/dev-games/neoengine/neoengine-0.8.2.ebuild b/dev-games/neoengine/neoengine-0.8.2.ebuild
index 55cb256af3ea..cba0ecb2ef8e 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-2006 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.2 2006/03/03 20:26:37 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/neoengine/neoengine-0.8.2.ebuild,v 1.3 2006/04/15 01:00:58 tupone Exp $
 
 inherit eutils autotools
 
@@ -24,6 +24,8 @@ src_unpack() {
 	unpack "${A}"
 	cd "${S}"
 
+	epatch "${FILESDIR}/${P}"-gcc41.patch
+
 	./setbuildtype.sh dynamic
 
 	eautoreconf || die "eautoreconf failed"