From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 995AE1382C5 for ; Sun, 24 Jan 2021 11:28:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1A35E0999; Sun, 24 Jan 2021 11:28:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9E4EE0999 for ; Sun, 24 Jan 2021 11:28:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C3794340FDE for ; Sun, 24 Jan 2021 11:28:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 61599328 for ; Sun, 24 Jan 2021 11:28:41 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1611487719.81521646674e9a2c3cdc22a8b5fcf5ee10c83a78.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/squid/squid-4.13.ebuild X-VCS-Directories: net-proxy/squid/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 81521646674e9a2c3cdc22a8b5fcf5ee10c83a78 X-VCS-Branch: master Date: Sun, 24 Jan 2021 11:28:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7a211312-385f-40d7-803e-56004dd8fdcd X-Archives-Hash: 89314a24c5e6688fcb1ddad235734660 commit: 81521646674e9a2c3cdc22a8b5fcf5ee10c83a78 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Jan 24 11:27:38 2021 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sun Jan 24 11:28:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81521646 net-proxy/squid: install pam files conditionally Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> net-proxy/squid/squid-4.13.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net-proxy/squid/squid-4.13.ebuild b/net-proxy/squid/squid-4.13.ebuild index 5547d6a8e97..6201b7c4543 100644 --- a/net-proxy/squid/squid-4.13.ebuild +++ b/net-proxy/squid/squid-4.13.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 @@ -256,7 +256,10 @@ src_install() { newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group dodoc RELEASENOTES.html - newpamd "${FILESDIR}/squid.pam" squid + if use pam; then + newpamd "${FILESDIR}/squid.pam" squid + fi + newconfd "${FILESDIR}/squid.confd-r2" squid newinitd "${FILESDIR}/squid.initd-r5" squid if use logrotate; then