net-libs/gnome-online-accounts: moved 3.2.1 to gx86 + make g-c-c dep optional

The dependency on gnome-control-center should not be hard because it's
not required for core goa functionality, and other DEs might want to use
goa too.

3 files changed, 4 insertions, 60 deletions

diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 1e58b410..817e6a3b 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1 @@
-DIST gnome-online-accounts-3.2.1.tar.xz 457816 RMD160 ca749852eca94a6d63679a1e59654517f61189bd SHA1 184042ea3a331fb454d0270aa324220bd0749015 SHA256 549c210c358fd05598a00cb7a8d8f5b0fd6e18f7cb321c3c1641fb18f1312234
-EBUILD gnome-online-accounts-3.2.1.ebuild 1190 RMD160 ce1c5665f8d7c39ae687ee919fe7e320b0ae2e64 SHA1 908bd080cfc2c778559c5fa11dd942361ae15af0 SHA256 ee6fc31525cfd4433519128923698f252288cb510ab231a8a80e9211db4a25b1
-EBUILD gnome-online-accounts-9999.ebuild 1190 RMD160 ce1c5665f8d7c39ae687ee919fe7e320b0ae2e64 SHA1 908bd080cfc2c778559c5fa11dd942361ae15af0 SHA256 ee6fc31525cfd4433519128923698f252288cb510ab231a8a80e9211db4a25b1
+EBUILD gnome-online-accounts-9999.ebuild 1252 RMD160 beed6719fb379d783bfd345d03d99f4f5cbe0ddd SHA1 4e62caa4b7fb04ef7f34868fcac70be67e429b48 SHA256 927b3752588a0e0331c7543d9b4daf00bd41bfead314bda3982ce81c5b74853e
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.2.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.2.1.ebuild
deleted file mode 100644
index 7a172b34..00000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 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="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="doc +introspection"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# pango used in goaeditablelabel
-# libsoup used in goaoauthprovider
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-RDEPEND="
-	>=dev-libs/glib-2.30.0:2
-	dev-libs/json-glib
-	gnome-base/libgnome-keyring
-	net-libs/libsoup:2.4
-	>=net-libs/libsoup-gnome-2.26:2.4
-	net-libs/rest:0.7
-	net-libs/webkit-gtk:3
-	>=x11-libs/gtk+-3.0.0:3
-	>=x11-libs/libnotify-0.7
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )"
-PDEPEND=">=gnome-base/gnome-control-center-3.2"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.30.0
-	dev-util/intltool
-	sys-devel/gettext
-
-	doc? ( >=dev-util/gtk-doc-1.3 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static"
-	DOCS="NEWS" # README is empty
-}
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 7a172b34..16d063f8 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="doc +introspection"
+IUSE="doc gnome +introspection"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -39,7 +39,8 @@ RDEPEND="
 	x11-libs/pango
 
 	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )"
-PDEPEND=">=gnome-base/gnome-control-center-3.2"
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2 )"
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	>=dev-util/gdbus-codegen-2.30.0