Fix html-renderer-fixes patch to make Mono.Webbrowser engine optional. Xulrunner use-flag now pulls in gluezilla for Mono.Webbrowser. Drop gecko-sharp usage, since it's broken. Update 9999 ebuilds with same fixes.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

6 files changed, 184 insertions, 40 deletions

diff --git a/dev-util/mono-tools/ChangeLog b/dev-util/mono-tools/ChangeLog
index 113c2bd44ae5..9a0a307eb3ec 100644
--- a/dev-util/mono-tools/ChangeLog
+++ b/dev-util/mono-tools/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/mono-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.61 2009/06/30 06:02:08 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.62 2009/09/02 14:05:04 loki_val Exp $
+
+*mono-tools-2.4.2-r1 (02 Sep 2009)
+
+  02 Sep 2009; Peter Alfredsen <loki_val@gentoo.org>
+  -mono-tools-2.4.2.ebuild, +mono-tools-2.4.2-r1.ebuild,
+  mono-tools-2.4.9999.ebuild,
+  +files/mono-tools-2.4-html-renderer-fixes.patch, mono-tools-9999.ebuild:
+  Fix html-renderer-fixes patch to make Mono.Webbrowser engine optional.
+  Xulrunner use-flag now pulls in gluezilla for Mono.Webbrowser. Drop
+  gecko-sharp usage, since it's broken. Update 9999 ebuilds with same fixes.
 
 *mono-tools-2.4.2 (30 Jun 2009)
 
diff --git a/dev-util/mono-tools/Manifest b/dev-util/mono-tools/Manifest
index 66d8060e1678..389626600492 100644
--- a/dev-util/mono-tools/Manifest
+++ b/dev-util/mono-tools/Manifest
@@ -3,6 +3,7 @@ AUX mono-tools-1.2.4-install.patch 288 RMD160 93e0d5d784f293ec3e1834ed44256414fa
 AUX mono-tools-1.2.6-html-renderer-fixes.patch 3208 RMD160 acc437f2994cf2fa5a88b8798ce53944d7c1dcc0 SHA1 8d6c53ff03132d58f5ac0e7f0f5d7f9769db04cd SHA256 a65a31321b39c547d5c966401fe041e5800f6fb5c7bda87997b7f94f92b7220b
 AUX mono-tools-1.9-html-renderer-fixes.patch 2993 RMD160 f17d5817c77f9b3fc9ac561fae510e89e68c535f SHA1 b70cb44e99f4d0906e77628dd59fd9ce48e7ad0e SHA256 a99d508f6b826cb1979dc9113320182ae395d357a16c299ab4819437867ee7d8
 AUX mono-tools-2.0-html-renderer-fixes.patch 5076 RMD160 2f0c6b5c04df27564eed4807859f89c26e1df9ba SHA1 069bfbec88cb82a81b1422342224714183268794 SHA256 643ff6da3032fe33c3c09028411c9b9c935e343752c780e3e7a02786a5825f3a
+AUX mono-tools-2.4-html-renderer-fixes.patch 4003 RMD160 588b6c7b8eb1d1b6c84e00db7decdcf0ac66fe80 SHA1 1ccc47ec25ae26db8e5be7922950deff84da7913 SHA256 3d582450657ab90016064e9b070fafcb3acfd51aa7e2c469ea9054a23f058110
 DIST mono-tools-1.2.1.tar.gz 281653 RMD160 b96046218262220a931b074724334a31743026a1 SHA1 268c06497f7f914f8a83a62c068c6ae85be10d5e SHA256 3968713b758fa80156de19339f20be102c34aadd2817f955041db8402d76be78
 DIST mono-tools-1.2.4.tar.bz2 301009 RMD160 5af55735b309ffd78e4e515ef53ab08968680c27 SHA1 503ad8e776ea388ee7033bb010328e5d92ddac0f SHA256 9246dad467d4d66f1d8e54d55051ba5e7e788efb8f070ca96d4407c5d9f961dd
 DIST mono-tools-1.2.6.tar.bz2 298147 RMD160 d94bb5229e82c7feb7e5b46ee62391177dabfcdb SHA1 a44b2474b92b074784929f0e8e2c6b153796b54c SHA256 323aafcacd8e8421b28228baad10cef6f3f15013486687add5cb326552684fdc
