diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-01-08 18:59:30 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-01-08 18:59:30 +0000 |
commit | 1e1e7636b59380beebd325e8d256875e4f824230 (patch) | |
tree | cac3706b236cea47f66f8d45afc943890cd4375e /eclass | |
parent | 5cbf14acf23c82626389931f64cfe3ef12a1c29f (diff) |
gentoo auto-resync : 08:01:2024 - 18:59:30
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/Manifest.gz | bin | 38919 -> 38915 bytes | |||
-rw-r--r-- | eclass/kernel-2.eclass | 2 | ||||
-rw-r--r-- | eclass/toolchain.eclass | 4 | ||||
-rw-r--r-- | eclass/verify-sig.eclass | 18 |
4 files changed, 9 insertions, 15 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex f4b4c102f2f9..f2a04f7a677b 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 786b78958200..00b3566ab92d 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -656,7 +656,7 @@ if [[ ${ETYPE} == sources ]]; then app-alternatives/cpio dev-lang/perl app-alternatives/bc - sys-devel/bison + app-alternatives/yacc app-alternatives/lex sys-devel/make >=sys-libs/ncurses-5.2 diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 6ac5f97b114a..a446fd8f1a34 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -303,8 +303,8 @@ if tc_has_feature graphite ; then fi BDEPEND=" - >=sys-devel/bison-1.875 - >=app-alternatives/lex-2.5.4 + app-alternatives/yacc + app-alternatives/lex nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass index d5f71669538e..b74ed78290aa 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[@]}" --no-require-all-good \ + "${sig}" "${file}" || + die "PGP signature verification failed" ;; signify) signify -V -p "${key}" -m "${file}" -x "${sig}" || |