gentoo auto-resync : 20:04:2024 - 12:05:23

5 files changed, 130 insertions, 15 deletions

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 80118974d72f..02f39e321959 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -6,7 +6,9 @@ DIST spdlog-1.11.0.tar.gz 373033 BLAKE2B a05a535ba55641ecb3bf484eeff902f266bf396
 DIST spdlog-1.12.0.tar.gz 251037 BLAKE2B 3170f1e680fc4652ed8ddc0f74627aec22149f028def599fc5ed4db3a942d840006963789577f2e3df0e2b8ca1d98a881f3b96be5e1174fdf0acea15b3676d6e SHA512 db9a4f13b6c39ffde759db99bcdfe5e2dbe4231e73b29eb906a3fa78d6b8ec66920b8bd4371df17ae21b7b562472a236bc4435678f3af92b6496be090074181d
 DIST spdlog-1.13.0.tar.gz 264003 BLAKE2B 8ffeec847f082a0932f406ab44b4653661fdbe95a15f7b736367ee6d8f45ab36ca2182a9e9c6fba5c0688ab5436c16932b130541a8532cc2e5f4980e6340b929 SHA512 44fcb414ad9fbbe2a6d72c29143eeeae477b687ed30ae870d661b032a029ad4214ef43e7ef6350d02791d05504492978ade2d6733fab12ce4884d8f0bc4c6340
 EBUILD spdlog-1.11.0-r3.ebuild 1066 BLAKE2B 2f9e5013ded134257381f8be7a545677ff1950018cbee2d6e56a1c668890c0d5c2a1f606473cfed9858155ee1e7ba15fc147bd0c0a2f54480be35d58525989ab SHA512 07fa9eb7b51213654f012761aa0d3c107499bcf9f07371b5fdfcccfefba5d378cb825bea61c618c8284759091030cd995fc454e132b541c8bf95cad043d78689
+EBUILD spdlog-1.11.0-r4.ebuild 1180 BLAKE2B 1553c6ad46a09283746e4b4e4c62f28e50e1f5a8af44fc40b20da9cdd0ddb0ed25095454ca22edb9b6ed2303b14d0bd92ce27401a9731a041af99bcf14e5936a SHA512 490b12a8cc566e7fec04b528dcbeb035a1a5ac62068c11a41fb106ba0125b4ed8a0cc5fe12a13bc74cc4e591505ca4bbef9e292b3d47d2d6de1f3f468f540696
 EBUILD spdlog-1.12.0-r2.ebuild 1106 BLAKE2B 3c56c2e447e6812acbaaed28f1544501a23a60b8a398f4172af6ba03b1564bb2211120eee98353d5b97fe11a2ee28c8b4dfa756171170e55cf89f0ef2a3dbb59 SHA512 fc12e864b6d4d4b159fb61572eadfb7872aab7108621359a277e872268511c5e48bc2cb10feb1b29b1f3c8f8ec3baae4be98cd176b50c513f81f05494b6b5a41