@@ -17,11 +18,9 @@ EBUILD mono-tools-2.0.9999.ebuild 1391 RMD160 a68fc21f0482323f3a861d33bb65f449ba
 EBUILD mono-tools-2.0.ebuild 1213 RMD160 dfc934d8fb39a7d03c068cdbd8baed68e3f2ff61 SHA1 020a3347fadb2d9a331642d07e7d0502fe46bd74 SHA256 6120e4d8ed22edac95726ce5e16db29b0d53b0c65af2edee33b4de0db5881795
 EBUILD mono-tools-2.2.9999.ebuild 1391 RMD160 faf6c6bb65772e6aa466a7e8453b43150e523a09 SHA1 a12c9a934d323affaf5030b70d54575029509a23 SHA256 5478f7fa9102807d9660c65b4d497816670695d36091cc22abad02a9169e8544
 EBUILD mono-tools-2.2.ebuild 1336 RMD160 fc4f026ba4b6067bffdc4f09e9bd7219da893b26 SHA1 dd031917cb285eda55973c30e500296a313f2089 SHA256 70d5922aa7ad320baa3e71fe55dee6f9a4cf06dc0405fee9cc0ef490f8c0fa76
-EBUILD mono-tools-2.4.2.ebuild 1338 RMD160 34e543ae61ff0d3c4eeecd2d083ef4204faf30ce SHA1 463d983ab7b35cb9b67cf75b8e4cec9bfc7a6156 SHA256 3d2ef0db1eecf22423a26a7ded5563b971ddffc79658a40ee6f3607f9a0cbff6
-EBUILD mono-tools-2.4.9999.ebuild 1391 RMD160 dafe6fc19631b4558716bf6d8265dbc059ac2033 SHA1 c619b277942e4ef33466d453998f5920ae0f6f92 SHA256 ca42255969ec32286d29719884d2db2b91f2d1b9a5fbef754012879843ff767d
+EBUILD mono-tools-2.4.2-r1.ebuild 1513 RMD160 824f8869e9e11e6ae697ae3fee9fe5c2c187b336 SHA1 a44c7be4d1589d8144298768f041194475ef4db7 SHA256 6f2ae6d3ef33a3ea93966f0db0e914f30576e2fba78f3dddd8e171b62b2a79e3
+EBUILD mono-tools-2.4.9999.ebuild 1563 RMD160 387b35f77520de040b3e8ab250c8cea583b63b97 SHA1 6aa50e48087bdb10fbe91df224214b6d884f0f5e SHA256 1987dcb12b2b0b6905324bbd5afe6d6cec6a0bbf0c892f2f75ed410ae25d3c8e
 EBUILD mono-tools-2.4.ebuild 1334 RMD160 88be162758fb572a00304c2b4548ea774349d4f7 SHA1 0b9afc6964703be64b9aaa37ec8577705d8e9702 SHA256 4b1b2c74149f3f735a03143ae85c3fa722e12b47da15be8da860cd8defd5353a
-EBUILD mono-tools-9999.ebuild 1387 RMD160 c5e41528e5b9389e3da56be71a2e6db0f87e66d1 SHA1 14e23167b59fbd468f37d926c7d2d2627ebceb53 SHA256 51b00806bea0d7da1894f568b2f1fce8fedbc85b197fff5d6e732820c733025c
-MISC ChangeLog 9378 RMD160 ff9c8ba50aba617ad59892715248de505843085b SHA1 91672692a77b4e8151dfc6c770ca899b6614cafe SHA256 993108325ba675f74fc4f0947ab787b074887c85e7bf32c0d8b8ebc9f5eabe25
+EBUILD mono-tools-9999.ebuild 1559 RMD160 1d82a1569df63e961ad7748f8ca4651102a5aa8c SHA1 e4154e01c0c2619fd37c3789b2994f72d6e09ae1 SHA256 84597f369d7bf6d1c6bc3d8bc665552775b48c307d926c0472ea8d157459efd0
+MISC ChangeLog 9850 RMD160 d09c27cbe682fd4d8f7d2ae57d27672eb17938cf SHA1 7affd13f74fd1e9c5aca20894961b4fe6009a0e4 SHA256 5237e36994e671aeb7fc36740261a2ce9632fa18d205e89990f17a8f7f3cf17e
 MISC metadata.xml 254 RMD160 68c02b69bcd19311b207476b2cf5d474c74db77c SHA1 bd0905a26b1c03706221e75bd46fe88e9dc6a6c6 SHA256 edb26c541b69f6e45042fcfe097ad7b6103f69b5d7c03e90c434f8f6f019a04f
