[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/

[Mikle Kolyada]

commit:     da820dfb26530eda166774cc927b81fb41532f16
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 15:32:19 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 15:32:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da820dfb

x11-misc/xscreensaver: install pam files conditionally

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 .../{xscreensaver-5.38-r2.ebuild => xscreensaver-5.38-r3.ebuild}  | 8 +++++---
 .../{xscreensaver-5.43-r4.ebuild => xscreensaver-5.43-r5.ebuild}  | 8 +++++---
 .../{xscreensaver-5.44-r3.ebuild => xscreensaver-5.44-r4.ebuild}  | 8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild 
b/x11-misc/xscreensaver/xscreensaver-5.38-r3.ebuild
similarity index 96%
rename from x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.38-r3.ebuild
index a71b8a78af4..01313f497ec 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -134,8 +134,10 @@ src_install() {
 
        dodoc README{,.hacking}
 
-       use pam && fperms 755 /usr/bin/${PN}
-       pamd_mimic_system ${PN} auth
+       if use pam; then
+               fperms 755 /usr/bin/${PN}
+               pamd_mimic_system ${PN} auth
+       fi
 
        rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
 }

diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild 
b/x11-misc/xscreensaver/xscreensaver-5.43-r5.ebuild
similarity index 96%
rename from x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.43-r5.ebuild
index e80dbdef620..1ef07b385bf 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -137,8 +137,10 @@ src_install() {
 
        dodoc README{,.hacking}
 
-       use pam && fperms 755 /usr/bin/${PN}
-       pamd_mimic_system ${PN} auth
+       if use pam; then
+               fperms 755 /usr/bin/${PN}
+               pamd_mimic_system ${PN} auth
+       fi
 
        rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
 }

diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild 
b/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
similarity index 96%
rename from x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
index 94304df0805..40e90de32b1 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -152,8 +152,10 @@ src_install() {
 
        dodoc README{,.hacking}
 
-       use pam && fperms 755 /usr/bin/${PN}
-       pamd_mimic_system ${PN} auth
+       if use pam; then
+               fperms 755 /usr/bin/${PN}
+               pamd_mimic_system ${PN} auth
+       fi
 
        rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
 }