Fix up the execstack stuff so it works for people not using the default GAMES_PREFIX_OPT.

Package-Manager: portage-2.1.1_rc1-r1

diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog
index 169ee8db1403e0cbed336abe3eafc67a5b6df00f..086c62665b49f2ab38f92aef4ca827493aa23ed0 100644 (file)
--- a/games-fps/ut2004/ChangeLog
+++ b/games-fps/ut2004/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/ut2004
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.53 2006/05/17 15:07:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.54 2006/09/06 22:37:10 wolf31o2 Exp $
+
+  06 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> ut2004-3369-r4.ebuild:
+  Fix up the execstack stuff so it works for people not using the default
+  GAMES_PREFIX_OPT.
 
   17 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   -ut2004-3369-r2.ebuild:

diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
index 48431067e42812a6dcc8bb478e2c5cdca0121931..7e001cb5fb672bc843ed9157e15375c5d930fd77 100644 (file)
--- a/games-fps/ut2004/Manifest
+++ b/games-fps/ut2004/Manifest
@@ -1,20 +1,30 @@
-AUX ut2004.xml 358 RMD160 777a50b9d742f72bf80fbe485650c3fd1301d358 SHA1 87484382abc9776d5b103ac673a32f7f8006f582 SHA256 787da216a5b8dce71b3dd9b9782ed628a88a983bfe7a9071050a48dd1eccfe4e size 358
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ut2004.xml 358 RMD160 777a50b9d742f72bf80fbe485650c3fd1301d358 SHA1 87484382abc9776d5b103ac673a32f7f8006f582 SHA256 787da216a5b8dce71b3dd9b9782ed628a88a983bfe7a9071050a48dd1eccfe4e
 MD5 e199cda0f458ab3a4b3ca2e482451c8f files/ut2004.xml 358
 RMD160 777a50b9d742f72bf80fbe485650c3fd1301d358 files/ut2004.xml 358
 SHA256 787da216a5b8dce71b3dd9b9782ed628a88a983bfe7a9071050a48dd1eccfe4e files/ut2004.xml 358
-DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 RMD160 af632d8cd1f05e36e861eb3fab927ffc8ae3f59d SHA256 438b9b13a367d46f23cce12b065382a55afa2fc68add1f1dd3db03b015f60bb3 size 22465217
-EBUILD ut2004-3369-r4.ebuild 4965 RMD160 b213f26f87c2ff30fc22fbb547c3c90940eb3254 SHA1 34d3c0847f297c52a9017c1ef5d9a81806a8def0 SHA256 7150a525cdf43c68180b43c2a5585af94601f1d44d7d176c459a2a3bc2b714d9 size 4965
-MD5 14a24daf0d17dddabd52996b2edb9ce9 ut2004-3369-r4.ebuild 4965
-RMD160 b213f26f87c2ff30fc22fbb547c3c90940eb3254 ut2004-3369-r4.ebuild 4965
-SHA256 7150a525cdf43c68180b43c2a5585af94601f1d44d7d176c459a2a3bc2b714d9 ut2004-3369-r4.ebuild 4965
-MISC ChangeLog 9648 RMD160 efba20756d77c744604a868aaf5ecf2a84bcfba7 SHA1 c7386cec197598eb55ef9551979781d6e252e0c9 SHA256 a6697cfb296d6cc440da3110d6721c09d9a0acb9d4b438658c226632ff48df4c size 9648
-MD5 91a0a3a6984186a3f90e3a6a952f4ddc ChangeLog 9648
-RMD160 efba20756d77c744604a868aaf5ecf2a84bcfba7 ChangeLog 9648
-SHA256 a6697cfb296d6cc440da3110d6721c09d9a0acb9d4b438658c226632ff48df4c ChangeLog 9648
-MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535 size 254
+DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 RMD160 af632d8cd1f05e36e861eb3fab927ffc8ae3f59d SHA256 438b9b13a367d46f23cce12b065382a55afa2fc68add1f1dd3db03b015f60bb3
+EBUILD ut2004-3369-r4.ebuild 5039 RMD160 1a9e477e978d349348a5e79d70b6932b5d6f1a7a SHA1 310628705864466d597b2b87bf748e9abbc9be24 SHA256 557958efee0a8787eda32319687089e0345645351420611f298e17a611294d36
+MD5 f8442c9cc63f4cd9305efda233b4a414 ut2004-3369-r4.ebuild 5039
+RMD160 1a9e477e978d349348a5e79d70b6932b5d6f1a7a ut2004-3369-r4.ebuild 5039
+SHA256 557958efee0a8787eda32319687089e0345645351420611f298e17a611294d36 ut2004-3369-r4.ebuild 5039
+MISC ChangeLog 9820 RMD160 ce9396d23ca34423410e9bde724dddec883e9c60 SHA1 295ab7be42337bcb8ea0c3c2abd5d2f5bc62b4a9 SHA256 ab256539e8eab456bdec9a009bc63105c68035a8daba5bd74e5c05f7bbadb3d5
+MD5 99f37965d20b4a519901b1fac99f125a ChangeLog 9820
+RMD160 ce9396d23ca34423410e9bde724dddec883e9c60 ChangeLog 9820
+SHA256 ab256539e8eab456bdec9a009bc63105c68035a8daba5bd74e5c05f7bbadb3d5 ChangeLog 9820
+MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
 SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535 metadata.xml 254
 MD5 2316e4a01aee16470ad74edc0de49cab files/digest-ut2004-3369-r4 274
 RMD160 a4f837e7ef67ff362db4c743a1dad0543dfa5fc7 files/digest-ut2004-3369-r4 274
 SHA256 1d955ade2fd863e38d6a1170b089ee73152a05e1ce800f24db8095bba8e2e57f files/digest-ut2004-3369-r4 274
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD4DBQFE/020kT4lNIS36YERAkUvAJ4kqLb1YfVzqf0ZuHQ6A8d43zXmRQCY8kqL
+7GF4LZBF0pyTFqxz52OZFQ==
+=mm7+
+-----END PGP SIGNATURE-----

diff --git a/games-fps/ut2004/ut2004-3369-r4.ebuild b/games-fps/ut2004/ut2004-3369-r4.ebuild
index 2091e04f3919d52aa45b6912bbfc8796d8f89b42..e9f55fab6717357c463b888e56c473504001e777 100644 (file)
--- a/games-fps/ut2004/ut2004-3369-r4.ebuild
+++ b/games-fps/ut2004/ut2004-3369-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild,v 1.8 2006/05/01 21:26:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild,v 1.9 2006/09/06 22:37:10 wolf31o2 Exp $
 
 inherit eutils multilib games
 
@@ -16,8 +16,10 @@ LICENSE="ut2003"
 SLOT="0"
 KEYWORDS="amd64 x86"
 # The executable pages are required.
-QA_EXECSTACK_x86="opt/ut2004/System/ut2004-bin opt/ut2004/System/ucc-bin"
-QA_EXECSTACK_amd64="opt/ut2004/System/ut2004-bin opt/ut2004/System/ucc-bin"
+QA_EXECSTACK_x86="${GAMES_PREFIX_OPT:1}/ut2004/System/ut2004-bin
+       ${GAMES_PREFIX_OPT:1}/ut2004/System/ucc-bin"
+QA_EXECSTACK_amd64="${GAMES_PREFIX_OPT:1}/ut2004/System/ut2004-bin
+       ${GAMES_PREFIX_OPT:1}/ut2004/System/ucc-bin"
 RESTRICT="mirror strip"
 IUSE="opengl"