remove need for an executable stack

Package-Manager: portage-2.1.3_rc6

5 files changed, 101 insertions, 47 deletions

diff --git a/games-fps/nprquake-sdl/ChangeLog b/games-fps/nprquake-sdl/ChangeLog
index 850dc8e695f0..74b30f457689 100644
--- a/games-fps/nprquake-sdl/ChangeLog
+++ b/games-fps/nprquake-sdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/nprquake-sdl
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/nprquake-sdl/ChangeLog,v 1.6 2007/03/12 14:44:51 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/nprquake-sdl/ChangeLog,v 1.7 2007/07/02 21:46:18 nyhm Exp $
+
+  02 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/nprquake-sdl-1-exec-stack.patch, files/1-gentoo.patch,
+  nprquake-sdl-1-r1.ebuild:
+  remove need for an executable stack
 
   12 Mar 2007; Marius Mauch <genone@gentoo.org> nprquake-sdl-1-r1.ebuild:
   Replacing einfo with elog
diff --git a/games-fps/nprquake-sdl/Manifest b/games-fps/nprquake-sdl/Manifest
index ea218fe8ef61..becf3521908b 100644
--- a/games-fps/nprquake-sdl/Manifest
+++ b/games-fps/nprquake-sdl/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1-gentoo.patch 2611 RMD160 7bff190f68c746209ed667b950d9db7f7b580402 SHA1 4f6cd79566868eac706a7c886e3525d6438928cf SHA256 ce959d9eca6ddf47b6b26c3e6e2ee3934eab86b5d4bf69e6095778d1e310a99f
-MD5 7f1d3f402fe4ca8147e59c70385d0df7 files/1-gentoo.patch 2611
-RMD160 7bff190f68c746209ed667b950d9db7f7b580402 files/1-gentoo.patch 2611
-SHA256 ce959d9eca6ddf47b6b26c3e6e2ee3934eab86b5d4bf69e6095778d1e310a99f files/1-gentoo.patch 2611
+AUX 1-gentoo.patch 2681 RMD160 5fda684a1ef65e7ff39ec1b09f0ab439a9561542 SHA1 cf6c6accd782b3ca6b80bc939e7cca18f5737914 SHA256 f98a084e455abb5577ecabfa70acff1f1d0dbf2322cc4a982de1f52773107340
+MD5 c0ea42656f28efa1d08d1eda30bfdbee files/1-gentoo.patch 2681
+RMD160 5fda684a1ef65e7ff39ec1b09f0ab439a9561542 files/1-gentoo.patch 2681
+SHA256 f98a084e455abb5577ecabfa70acff1f1d0dbf2322cc4a982de1f52773107340 files/1-gentoo.patch 2681
+AUX nprquake-sdl-1-exec-stack.patch 738 RMD160 038cae0a46a15512a6fddacae7168a9ae60903ce SHA1 b61e8a1217af34a94e9f2f02382ab4e5d190f783 SHA256 cc82f9cd428bdfa9cc63a539692321573a415c18b6a442665a219f915294c868
+MD5 776eea4553e39ac1177a19e738cdc8f0 files/nprquake-sdl-1-exec-stack.patch 738
+RMD160 038cae0a46a15512a6fddacae7168a9ae60903ce files/nprquake-sdl-1-exec-stack.patch 738
+SHA256 cc82f9cd428bdfa9cc63a539692321573a415c18b6a442665a219f915294c868 files/nprquake-sdl-1-exec-stack.patch 738
 DIST NPRQuake-SDL.tar.gz 3393497 RMD160 dc0359a4504c7dc5b751bacf2442c926684626ab SHA1 1efd4df26c9f6e3e1dc7e0d9b14f6f08ae896fb7 SHA256 f4c88c1f31909d2e870d331d1f0badaa8ff787f56521cd2d449f279a62fb3e46
