[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-contacts/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     0c26563c1a663bf755a0f8bf36e300e36b5537d6
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 17:33:23 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat May  9 17:33:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0c26563c

gnome-extra/gnome-contacts: 3.14.2 → 3.16.2

 ...acts-9999.ebuild => gnome-contacts-3.16.2.ebuild} | 20 +++++++++-----------
 .../gnome-contacts/gnome-contacts-9999.ebuild        |  9 +++++++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.16.2.ebuild
similarity index 80%
copy from gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
copy to gnome-extra/gnome-contacts/gnome-contacts-3.16.2.ebuild
index 898d812..bcd4c42 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,9 +8,6 @@ VALA_USE_DEPEND="vapigen"
 VALA_MIN_API_VERSION="0.24"
 
 inherit gnome2 vala
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="GNOME contact management application"
 HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
@@ -18,12 +15,8 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="v4l"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-	EGIT_HAS_SUBMODULES=true
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
 VALA_DEPEND="
 	$(vala_depend)
 	>=dev-libs/gobject-introspection-0.9.6
@@ -38,10 +31,13 @@ RDEPEND="
 	>=dev-libs/folks-0.9.5:=[eds,telepathy]
 	>=dev-libs/glib-2.37.6:2
 	>=dev-libs/libgee-0.10:0.8
-	>=gnome-extra/evolution-data-server-3.5.3:=[gnome-online-accounts]
+	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
 	>=gnome-base/gnome-desktop-3.0:3=
+	media-libs/clutter-gtk:1.0
+	media-libs/libchamplain:0.12
 	net-libs/gnome-online-accounts
 	>=net-libs/telepathy-glib-0.17.5
+	>=sci-geosciences/geocode-glib-3.15.3
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:2
 	x11-libs/libnotify:=
@@ -51,6 +47,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	${VALA_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17

diff --git a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
index 898d812..6ec4562 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -38,10 +38,13 @@ RDEPEND="
 	>=dev-libs/folks-0.9.5:=[eds,telepathy]
 	>=dev-libs/glib-2.37.6:2
 	>=dev-libs/libgee-0.10:0.8
-	>=gnome-extra/evolution-data-server-3.5.3:=[gnome-online-accounts]
+	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
 	>=gnome-base/gnome-desktop-3.0:3=
+	media-libs/clutter-gtk:1.0
+	media-libs/libchamplain:0.12
 	net-libs/gnome-online-accounts
 	>=net-libs/telepathy-glib-0.17.5
+	>=sci-geosciences/geocode-glib-3.15.3
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:2
 	x11-libs/libnotify:=
@@ -51,6 +54,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	${VALA_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17