gentoo resync : 08.01.2018

12 files changed, 533 insertions, 2 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index c542be69bc78..e67f4a91a866 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 8b6eacc1c3dc..034c0483f173 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,6 +1,10 @@
+AUX 3.24.7-DESTDIR-honoring.patch 1122 BLAKE2B 73d95683bd162f0e93de3b005787b2aa722b0a0f4ba58e3313fa3e66f90c159d5766ac03ee81c2fa3cb33ff2dedfcd4ffb59fb32ac88b17f04447d38c4a7605e SHA512 311e0163ef783430f4eea638e2ece92ab6d1c52d79f399190607eead5359f28eec647c626bb1c435eba427f7844456b4fd2dd60e75ca40331f1d249d1549eb0c
+AUX 3.24.7-libical3-compat.patch 5323 BLAKE2B 5a2392751b009d6726490cbd11227d1d4c5ed5e61c8d0b6acdf282182dffcdeb31a2ed6395626231dc729dd9ee7b1ca26a3ce9148b3cca1fbdc83376e58baca7 SHA512 0b29c1d86eedf778d489a4a4c78bfc292898ceba2d90ac4c81aae2a0c65ac132e71de767f7a74ef839977c2fbdcc38da50579735e1775cfb5b2414fa304d19b5
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.22.7.tar.xz 5564924 BLAKE2B 8107a13ef46a4457e122c5d719c0d29ccbf5ec61424fb6b4810b1e165bb68cb8c1c87ec9ab34446458321c0c56ba5a5408f45ae9fc95bcee965c21caaad6a230 SHA512 53648c0b893982b3577008aeae57e213e084aa5ba4663ca109f200b268635fd1544408c1ace065e91e5eaf48a20f59609c8e895a1907501ea5e64119d1590d44
 DIST evolution-data-server-3.24.6.tar.xz 4252940 BLAKE2B 42a0a39a8248628964cfd026e4b8bc3794e897f447aadb73e0e7870865314c47d6de11a1aa85d6e7fcb0a414a3552a74cb3012c8a6d4908b280ae7440e1154d7 SHA512 01eece83217e66ce7e08e333ceaf38bae226800dd8a015dda29583b0155b9f1fbef4f18d95a7127d08421cd27b3203d2b7cc6a3bc0b5adba1b06197c85be96e6
+DIST evolution-data-server-3.24.7.tar.xz 4253252 BLAKE2B ca435a4e6c3a003c5166bd06f0308766686cc9e02f1eb6a15a521c58805bafdfd39cbc7ee058339ba383329ab34a11ed2b0eeebd9b545219c4b3d8f51de8df60 SHA512 3e83cb0e87ec822ebf6c81963693e7c701d20266e0811bd261a78073c75724e2c24ac5d5561e997ed8567e9e519c175b3104fa6e2e28158854c8c3ec39a8e9df
 EBUILD evolution-data-server-3.22.7.ebuild 3689 BLAKE2B 4b37c74e6b0d27d4cd1061049f27e5044cd0319367fae2d521cd0a861076de52a52c736e009ee55ea93fae46fb38a7d1e63b3988d5d188dd35f0e034c85174a1 SHA512 ec236fda93b156d8ee5ada17f83ba66fee61807c44979d6f9301711e088bca1135abc367f2959cbc95c2e7be5c2976844418decb82e8eda362bb2af059adf1cb
 EBUILD evolution-data-server-3.24.6.ebuild 4047 BLAKE2B efaa725a8ca0c725bbbf5a45d50380a3cc08b164d7683af8cb63e5f3ecd790906cd0af3457d2ed306fc3bcac82737c800cc9be452c8d0694a8c549f49a626db5 SHA512 961f124186d8ade010b8c77ad34f07b2aabb16ffbbaaa93db1ec564a9fce8ef8de171b6890fc2685030f64f06781208f283caba45c29ce56688b5b43b4e826d1
