From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 96AC2138BED for ; Tue, 13 Oct 2015 20:04:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADCC8E07F9; Tue, 13 Oct 2015 20:04:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1420AE07F7 for ; Tue, 13 Oct 2015 20:04:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA86E340988 for ; Tue, 13 Oct 2015 20:04:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 924FA1092 for ; Tue, 13 Oct 2015 20:03:59 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1444766616.82c6a1b7c209f54c12dda0255f90c62bddc0c368.tranquility@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/gnome-online-accounts/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/gnome-online-accounts/gnome-online-accounts-3.18.0.ebuild net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild net-libs/gnome-online-accounts/metadata.xml X-VCS-Directories: net-libs/gnome-online-accounts/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: 82c6a1b7c209f54c12dda0255f90c62bddc0c368 X-VCS-Branch: master Date: Tue, 13 Oct 2015 20:03:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1c5f561a-dc66-4300-8efc-9c00dce6fb1a X-Archives-Hash: 5e640511ecafea299794acbe405b6179 commit: 82c6a1b7c209f54c12dda0255f90c62bddc0c368 Author: Ole Reifschneider gentoo org> AuthorDate: Tue Oct 13 07:15:45 2015 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Tue Oct 13 20:03:36 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=82c6a1b7 net-libs/gnome-online-accounts: Bump version to 3.18.0 Package-Manager: portage-2.2.23 Manifest-Sign-Key: 0xE9E568677E8B4D42 ...9.ebuild => gnome-online-accounts-3.18.0.ebuild} | 21 +++++---------------- .../gnome-online-accounts-9999.ebuild | 3 ++- net-libs/gnome-online-accounts/metadata.xml | 2 -- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.0.ebuild similarity index 84% copy from net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild copy to net-libs/gnome-online-accounts/gnome-online-accounts-3.18.0.ebuild index 4b0fb8f..198f4e5 100644 --- a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild +++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.0.ebuild @@ -4,11 +4,9 @@ EAPI="5" GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" -inherit gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi +inherit autotools eutils gnome2 DESCRIPTION="GNOME framework for accessing online accounts" HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" @@ -16,12 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" LICENSE="LGPL-2+" SLOT="0/1" IUSE="gnome +introspection kerberos" # telepathy" -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -fi +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" # pango used in goaeditablelabel # libsoup used in goaoauthprovider @@ -40,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 ) @@ -61,11 +54,6 @@ DEPEND="${RDEPEND} # Due to sub-configure QA_CONFIGURE_OPTIONS=".*" -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - doc? ( >=dev-util/gtk-doc-1.3 )" -fi - src_configure() { # TODO: Give users a way to set the G/FB/Windows Live secrets # telepathy optional support is really badly done, bug #494456 @@ -77,6 +65,7 @@ src_configure() { --enable-flickr \ --enable-foursquare \ --enable-imap-smtp \ + --enable-lastfm \ --enable-media-server \ --enable-owncloud \ --enable-pocket \ diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild index 4b0fb8f..88c58c0 100644 --- a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild +++ b/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild @@ -40,7 +40,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 ) @@ -77,6 +77,7 @@ src_configure() { --enable-flickr \ --enable-foursquare \ --enable-imap-smtp \ + --enable-lastfm \ --enable-media-server \ --enable-owncloud \ --enable-pocket \ diff --git a/net-libs/gnome-online-accounts/metadata.xml b/net-libs/gnome-online-accounts/metadata.xml index aa2fde5..a93b05f 100644 --- a/net-libs/gnome-online-accounts/metadata.xml +++ b/net-libs/gnome-online-accounts/metadata.xml @@ -5,7 +5,5 @@ Use gnome-base/gnome-control-center to set GNOME online accounts preferences - Provide widget to configure the telepathy - frawework