-MISC mono-tools-2.4.ebuild.orig 1121 RMD160 0b56f8e2320ac63b5523dd2b6c90fb52cc205628 SHA1 356f06eb2c5f2b92aba694705eb2657e822c1577 SHA256 3c9c3e2fa73ef53dfd62928d731670b212002d6a31cf245daad371bd4e150203
-MISC mono-tools-2.4.ebuild.rej 2430 RMD160 c768a7c07d822bb4b876c73e71418b7d46337420 SHA1 608a5bb8f4553098e7c5b6a0a274c855b3e5d35e SHA256 a651920d96d5a0e8f5b4736d8023b5070d3498b0a2b0b9de122a2f860f51a165
diff --git a/dev-util/mono-tools/files/mono-tools-2.4-html-renderer-fixes.patch b/dev-util/mono-tools/files/mono-tools-2.4-html-renderer-fixes.patch
new file mode 100644
index 000000000000..cb420dccc687
--- /dev/null
+++ b/dev-util/mono-tools/files/mono-tools-2.4-html-renderer-fixes.patch
@@ -0,0 +1,117 @@
+diff -NrU5 mono-tools-2.4.2.orig/configure.in mono-tools-2.4.2/configure.in
+--- mono-tools-2.4.2.orig/configure.in	2009-09-02 13:49:47.000000000 +0200
++++ mono-tools-2.4.2/configure.in	2009-09-02 14:14:04.000000000 +0200
+@@ -43,54 +43,84 @@
+ 
+ PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0)
+ #PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp glade-sharp gconf-sharp)
+ AC_SUBST(GTK_SHARP_LIBS)
+ 
+-PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enable_gtkhtml=no)
+-if test "x$enable_gtkhtml" = "xyes"; then
+-CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14"
+-else
+-PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0, enable_gtkhtml=yes, enable_gtkhtml=no)
+-CSHARP_FLAGS=
++AC_ARG_ENABLE(gtkhtml,
++		AC_HELP_STRING([--enable-gtkhtml], [Use GTKHTML Browser]),,
++		enable_gtkhtml=yes)
++
++if test "x$enable_gtkhtml" = "xyes" ; then
++	PKG_CHECK_MODULES([GTKHTML_SHARP],
++			[gtkhtml-sharp-3.14],
++			[CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14"],
++				[
++					PKG_CHECK_MODULES([GTKHTML_SHARP],
++						[gtkhtml-sharp-2.0],
++						[CSHARP_FLAGS=""],
++						[])
++				]
++			)
++       AC_SUBST(GTKHTML_SHARP_LIBS)
++       AC_SUBST(CSHARP_FLAGS)
+ fi
+-AC_SUBST(GTKHTML_SHARP_LIBS)
+-AC_SUBST(CSHARP_FLAGS)
++
+ AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes")
+ 
+-PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0, enable_gecko=yes, enable_gecko=no)
+-AC_SUBST(GECKO_SHARP_LIBS)
++AC_ARG_ENABLE(gecko,
++             AC_HELP_STRING([--enable-gecko], [Use Gecko / Xulrunner-1.8 browser libs]),,
++             enable_gecko=yes)
++
++if test "x$enable_gecko" = "xyes" ; then
++       PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0)
++
++       AC_SUBST(GECKO_SHARP_LIBS)
++
++       # get the mozilla home directory
++       MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
++       AC_SUBST(MOZILLA_HOME)
++fi
++
+ AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes")
+ 
+-if test "x$enable_gecko" = "xyes"; then
+-   # get the mozilla home directory
+-   MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
+-   AC_SUBST(MOZILLA_HOME)
++AC_ARG_ENABLE(webkit,
++             AC_HELP_STRING([--enable-webkit], [Use Webkit browser]),,
++             enable_webkit=yes)
++
++if test "x$enable_webkit" = "xyes" ; then
++	PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0)
++	AC_SUBST(WEBKIT_SHARP_LIBS)
+ fi
+ 
+-PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, enable_webkit=yes, enable_webkit=no)
+-AC_SUBST(WEBKIT_SHARP_LIBS)
+ AM_CONDITIONAL(ENABLE_WEBKIT, test "x$enable_webkit" = "xyes")
+ 
+ # PKG_CHECK_MODULES(MONOWEBBROWSER, mono-webbrowser, enable_monowebbrowser=yes, enable_monowebbrowser=no)
+ # AC_SUBST(MONOWEBBROWSER_LIBS)
+ 
+-AC_MSG_CHECKING([for Mono.WebBrowser])
+-if test "x$GACUTIL" = "xno"
+-then
+-   	AC_MSG_RESULT([no])
+-	if test "x$enable_monowebbrowser" = "x" ; then enable_monowebbrowser=no ; fi
+-else
+-	if $GACUTIL -l Mono.WebBrowser | grep -q "Mono.WebBrowser" 
++AC_ARG_ENABLE(monowebbrowser,
++             AC_HELP_STRING([--enable-monowebbrowser], [Use Mono.Webbrowser]),,
++             enable_monowebbrowser=yes)
++
++if test "x$enable_monowebbrowser" = "xyes" ; then
++	AC_MSG_CHECKING([for Mono.WebBrowser])
++	if test "x$GACUTIL" = "xno"
+ 	then
+-		AC_MSG_RESULT([yes])
+-		enable_monowebbrowser=yes
++	   	AC_MSG_RESULT([no])
++		if test "x$enable_monowebbrowser" = "x" ; then enable_monowebbrowser=no ; fi
+ 	else
+-		AC_MSG_RESULT([no])
+-		enable_monowebbrowser=no
+-	fi  
++		if $GACUTIL -l Mono.WebBrowser | grep -q "Mono.WebBrowser"
++		then
++			AC_MSG_RESULT([yes])
++			enable_monowebbrowser=yes
++			MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser
++		else
++			AC_MSG_RESULT([no])
++			enable_monowebbrowser=no
++		fi
++	fi
+ fi
+-MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser
++
+ AM_CONDITIONAL(ENABLE_MONOWEBBROWSER, test "x$enable_monowebbrowser" = "xyes")
+ 
+ if test "x$enable_gtkhtml$enable_gecko$enable_monowebbrowser$enable_webkit" = "xnononono" ; then
+    AC_MSG_ERROR([no HTML display found. You need either gtkhtml, gecko, WebKit or Mono.WebBrowser])
+ fi
diff --git a/dev-util/mono-tools/mono-tools-2.4.2.ebuild b/dev-util/mono-tools/mono-tools-2.4.2-r1.ebuild
index 0e7c390f050b..19942c6ebf21 100644
--- a/dev-util/mono-tools/mono-tools-2.4.2.ebuild
+++ b/dev-util/mono-tools/mono-tools-2.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-2.4.2.ebuild,v 1.1 2009/06/30 06:02:08 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-2.4.2-r1.ebuild,v 1.1 2009/09/02 14:05:04 loki_val Exp $
 
 EAPI=2
 
