Version bump, use spidermonkey-185 because of problems with memory handling when using mozjs-17 (#553334)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 41 insertions, 292 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index e8b221c54763..df558e134c43 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/polkit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.193 2015/06/06 08:52:19 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.194 2015/07/04 13:26:52 pacho Exp $
+
+*polkit-0.113 (04 Jul 2015)
+
+  04 Jul 2015; Pacho Ramos <pacho@gentoo.org> +polkit-0.113.ebuild,
+  -files/polkit-0.110-W_define.patch, -polkit-0.110.ebuild,
+  -polkit-0.112-r1.ebuild, -polkit-0.112.ebuild:
+  Version bump, use spidermonkey-185 because of problems with memory handling
+  when using mozjs-17 (#553334)
 
 *polkit-0.112-r3 (06 Jun 2015)
 
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 343c3f7d23e1..2ecb7c09a9bf 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,33 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX polkit-0.110-W_define.patch 810 SHA256 75a47bbf04e328a8622996d40128752c6951ce434c404cca87ad3838b848874b SHA512 e17cb4867c0d16c04e4d68dfb95eb58f27cf64e1b8c6b36fa24c876c78bee990bb07a08bb7c335e333797075911639b8c6049909e7948bc86fd07e1abce2be88 WHIRLPOOL 74610ba53eb185f3963fe6dfdddcb2eb4aaa4bf23057939dcfde0d4ada296c7f904a2d45e470a0f0cdae9919c6f51512ee45ea7cb623eb3367439abeac2cb538
 AUX polkit-0.112-0001-backend-Handle-invalid-object-paths-in-RegisterAuthe.patch 4368 SHA256 23a91c9cff2c702a2bf93e78a445e69bb42265bd837c8c543d5da3e0c78c3f1f SHA512 1db1da9f36e917ee2b93b9976de85f6c5b295ae76adb84c255f3f252f5e2c8c99ae1e0cd3e4d460638038b1e1beaddc0cde76ad83f08b5fddc5fa3cb2a0aea26 WHIRLPOOL 6624cdfc49e11382b1e53300193c57d74cf03985ae52d2240464a3c6016f2a52a2716ca2abfd6f154b525b1c740706cb7e99e92700655cd91e0bfb87c335e9eb
-DIST polkit-0.110.tar.gz 1390215 SHA256 8e5c5044bb968643b7fa379f287fb10582615df760ad2f1cb84be6e19fafe6e8 SHA512 f2630a84c21216edfc69f56092ba1b127b7765dcf4fe29a7f2f81d7163c11c643a931b215847a3fc6434c482cf12a48fef2f0e2c007d587c8bbb2fbca74eda67 WHIRLPOOL 1a4928733cdab6c9dfa186643959f15d395f6d6cba0a3790a9716282d331ceed3e962e58dc39ed2c40474238fc4d4c9e54662b20d0055059c512d42eed85631b
 DIST polkit-0.112.tar.gz 1429240 SHA256 d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6 SHA512 e4ad1bd287b38e5650cb94b1897a959b2ceaa6c19b4478ba872eacb13b58758fd42f6ab1718976162d823d850cd5c99b3ccadf1b57d75dea7790101422029d5f WHIRLPOOL af5dd0a17b7356302b0319e80565d6ac916128dfc85b6e2711147f3de86651f11fe8d08f3d6067d7abd24e263be92403f9d8f46935ba93db571e386a603a038a
-EBUILD polkit-0.110.ebuild 3044 SHA256 0c3f874d5e05d324c620c8c6b05f239751a2db09a0c9a18eb2f7859460e67dcc SHA512 4d9f23df2bf2549f3c300740b729e85b9eeafc6e5f1456e413e3245d008585e1b5b970ca04971c1607c99e0c7081545e19589f5f6ecc953541414740632bb215 WHIRLPOOL a395e4c83e084b6cb917383987b7ef4136bf6a1093ae22508c98dae2917a7f1ceea5d621db1081b8ced34e551862d71f66b3d73e913f840a8a2cc92285dc9d60
-EBUILD polkit-0.112-r1.ebuild 3144 SHA256 510e51bf8668577cdfd62fc3f59c32b16a34b2b509b3540c3c899d5e75222321 SHA512 68c07cd82551401ca7bfd476add920d0387a80685a8e3fc96e0f9dcdf38a1be7230a4449f7726a6ea3cd4f92634b8dd967c5e48cfb81cd2f56d7f273ad4de006 WHIRLPOOL f6f27f07bff4fe4d709f5314695e542888dd6e16c3e15416c535672603d34b9b4e3d7ace19de88a0e59261272ae8e3a28af6341cbbf869749b6c6fdbb63c0aae
+DIST polkit-0.113.tar.gz 1448865 SHA256 e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81 SHA512 ab177c89a20eeb2978ddbe28afb205d3619f9c5defe833eb68a85e71a0f2c905367f1295cbbfb85da5eafdd661bce474d5d84aca9195cd425a18c9b4170eb5f9 WHIRLPOOL 106db7e6085a4ce49da44929138671eff2fd6007c80533518abe2d91ede9242b1e3cd0a1801190eeac5d4d5c1e978a30a18e47a6b604497b38853fa60c935a81
 EBUILD polkit-0.112-r2.ebuild 3367 SHA256 bb1aa4df5b18bcdfc4a8a23d88d32faa163e76d1440fa5f5eed8b12871ad3823 SHA512 8f99a61dd94e80c52d13d1c52847b75726e09406d996b439626f77e68006a013541eb998f21c15d3fbccb78b502ceca7b2969ba6984f85046f039e31b3e977ae WHIRLPOOL 3383d8b5dd15fcbc2ff10f96d0e5665a3715e4737089a4725f26dbf77cefe23e0a591d35c4ddd897b02ceb364071040cb5c78e15edaec5f1036bb5a06381e9ce
 EBUILD polkit-0.112-r3.ebuild 3488 SHA256 0eef359c4b2aa6f973acf6bb56427e72aeca5f589e0bed7e226bc56833cc3a8b SHA512 aaf204c2a4e5b70fd62891dd28d4b49657c56a329ae0d0f1f5e0aba001d7aeeca25c3be695d5d991c62e5bacba619216559ec9a9cb02e3483b78a264098b84cc WHIRLPOOL 91c5402f8912edca8abfe4f4f19a41bf6517cedc5f6e1f025a72ffd9d027f04fa6b62cb2767757f4cd36579002bb4f217cb75bdff3740f22bf7e3ae58e6703cc
-EBUILD polkit-0.112.ebuild 2718 SHA256 ed56fdbb139eae6304b74d0057eed45cc1c9db8168d41e3b4a03363b03aecbb2 SHA512 3b3afb0f2662e75974f8a94f4cb52fc3ef78182570fd7d8cbd0e428d4865caf5cf6e74badaf8be5179348a4412932ab9420d615b03c28264631ca8becbc4845e WHIRLPOOL 1cf1ecf228d086e93e6237a779c2133024b127c5f9c5e0eaa25b226021836013d6e36b25b4fc3effad6c9e465abcd232fe9fe623e7b03811f6440e346e0f1903
-MISC ChangeLog 26235 SHA256 f08a6959ba333f71241ab7b871a73a9c68902eb6a1e676333089bac9ccc2c400 SHA512 2ec56ce1bcecabc708f2eeb642f9c7b63f26369057527d76ec3baa05cd313ed4194a1ae16213cd3275467d16bb5f6f729058ca8cbc11c9de111ea645d62430a5 WHIRLPOOL 9d737c28ab0920f3586c76d4ee7c43e71c34a7f459e3dadea4a9d7b08301665e4dc77bf2d213a9a336c2fd9fc977e188b1c310cad8d34455f487be6f75e7ea2d
+EBUILD polkit-0.113.ebuild 2832 SHA256 b283fc1ebc4af4d4a05147a53b90c9644e5c0a7719e9a73cc748244e8d93d2cc SHA512 704e8d82fa56070c41b1d839d22bee022a91d2da63b07693bcb66ee0c938204f19a21c30f3d8f355028cd0f8388a481b99d9c2deb8bd16eda3c54ea41cf6fb4d WHIRLPOOL e6be72b9c21b08c7d27ff45f912143faac9d9709a597a0d31910e874285490386b4ae948fbcb5e1e41d482f98c5286b4bb3d695b1413e5408022199a25ac9565
+MISC ChangeLog 26548 SHA256 6b41de868f2c2d212fbd7e2b89dcadff08ca65b064e060045fc693b84839e182 SHA512 a9728f6c4caac8492c45d220cfc4a75f38ea2ec1d125884558fc6ea14512e499742778d6d0bce8cc5011f5a9335f3683e1d66e7bed3329e8ebe0b2feb526c469 WHIRLPOOL c1ef1125351cc952c5c41c05ec26d9e44cd77955fcb150a5e31fa6340f88c26473841c243bde09b18d5151069ecb70bc980b160edce6c7b3d3a791a1d33ba20b
 MISC metadata.xml 379 SHA256 ecde37fb639f16a58cccb842e5e1c5ab40359a62045c3d622f4960cd6c3da42b SHA512 6d0bfcbf0e5123e4f088b0d8b6f8558c7a5f62b0dde794b61c03466790d4064071dcb2b47350f197049f5c2e34aa762cf0f1829a2bb6de646c46f2f5bfb8264b WHIRLPOOL c457da71156bb08f89f6a0479334d1a665c011987d084f1a49a23b4b6109b929c75b1d29bfd149e22921de19f159c7d2fc46de6f2c94541f9b93b1d676e0a92a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVcrTUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VzFcP/3ehv0WpzrvjId2fQ5faxoMr
-F7VoNyqKemQeAp60QLrWxsK3lI07vRV8ps7tV4TQfarRcYz/wBJIHDN7N/HO4/c6
-bnAf1jvQPSDvZU3T+yW85ubRTi/lcXKp1M4h08IT1sCTE7dMFJhKzWLysa9m/1TW
-TtMLMU+/xJ42/HOGSSd9TZ0GQiJxCImQgAVRAnDQJI7fKcMgcjTwOKnqtxdP6hLg
-sCAIGxvLCrhrYkV6P+RpMS2Ymqx8Hmx9MiODdWKuOhvgiCfv8U2APVy73WdufCPN
-BsaJb4iIcrL3J+5r9mmLHdEQNvAlC0iglv86bwv8owbOzwODhXtzlMQ5xwFSS6Eq
-8DVXN2zbnF/xFiWep0uQr24djzGcBs4XmPajve7dtYC+NTXY05zdPaRKFw7xsDrG
-qqvFEMw9jrrH8fQatUt/mcnx91f/rLjCmTAisPRuuQbKxD/cT3zaW6L7ea3QtW//
-U17KR4Kg/I7wSnOG0iKbtO8/Uw5eZ7qAnh0M92BTaY/3RfakiRvAqLSHt4aFIEIS
-BAsiXDjvcL4/jUezhO9tox+20MKdL/lEVoCLXqOrKtEuQBJ49N1wb/lqm6+5qRdf
-UG4G3Q4IzrRyBVcTcC4lLG+azRHHjKyiYi8Wy48CNWMDz/Ae9YkiCWDFaLGG5V/Q
-Eb/wtRlZSkkFZXZaVEKg
-=gtTF
+iEYEAREIAAYFAlWX3x0ACgkQCaWpQKGI+9R5FACaAigb6fxGfGJwY068wSwddzNf
+q0AAnjFhF6nESsxNEQAgt0qpCNfVDC1x
+=gVZI
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/files/polkit-0.110-W_define.patch b/sys-auth/polkit/files/polkit-0.110-W_define.patch
deleted file mode 100644
index 8e502b878bc7..000000000000
--- a/sys-auth/polkit/files/polkit-0.110-W_define.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.freedesktop.org/show_bug.cgi?id=62220
-
-Failure to compile on SH4 arch because <sys/wait.h> is missing for #define's of:
-WIFEXITED, WEXITSTATUS, WIFSIGNALED, WTERMSIG
-
-Errors are like this:
-
-polkitbackendjsauthority.c:1509:3: warning: implicit declaration of function 'WIFEXITED' [-Wimplicit-function-declaration]
-polkitbackendjsauthority.c:1509:3: warning: nested extern declaration of 'WIFEXITED' [-Wnested-externs]
-
-polkitbackendjsauthority.c:(.text+0x3008): undefined reference to `WIFEXITED'
-polkitbackendjsauthority.c:(.text+0x3010): undefined reference to `WIFEXITED'
-
---- src/polkitbackend/polkitbackendjsauthority.c
-+++ src/polkitbackend/polkitbackendjsauthority.c
-@@ -20,6 +20,7 @@
-  */
- 
- #include "config.h"
-+#include <sys/wait.h>
- #include <errno.h>
- #include <pwd.h>
- #include <grp.h>
diff --git a/sys-auth/polkit/polkit-0.110.ebuild b/sys-auth/polkit/polkit-0.110.ebuild
deleted file mode 100644
index 7ad37ee725ba..000000000000
--- a/sys-auth/polkit/polkit-0.110.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 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.16 2015/03/03 09:56:07 dlan Exp $
-
-EAPI=5
-inherit eutils multilib pam pax-utils systemd user
-
-DESCRIPTION="Policy framework for controlling privileges for system-wide services"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit"
-SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 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:0=[-debug]
-	>=dev-libs/glib-2.32
-	>=dev-libs/expat-2
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-		)
-	selinux? ( sec-policy/selinux-policykit )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/intltool
-	virtual/pkgconfig"
-PDEPEND="
-	gtk? ( || (
-		>=gnome-extra/polkit-gnome-0.105
-		lxde-base/lxpolkit
-		) )
-	kde? ( sys-auth/polkit-kde-agent )
-	!systemd? ( >=sys-auth/consolekit-0.4.5_p2012[policykit] )"
-
-QA_MULTILIB_PATHS="
-	usr/lib/polkit-1/polkit-agent-helper-1
-	usr/lib/polkit-1/polkitd"
-
-pkg_setup() {
-	local u=polkitd
-	local g=polkitd
-	local h=/var/lib/polkit-1
-
-	enewgroup ${g}
-	enewuser ${u} -1 -1 ${h} ${g}
-	esethome ${u} ${h}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-W_define.patch
-
-	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
-
-	if has_version '>=dev-lang/spidermonkey-1.8.7'; then
-		sed -i \
-			-e '/mozjs/s:185:187:g' \
-			configure src/polkitbackend/polkitbackendjsauthority.c || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		--enable-man-pages \
-		--disable-gtk-doc \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable introspection) \
-		--disable-examples \
-		$(use_enable nls) \
-		"$(systemd_with_unitdir)" \
-		--with-authfw=$(usex pam pam shadow) \
-		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
-		--with-os-type=gentoo
-}
-
-src_compile() {
-	default
-
-	# 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
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc docs/TODO HACKING NEWS README
-
-	fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
-
-	diropts -m0700 -o polkitd -g polkitd
-	keepdir /var/lib/polkit-1
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins src/examples/{*.c,*.policy*}
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
-	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
-}
diff --git a/sys-auth/polkit/polkit-0.112-r1.ebuild b/sys-auth/polkit/polkit-0.112-r1.ebuild
deleted file mode 100644
index 5fa08c76ed8e..000000000000
--- a/sys-auth/polkit/polkit-0.112-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r1.ebuild,v 1.14 2014/08/14 14:14:06 ssuominen Exp $
-
-EAPI=5
-inherit eutils multilib pam pax-utils systemd user
-
-DESCRIPTION="Policy framework for controlling privileges for system-wide services"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit"
-SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="examples gtk +introspection kde nls pam selinux systemd"
-
-RDEPEND="
-	ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
-	hppa? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
-	mips? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
-	!hppa? ( !ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug] ) ) )
-	>=dev-libs/glib-2.32
-	>=dev-libs/expat-2:=
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-		)
-	selinux? ( sec-policy/selinux-policykit )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/intltool
-	virtual/pkgconfig"
-PDEPEND="
-	gtk? ( || (
-		>=gnome-extra/polkit-gnome-0.105
-		lxde-base/lxpolkit
-		) )
-	kde? ( sys-auth/polkit-kde-agent )
-	!systemd? ( sys-auth/consolekit[policykit] )"
-
-QA_MULTILIB_PATHS="
-	usr/lib/polkit-1/polkit-agent-helper-1
-	usr/lib/polkit-1/polkitd"
-
-pkg_setup() {
-	local u=polkitd
-	local g=polkitd
-	local h=/var/lib/polkit-1
-
-	enewgroup ${g}
-	enewuser ${u} -1 -1 ${h} ${g}
-	esethome ${u} ${h}
-}
-
-src_prepare() {
-	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		--enable-man-pages \
-		--disable-gtk-doc \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable introspection) \
-		--disable-examples \
-		$(use_enable nls) \
-		$(if use hppa || use ia64 || use mips; then echo --with-mozjs=mozjs185; else echo --with-mozjs=mozjs-17.0; fi) \
-		"$(systemd_with_unitdir)" \
-		--with-authfw=$(usex pam pam shadow) \
-		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
-		--with-os-type=gentoo
-}
-
-src_compile() {
-	default
-
-	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
-	local f='src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest'
-	local m='m'
-	# hppa, ia64 and mips uses spidermonkey-1.8.5 which requires different pax-mark flags
-	use hppa && m='mr'
-	use ia64 && m='mr'
-	use mips && m='mr'
-	pax-mark ${m} ${f}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc docs/TODO HACKING NEWS README
-
-	fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
-
-	diropts -m0700 -o polkitd -g polkitd
-	keepdir /var/lib/polkit-1
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins src/examples/{*.c,*.policy*}
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
-	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
-}
diff --git a/sys-auth/polkit/polkit-0.112.ebuild b/sys-auth/polkit/polkit-0.113.ebuild
index 4bfb2137b152..d742cce195d2 100644
--- a/sys-auth/polkit/polkit-0.112.ebuild
+++ b/sys-auth/polkit/polkit-0.113.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112.ebuild,v 1.10 2013/09/23 19:17:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.113.ebuild,v 1.1 2015/07/04 13:26:52 pacho Exp $
 
 EAPI=5
 inherit eutils multilib pam pax-utils systemd user
