gentoo auto-resync : 19:11:2024 - 03:03:00

3 files changed, 119 insertions, 2 deletions

diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 05c4aba4b2d6..787968135317 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,5 +1,7 @@
 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
 DIST bear-3.1.4.tar.gz 127672 BLAKE2B 18deb1172fcd8afdf4721a04b5d72b182190afd92d645841023033d187c812a0a30805af2bfb67b794ab8a8f0ca42965bebab6d035e95e2a25c5fccfe48a1afd SHA512 c63da7586d25a64dd8b3ff82f37505b36071dd064deb973c012840bc52ff6aec861fca21422b86b11629e86dc43d156b233d21b01e689369f0726799083afa98
-EBUILD bear-3.1.4-r1.ebuild 2722 BLAKE2B c62d0ff310125554119ff9f44d04f7c944a40294e4de5c0c877cb6769da78b1a608b512076024b20befdb71b0572af60a2f2d570e0c8584ac67797a5739c0240 SHA512 fdf1d2b3f7ffa1aebbf9ea9b3249b7edd399cb91231b26c7ad9543e703e4132765f99c7a7bca7fd13a0a8e698c345c55f5de5e7b4659f6c79d12b85a68f9013d
+DIST bear-3.1.5.tar.gz 152228 BLAKE2B 64d03d1ca5b1473e4d0b2106969285a2391471a0027cf387c72fe70769293fa361196cb1d37ebb528d27b5741b792472fad09688761ab7f73dc0ea7db96d8be1 SHA512 acf233f7bb8215694734b6c947c965323c0a5ea0c2a6bbb210a37e38fdf545326ca8de3a7b31ce81469756afd1c02233775ddc5936fd04132f216def6e3ce1de
+EBUILD bear-3.1.4-r2.ebuild 2800 BLAKE2B 0d5bac64e24cc287152991e75ba6a2149e8f3423b62612ca4b9a369106e872e90f2bf3805a26137140138c823169f7a4c139bea230053b1011f0efa95426ec4e SHA512 430c9554ec3d1d099de47eb01f2838a0cff807b797b9fd9b846b52b644cd19a3a1c4d708aff0e05adcc4aefb27d784c679d476e0b9437f56ec992853b8e4e9ab
+EBUILD bear-3.1.5.ebuild 2724 BLAKE2B f214d7b91b6e92c9586acfb15eeb4a7025343b1bd533c486c40a723a37a98bbc1c198e2de9d05145f327aac3e1b877d4ee6fa119b24176128881652df584ae49 SHA512 91421997afc187deedb3ce27469fd7ecac5b399734f1d7c405f9e355ed9282e51cad6e86ac12acc462a71a4519d226cacc273b87a3c92eb0cd5d362b6ddcbd8c
 MISC metadata.xml 1067 BLAKE2B 180de420c2173d245fa29b092d80e2c94ae2df8ba5c1c9d3fa2d706c75fbbc489d08b61505bf612fe247b7a9384b220682549f47db77b8bc3e7b170be9663380 SHA512 df9e220346c2098767bafc1e212a94fedae90892de64d8f04c599f3caf124d3ab539a9d9f757b5ba5ed4ff895fa39b954409d551514c9ee6fe44296c2317a021
diff --git a/dev-util/bear/bear-3.1.4-r2.ebuild b/dev-util/bear/bear-3.1.4-r2.ebuild
new file mode 100644
index 000000000000..10a1423f03cb
--- /dev/null
+++ b/dev-util/bear/bear-3.1.4-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2020-2024 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 )"
+
+# <libfmt-11 https://github.com/rizsotto/Bear/issues/592
+RDEPEND="
+	>=dev-libs/libfmt-9.1.0:=
+	<dev-libs/libfmt-11
+	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"
+)
+
+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/bear-3.1.4-r1.ebuild b/dev-util/bear/bear-3.1.5.ebuild
index ed91401baefe..b3a0ae0c42c0 100644
--- a/dev-util/bear/bear-3.1.4-r1.ebuild
+++ b/dev-util/bear/bear-3.1.5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="cuda test"
 RESTRICT="!test? ( test )"