From 922469e259a0044e4138a36ea762773f912cbccb Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Mon, 24 Dec 2012 04:41:51 +0000 Subject: 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) --- gnome-extra/evolution-ews/ChangeLog | 7 ++++++- gnome-extra/evolution-ews/evolution-ews-3.4.4.ebuild | 7 +++++-- gnome-extra/evolution-ews/evolution-ews-3.6.1.ebuild | 7 +++++-- 3 files changed, 16 insertions(+), 5 deletions(-) (limited to 'gnome-extra') diff --git a/gnome-extra/evolution-ews/ChangeLog b/gnome-extra/evolution-ews/ChangeLog index 38402cf9bc49..c3878ad23067 100644 --- a/gnome-extra/evolution-ews/ChangeLog +++ b/gnome-extra/evolution-ews/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/evolution-ews # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-ews/ChangeLog,v 1.4 2012/12/19 06:30:27 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-ews/ChangeLog,v 1.5 2012/12/24 04:41:51 tetromino Exp $ + + 24 Dec 2012; Alexandre Rostovtsev + evolution-ews-3.4.4.ebuild, evolution-ews-3.6.1.ebuild: + Depend on evolution-data-server with the same major/minor version (bug + #448350). 19 Dec 2012; Alexandre Rostovtsev -evolution-ews-3.4.3.ebuild, +evolution-ews-3.6.1.ebuild, diff --git a/gnome-extra/evolution-ews/evolution-ews-3.4.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.4.4.ebuild index 13e1f8ac5358..b533412d465e 100644 --- a/gnome-extra/evolution-ews/evolution-ews-3.4.4.ebuild +++ b/gnome-extra/evolution-ews/evolution-ews-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-ews/evolution-ews-3.4.4.ebuild,v 1.1 2012/08/13 04:59:52 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-ews/evolution-ews-3.4.4.ebuild,v 1.2 2012/12/24 04:41:51 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit db-use eutils flag-o-matic gnome2 +inherit db-use eutils flag-o-matic gnome2 versionator + +MY_MAJORV=$(get_version_component_range 1-2) DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services" HOMEPAGE="http://www.gnome.org/projects/evolution/" @@ -18,6 +20,7 @@ IUSE="" # doc RDEPEND=">=mail-client/evolution-${PV}:2.0 >=gnome-extra/evolution-data-server-${PV} + =gnome-extra/evolution-data-server-${MY_MAJORV}* >=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2 >=gnome-base/gconf-2:2 diff --git a/gnome-extra/evolution-ews/evolution-ews-3.6.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.6.1.ebuild index cd672e310631..e203e16edffb 100644 --- a/gnome-extra/evolution-ews/evolution-ews-3.6.1.ebuild +++ b/gnome-extra/evolution-ews/evolution-ews-3.6.1.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-ews/evolution-ews-3.6.1.ebuild,v 1.1 2012/12/19 06:30:27 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-ews/evolution-ews-3.6.1.ebuild,v 1.2 2012/12/24 04:41:51 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit autotools db-use eutils flag-o-matic gnome2 +inherit autotools db-use eutils flag-o-matic gnome2 versionator + +MY_MAJORV=$(get_version_component_range 1-2) DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services" HOMEPAGE="http://www.gnome.org/projects/evolution/" @@ -21,6 +23,7 @@ RDEPEND=" dev-libs/libical:= >=mail-client/evolution-${PV}:2.0[kerberos?] >=gnome-extra/evolution-data-server-${PV}:=[kerberos?] + =gnome-extra/evolution-data-server-${MY_MAJORV}* >=dev-libs/glib-2.28:2 >=dev-libs/libxml2-2 >=net-libs/libsoup-2.30:2.4 -- cgit v1.2.3-65-gdbad