gentoo resync : 28.04.2021

6 files changed, 83 insertions, 142 deletions

diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 87329c2c36eb..294fb5b60d96 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,9 +1,6 @@
-DIST evolution-ews-3.36.5.tar.xz 558900 BLAKE2B 059a72b087287d0e553e085dc764a928d838bc8bd011c16b00f240b29d12bc7cfda98d33f8dc102866f5747313975e32506dc016435342bdb6c35f7d73749b52 SHA512 9cc40ae5d56bc86a8aa4e7aaa36fa10b0841278dd1edb075155bfe3666da4051e4fc4843398f74d00d77f550aaeb93bf576007828da4c574a17d4f17c41bfb7f
-DIST evolution-ews-3.38.2.tar.xz 650188 BLAKE2B a1e296a15269191ecc9ff02108daed90bbcaefbabdc989f919dfc25532cb31a7afa73d897bcc0f2dbaf22b0e9b250af61db9900bc2dec740b08786dad7808e8b SHA512 5f441ecbf2753243711b605e085ae8fddcfaf0f91f822b76d8a8453aca0f55c2e7788d74d726651d58b97160db3581e269e6b9f05d7c4258bd28cf13ff14efe4
-DIST evolution-ews-3.38.3.tar.xz 650292 BLAKE2B 56b84c6bcb07db5ae0579bdfb55351d323133d3b4a00d2b82a0d774d19111b293b92d9c83118bcc0bd3bef3c0b99b85ad093028a71d3b6b3ae7728c6e633ecc3 SHA512 8e3718ad6500e24cdc7594c09155df621bd8448769e0510d4010f5b77042fe6fb26e09edd82abdb863c36c5cb8cbd74dad22d51bc27237584d0743d0fd6abf45
+AUX evolution-ews-3.38.4-cmake-3.20.1.patch 2499 BLAKE2B 169eff8e666f732cf0040df67b834c32c351a6b6cfa09ff200dd5bb5aad6fa0be59a02722747c708ce1d7d448303d617054d2ccb1685cf2ab5c7aca3a80f4c1b SHA512 b5013334535f2fcfbba3a03767d9a8207dd5d6c7390ebbf97317973c481b93819c117eb103698bc4aa980f8fa27cda04671eba1f25d8ce62dfb22c05225017a3
 DIST evolution-ews-3.38.4.tar.xz 651384 BLAKE2B e4f71d38ddef6347ba3c137bac2246a6f4ffb5990ac2b6d3be72549326ae579c0a0f2bf11d19ce578ea37b99d0f8613d8d6a7e2ac75b9381e3b8c96646e483fc SHA512 98c1fecfa45bb2fe8337a1da54f09ef620128e4bba28b008aab3117291f7df708e6676421f3b8514448d035f1288591e54642f1426830fca7ba0320e3f3a99fc
