gentoo resync : 05.12.2021

4 files changed, 28 insertions, 231 deletions

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 501e388ce440..3fe5c1457a98 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,9 +1,7 @@
 AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05
-DIST claws-mail-3.17.8.tar.xz 6435692 BLAKE2B 2fb981ea86294eba0918c4b9bd74b762e19b6658d1970e6ec8f41e97e37063d3823f4aaae3ffcd855bd2839b7feb3a4bca0c15595fce2968de2418758f4fc50c SHA512 dc29c968dc81a184af8f66c1afe5c9d17558ce6a4a8b196136a9fb5deec96aa67eec42148ed0f4d6d6ee94aec2791247b9034090dac81beec193bd7d366617d7
 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 5619 BLAKE2B 127ec3a27ff10ba888c8eb38dbe1554a53e91e48e5c566bc3cc6a91ab78fa641a5a71ea806742678e6a0dc6331860224cd862ef5ee25d7238aa9893dba64d6bd SHA512 e1d3a53f2b0ecd925b7114c6c63a5cbd828dcda11522428581b5b3f56c7a094edab68f873194d9d7ee163fb5bde4efdfcc36a62757c30d69db6a5643fccd0c89
-EBUILD claws-mail-4.0.0.ebuild 5624 BLAKE2B 7f81fa67ffa10ccd4bcf08532669f2bc54c2d53ef22a9cf49004faea06d7a8d43eef50cb871c81a18bbacc14184c00110b8a2bec55022d952380b1091a0f5404 SHA512 6f635b8a8a62dc647eb86c57a2177153aa6f9853c6c8d155de9e4067dcbb502c6fb75e93a97dc10a339694d58f945db3bcb8e4a2fa5c6434b73b5abb4a8762ae
-EBUILD claws-mail-9999.ebuild 6011 BLAKE2B 6ae0cd5309e1f715bdd9abee4675bba545a4bfeed04ae98d14dfae3c1232069d8738269593095c1d2c415ff5a632aed4f928579daad601942a38db7f4360a8cd SHA512 57aab86cd5b19892c4f2cdd0bdbc99bde5b756845f92a4f1737e75c6194ae9b4fa14b6316990e550e56b5f8208c64f60626c660eca00c4907468e9c5d6577a82
+EBUILD claws-mail-4.0.0.ebuild 5677 BLAKE2B daeacf484d6b6fe5d3e103669f4f06c25f73a2754957352994688d6ce4e91910145dd1f681348ab89b5ecbd7227b304221268472f0fba52ee5c6c8ace4bc49bd SHA512 ab293dcacbb22e4951c544150effb9dab74951b168328c8052766998df877c33bdf2059cb2733f6c6cdfc16ff2e431b66602fca1793b85754ea8ccaccc02f809
+EBUILD claws-mail-9999.ebuild 5994 BLAKE2B fc2731ed060c37449e031d917f9c811644f0e867784d4579f476034cb2759094597edd7b398e3c918baec3efc5713dcb56432c7922e4b9d89a6991965e04a9ef SHA512 b6a0ca04d693ae5dcacd0171afaaa689c726c90d5a3108e232abeeb8c4aac20e58f05263b3a2bb7294e7bb24749540a62fbcf90ed9ea1517fe3d8c248858ebba
 MISC metadata.xml 1468 BLAKE2B 51e786691dbf1427b1532311620e6c844eb1c88fdb1df3a4935fdfa07e952fd5b9cddcf4ab2610561cdf381a14aaf42e15c544bd6cff76a62277e15571c9b45e SHA512 da6469f631ee92619caaddc6d924e41488eeaa956d5150414e6552d560f9e188a64b2df1e67738f40b6ad34b60ab9f1ba50fafafdfdfc521c3bddbc6df0b45d0
