gnome-extra/evolution-ews: bump to 3.24.6, fresh install fix, libical3 compat

Bump, patch to honor DESTDIR and not update caches when set (might cause sandbox
violation for us and is generally wrong), patches for libical:0/3 compatibility.

Bug: https://bugs.gentoo.org/628460
Closes: https://bugs.gentoo.org/639126
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 645e932981e0be6710a74dbbc81ec032dc9197c5..cda9aee0b9fd57dfee4ea6969c5591aac86c5916 100644 (file)
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,2 +1,3 @@
 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

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 (file)
index 0000000..1c2d3ee
--- /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 (file)
index 0000000..c74df6b
--- /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 (file)
index 0000000..001e356
--- /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
+