add patch to compile with gcc4 from Necoro d.M via bug #147086

(Portage version: 2.1.2.2)

7 files changed, 47 insertions, 72 deletions

diff --git a/games-roguelike/noegnud-nethack/ChangeLog b/games-roguelike/noegnud-nethack/ChangeLog
index ea1c779e1a81..23d423ec84d3 100644
--- a/games-roguelike/noegnud-nethack/ChangeLog
+++ b/games-roguelike/noegnud-nethack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-roguelike/noegnud-nethack
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/ChangeLog,v 1.9 2007/02/08 21:24:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/ChangeLog,v 1.10 2007/03/14 18:19:31 mr_bones_ Exp $
+
+  14 Mar 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/noegnud-nethack-0.8.2-gcc41.patch,
+  +files/noegnud-nethack-0.8.3-gcc41.patch, -noegnud-nethack-0.7.1.ebuild,
+  noegnud-nethack-0.8.2.ebuild, noegnud-nethack-0.8.3.ebuild:
+  add patch to compile with gcc4 from Necoro d.M via bug #147086
 
   08 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/games-roguelike/noegnud-nethack/files/digest-noegnud-nethack-0.7.1 b/games-roguelike/noegnud-nethack/files/digest-noegnud-nethack-0.7.1
deleted file mode 100644
index f22e91500495..000000000000
--- a/games-roguelike/noegnud-nethack/files/digest-noegnud-nethack-0.7.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 aefcbeb20210b2d64511c84bd03c3e4e nethack-341.tgz 3492419
-RMD160 d28255e76248a8658b4c08e9d55a849dd6572b17 nethack-341.tgz 3492419
-SHA256 c431c88788646751b72db75301468a4b2094ac0fddd0f9a1eec55df72013a51f nethack-341.tgz 3492419
-MD5 bc11db264ba3e42bcac3997762da7150 noegnud-0.7.1-src.tar.gz 110120
-RMD160 38585229cf8eecedf2bc532ad3ac20f808131422 noegnud-0.7.1-src.tar.gz 110120
-SHA256 cdb342d40809a467e55e246d9311caefdbb96b1fe15eb5f7735a013498eb4fbb noegnud-0.7.1-src.tar.gz 110120
diff --git a/games-roguelike/noegnud-nethack/files/noegnud-nethack-0.8.2-gcc41.patch b/games-roguelike/noegnud-nethack/files/noegnud-nethack-0.8.2-gcc41.patch
new file mode 100644
index 000000000000..7742a2d3657b
--- /dev/null
+++ b/games-roguelike/noegnud-nethack/files/noegnud-nethack-0.8.2-gcc41.patch
@@ -0,0 +1,11 @@
+--- ../noegnud/noegnud_gui.c.old	2007-01-18 11:43:45.004148588 +0100
++++ ../noegnud/noegnud_gui.c	2007-01-18 11:43:59.563935164 +0100
+@@ -627,7 +627,7 @@
+     //button=(noegnud_gui_tbutton *)noegnud_gui_create_window(parent,x,y,width,height,(sizeof(noegnud_gui_twindow)-sizeof(noegnud_gui_twidget))+datasize);
+ 
+     text=noegnud_gui_create_text(
+-				 (noegnud_gui_twidget *)button=(noegnud_gui_tbutton *)noegnud_gui_create_window(
++				 /*(noegnud_gui_twidget *)*/button=(noegnud_gui_tbutton *)noegnud_gui_create_window(
+ 														parent,
+ 														x,y,
+ 														width,height,
diff --git a/games-roguelike/noegnud-nethack/files/noegnud-nethack-0.8.3-gcc41.patch b/games-roguelike/noegnud-nethack/files/noegnud-nethack-0.8.3-gcc41.patch
new file mode 100644
index 000000000000..7742a2d3657b
--- /dev/null
+++ b/games-roguelike/noegnud-nethack/files/noegnud-nethack-0.8.3-gcc41.patch
@@ -0,0 +1,11 @@
+--- ../noegnud/noegnud_gui.c.old	2007-01-18 11:43:45.004148588 +0100
++++ ../noegnud/noegnud_gui.c	2007-01-18 11:43:59.563935164 +0100
+@@ -627,7 +627,7 @@
+     //button=(noegnud_gui_tbutton *)noegnud_gui_create_window(parent,x,y,width,height,(sizeof(noegnud_gui_twindow)-sizeof(noegnud_gui_twidget))+datasize);
+ 
+     text=noegnud_gui_create_text(
+-				 (noegnud_gui_twidget *)button=(noegnud_gui_tbutton *)noegnud_gui_create_window(
++				 /*(noegnud_gui_twidget *)*/button=(noegnud_gui_tbutton *)noegnud_gui_create_window(
+ 														parent,
+ 														x,y,
+ 														width,height,
diff --git a/games-roguelike/noegnud-nethack/noegnud-nethack-0.7.1.ebuild b/games-roguelike/noegnud-nethack/noegnud-nethack-0.7.1.ebuild
deleted file mode 100644
index 428cda1cc626..000000000000
--- a/games-roguelike/noegnud-nethack/noegnud-nethack-0.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.7.1.ebuild,v 1.5 2004/06/24 23:13:41 agriffis Exp $
-
-inherit games
-
-NH_DVER=3.4.1
-NH_VER=${NH_DVER//.}
-DESCRIPTION="an alternate 2D/3D graphical user interface for NetHack"
-HOMEPAGE="http://noegnud.sourceforge.net/"
-SRC_URI="mirror://sourceforge/noegnud/noegnud-${PV}-src.tar.gz
-	mirror://sourceforge/nethack/nethack-${NH_VER}.tgz"
-
-LICENSE="nethack"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	dev-util/yacc"
-RDEPEND="media-libs/libsdl
-	media-libs/sdl-image
-	virtual/opengl
-	games-roguelike/noegnud-data"
-
-S=${WORKDIR}/noegnud-${PV}/variants
-
-src_unpack() {
-	unpack noegnud-${PV}-src.tar.gz
-	ln -s ${DISTDIR}/nethack-${NH_VER}.tgz noegnud-${PV}/variants/tarballs/nethack-${NH_VER}.tgz
-}
-
-src_compile() {
-	make nh${NH_VER} PREFIX=${GAMES_PREFIX} || die
-}
-
-src_install() {
-	make install_nh${NH_VER} PREFIX=${D}/${GAMES_PREFIX} || die
-
-	cd ${D}/${GAMES_BINDIR}
-	rm noegnud-nethack-${NH_DVER}
-	mv noegnud-${PV}-nethack-${NH_DVER} noegnud-nethack
-	dosed "/^HACKDIR/s:=.*:=${GAMES_LIBDIR}/noegnud-${PV}/nethack-${NH_DVER}:" ${GAMES_BINDIR}/noegnud-nethack
-
-	keepdir ${GAMES_LIBDIR}/noegnud-${PV}/nethack-${NH_DVER}/save
-	dodir ${GAMES_DATADIR}/noegnud_data
-	dosym ${GAMES_DATADIR}/noegnud_data ${GAMES_LIBDIR}/noegnud-${PV}/noegnud_data
-
-	prepgamesdirs
-	chmod -R g+w ${D}/${GAMES_LIBDIR}/noegnud-${PV}
-}
diff --git a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild
index 669c0479d2c0..572ef46edd52 100644
--- a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild
+++ b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild,v 1.9 2004/12/16 15:14:17 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild,v 1.10 2007/03/14 18:19:32 mr_bones_ Exp $
 
-inherit games
+inherit eutils games
 
 VAR_NAME=nethack
 VAR_SNAME=nh
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/noegnud/noegnud-${PV}_linux_src-minimal.tar.bz2
 
 LICENSE="nethack"
 SLOT="0"
-KEYWORDS="x86 ppc ~amd64"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl
@@ -32,15 +32,17 @@ S="${WORKDIR}/noegnud-${PV}/variants"
 src_unpack() {
 	unpack noegnud-${PV}_linux_src-minimal.tar.bz2
 	ln -s "${DISTDIR}/${VAR_TAR}" noegnud-${PV}/variants/tarballs/${VAR_TAR}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc41.patch"
 }
 
 src_compile() {
-	make ${VAR_SNAME}${VAR_VER} PREFIX="${GAMES_PREFIX}" || die "make failed"
+	emake ${VAR_SNAME}${VAR_VER} PREFIX="${GAMES_PREFIX}" || die "emake failed"
 }
 
 src_install() {
-	make install_${VAR_SNAME}${VAR_VER} PREFIX="${D}/${GAMES_PREFIX}" \
-		|| die "make install failed"
+	emake install_${VAR_SNAME}${VAR_VER} PREFIX="${D}/${GAMES_PREFIX}" \
+		|| die "emake install failed"
 
 	cd "${D}/${GAMES_BINDIR}"
 	# we do this cause sometimes the installed package thinks it's a diff version :)
diff --git a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild
index e4f5abbd92ac..017adff28f8a 100644
--- a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild
+++ b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild,v 1.1 2004/11/19 19:08:01 citizen428 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild,v 1.2 2007/03/14 18:19:32 mr_bones_ Exp $
 
-inherit games
+inherit eutils games
 
 VAR_NAME=nethack
 VAR_SNAME=nh
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/noegnud/noegnud-${PV}_linux_src-minimal.tar.bz2
 
 LICENSE="nethack"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl
@@ -32,15 +32,17 @@ S="${WORKDIR}/noegnud-${PV}/variants"
 src_unpack() {
 	unpack noegnud-${PV}_linux_src-minimal.tar.bz2
 	ln -s "${DISTDIR}/${VAR_TAR}" noegnud-${PV}/variants/tarballs/${VAR_TAR}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc41.patch"
 }
 
 src_compile() {
-	make ${VAR_SNAME}${VAR_VER} PREFIX="${GAMES_PREFIX}" || die "make failed"
+	emake ${VAR_SNAME}${VAR_VER} PREFIX="${GAMES_PREFIX}" || die "emake failed"
 }
 
 src_install() {
-	make install_${VAR_SNAME}${VAR_VER} PREFIX="${D}/${GAMES_PREFIX}" \
-		|| die "make install failed"
+	emake install_${VAR_SNAME}${VAR_VER} PREFIX="${D}/${GAMES_PREFIX}" \
+		|| die "emake install failed"
 
 	cd "${D}/${GAMES_BINDIR}"
 	# we do this cause sometimes the installed package thinks it's a diff version :)