Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 53674
Collapse All | Expand All

(-)/usr/lib/portage/bin/ebuild.sh.orig (+13 lines)
Lines 721-726 Link Here
721
	echo ">>> Source unpacked."
721
	echo ">>> Source unpacked."
722
	cd "${PORTAGE_BUILDDIR}"
722
	cd "${PORTAGE_BUILDDIR}"
723
723
724
	[ "$(type -t user_src_unpack)" == "function" ] && user_src_unpack
724
	[ "$(type -t post_src_unpack)" == "function" ] && post_src_unpack
725
	[ "$(type -t post_src_unpack)" == "function" ] && post_src_unpack
725
726
726
	trap SIGINT SIGQUIT
727
	trap SIGINT SIGQUIT
Lines 993-998 Link Here
993
		touch DEBUGBUILD
994
		touch DEBUGBUILD
994
	fi
995
	fi
995
996
997
	[ "$(type -t user_src_compile)" == "function" ] && user_src_compile
996
	[ "$(type -t post_src_compile)" == "function" ] && post_src_compile
998
	[ "$(type -t post_src_compile)" == "function" ] && post_src_compile
997
999
998
	trap SIGINT SIGQUIT
1000
	trap SIGINT SIGQUIT
Lines 1282-1287 Link Here
1282
	echo ">>> Completed installing ${PF} into ${D}"
1284
	echo ">>> Completed installing ${PF} into ${D}"
1283
	echo
1285
	echo
1284
	cd ${PORTAGE_BUILDDIR}
1286
	cd ${PORTAGE_BUILDDIR}
1287
	[ "$(type -t user_src_install)" == "function" ] && user_src_install
1285
	[ "$(type -t post_src_install)" == "function" ] && post_src_install
1288
	[ "$(type -t post_src_install)" == "function" ] && post_src_install
1286
	trap SIGINT SIGQUIT
1289
	trap SIGINT SIGQUIT
1287
}
1290
}
Lines 1841-1846 Link Here
1841
unset EBUILD_DEATH_HOOKS
1844
unset EBUILD_DEATH_HOOKS
1842
1845
1843
source ${EBUILD} || die "error sourcing ebuild"
1846
source ${EBUILD} || die "error sourcing ebuild"
1847
if [ -n "$USERFUNC_OVERLAY" ]; then
1848
	declare uf_overlay
1849
	for uf_overlay in ${USERFUNC_OVERLAY}; do
1850
		uf_location="${uf_overlay}/${CATEGORY}/${PN}/${P}.ebuild"
1851
		if [ -e "$uf_location" ]; then
1852
			export OFILESDIR="${uf_overlay}/${CATEGORY}/${PN}/files"
1853
			source ${uf_location} || die "error sourcing ebuild from user"
1854
		fi
1855
	done
1856
fi
1844
if ! hasq depend $EBUILD_PHASE; then
1857
if ! hasq depend $EBUILD_PHASE; then
1845
	RESTRICT="${PORTAGE_RESTRICT}"
1858
	RESTRICT="${PORTAGE_RESTRICT}"
1846
	unset PORTAGE_RESTRICT
1859
	unset PORTAGE_RESTRICT

Return to bug 53674