[gentoo-commits] repo/gentoo:master commit in: dev-util/bear/, dev-util/bear/files/

["Sam James" <sam@gentoo.org>]

commit:     4faf550baa77bca59e097840348eec4767827297
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 17:52:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 18:47:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4faf550b

dev-util/bear: drop 3.0.17

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/bear/Manifest                 |  1 -
 dev-util/bear/bear-3.0.17.ebuild       | 90 ----------------------------------
 dev-util/bear/files/3.0.17-gcc11.patch | 52 --------------------
 3 files changed, 143 deletions(-)

diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 75749bfbe8ca..c654704a0b5f 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,3 +1,2 @@
 DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
-DIST bear-3.0.17.tar.gz 123861 BLAKE2B 9dea85c7c0ec5ec4954d08147cdac31e0b28c9780281a544687340e6e226e5403ad82f74db0fb9edd3f65c9a982531afb612e1c744430735e6de97d8d29a2189 SHA512 08e50b04c87745ae60623c32de07e710ffb4e78d9978f13cca9d51929b45477c780f1fe47178569310dca20dab5fef49dbffdf17a087c388f111eb11ffadf5b1
 DIST bear-3.0.19.tar.gz 125086 BLAKE2B 0c6a27359e8c88ab0dbaa3f5442a87efeaba4f6a9b8d0912ad026231421e2555a524b194a19972f549600951bc1f6620398c48338f7eac8850ba6c3969f2e6ac SHA512 688766a76cc3bee1dc82478d29d6e8754618f92633c842586fce95f2f1096764902ffd64a6f2f59101e58eba5472bf39ddb178c3dfcd48491fa4eb63d111585c

diff --git a/dev-util/bear/bear-3.0.17.ebuild b/dev-util/bear/bear-3.0.17.ebuild
deleted file mode 100644
index b31cd181b486..000000000000
--- a/dev-util/bear/bear-3.0.17.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-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-9.0.0:=
-	dev-libs/protobuf:=
-	>=dev-libs/spdlog-1.5
-	>=net-libs/grpc-1.26:=
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-cpp/gtest-1.10
-	)
-"
-
-BDEPEND="test? (
-	sys-devel/libtool
-	$(python_gen_any_dep '
-		dev-python/lit[${PYTHON_USEDEP}]
-	')
-)"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=( "${FILESDIR}/3.0.17-gcc11.patch" )
-
-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/files/3.0.17-gcc11.patch b/dev-util/bear/files/3.0.17-gcc11.patch
deleted file mode 100644
index cb52a7f36215..000000000000
--- a/dev-util/bear/files/3.0.17-gcc11.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ada467c3f4038abc3c3ac964a46ec0da0e8ed1c5 Mon Sep 17 00:00:00 2001
-From: shrkamat <shrinivas.kamath@gmail.com>
-Date: Sat, 11 Dec 2021 17:43:10 +0530
-Subject: [PATCH] Fix compile errors with g++ 11.02 (#434)
-
-Co-authored-by: Shrinivas Kamath <skamath@synamedia.com>
----
- source/citnames/source/semantic/Parsers.h | 1 +
- source/libflags/include/libflags/Flags.h  | 1 +
- third_party/grpc/CMakeLists.txt           | 5 +++++
- 3 files changed, 7 insertions(+)
-
-diff --git a/source/citnames/source/semantic/Parsers.h b/source/citnames/source/semantic/Parsers.h
-index 7a4dc8f4..0ec003ee 100644
---- a/source/citnames/source/semantic/Parsers.h
-+++ b/source/citnames/source/semantic/Parsers.h
-@@ -27,6 +27,7 @@
- #include <map>
- #include <optional>
- #include <string>
-+#include <optional>
- 
- #include <fmt/format.h>
- 
-diff --git a/source/libflags/include/libflags/Flags.h b/source/libflags/include/libflags/Flags.h
-index 76f772df..d92fbae2 100644
---- a/source/libflags/include/libflags/Flags.h
-+++ b/source/libflags/include/libflags/Flags.h
-@@ -28,6 +28,7 @@
- #include <string_view>
- #include <vector>
- #include <iosfwd>
-+#include <optional>
- 
- namespace flags {
- 
-diff --git a/third_party/grpc/CMakeLists.txt b/third_party/grpc/CMakeLists.txt
-index c8a7114b..792a0c6a 100644
---- a/third_party/grpc/CMakeLists.txt
-+++ b/third_party/grpc/CMakeLists.txt
-@@ -46,6 +46,11 @@ else ()
-                 -DgRPC_BUILD_TESTS:BOOL=OFF
-                 -DgRPC_BUILD_CSHARP_EXT:BOOL=OFF
-                 -DCMAKE_INSTALL_PREFIX:PATH=${DEPENDENCIES_INSTALL_PREFIX}/grpc_dependency
-+                -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-+                -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}
-+                -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
-+                -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-+                -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
-             )
- 
-     include(GNUInstallDirs)