-EBUILD nprquake-sdl-1-r1.ebuild 1893 RMD160 b5d4044f56d575eb560c7054bdf89714cb71277d SHA1 4601c3fb6522e036f08844f812a80bd289f92e27 SHA256 452d5d280de0cfdac5ac6cb3e447ab94aa3f285cde24012f5160c133fdb4a5ab
-MD5 22bdb2c7d58592ce555be486a883be8d nprquake-sdl-1-r1.ebuild 1893
-RMD160 b5d4044f56d575eb560c7054bdf89714cb71277d nprquake-sdl-1-r1.ebuild 1893
-SHA256 452d5d280de0cfdac5ac6cb3e447ab94aa3f285cde24012f5160c133fdb4a5ab nprquake-sdl-1-r1.ebuild 1893
-MISC ChangeLog 723 RMD160 3bf41dafdb8f28c6cef0976dc00b89ad8c8a9093 SHA1 7e9dd32eb51c903c264a928b1db0b9335d373d91 SHA256 113886440990de9e703ba2790a0a3c34fe0094658e876375360c7c4f07af3685
-MD5 1c17177161fd81bda1839942c1d00baf ChangeLog 723
-RMD160 3bf41dafdb8f28c6cef0976dc00b89ad8c8a9093 ChangeLog 723
-SHA256 113886440990de9e703ba2790a0a3c34fe0094658e876375360c7c4f07af3685 ChangeLog 723
+EBUILD nprquake-sdl-1-r1.ebuild 1953 RMD160 ef6a97f44b83acf8408ed696a75b94730bf3fcbb SHA1 e992f06acbcda426a36565948e650644d922ab6c SHA256 3c9fd8e66693a0f506ca470cf9e3d3a0525f5aac0275218df6d562ebd2cb02aa
+MD5 2ef80b9222d0650e2a5365221ee76fd2 nprquake-sdl-1-r1.ebuild 1953
+RMD160 ef6a97f44b83acf8408ed696a75b94730bf3fcbb nprquake-sdl-1-r1.ebuild 1953
+SHA256 3c9fd8e66693a0f506ca470cf9e3d3a0525f5aac0275218df6d562ebd2cb02aa nprquake-sdl-1-r1.ebuild 1953
+MISC ChangeLog 900 RMD160 a47c07b1d53417786282dc4859126ca182ad84d1 SHA1 5d960bebf119f437f90d85a8edb4025774aa237f SHA256 8c4dd8612eb80db95931f4dd94dd9d2c121c07bd9b97fe149ada8471e26f2459
+MD5 2cbde51a2b0e33e42030731fe59d015b ChangeLog 900
+RMD160 a47c07b1d53417786282dc4859126ca182ad84d1 ChangeLog 900
+SHA256 8c4dd8612eb80db95931f4dd94dd9d2c121c07bd9b97fe149ada8471e26f2459 ChangeLog 900
 MISC metadata.xml 791 RMD160 65ab8ee79685914dc959e723201d6218ce43f9f2 SHA1 de924251db2ada8bc3b12bcd344a0606654b0c9f SHA256 eeb2e808574f5573b21cf3a2231ec32e90654ef0ec91c0ef0646cc9e4eb9d0f0
 MD5 722404c5362ee00fc5384316c3a2e8f7 metadata.xml 791
 RMD160 65ab8ee79685914dc959e723201d6218ce43f9f2 metadata.xml 791
@@ -22,9 +26,9 @@ MD5 04bf9b518039ab2c735413d2972b3e43 files/digest-nprquake-sdl-1-r1 241
 RMD160 6aeecb33b6f360a71e119397d3e259140076976c files/digest-nprquake-sdl-1-r1 241
 SHA256 89714abd9d23f96f67c8c41b551b927da3137d51b1896b0eb041ff0e46ae43da files/digest-nprquake-sdl-1-r1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGGn3Tdz7hIScOURERAgZDAKDFioo+6yQtwmUYyUFKhl7X8VRcaQCdGcwZ
