diff options
Diffstat (limited to 'bin')
-rw-r--r-- | bin/phase-functions.sh | 14 | ||||
-rw-r--r-- | bin/phase-helpers.sh | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 68a33a871..ad9ba6bb0 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -372,7 +372,11 @@ dyn_prepare() { else die "The source directory '${S}' doesn't exist" fi - rm -f "${PORTAGE_BUILDDIR}/.apply_user_patches" || die + case "${EAPI}" in + 5_pre1) + rm -f "${PORTAGE_BUILDDIR}/.apply_user_patches" || die + ;; + esac trap abort_prepare SIGINT SIGQUIT @@ -384,9 +388,7 @@ dyn_prepare() { vecho ">>> Source prepared." ebuild_phase post_src_prepare case "${EAPI}" in - 0|1|2|3|4|4-python|4-slot-abi) - ;; - *) + 5_pre1) [[ ! -f ${PORTAGE_BUILDDIR}/.apply_user_patches ]] && \ die "src_prepare must call apply_user_patches at least once" ;; @@ -815,9 +817,7 @@ _ebuild_phase_funcs() { [[ $phase_func = src_install ]] && \ eval "default() { _eapi4_$phase_func \"\$@\" ; }" case "$eapi" in - 4|4-python|4-slot-abi) - ;; - *) + 5_pre1) ! declare -F src_prepare >/dev/null && \ src_prepare() { _eapi5_src_prepare "$@" ; } default_src_prepare() { _eapi5_src_prepare "$@" ; } diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index bb5e057a7..0250aca96 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -638,10 +638,6 @@ _eapi5_src_prepare() { apply_user_patches } -apply_user_patches() { - die "apply_user_patches is not supported with EAPI ${EAPI}" -} - _eapi5_apply_user_patches() { [[ ${EBUILD_PHASE} == prepare ]] || \ die "apply_user_patches may only be called during src_prepare" |