--- /usr/lib/portage/bin/ebuild.sh.orig	2006-03-07 13:47:07.000000000 +0100
+++ /usr/lib/portage/bin/ebuild.sh.orig	2006-03-07 14:13:25.000000000 +0100
@@ -721,6 +721,7 @@ 
 	echo ">>> Source unpacked."
 	cd "${PORTAGE_BUILDDIR}"
 
+	[ "$(type -t user_src_unpack)" == "function" ] && user_src_unpack
 	[ "$(type -t post_src_unpack)" == "function" ] && post_src_unpack
 
 	trap SIGINT SIGQUIT
@@ -993,6 +994,7 @@ 
 		touch DEBUGBUILD
 	fi
 
+	[ "$(type -t user_src_compile)" == "function" ] && user_src_compile
 	[ "$(type -t post_src_compile)" == "function" ] && post_src_compile
 
 	trap SIGINT SIGQUIT
@@ -1282,6 +1284,7 @@ 
 	echo ">>> Completed installing ${PF} into ${D}"
 	echo
 	cd ${PORTAGE_BUILDDIR}
+	[ "$(type -t user_src_install)" == "function" ] && user_src_install
 	[ "$(type -t post_src_install)" == "function" ] && post_src_install
 	trap SIGINT SIGQUIT
 }
@@ -1841,6 +1844,16 @@ 
 unset EBUILD_DEATH_HOOKS
 
 source ${EBUILD} || die "error sourcing ebuild"
+if [ -n "$USERFUNC_OVERLAY" ]; then
+	declare uf_overlay
+	for uf_overlay in ${USERFUNC_OVERLAY}; do
+		uf_location="${uf_overlay}/${CATEGORY}/${PN}/${P}.ebuild"
+		if [ -e "$uf_location" ]; then
+			export OFILESDIR="${uf_overlay}/${CATEGORY}/${PN}/files"
+			source ${uf_location} || die "error sourcing ebuild from user"
+		fi
+	done
+fi
 if ! hasq depend $EBUILD_PHASE; then
 	RESTRICT="${PORTAGE_RESTRICT}"
 	unset PORTAGE_RESTRICT