--- yelp-2.22.1-r1.ebuild	2008-06-08 01:36:22.000000000 +0200
+++ yelp-2.22.1-r2.ebuild	2008-06-08 13:04:30.000000000 +0200
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.22.1-r1.ebuild,v 1.4 2008/06/07 23:22:31 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.22.1-r1.ebuild,v 1.3 2008/05/07 00:17:43 dirtyepic Exp $
 
 inherit eutils autotools gnome2
 
@@ -25,8 +25,8 @@
 	>=dev-libs/glib-2
 	>=dev-libs/dbus-glib-0.71
 	beagle? ( || ( >=dev-libs/libbeagle-0.3.0 =app-misc/beagle-0.2* ) )
-	!xulrunner? ( =www-client/mozilla-firefox-2* )
-	xulrunner? ( =net-libs/xulrunner-1.8* )
+	!xulrunner? ( www-client/mozilla-firefox )
+	xulrunner? ( net-libs/xulrunner )
 	sys-libs/zlib
 	app-arch/bzip2
 	lzma? ( app-arch/lzma-utils )
@@ -44,11 +44,10 @@
 
 	# patch to work with >=libbeagle-0.3, bug #215026
 	epatch "${FILESDIR}"/yelp-2.22-with-beagle-0.3.patch
-
+	epatch "${FILESDIR}"/06_xulrunner19.patch
 	# patch to fix parallel make, see bug #217250
 	sed -e "s/install-exec-local:/install-exec-hook:/" -i src/Makefile.am
 
-	intltoolize --force --automake || die "intltoolize failed"
 	eautoreconf
 
 	# strip stupid options in configure, see bug #196621
@@ -66,7 +65,8 @@
 	fi
 
 	if use xulrunner; then
-		G2CONF="${G2CONF} --with-gecko=xulrunner"
+		G2CONF="${G2CONF} --with-gecko=libxul-embedding"
+#		G2CONF="${G2CONF} --with-gecko=xulrunner"
 	else
 		G2CONF="${G2CONF} --with-gecko=firefox"
 	fi