5 files changed, 1 insertions, 575 deletions
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 6cd8ebd9d1d6..8748a9f3612f 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,15 +1,11 @@
 AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05
 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
 AUX claws-mail-4.2.0-gtksocket.patch 7480 BLAKE2B debc702b86ecf27944c76a5b1c011e62990016174c41bdac315b5022f4587fc45242ae24ae2bd7d9802f74236a04b5ea2955ff3ee2762e453ef9a1b871974144 SHA512 c00b1d55523f5f60c609d9d58cae95861ff65c2a8a9f4f22029f53df6a9394abf679732714b01c58f67995aff8a7763b002feae2d412ba4d6bc5d147dbc41515
 DIST claws-mail-3.21.0.tar.xz 6848648 BLAKE2B 9b2c89b5b9105add54db7b55f082e965645b67ca361edb9cdb7fdc3793146332acb678f06a493b0668c6a7d36a70d471d25948b0d14d6f61b22423057014a67f SHA512 59078bdb2d0314c63d4c63fdf493b0484c731523a2a099dd29816b14586f6ef038e36f794284d60deb45fe22b4c29bd239da49cc3b94549884742ef64d2fdcae
-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
 DIST claws-mail-4.3.0.tar.xz 6831980 BLAKE2B e4dfb35b7f542ee514613b55286a19e2db398babc391a648edbda6d694b2e76973e1e7b6c4b7942b335898a571ffbbfef60fea1831ad4ac5ef7457a454259198 SHA512 3b0e811948d75ca2d003035d545d46d142ed4f2c1a103dc862413f9ff7a5ba612e00a7d5832836657e8d382bc7f94520496aaf60da429c72d9fb146ba12f0dfc
 EBUILD claws-mail-3.21.0-r1.ebuild 5300 BLAKE2B 3bf76da7d4901a53fedefdc7c46b4afabee2a0673b081d5df91a8c97f17aed4c45af147af10824ba6592c67b07f294691c79a3c261cc25f6f8f0730ef8140672 SHA512 a0052f06853b8240b40ca7684d8dd5af9dc3a07e076138b7cf87d3979b8ee4d3788eec22b595900317d56e2b273afbfd1edd3c493d99db3ea6a1312aad962138
-EBUILD claws-mail-4.1.1-r4.ebuild 5638 BLAKE2B a96c2a34350ecf4adfdc9d1da538a5d430f7071ac7a01dd303abbc79cac8aeef7d481c253e6bfea67588c998937671e802d902af9288ea4df4ead7770f671cee SHA512 51c1cc196d0c9c932e7ec54c154209b830dd18779dd4f6804707d1d2861920f87931b51ad9c92faa9c28811168082d36a0faddde1d073d53df0111b28d413a2c
 EBUILD claws-mail-4.2.0-r2.ebuild 5681 BLAKE2B 53e683434b1f888835cb31f8a5d0d56b4759874c707513ef7c22c4ec3dc98f0c9edc71d7e95d7365a8ecffe2bdcdb3a9ef7c2191c937e89167764a63bcca4986 SHA512 d64fc34de67f5f254c6d4baf9e8ab1dd7ba83f8f45dd5e062459d6cd0eb4809dcb4ea447f72a62ec86bca41f9141fa91cdac7c6a63adbe42d16fe407b7754042
 EBUILD claws-mail-4.3.0.ebuild 5714 BLAKE2B e6f6e826bc1a071d1faac98f6fbd2c9c6a567cf83d8a31e37a10f41256c18a58de6cd1c0bf6eb78318c7edcbeec79c106db16abafd42112b448a5b764f79da0b SHA512 01a60d39f51923bd6bdd3434bfd61205bfc9a60a2d75dbf5ff5c0e8c7486d8968534d70a3a3cb8d1a9097d302e908db046ca18e291e2d4f2fee641fdd4aeb098
 EBUILD claws-mail-9999.ebuild 5727 BLAKE2B d6483a2da9d2c0933ef23f678980b20e9ab37e2a4add3d25637f6ee0ff0851df36ba94595b36e7acce46eff14b7db9f41ed27b2c523df4e55ff4321685e4e32c SHA512 11bafd152cb21aebed676d9f3574b50ca0a1699db2356ae49db1349fa39e8958de745d85e311224c0e822c015a7e3d88fb79549f5b5bcaf4b97efd18103b3010
