Fix building with newer gcc versions #93736 by Igor Galchevsky.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 44 insertions, 15 deletions

diff --git a/games-action/bombermaze/ChangeLog b/games-action/bombermaze/ChangeLog
index 035f8a6c540c..59ff11e3daf3 100644
--- a/games-action/bombermaze/ChangeLog
+++ b/games-action/bombermaze/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/bombermaze
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/bombermaze/ChangeLog,v 1.6 2004/12/28 22:50:03 ciaranm Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/bombermaze/ChangeLog,v 1.7 2005/05/24 00:59:06 vapier Exp $
+
+  24 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/bombermaze-0.6.6-gcc.patch, bombermaze-0.6.6.ebuild:
+  Fix building with newer gcc versions #93736 by Igor Galchevsky.
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/games-action/bombermaze/Manifest b/games-action/bombermaze/Manifest
index 0d883f5a7c01..133720df9988 100644
--- a/games-action/bombermaze/Manifest
+++ b/games-action/bombermaze/Manifest
@@ -1,4 +1,5 @@
-MD5 590852f099c606d60e4e949d84c1fc0a ChangeLog 1428
+MD5 a717a19832af838a33a88c8159cf80f9 ChangeLog 1606
+MD5 5cf06a0ca03ea44a9ba48272a8feea45 bombermaze-0.6.6.ebuild 1069
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 6109dd939dd5719ec7c953529eff2695 bombermaze-0.6.6.ebuild 973
 MD5 dc0ab4d1a401a11e130c325d259c45e1 files/digest-bombermaze-0.6.6 68
+MD5 faee577061ad012fa54f267d5ee81d56 files/bombermaze-0.6.6-gcc.patch 372
diff --git a/games-action/bombermaze/bombermaze-0.6.6.ebuild b/games-action/bombermaze/bombermaze-0.6.6.ebuild
index 6430c82aea5d..9353065303e0 100644
--- a/games-action/bombermaze/bombermaze-0.6.6.ebuild
+++ b/games-action/bombermaze/bombermaze-0.6.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/bombermaze/bombermaze-0.6.6.ebuild,v 1.5 2004/06/24 21:52:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/bombermaze/bombermaze-0.6.6.ebuild,v 1.6 2005/05/24 00:59:06 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
 DESCRIPTION="Bomberman clone for GNOME"
 HOMEPAGE="http://www.freesoftware.fsf.org/bombermaze/"
@@ -10,7 +10,7 @@ SRC_URI="http://freesoftware.fsf.org/download/bombermaze/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
 RDEPEND=">=media-libs/gdk-pixbuf-0.8
@@ -18,20 +18,24 @@ RDEPEND=">=media-libs/gdk-pixbuf-0.8
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc.patch
+	sed -i \
+		-e 's:destdir=:destdir=$(DESTDIR):' \
+		po/Makefile.in.in || die "sed po"
+}
+
 src_compile() {
 	# It normally fails to locate gdk-pixbuf.h
 	append-flags $(gdk-pixbuf-config --cflags)
 
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--with-included-gettext \
-		$(use_enable nls) || die "./configure failed"
-
+	econf $(use_enable nls) || die "./configure failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	make prefix="${D}/usr" install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS TODO
 }
diff --git a/games-action/bombermaze/files/bombermaze-0.6.6-gcc.patch b/games-action/bombermaze/files/bombermaze-0.6.6-gcc.patch
new file mode 100644
index 000000000000..6f92e5f267e4
--- /dev/null
+++ b/games-action/bombermaze/files/bombermaze-0.6.6-gcc.patch
@@ -0,0 +1,20 @@
+--- src/map.cc
++++ src/map.cc
+@@ -1587,7 +1587,7 @@
+   width = w;
+   height = h;
+ 
+-  map = new (char *)[width];
++  map = new char *[width];
+ 
+   unsigned i;
+   for (i = 0; i < width; i++)
+@@ -1728,7 +1728,7 @@
+ 
+ void GameMap::allocate_map(MapSquare ***m)
+ {
+-  *m = new (MapSquare *)[width];
++  *m = new MapSquare *[width];
+   int i;
+   for (i = 0; i < width; i++)
+   {