Fix for gcc-4.1, bug #120760

(Portage version: 2.1_pre7-r3)

5 files changed, 38 insertions, 12 deletions

diff --git a/games-arcade/openmortal/ChangeLog b/games-arcade/openmortal/ChangeLog
index 393d770bb20b..1dbd8495bffc 100644
--- a/games-arcade/openmortal/ChangeLog
+++ b/games-arcade/openmortal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/openmortal
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/openmortal/ChangeLog,v 1.13 2006/01/29 00:00:27 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/openmortal/ChangeLog,v 1.14 2006/04/02 13:47:04 tupone Exp $
+
+  02 Apr 2006; <Tupone@gentoo.org> +files/openmortal-0.7-gcc41.patch,
+  openmortal-0.7.ebuild:
+  Fix for gcc-4.1, bugs #120760 by Joshua Baergen
 
   28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   openmortal-0.7.ebuild:
diff --git a/games-arcade/openmortal/Manifest b/games-arcade/openmortal/Manifest
index e38919db09c2..ba9d19fc4ada 100644
--- a/games-arcade/openmortal/Manifest
+++ b/games-arcade/openmortal/Manifest
@@ -1,12 +1,15 @@
-MD5 163b8da6756ea4c439a0e4dc835d6765 ChangeLog 1773
-RMD160 5ddbfd3c1785f89c6f59530f4af4250a66ae6bae ChangeLog 1773
-SHA256 4946821a2353d7124ef9909f62352a73c38220934091e690aec9a90951933426 ChangeLog 1773
-MD5 1bf29891d934d4c0c23042adec613afd files/digest-openmortal-0.7 69
-RMD160 fb1c3526117aa18b7c8b7656869d5238edc7e6d1 files/digest-openmortal-0.7 69
-SHA256 c5d54f46b7a8a3c79a426fb0bfbe888b6c3c58d6f680e202c68d82d80eda8c61 files/digest-openmortal-0.7 69
+MD5 707b76f8c75a0fe63d9ce750be1eec67 ChangeLog 1919
+RMD160 4e07af86ee71045f900c1524491d6239d9cc48a5 ChangeLog 1919
+SHA256 b307e1e4d2bd4815711d0c17aa099db298f3acc966390cd26d00281a16c826c6 ChangeLog 1919
+MD5 44bd9a0d8228a6804408338a22a3f5f2 files/digest-openmortal-0.7 253
+RMD160 30f14d0a2bc20ebd1816ef0d8ef2d70d7e605d37 files/digest-openmortal-0.7 253
+SHA256 d8e848cb4a0ddb03ad9d78565c3da207f54d562507c0e0bbe5a40890bab44f32 files/digest-openmortal-0.7 253
+MD5 7823133f184a4cd5859f971e6e2f3452 files/openmortal-0.7-gcc41.patch 373
+RMD160 7c8e73d3c7af6c0186bc93b7cd7b90d85c24cd36 files/openmortal-0.7-gcc41.patch 373
+SHA256 e56c46d412dc11e04430da120d264d9d3ad90e207f941a7791712d972bfecdfd files/openmortal-0.7-gcc41.patch 373
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 a8532d47efb3a2f7a50f46ef6185992b openmortal-0.7.ebuild 756
-RMD160 a1df1e7f2bc8cfcf9f661b5aa95a95c532c0c937 openmortal-0.7.ebuild 756
-SHA256 984795d8f879fa39eaea82334b21e230e91bf7a32798f2b405346d9a3c246989 openmortal-0.7.ebuild 756
+MD5 9efad927a515a421ab2c7aee619e4231 openmortal-0.7.ebuild 844
+RMD160 51b38c2fb300810f26da185fc685bfcb2dc825b5 openmortal-0.7.ebuild 844
+SHA256 45882ee873ea853d1ae3be0217b4beaf8b20baf80fe9dd121bedb8a719b2f7d1 openmortal-0.7.ebuild 844
diff --git a/games-arcade/openmortal/files/digest-openmortal-0.7 b/games-arcade/openmortal/files/digest-openmortal-0.7
index 12b1fd4ca767..247a2a032615 100644
--- a/games-arcade/openmortal/files/digest-openmortal-0.7
+++ b/games-arcade/openmortal/files/digest-openmortal-0.7
@@ -1 +1,3 @@
 MD5 95278382bb563906fce624d833a845cf openmortal-0.7.tar.bz2 51197736
+RMD160 6a0fdd46445ed243db261227a93526b97c6f9d79 openmortal-0.7.tar.bz2 51197736
+SHA256 9c302560d71ddcd3473ba2a1022fd118cbce87a4cd4b3080cb46288a410bb710 openmortal-0.7.tar.bz2 51197736
diff --git a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
new file mode 100644
index 000000000000..fdba61c6b008
--- /dev/null
+++ b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
@@ -0,0 +1,11 @@
+--- src/OnlineChat.cpp.old	2006-01-28 14:34:42.000000000 -0700
++++ src/OnlineChat.cpp	2006-01-28 14:34:53.000000000 -0700
+@@ -56,7 +56,7 @@
+ class CChallengeMenu: public Menu
+ {
+ public:
+-	CChallengeMenu::CChallengeMenu( std::string a_sChallenger )
++	CChallengeMenu( std::string a_sChallenger )
+ 	: Menu( "You have been challenged!" ),
+ 	m_sChallenger( a_sChallenger )
+ 	{
diff --git a/games-arcade/openmortal/openmortal-0.7.ebuild b/games-arcade/openmortal/openmortal-0.7.ebuild
index b81b50f999a9..5edc202d781c 100644
--- a/games-arcade/openmortal/openmortal-0.7.ebuild
+++ b/games-arcade/openmortal/openmortal-0.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/openmortal/openmortal-0.7.ebuild,v 1.5 2006/01/29 00:00:27 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/openmortal/openmortal-0.7.ebuild,v 1.6 2006/04/02 13:47:04 tupone Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="A spoof of the famous Mortal Combat game"
 HOMEPAGE="http://apocalypse.rulez.org/~upi/Mortal/"
@@ -21,6 +21,12 @@ DEPEND="media-libs/libsdl
 	>=media-libs/freetype-2.1.0
 	dev-lang/perl"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog TODO README