Fix for gcc-4.1

Package-Manager: portage-2.1_pre10-r3

5 files changed, 81 insertions, 12 deletions

diff --git a/games-fps/red-blue-quake2/ChangeLog b/games-fps/red-blue-quake2/ChangeLog
index 5d2e74e839f3..3bfbc0f3beb7 100644
--- a/games-fps/red-blue-quake2/ChangeLog
+++ b/games-fps/red-blue-quake2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/red-blue-quake2
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/ChangeLog,v 1.5 2006/03/15 22:30:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/ChangeLog,v 1.6 2006/05/06 22:51:12 tupone Exp $
+
+  06 May 2006; <Tupone@gentoo.org> +files/red-blue-quake2-0.1-gcc41.patch,
+  red-blue-quake2-0.1.ebuild:
+  Fix for gcc-4.1
 
   15 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   red-blue-quake2-0.1.ebuild:
diff --git a/games-fps/red-blue-quake2/Manifest b/games-fps/red-blue-quake2/Manifest
index 99e402c60fac..39c19576e1a2 100644
--- a/games-fps/red-blue-quake2/Manifest
+++ b/games-fps/red-blue-quake2/Manifest
@@ -1,15 +1,35 @@
-MD5 868992ac367464246347d4a34a866c46 ChangeLog 740
-RMD160 8d7dfa131f61fad84971fe5b091d6efdc71fe310 ChangeLog 740
-SHA256 889be1ec3bf103f5e7f379a7edbb64290ac0bcd22f1647299256a01d45bf476a ChangeLog 740
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.1-gentoo.patch 2304 RMD160 e31601552a93bc268a78265e1899c9e4b9ccbd13 SHA1 968a3c202f767a5a319c0cd965d95f95e35ea42e SHA256 3e5510ff62fdc50a8d8c93464871bc14df488938c99dbc7fc86fe095af7f8ab9 size 2304
 MD5 86c6814acf8cf8b24f67557e5f96fb1e files/0.1-gentoo.patch 2304
 RMD160 e31601552a93bc268a78265e1899c9e4b9ccbd13 files/0.1-gentoo.patch 2304
 SHA256 3e5510ff62fdc50a8d8c93464871bc14df488938c99dbc7fc86fe095af7f8ab9 files/0.1-gentoo.patch 2304
-MD5 ac16b4e5cb958cca657192c316e60ec5 files/digest-red-blue-quake2-0.1 133
-RMD160 8b45300b92ba700f522cbd2b238aba77ec269be8 files/digest-red-blue-quake2-0.1 133
-SHA256 d4872a0182ccd24ab8c70b58d4217055cb2644b1589ede381595a31a130de32d files/digest-red-blue-quake2-0.1 133
+AUX red-blue-quake2-0.1-gcc41.patch 883 RMD160 0f8a5a2fa1e2ae6a71d3e2cc5452efad271e2747 SHA1 df5c0d2a7fb460de96b845bac3b2d826ac933c67 SHA256 cfc9e81e912d1f39c46a33c3e73bd1b1aeabd23052b4bb85de54050bc0ea6878 size 883
+MD5 e5e0e313a86c0d44b6c354a121051344 files/red-blue-quake2-0.1-gcc41.patch 883
+RMD160 0f8a5a2fa1e2ae6a71d3e2cc5452efad271e2747 files/red-blue-quake2-0.1-gcc41.patch 883
+SHA256 cfc9e81e912d1f39c46a33c3e73bd1b1aeabd23052b4bb85de54050bc0ea6878 files/red-blue-quake2-0.1-gcc41.patch 883
+DIST q2source-3.21.zip 1477764 RMD160 c23beea8062c94ef5d45f9acf3d884961b8d8564 SHA256 c9200316de189638d0d997a0092f36b85f2c3f9e4ebe30f4b1c356745ad676ca size 1477764
+DIST red-blue-quake2-0.1.tar.gz 34874 RMD160 4e7d9c46e3e20266565f9b08f4a4f8dd92ae5540 SHA256 65a0f2552f537e494f05f573e54faff7cf08d22276307e6c69eb314c2f3dac17 size 34874
+EBUILD red-blue-quake2-0.1.ebuild 1433 RMD160 990fba2be093173f5f94c67f68d0dbc008a3f137 SHA1 bb1d6b056e0a2a740fd89be83fd3edd455ca880d SHA256 e8487dd5b427c3bf8f84bd4d8a7acebdfc098fcb4f025e9cba782565eb238409 size 1433
+MD5 1020b5288298c1b939b38f307f3caed9 red-blue-quake2-0.1.ebuild 1433
+RMD160 990fba2be093173f5f94c67f68d0dbc008a3f137 red-blue-quake2-0.1.ebuild 1433
+SHA256 e8487dd5b427c3bf8f84bd4d8a7acebdfc098fcb4f025e9cba782565eb238409 red-blue-quake2-0.1.ebuild 1433
+MISC ChangeLog 862 RMD160 c622badbf4677ec9e9dc86d7ec4c9081be8abecd SHA1 0efad938e551506bd0c5ec53112155dd9976cc94 SHA256 399edb47cc56bea0ebc5e6510ffec13d7b34406a6f4f06556defdd143f6ce471 size 862
+MD5 5bdb996931f344a951de336f991f426f ChangeLog 862
+RMD160 c622badbf4677ec9e9dc86d7ec4c9081be8abecd ChangeLog 862
+SHA256 399edb47cc56bea0ebc5e6510ffec13d7b34406a6f4f06556defdd143f6ce471 ChangeLog 862
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 80c4b4cda878c74f8af495d5271b1fbb red-blue-quake2-0.1.ebuild 1392
-RMD160 432f2c680970696a98c947772d8ac614d10e1363 red-blue-quake2-0.1.ebuild 1392
-SHA256 9b0501dd981232efc17345fde8d4de0432d693e0dbee8849e3ebd143921f02ac red-blue-quake2-0.1.ebuild 1392
+MD5 6f1faede726cd9a8c60d918348e18548 files/digest-red-blue-quake2-0.1 491
+RMD160 cc3fa403d48673ccaec5762946b42242c3252c77 files/digest-red-blue-quake2-0.1 491
+SHA256 53c5214510417d55c1b2166d893d7cd682279c517e379bc0cad836a593c3607c files/digest-red-blue-quake2-0.1 491
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEXShs2CTtIKiFlQIRApedAKCVSySvUyyvqfed8wPXSiuOlizeMwCfd50h
+L1G75xHMHFWaFTiy7r3jj+4=
+=IS6I
+-----END PGP SIGNATURE-----
diff --git a/games-fps/red-blue-quake2/files/digest-red-blue-quake2-0.1 b/games-fps/red-blue-quake2/files/digest-red-blue-quake2-0.1
index 7dd7369aada1..d3d226a5ff85 100644
--- a/games-fps/red-blue-quake2/files/digest-red-blue-quake2-0.1
+++ b/games-fps/red-blue-quake2/files/digest-red-blue-quake2-0.1
@@ -1,2 +1,6 @@
 MD5 3ac9ac6a833b9c049a9f763c3137b86f q2source-3.21.zip 1477764
