gentoo resync : 25.08.2020

5 files changed, 40 insertions, 156 deletions

diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 0f3f6d0c9e69..0a94a286c68f 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,8 +1,7 @@
+AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
-DIST evolution-data-server-3.34.4.tar.xz 4627704 BLAKE2B d1b93f17eec1dc71b31c9a842af369646c7412c63461a63a0c42026795d97f8b282c498ca56e14b258e7764ce333fad159d4fae534891cd02b99be6166bfbc23 SHA512 e353724591216f472faabaab468d6a8555e05cafda4a8b2c55fa3113226475f0ec9edad65d8acbf95c92844d33f36cf32d49ddc14fe934a2b8c127c32cc7b74f
-DIST evolution-data-server-3.36.2.tar.xz 4631984 BLAKE2B 946a2c30a631f3e7efa5f084bdc3a7267c6ebeea63fc84d8a5f23aeddbdd9c81d95ff87ae34519f9faf86fbac54cd4faa8749fc57017a7aad78b9a3eedcc2f66 SHA512 3549d8ce4cf47080c426a023b88d4a1f4432096018d69c1cf6628f96c4b56312b487ba53c4813968a7aea051c3cf9e8d5438bd3fbdb9605e49eb4f1402b8c8fa
-DIST evolution-data-server-3.36.3.tar.xz 4632948 BLAKE2B e2830bd8340280f56e0fd1d32b6a85b5ee73b5704ad9ffaa73e83ef0aee395d23a80aa59aa5bd4b1e2211bf3020368b1f0e2d9a1d8eeaa6e047fbf406137e80b SHA512 bde03a84d262606ba8e43f084735db3072b7fa5641dda6053ad798ce8cffb3003aaa7065fab0f684cfbaaa8300855bb42b259ac1c22a8f4bb8b50032263ea75d
-EBUILD evolution-data-server-3.34.4.ebuild 4329 BLAKE2B 32512b88545711e9bddfcec3b7efdf6e384ac0397751eb5fa41f47ce97d3fc726a0f63a8e174d07137b8b0d42433cc837b35f27d098800fb1180099921f56a39 SHA512 d708438396f55a08e7a407a3e0967779afa38e7e08e0da61ae01b8e18d37a972ccee4c937d974fe14d8fb8cee210cc6a3e27578654bbcd1d338e018dc46e811e
-EBUILD evolution-data-server-3.36.2.ebuild 4202 BLAKE2B 720a0c22cc6bd7d06d1f7d3425f03907f099e441a8636ea5a968b336ce03133707635c268360f3d7a12264cacca4dff03e6b0f4311ec6a9e25a5455184494297 SHA512 cf6a4418e275ae0da4152f6d7db564878ccefc9975050c6c80a68906535c98af769eb1282cb20a992fc3365e99a319c90d7fec4697b0a441b429e83d6d9d1352
-EBUILD evolution-data-server-3.36.3.ebuild 4200 BLAKE2B 3bce351bf145ed7a50c0f365ffaa06ad4bd807478a7c15478a50e5a53976424a9cd4d676fef2abc53cadcbd823b7171d92ed77ef2fab9f64c45d31b20406318c SHA512 f8dbefdd85d854e85e683cae10de5ff1355ed05cdacb1111db773465a344c0746b8ea61dd1eda2331d7e11af2eb2587010eda8582556862edb2783e6a6b14531
+DIST evolution-data-server-3.36.4.tar.xz 4636308 BLAKE2B d701e2220de9aa68a1c5e112de16675c53a33e31441fbfd88d6ac7afa08d60faa3c06d74ee4161f3329b1ba93950f97f32d3cf5714a0de68560053b506425707 SHA512 dea044e12aac92f1cfde18c10f793b75e68e40e27fb9b299c6bdb91e6f19df4224bda7ed32d54a8b8dd517580b69929cff6be0b340e377dbc3bda5c4860f5a3b
+DIST evolution-data-server-3.36.5.tar.xz 4636800 BLAKE2B 5708ec1f064b723cb5421dad50145d2377c2c683ef37fe82d24b6f27a895b89e43c55ae6c900797d477b1af052e0cc6381649c790744d8591010d928822917f1 SHA512 65ec23a665e3a547b10ad6a6be5f0533db269406c3e8db64a63cffb8e1b410e83b9c39bd7cd5dac5ecd5cf61ef96dc529ba1bd00ad0a09b3bf2c4e98f3d156e3
+EBUILD evolution-data-server-3.36.4.ebuild 4200 BLAKE2B 3bce351bf145ed7a50c0f365ffaa06ad4bd807478a7c15478a50e5a53976424a9cd4d676fef2abc53cadcbd823b7171d92ed77ef2fab9f64c45d31b20406318c SHA512 f8dbefdd85d854e85e683cae10de5ff1355ed05cdacb1111db773465a344c0746b8ea61dd1eda2331d7e11af2eb2587010eda8582556862edb2783e6a6b14531
+EBUILD evolution-data-server-3.36.5.ebuild 4257 BLAKE2B 5164bfd121dea72010ae7917df40650c3ad19e6043cd798c03e896979266367b73e16db4d7ea0d0eb269972a0c48209c5748189e2e608386079e9aa843673773 SHA512 d14e1569dd8dff4bf1e76798e6ad0301b47e0c0207c09b3eeece51cca89d881003da474046d077028f6ae08a1ce5f43dcdc9b47b2c78519280d529a9125bd66b
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.34.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.34.4.ebuild
deleted file mode 100644
index 5038eb72784e..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.34.4.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit cmake-utils db-use flag-o-matic gnome2 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/62-24-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
-
-IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# 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 addressbook data from <3.13 versions, bug #519512
-# libical-glib currently (2020-02-29) oddly behind USE=introspection; but introspection also needed if USE=introspection for eds
-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-3.0.5:=[introspection(-)]
-	>=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
-		>=media-libs/libcanberra-0.25[gtk3]
-	)
-	oauth? (
-		>=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}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gperf
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	vala? ( $(vala_depend)
-		net-libs/libsoup:2.4[vala]
-		dev-libs/libical[vala(-)]
-	)
-"
-
-# Some tests fail due to missing locales.
-# Also, dbus tests are flaky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
-src_prepare() {
-	use vala && vala_src_prepare
-	cmake-utils_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_enable
-	if use oauth || use gnome-online-accounts; then
-		google_enable="ON"
-	else
-		google_enable="OFF"
-	fi
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
-		-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_CANBERRA=$(usex gtk)
-		-DENABLE_OAUTH2=$(usex oauth)
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_GOOGLE=${google_enable}
-		-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/evolution-data-server-3.36.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.36.4.ebuild
index fd92bc61af76..fd92bc61af76 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.36.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.36.4.ebuild
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.36.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.36.5.ebuild
index 5089f36061ec..39aaaae43b51 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.36.2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.36.5.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-libs/libxml2-2
 	>=dev-libs/nspr-4.4:=
 	>=dev-libs/nss-3.9:=
-	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/libsoup-2.58:2.4
 
 	dev-libs/icu:=
 	sys-libs/zlib:=
@@ -81,6 +81,8 @@ src_prepare() {
 	cmake-utils_src_prepare
 	gnome2_src_prepare
 
+	eapply "${FILESDIR}"/${PV}-gtk-doc-1.32-compat.patch
+
 	# Make CMakeLists versioned vala enabled
 	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
 		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
diff --git a/gnome-extra/evolution-data-server/files/3.36.5-gtk-doc-1.32-compat.patch b/gnome-extra/evolution-data-server/files/3.36.5-gtk-doc-1.32-compat.patch
new file mode 100644
index 000000000000..3a202bee154e
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.36.5-gtk-doc-1.32-compat.patch
@@ -0,0 +1,32 @@
+From 24c7ca17eaf69211b75f2882c11aeff01a3cad01 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 8 Aug 2020 18:59:25 +0300
+Subject: [PATCH] I#158 - Workaround build error with gtk-doc-1.32
+
+---
+ src/calendar/libecal/e-cal-time-util.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/calendar/libecal/e-cal-time-util.h b/src/calendar/libecal/e-cal-time-util.h
+index 8acb13061..11c9d3369 100644
+--- a/src/calendar/libecal/e-cal-time-util.h
++++ b/src/calendar/libecal/e-cal-time-util.h
+@@ -150,6 +150,7 @@ void		time_to_gdate_with_zone	(GDate *date,
+  * struct tm manipulation
+  **************************************************************************/
+ 
++#ifndef __GTK_DOC_IGNORE__
+ struct tm	e_cal_util_icaltime_to_tm
+ 					(const ICalTime *itt);
+ struct tm	e_cal_util_icaltime_to_tm_with_zone
+@@ -159,6 +160,7 @@ struct tm	e_cal_util_icaltime_to_tm_with_zone
+ ICalTime *	e_cal_util_tm_to_icaltime
+ 					(struct tm *tm,
+ 					 gboolean is_date);
++#endif
+ 
+ G_END_DECLS
+ 
+-- 
+2.20.1
+