gentoo resync : 18.08.2019

18 files changed, 51 insertions, 74 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 3b3173711a74..60def0eeb3b2 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 7d7d71a47647..b67019d7bbbd 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -2,5 +2,5 @@ AUX elogind-241.1-docs.patch 855 BLAKE2B 08fc89a264ab0408c13caa059649a004b775ec2
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
 DIST elogind-241.3.tar.gz 1401391 BLAKE2B 90bc10af1b6d66bc6b6e15314cbc7005f270ebd04767a88d93605d81b199758c7f5423ea85f9810f8dfcde82c6c2b8094e2237cf2ca70a9dfc45a4a8e20b0439 SHA512 b33c0ed85c4a97216f8d56441207510be180258d4f4e5ff9dea07d59d53b84b03c27f5397f09214ce9fc880f38865e20d7c05b41255d4b762c33099b7ebb53eb
-EBUILD elogind-241.3.ebuild 3501 BLAKE2B 91b6f42ab113c7bca0685a3fa681c638ec12c6cb95fa95bfc50e7d7c5a0936640719d01333572dfbafab3ab266497b1f9cb76497f36245ce7419a027ced6459d SHA512 ce7da5c500c333938235e2bc8d078256612e90a423e016a9f38ea7ea2d3d4dabb125504407aaceae93f7709686e48b60624f27a607cb86407443389a09e0eb43
+EBUILD elogind-241.3.ebuild 3525 BLAKE2B eb17a1ca1eb36e7e0bd4c90fb8d739ad6a32c940f46a13c2f69fb26a16cf922131af57657296311ce03b6d53d6154b1f0f09b9c0d8aaac455e4311c7d5bd266b SHA512 e175a821d9f53c0d7655edd1887000c46ed581db08146fb3cfa1e4e9ee272992fe99e3af6027757c92eebe349d5369ec0b73376199535b9fb5e16ff84dfb1dee
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-241.3.ebuild b/sys-auth/elogind/elogind-241.3.ebuild
index b02983196024..fe13b191df36 100644
--- a/sys-auth/elogind/elogind-241.3.ebuild
+++ b/sys-auth/elogind/elogind-241.3.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)"
+	local rccgroupmode="$(grep rc_cgroup_mode \"${EPREFIX}/etc/rc.conf\" | cut -d '"' -f 2)"
 	local cgroupmode="legacy"
 
 	if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
@@ -68,7 +68,7 @@ src_configure() {
 		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 		-Dpamlibdir=$(getpam_mod_dir)
-		-Dudevrulesdir="$(get_udevdir)"/rules.d
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)"/rules.d
 		--libdir="${EPREFIX}"/usr/$(get_libdir)
 		-Drootlibdir="${EPREFIX}"/$(get_libdir)
 		-Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 2ddca08b61a9..2074bc00f542 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -1,5 +1,4 @@
-DIST fprintd-0.5.0.tar.bz2 66981 BLAKE2B 02ae16bbeaab55559a44ef43999941fd2076ef610adc92184601963ab3edc4bae41abfce0540d4ac0e0717b8542f0b0684af2616684856b0e71f3e58b1834d6a SHA512 d77adb92e6913c8822e2c866ed632f5d1429c93e8e7c4c7d51d23385f6afb0c6048ff72c9cb885d7581e8d1e461f708af06ca6e6f98e177c98834289a76341de
 DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252
