Add patch to fix compilation with gcc-4.1 by TGL <degrenier AT easyconnect DOT fr>; bug #126922

(Portage version: 2.1_pre4-r1)

5 files changed, 57 insertions, 19 deletions

diff --git a/games-puzzle/enigma/ChangeLog b/games-puzzle/enigma/ChangeLog
index 87eafa71a382..69076eaef24c 100644
--- a/games-puzzle/enigma/ChangeLog
+++ b/games-puzzle/enigma/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-puzzle/enigma
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.23 2005/09/16 22:19:10 ciaranm Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.24 2006/03/30 17:50:00 halcy0n Exp $
+
+  30 Mar 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/enigma-0.92-gcc41.patch, enigma-0.92.ebuild:
+  Add patch to fix compilation with gcc-4.1 by TGL <degrenier AT easyconnect
+  DOT fr>; bug #126922
 
   16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
index d29bb3b5b3bb..13ea15775e62 100644
--- a/games-puzzle/enigma/Manifest
+++ b/games-puzzle/enigma/Manifest
@@ -1,17 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 94867664a774a4f2614502c763875949 enigma-0.92.ebuild 1463
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 11acf423847c619ef6788270061728a9 ChangeLog 4099
-MD5 9a83f99d9e12ec1d19a7a3a8c9964da6 files/enigma-0.81-gcc34.patch 7377
-MD5 fc1e961593260690cc1e5ebeb824d836 files/digest-enigma-0.92 65
-MD5 bebed419a4c41cffce2a7428f989b809 files/enigma-0.80-beta.patch 403
+RMD160 7541ee3c197a3de905841beddc882618a5eb2955 ChangeLog 4099
+SHA256 9a05928629683deba3f41cf82dd75b0965682ed2a7ddb608b7f8f57fdaf3624b ChangeLog 4099
+MD5 f0807c531493be69523cde91ab1eb9fa enigma-0.92.ebuild 1503
+RMD160 adce32ccd247d0605ca6fc62c83b1649baa15308 enigma-0.92.ebuild 1503
+SHA256 9c0e7114c6ae336377e9cdb405ff238a519191b72c71a5ae877a112b84649b98 enigma-0.92.ebuild 1503
 MD5 43e970bb89bb24c634b411cf29b5cb7f files/0.70-gcc3.patch 258
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDK0UeLLFUmVNQ7rkRAiaXAJ9OOwmqyx/SdSgOlVrJnrsSX1eATQCghbkH
-NPZ1DvQR8sJWoayu0kffavo=
-=+t6G
------END PGP SIGNATURE-----
+RMD160 314e2384a065acebefc1c8bc1447d20562b91085 files/0.70-gcc3.patch 258
+SHA256 84919273d22a17eb544ca938bab31bd9e976f9cccef7ce5697250df7951c964e files/0.70-gcc3.patch 258
+MD5 4051ec551b28596af13f8a7fef5f3d62 files/digest-enigma-0.92 241
+RMD160 8151863d7082549b51c57ceb34e4a68a5375928d files/digest-enigma-0.92 241
+SHA256 3aa602e1e1816ffe5920440cb79426ea11eed5e26fe6b4f4bec5e6a984ebe0f5 files/digest-enigma-0.92 241
+MD5 bebed419a4c41cffce2a7428f989b809 files/enigma-0.80-beta.patch 403
+RMD160 d3b0beecf78703ef526094f689f9643c95a82f0e files/enigma-0.80-beta.patch 403
+SHA256 247e89745d9f2e34e339bb52fdd151efdd9ef53919cb4a2b5feb2fbc3126bcf4 files/enigma-0.80-beta.patch 403
+MD5 9a83f99d9e12ec1d19a7a3a8c9964da6 files/enigma-0.81-gcc34.patch 7377
+RMD160 b068492fd96c711a7be200ab02f19b33b5cafd26 files/enigma-0.81-gcc34.patch 7377
+SHA256 8c9fe17b93b4a9a2f9cfa59bdca5d28917c1ae6e8c020be70936a829f8c8a304 files/enigma-0.81-gcc34.patch 7377
+MD5 cb27de800d7da933c03632dbab166cb0 files/enigma-0.92-gcc41.patch 778
+RMD160 8bc42f3e2395d8c905a9484df9b7e8520678e631 files/enigma-0.92-gcc41.patch 778
+SHA256 4e45c082000c0a6f577042944b98560bd1daaec58fd8704f23399463ac83b701 files/enigma-0.92-gcc41.patch 778
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-puzzle/enigma/enigma-0.92.ebuild b/games-puzzle/enigma/enigma-0.92.ebuild
index 7bc1a8c7f34f..2691291b4775 100644
--- a/games-puzzle/enigma/enigma-0.92.ebuild
+++ b/games-puzzle/enigma/enigma-0.92.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-puzzle/enigma/enigma-0.92.ebuild,v 1.1 2005/06/17 00:39:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-0.92.ebuild,v 1.2 2006/03/30 17:50:00 halcy0n Exp $
 
 inherit eutils games
 
@@ -39,6 +39,8 @@ src_unpack() {
 		-e 's/: install-docDATA/:/' \
 		-e '/^SUBDIRS/s/doc//' Makefile.in \
 		|| die "sed failed"
+
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 }
 
 src_compile() {
diff --git a/games-puzzle/enigma/files/digest-enigma-0.92 b/games-puzzle/enigma/files/digest-enigma-0.92
index 369dc186b6c3..898c1699d5a3 100644
--- a/games-puzzle/enigma/files/digest-enigma-0.92
+++ b/games-puzzle/enigma/files/digest-enigma-0.92
@@ -1 +1,3 @@
 MD5 b33d8fad75910c9a525f4382f5185f75 enigma-0.92.tar.gz 10768245
+RMD160 cdbe27425534792ac0199525db1d6068aefacebd enigma-0.92.tar.gz 10768245
+SHA256 027725d540076605ce60644c7aa5f175f7ab81c9e10c6cdd9be90c6b4bfd3cda enigma-0.92.tar.gz 10768245
diff --git a/games-puzzle/enigma/files/enigma-0.92-gcc41.patch b/games-puzzle/enigma/files/enigma-0.92-gcc41.patch
new file mode 100644
index 000000000000..c0ac8a92d457
--- /dev/null
+++ b/games-puzzle/enigma/files/enigma-0.92-gcc41.patch
@@ -0,0 +1,22 @@
+--- enigma-0.92/src/file_internal.hh.orig	2006-03-20 12:05:42.000000000 +0100
++++ enigma-0.92/src/file_internal.hh	2006-03-20 12:06:08.000000000 +0100
+@@ -19,7 +19,7 @@
+ 
+     class GameFS {
+     public:
+-        GameFS::GameFS();
++        GameFS();
+ 
+         void clear() { entries.clear(); }
+ 		
+--- enigma-0.92/src/stones_simple.cc.orig	2006-03-20 12:09:53.000000000 +0100
++++ enigma-0.92/src/stones_simple.cc	2006-03-20 12:10:48.000000000 +0100
+@@ -1672,7 +1672,7 @@
+             KillStone(p);
+             SetItem(p, it_explosion1);
+         }
+-        void BombStone::message(const string &msg, const Value &) {
++        void message(const string &msg, const Value &) {
+             if (msg =="expl" || msg =="bombstone")
+                 change_state(BREAK);
+         }