Version bump, drop old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 36 insertions, 16 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/Manifest b/net-libs/gnome-online-accounts/Manifest
index 9849f74a4c27..01632c8fe8ea 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA256
 
 DIST gnome-online-accounts-3.10.2.tar.xz 1267216 SHA256 0b2418c1845337b6574a12d2075d319d8aaa5bbc4b0d1d123108c5da00e11b97 SHA512 1a6a63dbeff8188062454fbda6a6009f7657041ef0264cd5c89af01ab7c965d3ae66a7b336a9e3dc9051acf67c075430802cbc64946b770048c9488b4835c151 WHIRLPOOL e558a402aba11a2cc57ff31762d1d4909ae6e17605cca92c65b7a65f26ae7492f3b08c929be66f6833ff6d29a8717264cbd2992f648901ce6f02ac7f6047c6f1
-DIST gnome-online-accounts-3.8.5.tar.xz 648396 SHA256 34d6fbc33bda4c7bba8aa52343ebe1eb8afe1033097c10a2d9979c0a99593e5d SHA512 b5af8c2e83e3287954c15b3b42ef9eebbbcb245534e45375f1e80c0309b064f81740d94ea4fb5b510863383e8c21f394fc6ec77523b4ef63566bfc15742f0b1c WHIRLPOOL cbcd43d36a15b5e9adc0d4284f4ee4c5a6291efe47e7a268f3f66024ca752af71edb5dc558014f683dd10ed36f54232bad7d43473936b5f80361e4defebf8d52
+DIST gnome-online-accounts-3.10.3.tar.xz 1333772 SHA256 09a0bb2219a6fb0cad07617c916430172e98716170b4136eaf48a322d409ad4c SHA512 0a16fb934402826bfac7e1962bc5561bab017c5d9881758870f607ddba3bc9b82386a608332c5fb3b15584b1ac917746a2e18cb4f9cf5e3664be29715bfd927c WHIRLPOOL 6b62e64ed919b9b711b3fb90010ddd9661d6d5c3609d7b2d730ad82b115b09ed1817666f5b38c939187a9d17be6d7b28ff6bbb90524f001be9a72a26e5cf9a28
 EBUILD gnome-online-accounts-3.10.2.ebuild 2162 SHA256 16d819b5621db24bc8cf3cc1eb602f19a2b112af7ee7c455bc4a0b127cdc6390 SHA512 06b51b3fcc67862bc31e7688ba6c11a06a8af093947b28cb4850a63793b3970dea6c8cfc843d56e83988fb99d140c833fa082ef55c992bfd9090978615b94bca WHIRLPOOL 553719b8ab0cacf352397566ff1c832ec69ea321e594455657603aa8b916bbbf06308448ee336bcf7fd9b5989dfe14ba4180aae1e48c0e235fac0a377aac5fe1
-EBUILD gnome-online-accounts-3.8.5.ebuild 1675 SHA256 ddcbfb173f1da6b49256d09387c560244b7b8b1a9dfd42465772b6d9dd388688 SHA512 3201688ab4f199c5ababbf70b009bc97f19323216ada97d22136d9a993b1e00a519ad589c3138fd7aa91a8446da79dbfca28e8f4af9edae242849bd6ec22572e WHIRLPOOL d70f54b5eb44e9759d837718439231ea165a102bdcef85ae8384308fad314da60283c426a007fcd0b7681b7382f6766bad35cab8816253f38ad4f560dd022079
-MISC ChangeLog 6307 SHA256 8bd05bc7c675fbcf4b1d9566af95b608f2c72be171fab9907c05c2c4f1632939 SHA512 8cb822dca4224eee592e5421650a8f03512b39e238632d592bffc7a1d0f8a17fc64061bf2b1d53128755942ae07f4bce0e7131810a56c4b5c6cd6cf1ca156f8f WHIRLPOOL 73c784ee2054d365bdb484fffd7f31ff71b6423c554182488c711cf38704957d498e4b0c87ecbd60c9b7411d48bc5a8428b618f907001e79658ef17518140e5f
+EBUILD gnome-online-accounts-3.10.3.ebuild 2173 SHA256 9ab7d6709007b54900c2d3c7da07bd9644f191215e593faeb9126ea1230a56db SHA512 095f84046920d8e17ce0f932f55ad8fc11f93cf1da61992b3803fef360b77f3ac9b0a8ab74097ce472ac6ac552a1fa3018e2e8f9ff142abf7039538199d1a259 WHIRLPOOL a4e6991ad77946399742e1ab1506d4cf69637ea56e1c0fc4cc8c291a9ca4902a7fa0c0821567e6951b7ac4ae73fa4d96725071b6d759206bd5d3bb5c5e8af5f9
+MISC ChangeLog 6501 SHA256 c217c9da36f6939c4ad7c4130c27f546aa32ab319a37a6b95fbe2467a0f0428d SHA512 b75fdda05d20ef3b7cc7bb299dd3e153771051b8b780ee71d58cb50d6f35a339bcc446d01a2379d194b497b68f2046373f8c9111355c7c120675d9e9c2c6438d WHIRLPOOL e64950b93988b700dc337217f54fc373603ffc71ffde45f1c9f86341e4229be4de8316e759bced43060a43b613a0dff16d3bc31f27ca0b4970d14ae5a66f1c92
 MISC metadata.xml 382 SHA256 6f896cf53b7405ce97aebde94a84b4139d67c3e9f347955e926c280578f14cd1 SHA512 085dd12bf7dad134870e8abfd08afff38f151596f4f56946eb3d1b367705c5b76a915dcc131a9a0c5d6f799c7feadb8082154b6c83d8471f1a0365d51e873245 WHIRLPOOL 5a9048d954fac7975358da0933a598c67cc687b5af7ba6a853f6ffc36ebcec575e23447af1d3275a63531da6702408a0ae6c69e5f8856e78c2d903acb024434e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMcWHsACgkQCaWpQKGI+9R7HgCeKOlNFDRePkEhIlmWGlfqaUDP
-iSAAniKU7coLcfClMb+MYPNKFCk6oZxU
-=JWev
+iEYEAREIAAYFAlM3Fj0ACgkQCaWpQKGI+9S3RgCfVPhEamcn54eLMwoamje+Ppkz
+p/MAn0Watz+kr0QAePqURHqsDbX3nFzo
+=NcuQ
 -----END PGP SIGNATURE-----
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
 }