gentoo auto-resync : 21:10:2022 - 02:01:39

4 files changed, 229 insertions, 33 deletions

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index ccf6aacd9fc1..a30f5f504b39 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -5,9 +5,11 @@ AUX claws-mail-4.1.0-perl-5.36.patch 11183 BLAKE2B ecbdfcfb8ecbf73bc8e74cc90de17
 DIST claws-mail-3.18.0.tar.xz 6517632 BLAKE2B 534a37a081ceeb4d3066717d738d04e2027d38c621c15091506ec117a3b592eedb6f3c67afddd972424976398019fda3d618db4083f0a05f39e7b8f07a1c2138 SHA512 3f73e11fc75234c44c0faf266a196c7f1c80b837fb920fc4a3979ede81f37efd180c006ab6436ae9c2dffde2d6c3bf6340a90d93e1e3fa8821fb09693d030811
 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
+DIST claws-mail-4.1.1.tar.xz 6523688 BLAKE2B 7e1b1ae201a67e14821f415d2b51f6eebfc2896699d89f2088fa9f7f21de984f6d8e4e92791c233ec755a15184ff5e562ce96ad9d197acc4e1f8dadb3fd57c30 SHA512 4157772fd0e918bae1df11230ce52691ff86181a0c164c0c5116d1ebb91885910e2e24ff18ae5e5ad4ed1c83ef830773de0b4ab40da988607909e0c17efb26b4
 EBUILD claws-mail-3.18.0-r3.ebuild 5631 BLAKE2B 82456d518d3316d71923667da8743142d7df7d631544e516bbee05ae555eca221bc73f374ba8afaf57c87f2cd97bbd2fc22728ce36c905553672271f8fe21a89 SHA512 b256cb224632450a22bd3fb66ae75cbeeb3e0524e964d6cf48cdc92a50ae00c3c22b83047a1a639c00e0abb252970b8e7d888c0cd639cc8c3340062f2f82bea1
 EBUILD claws-mail-3.19.0-r1.ebuild 5625 BLAKE2B 5b815f6be5b482d15a32c8c51d49c927cf80aec0ad8706b32af80c1bde46434ff7fd794d8677fc8ef29c15cf58f650e503674d46a7e0e0fb956eb445641906fd SHA512 05569a87074f974e86ccbf03118020b2b2449f3cf3014a9082c2bc759f3e7c69f37fa823103e7f244749cd55d45a0682e2a62882e8ddacbc69da4a403d6681ee
 EBUILD claws-mail-3.19.0-r2.ebuild 5674 BLAKE2B 2e7d16867ff97f487479672a09cebd43e6867e922f51834e1111095d7da20fe733f871daa5ea90f4dfb633d14bc1a454a75cee11346e8ef0a610bed37b1748df SHA512 ef74c181adb25adb3c5bc1b672c6435a9293005db1513e5ab1de47b9d1e2164dcb3752cbadb05e4ad7873a04870704819db12d83dd289d559a684625f2473d7e
 EBUILD claws-mail-4.1.0-r1.ebuild 5799 BLAKE2B d857c2300e97d11ce0fbfd9d157b61b64aa21c6cb8a3ddd97b14b6410726e4f610880585f5d739d492e187d1fde1e6278b4b17fea28a4cbb7586c2b252cdc3be SHA512 d04644ace0d55e50ff76b6fd19d8332cad1325f51abf1855e1f9b1506b6c3642644ab26ff26681e57b23308f7ba548a8b48dd4398f3a8c251995bf72c8a075f9
