Express dependencies in a way that portage is less likely to choke on.

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

4 files changed, 22 insertions, 10 deletions

diff --git a/dev-dotnet/evolution-sharp/ChangeLog b/dev-dotnet/evolution-sharp/ChangeLog
index 486960438fa4..d992d01dc635 100644
--- a/dev-dotnet/evolution-sharp/ChangeLog
+++ b/dev-dotnet/evolution-sharp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/evolution-sharp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.33 2009/01/23 15:40:04 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.34 2009/01/24 09:54:30 loki_val Exp $
+
+  24 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  evolution-sharp-0.17.4.ebuild, evolution-sharp-0.19.1.ebuild:
+  Express dependencies in a way that portage is less likely to choke on.
 
 *evolution-sharp-0.19.1 (23 Jan 2009)
 
diff --git a/dev-dotnet/evolution-sharp/Manifest b/dev-dotnet/evolution-sharp/Manifest
index 02c95857a8c0..e1aae41f679d 100644
--- a/dev-dotnet/evolution-sharp/Manifest
+++ b/dev-dotnet/evolution-sharp/Manifest
@@ -2,8 +2,8 @@ AUX evolution-sharp-0.18.0-respectlibdir.patch 1617 RMD160 6e8ad68e4637bdc3245d1
 DIST evolution-sharp-0.17.4.tar.bz2 276899 RMD160 45cba93354068e8417912744545a600079d73737 SHA1 2bb975fd77d73a65f6b6aa1d637a73d0ab8fefb3 SHA256 f5895815caa31f7b878294bfb0023a3d465705389b7fb92400e03d29256cebdf
 DIST evolution-sharp-0.18.1.tar.bz2 317001 RMD160 88433a61f7098052fbba38634b5d2fbbca758d91 SHA1 259bfb2e6709f24db9e6fae23ee5da310b41e172 SHA256 bf0258f2d73a7bacafb94dde87b4806f4b6bf9d94a96d98fa1cea09026d215c4
 DIST evolution-sharp-0.19.1.tar.bz2 334418 RMD160 cd23c84df6c62e422d175ea2119812f04480490b SHA1 b716ab938431f43294e6662455a0ed5054e52a79 SHA256 e840c4f364da149b6612249dbae4da5223a81944c88fbee52ddfc639817f329a
-EBUILD evolution-sharp-0.17.4.ebuild 957 RMD160 2f735dc71adc4ff7c7e08d91afc1f16be26048ae SHA1 87d19df90e8d9b54cd77b4f09362be89bfbf051b SHA256 41d6c95ee3b5f5837097f9b88a2454051979a8b25b548b43ed143f3856ee359c
+EBUILD evolution-sharp-0.17.4.ebuild 955 RMD160 8a4dff6a410e9c4f1fb73e87647555d6e28195a1 SHA1 31ee9c949e1df6299a3640c74adbe9323a8862e2 SHA256 18e7ca3779b3947f3b836c1c2f3275159d90d541914cd3ef0aa8f6265f2a6313
 EBUILD evolution-sharp-0.18.1.ebuild 701 RMD160 1d1894d87ee738c71edfde687cd578fd213e1bf4 SHA1 596645475be8646564c43bf86e526fb83024f267 SHA256 153abc83de709311836a36beca33cb556981c63d21c7c9ab8d7c9d5074696c88
-EBUILD evolution-sharp-0.19.1.ebuild 1009 RMD160 ad1ff787b834aafdca26a8effd25067a33903eb1 SHA1 7f5772bf167bf38cf33151e97a6d97dce790c6e4 SHA256 554abb2dc33ec08d5c0b3344e0e93dda7a9f8e730267facd7b00e3d8a1935276
-MISC ChangeLog 6057 RMD160 8ae3895ee93a593c171474e90941034f1f91b70b SHA1 08433e6bdae62781ae7f922c1c3852366225dd26 SHA256 6614321086b2a90261b670dd959d5cffd95aa541eeb87ebab0e0c4e345302ec0
+EBUILD evolution-sharp-0.19.1.ebuild 1248 RMD160 f019acc0f7b85d727419225040216b87be77d110 SHA1 8ec804433530b12d9c38b4142a841889ca44d7fa SHA256 e54e59af836bf9835e81644242c9785e4573e06fe90e331565193d1119635cbb
+MISC ChangeLog 6248 RMD160 4aec73f57ed3738fb7201014f562eb9ab70833e1 SHA1 3868e1522a37d945a711dfdccbb8f7860cfd5064 SHA256 4ab036c520754d1214d41ba1e64006da828d8f85624694b029aca368161db7e2
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
diff --git a/dev-dotnet/evolution-sharp/evolution-sharp-0.17.4.ebuild b/dev-dotnet/evolution-sharp/evolution-sharp-0.17.4.ebuild
index 858ecc91b61e..a32f8426e7bd 100644
--- a/dev-dotnet/evolution-sharp/evolution-sharp-0.17.4.ebuild
+++ b/dev-dotnet/evolution-sharp/evolution-sharp-0.17.4.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-dotnet/evolution-sharp/evolution-sharp-0.17.4.ebuild,v 1.5 2009/01/23 15:40:04 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/evolution-sharp-0.17.4.ebuild,v 1.6 2009/01/24 09:54:30 loki_val Exp $
 
 inherit mono gnome.org
 
@@ -12,8 +12,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND=">=gnome-extra/evolution-data-server-1.8.1-r1
-	!>=gnome-extra/evolution-data-server-2.24
+RDEPEND="<gnome-extra/evolution-data-server-2.24
+	!<gnome-extra/evolution-data-server-1.8.1-r1
 	>=dev-dotnet/gtk-sharp-2.4
 	dev-lang/mono"
 DEPEND="${RDEPEND}
diff --git a/dev-dotnet/evolution-sharp/evolution-sharp-0.19.1.ebuild b/dev-dotnet/evolution-sharp/evolution-sharp-0.19.1.ebuild
index 2d7a4463bed2..1a49a0047b5f 100644
--- a/dev-dotnet/evolution-sharp/evolution-sharp-0.19.1.ebuild
+++ b/dev-dotnet/evolution-sharp/evolution-sharp-0.19.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-dotnet/evolution-sharp/evolution-sharp-0.19.1.ebuild,v 1.1 2009/01/23 15:40:04 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/evolution-sharp-0.19.1.ebuild,v 1.2 2009/01/24 09:54:30 loki_val Exp $
 
 EAPI=2
 
@@ -14,8 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND=">=gnome-extra/evolution-data-server-2.24
-	<gnome-extra/evolution-data-server-2.25.7
+RDEPEND="
+	|| (
+		=gnome-extra/evolution-data-server-2.24*
+		=gnome-extra/evolution-data-server-2.25.1*
+		=gnome-extra/evolution-data-server-2.25.2*
+		=gnome-extra/evolution-data-server-2.25.3*
+		=gnome-extra/evolution-data-server-2.25.4*
+		=gnome-extra/evolution-data-server-2.25.5*
+		=gnome-extra/evolution-data-server-2.25.6*
+	)
 	>=dev-dotnet/glib-sharp-2.12
 	>=dev-lang/mono-2"
 DEPEND="${RDEPEND}