commit: 15ae64bfc8ffd6047e48596c0f820a1b2152700f Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Nov 20 15:10:32 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Nov 20 15:10:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ae64bf
dev-util/ninja: install zsh completions unconditionally Closes: https://bugs.gentoo.org/671544 Package-Manager: Portage-2.3.51_p14, Repoman-2.3.12_p5 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-util/ninja/ninja-1.8.2-r1.ebuild | 9 +++------ dev-util/ninja/ninja-1.8.2-r2.ebuild | 9 +++------ dev-util/ninja/ninja-1.8.2.ebuild | 11 ++++------- dev-util/ninja/ninja-9999.ebuild | 11 ++++------- 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild index 84c7f67ce66..767546f3c05 100644 --- a/dev-util/ninja/ninja-1.8.2-r1.ebuild +++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild @@ -24,7 +24,7 @@ HOMEPAGE="https://ninja-build.org/"; LICENSE="Apache-2.0" SLOT="0" -IUSE="doc emacs test vim-syntax zsh-completion" +IUSE="doc emacs test vim-syntax" DEPEND=" ${PYTHON_DEPS} @@ -44,7 +44,6 @@ RDEPEND=" app-editors/gvim ) ) - zsh-completion? ( app-shells/zsh ) !<net-irc/ninja-1.5.9_pre14-r1" #436804 run_for_build() { @@ -111,10 +110,8 @@ src_install() { doins "${T}/${PN}.vim" fi - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja - fi + insinto /usr/share/zsh/site-functions + newins misc/zsh-completion _ninja if use emacs; then cd misc || die diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild index 18d8f1000a7..bc97b85a2b4 100644 --- a/dev-util/ninja/ninja-1.8.2-r2.ebuild +++ b/dev-util/ninja/ninja-1.8.2-r2.ebuild @@ -24,7 +24,7 @@ HOMEPAGE="https://ninja-build.org/"; LICENSE="Apache-2.0" SLOT="0" -IUSE="doc emacs test vim-syntax zsh-completion" +IUSE="doc emacs test vim-syntax" DEPEND=" ${PYTHON_DEPS} @@ -44,7 +44,6 @@ RDEPEND=" app-editors/gvim ) ) - zsh-completion? ( app-shells/zsh ) !<net-irc/ninja-1.5.9_pre14-r1" #436804 run_for_build() { @@ -111,10 +110,8 @@ src_install() { doins "${T}/${PN}.vim" fi - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja - fi + insinto /usr/share/zsh/site-functions + newins misc/zsh-completion _ninja if use emacs; then cd misc || die diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild index f25829f0ec1..3f5366eac1e 100644 --- a/dev-util/ninja/ninja-1.8.2.ebuild +++ b/dev-util/ninja/ninja-1.8.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,7 @@ HOMEPAGE="https://ninja-build.org/"; LICENSE="Apache-2.0" SLOT="0" -IUSE="doc emacs test vim-syntax zsh-completion" +IUSE="doc emacs test vim-syntax" DEPEND=" ${PYTHON_DEPS} @@ -41,7 +41,6 @@ RDEPEND=" app-editors/gvim ) ) - zsh-completion? ( app-shells/zsh ) !<net-irc/ninja-1.5.9_pre14-r1" #436804 run_for_build() { @@ -108,10 +107,8 @@ src_install() { doins "${T}/${PN}.vim" fi - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja - fi + insinto /usr/share/zsh/site-functions + newins misc/zsh-completion _ninja if use emacs; then cd misc || die diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild index 38f251adba3..0f378c4dd3a 100644 --- a/dev-util/ninja/ninja-9999.ebuild +++ b/dev-util/ninja/ninja-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ HOMEPAGE="https://ninja-build.org/"; LICENSE="Apache-2.0" SLOT="0" -IUSE="doc emacs test vim-syntax zsh-completion" +IUSE="doc emacs test vim-syntax" BDEPEND=" ${PYTHON_DEPS} @@ -41,7 +41,6 @@ RDEPEND=" app-editors/gvim ) ) - zsh-completion? ( app-shells/zsh ) !<net-irc/ninja-1.5.9_pre14-r1" #436804 run_for_build() { @@ -108,10 +107,8 @@ src_install() { doins "${T}/ninja.vim" fi - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja - fi + insinto /usr/share/zsh/site-functions + newins misc/zsh-completion _ninja if use emacs; then cd misc || die
