gentoo auto-resync : 29:03:2025 - 00:32:15

3 files changed, 131 insertions, 0 deletions

diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 1a96b413917b..224d9254b790 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,5 +1,8 @@
 AUX bear-3.1.4-reduce-grpc-verbosity.patch 1813 BLAKE2B 3a4e3faca382d3994bc94e5a3aa95c2d44f255fae95383068d44cc2347323508690451759533e01ebe2845235e7de0e37b1bf1f80aa9adbfe73c2b3a9546460d SHA512 58a1831c763565d443c7fad6b752640706176b19edd4d1fff67d74aecf5a3fb86d91d969b60c6d926deacb18771b9e5e5b00eb791dee45648ae709ccbe9d05ff
 AUX bear-3.1.4-tests.patch 2199 BLAKE2B 2f2c97705aec1d55e6166cb13858d3e6eda3cc44e9de0fdff9a9c452a71790542534bcb0740f28e47e061405eaf9e180cca49c12232fef8b63107a3e0fde1166 SHA512 89451e19647064fcbe7c31c328d0eddf33882a4a5b94903bc6e89b24bbfe30f2152afc813c40c0ae5aeb0909e0c9f7e190e21b7d9505b05c9f52741a35525f51
+AUX bear-3.1.6-always.patch 511 BLAKE2B c2b46710df6e8a70aa1310cb1a8ed5263d222186026e4ef178f4266fc2aac75c951bb8fe0c03186f2687fd3e1fa911539497fef474085e245a242d643bc1a0e5 SHA512 ea5c24147c32e007e499337a72666908c0dad7a4de79ae0bd2118c629ec8eb2ee004d9546fb92c7fb3fea0c7a4126671ed63bf6f0b3c5f54c1161bace15c4f9b
 DIST bear-3.1.5.tar.gz 152228 BLAKE2B 64d03d1ca5b1473e4d0b2106969285a2391471a0027cf387c72fe70769293fa361196cb1d37ebb528d27b5741b792472fad09688761ab7f73dc0ea7db96d8be1 SHA512 acf233f7bb8215694734b6c947c965323c0a5ea0c2a6bbb210a37e38fdf545326ca8de3a7b31ce81469756afd1c02233775ddc5936fd04132f216def6e3ce1de
+DIST bear-3.1.6.tar.gz 170892 BLAKE2B dc54bf28ad329e39b609b4993a1b6a78b4ea6562fa57b1615f4b7885c0aab70a124c485c435f3cb341be2915ee7f0b80ab9362c3504899d436271208e25cf239 SHA512 5852ca8d93459a9e1a6d2e030cc3963c213bf1638241825ec5df4eea7e3460faca9436ca2e36b8e5da40222306a0ecc8ed80d1f5e518ddd97dc5e200d42a75bb
 EBUILD bear-3.1.5.ebuild 2722 BLAKE2B c62d0ff310125554119ff9f44d04f7c944a40294e4de5c0c877cb6769da78b1a608b512076024b20befdb71b0572af60a2f2d570e0c8584ac67797a5739c0240 SHA512 fdf1d2b3f7ffa1aebbf9ea9b3249b7edd399cb91231b26c7ad9543e703e4132765f99c7a7bca7fd13a0a8e698c345c55f5de5e7b4659f6c79d12b85a68f9013d
+EBUILD bear-3.1.6.ebuild 2764 BLAKE2B afee3bcd66d7fb12dbfda8d5c47e16ec9e49983db2c32939a80ec838524d8a273cef42d1af37e63e4cf12217b1eccbb5d2ef5efcb9648ebdc11875c5e4cc3698 SHA512 2aca84a2a2e293f9de8c3c76d9f67f69b3168c97e52ba86e85bfb6cda59e4c5ef4bb6f58c28c4149dd3b9c03562974fb95f784bc84dcd88bbb434c38a0070c92
 MISC metadata.xml 1067 BLAKE2B 180de420c2173d245fa29b092d80e2c94ae2df8ba5c1c9d3fa2d706c75fbbc489d08b61505bf612fe247b7a9384b220682549f47db77b8bc3e7b170be9663380 SHA512 df9e220346c2098767bafc1e212a94fedae90892de64d8f04c599f3caf124d3ab539a9d9f757b5ba5ed4ff895fa39b954409d551514c9ee6fe44296c2317a021
