From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 14 Sep 2012 01:51:31 +0000 (-0700)
Subject: Deprecate EAPI 5_pre1.
X-Git-Tag: v2.2.0_alpha128~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e135f6f32d728dd918253a17681fc412704c0db1;p=portage.git

Deprecate EAPI 5_pre1.
---

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 \
diff --git a/man/emerge.1 b/man/emerge.1
index 8474cf947..b3ac37915 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -494,7 +494,7 @@ Ignore the slot/sub\-slot := operator parts of dependencies that have
 been recorded when packages where built. This option is intended
 only for debugging purposes, and it only affects built packages
 that specify slot/sub\-slot := operator dependencies using the
-experimental "4\-slot\-abi", "5_pre1", or "5_pre2" EAPIs.
+experimental "4\-slot\-abi" or "5_pre2" EAPIs.
 .TP
 .BR "-j [JOBS], \-\-jobs[=JOBS]"
 Specifies the number of packages to build simultaneously. If this option is
@@ -660,7 +660,7 @@ operator dependencies can be satisfied by a newer slot, so that
 older packages slots will become eligible for removal by the
 \-\-depclean action as soon as possible. This option only
 affects packages that specify slot/sub\-slot := dependencies using the
-experimental "4\-slot\-abi", "5_pre1", or "5_pre1" EAPIs
+experimental "4\-slot\-abi" or "5_pre2" EAPIs.
 Since this option requires
 checking of reverse dependencies, it enables \-\-complete\-graph
 mode whenever a new slot is installed. This option is enabled by
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index ee5104211..afaff516b 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -414,8 +414,8 @@ def abssymlink(symlink, target=None):
 
 _doebuild_manifest_exempt_depend = 0
 
-_testing_eapis = frozenset(["4-python", "4-slot-abi", "5_pre1", "5_pre2"])
-_deprecated_eapis = frozenset(["4_pre1", "3_pre2", "3_pre1"])
+_testing_eapis = frozenset(["4-python", "4-slot-abi", "5_pre2"])
+_deprecated_eapis = frozenset(["4_pre1", "3_pre2", "3_pre1", "5_pre1"])
 
 def _eapi_is_deprecated(eapi):
 	return eapi in _deprecated_eapis