-EBUILD fprintd-0.5.0.ebuild 1509 BLAKE2B 3ecb04540bd0b11bbf0733e6d40859e4bc926d627a540183c5d5f346c38df2ae8bc59e15efe53d133c9a5a4ea83be5fa0a63c6b45e12ef51827649d3da29e93f SHA512 06380a416b30de228675312d39bdca884476dde70777e01ba14bb316f9652b40997bf00a4bb2e14d46fbd11427e1f09e32eae5b39c10dae025e4cb9cc27b656f
-EBUILD fprintd-0.8.1.ebuild 1521 BLAKE2B 1f55a022725a6feec42670a110aefe7e406d53d6542ff0dc124f368fba505f2a25d1e28a10b8bb703314d87dc89d614be20e1f8d4068f1f2350ee70114fcb56a SHA512 00a419330e35a135b6524c32b4a6b50130cfa5d742ed5be4e1f576faf3165c31075c7d247d148e70aa3f3d7a0fb9a29479a27da78c63b2abd6bae4020e8d07a3
+EBUILD fprintd-0.8.1-r1.ebuild 1645 BLAKE2B ae01233804a3afaa85ab92dbcc03f8378d505a4551e67fdfc7640f94754f8275ede43b6770c7f9c289ce8a88bb0c5622702d2cd5aa15bc87b3cbde1725abb90c SHA512 5254e253c742ec48e07a95d0c3e332ee0cc32d0a84f01dae319b7f145a2758d413b1a8e4669eb6bf66d4535569d282edeeb65d65c2e839386af0a60405b5caf9
+EBUILD fprintd-0.8.1.ebuild 1528 BLAKE2B 3b9fd232320cb0aaacb1348b580659c0d648ffba481ae8f22ceda92d4142e5a92e65de96cc11c8afb4c905d4b3286c43419995f93ec36dd1e1bbb5c87e5fc9a2 SHA512 90bcdbe60fd50c65b9c60318627af016f215f713665508f8de08fa87ad9daee6dd4b1df7f5d58c78c9da4b8b7c14123bc49c78c87a46cf5934bd928460fbda45
 MISC metadata.xml 344 BLAKE2B 9a02f1005090b51c476c6705fe5627cf66dfdc3c4168e917b47651510b0596a6582bb2e4bc09bdd943c202a49a9e3d9bf58a03badeb1bd45f017b6bfef236fe9 SHA512 93369d8bd0b3f7c65b2f6a49f9e35b438879ffdd5c4b4906a4f3e09b0ce74dad1bb6f204c58be724edb88cb4e6a0380e28f516bd1c3bdcd904b8b9e8955dbd8d
diff --git a/sys-auth/fprintd/fprintd-0.5.0.ebuild b/sys-auth/fprintd/fprintd-0.8.1-r1.ebuild
index 5528049ba143..da760b51d700 100644
--- a/sys-auth/fprintd/fprintd-0.5.0.ebuild
+++ b/sys-auth/fprintd/fprintd-0.8.1-r1.ebuild
@@ -1,34 +1,40 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools pam systemd versionator
+inherit autotools pam systemd
 
 DESCRIPTION="D-Bus service to access fingerprint readers"
 HOMEPAGE="https://cgit.freedesktop.org/libfprint/fprintd/"
-MY_PV="V_$(replace_all_version_separators _)"
+MY_PV="V_$(ver_rs 0- _)"
 SRC_URI="https://cgit.freedesktop.org/libfprint/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc pam static-libs"
 
-RDEPEND="dev-libs/dbus-glib
+RDEPEND="
+	dev-libs/dbus-glib
 	dev-libs/glib:2
 	sys-auth/libfprint
 	sys-auth/polkit
-	pam? ( sys-libs/pam )"
+	pam? ( sys-libs/pam )
+"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
 	dev-util/intltool
-	doc? ( dev-libs/libxml2 dev-libs/libxslt )"
+	doc? ( dev-libs/libxml2 dev-libs/libxslt )
+"
 
 S=${WORKDIR}/${MY_PV}
 
 src_prepare() {
+	default
+
+	sed -i 's#@localstatedir@/lib/fprint#@localstatedir@/fprint#g' data/fprintd.service.in || die "sed failed"
 	eautoreconf
 }
 
