| 1 |
commit: 15ae64bfc8ffd6047e48596c0f820a1b2152700f |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 20 15:10:32 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 20 15:10:32 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ae64bf |
| 7 |
|
| 8 |
dev-util/ninja: install zsh completions unconditionally |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/671544 |
| 11 |
Package-Manager: Portage-2.3.51_p14, Repoman-2.3.12_p5 |
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-util/ninja/ninja-1.8.2-r1.ebuild | 9 +++------ |
| 15 |
dev-util/ninja/ninja-1.8.2-r2.ebuild | 9 +++------ |
| 16 |
dev-util/ninja/ninja-1.8.2.ebuild | 11 ++++------- |
| 17 |
dev-util/ninja/ninja-9999.ebuild | 11 ++++------- |
| 18 |
4 files changed, 14 insertions(+), 26 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild |
| 21 |
index 84c7f67ce66..767546f3c05 100644 |
| 22 |
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild |
| 23 |
+++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild |
| 24 |
@@ -24,7 +24,7 @@ HOMEPAGE="https://ninja-build.org/" |
| 25 |
LICENSE="Apache-2.0" |
| 26 |
SLOT="0" |
| 27 |
|
| 28 |
-IUSE="doc emacs test vim-syntax zsh-completion" |
| 29 |
+IUSE="doc emacs test vim-syntax" |
| 30 |
|
| 31 |
DEPEND=" |
| 32 |
${PYTHON_DEPS} |
| 33 |
@@ -44,7 +44,6 @@ RDEPEND=" |
| 34 |
app-editors/gvim |
| 35 |
) |
| 36 |
) |
| 37 |
- zsh-completion? ( app-shells/zsh ) |
| 38 |
!<net-irc/ninja-1.5.9_pre14-r1" #436804 |
| 39 |
|
| 40 |
run_for_build() { |
| 41 |
@@ -111,10 +110,8 @@ src_install() { |
| 42 |
doins "${T}/${PN}.vim" |
| 43 |
fi |
| 44 |
|
| 45 |
- if use zsh-completion; then |
| 46 |
- insinto /usr/share/zsh/site-functions |
| 47 |
- newins misc/zsh-completion _ninja |
| 48 |
- fi |
| 49 |
+ insinto /usr/share/zsh/site-functions |
| 50 |
+ newins misc/zsh-completion _ninja |
| 51 |
|
| 52 |
if use emacs; then |
| 53 |
cd misc || die |
| 54 |
|
| 55 |
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild |
| 56 |
index 18d8f1000a7..bc97b85a2b4 100644 |
| 57 |
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild |
| 58 |
+++ b/dev-util/ninja/ninja-1.8.2-r2.ebuild |
| 59 |
@@ -24,7 +24,7 @@ HOMEPAGE="https://ninja-build.org/" |
| 60 |
LICENSE="Apache-2.0" |
| 61 |
SLOT="0" |
| 62 |
|
| 63 |
-IUSE="doc emacs test vim-syntax zsh-completion" |
| 64 |
+IUSE="doc emacs test vim-syntax" |
| 65 |
|
| 66 |
DEPEND=" |
| 67 |
${PYTHON_DEPS} |
| 68 |
@@ -44,7 +44,6 @@ RDEPEND=" |
| 69 |
app-editors/gvim |
| 70 |
) |
| 71 |
) |
| 72 |
- zsh-completion? ( app-shells/zsh ) |
| 73 |
!<net-irc/ninja-1.5.9_pre14-r1" #436804 |
| 74 |
|
| 75 |
run_for_build() { |
| 76 |
@@ -111,10 +110,8 @@ src_install() { |
| 77 |
doins "${T}/${PN}.vim" |
| 78 |
fi |
| 79 |
|
| 80 |
- if use zsh-completion; then |
| 81 |
- insinto /usr/share/zsh/site-functions |
| 82 |
- newins misc/zsh-completion _ninja |
| 83 |
- fi |
| 84 |
+ insinto /usr/share/zsh/site-functions |
| 85 |
+ newins misc/zsh-completion _ninja |
| 86 |
|
| 87 |
if use emacs; then |
| 88 |
cd misc || die |
| 89 |
|
| 90 |
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild |
| 91 |
index f25829f0ec1..3f5366eac1e 100644 |
| 92 |
--- a/dev-util/ninja/ninja-1.8.2.ebuild |
| 93 |
+++ b/dev-util/ninja/ninja-1.8.2.ebuild |
| 94 |
@@ -1,4 +1,4 @@ |
| 95 |
-# Copyright 1999-2018 Gentoo Foundation |
| 96 |
+# Copyright 1999-2018 Gentoo Authors |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
|
| 99 |
EAPI=6 |
| 100 |
@@ -21,7 +21,7 @@ HOMEPAGE="https://ninja-build.org/" |
| 101 |
LICENSE="Apache-2.0" |
| 102 |
SLOT="0" |
| 103 |
|
| 104 |
-IUSE="doc emacs test vim-syntax zsh-completion" |
| 105 |
+IUSE="doc emacs test vim-syntax" |
| 106 |
|
| 107 |
DEPEND=" |
| 108 |
${PYTHON_DEPS} |
| 109 |
@@ -41,7 +41,6 @@ RDEPEND=" |
| 110 |
app-editors/gvim |
| 111 |
) |
| 112 |
) |
| 113 |
- zsh-completion? ( app-shells/zsh ) |
| 114 |
!<net-irc/ninja-1.5.9_pre14-r1" #436804 |
| 115 |
|
| 116 |
run_for_build() { |
| 117 |
@@ -108,10 +107,8 @@ src_install() { |
| 118 |
doins "${T}/${PN}.vim" |
| 119 |
fi |
| 120 |
|
| 121 |
- if use zsh-completion; then |
| 122 |
- insinto /usr/share/zsh/site-functions |
| 123 |
- newins misc/zsh-completion _ninja |
| 124 |
- fi |
| 125 |
+ insinto /usr/share/zsh/site-functions |
| 126 |
+ newins misc/zsh-completion _ninja |
| 127 |
|
| 128 |
if use emacs; then |
| 129 |
cd misc || die |
| 130 |
|
| 131 |
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild |
| 132 |
index 38f251adba3..0f378c4dd3a 100644 |
| 133 |
--- a/dev-util/ninja/ninja-9999.ebuild |
| 134 |
+++ b/dev-util/ninja/ninja-9999.ebuild |
| 135 |
@@ -1,4 +1,4 @@ |
| 136 |
-# Copyright 1999-2018 Gentoo Foundation |
| 137 |
+# Copyright 1999-2018 Gentoo Authors |
| 138 |
# Distributed under the terms of the GNU General Public License v2 |
| 139 |
|
| 140 |
EAPI=7 |
| 141 |
@@ -21,7 +21,7 @@ HOMEPAGE="https://ninja-build.org/" |
| 142 |
LICENSE="Apache-2.0" |
| 143 |
SLOT="0" |
| 144 |
|
| 145 |
-IUSE="doc emacs test vim-syntax zsh-completion" |
| 146 |
+IUSE="doc emacs test vim-syntax" |
| 147 |
|
| 148 |
BDEPEND=" |
| 149 |
${PYTHON_DEPS} |
| 150 |
@@ -41,7 +41,6 @@ RDEPEND=" |
| 151 |
app-editors/gvim |
| 152 |
) |
| 153 |
) |
| 154 |
- zsh-completion? ( app-shells/zsh ) |
| 155 |
!<net-irc/ninja-1.5.9_pre14-r1" #436804 |
| 156 |
|
| 157 |
run_for_build() { |
| 158 |
@@ -108,10 +107,8 @@ src_install() { |
| 159 |
doins "${T}/ninja.vim" |
| 160 |
fi |
| 161 |
|
| 162 |
- if use zsh-completion; then |
| 163 |
- insinto /usr/share/zsh/site-functions |
| 164 |
- newins misc/zsh-completion _ninja |
| 165 |
- fi |
| 166 |
+ insinto /usr/share/zsh/site-functions |
| 167 |
+ newins misc/zsh-completion _ninja |
| 168 |
|
| 169 |
if use emacs; then |
| 170 |
cd misc || die |
Archives