gentoo auto-resync : 28:01:2024 - 12:57:11

7 files changed, 6 insertions, 1084 deletions

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 1756c2f12601..3399c8402b47 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,20 +1,16 @@
 AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05
 AUX claws-mail-3.19.0-perl-5.36.patch 11254 BLAKE2B 0c348bc581a83e068dcf9afa0d0b526fe831983d86576e2eb2a4cb2b6c07a0e6d28f71eea1865e5b44e2849d981741b5552598ed4387184e07d90c1b42928c72 SHA512 38699d82ac108012bd9416dc67b0f1bb50bfea30bdd5df36d49ea899f2dc905ec53d77bff2f33a17741eecbf533019f50825bbde46af5e9c29e20001b8aef499
-AUX claws-mail-4.1.0-disable_gnutls.patch 19822 BLAKE2B 7dc777cecababa089d299c8209a3198ac3066cbe6e27931fe541c8337e98dd3b564f14641b63bbbf1c0546168ac37e6dba9452cf57298fe3359371fe08bd8714 SHA512 0919161f4968249bddf6f8186cbd3b4dcc1d618d656fd5e7b8a5e51a08e24b4d322d38dfdea1ca6b950554afd86e515debdbb2ddf8205f9befcd9a9f88a97feb
 AUX claws-mail-4.1.0-perl-5.36.patch 11183 BLAKE2B ecbdfcfb8ecbf73bc8e74cc90de173a15b1a2634c0a55455a63933f53bccb1639bd475018e864d02e5aa248b14e25c43a6de0c7356a6ec7c3d352f2879e4c6ae SHA512 105ab6596aa540bc901e30072371271e8c9874bdc97dac0ff15084bed1b44a5dbaca1e5e9548e32c648e8599ac8dccae041dd42ad202dd3f224dc138e19625aa
 AUX claws-mail-4.1.1-fix_lto.patch 368 BLAKE2B 8925e93d1785361b23b6cf0b107606fe50aa5b1c369ba36e4be463bbdd51930a727f8f4e17467ea41fb5bda9fb05d9a2aab1a09f3b04b731ce2854247226d7ae SHA512 0e9e180d2d3303d416d3d3accab49f1a43ebada337a6ca1916c2bbaadeb801039209d2f68f2f78448ee421da947216ee584e1c2aba18b5c221b34b5d4f6655b8
 AUX claws-mail-4.1.1-litehtml_gcc13.patch 1135 BLAKE2B c2b327a272862c4ade64f43b12ed0610061b9b68e5f0560a628eaaa0481987f347c31d7a46db31ce6d8cc1d668d5cdecef767dd2a1ffe8c2c745ca0a604941ff SHA512 5c6fa56b439d5073042acc0b432147fd920661c489912653288108387f8529a6011830f7c445d2925fc5486f4dbf7fa1a5f90f17a6e3c5d3ea68599149096e51
 AUX claws-mail-4.1.1-webkitgtk4.1.patch 12462 BLAKE2B 4368d262ad952cdf1098409378c4015b853ec7e0988ad682f47b269f77e30e96e23e1712fa53c26360cfef17785fd0595e0dee88486f77f359db95e37695987a SHA512 0034b29ea759ff7be68cc92f7ebf1f49e7e77006f8e2e266269bfce105b9672ba56aa26bdd145d11c9c7cf9263b97a5f39fe1154cf79e553b1a0c8a21a38af0f
 DIST claws-mail-3.19.0.tar.xz 6543188 BLAKE2B eeb7df2b921dbd7ad40c845804fcabe5ddc2064fcf410e7809004be472bbe2ba8bfd89a868420a1bb76845180856fee8a0b3cde879ae67b1a1aab14442fe5d2d SHA512 88780df55873919197d3c6df5102a8eb89a586e8287419c179e1d0af839435a719814b1e3643aa783a7badeadceafda2dc3cb4a3265432b5ad3a210663922b20
 DIST claws-mail-3.20.0.tar.xz 6687376 BLAKE2B 9a72e77ea922271fdb947e4f76229c89cb0fb2589921fca6fd161714a3093a137165b84b84db5cece5cb6b06998e237d524104ddddd87078dcba36a94f02e0eb SHA512 66d0087493452cf43357fbfb2338b3716ec45d202f51cce033aa3a8888ec4dac2d6eb9e652efb22bcfcab1e6c00ff650a9926114fb4647f753e44013e607d923
-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
 DIST claws-mail-4.2.0.tar.xz 6674872 BLAKE2B b3118b45f1d3e8ae31a9c7bfa529fd5c8fda3ff8823e88a5ef078432d38d4150b05791deafff2577378ea17b03d965374755d2536ff6835ed46bcd566fefddaf SHA512 2415f246fc88b76263e1c43860c0638e08c581493333a3d846831f26cda21f0f14035a759379031d52e56aef2516bacec147a2cd5a153fc8fecf02ede64077f1
 EBUILD claws-mail-3.19.0-r3.ebuild 5621 BLAKE2B d22014990d6d28fe6bc3a3419240fc340c4fdb6c58c0ca0bd24695261a13a9c7cc850efc0d54bc52b15fd04a6499166a17db550f078ccfd13c352efb71b2874e SHA512 fe7b48f24cda6a1d15f8098ddb945215c609bb61a5d1d5f4059df5a40f63dd78f5e02efefc9317c4344dd1c44a3bb3cad8f41602e582926cb31e167e8172d598
 EBUILD claws-mail-3.20.0-r1.ebuild 5499 BLAKE2B b5bbdb62bd631facaab18657ad35fd101e2c2f78bd6c842237b9d48b4dcb47156f8f2d9a4f6c4f832da7937e04e6b5622d7ded9f0f8befd68d51540d3e6eea40 SHA512 fec2c9469f6b7e6c0006eb5b2a891df098f3413418968308d3fb51d5d024f0969ec37ff9928422a564e4f9d4969c3070eb8314e305d4387e1d17007a4e71c3ef