@@ -37,7 +43,7 @@ src_configure() {
 		$(use_enable pam) \
 		$(use_enable static-libs static) \
 		$(use_enable doc gtk-doc-html) \
-		$(systemd_with_unitdir)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 }
 
 src_install() {
diff --git a/sys-auth/fprintd/fprintd-0.8.1.ebuild b/sys-auth/fprintd/fprintd-0.8.1.ebuild
index 69e2845201e0..79ece161164c 100644
--- a/sys-auth/fprintd/fprintd-0.8.1.ebuild
+++ b/sys-auth/fprintd/fprintd-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://cgit.freedesktop.org/libfprint/${PN}/snapshot/${MY_PV}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE="doc pam static-libs"
 
 RDEPEND="
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 9cee68054094..11d2161af122 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,4 +1,4 @@
 AUX libfprint-0.8.2-fix-implicit-declaration.patch 4831 BLAKE2B ec61d1ee189549f4456634b5b0157f32c61b2255330681b96bc50c73d9a5d51c1058f4f82b979ca4695d9d1065b0623e86be943f98c1582725bcddda0630156b SHA512 afd4e7c5ee65a91b17aa8bec4c6a0ba5b972e9f2586a0cfa7adc823d2a1f8d2378ed28928c5108870d2347f3edb2f343a24b2eaef6c015b7650834b4d76ceb73
 DIST libfprint-0.99.0.tar.gz 473925 BLAKE2B 799e3600393e4b25f7b0685ff0456ca391e5fcaef36e5b4475371cd07c848e40820dbbdc5a241fe11c6ee08b818380967129f85e177b5d8714b9dbc4d7b68ea1 SHA512 eca1d45baa23b7db1fcc5d7a9a396fe504aadc6ec2e68da32b5415fb0fff1227566d579271e0b34895ce7f3baa55314a0ccd20bb8c4adba253063b7b61284748
-EBUILD libfprint-0.99.0.ebuild 1055 BLAKE2B 93f7183074fb7090ddaa110da8c86fb275737b58ebab76768ddb300b79df8e93323c433967e43044aca2951524c2dd2b883e5c85ad01f0e0df0f0a8d85d05342 SHA512 70842d4892446db29f1d8f94fe7f2c8dbb517b25708bc0b9e54102b3633cb7ec97bf8294a19456854fb7467aab60287562e46dac7a264632f792d2d3bf4cfe56
+EBUILD libfprint-0.99.0.ebuild 1062 BLAKE2B ed6620cb8f8f1da04c4ea8cc68d5f08a491ad7199816bda0514451dd43fdbca9e6176b155ae178a6b994874da2fd2a836b9d343293ae1a9728266bdb825268a7 SHA512 422ca65e9ecbc14b8ac37ef608a19d806f0435778eeb8b61234a59add034c07d1c02d5b1b2aefe4c64979a533181550ab2ff425e6d73ab580ae74738b61271cc
 MISC metadata.xml 347 BLAKE2B dd0d99ac1a5a8cc925618bc556216a23f14fab90dd2e1d66747e4af3fd64d410812aac366a0e11cc169af7345c8bbf304577da5a1faf75f557bb4ba18033fb0f SHA512 f3303670a2e7d4b30732d335b313edda6c97952f2f6290ff6b1d67a8a237e147ba7c7c4edcb58994679ff9cbf606fb82b79bec1ba840a22b46ee21cfd26aefc9
diff --git a/sys-auth/libfprint/libfprint-0.99.0.ebuild b/sys-auth/libfprint/libfprint-0.99.0.ebuild
index 02e7a88a665e..e55153dfc263 100644
--- a/sys-auth/libfprint/libfprint-0.99.0.ebuild
+++ b/sys-auth/libfprint/libfprint-0.99.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/freedesktop/libfprint/archive/V_$(ver_rs 0-3 '_').ta
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-libs/glib:2
diff --git a/sys-auth/pam_fprint/Manifest b/sys-auth/pam_fprint/Manifest
index bad0f735917a..ad83d51a004e 100644
--- a/sys-auth/pam_fprint/Manifest
+++ b/sys-auth/pam_fprint/Manifest
@@ -1,4 +1,4 @@
 AUX pam_fprint-0.2-headers.patch 281 BLAKE2B b05e33732c83483a790198dd884c7051f071a450935e8236a6d345446d4bc9c415815c251c9fd537f78abb7822a12e8b94916c429bf0635bfc4edc441ca897ff SHA512 f7bbc72805ccbea7ba66b88fdf1f9793b3e8c076e7e64cab0be2c04881fb786b7ba9559067efad2956a3fd26aa647794b19b0cd0c52472fbd3ecd7205d71d006
 DIST pam_fprint-0.2.tar.bz2 72781 BLAKE2B 196bfd6a714da2d0fa8fe616a63e31008024a02b785aa393a62acd2267c1cc87382aef1d7af8d9f626c406534dd1e952dec520e6fc5dc0bc52d157246762c15c SHA512 c860488efabfd6301b4e19596e15545bbcb1a15f79bfd7c61a357ef47cf0a621ec0d15328d5be30f7ef045813e18333bd0aea7fb8fcb06681007dcacca6396fd
-EBUILD pam_fprint-0.2-r1.ebuild 649 BLAKE2B a7827e06deb62dab1b4b148ac0cbf3257127571a369e925e7c9a8cf69ef63682c9f0fae9f43ea20735352bab589a996e14d9d35b02be4d8d08f6ee1336f86dda SHA512 6dc1f32ccb842bc95b3ae9160597aa747a172a085ecb9c5185c48f17576307cf87166d0b4df17412c02e3cbc295c81ba3eae814f11f5eb222f0f2ceff02db453
+EBUILD pam_fprint-0.2-r1.ebuild 656 BLAKE2B 5a6dcb674049b782d65f47b48c88ba7c0e7e697b6eed17ebb0147c702c79339f0dd2b6b05e4342e2c6b46318946f8b260c02006b8c2ea98f7cb0d484e9a4e8ef SHA512 022449234399843f7692b8eb1d330a03237135c645f469420db2ac2f5e5371899796be33a5df8cb2154d753e9016a3514b1e7605748608ab4b17381a1b1ac264
 MISC metadata.xml 243 BLAKE2B 14de7dae3f7870f70ce49d4b1dd033b81e178198612c228b863fdf45d758b8b2a09f5103d7b7495d6491108405ae04803aa728b41a0313c9b26230c06e46badf SHA512 15b351ba26192374574eaa4a1f14898e0cf2a0bb5b6bb9bd5c69a8ed76ad5be89973b9bcb2c0d068d1996e8af76d26393cf01901a81c161f7ca04c862f7c16bf
diff --git a/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild b/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild
index 8179d8611ad5..8c7cc0800b25 100644
--- a/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild
+++ b/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/fprint/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 3045a0e62aff..791bfd1121ea 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -5,5 +5,5 @@ DIST polkit-0.115.tar.gz 1550932 BLAKE2B 3185ebed46209f88a9ffccbbcaf1bf180d1ae6d
 DIST polkit-0.116.tar.gz 1548311 BLAKE2B e9761a2934136d453a47b81dd1f132f9fc96c45b731d5fceb2aa7706f5325b6499f6acbb68032befc1b21878b1b54754685607c916ca8e02a8accca3ca014b31 SHA512 b66b01cc2bb4349de70147f41f161f0f6f41e7230b581dfb054058b48969ec57041ab05b51787c749ccfc36aa5f317952d7e7ba337b4f6f6c0a923ed5866c2d5
 EBUILD polkit-0.115-r3.ebuild 3524 BLAKE2B be2c343098d17a44ed50663766d20236cde1be31cb8e47b94b1005bad9a738e59b6035a16f2a17b5448eb1286e25c8abae2d056c0f299f35e89eb3e38a837ba1 SHA512 11f280bba463810f0ef6c73bbaf3c37f50dbb0b07dfc9c56d0f5210235091748977bb1e001a1ccd86381f14ac9a6b97c017280fb9a2d7f4cfc2fe8ea6fd7bf37
 EBUILD polkit-0.115-r4.ebuild 3615 BLAKE2B 354bb18d8cbc94d16f92d08253974cb726805e07a44020d8b28c9262f034e53ab4cff5d235c1acacd28bc97784fc0d38ee19e181d5432365954e7301b8948b21 SHA512 f438794fc7ee385aab8246f5918087b5d2e3bc26f3cb4f89dd849e02b0e75cceadcadb21046bec81ae0166278b47d3f4504cf19a79c27ee2f0049c89bcea2f95
-EBUILD polkit-0.116.ebuild 3538 BLAKE2B bf15f17cbb364e5b1198076aea7d0b49ff9b0d0784cf651f79a919bca6d42f50e59a471ac7d0c00c699b7dddcea955301f2652878f2c8820fd6910afad9a2c97 SHA512 a6f96f4ef9abe67055777be109ddfb667f6191db4439978c6b7a3ad61d941dc50d618686c66383b7b59945cd464f570f2887543020767d3a3689690e3f6b4a44
+EBUILD polkit-0.116-r1.ebuild 3359 BLAKE2B 578f389e449094c1cb555272d03c308b3530a66bd44354a9a1b6441644b2c2f48fa5e2c4788ae31f4159f91157742d5cd17b3074b992271a5bdace482e8b6537 SHA512 b037d3b56d9fccbd49d69c984247ab18dcdbafd03f6f23384e4bd315aae3c30eeb9b70e2287bf4769b54b4c5782cf22db993a841f9a95d00c3baeeebdf826ec3
 MISC metadata.xml 498 BLAKE2B 8bbfe2ee11b53b77dc26215776a87acd7cade59a5a139ada605f2ad293c569005d2bd517aaee1c6f4ea45251a0cc67f10082c96c2224d47fd84b5e1d87dcb724 SHA512 16ab1ff82daad858eb9adf7396b0e3d5845914eb7d7f1590cdea44fe1a2214043f011cd65cdde2e2195b959bae6581845bc6b4981fd400b3d8719f400f85b6dc
diff --git a/sys-auth/polkit/polkit-0.116.ebuild b/sys-auth/polkit/polkit-0.116-r1.ebuild
index b3fdcd99dd81..4b9c7900a5f5 100644
--- a/sys-auth/polkit/polkit-0.116.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"
@@ -17,6 +17,7 @@ IUSE="consolekit elogind examples gtk +introspection jit kde nls pam selinux sys
 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="
@@ -62,16 +64,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
 
@@ -122,20 +114,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
 }
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index fc5b5e1a21c3..7373dd874de1 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -6,7 +6,7 @@ AUX sssd.service 341 BLAKE2B 0cffcd43786633aa8e5bb42c54741cba676021c5a07554b0849
 DIST sssd-1.16.3.tar.gz 6217114 BLAKE2B eefaf8de466d0d76e9a4b60aefef6eb63c17a55b9a1f2e07e973a61d71cbe5432e92357656a1eb353d45bbc2fa92290cef45898d0b315d4a4c4074652ff25a23 SHA512 6165923f652f624bbe3ddc625ae682c4867eb7a20652d0cf74bbb8dda2307c917d3189ede26fd21a4fb5fd5926149271a65fa09f3affe928029ed99e6422b728
 DIST sssd-2.1.0.tar.gz 6463331 BLAKE2B 9226370dc384c58841d944bdf9b067d953bf138ee7a289f01a4b8bb5d09beee3b9f21609989123d8f4f9fc13237670d61e32dcb194555ddc6785c598ce78d08c SHA512 12a7e5b89d462350af3c43e15b24a437dd985ac4a2e419d5e52cc0d05c6eacb9319d39b23681595ef860120cd1ae6e5fb265054afeddcb05d3d5f5de5d6ffa63
 DIST sssd-2.2.0.tar.gz 6642715 BLAKE2B e6c16ca69effe59769fc166c02203faee445ebe2bf551c6a1460bdee2474ccbce1a38b3aa59b1ae4a79bb170696a784b800a9299025bf6a58bc9aeb94b946338 SHA512 9ebd8784e1f0c72cb808bbc153c0b0aa9bf507938f78336a260073a89b49350dc2c6172653509738ea7a50bb9da596725e1d6c92f99c7a03308aa42f6378dbbb
