Fix building with GCC 4.5+ wrt #318411 by Kacper Kowalik.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 40 insertions, 11 deletions

diff --git a/games-arcade/njam/ChangeLog b/games-arcade/njam/ChangeLog
index aae16782d680..9a7a5a50fe1c 100644
--- a/games-arcade/njam/ChangeLog
+++ b/games-arcade/njam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/njam
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/njam/ChangeLog,v 1.10 2007/04/20 05:54:12 opfer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/njam/ChangeLog,v 1.11 2010/05/06 10:55:02 ssuominen Exp $
+
+  06 May 2010; Samuli Suominen <ssuominen@gentoo.org> njam-1.25.ebuild,
+  +files/njam-1.25-gcc45.patch:
+  Fix building with GCC 4.5+ wrt #318411 by Kacper Kowalik.
 
   20 Apr 2007; Christian Faulhammer <opfer@gentoo.org> njam-1.25.ebuild:
   stable amd64, bug 174569
diff --git a/games-arcade/njam/Manifest b/games-arcade/njam/Manifest
index 616505a2d8b1..96d699f5c52b 100644
--- a/games-arcade/njam/Manifest
+++ b/games-arcade/njam/Manifest
@@ -1,4 +1,5 @@
+AUX njam-1.25-gcc45.patch 666 RMD160 ed073305366e1507e84887e201b16f0ac5cc5f06 SHA1 d2e242257bbf73b8a29a21e233e276cc1732f8a4 SHA256 2c3a7867ff381cf1e8cc8348b8f1d90d62f4fd2164807c67dd750165edf42562
 DIST njam-1.25-src.tar.gz 1665803 RMD160 b4c4281993cb42d7812d2dbae21cbfec2fee335c SHA1 1975c17e83fcc1042d758b25bccb784130bb22ad SHA256 8ed3eee3f387ce5ecdab7dd528f98cf77f65971510964000f2f1dfbf8b6f3000
-EBUILD njam-1.25.ebuild 1225 RMD160 66294765f30102dc9162c94897debf677997b39a SHA1 51a8ede4e69113735d7ddc4d17cf1307c3a7546a SHA256 68e279aa3d7a658cae7abd35493d17873b19bc11ce8c73c5286baafb760e6afe
-MISC ChangeLog 1315 RMD160 bba288c6967de3899f621000773510df0c6e36ec SHA1 f642a10773b6cc4ebaa051cb77a374c4a09e6390 SHA256 75f057c37577d033bb70d37342643d714cf6c117d416fb4196b08f9f0cc2670f
+EBUILD njam-1.25.ebuild 1229 RMD160 a6a9894b33e9b6e7961ff97cef1aa075df66a699 SHA1 620b9b2538045117a295418c2bf6ecea1399ac16 SHA256 15e566245b61c02b6f103094106a8bf5f618c159e956082837d9cc8042c50bb1
+MISC ChangeLog 1484 RMD160 318191fb672e838ecf7df9c6bd8f3972d8b8cd07 SHA1 2481795a4ab7e6c0995f8af1fa6cdc58af66d54b SHA256 c44463709c197af7b8f3069ac6632b2fb6c03093898b6e0222eea44cb9bcf1c7
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/njam/files/njam-1.25-gcc45.patch b/games-arcade/njam/files/njam-1.25-gcc45.patch
new file mode 100644
index 000000000000..b74bc3dac105
--- /dev/null
+++ b/games-arcade/njam/files/njam-1.25-gcc45.patch
@@ -0,0 +1,24 @@
+Fix buiding with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=318411
+
+--- src/njamedit.cpp
++++ src/njamedit.cpp
+@@ -114,7 +114,7 @@
+ 				key = SDLK_a;
+ 			else if (CheckForSave())
+ 			{
+-				LogFile::LogFile("Saving maps");
++				LogFile("Saving maps");
+ 				m_Maps.Save(filename);
+ 				level_type_was = level_type;
+ 				changed = false;
+@@ -131,7 +131,7 @@
+ 					char types[2][5] = { "COOP", "DUEL" };
+ 					sprintf(buf, "levels/%s.%s\0", filename, types[level_type]);
+ 					sprintf(filename, "%s\0", buf);
+-					LogFile::LogFile("Saving maps");
++					LogFile("Saving maps");
+ 					m_Maps.Save(filename);
+ 					level_type_was = level_type;
+ 					changed = false;
diff --git a/games-arcade/njam/njam-1.25.ebuild b/games-arcade/njam/njam-1.25.ebuild
index 248156abc41a..52e8b0f77605 100644
--- a/games-arcade/njam/njam-1.25.ebuild
+++ b/games-arcade/njam/njam-1.25.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/njam/njam-1.25.ebuild,v 1.3 2007/04/20 05:54:12 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/njam/njam-1.25.ebuild,v 1.4 2010/05/06 10:55:02 ssuominen Exp $
 
+EAPI=2
 inherit eutils flag-o-matic games
 
-MY_P="${P}-src"
+MY_P=${P}-src
 DESCRIPTION="Multi or single-player network Pacman-like game in SDL"
 HOMEPAGE="http://njam.sourceforge.net/"
 SRC_URI="mirror://sourceforge/njam/${MY_P}.tar.gz"
@@ -21,9 +22,7 @@ DEPEND="media-libs/sdl-mixer
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i \
 		-e "s:hiscore.dat:${GAMES_STATEDIR}/${PN}/\0:" \
 		src/njam.cpp \
@@ -32,13 +31,14 @@ src_unpack() {
 		-e "/hiscore.dat/ s:\$(DEFAULT_LIBDIR):${GAMES_STATEDIR}:" \
 		Makefile.in \
 		|| die "sed failed"
+	epatch "${FILESDIR}"/${P}-gcc45.patch
 	# njam segfaults on startup with -Os
 	replace-flags "-Os" "-O2"
 }
 
 src_install() {
 	dodir "${GAMES_STATEDIR}/${PN}"
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dohtml -r "${D}${GAMES_DATADIR}/njam/html/"*
 	rm -rf "${D}${GAMES_DATADIR}/njam/html/"
 	newicon data/njamicon.bmp njam.bmp