-EBUILD spdlog-1.13.0.ebuild 1078 BLAKE2B 0ea422619dfe01a0aa8229eca9789e6d90837b2841dd65e9c1c5df19cf2837c10d26eff6ee05ef194a27176294c7446bc24845714ecccf62701c024d58e93816 SHA512 56b9588fbbaca09c64da1bbda9b5ddab76acb2811b0ec705b61b8ed336bafb49686e3f2450c5219e39f594b4fec39d02f9ff1fc782ae7e42b6026df6cc52ae20
-EBUILD spdlog-9999.ebuild 1037 BLAKE2B dc327846fe1bb2ed5199ba13f53ba24b2040af8df5e6e094059d96436b1e882cf1fee83f92da10812ac738a4c50e8eaae3d0c7b1fe5fca72ca1e17831b647364 SHA512 fe9ec2e627e4dc8195bfee5892e966ee119bd6149e9002d5a8469f981d20e980fccb6bbeaf9eb90b564982ab479efe9f4cf2235a3db60cf4807b89e8296b9943
+EBUILD spdlog-1.12.0-r3.ebuild 1190 BLAKE2B 24771d7f021dbdf6fd70ef37c567fb8da71ff62bcb1b3e6c5a1f981deada76453a4d8a1c518948ae44b06acd242bc33397eeaa63495f91b2efd74722276cb1df SHA512 394c5a964278fcdeb199956fb37c1de9d23727d59733f4f35ec603b5759093f41815c24fe33990a77cb0d7ea2fedeea8fe4f7ae48c38bd5a7496bc3cb7d491f4
+EBUILD spdlog-1.13.0-r1.ebuild 1133 BLAKE2B ea20a8dfd157bdfd3a48217e6dfafc37baee8ae3b182048c4dad1121c469ff0ec12e9b79078a369e791bd6079fa5fa5d5377addfa09531df5cec35da847a94d5 SHA512 6891a853c0c558f02c2c8b2d9b8cdcde12143194bae6a9daeeb0d1bec8ec0603f8be8d351685a78319b1c47a3737d61855b70bf5d6e2d4b79ed6accad73da621
+EBUILD spdlog-9999.ebuild 1133 BLAKE2B ea20a8dfd157bdfd3a48217e6dfafc37baee8ae3b182048c4dad1121c469ff0ec12e9b79078a369e791bd6079fa5fa5d5377addfa09531df5cec35da847a94d5 SHA512 6891a853c0c558f02c2c8b2d9b8cdcde12143194bae6a9daeeb0d1bec8ec0603f8be8d351685a78319b1c47a3737d61855b70bf5d6e2d4b79ed6accad73da621
 MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c
diff --git a/dev-libs/spdlog/spdlog-1.11.0-r4.ebuild b/dev-libs/spdlog/spdlog-1.11.0-r4.ebuild
new file mode 100644
index 000000000000..02a505623954
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.11.0-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Fast C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gabime/${PN}"
+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/1"
+IUSE="test static-libs"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DEPEND="
+	>=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"
+)
+
+multilib_src_prepare() {
+	cmake_src_prepare
+	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSPDLOG_BUILD_BENCH=no
+		-DSPDLOG_BUILD_EXAMPLE=no
+		-DSPDLOG_FMT_EXTERNAL=yes
+		-DSPDLOG_BUILD_SHARED=$(usex static-libs)
+		-DSPDLOG_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/spdlog/spdlog-1.12.0-r3.ebuild b/dev-libs/spdlog/spdlog-1.12.0-r3.ebuild
new file mode 100644
index 000000000000..298801759f76
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.12.0-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Fast C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gabime/${PN}"
+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 static-libs"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		>=dev-cpp/catch-3.4.0
+	)
+"
+DEPEND="
+	>=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-force_external_fmt.patch"
+	"${FILESDIR}/${P}-fix-tests.patch"
+)
+
+multilib_src_prepare() {
+	cmake_src_prepare
+	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSPDLOG_BUILD_BENCH=no
+		-DSPDLOG_BUILD_EXAMPLE=no
+		-DSPDLOG_FMT_EXTERNAL=yes
+		-DSPDLOG_BUILD_SHARED=$(usex static-libs)
+		-DSPDLOG_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/spdlog/spdlog-1.13.0.ebuild b/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 55c4ac137dc1..01917c4d913f 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+inherit cmake-multilib
 
 DESCRIPTION="Fast C++ logging library"
 HOMEPAGE="https://github.com/gabime/spdlog"
@@ -13,17 +13,19 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	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"
+IUSE="test static-libs"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
 	virtual/pkgconfig
-	test? ( dev-cpp/catch:0 )
+	test? (
+		>=dev-cpp/catch-3.4.0
+	)
 "
 DEPEND="
 	>=dev-libs/libfmt-8.0.0:=
@@ -34,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)
 	)