-DB+0IVh6msQf4Rd7/tu6TAY=
-=LGYS
+iD8DBQFGiXIwdz7hIScOURERAjC+AKCdGEZsUFGgz3Ij6VfKpytjinco4wCeL6gc
+LEyL6RJUfr1p74Ld0hkef8s=
+=AtV+
 -----END PGP SIGNATURE-----
diff --git a/games-fps/nprquake-sdl/files/1-gentoo.patch b/games-fps/nprquake-sdl/files/1-gentoo.patch
index 6d45b15c6b75..0f1ec8dcba2d 100644
--- a/games-fps/nprquake-sdl/files/1-gentoo.patch
+++ b/games-fps/nprquake-sdl/files/1-gentoo.patch
@@ -1,33 +1,20 @@
---- NPRQuake-SDL/Makefile
-+++ NPRQuake-SDL/Makefile
-@@ -1,4 +1,4 @@
+--- Makefile
++++ Makefile
+@@ -1,10 +1,10 @@
 -RELEASE_CFLAGS=-Dstricmp=strcasecmp -mcpu=i586 -march=i586 -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
 +RELEASE_CFLAGS=-Dstricmp=strcasecmp $(OPTFLAGS) -DGENTOO_LIBDIR='\"$(GENTOO_LIBDIR)\"' -DGENTOO_DATADIR='\"$(GENTOO_DATADIR)\"'
  
  DEBUG_CFLAGS=-Dstricmp=strcasecmp -g
  
---- NPRQuake-SDL/NPRQuakeSrc/Makefile
-+++ NPRQuake-SDL/NPRQuakeSrc/Makefile
-@@ -29,7 +29,7 @@
- 
- CC=gcc
- 
--RELEASE_CFLAGS=$(BASE_CFLAGS) -mcpu=i586 -march=i586 -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
-+RELEASE_CFLAGS=$(BASE_CFLAGS) $(OPTFLAGS) -DGENTOO_LIBDIR='\"$(GENTOO_LIBDIR)\"' -DGENTOO_DATADIR='\"$(GENTOO_DATADIR)\"'
- DEBUG_CFLAGS=$(BASE_CFLAGS) -g
- LDFLAGS=-lm
  CFLAGS=$(RELEASE_CFLAGS)
-@@ -176,7 +176,7 @@
- 	$(DO_GL_CC)
  
- $(BUILDDIR)/glquake/common.o :       common.c
--	$(DO_GL_DEBUG_CC)
-+	$(DO_GL_CC)
+-DR_FLAGS=-DGLQUAKE -D_DLL_BUILD -shared
++DR_FLAGS=-DGLQUAKE -D_DLL_BUILD -shared -fPIC
  
- $(BUILDDIR)/glquake/console.o :      console.c
- 	$(DO_GL_CC)
---- NPRQuake-SDL/NPRQuakeSrc/common.c
-+++ NPRQuake-SDL/NPRQuakeSrc/common.c
+ renderers=build/dr_default.so build/brush.so build/bprint.so build/sketch.so
+ 
+--- NPRQuakeSrc/common.c
++++ NPRQuakeSrc/common.c
 @@ -1775,11 +1775,16 @@
  // start up with GAMENAME by default (id1)

  //

@@ -55,8 +42,8 @@
  	}

  

  //

---- NPRQuake-SDL/NPRQuakeSrc/gl_rmisc.c
-+++ NPRQuake-SDL/NPRQuakeSrc/gl_rmisc.c
+--- NPRQuakeSrc/gl_rmisc.c
++++ NPRQuakeSrc/gl_rmisc.c
 @@ -563,13 +563,15 @@
  
      // this should be as big as the number of functions we pull out.
