diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-02-13 20:18:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-13 20:18:03 +0000 |
commit | 8d8d5594277708985dde6b4829f02ce45408e78e (patch) | |
tree | 1ad91bed129fb43666fa7242455404e4ab364357 /eclass | |
parent | fb12f951d1a9071b4ddf774f2d570de245c2d061 (diff) |
gentoo auto-resync : 13:02:2023 - 20:18:03
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/Manifest.gz | bin | 37513 -> 37512 bytes | |||
-rw-r--r-- | eclass/gnome2-utils.eclass | 6 | ||||
-rw-r--r-- | eclass/verify-sig.eclass | 10 |
3 files changed, 9 insertions, 7 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 1c25f73d923d..7ed900794d3c 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz 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) |