Adjusted deps for dev-lang/spidermonkey to ensure SLOT=0

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

4 files changed, 21 insertions, 21 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index aec10c1f6997..6500d85f05cf 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/polkit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.143 2013/08/08 21:10:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.144 2013/08/09 18:38:03 axs Exp $
+
+  09 Aug 2013; Ian Stakenvicius <axs@gentoo.org> polkit-0.110.ebuild,
+  polkit-0.111-r1.ebuild:
+  Adjusted deps for dev-lang/spidermonkey to ensure SLOT=0
 
 *polkit-0.111-r1 (08 Aug 2013)
 
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index bcb07087ef3a..2eb2098a6429 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -4,19 +4,15 @@ Hash: SHA256
 AUX polkit-0.110-W_define.patch 810 SHA256 75a47bbf04e328a8622996d40128752c6951ce434c404cca87ad3838b848874b SHA512 e17cb4867c0d16c04e4d68dfb95eb58f27cf64e1b8c6b36fa24c876c78bee990bb07a08bb7c335e333797075911639b8c6049909e7948bc86fd07e1abce2be88 WHIRLPOOL 74610ba53eb185f3963fe6dfdddcb2eb4aaa4bf23057939dcfde0d4ada296c7f904a2d45e470a0f0cdae9919c6f51512ee45ea7cb623eb3367439abeac2cb538
 DIST polkit-0.110.tar.gz 1390215 SHA256 8e5c5044bb968643b7fa379f287fb10582615df760ad2f1cb84be6e19fafe6e8 SHA512 f2630a84c21216edfc69f56092ba1b127b7765dcf4fe29a7f2f81d7163c11c643a931b215847a3fc6434c482cf12a48fef2f0e2c007d587c8bbb2fbca74eda67 WHIRLPOOL 1a4928733cdab6c9dfa186643959f15d395f6d6cba0a3790a9716282d331ceed3e962e58dc39ed2c40474238fc4d4c9e54662b20d0055059c512d42eed85631b
 DIST polkit-0.111.tar.gz 1396389 SHA256 02ae544547211b687818c97bcbf19bf6b8b5be7fda93000525a8765c7bed1ea1 SHA512 88eb1dfad25244020632f964219a382f7b7f7efc00cf563c66f9c6e6ef72af3c7198602be751aa8f0845b5b4f928d003e8041e1c92533beb9d00c38a7688b2d0 WHIRLPOOL dc3941e3de2767b766e4b984475485c743de113fe7b6fe1e6d89acff1a113bdb825366bc214a02aa07fdd148337ff11614a37ca450743910c4953979f99f4604
-EBUILD polkit-0.110.ebuild 3131 SHA256 4732f21b969cb8f66dd2f5e26ed5325758c757340ebea9e68d444391e643e93e SHA512 b285af96f181665aa13b6fff8f2f8fa09c911ef8b50f5a15b7856af7d251099c5670da763832a1d81025888083263019cb7bdd72648a8efcb5c4fb2bb0325a16 WHIRLPOOL 4ada5cbc533c29eed476799458cce402b152cd1933f8c3af007047276b601bede72b612cd2f979c3c23aa51e37471bd7dd5c43cd891edc7f1fece0c6698d2e80
-EBUILD polkit-0.111-r1.ebuild 2950 SHA256 64fc7799b1bdfcb4ffe7a2df98452410d131c7df8b83c3f3960037a105971e46 SHA512 45fbd584b29168cd34d936296f25fdb6f64a1f5a8ea70a7df1116c5643706bfd38b1305494e491c191c2aeeab41942211d8e74171c7bf3adad17967182784c1c WHIRLPOOL b2315a13d261b31eb0c33c3ae96a7e5d7cec440b1bd9e5d16d140e49026de3aea3ee9da1f7c7333f9178598148e442f5d1cf7b89940f776f36e0fb52e1ec5d83
+EBUILD polkit-0.110.ebuild 3134 SHA256 3ecc480f3755637ecf70d5e39d80efac3b25f215d8a70410fc4ea97581eef99c SHA512 83869331bbab29bc6b1586cf8fdb8e52a5362e65d4ca50705bc29e87fd5f848bf63c8c7da055651a6e82e4b73337138481ad659fc693987f151cf2f9fcf477c9 WHIRLPOOL 3de7e2f81da275e33745e75a952bb758474a4495296a397bfca1097e624f9db353c110d5d289a399c186398674e4e5e2fb69581b801e12407869d0566a2af6c2
+EBUILD polkit-0.111-r1.ebuild 3009 SHA256 377bce849a472b30d9584157450243b50932699426555551ecbba5d604f90599 SHA512 b9aa0893f3c1b844ec2ea8bd4d6ac7e1310700e732ebf2bc72b6bb69d74f6870b07a83f638e6f3abf541542121566de1f73338124e26050a4675550696d25932 WHIRLPOOL c51bc55fa7862c5b336299f8d23fc9e29bc8d99eccaea8a8161909a7ecb1912aa5f85662dd7ff659a3070b984406a18ca21eeb2fa88f72942981af4271e94bfb
 EBUILD polkit-0.111.ebuild 2966 SHA256 158aea105b7c7196ca09f653ef29f8953375c63c903d8f407e3f0a206515dcf8 SHA512 3f0cc10c1a1c553b2f518e85f24dfe0711f690cbfa40e782e88e3ceba48a8887c3530d5edded4060d7e933e4fe112ef90d10e2ca7f3222f9f7a5caaed5322bde WHIRLPOOL 4cf5e6904f80d5278adf6cc822633f89cec420be667910756b191d3046109b7ba8d0f2c3f0e007a774bcd0517a286615802605a96270d225d13052b26f8eab5e
