RESTRICT="multilib-strict" since it's not compatible with the whole /usr/libexec -> u/usr/lib/$package migration wrt #424423. This will move polkit-agent-helper-1 and polkitd back to /usr/lib/polkit-1.

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

3 files changed, 125 insertions, 9 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index 3daa68098075..5b9ab91c7067 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/polkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.95 2012/07/01 13:30:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.96 2012/07/02 16:29:47 ssuominen Exp $
+
+*polkit-0.106-r7 (02 Jul 2012)
+
+  02 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> +polkit-0.106-r7.ebuild:
+  RESTRICT="multilib-strict" since it's not compatible with the whole
+  /usr/libexec -> /usr/lib/$package migration wrt #424423. This will move
+  polkit-agent-helper-1 and polkitd back to /usr/lib/polkit-1.
 
 *polkit-0.106-r6 (01 Jul 2012)
 
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index e21cbeb4dc8c..309adf884368 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -8,16 +8,17 @@ EBUILD polkit-0.104-r1.ebuild 3599 RMD160 0971476dcae7e67dbdd40588d47ebbbc61873b
 EBUILD polkit-0.105.ebuild 2241 RMD160 e7a155386c6b9fb189799d423cb0843ca8fc6ba7 SHA1 dc20155d6178c0a017ff8c1374428102b22c9468 SHA256 4ec832b243b7623a289ba38cee2576e6cda162d9fb3ad1afb995ae797968cfb8
 EBUILD polkit-0.106-r5.ebuild 3053 RMD160 e819509449da0a45b8d13f9595041896d56ccbbd SHA1 4ae99ba469a92d440274d1ef6989fb3425e229ac SHA256 a331ee7504ddf0e1c92f172022b695ab29ffd96bed2fe8108ca108dd9976b96d
 EBUILD polkit-0.106-r6.ebuild 3239 RMD160 008225f7254655bedbb0e840d3f447453250f602 SHA1 d3816169c9e1c1179c3e5bc5cd102c2ce0c9c8d9 SHA256 c32ea30c69cc20bad739484038c1aeb410d8ae2e55f60a5d36ebe23f84280e3c
-MISC ChangeLog 13370 RMD160 bf0a601a62e2a8ee14d0047a6f2b4d874784e570 SHA1 65f23be7c9c1b2ca430ab7e75fa3ad1061ba5a40 SHA256 44732e39e931962426ae6ff45461bf921c1885d6946c0caf9923b9f15940d95b
+EBUILD polkit-0.106-r7.ebuild 3010 RMD160 37aa209a2c5dad169f214fcf898d81183790e7fa SHA1 4e362208de9a47e1ca77ebc8c1cfa7f0746340d3 SHA256 7ee4993c9d05eb03d15f25001dc4f8011f2901f15cd10309f7cbb0a2c159f691
+MISC ChangeLog 13689 RMD160 1c057944fa809674542a4a2b0e4554033b651073 SHA1 5e192524e59dd40f282fcf2f651fc2dff3d14a14 SHA256 589a0b62b59a531eb225b287c5704838132f46f1e3eabee2974aec451a49d582
 MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP8E+mAAoJEEdUh39IaPFN8cMH/is2AANbR9Vcfkv8VsgD+ngb
-ZpzxzrNsxivdag5P0Nvl+LiMqYzrgqZmldwBYbrYQKe+XLY4h9e8BIbd5wEAQYa5
-OVKoicXn2BHH4law8tik+jKF9lNYTs/XuI39idp6L3azhodyAbXtMi6FwUk4ctZx
-JaVBEJAHknaxqrm/2sUjDRLcXgGPeB96FECQ0EYE5nGxL08bM0GxeFv5pdjAo4TM
-sHe+pxSEI5dkDtheybP3rtp0Vbu7pbwgnSAOdqZh5DbGiyo4ol/D12FnHbVoqQJX
-I+zsVmDKc1K5ErY+a1R3Xu1dZxBt7ijrNsAhQqMfXi5pOMEDZKpIzFwQ3LL8fhA=
-=wKeg
+iQEcBAEBAgAGBQJP8cs/AAoJEEdUh39IaPFN9CsH/i1PTTFkYydcAPLYwVpv2ThX
+0ap5Fu36Xf8QQWrbju/dod8Q05RcppOqrOMXlcRdYPAIwuZ8AC5VFnqyNm+yDLTf
+sGjlq5KjzPnYNr1rUqhGPP9ZJCZ7eWrJLVpPgZpLFnpbGjAFF/hcR+y+4fl02d7y
+SL+3Rt0O7RtqgL0fUf5oUExH3eTWd6OaxGX8VjDZ0yXN9oi9sq7wNVp5zVt0PbSa
+/QqINfQahBW06xOjSz2aRqv21beVX1cyJ78a6lLHbtD+/3K0w27fIg3gqKLTADIg
+LoMT/LYR8TZACmfNL5IfcPvdFa5mtZ/gR9brXQrwygrzQmZ6+R9QIbKYOPnx6Gg=
+=uytG
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/polkit-0.106-r7.ebuild b/sys-auth/polkit/polkit-0.106-r7.ebuild
new file mode 100644
index 000000000000..8e279d40faa5
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.106-r7.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106-r7.ebuild,v 1.1 2012/07/02 16:29:47 ssuominen Exp $
+
+EAPI=4
+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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug examples gtk +introspection kde nls pam selinux systemd"
+
+RESTRICT="multilib-strict" #424423
+
+RDEPEND=">=dev-lang/spidermonkey-1.8.5
+	>=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-0.4.5_p2012[policykit] )"
+
+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
+	has_version ">=dev-lang/spidermonkey-1.8.7" && { sed -i -e '/mozjs/s:185:187:g' configure || die; }
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--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_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
+	rm -f "${ED}"/usr/lib*/pkgconfig/polkit-backend-1.pc #423431
+
+	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
+	if has_version '<dev-lang/spidermonkey-1.8.7'; then
+		pax-mark mr "${ED}"/usr/lib/polkit-1/polkitd
+	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
+		pax-mark m "${ED}"/usr/lib/polkit-1/polkitd
+	fi
+}
+
+pkg_postinst() {
+	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
+}