From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F980158046 for ; Tue, 28 Oct 2025 18:59:10 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 082B3341010 for ; Tue, 28 Oct 2025 18:59:10 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id D779F110213; Tue, 28 Oct 2025 18:59:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id CADD1110213 for ; Tue, 28 Oct 2025 18:59:08 +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 83E60340D1B for ; Tue, 28 Oct 2025 18:59:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C39171597 for ; Tue, 28 Oct 2025 18:59:06 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1761677818.133742ca3a9497606262fab40ed6f4f965782a7c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/gnupg/gnupg-2.4.8-r1.ebuild app-crypt/gnupg/gnupg-2.4.8.ebuild app-crypt/gnupg/gnupg-2.5.13-r1.ebuild app-crypt/gnupg/gnupg-2.5.13.ebuild X-VCS-Directories: app-crypt/gnupg/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 133742ca3a9497606262fab40ed6f4f965782a7c X-VCS-Branch: master Date: Tue, 28 Oct 2025 18:59:06 +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: 924eb417-52b9-4168-a6fe-2f8a18c08d41 X-Archives-Hash: 086af2c20ea6ead0d70c3271b912314b commit: 133742ca3a9497606262fab40ed6f4f965782a7c Author: Sam James gentoo org> AuthorDate: Tue Oct 28 18:49:42 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Oct 28 18:56:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=133742ca app-crypt/gnupg: provide /usr/bin/gpg and /usr/bin/gpgv in pkg_postinst After app-crypt/gnupg[alternatives] is merged, gnupg no longer provides /usr/bin/gpg, and there's no /usr/bin/gpg on the system until app-alternatives/gpg can be merged. That's somewhat-fine unless app-alternatives/gpg is a signed binpkg, in which case gpg is needed to verify it. Provide gpg and gpgv as orphaned symlinks in pkg_postinst to handle this case. Reported-by: Jay Faulkner gentoo.org> Signed-off-by: Sam James gentoo.org> app-crypt/gnupg/{gnupg-2.4.8.ebuild => gnupg-2.4.8-r1.ebuild} | 11 +++++++++++ .../gnupg/{gnupg-2.5.13.ebuild => gnupg-2.5.13-r1.ebuild} | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/app-crypt/gnupg/gnupg-2.4.8.ebuild b/app-crypt/gnupg/gnupg-2.4.8-r1.ebuild similarity index 95% rename from app-crypt/gnupg/gnupg-2.4.8.ebuild rename to app-crypt/gnupg/gnupg-2.4.8-r1.ebuild index ea4af2024706..65df46615281 100644 --- a/app-crypt/gnupg/gnupg-2.4.8.ebuild +++ b/app-crypt/gnupg/gnupg-2.4.8-r1.ebuild @@ -204,3 +204,14 @@ my_src_install_all() { dodoc "${FILESDIR}"/README-systemd systemd_douserunit "${GNUPG_SYSTEMD_UNITS[@]/#/${T}/}" } + +pkg_postinst() { + # If /usr/bin/gpg and /usr/bin/gpgv do not exist, provide them. + if [[ ! -e ${EROOT}/usr/bin/gpg ]]; then + ln -sf -- gpg-reference "${EROOT}"/usr/bin/gpg || die + fi + + if [[ ! -e ${EROOT}/usr/bin/gpgv ]]; then + ln -sf -- gpgv-reference "${EROOT}"/usr/bin/gpgv || die + fi +} diff --git a/app-crypt/gnupg/gnupg-2.5.13.ebuild b/app-crypt/gnupg/gnupg-2.5.13-r1.ebuild similarity index 95% rename from app-crypt/gnupg/gnupg-2.5.13.ebuild rename to app-crypt/gnupg/gnupg-2.5.13-r1.ebuild index 87cb1ff1d288..1e9503ba5a7e 100644 --- a/app-crypt/gnupg/gnupg-2.5.13.ebuild +++ b/app-crypt/gnupg/gnupg-2.5.13-r1.ebuild @@ -208,3 +208,14 @@ my_src_install_all() { dodoc "${FILESDIR}"/README-systemd systemd_douserunit "${GNUPG_SYSTEMD_UNITS[@]/#/${T}/}" } + +pkg_postinst() { + # If /usr/bin/gpg and /usr/bin/gpgv do not exist, provide them. + if [[ ! -e ${EROOT}/usr/bin/gpg ]]; then + ln -sf -- gpg-reference "${EROOT}"/usr/bin/gpg || die + fi + + if [[ ! -e ${EROOT}/usr/bin/gpgv ]]; then + ln -sf -- gpgv-reference "${EROOT}"/usr/bin/gpgv || die + fi +}