Use gtkhtml instead of old gecko-sharp which deps on vulnerable seamonkey wrt #300414.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 37 insertions, 68 deletions

diff --git a/dev-util/mono-tools/ChangeLog b/dev-util/mono-tools/ChangeLog
index ffe59a23d602..fbfb83c06ef7 100644
--- a/dev-util/mono-tools/ChangeLog
+++ b/dev-util/mono-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/mono-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.67 2010/02/27 01:33:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.68 2010/03/27 08:54:48 ssuominen Exp $
+
+  27 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  mono-tools-1.2.1.ebuild, mono-tools-1.2.4.ebuild, mono-tools-1.2.6.ebuild:
+  Use gtkhtml instead of old gecko-sharp which deps on vulnerable seamonkey
+  wrt #300414.
 
 *mono-tools-2.6.1 (27 Feb 2010)
 
diff --git a/dev-util/mono-tools/mono-tools-1.2.1.ebuild b/dev-util/mono-tools/mono-tools-1.2.1.ebuild
index cf54e61c5062..901797e22c03 100644
--- a/dev-util/mono-tools/mono-tools-1.2.1.ebuild
+++ b/dev-util/mono-tools/mono-tools-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-1.2.1.ebuild,v 1.7 2008/12/14 15:05:16 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-1.2.1.ebuild,v 1.8 2010/03/27 08:54:48 ssuominen Exp $
 
 inherit eutils mono multilib autotools
 
@@ -11,28 +11,20 @@ SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="gtkhtml seamonkey"
+IUSE=""
 
 RDEPEND="dev-lang/mono
-		 >=virtual/monodoc-${PV}
-		 =dev-dotnet/gtk-sharp-2*
-		 =dev-dotnet/glade-sharp-2*
-		 =dev-dotnet/gconf-sharp-2*
-		 gtkhtml? ( =dev-dotnet/gtkhtml-sharp-2* )
-		 seamonkey? ( =dev-dotnet/gecko-sharp-0.11* )
-		 !seamonkey? ( =dev-dotnet/gtkhtml-sharp-2* )"
+	>=virtual/monodoc-${PV}
+	=dev-dotnet/gtk-sharp-2*
+	=dev-dotnet/glade-sharp-2*
+	=dev-dotnet/gconf-sharp-2*
+	=dev-dotnet/gtkhtml-sharp-2*"
 DEPEND="${RDEPEND}
-		sys-devel/gettext"
+	sys-devel/gettext"
 
 # Parallel build unfriendly
 MAKEOPTS="${MAKEOPTS} -j1"
 
-pkg_setup() {
-	if ! use gtkhtml && ! use seamonkey ; then
-		elog "No browser selected, defaulting to gtkhtml"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -55,11 +47,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="$(use_enable gtkhtml) $(use_enable seamonkey mozilla)"
-
-	if ! use gtktml && ! use seamonkey ; then
-		myconf="--enable-gtkhtml --disable-mozilla"
-	fi
+	local myconf="--enable-gtkhtml --disable-mozilla"
 
 	econf ${myconf} || die "configure failed"
 	emake || die "make failed"
diff --git a/dev-util/mono-tools/mono-tools-1.2.4.ebuild b/dev-util/mono-tools/mono-tools-1.2.4.ebuild
index c6f4488c16af..30ba0daa6b22 100644
--- a/dev-util/mono-tools/mono-tools-1.2.4.ebuild
+++ b/dev-util/mono-tools/mono-tools-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-1.2.4.ebuild,v 1.9 2008/12/14 15:05:16 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-1.2.4.ebuild,v 1.10 2010/03/27 08:54:48 ssuominen Exp $
 
 inherit eutils mono multilib autotools
 
@@ -11,28 +11,20 @@ SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ~sparc x86 ~x86-fbsd"
-IUSE="gtkhtml seamonkey"
+IUSE=""
 
 RDEPEND="dev-lang/mono
-		 >=virtual/monodoc-${PV}
-		 =dev-dotnet/gtk-sharp-2*
-		 =dev-dotnet/glade-sharp-2*
-		 =dev-dotnet/gconf-sharp-2*
-		 gtkhtml? ( =dev-dotnet/gtkhtml-sharp-2* )
-		 seamonkey? ( >=dev-dotnet/gecko-sharp-0.11 )
-		 !seamonkey? ( =dev-dotnet/gtkhtml-sharp-2* )"
+	>=virtual/monodoc-${PV}
+	=dev-dotnet/gtk-sharp-2*
+	=dev-dotnet/glade-sharp-2*
+	=dev-dotnet/gconf-sharp-2*
+	=dev-dotnet/gtkhtml-sharp-2*"
 DEPEND="${RDEPEND}
-		sys-devel/gettext"
+	sys-devel/gettext"
 
 # Parallel build unfriendly
 MAKEOPTS="${MAKEOPTS} -j1"
 
-pkg_setup() {
-	if ! use gtkhtml && ! use seamonkey ; then
-		elog "No browser selected, defaulting to gtkhtml"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -58,11 +50,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="$(use_enable gtkhtml) $(use_enable seamonkey mozilla)"
-
-	if ! use gtktml && ! use seamonkey ; then
-		myconf="--enable-gtkhtml --disable-mozilla"
-	fi
+	local myconf="--enable-gtkhtml --disable-mozilla"
 
 	econf ${myconf} || die "configure failed"
 	emake || die "make failed"
diff --git a/dev-util/mono-tools/mono-tools-1.2.6.ebuild b/dev-util/mono-tools/mono-tools-1.2.6.ebuild
index fb44cdabca34..1ebfde2dbdd2 100644
--- a/dev-util/mono-tools/mono-tools-1.2.6.ebuild
+++ b/dev-util/mono-tools/mono-tools-1.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-1.2.6.ebuild,v 1.2 2008/12/14 15:05:16 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-1.2.6.ebuild,v 1.3 2010/03/27 08:54:48 ssuominen Exp $
 
 inherit mono multilib eutils
 
@@ -11,25 +11,17 @@ SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="gtkhtml seamonkey"
+IUSE=""
 
 RDEPEND=">=dev-lang/mono-1.0
-		 >=virtual/monodoc-${PV}
-		 =dev-dotnet/gtk-sharp-2*
-		 =dev-dotnet/glade-sharp-2*
-		 =dev-dotnet/gconf-sharp-2*
-		 gtkhtml? ( =dev-dotnet/gtkhtml-sharp-2* )
-		 seamonkey? ( =dev-dotnet/gecko-sharp-0.11* )
-		 !seamonkey? ( =dev-dotnet/gtkhtml-sharp-2* )"
+	>=virtual/monodoc-${PV}
+	=dev-dotnet/gtk-sharp-2*
+	=dev-dotnet/glade-sharp-2*
+	=dev-dotnet/gconf-sharp-2*
+	=dev-dotnet/gtkhtml-sharp-2*"
 DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		>=dev-util/pkgconfig-0.19"
-
-pkg_setup() {
-	if ! use gtkhtml && ! use seamonkey ; then
-		elog "No browser selected, defaulting to gtkhtml"
-	fi
-}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.19"
 
 src_unpack() {
 	unpack ${A}
@@ -51,11 +43,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="$(use_enable gtkhtml) $(use_enable seamonkey mozilla)"
-
-	if ! use gtktml && ! use seamonkey ; then
-		myconf="--enable-gtkhtml --disable-mozilla"
-	fi
+	local myconf="--enable-gtkhtml --disable-mozilla"
 
 	econf ${myconf} || die "configure failed"
 	emake || die "make failed"