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)

4 files changed, 20 insertions, 6 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 589909619a1f..920d1b5cef0b 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.377 2012/12/19 05:52:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.378 2012/12/24 04:37:08 tetromino Exp $
+
+  24 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-2.32.3-r1.ebuild, evolution-3.4.4.ebuild,
+  evolution-3.6.2-r1.ebuild:
+  Depend on evolution-data-server with the same major/minor version (bug
+  #448350).
 
 *evolution-3.6.2-r1 (19 Dec 2012)
 
diff --git a/mail-client/evolution/evolution-2.32.3-r1.ebuild b/mail-client/evolution/evolution-2.32.3-r1.ebuild
index f302533ff8d5..488ee2e96951 100644
--- a/mail-client/evolution/evolution-2.32.3-r1.ebuild
+++ b/mail-client/evolution/evolution-2.32.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.17 2012/11/26 16:08:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.18 2012/12/24 04:37:08 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -31,6 +31,7 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 # glade-3 support is for maintainers only per configure.ac
 # mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
 # pst is not mature enough and changes API/ABI frequently
+
 RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=x11-libs/gtk+-2.20.0:2
 	>=dev-libs/libunique-1.1.2:1
@@ -40,6 +41,7 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
 	media-libs/libcanberra[gtk]
 	>=x11-libs/libnotify-0.3
 	>=gnome-extra/evolution-data-server-${PV}[weather]
+	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=gnome-extra/gtkhtml-3.31.90:3.14
 	>=gnome-base/gconf-2:2
 	dev-libs/atk
diff --git a/mail-client/evolution/evolution-3.4.4.ebuild b/mail-client/evolution/evolution-3.4.4.ebuild
index d5d48b47238d..1a1f7644a884 100644
--- a/mail-client/evolution/evolution-3.4.4.ebuild
+++ b/mail-client/evolution/evolution-3.4.4.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/mail-client/evolution/evolution-3.4.4.ebuild,v 1.6 2012/11/26 16:19:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.4.4.ebuild,v 1.7 2012/12/24 04:37:08 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit eutils flag-o-matic gnome2 python
+inherit eutils flag-o-matic gnome2 python versionator
+
+MY_MAJORV=$(get_version_component_range 1-2)
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
 HOMEPAGE="http://projects.gnome.org/evolution/"
@@ -34,6 +36,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7
 	>=gnome-extra/evolution-data-server-${PV}[gnome-online-accounts?,weather]
+	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=gnome-extra/gtkhtml-4.1.2:4.0
 	>=gnome-base/gconf-2:2
 	dev-libs/atk
diff --git a/mail-client/evolution/evolution-3.6.2-r1.ebuild b/mail-client/evolution/evolution-3.6.2-r1.ebuild
index 166e03eb9f46..c71c03fb0fbf 100644
--- a/mail-client/evolution/evolution-3.6.2-r1.ebuild
+++ b/mail-client/evolution/evolution-3.6.2-r1.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/mail-client/evolution/evolution-3.6.2-r1.ebuild,v 1.1 2012/12/19 05:52:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.6.2-r1.ebuild,v 1.2 2012/12/24 04:37:08 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils flag-o-matic gnome2
+inherit autotools eutils flag-o-matic gnome2 versionator
+
+MY_MAJORV=$(get_version_component_range 1-2)
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
 HOMEPAGE="http://projects.gnome.org/evolution/"
@@ -35,6 +37,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.32:2
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7:=
 	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather]
+	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=gnome-extra/gtkhtml-4.5.2:4.0
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.6