From 800d7e2da94dd545d984923b1b982abcfe201df6 Mon Sep 17 00:00:00 2001
From: Patrick McLean <chutzpah@gentoo.org>
Date: Thu, 10 Aug 2023 13:39:35 -0700
Subject: [PATCH] sys-cluster/ceph: Revbumps, use bundled libfmt

Too many API changes makes for an annoying game of whack-a-mole. Going to use
bundled for now.

Closes: https://bugs.gentoo.org/895254
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
---
 .../{ceph-16.2.13-r1.ebuild => ceph-16.2.13-r2.ebuild}   | 3 ++-
 .../{ceph-17.2.6-r5.ebuild => ceph-17.2.6-r6.ebuild}     | 9 ++-------
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename sys-cluster/ceph/{ceph-16.2.13-r1.ebuild => ceph-16.2.13-r2.ebuild} (99%)
 rename sys-cluster/ceph/{ceph-17.2.6-r5.ebuild => ceph-17.2.6-r6.ebuild} (97%)

diff --git a/sys-cluster/ceph/ceph-16.2.13-r1.ebuild b/sys-cluster/ceph/ceph-16.2.13-r2.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-16.2.13-r1.ebuild
rename to sys-cluster/ceph/ceph-16.2.13-r2.ebuild
index 5077fc2be1318..dccc03e507a42 100644
--- a/sys-cluster/ceph/ceph-16.2.13-r1.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.13-r2.ebuild
@@ -47,7 +47,6 @@ DEPEND="
 	dev-cpp/gflags:=
 	<dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?]
 	dev-libs/libaio:=
-	<dev-libs/libfmt-9:=
 	dev-libs/libnl:3=
 	dev-libs/libxml2:=
 	dev-libs/libevent:=
@@ -318,6 +317,8 @@ ceph_src_configure() {
 		-DWITH_RDMA:BOOL=$(usex rdma)
 		-DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
 		-DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc"
+		# use the bundled libfmt for now since they seem to constantly break their API
+		-DCMAKE_DISABLE_FIND_PACKAGE_fmt=ON
 		-Wno-dev
 	)
 
diff --git a/sys-cluster/ceph/ceph-17.2.6-r5.ebuild b/sys-cluster/ceph/ceph-17.2.6-r6.ebuild
similarity index 97%
rename from sys-cluster/ceph/ceph-17.2.6-r5.ebuild
rename to sys-cluster/ceph/ceph-17.2.6-r6.ebuild
index 16a9a26387dcc..2d7cf423fb877 100644
--- a/sys-cluster/ceph/ceph-17.2.6-r5.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.6-r6.ebuild
@@ -33,8 +33,6 @@ IUSE="
 
 IUSE+="$(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 
-# <dev-libs/libfmt-10 because we're using -DFMT_DEPRECATED_OSTREAM for bug #895254
-# See https://github.com/ceph/ceph/pull/49768 for a fix for newer versions.
 DEPEND="
 	${LUA_DEPS}
 	${PYTHON_DEPS}
@@ -51,7 +49,6 @@ DEPEND="
 	dev-cpp/gflags:=
 	dev-lang/jsonnet:=
 	dev-libs/libaio:=
-	<dev-libs/libfmt-10:=
 	dev-libs/libnl:3=
 	dev-libs/libxml2:=
 	dev-libs/libevent:=
@@ -257,10 +254,6 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 
-	# Add compatibility hack for fmt-9, this won't work with fmt-10 though.
-	# See bug #895254. Should be fixed upstream properly by https://github.com/ceph/ceph/pull/49768.
-	append-cppflags -DFMT_DEPRECATED_OSTREAM
-
 	if use system-boost; then
 		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
 			| xargs --null sed -r \
@@ -336,6 +329,8 @@ ceph_src_configure() {
 		-DWITH_RDMA:BOOL=$(usex rdma)
 		-DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
 		-DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc"
+		# use the bundled libfmt for now since they seem to constantly break their API
+		-DCMAKE_DISABLE_FIND_PACKAGE_fmt=ON
 		-Wno-dev
 	)