Fix for gcc-4.1

Package-Manager: portage-2.1_pre10-r3

6 files changed, 75 insertions, 13 deletions

diff --git a/games-fps/rott/ChangeLog b/games-fps/rott/ChangeLog
index 86bf957bbb23..2d53eb8f7a73 100644
--- a/games-fps/rott/ChangeLog
+++ b/games-fps/rott/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/rott
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rott/ChangeLog,v 1.5 2005/09/16 01:19:49 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rott/ChangeLog,v 1.6 2006/05/06 23:07:21 tupone Exp $
+
+  06 May 2006; <Tupone@gentoo.org> +files/rott-1.0-gcc41.patch,
+  files/1.0-custom-datapath.patch, rott-1.0.ebuild:
+  Fix for gcc-4.1
 
   16 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> rott-1.0.ebuild:
   needs app-arch/unzip; tidy
diff --git a/games-fps/rott/Manifest b/games-fps/rott/Manifest
index 42524788d483..e5cdb4cc4c8e 100644
--- a/games-fps/rott/Manifest
+++ b/games-fps/rott/Manifest
@@ -1,5 +1,35 @@
-MD5 2a5231e70a4116a69dc30ccbb9a50f76 rott-1.0.ebuild 1227
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.0-custom-datapath.patch 1530 RMD160 656a997f4666380e3741a3c2467961dc703180d4 SHA1 fd08ec6714dbaf0dc6008bb42f5da748c8a415a3 SHA256 dc5b896b5b0ce890033147e12e679b374a0131712dde8438512c5ff13bfff48f size 1530
+MD5 cdef8cd1a4ab591b6298c6aed56c3d1d files/1.0-custom-datapath.patch 1530
+RMD160 656a997f4666380e3741a3c2467961dc703180d4 files/1.0-custom-datapath.patch 1530
+SHA256 dc5b896b5b0ce890033147e12e679b374a0131712dde8438512c5ff13bfff48f files/1.0-custom-datapath.patch 1530
+AUX rott-1.0-gcc41.patch 730 RMD160 add48ea08f48014a3406879585c2ef988a46ac19 SHA1 4d4c34b42f71ce150025fd52b0d7db5aba5048c2 SHA256 845feaeae78d7bfcc1b83f4a7cd2f4842477cfdf61d686eb8b4b49f16878625e size 730
+MD5 93c4d4fa050c72a94f4053b7d4450382 files/rott-1.0-gcc41.patch 730
+RMD160 add48ea08f48014a3406879585c2ef988a46ac19 files/rott-1.0-gcc41.patch 730
+SHA256 845feaeae78d7bfcc1b83f4a7cd2f4842477cfdf61d686eb8b4b49f16878625e files/rott-1.0-gcc41.patch 730
+DIST rott-1.0.tar.gz 777281 RMD160 539125b1e2f820f61029397df7c5ae829c043cc2 SHA256 11f9cc331d0be87f0f172840e2bb6e03e27c3b8e9ecbb3eb8cffdc5b73afbd95 size 777281
+DIST swdata.zip 2889672 RMD160 1a51acf050d543acbb22e99ae2a2d5f32e0c503a SHA256 e226d4958ce1294886b32faf782d9db3d3e66f875d9addd62982e2c8d104fd6b size 2889672
+EBUILD rott-1.0.ebuild 1270 RMD160 60af2b0f016e2fda2eb16438e6273c43d2fc3a6c SHA1 2b43b97073f70d2ad6773d83c755e0b7a63a04f2 SHA256 9d9fa5bc815db1f5a58ac8b95e57d9b2f97616d2bda65136d9e1daac1bb7320c size 1270
+MD5 d37973b5743f690747069eb859fee53b rott-1.0.ebuild 1270
+RMD160 60af2b0f016e2fda2eb16438e6273c43d2fc3a6c rott-1.0.ebuild 1270
+SHA256 9d9fa5bc815db1f5a58ac8b95e57d9b2f97616d2bda65136d9e1daac1bb7320c rott-1.0.ebuild 1270
+MISC ChangeLog 628 RMD160 1bdfa3c9525670a550045e8c1333f46b703f4b12 SHA1 eeb4ef9872b570c153c805ac7def5de8cb3b92a1 SHA256 a63f91240197e292e6f40178d60f7bec8b01e883ef46723d4909d5fc15321c9e size 628
+MD5 cda75cd68f4391c59cf1d7140a15fc06 ChangeLog 628
+RMD160 1bdfa3c9525670a550045e8c1333f46b703f4b12 ChangeLog 628
+SHA256 a63f91240197e292e6f40178d60f7bec8b01e883ef46723d4909d5fc15321c9e ChangeLog 628
+MISC metadata.xml 1006 RMD160 3983c1f8726b500fa5b1f7017c2b4b1570910aae SHA1 13638a513dfaade4877d09b906291e2af1ddaa27 SHA256 13918bb7e8be247765fcd9fc4422605c29f2bf2ec63cc63050b1b1c8b2d1aed7 size 1006
 MD5 1a8411807b43b91d44a506a734207d4e metadata.xml 1006
