--- galeon-2.0.4.ebuild	2008-03-20 23:34:02.000000000 +0100
+++ galeon-2.0.7-r10.ebuild	2009-01-05 23:14:41.217842571 +0100
@@ -2,21 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.4.ebuild,v 1.8 2008/03/14 17:27:42 armin76 Exp $
 
-inherit gnome2 eutils
+EAPI="1"
+
+inherit gnome2
 
 DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
 HOMEPAGE="http://galeon.sourceforge.net"
-SRC_URI="mirror://sourceforge/galeon/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-IUSE="seamonkey xulrunner"
-KEYWORDS="amd64 ia64 ppc sparc x86"
+IUSE=""
 SLOT="0"
-RDEPEND="xulrunner? ( =net-libs/xulrunner-1.8* )
-	!xulrunner? (
-		seamonkey? ( =www-client/seamonkey-1* )
-		!seamonkey? ( =www-client/mozilla-firefox-2* )
-		)
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND="net-libs/xulrunner:1.9
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2.4.0
 	>=dev-libs/libxml2-2.6.6
@@ -27,30 +27,15 @@
 	>=gnome-base/libgnomeui-2.5.2
 	>=gnome-base/gnome-vfs-2
 	>=gnome-base/gnome-desktop-2.10.0
-	>=gnome-base/libglade-2.3.1
-	app-text/scrollkeeper"
+	>=gnome-base/libglade-2.3.1"
 DEPEND="${RDEPEND}
+	app-text/scrollkeeper
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.30
 	>=sys-devel/gettext-0.11"
 
 DOCS="AUTHORS ChangeLog FAQ README README.ExtraPrefs THANKS TODO NEWS"
 
-src_unpack() {
-	gnome2_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-maketest.diff"
-}
-
-src_compile() {
-	if use xulrunner; then
-		myconf="--with-mozilla=xulrunner"
-	elif use seamonkey; then
-		myconf="--with-mozilla=seamonkey"
-	else
-		myconf="--with-mozilla=firefox"
-	fi
-
-	econf ${myconf} || die "configure failed"
-	emake || die "compile failed"
+pkg_setup() {
+	G2CONF="${G2CONF} --with-gecko=libxul-embedding-unstable"
 }