commit:     5e6d608ea9cfb8ee5d0a1afef95c547549f1f737
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 09:48:50 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 09:49:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e6d608e

net-print/cups: Fixed installation with USE="-pam"

Thanks-to: Xavier Miller <xavier.miller <AT> cauwe.org>
Closes: https://bugs.gentoo.org/784770
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-print/cups/cups-2.3.3_p2.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-print/cups/cups-2.3.3_p2.ebuild 
b/net-print/cups/cups-2.3.3_p2.ebuild
index 20e54bc815d..f0415242e5a 100644
--- a/net-print/cups/cups-2.3.3_p2.ebuild
+++ b/net-print/cups/cups-2.3.3_p2.ebuild
@@ -227,7 +227,7 @@ multilib_src_install_all() {
        rm "${ED}"/etc/cups/cupsd.conf.default || die
 
        # clean out cups init scripts
-       rm -r "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} || die
+       rm -r "${ED}"/etc/{init.d/cups,rc*} || die
 
        # install our init script
        local neededservices=(
@@ -239,7 +239,8 @@ multilib_src_install_all() {
        sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die
        doinitd "${T}"/cupsd
 
-       if use pam; then
+       if use pam ; then
+               rm "${ED}"/etc/pam.d/${PN} || die
                pamd_mimic_system cups auth account
        fi
 

Reply via email to