From e135f6f32d728dd918253a17681fc412704c0db1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 13 Sep 2012 18:51:31 -0700 Subject: Deprecate EAPI 5_pre1. --- bin/phase-functions.sh | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'bin/phase-functions.sh') diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 0883ccd99..e50b34033 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -277,8 +277,7 @@ dyn_clean() { "$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \ "$PORTAGE_BUILDDIR"/.die_hooks \ "$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \ - "$PORTAGE_BUILDDIR"/.exit_status \ - "$PORTAGE_BUILDDIR"/.apply_user_patches + "$PORTAGE_BUILDDIR"/.exit_status rm -rf "${PORTAGE_BUILDDIR}/build-info" rm -rf "${WORKDIR}" @@ -372,11 +371,6 @@ dyn_prepare() { else die "The source directory '${S}' doesn't exist" fi - case "${EAPI}" in - 5_pre1) - rm -f "${PORTAGE_BUILDDIR}/.apply_user_patches" || die - ;; - esac trap abort_prepare SIGINT SIGQUIT @@ -387,12 +381,6 @@ dyn_prepare() { die "Failed to create $PORTAGE_BUILDDIR/.prepared" vecho ">>> Source prepared." ebuild_phase post_src_prepare - case "${EAPI}" in - 5_pre1) - [[ ! -f ${PORTAGE_BUILDDIR}/.apply_user_patches ]] && \ - die "src_prepare must call apply_user_patches at least once" - ;; - esac trap - SIGINT SIGQUIT } @@ -816,16 +804,6 @@ _ebuild_phase_funcs() { eval "default_src_install() { _eapi4_src_install \"\$@\" ; }" [[ $phase_func = src_install ]] && \ eval "default() { _eapi4_$phase_func \"\$@\" ; }" - case "$eapi" in - 5_pre1) - ! declare -F src_prepare >/dev/null && \ - src_prepare() { _eapi5_src_prepare "$@" ; } - default_src_prepare() { _eapi5_src_prepare "$@" ; } - [[ $phase_func = src_prepare ]] && \ - eval "default() { _eapi5_$phase_func \"\$@\" ; }" - apply_user_patches() { _eapi5_apply_user_patches "$@" ; } - ;; - esac ;; esac -- cgit v1.2.3-1-g7c22