gentoo resync : 22.12.2021

3 files changed, 145 insertions, 0 deletions

diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 16364d5eadf2..379648dc412e 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,5 +1,8 @@
+AUX 3.0.17-gcc11.patch 1934 BLAKE2B a51dcf079322144ee84ae41dddfccc08dd878a0b04f0a97dab9ea9d5c3a54ecd035c28cb9fb19402cd2d8c2b2af678b65246fd53515c6d20427f4ead12b7bc86 SHA512 645e87cf4afd0f0c91b62c1bd8257e3eba08d4a5d177d7748ce1be936185618a90c5be4775256cf0dbc8bb2c207caa7871d35e170cdd1d6805ad84a0c3f4287a
 DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
 DIST bear-3.0.16.tar.gz 122948 BLAKE2B bb720170488968e79d26b7022859a3a55f191661a65d8c5c1ce6120911919ffcd74a32035eebb419e4fe9a616f6dec1c66804445d9e8b243c7d26a87284f7776 SHA512 3906011aa01f42c7841046614e9f1972a39288749cbdeab4b55e517d48a05cb02a48be2b055b4ce65300ffa0a940609e713f55bd1a47ce4fc9a8cb2702487f07
+DIST bear-3.0.17.tar.gz 123861 BLAKE2B 9dea85c7c0ec5ec4954d08147cdac31e0b28c9780281a544687340e6e226e5403ad82f74db0fb9edd3f65c9a982531afb612e1c744430735e6de97d8d29a2189 SHA512 08e50b04c87745ae60623c32de07e710ffb4e78d9978f13cca9d51929b45477c780f1fe47178569310dca20dab5fef49dbffdf17a087c388f111eb11ffadf5b1
 EBUILD bear-2.4.4.ebuild 1638 BLAKE2B 26435a94e41a295c629ca64a62f726a1ec58be5e85bcfbc312a2f6cd75d3232aae1e6854ad3415e99dfc369ce0e4a1ed0ff9e1b413332d24102015a2d1592d24 SHA512 c7d5cd603d219d8a1f764c728fdfb476b79b500b3db6c5513bb91397f88d4b5f46d4b16903834b93fff38f1fad243bca7c0c10d8893f2ce6238ac24847402e94
 EBUILD bear-3.0.16-r2.ebuild 2095 BLAKE2B 515d7147414212b1edba08ef6a63c58f2e85de1908103b4308d6eaa13ca23c4e058025181f3a5ee0fa0c25712950f6130513d47bd073abbfd03343903eac8985 SHA512 480fa8af0fde9f09bb70a14021fad6d0766c9831590c2c46db6e6a1331f3d24dc0b3a6202051fe9975567047c86dddc2f89e3324113586c6c84042659d69b81e
+EBUILD bear-3.0.17.ebuild 2160 BLAKE2B 9fac64f316be4108616bce784e2efa4c32fdd379f06ba21de0f3c378611244088ac99d7358593a6a7d75871dea5b846e1774e5268ddef6e68a39da7492d15fcf SHA512 21f420ed9cf827bbee97d8d587228374594ebc467996e96aa5e6a4d0ef169444e01dc9111bacbb66ad033ed7bcb3adfd1c990da5ecb3146107ae8a0931bacf94
 MISC metadata.xml 915 BLAKE2B 74d981eed24b95353d225061c11b11e3f7aedddd6fb3b79a96bc98f2d348d64ea4598337f5b946d94ac64278eaa9bce5a3ade0f9564d9e3f3b4031574569f20c SHA512 010b17d6da15e7b5a4079864c7c2f3f11c8531faddee1ab226c1d6c3f646079c52ef4495e4685bae6eeec8702801ddbd41c4bd2e1aaa82400c1265e2ecad1957
diff --git a/dev-util/bear/bear-3.0.17.ebuild b/dev-util/bear/bear-3.0.17.ebuild
new file mode 100644
index 000000000000..a4051dc0e04c
--- /dev/null
+++ b/dev-util/bear/bear-3.0.17.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020-2021 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-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? (
+	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
new file mode 100644
index 000000000000..cb52a7f36215
--- /dev/null
+++ b/dev-util/bear/files/3.0.17-gcc11.patch
@@ -0,0 +1,52 @@
+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)