public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bear/
Date: Fri, 24 Dec 2021 12:08:17 +0000 (UTC)	[thread overview]
Message-ID: <1640347658.7f9e2cc58269ddd27b1ff422045f7eb1bc06b592.gyakovlev@gentoo> (raw)

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"


             reply	other threads:[~2021-12-24 12:08 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-24 12:08 Georgy Yakovlev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-03 14:35 [gentoo-commits] repo/gentoo:master commit in: dev-util/bear/ Arthur Zamarin
2025-04-27 21:16 Sam James
2025-02-11 20:54 Andreas Sturmlechner
2024-12-31  4:57 Sam James
2024-12-31  3:19 Jakov Smolić
2024-11-18  9:07 Petr Vaněk
2024-11-18  9:07 Petr Vaněk
2024-09-14  9:53 Florian Schmaus
2024-09-13 19:33 Arthur Zamarin
2024-09-13 19:33 Arthur Zamarin
2024-08-13 13:05 Joonas Niilola
2024-07-03  5:30 Joonas Niilola
2024-05-12 15:41 Sam James
2024-05-12 15:41 Sam James
2024-04-01  7:14 Sam James
2024-03-16 13:34 Joonas Niilola
2023-09-15  6:06 Sam James
2023-07-07 10:14 Sam James
2023-07-07  4:40 Sam James
2023-06-06  6:41 Sam James
2023-04-25 14:56 Arthur Zamarin
2023-02-16  5:52 WANG Xuerui
2023-02-07  2:59 Sam James
2022-12-21 23:09 Sam James
2022-11-10  7:58 Sam James
2022-10-22 11:26 Yixun Lan
2022-07-06 19:33 Sam James
2022-07-04 17:56 Georgy Yakovlev
2022-07-04 17:56 Georgy Yakovlev
2022-04-08  5:25 Georgy Yakovlev
2021-12-24 12:08 Georgy Yakovlev
2021-12-20  4:19 Georgy Yakovlev
2021-10-17  0:03 Georgy Yakovlev
2021-10-12 16:13 Georgy Yakovlev
2021-10-07  5:34 Georgy Yakovlev
2021-07-14 21:27 Georgy Yakovlev
2021-07-04  9:48 Georgy Yakovlev
2021-07-04  9:10 Georgy Yakovlev
2021-07-03 20:40 Georgy Yakovlev
2021-07-03 20:38 Georgy Yakovlev
2021-06-23  3:47 Georgy Yakovlev
2021-06-09  6:04 Georgy Yakovlev
2021-06-04 23:15 Georgy Yakovlev
2021-05-07  7:35 Joonas Niilola
2021-05-07  7:35 Joonas Niilola
2021-05-03 17:01 Georgy Yakovlev
2021-04-23 20:06 Georgy Yakovlev
2021-04-23 19:50 Georgy Yakovlev
2021-04-23  5:55 Joonas Niilola
2021-04-22  4:07 Georgy Yakovlev
2021-04-22  4:07 Georgy Yakovlev
2021-04-22  4:07 Georgy Yakovlev
2021-04-06 10:10 Joonas Niilola
2021-04-06 10:08 Joonas Niilola
2020-09-10 22:58 Georgy Yakovlev
2020-07-01 21:23 Georgy Yakovlev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1640347658.7f9e2cc58269ddd27b1ff422045f7eb1bc06b592.gyakovlev@gentoo \
    --to=gyakovlev@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox