commit: 97fda9eb74eacbed9710e2c3a6eceed78208ed53 Author: David Roman <davidroman96 <AT> gmail <DOT> com> AuthorDate: Tue Dec 13 21:37:31 2022 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Wed Dec 21 09:53:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97fda9eb
dev-libs/spdlog: add 1.11.0 Signed-off-by: David Roman <davidroman96 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/28657 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> dev-libs/spdlog/Manifest | 1 + dev-libs/spdlog/{spdlog-9999.ebuild => spdlog-1.11.0.ebuild} | 10 +++++++--- dev-libs/spdlog/spdlog-9999.ebuild | 10 +++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest index f33e9a50c1ed..17dd522095c4 100644 --- a/dev-libs/spdlog/Manifest +++ b/dev-libs/spdlog/Manifest @@ -1 +1,2 @@ DIST spdlog-1.10.0.tar.gz 368651 BLAKE2B e40afa9fd1dd791e1f703392f0f54fc798ed70537a9f1ee9c8598dd449f4cd4dd03bc4ce95e416cbbe224711a17e70708a106f0432384542d6316cf232cf8757 SHA512 e82ec0a0c813ed2f1c8a31a0f21dbb733d0a7bd8d05284feae3bd66040bc53ad47a93b26c3e389c7e5623cfdeba1854d690992c842748e072aab3e6e6ecc5666 +DIST spdlog-1.11.0.tar.gz 373033 BLAKE2B a05a535ba55641ecb3bf484eeff902f266bf3967cfbd619234ab0ca2d0c15bddb27b73ce43c33623d02fb046f621933cd52cf39f377f354182d9cdab33340f28 SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412 diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-1.11.0.ebuild similarity index 84% copy from dev-libs/spdlog/spdlog-9999.ebuild copy to dev-libs/spdlog/spdlog-1.11.0.ebuild index b763f5c7e398..63858c13d0f8 100644 --- a/dev-libs/spdlog/spdlog-9999.ebuild +++ b/dev-libs/spdlog/spdlog-1.11.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -13,7 +13,7 @@ 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 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="MIT" @@ -29,6 +29,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-force_external_fmt.patch" +) + src_prepare() { cmake_src_prepare rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild index b763f5c7e398..63858c13d0f8 100644 --- a/dev-libs/spdlog/spdlog-9999.ebuild +++ b/dev-libs/spdlog/spdlog-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -13,7 +13,7 @@ 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 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="MIT" @@ -29,6 +29,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-force_external_fmt.patch" +) + src_prepare() { cmake_src_prepare rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
