gentoo resync : 20.03.2022

3 files changed, 3 insertions, 73 deletions

diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 5fe70618ef43..a1771fb16267 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,3 @@
-DIST evolution-ews-3.40.4.tar.xz 673888 BLAKE2B 532b708795db3ffdff69b44d31c49ff9c4800b527b09d4440b383a16f6ad283cea5ebdfae5cf104e08d8f2166d7269d6810d4ae6ead2c55af7f77633292d7376 SHA512 7f89e8cebf5931bd7d2f636b1780d914f069fb62ac4e14ad0ab2c9759e4553bc5d58a53b65a635c7b5be298fc017f375f9ca4d1c96002804093b9f47107455f2
-DIST evolution-ews-3.42.3.tar.xz 685692 BLAKE2B 6e9a06c78d54f119e0d942dc830d118fc7a0b19c16fa3729491b695ac01c582b1124d895d3f56ccadf72fca5716491f29a6ca6ac216fea2ea2cd1a26bdd3f5ed SHA512 e740796e4c4afc8946592195d21aac2171724cad6069001c7d2af36f1deb8d25f89ce825898faa9e042fb6e32571f7556579bf984da0573118739e314fb7bff9
-EBUILD evolution-ews-3.40.4.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b
-EBUILD evolution-ews-3.42.3.ebuild 1408 BLAKE2B 0422bddd8f72fbdeed4e4a47e5950ee83126e8c03ec28d39710c47c6433842c0672588a5a1d92d1f158d05e3eced244b642f03a753b61877153b2c6098c1598e SHA512 d0d8d90698a4b8fd100e863da528e7d7de63da178df1f9cf5d01227a23f5a098e3357a81314ba670da7be7c87554f718aa94d7bd87241682d7919838541bfe05
+DIST evolution-ews-3.42.4.tar.xz 686236 BLAKE2B f68a3c4c41419eb5d316ce8271a8c8411217e63b951230fb0151d79fca15e82e36248e3bd676518ae5f8a92d7e1d1dbf6a140bbd63dee6dca97fe48f76d502f9 SHA512 5ce1a228414d8c456962ce944a01efbeefb059bc9ff358c95bb7cec72e74ad29cd9476c9aa396b01df35d7c89fff743837dc2f9763129a5f794cbbd14557c2e3
+EBUILD evolution-ews-3.42.4.ebuild 1406 BLAKE2B 2efed5c1908dedf348d557257fa96afca953ca8ce5760c923e3d2ea77ccad02e23304020ea0d2e66a32837b0f177a6a910c040b5d65bc59038d2d13116c28da2 SHA512 deda632646a2586dd54fa80e06f78bd6b10cc8701b2024b4bfbd3cfcc85d76f3063285cac0eebf1d893c40f6be7c801b6f7d67726be3779687955c1b93614b16
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.40.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.4.ebuild
deleted file mode 100644
index cf149d49e105..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.40.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-# libical-glib currently (2020-02-29) oddly behind USE=introspection
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.62:2
-	>=dev-libs/libical-3.0.5:0=[introspection(-)]
-	>=dev-libs/json-glib-1.0.4
-	>=dev-libs/libmspack-0.4
-	dev-libs/libxml2:2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.58:2.4
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	test? ( net-libs/uhttpmock )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.42.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.42.4.ebuild
index e3822dd52ce6..948957d9fe3c 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.42.3.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.42.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 # libical-glib currently (2020-02-29) oddly behind USE=introspection