Force use of dev-lang/spidermonkey:17 because automagic dependencies are bad.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 128 insertions, 9 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index 73db7057c8bf..aec10c1f6997 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,11 @@
 # 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.142 2013/05/15 23:02:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.143 2013/08/08 21:10:02 ssuominen Exp $
+
+*polkit-0.111-r1 (08 Aug 2013)
+
+  08 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> +polkit-0.111-r1.ebuild:
+  Force use of dev-lang/spidermonkey:17 because automagic dependencies are bad.
 
 *polkit-0.111 (15 May 2013)
 
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 14e10223f097..bcb07087ef3a 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -5,17 +5,18 @@ AUX polkit-0.110-W_define.patch 810 SHA256 75a47bbf04e328a8622996d40128752c6951c
 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.111.ebuild 2966 SHA256 158aea105b7c7196ca09f653ef29f8953375c63c903d8f407e3f0a206515dcf8 SHA512 3f0cc10c1a1c553b2f518e85f24dfe0711f690cbfa40e782e88e3ceba48a8887c3530d5edded4060d7e933e4fe112ef90d10e2ca7f3222f9f7a5caaed5322bde WHIRLPOOL 4cf5e6904f80d5278adf6cc822633f89cec420be667910756b191d3046109b7ba8d0f2c3f0e007a774bcd0517a286615802605a96270d225d13052b26f8eab5e
-MISC ChangeLog 19652 SHA256 39094cc940d879ae6ae73e474c792fcde6cac5939483d0a77d9ff947ea545076 SHA512 2d081c9cf082979af0250fc33ccac91180aceff1d0b48156ce7a6232af9707edabd47b6ba0edac56a7c53798477927f70c11bdd728943319323c594fba139408 WHIRLPOOL dd85bc04a6ce4eeac3e06a26dfba5e7134b3e059e1016f96881ba43489d7fa8a565d081bde74eba263ee3315d2247deb959091e3351cac868b52e059f215f63d
+MISC ChangeLog 19844 SHA256 03cd35f272359e665af64f5860356e9303339f9ae72c13281faac6ad195368eb SHA512 17231b2804b5c7ea3c7490551dd8853259540c7235f90615832514eb30d312985898d47c39fac70c8fbaa3fd920db0f4b760e8e9ccf657e30942836cde69869e WHIRLPOOL 477984840f3fdc47f6a3451b1258e3402c4afed2cb40e666055bd079c6c57a2cea87a7c6bbe49882ecf089d57424f021ad37996ddbdacb360f13abb60b07258a
 MISC metadata.xml 516 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba SHA512 293585c3b4c95b76af687f398645982d84d583e3cbf039a181c67c9710a899dad34cba9ff43f7be03a00d7552f42f0ac0a2a997c3ce7c9b80097a43f501001d4 WHIRLPOOL 4caf1316226570bec927b20957e420217a490c91013154b84f56fddf50cd5b525ccd0fd736a305ef5bc772cca734aadd8fec757238021b3e05046b503468e1a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRlBStAAoJEEdUh39IaPFNtmEIAIdSHMPFpXpOzU2q8k9kuaba
-ruLsVcuhxyVY/wytfWB8AlvfSdhk95PVXgeNpjKiDql//RCqDgza7EMZE2qGxGfB
-tmHSQhK0usRVwiuwufjIn/xbG7le9muSCuwUZnRRVTZPrm9pJvwKgsR9Wr5JLSK8
-VVPea5KHsem19eX+iIgvO0bak5lpoPA9hA85OVeDXAoqVmxDnEQ7wRQLXYq8G5PP
-WjpKdTg9K9dPUx7qq0rdTGyNC03lARRrQtmJxaI/UyWu1MpNoKgs91GXnDBuj78M
-g71jZcUNS9KMsfai+RORNArJbUXs07F7RJ5nBgZxOQFGldUC5XP1t3hU+JB/+cE=
-=4Dng
+iQEcBAEBCAAGBQJSBAizAAoJEEdUh39IaPFNTRUIAIU13WfemsOfn6QFewkkjXX5
+IpbtDwtdH/J34kOGGgV2Z9Xh8ZcggeQT34y80s417P3zmWlr3FqFapposNhFOSj4
+vzTredYfn1sBG7/Jou5KmaI/TYWEYm5+BEkl2ZjN74RDaQnoPPqj/TbXJ7dvzWzo
+JJwCj4EAQGh9m/TXs/xWqN3erhIC336Zn6qna7GAWk8PdeqLJtk+0B3YrBRjEE+i
+3IxptEVWHA8mKBW6/G9sdvEI6BZm/GqTX81WIUoGwJt6QDpnngX3aetjGf1qUuq8
+HW2WB/GTQZ5FukzxhLj/unbIolQPp9FkcS4gkoRngmXk3IFSeeQXb379MoF0Xyk=
+=vuuI
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/polkit-0.111-r1.ebuild b/sys-auth/polkit/polkit-0.111-r1.ebuild
new file mode 100644
index 000000000000..4d472e559bc1
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.111-r1.ebuild
@@ -0,0 +1,113 @@
+# 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 $
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="examples gtk +introspection kde nls pam selinux systemd"
+
+RDEPEND="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 )
+	pam? (
+		systemd? ( sys-auth/pambase[systemd] )
+		!systemd? ( sys-auth/pambase[consolekit] )
+		)
+	!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) \
+		--with-mozjs=mozjs-17.0 \
+		"$(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
+}