remove need for an executable stack

(Portage version: 2.1.3_rc6)

5 files changed, 135 insertions, 2 deletions

diff --git a/games-emulation/tuxnes/ChangeLog b/games-emulation/tuxnes/ChangeLog
index 9100d35ff28b..782d0cbfa062 100644
--- a/games-emulation/tuxnes/ChangeLog
+++ b/games-emulation/tuxnes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/tuxnes
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/ChangeLog,v 1.8 2006/10/18 19:37:48 nyhm Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/ChangeLog,v 1.9 2007/07/02 16:11:11 nyhm Exp $
+
+*tuxnes-0.75-r1 (02 Jul 2007)
+
+  02 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/tuxnes-0.75-exec-stack.patch, +files/tuxnes-0.75-include.patch,
+  +tuxnes-0.75-r1.ebuild:
+  remove need for an executable stack
 
   18 Oct 2006; Tristan Heaven <nyhm@gentoo.org>
   files/tuxnes-0.75-configure.in.patch, tuxnes-0.75.ebuild:
diff --git a/games-emulation/tuxnes/files/digest-tuxnes-0.75-r1 b/games-emulation/tuxnes/files/digest-tuxnes-0.75-r1
new file mode 100644
index 000000000000..aeda4a20064b
--- /dev/null
+++ b/games-emulation/tuxnes/files/digest-tuxnes-0.75-r1
@@ -0,0 +1,3 @@
+MD5 5db0cd42dfdff3e681805e93b4867c43 tuxnes-0.75.tar.gz 198735
+RMD160 d4a94e00f7c90cbf6fbf19537ede22aca05eeafd tuxnes-0.75.tar.gz 198735
+SHA256 217fc57fdd2a5ec360c197ea36110ec929d3f27c88cf875f0f4723b3496ed7c2 tuxnes-0.75.tar.gz 198735
diff --git a/games-emulation/tuxnes/files/tuxnes-0.75-exec-stack.patch b/games-emulation/tuxnes/files/tuxnes-0.75-exec-stack.patch
new file mode 100644
index 000000000000..2e50fd6888e1
--- /dev/null
+++ b/games-emulation/tuxnes/files/tuxnes-0.75-exec-stack.patch
@@ -0,0 +1,19 @@
+--- Makefile.am
++++ Makefile.am
+@@ -10,6 +10,7 @@
+ 	ziploader.c ziploader.h
+ EXTRA_tuxnes_SOURCES = pixels.h
+ tuxnes_LDADD = table.o
++tuxnes_LDFLAGS = -Wl,-z,noexecstack
+ 
+ comptbl_SOURCES = comptbl.c
+ 
+--- x86.S
++++ x86.S
+@@ -1670,3 +1670,6 @@
+  leal   0x1(%eax),%ebx
+  popl   %eax
+  jmp i_next
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/games-emulation/tuxnes/files/tuxnes-0.75-include.patch b/games-emulation/tuxnes/files/tuxnes-0.75-include.patch
new file mode 100644
index 000000000000..dec75d9127d8
--- /dev/null
+++ b/games-emulation/tuxnes/files/tuxnes-0.75-include.patch
@@ -0,0 +1,51 @@
+--- comptbl.c
++++ comptbl.c
+@@ -28,6 +28,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #define ALLOC_SIZE 0x48d801     /* approximately 4.69MB */
+ #define TBL_BASE ((unsigned char *)0x10000000)
+--- gamegenie.c
++++ gamegenie.c
+@@ -12,6 +12,7 @@
+ 
+ #include <ctype.h>
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include "gamegenie.h"
+ 
+--- io.c
++++ io.c
+@@ -21,6 +21,7 @@
+ #endif /* HAVE_FEATURES_H */
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include "consts.h"
+ #include "globals.h"
+--- mapper.c
++++ mapper.c
+@@ -13,6 +13,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "consts.h"
+ #include "globals.h"
+--- sound.c
++++ sound.c
+@@ -116,6 +116,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <string.h>
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
diff --git a/games-emulation/tuxnes/tuxnes-0.75-r1.ebuild b/games-emulation/tuxnes/tuxnes-0.75-r1.ebuild
new file mode 100644
index 000000000000..5ebb6c950c02
--- /dev/null
+++ b/games-emulation/tuxnes/tuxnes-0.75-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/tuxnes-0.75-r1.ebuild,v 1.1 2007/07/02 16:11:11 nyhm Exp $
+
+inherit autotools eutils games
+
+DESCRIPTION="emulator for the 8-bit Nintendo Entertainment System"
+HOMEPAGE="http://tuxnes.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="X ggi"
+
+RDEPEND="X? (
+		x11-libs/libXext
+		x11-libs/libICE
+		x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libSM )
+	ggi? ( >=media-libs/libggi-2.0.1 )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${P}-configure.in.patch \
+		"${FILESDIR}"/${P}-gcc34.patch \
+		"${FILESDIR}"/${P}-include.patch \
+		"${FILESDIR}"/${P}-exec-stack.patch
+	eautoreconf
+}
+
+src_compile() {
+	egamesconf \
+		--without-w \
+		$(use_with ggi) \
+		$(use_with X x) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	doicon tuxnes.xpm tuxnes2.xpm
+	dodoc AUTHORS BUGS ChangeLog CHANGES NEWS README THANKS
+	prepgamesdirs
+}