diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-03-22 11:03:18 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-03-22 11:03:18 +0000 |
commit | 04ab778bba33efd03bf5a7b3d02570f90fcf7113 (patch) | |
tree | f15b3f40bb37ac22c4ede13e73018f3fab2a0c10 | |
parent | Remove old. (diff) | |
download | gentoo-2-04ab778bba33efd03bf5a7b3d02570f90fcf7113.tar.gz gentoo-2-04ab778bba33efd03bf5a7b3d02570f90fcf7113.tar.bz2 gentoo-2-04ab778bba33efd03bf5a7b3d02570f90fcf7113.zip |
Remove net-libs/xulrunner from || () wrt #403415
(Portage version: 2.2.0_alpha92/cvs/Linux x86_64)
-rw-r--r-- | dev-util/monodevelop/ChangeLog | 6 | ||||
-rw-r--r-- | dev-util/monodevelop/monodevelop-2.6.ebuild | 5 | ||||
-rw-r--r-- | dev-util/monodevelop/monodevelop-2.8.2.ebuild | 5 | ||||
-rw-r--r-- | dev-util/monodevelop/monodevelop-2.8.5.1.ebuild | 56 |
4 files changed, 41 insertions, 31 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/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 +} |