-EBUILD claws-mail-9999.ebuild 5998 BLAKE2B 4c9c1d9e74dd51a1dc4352f08284ffbc2db37b5107a91e9dd72bf417ee3a5b053dcc17a867db41f46236b99ddd3040b07947f7f8a260b01ac1a4c98efc1620af SHA512 d88dc00c953d137a6bc94887193aac83c3be8fdec211ccf59ccc101cea918ed90a13f0219563c2d2142e3cc49b45aa750d2ffb516e3bc0004f35e4a71bbafcd2
-MISC metadata.xml 1469 BLAKE2B 783f75970a9a6d0919903cc4b937f4584752e63d9d629e37e89bce5fcbe1bd309bd381d633c59ed2fb2c41786be9964a0d9fd4e7f0aeb92c41acde4fddf1583d SHA512 4015fdffd6751583cb815a9af0e1e0ec2efd052a0d448f3f24248dfc9a74fb5e98f204d4175042fd24aba900d175403b95d586efb8178c2d7fabc3c10abd1696
+EBUILD claws-mail-4.1.1.ebuild 5608 BLAKE2B c5d17ef4163d50b3a71486fd2dcfb2484c844af9dc70901ae1b78056813a2acb8771801c23b119ea0c59c7798caed08b14b347f8c77f77642f6345d9cf9105fb SHA512 9c16eac8505d755f74bbb05936e03f6d74aa145e5550052fb3ba3faf08f54b6852c226a7eba4c504ec8a4213a2b05e099e7c20b2063e2af34bf0961e85148667
+EBUILD claws-mail-9999.ebuild 5608 BLAKE2B c5d17ef4163d50b3a71486fd2dcfb2484c844af9dc70901ae1b78056813a2acb8771801c23b119ea0c59c7798caed08b14b347f8c77f77642f6345d9cf9105fb SHA512 9c16eac8505d755f74bbb05936e03f6d74aa145e5550052fb3ba3faf08f54b6852c226a7eba4c504ec8a4213a2b05e099e7c20b2063e2af34bf0961e85148667
+MISC metadata.xml 1380 BLAKE2B 134e42b62ca1d00f602b20ee1443c6f491adc1dc1ce1bff1b508b16160fcf492be561eb3c0d4be13073b32c0a2cb42efcaaa8783e5686a36668f11db909b0452 SHA512 1333b9a5401dd6389feb7d31f51e04576bca1773e69fcd5597d8ed6b439886cd7a0785371f6706aa012d03b4772857519074c1b13e824d2a555d8147e9acfaac
diff --git a/mail-client/claws-mail/claws-mail-4.1.1.ebuild b/mail-client/claws-mail/claws-mail-4.1.1.ebuild
new file mode 100644
index 000000000000..b4732cb9f330
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-4.1.1.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..11} )
+
+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"
+QA_PKGCONFIG_VERSION="${PV}.0"
+LICENSE="GPL-3"
+
+IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap 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="
+	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+:3
+	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
+		libcanberra? (  media-libs/libcanberra[gtk3] )
+		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 )
+	webkit? ( net-libs/webkit-gtk:4 )
+"
+
+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-generic-umpc
+		--disable-jpilot #735118
+		--disable-python-plugin
+		--enable-acpi_notifier-plugin
+		--enable-address_keeper-plugin
+		--enable-alternate-addressbook
+		--enable-att_remover-plugin
+		--enable-attachwarner-plugin
+		--enable-fetchinfo-plugin
+		--enable-ipv6
+		--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 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)
+		$(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 webkit fancy-plugin)
+		$(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/$(get_libdir)/${PN}/plugins/ \
+		\( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_postinst() {
+	ewarn "When upgrading from version 3.x please re-load any plugin you use"
+	xdg_pkg_postinst
+}
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index 27f7930493db..b4732cb9f330 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit autotools desktop python-any-r1 xdg
 
@@ -19,11 +19,11 @@ else
 fi
 
 SLOT="0"
+QA_PKGCONFIG_VERSION="${PV}.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 webkit xface"
+IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap 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 )
 	libnotify? ( notification )
 	networkmanager? ( dbus )
@@ -36,6 +36,7 @@ COMMONDEPEND="
 	sys-libs/zlib:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2[jpeg]
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/pango
 	archive? (
@@ -54,11 +55,6 @@ COMMONDEPEND="
 	gdata? ( >=dev-libs/libgdata-0.17.2 )
 	dillo? ( www-client/dillo )
 	gnutls? ( >=net-libs/gnutls-3.0 )
-	!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:= )
 	litehtml? (
@@ -71,11 +67,7 @@ COMMONDEPEND="
 	nntp? ( >=net-libs/libetpan-0.57 )
 	notification? (
 		dev-libs/glib:2
-		appindicator? ( dev-libs/libindicate:3[gtk] )
-		libcanberra? (
-			!gtk2? ( media-libs/libcanberra[gtk3] )
-			gtk2? ( media-libs/libcanberra[gtk2] )
-		)
+		libcanberra? (  media-libs/libcanberra[gtk3] )
 		libnotify? ( x11-libs/libnotify )
 	)
 	pdf? ( app-text/poppler[cairo] )
@@ -90,6 +82,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}
@@ -117,12 +110,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
 )
 
-pkg_setup() {
-	if [[ "${PV}" == 9999 ]] && ! use gtk2 ; then
-		EGIT_BRANCH="gtk3"
-	fi
-}
-
 src_prepare() {
 	default
 	eautoreconf
@@ -136,12 +123,14 @@ src_configure() {
 		--disable-bsfilter-plugin
 		--disable-generic-umpc
 		--disable-jpilot #735118
+		--disable-python-plugin
 		--enable-acpi_notifier-plugin
 		--enable-address_keeper-plugin
 		--enable-alternate-addressbook
 		--enable-att_remover-plugin
 		--enable-attachwarner-plugin
 		--enable-fetchinfo-plugin
+		--enable-ipv6
 		--enable-mailmbox-plugin
 		--enable-newmail-plugin
 		--enable-tnef_parse-plugin
@@ -156,7 +145,6 @@ src_configure() {
 		$(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)
@@ -167,7 +155,6 @@ src_configure() {
 		$(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)
@@ -178,6 +165,7 @@ src_configure() {
 		$(use_enable startup-notification)
 		$(use_enable svg)
 		$(use_enable valgrind valgrind)
+		$(use_enable webkit fancy-plugin)
 		$(use_enable xface compface)
 	)
 
@@ -188,12 +176,6 @@ 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[@]}"
 }
 
@@ -228,8 +210,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! use gtk2 ; then
-		ewarn "When upgrading from version 3.x please re-load any plugin you use"
-	fi
+	ewarn "When upgrading from version 3.x please re-load any plugin you use"
 	xdg_pkg_postinst
 }
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index 6d4525b18e7d..5e9efd0b26e6 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -10,7 +10,6 @@
 		<flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg> plugin</flag>
 		<flag name="dillo">Enable dillo html viewer plugin</flag>
 		<flag name="gdata">Enable plugin for access to Google data providers</flag>
-		<flag name="gtk2">Build support for GTK+-2 instead of GTK+-3 (live ebuild only)</flag>
 		<flag name="libcanberra">Enable sound notification in connection with USE=notification</flag>
 		<flag name="libnotify">Enable notification on the desktop in connection with USE=notification</flag>
 		<flag name="litehtml">Enable <pkg>dev-libs/gumbo</pkg> html viewer plugin</flag>