gcc-4.1 patch, bug #126529

(Portage version: 2.1_pre7-r3)

5 files changed, 65 insertions, 11 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index 8f4df93a6d15..3e21f3070f41 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/irrlicht
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.15 2006/02/10 16:13:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.16 2006/04/03 22:49:17 tupone Exp $
+
+  03 Apr 2006; <Tupone@gentoo.org> +files/irrlicht-0.14.0-gcc41.patch,
+  irrlicht-0.14.0.ebuild:
+  gcc-4.1 patch, bug #126529 by Giacomo Graziosi
 
   10 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   -files/0.7.1-opengl.patch, -files/irrlicht-0.10.0-opengl.patch,
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 13dcbefa4ed8..3e3d07387197 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,24 +1,27 @@
-MD5 a04c96bfe6a8f41ea44fcfd35964e915 ChangeLog 2679
-RMD160 53aedec94d3ed999d92a60b88910af17cb1e9e55 ChangeLog 2679
-SHA256 501d4c839d41702235ec55dd2ac9185d7a5adb6f16f0d9fff09aafd707182c26 ChangeLog 2679
+MD5 0fcc157c80e8383b43c536df966a02eb ChangeLog 2826
+RMD160 734fdc03bd30757685a8c6a1a238b253675108fd ChangeLog 2826
+SHA256 a581bff31d377d90aa284fe5fa184540eb446a88a7c8e2b3533e4e6f0fe9e01e ChangeLog 2826
 MD5 0ad2514a81760732b181856cf7eab90e files/digest-irrlicht-0.12.0 66
 RMD160 dad2b414e94c8489637efe003703ad71d9ac8727 files/digest-irrlicht-0.12.0 66
 SHA256 3894eb33af23438b605afa8df6922ba533179c55bf7e9f9a2746d1031b38a978 files/digest-irrlicht-0.12.0 66
-MD5 0b2f0ee114614d04ce2f822c3d7cbf3d files/digest-irrlicht-0.14.0 66
-RMD160 67c4cdc178c2c7452270bf2eb12d00e58d126db0 files/digest-irrlicht-0.14.0 66
-SHA256 7c60832a390efa2f4ddd45b43c7275762758db5c3d8ac9d9154aff959580fce3 files/digest-irrlicht-0.14.0 66
+MD5 06c03be236123be45b2abe90b9783d4c files/digest-irrlicht-0.14.0 244
+RMD160 30dfad5a4db728a958770a71fd77f52d8e7877b1 files/digest-irrlicht-0.14.0 244
+SHA256 18454d48aa533cbe66ea93acbc6adabe86f361ea07263185f6165de48716353a files/digest-irrlicht-0.14.0 244
 MD5 e03898aad8550858f91a0b78c888c3f8 files/irrlicht-0.12.0-64bit.patch 10232
 RMD160 2236e1f206d7cfef008e5c8d5ee4e3d735bdd361 files/irrlicht-0.12.0-64bit.patch 10232
 SHA256 e86f20445d6d0cbe191b29f1a57c125d226588e0dba72e6f22a9c19e8a02c66b files/irrlicht-0.12.0-64bit.patch 10232
 MD5 482fcd4ab66e17c76273ec131a05920a files/irrlicht-0.12.0-opengl.patch 655
 RMD160 83a06521306cf177581f2e547a4b9b69ef79e20b files/irrlicht-0.12.0-opengl.patch 655
 SHA256 c97b3d5f857e31de24482cd72d92f6d3c9c1b4ddb2a8ff162411d5f684967865 files/irrlicht-0.12.0-opengl.patch 655
+MD5 5182269be1187ffbd25e8461bf8866b1 files/irrlicht-0.14.0-gcc41.patch 1836
+RMD160 d637e9f49167e7b7cc79983556b2bec079de49d0 files/irrlicht-0.14.0-gcc41.patch 1836
+SHA256 e3005916b06c360d7e5cefcdac14cbaeb0d2021b1da6adbbe010efe5215d1505 files/irrlicht-0.14.0-gcc41.patch 1836
 MD5 83bf4ddba17a6c3c25fd5de2b0a55c38 irrlicht-0.12.0.ebuild 2200
 RMD160 e041687675710795299037eb34e8a1eafbe07243 irrlicht-0.12.0.ebuild 2200
 SHA256 f787a2d57c717a73c2edbb86eb3b2810c884a90362f4d81c6987d22b2e89a4c3 irrlicht-0.12.0.ebuild 2200
