Remove net-libs/xulrunner from || () wrt #403415

Package-Manager: portage-2.2.0_alpha92/cvs/Linux x86_64

5 files changed, 53 insertions, 39 deletions

diff --git a/dev-util/monodevelop/ChangeLog b/dev-util/monodevelop/ChangeLog
index 3bccc4695582..3e3c3569243b 100644
--- a/dev-util/monodevelop/ChangeLog
+++ b/dev-util/monodevelop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/monodevelop
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.95 2012/01/22 11:46:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.96 2012/03/22 11:03:18 ssuominen Exp $
+
+  22 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> monodevelop-2.6.ebuild,
+  monodevelop-2.8.2.ebuild, monodevelop-2.8.5.1.ebuild:
+  Remove net-libs/xulrunner from || () wrt #403415
 
 *monodevelop-2.8.5.1 (22 Jan 2012)
 
diff --git a/dev-util/monodevelop/Manifest b/dev-util/monodevelop/Manifest
index 2540e8e1502b..ada4b1d8a744 100644
--- a/dev-util/monodevelop/Manifest
+++ b/dev-util/monodevelop/Manifest
@@ -4,15 +4,19 @@ Hash: SHA1
 DIST monodevelop-2.6.tar.gz 10126502 RMD160 f824767c2eddb0e7aace18d295f315ffce209336 SHA1 8cb14f7a26efb1e88171f8c8168f39b959e41f73 SHA256 3572b9e650f1537f4179c0fb681d8ffa5503621442de48937cb1c14be3312a57
 DIST monodevelop-2.8.2.tar.bz2 8184505 RMD160 fb79b38b780c9d6daa112818b8a5b881eb18c120 SHA1 8d5db64be320ecc575b85b91f03feeb07d5de86a SHA256 70c9ea2dbc8f29c18bbc0e5c7bbd594643f5f34baf209944781167468ce99e4e
 DIST monodevelop-2.8.5.1.tar.bz2 8158482 RMD160 50d814c794d86b36abefac9755cff81fb7daedf4 SHA1 b447a13e253c6ecd99b31e4173da79a84ff10fef SHA256 b2f3ed5ea714825cff77b96aee94a098b0d8b361dd8bda18a52ef04670dc2efd
-EBUILD monodevelop-2.6.ebuild 2354 RMD160 5df7cb71666addad02750a8420c9640cac48c96a SHA1 285434ae228e7b946f18b0421490b30a934804f9 SHA256 91ac0335996cc398a9796ad2ab198a0378af1dc6bb19022eaa6fdf7c9b3b2162
-EBUILD monodevelop-2.8.2.ebuild 2251 RMD160 71a5cab6cef1b3b49cb92e4abacf42aed3da317b SHA1 dbb246b87dc1ab68aebfb0272ce4c960bc4bfae8 SHA256 62fb4e7bdcdcb2ffa0c41fcc262e1f3d8df58d6303ad129f5bedf553b93d5a99
-EBUILD monodevelop-2.8.5.1.ebuild 2225 RMD160 0b4bb1e05c8d8a288f414008b823568c30bc4fef SHA1 069eae8292719588a81aaeb02d51bf34fe9a26de SHA256 be4a1bcf0b9e3a5e0366a9e618d5e6d7ce82456fed1ebf80677014a6c4109527
-MISC ChangeLog 17596 RMD160 0216fa152e0c9df967b5a6cad78f774cc210fb70 SHA1 da9bbd89463696cedd7344c94c4932f7f3864620 SHA256 8e1f0ac5ccf351e324c6266a2fc507becb332663febce65e48d219a2a13431b8
+EBUILD monodevelop-2.6.ebuild 2334 RMD160 57789e4655280acf98da4793a92ac3cb579880ac SHA1 4911c27984d6891f331068fad14cca6a91a37ac8 SHA256 98def2c78580ff45e0054de3bed3e96aa6712df283a1a6e6dcae2a7c6eec5d08
+EBUILD monodevelop-2.8.2.ebuild 2234 RMD160 98af7a330196db2bbd838d612220fd60313fa8bd SHA1 575da7ac87121b5b2100a9333c3f40a2ab948304 SHA256 e2e321c80f6d231aa21d27b080856454f051926c83e68adfe2c3c2175b42b30e
+EBUILD monodevelop-2.8.5.1.ebuild 2323 RMD160 ab17ce7130d37b7c65c13167b56ab9e4ad9f399d SHA1 5728196cdd41c08af2739b16f25a86f2d17eafdd SHA256 361b621f4bc7033f2f7cf6f38dd18c899d858b348586df8ad539c2ad183afea7
+MISC ChangeLog 17786 RMD160 55000aba51ae994163591aa629f5d6e2c9032f08 SHA1 8ca56e80b4f1315ed81c222b9aa8937b7b1db35c SHA256 1f876133c7c154fb86829635e55165b2291b24ff38f2fbcede1ede83de182c2c
 MISC metadata.xml 238 RMD160 cadd7a7a2ba596d3a89758ee0a6e78c95df3e532 SHA1 3af8b497d782af84acda84f415c6e8653767fa6f SHA256 8e3dd605713bc1911dbbe0079549b87a68719a820912bfe865df60a181eb55dc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8b9xgACgkQCaWpQKGI+9TDxACcDcqHilZ4W3rRFj2Va0o3xyFz
