Fix for recent linux-headers and exec stack

Package-Manager: portage-2.1.3_rc6

5 files changed, 170 insertions, 18 deletions

diff --git a/games-emulation/gnuboy/ChangeLog b/games-emulation/gnuboy/ChangeLog
index f03f51b77827..01b650e9301f 100644
--- a/games-emulation/gnuboy/ChangeLog
+++ b/games-emulation/gnuboy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/gnuboy
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gnuboy/ChangeLog,v 1.10 2006/09/28 12:45:03 nyhm Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gnuboy/ChangeLog,v 1.11 2007/07/06 18:48:05 nyhm Exp $
+
+  06 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/gnuboy-1.0.3-exec-stack.patch,
+  +files/gnuboy-1.0.3-linux-headers.patch, gnuboy-1.0.3.ebuild:
+  Fix for recent linux-headers and exec stack
 
   28 Sep 2006; Tristan Heaven <nyhm@gentoo.org> gnuboy-1.0.3.ebuild:
   Add missing RDEPEND on sys-apps/fbset, bug #99983
diff --git a/games-emulation/gnuboy/Manifest b/games-emulation/gnuboy/Manifest
index 663087cc98b7..d1961aad743e 100644
--- a/games-emulation/gnuboy/Manifest
+++ b/games-emulation/gnuboy/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gnuboy-1.0.3-exec-stack.patch 475 RMD160 863a67d4d58f522cf59abd19a256bd18539e69f0 SHA1 74e7416bd1d20a83cbb62c1e9f342ff2c81d3932 SHA256 4c296ec67b0667d6422a961d3bb213c008d2bd33ebb2572aaca2063fbb622cd3
+MD5 768b73cfa5aff48f2004f843dbb4b20c files/gnuboy-1.0.3-exec-stack.patch 475
+RMD160 863a67d4d58f522cf59abd19a256bd18539e69f0 files/gnuboy-1.0.3-exec-stack.patch 475
+SHA256 4c296ec67b0667d6422a961d3bb213c008d2bd33ebb2572aaca2063fbb622cd3 files/gnuboy-1.0.3-exec-stack.patch 475
+AUX gnuboy-1.0.3-linux-headers.patch 1685 RMD160 d8659bfa3b6fdde1a958a26c5cc5326fe89101ac SHA1 0f54dc8c89b079f0aa99b366bfb182558d5e134e SHA256 c9b8d177c31ce4531dcd3c055c5e4ebd3a0ad65dcf515ce439f143239e77407e
+MD5 3d084d6421c55751ac9432b95ccdf3e6 files/gnuboy-1.0.3-linux-headers.patch 1685
+RMD160 d8659bfa3b6fdde1a958a26c5cc5326fe89101ac files/gnuboy-1.0.3-linux-headers.patch 1685
+SHA256 c9b8d177c31ce4531dcd3c055c5e4ebd3a0ad65dcf515ce439f143239e77407e files/gnuboy-1.0.3-linux-headers.patch 1685
 DIST gnuboy-1.0.3.tar.gz 187627 RMD160 dfaf927fe2d4e03f39d83079b7dd3aa02c8983b9 SHA1 4c371445b6599c6636d08ba9c5de7bb9fbf78437 SHA256 f0022db824b920054a42690322932cf582e0a9995961124586f054503a0f8072