+RMD160 c23beea8062c94ef5d45f9acf3d884961b8d8564 q2source-3.21.zip 1477764
+SHA256 c9200316de189638d0d997a0092f36b85f2c3f9e4ebe30f4b1c356745ad676ca q2source-3.21.zip 1477764
 MD5 b80542d7977ecaa36799c479a6557069 red-blue-quake2-0.1.tar.gz 34874
+RMD160 4e7d9c46e3e20266565f9b08f4a4f8dd92ae5540 red-blue-quake2-0.1.tar.gz 34874
+SHA256 65a0f2552f537e494f05f573e54faff7cf08d22276307e6c69eb314c2f3dac17 red-blue-quake2-0.1.tar.gz 34874
diff --git a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch
new file mode 100644
index 000000000000..1090c306069f
--- /dev/null
+++ b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch
@@ -0,0 +1,39 @@
+--- game/g_local.h.old	2006-05-07 00:27:45.000000000 +0200
++++ game/g_local.h	2006-05-07 00:28:06.000000000 +0200
+@@ -458,11 +458,6 @@
+ extern	int	sm_meat_index;

+ extern	int	snd_fry;

+ 

+-extern	int	jacket_armor_index;

+-extern	int	combat_armor_index;

+-extern	int	body_armor_index;

+-

+-

+ // means of death

+ #define MOD_UNKNOWN			0

+ #define MOD_BLASTER			1

+--- ctf/g_local.h.old	2006-05-07 00:36:21.000000000 +0200
++++ ctf/g_local.h	2006-05-07 00:36:38.000000000 +0200
+@@ -466,11 +466,6 @@
+ extern	int	sm_meat_index;

+ extern	int	snd_fry;

+ 

+-extern	int	jacket_armor_index;

+-extern	int	combat_armor_index;

+-extern	int	body_armor_index;

+-

+-

+ // means of death

+ #define MOD_UNKNOWN			0

+ #define MOD_BLASTER			1

+@@ -556,10 +556,6 @@
+ 

+ extern	cvar_t	*sv_maplist;

+ 

+-//ZOID

+-extern	qboolean	is_quad;

+-//ZOID

+-

+ #define world	(&g_edicts[0])

+ 

+ // item spawnflags

diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
index 707286d94e60..1c4043c9c6d6 100644
--- a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
+++ b/games-fps/red-blue-quake2/red-blue-quake2-0.1.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-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild,v 1.8 2006/03/15 22:30:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild,v 1.9 2006/05/06 22:51:12 tupone Exp $
 
 inherit eutils games
 
@@ -25,7 +25,9 @@ S=${WORKDIR}/quake2-3.21/linux
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${PV}-gentoo.patch
-	cd quake2-3.21/linux
+	cd quake2-3.21
+	epatch "${FILESDIR}/${P}"-gcc41.patch
+	cd linux
 	sed -i "s:GENTOO_DIR:${GAMES_LIBDIR}/${PN}:" sys_linux.c
 	sed -i "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" sys_linux.c vid_so.c
 }