--- boost-1.35.0-r1.ebuild	2008-06-16 07:06:31.000000000 +0200
+++ boost-1.36.0.ebuild	2008-08-21 11:18:17.000000000 +0200
@@ -78,6 +80,8 @@
 	OPTIONS="gentoorelease"
 	use debug && OPTIONS="gentoodebug"
 
+	BUILD_NAME="${OPTIONS}"
+
 	use icu && OPTIONS="${OPTIONS} -sICU_PATH=/usr"
 	if use expat ; then
 		OPTIONS="${OPTIONS} -sEXPAT_INCLUDE=/usr/include -sEXPAT_LIBPATH=/usr/$(get_libdir)"
@@ -151,15 +155,6 @@
 			|| die "building tools failed"
 	fi
 
-	if has test ${FEATURES} ; then
-		cd "${S}/tools/regression/build"
-		bjam -q \
-			${OPTIONS} \
-			--prefix="${D}/usr" \
-			--layout=system \
-			|| die "building regression test helpers failed"
-	fi
-
 }
 
 src_install () {
@@ -220,8 +215,8 @@
 		doins -r share
 	fi
 
-	if has test ${FEATURES} ; then
-		cd "${S}/status"
+	cd "${S}/status"
+	if test -f regress.log ; then
 		docinto status
 		dohtml *.{html,gif} ../boost.png
 		dodoc regress.log
@@ -233,6 +228,14 @@
 
 	export BOOST_ROOT=${S}
 
+	cd "${S}/tools/regression/build"
+	bjam -q \
+		${OPTIONS} \
+		--prefix="${D}/usr" \
+		--layout=system \
+		process_jam_log compiler_status \
+		|| die "building regression test helpers failed"
+
 	cd "${S}/status"
 
 	# Some of the test-checks seem to rely on regexps
@@ -247,7 +250,7 @@
 		--dump-tests 2>&1 | tee regress.log
 
 	# Postprocessing
-	cat regress.log | "${S}/dist/bin/process_jam_log" --v2
+	cat regress.log | "${S}/tools/regression/build/bin/gcc-$(gcc-version)/${BUILD_NAME}/process_jam_log" --v2
 	if test $? != 0 ; then
 		die "Postprocessing the build log failed"
 	fi
@@ -257,7 +260,7 @@
 __EOF__
 
 	# Generate the build log html summary page
-	"${S}/dist/bin/compiler_status" --v2 \
+	"${S}/tools/regression/build/bin/gcc-$(gcc-version)/${BUILD_NAME}/compiler_status" --v2 \
 		--comment "${S}/status/comment.html" "${S}" \
 		cs-$(uname).html cs-$(uname)-links.html
 	if test $? != 0 ; then