Drop some keywords, fix polkitd user homedir, etc

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

3 files changed, 28 insertions, 16 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index a831e0bf2247..de787bff9f31 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,11 @@
 # 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.78 2012/06/13 14:45:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.79 2012/06/13 15:28:32 ssuominen Exp $
+
+  13 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> polkit-0.106.ebuild:
+  Use /var/lib/polkit-1 as home directory for the polkitd user and fix owners
+  of /etc/polkit-1/rules.d and /usr/share/polkit-1/rules.d to polkitd:polkitd
+  accordingly wrt #420269
 
   13 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> polkit-0.106.ebuild:
   Missing dev-lang/spidermonkey dependency wrt #420173. Raise dev-libs/glib
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index d788a6d862ae..6a32af9a2e11 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -6,17 +6,17 @@ DIST polkit-0.105.tar.gz 1431080 RMD160 cd1100ee69a308d620e437d34e471580bb6dcf5a
 DIST polkit-0.106.tar.gz 1381428 RMD160 6fa79aaa4e67e072d16860f1a242b053cc311bc3 SHA1 665624f5d69876ec5833f7952290188ca594aac0 SHA256 4005076a67aaa182872c1e316939fcb0ba74a89298e6330d72cfdac6624c984e
 EBUILD polkit-0.104-r1.ebuild 3548 RMD160 e056d1186192d865a610ebe1250e8adf9250eed7 SHA1 1a7cec206005fdb8985fc308f16bbe6f76b45c34 SHA256 a038cdfd2381bd5ddbd6cf4feef8a3aaa126b4e80a6205979538c9ebcbf0b9a0
 EBUILD polkit-0.105.ebuild 2194 RMD160 7f46dccee0326480a5c1c2fd276df48553abd630 SHA1 f41f0393be142066d39d52994f7f29f52c336f2c SHA256 15339d2d61f350eec88ad0fd90cec401df45106fc2ee52ee7b8b051103a5279e
-EBUILD polkit-0.106.ebuild 2235 RMD160 22fd91adf45044aa748b77716efbc8702a23be4a SHA1 66da109bbc3d89a0d6184ea1d03fe99f240c0a1a SHA256 df2e5c2576a12c6059594d4029cf46532f73098cf464eae796b8fb3413fd5122
-MISC ChangeLog 10552 RMD160 e3c807c22e0722ba989911c48c9a35f110136d45 SHA1 5882660f120aa26e288a2a1979383286b5e1e35f SHA256 acc71f2b01c6cde441635cede5b03901a3cefb73c43f34567368539636bb8968
+EBUILD polkit-0.106.ebuild 2562 RMD160 2844b59bef28e2c18ffb08d826793733b1454afb SHA1 62ed22459c2d7d584e1d4d9ac25bc6b0e304c631 SHA256 abf42e5382be66ed0f1ba7c81bedc1fad32f61e7cce83a597509d65858c3f477
+MISC ChangeLog 10810 RMD160 61f4706b918e0f233865ab1a513141506368ed93 SHA1 1676902f707b9aae7ddee405fd93d490eb72de2f SHA256 97dcb6add9eacfe7af19a243c6702a1baec292c4433475dddcbe66f8e9548b84
 MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP2KajAAoJEEdUh39IaPFN0RUIAJAkXhXGO4By3Po7xNbx/m0p
-7Gb86SDUSfcvTyKi7Brg0tqzCPDl5G+WCMGfAHm8nKHrPUmYCR1MyS2oxz1VsOz1
-/6oqohNQl5puDozIYVkhJeoygrsc7Gv4QGAPxJ0J+tnMS6wvxQMq0HF1KYJWEGVt
-73gA7h4UAZD5Qu4GsYjGtaGnJ7r4DdoAnF4oZ6w24xd38S1HmuwyOQTDbQbmiK21
-gasrOCxS7B+uNPrQt0EPJp+MAJlArIpG7Bg7uc6pDrRVCL0w+DqaMXrnzLrnstdj
-2dFdSZAz8Y+6WvyfhZ/A16lUog5ZNxoB6duHXaUcCuLzCBgdGBBoBYISUdG9jus=
-=DmGc
+iQEcBAEBAgAGBQJP2LCuAAoJEEdUh39IaPFNqz0H/3d51nGJd23e22I/3L2Wgqn2
+57rcWu116P2Rgkub1ZfqB9SqiDpJgxdAxd5Jptg8EyX7EW0iaf+l+sILJtL/5y5w
+eLuDTPrV3mxQvSh/nt7lB+d/V0ImMhlwHyU4MwA08+mhWaCA5jh6zZSy8WVOInOt
+/QrpHHOkXuJ0C9voahVfAeqym6tucDF6wwrnKWWxHIamGdZkhHGLL9fYdnDZNIFP
+kKQkhny4Pog1TohSAbpv9BdLjMgxmdJX/Pn6aot9q13uH4U8xGUSwkp5GNtmq3z5
+PMoNN0qJljU7FXSVTrJHDKWedFwQ4NTeuqu2QtYj2Q5nbhBYcPy8b2g66mRFGy0=
+=iO/F
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/polkit-0.106.ebuild b/sys-auth/polkit/polkit-0.106.ebuild
index d3290e3649d2..1ffc1bd625d5 100644
--- a/sys-auth/polkit/polkit-0.106.ebuild
+++ b/sys-auth/polkit/polkit-0.106.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.3 2012/06/13 14:45:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106.ebuild,v 1.4 2012/06/13 15:28:32 ssuominen Exp $
 
 EAPI=4
 inherit eutils user pam systemd
@@ -11,7 +11,7 @@ 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 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug examples gtk +introspection kde nls pam systemd"
 
 RDEPEND=">=dev-lang/spidermonkey-1.8.5
@@ -44,13 +44,13 @@ DOCS="docs/TODO HACKING NEWS README"
 
 pkg_setup() {
 	enewgroup polkitd
-	enewuser polkitd -1 -1 -1 polkitd
+	enewuser polkitd -1 -1 /var/lib/polkit-1 polkitd
 }
 
 src_prepare() {
 	# http://bugs.gentoo.org/401513
-	ewarn "Switching from group \"wheel\" to group \"0\" in	/etc/polkit-1/rules.d/*.rules"
-	sed -i -e '/unix-group/s:wheel:0:' src/polkitbackend/*.rules || die
+	ewarn "Switching from group \"wheel\" to group \"0\" in	/etc/polkit-1/rules.d/*-default.rules"
+	sed -i -e '/unix-group/s:wheel:0:' src/polkitbackend/*-default.rules || die
 }
 
 src_configure() {
@@ -75,7 +75,7 @@ src_install() {
 
 	prune_libtool_files
 
-	diropts -m0700 -o root -g root
+	diropts -m0700 -o polkitd -g polkitd
 	keepdir /var/lib/polkit-1
 
 	if use examples; then
@@ -83,3 +83,10 @@ src_install() {
 		doins src/examples/{*.c,*.policy*}
 	fi
 }
+
+pkg_postinst() {
+	# fowners in src_install fails and Portage sets these back to root:root
+	chown -R polkitd:polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+	# enewuser fails to refresh itself for new home directory #420269
+	sed -i -e '/^polkitd/s:/dev/null:/var/lib/polkit-1:' "${EROOT}"/etc/passwd
+}