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 26DE613827E for ; Sun, 8 Dec 2013 22:59:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FC3AE0931; Sun, 8 Dec 2013 22:58:57 +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 CA50BE0931 for ; Sun, 8 Dec 2013 22:58:56 +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 A201A33F0D0 for ; Sun, 8 Dec 2013 22:58:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 528EFE5699 for ; Sun, 8 Dec 2013 22:58:54 +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: <1386543499.d712ae76ed038a814c2396983d18eb7fd2680854.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.10.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: d712ae76ed038a814c2396983d18eb7fd2680854 X-VCS-Branch: master Date: Sun, 8 Dec 2013 22:58:54 +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: 8ad801d9-a345-4724-b25c-d761b79c94a7 X-Archives-Hash: fa7f8ebb2cd635311888005e41c7ce49 commit: d712ae76ed038a814c2396983d18eb7fd2680854 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Dec 8 22:28:34 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Dec 8 22:58:19 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d712ae76 net-libs/gnome-online-accounts: 3.8.5 → 3.10.2 --- ....ebuild => gnome-online-accounts-3.10.2.ebuild} | 54 +++++++++++----------- .../gnome-online-accounts-9999.ebuild | 43 +++++++++++------ net-libs/gnome-online-accounts/metadata.xml | 2 + 3 files changed, 59 insertions(+), 40 deletions(-) diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.2.ebuild similarity index 54% copy from net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild copy to net-libs/gnome-online-accounts/gnome-online-accounts-3.10.2.ebuild index f2f5ec1..99f5305 100644 --- a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild +++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.2.ebuild @@ -3,67 +3,69 @@ # $Header: $ EAPI="5" -GNOME2_LA_PUNT="yes" +GCONF_DEBUG="yes" inherit gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi DESCRIPTION="GNOME framework for accessing online accounts" -HOMEPAGE="https://live.gnome.org/GnomeOnlineAccounts" +HOMEPAGE="https://wiki.gnome.org/GnomeOnlineAccounts" LICENSE="LGPL-2+" -SLOT="0" -IUSE="gnome +introspection kerberos" -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -fi +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 - dev-libs/json-glib + >=app-crypt/libsecret-0.5 + >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 - net-libs/libsoup:2.4 - >=net-libs/libsoup-gnome-2.41:2.4 + >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 - net-libs/webkit-gtk:3 + >=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 + 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 + >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig " -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - doc? ( >=dev-util/gtk-doc-1.3 )" -fi + +# Due to sub-configure +QA_CONFIGURE_OPTIONS=".*" src_configure() { - # TODO: Give users a way to set the G/FB/Windows Live secrets + # TODO: Give users a way to set the G/Y!/FB/Twitter/Windows Live secrets gnome2_src_configure \ --disable-static \ --enable-documentation \ + --enable-exchange \ + --enable-facebook \ --enable-flickr \ - $(use_enable kerberos) + --enable-twitter \ + --enable-yahoo \ + --enable-imap-smtp \ + --enable-owncloud \ + $(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-9999.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild index f2f5ec1..230a792 100644 --- a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild +++ b/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI="5" -GNOME2_LA_PUNT="yes" +GCONF_DEBUG="yes" inherit gnome2 if [[ ${PV} = 9999 ]]; then @@ -11,59 +11,74 @@ if [[ ${PV} = 9999 ]]; then fi DESCRIPTION="GNOME framework for accessing online accounts" -HOMEPAGE="https://live.gnome.org/GnomeOnlineAccounts" +HOMEPAGE="https://wiki.gnome.org/GnomeOnlineAccounts" LICENSE="LGPL-2+" -SLOT="0" -IUSE="gnome +introspection kerberos" +SLOT="0/1" +IUSE="gnome +introspection kerberos telepathy" if [[ ${PV} = 9999 ]]; then IUSE="${IUSE} doc" KEYWORDS="" else - KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi # 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 - dev-libs/json-glib + >=app-crypt/libsecret-0.5 + >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 - net-libs/libsoup:2.4 - >=net-libs/libsoup-gnome-2.41:2.4 + >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 - net-libs/webkit-gtk:3 + >=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 + 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 + >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig " + +# 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 + # TODO: Give users a way to set the G/Y!/FB/Twitter/Windows Live secrets gnome2_src_configure \ --disable-static \ --enable-documentation \ + --enable-exchange \ + --enable-facebook \ --enable-flickr \ - $(use_enable kerberos) + --enable-twitter \ + --enable-yahoo \ + --enable-imap-smtp \ + --enable-owncloud \ + $(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/metadata.xml b/net-libs/gnome-online-accounts/metadata.xml index a93b05f..aa2fde5 100644 --- a/net-libs/gnome-online-accounts/metadata.xml +++ b/net-libs/gnome-online-accounts/metadata.xml @@ -5,5 +5,7 @@ Use gnome-base/gnome-control-center to set GNOME online accounts preferences + Provide widget to configure the telepathy + frawework