Fix by nyhm for gcc-4.2 issues #179649 by Philipp.

Package-Manager: portage-2.1.3_rc3

4 files changed, 45 insertions, 14 deletions

diff --git a/games-fps/quake3/ChangeLog b/games-fps/quake3/ChangeLog
index 05e21a52738d..77490a7dc3ab 100644
--- a/games-fps/quake3/ChangeLog
+++ b/games-fps/quake3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake3
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.46 2007/01/30 22:20:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.47 2007/06/22 02:06:59 vapier Exp $
+
+  22 Jun 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/quake3-1.34_rc3-gcc42.patch, quake3-1.34_rc3.ebuild:
+  Fix by nyhm for gcc-4.2 issues #179649 by Philipp.
 
   30 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   -quake3-1.34_rc2.ebuild, quake3-1.34_rc3.ebuild, quake3-9999.ebuild:
diff --git a/games-fps/quake3/Manifest b/games-fps/quake3/Manifest
index 686d1a48c78a..a887086057fc 100644
--- a/games-fps/quake3/Manifest
+++ b/games-fps/quake3/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX quake3-1.34_rc3-gcc42.patch 766 RMD160 a584f52898bb9d8099dce89bcb88cd8fa099211d SHA1 72e524009f0f4bee75eadcc29ffc56bbbcf3d434 SHA256 3ded8cb46b60ee74fbfae97633f6dab371916b18a2c69b042e7eb1cf5ca78919
+MD5 a7096b9de4b45f77ee50b2bd9ca5b551 files/quake3-1.34_rc3-gcc42.patch 766
+RMD160 a584f52898bb9d8099dce89bcb88cd8fa099211d files/quake3-1.34_rc3-gcc42.patch 766
+SHA256 3ded8cb46b60ee74fbfae97633f6dab371916b18a2c69b042e7eb1cf5ca78919 files/quake3-1.34_rc3-gcc42.patch 766
 DIST ioquake3_1.34-rc3.tar.bz2 3147694 RMD160 b270cd43a4f9f2700715cbd1487a8d0efab0296b SHA1 327d95a128aacc3bdd4e9497896651005cce8f92 SHA256 fb43f63178c6700f20b83634b816f77e390e375e7d9c717180c9820f0c541b01
-EBUILD quake3-1.34_rc3.ebuild 2858 RMD160 1ac38a6cbcd86a324af0cdc234dda6a309ee687e SHA1 fc09233f5deed0bcacfc38e1eed2492a5e0eae1e SHA256 cb823b3b714fed4e976d64e2fa0eab2a569d27a2202941e7bd545bf5aa9fabee
-MD5 b22da46ac28f772f9c7ffd91335b5d9b quake3-1.34_rc3.ebuild 2858
-RMD160 1ac38a6cbcd86a324af0cdc234dda6a309ee687e quake3-1.34_rc3.ebuild 2858
-SHA256 cb823b3b714fed4e976d64e2fa0eab2a569d27a2202941e7bd545bf5aa9fabee quake3-1.34_rc3.ebuild 2858
+EBUILD quake3-1.34_rc3.ebuild 2900 RMD160 8c4b50b7c80f7f4e27679f0c0e12efbfbd3043b5 SHA1 e84a0109612f31f3e947e7753c7da0c012db8be2 SHA256 4d966015191c51bd194d6733d488d69804db8bac0f1bd63326419cb87c8799ed
+MD5 d670ee39068fc849c241ce901aea6675 quake3-1.34_rc3.ebuild 2900
+RMD160 8c4b50b7c80f7f4e27679f0c0e12efbfbd3043b5 quake3-1.34_rc3.ebuild 2900
+SHA256 4d966015191c51bd194d6733d488d69804db8bac0f1bd63326419cb87c8799ed quake3-1.34_rc3.ebuild 2900
 EBUILD quake3-9999.ebuild 2831 RMD160 bddcacfbba67ce1e18ed85fd573a6fafb52bc063 SHA1 f4d7e7fe6eebe001afbe2204526dec36583ce410 SHA256 e7c6d15bc804b2cbfd27af51d9e582893ed63b28e192bbc655505339705246bd
 MD5 3c0db7ddec1cc3498b3634ae4e2a8de3 quake3-9999.ebuild 2831
 RMD160 bddcacfbba67ce1e18ed85fd573a6fafb52bc063 quake3-9999.ebuild 2831
 SHA256 e7c6d15bc804b2cbfd27af51d9e582893ed63b28e192bbc655505339705246bd quake3-9999.ebuild 2831
