Fix for gcc-4.1

(Portage version: 2.1_pre7-r5)

5 files changed, 51 insertions, 8 deletions

diff --git a/games-arcade/sdl-sopwith/ChangeLog b/games-arcade/sdl-sopwith/ChangeLog
index 8d028e235dc6..c222f4a23cf5 100644
--- a/games-arcade/sdl-sopwith/ChangeLog
+++ b/games-arcade/sdl-sopwith/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/sdl-sopwith
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdl-sopwith/ChangeLog,v 1.6 2004/06/24 22:11:56 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdl-sopwith/ChangeLog,v 1.7 2006/04/24 15:13:58 tupone Exp $
+
+  24 Apr 2006; <Tupone@gentoo.org> +files/sdl-sopwith-1.7.1-gcc41.patch,
+  sdl-sopwith-1.7.1.ebuild:
+  Fix for gcc-4.1
 
   17 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org>
   sdl-sopwith-1.7.1.ebuild:
diff --git a/games-arcade/sdl-sopwith/Manifest b/games-arcade/sdl-sopwith/Manifest
index 3ba12c159c0b..e64dc0274652 100644
--- a/games-arcade/sdl-sopwith/Manifest
+++ b/games-arcade/sdl-sopwith/Manifest
@@ -1,4 +1,15 @@
-MD5 95c49976d30c6790d4a25b20910caa04 sdl-sopwith-1.7.1.ebuild 857
-MD5 f11d32ef05cee4d0c5e1c2b05eeb7f94 ChangeLog 1039
+MD5 02025479ddb659455a9de2b425017166 ChangeLog 1159
+RMD160 4b26b2f6b881a4990c48b99ce9083e365d31d29d ChangeLog 1159
+SHA256 37f06b15c089237c0a712668668f8c48e3afd6788e648d2d37d985e7618a1963 ChangeLog 1159
+MD5 f5bdaefa619804e9749fda3d37a172fd files/digest-sdl-sopwith-1.7.1 253
+RMD160 f92e5182c08fed69101d0a78d82a987119426790 files/digest-sdl-sopwith-1.7.1 253
+SHA256 a19a1321ec4776bd88955ac5779fd07fde417dd642f28c7e2865862991742ced files/digest-sdl-sopwith-1.7.1 253
+MD5 cff130f6aaf79a894c298cf67f178512 files/sdl-sopwith-1.7.1-gcc41.patch 540
+RMD160 75adf4e8c3caa5edd1a88c43eac3d3652229cdf0 files/sdl-sopwith-1.7.1-gcc41.patch 540
+SHA256 9450e734f9388650617e7b5c740019d0a7d7244e7d9d83b218c0894305d10791 files/sdl-sopwith-1.7.1-gcc41.patch 540
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 e35cc5cd710dd0d0c12d63304ca5b0a1 files/digest-sdl-sopwith-1.7.1 69
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 ab2bf1bc9cedbae31c1ed2b2c8bcc3a5 sdl-sopwith-1.7.1.ebuild 945
+RMD160 f058e82a04e701dcdb25c0d1f806cbb971e57160 sdl-sopwith-1.7.1.ebuild 945
+SHA256 66b3c8e0f6ab7742ce72b41d7e1adb143c4b778352ac4055b1812b2b12d2e7fc sdl-sopwith-1.7.1.ebuild 945
diff --git a/games-arcade/sdl-sopwith/files/digest-sdl-sopwith-1.7.1 b/games-arcade/sdl-sopwith/files/digest-sdl-sopwith-1.7.1
index 7dbbdded81e6..473208c05941 100644
--- a/games-arcade/sdl-sopwith/files/digest-sdl-sopwith-1.7.1
+++ b/games-arcade/sdl-sopwith/files/digest-sdl-sopwith-1.7.1
@@ -1 +1,3 @@
 MD5 bc66c80c83b14d48b60ba263403dba9a sdl_sopwith-1.7.1.tar.gz 176774
+RMD160 7c55da41e7e160b4a84e5235974ecf0d48d1010a sdl_sopwith-1.7.1.tar.gz 176774
+SHA256 b0beaa54d3a9e8c4f8e15d9ec5ca92e377859721d1db45be44f6aa03e2e06848 sdl_sopwith-1.7.1.tar.gz 176774
diff --git a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.1-gcc41.patch b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.1-gcc41.patch
new file mode 100644
index 000000000000..432f1fad7d15
--- /dev/null
+++ b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.1-gcc41.patch
@@ -0,0 +1,20 @@
+--- src/swmain.h.old	2006-04-24 17:00:39.000000000 +0200
++++ src/swmain.h	2006-04-24 17:00:52.000000000 +0200
+@@ -46,7 +46,6 @@
+ extern int     targrnge;
+ extern BOOL    hires;
+ extern BOOL    disppos;
+-extern BOOL    titleflg;
+ extern int     dispdbg;
+ extern BOOL    soundflg;
+ extern BOOL    repflag;
+--- src/swtitle.h.old	2006-04-24 17:04:49.000000000 +0200
++++ src/swtitle.h	2006-04-24 17:05:09.000000000 +0200
+@@ -30,6 +30,7 @@
+ extern int getgame();
+ extern void swtitln();
+ extern void swtitlf();
++extern BOOL titleflg;
+ 
+ #endif
+ 
diff --git a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.1.ebuild b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.1.ebuild
index fe02bb5ba63f..6bfb650eacb2 100644
--- a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.1.ebuild
+++ b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdl-sopwith/sdl-sopwith-1.7.1.ebuild,v 1.10 2004/06/24 22:11:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdl-sopwith/sdl-sopwith-1.7.1.ebuild,v 1.11 2006/04/24 15:13:58 tupone Exp $
 
-inherit games
+inherit eutils games
 
 MY_P="${P/-/_}"
 S="${WORKDIR}/${MY_P}"
@@ -24,6 +24,12 @@ RDEPEND=">=media-libs/freetype-2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog FAQ NEWS README TODO doc/*txt