gentoo auto-resync : 02:04:2023 - 23:19:00

9 files changed, 553 insertions, 23 deletions

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 05dd46e03178..cf682ae96a4e 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -3,12 +3,14 @@ AUX claws-mail-3.19.0-perl-5.36.patch 11254 BLAKE2B 0c348bc581a83e068dcf9afa0d0b
 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-webkitgtk4.1.patch 12462 BLAKE2B 4368d262ad952cdf1098409378c4015b853ec7e0988ad682f47b269f77e30e96e23e1712fa53c26360cfef17785fd0595e0dee88486f77f359db95e37695987a SHA512 0034b29ea759ff7be68cc92f7ebf1f49e7e77006f8e2e266269bfce105b9672ba56aa26bdd145d11c9c7cf9263b97a5f39fe1154cf79e553b1a0c8a21a38af0f
 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.19.0-r1.ebuild 5624 BLAKE2B 6954f91b60edbeea184b9b913a21a37475da2fe8d500c92af5a52417b969bce61e4e57a6f9494a7e7de6a1196f0a67b7202be6ff36f91e1fc1e5e69a31873464 SHA512 2a28ddba0e6949046972e3c4f33e73e74fd8232f125c214f639a18c2ea4c7ec04aea5082cbc55ce3fc812bfe12b92ba895593f2d11d3887969ca763449d8c69e
