Version bump, drop old

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

2 files changed, 30 insertions, 10 deletions

diff --git a/net-libs/gnome-online-accounts/ChangeLog b/net-libs/gnome-online-accounts/ChangeLog
index 62f21f5a276f..86af4e975779 100644
--- a/net-libs/gnome-online-accounts/ChangeLog
+++ b/net-libs/gnome-online-accounts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gnome-online-accounts
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/ChangeLog,v 1.33 2014/03/09 12:03:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/ChangeLog,v 1.34 2014/03/29 18:51:40 pacho Exp $
+
+*gnome-online-accounts-3.10.3 (29 Mar 2014)
+
+  29 Mar 2014; Pacho Ramos <pacho@gentoo.org>
+  +gnome-online-accounts-3.10.3.ebuild, -gnome-online-accounts-3.8.5.ebuild:
+  Version bump, drop old
 
   09 Mar 2014; Pacho Ramos <pacho@gentoo.org>
   gnome-online-accounts-3.10.2.ebuild:
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.8.5.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.3.ebuild
index ef5e51656f8f..649beaa7c4d7 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.8.5.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.5.ebuild,v 1.3 2013/12/08 19:22:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.3.ebuild,v 1.1 2014/03/29 18:51:40 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -8,12 +8,12 @@ GCONF_DEBUG="yes"
 inherit gnome2
 
 DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/GnomeOnlineAccounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="gnome +introspection kerberos"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+SLOT="0/1"
+IUSE="gnome +introspection kerberos" # telepathy"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # pango used in goaeditablelabel
 # libsoup used in goaoauthprovider
@@ -22,19 +22,22 @@ 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/telepathy-glib
+	>=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(+)] )"
 
@@ -42,20 +45,31 @@ 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
+	# Twitter/Y! disabled per upstream recommendation, bug #497168
+	# telepathy optional support is really badly done, bug #494456
 	gnome2_src_configure \
 		--disable-static \
+		--disable-twitter \
+		--disable-yahoo \
 		--enable-documentation \
 		--enable-exchange \
 		--enable-facebook \
 		--enable-flickr \
 		--enable-imap-smtp \
 		--enable-owncloud \
+		--enable-telepathy \
 		$(use_enable kerberos)
+		#$(use_enable telepathy)
+	# gudev & cheese from sub-configure is overriden
+	# by top level configure, and disabled so leave it like that
 }