-EBUILD claws-mail-4.1.0-r2.ebuild 5719 BLAKE2B 61acbaf73f293bc65f9309f036761a328d9ac1ed1b27446e14b3e2007ea72f3edb020248da63eaaf8f75662e0b671bea3f2ddb74c84b5fac08087b8dadad53c0 SHA512 cc589a46aff4edc511dfbbaaaad3aaff9f3fd136a8c83776b33785144ca3991ebdde7ad4d69c38fde9014c1436f04aad71d98c2eacbf90d7f146eb547de7a8cd
-EBUILD claws-mail-4.1.1-r3.ebuild 5630 BLAKE2B c84e50fb0db7b08a5558ac922e17013e55d2d5fb28841d6bcf3b90ba24d8b94105d50b3d12f573a1f75e1994908a74671181b14e272a196d05e42351df9b7ddb SHA512 f3318f6ec5d18b0f4ba9dfbc206146fa98d63d464385a5c0ebe30b8ec3da08e70586b7411b3b0ca9e4f7b9cc135f9afa4de12d469a21c21b01300b45ac4caa38
-EBUILD claws-mail-4.1.1-r4.ebuild 5635 BLAKE2B a815ee11599ce00e09d394753b6ff342fc1f156eee9bccd5b52b7aa885da92d10aec39231a38592e08669f4c1dfb692f3b937810378508f35f9a904aca383356 SHA512 14286232c01cb7b476fc903a70859c0f95fdd784d56937709a1935e25450ef7504f87739f80886b596ffe8671bf073452c76a9c57030fa467b9ae6c9aa25e64a
-EBUILD claws-mail-4.2.0-r1.ebuild 5650 BLAKE2B d5fa716d525019e525de3e5367883713b41f98a8f13644038ff111cee225031970f849b5edcbbb1af6d2d67d1b020bc659f1beeb4f1b10c05e3a41885d8daf1d SHA512 7a370f0f3df95686d2fe78c5aa20b7fc10e72e4018ad7e04f53cce49b769383f0c3f09ca38b368da84fcb10192c58c3187ff334adaa7bfe8367c517c7696c58e
-EBUILD claws-mail-9999.ebuild 5759 BLAKE2B 72f46f491e453571b8b1fcc853d1946bd7c23c21102cb5aa893b4fb12d640de8ee09f071611b09766be09b8b2552a1d07caae5f0eaa8ad90774429a966603ec5 SHA512 d8ed88e904fd8fd115250c862fe2df5e9e793d6c0124dfd3c3cb302c58c02588f858857d28403d1ae56d2a9acf5a04d45e4858ac04a77c14ba906e0877d14aaf
+EBUILD claws-mail-4.1.1-r4.ebuild 5638 BLAKE2B a96c2a34350ecf4adfdc9d1da538a5d430f7071ac7a01dd303abbc79cac8aeef7d481c253e6bfea67588c998937671e802d902af9288ea4df4ead7770f671cee SHA512 51c1cc196d0c9c932e7ec54c154209b830dd18779dd4f6804707d1d2861920f87931b51ad9c92faa9c28811168082d36a0faddde1d073d53df0111b28d413a2c
+EBUILD claws-mail-4.2.0-r1.ebuild 5653 BLAKE2B f26845d4db9a4f480f278cc75f917102965ca0b0715af6ddf8da54938959288ca6f55f6dbab267d316c794d677d0669f1237282ec5e2a4e7cd2d8caa6bb59cbc SHA512 057547c5364b7a75081813b10980555a922f43334832b68fae4be4be130fefa7d6aadcbc3660475fdbd23395e5af638834cedb1cfcb4808b2cacaa461823eeeb
+EBUILD claws-mail-9999.ebuild 5762 BLAKE2B 556189a82c42601a5b430181e4321e177070b9f7b645e601fc3d7edf5aca523ebd99dfffc2332f30ced9222703ba2c8fea52e8b892d02a2969ebad11831f485b SHA512 8736a37f233acfc30dbe40bae8439b40c884dc3ac651d9b59b530d62382b37a2251a01e7517b06b61ccdf759790a5ce8244de7238c2ee3cca4f3be7fda5703a7
 MISC metadata.xml 1370 BLAKE2B d4e8a3be1636876f73dd0e789bbd1e62cc35e938b84623c4d177746bdd758bea5dd4bbb7d3c58077cac0554c1c6948f07fc4bf883eec70928f76c3fd495faf85 SHA512 e13f1ab08ddebc27da373923d20d4cfc292313a2f63438d55bd4843c90555ead1e4678345c2df6272ed784d52e305ccbaeda749b34e36f325e1de89a63b08e76
