From 064ebcfc92f8a3fb746593df0381c65911190eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@gentoo.org>
Date: Tue, 10 Jun 2025 14:58:04 +0200
Subject: [PATCH] mail-filter/rspamd: sync live
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Petr Vaněk <arkamar@gentoo.org>
---
 mail-filter/rspamd/rspamd-9999.ebuild | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 16b59dbaef8de..9b3d9ffba5967 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -59,7 +59,6 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-cpp/doctest
-	dev-libs/libfmt:=
 	>=dev-libs/xxhash-0.8.0
 "
 BDEPEND="
@@ -69,15 +68,18 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
-	"${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
-	"${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
+	"${FILESDIR}/${PN}-3.12-cmake-lua-version.patch"
+	"${FILESDIR}/${PN}-3.12-unbundle-lua.patch"
+	"${FILESDIR}/${PN}-3.12-unbundle-snowball.patch"
+
+	# upstream issue https://github.com/rspamd/rspamd/issues/5263
+	"${FILESDIR}/${PN}-3.11.1-punycode-icu-76.1.patch"
 )
 
 src_prepare() {
 	cmake_src_prepare
 
-	rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd} || die
+	rm -vrf contrib/{doctest,lua-{argparse,bit},snowball,xxhash,zstd} || die
 
 	> cmake/Toolset.cmake || die #827550
 
@@ -95,7 +97,6 @@ src_configure() {
 		-DLIBDIR="/usr/$(get_libdir)/rspamd"
 
 		-DSYSTEM_DOCTEST=ON
-		-DSYSTEM_FMT=ON
 		-DSYSTEM_XXHASH=ON
 		-DSYSTEM_ZSTD=ON