-MD5 3dc064300055419ee526f5b6bd1de82d ChangeLog 496
-MD5 b9d4e3897be46c3c6ab65ecfdf56a616 files/digest-rott-1.0 116
-MD5 725483f80f01ab46de33d31967e3ab72 files/1.0-custom-datapath.patch 1586
+RMD160 3983c1f8726b500fa5b1f7017c2b4b1570910aae metadata.xml 1006
+SHA256 13918bb7e8be247765fcd9fc4422605c29f2bf2ec63cc63050b1b1c8b2d1aed7 metadata.xml 1006
+MD5 c1736c718d83908669decbc49c0e1d92 files/digest-rott-1.0 440
+RMD160 fd66afaa9e3f431d133f9d530d063cfac006518d files/digest-rott-1.0 440
+SHA256 c4e6a45ef0dbb53aaccb52bce6390793c74a1eab6d855ae971e234f135573ae1 files/digest-rott-1.0 440
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEXSw12CTtIKiFlQIRAijZAJ0b6vQiLtAuKJc4eu9cnFoSqNLINACguA6P
+hFh2hyPhALnFKSIGNg0ETDo=
+=BQAJ
+-----END PGP SIGNATURE-----
diff --git a/games-fps/rott/files/1.0-custom-datapath.patch b/games-fps/rott/files/1.0-custom-datapath.patch
index 90c533113b1f..102801d852e0 100644
--- a/games-fps/rott/files/1.0-custom-datapath.patch
+++ b/games-fps/rott/files/1.0-custom-datapath.patch
@@ -1,5 +1,5 @@
---- rott-1.0/rott/rt_main.c.orig	2003-06-19 23:03:34.000000000 -0400
-+++ rott-1.0/rott/rt_main.c	2003-06-19 23:04:49.000000000 -0400
+--- rt_main.c.orig	2003-06-19 23:03:34.000000000 -0400
++++ rt_main.c	2003-06-19 23:04:49.000000000 -0400
 @@ -763,9 +763,9 @@
     // Normal ROTT wads
  
@@ -21,8 +21,8 @@
        }
  
     newargs [argnum++] = NULL;
---- rott-1.0/rott/_rt_ted.h.orig	2003-06-19 23:15:26.000000000 -0400
-+++ rott-1.0/rott/_rt_ted.h	2003-06-19 23:15:54.000000000 -0400
+--- _rt_ted.h.orig	2003-06-19 23:15:26.000000000 -0400
++++ _rt_ted.h	2003-06-19 23:15:54.000000000 -0400
 @@ -84,17 +84,17 @@
  #define  MAXSILLYSTRINGS 32
  
diff --git a/games-fps/rott/files/digest-rott-1.0 b/games-fps/rott/files/digest-rott-1.0
index 0465c1828282..41cb378f078d 100644
--- a/games-fps/rott/files/digest-rott-1.0
+++ b/games-fps/rott/files/digest-rott-1.0
@@ -1,2 +1,6 @@
 MD5 c1c6cbecf00f2229cf2e0053334dcfc1 rott-1.0.tar.gz 777281
+RMD160 539125b1e2f820f61029397df7c5ae829c043cc2 rott-1.0.tar.gz 777281
+SHA256 11f9cc331d0be87f0f172840e2bb6e03e27c3b8e9ecbb3eb8cffdc5b73afbd95 rott-1.0.tar.gz 777281
 MD5 0150bf731e703cc91b8c5e21cb9402f3 swdata.zip 2889672
+RMD160 1a51acf050d543acbb22e99ae2a2d5f32e0c503a swdata.zip 2889672
+SHA256 e226d4958ce1294886b32faf782d9db3d3e66f875d9addd62982e2c8d104fd6b swdata.zip 2889672
diff --git a/games-fps/rott/files/rott-1.0-gcc41.patch b/games-fps/rott/files/rott-1.0-gcc41.patch
new file mode 100644
index 000000000000..c2f67b5e9e3c
--- /dev/null
+++ b/games-fps/rott/files/rott-1.0-gcc41.patch
@@ -0,0 +1,22 @@
+--- rt_actor.h.old	2006-05-07 00:54:12.000000000 +0200
++++ rt_actor.h	2006-05-07 00:54:23.000000000 +0200
+@@ -315,7 +315,6 @@
+ extern  void             *actorat[MAPSIZE][MAPSIZE];
+ extern  int              angletodir[ANGLES];
+ extern _2Dpoint          SNAKEPATH[512];
+-extern  int              STOPSPEED;
+ extern  int              FRICTION;
+ 
+ extern  int              objcount;
+--- rt_in.h.old	2006-05-07 00:59:45.000000000 +0200
++++ rt_in.h	2006-05-07 01:00:07.000000000 +0200
+@@ -147,9 +147,6 @@
+ 
+ extern boolean  Paused;
+ extern volatile int LastScan;
+-extern KeyboardDef KbdDefs;
+-extern JoystickDef JoyDefs[];
+-extern ControlType Controls[MAXPLAYERS];
+ 
+ extern boolean  SpaceBallPresent;
+ extern boolean  CybermanPresent;
diff --git a/games-fps/rott/rott-1.0.ebuild b/games-fps/rott/rott-1.0.ebuild
index 2a5ee9b44053..4b140e9c61c2 100644
--- a/games-fps/rott/rott-1.0.ebuild
+++ b/games-fps/rott/rott-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rott/rott-1.0.ebuild,v 1.7 2005/09/16 01:19:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rott/rott-1.0.ebuild,v 1.8 2006/05/06 23:07:21 tupone Exp $
 
 inherit eutils games
 
@@ -23,7 +23,9 @@ S=${WORKDIR}/${P}/rott
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}"/${PV}-custom-datapath.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-custom-datapath.patch \
+		"${FILESDIR}/${P}"-gcc41.patch
 }
 
 src_compile() {