From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 134D3158086 for ; Fri, 24 Dec 2021 12:08:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D64EA2BC010; Fri, 24 Dec 2021 12:08:22 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 737752BC010 for ; Fri, 24 Dec 2021 12:08:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B68C343322 for ; Fri, 24 Dec 2021 12:08:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 69597256 for ; Fri, 24 Dec 2021 12:08:17 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1640347658.7f9e2cc58269ddd27b1ff422045f7eb1bc06b592.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bear/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/bear/bear-2.4.4-r1.ebuild dev-util/bear/bear-2.4.4.ebuild X-VCS-Directories: dev-util/bear/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 7f9e2cc58269ddd27b1ff422045f7eb1bc06b592 X-VCS-Branch: master Date: Fri, 24 Dec 2021 12:08:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f2644fc0-2ed4-4fa6-a379-88fcd7540e75 X-Archives-Hash: 18ba33f2fc92c576ff57b6bdc5bd2c6c commit: 7f9e2cc58269ddd27b1ff422045f7eb1bc06b592 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Dec 24 12:03:25 2021 +0000 Commit: Georgy Yakovlev gentoo 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 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"