gentoo resync : 10.09.2021

5 files changed, 2 insertions, 156 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 4697fde18ffc..997f1ec18c9c 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 24595284a704..eddc7a33744a 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -3,7 +3,7 @@ DIST claws-mail-3.17.8.tar.xz 6435692 BLAKE2B 2fb981ea86294eba0918c4b9bd74b762e1
 DIST claws-mail-3.18.0.tar.xz 6517632 BLAKE2B 534a37a081ceeb4d3066717d738d04e2027d38c621c15091506ec117a3b592eedb6f3c67afddd972424976398019fda3d618db4083f0a05f39e7b8f07a1c2138 SHA512 3f73e11fc75234c44c0faf266a196c7f1c80b837fb920fc4a3979ede81f37efd180c006ab6436ae9c2dffde2d6c3bf6340a90d93e1e3fa8821fb09693d030811
 DIST claws-mail-4.0.0.tar.xz 6390300 BLAKE2B 291c62e7dc0329ce12dd571a15f19942ac6ae6f3bbbcba3708afbe30682392883ceba165356d4be68e3b655aade85ecdad4ed8a296517b37fd0f7918e8418d51 SHA512 26d207fb8b5ce8b814a8a712843a209f58c8c9df3e9623387322b2e70ac351c71ac8b1ff77c52c5df9a14a46be7f65413efc0a4dbcda1e70ecb453f042da153e
 EBUILD claws-mail-3.17.8.ebuild 5819 BLAKE2B 0b72ef52caa8f8ea581cf115df92d676264fb9fec881bfc45ef7c4a97aa577e28b51bc855196c708f8b5706b49c6f64594be9f364f97f98b75ac360d51264f4f SHA512 a4289b4097e83d65454a7b985ea992bdd3c9582f67f611f70357bebdb810495d24b0b2a858bd53835342e988cfe1c36379edebde870d40930fca921b55473e2e
-EBUILD claws-mail-3.18.0.ebuild 5613 BLAKE2B f333cdaa879cb414d34b807fb27f515e07e2080faeb399046f09853a0c10547bf3b60c0ef3366b4488a4f134ef0c6248941a39a85cce5f5beb9faa1d5cad68a0 SHA512 f5889c26c34adcc52a76e9d7b9f0c4000b91ce0585176bf631faf09a2d535f4c8c13cca73bf7e9d3194066c23c3037014ca3bf584734c2bb714bd9da9fc1b54b
+EBUILD claws-mail-3.18.0.ebuild 5612 BLAKE2B 3fbc8b378df524af90ea4f892b2665c26bdd794fb48af40c913c0bc886f297cbcf0c2836dcb624af18097b3f9d80c89d1d19e27c52bcb5bca9658d83dbcae852 SHA512 63a15e773e79ec27533b6437733d40116378f6461f277928de506930bea1991e0d406c4cabad77b3a5105ec8a38787aeab659fd4c7550b324e7cff9ce4095917
 EBUILD claws-mail-4.0.0.ebuild 5617 BLAKE2B 097e014cf0813657a36845f3c70b02222d3cbae33f95797bc708f18e3fb27aa253725d2e48a37528d1609451c793d5e3235ab749a4eef1c6f7fdba90d192abb8 SHA512 8c80e2beb4f3ae07848b0c40918abac1d7ad68975116b7ec9a615b7c8ebc1ce818662a5a6fb884b4ea51c8cca6ccd8e04696084cab1c655921344fd342a2611c
 EBUILD claws-mail-9999.ebuild 6011 BLAKE2B 6ae0cd5309e1f715bdd9abee4675bba545a4bfeed04ae98d14dfae3c1232069d8738269593095c1d2c415ff5a632aed4f928579daad601942a38db7f4360a8cd SHA512 57aab86cd5b19892c4f2cdd0bdbc99bde5b756845f92a4f1737e75c6194ae9b4fa14b6316990e550e56b5f8208c64f60626c660eca00c4907468e9c5d6577a82
 MISC metadata.xml 1467 BLAKE2B 84d9e335170d8e84ac9da4a8e02222cab0b2454ce4044878c8f1bf7a390f7ed190633537469be424de5e2db58791636b86b7db325a971d684233919838cf97d3 SHA512 6c655572b3f4c5cfb38776118fbbe692385bc7dfa5211846a13cde6f2d2d5ab3dc05b12a9a93da1ad7c82c5963dff2773ab3dd8f32e8d1a44fa4d7834e77ded1
