commit: 7f9e2cc58269ddd27b1ff422045f7eb1bc06b592 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Fri Dec 24 12:03:25 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Fri Dec 24 12:07:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9e2cc5
dev-util/bear: fix automagic completion installation install with out eclass instead unconditionally Closes: https://bugs.gentoo.org/829806 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> dev-util/bear/{bear-2.4.4.ebuild => bear-2.4.4-r1.ebuild} | 12 +++++++++++- dev-util/bear/bear-2.4.4.ebuild | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dev-util/bear/bear-2.4.4.ebuild b/dev-util/bear/bear-2.4.4-r1.ebuild similarity index 88% copy from dev-util/bear/bear-2.4.4.ebuild copy to dev-util/bear/bear-2.4.4-r1.ebuild index e7c189ffb934..af4cedd7fc4f 100644 --- a/dev-util/bear/bear-2.4.4.ebuild +++ b/dev-util/bear/bear-2.4.4-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit cmake python-single-r1 +inherit bash-completion-r1 cmake python-single-r1 DESCRIPTION="Build EAR generates a compilation database for clang tooling" HOMEPAGE="https://github.com/rizsotto/Bear"; @@ -31,6 +31,11 @@ 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 @@ -38,6 +43,11 @@ src_compile() { 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" diff --git a/dev-util/bear/bear-2.4.4.ebuild b/dev-util/bear/bear-2.4.4.ebuild index e7c189ffb934..af4cedd7fc4f 100644 --- a/dev-util/bear/bear-2.4.4.ebuild +++ b/dev-util/bear/bear-2.4.4.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit cmake python-single-r1 +inherit bash-completion-r1 cmake python-single-r1 DESCRIPTION="Build EAR generates a compilation database for clang tooling" HOMEPAGE="https://github.com/rizsotto/Bear"; @@ -31,6 +31,11 @@ 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 @@ -38,6 +43,11 @@ src_compile() { 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"
