gentoo resync : 14.05.2020

3 files changed, 3 insertions, 162 deletions

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 2bf8e07d9e94..22935eef2a93 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -2,9 +2,8 @@ AUX 3.32.4-gtk-doc-fix1.patch 4057 BLAKE2B 7ca0773467fa13e540e18b18f7c5ee883c1d1
 AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c99265fe59a4b99dd873875aa93933fac513d4ed2717665a53d747578d94f475b58bb7f61351f637515d9e86249b SHA512 c77607534d7b262044658ccaf88a6281c294561ec9e84a78c6dc79385bd14fb7beda33a175fadb8804be3eadf3ddb3e72055728b6e978f68a5e6ce05643379bd
 AUX 3.32.5-webkitgtk-2.26-compat.patch 894 BLAKE2B a6aef35795eb50d30becc3436d8427deed92ef367c9021ea9094a058d2e186fd43b9505e2844771af005c0ef924fa3d0fa6e3f6e021353adf7c6233c1aa16305 SHA512 2b6eae26e85e5c7aaf2410395d50f86473e1d866cce68a81e8cf1dbb70fe80d4f8b4c19acf2be8bca51e53c4972abb8cd4e0d449e5da92d80b50248551dc0016
 AUX 3.34.4-CVE-2020-11879.patch 4256 BLAKE2B efe57b53f04908ed5ff83da42a759428b68cef0ceeeee158cdc9792e4af9f31654621742db3ae5a15f30ba68409cfbe775d09d7893cc9dbac0328b5c092f3695 SHA512 7484974c557eb084055b80f45f03d0d7f40084bdaf53cd90dd1f62efea250801eb99f6a35befd9e19c3c44e0b2d1ddc0db299d3063ca2045b7421bfcbba27c76
-DIST evolution-3.32.5.tar.xz 11793908 BLAKE2B 798b49e3ab8b34be85263d876a4fde86bb63374c017ec43f8f3742246308bd023e4bdb0c943c1a96ad7866f09023e8c2df561e4f168730bb32b256e4e400dd23 SHA512 b77715d290ad3727a68416d425a19a0d10b5ebab69538d702008bc158fa70ea8bdb43f8cc55ebdf913f88ccf408df31ff5919ae5ccd3e94eeecd0f9f97592f96
 DIST evolution-3.34.4.tar.xz 11964640 BLAKE2B 48b58208064633236be32f44ff49f8718e110d1ab1aa311b3652affb3b5793b9f6775519191a9480efef731c9f14ff269d65dacbd8d411b30be64daaf953c4b5 SHA512 54ff4b191237b291e3e008ca8691624ac0af35bae096c20615ac5a51be033c97ea28be6629362a3676bee9285afab666c4624cfcca536bf5255ecd38dcf3ac58
-EBUILD evolution-3.32.5-r2.ebuild 4636 BLAKE2B db044f7101258192838c9984bf714378ffac3040d4598141fa600fb08ea77e25a7dcfcee34d5826ff5c616e942501c4539e8a13bb73c642446fc67e0d9e7cd75 SHA512 48900d1036f9468db58c548dd17cf91f559f78d835f0fa529811a602821f70eb581ceb2e20cd9a01e15c1b3edfe83507e0e1bdeedf15cf8acd04072291154cda
+DIST evolution-3.36.2.tar.xz 12027568 BLAKE2B 3bf2eca4a26e16b34567b4a976ccaa0d3138e3a7ba1a0c9652c3e642dd7e332e4a9994b9e5ae6ce3ed137eb85ac396c83b3bb84fdd99129fe4537a391ad268ff SHA512 2dccf69d32c4381f40ccdf84b621b8241c22bdb992cb77a87ce2e62e3598c436e7d0f8b72ce4fe504399c04a38266b0b0c2abf04000267a16c242d2dec7b9e9c
 EBUILD evolution-3.34.4-r1.ebuild 4430 BLAKE2B 038126aa987508944b795cc8ac73f48f24c0006cba40d9522058ed621422a7ce1f1587067e86493aade42351400023e16070abe1028e10e9aa112aac8871b3f6 SHA512 d027de5fef0f850d815c6e09b6ace58675dae79af7cf2fcd6da23f460feef7df305d8ecbe1acf8f8e55a54cb9ca5d1ec3131ad9c49dcbea440625abc449a2ba8