-GEwAn3psObAzXP6UVXvNkm10NngwPKCv
-=I3d0
+iQEcBAEBAgAGBQJPawbzAAoJEEdUh39IaPFNCLQH/39WRQ4hMGlznH7fHMjLR7hD
+HL9z/H3hEaGaX+Y5RKN0OPNS5Qirx7cCstqTNNsViK3l60kVzqoMMjPOFs5P323m
+9MUGzsEAgDmbWU5DuHJ396ECKv12ShI0J1sjMW8rOU4lju4cEAgLa2POIJ/sb4l5
+Ebe4/NJ5cCWqljJY8bQ30aEDDNzgks0VIgj5fDTjqn77klbt1BWnC2W/2aChyzsp
+C7311r3oOJprnelv4Nz1tzLFb0mZYbjrzPgrROZto92ZHXm+zJPXyWLNSrd5uW/c
++rocpyGOOiV0oJqhZbNMHFH8zGTRV99DcbPmgoaywpz31TJZwuFjpLm/tDWajmk=
+=Tzk8
 -----END PGP SIGNATURE-----
diff --git a/dev-util/monodevelop/monodevelop-2.6.ebuild b/dev-util/monodevelop/monodevelop-2.6.ebuild
index f8728912829b..51937828d0ab 100644
--- a/dev-util/monodevelop/monodevelop-2.6.ebuild
+++ b/dev-util/monodevelop/monodevelop-2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-2.6.ebuild,v 1.4 2011/11/05 12:26:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-2.6.ebuild,v 1.5 2012/03/22 11:03:18 ssuominen Exp $
 
 EAPI="4"
 
