gentoo auto-resync : 28:10:2022 - 22:00:04

4 files changed, 2 insertions, 113 deletions

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index d10455d04392..54bdcafa9798 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,10 +1,6 @@
 AUX spdlog-1.9.2-fix-clone-test.patch 422 BLAKE2B adf5104879b3ffae5658b8cc38d78b56e9c330c59add082a4604372ba45822512774a331995634915bdf3514ed4cf74d5e8171835cea3e8dbd9bae33177ebfdf SHA512 e66801855e2856f5195644eb31b3f53fee62164df9883d66289c6bfefff1c1c7e7d4aea320b0cd510ab5a656b415886ab2fe2686047d77f33cde4f997569b2c9
 AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692
 DIST spdlog-1.10.0.tar.gz 368651 BLAKE2B e40afa9fd1dd791e1f703392f0f54fc798ed70537a9f1ee9c8598dd449f4cd4dd03bc4ce95e416cbbe224711a17e70708a106f0432384542d6316cf232cf8757 SHA512 e82ec0a0c813ed2f1c8a31a0f21dbb733d0a7bd8d05284feae3bd66040bc53ad47a93b26c3e389c7e5623cfdeba1854d690992c842748e072aab3e6e6ecc5666
-DIST spdlog-1.9.2-update-catch-glibc-2.34.patch.bz2 54615 BLAKE2B 62b707fef02c7876692f7cc67119ea2b1a712d005d5367e5afdc50f42d6762f370a463ca3194e6850c059c679aef0e908471e0362afa2dc44a8bf7aaf19af2b0 SHA512 5d9868de7968ecf2c17b5fbb1199e70b064551bc2474fe563770d1e8d4b5f6d46d371091284c3bd10b47b3c7e94b134252e16f26b1834eff4390896acd773ecb
-DIST spdlog-1.9.2.tar.gz 327799 BLAKE2B 8e4cce17887509512c0d3a63485f9271098bdf7f853c2a07adb8d46459c1039d93d16d05cb60963c1bbc754f6af6ba3af1a66c69bc421bf234f676231c8c1315 SHA512 87b12a792cf2d740ef29db4b6055788a487b6d474662b878711b8a5534efea5f0d97b6ac357834500b66cc65e1ba8934446a695e9691fd5d4b95397b6871555c
-EBUILD spdlog-1.10.0.ebuild 1052 BLAKE2B 0c97ecf8b5a62362dc79d5dc9dbf682881f2694671a5712614057e848f45f001d3dee1f437ddf08100d2703f5e69ada5c130ba3c1898e7b00d5bb9ad53610a53 SHA512 f33ed451d1272ef566ec3b91ab9feeff32481e0e9e7627e0a04e5c00f2dafa330c44ac38aa8146e6a3d701a78b4b1fc8a9a087453bc04bd0eb406acffd929030
-EBUILD spdlog-1.9.2-r1.ebuild 1259 BLAKE2B 6e7ba878d9ee9423170a9c2d3b97a279bb9717937fc1df6d0c7f1ed7a4591cb8c05b829a8da6e97b00b68d82252a9ab459e87fa0205ff99c8d08cfc7895d77a8 SHA512 c4c4bc1f648cb6ca7a716f9d88324cd38e753a1d006cc59483f541531be0ce2b5b83cea0b0f447d4c43ffae01472c673ced43f71043cf21c9633ae1965fbfdb3
-EBUILD spdlog-1.9.2.ebuild 1154 BLAKE2B c9d1a6441a46b9d945e5036734e2efab4551ab7712b6df7faf82c470b18db538eeb16067e186a351c9ba48480cfa9a8455cc5b333922f875567db633be04ef35 SHA512 4234dd4b5319e7932c4a17484411dd5104da67190d6a67cfadfa1b6d30d669d74f7f61b3358f19c1e1312634948715b548869e55f85667368263846c9563167d
+EBUILD spdlog-1.10.0.ebuild 1051 BLAKE2B ebf55210df05bb7a8774a50991e07d9131166b56a8783ae021ae7e351bc7e4193a494738952f1a4783c28db99d289d53abf1202426e77f7d4759960626aa9999 SHA512 5bc8a4613c59d0bda07009191069ac0901121fcaeb220568cb4e68a9f9834c8be61d235f69852ce3af0e1f63e076f3043f17856fd21781f99197127e16f874a6
 EBUILD spdlog-9999.ebuild 943 BLAKE2B 2648bd5446a12ed2e55af185461a42ce4a02ce83c6dcc97470fb2a4bf4a8fc20526a34773ae8499efb3886e974444e6e1e39785a5f200ce7611432d2ac82fb60 SHA512 e960e95684bcc5c8d73d9fdfd2d45348362fca6c4d991453a7ee64b6dd5014c158bdc3bef11d26ab4e8c68437f9ecd5d53b3e809765a5687a749330f516378fa
 MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c
diff --git a/dev-libs/spdlog/spdlog-1.10.0.ebuild b/dev-libs/spdlog/spdlog-1.10.0.ebuild
index f496aa6b47f3..5b255d81d0bd 100644
--- a/dev-libs/spdlog/spdlog-1.10.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.10.0.ebuild
@@ -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 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
deleted file mode 100644
index d1522c98ebf1..000000000000
--- a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Very fast, header only, 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"
-	# Temporary for bug #811750
-	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-update-catch-glibc-2.34.patch.bz2 )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libfmt-8.0.0:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-force_external_fmt.patch"
-	"${FILESDIR}/${P}-fix-clone-test.patch"
-)
-
-src_prepare() {
-	use test && eapply "${WORKDIR}"/${P}-update-catch-glibc-2.34.patch
-
-	cmake_src_prepare
-	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSPDLOG_BUILD_BENCH=no
-		-DSPDLOG_BUILD_EXAMPLE=no
-		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
-		-DSPDLOG_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/spdlog/spdlog-1.9.2.ebuild b/dev-libs/spdlog/spdlog-1.9.2.ebuild
deleted file mode 100644
index beb63a1a7f60..000000000000
--- a/dev-libs/spdlog/spdlog-1.9.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Very fast, header only, 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"
-	# Temporary for bug #811750
-	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-update-catch-glibc-2.34.patch.bz2 )"
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libfmt-8.0.0:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	use test && eapply "${WORKDIR}"/${P}-update-catch-glibc-2.34.patch
-
-	cmake_src_prepare
-	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSPDLOG_BUILD_BENCH=no
-		-DSPDLOG_BUILD_EXAMPLE=no
-		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
-		-DSPDLOG_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}