diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2021-05-12 18:21:33 +0200 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2021-05-23 21:47:49 -0700 |
| commit | 23727e2b902b2352aeed3ded659f19d5aa65898a (patch) | |
| tree | e384e0c6debed11644d6c5cd294dceee90ee410b | |
| parent | Relax update filenames as permitted for EAPI 8 (diff) | |
| download | portage-23727e2b902b2352aeed3ded659f19d5aa65898a.tar.gz portage-23727e2b902b2352aeed3ded659f19d5aa65898a.tar.bz2 portage-23727e2b902b2352aeed3ded659f19d5aa65898a.zip | |
Disallow options in PATCHES in EAPI 8
Bug: https://bugs.gentoo.org/752486
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
| -rw-r--r-- | bin/phase-functions.sh | 6 | ||||
| -rw-r--r-- | bin/phase-helpers.sh | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index db30fdefa..a6837390f 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -926,6 +926,12 @@ __ebuild_phase_funcs() { declare -F src_prepare >/dev/null || \ src_prepare() { default; } fi + + # defaults starting with EAPI 8 + if ! has ${eapi} 2 3 4 4-python 4-slot-abi 5 5-progress 6 7; then + [[ ${phase_func} == src_prepare ]] && \ + default_src_prepare() { __eapi8_src_prepare; } + fi ;; esac } diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 6c9e4424e..3f53e6c57 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -871,6 +871,17 @@ __eapi6_src_install() { einstalldocs } +__eapi8_src_prepare() { + local f + if ___is_indexed_array_var PATCHES ; then + [[ ${#PATCHES[@]} -gt 0 ]] && eapply -- "${PATCHES[@]}" + elif [[ -n ${PATCHES} ]]; then + eapply -- ${PATCHES} + fi + + eapply_user +} + ___best_version_and_has_version_common() { local atom root root_arg local -a cmd=() |