diff --git a/mail-client/claws-mail/claws-mail-3.17.8.ebuild b/mail-client/claws-mail/claws-mail-3.17.8.ebuild
deleted file mode 100644
index 474338a97d6a..000000000000
--- a/mail-client/claws-mail/claws-mail-3.17.8.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.claws-mail.org/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"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-IUSE="+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
-
-REQUIRED_USE="
-	appindicator? ( notification )
-	libcanberra? ( notification )
-	libnotify? ( notification )
-	networkmanager? ( dbus )
-	smime? ( pgp )
-"
-
-COMMONDEPEND="
-	dev-libs/nettle:=
-	net-mail/ytnef
-	sys-libs/zlib:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2[jpeg]
-	>=x11-libs/gtk+-2.24:2
-	x11-libs/libX11
-	x11-libs/pango
-	archive? (
-		app-arch/libarchive
-		>=net-misc/curl-7.9.7
-	)
-	bogofilter? ( mail-filter/bogofilter )
-	calendar? (
-		>=dev-libs/libical-2.0.0:=
-		>=net-misc/curl-7.9.7
-	)
-	dbus? (
-		>=dev-libs/dbus-glib-0.60
-		sys-apps/dbus
-	)
-	gdata? ( >=dev-libs/libgdata-0.17.2 )
-	dillo? ( www-client/dillo )
-	gnutls? ( >=net-libs/gnutls-3.0 )
-	imap? ( >=net-libs/libetpan-0.57 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	litehtml? (
-		>=dev-libs/glib-2.36:2
-		>=dev-libs/gumbo-0.10
-		net-misc/curl
-		media-libs/fontconfig
-	)
-	nls? ( >=sys-devel/gettext-0.18 )
-	nntp? ( >=net-libs/libetpan-0.57 )
-	notification? (
-		dev-libs/glib:2
-		appindicator? ( dev-libs/libindicate:3[gtk] )
-		libcanberra? (  media-libs/libcanberra[gtk] )
-		libnotify? ( x11-libs/libnotify )
-	)
-	pdf? ( app-text/poppler[cairo] )
-	pgp? ( >=app-crypt/gpgme-1.0.0 )
-	session? (
-		x11-libs/libICE
-		x11-libs/libSM
-	)
-	smime? ( >=app-crypt/gpgme-1.0.0 )
-	spam-report? ( >=net-misc/curl-7.9.7 )
-	spell? ( >=app-text/enchant-2.0.0:2= )
-	startup-notification? ( x11-libs/startup-notification )
-	svg? ( >=gnome-base/librsvg-2.40.5 )
-	valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=media-libs/compface-1.4 )
-"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info
-	clamav? ( app-antivirus/clamav )
-	networkmanager? ( net-misc/networkmanager )
-	pdf? ( app-text/ghostscript-gpl )
-	perl? ( dev-lang/perl:= )
-	rss? (
-		dev-libs/libxml2
-		net-misc/curl
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
-)
-
-src_prepare() {
-	xdg_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	# Don't use libsoup-gnome (bug #565924)
-	export HAVE_LIBSOUP_GNOME=no
-
-	local myeconfargs=(
-		--disable-bsfilter-plugin
-		--disable-fancy-plugin
-		--disable-generic-umpc
-		--disable-jpilot #735118
-		--enable-acpi_notifier-plugin
-		--enable-address_keeper-plugin
-		--enable-alternate-addressbook
-		--enable-att_remover-plugin
-		--enable-attachwarner-plugin
-		--enable-fetchinfo-plugin
-		--enable-mailmbox-plugin
-		--enable-newmail-plugin
-		--enable-tnef_parse-plugin
-		--with-password-encryption=$(usex gnutls gnutls old)
-		$(use_enable archive archive-plugin)
-		$(use_enable bogofilter bogofilter-plugin)
-		$(use_enable calendar vcalendar-plugin)
-		$(use_enable clamav clamd-plugin)
-		$(use_enable dbus)
-		$(use_enable debug crash-dialog)
-		$(use_enable dillo dillo-plugin)
-		$(use_enable doc manual)
-		$(use_enable gdata gdata-plugin)
-		$(use_enable gnutls)
-		$(use_enable ipv6)
-		$(use_enable ldap)
-		$(use_enable litehtml litehtml_viewer-plugin)
-		$(use_enable networkmanager)
-		$(use_enable nls)
-		$(use_enable notification notification-plugin)
-		$(use_enable pdf pdf_viewer-plugin)
-		$(use_enable perl perl-plugin)
-		$(use_enable pgp pgpcore-plugin)
-		$(use_enable pgp pgpinline-plugin)
-		$(use_enable pgp pgpmime-plugin)
-		--disable-python-plugin
-		$(use_enable rss rssyl-plugin)
-		$(use_enable session libsm)
-		$(use_enable sieve managesieve-plugin)
-		$(use_enable smime smime-plugin)
-		$(use_enable spam-report spam_report-plugin)
-		$(use_enable spamassassin spamassassin-plugin)
-		$(use_enable spell enchant)
-		$(use_enable startup-notification)
-		$(use_enable svg)
-		$(use_enable valgrind valgrind)
-		$(use_enable xface compface)
-	)
-
-	# libetpan is needed if user wants nntp or imap functionality
-	if use imap || use nntp ; then
-		myeconfargs+=( --enable-libetpan )
-	else
-		myeconfargs+=( --disable-libetpan )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
-	default
-
-	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
-	# => also install it in /usr/share/pixmaps for other desktop envs
-	# => also install higher resolution icons in /usr/share/icons/hicolor/...
-	insinto /usr/share/pixmaps
-	doins ${PN}.png
-	local size
-	for size in 64 128 ; do
-		newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
-	done
-
-	docinto tools
-	dodoc tools/README*
-
-	domenu ${PN}.desktop
-
-	einfo "Installing extra tools"
-	cd "${S}"/tools || die
-	exeinto /usr/$(get_libdir)/${PN}/tools
-	doexe *.pl *.py *.conf *.sh
-	doexe tb2claws-mail update-po uudec uuooffice
-
-	# kill useless files
-	rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_postinst() {
-	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
-	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
-	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
-	ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely"
-	xdg_pkg_postinst
-}
diff --git a/mail-client/claws-mail/claws-mail-4.0.0.ebuild b/mail-client/claws-mail/claws-mail-4.0.0.ebuild
index 2881f9a1b138..04764842d2c5 100644
--- a/mail-client/claws-mail/claws-mail-4.0.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.0.0.ebuild
@@ -21,7 +21,7 @@ fi
 SLOT="0"
 LICENSE="GPL-3"
 
-IUSE="+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+IUSE="+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
 REQUIRED_USE="
 	appindicator? ( notification )
 	libcanberra? ( notification )
@@ -83,6 +83,7 @@ COMMONDEPEND="
 	startup-notification? ( x11-libs/startup-notification )
 	svg? ( >=gnome-base/librsvg-2.40.5 )
 	valgrind? ( dev-util/valgrind )
+	webkit? ( net-libs/webkit-gtk:4 )
 "
 
 DEPEND="${COMMONDEPEND}
@@ -121,7 +122,6 @@ src_configure() {
 
 	local myeconfargs=(
 		--disable-bsfilter-plugin
-		--disable-fancy-plugin
 		--disable-generic-umpc
 		--disable-jpilot #735118
 		--enable-acpi_notifier-plugin
@@ -166,6 +166,7 @@ src_configure() {
 		$(use_enable startup-notification)
 		$(use_enable svg)
 		$(use_enable valgrind valgrind)
+		$(use_enable webkit fancy-plugin)
 		$(use_enable xface compface)
 	)
 
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index aca0fa2b8041..0383774f79fb 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit autotools desktop xdg
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools desktop python-any-r1 xdg
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
 HOMEPAGE="https://www.claws-mail.org/"
@@ -13,13 +15,13 @@ 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 ~riscv ~sparc ~x86"
 fi
 
 SLOT="0"
 LICENSE="GPL-3"
 
-IUSE="+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls gtk2 +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+IUSE="+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls gtk2 +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
 REQUIRED_USE="
 	appindicator? ( notification )
 	libcanberra? ( notification )
@@ -52,7 +54,10 @@ COMMONDEPEND="
 	gdata? ( >=dev-libs/libgdata-0.17.2 )
 	dillo? ( www-client/dillo )
 	gnutls? ( >=net-libs/gnutls-3.0 )
-	!gtk2? ( x11-libs/gtk+:3 )
+	!gtk2? (
+		x11-libs/gtk+:3
+		webkit? ( net-libs/webkit-gtk:4 )
+	)
 	gtk2? ( >=x11-libs/gtk+-2.24:2 )
 	imap? ( >=net-libs/libetpan-0.57 )
 	ldap? ( >=net-nds/openldap-2.0.7 )
@@ -67,7 +72,10 @@ COMMONDEPEND="
 	notification? (
 		dev-libs/glib:2
 		appindicator? ( dev-libs/libindicate:3[gtk] )
-		libcanberra? (  media-libs/libcanberra[gtk] )
+		libcanberra? (
+			!gtk2? ( media-libs/libcanberra[gtk3] )
+			gtk2? ( media-libs/libcanberra[gtk] )
+		)
 		libnotify? ( x11-libs/libnotify )
 	)
 	pdf? ( app-text/poppler[cairo] )
@@ -88,6 +96,7 @@ DEPEND="${COMMONDEPEND}
 	xface? ( >=media-libs/compface-1.4 )
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	app-arch/xz-utils
 	virtual/pkgconfig
 "
@@ -125,7 +134,6 @@ src_configure() {
 
 	local myeconfargs=(
 		--disable-bsfilter-plugin
-		--disable-fancy-plugin
 		--disable-generic-umpc
 		--disable-jpilot #735118
 		--enable-acpi_notifier-plugin
@@ -180,6 +188,12 @@ src_configure() {
 		myeconfargs+=( --disable-libetpan )
 	fi
 
+	if use gtk2 ; then
+		myeconfargs+=( --disable-fancy-plugin )
+	else
+		myeconfargs+=( $(use_enable webkit fancy-plugin) )
+	fi
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
@@ -214,9 +228,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
-	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
-	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
-	ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely"
+	if ! use gtk2 ; then
+		ewarn "When upgrading from version 3.x please re-load any plugin you use"
+	fi
 	xdg_pkg_postinst
 }