@@ -12,27 +12,32 @@ HOMEPAGE="http://www.mono-project.com/"
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="webkit xulrunner"
+IUSE="webkit gtkhtml +xulrunner"
 
 RDEPEND="=virtual/monodoc-${GO_MONO_REL_PV}*
 	>=dev-dotnet/gtk-sharp-2.12.6
 	>=dev-dotnet/glade-sharp-2.12.6
 	>=dev-dotnet/gconf-sharp-2
-	>=dev-dotnet/gtkhtml-sharp-2
-	webkit? ( dev-dotnet/webkit-sharp )
-	xulrunner? (
-		>=dev-dotnet/gecko-sharp-0.13
-		=dev-dotnet/gluezilla-${PV}
-	)"
+	gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0 )
+	webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 )
+	xulrunner? ( =dev-dotnet/gluezilla-${PV} )
+	"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.19"
 
-PATCHES=( "${FILESDIR}/${PN}-2.0-html-renderer-fixes.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.4-html-renderer-fixes.patch" )
 
 #Fails parallel make.
 MAKEOPTS="${MAKEOPTS} -j1"
 
+pkg_setup() {
+	if ! use webkit && ! use gtkhtml && ! use xulrunner
+	then
+		die "You must USE either webkit, gtkhtml or xulrunner"
+	fi
+}
+
 src_prepare() {
 	go-mono_src_prepare
 	eautoreconf
@@ -40,9 +45,10 @@ src_prepare() {
 
 src_configure() {
 	econf	--disable-dependency-tracking \
-		--enable-gtkhtml \
-		$(use_enable xulrunner mozilla) \
+		--disable-gecko \
+		$(use_enable gtkhtml) \
 		$(use_enable webkit) \
+		$(use_enable xulrunner monowebbrowser) \
 		|| die "configure failed"
 }
 
diff --git a/dev-util/mono-tools/mono-tools-2.4.9999.ebuild b/dev-util/mono-tools/mono-tools-2.4.9999.ebuild
index 859d6e8aaa2f..0324254e73c8 100644
--- a/dev-util/mono-tools/mono-tools-2.4.9999.ebuild
+++ b/dev-util/mono-tools/mono-tools-2.4.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-2.4.9999.ebuild,v 1.3 2009/06/09 21:19:35 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-2.4.9999.ebuild,v 1.4 2009/09/02 14:05:04 loki_val Exp $
 
 EAPI=2
 
@@ -12,27 +12,32 @@ HOMEPAGE="http://www.mono-project.com/"
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="webkit xulrunner"
+IUSE="webkit gtkhtml +xulrunner"
 
 RDEPEND="=virtual/monodoc-${GO_MONO_REL_PV}*
 	>=dev-dotnet/gtk-sharp-2.12.6
 	>=dev-dotnet/glade-sharp-2.12.6
 	>=dev-dotnet/gconf-sharp-2
-	>=dev-dotnet/gtkhtml-sharp-2
-	webkit? ( dev-dotnet/webkit-sharp )
-	xulrunner? (
-		>=dev-dotnet/gecko-sharp-0.13
-		=dev-dotnet/gluezilla-${PV}
-	)"
+	gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0 )
+	webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 )
+	xulrunner? ( =dev-dotnet/gluezilla-${PV} )
+	"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.19"
 
