[gentoo-commits] repo/gentoo:master commit in: net-print/cups/

[Mikle Kolyada]

commit:     8f0d07dfbacb9156183d16fc09c3193e842aaba3
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 14:52:58 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 14:54:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0d07df

net-print/cups: install pam files conditionally

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

 net-print/cups/{cups-2.3.3-r1.ebuild => cups-2.3.3-r2.ebuild} | 7 ++++---
 net-print/cups/cups-9999.ebuild                               | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/net-print/cups/cups-2.3.3-r1.ebuild 
b/net-print/cups/cups-2.3.3-r2.ebuild
similarity index 98%
rename from net-print/cups/cups-2.3.3-r1.ebuild
rename to net-print/cups/cups-2.3.3-r2.ebuild
index d6375da0adf..a367e9deed5 100644
--- a/net-print/cups/cups-2.3.3-r1.ebuild
+++ b/net-print/cups/cups-2.3.3-r2.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
@@ -253,8 +253,9 @@ multilib_src_install_all() {
                "${T}"/cupsd || die
        doinitd "${T}"/cupsd
 
-       # install our pam script
-       pamd_mimic_system cups auth account
+       if use pam; then
+               pamd_mimic_system cups auth account
+       fi
 
        if use xinetd ; then
                # correct path

diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index dd20b85bf92..7fecb1e8f2e 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.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
@@ -251,8 +251,9 @@ multilib_src_install_all() {
                "${T}"/cupsd || die
        doinitd "${T}"/cupsd
 
-       # install our pam script
-       pamd_mimic_system cups auth account
+       if use pam; then
+               pamd_mimic_system cups auth account
+       fi
 
        if use xinetd ; then
                # correct path