-MISC ChangeLog 19844 SHA256 03cd35f272359e665af64f5860356e9303339f9ae72c13281faac6ad195368eb SHA512 17231b2804b5c7ea3c7490551dd8853259540c7235f90615832514eb30d312985898d47c39fac70c8fbaa3fd920db0f4b760e8e9ccf657e30942836cde69869e WHIRLPOOL 477984840f3fdc47f6a3451b1258e3402c4afed2cb40e666055bd079c6c57a2cea87a7c6bbe49882ecf089d57424f021ad37996ddbdacb360f13abb60b07258a
+MISC ChangeLog 19994 SHA256 891233aafe9e0ec9e71a594d61653cceb10b9b22eef2bc6062636367599ed9d9 SHA512 c164f63bf13aab8844a8673759d0605d97b62d9cd009c8526286f5a0889fa53e9b4abcd2497b7591b93ba44f16650400675f1fc1dc63f642c7013704f11d4a9c WHIRLPOOL 691d3ffe5a567776e488f5847c59d3d227a9e31f1048f5ff4304a310b66e7ec3487670e991e9776c3a6a2b9c464e8b2ba07c0b7a84a259faa5404c5d576dbba9
 MISC metadata.xml 516 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba SHA512 293585c3b4c95b76af687f398645982d84d583e3cbf039a181c67c9710a899dad34cba9ff43f7be03a00d7552f42f0ac0a2a997c3ce7c9b80097a43f501001d4 WHIRLPOOL 4caf1316226570bec927b20957e420217a490c91013154b84f56fddf50cd5b525ccd0fd736a305ef5bc772cca734aadd8fec757238021b3e05046b503468e1a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSBAizAAoJEEdUh39IaPFNTRUIAIU13WfemsOfn6QFewkkjXX5
-IpbtDwtdH/J34kOGGgV2Z9Xh8ZcggeQT34y80s417P3zmWlr3FqFapposNhFOSj4
-vzTredYfn1sBG7/Jou5KmaI/TYWEYm5+BEkl2ZjN74RDaQnoPPqj/TbXJ7dvzWzo
-JJwCj4EAQGh9m/TXs/xWqN3erhIC336Zn6qna7GAWk8PdeqLJtk+0B3YrBRjEE+i
-3IxptEVWHA8mKBW6/G9sdvEI6BZm/GqTX81WIUoGwJt6QDpnngX3aetjGf1qUuq8
-HW2WB/GTQZ5FukzxhLj/unbIolQPp9FkcS4gkoRngmXk3IFSeeQXb379MoF0Xyk=
-=vuuI
+iF4EAREIAAYFAlIFNx8ACgkQ2ugaI38ACPB/4AD8C+mMsYpnbm+BiTqvZt/s5drT
++PCasx1EHFpu22rVGeAA/joPPoe/KdnQ8i7cJG7R323b0sHpb7Z4JSIEeEHSMhJm
+=0W/J
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/polkit-0.110.ebuild b/sys-auth/polkit/polkit-0.110.ebuild
index a3d3ff5e3fa1..bc917f204a05 100644
--- a/sys-auth/polkit/polkit-0.110.ebuild
+++ b/sys-auth/polkit/polkit-0.110.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/sys-auth/polkit/polkit-0.110.ebuild,v 1.13 2013/03/19 20:35:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.110.ebuild,v 1.14 2013/08/09 18:38:03 axs Exp $
 
 EAPI=5
 inherit eutils multilib pam pax-utils systemd user
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="examples gtk +introspection kde nls pam selinux systemd"
 
-RDEPEND=">=dev-lang/spidermonkey-1.8.5-r1[-debug]
+RDEPEND=">=dev-lang/spidermonkey-1.8.5-r1:0=[-debug]
 	>=dev-libs/glib-2.32
 	>=dev-libs/expat-2
 	introspection? ( >=dev-libs/gobject-introspection-1 )
diff --git a/sys-auth/polkit/polkit-0.111-r1.ebuild b/sys-auth/polkit/polkit-0.111-r1.ebuild
index 4d472e559bc1..92ede76fb0d5 100644
--- a/sys-auth/polkit/polkit-0.111-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.111-r1.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/sys-auth/polkit/polkit-0.111-r1.ebuild,v 1.1 2013/08/08 21:10:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.111-r1.ebuild,v 1.2 2013/08/09 18:38:03 axs Exp $
 
 EAPI=5
 inherit eutils multilib pam pax-utils systemd user
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="examples gtk +introspection kde nls pam selinux systemd"
 
-RDEPEND="dev-lang/spidermonkey:17[-debug]
+RDEPEND="ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
+	!ia64? ( dev-lang/spidermonkey:17[-debug] )
 	>=dev-libs/glib-2.32
 	>=dev-libs/expat-2:=
 	introspection? ( >=dev-libs/gobject-introspection-1 )
@@ -70,7 +71,7 @@ src_configure() {
 		$(use_enable introspection) \
 		--disable-examples \
 		$(use_enable nls) \
-		--with-mozjs=mozjs-17.0 \
+		$(usex ia64 --with-mozjs=mozjs185 --with-mozjs=mozjs-17.0) \
 		"$(systemd_with_unitdir)" \
 		--with-authfw=$(usex pam pam shadow) \
 		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
@@ -82,11 +83,10 @@ src_compile() {
 
 	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
 	local f='src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest'
-	if has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m ${f}
-	elif has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr ${f}
-	fi
+	local m='m'
+	# ia64 uses spidermonkey-1.8.5 which requires different pax-mark flags
+	use ia64 && m='mr'
+	pax-mark ${m} ${f}
 }
 
 src_install() {