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-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog
index 73cdcc6299ad..5aee7e793081 100644
--- a/gnome-extra/evolution-exchange/ChangeLog
+++ b/gnome-extra/evolution-exchange/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/evolution-exchange
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.151 2012/12/19 06:46:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.152 2012/12/24 04:47:56 tetromino Exp $
+
+  24 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-exchange-2.32.3.ebuild, evolution-exchange-3.4.4.ebuild:
+  Depend on evolution-data-server with the same major/minor version (bug
+  #448350).
 
   19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -evolution-exchange-3.2.3.ebuild:
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild
index 6f5385034475..bfa80ee7639c 100644
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild,v 1.7 2012/11/17 11:51:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild,v 1.8 2012/12/24 04:47:56 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit gnome2
+inherit gnome2 versionator
+
+MY_MAJORV=$(get_version_component_range 1-2)
 
 DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
 HOMEPAGE="http://projects.gnome.org/evolution/"
@@ -20,6 +22,7 @@ IUSE="debug static"
 RDEPEND="
 	>=mail-client/evolution-2.32.2:2.0
 	>=gnome-extra/evolution-data-server-2.32.2[ldap,kerberos]
+	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=dev-libs/glib-2.16:2
 	>=x11-libs/gtk+-2.20:2
 	>=gnome-base/gconf-2:2
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-3.4.4.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-3.4.4.ebuild
index 848eb62f5991..d8aab298e30c 100644
--- a/gnome-extra/evolution-exchange/evolution-exchange-3.4.4.ebuild
+++ b/gnome-extra/evolution-exchange/evolution-exchange-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-exchange/evolution-exchange-3.4.4.ebuild,v 1.1 2012/08/13 04:59:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-3.4.4.ebuild,v 1.2 2012/12/24 04:47:56 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit gnome2 versionator
+
+MY_MAJORV=$(get_version_component_range 1-2)
 
 DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
 HOMEPAGE="http://projects.gnome.org/evolution/"
@@ -19,6 +21,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	>=mail-client/evolution-${PV}:2.0
 	>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos]
+	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=dev-libs/glib-2.28:2
 	>=x11-libs/gtk+-3.0:3
 	>=gnome-base/gconf-2:2