[gentoo-commits] repo/gentoo:master commit in: net-libs/gnome-online-accounts/

[Pacho Ramos]

commit:     0690c253b940f39f41147e3dd3d80b3d9c4e05a1
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 18:09:13 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 18:09:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0690c253

net-libs/gnome-online-accounts: Version bump, drop old

Package-Manager: portage-2.2.20.1

 net-libs/gnome-online-accounts/Manifest            |  2 +-
 .../gnome-online-accounts-3.14.3.ebuild            | 78 ----------------------
 ...build => gnome-online-accounts-3.16.4.1.ebuild} | 16 ++++-
 3 files changed, 15 insertions(+), 81 deletions(-)

diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index dd52558..2562155 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,3 @@
-DIST gnome-online-accounts-3.14.3.tar.xz 1408156 SHA256 6fe2dc67ab2c50a1c127767f43f31513dac72453bd41d4b4265217a19667c2c6 SHA512 849fd4419a78ea442f610701d4653bfaa18974a35324f0b8209efe9d86e193dccfe67d044a868e1e6e594403b494884bac7109860a6352eecd1b58903432aa39 WHIRLPOOL dcb9373b4c7db2845b0854c52c345f767785ac8e8e590d7e09f41e86d895d40ad9cdd8e4dc11efa5d7ed397b27d41c4f3065a08ec335ba695d3a2a315f49ea2d
 DIST gnome-online-accounts-3.14.4.tar.xz 1415052 SHA256 4c348bfd4baa41d263afefd3d82659f486367d48eb89a3755cde9caae754ceb1 SHA512 12e3ef72cea818c183f038898ee52e4583bc55c70dd6564282c7d2b2d9e013a6a1de1452cb88e5a97e2dccb86d81396689ab069249a8f8710974386404ffbc6e WHIRLPOOL 859947b2e4824c9776a96a68d3d50f47b82e6bf42b8349cdb3c16fe678518a441792a872c44361580b8018d27623c872ae37a715e61cb5ae87c3513bdc3fa636
 DIST gnome-online-accounts-3.16.3.tar.xz 1420940 SHA256 a0648e4d595f5c63f85c03bf65a2cf1204e8615aba242c50c15aa4c9696a0ca0 SHA512 34056d996b6d2d217375e1a86ff544915ae707759b64c77030366f9d3d34c0c735869130beb7fe94bbd949adc46d87153de47afa2fe1bcd3f175c6c420037145 WHIRLPOOL 902205f3a792e864e8ca119dbcc0fd81399cf5e9fb5bdc821bd8400870e282f47c595d411d6f678d15834504136f060720ab805d2b018bb30515edc09cf6e059
+DIST gnome-online-accounts-3.16.4.1.tar.xz 1440252 SHA256 68c688730a4a0be0a29e77106a78681fd0ea2c4e1aabafe4df7e20a22dbdb120 SHA512 3c563f422afc30994f7d3ac1102a3ace3b0c4ae645e76d4e40566a8aa01324f47737d978352a18e51e268ab3d707fc707ce7d5f0c8c281ebe3c9f86042a4f6b9 WHIRLPOOL 4697f67b55a7b85641efeed101afd384e4b19d9c920b871bdfcf0e6058b27850a771ba1da354b33ceab302ec87d4b6ce46a243637e401abc4e85dbcf3e449feb

diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.3.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.3.ebuild
deleted file mode 100644
index d039868..0000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-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
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.35:2
-	>=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/telepathy-glib
-	>=net-libs/webkit-gtk-2.1.90:3
-	>=x11-libs/gtk+-3.11.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(+)] )"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.3
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.50.1
-	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-media-server \
-		--enable-owncloud \
-		--enable-pocket \
-		--enable-telepathy \
-		--enable-windows-live \
-		$(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/gnome-online-accounts-3.16.3.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.4.1.ebuild
similarity index 82%
rename from net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3.ebuild
rename to net-libs/gnome-online-accounts/gnome-online-accounts-3.16.4.1.ebuild
index c1afbf9..58aa579 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.4.1.ebuild
@@ -4,8 +4,9 @@
 
 EAPI="5"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="GNOME framework for accessing online accounts"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
@@ -32,7 +33,7 @@ RDEPEND="
 	>=x11-libs/gtk+-3.11.1:3
 	x11-libs/pango
 
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
 	kerberos? (
 		app-crypt/gcr:0=
 		app-crypt/mit-krb5 )
@@ -48,11 +49,22 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.50.1
 	sys-devel/gettext
 	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
 "
+# eautoreconf needs gobject-introspection-common, gnome-common
 
 # Due to sub-configure
 QA_CONFIGURE_OPTIONS=".*"
 
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=750897
+	epatch "${FILESDIR}"/${PN}-3.16.3-parallel-make.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_configure() {
 	# TODO: Give users a way to set the G/FB/Windows Live secrets
 	# telepathy optional support is really badly done, bug #494456