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 <mgorny@gentoo.org>
Part-of: https://github.com/gentoo/gentoo/pull/44224
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny 2025-10-06 12:46:56 +02:00
parent e7872dae71
commit bc95d85cc9
No known key found for this signature in database
GPG Key ID: 639ADAE2329E240E
3 changed files with 29 additions and 6 deletions

View File

@ -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

View File

@ -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

View File

@ -6,6 +6,9 @@
<name>Gentoo Base System</name>
</maintainer>
<use>
<flag name="alternatives">
Install renamed, for compatibility with <pkg>app-alternatives/gpg</pkg>.
</flag>
<flag name="smartcard">
Build scdaemon software. Enables usage of OpenPGP cards. For
other type of smartcards, try <pkg>app-crypt/gnupg-pkcs11-scd</pkg>.