-PATCHES=( "${FILESDIR}/${PN}-2.0-html-renderer-fixes.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.4-html-renderer-fixes.patch" )
 
 #Fails parallel make.
 MAKEOPTS="${MAKEOPTS} -j1"
 
+pkg_setup() {
+	if ! use webkit && ! use gtkhtml && ! use xulrunner
+	then
+		die "You must USE either webkit, gtkhtml or xulrunner"
+	fi
+}
+
 src_prepare() {
 	glib-gettextize --force --copy || die "glib-gettextize --force --copy failed"
 	go-mono_src_prepare
@@ -40,9 +45,10 @@ src_prepare() {
 
 src_configure() {
 	econf	--disable-dependency-tracking \
-		--enable-gtkhtml \
-		$(use_enable xulrunner mozilla) \
+		--disable-gecko \
+		$(use_enable gtkhtml) \
 		$(use_enable webkit) \
+		$(use_enable xulrunner monowebbrowser) \
 		|| die "configure failed"
 }
 
diff --git a/dev-util/mono-tools/mono-tools-9999.ebuild b/dev-util/mono-tools/mono-tools-9999.ebuild
index 2f3cbd4dcb0d..6459e6c809f6 100644
--- a/dev-util/mono-tools/mono-tools-9999.ebuild
+++ b/dev-util/mono-tools/mono-tools-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-9999.ebuild,v 1.3 2009/06/09 21:19:35 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-9999.ebuild,v 1.4 2009/09/02 14:05:04 loki_val Exp $
 
 EAPI=2
 
@@ -12,27 +12,32 @@ HOMEPAGE="http://www.mono-project.com/"
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="webkit xulrunner"
+IUSE="webkit gtkhtml +xulrunner"
 
 RDEPEND="=virtual/monodoc-${GO_MONO_REL_PV}*
 	>=dev-dotnet/gtk-sharp-2.12.6
 	>=dev-dotnet/glade-sharp-2.12.6
 	>=dev-dotnet/gconf-sharp-2
-	>=dev-dotnet/gtkhtml-sharp-2
-	webkit? ( dev-dotnet/webkit-sharp )
-	xulrunner? (
-		>=dev-dotnet/gecko-sharp-0.13
-		=dev-dotnet/gluezilla-${PV}
-	)"
+	gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0 )
+	webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 )
+	xulrunner? ( =dev-dotnet/gluezilla-${PV} )
+	"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.19"
 
-PATCHES=( "${FILESDIR}/${PN}-2.0-html-renderer-fixes.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.4-html-renderer-fixes.patch" )
 
 #Fails parallel make.
 MAKEOPTS="${MAKEOPTS} -j1"
 
+pkg_setup() {
+	if ! use webkit && ! use gtkhtml && ! use xulrunner
+	then
+		die "You must USE either webkit, gtkhtml or xulrunner"
+	fi
+}
+
 src_prepare() {
 	glib-gettextize --force --copy || die "glib-gettextize --force --copy failed"
 	go-mono_src_prepare
@@ -40,9 +45,10 @@ src_prepare() {
 
 src_configure() {
 	econf	--disable-dependency-tracking \
-		--enable-gtkhtml \
-		$(use_enable xulrunner mozilla) \
+		--disable-gecko \
+		$(use_enable gtkhtml) \
 		$(use_enable webkit) \
+		$(use_enable xulrunner monowebbrowser) \
 		|| die "configure failed"
 }