commit:     6695ceddfc2b55392293665205c6e28c3cf0503a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 06:01:24 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 09:43:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6695cedd

dev-libs/libsodium: use new verify-sig minisign support

Closes: https://bugs.gentoo.org/783066
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libsodium/libsodium-1.0.19-r1.ebuild | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild 
b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
index cb3ef0373a0f..d175a5ffc7f5 100644
--- a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit autotools multilib-minimal
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libsodium.key
+VERIFY_SIG_METHOD=minisig
+inherit autotools multilib-minimal verify-sig
 
 DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library"
 HOMEPAGE="https://libsodium.org";
@@ -41,22 +43,6 @@ PATCHES=(
        "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
 )
 
-src_unpack() {
-       # TODO: Could verify-sig.eclass support minisig? bug #783066
-       MINISIGN_KEY="RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"
-
-       if use verify-sig ; then
-               ebegin "Verifying signature using app-crypt/minisign"
-               minisign -V \
-                       -P ${MINISIGN_KEY} \
-                       -x "${DISTDIR}"/${P}.tar.gz.minisig \
-                       -m "${DISTDIR}"/${P}.tar.gz
-               eend $? || die "Failed to verify distfile using minisign!"
-       fi
-
-       default
-}
-
 src_prepare() {
        default
 

Reply via email to