-EBUILD sssd-1.16.3-r2.ebuild 6285 BLAKE2B e44ab49fc7d72b0c2121bc4b5bea2b2413f6a379d1223a9b2f2cea59cb79685e30ae2beb25620e4c3094c5c032bdf29bf1affd5456665d12504ed84adae44528 SHA512 d79062bc3c7d48db6452bd6cdcf681745f4ae7e13f5aacd7bb8f434963df82d66c0293a1848518a6c2df71e7fcc3337e9de58a622859b1772e6c96fa8618cfa6
-EBUILD sssd-2.1.0.ebuild 6205 BLAKE2B f78b016540080eec10a44fb162dacc639639db594dd2e763774a1a51917cd5e2410184c7a2c6efb04a1bf876bd2320a977082980a807ac308292080de3fb9a7b SHA512 b36a70fa89df5717a53e03b42541c881e69eb6c27868fa25f2cbc5dbfd64ac21e020ef6c916acd7c0d0fe3967e05629abd4952f29234fb6a7c41b0f911be41b6
-EBUILD sssd-2.2.0.ebuild 6205 BLAKE2B f78b016540080eec10a44fb162dacc639639db594dd2e763774a1a51917cd5e2410184c7a2c6efb04a1bf876bd2320a977082980a807ac308292080de3fb9a7b SHA512 b36a70fa89df5717a53e03b42541c881e69eb6c27868fa25f2cbc5dbfd64ac21e020ef6c916acd7c0d0fe3967e05629abd4952f29234fb6a7c41b0f911be41b6
+EBUILD sssd-1.16.3-r2.ebuild 6049 BLAKE2B 737c2d6271e5e8cf022656c552c666fb5e69d2cdb256035eb2b521a9693492e8d0c77533e90621ff599c1411e5d7b183183e587b5a5f1049b6b129c6a6d2908b SHA512 70c3ed9b8f3184c1d56058844bb4033981341cff6b6eb4b904bc482770f247087e85845bd8af7b1e73267a38d89181f27684ba93b9527a1c1766be397cfd9081
+EBUILD sssd-2.1.0.ebuild 5969 BLAKE2B 82d98764761159594dd1b771e2bbbe2e2029916a922d0c8f7086c1ec409b9f89700f719d805bf3551805ba525c1ed99b4a83894f04f6d5b2f2efc7196a97768e SHA512 25ecf654a10f4b57e3aa360499718ecb393a7c87362fcc2efed542450eadcbd340fc8a9f68598709f8a95f7d3b1ba76ccf81e86635a2179c85590454e4556989
+EBUILD sssd-2.2.0.ebuild 5969 BLAKE2B 82d98764761159594dd1b771e2bbbe2e2029916a922d0c8f7086c1ec409b9f89700f719d805bf3551805ba525c1ed99b4a83894f04f6d5b2f2efc7196a97768e SHA512 25ecf654a10f4b57e3aa360499718ecb393a7c87362fcc2efed542450eadcbd340fc8a9f68598709f8a95f7d3b1ba76ccf81e86635a2179c85590454e4556989
 MISC metadata.xml 1090 BLAKE2B 7085d66b3454b3756d7dab49b6d9525c4ba90156d07f2710f4eb3c5bf3bbd9d10412d511dc0fe091ac4c5291f87a258fac6adbe9732d20a96660f4e0a66cf247 SHA512 2cbf20cd206a45bd82b1416926a02de06bf40b1b4168f19202c367cf8e24d764745b8a5116366ee10520cae15800e17b43d3000995419117f02b2d37474f142e
