Attachment #274863 for bug #368865




		vecho ">>> Remove '$PORTAGE_BUILDDIR/.pretended' to force pretend."
		return 0
	fi
	ebuild_phase_with_hooks pkg_pretend
	ebuild_phase pkg_pretend
	>> "$PORTAGE_BUILDDIR/.pretended" || \
		die "Failed to create $PORTAGE_BUILDDIR/.pretended"
	ebuild_phase post_pkg_pretend
}

dyn_setup() {

		vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped' to force setup."
		return 0
	fi
	ebuild_phase_with_hooks pkg_setup
	ebuild_phase pkg_setup
	>> "$PORTAGE_BUILDDIR/.setuped" || \
		die "Failed to create $PORTAGE_BUILDDIR/.setuped"
	ebuild_phase post_pkg_setup
}

dyn_unpack() {

		install -m${PORTAGE_WORKDIR_MODE:-0700} -d "${WORKDIR}" || die "Failed to create dir '${WORKDIR}'"
	fi
	cd "${WORKDIR}" || die "Directory change failed: \`cd '${WORKDIR}'\`"
	ebuild_phase pre_src_unpack
	vecho ">>> Unpacking source..."
	ebuild_phase_with_hooks src_unpack
	>> "$PORTAGE_BUILDDIR/.unpacked" || \
		die "Failed to create $PORTAGE_BUILDDIR/.unpacked"
	vecho ">>> Source unpacked in ${WORKDIR}"
	ebuild_phase post_src_unpack
}

dyn_clean() {


	trap abort_prepare SIGINT SIGQUIT

	ebuild_phase pre_src_prepare
	vecho ">>> Preparing source in $PWD ..."
	ebuild_phase_with_hooks src_prepare
	>> "$PORTAGE_BUILDDIR/.prepared" || \
		die "Failed to create $PORTAGE_BUILDDIR/.prepared"
	vecho ">>> Source prepared."
	ebuild_phase post_src_prepare

	trap - SIGINT SIGQUIT
}


	trap abort_configure SIGINT SIGQUIT

	ebuild_phase pre_src_configure

	vecho ">>> Configuring source in $PWD ..."
	ebuild_phase_with_hooks src_configure
	>> "$PORTAGE_BUILDDIR/.configured" || \
		die "Failed to create $PORTAGE_BUILDDIR/.configured"
	vecho ">>> Source configured."

	ebuild_phase post_src_configure

	trap - SIGINT SIGQUIT
}


		fi
	fi

	ebuild_phase pre_src_compile

	vecho ">>> Compiling source in $PWD ..."
	ebuild_phase_with_hooks src_compile
	>> "$PORTAGE_BUILDDIR/.compiled" || \
		die "Failed to create $PORTAGE_BUILDDIR/.compiled"
	vecho ">>> Source compiled."

	ebuild_phase post_src_compile

	trap - SIGINT SIGQUIT
}


	else
		local save_sp=${SANDBOX_PREDICT}
		addpredict /
		ebuild_phase_with_hooks src_test
		ebuild_phase src_test
		>> "$PORTAGE_BUILDDIR/.tested" || \
			die "Failed to create $PORTAGE_BUILDDIR/.tested"
		ebuild_phase post_src_test
		SANDBOX_PREDICT=${save_sp}
	fi


		return 0
	fi
	trap "abort_install" SIGINT SIGQUIT
	ebuild_phase pre_src_install
	rm -rf "${PORTAGE_BUILDDIR}/image"
	mkdir "${PORTAGE_BUILDDIR}/image"
	if [[ -d $S ]] ; then

	export _E_EXEDESTTREE_=""
	export _E_DOCDESTTREE_=""

	ebuild_phase_with_hooks src_install
	>> "$PORTAGE_BUILDDIR/.installed" || \
		die "Failed to create $PORTAGE_BUILDDIR/.installed"
	vecho ">>> Completed installing ${PF} into ${D}"
	vecho
	ebuild_phase post_src_install

	cd "${PORTAGE_BUILDDIR}"/build-info
	set -f

			# If $- contains x, then tracing has already enabled elsewhere for some
			# reason.  We preserve it's state so as not to interfere.
			if [ "$PORTAGE_DEBUG" != "1" ] || [ "${-/x/}" != "$-" ]; then
				EMERGE_FROM="${PORTAGE_EMERGE_FROM}" source "${x}"
			else
				set -x
				EMERGE_FROM="${PORTAGE_EMERGE_FROM}" source "${x}"
				set +x
			fi
		fi
- 

Return to bug 368865

