[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     75ea89a43b8d3efb6b264296f819d04d3c18c3af
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 08:22:12 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 15:13:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ea89a4

verify-sig.eclass: Use gemato openpgp-verify-detached

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/verify-sig.eclass | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
index 394ce2e44427..a071139daa17 100644
--- a/eclass/verify-sig.eclass
+++ b/eclass/verify-sig.eclass
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: verify-sig.eclass
@@ -65,8 +65,9 @@ case ${VERIFY_SIG_METHOD} in
                BDEPEND="
                        verify-sig? (
                                app-crypt/gnupg
-                               >=app-portage/gemato-16
-                       )"
+                               >=app-portage/gemato-18.0
+                       )
+               "
                ;;
        signify)
                BDEPEND="verify-sig? ( app-crypt/signify )"
@@ -144,8 +145,9 @@ verify-sig_verify_detached() {
                        # gpg can't handle very long TMPDIR
                        # https://bugs.gentoo.org/854492
                        local -x TMPDIR=/tmp
-                       gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \
-                               gpg --verify "${sig}" "${file}" ||
+                       gemato openpgp-verify-detached -K "${key}" \
+                               "${extra_args[@]}" \
+                               "${sig}" "${file}" ||
                                die "PGP signature verification failed"
                        ;;
                signify)