remove need for an executable stack

Package-Manager: portage-2.1.3_rc6

4 files changed, 68 insertions, 13 deletions

diff --git a/games-fps/industri/ChangeLog b/games-fps/industri/ChangeLog
index 61a4d853bdb9..cdce4cf29978 100644
--- a/games-fps/industri/ChangeLog
+++ b/games-fps/industri/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/industri
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/ChangeLog,v 1.8 2007/02/21 23:40:37 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/ChangeLog,v 1.9 2007/07/02 17:28:03 nyhm Exp $
+
+  02 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/industri-1.01-exec-stack.patch, industri-1.01.ebuild:
+  remove need for an executable stack
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-fps/industri/Manifest b/games-fps/industri/Manifest
index c1fa5dc6ad56..cb6c7d9f1e50 100644
--- a/games-fps/industri/Manifest
+++ b/games-fps/industri/Manifest
@@ -1,17 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX industri-1.01-exec-stack.patch 642 RMD160 ddb22f84e2daf1f2eee27ad13e30b7175aab2e4f SHA1 3df0fd513eb05e63ac83e897aef0cff51b7dcbb5 SHA256 d04cbf31f16929b27040ea9f4e599db2ea4e14b696708034ae523ff406de011c
+MD5 6e2534655bf0e638b3faf1e126999ec8 files/industri-1.01-exec-stack.patch 642
+RMD160 ddb22f84e2daf1f2eee27ad13e30b7175aab2e4f files/industri-1.01-exec-stack.patch 642
+SHA256 d04cbf31f16929b27040ea9f4e599db2ea4e14b696708034ae523ff406de011c files/industri-1.01-exec-stack.patch 642
 AUX industri.pretty 42 RMD160 45b349d4a44a8cdeb4fd2215af11be46b2ce33e3 SHA1 9d44b2cdfe7862993cba4581bad1b4d87b87960c SHA256 127a00f5ce37b1502a09d049d9ad32e468c398ba0a98fbf66142d1408c382ba3
 MD5 5c2c277e6fc318889a5bc2bf4f26c473 files/industri.pretty 42
 RMD160 45b349d4a44a8cdeb4fd2215af11be46b2ce33e3 files/industri.pretty 42
 SHA256 127a00f5ce37b1502a09d049d9ad32e468c398ba0a98fbf66142d1408c382ba3 files/industri.pretty 42
 DIST industri-1.00.zip 30339989 RMD160 a8c3086f0105c4c9f6ad8405fb58297c3a2fba26 SHA1 ba383c48ab043849b5a6908f550ad99356f4d2d2 SHA256 6c0761c6eacb501fffe37f9be4b9e2ae62074f8714c4ef36251241aba6b90652
 DIST industri_BIN-1.01-src.tar.gz 1086838 RMD160 288c35c9864d127ec1ea0c7f4bf90f65480c8ebf SHA1 34b3dfa47c8d838ad9d79432906f8be3ddf1e479 SHA256 b702b819c0b99cc9a7f8e9ec89c9a58812212826f592e3594904b4cd3cdd09f8