-EBUILD claws-mail-3.19.0-r2.ebuild 5671 BLAKE2B 5f508a5842abb4a8888bdbe7c0231a53135fcb569f03bb4d19fae7007fe4f2e255c148bb5b6f2cb164da649d0da41e514c25a48f31fbdd35982422900c600442 SHA512 f329414919bca9b94205aee917c55b9879184aec70b1aff67501e12b0fcf6895974ab4060a1b9f098037e3f79fe075c550a77cc85c43656e26465fedc8d90a30
-EBUILD claws-mail-4.1.0-r1.ebuild 5797 BLAKE2B 71ee869074c952f08dae67c031fd303befca46cfdfd9ed3ddb5ab41d5c195d91c7a0c6e3acea034c676831813f20df2cdafe69c7b3970725828fcc19460c344c SHA512 978ee5c6121bbb009cbbb28bda8fabffb662ef1f428ca239f243a944cbf17484d2e7526b611f3f4de3f2dfe5382d42c0a16b53096df964f36d1a5b190825835f
-EBUILD claws-mail-4.1.1-r1.ebuild 5702 BLAKE2B 5391aa30f88eb39f1829f094a9f77eca5fbab25bc35c4d3fbb74f10575ca6db96f71b68aff071453feee4fc07564a9e80a53eff600a9a197297105b894f690c1 SHA512 0160665cb487bf297b6468abef0d02be817c4073b4c91fd977df810ca89f3bff2b953eb5d54b73fbe9f1c2916bb6b424df614a5511e012178563703ce9f77c97
-EBUILD claws-mail-9999.ebuild 5673 BLAKE2B 5fd4919bae694c738231ce857b3d833f7cb05d8fd7486b89eff842651c8089a2fec071f7560a68293dc8af409f931218af8564aef3db6b0f1afd9f055890dcb8 SHA512 95b46c13d7264246e37a1496c293e3046c594b7b04d36665bb43891d87d33d4c92e51cdde9983be4adf3027cc79f158855d435d5e33630f57b75287edd1d644f
-MISC metadata.xml 1445 BLAKE2B 2c20d83b5af1f03c791c733c9cdaa970ea070fe9ee63cfe4d8f4b2c5284bb791579fa0629f1b70c336440b8a8dae7c70d460b906fc34e7e314b074b67ae00523 SHA512 a956df8043597fb5be434fec8747c49088fdd82ea8c7d2a32d8b9a3d88d058cf4bf8cb3a8cc77463ebb8484729f155c258f58dd581b96eb0703de1464ead73b9
+EBUILD claws-mail-3.19.0-r1.ebuild 5579 BLAKE2B 7e9719974301dd19be8e69ce7014530cabf22b41feb202374fb51fb2ab4d548cd48ef6a6c19b8d6669adb0e7d78f590449945637a4996dffe5ca7b2a729e6470 SHA512 9deab954859f1f90cef53a7bb9b26e1acf512f955776360198fedcac5f45710757fb5bbf4b4d5bf0d508f48f6427654345d388e88e9e3bc170fd2cd33df4593e
+EBUILD claws-mail-3.19.0-r2.ebuild 5626 BLAKE2B ab8e3f37fdf2de10c82ea368f67c4e54f8309b4e5350767c5faaa6c4362847b3700beff105a80f68a605981a48066467e2bc7c5936a71d252d0e1df060f0bfdf SHA512 50e6675a335825ce6ff49bf9d9a2d98c3e315e994fd14285ea439ff6aef14faf5aa3029d1daf86e829669746a5c211339492b1b1daa7893e892b228077d99a77
+EBUILD claws-mail-4.1.0-r1.ebuild 5752 BLAKE2B 43fe31e413a4c48633c3a865ee615920f1b071e3165da5a3c62af77b2876e4e1a10798cd5a103570e9a6397162676b6ffe4658df020a62751a3ff86b526115a2 SHA512 a76842a9caeedddfc3efd0a3100eb88f8d918df106ccb4ec894e65f7d85b3ac68167b6ab138c7a1fff7f32a91d43c5a7386e30e182aedc9d3e123bb41b15a8f6
+EBUILD claws-mail-4.1.1-r1.ebuild 5657 BLAKE2B b27384933ba3db323a5fea26a7ae89a9e40ee9c74384cff74bea27f419cd936dc19dd4efc2a8d02ebc026b3a95de31212b3c575a1bf9f1594dc7799b1c2cbf1a SHA512 d6bbb70a8ee69b8eca52120e4eef22596379b23246b62b7c6a4d3d1b0c1213f45c519c4bf9842cb6aff1eb6e662acc88b5febecdc138c16cc59d03525e6ecb75
+EBUILD claws-mail-4.1.1-r2.ebuild 5627 BLAKE2B 3a0223df8a2d9bc94a389e08b375194afc00cec3d73170cdf310052cc1fe0dbd5b4fd87473085488fbee197e406e63c6fa4fad30ba9150f20227fd6f06d6bbaf SHA512 f3fa2fb283144caf9c3390e44f701efb13ff281db15ac00f1207081c426599ae13657223a08c8e3cda20b7eaa9a97b476767334acfb19ce0223c7ff12d3e18fb
+EBUILD claws-mail-9999.ebuild 5697 BLAKE2B 66c03167b092eb10d341215f906d335f1ee1a4b929f37703a978a6f5d9e106717ef31863181d3232b340a3a714fd0d2a918c38ea93e5feb32aaf09b6a712e7b4 SHA512 5d5bbf8fd0ca25fc28734e85196ea1f5c91ea8c8ad60006dea9cadc69d8fbed85575209b4ec00087f45701d22a50c84edc89003c01d81b426a78a2311972b7e5
+MISC metadata.xml 1385 BLAKE2B aa14790b44c8c2399b1e4435d08e70b574d5f720d72e0897d894e781223e2c9f1cb5e183d446a712282a7f82bad7b39f6ceea5dbb4805b6cf6300022255b19f3 SHA512 3dc48c58e155330ec969c840cfe5737d65f1ed3822c0e4f42437c0cf7892c7cc47a19fb1b311c3ed643e326fa73a3508d892f157667b241ee626b4dabe66651d
diff --git a/mail-client/claws-mail/claws-mail-3.19.0-r1.ebuild b/mail-client/claws-mail/claws-mail-3.19.0-r1.ebuild
index 68387615d682..842a18b93d5d 100644
--- a/mail-client/claws-mail/claws-mail-3.19.0-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.19.0-r1.ebuild
@@ -21,7 +21,7 @@ fi
 SLOT="0"
 LICENSE="GPL-3"
 
