Fix order of mono-addins in || ( a b ) expression to prefer the newest version. Bug 263864. Thanks to uzytkownik <uzytkownik2@gmail.com> for reporting.

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

5 files changed, 18 insertions, 11 deletions

diff --git a/dev-util/monodevelop/ChangeLog b/dev-util/monodevelop/ChangeLog
index 25b15fd916a4..56cde6f9082a 100644
--- a/dev-util/monodevelop/ChangeLog
+++ b/dev-util/monodevelop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/monodevelop
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.71 2009/03/17 12:53:24 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.72 2009/03/26 22:52:07 loki_val Exp $
+
+  26 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
+  monodevelop-1.9.1.ebuild, monodevelop-1.9.2.ebuild,
+  monodevelop-1.9.3.ebuild:
+  Fix order of mono-addins in || ( a b ) expression to prefer the newest
+  version. Bug 263864. Thanks to uzytkownik <uzytkownik2@gmail.com> for
+  reporting.
 
 *monodevelop-1.9.3 (17 Mar 2009)
 
diff --git a/dev-util/monodevelop/Manifest b/dev-util/monodevelop/Manifest
index b19560172485..2eff2d4c809f 100644
--- a/dev-util/monodevelop/Manifest
+++ b/dev-util/monodevelop/Manifest
@@ -9,8 +9,8 @@ AUX monodevelop-exuberant-ctags.patch 2016 RMD160 9348329aae67f8b228748b2d09a0cb
 DIST monodevelop-1.9.1.tar.bz2 4816095 RMD160 32c6723fc6c87b9adccb8ae16b2e33b72be663ae SHA1 dfe2e73433602130fce32a41730a7afd246923a9 SHA256 02da04a8984a05cc5439d4cab7b554113ae90f3e0205a51df641653612127fca
 DIST monodevelop-1.9.2.tar.bz2 4622943 RMD160 4d5fe788856ab67eba369b725d509cf467b1b154 SHA1 7df87a9cca0088d1d43dad138608d9cab8223638 SHA256 a3a1f1737d0dccadcf85f14699ca56c502b5503f1458d4fa00288d1cac83b2db
 DIST monodevelop-1.9.3.tar.bz2 4985883 RMD160 7ace007507267eb060fd0600e652ccb86014b1d7 SHA1 3c0e52b888820b66339ad4999dcaa7102aefa9ae SHA256 5092448cfe1ef2adff45fd1872bce2657a3c01cc2d77c3e9223abc158f804511
-EBUILD monodevelop-1.9.1.ebuild 2004 RMD160 031a4e395b5cafcb33ff19f9db4b364ae583c02c SHA1 77669e2ce408bedc91968e47d51868a1f65a70e9 SHA256 a6d1e3d00b881aae2b445e313303253975f3acda93d94065505e99afa14fc48c
-EBUILD monodevelop-1.9.2.ebuild 2358 RMD160 1c47acc99ffeed16fab33328a1a6bade39c61b76 SHA1 c9d7d901ed6a8a41c2c1bc19ebb9fb5b9a246b82 SHA256 631edaf037a7c69507a66b1b8ec53187e5f412d6963659f7fe28e8402f3ec473
-EBUILD monodevelop-1.9.3.ebuild 2358 RMD160 2abe0c6edcc7b6d36acba7e264a6a13903aaa00e SHA1 93749d355e5f4e58beac85ead2a47b8b784c0527 SHA256 9f1cc29dd51692b9727d104cca946edb011b6411e2c56dbda3c72e4b74b63d30
-MISC ChangeLog 13503 RMD160 3f8f814c563a4fa0c6bb1a42fcdfa13d1623fc4c SHA1 c0db2ee970c957fb4a02608eae7a62359041365c SHA256 19ec9f0d6fd5ad70506022827d8a28a389a354d10cbad9e14d55c62d091eefd6
+EBUILD monodevelop-1.9.1.ebuild 2004 RMD160 e8ccafc5ab017d76c5d43c79dbbd142c33bb9054 SHA1 65aaa3cc2e3db0f17457653dc646059853f35d1d SHA256 d8db760153a9daa684c751a556dcef536463a31c999f6f7a2da40ed7d4836c24
+EBUILD monodevelop-1.9.2.ebuild 2358 RMD160 ecfacef9d71946d36428a45a187aed6ccab7d397 SHA1 3c27fc2528c56804d9ed4d2aa09102c08cb2f8d0 SHA256 727d21d305b67dc4997927817ca0a49a508b6ea8597ca255b2bdaa578e60ff1c
+EBUILD monodevelop-1.9.3.ebuild 2358 RMD160 740a0accfaa430654f4413d30096f7ab9e106833 SHA1 97268096786341a08030ce5d36d61329daed37ec SHA256 e6a01960a6ccfcae0f49979eb35ee7a25d8ef27b89b0906881879372ac020b23
+MISC ChangeLog 13797 RMD160 1caccd2faf0b5afd131593a545c7d0f6923133b2 SHA1 f2d38e5d196ff005b0af97897e8071092eaf2273 SHA256 2f5004e4e5a6566a463b83d96be0b6751fb6a0ff026b466248b0f26a9b6457b5
 MISC metadata.xml 161 RMD160 a0a2d2292aa270508f486b7b8df44e41284c26d7 SHA1 9b8b4681d509e9534cc771857355f912aa79643d SHA256 94675b9f5f7cd65b33f9ad2c853ad20c178253e38c6535795a189ef89f1b11f7