-EBUILD industri-1.01.ebuild 1938 RMD160 d8fdead2ab9360e822659d4a0e7d044a2d8538e5 SHA1 8906709195770f14d7b705637efd0524b8dfff85 SHA256 229cf9d2fce8ae4d0b7be80b41d169729ff23c9e952908879d014321c464bf39
-MD5 eb296c6f5730dfdfc7021a3d91f7b143 industri-1.01.ebuild 1938
-RMD160 d8fdead2ab9360e822659d4a0e7d044a2d8538e5 industri-1.01.ebuild 1938
-SHA256 229cf9d2fce8ae4d0b7be80b41d169729ff23c9e952908879d014321c464bf39 industri-1.01.ebuild 1938
-MISC ChangeLog 1009 RMD160 9e0107a021f2f70de48b4bef2e79aae5b79e04ab SHA1 61bc9edac4a9b98e8086794f354b886d78f6e14c SHA256 1877ff96d26142386a4c61ddfc270421422171314c636ba3de84bdc4a5b31390
-MD5 69a7d18f31a9e8b1dcd390ea6d0c2695 ChangeLog 1009
-RMD160 9e0107a021f2f70de48b4bef2e79aae5b79e04ab ChangeLog 1009
-SHA256 1877ff96d26142386a4c61ddfc270421422171314c636ba3de84bdc4a5b31390 ChangeLog 1009
+EBUILD industri-1.01.ebuild 1971 RMD160 a1f43855792e0e085fce5f0110ce859c10159af2 SHA1 bcc312348e544da7de7eb90902a02b57d9e931d7 SHA256 015f9e4245f6c14b8154d5ad962dd999b8c6cdccc750fe2b5bfdf30034a5f118
+MD5 6df0369ed24a0577c20aaa438a57a215 industri-1.01.ebuild 1971
+RMD160 a1f43855792e0e085fce5f0110ce859c10159af2 industri-1.01.ebuild 1971
+SHA256 015f9e4245f6c14b8154d5ad962dd999b8c6cdccc750fe2b5bfdf30034a5f118 industri-1.01.ebuild 1971
+MISC ChangeLog 1158 RMD160 66a1de17ea489fe2f731add03bc87bb69a3954a2 SHA1 d38ef86061443865ed87eb685127f6583fb3526f SHA256 c1343a21d37e023de7fa0c611f203f6b43a4183d1663ba66d0d8b7492dbec1b1
+MD5 70204fd7aadafe60cb5dd47495fbc4b1 ChangeLog 1158
+RMD160 66a1de17ea489fe2f731add03bc87bb69a3954a2 ChangeLog 1158
+SHA256 c1343a21d37e023de7fa0c611f203f6b43a4183d1663ba66d0d8b7492dbec1b1 ChangeLog 1158
 MISC metadata.xml 579 RMD160 f45d7504b9b1e9ab4a41fdf5aa396b6d7f71576d SHA1 3d060ebb0e9cd696cdcc8962363e3298c9b3b452 SHA256 2a18b6d76e1fe87370d6113bca5c558e0073866f5fa2ef316d76874b79aafb2a
 MD5 61da71fe698121d741feec7ee8a50d54 metadata.xml 579
 RMD160 f45d7504b9b1e9ab4a41fdf5aa396b6d7f71576d metadata.xml 579
@@ -19,3 +26,10 @@ SHA256 2a18b6d76e1fe87370d6113bca5c558e0073866f5fa2ef316d76874b79aafb2a metadata
 MD5 d6ab758cf30e258058c7cc7ba98bf1dc files/digest-industri-1.01 506
 RMD160 58be1b16cc5367e4e60a4e5e638cd53255d6eeb5 files/digest-industri-1.01 506
 SHA256 eb5004e97c281a9df3d5da12f03f75f90143a70a789b1dd38c872c645c62ae2f files/digest-industri-1.01 506
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGiTWrdz7hIScOURERAjFRAJ9v4wSN6D+3gsJARuYtsBb86GN6rgCg3lB9
+CEmkmlgGN8DM0wZ8mVZ0daA=
+=LJY+
+-----END PGP SIGNATURE-----
diff --git a/games-fps/industri/files/industri-1.01-exec-stack.patch b/games-fps/industri/files/industri-1.01-exec-stack.patch
new file mode 100644
index 000000000000..bc74e951fe6a
--- /dev/null
+++ b/games-fps/industri/files/industri-1.01-exec-stack.patch
@@ -0,0 +1,36 @@
+--- math.s
++++ math.s
+@@ -416,3 +416,6 @@
+ 	call	C(BOPS_Error)
+ 
+ #endif	// id386
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- snd_mixa.s
++++ snd_mixa.s
+@@ -216,3 +216,6 @@
+ 
+ #endif	// id386
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- sys_dosa.s
++++ sys_dosa.s
+@@ -93,3 +93,6 @@
+ 
+ 	ret
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- worlda.s
++++ worlda.s
+@@ -142,3 +142,6 @@
+ 
+ #endif	// id386
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/games-fps/industri/industri-1.01.ebuild b/games-fps/industri/industri-1.01.ebuild
index 03d6dcb7dcfb..83201d84e508 100644
--- a/games-fps/industri/industri-1.01.ebuild
+++ b/games-fps/industri/industri-1.01.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/industri-1.01.ebuild,v 1.13 2007/01/11 21:43:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/industri-1.01.ebuild,v 1.14 2007/07/02 17:28:03 nyhm Exp $
 
-inherit toolchain-funcs games
+inherit eutils toolchain-funcs games
 
 DESCRIPTION="Quake/Tenebrae based, single player game"
 HOMEPAGE="http://industri.sourceforge.net/"
@@ -21,8 +21,7 @@ RDEPEND="virtual/opengl
 	x11-libs/libX11
 	x11-libs/libXxf86vm
 	media-libs/libpng
-	cdinstall? ( games-fps/quake1-data )
-	sys-libs/zlib"
+	cdinstall? ( games-fps/quake1-data )"
 DEPEND="${RDEPEND}
 	x11-proto/xf86dgaproto
 	x11-proto/xextproto
@@ -49,6 +48,8 @@ src_unpack() {
 				|| die "sed failed"
 		fi
 	done
+
+	epatch "${FILESDIR}"/${P}-exec-stack.patch
 }
 
 src_compile() {