-EBUILD evolution-3.34.4.ebuild 4383 BLAKE2B 404ba5b3ee03be264b22fe229a1b3942d73f8133bd8a8f4384038529fe22cad71ba92aa75d6e2b920bf1a7cefe7da518c6b4cb7ee5900d2793e8d1b241862eb6 SHA512 54e9f216e5cd2c22259dee1abeb37d7cd04a853dfea629b3c317b182fd4d805733a2e29411dae936db6ab1778ea9576bb47c90bdab19d9aa7e538c8bd0c60cae
+EBUILD evolution-3.36.2.ebuild 4383 BLAKE2B 4f80579ac95b19852ef29127cd7d44eb7b3030aee511d426637731e8014abbe6c22f45a7904d458d1e3d4b0e2c55924466541dd41e8fca0e0ec399ae11809bdd SHA512 db923a977faa5a6c2141a5fb96468a9b39c7a5664d47af6623c34bfea65c28a7da0163c2d8617f43445d7d10b8a1ec64b0362ec57478b7667a7841b1eecca607
 MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c
diff --git a/mail-client/evolution/evolution-3.32.5-r2.ebuild b/mail-client/evolution/evolution-3.32.5-r2.ebuild
deleted file mode 100644
index 4dc92b18e571..000000000000
--- a/mail-client/evolution/evolution-3.32.5-r2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-
-IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitely needed for backup plugin
-# gnome-desktop support is optional with --enable-gnome-desktop
-# automagic libunity dep
-# >=webkit-gtk-2.26.3-r1 and >=gtkspell-3.0.10 to ensure all use enchant:2
-# TODO: Adjust webkit-gtk dep to actually be that once it's keyworder for needed arches
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.4:=[gtk]
-	>=app-text/enchant-2.2.0:2
-	>=dev-libs/glib-2.46:2[dbus]
-	>=dev-libs/libxml2-2.7.3:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
-	<gnome-extra/evolution-data-server-3.33
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/libsoup-2.42:2.4
-	>=net-libs/webkit-gtk-2.16.0:4
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libnotify-0.7:=
-	>=x11-misc/shared-mime-info-0.22
-
-	>=app-text/iso-codes-0.49
-	dev-libs/atk
-	gnome-base/dconf
-	>=dev-libs/libical-3.0.2:=
-	x11-libs/libSM
-	x11-libs/libICE
-
-	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
-	geolocation? (
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.10.0
-		x11-libs/mx:1.0 )
-	ldap? ( >=net-nds/openldap-2:= )
-	spell? ( >=app-text/gtkspell-3.0.10:3 )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.10:2= )
-	ytnef? ( net-mail/ytnef )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
-	!gnome-extra/evolution-exchange
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-# 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() {
-	eapply "${FILESDIR}"/3.32.4-gtk-doc-fix{1,2}.patch
-	eapply "${FILESDIR}"/${PV}-webkitgtk-2.26-compat.patch # Don't use with 3.34, it should be compatible without this hack.
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DENABLE_SMIME=$(usex ssl)
-		-DENABLE_GNOME_DESKTOP=ON
-		-DWITH_ENCHANT_VERSION=2
-		-DENABLE_CANBERRA=ON
-		-DENABLE_AUTOAR=$(usex archive)
-		-DWITH_HELP=ON
-		-DENABLE_YTNEF=OFF
-		-DWITH_BOGOFILTER=$(usex bogofilter)
-		-DWITH_SPAMASSASSIN=$(usex spamassassin)
-		-DENABLE_GTKSPELL=$(usex spell)
-		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_CONTACT_MAPS=$(usex geolocation)
-		-DENABLE_YTNEF=$(usex ytnef)
-		-DENABLE_PST_IMPORT=OFF
-		-DWITH_GLADE_CATALOG=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Problems with prelink:
-	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
-	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
-	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
-	doenvd "${T}"/99${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/evolution-3.34.4.ebuild b/mail-client/evolution/evolution-3.36.2.ebuild
index 15ea8d66bcea..2c90448a8995 100644
--- a/mail-client/evolution/evolution-3.34.4.ebuild
+++ b/mail-client/evolution/evolution-3.36.2.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=net-libs/libsoup-2.42:2.4
-	>=net-libs/webkit-gtk-2.16.0:4
+	>=net-libs/webkit-gtk-2.24.0:4
 	>=x11-libs/cairo-1.9.15:=[glib]
 	>=x11-libs/gdk-pixbuf-2.24:2
 	>=x11-libs/gtk+-3.22:3