Version bump for Gnome 3.10

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 29 insertions, 8 deletions

diff --git a/net-libs/gnome-online-accounts/ChangeLog b/net-libs/gnome-online-accounts/ChangeLog
index ea84b8649745..f17e0c8b29fa 100644
--- a/net-libs/gnome-online-accounts/ChangeLog
+++ b/net-libs/gnome-online-accounts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/gnome-online-accounts
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/ChangeLog,v 1.27 2013/12/08 19:22:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/ChangeLog,v 1.28 2013/12/24 17:33:07 pacho Exp $
+
+*gnome-online-accounts-3.10.2 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  +gnome-online-accounts-3.10.2.ebuild, -gnome-online-accounts-3.8.4.1.ebuild,
+  metadata.xml:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org>
   gnome-online-accounts-3.8.5.ebuild:
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.8.4.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.2.ebuild
index 987d6c6029e2..8431fae81b6b 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.8.4.1.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.2.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/gnome-online-accounts-3.8.4.1.ebuild,v 1.1 2013/10/10 18:50:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.2.ebuild,v 1.1 2013/12/24 17:33:07 pacho Exp $
 
 EAPI="5"
+GCONF_DEBUG="yes"
+
 inherit gnome2
 
 DESCRIPTION="GNOME framework for accessing online accounts"
 HOMEPAGE="https://wiki.gnome.org/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="gnome +introspection kerberos"
+SLOT="0/1"
+IUSE="gnome +introspection kerberos telepathy"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # pango used in goaeditablelabel
@@ -20,18 +22,20 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # json-glib-0.16 needed for bug #485092
 RDEPEND="
 	>=dev-libs/glib-2.35:2
-	app-crypt/libsecret
+	>=app-crypt/libsecret-0.5
 	>=dev-libs/json-glib-0.16
 	dev-libs/libxml2:2
 	>=net-libs/libsoup-2.42:2.4
 	net-libs/rest:0.7
-	net-libs/webkit-gtk:3
+	>=net-libs/webkit-gtk-2.1.90:3
 	>=x11-libs/gtk+-3.5.1:3
 	x11-libs/pango
+
 	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
 	kerberos? (
 		app-crypt/gcr:0=
 		app-crypt/mit-krb5 )
+	telepathy? ( net-libs/telepathy-glib )
 "
 # goa-daemon can launch gnome-control-center
 PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
@@ -40,11 +44,14 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	>=dev-util/gtk-doc-am-1.3
 	>=dev-util/gdbus-codegen-2.30.0
-	dev-util/intltool
+	>=dev-util/intltool-0.50
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
 src_configure() {
 	# TODO: Give users a way to set the G/Y!/FB/Twitter/Windows Live secrets
 	gnome2_src_configure \
@@ -53,7 +60,12 @@ src_configure() {
 		--enable-exchange \
 		--enable-facebook \
 		--enable-flickr \
+		--enable-twitter \
+		--enable-yahoo \
 		--enable-imap-smtp \
 		--enable-owncloud \
-		$(use_enable kerberos)
+		$(use_enable kerberos) \
+		$(use_enable telepathy)
+	# gudev & cheese from sub-configure is overriden
+	# by top level configure, and disabled so leave it like that
 }
diff --git a/net-libs/gnome-online-accounts/metadata.xml b/net-libs/gnome-online-accounts/metadata.xml
index 998061301bdc..ea808a92ebe1 100644
--- a/net-libs/gnome-online-accounts/metadata.xml
+++ b/net-libs/gnome-online-accounts/metadata.xml
@@ -5,5 +5,7 @@
 <use>
 	<flag name="gnome">Use <pkg>gnome-base/gnome-control-center</pkg>
 		to set GNOME online accounts preferences</flag>
+	<flag name="telepathy">Provide widget to configure the telepathy
+		frawework</flag>
 </use>
 </pkgmetadata>