Install zsh and bash completion files unconditionally.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)

3 files changed, 9 insertions, 13 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 09c375d56239..a16957dd7793 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/notmuch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.102 2014/08/28 14:14:21 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.103 2014/09/01 07:55:36 aidecoe Exp $
+
+  01 Sep 2014; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  notmuch-0.16-r1.ebuild, notmuch-0.17.ebuild:
+  Install zsh and bash completion files unconditionally.
 
   28 Aug 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> notmuch-0.18.1.ebuild:
   src_prepare() doesn't have 'default'.
diff --git a/net-mail/notmuch/notmuch-0.16-r1.ebuild b/net-mail/notmuch/notmuch-0.16-r1.ebuild
index e8139925f933..42fae4db3ead 100644
--- a/net-mail/notmuch/notmuch-0.16-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.16-r1.ebuild,v 1.7 2014/08/28 09:37:07 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.16-r1.ebuild,v 1.8 2014/09/01 07:55:36 aidecoe Exp $
 
 EAPI=5
 
@@ -21,8 +21,7 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( crypt emacs python )
 	"
-IUSE="bash-completion crypt debug doc emacs mutt nmbug pick python test
-	zsh-completion"
+IUSE="crypt debug doc emacs mutt nmbug pick python test"
 
 CDEPEND="
 	>=dev-libs/glib-2.22
@@ -48,7 +47,6 @@ RDEPEND="${CDEPEND}
 		virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
 		virtual/perl-Pod-Parser
 		)
-	zsh-completion? ( app-shells/zsh )
 	"
 
 DOCS=( AUTHORS NEWS README )
@@ -92,9 +90,7 @@ src_configure() {
 		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
 		--with-gmime-version=2.6
 		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with bash-completion)
 		$(use_with emacs)
-		$(use_with zsh-completion)
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/net-mail/notmuch/notmuch-0.17.ebuild b/net-mail/notmuch/notmuch-0.17.ebuild
index 4cdc05ed5e6b..1867d21491bc 100644
--- a/net-mail/notmuch/notmuch-0.17.ebuild
+++ b/net-mail/notmuch/notmuch-0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.17.ebuild,v 1.7 2014/08/28 09:37:07 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.17.ebuild,v 1.8 2014/09/01 07:55:36 aidecoe Exp $
 
 EAPI=5
 
@@ -20,8 +20,7 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( crypt emacs python )
 	"
-IUSE="bash-completion crypt debug doc emacs mutt nmbug python test
-	zsh-completion"
+IUSE="crypt debug doc emacs mutt nmbug python test"
 
 CDEPEND="
 	>=dev-libs/glib-2.22
@@ -48,7 +47,6 @@ RDEPEND="${CDEPEND}
 		virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
 		virtual/perl-Pod-Parser
 		)
-	zsh-completion? ( app-shells/zsh )
 	"
 
 DOCS=( AUTHORS NEWS README )
@@ -89,9 +87,7 @@ src_configure() {
 		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
 		--with-gmime-version=2.6
 		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		$(use_with bash-completion)
 		$(use_with emacs)
-		$(use_with zsh-completion)
 	)
 	tc-export CC CXX
 	econf "${myeconfargs[@]}"