Fix for gcc-4.1

Package-Manager: portage-2.1_pre7-r5

5 files changed, 62 insertions, 14 deletions

diff --git a/games-action/rrootage/ChangeLog b/games-action/rrootage/ChangeLog
index c481dd6dffdf..aa7d0757e4f4 100644
--- a/games-action/rrootage/ChangeLog
+++ b/games-action/rrootage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/rrootage
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/rrootage/ChangeLog,v 1.4 2005/08/11 12:04:08 r3pek Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/rrootage/ChangeLog,v 1.5 2006/04/21 21:58:00 tupone Exp $
+
+  21 Apr 2006; <Tupone@gentoo.org> +files/rrootage-0.23a-gcc41.patch,
+  rrootage-0.23a.ebuild:
+  Fix for gcc-4.1
 
   11 Aug 2005; Carlos Silva <r3pek@gentoo.org> rrootage-0.23a.ebuild:
   marked ~amd64. closes bug 102058
diff --git a/games-action/rrootage/Manifest b/games-action/rrootage/Manifest
index 8cb8049c4774..b76b32a8d024 100644
--- a/games-action/rrootage/Manifest
+++ b/games-action/rrootage/Manifest
@@ -1,12 +1,25 @@
-MD5 558d3810776725ce4b06e026c11842dc ChangeLog 695
-RMD160 bf4eb4ee1fe9958714132580d0e6d1eaac90f629 ChangeLog 695
-SHA256 decefedb773cfd47b0a52ff4b300286d17978e85683625a4ee3e5f7f15b50e79 ChangeLog 695
-MD5 282b52d17f5c68430f3db79cb1cd8cfd files/digest-rrootage-0.23a 67
-RMD160 60f3372246eed9c197ae944f1a42fe2baf06ab07 files/digest-rrootage-0.23a 67
-SHA256 2223c559b8306a0d03c79ee7ba791d0346217eeaca6def1f00c1ffe8d129f565 files/digest-rrootage-0.23a 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1d2f501591f9f1e6a255e7b942502069 ChangeLog 810
+RMD160 cd87578e5ef631ba1a5ca64c5354ef4143e572e8 ChangeLog 810
+SHA256 a2803d7c665360a1bf193ec4b104a306cd5d4dfe96abf54b5ae0281fa4714899 ChangeLog 810
+MD5 6abe8847003975420bf19ad86e379c5e files/digest-rrootage-0.23a 247
+RMD160 a04d06f6909e2102bebbb4533b792798f18aedb6 files/digest-rrootage-0.23a 247
+SHA256 b3746b017031be3d7f4ccfc5a800321b7f35ca9495d26bff61d6cf4c3b00c039 files/digest-rrootage-0.23a 247
+MD5 b436ae9ae121ee18ea265cc5479bd02b files/rrootage-0.23a-gcc41.patch 959
+RMD160 ab8aa82263f1dcf9db65c7b43e8841c7ac6abf3f files/rrootage-0.23a-gcc41.patch 959
+SHA256 0bf69bcf48f434a62b22a893c3e07bc3c9412deee756081b2626118af58b08cb files/rrootage-0.23a-gcc41.patch 959
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 079a8e1886157c7245c238dcbd8efebf rrootage-0.23a.ebuild 1499
-RMD160 0095020c2618d375a13c1e9158da6b4be6ecac83 rrootage-0.23a.ebuild 1499
-SHA256 cc723b2ff1e13c58142f593a0c9cf692f21e58b9fbad3b66828226e4134ae606 rrootage-0.23a.ebuild 1499
+MD5 2ae31794afd1ab72dbd53e56e1b1bd1d rrootage-0.23a.ebuild 1542
+RMD160 66b9eb911eb48cdabb0703f256ede3a6758a4ee2 rrootage-0.23a.ebuild 1542
+SHA256 24ca71829986ecf4a3c35e2e70667cc755f8eb661295f84c280fa1809cabcafb rrootage-0.23a.ebuild 1542
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFESVV/2CTtIKiFlQIRAlx2AJ9Tkpmo1hkx0rbilY+kHTGcy43bvwCeP9Wz
+FVoxubpA6F1L1a7PTtA60us=
+=QQmv
+-----END PGP SIGNATURE-----
diff --git a/games-action/rrootage/files/digest-rrootage-0.23a b/games-action/rrootage/files/digest-rrootage-0.23a
index e4cfc66eac92..f2f83eb4146c 100644
--- a/games-action/rrootage/files/digest-rrootage-0.23a
+++ b/games-action/rrootage/files/digest-rrootage-0.23a
@@ -1 +1,3 @@
 MD5 fb12876d703594d915ec43a56bd9ce62 rRootage-0.23a.tar.gz 3910941
+RMD160 f6dc4e5ea72780fe2a9dd93ad813ecdeb8464b33 rRootage-0.23a.tar.gz 3910941
+SHA256 964edbe21802e3e40d6a8da19b61132decacd13bf9a71bac86abce012379ff07 rRootage-0.23a.tar.gz 3910941
diff --git a/games-action/rrootage/files/rrootage-0.23a-gcc41.patch b/games-action/rrootage/files/rrootage-0.23a-gcc41.patch
new file mode 100644
index 000000000000..1e6e50e683fd
--- /dev/null
+++ b/games-action/rrootage/files/rrootage-0.23a-gcc41.patch
@@ -0,0 +1,28 @@
+--- src/foecommand.h.old	2006-04-21 23:26:03.000000000 +0200
++++ src/foecommand.h	2006-04-21 23:26:26.000000000 +0200
+@@ -39,10 +39,10 @@
+   

+   virtual void doChangeDirection(double d);

+   virtual void doChangeSpeed(double s);

+-  virtual void FoeCommand::doAccelX(double ax);

+-  virtual void FoeCommand::doAccelY(double ay);

+-  virtual double FoeCommand::getBulletSpeedX();

+-  virtual double FoeCommand::getBulletSpeedY();

++  virtual void doAccelX(double ax);

++  virtual void doAccelY(double ay);

++  virtual double getBulletSpeedX();

++  virtual double getBulletSpeedY();

+   

+  private:

+   struct foe *foe;

+--- src/screen.c.old	2006-04-21 23:50:01.000000000 +0200
++++ src/screen.c	2006-04-21 23:50:30.000000000 +0200
+@@ -73,7 +73,7 @@
+ void loadGLTexture(char *fileName, GLuint *texture) {

+   SDL_Surface *surface;

+ 

+-  char name[32];

++  char name[128];

+   strcpy(name, SHARE_LOC);

+   strcat(name, "images/");

+   strcat(name, fileName);

diff --git a/games-action/rrootage/rrootage-0.23a.ebuild b/games-action/rrootage/rrootage-0.23a.ebuild
index f40c775637c2..b3116df36620 100644
--- a/games-action/rrootage/rrootage-0.23a.ebuild
+++ b/games-action/rrootage/rrootage-0.23a.ebuild
@@ -1,8 +1,8 @@
-# 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-action/rrootage/rrootage-0.23a.ebuild,v 1.5 2006/03/21 22:41:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/rrootage/rrootage-0.23a.ebuild,v 1.6 2006/04/21 21:58:00 tupone Exp $
 
-inherit games
+inherit eutils games
 
 MY_PN="rRootage"
 MY_P="${MY_PN}-${PV}"
@@ -27,6 +27,7 @@ S="${WORKDIR}/${MY_PN}/src"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
 	sed -e "s/-lglut/-lGL -lGLU/" makefile.lin > Makefile || die "sed failed"
 
 	sed -i \