Fix for gcc-4.1, bug #132096

Package-Manager: portage-2.1_rc1-r3

4 files changed, 41 insertions, 11 deletions

diff --git a/games-sports/torcs/ChangeLog b/games-sports/torcs/ChangeLog
index 0ec166b80c33..1a3b18547aed 100644
--- a/games-sports/torcs/ChangeLog
+++ b/games-sports/torcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/torcs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.12 2006/05/11 14:42:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.13 2006/05/23 20:21:52 tupone Exp $
+
+  23 May 2006; <Tupone@gentoo.org> +files/torcs-1.2.4-gcc41.patch,
+  torcs-1.2.4-r1.ebuild:
+  Fix for gcc 4.1, bug #132096 by nyhm
 
 *torcs-1.2.4-r1 (11 May 2006)
 
diff --git a/games-sports/torcs/Manifest b/games-sports/torcs/Manifest
index 6e7caf559a7b..885a042b9fff 100644
--- a/games-sports/torcs/Manifest
+++ b/games-sports/torcs/Manifest
@@ -1,20 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX torcs-1.2.4-freealut.patch 328 RMD160 d658e6ba0b43e6dc07e9a4bc2538f5e45190d298 SHA1 9c0b5e8dd3d2dab2bcb6041aa7c49b836a5917de SHA256 ed5cb484b4f7160ff0545112c2151cc03379b4e82e464ec9998283b087599d61 size 328
 MD5 0ecf26c2415c16a755e77b20db65d046 files/torcs-1.2.4-freealut.patch 328
 RMD160 d658e6ba0b43e6dc07e9a4bc2538f5e45190d298 files/torcs-1.2.4-freealut.patch 328
 SHA256 ed5cb484b4f7160ff0545112c2151cc03379b4e82e464ec9998283b087599d61 files/torcs-1.2.4-freealut.patch 328
+AUX torcs-1.2.4-gcc41.patch 353 RMD160 7495805017f19feb72355f1f061deef820930f27 SHA1 317f9a7a6dcca504139b831be7d0651cb6a60257 SHA256 9d86dce50beb4ee673c022d00da007b303c13fb3874cae64f06cd078871f3730 size 353
+MD5 ddda33129b0eb4fbb226b229596b8ba4 files/torcs-1.2.4-gcc41.patch 353
+RMD160 7495805017f19feb72355f1f061deef820930f27 files/torcs-1.2.4-gcc41.patch 353
+SHA256 9d86dce50beb4ee673c022d00da007b303c13fb3874cae64f06cd078871f3730 files/torcs-1.2.4-gcc41.patch 353
 DIST torcs-1.2.4.tar.bz2 112020278 RMD160 4337589c8a5d84a84dccbe75c20d7831d876b322 SHA256 2b836a6f99947fa1a4a32ebd9b85f62ca109cde0e58b2326a3f94ef619f66249 size 112020278
-EBUILD torcs-1.2.4-r1.ebuild 1168 RMD160 36f1eb89476ce0b893a6b6d2084c2d2c43825ec4 SHA1 8dcbda31588ce0b35c817af80aaf003b5a03be6f SHA256 62fcb46f9d2cd38d7de2da18d71ce6577b5aa329e0ef4cba0076d7148735e34a size 1168
-MD5 5237ef1d78db0e365350bab1ee780464 torcs-1.2.4-r1.ebuild 1168
-RMD160 36f1eb89476ce0b893a6b6d2084c2d2c43825ec4 torcs-1.2.4-r1.ebuild 1168
-SHA256 62fcb46f9d2cd38d7de2da18d71ce6577b5aa329e0ef4cba0076d7148735e34a torcs-1.2.4-r1.ebuild 1168
+EBUILD torcs-1.2.4-r1.ebuild 1201 RMD160 0d544d6a5489a84590d29d7665b60ca94e9715e7 SHA1 5ebdc09c170a5b5e1806969e0d545d6157466caf SHA256 b4d0520c9837059e74d326d624e491b387b793031622006565b02296ad9f073d size 1201
+MD5 a434b28bc05a1753529d519b4abffeaa torcs-1.2.4-r1.ebuild 1201
+RMD160 0d544d6a5489a84590d29d7665b60ca94e9715e7 torcs-1.2.4-r1.ebuild 1201
+SHA256 b4d0520c9837059e74d326d624e491b387b793031622006565b02296ad9f073d torcs-1.2.4-r1.ebuild 1201
 EBUILD torcs-1.2.4.ebuild 1095 RMD160 76834cf30c53e3fa183b610a08e201ec8f7d4d8a SHA1 f534c10d85a3b3ff38025c8f2fd1f62fa79e30a1 SHA256 0f38c5f9f790895efaaad4729d66625624e1185740bda00ae849718095ad1cae size 1095
 MD5 76968f94b4deb2295f5205fb0318752c torcs-1.2.4.ebuild 1095
 RMD160 76834cf30c53e3fa183b610a08e201ec8f7d4d8a torcs-1.2.4.ebuild 1095
 SHA256 0f38c5f9f790895efaaad4729d66625624e1185740bda00ae849718095ad1cae torcs-1.2.4.ebuild 1095
