--- net-libs/xulrunner/xulrunner-1.9.0.7.ebuild	2009-03-12 17:36:35.000000000 +0100
+++ net-libs/xulrunner/xulrunner-1.9.0.7-r1.ebuild	2009-03-27 12:56:46.000000000 +0100
@@ -17,7 +17,7 @@
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 -sparc x86"
 SLOT="1.9"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE=""
+IUSE="pgo"
 
 RDEPEND="java? ( >=virtual/jre-1.4 )
 	>=sys-devel/binutils-2.16.1
@@ -132,18 +132,19 @@
 	#
 	####################################
 
-	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-	# to econf, but the quotes cause configure to fail.
-	sed -i -e \
-		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
-		"${S}"/config/autoconf.mk \
-		"${S}"/toolkit/content/buildconfig.html
+	# profile guided optimization
+	local pgo=""
+	use pgo && pgo="-j1 profiledbuild"
+
+	append-cxxflags -DGENTOO_NSPLUGINS_DIR=\\\"/usr/$(get_libdir)/nsplugins\\\"
+	append-cxxflags -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/$(get_libdir)/nsbrowser/plugins\\\"
+
+	# without econf we need these
+	mozconfig_annotate '' --prefix=/usr
+	mozconfig_annotate '' --libdir=/usr/$(get_libdir)
 
-	emake || die "emake failed"
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	emake -f client.mk ${pgo} || die "emake failed"
 }
 
 src_install() {