[gentoo-commits] repo/gentoo:master commit in: sys-libs/pam/

[Georgy Yakovlev]

commit:     0269a2a32e6ef3352dad30260f2efbc05b425e87
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 17 03:12:53 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 03:34:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0269a2a3

sys-libs/pam: revbump 1.4.0, use tmpfiles_process

use /run instead of /var/run
remove trailing - in tmpfiles.d, it can be omitted.
also inherit multilib-minimal last in order

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Acked-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../pam/{pam-1.4.0.ebuild => pam-1.4.0-r1.ebuild}  | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/sys-libs/pam/pam-1.4.0.ebuild b/sys-libs/pam/pam-1.4.0-r1.ebuild
similarity index 88%
rename from sys-libs/pam/pam-1.4.0.ebuild
rename to sys-libs/pam/pam-1.4.0-r1.ebuild
index b1d695f9d9e..632649733a3 100644
--- a/sys-libs/pam/pam-1.4.0.ebuild
+++ b/sys-libs/pam/pam-1.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools db-use fcaps multilib-minimal toolchain-funcs usr-ldscript
+inherit autotools db-use fcaps tmpfiles toolchain-funcs usr-ldscript 
multilib-minimal
 
 DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
 HOMEPAGE="https://github.com/linux-pam/linux-pam";
@@ -94,16 +94,12 @@ multilib_src_install() {
 multilib_src_install_all() {
        find "${ED}" -type f -name '*.la' -delete || die
 
-       dodir /usr/lib/tmpfiles.d
-       cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}-:${SLOT}.conf <<EOF
-d /var/run/faillock 0755 root root -
-EOF
-
-       if use selinux; then
-               cat - >> 
"${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
-d /run/sepermit 0755 root root
-EOF
-       fi
+       newtmpfiles - "${CATEGORY}-${PN}.conf" <<-_EOF_
+               d /run/faillock 0755 root root
+       _EOF_
+       use selinux && newtmpfiles - "${CATEGORY}-${PN}-selinux.conf" <<-_EOF_
+               d /run/sepermit 0755 root root
+       _EOF_
 
        for i in "${WORKDIR}"/${P}-doc/*; do
                doman ${i}
@@ -125,4 +121,8 @@ pkg_postinst() {
        # The pam_unix module needs to check the password of the user which 
requires
        # read access to /etc/shadow only.
        fcaps cap_dac_override sbin/unix_chkpwd
+
+       # OpenRC systems need this processed right away
+       tmpfiles_process "${CATEGORY}-${PN}.conf"
+       use selinux && tmpfiles_process "${CATEGORY}-${PN}-selinux.conf"
 }