-EBUILD gnuboy-1.0.3.ebuild 1257 RMD160 412aa41fc177b201f5bf1602e879f9ef1f2ebb47 SHA1 64c8ec05fe633d6607dc3471de5834eafc8006cc SHA256 a00ca6909a2e7e64e5350f7f2e89fa44aa95bad3a88cfadcf91cef4728422f11
-MD5 f77cd179c8d0722ffd849161a26c87b6 gnuboy-1.0.3.ebuild 1257
-RMD160 412aa41fc177b201f5bf1602e879f9ef1f2ebb47 gnuboy-1.0.3.ebuild 1257
-SHA256 a00ca6909a2e7e64e5350f7f2e89fa44aa95bad3a88cfadcf91cef4728422f11 gnuboy-1.0.3.ebuild 1257
-MISC ChangeLog 1073 RMD160 ed5490066d6da19c007b8dc40a120c239fd13f34 SHA1 407f325d821ae4a14158387725ddced14276a3d0 SHA256 2ac48dc98de2a2a867f75567a4a19580108e7ea22706599743a2d4c489acbed8
-MD5 f86f3d4441d3d0541fba27cc6ff7d906 ChangeLog 1073
-RMD160 ed5490066d6da19c007b8dc40a120c239fd13f34 ChangeLog 1073
-SHA256 2ac48dc98de2a2a867f75567a4a19580108e7ea22706599743a2d4c489acbed8 ChangeLog 1073
+EBUILD gnuboy-1.0.3.ebuild 1415 RMD160 dc4e01358b7a25e9ce8ad8a131a54b24c0493934 SHA1 9e1bb690a19771698bd31b3900635aca1c42e303 SHA256 cd9d00067124fbb5aa682ed0e65b4a5c2c3c51ef7b0d31a7d4739fe03073d7d6
+MD5 54b69fc372d61b23e4b3b716fca593a0 gnuboy-1.0.3.ebuild 1415
+RMD160 dc4e01358b7a25e9ce8ad8a131a54b24c0493934 gnuboy-1.0.3.ebuild 1415
+SHA256 cd9d00067124fbb5aa682ed0e65b4a5c2c3c51ef7b0d31a7d4739fe03073d7d6 gnuboy-1.0.3.ebuild 1415
+MISC ChangeLog 1272 RMD160 70f492e965762fa2468c2d79e331e47ed8f9b13b SHA1 b68f233da89d92d1f9d7b97b7e80ec1a5a6b4210 SHA256 7dd4bd6683dca5acf96959d728df50b297988753a501b01c5ce892b615ae25ed
+MD5 c5845d362a1819954ae78981f3fcb2d8 ChangeLog 1272
+RMD160 70f492e965762fa2468c2d79e331e47ed8f9b13b ChangeLog 1272
+SHA256 7dd4bd6683dca5acf96959d728df50b297988753a501b01c5ce892b615ae25ed ChangeLog 1272
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -14,3 +25,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 f0bab923c6f8745cea4b58ac3537c151 files/digest-gnuboy-1.0.3 238
 RMD160 c45c1abca362a75bb1b5153a652516d2ad5a098c files/digest-gnuboy-1.0.3 238
 SHA256 1a1627799b6d841e0bcd2d85f4b75b53889376dc6fdfaa565a85645e246f2a66 files/digest-gnuboy-1.0.3 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGjo5rdz7hIScOURERApi8AKCpUE+gVq/SlXF/fRwhe+nGc863rQCeJOzL