@@ -74,8 +61,28 @@
  #endif
  
      if( hnewlib == NULL ) {
---- NPRQuake-SDL/NPRQuakeSrc/sys_linux.c
-+++ NPRQuake-SDL/NPRQuakeSrc/sys_linux.c
+--- NPRQuakeSrc/Makefile
++++ NPRQuakeSrc/Makefile
+@@ -29,7 +29,7 @@
+ 
+ CC=gcc
+ 
+-RELEASE_CFLAGS=$(BASE_CFLAGS) -mcpu=i586 -march=i586 -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
++RELEASE_CFLAGS=$(BASE_CFLAGS) $(OPTFLAGS) -DGENTOO_LIBDIR='\"$(GENTOO_LIBDIR)\"' -DGENTOO_DATADIR='\"$(GENTOO_DATADIR)\"'
+ DEBUG_CFLAGS=$(BASE_CFLAGS) -g
+ LDFLAGS=-lm
+ CFLAGS=$(RELEASE_CFLAGS)
+@@ -176,7 +176,7 @@
+ 	$(DO_GL_CC)
+ 
+ $(BUILDDIR)/glquake/common.o :       common.c
+-	$(DO_GL_DEBUG_CC)
++	$(DO_GL_CC)
+ 
+ $(BUILDDIR)/glquake/console.o :      console.c
+ 	$(DO_GL_CC)
+--- NPRQuakeSrc/sys_linux.c
++++ NPRQuakeSrc/sys_linux.c
 @@ -86,7 +86,7 @@
  void Sys_Printf (char *fmt, ...)
  {
diff --git a/games-fps/nprquake-sdl/files/nprquake-sdl-1-exec-stack.patch b/games-fps/nprquake-sdl/files/nprquake-sdl-1-exec-stack.patch
new file mode 100644
index 000000000000..99edb83a1b32
--- /dev/null
+++ b/games-fps/nprquake-sdl/files/nprquake-sdl-1-exec-stack.patch
@@ -0,0 +1,36 @@
+--- NPRQuakeSrc/math.s
++++ NPRQuakeSrc/math.s
+@@ -416,3 +416,6 @@
+ 	call	C(BOPS_Error)
+ 
+ #endif	// id386
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- NPRQuakeSrc/snd_mixa.s
++++ NPRQuakeSrc/snd_mixa.s
+@@ -216,3 +216,6 @@
+ 
+ #endif	// id386
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- NPRQuakeSrc/sys_dosa.s
++++ NPRQuakeSrc/sys_dosa.s
+@@ -93,3 +93,6 @@
+ 
+ 	ret
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- NPRQuakeSrc/worlda.s
++++ NPRQuakeSrc/worlda.s
+@@ -142,3 +142,6 @@
+ 
+ #endif	// id386
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/games-fps/nprquake-sdl/nprquake-sdl-1-r1.ebuild b/games-fps/nprquake-sdl/nprquake-sdl-1-r1.ebuild
index 34d729048905..703f2aa300bd 100644
--- a/games-fps/nprquake-sdl/nprquake-sdl-1-r1.ebuild
+++ b/games-fps/nprquake-sdl/nprquake-sdl-1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/nprquake-sdl/nprquake-sdl-1-r1.ebuild,v 1.12 2007/04/09 17:54:20 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/nprquake-sdl/nprquake-sdl-1-r1.ebuild,v 1.13 2007/07/02 21:46:18 nyhm Exp $
 
 inherit eutils games
 
@@ -22,16 +22,18 @@ S=${WORKDIR}/NPRQuake-SDL
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
+	epatch \
+		"${FILESDIR}"/${PV}-gentoo.patch \
+		"${FILESDIR}"/${P}-exec-stack.patch
 }
 
 src_compile() {
-	make \
+	emake \
 		GENTOO_LIBDIR="$(games_get_libdir)/${PN}" \
 		GENTOO_DATADIR="${GAMES_DATADIR}/quake1" \
 		OPTFLAGS="${CFLAGS}" \
 		release \
-		|| die
+		|| die "emake failed"
 }
 
 src_install() {