gentoo resync : 15.06.2021

3 files changed, 91 insertions, 1 deletions

diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 8135bbf05436..d17f2b279ed1 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,5 +1,7 @@
 DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
 DIST bear-3.0.11.tar.gz 118678 BLAKE2B 209d904a84363a87e566798dcd65ffed96cdbf3d2e753af8dc2706adb995d2999bc112eabb88db28791cbb245c373eb330cf9c20d3d886bb2caeb5c01150e65d SHA512 6d362aede911a8ad35be30638a698579582ca5de770a7c3199bb205046f08f355387099261b8d857188d526ab62024f78e3d06a225734c5f9acca03e5dfea1ec
+DIST bear-3.0.12.tar.gz 118937 BLAKE2B 4ed41693a92583091b8510dd1ade55a3e5c897825205e59d9e9810aa63e5f17c5049b3b3de509665143083d44aeb6d85c63d944041bb36c6b1d842d0308d88f0 SHA512 e45e842793e9f5f2cd6b13a9795c2b6753c2fffd516e4af9f0362644c9d0952a2b0e505a4a9d53e9a1a4aa063d7368c6466367a78fececb70582ec7c4e8d7f10
 EBUILD bear-2.4.4.ebuild 1638 BLAKE2B 26435a94e41a295c629ca64a62f726a1ec58be5e85bcfbc312a2f6cd75d3232aae1e6854ad3415e99dfc369ce0e4a1ed0ff9e1b413332d24102015a2d1592d24 SHA512 c7d5cd603d219d8a1f764c728fdfb476b79b500b3db6c5513bb91397f88d4b5f46d4b16903834b93fff38f1fad243bca7c0c10d8893f2ce6238ac24847402e94
-EBUILD bear-3.0.11-r1.ebuild 2071 BLAKE2B a133a2e37f574d2ad1b060023becf5277f3011a7d54bad2d389b146ae3ef08f2a5d55ad93d2bd1c4e2778d9c44d6f4cea403ece918e111e19d3261ee9bde5a77 SHA512 562c3d1a8c4bded4cb8f29cefdc06dcef5665d40bf37c7f097c848a01b29df8c7bde0d905bc2e11dc20fec291963579ddc4db6c24b8679ffb5935b3f52c43764
+EBUILD bear-3.0.11-r1.ebuild 2092 BLAKE2B 78d02fa040a3b65d218fee784dbd321257fd6380c7b48e133f6121b8f616771b29aa2fecb7c44074f688d11aff506a63fd93259d4ef6d774bcf0e04bc8ddabd0 SHA512 9d842751d1452f3fe79e9e76aa776e6b4395200b1028ff0d0c2050a7092fec98afc4a2bbc1d461d4b6c36e372a0942e1998f7c82bb8d97e48f9be74cdeaa4175
+EBUILD bear-3.0.12.ebuild 2092 BLAKE2B 78d02fa040a3b65d218fee784dbd321257fd6380c7b48e133f6121b8f616771b29aa2fecb7c44074f688d11aff506a63fd93259d4ef6d774bcf0e04bc8ddabd0 SHA512 9d842751d1452f3fe79e9e76aa776e6b4395200b1028ff0d0c2050a7092fec98afc4a2bbc1d461d4b6c36e372a0942e1998f7c82bb8d97e48f9be74cdeaa4175
 MISC metadata.xml 914 BLAKE2B 791cac2c9a3850bc49848ec8f6ff889a21802ddce6937783afccdda45045b3861f0c79e44028ea6df18f046c5fc1b6ad89ac1a940afc9e4d6607507a12933382 SHA512 a7b29ce47f3c9d91f2ba5d1abf5975d64a9229619737b75d38d54b3bde860a47a859e6de7a959ad67cba21b2a0ced8a9fbaf508c02cace63c4090afbac2005ba
diff --git a/dev-util/bear/bear-3.0.11-r1.ebuild b/dev-util/bear/bear-3.0.11-r1.ebuild
index 86011aec51e5..9f97558920d0 100644
--- a/dev-util/bear/bear-3.0.11-r1.ebuild
+++ b/dev-util/bear/bear-3.0.11-r1.ebuild
@@ -20,6 +20,7 @@ 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:=
 "
diff --git a/dev-util/bear/bear-3.0.12.ebuild b/dev-util/bear/bear-3.0.12.ebuild
new file mode 100644
index 000000000000..9f97558920d0
--- /dev/null
+++ b/dev-util/bear/bear-3.0.12.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-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
+}