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 0A30B1382C5 for ; Sat, 23 Jan 2021 11:31:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AA24E0AEC; Sat, 23 Jan 2021 11:31:19 +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 179C8E0AEC for ; Sat, 23 Jan 2021 11:31:19 +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 B2D7F340F04 for ; Sat, 23 Jan 2021 11:31:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2DB5B32B for ; Sat, 23 Jan 2021 11:31:16 +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: <1611401473.c32ff3fd3d55c96086f38245f365f94eb135da7e.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/openrc/openrc-0.42.1-r1.ebuild sys-apps/openrc/openrc-0.42.1.ebuild sys-apps/openrc/openrc-9999.ebuild X-VCS-Directories: sys-apps/openrc/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: c32ff3fd3d55c96086f38245f365f94eb135da7e X-VCS-Branch: master Date: Sat, 23 Jan 2021 11:31:16 +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: 1eb5afad-2929-4e79-9725-90abeebe9912 X-Archives-Hash: 81f8b004ce4a683d2b6c3df82c6a9c8d commit: c32ff3fd3d55c96086f38245f365f94eb135da7e Author: Mikle Kolyada gentoo org> AuthorDate: Sat Jan 23 11:30:43 2021 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sat Jan 23 11:31:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c32ff3fd sys-apps/openrc: install pam files conditionally Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> .../openrc/{openrc-0.42.1.ebuild => openrc-0.42.1-r1.ebuild} | 10 ++++++---- sys-apps/openrc/openrc-9999.ebuild | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sys-apps/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1-r1.ebuild similarity index 96% rename from sys-apps/openrc/openrc-0.42.1.ebuild rename to sys-apps/openrc/openrc-0.42.1-r1.ebuild index a10ce3384c6..14135968508 100644 --- a/sys-apps/openrc/openrc-0.42.1.ebuild +++ b/sys-apps/openrc/openrc-0.42.1-r1.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 @@ -135,9 +135,11 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/openrc.logrotate openrc - # install gentoo pam.d files - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon - newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon + if use pam; then + # install gentoo pam.d files + newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon + newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon + fi # install documentation dodoc ChangeLog *.md diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index c159c6cdce2..da6d7d50ca1 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-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 @@ -125,9 +125,11 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/openrc.logrotate openrc - # install gentoo pam.d files - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon - newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon + if use pam; then + # install gentoo pam.d files + newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon + newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon + fi # install documentation dodoc ChangeLog *.md