commit: bbe111c92968315c62a798aa9342ca17b3c71f7a
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat May 9 13:54:04 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat May 9 23:10:31 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=bbe111c9
net-libs/gnome-online-accounts: 3.14.3 → 3.16.0
....ebuild => gnome-online-accounts-3.16.0.ebuild} | 25 +++++-----------------
.../gnome-online-accounts-9999.ebuild | 10 ++++-----
2 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild
b/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.0.ebuild
similarity index 77%
copy from net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild
copy to net-libs/gnome-online-accounts/gnome-online-accounts-3.16.0.ebuild
index 5a7a842..fdd0d4e 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,9 +6,6 @@ EAPI="5"
GCONF_DEBUG="yes"
inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="GNOME framework for accessing online accounts"
HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts";
@@ -16,12 +13,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
@@ -36,7 +28,7 @@ RDEPEND="
>=net-libs/libsoup-2.42:2.4
net-libs/rest:0.7
net-libs/telepathy-glib
- >=net-libs/webkit-gtk-2.1.90:3
+ >=net-libs/webkit-gtk-2.7.2:4
>=x11-libs/gtk+-3.11.1:3
x11-libs/pango
@@ -61,23 +53,16 @@ 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/Y!/FB/Twitter/Windows Live secrets
- # Twitter/Y! disabled per upstream recommendation, bug #497168
+ # TODO: Give users a way to set the G/FB/Windows Live secrets
# 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-foursquare \
--enable-imap-smtp \
--enable-media-server \
--enable-owncloud \
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 5a7a842..0560946 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -36,7 +36,7 @@ RDEPEND="
>=net-libs/libsoup-2.42:2.4
net-libs/rest:0.7
net-libs/telepathy-glib
- >=net-libs/webkit-gtk-2.1.90:3
+ >=net-libs/webkit-gtk-2.7.2:4
>=x11-libs/gtk+-3.11.1:3
x11-libs/pango
@@ -67,17 +67,15 @@ if [[ ${PV} = 9999 ]]; then
fi
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
+ # TODO: Give users a way to set the G/FB/Windows Live secrets
# 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-foursquare \
--enable-imap-smtp \
--enable-media-server \
--enable-owncloud \
