[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/

["Craig Andrews" <candrews@gentoo.org>]

commit:     9ef5e5caeb9db3d7675bfbddc757e51ddb973807
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Fri Apr 19 17:33:56 2024 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 21:25:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ef5e5ca

dev-libs/spdlog: add multilib and static-lib useflag

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 ...pdlog-1.13.0.ebuild => spdlog-1.11.0-r4.ebuild} | 22 ++++++++++++----------
 ...pdlog-1.13.0.ebuild => spdlog-1.12.0-r3.ebuild} | 13 +++++++------
 ...pdlog-1.13.0.ebuild => spdlog-1.13.0-r1.ebuild} | 10 +++++-----
 dev-libs/spdlog/spdlog-9999.ebuild                 | 10 +++++-----
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/dev-libs/spdlog/spdlog-1.13.0.ebuild b/dev-libs/spdlog/spdlog-1.11.0-r4.ebuild
similarity index 76%
copy from dev-libs/spdlog/spdlog-1.13.0.ebuild
copy to dev-libs/spdlog/spdlog-1.11.0-r4.ebuild
index bdb630b7d8d3..02a505623954 100644
--- a/dev-libs/spdlog/spdlog-1.13.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.11.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake-multilib
 
 DESCRIPTION="Fast C++ logging library"
 HOMEPAGE="https://github.com/gabime/spdlog"
@@ -14,39 +14,41 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
 fi
 
 LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
+SLOT="0/1"
+IUSE="test static-libs"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
 	virtual/pkgconfig
-	test? (
-		>=dev-cpp/catch-3.4.0
-	)
 "
+
 DEPEND="
-	>=dev-libs/libfmt-8.0.0:=
+	>=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}]
 "
+
 RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-force_external_fmt.patch"
+	"${FILESDIR}/${PN}-fmt-10.patch"
+	"${FILESDIR}/${PN}-musl-1.2.4.patch"
 )
 
-src_prepare() {
+multilib_src_prepare() {
 	cmake_src_prepare
 	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
 }
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DSPDLOG_BUILD_BENCH=no
 		-DSPDLOG_BUILD_EXAMPLE=no
 		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
+		-DSPDLOG_BUILD_SHARED=$(usex static-libs)
 		-DSPDLOG_BUILD_TESTS=$(usex test)
 	)
 

diff --git a/dev-libs/spdlog/spdlog-1.13.0.ebuild b/dev-libs/spdlog/spdlog-1.12.0-r3.ebuild
similarity index 80%
copy from dev-libs/spdlog/spdlog-1.13.0.ebuild
copy to dev-libs/spdlog/spdlog-1.12.0-r3.ebuild
index bdb630b7d8d3..298801759f76 100644
--- a/dev-libs/spdlog/spdlog-1.13.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.12.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake-multilib
 
 DESCRIPTION="Fast C++ logging library"
 HOMEPAGE="https://github.com/gabime/spdlog"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
+IUSE="test static-libs"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -28,25 +28,26 @@ BDEPEND="
 	)
 "
 DEPEND="
-	>=dev-libs/libfmt-8.0.0:=
+	>=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-force_external_fmt.patch"
+	"${FILESDIR}/${P}-fix-tests.patch"
 )
 
-src_prepare() {
+multilib_src_prepare() {
 	cmake_src_prepare
 	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
 }
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DSPDLOG_BUILD_BENCH=no
 		-DSPDLOG_BUILD_EXAMPLE=no
 		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
+		-DSPDLOG_BUILD_SHARED=$(usex static-libs)
 		-DSPDLOG_BUILD_TESTS=$(usex test)
 	)
 

diff --git a/dev-libs/spdlog/spdlog-1.13.0.ebuild b/dev-libs/spdlog/spdlog-1.13.0-r1.ebuild
similarity index 87%
rename from dev-libs/spdlog/spdlog-1.13.0.ebuild
rename to dev-libs/spdlog/spdlog-1.13.0-r1.ebuild
index bdb630b7d8d3..01917c4d913f 100644
--- a/dev-libs/spdlog/spdlog-1.13.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.13.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake-multilib
 
 DESCRIPTION="Fast C++ logging library"
 HOMEPAGE="https://github.com/gabime/spdlog"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
+IUSE="test static-libs"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -36,17 +36,17 @@ PATCHES=(
 	"${FILESDIR}/${PN}-force_external_fmt.patch"
 )
 
-src_prepare() {
+multilib_src_prepare() {
 	cmake_src_prepare
 	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
 }
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DSPDLOG_BUILD_BENCH=no
 		-DSPDLOG_BUILD_EXAMPLE=no
 		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
+		-DSPDLOG_BUILD_SHARED=$(usex static-libs)
 		-DSPDLOG_BUILD_TESTS=$(usex test)
 	)
 

diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index bdb630b7d8d3..01917c4d913f 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake-multilib
 
 DESCRIPTION="Fast C++ logging library"
 HOMEPAGE="https://github.com/gabime/spdlog"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
+IUSE="test static-libs"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -36,17 +36,17 @@ PATCHES=(
 	"${FILESDIR}/${PN}-force_external_fmt.patch"
 )
 
-src_prepare() {
+multilib_src_prepare() {
 	cmake_src_prepare
 	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
 }
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DSPDLOG_BUILD_BENCH=no
 		-DSPDLOG_BUILD_EXAMPLE=no
 		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
+		-DSPDLOG_BUILD_SHARED=$(usex static-libs)
 		-DSPDLOG_BUILD_TESTS=$(usex test)
 	)