| 1 |
commit: 5e6d608ea9cfb8ee5d0a1afef95c547549f1f737 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 21 09:48:50 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 21 09:49:32 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e6d608e |
| 7 |
|
| 8 |
net-print/cups: Fixed installation with USE="-pam" |
| 9 |
|
| 10 |
Thanks-to: Xavier Miller <xavier.miller <AT> cauwe.org> |
| 11 |
Closes: https://bugs.gentoo.org/784770 |
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
net-print/cups/cups-2.3.3_p2.ebuild | 5 +++-- |
| 15 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-print/cups/cups-2.3.3_p2.ebuild b/net-print/cups/cups-2.3.3_p2.ebuild |
| 18 |
index 20e54bc815d..f0415242e5a 100644 |
| 19 |
--- a/net-print/cups/cups-2.3.3_p2.ebuild |
| 20 |
+++ b/net-print/cups/cups-2.3.3_p2.ebuild |
| 21 |
@@ -227,7 +227,7 @@ multilib_src_install_all() { |
| 22 |
rm "${ED}"/etc/cups/cupsd.conf.default || die |
| 23 |
|
| 24 |
# clean out cups init scripts |
| 25 |
- rm -r "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} || die |
| 26 |
+ rm -r "${ED}"/etc/{init.d/cups,rc*} || die |
| 27 |
|
| 28 |
# install our init script |
| 29 |
local neededservices=( |
| 30 |
@@ -239,7 +239,8 @@ multilib_src_install_all() { |
| 31 |
sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die |
| 32 |
doinitd "${T}"/cupsd |
| 33 |
|
| 34 |
- if use pam; then |
| 35 |
+ if use pam ; then |
| 36 |
+ rm "${ED}"/etc/pam.d/${PN} || die |
| 37 |
pamd_mimic_system cups auth account |
| 38 |
fi |
Archives