+FLTfTmMZfMQcv8boWPgnJ0I=
+=5u8V
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch b/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch
new file mode 100644
index 000000000000..b8059f915f6f
--- /dev/null
+++ b/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch
@@ -0,0 +1,27 @@
+--- asm/i386/cpu.s
++++ asm/i386/cpu.s
+@@ -2428,3 +2428,6 @@
+ 
+ 
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- asm/i386/lcd.s
++++ asm/i386/lcd.s
+@@ -288,3 +288,6 @@
+ 
+ 
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- asm/i386/refresh.s
++++ asm/i386/refresh.s
+@@ -283,3 +283,6 @@
+ 
+ 
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch b/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch
new file mode 100644
index 000000000000..b0dd24a8e50e
--- /dev/null
+++ b/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch
@@ -0,0 +1,93 @@
+# -ansi breaks <linux/joystick.h>
+
+--- configure.in
++++ configure.in
+@@ -133,7 +133,7 @@
+ if test "$enable_warnings" = yes ; then
+ case "$CC" in *gcc*)
+ AC_MSG_RESULT(enabling selected compiler warnings)
+-CFLAGS="$CFLAGS -ansi -pedantic -Wall -Wno-implicit -Wno-long-long" ;;
++CFLAGS="$CFLAGS -Wall -Wno-implicit -Wno-long-long" ;;
+ *)
+ AC_MSG_RESULT(disabling warnings for non-gcc compiler) ;;
+ esac
+--- loader.c
++++ loader.c
+@@ -11,7 +11,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-char *strdup();
+ 
+ static int mbc_table[256] =
+ {
+--- main.c
++++ main.c
+@@ -8,7 +8,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-char *strdup();
+ 
+ #include <stdarg.h>
+ #include <signal.h>
+--- path.c
++++ path.c
+@@ -5,7 +5,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-char *strdup();
+ 
+ #ifdef ALT_PATH_SEP
+ #define SEP ';'
+--- rckeys.c
++++ rckeys.c
+@@ -4,7 +4,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-char *strdup();
+ 
+ #include "defs.h"
+ #include "rc.h"
+--- rcvars.c
++++ rcvars.c
+@@ -5,7 +5,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-char *strdup();
+ 
+ #include "defs.h"
+ #include "rc.h"
+--- sys/linux/fbdev.c
++++ sys/linux/fbdev.c
+@@ -10,7 +10,6 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
+-char *strdup();
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <linux/fb.h>
+--- sys/linux/joy.c
++++ sys/linux/joy.c
+@@ -2,7 +2,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-char *strdup();
+ #include <linux/joystick.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+--- sys/oss/oss.c
++++ sys/oss/oss.c
+@@ -2,7 +2,6 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
+-char *strdup();
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/games-emulation/gnuboy/gnuboy-1.0.3.ebuild b/games-emulation/gnuboy/gnuboy-1.0.3.ebuild
index 80f9c05e96d1..0dc318d6917a 100644
--- a/games-emulation/gnuboy/gnuboy-1.0.3.ebuild
+++ b/games-emulation/gnuboy/gnuboy-1.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gnuboy/gnuboy-1.0.3.ebuild,v 1.12 2006/09/28 12:45:03 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gnuboy/gnuboy-1.0.3.ebuild,v 1.13 2007/07/06 18:48:05 nyhm Exp $
 
-inherit games
+inherit autotools eutils games
 
 DESCRIPTION="Gameboy emulator with multiple renderers"
 HOMEPAGE="http://gnuboy.unix-fu.org/"
@@ -14,14 +14,23 @@ KEYWORDS="amd64 ppc x86"
 IUSE="X fbcon sdl svga"
 
 RDEPEND="sdl? ( media-libs/libsdl )
-	     !X? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) )
-		 X? ( x11-libs/libXext )
-		 fbcon? ( sys-apps/fbset )"
+	!X? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) )
+	X? ( x11-libs/libXext )
+	fbcon? ( sys-apps/fbset )"
 DEPEND="${RDEPEND}
 	svga? ( media-libs/svgalib )
 	X? ( x11-proto/xextproto
 		x11-proto/xproto )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${P}-exec-stack.patch \
+		"${FILESDIR}"/${P}-linux-headers.patch
+	eautoreconf
+}
+
 src_compile() {
 	local myconf
 
@@ -44,8 +53,8 @@ src_compile() {
 src_install() {
 	for f in fbgnuboy sdlgnuboy sgnuboy xgnuboy
 	do
-		if [[ -f $f ]] ; then
-			dogamesbin $f || die "dogamesbin failed"
+		if [[ -f ${f} ]] ; then
+			dogamesbin ${f} || die "dogamesbin failed"
 		fi
 	done
 	dodoc README docs/{CHANGES,CONFIG,CREDITS,FAQ,HACKING,WHATSNEW}