Version bump for Gnome 3.6. Switch to EAPI=5. Clean up old revisions. USE=introspection is now global.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 34 insertions, 72 deletions

diff --git a/net-libs/gnome-online-accounts/ChangeLog b/net-libs/gnome-online-accounts/ChangeLog
index 1b67255ab49e..03ad1e85077c 100644
--- a/net-libs/gnome-online-accounts/ChangeLog
+++ b/net-libs/gnome-online-accounts/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/gnome-online-accounts
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/ChangeLog,v 1.5 2012/09/23 14:11:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/ChangeLog,v 1.6 2012/12/25 21:50:41 eva Exp $
+
+*gnome-online-accounts-3.6.2 (25 Dec 2012)
+
+  25 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-online-accounts-3.2.1.ebuild, -gnome-online-accounts-3.4.1-r1.ebuild,
+  +gnome-online-accounts-3.6.2.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Switch to EAPI=5. Clean up old revisions.
+  USE=introspection is now global.
 
   23 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
   gnome-online-accounts-3.4.2.ebuild:
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 4e744c6a2957..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.2.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/gnome-online-accounts-3.2.1.ebuild,v 1.2 2012/05/25 08:27:40 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="doc gnome +introspection"
-KEYWORDS="~amd64 ~x86"
-
-# 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 )"
-# 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/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-3.4.1-r1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.6.2.ebuild
index 71a90b5e610e..7dfa6e909fdf 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.4.1-r1.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.6.2.ebuild
@@ -1,54 +1,59 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/gnome-online-accounts-3.4.1-r1.ebuild,v 1.2 2012/05/25 08:27:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/gnome-online-accounts-3.6.2.ebuild,v 1.1 2012/12/25 21:50:41 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
 DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://live.gnome.org/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="doc gnome +introspection"
-KEYWORDS="~amd64 ~x86"
+IUSE="gnome +introspection kerberos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 # 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/glib-2.32:2
+	app-crypt/libsecret
 	dev-libs/json-glib
-	gnome-base/libgnome-keyring
+	dev-libs/libxml2:2
 	net-libs/libsoup:2.4
-	>=net-libs/libsoup-gnome-2.26:2.4
+	>=net-libs/libsoup-gnome-2.38: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/gtk+-3.5.1:3
+	>=x11-libs/libnotify-0.7:=
 	x11-libs/pango
 
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )"
+	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
+"
 
-	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
 		--enable-documentation
+		--enable-exchange
 		--enable-facebook
-		--enable-windows-live"
-	DOCS="NEWS" # README is empty
+		--enable-windows-live
+		$(use_enable kerberos)"
+	gnome2_src_configure
 }
diff --git a/net-libs/gnome-online-accounts/metadata.xml b/net-libs/gnome-online-accounts/metadata.xml
index 6c77ba1e6e64..998061301bdc 100644
--- a/net-libs/gnome-online-accounts/metadata.xml
+++ b/net-libs/gnome-online-accounts/metadata.xml
@@ -3,9 +3,7 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-  <flag name="introspection">Use <pkg>gnome-base/gnome-control-center</pkg>
-    to set GNOME online accounts preferences</flag>
-  <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-    for introspection</flag>
+	<flag name="gnome">Use <pkg>gnome-base/gnome-control-center</pkg>
+		to set GNOME online accounts preferences</flag>
 </use>
 </pkgmetadata>