diff --git a/dev-util/bear/bear-3.1.6.ebuild b/dev-util/bear/bear-3.1.6.ebuild
new file mode 100644
index 000000000000..4d37f48842ed
--- /dev/null
+++ b/dev-util/bear/bear-3.1.6.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cuda cmake multiprocessing 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"
+S="${WORKDIR}/${P^}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="cuda test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libfmt-9.1.0:=
+	dev-libs/protobuf:=
+	>=dev-libs/spdlog-1.11.0:=
+	>=net-libs/grpc-1.49.2:=
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/nlohmann_json-3.11.2:=
+	test? (
+		>=dev-cpp/gtest-1.13
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-build/libtool
+		$(python_gen_any_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.4-tests.patch"
+	"${FILESDIR}/${PN}-3.1.4-reduce-grpc-verbosity.patch"
+	"${FILESDIR}/${PN}-3.1.6-always.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() {
+	# TODO: remove this when https://bugs.gentoo.org/928346 is fixed
+	export CMAKE_BUILD_PARALLEL_LEVEL=$(makeopts_jobs)
+
+	local mycmakeargs=(
+		-DENABLE_UNIT_TESTS="$(usex test)"
+		-DENABLE_FUNC_TESTS="$(usex test)"
+	)
+	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 "tests will fail"
+	fi
+	if has usersandbox "${FEATURES}"; then
+		ewarn "FEATURES=usersandbox detected"
+		ewarn "tests will fail"
+	fi
+	if
+		has network-sandbox "${FEATURES}"; then
+		ewarn "FEATURES=network-sandbox detected"
+		ewarn "tests will fail"
+	fi
+	if
+		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"
+	fi
+
+	einfo "test may use optional tools if found: gfortran libtool nvcc valgrind"
+
+	# unit tests
+	BUILD_DIR="${BUILD_DIR}/subprojects/Build/BearSource" cmake_src_test
+
+	# functional tests
+	if use cuda; then
+		NVCC_CCBIN="$(cuda_gccdir)"
+		export NVCC_CCBIN
+	else
+		LIT_SKIP_TESTS+=( "cases/compilation/output/compile_cuda.sh" )
+	fi
+
+	mylitopts+=(-j "$(makeopts_jobs)" )
+	[[ -n "${LIT_SKIP_TESTS[*]}" ]] && mylitopts+=( --filter-out "($( IFS='|'; echo "${LIT_SKIP_TESTS[*]}"))" )
+
+	export LIT_OPTS="${mylitopts[*]}"
+
+	BUILD_DIR="${BUILD_DIR}/subprojects/Build/BearTest" cmake_src_test
+}
diff --git a/dev-util/bear/files/bear-3.1.6-always.patch b/dev-util/bear/files/bear-3.1.6-always.patch
new file mode 100644
index 000000000000..60eb4a283711
--- /dev/null
+++ b/dev-util/bear/files/bear-3.1.6-always.patch
@@ -0,0 +1,14 @@
+Reverse of https://github.com/rizsotto/Bear/commit/83383261e0756d2a5c5b85cf469f1fa34110c9ed
+https://github.com/rizsotto/Bear/issues/625
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -83,8 +83,6 @@ ExternalProject_Add(BearSource
+             -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_MODULE_LINKER_FLAGS}
+             -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+             ${CMAKE_CACHE_ARGS_EXTRA}
+-        BUILD_ALWAYS
+-            1
+         TEST_BEFORE_INSTALL
+             1
+         TEST_COMMAND