-MISC metadata.xml 1370 BLAKE2B d4e8a3be1636876f73dd0e789bbd1e62cc35e938b84623c4d177746bdd758bea5dd4bbb7d3c58077cac0554c1c6948f07fc4bf883eec70928f76c3fd495faf85 SHA512 e13f1ab08ddebc27da373923d20d4cfc292313a2f63438d55bd4843c90555ead1e4678345c2df6272ed784d52e305ccbaeda749b34e36f325e1de89a63b08e76
+MISC metadata.xml 1292 BLAKE2B 10b606071c9dd64ff986e6da0b7331f0b57c71e3c91437bcae62a4dd7c1eaec77dc03280589399613ed61e5ae08f686ac04fe73e7f1567d84ce8d98a2f22bdd6 SHA512 c91b7fd38b54cdec285f4d11b3a9333e38949e4676137a463be48868f61e5ce37c7a77fbb1e636a1044ec1fa7304e4a7659b1924ceed9c0028c870c6baaf1304
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
deleted file mode 100644
index 902c4bdc278a..000000000000
--- a/mail-client/claws-mail/claws-mail-4.1.1-r4.ebuild
+++ /dev/null
@@ -1,215 +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[X]
-	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.1 )
-"
-
-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"
-	"${FILESDIR}/${P}-webkitgtk4.1.patch"
-	"${FILESDIR}/${P}-litehtml_gcc13.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	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/files/claws-mail-4.1.1-litehtml_gcc13.patch b/mail-client/claws-mail/files/claws-mail-4.1.1-litehtml_gcc13.patch
deleted file mode 100644
index 10da0463b843..000000000000
--- a/mail-client/claws-mail/files/claws-mail-4.1.1-litehtml_gcc13.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a9a16a253ed3865a51db5e306539d3494087dafd Mon Sep 17 00:00:00 2001
-From: Paul <paul@claws-mail.org>
-Date: Wed, 19 Apr 2023 16:42:07 +0100
-Subject: [PATCH] fix bug 4648, 'fails to build with gcc 13'
-
----
- src/plugins/litehtml_viewer/litehtml/html.h    | 1 +
- src/plugins/litehtml_viewer/litehtml/num_cvt.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/plugins/litehtml_viewer/litehtml/html.h b/src/plugins/litehtml_viewer/litehtml/html.h
-index 4151b1225..20457f155 100644
---- a/src/plugins/litehtml_viewer/litehtml/html.h
-+++ b/src/plugins/litehtml_viewer/litehtml/html.h
-@@ -9,6 +9,7 @@
- #include <cstring>
- #include <algorithm>
- #include <sstream>
-+#include <cstdint>
- #include "os_types.h"
- #include "types.h"
- #include "background.h"
-diff --git a/src/plugins/litehtml_viewer/litehtml/num_cvt.h b/src/plugins/litehtml_viewer/litehtml/num_cvt.h
-index 515e46d62..367dcc36a 100644
---- a/src/plugins/litehtml_viewer/litehtml/num_cvt.h
-+++ b/src/plugins/litehtml_viewer/litehtml/num_cvt.h
-@@ -2,6 +2,7 @@
- #define NUM_CVT_H
- 
- #include <string>
-+#include <cstdint>
- #include "os_types.h"
- 
- namespace litehtml
--- 
-2.25.1
-
diff --git a/mail-client/claws-mail/files/claws-mail-4.1.1-webkitgtk4.1.patch b/mail-client/claws-mail/files/claws-mail-4.1.1-webkitgtk4.1.patch
deleted file mode 100644
index cfd9cb6842e8..000000000000
--- a/mail-client/claws-mail/files/claws-mail-4.1.1-webkitgtk4.1.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-diff -Naur claws-mail-4.1.1.orig/configure.ac claws-mail-4.1.1/configure.ac
---- claws-mail-4.1.1.orig/configure.ac	2022-10-20 10:13:00.000000000 +0200
-+++ claws-mail-4.1.1/configure.ac	2023-04-02 22:12:14.715133250 +0200
-@@ -1238,26 +1238,10 @@
- AC_SUBST(EXPAT_LIBS)
- 
- dnl webkit *********************************************************************
--PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0 >= 2.18.0, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
-+PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.1 >= 2.18.0, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
- AC_SUBST(WEBKIT_LIBS)
- AC_SUBST(WEBKIT_CFLAGS)
- 
--dnl libsoup ********************************************************************
--PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
--if test x"$HAVE_LIBSOUP" = xyes; then
--	AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup is available])
--fi
--AC_SUBST(LIBSOUP_CFLAGS)
--AC_SUBST(LIBSOUP_LIBS)
--
--dnl libsoup-gnome **************************************************************
--PKG_CHECK_MODULES(LIBSOUP_GNOME, libsoup-gnome-2.4 >= 2.26, HAVE_LIBSOUP_GNOME=yes, HAVE_LIBSOUP_GNOME=no)
--if test x"$HAVE_LIBSOUP_GNOME" = xyes; then
--	AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup_gnome is available])
--fi
--AC_SUBST(LIBSOUP_GNOME_CFLAGS)
--AC_SUBST(LIBSOUP_GNOME_LIBS)
--
- dnl libarchive *****************************************************************
- PKG_CHECK_MODULES(LIBARCHIVE, libarchive, HAVE_ARCHIVE=yes, HAVE_ARCHIVE=no)
- AC_SUBST(ARCHIVE_LIBS)
-@@ -1573,7 +1557,7 @@
- 	dependencies_missing=""
- 
- 	if test x"$HAVE_WEBKIT" = xno; then
--		dependencies_missing="libwebkit2gtk-4.0 $dependencies_missing"
-+		dependencies_missing="libwebkit2gtk-4.1 $dependencies_missing"
- 	fi
- 	if test x"$HAVE_CURL" = xno; then
- 		dependencies_missing="libcurl $dependencies_missing"
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/fancy_prefs.c claws-mail-4.1.1/src/plugins/fancy/fancy_prefs.c
---- claws-mail-4.1.1.orig/src/plugins/fancy/fancy_prefs.c	2022-05-06 12:11:04.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/fancy_prefs.c	2023-04-02 22:07:34.285867703 +0200
-@@ -46,11 +46,8 @@
- 
- FancyPrefs fancy_prefs;
- 
--static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str);
-+// static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str);
- 
--#ifdef HAVE_LIBSOUP_GNOME
--static void prefs_disable_fancy_proxy(GtkWidget *checkbox, GtkWidget *block);
--#endif
- typedef struct _FancyPrefsPage FancyPrefsPage;
- 
- struct _FancyPrefsPage {
-@@ -61,11 +58,8 @@
- 	GtkWidget *enable_plugins;
- 	GtkWidget *enable_java;
- 	GtkWidget *open_external;
--#ifdef HAVE_LIBSOUP_GNOME
--	GtkWidget *gnome_proxy_checkbox;
--#endif
--	GtkWidget *proxy_checkbox;
--	GtkWidget *proxy_str;
-+/*	GtkWidget *proxy_checkbox;
-+	GtkWidget *proxy_str; */
- 	GtkWidget *stylesheet;
- };
- 
-@@ -84,14 +78,10 @@
- 		NULL, NULL, NULL},
- 		{"enable_java", "FALSE", &fancy_prefs.enable_java, P_BOOL,
- 		NULL, NULL, NULL},
--#ifdef HAVE_LIBSOUP_GNOME
--		{"enable_gnome_proxy","FALSE", &fancy_prefs.enable_gnome_proxy, P_BOOL,
--		NULL, NULL, NULL},
--#endif
--		{"enable_proxy", "FALSE", &fancy_prefs.enable_proxy, P_BOOL,
-+/*		{"enable_proxy", "FALSE", &fancy_prefs.enable_proxy, P_BOOL,
- 		NULL, NULL, NULL},
- 		{"proxy_server", "http://SERVERNAME:PORT", &fancy_prefs.proxy_str, P_STRING,
--		NULL, NULL, NULL},
-+		NULL, NULL, NULL}, */
- 		{"stylesheet", "", &fancy_prefs.stylesheet, P_STRING, NULL, NULL, NULL},
- 		{0,0,0,0,0,0,0}
- };
-@@ -180,14 +170,11 @@
- 	FancyPrefsPage *prefs_page = (FancyPrefsPage *) page;
- 
- 	GtkWidget *vbox;
--#ifdef HAVE_LIBSOUP_GNOME
--	GtkWidget *gnome_proxy_checkbox;
--#endif
--	GtkWidget *proxy_checkbox;
-+/*	GtkWidget *proxy_checkbox;
- 	GtkWidget *proxy_str;
- 	GtkWidget *vbox_proxy;
- 	GtkWidget *frame_proxy;
--
-+*/
- 	GtkWidget *frame_remote;
- 	GtkWidget *vbox_remote;
- 	GtkWidget *remote_label;
-@@ -204,25 +191,12 @@
- 	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
- 	gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
- 	gtk_widget_show(vbox);
--
-+/*
- 	GtkWidget *block = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- 
- 	vbox_proxy = gtkut_get_options_frame(vbox, &frame_proxy, _("Proxy"));
--#ifdef HAVE_LIBSOUP_GNOME
--	gnome_proxy_checkbox = gtk_check_button_new_with_label(_("Use GNOME's proxy settings"));	
--	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gnome_proxy_checkbox),
--				     fancy_prefs.enable_gnome_proxy);
--	gtk_box_pack_start(GTK_BOX(vbox_proxy), gnome_proxy_checkbox, FALSE, FALSE, 0);
--	gtk_widget_show(gnome_proxy_checkbox);
--	g_signal_connect(G_OBJECT(gnome_proxy_checkbox), "toggled",
--			 G_CALLBACK(prefs_disable_fancy_proxy), block);
--#endif
- 	proxy_checkbox = gtk_check_button_new_with_label(_("Use proxy"));
- 	proxy_str = gtk_entry_new();
--#ifdef HAVE_LIBSOUP_GNOME
--	if (fancy_prefs.enable_gnome_proxy)
--		gtk_widget_set_sensitive(proxy_checkbox, FALSE);
--#endif
- 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(proxy_checkbox),
- 				     fancy_prefs.enable_proxy);
- 	prefs_set_proxy_entry_sens(proxy_checkbox, GTK_ENTRY(proxy_str));
-@@ -234,7 +208,7 @@
- 	gtk_box_pack_start(GTK_BOX(block), proxy_str, TRUE, TRUE, 0);
- 	gtk_box_pack_start(GTK_BOX(vbox_proxy), block, FALSE, FALSE, 0);
- 	gtk_widget_show_all(vbox_proxy);
--
-+*/
- 	vbox_remote = gtkut_get_options_frame(vbox, &frame_remote, _("Remote resources"));
- 	remote_label = gtk_label_new(_("Loading remote resources can lead to some privacy issues.\n"
- 					"When remote content loading is disabled, nothing will be requested\n"
-@@ -323,12 +297,8 @@
- 	pref_set_entry_from_pref(GTK_ENTRY(stylesheet), fancy_prefs.stylesheet);
- 	g_signal_emit_by_name(G_OBJECT(stylesheet), "changed", stylesheet_edit_button);
- 
--
--#ifdef HAVE_LIBSOUP_GNOME
--	prefs_page->gnome_proxy_checkbox = gnome_proxy_checkbox;
--#endif
--	prefs_page->proxy_checkbox = proxy_checkbox;
--	prefs_page->proxy_str = proxy_str;
-+/*	prefs_page->proxy_checkbox = proxy_checkbox;
-+	prefs_page->proxy_str = proxy_str; */
- 	prefs_page->enable_remote_content = enable_remote_content;
- 	prefs_page->enable_images = enable_images;
- 	prefs_page->enable_scripts = enable_scripts;
-@@ -374,25 +344,12 @@
- 	const gchar *stylesheet = gtk_entry_get_text(GTK_ENTRY(widget));
- 	gtk_widget_set_sensitive(GTK_WIDGET(data), (*stylesheet)? TRUE: FALSE);
- }
--
-+/*
- static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str) {
- 	gtk_widget_set_sensitive(GTK_WIDGET(entry_str),
- 				 gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
- }
--
--#ifdef HAVE_LIBSOUP_GNOME
--static void prefs_disable_fancy_proxy(GtkWidget *checkbox, GtkWidget *block) {
--	gboolean toggle = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox));
--	gtk_widget_set_sensitive(block, !toggle);
--	GList *list = g_list_first(gtk_container_get_children(GTK_CONTAINER(block)));
--	if (toggle) {
--		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(list->data), FALSE);
--	}
--	else {
--		gtk_widget_set_sensitive(GTK_WIDGET(list->data), TRUE);
--	}
--}
--#endif
-+*/
- static void destroy_fancy_prefs_page(PrefsPage *page)
- {
- 	/* Do nothing! */
-@@ -425,10 +382,6 @@
- {
- 		FancyPrefsPage *prefs_page = (FancyPrefsPage *) page;
- 	
--#ifdef HAVE_LIBSOUP_GNOME
--		fancy_prefs.enable_gnome_proxy = gtk_toggle_button_get_active
--				(GTK_TOGGLE_BUTTON(prefs_page->gnome_proxy_checkbox));
--#endif
- 		fancy_prefs.enable_images = gtk_toggle_button_get_active
- 				(GTK_TOGGLE_BUTTON(prefs_page->enable_images));
- 		fancy_prefs.enable_remote_content = gtk_toggle_button_get_active
-@@ -441,9 +394,9 @@
- 				(GTK_TOGGLE_BUTTON(prefs_page->enable_java));
- 		fancy_prefs.open_external = combobox_get_active_data
- 				(GTK_COMBO_BOX(prefs_page->open_external));
--		fancy_prefs.enable_proxy = gtk_toggle_button_get_active
-+/*		fancy_prefs.enable_proxy = gtk_toggle_button_get_active
- 				(GTK_TOGGLE_BUTTON(prefs_page->proxy_checkbox));
--		fancy_prefs.proxy_str = pref_get_pref_from_entry(GTK_ENTRY(prefs_page->proxy_str));
-+		fancy_prefs.proxy_str = pref_get_pref_from_entry(GTK_ENTRY(prefs_page->proxy_str)); */
- #ifdef G_OS_WIN32
- 		/* pref_get_pref_from_entry() escapes the backslashes in strings,
- 		 * we do not want that, since this entry contains a Windows path.
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/fancy_prefs.h claws-mail-4.1.1/src/plugins/fancy/fancy_prefs.h
---- claws-mail-4.1.1.orig/src/plugins/fancy/fancy_prefs.h	2022-05-06 12:11:04.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/fancy_prefs.h	2023-04-02 22:07:34.285867703 +0200
-@@ -1,6 +1,6 @@
- /* 
-  * Claws Mail -- A GTK based, lightweight, and fast e-mail client
-- * Copyright(C) 1999-2014 the Claws Mail Team
-+ * Copyright(C) 1999-2023 the Claws Mail Team
-  * == Fancy Plugin ==
-  * This file Copyright (C) 2009 -2014 Salvatore De Paolis
-  * <iwkse@claws-mail.org> and the Claws Mail Team
-@@ -35,11 +35,8 @@
- 	gboolean enable_java;
- 	gboolean open_external;
- 	gint zoom_level;
--#ifdef HAVE_LIBSOUP_GNOME
--	gboolean enable_gnome_proxy;
--#endif
--	gboolean enable_proxy;
--	gchar *proxy_str;
-+	// gboolean enable_proxy;
-+	// gchar *proxy_str;
- 	gchar *stylesheet;
- };
- 
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/fancy_viewer.c claws-mail-4.1.1/src/plugins/fancy/fancy_viewer.c
---- claws-mail-4.1.1.orig/src/plugins/fancy/fancy_viewer.c	2022-10-20 09:16:02.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/fancy_viewer.c	2023-04-02 22:07:34.285867703 +0200
-@@ -1,7 +1,7 @@
- /*
-  * Claws Mail -- A GTK based, lightweight, and fast e-mail client
-  * == Fancy Plugin ==
-- * Copyright(C) 1999-2022 the Claws Mail Team
-+ * Copyright(C) 1999-2023 the Claws Mail Team
-  * This file Copyright (C) 2009-2014 Salvatore De Paolis
-  * <iwkse@claws-mail.org> and the Claws Mail Team
-  *
-@@ -1106,23 +1106,6 @@
- 	viewer->mimeviewer.scroll_one_line = fancy_scroll_one_line;
- 	viewer->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
- 
--/*#ifdef HAVE_LIBSOUP_GNOME
--  TODO webkit_get_default_session() missing 
--   *     enum WebKitNetworkProxySettings
--   * */
-- /* Use GNOME proxy settings through libproxy */
--/*	if (fancy_prefs.enable_gnome_proxy) {
--		SoupSession *session = webkit_get_default_session();
--		soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
--	}
--#endif
--	
--	if (fancy_prefs.enable_proxy) {
--		SoupSession *session = webkit_get_default_session();
--		SoupURI* pURI = soup_uri_new(fancy_prefs.proxy_str);
--		g_object_set(session, "proxy-uri", pURI, NULL);
--	}
--*/
- 	viewer->settings = webkit_settings_new();
- 	g_object_set(viewer->settings, "user-agent", "Fancy Viewer", NULL);
- 	viewer->scrollwin = gtk_scrolled_window_new(NULL, NULL);
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/fancy_viewer.h claws-mail-4.1.1/src/plugins/fancy/fancy_viewer.h
---- claws-mail-4.1.1.orig/src/plugins/fancy/fancy_viewer.h	2022-10-19 16:49:50.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/fancy_viewer.h	2023-04-02 22:07:34.285867703 +0200
-@@ -1,8 +1,8 @@
- /*
-  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
-  * == Fancy Plugin ==
-- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail Team
-- * This file Copyright (C) 2009-2013 Salvatore De Paolis <iwkse@claws-mail.org>
-+ * Copyright (C) 1999-2023 the Claws Mail Team
-+ * This file Copyright (C) 2009-2023 Salvatore De Paolis <iwkse@claws-mail.org>
-  *  and the Claws Mail Team
-  *
-  * This program is free software; you can redistribute it and/or modify
-@@ -51,10 +51,6 @@
- #include <curl/curlver.h>
- #include "filesel.h"
- 
--#ifdef HAVE_LIBSOUP_GNOME
--#include <libsoup/soup-gnome.h>
--#endif
--
- typedef enum _NavigationMode {
- 	NAV_DEFAULT,
- 	NAV_INNER,
-diff -Naur claws-mail-4.1.1.orig/src/plugins/fancy/Makefile.am claws-mail-4.1.1/src/plugins/fancy/Makefile.am
---- claws-mail-4.1.1.orig/src/plugins/fancy/Makefile.am	2022-10-20 09:16:02.000000000 +0200
-+++ claws-mail-4.1.1/src/plugins/fancy/Makefile.am	2023-04-02 22:07:34.285867703 +0200
-@@ -1,4 +1,4 @@
--# Copyright 1999-2022 the Claws Mail team.
-+# Copyright 1999-2023 the Claws Mail team.
- # This file is part of Claws Mail package, and distributed under the
- # terms of the General Public License version 3 (or later).
- # See COPYING file for license details.
-@@ -28,7 +28,6 @@
- fancy_la_LIBADD = $(plugin_libadd) \
- 	$(GTK_LIBS) \
- 	$(WEBKIT_LIBS) \
--	$(LIBSOUP_GNOME_LIBS) \
- 	$(CURL_LIBS)
- 
- fancy_la_CPPFLAGS = \
-@@ -37,7 +36,6 @@
- 	$(GTK_CFLAGS) \
- 	$(ENCHANT_CFLAGS) \
- 	$(WEBKIT_CFLAGS) \
--	$(LIBSOUP_GNOME_CFLAGS) \
- 	$(CURL_CFLAGS) \
- 	-DFANCY_WEB_EXTENSIONS_DIR=\""$(pkglibdir)/plugins/web_extensions"\" \
- 	-DFANCY_WEB_EXTENSION_FILE=\""fancywebextension"\"
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index 6727b3320653..71ee587a179a 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="archive">Enable archiving plugin</flag>
 		<flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg> plugin</flag>
-		<flag name="gdata">Enable plugin for access to Google data providers</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>