From 6416826991f08ac0f54fc8b1ff4b140bedd29684 Mon Sep 17 00:00:00 2001
From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Sun, 4 Jul 2021 02:08:58 -0700
Subject: dev-util/bear: use older fmt

Bug: https://bugs.gentoo.org/800236
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---
 dev-util/bear/bear-3.0.13-r1.ebuild | 87 +++++++++++++++++++++++++++++++++++++
 dev-util/bear/bear-3.0.13.ebuild    | 87 -------------------------------------
 2 files changed, 87 insertions(+), 87 deletions(-)
 create mode 100644 dev-util/bear/bear-3.0.13-r1.ebuild
 delete mode 100644 dev-util/bear/bear-3.0.13.ebuild

(limited to 'dev-util/bear')

diff --git a/dev-util/bear/bear-3.0.13-r1.ebuild b/dev-util/bear/bear-3.0.13-r1.ebuild
new file mode 100644
index 000000000000..2681fb25ea77
--- /dev/null
+++ b/dev-util/bear/bear-3.0.13-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Build EAR generates a compilation database for clang tooling"
+HOMEPAGE="https://github.com/rizsotto/Bear"
+SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-cpp/nlohmann_json-3.7:=
+	>=dev-db/sqlite-3.14:=
+	dev-libs/libfmt:0/7
+	dev-libs/protobuf:=
+	>=dev-libs/spdlog-1.5
+	>=net-libs/grpc-1.26:=
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-cpp/gtest-1.10
+	)
+"
+
+BDEPEND="test? (
+	$(python_gen_any_dep '
+		dev-python/lit[${PYTHON_USEDEP}]
+	')
+)"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${P^}"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# Turn off testing before installation
+	sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_UNIT_TESTS="$(usex test ON OFF)"
+		-DENABLE_FUNC_TESTS="$(usex test ON OFF)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if has sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=sandbox\' detected"
+		ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
+		ewarn "Skipping tests"
+	elif
+		has usersandbox ${FEATURES}; then
+		ewarn "\'FEATURES=usersandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has network-sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=network-sandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
+		ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
+		ewarn "and will fail without generic cc symlink"
+		ewarn "Skipping tests"
+	else
+		einfo "test may use optional tools if found: qmake gfortran valgrind"
+		# unit tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose
+		# functional tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose
+	fi
+}
diff --git a/dev-util/bear/bear-3.0.13.ebuild b/dev-util/bear/bear-3.0.13.ebuild
deleted file mode 100644
index 97791cb96b0b..000000000000
--- a/dev-util/bear/bear-3.0.13.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="Build EAR generates a compilation database for clang tooling"
-HOMEPAGE="https://github.com/rizsotto/Bear"
-SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-cpp/nlohmann_json-3.7:=
-	>=dev-db/sqlite-3.14:=
-	>=dev-libs/libfmt-6.2:=
-	dev-libs/protobuf:=
-	>=dev-libs/spdlog-1.5
-	>=net-libs/grpc-1.26:=
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-cpp/gtest-1.10
-	)
-"
-
-BDEPEND="test? (
-	$(python_gen_any_dep '
-		dev-python/lit[${PYTHON_USEDEP}]
-	')
-)"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P^}"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	# Turn off testing before installation
-	sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_UNIT_TESTS="$(usex test ON OFF)"
-		-DENABLE_FUNC_TESTS="$(usex test ON OFF)"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if has sandbox ${FEATURES}; then
-		ewarn "\'FEATURES=sandbox\' detected"
-		ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
-		ewarn "Skipping tests"
-	elif
-		has usersandbox ${FEATURES}; then
-		ewarn "\'FEATURES=usersandbox\' detected"
-		ewarn "Skipping tests"
-	elif
-		has network-sandbox ${FEATURES}; then
-		ewarn "\'FEATURES=network-sandbox\' detected"
-		ewarn "Skipping tests"
-	elif
-		has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
-		ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
-		ewarn "and will fail without generic cc symlink"
-		ewarn "Skipping tests"
-	else
-		einfo "test may use optional tools if found: qmake gfortran valgrind"
-		# unit tests
-		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose
-		# functional tests
-		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose
-	fi
-}
-- 
cgit v1.2.3-65-gdbad