Lines 708-718 dyn_pretend() { Link Here

(-)a/bin/ebuild.sh (-31 / +10 lines)
708	vecho ">>> Remove '$PORTAGE_BUILDDIR/.pretended' to force pretend."	708	vecho ">>> Remove '$PORTAGE_BUILDDIR/.pretended' to force pretend."
709	return 0	709	return 0
710	fi	710	fi
711	ebuild_phase pre_pkg_pretend	711	ebuild_phase_with_hooks pkg_pretend
712	ebuild_phase pkg_pretend
713	>> "$PORTAGE_BUILDDIR/.pretended" \|\| \	712	>> "$PORTAGE_BUILDDIR/.pretended" \|\| \
714	die "Failed to create $PORTAGE_BUILDDIR/.pretended"	713	die "Failed to create $PORTAGE_BUILDDIR/.pretended"
715	ebuild_phase post_pkg_pretend
716	}	714	}
717		715
718	dyn_setup() {	716	dyn_setup() {
Lines 721-731 dyn_setup() { Link Here
721	vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped' to force setup."	719	vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped' to force setup."
722	return 0	720	return 0
723	fi	721	fi
724	ebuild_phase pre_pkg_setup	722	ebuild_phase_with_hooks pkg_setup
725	ebuild_phase pkg_setup
726	>> "$PORTAGE_BUILDDIR/.setuped" \|\| \	723	>> "$PORTAGE_BUILDDIR/.setuped" \|\| \
727	die "Failed to create $PORTAGE_BUILDDIR/.setuped"	724	die "Failed to create $PORTAGE_BUILDDIR/.setuped"
728	ebuild_phase post_pkg_setup
729	}	725	}
730		726
731	dyn_unpack() {	727	dyn_unpack() {
Lines 768-780 dyn_unpack() { Link Here
768	install -m${PORTAGE_WORKDIR_MODE:-0700} -d "${WORKDIR}" \|\| die "Failed to create dir '${WORKDIR}'"	764	install -m${PORTAGE_WORKDIR_MODE:-0700} -d "${WORKDIR}" \|\| die "Failed to create dir '${WORKDIR}'"
769	fi	765	fi
770	cd "${WORKDIR}" \|\| die "Directory change failed: \`cd '${WORKDIR}'\`"	766	cd "${WORKDIR}" \|\| die "Directory change failed: \`cd '${WORKDIR}'\`"
771	ebuild_phase pre_src_unpack
772	vecho ">>> Unpacking source..."	767	vecho ">>> Unpacking source..."
773	ebuild_phase src_unpack	768	ebuild_phase_with_hooks src_unpack
774	>> "$PORTAGE_BUILDDIR/.unpacked" \|\| \	769	>> "$PORTAGE_BUILDDIR/.unpacked" \|\| \
775	die "Failed to create $PORTAGE_BUILDDIR/.unpacked"	770	die "Failed to create $PORTAGE_BUILDDIR/.unpacked"
776	vecho ">>> Source unpacked in ${WORKDIR}"	771	vecho ">>> Source unpacked in ${WORKDIR}"
777	ebuild_phase post_src_unpack
778	}	772	}
779		773
780	dyn_clean() {	774	dyn_clean() {
Lines 1014-1026 dyn_prepare() { Link Here
1014		1008
1015	trap abort_prepare SIGINT SIGQUIT	1009	trap abort_prepare SIGINT SIGQUIT
1016		1010
1017	ebuild_phase pre_src_prepare
1018	vecho ">>> Preparing source in $PWD ..."	1011	vecho ">>> Preparing source in $PWD ..."
1019	ebuild_phase src_prepare	1012	ebuild_phase_with_hooks src_prepare
1020	>> "$PORTAGE_BUILDDIR/.prepared" \|\| \	1013	>> "$PORTAGE_BUILDDIR/.prepared" \|\| \
1021	die "Failed to create $PORTAGE_BUILDDIR/.prepared"	1014	die "Failed to create $PORTAGE_BUILDDIR/.prepared"
1022	vecho ">>> Source prepared."	1015	vecho ">>> Source prepared."
1023	ebuild_phase post_src_prepare
1024		1016
1025	trap - SIGINT SIGQUIT	1017	trap - SIGINT SIGQUIT
1026	}	1018	}
Lines 1045-1060 dyn_configure() { Link Here
1045		1037
1046	trap abort_configure SIGINT SIGQUIT	1038	trap abort_configure SIGINT SIGQUIT
1047		1039
1048	ebuild_phase pre_src_configure
1049
1050	vecho ">>> Configuring source in $PWD ..."	1040	vecho ">>> Configuring source in $PWD ..."
1051	ebuild_phase src_configure	1041	ebuild_phase_with_hooks src_configure
1052	>> "$PORTAGE_BUILDDIR/.configured" \|\| \	1042	>> "$PORTAGE_BUILDDIR/.configured" \|\| \
1053	die "Failed to create $PORTAGE_BUILDDIR/.configured"	1043	die "Failed to create $PORTAGE_BUILDDIR/.configured"
1054	vecho ">>> Source configured."	1044	vecho ">>> Source configured."
1055		1045
1056	ebuild_phase post_src_configure
1057
1058	trap - SIGINT SIGQUIT	1046	trap - SIGINT SIGQUIT
1059	}	1047	}
1060		1048
Lines 1085-1100 dyn_compile() { Link Here
1085	fi	1073	fi
1086	fi	1074	fi
1087		1075
1088	ebuild_phase pre_src_compile
1089
1090	vecho ">>> Compiling source in $PWD ..."	1076	vecho ">>> Compiling source in $PWD ..."
1091	ebuild_phase src_compile	1077	ebuild_phase_with_hooks src_compile
1092	>> "$PORTAGE_BUILDDIR/.compiled" \|\| \	1078	>> "$PORTAGE_BUILDDIR/.compiled" \|\| \
1093	die "Failed to create $PORTAGE_BUILDDIR/.compiled"	1079	die "Failed to create $PORTAGE_BUILDDIR/.compiled"
1094	vecho ">>> Source compiled."	1080	vecho ">>> Source compiled."
1095		1081
1096	ebuild_phase post_src_compile
1097
1098	trap - SIGINT SIGQUIT	1082	trap - SIGINT SIGQUIT
1099	}	1083	}
1100		1084
Lines 1127-1137 dyn_test() { Link Here
1127	else	1111	else
1128	local save_sp=${SANDBOX_PREDICT}	1112	local save_sp=${SANDBOX_PREDICT}
1129	addpredict /	1113	addpredict /
1130	ebuild_phase pre_src_test	1114	ebuild_phase_with_hooks src_test
1131	ebuild_phase src_test
1132	>> "$PORTAGE_BUILDDIR/.tested" \|\| \	1115	>> "$PORTAGE_BUILDDIR/.tested" \|\| \
1133	die "Failed to create $PORTAGE_BUILDDIR/.tested"	1116	die "Failed to create $PORTAGE_BUILDDIR/.tested"
1134	ebuild_phase post_src_test
1135	SANDBOX_PREDICT=${save_sp}	1117	SANDBOX_PREDICT=${save_sp}
1136	fi	1118	fi
1137		1119
Lines 1148-1154 dyn_install() { Link Here
1148	return 0	1130	return 0
1149	fi	1131	fi
1150	trap "abort_install" SIGINT SIGQUIT	1132	trap "abort_install" SIGINT SIGQUIT
1151	ebuild_phase pre_src_install
1152	rm -rf "${PORTAGE_BUILDDIR}/image"	1133	rm -rf "${PORTAGE_BUILDDIR}/image"
1153	mkdir "${PORTAGE_BUILDDIR}/image"	1134	mkdir "${PORTAGE_BUILDDIR}/image"
1154	if [[ -d $S ]] ; then	1135	if [[ -d $S ]] ; then
Lines 1175-1186 dyn_install() { Link Here
1175	export _E_EXEDESTTREE_=""	1156	export _E_EXEDESTTREE_=""
1176	export _E_DOCDESTTREE_=""	1157	export _E_DOCDESTTREE_=""
1177		1158
1178	ebuild_phase src_install	1159	ebuild_phase_with_hooks src_install
1179	>> "$PORTAGE_BUILDDIR/.installed" \|\| \	1160	>> "$PORTAGE_BUILDDIR/.installed" \|\| \
1180	die "Failed to create $PORTAGE_BUILDDIR/.installed"	1161	die "Failed to create $PORTAGE_BUILDDIR/.installed"
1181	vecho ">>> Completed installing ${PF} into ${D}"	1162	vecho ">>> Completed installing ${PF} into ${D}"
1182	vecho	1163	vecho
1183	ebuild_phase post_src_install
1184		1164
1185	cd "${PORTAGE_BUILDDIR}"/build-info	1165	cd "${PORTAGE_BUILDDIR}"/build-info
1186	set -f	1166	set -f
Lines 1727-1736 source_all_bashrcs() { Link Here
1727	# If $- contains x, then tracing has already enabled elsewhere for some	1707	# If $- contains x, then tracing has already enabled elsewhere for some
1728	# reason. We preserve it's state so as not to interfere.	1708	# reason. We preserve it's state so as not to interfere.
1729	if [ "$PORTAGE_DEBUG" != "1" ] \|\| [ "${-/x/}" != "$-" ]; then	1709	if [ "$PORTAGE_DEBUG" != "1" ] \|\| [ "${-/x/}" != "$-" ]; then
1730	source "${x}"	1710	EMERGE_FROM="${PORTAGE_EMERGE_FROM}" source "${x}"
1731	else	1711	else
1732	set -x	1712	set -x
1733	source "${x}"	1713	EMERGE_FROM="${PORTAGE_EMERGE_FROM}" source "${x}"
1734	set +x	1714	set +x
1735	fi	1715	fi
1736	fi	1716	fi
1737	-