gentoo resync : 13.11.2021

3 files changed, 155 insertions, 2 deletions

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 6ce60793c2a6..cce971117537 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,7 +1,9 @@
 DIST evolution-3.40.3.tar.xz 12216768 BLAKE2B 7b146ee09abff566a5a0cbbda9dda6ce5cd26c076462fd511cbc02fa35352d1ab776c67c5c99990278963a6f96c2ea8410588925cce1c05300e34ad5252de618 SHA512 08fcfdafd78ee323a57355dec1c8755525eefb599b70e6fb60ed0e9963a538a4b3f172b78f03aecbd245741fad08363b01ada46c2e349a9ccdc080d28c286452
 DIST evolution-3.40.4.tar.xz 12219300 BLAKE2B cbe56014252e8a23debbd4055be85d8bf89e25aa677b92880a6dba78d5d5fbb452403d5f9199b0257ca4c7ee10bff3bc5ca7601fa74390cf6d01d4d7cf099d1d SHA512 f6f08ab3cbc21397a0727b1edc5e37711294fdba6e537000d5a9f11f0142f69702fffad3922645fab256ccdee348b914a87abd0e6ed843c01762ccd32333518a
 DIST evolution-3.42.0.tar.xz 12243112 BLAKE2B fc79c75b4a684da8d0c09fbc8b682095704d9446c93909d57947083fb5798b622efdb4dc52423bc10bdd392e8f05f4968cbf119dd3ffad737403934e9ef5f68a SHA512 435155a69ef324ff3b0f85c9f0ed3206a7dfe12bd8ad5e9a87dff5de839e837417147e81faa93c57f207dff4d92cdc36ac3856402493ff693055f267aed5cbeb
+DIST evolution-3.42.1.tar.xz 12274632 BLAKE2B b42984b4d5c8446e4a8714e3c7c92f0cf2baa53af05146df0449d41a587d968a3d91c707a797e09865f3fa03c0397b6fecf88552e53936b068215d5aac3ece48 SHA512 9db26d27c78997c3924b6627389b1a5c95a2f161219346fe45016b346a68c10679039fbde540220fc31769b0d3402c228ef7283b55ea3388cf66398a11cb0508
 EBUILD evolution-3.40.3.ebuild 4156 BLAKE2B efda580e566f9f234b1c96252a5af675386f479a3b166a5a356eaecae7f83b2a4b9b140648ee1df755838dc303179ae656080c4c4bf48c19c10c0badc4d9feba SHA512 c007a759e42e4190e7c9c7a8c741c43fb2fa5d2eb126017f8b2269c8bd1af907ef42d2386849860724388d604bf0deaf066f9706a36597aeee74851352230f36
-EBUILD evolution-3.40.4.ebuild 4157 BLAKE2B 28fe2d273facbca610e00017c053661f2c1380076b00601a63d71c3dbfd22a47c61e000adad7ffe0434c889231c228240d7a3f68fffdade8127290001d54f2da SHA512 6f7259a25900aa06e7fd5166565311f28ad17fcb37cedddb149c194414bb4296b9543f1a6fe5f17a7ee6a82a7d9f8cdab2926fcffe69b8d3e0dc89fb2200c7b6
+EBUILD evolution-3.40.4.ebuild 4156 BLAKE2B efda580e566f9f234b1c96252a5af675386f479a3b166a5a356eaecae7f83b2a4b9b140648ee1df755838dc303179ae656080c4c4bf48c19c10c0badc4d9feba SHA512 c007a759e42e4190e7c9c7a8c741c43fb2fa5d2eb126017f8b2269c8bd1af907ef42d2386849860724388d604bf0deaf066f9706a36597aeee74851352230f36
 EBUILD evolution-3.42.0.ebuild 4158 BLAKE2B 20d944a401e2f8cd3ac032a089a6d3b126dc9daa1a0c42e8c18e210360e6cd59c1944283df0a51ad3edf2413d33ff57d0637be629c265693ac7bd5817028314a SHA512 68777f37ecb80c4178b6fe72994fffe7fa92ac4f848abf26e4a1529f6ecc5de118eb73c7154693c159d14304a2d0d936cf5c453c6b574514a8164262fb781578
+EBUILD evolution-3.42.1.ebuild 4158 BLAKE2B 20d944a401e2f8cd3ac032a089a6d3b126dc9daa1a0c42e8c18e210360e6cd59c1944283df0a51ad3edf2413d33ff57d0637be629c265693ac7bd5817028314a SHA512 68777f37ecb80c4178b6fe72994fffe7fa92ac4f848abf26e4a1529f6ecc5de118eb73c7154693c159d14304a2d0d936cf5c453c6b574514a8164262fb781578
 MISC metadata.xml 1078 BLAKE2B b3a32d1876342fba5db22aae478cf1194df56f01719c6322f13a069e9fe8d1f17123b9592e0a0c5c25ac856ddbb9d20266bc11ce7c9a4737aa7dd43e76c0aa8d SHA512 9c3da89a72cc8235f73fb98b2cbe21597a4889ebd4d989a98e105613e131a42236ed115c0ac88cb87a312a43123c5bdcc44aa76328bf3cd537367553691408f1
diff --git a/mail-client/evolution/evolution-3.40.4.ebuild b/mail-client/evolution/evolution-3.40.4.ebuild
index 9df09b459828..49e0a4481f0a 100644
--- a/mail-client/evolution/evolution-3.40.4.ebuild
+++ b/mail-client/evolution/evolution-3.40.4.ebuild
@@ -14,7 +14,7 @@ SLOT="2.0"
 
 IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
diff --git a/mail-client/evolution/evolution-3.42.1.ebuild b/mail-client/evolution/evolution-3.42.1.ebuild
new file mode 100644
index 000000000000..141bc4cc9c0c
--- /dev/null
+++ b/mail-client/evolution/evolution-3.42.1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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="~amd64 ~arm ~arm64 ~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
+# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
+DEPEND="
+	>=app-crypt/gcr-3.4:=[gtk]
+	>=app-text/enchant-2.2.0:2
+	>=dev-libs/glib-2.56: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?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.28.0:4[spell?]
+	>=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
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	bogofilter? ( mail-filter/bogofilter )
+	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 )
+	ldap? ( >=net-nds/openldap-2:= )
+	spamassassin? ( mail-filter/spamassassin )
+	spell? ( >=app-text/gspell-1.8:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+	ytnef? ( net-mail/ytnef )
+"
+RDEPEND="${DEPEND}
+	highlight? ( app-text/highlight )
+"
+BDEPEND="
+	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
+"
+
+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_src_prepare call, if that works
+
+src_prepare() {
+	cmake_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_GSPELL=$(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_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_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
+}