gentoo auto-resync : 22:12:2022 - 01:55:45

4 files changed, 2 insertions, 168 deletions

diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 43a2df2723b4..671dd8ce2cb8 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,7 +1,3 @@
-DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
-DIST bear-3.0.19.tar.gz 125086 BLAKE2B 0c6a27359e8c88ab0dbaa3f5442a87efeaba4f6a9b8d0912ad026231421e2555a524b194a19972f549600951bc1f6620398c48338f7eac8850ba6c3969f2e6ac SHA512 688766a76cc3bee1dc82478d29d6e8754618f92633c842586fce95f2f1096764902ffd64a6f2f59101e58eba5472bf39ddb178c3dfcd48491fa4eb63d111585c
 DIST bear-3.0.20.tar.gz 125393 BLAKE2B 826a774beeb0596038f69b345a3659fe58f897bdb1a63f5faeac1d4242ae3cf4bf346ab82d2f87934d0786e5c0d4e835837b838a62f5a92c28ffe5e6a3d6a900 SHA512 4cf0e648b73fd4c0ac109c4a853e203efccb34ac7373d6c2f3ee3d5089853b791008990df768871dfd1268324bcce97c44657b4c3a2d1383134cba3eaec40bdd
-EBUILD bear-2.4.4-r1.ebuild 1829 BLAKE2B 0f87691b8ee68c1176236f4cf1608892941195893b4a1ebdf5872333b05196f81f1b98469bd90534f7de062bb613dbc649ccc2e99ccc739501d4d57b57d48a61 SHA512 be4c5dee00262ac6681cc2486965732ba5f196e70e7cbf21424e96d3154f3171d1db68b7493f802ba359699999664f92bc64488f3922cbf9ac34d785dc61dd8e
-EBUILD bear-3.0.19.ebuild 2151 BLAKE2B f71d8ca7f99cf5e07b27a1a390075dd8a13acd4d99b05b8d66743de94630f99eeec424e75836377b103945a4425ef6fd7a5acedfd47bc9f58d3142c5ce513637 SHA512 4702e73afe41c9756a1fba67f2680aeea1cf8ce920b4679288af9924c5dd7a7218cbd6ece08303f521d8156487624a1f157f66670602fe652415761ad4f1408c
-EBUILD bear-3.0.20.ebuild 2128 BLAKE2B a53d5536bd2180b3e56d97de174e16e3ed1b8c25fded443c98608607238ac188aa02b7efa039bfbd91bc2c184e034e4f144f4d584c7f555505ab5b405d11f9aa SHA512 5ea9453701de81a19d4e6abe3820d7e82d08cac34e808026a5b9669e449d800a7e840736a829d9416c4bf801c0509bf6940c804feafad29c26c4f48656748b4e
+EBUILD bear-3.0.20-r1.ebuild 2130 BLAKE2B b3be104c8616018c4921d650a8a6eb27a101ec4414c80e3a479dff51e2bfcb026ba8c06b2ab220bf028ce293dff2d9cfac979f6d2d7b9842a48ad5c17a7f2ecc SHA512 005beffef08fbe1821945a333cfba32d65c7c9030839f9b211386139df7e4eb0cfc3c11cc949d572b8404d8ad35cf52cad5a2311cefa0fd27c08ac8fdf739bc5
 MISC metadata.xml 915 BLAKE2B 74d981eed24b95353d225061c11b11e3f7aedddd6fb3b79a96bc98f2d348d64ea4598337f5b946d94ac64278eaa9bce5a3ade0f9564d9e3f3b4031574569f20c SHA512 010b17d6da15e7b5a4079864c7c2f3f11c8531faddee1ab226c1d6c3f646079c52ef4495e4685bae6eeec8702801ddbd41c4bd2e1aaa82400c1265e2ecad1957
diff --git a/dev-util/bear/bear-2.4.4-r1.ebuild b/dev-util/bear/bear-2.4.4-r1.ebuild
deleted file mode 100644
index 08fbed8fe87a..000000000000
--- a/dev-util/bear/bear-2.4.4-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit bash-completion-r1 cmake python-single-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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="test? (
-	app-shells/bash
-	$(python_gen_cond_dep '
-		dev-python/lit[${PYTHON_USEDEP}]
-	')
-)"
-
-RDEPEND="${PYTHON_DEPS}"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P^}"
-
-src_configure() {
-	local mycmakeargs=( -DUSE_SHELL_COMPLETION=OFF )
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	# need to fix it now, before tests are run
-	python_fix_shebang "${BUILD_DIR}"/bear/bear
-	python_fix_shebang test/functional/tools/cdb_diff.py
-}
-
-src_install() {
-	cmake_src_install
-	dobashcomp shell-completion/bash/bear
-}
-
-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_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 "removing unwanted/unsupported/xfail tests"
-		rm -v test/functional/cases/{end-to-end/scons.ft,intercept/cuda/successful_build.fts,run_pep8.ft} || die
-		einfo "test may use optional tools if found: qmake gfortran"
-		cmake_build check
-	fi
-}
diff --git a/dev-util/bear/bear-3.0.19.ebuild b/dev-util/bear/bear-3.0.19.ebuild
deleted file mode 100644
index 9ac6d7e10574..000000000000
--- a/dev-util/bear/bear-3.0.19.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-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 ~riscv ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-cpp/nlohmann_json-3.7.3:=
-	>=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="
-	virtual/pkgconfig
-	test? (
-		sys-devel/libtool
-		$(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
-}
diff --git a/dev-util/bear/bear-3.0.20.ebuild b/dev-util/bear/bear-3.0.20-r1.ebuild
index b5097f2c2007..46a19355ce1b 100644
--- a/dev-util/bear/bear-3.0.20.ebuild
+++ b/dev-util/bear/bear-3.0.20-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	>=dev-db/sqlite-3.14:=
 	dev-libs/libfmt:=
 	dev-libs/protobuf:=
-	>=dev-libs/spdlog-1.5
+	>=dev-libs/spdlog-1.5:=
 	>=net-libs/grpc-1.26:=
 "