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

[Michał Górny]

commit:     d466b3b94a8149cfb7ef4f7ac34d373b0ae4447f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 10:50:51 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 14:48:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d466b3b9

verify-sig.eclass: Remove <dev-python/gemato-20 support

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

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

diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
index d5f71669538e..88fb17c31652 100644
--- a/eclass/verify-sig.eclass
+++ b/eclass/verify-sig.eclass
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: verify-sig.eclass
@@ -68,7 +68,7 @@ case ${VERIFY_SIG_METHOD} in
                BDEPEND="
                        verify-sig? (
                                app-crypt/gnupg
-                               >=app-portage/gemato-16
+                               >=app-portage/gemato-20
                        )
                "
                ;;
@@ -159,16 +159,10 @@ verify-sig_verify_detached() {
                        # gpg can't handle very long TMPDIR
                        # https://bugs.gentoo.org/854492
                        local -x TMPDIR=/tmp
-                       if has_version ">=app-portage/gemato-20"; then
-                               gemato openpgp-verify-detached -K "${key}" \
-                                       "${extra_args[@]}" \
-                                       "${sig}" "${file}" ||
-                                       die "PGP signature verification failed"
-                       else
-                               gemato gpg-wrap -K "${key}" "${extra_args[@]}" 
-- \
-                                       gpg --verify "${sig}" "${file}" ||
-                                       die "PGP signature verification failed"
-                       fi
+                       gemato openpgp-verify-detached -K "${key}" \
+                               "${extra_args[@]}" \
+                               "${sig}" "${file}" ||
+                               die "PGP signature verification failed"
                        ;;
                signify)
                        signify -V -p "${key}" -m "${file}" -x "${sig}" ||