gentoo resync : 02.02.2022

3 files changed, 3 insertions, 88 deletions

diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index ed27ec136a6b..9064647f772b 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-online-accounts-3.40.0.tar.xz 860724 BLAKE2B 47f22af85b701854396c462df04b9ba2e004ee4a954619916240fef0f8139e3a37608bb9c16e4cfabbb6fc863e7448678a48865620c0293d231f9b125fe9c904 SHA512 ac90226023e2a69ad9cd12faf637844a029814282f164cc905810bf54af6693069b9019ca58211deb8487f6a32886eb072a1223fca32bc4e3fe0bc91ce8f2d6c
 DIST gnome-online-accounts-3.40.1.tar.xz 861220 BLAKE2B 668af9cca8524e25b4f65f41983c527e0cac167317c28f6c451c9c9a6cea18a5774c42acd1cf80cfc707ed62524d1381039fd4f16e3e506d4789372a3db85f4f SHA512 ee7835efe6e1afd6a13f823e17eb93e4a3c55e90764f93a766270ef64f07ed18eff2fce325d8248783d7c6f1c0a7a7fe7512ebb7a8bc0a3e3b33b9037a75b088
-EBUILD gnome-online-accounts-3.40.0.ebuild 2121 BLAKE2B 57476176b80434f237305a369d100d0fdc541321e273f9c38f6c30fad15faed17fb841ccf8feb2b63a9d040a8855c8d7778b5ad039cf2d4abd0edfd398f69e82 SHA512 1b3ddd0d712c6aedfe8a7f747aff1068c98952724624a3c06290d0544429dc6ec12a410094b21fbb529569697ec1d6fbba461c4c597074965ea1c2abe5e5ef63
-EBUILD gnome-online-accounts-3.40.1.ebuild 2124 BLAKE2B db5bcb09565828f88ea2c106366e0c4c3a986dc0663a0b2b7fcf9e1d5b1745a4e14d51db1666995c5393f8c14162aecb94ffef0ef028218cc6cf5472dc23d2d9 SHA512 92f278bb6b94aa18297dd57c791028e692ef42d99bed52a8851d1e1b4c1cd04dbb9de94e41803884a4aeded54041c2b42fa9fffe924ef1f5378e602cb2df5ce8
+EBUILD gnome-online-accounts-3.40.1.ebuild 2121 BLAKE2B 3fb1d323c8897a2ca8ceb11e976b7a4a801dcb2d4e7f6c8b6f0155aadaef8efa3c912c948c85911a58ba1471b45fec60ecfbe9fb987050a01f355447b3a8c6c7 SHA512 a3a5aff663fa2c12bd615be67442b9b87b7bc3858f1d7fb5352e6ced75e75b1e2d51c27b1e2a9fe3a73cb210066d5a77fc44103f3e98f2c9cae8fab6716da29c
 MISC metadata.xml 380 BLAKE2B 0c3c7edbcff0344c8e7929bf525916d8a6c8bec9628c7c20d9c98e81102525e2651e422e10edf53be338bd2a74b6d42396d9f8c0d1b8bfa2576a319236a07987 SHA512 eb224bd0e6ffb92203f9df3c56449dff3aeebd8623bd451810ac99a57cb84b277e5ba53354d36cede6678be209da55cc30386b903e71dbd90bd91623c2d005f1
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
deleted file mode 100644
index ed7cb68c8a1c..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
-
-IUSE="debug gnome +introspection kerberos +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# 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.52:2
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/json-glib-0.16
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/rest:0.7
-	>=net-libs/webkit-gtk-2.26.0:4
-	>=x11-libs/gtk+-3.19.12:3
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
-	kerberos? (
-		app-crypt/gcr:0=[gtk]
-		app-crypt/mit-krb5
-	)
-"
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend) )
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.30.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# TODO: Give users a way to set the G/FB/Windows Live secrets
-
-	# CONFIG_SHELL for bashisms in bug #829494, patch submitted upstream.
-	# Can be removed in future.
-	CONFIG_SHELL="${BROOT}/bin/bash" gnome2_src_configure \
-		--disable-static \
-		--enable-backend \
-		--enable-documentation \
-		--enable-exchange \
-		--enable-facebook \
-		--enable-flickr \
-		--enable-foursquare \
-		--enable-imap-smtp \
-		--enable-lastfm \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-windows-live \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable kerberos) \
-		$(use_enable kerberos fedora) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
index fe36f7b72807..1bb0801290c0 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 
 IUSE="debug gnome +introspection kerberos +vala"
 REQUIRED_USE="vala? ( introspection )"