diff --git a/sys-auth/sssd/sssd-1.16.3-r2.ebuild b/sys-auth/sssd/sssd-1.16.3-r2.ebuild
index 123d66457912..6397b5835b11 100644
--- a/sys-auth/sssd/sssd-1.16.3-r2.ebuild
+++ b/sys-auth/sssd/sssd-1.16.3-r2.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools flag-o-matic linux-info multilib-minimal pam python-r1 systemd toolchain-funcs
+inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain-funcs
 
 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
 HOMEPAGE="https://pagure.io/SSSD/sssd"
@@ -14,7 +12,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl autofs +locator +netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
+IUSE="acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test"
 
 COMMON_DEP="
 	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
@@ -104,12 +102,6 @@ multilib_src_configure() {
 	# set initscript to sysv because the systemd option needs systemd to
 	# be installed. We provide our own systemd file anyway.
 	local myconf=()
-	if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
-		myconf+=($(multilib_native_use_with python python2-bindings))
-	fi
-	if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
-		myconf+=($(multilib_native_use_with python python3-bindings))
-	fi
 	#Work around linker dependency problem.
 	append-ldflags "-Wl,--allow-shlib-undefined"
 
@@ -142,6 +134,8 @@ multilib_src_configure() {
 		$(multilib_native_use_with ssh)
 		--with-crypto="nss"
 		--with-initscript="sysv"
+		--without-python2-bindings
+		--without-python3-bindings
 
 		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
 	)
diff --git a/sys-auth/sssd/sssd-2.1.0.ebuild b/sys-auth/sssd/sssd-2.1.0.ebuild
index 146e47c5995d..3bb83f60232e 100644
--- a/sys-auth/sssd/sssd-2.1.0.ebuild
+++ b/sys-auth/sssd/sssd-2.1.0.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools flag-o-matic linux-info multilib-minimal pam python-r1 systemd toolchain-funcs
+inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain-funcs
 
 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
 HOMEPAGE="https://pagure.io/SSSD/sssd"
@@ -14,7 +12,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl autofs +locator +netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
+IUSE="acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test"
 
 COMMON_DEP="
 	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
@@ -101,12 +99,6 @@ multilib_src_configure() {
 	# set initscript to sysv because the systemd option needs systemd to
 	# be installed. We provide our own systemd file anyway.
 	local myconf=()
-	if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
-		myconf+=($(multilib_native_use_with python python2-bindings))
-	fi
-	if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
-		myconf+=($(multilib_native_use_with python python3-bindings))
-	fi
 	#Work around linker dependency problem.
 	append-ldflags "-Wl,--allow-shlib-undefined"
 
@@ -139,6 +131,8 @@ multilib_src_configure() {
 		$(multilib_native_use_with ssh)
 		--with-crypto="nss"
 		--with-initscript="sysv"
+		--without-python2-bindings
+		--without-python3-bindings
 
 		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
 	)
diff --git a/sys-auth/sssd/sssd-2.2.0.ebuild b/sys-auth/sssd/sssd-2.2.0.ebuild
index 146e47c5995d..3bb83f60232e 100644
--- a/sys-auth/sssd/sssd-2.2.0.ebuild
+++ b/sys-auth/sssd/sssd-2.2.0.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools flag-o-matic linux-info multilib-minimal pam python-r1 systemd toolchain-funcs
+inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain-funcs
 
 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
 HOMEPAGE="https://pagure.io/SSSD/sssd"
@@ -14,7 +12,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl autofs +locator +netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
+IUSE="acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test"
 
 COMMON_DEP="
 	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
@@ -101,12 +99,6 @@ multilib_src_configure() {
 	# set initscript to sysv because the systemd option needs systemd to
 	# be installed. We provide our own systemd file anyway.
 	local myconf=()
-	if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
-		myconf+=($(multilib_native_use_with python python2-bindings))
-	fi
-	if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
-		myconf+=($(multilib_native_use_with python python3-bindings))
-	fi
 	#Work around linker dependency problem.
 	append-ldflags "-Wl,--allow-shlib-undefined"
 
@@ -139,6 +131,8 @@ multilib_src_configure() {
 		$(multilib_native_use_with ssh)
 		--with-crypto="nss"
 		--with-initscript="sysv"
+		--without-python2-bindings
+		--without-python3-bindings
 
 		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
 	)
diff --git a/sys-auth/ykpers/Manifest b/sys-auth/ykpers/Manifest
index e2434e2d18b3..4fcac268cd1c 100644
--- a/sys-auth/ykpers/Manifest
+++ b/sys-auth/ykpers/Manifest
@@ -5,5 +5,5 @@ DIST ykpers-1.19.3.tar.gz 127789 BLAKE2B 8dfc2751be92e69fcf98f5dc75d87eb170a4f70
 EBUILD ykpers-1.18.0.ebuild 937 BLAKE2B ea45c65f0927b0a6c810b90c5662505f68f85e78eeb6aa1f0be6a83ffe13c3237d46aef84614da11321cdf02224629a2344413f1f5d8880fd0cbeb9db660cb5a SHA512 8313c2c13adeacf11427cfa6dfd8455f141ac5d992a3bd418731867e3d599a946edb02e0b9cfc319ceef9506c4e6e60ee75b46ce78f8a5f3c0925cab9a9f348c
 EBUILD ykpers-1.18.1.ebuild 981 BLAKE2B af4f36e8d758a125997188c48e16083d3d45cc66334fdc3330dafa175ee552ebbf0a4a88a78c598e6f00b6d12097f7295d874381fcd653c3e0f60d209fe32beb SHA512 b118dd9c1897a434460ca12f3887868c7240eaa5c81035e3f6101300f4519267802aae1f6882e3a24b5a40e669031697635fb87ad8caa1ea35262b93665b0e3f
 EBUILD ykpers-1.19.0.ebuild 995 BLAKE2B b4c7a15d5d52056492d04bed8644dd8bffed31625e2d7df5e52bc93d7828d2a21d3f05cbe514778845666461749d77d78cddb8e21bacb1e1231f3be6ef42f9d2 SHA512 864b9228c1eb50c8f0e9e70f32b0ebd394b3f6adeaaf80e694947fd8d64e9058aa0d43fa1529d39b8dcb2cf2ac30f4d8c04e35699e9a00aabcca0b3c20023da8
-EBUILD ykpers-1.19.3-r1.ebuild 1079 BLAKE2B e33df34982e28e79e546150670c0e8e11c1b2cd5642064c828c40a5e8972cd303b4e9d3d3bd8957b5876e5bfbdcd7e03e652796fa688dad051056dd9bf4e2a45 SHA512 ab179c6e71cfc3c58984d42a947b4e371471b65b6e3bdc69af084a134ebc01bfa09381b7ffca47b3f18d1081c7976caffc0cc8931e90ef71427ebad461bd02e7
+EBUILD ykpers-1.19.3-r1.ebuild 1077 BLAKE2B c80749b2db997e79112cec9dee3b6ad3e838ed30febc099d79180f1e2a9057edd200b705a1421b2f6e378be8a514c0a3e04cb809f2f795e00a88a95447d9fdce SHA512 b114d2b8f472da3dfebb2f5b5de9ca69a73dbe32abe9b5f62fd694a5d5755f80493d30d741d2ddcaa06d9235263c6fcc5abff54c94b3fd407a5d9f71ca1fa78f
 MISC metadata.xml 632 BLAKE2B b03dff691e31f6d0ff188f1e10156140f0b9d5a91993be3be01f291e5edb75a0e8776a550ad3a66ac0244c402bbb40aa9e7948307d498d05d5c8d6b9b1997c4a SHA512 1cb1ba38e29077530438a94c0a2c4e6724abc4b8e3f946466d141497495b6f316094c5f6d2313e260b163c979f65a777570de03a7630c2908a085ce5da34580b
diff --git a/sys-auth/ykpers/ykpers-1.19.3-r1.ebuild b/sys-auth/ykpers/ykpers-1.19.3-r1.ebuild
index 4db6dbd05bb2..fbbae20cc15f 100644
--- a/sys-auth/ykpers/ykpers-1.19.3-r1.ebuild
+++ b/sys-auth/ykpers/ykpers-1.19.3-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Library and tool for personalization of Yubico's YubiKey"
 SRC_URI="https://github.com/Yubico/yubikey-personalization/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="https://github.com/Yubico/yubikey-personalization"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="BSD-2"
 IUSE="consolekit static-libs"