added x86-macos keyword and extra dep (bug 464654); pax-marked tests so they finish on hardened (bug 415791)

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 19 insertions, 11 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index 0fc304af1ace..ceec34dedd5f 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.120 2013/08/10 02:43:06 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.121 2013/08/30 17:28:21 axs Exp $
+
+  30 Aug 2013; Ian Stakenvicius <axs@gentoo.org> metadata.xml,
+  spidermonkey-1.8.5-r4.ebuild:
+  added x86-macos keyword and extra dep (bug 464654); pax-marked tests so they
+  finish on hardened (bug 415791)
 
 *spidermonkey-17.0.0-r1 (10 Aug 2013)
 
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index d8f590a07a5e..26bedf2fe13a 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -33,15 +33,15 @@ EBUILD spidermonkey-1.7.0.ebuild 1432 SHA256 5df2e8917fce96363d2128a2fdafc623aa1
 EBUILD spidermonkey-1.8.2.15-r1.ebuild 1938 SHA256 b1fc8c11374df02de4ae2136127958f3d5b7d4c9dca349e396f5127769e9c0f2 SHA512 c5c10a981e7adfc1e04f19f28137b0d227136b1b05bbd8e7bf1f49e5efa9d871ef266ec0542afddb3ab7c2437213caac61fffc81bc08b2878fa2b39c54bd843e WHIRLPOOL e5f6e72e97089cd752753d0dec44074a5cc46b1e3e31601e7dd20267578ef33d2ee9b50f93d4138dcac2a372ed32046f84b58309eb93fa08231413ef04a22560
 EBUILD spidermonkey-1.8.2.15-r2.ebuild 1942 SHA256 2c992d6d203034d96467245b9e960d1ce6f6e6e57105695c2be6b2a8152e86d1 SHA512 afa0622a795c328039494303b6a168db1d0826271f476520d4fbb26f270f67aba9d53361c4f6d8dfcf8022dd0990d7f6e0dab2a526fe5ad1cea1c18ed8fe9fca WHIRLPOOL 2d440db163a99a7a834a6e3c3afbff358c994e71188543dcf02dc1021846d46a317c07bb00d2ef6a312ee663b7cd91397accef568ec54156a3fe27ea906d0f07
 EBUILD spidermonkey-1.8.2.15.ebuild 1907 SHA256 e03a07403e86e8a20c7efefc59dc5e84853cb8eb459e9685de79d7d90f46de19 SHA512 a684bc61faabcd69492a40c0cad6403605397c46b53e92e3b78df07dea2295fb07f0c9370e0c033fa2a20b7ec35f90ab85e942dddeb693e3afe1d481cfad9268 WHIRLPOOL da7b06b7bda65e2835c467916e496243231303ec7dd94f41c532cb7f6f3a8c264b25d5f39ca178c0300d1c94fd1d9ded64ffe06a6c0f5b58139eeace54b02ba5
-EBUILD spidermonkey-1.8.5-r4.ebuild 3922 SHA256 dfbed81f7be6856c0bdd064f4e57f5a939ee3456e2db2d67337772752044d1d4 SHA512 d0a93c7641dc82996308a34b7a444c3da3ea7398e95e6a0c027dd763871158cb61da83696980e724c18a72c947ef62ed20af8cc7f153348cf3c8be5c48fe79cc WHIRLPOOL dd844088c850936ecc0e9e0d17719b6f4db61c5c3fdbb9b4f38a838692106869d00afb259bfdf281222f4831f94239f7b0b63c6b0be96012ca0d5b3928714d98
+EBUILD spidermonkey-1.8.5-r4.ebuild 4010 SHA256 92127da6b4a5a2efb8dcfed7cbcfc52b3f026963409ed770a35ffc2b365d20d4 SHA512 e4e276f4b2895dd2babbd99659b34082936a1c788eb0640598c77bbbc03cefa310f7bbaf66bdbb18b404de884e4f83946e1dcb2ea6613787cb628f7d57a89af8 WHIRLPOOL d1b8c7719143a0c91093d875088d00b0fe249d12c29af53c8ba8d50adab460a5cc8496dbfb3259eebfd04de8390675c916c259ed8099dbf5e3662ee2c2bb2bb7
 EBUILD spidermonkey-1.8.7-r3.ebuild 3807 SHA256 85cfb138eab9d0dbf13b240d7f6972a7b4bd71266c6e68de4d9bbde0b11d384f SHA512 f4e6d27283f4c0052e3c88cafc237a802062ab5e945cbd9f82b7491f9120dab3eba670889d6cb2f1ad13debed3daec6c2752e29ab5d41499149dcdfd2a660195 WHIRLPOOL 13316f248ea613dc05b07994e026f8aa9752e47cb18261f80b44d483d9900bfe4efaffcded1c6806618fb3bfa49b5e28c16a1b7092b0f223ed144e17639392b6
 EBUILD spidermonkey-17.0.0-r1.ebuild 3218 SHA256 b99f65090d6f249022a255b5bbce1df8a93ef648431525b1013cd6a2eb476092 SHA512 f7c12969e4fa443046eb45961961f49246cf01de44debbff87b5607988d1f236302bbe323180873eb20214d1a7651807b1d0ef1c23db7e8602e56935e52ffb16 WHIRLPOOL bb46197ba315ab1e42c6844d4daee913587743957383bdc00c0eba091be3eae309e238c5ec726a5fd073e9f60a29942c70c0e61e2c8512ad7388536b6a16a57c