+EBUILD evolution-data-server-3.24.7.ebuild 4147 BLAKE2B f335e97ba468fcd5f58202ce54522367718f92607796c161e220a018bbcd8ad5a26b804bce6e258bdaa0c00333204d3e1fba2d7e533e26411cab39c4ccfc8e1b SHA512 07e6e480c891cfa921739171d05ccec3103dd9bad844c30dabb29fb852f3a5d264bb8a6328604f457734b13e149b5ca8bbd8435f784a011f616b3cb6722c7329
 MISC metadata.xml 894 BLAKE2B 2b37b8e2f6a027c64cf3fa2e93dda6270d6d73291213c956aabd91d3cdbeed7b7f40d7738f22566059304c13cb4471d6a344b564d28c4d11e86ac159dd789ebb SHA512 26ebc7b28f82f5d0d048bb699ad3663f8cb26cecccff86bb77543412a8faaf54c9cfbf3f526a6d3e113ec5b573fb97cc60eb56343d3a79d9d6162922cfddab52
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
new file mode 100644
index 000000000000..9c317ebf4171
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/60" # subslot = libcamel-1.2 soname version
+
+IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# sys-libs/db is only required for migrating from <3.13 versions
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old calendar data, bug #519512
+gdata_depend=">=dev-libs/libgdata-0.17.7:="
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/libical-0.43:=
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=net-libs/libsoup-2.42:2.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.10:3
+	)
+	google? (
+		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.11.91:4
+		${gdata_depend}
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.8:=
+		${gdata_depend} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/gperf
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+# Some tests fail due to missings locales.
+# Also, dbus tests are flacky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-DESTDIR-honoring.patch
+	"${FILESDIR}"/${PV}-libical3-compat.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	# Make CMakeLists versioned vala enabled
+	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+	    -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+		-i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	local google_auth_enable
+	if use google || use gnome-online-accounts; then
+		google_auth_enable="ON"
+	else
+		google_auth_enable="OFF"
+	fi
+
+	# phonenumber does not exist in tree
+	local mycmakeargs=(
+		-DENABLE_GTK_DOC=$(usex api-doc-extras)
+		-DWITH_PRIVATE_DOCS=$(usex api-doc-extras)
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DWITH_KRB5=$(usex kerberos)
+		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PHONENUMBER=OFF
+		-DENABLE_SMIME=ON
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_GOOGLE_AUTH=${google_auth_enable}
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_GOA=$(usex gnome-online-accounts)
+		-DENABLE_UOA=OFF
+		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+		# ENABLE_BACKTRACES requires libdwarf ?
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_GOOGLE=$(usex google)
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_VALA_BINDINGS=$(usex vala)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	virtx cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch b/gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch
new file mode 100644
index 000000000000..a3a3d470b984
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch
@@ -0,0 +1,31 @@
+From 5406fcda088be73f462e7d02d4a2ae56cc7329cc Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 2 Oct 2017 19:20:36 +0200
+Subject: Bug 781645 - Skip GSettings schema compile when DESTDIR is set
+
+---
+ cmake/modules/GLibTools.cmake | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
+index fc8eb82..f0be558 100644
+--- a/cmake/modules/GLibTools.cmake
++++ b/cmake/modules/GLibTools.cmake
+@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0)
+ 	if(_install_code)
+ 		# Compile gsettings schemas and ensure that all of them are in the place.
+ 		install(CODE
+-			"execute_process(${_install_code}
+-				COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
+-			)")
++			"if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
++				execute_process(${_install_code}
++					COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
++				)
++			endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
+ 	endif(_install_code)
+ endmacro(add_gsettings_schemas)
+ 
+-- 
+cgit v0.12
+
diff --git a/gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch b/gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch
new file mode 100644
index 000000000000..8f574b0f8d9c
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch
@@ -0,0 +1,146 @@
+From dc5fc0e163421f5a01c3cdaab23ca2ea1eb3fae2 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 4 Oct 2017 11:48:48 +0200
+Subject: [PATCH 1/2] Use icaltime_is_utc() instead of icaltimetype::is_utc
+
+The structure member is going to be removed from libical in the next release
+and the function is available for a long time, thus it's safe to replace
+the usage in the code.
+
+(cherry picked from commit f607f8628a28440374579531bc78848dfe0c782e)
+---
+ src/calendar/backends/contacts/e-cal-backend-contacts.c | 1 -
+ src/calendar/libecal/e-cal-component.c                  | 8 ++++----
+ src/calendar/libecal/e-cal-recur.c                      | 8 ++++----
+ src/calendar/libecal/e-cal-time-util.c                  | 3 +--
+ 4 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c
+index d2b570885..cf2c62062 100644
+--- a/src/calendar/backends/contacts/e-cal-backend-contacts.c
++++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c
+@@ -699,7 +699,6 @@ cdate_to_icaltime (EContactDate *cdate)
+ 	ret.month = cdate->month;
+ 	ret.day = cdate->day;
+ 	ret.is_date = TRUE;
+-	ret.is_utc = FALSE;
+ 	ret.zone = NULL;
+ 	ret.is_daylight = FALSE;
+ 
+diff --git a/src/calendar/libecal/e-cal-component.c b/src/calendar/libecal/e-cal-component.c
+index 65b530d1e..6d8a9814d 100644
+--- a/src/calendar/libecal/e-cal-component.c
++++ b/src/calendar/libecal/e-cal-component.c
+@@ -2522,7 +2522,7 @@ get_datetime (struct datetime *datetime,
+ 	 * This makes the timezone code simpler. */
+ 	if (datetime->tzid_param)
+ 		dt->tzid = g_strdup (icalparameter_get_tzid (datetime->tzid_param));
+-	else if (dt->value && dt->value->is_utc)
++	else if (dt->value && icaltime_is_utc (*dt->value))
+ 		dt->tzid = g_strdup ("UTC");
+ 	else
+ 		dt->tzid = NULL;
+@@ -2559,9 +2559,9 @@ set_datetime (ECalComponent *comp,
+ 
+ 	/* If the TZID is set to "UTC", we set the is_utc flag. */
+ 	if (dt->tzid && !strcmp (dt->tzid, "UTC"))
+-		dt->value->is_utc = 1;
+-	else
+-		dt->value->is_utc = 0;
++		dt->value->zone = icaltimezone_get_utc_timezone ();
++	else if (dt->value->zone == icaltimezone_get_utc_timezone ())
++		dt->value->zone = NULL;
+ 
+ 	if (datetime->prop) {
+ 		/* make sure no VALUE property is left if not needed */
+diff --git a/src/calendar/libecal/e-cal-recur.c b/src/calendar/libecal/e-cal-recur.c
+index 535d56c14..cad588c4d 100644
+--- a/src/calendar/libecal/e-cal-recur.c
++++ b/src/calendar/libecal/e-cal-recur.c
+@@ -195,7 +195,7 @@ ensure_timezone (icalcomponent *comp,
+ 	   a different icalcomponent and cause use-after-free. */
+ 	tt->zone = NULL;
+ 
+-	if (tt->is_utc)
++	if (icaltime_is_utc (*tt))
+ 		return TRUE;
+ 
+ 	tt->zone = default_timezone;
+@@ -435,7 +435,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
+ 				rrule.until.minute = 0;
+ 				rrule.until.second = 0;
+ 
+-				if (!rrule.until.zone && !rrule.until.is_utc)
++				if (!rrule.until.zone && !icaltime_is_utc (rrule.until))
+ 					rrule.until.zone = dtstart.zone;
+ 			}
+ 
+@@ -542,7 +542,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
+ 				exrule.until.minute = 0;
+ 				exrule.until.second = 0;
+ 
+-				if (!exrule.until.zone && !exrule.until.is_utc)
++				if (!exrule.until.zone && !icaltime_is_utc (exrule.until))
+ 					exrule.until.zone = dtstart.zone;
+ 			}
+ 
+@@ -586,7 +586,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
+ 			if (!success)
+ 				break;
+ 
+-			if (!exdate.zone && !exdate.is_utc)
++			if (!exdate.zone && !icaltime_is_utc (exdate))
+ 				exdate.zone = dtstart.zone;
+ 
+ 			if (intersects_interval (&exdate, NULL, duration_days, duration_seconds, &interval_start, &interval_end)) {
+diff --git a/src/calendar/libecal/e-cal-time-util.c b/src/calendar/libecal/e-cal-time-util.c
+index 7bcbc8ba1..914761cb0 100644
+--- a/src/calendar/libecal/e-cal-time-util.c
++++ b/src/calendar/libecal/e-cal-time-util.c
+@@ -763,9 +763,8 @@ tm_to_icaltimetype (struct tm *tm,
+ 
+ 	itt.day = tm->tm_mday;
+ 	itt.month = tm->tm_mon + 1;
+-	itt.year = tm->tm_year+ 1900;
++	itt.year = tm->tm_year + 1900;
+ 
+-	itt.is_utc = 0;
+ 	itt.is_date = is_date;
+ 
+ 	return itt;
+-- 
+2.15.1
+
+
+From fccd77cf4620ca76c4fd2bf7721e3fb7eaf55ec6 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Thu, 5 Oct 2017 13:50:08 +0200
+Subject: [PATCH 2/2] e-cal-recur.c:ensure_timezone(): Unset icaltimetype::zone
+ only if not UTC
+
+With a removal of icaltimetype::is_utc the icaltimetype::zone is used
+to determine whether it's UTC or not. That means that the icaltimetype::zone
+can be unset only if it's not the built-in UTC time zone.
+
+(cherry picked from commit 1f39ade8db00091d6fa4c752ccb70361ef0e8abc)
+---
+ src/calendar/libecal/e-cal-recur.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/calendar/libecal/e-cal-recur.c b/src/calendar/libecal/e-cal-recur.c
+index cad588c4d..fc14fb15c 100644
+--- a/src/calendar/libecal/e-cal-recur.c
++++ b/src/calendar/libecal/e-cal-recur.c
+@@ -193,7 +193,8 @@ ensure_timezone (icalcomponent *comp,
+ 
+ 	/* Do not trust the 'zone' set on the structure, as it can come from
+ 	   a different icalcomponent and cause use-after-free. */
+-	tt->zone = NULL;
++	if (tt->zone != icaltimezone_get_utc_timezone ())
++		tt->zone = NULL;
+ 
+ 	if (icaltime_is_utc (*tt))
+ 		return TRUE;
+-- 
+2.15.1
+
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index e2a74655c9c1..4c32d9f321b5 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,9 @@
+AUX 3.24.6-DESTDIR-honoring.patch 1196 BLAKE2B e6996ff088f5e5f3b1e4db6b1f85524d61ba35798d76cf46f07c9efe8587dadeab08b78f3a8d0ad8602ebe6899c72e0d0804e2835ba634afddf610ec0ff54488 SHA512 dc837d7150a42e9e03856b36a1f417ac1b850722f1475efacfa00bf724d45fddc03eb61d3f8f4c7e74884c672dd1f18bed86987cd3f22bbefa6ad7f514368a07
+AUX 3.24.6-libical3-compat.patch 1623 BLAKE2B f8fc567f2c86cbe6392de5750e8a01155d49a9bb79912d1e3f066be0b03eae90be4d39b72d3fa2eb92129d378d5647a697c3813d253f26980bed5a51e838a811 SHA512 2f1a607cf44d69bdd7a14551f0b95cc01c34a86f92741fce848b3d90e6e4bc8c35e9bf02426c742da3ab8bb4bc01c4533bac8c95894f11bb57290da19dec95bb
 DIST evolution-ews-3.22.6.tar.xz 715320 BLAKE2B abd68ffce9a2b723a72e26d5c0991060c377f930c3f34e2f9244dfb53c449bc92d8e0bca60b64993369fe00370fb60920e405355c3fbe63b846e279de785045c SHA512 6b93faa67a6f546142b023086bf54ac34d6c7c4320ee136f58cc0ea5a018811af2080d5945c4dc68c89555a35a4194b2f92bd839b2142ae63690e94ed895b40e
 DIST evolution-ews-3.24.5.tar.xz 488116 BLAKE2B 8144f1eae7440993c2bedd76e5cdfb3354b32bb1b1093bf24f23c12ca8a36e076950dc015f89966532d6c5ee491262a979cc9bff47cba5146c08989becd2fb95 SHA512 eaa5096c09686dade6f1efddea2b706a73c292b06b473b0f2ef1ba15eb5a3d685678416a0f1de40296beaa893d5dc91b944a440440dba489df67a944342f2f17
+DIST evolution-ews-3.24.6.tar.xz 488668 BLAKE2B 3ec507b654042882158d2d8dfdbaae0372cc67d515501e45e327ef006cd8674f7b6e48de63f8930add9f29536d3428604f21666cfac98a764cb2eb0c20353ef3 SHA512 24bcaf9755b9d45d4848624b42f2b41bf1532aa836cdd26f8ab57b4dd5ac83d4375c340e0cac6f7f1b830c3ab998597893bce0fdd471ed7b0758a69367edfac1
 EBUILD evolution-ews-3.22.6.ebuild 797 BLAKE2B 364b2955e3d909feb216050230cb1c4b5cfe86b5e6e7ee934959913f4cfbc29314be5a68ce6f30ee2200a1f2dfef1a34ee299ae736acab8673453343348efae0 SHA512 0baa303346cd26bfc417cf8ee7fd2bdcaeb62980d6cda234b131b55cf7d3fb7638a9b127684bb2762453b37e1938ace02dabfa5bdb82027e99a7d8c30ceead93
 EBUILD evolution-ews-3.24.5.ebuild 1076 BLAKE2B 5c71eb434a6c91b53a20450960d8c89d19297c5f0af7661a3465c0201303b4af1b456387e6e18338bc927e4350883adb5c2c4119f5282401aab24340f80ed971 SHA512 9343a952f6c3d9b58a8b9bf6522107311de6c01f16715cb548cfff63d316873db07f05d1e61d4719dea6bad034b4998a8d65ed71ac1cf46a2e076d2c810c0be8
+EBUILD evolution-ews-3.24.6.ebuild 1308 BLAKE2B d9c62b06ae700db742035d8bff57e5ec3d2074bfb7408912ca7c420904f5d0866c875f14c32584987b2c081b699110fb5c9b67a7135da34963824f927d484f7a SHA512 e8a0241cbc05bfef92c7563ceec5d67477ce6f685d489deab1ec204382e9844ee32e3406bd68c6c14650c4bb95e33f9c7d69c42832f181e8ddf4705b74fcf9a3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild
new file mode 100644
index 000000000000..1c2d3ee514da
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+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"
+
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.46:2
+	dev-libs/libical:0=
+	>=dev-libs/libmspack-0.4
+	>=dev-libs/libxml2-2
+	>=gnome-extra/evolution-data-server-3.24.7:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.42:2.4
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=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"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-DESTDIR-honoring.patch
+	"${FILESDIR}"/${PV}-libical3-compat.patch
+)
+
+src_prepare() {
+	gnome2_src_prepare # default from inherit order, but be explicit; needed for xdg_src_prepare, env_reset and co
+}
+
+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/files/3.24.6-DESTDIR-honoring.patch b/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch
new file mode 100644
index 000000000000..c74df6bce523
--- /dev/null
+++ b/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch
@@ -0,0 +1,33 @@
+From 01974dad6fb73344e2852715ccfe143b3d998cbf Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 2 Oct 2017 19:24:57 +0200
+Subject: [PATCH] Bug 781645 - Skip GSettings schema compile when DESTDIR is
+ set
+
+(cherry picked from commit bdc3319e906479e665a9fb30fde084ecf735fa4f)
+---
+ cmake/modules/GLibTools.cmake | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
+index fc8eb82..f0be558 100644
+--- a/cmake/modules/GLibTools.cmake
++++ b/cmake/modules/GLibTools.cmake
+@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0)
+ 	if(_install_code)
+ 		# Compile gsettings schemas and ensure that all of them are in the place.
+ 		install(CODE
+-			"execute_process(${_install_code}
+-				COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
+-			)")
++			"if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
++				execute_process(${_install_code}
++					COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
++				)
++			endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
+ 	endif(_install_code)
+ endmacro(add_gsettings_schemas)
+ 
+-- 
+2.15.1
+
diff --git a/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch b/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch
new file mode 100644
index 000000000000..001e35630e91
--- /dev/null
+++ b/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch
@@ -0,0 +1,44 @@
+From 02ac53280fef79d7ed2aafa2989cd1da5c5e8d80 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Mon, 8 Jan 2018 14:23:49 +0200
+Subject: [PATCH] Use icaltime_is_utc() instead of icaltimetype::is_utc
+
+The structure member is going to be removed from libical3 and the
+function is available for a long time, thus it's safe to replace
+the usage in the code.
+
+(ported from commit 7c0f42604c16fe571168ea48f4628bc920359595)
+---
+ src/calendar/e-cal-backend-ews-utils.c | 2 +-
+ src/calendar/e-cal-backend-ews.c       | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c
+index 41d77b4..a46b1e3 100644
+--- a/src/calendar/e-cal-backend-ews-utils.c
++++ b/src/calendar/e-cal-backend-ews-utils.c
+@@ -346,7 +346,7 @@ ewscal_set_time (ESoapMessage *msg,
+ 	gchar *tz_ident = NULL;
+ 
+ 	if (with_timezone) {
+-		if (t->is_utc || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) {
++		if (icaltime_is_utc (*t) || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) {
+ 			tz_ident = g_strdup ("Z");
+ 		} else {
+ 			gint offset, is_daylight, hrs, mins;
+diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
+index 50dd5ae..29e488f 100644
+--- a/src/calendar/e-cal-backend-ews.c
++++ b/src/calendar/e-cal-backend-ews.c
+@@ -1081,7 +1081,7 @@ e_cal_backend_ews_get_timezone_from_ical_component (ECalBackend *backend,
+ 			struct icaltimetype dtstart;
+ 
+ 			dtstart = icalproperty_get_dtstart (prop);
+-			if (dtstart.is_utc)
++			if (icaltime_is_utc (dtstart))
+ 				tzid = "UTC";
+ 		}
+ 	}
+-- 
+2.15.1
+
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index fa7215ebe3bd..582ad8502cca 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,6 +1,7 @@
+AUX 3.24.3-libical3-compat.patch 1429 BLAKE2B ff22e520aeded89b65db02b511c869b8b76c1be1978b9be750565a6d813c0bdf8054a346849de4e2a8c840506d8fb72d34cf08148878b25839f5454d727a2a64 SHA512 72541436fc604ebb923e4d1d9bd033b22972c7f3305b81a2c4b3b77a9c56513654f382de433112e8327250d901e108b899baed437d871125f1709c21cbcfb370
 AUX 3.24.3-week-grid-fixes.patch 4124 BLAKE2B 99fca623889b10356defd0da2ab2672123dadf98ca0eb4ede729c0a586caf5677249ce541ba2a2a7cc440e5fc209a3a93fd4dd0e92607010f1320f988f3977c6 SHA512 9a4095c13470a1dcd7fef6d1d5e9ce12b54acde103029983ca7bb581efbc2502f74ef1fc53b6c7dfb40cc25d1778a1b5d82852dc674038217d2777e9e5a1d0a0
 DIST gnome-calendar-3.22.5.tar.xz 2376792 BLAKE2B b36ba91a0c8202bf1419450656b8abd75913a83ecb7780ac73204e0e52dd938069c364fc106860d3ef7ae14bb3545ddab54db9889207d0568e0fb6bb055eeba7 SHA512 113a77c64fce8317f12d1704bf4076b48abb0f42e4d6e474a7912bc948295bf71e8b9ea00e50301464fa9726cdbfe453af92a24acd3c9ac76a6f40e92062e335
 DIST gnome-calendar-3.24.3.tar.xz 2425292 BLAKE2B cb859e229b040dd1ef34643e7aac5ddc1d0368d0bc6912effd73bd2c95ecab458294fef866f5718e108ef36f03bfc0dcb5a1140a571b3dc35128125ea8ff8e19 SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67
 EBUILD gnome-calendar-3.22.5.ebuild 748 BLAKE2B ef9d8db79696ae99c9cbe392fc0413f595f78debc7cbe1ab467b7d2777ad55539acd3a6b885b2f62e7d5a73f27336c97b86c3ffff05f4548433080db3b8eb0a4 SHA512 70cf17138a1f4d5f14076c9f330228a1f82007bfbaf121b4ccb2a6d36a3b83e257e7e9aa2f5c601e7fd11ddc05399babb5a0ee98d3bc632c08af8fd27e3db266
-EBUILD gnome-calendar-3.24.3.ebuild 1023 BLAKE2B 9a26a57786a1c03f352b5fb663262f0206de11b038c1a5630b6b81ea9107670385076dce45cdf5e4ea6d373366429a865e2e2cc58264d4307f0cbfb6c05c1ae4 SHA512 8fdb17af92906789327928cd170acbe498d2481deeb92067d0bbc21208f7a457b4a1d759ff6c0a7f7677316a6cb8d0e2c9f852e17087f8693cbfc5a7333f5510
+EBUILD gnome-calendar-3.24.3.ebuild 1138 BLAKE2B 00d023159d87cd305b7c16a1bb6cf317786718c9d40d6af6af296e049bea1dc6e04deb669f62e7f2832b91652d515b00930aeae71c6824d49804f9efd5237887 SHA512 0b0eef3890fdecac042c0658e8fd5100637d32860d6b3b4bf471787897e6067529571f444b3ceab309e745d6482894e87e4a735f67f232b7a9800659facd2733
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch b/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch
new file mode 100644
index 000000000000..5d0160e9773e
--- /dev/null
+++ b/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch
@@ -0,0 +1,49 @@
+From ad404c26ed22690d842a01df3e10a851a198a0b7 Mon Sep 17 00:00:00 2001
+From: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
+Date: Wed, 15 Nov 2017 13:09:54 -0800
+Subject: [PATCH] utils: simplify gcal_dup_icaltime
+
+Instead of copying member by member, copy the entire struct contents.
+It works as before, but doesn't depend on the member names.
+
+This fixes compiling gnome-calendar with libical 3.0.0, since the
+struct icaltimetype had one of the members removed (is_utc).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=790072
+---
+ src/gcal-utils.c | 19 +------------------
+ 1 file changed, 1 insertion(+), 18 deletions(-)
+
+diff --git a/src/gcal-utils.c b/src/gcal-utils.c
+index c80ba53a..4558f540 100644
+--- a/src/gcal-utils.c
++++ b/src/gcal-utils.c
+@@ -199,24 +199,7 @@ datetime_is_date (GDateTime *dt)
+ icaltimetype*
+ gcal_dup_icaltime (const icaltimetype *date)
+ {
+-  icaltimetype *new_date;
+-
+-  if (date == NULL)
+-    return NULL;
+-
+-  new_date= g_new (icaltimetype, 1);
+-  new_date->year = date->year;
+-  new_date->month = date->month;
+-  new_date->day = date->day;
+-  new_date->hour = date->hour;
+-  new_date->minute = date->minute;
+-  new_date->second = date->second;
+-  new_date->is_utc = date->is_utc;
+-  new_date->is_date = date->is_date;
+-  new_date->is_daylight = date->is_daylight;
+-  new_date->zone = date->zone;
+-
+-  return new_date;
++  return g_memdup (date, sizeof (icaltimetype));
+ }
+ 
+ /**
+-- 
+2.15.1
+
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
index 75c1537a99c7..96803962df49 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-week-grid-fixes.patch # from gnome-3-22 branch
+	"${FILESDIR}"/${PV}-libical3-compat.patch # from master branch, https://bugzilla.gnome.org/show_bug.cgi?id=790072
 )
 
 src_configure() {