Depend on evolution-data-server with the same major/minor version (bug #448350).

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 16 insertions, 5 deletions

diff --git a/gnome-extra/evolution-kolab/ChangeLog b/gnome-extra/evolution-kolab/ChangeLog
index 5a6eba1c3112..b47f970d2964 100644
--- a/gnome-extra/evolution-kolab/ChangeLog
+++ b/gnome-extra/evolution-kolab/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/evolution-kolab
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-kolab/ChangeLog,v 1.3 2012/12/19 07:01:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-kolab/ChangeLog,v 1.4 2012/12/24 04:51:47 tetromino Exp $
+
+  24 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-kolab-3.4.4.ebuild, evolution-kolab-3.6.2.ebuild:
+  Depend on evolution-data-server with the same major/minor version (bug
+  #448350).
 
 *evolution-kolab-3.6.2 (19 Dec 2012)
 
diff --git a/gnome-extra/evolution-kolab/evolution-kolab-3.4.4.ebuild b/gnome-extra/evolution-kolab/evolution-kolab-3.4.4.ebuild
index c01aa89a99d9..57ceae102b44 100644
--- a/gnome-extra/evolution-kolab/evolution-kolab-3.4.4.ebuild
+++ b/gnome-extra/evolution-kolab/evolution-kolab-3.4.4.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-kolab/evolution-kolab-3.4.4.ebuild,v 1.2 2012/12/19 07:01:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-kolab/evolution-kolab-3.4.4.ebuild,v 1.3 2012/12/24 04:51:47 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit autotools eutils gnome2 versionator
+
+MY_MAJORV=$(get_version_component_range 1-2)
 
 DESCRIPTION="Evolution module for connecting to Kolab groupware servers"
 HOMEPAGE="https://live.gnome.org/Evolution/Kolab"
@@ -18,6 +20,7 @@ IUSE="" # kerberos (does nothing useful for now)
 
 RDEPEND=">=mail-client/evolution-${PV}:2.0
 	>=gnome-extra/evolution-data-server-${PV}
+	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=dev-db/sqlite-3.7:3
 	>=dev-libs/glib-2.30:2
 	>=dev-libs/libical-0.44
diff --git a/gnome-extra/evolution-kolab/evolution-kolab-3.6.2.ebuild b/gnome-extra/evolution-kolab/evolution-kolab-3.6.2.ebuild
index 205ce6ff2bbc..5ce86e354a27 100644
--- a/gnome-extra/evolution-kolab/evolution-kolab-3.6.2.ebuild
+++ b/gnome-extra/evolution-kolab/evolution-kolab-3.6.2.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-kolab/evolution-kolab-3.6.2.ebuild,v 1.1 2012/12/19 07:01:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-kolab/evolution-kolab-3.6.2.ebuild,v 1.2 2012/12/24 04:51:47 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit autotools eutils gnome2 versionator
+
+MY_MAJORV=$(get_version_component_range 1-2)
 
 DESCRIPTION="Evolution module for connecting to Kolab groupware servers"
 HOMEPAGE="https://live.gnome.org/Evolution/Kolab"
@@ -18,6 +20,7 @@ IUSE="" # kerberos (does nothing useful for now)
 
 RDEPEND=">=mail-client/evolution-${PV}:2.0
 	>=gnome-extra/evolution-data-server-${PV}
+	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=dev-db/sqlite-3.7:3
 	>=dev-libs/glib-2.32:2
 	>=dev-libs/libical-0.44