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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B3525158089 for ; Tue, 31 Oct 2023 15:49:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F24122BC054; Tue, 31 Oct 2023 15:49:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D79B12BC054 for ; Tue, 31 Oct 2023 15:49:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16001335CEE for ; Tue, 31 Oct 2023 15:49:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 60ED01307 for ; Tue, 31 Oct 2023 15:49:25 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1698767263.b4759d375eb36ec1a0be3883e696f7c3323049fa.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/shadow/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/shadow/shadow-4.14.2.ebuild X-VCS-Directories: sys-apps/shadow/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: b4759d375eb36ec1a0be3883e696f7c3323049fa X-VCS-Branch: master Date: Tue, 31 Oct 2023 15:49:25 +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: 09783506-074d-4b76-8c76-f0d40a259069 X-Archives-Hash: b38c7ffdbec8abb3a8f8cc6ccab08211 commit: b4759d375eb36ec1a0be3883e696f7c3323049fa Author: Mike Gilbert gentoo org> AuthorDate: Tue Oct 31 15:46:34 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Oct 31 15:47:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4759d37 sys-apps/shadow: wire up PGP key for Alejandro Colomar Signed-off-by: Mike Gilbert gentoo.org> sys-apps/shadow/shadow-4.14.2.ebuild | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys-apps/shadow/shadow-4.14.2.ebuild b/sys-apps/shadow/shadow-4.14.2.ebuild index 429b72eedc9e..8995414032f7 100644 --- a/sys-apps/shadow/shadow-4.14.2.ebuild +++ b/sys-apps/shadow/shadow-4.14.2.ebuild @@ -7,7 +7,6 @@ EAPI=8 # official. Don't keyword the pre-releases! # Check https://github.com/shadow-maint/shadow/releases. -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sergehallyn.asc inherit libtool pam verify-sig DESCRIPTION="Utilities to deal with user accounts" @@ -62,9 +61,16 @@ RDEPEND=" BDEPEND=" app-arch/xz-utils sys-devel/gettext - verify-sig? ( sec-keys/openpgp-keys-sergehallyn ) " +if [[ ${PV} == *.0 ]]; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-sergehallyn )" + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sergehallyn.asc +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-alejandro-colomar )" + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/alejandro-colomar.asc +fi + src_prepare() { default elibtoolize