-MISC ChangeLog 19663 SHA256 6b451573431480f31e08ad3b37bc17eeb62436928fbfcc398be182e28dd485a5 SHA512 3adb0efe6b1845603ab3d383b4f4417343e682167e2beb13cac916475a2c238a6ca676d9695279db71e4bb74865bfceecb949c1b0f79373e471341a1815bf0fb WHIRLPOOL ec37b3d62b10e6f47a4366dd46a4fe3add07d23dba64e1f9a59139a7d0377133d2d6f45cd17b755703ceac5478881399829cd5b808bf140db49e90148b16844c
-MISC metadata.xml 518 SHA256 55d779229ca449e86ec0052deffcec1917d7012bf21f4314ed2ee5464d3b2a43 SHA512 7e479e71291031e8abad486fea8258fc6c0e398b42a1c3ee607252e7d3320b196b1e87fe01032c496a668c4c3af497acb3f993e58e53572ef88a8b83f5415706 WHIRLPOOL 5cf758c6d4111effbffd811c15f2380f16f43df86b3f88fad72b56612f2b520a814f4d0a64d04c4102219480ddead7e8539d0ebf63fee13526473edc25e1fa60
+MISC ChangeLog 19872 SHA256 087aebac4309e1b0ff8ea5ca3738b66ba27f438fdeb77ca9eabef9ff58af7fab SHA512 a693d1fdeb96a8a2170e520f7744b4a1e8fda133a488fb6e7c3d2b4fb7f13ff21f65760f2b5d04009ea11631348a1c504d3e11559f6c36458b85686d43b28606 WHIRLPOOL ac177dbd16cd56ac64e9fc9cb95d0b2ba60abe6d432820f137013ebef47e88182a26f0a1f4370ee577643e6e7dce37df351c6fce9ed7892ab82e298b9022d7dd
+MISC metadata.xml 518 SHA256 3e269ca10769d6bb9bc488f481a4487be5108d5e440775f865b4178daf89412e SHA512 9b767bf335e523d410ccdca16bcd44bd701ae7255ad9dcda1bc092708e0f69be3805001b7cf39688dcece38b35f67b375edd09aa712fce6ef5aec250dcac8896 WHIRLPOOL 90481c9ff831e4cd25d94443de5cdfac49238747587841d3ceb4493c1b6acf16dda648e368f2058936efbb2d24c0c4d481eb9905b15e412834f682b9accfdae8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlIFqNEACgkQ2ugaI38ACPAUgwEAhcMk6vdYuemtBKl1uv4PmdKb
-WcXoZglwi/Wy25jR15cBALcAkwFCjXdyl1On0ivcS9JCQ196ff3OoLy8HAPYkqXd
-=q2Ej
+iF4EAREIAAYFAlIg1joACgkQ2ugaI38ACPBK6wD/S7W1Z6ul3eUUJumz2HbO5Yni
+lEYiSDjeVS7qYGnAwjYA/1uUJI1yZ13XJxDPLYbdH/r1gMtkJc+a5ZnnDGTIRPFg
+=Zuut
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/spidermonkey/metadata.xml b/dev-lang/spidermonkey/metadata.xml
index 9cfa2ce411f0..0163cea2b2ec 100644
--- a/dev-lang/spidermonkey/metadata.xml
+++ b/dev-lang/spidermonkey/metadata.xml
@@ -6,7 +6,7 @@
 		Stand-alone JavaScript C library
 	</longdescription>
 	<use>
-		<flag name='debug'>Enable assertions to allow for easier debugging of programs that link to spidemronkey -- note this will often crash software on regular end-user systems</flag>
+		<flag name='debug'>Enable assertions to allow for easier debugging of programs that link to spidermonkey -- note this will often crash software on regular end-user systems</flag>
 		<flag name='threadsafe'>Build a threadsafe version of spidermonkey</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
index da33fb226c4e..730280d6d4d5 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild,v 1.19 2013/08/08 20:49:55 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild,v 1.20 2013/08/30 17:28:21 axs Exp $
 
 EAPI="5"
 WANT_AUTOCONF="2.1"
@@ -18,13 +18,14 @@ SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
 
 LICENSE="NPL-1.1"
 SLOT="0/mozjs185"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="debug minimal static-libs test"
 
 S="${WORKDIR}/${MY_P}"
 BUILDDIR="${S}/js/src"
 
-RDEPEND=">=dev-libs/nspr-4.7.0"
+RDEPEND=">=dev-libs/nspr-4.7.0
+	x64-macos? ( dev-libs/jemalloc )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	app-arch/zip
@@ -109,6 +110,8 @@ src_compile() {
 
 src_test() {
 	cd "${BUILDDIR}/jsapi-tests" || die
+	# for bug 415791
+	pax-mark mr jsapi-tests
 	emake check
 }