-MISC ChangeLog 2402 RMD160 17b7040b8d7df2cb12f789d2609d0226d9596434 SHA1 0ccacfd6a1677bade0f4144817165c5eae315da3 SHA256 7fb7767334b0636566a9e2449ce9e171de2f65ff3f1d175df9b2d4ffbf2a591a size 2402
-MD5 6b74321a007863da44b784571941d2d9 ChangeLog 2402
-RMD160 17b7040b8d7df2cb12f789d2609d0226d9596434 ChangeLog 2402
-SHA256 7fb7767334b0636566a9e2449ce9e171de2f65ff3f1d175df9b2d4ffbf2a591a ChangeLog 2402
+MISC ChangeLog 2532 RMD160 16d74f6ac885f019f206da7f31ff26856fdc5387 SHA1 15373e5adcf1ed294f6cfe0cf5d6e3102014c868 SHA256 b4ecfa6956f01c4d2a0f6e02832a6880a0588f0ac4bbd13b576fe9eadae5f983 size 2532
+MD5 76c002199549bf3858431232d50dcdda ChangeLog 2532
+RMD160 16d74f6ac885f019f206da7f31ff26856fdc5387 ChangeLog 2532
+SHA256 b4ecfa6956f01c4d2a0f6e02832a6880a0588f0ac4bbd13b576fe9eadae5f983 ChangeLog 2532
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -25,3 +32,10 @@ SHA256 d28e4b5ad9cce164473014dd5c028be0c5e3590ecaf6822d6a02df5a9083a028 files/di
 MD5 f65fb7476616f6c3dd2184dc37b98c23 files/digest-torcs-1.2.4-r1 247
 RMD160 e6187f492e87a47a306f695a4c977330856198b2 files/digest-torcs-1.2.4-r1 247
 SHA256 d28e4b5ad9cce164473014dd5c028be0c5e3590ecaf6822d6a02df5a9083a028 files/digest-torcs-1.2.4-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEc27/2CTtIKiFlQIRAgMKAKChW4KJOVBR786y5J+v4Iy/mDNuvACfc1fX
+eyXCZZ/Ta9fFzTFQMbANYhA=
+=osvL
+-----END PGP SIGNATURE-----
diff --git a/games-sports/torcs/files/torcs-1.2.4-gcc41.patch b/games-sports/torcs/files/torcs-1.2.4-gcc41.patch
new file mode 100644
index 000000000000..35dd039eb9bd
--- /dev/null
+++ b/games-sports/torcs/files/torcs-1.2.4-gcc41.patch
@@ -0,0 +1,11 @@
+--- src/modules/graphic/ssggraph/grscreen.h.old	2006-05-23 20:46:59.000000000 +0200
++++ src/modules/graphic/ssggraph/grscreen.h	2006-05-23 20:47:14.000000000 +0200
+@@ -78,7 +78,7 @@
+ 
+     void update(tSituation *s, float Fps);
+ 
+-    void cGrScreen::camDraw(tSituation *s);
++    void camDraw(tSituation *s);
+ 
+     void updateCurrent(tSituation *s);
+ 
diff --git a/games-sports/torcs/torcs-1.2.4-r1.ebuild b/games-sports/torcs/torcs-1.2.4-r1.ebuild
index eb8a59f24da5..c531ac3aa143 100644
--- a/games-sports/torcs/torcs-1.2.4-r1.ebuild
+++ b/games-sports/torcs/torcs-1.2.4-r1.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/games-sports/torcs/torcs-1.2.4-r1.ebuild,v 1.1 2006/05/11 14:42:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.2.4-r1.ebuild,v 1.2 2006/05/23 20:21:52 tupone Exp $
 
 inherit games
 
@@ -24,7 +24,8 @@ DEPEND=">=media-libs/plib-1.8.3
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-freealut.patch
+	epatch "${FILESDIR}"/${P}-freealut.patch \
+		"${FILESDIR}/${P}"-gcc41.patch
 	sed -i \
 		-e "s:/games::" \
 		Make-config.in \