@@ -25,7 +25,6 @@ RDEPEND="sys-apps/dbus[X]
 	>=dev-dotnet/gnomevfs-sharp-2.24.0
 	>=dev-dotnet/gconf-sharp-2.24.0
 	||	(
-		net-libs/xulrunner
 		www-client/firefox
 		www-client/firefox-bin
 		www-client/seamonkey
diff --git a/dev-util/monodevelop/monodevelop-2.8.2.ebuild b/dev-util/monodevelop/monodevelop-2.8.2.ebuild
index ff23d6a00f6a..97e98f9cf637 100644
--- a/dev-util/monodevelop/monodevelop-2.8.2.ebuild
+++ b/dev-util/monodevelop/monodevelop-2.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-2.8.2.ebuild,v 1.1 2011/11/23 19:03:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-2.8.2.ebuild,v 1.2 2012/03/22 11:03:18 ssuominen Exp $
 
 EAPI="4"
 
@@ -25,7 +25,6 @@ RDEPEND="sys-apps/dbus[X]
 	>=dev-dotnet/gnomevfs-sharp-2.24.0
 	>=dev-dotnet/gconf-sharp-2.24.0
 	||	(
-		net-libs/xulrunner
 		www-client/firefox
 		www-client/firefox-bin
 		www-client/seamonkey
diff --git a/dev-util/monodevelop/monodevelop-2.8.5.1.ebuild b/dev-util/monodevelop/monodevelop-2.8.5.1.ebuild
index c5bddc80ee49..a3ca9251c52f 100644
--- a/dev-util/monodevelop/monodevelop-2.8.5.1.ebuild
+++ b/dev-util/monodevelop/monodevelop-2.8.5.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-2.8.5.1.ebuild,v 1.1 2012/01/22 11:46:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-2.8.5.1.ebuild,v 1.2 2012/03/22 11:03:18 ssuominen Exp $
 
-EAPI="4"
-
-inherit fdo-mime mono multilib gnome2-utils versionator
+EAPI=4
+inherit fdo-mime gnome2-utils mono versionator
 
 DESCRIPTION="Integrated Development Environment for .NET"
 HOMEPAGE="http://www.monodevelop.com/"
@@ -15,48 +14,51 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+subversion +git"
 
-RDEPEND="sys-apps/dbus[X]
-	>=dev-lang/mono-2.6.1
-	>=virtual/monodoc-2.0
-	>=dev-dotnet/mono-addins-0.6[gtk]
-	>=dev-dotnet/gtk-sharp-2.12.9
+RDEPEND=">=dev-lang/mono-2.6.1
+	>=dev-dotnet/gconf-sharp-2.24.0
 	>=dev-dotnet/glade-sharp-2.12.9
 	>=dev-dotnet/gnome-sharp-2.24.0
 	>=dev-dotnet/gnomevfs-sharp-2.24.0
-	>=dev-dotnet/gconf-sharp-2.24.0
-	||	(
-		net-libs/xulrunner
+	>=dev-dotnet/gtk-sharp-2.12.9
+	>=dev-dotnet/mono-addins-0.6[gtk]
+	>=dev-dotnet/xsp-2
+	dev-util/ctags
+	sys-apps/dbus[X]
+	>=virtual/monodoc-2.0
+	|| (
 		www-client/firefox
 		www-client/firefox-bin
 		www-client/seamonkey
-	)
-	>=dev-dotnet/xsp-2
+		)
 	subversion? ( dev-vcs/subversion )
-	dev-util/ctags
 	!<dev-util/monodevelop-boo-$(get_version_component_range 1-2)
 	!<dev-util/monodevelop-java-$(get_version_component_range 1-2)
 	!<dev-util/monodevelop-database-$(get_version_component_range 1-2)
 	!<dev-util/monodevelop-debugger-gdb-$(get_version_component_range 1-2)
 	!<dev-util/monodevelop-debugger-mdb-$(get_version_component_range 1-2)
 	!<dev-util/monodevelop-vala-$(get_version_component_range 1-2)"
-
 DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
 	sys-devel/gettext
-	x11-misc/shared-mime-info
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19"
+	x11-misc/shared-mime-info"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
 src_configure() {
-	econf	--disable-update-mimedb				\
-		--disable-update-desktopdb			\
-		--enable-monoextensions				\
-		--enable-gnomeplatform				\
-		$(use_enable subversion)			\
+	econf \
+		--disable-update-mimedb \
+		--disable-update-desktopdb \
+		--enable-monoextensions \
+		--enable-gnomeplatform \
+		$(use_enable subversion) \
 		$(use_enable git)
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	gnome2_icon_cache_update
 	fdo-mime_mime_database_update
@@ -71,3 +73,9 @@ pkg_postinst() {
 	elog "Read more here:"
 	elog "http://monodevelop.com/"
 }
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}