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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 42 insertions, 82 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/Manifest b/net-libs/gnome-online-accounts/Manifest
index 0bb751c14c12..2ff866099b0d 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gnome-online-accounts-3.2.1.tar.xz 457816 SHA256 549c210c358fd05598a00cb7a8d8f5b0fd6e18f7cb321c3c1641fb18f1312234
-DIST gnome-online-accounts-3.4.1.tar.xz 492164 SHA256 d5636b8da29aae04757ca528de65e3617d85696bd7e434c48dbd1199c105f4ae
-DIST gnome-online-accounts-3.4.2.tar.xz 486952 SHA256 b349ea12fbb564c8a71574b47d8949974cf42f959d7da212ef8933a5eb1d7945
-EBUILD gnome-online-accounts-3.2.1.ebuild 1306 SHA256 c3bd82a4182343af78cb3d76d3dafb4c3739cf2942e45c07f5ae08e2138687d5 SHA512 f93a72ddfcf05d7e4bd96c2b6b0728190646280e6240a23a1b34d2a2195504b975c4317a046c5d7c085a630f973758593bb35bb02a17594e74c6db1248bfd1ea WHIRLPOOL cab8ebab3f533e7ac1c3ed6236c95b014862afed18a388a241d34eecd652eebfa3abb47009c0c33bc6a8a2e4e632b94ed8c9f09d4e2450417ad9a33d4e4bae07
-EBUILD gnome-online-accounts-3.4.1-r1.ebuild 1471 SHA256 3475411ae7667cd771d77b55badf5b139cd8b59b63355d731b906cd5b3131f4a SHA512 67a0e99b742b1b8a8d520dbf8f436f531664b32a26b98580c7283f36f4b4e04ac3f392757ce32d7402f160e630adb599886316fbb1528a9b8264e42faa12b8a6 WHIRLPOOL d7dd462732a91c3d6bc7d9ecb034564a65fc8891ddb05f5becccffbe0102e84defa8df227b9f6e93585bfbd856059d49e461cbb518fe74e843225be5a0c3abd3
+DIST gnome-online-accounts-3.4.2.tar.xz 486952 SHA256 b349ea12fbb564c8a71574b47d8949974cf42f959d7da212ef8933a5eb1d7945 SHA512 0011704fe8669dac7a778b6e624e34361b983acfe735ab74c5e7069b49a3f186d76bc8fe5a564c24a5c5cfbf7d5cd157b29f105b5721ea37a8faa03a6b3bd993 WHIRLPOOL 269367a45008a20a59346b318adc0088cfba42198de8f399a0da52dbc0228885aad03cc79a0b4bdbc192aa7ee01a7b2a863d414bcf0e54d3c3186e42b1e2eb94
+DIST gnome-online-accounts-3.6.2.tar.xz 583628 SHA256 55d207d2dc5428f41b0a504aa3edd996a6167a5625d9e11d678f33f282935fa7 SHA512 de357f3e42db5f4f818ad7da5bb0798e69a8fc1ee8dd7299270062b4fa589d96d758c7002359c22cefd459a3bffd75593e3fd1bb9592a339c1f7a1d2683fe8ad WHIRLPOOL 40ccfa2476ef432aa765386a66375d4725f1c55b0df932af04cdefa4191e47da8064b5ce7d9f7a7eabd47e65a78b018bf83f286230110cba746db50378f7b811
 EBUILD gnome-online-accounts-3.4.2.ebuild 1479 SHA256 fc34ac620f334be92c281b8ddf8d6057030ee4d7f1a6ebea22779a46c9e697d5 SHA512 5756a37e1a1df04508dc8d18053dec001b9fe68a5eac35d3e851faa1135f6b7be05da3899c4e1c9204ceab548ac7fffadda219d985e3971aee76cd2809811a6a WHIRLPOOL 4bdc25e0d571e1fae827674f632ebb7c120addeb7478b0285266028fbb04cbe1f9b19df8c6e6b03c51fffecddb394aa87c120ff260b0b42292012ca072be1ecf
-MISC ChangeLog 1326 SHA256 d50b47f579034ecf6b983280b3345635ef3fc22655293a4ab9ac32bc4b3cb713 SHA512 7d5c852a1d0aa3b36449782a6bea7ab5c0db327295ab03916d0965153fd521101c4b8ccc4f5c04e99e8d07697b588746dcf322a95ab97f3ab59c1e9f0eb00bc1 WHIRLPOOL 009b25f6396e4db5ca186ce28cbfb0c097d404421621928e024dcbdc59648bc93a4bf2c8daa973cab091e4dc76c895a868c60d8a63813decc21a30318956ec31
-MISC metadata.xml 403 SHA256 888a3ad0617daa23ebaec8ee9df76846f8071fdf86e0cc4693d81beb357707e6 SHA512 ed27c47d4b202e9fc631713bb2a983d84cb9c0b30e7320ca584d466f37bf567778e20d32a426bf380680a631d43bcd549ae0c3124cd3a026d82cde13cce124d2 WHIRLPOOL 04d7f3be29f5ea7e5104ad294a075c281f575662fcd4f17592f27b112399c08b5107844fb69c4d480ebaed750bca7afed7c5b2ec18cdd58af88089bb507cecf9
+EBUILD gnome-online-accounts-3.6.2.ebuild 1501 SHA256 6aa8ce8940960acf56452c03ece7bad618f94612b4b9b11d50f1cd353b1a48ab SHA512 e0b8f67dbb175696bbb43742694304e9f7493650ffbee92efe7fcd070ae363bc01c7a771482bb10a26d20a9aa869b18f00a544c43e7dae7253f465690c33e93f WHIRLPOOL 160873936ac511bb4c3db8aabe813b0cfb72d6635d5256866cc1e4e3427c1311c4f749818dc96ac448273db8bc65c31e0072c30be565067aef7f9c3b47f7ed45
+MISC ChangeLog 1659 SHA256 8941ff669f4cceca48316fb869a2702465b3fab445924ec120948e530e0669e0 SHA512 6b11f4031c2301468034f344b2f40f9d9b3fd8475aee2ee1edef4755032b8eb8d7e12bb13715b26d329a6400030cf9785f52b8e6648b1fb7aa53b167fb609062 WHIRLPOOL cc34b2d9a3937939f22967967291d28d0b984a43663613f51fb843aa6f0f66cb9596579c0fc41125ddb8ec6bab58efd221110b6fe8b25baa76820a6b624ab399
+MISC metadata.xml 288 SHA256 7d53248d2d185ee6ff67ac7c464c575b98329974674d742a7bd34f479a302c06 SHA512 f144535c9d708b47f5a8f3c00765728d73949d0f45a0fd6101158024499c7d1cccc40a3992dca1d4512c7fe0a895ffd9d47e8e982347fd82c4c564073f47eb17 WHIRLPOOL 82bf76f0942643dcfe8152b0a12e8ef74a0d1fbf16b1a983a7a0768cc97f766aaef6be86e938b4fd30f14144c14260ba05fc95baec3300f27f2f5d7f1a0595cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBfGJEACgkQl5yvQNBFVTX4LQCfdxXTRb/rylF9gJEPnWcvjKsY
-kmgAnjxrikpWtg0TvGmJFCAQrDhfKeWT
-=Ylgd
+iEYEAREIAAYFAlDaH7IACgkQ1fmVwcYIWAYqBACfbPtm56vniIpg05yAZn0aP7in
+5qoAoMnCds+O2cyKO+U9IFO5RodMKc4N
+=uHwV
 -----END PGP SIGNATURE-----
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>