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 0776E1381FB for ; Tue, 25 Dec 2012 21:53:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA72F21C0E9; Tue, 25 Dec 2012 21:53:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 37C7D21C0E9 for ; Tue, 25 Dec 2012 21:53:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9A2B33D880 for ; Tue, 25 Dec 2012 21:52:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 72FD7E543D for ; Tue, 25 Dec 2012 21:52:57 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1356472350.5f6ef276dd43cb95f1ce7b9bd8162e6cf336f09b.eva@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.6.2.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: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 5f6ef276dd43cb95f1ce7b9bd8162e6cf336f09b X-VCS-Branch: master Date: Tue, 25 Dec 2012 21:52:57 +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: f97af74a-8bff-4966-afa6-a0949cd58e57 X-Archives-Hash: ff4e13e84b96f091593c1a918ab88eba commit: 5f6ef276dd43cb95f1ce7b9bd8162e6cf336f09b Author: Gilles Dartiguelongue gentoo org> AuthorDate: Tue Dec 25 21:52:30 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Tue Dec 25 21:52:30 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5f6ef276 net-libs/gnome-online-accounts: moved to gx86 * Sync live ebuild with gx86 changes. * Update metadata.xml. --- .../gnome-online-accounts-3.6.2.ebuild | 72 -------------------- .../gnome-online-accounts-9999.ebuild | 24 ++++--- net-libs/gnome-online-accounts/metadata.xml | 6 +- 3 files changed, 17 insertions(+), 85 deletions(-) diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.6.2.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.6.2.ebuild deleted file mode 100644 index 05da4a8..0000000 --- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.6.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GNOME2_LA_PUNT="yes" - -inherit gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION="GNOME framework for accessing online accounts" -HOMEPAGE="https://live.gnome.org/GnomeOnlineAccounts" - -LICENSE="LGPL-2" -SLOT="0" -IUSE="gnome +introspection kerberos" -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~amd64 ~x86" -fi - -# pango used in goaeditablelabel -# libsoup used in goaoauthprovider -RDEPEND=" - >=dev-libs/glib-2.32:2 - app-crypt/libsecret - dev-libs/json-glib - dev-libs/libxml2:2 - net-libs/libsoup:2.4 - >=net-libs/libsoup-gnome-2.38:2.4 - net-libs/rest:0.7 - net-libs/webkit-gtk:3 - >=x11-libs/gtk+-3.5.1:3 - >=x11-libs/libnotify-0.7 - x11-libs/pango - - introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) - kerberos? ( - app-crypt/gcr - virtual/krb5 )" -# 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 - sys-devel/gettext - virtual/pkgconfig -" - -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/Y!/FB/Twitter/Windows Live secrets - G2CONF="${G2CONF} - --disable-static - --enable-documentation - --enable-exchange - --enable-facebook - --enable-windows-live - $(use_enable kerberos)" - DOCS="NEWS" # README is empty - gnome2_src_configure -} 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 2ee5cad..3552cf4 100644 --- a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild +++ b/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI="5" GNOME2_LA_PUNT="yes" inherit gnome2 @@ -15,11 +15,12 @@ HOMEPAGE="https://live.gnome.org/GnomeOnlineAccounts" LICENSE="LGPL-2" SLOT="0" -IUSE="doc gnome +introspection kerberos" +IUSE="gnome +introspection kerberos" if [[ ${PV} = 9999 ]]; then + IUSE="${IUSE} doc" KEYWORDS="" else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" fi # pango used in goaeditablelabel @@ -34,25 +35,30 @@ RDEPEND=" net-libs/rest:0.7 net-libs/webkit-gtk:3 >=x11-libs/gtk+-3.5.1:3 - >=x11-libs/libnotify-0.7 + >=x11-libs/libnotify-0.7:= x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) kerberos? ( app-crypt/gcr - virtual/krb5 )" + virtual/krb5 ) +" # 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 sys-devel/gettext virtual/pkgconfig +" +if [[ ${PV} = 9999 ]]; then + DEPEND="${DEPEND} + doc? ( >=dev-util/gtk-doc-1.3 )" +fi - doc? ( >=dev-util/gtk-doc-1.3 )" - -pkg_setup() { +src_configure() { # TODO: Give users a way to set the G/Y!/FB/Twitter/Windows Live secrets G2CONF="${G2CONF} --disable-static @@ -61,5 +67,5 @@ pkg_setup() { --enable-facebook --enable-windows-live $(use_enable kerberos)" - DOCS="NEWS" # README is empty + gnome2_src_configure } diff --git a/net-libs/gnome-online-accounts/metadata.xml b/net-libs/gnome-online-accounts/metadata.xml index 776fe7b..a93b05f 100644 --- a/net-libs/gnome-online-accounts/metadata.xml +++ b/net-libs/gnome-online-accounts/metadata.xml @@ -3,9 +3,7 @@ gnome - Use gnome-base/gnome-control-center - to set GNOME online accounts preferences - Use dev-libs/gobject-introspection - for introspection + Use gnome-base/gnome-control-center + to set GNOME online accounts preferences