diff --git a/mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild b/mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild
deleted file mode 100644
index 0e559de511fe..000000000000
--- a/mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_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 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 )
-	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 )
-	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[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-debug/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"
-	"${FILESDIR}/${PN}-4.1.0-perl-5.36.patch"
-	"${FILESDIR}/${PN}-4.1.0-disable_gnutls.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-dillo-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 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 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-4.1.1-r3.ebuild b/mail-client/claws-mail/claws-mail-4.1.1-r3.ebuild
deleted file mode 100644
index 9b8a1f96ad41..000000000000
--- a/mail-client/claws-mail/claws-mail-4.1.1-r3.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..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"
-LICENSE="GPL-3"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth 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 )
-	oauth? ( gnutls )
-	smime? ( pgp )
-"
-
-COMMONDEPEND="
-	>=dev-libs/glib-2.36:2
-	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-lang/perl:=
-		>=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 )
-	gnutls? ( >=net-libs/gnutls-3.0 )
-	imap? ( >=net-libs/libetpan-0.57 )
-	ldap? ( >=net-nds/openldap-2.0.7:= )
-	litehtml? (
-		>=dev-libs/gumbo-0.10:=
-		net-misc/curl
-		media-libs/fontconfig
-	)
-	nls? ( >=sys-devel/gettext-0.18 )
-	nntp? ( >=net-libs/libetpan-0.57 )
-	notification? (
-		libcanberra? (  media-libs/libcanberra[gtk3] )
-		libnotify? ( x11-libs/libnotify )
-	)
-	perl? ( dev-lang/perl:= )
-	pdf? ( app-text/poppler[cairo] )
-	pgp? ( >=app-crypt/gpgme-1.0.0:= )
-	rss? (
-		dev-libs/libxml2
-		net-misc/curl
-	)
-	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-debug/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 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
-	"${FILESDIR}/${PN}-4.1.1-fix_lto.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-dillo-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 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 oauth oauth2)
-		$(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-4.1.1-r4.ebuild b/mail-client/claws-mail/claws-mail-4.1.1-r4.ebuild
index d03c5bd0d89f..902c4bdc278a 100644
--- a/mail-client/claws-mail/claws-mail-4.1.1-r4.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.1.1-r4.ebuild
@@ -37,7 +37,7 @@ COMMONDEPEND="
 	sys-libs/zlib:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2[jpeg]
-	x11-libs/gtk+:3
+	x11-libs/gtk+:3[X]
 	x11-libs/libX11
 	x11-libs/pango
 	archive? (
diff --git a/mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild b/mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild
index 5c39b553119e..5851aa86830f 100644
--- a/mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild
@@ -38,7 +38,7 @@ COMMONDEPEND="
 	sys-libs/zlib:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2[jpeg]
-	x11-libs/gtk+:3
+	x11-libs/gtk+:3[X]
 	x11-libs/libX11
 	x11-libs/pango
 	archive? (
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index ced89451d1f2..4490774ed8e4 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -38,7 +38,7 @@ COMMONDEPEND="
 	sys-libs/zlib:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2[jpeg]
-	x11-libs/gtk+:3
+	x11-libs/gtk+:3[X]
 	x11-libs/libX11
 	x11-libs/pango
 	archive? (
diff --git a/mail-client/claws-mail/files/claws-mail-4.1.0-disable_gnutls.patch b/mail-client/claws-mail/files/claws-mail-4.1.0-disable_gnutls.patch
deleted file mode 100644
index 5bfea4727e51..000000000000
--- a/mail-client/claws-mail/files/claws-mail-4.1.0-disable_gnutls.patch
+++ /dev/null
@@ -1,641 +0,0 @@
-diff -Naur claws-mail-4.1.0.orig/src/common/smtp.c claws-mail-4.1.0/src/common/smtp.c
---- claws-mail-4.1.0.orig/src/common/smtp.c	2022-03-19 13:03:24.000000000 +0100
-+++ claws-mail-4.1.0/src/common/smtp.c	2022-07-23 22:10:48.323673856 +0200
-@@ -1,6 +1,6 @@
- /*
-  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
-- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
-+ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -42,11 +42,11 @@
- static gint smtp_auth(SMTPSession *session);
- #ifdef USE_GNUTLS
- static gint smtp_starttls(SMTPSession *session);
-+static gint smtp_auth_oauth2(SMTPSession *session);
- #endif
- static gint smtp_auth_cram_md5(SMTPSession *session);
- static gint smtp_auth_login(SMTPSession *session);
- static gint smtp_auth_plain(SMTPSession *session);
--static gint smtp_auth_oauth2(SMTPSession *session);
- 
- static gint smtp_ehlo(SMTPSession *session);
- static gint smtp_ehlo_recv(SMTPSession *session, const gchar *msg);
-@@ -176,11 +176,13 @@
-                  &&
- 		  (session->avail_auth_type & SMTPAUTH_PLAIN) != 0)
- 		smtp_auth_plain(session);
-+#ifdef USE_GNUTLS
- 	else if ((session->forced_auth_type == SMTPAUTH_OAUTH2
- 		  || session->forced_auth_type == 0)
-                  &&
- 		  (session->avail_auth_type & SMTPAUTH_OAUTH2) != 0)
- 		smtp_auth_oauth2(session);
-+#endif
- 	else if (session->forced_auth_type == 0) {
- 		log_warning(LOG_PROTOCOL, _("No SMTP AUTH method available\n"));
- 		return SM_AUTHFAIL;
-@@ -323,8 +325,10 @@
- 				session->avail_auth_type |= SMTPAUTH_CRAM_MD5;
- 			if (strcasestr(p, "DIGEST-MD5"))
- 				session->avail_auth_type |= SMTPAUTH_DIGEST_MD5;
-+#ifdef USE_GNUTLS
- 			if (strcasestr(p, "XOAUTH2"))
- 				session->avail_auth_type |= SMTPAUTH_OAUTH2;
-+#endif
- 		}
- 		if (g_ascii_strncasecmp(p, "SIZE", 4) == 0) {
- 			p += 5;
-@@ -399,7 +403,7 @@
- 	return SM_OK;
- }
- 
--
-+#ifdef USE_GNUTLS
- static gint smtp_auth_oauth2(SMTPSession *session)
- {
- 	gchar buf[MESSAGEBUFSIZE], *b64buf, *out;
-@@ -428,6 +432,7 @@
- 
- 	return SM_OK;
- }
-+#endif
- 
- static gint smtp_auth_login(SMTPSession *session)
- {
-@@ -547,7 +552,9 @@
- 	case SMTP_AUTH_PLAIN:
- 	case SMTP_AUTH_LOGIN_USER:
- 	case SMTP_AUTH_LOGIN_PASS:
-+#ifdef USE_GNUTLS
-         case SMTP_AUTH_OAUTH2:
-+#endif
- 	case SMTP_AUTH_CRAM_MD5:
- 		log_print(LOG_PROTOCOL, "ESMTP< %s\n", msg);
- 		break;
-@@ -670,7 +677,9 @@
- 		break;
- 	case SMTP_AUTH_PLAIN:
- 	case SMTP_AUTH_LOGIN_PASS:
-+#ifdef USE_GNUTLS
-         case SMTP_AUTH_OAUTH2:
-+#endif
- 	case SMTP_AUTH_CRAM_MD5:
- 		ret = smtp_from(smtp_session);
- 		break;
-diff -Naur claws-mail-4.1.0.orig/src/etpan/imap-thread.c claws-mail-4.1.0/src/etpan/imap-thread.c
---- claws-mail-4.1.0.orig/src/etpan/imap-thread.c	2022-03-19 13:03:24.000000000 +0100
-+++ claws-mail-4.1.0/src/etpan/imap-thread.c	2022-07-23 22:10:48.324673857 +0200
-@@ -1,6 +1,6 @@
- /*
-  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
-- * Copyright (C) 2005-2016 DINH Viet Hoa and the Claws Mail team
-+ * Copyright (C) 2005-2022 the Claws Mail team and DINH Viet Hoa
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -999,9 +999,11 @@
- 			param->type, NULL, NULL, NULL,
- 			NULL, param->login,
- 			param->password, NULL);
--	else if (!strcmp(param->type, "XOAUTH2")) {
-+#ifdef USE_GNUTLS
-+	else if (!strcmp(param->type, "XOAUTH2"))
-                 r = mailimap_oauth2_authenticate(param->imap, param->login, param->password);
--	} else
-+#endif
-+	else
- 		r = mailimap_authenticate(param->imap,
- 			param->type, NULL, NULL, NULL,
- 			param->login, param->login,
-diff -Naur claws-mail-4.1.0.orig/src/imap.c claws-mail-4.1.0/src/imap.c
---- claws-mail-4.1.0.orig/src/imap.c	2022-03-19 13:03:24.000000000 +0100
-+++ claws-mail-4.1.0/src/imap.c	2022-07-23 22:10:48.325673859 +0200
-@@ -72,7 +72,9 @@
- #include "main.h"
- #include "passwordstore.h"
- #include "file-utils.h"
-+#ifdef USE_GNUTLS
- #include "oauth2.h"
-+#endif
- 
- typedef struct _IMAPFolder	IMAPFolder;
- typedef struct _IMAPSession	IMAPSession;
-@@ -913,9 +915,11 @@
- 	case IMAP_AUTH_PLAIN:
- 		ok = imap_cmd_login(session, user, pass, "PLAIN");
- 		break;
-+#ifdef USE_GNUTLS
- 	case IMAP_AUTH_OAUTH2:
- 		ok = imap_cmd_login(session, user, pass, "XOAUTH2");
- 		break;
-+#endif
- 	case IMAP_AUTH_LOGIN:
- 		ok = imap_cmd_login(session, user, pass, "LOGIN");
- 		break;
-@@ -932,7 +936,9 @@
- 				"\t DIGEST-MD5 %d\n"
- 				"\t SCRAM-SHA-1 %d\n"
- 				"\t PLAIN %d\n"
-+#ifdef USE_GNUTLS
- 				"\t OAUTH2 %d\n"
-+#endif
- 				"\t LOGIN %d\n"
- 				"\t GSSAPI %d\n", 
- 			imap_has_capability(session, "ANONYMOUS"),
-@@ -940,7 +946,9 @@
- 			imap_has_capability(session, "DIGEST-MD5"),
- 			imap_has_capability(session, "SCRAM-SHA-1"),
- 			imap_has_capability(session, "PLAIN"),
-+#ifdef USE_GNUTLS
- 			imap_has_capability(session, "XOAUTH2"),
-+#endif
- 			imap_has_capability(session, "LOGIN"),
- 			imap_has_capability(session, "GSSAPI"));
- 		if (imap_has_capability(session, "CRAM-MD5"))
-@@ -957,8 +965,10 @@
- 			ok = imap_cmd_login(session, user, pass, "GSSAPI");
- 		if (ok == MAILIMAP_ERROR_LOGIN) /* we always try plaintext login before giving up */
- 			ok = imap_cmd_login(session, user, pass, "plaintext");
-+#ifdef USE_GNUTLS
- 		if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "XOAUTH2"))
- 			ok = imap_cmd_login(session, user, pass, "XOAUTH2");
-+#endif
- 	}
- 
- 	if (ok == MAILIMAP_NO_ERROR)
-@@ -993,12 +1003,12 @@
- 				     "compiled with SASL support and the "
- 				     "LOGIN SASL plugin is installed.");
- 		}
--
-+#ifdef USE_GNUTLS
- 		if (type == IMAP_AUTH_OAUTH2) {
- 			ext_info = _("\n\nOAuth2 error. Check and correct your OAuth2 "
- 				     "account preferences.");
- 		} 
--
-+#endif
- 		if (time(NULL) - last_login_err > 10) {
- 			if (!prefs_common.no_recv_err_panel) {
- 				alertpanel_error_log(_("Connection to %s failed: "
-@@ -1320,10 +1330,10 @@
- 	gboolean failed = FALSE;
- 	gint ok = MAILIMAP_NO_ERROR;
- 	g_return_val_if_fail(account->userid != NULL, MAILIMAP_ERROR_BAD_STATE);
--
-+#ifdef USE_GNUTLS
- 	if(account->imap_auth_type == IMAP_AUTH_OAUTH2)
- 	        oauth2_check_passwds (account);
--	
-+#endif
- 	if (!password_get(account->userid, account->recv_server, "imap",
- 			 SESSION(session)->port, &acc_pass)) {
- 		acc_pass = passwd_store_get_account(account->account_id,
-diff -Naur claws-mail-4.1.0.orig/src/inc.c claws-mail-4.1.0/src/inc.c
---- claws-mail-4.1.0.orig/src/inc.c	2022-03-19 13:03:24.000000000 +0100
-+++ claws-mail-4.1.0/src/inc.c	2022-07-23 22:10:48.325673859 +0200
-@@ -61,7 +61,9 @@
- #include "hooks.h"
- #include "logwindow.h"
- #include "passwordstore.h"
-+#ifdef USE_GNUTLS
- #include "oauth2.h"
-+#endif
- 
- extern SessionStats session_stats;
- 
-@@ -633,11 +635,12 @@
- 			manage_window_focus_in
- 				(inc_dialog->dialog->window,
- 				 NULL, NULL);
--
-+#ifdef USE_GNUTLS
- 		if(pop3_session->ac_prefs->use_pop_auth && 
- 		   pop3_session->ac_prefs->pop_auth_type == POPAUTH_OAUTH2)
- 		     oauth2_check_passwds (pop3_session->ac_prefs);
--		
-+#endif
-+
- 		if (password_get(pop3_session->user,
- 					pop3_session->ac_prefs->recv_server,
- 					"pop3", pop3_get_port(pop3_session),
-diff -Naur claws-mail-4.1.0.orig/src/oauth2.c claws-mail-4.1.0/src/oauth2.c
---- claws-mail-4.1.0.orig/src/oauth2.c	2022-03-19 13:03:24.000000000 +0100
-+++ claws-mail-4.1.0/src/oauth2.c	2022-07-23 22:10:48.325673859 +0200
-@@ -22,6 +22,8 @@
- #include "claws-features.h"
- #endif
- 
-+#ifdef USE_GNUTLS
-+
- #include <glib.h>
- #ifdef ENABLE_NLS
- #include <glib/gi18n.h>
-@@ -715,3 +717,5 @@
- 	 
- 	 return (0);
- }
-+
-+#endif	/* USE_GNUTLS */
-diff -Naur claws-mail-4.1.0.orig/src/oauth2.h claws-mail-4.1.0/src/oauth2.h
---- claws-mail-4.1.0.orig/src/oauth2.h	2022-03-19 13:03:24.000000000 +0100
-+++ claws-mail-4.1.0/src/oauth2.h	2022-07-23 22:10:48.325673859 +0200
-@@ -1,6 +1,6 @@
- /*
-  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
-- * Copyright (C) 2020 the Claws Mail team
-+ * Copyright (C) 2020-2022 the Claws Mail team
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -21,6 +21,8 @@
- #include "claws-features.h"
- #endif
- 
-+#ifdef USE_GNUTLS
-+
- #include <glib.h>
- 
- #include "socket.h"
-@@ -79,3 +81,5 @@
- gint oauth2_use_refresh_token (Oauth2Service provider, OAUTH2Data *OAUTH2Data);
- guchar* oauth2_decode(const gchar *in);
- void oauth2_encode(const gchar *in);
-+
-+#endif	/* USE_GNUTLS */
-diff -Naur claws-mail-4.1.0.orig/src/pop.c claws-mail-4.1.0/src/pop.c
---- claws-mail-4.1.0.orig/src/pop.c	2022-03-19 13:03:24.000000000 +0100
-+++ claws-mail-4.1.0/src/pop.c	2022-07-23 22:10:48.325673859 +0200
-@@ -1,6 +1,6 @@
- /*
-  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
-- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
-+ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -178,6 +178,7 @@
- 	return PS_SUCCESS;
- }
- 
-+#ifdef USE_GNUTLS
- static gint pop3_getauth_oauth2_send(Pop3Session *session)
- {
- 	gchar buf[MESSAGEBUFSIZE], *b64buf, *out;
-@@ -202,6 +203,7 @@
- 	g_free(out);
- 	return PS_SUCCESS;
- }
-+#endif
- 
- static gint pop3_getrange_stat_send(Pop3Session *session)
- {
-@@ -533,8 +535,10 @@
- 
- 	if (!g_ascii_strncasecmp(buf, "PASS ", 5))
- 		log_print(LOG_PROTOCOL, "POP> PASS ********\n");
-+#ifdef USE_GNUTLS
-         else if  (!g_ascii_strncasecmp(buf, "AUTH XOAUTH2 ", 13))
- 		log_print(LOG_PROTOCOL, "POP> AUTH XOAUTH2  ********\n");
-+#endif
- 	else
- 		log_print(LOG_PROTOCOL, "POP> %s\n", buf);
- 
-@@ -989,12 +993,12 @@
- #ifdef USE_GNUTLS
- 		if (pop3_session->ac_prefs->ssl_pop == SSL_STARTTLS)
- 			val = pop3_stls_send(pop3_session);
-+                else if (pop3_session->ac_prefs->use_pop_auth && pop3_session->ac_prefs->pop_auth_type == POPAUTH_OAUTH2)
-+			val = pop3_getauth_oauth2_send(pop3_session);
- 		else
- #endif
- 		if (pop3_session->ac_prefs->use_pop_auth && pop3_session->ac_prefs->pop_auth_type == POPAUTH_APOP)
- 			val = pop3_getauth_apop_send(pop3_session);
--                else if (pop3_session->ac_prefs->use_pop_auth && pop3_session->ac_prefs->pop_auth_type == POPAUTH_OAUTH2)
--			val = pop3_getauth_oauth2_send(pop3_session);
- 		else
- 			val = pop3_getauth_user_send(pop3_session);
- 		break;
-@@ -1015,7 +1019,9 @@
- 		break;
- 	case POP3_GETAUTH_PASS:
- 	case POP3_GETAUTH_APOP:
-+#ifdef USE_GNUTLS
-         case POP3_GETAUTH_OAUTH2:
-+#endif
- 		if (!pop3_session->pop_before_smtp)
- 			val = pop3_getrange_stat_send(pop3_session);
- 		else
-diff -Naur claws-mail-4.1.0.orig/src/prefs_account.c claws-mail-4.1.0/src/prefs_account.c
---- claws-mail-4.1.0.orig/src/prefs_account.c	2022-03-19 13:03:24.000000000 +0100
-+++ claws-mail-4.1.0/src/prefs_account.c	2022-07-23 22:14:18.477957308 +0200
-@@ -1,6 +1,6 @@
- /*
-  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
-- * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
-+ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -54,7 +54,9 @@
- #include "smtp.h"
- #include "imap.h"
- #include "pop.h"
-+#ifdef USE_GNUTLS
- #include "oauth2.h"
-+#endif
- #include "remotefolder.h"
- #include "combobox.h"
- #include "setup.h"
-@@ -200,6 +202,7 @@
- 	GtkWidget *pop_auth_minutes_lbl;
- } SendPage;
- 
-+#ifdef USE_GNUTLS
- typedef struct Oauth2Page
- {
-         PrefsPage page;
-@@ -218,6 +221,7 @@
-         GtkWidget *oauth2_client_secret_entry;
- 
- } Oauth2Page;
-+#endif
- 
- typedef struct
- {
-@@ -373,7 +377,9 @@
- static BasicPage basic_page;
- static ReceivePage receive_page;
- static SendPage send_page;
-+#ifdef USE_GNUTLS
- static Oauth2Page oauth2_page;
-+#endif
- static ComposePage compose_page;
- static TemplatesPage templates_page;
- static PrivacyPage privacy_page;
-@@ -416,7 +422,8 @@
- static void prefs_account_pop_auth_type_set_data_from_optmenu
- 							(PrefParam *pparam);
- static void prefs_account_pop_auth_type_set_optmenu	(PrefParam *pparam);
-- 
-+
-+#ifdef USE_GNUTLS
- static void prefs_account_oauth2_provider_set_data_from_optmenu
- 							(PrefParam *pparam);
- static void prefs_account_oauth2_provider_set_optmenu	(PrefParam *pparam);
-@@ -425,6 +432,7 @@
- static void prefs_account_oauth2_set_sensitivity(void);
- static void prefs_account_oauth2_set_auth_sensitivity(void);
- static void prefs_account_oauth2_obtain_tokens(GtkButton *button, gpointer data);
-+#endif
- static void prefs_account_set_autochk_interval_from_widgets(PrefParam *pparam);
- static void prefs_account_set_autochk_interval_to_widgets(PrefParam *pparam);
- 
-@@ -652,6 +660,7 @@
- };
- 
- static PrefParam oauth2_param[] = {
-+#ifdef USE_GNUTLS
- 	{"oauth2_auth_provider", "0", &tmp_ac_prefs.oauth2_provider, P_ENUM,
- 	 &oauth2_page.oauth2_auth_optmenu,
- 	 prefs_account_oauth2_provider_set_data_from_optmenu,
-@@ -668,6 +677,23 @@
- 
- 	{"oauth2_client_secret", NULL, &tmp_ac_prefs.oauth2_client_secret, P_STRING,
- 	 &oauth2_page.oauth2_client_secret_entry, prefs_set_data_from_entry, prefs_set_entry},
-+#else
-+	{"oauth2_auth_provider", "0", &tmp_ac_prefs.oauth2_provider, P_ENUM,
-+	 NULL, NULL, NULL},
-+
-+	{"oauth2_date", 0, &tmp_ac_prefs.oauth2_date, P_INT,
-+	 NULL, NULL, NULL},
-+
-+	{"oauth2_authcode", NULL, &tmp_ac_prefs.oauth2_authcode, P_PASSWORD,
-+	 NULL, NULL, NULL},
-+
-+	{"oauth2_client_id", NULL, &tmp_ac_prefs.oauth2_client_id, P_STRING,
-+	 NULL, NULL, NULL},
-+
-+	{"oauth2_client_secret", NULL, &tmp_ac_prefs.oauth2_client_secret, P_STRING,
-+	 NULL, NULL, NULL},
-+
-+#endif
- 
- 	{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
- };
-@@ -1624,8 +1650,9 @@
- 	COMBOBOX_ADD (menu2, _("Select"), 0);
- 	COMBOBOX_ADD (menu2, NULL, 0);
- 	COMBOBOX_ADD (menu2, "APOP", POPAUTH_APOP);
-+#ifdef USE_GNUTLS
- 	COMBOBOX_ADD (menu2, "OAuth2", POPAUTH_OAUTH2);
--
-+#endif
- 	SET_TOGGLE_SENSITIVITY (pop_auth_checkbtn, vbox5);
- 
- 	PACK_CHECK_BUTTON (vbox2, rmmail_checkbtn,
-@@ -1762,7 +1789,9 @@
- 	COMBOBOX_ADD (menu, "SCRAM-SHA-1", IMAP_AUTH_SCRAM_SHA1);
- 	COMBOBOX_ADD (menu, "PLAIN", IMAP_AUTH_PLAIN);
- 	COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN);
-+#ifdef USE_GNUTLS
- 	COMBOBOX_ADD (menu, "OAUTH2", IMAP_AUTH_OAUTH2);
-+#endif
- 
- 	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
- 	gtk_widget_show (hbox1);
-@@ -2019,7 +2048,9 @@
- 	COMBOBOX_ADD (menu, "PLAIN", SMTPAUTH_PLAIN);
- 	COMBOBOX_ADD (menu, "LOGIN", SMTPAUTH_LOGIN);
- 	COMBOBOX_ADD (menu, "CRAM-MD5", SMTPAUTH_CRAM_MD5);
-+#ifdef USE_GNUTLS
- 	COMBOBOX_ADD (menu, "OAUTH2", SMTPAUTH_OAUTH2);
-+#endif
- 	COMBOBOX_ADD (menu, "DIGEST-MD5", SMTPAUTH_DIGEST_MD5);
- 	gtk_list_store_set(menu, &iter, COMBOBOX_SENS, FALSE, -1);
- 
-@@ -2165,6 +2196,7 @@
- 	page->page.widget = vbox1;
- }
- 
-+#ifdef USE_GNUTLS
- static void oauth2_create_widget_func(PrefsPage * _page,
-                                            GtkWindow * window,
-                                            gpointer data)
-@@ -2379,6 +2411,7 @@
- 	/* 	oauth2_encode(OAUTH2info[0][OA2_CLIENT_ID]); */
- 
- }
-+#endif
- 
- static void compose_create_widget_func(PrefsPage * _page,
-                                            GtkWindow * window,
-@@ -3612,8 +3645,10 @@
- 			gtk_entry_get_text(GTK_ENTRY(basic_page.pass_entry)),
- 			FALSE);
- 
-+#ifdef USE_GNUTLS
- 	/* Manual password change - reset expiry on OAUTH2 tokens*/
- 	passwd_store_set_account(tmp_ac_prefs.account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, "0", FALSE);
-+#endif
- 
- 	if (protocol == A_IMAP4 || protocol == A_NNTP) {
- 		new_id = g_strdup_printf("#%s/%s",
-@@ -3656,13 +3691,15 @@
- 			PWS_ACCOUNT_SEND,
- 			gtk_entry_get_text(GTK_ENTRY(send_page.smtp_pass_entry)),
- 			FALSE);
--
-+#ifdef USE_GNUTLS
- 	/* Manual password change - reset expiry on OAUTH2 tokens*/
- 	passwd_store_set_account(tmp_ac_prefs.account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, "0", FALSE);
-+#endif
- 
- 	return 0;
- }
- 
-+#ifdef USE_GNUTLS
- static gint prefs_oauth2_apply(void)
- {
- 	prefs_set_data_from_dialog(oauth2_param);
-@@ -3675,6 +3712,7 @@
- 
-  	return 0;
- }
-+#endif
- 
- static gint prefs_compose_apply(void)
- {
-@@ -3773,10 +3811,12 @@
- 	/* SendPage *page = (SendPage *) _page; */
- }
- 
-+#ifdef USE_GNUTLS
- static void oauth2_destroy_widget_func(PrefsPage *_page)
- {
- 	/* Oauth2Page *page = (Oauth2Page *) _page; */
- }
-+#endif
- 
- static void compose_destroy_widget_func(PrefsPage *_page)
- {
-@@ -3840,6 +3880,7 @@
- 	return prefs_send_apply() >= 0;
- }
- 
-+#ifdef USE_GNUTLS
- static gboolean oauth2_can_close_func(PrefsPage *_page)
- {	
- 	Oauth2Page *page = (Oauth2Page *) _page;
-@@ -3849,6 +3890,7 @@
- 
- 	return prefs_oauth2_apply() >= 0;
- }
-+#endif
- 
- static gboolean compose_can_close_func(PrefsPage *_page)
- {	
-@@ -3945,6 +3987,7 @@
- 		cancelled = FALSE;
- }
- 
-+#ifdef USE_GNUTLS
- static void oauth2_save_func(PrefsPage *_page)
- {
- 	Oauth2Page *page = (Oauth2Page *) _page;
-@@ -3955,6 +3998,7 @@
- 	if (prefs_oauth2_apply() >= 0)
- 		cancelled = FALSE;
- }
-+#endif
- 
- static void compose_save_func(PrefsPage *_page)
- {
-@@ -4090,6 +4134,7 @@
- 	prefs_account_register_page((PrefsPage *) &send_page);
- }
- 
-+#ifdef USE_GNUTLS
- static void register_oauth2_page(void)
- {
- 	static gchar *path[3];
-@@ -4107,6 +4152,7 @@
- 
- 	prefs_account_register_page((PrefsPage *) &oauth2_page);
- }
-+#endif
- 
- static void register_compose_page(void)
- {
-@@ -4296,7 +4342,9 @@
- 	hooks_register_hook(SSL_CERT_GET_PASSWORD, sslcert_get_password, NULL);
- #endif
- 	register_proxy_page();
-+#ifdef USE_GNUTLS
- 	register_oauth2_page();
-+#endif
- 	register_advanced_page();
- }
- 
-@@ -5043,6 +5091,7 @@
- 	combobox_select_by_data(optmenu, type);
- }
- 
-+#ifdef USE_GNUTLS
- static void prefs_account_oauth2_provider_set_data_from_optmenu(PrefParam *pparam)
- {
- 	*((Oauth2Service *)pparam->data) =
-@@ -5177,6 +5226,7 @@
- 	g_free(trim_text);
- 	g_free(OAUTH2Data);
- }
-+#endif
- 
- static void prefs_account_set_autochk_interval_to_widgets(PrefParam *pparam)
- {
-diff -Naur claws-mail-4.1.0.orig/src/prefs_account.h claws-mail-4.1.0/src/prefs_account.h
---- claws-mail-4.1.0.orig/src/prefs_account.h	2022-03-19 13:03:24.000000000 +0100
-+++ claws-mail-4.1.0/src/prefs_account.h	2022-07-23 22:10:48.328673863 +0200
-@@ -1,6 +1,6 @@
- /*
-  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
-- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
-+ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-diff -Naur claws-mail-4.1.0.orig/src/send_message.c claws-mail-4.1.0/src/send_message.c
---- claws-mail-4.1.0.orig/src/send_message.c	2022-03-19 13:03:24.000000000 +0100
-+++ claws-mail-4.1.0/src/send_message.c	2022-07-23 22:10:48.328673863 +0200
-@@ -57,7 +57,9 @@
- #include "log.h"
- #include "passwordstore.h"
- #include "file-utils.h"
-+#ifdef USE_GNUTLS
- #include "oauth2.h"
-+#endif
- 
- typedef struct _SendProgressDialog	SendProgressDialog;
- 
-@@ -282,6 +284,9 @@
- 		    strlen(ac_prefs->gnutls_priority))
- 			session->gnutls_priority = g_strdup(ac_prefs->gnutls_priority);
- 		session->use_tls_sni = ac_prefs->use_tls_sni;
-+
-+		if (ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2)
-+		        oauth2_check_passwds (ac_prefs);
- #else
- 		if (ac_prefs->ssl_smtp != SSL_NONE) {
- 			if (alertpanel_full(_("Insecure connection"),
-@@ -299,9 +304,6 @@
- 		}
- 		port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT;
- #endif
--		
--		if(ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2)
--		        oauth2_check_passwds (ac_prefs);
- 
- 		if (ac_prefs->use_smtp_auth) {
- 			smtp_session->forced_auth_type = ac_prefs->smtp_auth_type;