gentoo resync : 06.04.2022

4 files changed, 225 insertions, 8 deletions

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index ff0869cac54f..cf1eaa3dcc0f 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,7 +1,9 @@
 AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05
 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
+DIST claws-mail-3.19.0.tar.xz 6543188 BLAKE2B eeb7df2b921dbd7ad40c845804fcabe5ddc2064fcf410e7809004be472bbe2ba8bfd89a868420a1bb76845180856fee8a0b3cde879ae67b1a1aab14442fe5d2d SHA512 88780df55873919197d3c6df5102a8eb89a586e8287419c179e1d0af839435a719814b1e3643aa783a7badeadceafda2dc3cb4a3265432b5ad3a210663922b20
+DIST claws-mail-4.1.0.tar.xz 6471604 BLAKE2B 30d1725c2679e8a0b44edd6c30b15f28633c0a017935980d1412dabffdfb1f33e1c36bee3506e90af54410db222b64422155be821ba18f5e315ed411d477ed63 SHA512 83c7b1a8065628b1dcac58feb4d852b759b3fc376531572e88450b8e9517172a641f710a219b7e16bbc672dbe69853783e4edd1d7647a3f2aacb92e47be9175b
 EBUILD claws-mail-3.18.0-r2.ebuild 5625 BLAKE2B 4901c61956128628c711986624990c46092c536cc3c5b5226b1f6e9ff466f95b27b7fb5c0b3f89a8263df8eb1a1ac47860bbcd5abbc88e46acf7a0c4f095d849 SHA512 8d7587e9a318bdeaca51510202068481bb659ffb5047ae8734645ae86fa8ceeaf96950fa67a76dc9a259eb3d2802a3f930b96266e07c3966529ab71fd5947bc1
-EBUILD claws-mail-4.0.0-r2.ebuild 5683 BLAKE2B e0a64dc57e4e21da7929d9a9e99696531affce5cf0a4c33cabedd0566aaa147c2bf9adb7005629aca7dc931ae8656ef25e647aca16d9e3362d52deafb376601d SHA512 3349029ef7c8f6948e6952b26f623c151e612adc3bc6e4f00f7f09a0574396bb0f1909cc24218c5c256fede6c278fc25929bd53d3aa48a485d1f16ca4d8ed5b1
-EBUILD claws-mail-9999.ebuild 6000 BLAKE2B 1b843c30c450b11ab6afdbfe62f0b458175fedbe8c47657ef3b5a04a0a7fcfaf2d660f526d5b9719e3bc5d18abc5f4db13afded87b7068b093763e8ce0d15560 SHA512 3c4acd7c5fd37fcb3477403266880aabda6dce542f9a2c4536dc6a8b8a3d37900b7324b55629c28c13f756fbeceabb24fc2a50eff0e8d61489ad8efe2441fc63
+EBUILD claws-mail-3.19.0.ebuild 5624 BLAKE2B c00bdd28b76b33033603738627f42c46daf6bc1b23ddd32726817305d7bf155e1368790699ecdde242d1603a47d89ce188a0613773d542aa36b4adedcb1a5331 SHA512 dc6574c492cc32ef17ee2cd57ee4cf380ed8b5d22c8d29a9d8c4c0aa380d91a403971fc6b88c8a231422413dad2847b327c2622d56f710cc7fd4447a24ad5ca0
+EBUILD claws-mail-4.1.0.ebuild 5676 BLAKE2B f228bbcc167ed5a4fe810ff0857e305e8738579487740c027f5ecb9e5c2f8f0ab221f0be1218c495662cee00c5c0183fe8f0f0c677fd58503684999fb072363e SHA512 4293fff1c20affe0bace4a11d951cbc77cbd3b9718f2a47c10ebd81bd83db6320b994b876cdc7176cf75ca21586f0821577647b063abae5b7f83439255bebcb7
+EBUILD claws-mail-9999.ebuild 5992 BLAKE2B c0637e30639930d4f66fae5f525115504465fc702a345e7646b4fdb23578ddf8f6a64eb1a18953320ca2f6439335fd8f2f508bc4da777a04ecedf8027a04d2aa SHA512 df50847a70c2020fcea196ce9275f405dc1fe20bfec9563867b73a5e3046b3ffd8c0954a04401a5e604fc6d60532c2eb30c2fad11caf49cc90c4470dce77dd45
 MISC metadata.xml 1468 BLAKE2B 51e786691dbf1427b1532311620e6c844eb1c88fdb1df3a4935fdfa07e952fd5b9cddcf4ab2610561cdf381a14aaf42e15c544bd6cff76a62277e15571c9b45e SHA512 da6469f631ee92619caaddc6d924e41488eeaa956d5150414e6552d560f9e188a64b2df1e67738f40b6ad34b60ab9f1ba50fafafdfdfc521c3bddbc6df0b45d0
diff --git a/mail-client/claws-mail/claws-mail-3.19.0.ebuild b/mail-client/claws-mail/claws-mail-3.19.0.ebuild
new file mode 100644
index 000000000000..b949c8576708
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.19.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	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 ~riscv ~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
+	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="
+	${PYTHON_DEPS}
+	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() {
+	default
+	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
+	find "${ED}"/usr/lib*/claws-mail/plugins/ \
+		\( -name "*.a" -o -name ".la" \) -delete || die
+}
+
+pkg_postinst() {
+	ewarn "When upgrading from version <3.18 please re-load any plugin you use"
+	xdg_pkg_postinst
+}
diff --git a/mail-client/claws-mail/claws-mail-4.0.0-r2.ebuild b/mail-client/claws-mail/claws-mail-4.1.0.ebuild
index e570c9589d23..ec4aa3009ba5 100644
--- a/mail-client/claws-mail/claws-mail-4.0.0-r2.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools desktop python-any-r1 xdg
 
@@ -112,7 +112,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	xdg_src_prepare
+	default
 	eautoreconf
 }
 
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index 47e6a88b592a..741739274283 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -124,7 +124,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	xdg_src_prepare
+	default
 	eautoreconf
 }