| 1 |
commit: 7f9e2cc58269ddd27b1ff422045f7eb1bc06b592 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 24 12:03:25 2021 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 24 12:07:38 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9e2cc5 |
| 7 |
|
| 8 |
dev-util/bear: fix automagic completion installation |
| 9 |
|
| 10 |
install with out eclass instead unconditionally |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/829806 |
| 13 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-util/bear/{bear-2.4.4.ebuild => bear-2.4.4-r1.ebuild} | 12 +++++++++++- |
| 16 |
dev-util/bear/bear-2.4.4.ebuild | 12 +++++++++++- |
| 17 |
2 files changed, 22 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-util/bear/bear-2.4.4.ebuild b/dev-util/bear/bear-2.4.4-r1.ebuild |
| 20 |
similarity index 88% |
| 21 |
copy from dev-util/bear/bear-2.4.4.ebuild |
| 22 |
copy to dev-util/bear/bear-2.4.4-r1.ebuild |
| 23 |
index e7c189ffb934..af4cedd7fc4f 100644 |
| 24 |
--- a/dev-util/bear/bear-2.4.4.ebuild |
| 25 |
+++ b/dev-util/bear/bear-2.4.4-r1.ebuild |
| 26 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 27 |
|
| 28 |
PYTHON_COMPAT=( python3_{7,8,9} ) |
| 29 |
|
| 30 |
-inherit cmake python-single-r1 |
| 31 |
+inherit bash-completion-r1 cmake python-single-r1 |
| 32 |
|
| 33 |
DESCRIPTION="Build EAR generates a compilation database for clang tooling" |
| 34 |
HOMEPAGE="https://github.com/rizsotto/Bear" |
| 35 |
@@ -31,6 +31,11 @@ RESTRICT="!test? ( test )" |
| 36 |
|
| 37 |
S="${WORKDIR}/${P^}" |
| 38 |
|
| 39 |
+src_configure() { |
| 40 |
+ local mycmakeargs=( -DUSE_SHELL_COMPLETION=OFF ) |
| 41 |
+ cmake_src_configure |
| 42 |
+} |
| 43 |
+ |
| 44 |
src_compile() { |
| 45 |
cmake_src_compile |
| 46 |
# need to fix it now, before tests are run |
| 47 |
@@ -38,6 +43,11 @@ src_compile() { |
| 48 |
python_fix_shebang test/functional/tools/cdb_diff.py |
| 49 |
} |
| 50 |
|
| 51 |
+src_install() { |
| 52 |
+ cmake_src_install |
| 53 |
+ dobashcomp shell-completion/bash/bear |
| 54 |
+} |
| 55 |
+ |
| 56 |
src_test() { |
| 57 |
if has sandbox ${FEATURES}; then |
| 58 |
ewarn "\'FEATURES=sandbox\' detected" |
| 59 |
|
| 60 |
diff --git a/dev-util/bear/bear-2.4.4.ebuild b/dev-util/bear/bear-2.4.4.ebuild |
| 61 |
index e7c189ffb934..af4cedd7fc4f 100644 |
| 62 |
--- a/dev-util/bear/bear-2.4.4.ebuild |
| 63 |
+++ b/dev-util/bear/bear-2.4.4.ebuild |
| 64 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 65 |
|
| 66 |
PYTHON_COMPAT=( python3_{7,8,9} ) |
| 67 |
|
| 68 |
-inherit cmake python-single-r1 |
| 69 |
+inherit bash-completion-r1 cmake python-single-r1 |
| 70 |
|
| 71 |
DESCRIPTION="Build EAR generates a compilation database for clang tooling" |
| 72 |
HOMEPAGE="https://github.com/rizsotto/Bear" |
| 73 |
@@ -31,6 +31,11 @@ RESTRICT="!test? ( test )" |
| 74 |
|
| 75 |
S="${WORKDIR}/${P^}" |
| 76 |
|
| 77 |
+src_configure() { |
| 78 |
+ local mycmakeargs=( -DUSE_SHELL_COMPLETION=OFF ) |
| 79 |
+ cmake_src_configure |
| 80 |
+} |
| 81 |
+ |
| 82 |
src_compile() { |
| 83 |
cmake_src_compile |
| 84 |
# need to fix it now, before tests are run |
| 85 |
@@ -38,6 +43,11 @@ src_compile() { |
| 86 |
python_fix_shebang test/functional/tools/cdb_diff.py |
| 87 |
} |
| 88 |
|
| 89 |
+src_install() { |
| 90 |
+ cmake_src_install |
| 91 |
+ dobashcomp shell-completion/bash/bear |
| 92 |
+} |
| 93 |
+ |
| 94 |
src_test() { |
| 95 |
if has sandbox ${FEATURES}; then |
| 96 |
ewarn "\'FEATURES=sandbox\' detected" |
Archives