[gentoo-commits] proj/musl:master commit in: sys-auth/polkit/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     f36d591640377842b40883aee25ae567d4ec90ac
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 14 05:11:55 2019 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 05:11:55 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=f36d5916

sys-auth/polkit: sync user changes from tree

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 sys-auth/polkit/polkit-0.116-r1.ebuild | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/sys-auth/polkit/polkit-0.116-r1.ebuild b/sys-auth/polkit/polkit-0.116-r1.ebuild
index 75ed3cc..0d0d3a7 100644
--- a/sys-auth/polkit/polkit-0.116-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.116-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools pam pax-utils systemd user xdg-utils
+inherit autotools pam pax-utils systemd xdg-utils
 
 DESCRIPTION="Policy framework for controlling privileges for system-wide services"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit"
@@ -11,12 +11,13 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="consolekit elogind examples gtk +introspection jit kde nls pam selinux systemd test"
 
 REQUIRED_USE="^^ ( consolekit elogind systemd )"
 
 BDEPEND="
+	acct-user/polkitd
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
 	dev-libs/gobject-introspection-common
@@ -40,6 +41,7 @@ DEPEND="
 	systemd? ( sys-apps/systemd:0=[policykit] )
 "
 RDEPEND="${DEPEND}
+	acct-user/polkitd
 	selinux? ( sec-policy/selinux-policykit )
 "
 PDEPEND="
@@ -64,16 +66,6 @@ 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() {
 	default
 
@@ -124,20 +116,18 @@ src_compile() {
 src_install() {
 	default
 
-	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
 
+	diropts -m 0700 -o polkitd
+	keepdir /usr/share/polkit-1/rules.d
+
 	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
-	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
-	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
+	chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+	chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
 }