-EBUILD evolution-ews-3.36.5.ebuild 1408 BLAKE2B 4c50c511fc049d334447938e4e2027bc4e3b353a684f453e90d4e20c3988e113632826b9107ed5726b5cbf59991bca285512cb80ab51071d45eb9e5eb307bfd0 SHA512 b845c4d3b3cfb3760e89c2f8cb8787f5a09db8840984cbc43ab427808db7436b9d58584514b4d83c5eb8e4ad6286f86bf2014c9656e32bade0c7b5dba307b91a
-EBUILD evolution-ews-3.38.2.ebuild 1408 BLAKE2B 7740c3a35f67e3be891044153a2f8b66027fe299d57f963abed1378240eeed2ba1759143f36c07618d7464a245d005d5948906d42b65e748ae625f19f725ed2a SHA512 7225d0d716b14af8e1ab8e5c1c998dade4cfdb6bdf072a9bbc5893a4adf8bc6134575ad772a0ca0d84d7979ed011b6e1761fc63902c1e87d73c161b9f2526da1
-EBUILD evolution-ews-3.38.3.ebuild 1408 BLAKE2B 9ebe3a70ed98b69de0fdc15102ee5396554b02e0fdc337e2dc9a81162806a9467725113932b1f0a609c89e3b2dd55bbfcfaa14cddfccab80b0773dec9ad119c2 SHA512 753fa5498f63787812da6fe6c312ce98c523f064398693aad4b480a29d739c4d3c13e8b59ab2e21bd7392ac207f6f9408ea2dfd23587d8132fded9e6d5c14ab7
-EBUILD evolution-ews-3.38.4.ebuild 1407 BLAKE2B c9bc941c1c623a8c1a88086e99ce66323643e9a20c78f8029e1d6df262a2cdef1b50e92ce04c38b5f9dab23635b4cd584af52c70b5c2fff9755c79b7eebe6022 SHA512 97a59dd9840a4a1b949fe3f56b2d60d5f4d7e0da3accc031e22a6d82b176417dc91595d79eb12383fe0f1acbbef502bebada25fbe314ac2f2b18d128cd87df71
+DIST evolution-ews-3.40.0.tar.xz 666148 BLAKE2B f8d7f6c917114e57bcc8ea93072f520069f7f183ce67ef5a5304c6721b3b9dae262ad5a2a8fc78b8ea75495f7f31f565b5db8e5bb02acaa5666ced15c0c3c5f2 SHA512 c5b0fdfbe455941444974738853a1c0346b77b96a483db8ff5b509a7c7dda90a0c1795749f3b17eeef4b3c2aceb06e51d2c5f9d784c0b6c17c78f8c37bc1c9af
+EBUILD evolution-ews-3.38.4.ebuild 1462 BLAKE2B 8a7790c3a372f799b23060f14e13b0bb5bf8923f17cc7100c74af2fa48676dbc94bfb0fc46ea867e098beefce5ae46b06c93e52a15c935176a649d9e22404b4d SHA512 61760df6be1c7848a3ab1e5cf04b33f9d6f1ad393bad54b26138f9154861e4b09d45c44534c85db24cef85891a7e2a426b0264ecbc1871c27635a411f8910b46
+EBUILD evolution-ews-3.40.0.ebuild 1464 BLAKE2B aa9cf2a2aafed9c1900d7506e80b65dc55270618ee3978e8ccbeef37605617ec72f6c75c6ee304728a51ff8d659992c2af2859d0ecfa569c02d2a8149d1abfe4 SHA512 12890f61f4ce66e79156d6f507865b6aeebadd9fcc9df79b1d8ecbeae5cf84e212385dd77167ec825420ed94202d237dec888d112b801166f2c8ca96ca371bf2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.36.5.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.36.5.ebuild
deleted file mode 100644
index 3d5c7d9b8f15..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.36.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils 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.46:2
-	>=dev-libs/libical-3.0.5:0=[introspection(-)]
-	>=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}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( net-libs/uhttpmock )
-"
-
-# 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-utils_src_prepare call, if that works
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.38.2.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.38.2.ebuild
deleted file mode 100644
index 422d53389b60..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.38.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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.46: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.38.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild
index 56daee683f81..adff76ede31a 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.38.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
@@ -44,6 +44,9 @@ RESTRICT="test !test? ( test )"
 # call; if needed, set them after cmake_src_prepare call, if that works
 src_prepare() {
 	cmake_src_prepare
+
+	eapply "${FILESDIR}"/${PN}-3.38.4-cmake-3.20.1.patch
+
 	gnome2_src_prepare
 }
 
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.38.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild
index aacb97f3c637..394ab53f0341 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.38.3.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild
@@ -16,7 +16,7 @@ IUSE="test"
 # libical-glib currently (2020-02-29) oddly behind USE=introspection
 RDEPEND="
 	dev-db/sqlite:3
-	>=dev-libs/glib-2.46:2
+	>=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
@@ -44,6 +44,9 @@ RESTRICT="test !test? ( test )"
 # call; if needed, set them after cmake_src_prepare call, if that works
 src_prepare() {
 	cmake_src_prepare
+
+	eapply "${FILESDIR}"/${PN}-3.38.4-cmake-3.20.1.patch
+
 	gnome2_src_prepare
 }
 
diff --git a/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch b/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch
new file mode 100644
index 000000000000..050bacd7628c
--- /dev/null
+++ b/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch
@@ -0,0 +1,71 @@
+https://gitlab.gnome.org/GNOME/evolution-ews/-/commit/6d8f7d303ec319539add2f0ba5331c2dab9d23c7.patch
+https://bugs.gentoo.org/783603
+
+From 6d8f7d303ec319539add2f0ba5331c2dab9d23c7 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 14 Apr 2021 16:58:08 +0200
+Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison
+
+CMake 3.20.1 errors out with:
+
+CMake Error at cmake/modules/PrintableOptions.cmake:38 (message):
+   variable name cannot be empty
+ Call Stack (most recent call first):
+   CMakeLists.txt:152 (add_printable_variable)
+
+Change how the parameter value is compared, to fix it.
+--- a/cmake/modules/PrintableOptions.cmake
++++ b/cmake/modules/PrintableOptions.cmake
+@@ -19,40 +19,40 @@
+ #    prints all the build options previously added with the above functions
+ 
+ macro(add_printable_variable_bare _name)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	list(APPEND _printable_options ${_name})
+ endmacro()
+ 
+ macro(add_printable_option _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "option name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	option(${_name} ${_description} ${_default_value})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE STRING ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable_path _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "path variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE PATH ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable_filepath _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "filepath variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE FILEPATH ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+-- 
+GitLab