@@ -11,32 +11,42 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="examples gtk +introspection kde nls pam selinux systemd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="examples gtk +introspection jit kde nls pam selinux systemd test"
 
-RDEPEND="=dev-lang/spidermonkey-1.8.5*[-debug]
-	>=dev-libs/glib-2.32
+CDEPEND="
+	dev-lang/spidermonkey:0/mozjs185[-debug]
+	>=dev-libs/glib-2.32:2
 	>=dev-libs/expat-2:=
-	introspection? ( >=dev-libs/gobject-introspection-1 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
 	pam? (
 		sys-auth/pambase
 		virtual/pam
 		)
-	selinux? ( sec-policy/selinux-policykit )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
+	systemd? ( sys-apps/systemd:0= )
+"
+DEPEND="${CDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
+	dev-util/gtk-doc-am
 	dev-util/intltool
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-policykit )
+"
 PDEPEND="
 	gtk? ( || (
 		>=gnome-extra/polkit-gnome-0.105
 		lxde-base/lxpolkit
 		) )
-	kde? ( sys-auth/polkit-kde-agent )
-	!systemd? ( sys-auth/consolekit[policykit] )"
+	kde? ( || (
+		kde-plasma/polkit-kde-agent
+		sys-auth/polkit-kde-agent
+		) )
+	!systemd? ( sys-auth/consolekit[policykit] )
+"
 
 QA_MULTILIB_PATHS="
 	usr/lib/polkit-1/polkit-agent-helper-1
@@ -70,6 +80,7 @@ src_configure() {
 		"$(systemd_with_unitdir)" \
 		--with-authfw=$(usex pam pam shadow) \
 		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
+		$(use_enable test) \
 		--with-os-type=gentoo
 }
 
@@ -77,9 +88,7 @@ src_compile() {
 	default
 
 	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
-	local f='src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest'
-	local m='mr'
-	pax-mark ${m} ${f}
+	pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest
 }
 
 src_install() {