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@gentoo.org>

diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
index 84c7f67ce665892295a005e65b8ab4717f73a9f1..767546f3c055197d11914c65dfcf43af3d9d0e7d 100644 (file)
--- 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 18d8f1000a72f44580fd14a37e0d9c1df53b28ef..bc97b85a2b45b5bebef061f11b8fbb88531c6c46 100644 (file)
--- 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 f25829f0ec1b5e0294e1830404f9794c49343ad1..3f5366eac1e635e4220ddfe42f60722f3ca18a3c 100644 (file)
--- 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 38f251adba32ea71fecdc7be195f695133c58819..0f378c4dd3aa55270351766b5808f1cc28daacc9 100644 (file)
--- 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