From 8d8d5594277708985dde6b4829f02ce45408e78e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 13 Feb 2023 20:18:03 +0000 Subject: gentoo auto-resync : 13:02:2023 - 20:18:03 --- eclass/Manifest.gz | Bin 37513 -> 37512 bytes eclass/gnome2-utils.eclass | 6 +++++- eclass/verify-sig.eclass | 10 ++++------ 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 1c25f73d923d..7ed900794d3c 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass index 6c8d222a712e..4bbbdc82dae7 100644 --- a/eclass/gnome2-utils.eclass +++ b/eclass/gnome2-utils.eclass @@ -43,8 +43,12 @@ esac # Path to scrollkeeper-update : ${SCROLLKEEPER_UPDATE_BIN:="/usr/bin/scrollkeeper-update"} +# @ECLASS_VARIABLE: GLIB_COMPILE_RESOURCES +# @DESCRIPTION: +# Path to glib-compile-resources +: ${GLIB_COMPILE_RESOURCES:="/usr/bin/glib-compile-resources"} + # @ECLASS_VARIABLE: GLIB_COMPILE_SCHEMAS -# @INTERNAL # @DESCRIPTION: # Path to glib-compile-schemas : ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"} diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass index a7d6d26ed432..91433bf53453 100644 --- a/eclass/verify-sig.eclass +++ b/eclass/verify-sig.eclass @@ -65,9 +65,8 @@ case ${VERIFY_SIG_METHOD} in BDEPEND=" verify-sig? ( app-crypt/gnupg - >=app-portage/gemato-18.0 - ) - " + >=app-portage/gemato-16 + )" ;; signify) BDEPEND="verify-sig? ( app-crypt/signify )" @@ -145,9 +144,8 @@ verify-sig_verify_detached() { # gpg can't handle very long TMPDIR # https://bugs.gentoo.org/854492 local -x TMPDIR=/tmp - gemato openpgp-verify-detached -K "${key}" \ - "${extra_args[@]}" --no-require-all-good \ - "${sig}" "${file}" || + gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \ + gpg --verify "${sig}" "${file}" || die "PGP signature verification failed" ;; signify) -- cgit v1.2.3