diff --git a/mail-client/claws-mail/claws-mail-3.18.0.ebuild b/mail-client/claws-mail/claws-mail-3.18.0.ebuild
index 68630bf1ec58..353b92186afd 100644
--- a/mail-client/claws-mail/claws-mail-3.18.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.18.0.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git"
 else
 	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 SLOT="0"
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 5da2b7554d9e..519cef467ce5 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,7 +1,5 @@
-DIST evolution-3.40.2.tar.xz 12215356 BLAKE2B df1bc738ea058c2e624e7d56b69bb13e059ceb25fc4fa26d00823677fee61ccb9adc16ee70f5f702163b59f3fcf760a116eb2eabe2350edcad693614d6c0b68e SHA512 081692e157bcc300ef26179f5e12a22bdc993043ca7c56b63622c4608b3c36c3c2e642d5353124c8661cc1ce2841d147345de86b4171ee7341493ffe0e24fc08
 DIST evolution-3.40.3.tar.xz 12216768 BLAKE2B 7b146ee09abff566a5a0cbbda9dda6ce5cd26c076462fd511cbc02fa35352d1ab776c67c5c99990278963a6f96c2ea8410588925cce1c05300e34ad5252de618 SHA512 08fcfdafd78ee323a57355dec1c8755525eefb599b70e6fb60ed0e9963a538a4b3f172b78f03aecbd245741fad08363b01ada46c2e349a9ccdc080d28c286452
 DIST evolution-3.40.4.tar.xz 12219300 BLAKE2B cbe56014252e8a23debbd4055be85d8bf89e25aa677b92880a6dba78d5d5fbb452403d5f9199b0257ca4c7ee10bff3bc5ca7601fa74390cf6d01d4d7cf099d1d SHA512 f6f08ab3cbc21397a0727b1edc5e37711294fdba6e537000d5a9f11f0142f69702fffad3922645fab256ccdee348b914a87abd0e6ed843c01762ccd32333518a
-EBUILD evolution-3.40.2.ebuild 4174 BLAKE2B 934f54e05123d518ebc4d8b2df4e545da85a50d8d23d1e20b9d59f4489fc741a68e98fa79cf0abfb288038e0e8adfe4d26296279c59d90f4f585fad9da776821 SHA512 b0fbe1e12c1fbb7b047a81f3f99ef6e6fcc360e6f319f7d6e751f38e2134bce15d6d381964a5d30c541493a356a1ba4b119ace6c9f200bfdfccfea597657036c
 EBUILD evolution-3.40.3.ebuild 4156 BLAKE2B efda580e566f9f234b1c96252a5af675386f479a3b166a5a356eaecae7f83b2a4b9b140648ee1df755838dc303179ae656080c4c4bf48c19c10c0badc4d9feba SHA512 c007a759e42e4190e7c9c7a8c741c43fb2fa5d2eb126017f8b2269c8bd1af907ef42d2386849860724388d604bf0deaf066f9706a36597aeee74851352230f36
 EBUILD evolution-3.40.4.ebuild 4158 BLAKE2B 20d944a401e2f8cd3ac032a089a6d3b126dc9daa1a0c42e8c18e210360e6cd59c1944283df0a51ad3edf2413d33ff57d0637be629c265693ac7bd5817028314a SHA512 68777f37ecb80c4178b6fe72994fffe7fa92ac4f848abf26e4a1529f6ecc5de118eb73c7154693c159d14304a2d0d936cf5c453c6b574514a8164262fb781578
 MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c
diff --git a/mail-client/evolution/evolution-3.40.2.ebuild b/mail-client/evolution/evolution-3.40.2.ebuild
deleted file mode 100644
index a37eb5ddf470..000000000000
--- a/mail-client/evolution/evolution-3.40.2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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
-		x11-libs/mx:1.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
-}