Fix for gcc-4.1

Package-Manager: portage-2.1_rc1-r2

4 files changed, 49 insertions, 11 deletions

diff --git a/games-puzzle/mirrormagic/ChangeLog b/games-puzzle/mirrormagic/ChangeLog
index 04b99d75d255..28fe8fe3a2a0 100644
--- a/games-puzzle/mirrormagic/ChangeLog
+++ b/games-puzzle/mirrormagic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/mirrormagic
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/ChangeLog,v 1.7 2006/02/17 22:55:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/ChangeLog,v 1.8 2006/05/19 20:33:13 tupone Exp $
+
+  19 May 2006; <Tupone@gentoo.org> +files/mirrormagic-2.0.2-gcc41.patch,
+  mirrormagic-2.0.2.ebuild:
+  Fix for gcc-4.1
 
   17 Feb 2006; <Tupone@gentoo.org> mirrormagic-2.0.2.ebuild:
   Modular X dependency fix
diff --git a/games-puzzle/mirrormagic/Manifest b/games-puzzle/mirrormagic/Manifest
index 4e0f288abb6d..e4d09637fc58 100644
--- a/games-puzzle/mirrormagic/Manifest
+++ b/games-puzzle/mirrormagic/Manifest
@@ -1,12 +1,30 @@
-MD5 db4328aab57634669efa78c3b9482ee6 ChangeLog 835
-RMD160 71195cb366da18d55390b1b954dee64b02270724 ChangeLog 835
-SHA256 b939ea28a6a9b3997986b9fca25c092c5e59b8a16ce7f933050cef036c95e55e ChangeLog 835
-MD5 88db32de8f23127438de94d0f2b599a2 files/digest-mirrormagic-2.0.2 256
-RMD160 e4cefe049763e5dd1913a4d91aabcb204d6ed1aa files/digest-mirrormagic-2.0.2 256
-SHA256 9fffd58068085973091ca10472dffaa9207718f135ab4f0d2d524a4972d57f59 files/digest-mirrormagic-2.0.2 256
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mirrormagic-2.0.2-gcc41.patch 339 RMD160 d7d8fe4004cf7360a99ddcdf0db2a56e2f55be3c SHA1 beb6a0170e2a749f7826c774c3ca0f2555ae6049 SHA256 ae5e1eee2ed2c37de5d2259d8150b0dace6e6744045989e83b1b0239b6fd0f4f size 339
+MD5 2b3c93b8aae056f548fefeb076d59c2e files/mirrormagic-2.0.2-gcc41.patch 339
+RMD160 d7d8fe4004cf7360a99ddcdf0db2a56e2f55be3c files/mirrormagic-2.0.2-gcc41.patch 339
+SHA256 ae5e1eee2ed2c37de5d2259d8150b0dace6e6744045989e83b1b0239b6fd0f4f files/mirrormagic-2.0.2-gcc41.patch 339
+DIST mirrormagic-2.0.2.tar.gz 1168098 RMD160 57de928f2b37575886ddb5cbafcababf9de765dc SHA256 79b3f13d493523438eeb988beffc272c804bc7a4361b83167a082c77e74b3ce2 size 1168098
+EBUILD mirrormagic-2.0.2.ebuild 1341 RMD160 da6aa79d2cecbcafcb737377e362fdbc3ebbe8ed SHA1 9ed40df59a548068a619fcc01cf5e71abd31251d SHA256 b6790dfb2cab6bb5293f38abe55b6a242f315d5bd9b9a819f944c17588f7ae38 size 1341
+MD5 ee452deea5a6f3f63a90b592edf24f7c mirrormagic-2.0.2.ebuild 1341
+RMD160 da6aa79d2cecbcafcb737377e362fdbc3ebbe8ed mirrormagic-2.0.2.ebuild 1341
+SHA256 b6790dfb2cab6bb5293f38abe55b6a242f315d5bd9b9a819f944c17588f7ae38 mirrormagic-2.0.2.ebuild 1341
+MISC ChangeLog 955 RMD160 3b3282595bae63485752572e5e5f0c7e668e4b9a SHA1 012e1c096bc7fd7e8343dc3f076c97d420aa23c1 SHA256 c831c6f9a3adb1637c9b0e1e167bc656d8c605d24c31ec0d3fcbc1eb09a07519 size 955
+MD5 7e0aa3e4e3d3f68c7a38e1aa9a2234f9 ChangeLog 955
+RMD160 3b3282595bae63485752572e5e5f0c7e668e4b9a ChangeLog 955
+SHA256 c831c6f9a3adb1637c9b0e1e167bc656d8c605d24c31ec0d3fcbc1eb09a07519 ChangeLog 955
+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 09604c023a0c062c1f0d707c197c606a mirrormagic-2.0.2.ebuild 1260
-RMD160 d3d3ebc3d3f8cbc3c67450bd0d9193edb23564be mirrormagic-2.0.2.ebuild 1260
-SHA256 f6195489b17ecdf368a4c4aa021c3df7a0ce93c35fc4d7509fd63d1032f50d08 mirrormagic-2.0.2.ebuild 1260
+MD5 88db32de8f23127438de94d0f2b599a2 files/digest-mirrormagic-2.0.2 256
+RMD160 e4cefe049763e5dd1913a4d91aabcb204d6ed1aa files/digest-mirrormagic-2.0.2 256
+SHA256 9fffd58068085973091ca10472dffaa9207718f135ab4f0d2d524a4972d57f59 files/digest-mirrormagic-2.0.2 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEbiuU2CTtIKiFlQIRAstpAKDCfiNn3lWcGqBT5vJyc7rd7bIFRwCeL++T
+Z7ixl1K+79u7zdMtzO4QuNs=
+=L0KV
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch
new file mode 100644
index 000000000000..316aa3b2946a
--- /dev/null
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch
@@ -0,0 +1,10 @@
+--- src/main.h.old	2006-05-19 22:24:24.000000000 +0200
++++ src/main.h	2006-05-19 22:25:57.000000000 +0200
+@@ -459,7 +459,6 @@
+ #endif
+ extern struct HiScore		highscore[];
+ extern struct TapeInfo		tape;
+-extern struct JoystickInfo	joystick[];
+ extern struct SetupInfo		setup;
+ extern struct GameInfo		game;
+ extern struct LaserInfo		laser;
diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild
index c3d923912c28..c78c264c62f0 100644
--- a/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild
+++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2.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-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild,v 1.14 2006/02/17 22:55:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild,v 1.15 2006/05/19 20:33:13 tupone Exp $
 
 inherit flag-o-matic games
 
@@ -22,6 +22,12 @@ RDEPEND="!sdl? ( || ( x11-libs/libX11 virtual/x11 ) )
 DEPEND="${RDEPEND}
 	!sdl? ( || ( x11-libs/libXt virtual/x11 ) )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
+}
+
 src_compile() {
 	replace-flags -march=k6 -march=i586