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 1AE5F158088 for ; Tue, 28 Oct 2025 05:51:32 +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 F1FC93415D3 for ; Tue, 28 Oct 2025 05:51:31 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 528A811056D; Tue, 28 Oct 2025 05:51:28 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 48CC911056D for ; Tue, 28 Oct 2025 05:51:28 +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 EF29C34143C for ; Tue, 28 Oct 2025 05:51:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64E893AD3 for ; Tue, 28 Oct 2025 05:51:26 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1761630641.bc95d85cc96185c21a8dc74f03d8fdca8d5f6b1b.mgorny@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.ebuild app-crypt/gnupg/gnupg-2.5.13.ebuild app-crypt/gnupg/metadata.xml X-VCS-Directories: app-crypt/gnupg/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: bc95d85cc96185c21a8dc74f03d8fdca8d5f6b1b X-VCS-Branch: master Date: Tue, 28 Oct 2025 05:51:26 +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: 72846726-3840-4767-8b4f-40056ece49af X-Archives-Hash: e2cd442929c1ba94d05026aac3a9b3b1 commit: bc95d85cc96185c21a8dc74f03d8fdca8d5f6b1b Author: Michał Górny gentoo org> AuthorDate: Mon Oct 6 10:46:56 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Oct 28 05:50:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc95d85c app-crypt/gnupg: Rename for app-alternatives/gpg Rename the "gpg" and "gpgv" executables to "*-reference" to account for app-alternatives/gpg. Also remove the compatibility "gpg2" and "gpgv2" symlinks that are now created by the other package. Signed-off-by: Michał Górny gentoo.org> Part-of: https://github.com/gentoo/gentoo/pull/44224 Signed-off-by: Michał Górny gentoo.org> app-crypt/gnupg/gnupg-2.4.8.ebuild | 16 +++++++++++++--- app-crypt/gnupg/gnupg-2.5.13.ebuild | 16 +++++++++++++--- app-crypt/gnupg/metadata.xml | 3 +++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/app-crypt/gnupg/gnupg-2.4.8.ebuild b/app-crypt/gnupg/gnupg-2.4.8.ebuild index e160012a42a9..ea4af2024706 100644 --- a/app-crypt/gnupg/gnupg-2.4.8.ebuild +++ b/app-crypt/gnupg/gnupg-2.4.8.ebuild @@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server" +IUSE="+alternatives bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server" RESTRICT="!test? ( test )" REQUIRED_USE="test? ( tofu )" @@ -53,6 +53,9 @@ RDEPEND=" " PDEPEND=" app-crypt/pinentry + alternatives? ( + app-alternatives/gpg[-freepg(-)] + ) " BDEPEND=" virtual/pkgconfig @@ -173,8 +176,15 @@ my_src_install() { use tools && dobin tools/{gpgconf,gpgsplit,gpg-check-pattern} tools/make-dns-cert - dosym gpg /usr/bin/gpg2 - dosym gpgv /usr/bin/gpgv2 + if use alternatives; then + # rename for app-alternatives/gpg + mv "${ED}"/usr/bin/gpg{,-reference} || die + mv "${ED}"/usr/bin/gpgv{,-reference} || die + else + dosym gpg /usr/bin/gpg2 + dosym gpgv /usr/bin/gpgv2 + fi + echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die diff --git a/app-crypt/gnupg/gnupg-2.5.13.ebuild b/app-crypt/gnupg/gnupg-2.5.13.ebuild index afc4f09869fd..87cb1ff1d288 100644 --- a/app-crypt/gnupg/gnupg-2.5.13.ebuild +++ b/app-crypt/gnupg/gnupg-2.5.13.ebuild @@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server" +IUSE="+alternatives bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server" RESTRICT="!test? ( test )" REQUIRED_USE="test? ( tofu )" @@ -53,6 +53,9 @@ RDEPEND=" " PDEPEND=" app-crypt/pinentry + alternatives? ( + app-alternatives/gpg[-freepg(-)] + ) " BDEPEND=" virtual/pkgconfig @@ -177,8 +180,15 @@ my_src_install() { use tools && dobin tools/{gpgconf,gpgsplit,gpg-check-pattern} tools/make-dns-cert - dosym gpg /usr/bin/gpg2 - dosym gpgv /usr/bin/gpgv2 + if use alternatives; then + # rename for app-alternatives/gpg + mv "${ED}"/usr/bin/gpg{,-reference} || die + mv "${ED}"/usr/bin/gpgv{,-reference} || die + else + dosym gpg /usr/bin/gpg2 + dosym gpgv /usr/bin/gpgv2 + fi + echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml index 9cfaddc1cdbe..2400ccf13111 100644 --- a/app-crypt/gnupg/metadata.xml +++ b/app-crypt/gnupg/metadata.xml @@ -6,6 +6,9 @@ Gentoo Base System + + Install renamed, for compatibility with app-alternatives/gpg. + Build scdaemon software. Enables usage of OpenPGP cards. For other type of smartcards, try app-crypt/gnupg-pkcs11-scd.