-MISC ChangeLog 3935 RMD160 0d4ab53c24f57e8f9d3ea64e453e034adc2dafd0 SHA1 727f43228adec06f13f28f3a183ea7abdeb29a4c SHA256 9b31db783b1716ef493e2bcd8d41252510b713e0010bf357fcbf7d35072e7bd6
-MD5 add7fa51da9e2516c242a2b32a87373d ChangeLog 3935
-RMD160 0d4ab53c24f57e8f9d3ea64e453e034adc2dafd0 ChangeLog 3935
-SHA256 9b31db783b1716ef493e2bcd8d41252510b713e0010bf357fcbf7d35072e7bd6 ChangeLog 3935
+MISC ChangeLog 4099 RMD160 7a8e66f265702fc13712153ceca8b9e63101e368 SHA1 f02e78ac1215eb45e5253e942123ea30fdbcb7af SHA256 4211246a1b5938f2b6a358b177ec0cc1b19ef038ff823d45a5f7a8e0215773d7
+MD5 aa38334b99db34f6f0bdb006b45df437 ChangeLog 4099
+RMD160 7a8e66f265702fc13712153ceca8b9e63101e368 ChangeLog 4099
+SHA256 4211246a1b5938f2b6a358b177ec0cc1b19ef038ff823d45a5f7a8e0215773d7 ChangeLog 4099
 MISC metadata.xml 954 RMD160 178b4856c0cdf3c57df6660d283aa9e4709d2511 SHA1 53680d486f627e45fc1168f66db7cd2a3c628186 SHA256 c8178e5b0a05fe236018af52c641a40d6262dd3e8d24965efafbe61f155bf58f
 MD5 0a25a9c85ee385ef578cb770a957756d metadata.xml 954
 RMD160 178b4856c0cdf3c57df6660d283aa9e4709d2511 metadata.xml 954
@@ -25,9 +29,9 @@ MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-quake3-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-quake3-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-quake3-9999 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGGoEHdz7hIScOURERAlaaAJ9j/WGVrXHN8BaZWxBnqJqBwd+6RACg9jN7
-GXa6oQTD8wjSzzdinLGyhOc=
-=ah6x
+iD8DBQFGey788bi6rjpTunYRAuy6AJ9gTqnz0lg9ChAe9K8yTrkzBGHoZgCg1orM
+KnYhZkb4dhjqIKQmAveXsIc=
+=KIW3
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quake3/files/quake3-1.34_rc3-gcc42.patch b/games-fps/quake3/files/quake3-1.34_rc3-gcc42.patch
new file mode 100644
index 000000000000..d62abcaf480a
--- /dev/null
+++ b/games-fps/quake3/files/quake3-1.34_rc3-gcc42.patch
@@ -0,0 +1,22 @@
+Index: code/tools/asm/cmdlib.c
+===================================================================
+--- code/tools/asm/cmdlib.c	(revision 1098)
++++ code/tools/asm/cmdlib.c	(revision 1099)
+@@ -312,7 +312,7 @@ char *ExpandArg (const char *path)
+ char *ExpandPath (const char *path)
+ {
+ 	static char full[1024];
+-	if (!qdir)
++	if (!qdir[0])
+ 		Error ("ExpandPath called without qdir set");
+ 	if (path[0] == '/' || path[0] == '\\' || path[1] == ':') {
+ 		strcpy( full, path );
+@@ -325,7 +325,7 @@ char *ExpandPath (const char *path)
+ char *ExpandGamePath (const char *path)
+ {
+ 	static char full[1024];
+-	if (!qdir)
++	if (!qdir[0])
+ 		Error ("ExpandGamePath called without qdir set");
+ 	if (path[0] == '/' || path[0] == '\\' || path[1] == ':') {
+ 		strcpy( full, path );
diff --git a/games-fps/quake3/quake3-1.34_rc3.ebuild b/games-fps/quake3/quake3-1.34_rc3.ebuild
index d231d3b9a7ca..0f4febeaad01 100644
--- a/games-fps/quake3/quake3-1.34_rc3.ebuild
+++ b/games-fps/quake3/quake3-1.34_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.34_rc3.ebuild,v 1.6 2007/04/09 18:07:58 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.34_rc3.ebuild,v 1.7 2007/06/22 02:06:59 vapier Exp $
 
 # quake3-9999          -> latest svn
 # quake3-9999.REV      -> use svn REV
@@ -54,6 +54,7 @@ src_unpack() {
 	else
 		unpack ${A}
 		cd "${S}"
+		epatch "${FILESDIR}"/${P}-gcc42.patch
 	fi
 	sed -i \
 		-e '/INSTALL/s: -s : :' \