From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1698730-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id EFE69158245
	for <garchives@archives.gentoo.org>; Tue, 10 Dec 2024 12:21:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id D0DA2E07F6;
	Tue, 10 Dec 2024 12:21:30 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 8ED91E07F1
	for <gentoo-commits@lists.gentoo.org>; Tue, 10 Dec 2024 12:21:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 97B5A3430E0
	for <gentoo-commits@lists.gentoo.org>; Tue, 10 Dec 2024 12:21:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 02AE51173
	for <gentoo-commits@lists.gentoo.org>; Tue, 10 Dec 2024 12:21:27 +0000 (UTC)
From: "Petr Vaněk" <arkamar@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Petr Vaněk" <arkamar@gentoo.org>
Message-ID: <1733833122.d339b5800ce490bc4f3b349eef28dee86c350c5b.arkamar@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-db/mariadb/mariadb-10.11.10.ebuild dev-db/mariadb/mariadb-11.4.4.ebuild
X-VCS-Directories: dev-db/mariadb/
X-VCS-Committer: arkamar
X-VCS-Committer-Name: Petr Vaněk
X-VCS-Revision: d339b5800ce490bc4f3b349eef28dee86c350c5b
X-VCS-Branch: master
Date: Tue, 10 Dec 2024 12:21:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0e8c16b1-25cc-4eb0-b98a-3121b6af8d57
X-Archives-Hash: e0eb9324344f760b568001aeb3ef7fce

commit:     d339b5800ce490bc4f3b349eef28dee86c350c5b
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 11:38:06 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 12:18:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d339b580

dev-db/mariadb: avoid libfmt-10*

libfmt-10 contains a bug [1], which affects mariadb [2]. The bug was
resolved in libfmt-11 [3], but it was not backported. Therefore, mariadb
must avoid libfmt-10.

[1] https://github.com/fmtlib/fmt/issues/3835
[2] https://jira.mariadb.org/browse/MDEV-32815
[3] https://github.com/fmtlib/fmt/commit/44c3fe1ebb466ab5c296e1a1a6991c7c7b51b72e

Closes: https://bugs.gentoo.org/946074
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 dev-db/mariadb/mariadb-10.11.10.ebuild | 7 +++++++
 dev-db/mariadb/mariadb-11.4.4.ebuild   | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/dev-db/mariadb/mariadb-10.11.10.ebuild b/dev-db/mariadb/mariadb-10.11.10.ebuild
index 8d087411ab5d..3c1a6e634be9 100644
--- a/dev-db/mariadb/mariadb-10.11.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.11.10.ebuild
@@ -37,8 +37,15 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 
 # Be warned, *DEPEND are version-dependant
 # These are used for both runtime and compiletime
+#
+# libfmt-10 contains a bug which was fixed in libfmt-11, see
+# https://jira.mariadb.org/browse/MDEV-32815, bug 946074
 COMMON_DEPEND="
 	dev-libs/libfmt:=
+	|| (
+		<dev-libs/libfmt-10
+		>=dev-libs/libfmt-11
+	)
 	>=dev-libs/libpcre2-10.34:=
 	>=sys-apps/texinfo-4.7-r1
 	sys-libs/ncurses:0=

diff --git a/dev-db/mariadb/mariadb-11.4.4.ebuild b/dev-db/mariadb/mariadb-11.4.4.ebuild
index 1c4e7e0edda3..b909e81afb50 100644
--- a/dev-db/mariadb/mariadb-11.4.4.ebuild
+++ b/dev-db/mariadb/mariadb-11.4.4.ebuild
@@ -37,8 +37,15 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 
 # Be warned, *DEPEND are version-dependant
 # These are used for both runtime and compiletime
+#
+# libfmt-10 contains a bug which was fixed in libfmt-11, see
+# https://jira.mariadb.org/browse/MDEV-32815, bug 946074
 COMMON_DEPEND="
 	dev-libs/libfmt:=
+	|| (
+		<dev-libs/libfmt-10
+		>=dev-libs/libfmt-11
+	)
 	>=dev-libs/libpcre2-10.34:=
 	>=sys-apps/texinfo-4.7-r1
 	sys-libs/ncurses:0=