-MD5 0f2444cde0429e713b8aebc7f719f319 irrlicht-0.14.0.ebuild 2184
-RMD160 bb74dcd8bc375a85f80780a7919969012ca091b8 irrlicht-0.14.0.ebuild 2184
-SHA256 bd5078e6d229a6842e6a8607f32dac59be0172ca9f4eea24de837ff7e675bed4 irrlicht-0.14.0.ebuild 2184
+MD5 06ae7028f59a7b82ead42d06fa74b518 irrlicht-0.14.0.ebuild 2223
+RMD160 d17f8f1a7af6b144fed70bfd8f3e3930f1c42b4b irrlicht-0.14.0.ebuild 2223
+SHA256 0c07691c7a27fc15f46baac87cf1ec34ad81626c2f6dab21b6d8e89504dba637 irrlicht-0.14.0.ebuild 2223
 MD5 ad41838cd74c70f9c72295bda4662786 metadata.xml 790
 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a metadata.xml 790
 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc metadata.xml 790
diff --git a/dev-games/irrlicht/files/digest-irrlicht-0.14.0 b/dev-games/irrlicht/files/digest-irrlicht-0.14.0
index f3b3c3d5efbc..159c9eeb2133 100644
--- a/dev-games/irrlicht/files/digest-irrlicht-0.14.0
+++ b/dev-games/irrlicht/files/digest-irrlicht-0.14.0
@@ -1 +1,3 @@
 MD5 5da8c8f4632d26f971fba2d56e04a652 irrlicht-0.14.0.zip 13925328
+RMD160 6c2abb7822a2fdb0b360983a5ad8094f7bd77eb5 irrlicht-0.14.0.zip 13925328
+SHA256 5b8c2424463cec711298edb77e25f021a11ac09950e085ebaeb8db546421dd97 irrlicht-0.14.0.zip 13925328
diff --git a/dev-games/irrlicht/files/irrlicht-0.14.0-gcc41.patch b/dev-games/irrlicht/files/irrlicht-0.14.0-gcc41.patch
new file mode 100644
index 000000000000..dd624fba7e4d
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-0.14.0-gcc41.patch
@@ -0,0 +1,44 @@
+--- include/matrix4.h.old	2006-03-17 14:49:10.894034456 +0100
++++ include/matrix4.h	2006-03-17 14:53:27.969952976 +0100
+@@ -59,7 +59,7 @@
+ 			void setTranslation( const vector3df& translation );			

+ 

+ 			//! Gets the current translation

+-			vector3df matrix4::getTranslation() const;

++			vector3df getTranslation() const;

+ 

+ 			//! Set the inverse translation of the current matrix. Will erase any previous values.

+ 			void setInverseTranslation( const vector3df& translation );	

+--- include/quaternion.h.old	2006-03-17 14:49:10.894034456 +0100
++++ include/quaternion.h	2006-03-17 14:53:42.701713408 +0100
+@@ -52,7 +52,7 @@
+ 		quaternion& operator*=(f32 s);

+ 

+ 		//! multiplication operator

+-		vector3df quaternion::operator* (const vector3df& v) const;

++		vector3df operator* (const vector3df& v) const;

+ 

+ 		//! multiplication operator

+ 		quaternion& operator*=(const quaternion& other);

+--- ../../include/matrix4.h.old	2006-03-17 14:48:29.901266304 +0100
++++ ../../include/matrix4.h	2006-03-17 14:59:04.464797984 +0100
+@@ -59,7 +59,7 @@
+ 			void setTranslation( const vector3df& translation );			

+ 

+ 			//! Gets the current translation

+-			vector3df matrix4::getTranslation() const;

++			vector3df getTranslation() const;

+ 

+ 			//! Set the inverse translation of the current matrix. Will erase any previous values.

+ 			void setInverseTranslation( const vector3df& translation );	

+--- ../../include/quaternion.h.old	2006-03-17 14:48:33.810671984 +0100
++++ ../../include/quaternion.h	2006-03-17 14:59:12.071641568 +0100
+@@ -52,7 +52,7 @@
+ 		quaternion& operator*=(f32 s);

+ 

+ 		//! multiplication operator

+-		vector3df quaternion::operator* (const vector3df& v) const;

++		vector3df operator* (const vector3df& v) const;

+ 

+ 		//! multiplication operator

+ 		quaternion& operator*=(const quaternion& other);

diff --git a/dev-games/irrlicht/irrlicht-0.14.0.ebuild b/dev-games/irrlicht/irrlicht-0.14.0.ebuild
index 8cc6e45d440b..35a50c1323d9 100644
--- a/dev-games/irrlicht/irrlicht-0.14.0.ebuild
+++ b/dev-games/irrlicht/irrlicht-0.14.0.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/irrlicht/irrlicht-0.14.0.ebuild,v 1.3 2006/02/10 16:13:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.14.0.ebuild,v 1.4 2006/04/03 22:49:17 tupone Exp $
 
 inherit eutils toolchain-funcs
 
@@ -37,6 +37,7 @@ src_unpack() {
 	unzip -qo source.zip || die "unpacking source.zip"
 	rm -f source.zip
 	cd Irrlicht
+	epatch "${FILESDIR}/${P}"-gcc41.patch
 
 	# stupid nvidia / xorg GL differences
 	# still needed - bug #114335