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 BB8C01382C5 for ; Fri, 22 Jan 2021 14:54:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04388E0849; Fri, 22 Jan 2021 14:54:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D9661E0849 for ; Fri, 22 Jan 2021 14:54:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 91F6B340F93 for ; Fri, 22 Jan 2021 14:54:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B353CC for ; Fri, 22 Jan 2021 14:54:14 +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: <1611327251.8f0d07dfbacb9156183d16fc09c3193e842aaba3.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups/cups-2.3.3-r1.ebuild net-print/cups/cups-2.3.3-r2.ebuild net-print/cups/cups-9999.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 8f0d07dfbacb9156183d16fc09c3193e842aaba3 X-VCS-Branch: master Date: Fri, 22 Jan 2021 14:54:14 +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: 3f377084-d151-4200-85e6-d1b07b7be1d6 X-Archives-Hash: 31925a5901e9ca6c00aafd172a8c261d commit: 8f0d07dfbacb9156183d16fc09c3193e842aaba3 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Jan 22 14:52:58 2021 +0000 Commit: Mikle Kolyada gentoo 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 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