--- app-emulation/xen-tools/xen-tools-3.1.0.ebuild-	2007-09-14 03:59:21.000000000 +0200
+++ app-emulation/xen-tools/xen-tools-3.1.0.ebuild	2007-09-14 04:49:07.000000000 +0200
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.1.0.ebuild,v 1.5 2007/09/03 19:40:30 marineam Exp $
 
-inherit flag-o-matic distutils eutils multilib
+inherit distutils eutils flag-o-matic multilib toolchain
 
 DESCRIPTION="Xend daemon and tools"
 HOMEPAGE="http://www.xensource.com/xen/xen/"
@@ -56,7 +56,7 @@
 		die "USE=hvm is unsupported on this system."
 	fi
 
-	if [[ "$(scanelf -s __guard -q `which python`)" ]] ; then
+	if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then
 		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
 		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
 	fi
@@ -127,6 +127,7 @@
 	use debug && myopt="${myopt} debug=y"
 
 	use custom-cflags || unset CFLAGS
+	version_is_at_least "4.2" "$(gcc-version)" && append-flags -fno-strict-overflow
 	#gcc-specs-ssp && append-flags -fno-stack-protector -fno-stack-protector-all
 
 	if use hvm; then
@@ -185,7 +186,7 @@
 	elog "Please visit the Xen and Gentoo wiki:"
 	elog "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
 
-	if [[ "$(scanelf -s __guard -q `which python`)" ]] ; then
+	if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then
 		echo
 		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
 		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"