diff --git a/dev-util/monodevelop/monodevelop-1.9.1.ebuild b/dev-util/monodevelop/monodevelop-1.9.1.ebuild
index 57d44e693606..59635c648ba5 100644
--- a/dev-util/monodevelop/monodevelop-1.9.1.ebuild
+++ b/dev-util/monodevelop/monodevelop-1.9.1.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/monodevelop/monodevelop-1.9.1.ebuild,v 1.10 2009/01/19 21:14:28 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-1.9.1.ebuild,v 1.11 2009/03/26 22:52:07 loki_val Exp $
 
 EAPI=2
 
@@ -19,8 +19,8 @@ RDEPEND="sys-apps/dbus[X]
 	>=dev-lang/mono-1.9
 	>=virtual/monodoc-1.9
 	||	(
-		~dev-dotnet/mono-addins-0.3.1
 		>=dev-dotnet/mono-addins-0.4[gtk]
+		~dev-dotnet/mono-addins-0.3.1
 	)
 	>=dev-dotnet/gtk-sharp-2.12.6
 	>=dev-dotnet/glade-sharp-2.12.6
diff --git a/dev-util/monodevelop/monodevelop-1.9.2.ebuild b/dev-util/monodevelop/monodevelop-1.9.2.ebuild
index 9e092d1e2c8f..1616c4abb5cf 100644
--- a/dev-util/monodevelop/monodevelop-1.9.2.ebuild
+++ b/dev-util/monodevelop/monodevelop-1.9.2.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/monodevelop/monodevelop-1.9.2.ebuild,v 1.1 2009/03/08 15:55:03 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-1.9.2.ebuild,v 1.2 2009/03/26 22:52:07 loki_val Exp $
 
 EAPI=2
 
@@ -19,8 +19,8 @@ RDEPEND="sys-apps/dbus[X]
 	>=dev-lang/mono-2.0
 	>=virtual/monodoc-2.0
 	||	(
-		~dev-dotnet/mono-addins-0.3.1
 		>=dev-dotnet/mono-addins-0.4[gtk]
+		~dev-dotnet/mono-addins-0.3.1
 	)
 	>=dev-dotnet/gtk-sharp-2.12.6
 	>=dev-dotnet/glade-sharp-2.12.6
diff --git a/dev-util/monodevelop/monodevelop-1.9.3.ebuild b/dev-util/monodevelop/monodevelop-1.9.3.ebuild
index 35d7a3901957..df702b4183da 100644
--- a/dev-util/monodevelop/monodevelop-1.9.3.ebuild
+++ b/dev-util/monodevelop/monodevelop-1.9.3.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/monodevelop/monodevelop-1.9.3.ebuild,v 1.1 2009/03/17 12:53:24 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-1.9.3.ebuild,v 1.2 2009/03/26 22:52:07 loki_val Exp $
 
 EAPI=2
 
@@ -19,8 +19,8 @@ RDEPEND="sys-apps/dbus[X]
 	>=dev-lang/mono-2.0
 	>=virtual/monodoc-2.0
 	||	(
-		~dev-dotnet/mono-addins-0.3.1
 		>=dev-dotnet/mono-addins-0.4[gtk]
+		~dev-dotnet/mono-addins-0.3.1
 	)
 	>=dev-dotnet/gtk-sharp-2.12.6
 	>=dev-dotnet/glade-sharp-2.12.6