From bc95d85cc96185c21a8dc74f03d8fdca8d5f6b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 6 Oct 2025 12:46:56 +0200 Subject: [PATCH] app-crypt/gnupg: Rename for app-alternatives/gpg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Part-of: https://github.com/gentoo/gentoo/pull/44224 Signed-off-by: Michał Górny --- 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.