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

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

5 files changed, 41 insertions, 72 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/Manifest b/dev-util/mono-tools/Manifest
index 73b5990259c3..62c8a59b9bf3 100644
--- a/dev-util/mono-tools/Manifest
+++ b/dev-util/mono-tools/Manifest
@@ -11,9 +11,9 @@ DIST mono-tools-2.0.tar.bz2 742545 RMD160 f645de3a2678dcbc88d5cd6aa901c8e635cca4
 DIST mono-tools-2.4.2.tar.bz2 991604 RMD160 639e91162141cb58f8792617356a3a8b26b5ab18 SHA1 fed6ed49ea16dceeed50bad4097820a2ab2711af SHA256 be0d67ce3769cd7dc96139aacf5a61b016b9d7471278c03937dbc7706803f91e
 DIST mono-tools-2.6.1.tar.bz2 1067857 RMD160 abef75736fd2374ee9395ebec1dfe962fb02f120 SHA1 55bae542ffdd53907a7be32cfcbf5ca2b3e75403 SHA256 6012d790c996c459222e1c0a5a4a789e1ab2ddf334e771c70bfab1ad318c3ad1
 DIST mono-tools-2.6.tar.bz2 1067008 RMD160 2d3e8e1f53dcfa0db9aefec5bc6cbc91f24603cb SHA1 6960546b8b0ad90980dc5410290c69b13c466c48 SHA256 7488211a31ca0f2767b38e19a35a4b0e16a419798718cd5206a9623d092df4de
-EBUILD mono-tools-1.2.1.ebuild 1818 RMD160 3afa9a216ed48587600209ebeab4819149b7649b SHA1 30e09559a6f7847596ce776b87c4015cb0428df7 SHA256 3abe20c2701331ea14d6a2e688adc8e91054c25747caf50a55d11281a722d3b8
-EBUILD mono-tools-1.2.4.ebuild 1908 RMD160 d572a5dce8cc42a035adde7d3f1973fa3ab42d4f SHA1 d926c89e4d52e21eee7279669627b08406c01e2e SHA256 fda8e9fb66be2d8b52d361f174f8841a5b5d98d53a7b8420ca1720af9c883a11
-EBUILD mono-tools-1.2.6.ebuild 1799 RMD160 6476e19a38a51bdf6888cea97eeb7e862b64b554 SHA1 ba37bcc34d48b48a452cda34dc15d9e69d342cad SHA256 a78fcdd8e971a535f0483ed62898bd8adfbbef4a7ac9e4a60199c2d0f5b9224f
+EBUILD mono-tools-1.2.1.ebuild 1452 RMD160 61ae4555d60f054de367bd9989867d82f375b0f0 SHA1 5f8ef416c92415e251d4c19fc0a104a06d593aa7 SHA256 e308c7dbbfc4e95023facf77eb06d8d130974ce8c4239021ab7489fd2893d0d5
+EBUILD mono-tools-1.2.4.ebuild 1543 RMD160 24194d1abe069193e295fb81bfb162998146689d SHA1 b4267f7c8b752420c16a542db771bbb13f319283 SHA256 aa0858cb5872f01a17274771c9d81d262241be9b0288cad49d4f11df36cd364d
+EBUILD mono-tools-1.2.6.ebuild 1430 RMD160 323c21bbf52c965aa2c63033e9c81e468cd14387 SHA1 9447ee6ef7f64c3c1bcba85a1623d5d08f1ec624 SHA256 22f782deb1744f4b5924e8399d91e8f860840a7da4b97d9d62c1805da3aba7b6
 EBUILD mono-tools-2.0.9999.ebuild 1391 RMD160 a68fc21f0482323f3a861d33bb65f449ba13e306 SHA1 fc925e42d4f66dbe201ab7a2db73c9e7690c424b SHA256 d8e2cd0b6378d036ec8116a62635241426762c1f2e77a5c7c89567e92dc9e13e
 EBUILD mono-tools-2.0.ebuild 1213 RMD160 dfc934d8fb39a7d03c068cdbd8baed68e3f2ff61 SHA1 020a3347fadb2d9a331642d07e7d0502fe46bd74 SHA256 6120e4d8ed22edac95726ce5e16db29b0d53b0c65af2edee33b4de0db5881795
 EBUILD mono-tools-2.4.2-r1.ebuild 1508 RMD160 0a4b471c1833eda9442d9c9ce4a5b5ecad8eccce SHA1 427e13528d4fc7bb07cdc3676b087beae7d371ef SHA256 d0c1d456dae519bb0f1377f4667c5c0a869b4342ca32ef8092128c4a9cf6af86
@@ -21,5 +21,5 @@ EBUILD mono-tools-2.4.9999.ebuild 1563 RMD160 387b35f77520de040b3e8ab250c8cea583
 EBUILD mono-tools-2.6.1.ebuild 1507 RMD160 43f8f8118ba1c67575a480394e18602fbc2cfc27 SHA1 ef8a9dc856f1da09d3befcb4ace0ef8bf8f01d78 SHA256 1887aff395debbb71140913303afdb52b858f0a26e771ce9577d8c329ebe8aa6
 EBUILD mono-tools-2.6.ebuild 1507 RMD160 c204ac59cc8bacee3afecdbda469a66f2d2550da SHA1 9424f1135d0b8f147d176c31d2c04644786ed1f0 SHA256 2f2ddcb63a1ab4e957601fea21606195abff507c8402d6d007c56e438bfba737
 EBUILD mono-tools-9999.ebuild 1559 RMD160 1d82a1569df63e961ad7748f8ca4651102a5aa8c SHA1 e4154e01c0c2619fd37c3789b2994f72d6e09ae1 SHA256 84597f369d7bf6d1c6bc3d8bc665552775b48c307d926c0472ea8d157459efd0
-MISC ChangeLog 10424 RMD160 d95bcad862efd30e079302ba8abc2277f3cacdff SHA1 2ad61fb4e89b3c687fd3949ebf01633b002b93fc SHA256 d51fac4dc47a8235634012ac9e8bac76903545004b4c51cf639221166e1a368e
+MISC ChangeLog 10649 RMD160 fd88254634d49fa4e278ade2a25c547c25d9f610 SHA1 2898925219d5f3848459fb64eff9457256846007 SHA256 b4abcb4a165afba91a99946d56baf6f2e3eb2864ff5b93983367fea76f95ef38
 MISC metadata.xml 254 RMD160 68c02b69bcd19311b207476b2cf5d474c74db77c SHA1 bd0905a26b1c03706221e75bd46fe88e9dc6a6c6 SHA256 edb26c541b69f6e45042fcfe097ad7b6103f69b5d7c03e90c434f8f6f019a04f
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"