-IUSE="+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+IUSE="+appindicator archive bogofilter calendar clamav dbus debug 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 )
@@ -53,7 +53,6 @@ COMMONDEPEND="
 		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:= )
@@ -121,6 +120,7 @@ src_configure() {
 
 	local myeconfargs=(
 		--disable-bsfilter-plugin
+		--disable-dillo-plugin
 		--disable-fancy-plugin
 		--disable-generic-umpc
 		--disable-jpilot #735118
@@ -140,7 +140,6 @@ src_configure() {
 		$(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)
diff --git a/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild b/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild
index f319eea382d8..fe76dc6ce732 100644
--- a/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild
@@ -21,7 +21,7 @@ fi
 SLOT="0"
 LICENSE="GPL-3"
 
-IUSE="+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+IUSE="+appindicator archive bogofilter calendar clamav dbus debug 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 )
@@ -53,7 +53,6 @@ COMMONDEPEND="
 		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:= )
@@ -122,6 +121,7 @@ src_configure() {
 
 	local myeconfargs=(
 		--disable-bsfilter-plugin
+		--disable-dillo-plugin
 		--disable-fancy-plugin
 		--disable-generic-umpc
 		--disable-jpilot #735118
@@ -141,7 +141,6 @@ src_configure() {
 		$(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)
diff --git a/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild b/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild
index ce60660e1179..a28b72f50dcb 100644
--- a/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 QA_PKGCONFIG_VERSION="${PV}.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 webkit xface"
+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 )
@@ -54,7 +54,6 @@ COMMONDEPEND="
 		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:= )
@@ -125,6 +124,7 @@ src_configure() {
 
 	local myeconfargs=(
 		--disable-bsfilter-plugin
+		--disable-dillo-plugin
 		--disable-generic-umpc
 		--disable-jpilot #735118
 		--enable-acpi_notifier-plugin
@@ -143,7 +143,6 @@ src_configure() {
 		$(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)
diff --git a/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild b/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild
index 413a3219729a..5ed2e9063209 100644
--- a/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild
@@ -22,7 +22,7 @@ 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 +oauth pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
+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 )
@@ -56,7 +56,6 @@ COMMONDEPEND="
 		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:= )
@@ -123,6 +122,7 @@ src_configure() {
 
 	local myeconfargs=(
 		--disable-bsfilter-plugin
+		--disable-dillo-plugin
 		--disable-generic-umpc
 		--disable-jpilot #735118
 		--disable-python-plugin
@@ -143,7 +143,6 @@ src_configure() {
 		$(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)
diff --git a/mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild b/mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild
new file mode 100644
index 000000000000..92a4637062ee
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..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 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-util/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"
+)
+
+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/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index b80a3e3d3d7a..98ad693f8d9b 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -22,7 +22,7 @@ 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 +oauth pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
+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 )
@@ -56,7 +56,6 @@ COMMONDEPEND="
 		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:= )
@@ -88,7 +87,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 )
+	webkit? ( net-libs/webkit-gtk:4.1 )
 "
 
 DEPEND="${COMMONDEPEND}
@@ -113,12 +112,15 @@ PATCHES=(
 
 src_prepare() {
 	default
+	sed -e "s/webkit2gtk-4.0/webkit2gtk-4.1/" -i configure.ac || die
+
 	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
 		--disable-bsfilter-plugin
+		--disable-dillo-plugin
 		--disable-generic-umpc
 		--disable-jpilot #735118
 		--disable-python-plugin
@@ -141,7 +143,6 @@ src_configure() {
 		$(use_enable debug crash-dialog)
 		$(use_enable debug more-addressbook-debug)
 		$(use_enable debug more-ldap-debug)
-		$(use_enable dillo dillo-plugin)
 		$(use_enable doc manual)
 		$(use_enable gdata gdata-plugin)
 		$(use_enable gnutls)
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
new file mode 100644
index 000000000000..cfd9cb6842e8
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-4.1.1-webkitgtk4.1.patch
@@ -0,0 +1,317 @@
+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 3568245d4713..c79619ae0391 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="dillo">Enable dillo html viewer 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>