diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-13 18:51:31 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-13 18:51:31 -0700 |
| commit | e135f6f32d728dd918253a17681fc412704c0db1 (patch) | |
| tree | 13386f0c5c26cc313db8f5c7b51573e60f8bdf22 /bin | |
| parent | db2e6f614169307e1c9cca9f8bab63f724547db4 (diff) | |
| download | portage-e135f6f32d728dd918253a17681fc412704c0db1.tar.gz portage-e135f6f32d728dd918253a17681fc412704c0db1.tar.bz2 portage-e135f6f32d728dd918253a17681fc412704c0db1.zip | |
Deprecate EAPI 5_pre1.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/phase-functions.sh | 24 | ||||
| -rw-r--r-- | bin/phase-helpers.sh | 13 | ||||
| -rw-r--r-- | bin/save-ebuild-env.sh | 5 |
3 files changed, 1 insertions, 41 deletions
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 diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 0250aca96..555b2372b 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -634,19 +634,6 @@ _eapi4_src_install() { fi } -_eapi5_src_prepare() { - apply_user_patches -} - -_eapi5_apply_user_patches() { - [[ ${EBUILD_PHASE} == prepare ]] || \ - die "apply_user_patches may only be called during src_prepare" - # This is a no-op that is just enough to fullfill the spec. - [[ -f ${PORTAGE_BUILDDIR}/.apply_user_patches ]] && return 1 - > "${PORTAGE_BUILDDIR}/.apply_user_patches" || die - return 1 -} - # @FUNCTION: has_version # @USAGE: [--host-root] <DEPEND ATOM> # @DESCRIPTION: diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh index cdc7c42ea..d8883cbdb 100644 --- a/bin/save-ebuild-env.sh +++ b/bin/save-ebuild-env.sh @@ -68,7 +68,6 @@ save_ebuild_env() { save_ebuild_env filter_readonly_variables preprocess_ebuild_env \ set_unless_changed unset_unless_changed source_all_bashrcs \ ebuild_main ebuild_phase ebuild_phase_with_hooks \ - _eapi5_apply_user_patches _eapi5_src_prepare \ _ebuild_arg_to_phase _ebuild_phase_funcs default \ _hasg _hasgq _unpack_tar \ ${QA_INTERCEPTORS} @@ -78,10 +77,6 @@ save_ebuild_env() { *) unset -f usex ;; esac - case "${EAPI}" in - 5_pre1) unset -f apply_user_patches ;; - esac - # portage config variables and variables set directly by portage unset ACCEPT_LICENSE BAD BRACKET BUILD_PREFIX COLS \ DISTCC_DIR DISTDIR DOC_SYMLINKS_DIR \ |