Install zsh and bash completion files unconditionally.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xF0134531E1DBFAB5

4 files changed, 19 insertions, 23 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/Manifest b/net-mail/notmuch/Manifest
index f436a5149492..097105f7c201 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -7,19 +7,19 @@ AUX 60notmuch-pick-gentoo.el 108 SHA256 5dea2e2113cc3ab74c351f0396ac0a98df9d3eeb
 DIST notmuch-0.16.tar.gz 588739 SHA256 e7792dec15be845c55ad265d06339325f03b9c886ab3836b7e80a6eb6841f344 SHA512 0b00abb32a340d25a6566b453ae086e13bd4f7f3c64a9dd827f0665733a1dc343c7df562282c4d9feb9ce7dff59f9c379daf599d6641156ace33c37f73974143 WHIRLPOOL 065452ead0bdc1f63b46419d7045fd798734e9d34a12e5673362f8302ae8b2d3eada3ca157eb55bcf9c0ec5f5fb3cf37b2ecdf5c9ab15e3a4590808fa0866213
 DIST notmuch-0.17.tar.gz 606710 SHA256 d215e0e7e536c50bc0d8a455a58bb4ddabe0678cc637c4dcebdb57d5c4bcbe95 SHA512 cb649aceba1a3e25d4cff51f212aa85d0efe9907af4bcb9390cd1cf5e29c48d4145d9ecd1b040eaef588c63bfb5296bdfef683c22872841b5631481f5d832c03 WHIRLPOOL 98d4a5c5b72ac6d237b2c77d80481dcaa43be87c4bcd0a53aa55e4d008c70a88738706b92a169fa8b12681cb6e169162d0bfc01a5fbce95d73dccf5c12b267c4
 DIST notmuch-0.18.1.tar.gz 634691 SHA256 f2d53dc1916283123d008a6084de860340a436631e83b1a41b2d9ced0f4db7dd SHA512 4268a32036b42cbacb0b43d7838f67c83f2c20ad9018e44c51f6112e22f3ffe5847a9f1418527865447a2442ee6ab9e77cf05b61090c2a1f02356dde6eae8ece WHIRLPOOL dc35171b2a1b20acfc5a8de3993335893ea73b236066a2f88b9a7aa2fe3389f88b791e72c8c9f493548ef0fddb19abfabc9f7664b2bd2d404eb964ec67cc2458
-EBUILD notmuch-0.16-r1.ebuild 4174 SHA256 6aeb9434308a0f68f4f6acedf999274db8a71e09a40ab02b7dab6a621072c694 SHA512 c0dca5b593829a677d40ba6db499a9dbc02ae8d720f46744d6907de2b652c427bc2791fcef1a179c2f2b125f969678bda2a8ceb1aeae7be6fb1e1b6b4f45e1a9 WHIRLPOOL d9b3eed485bb08882db36d9701f5ee0138781279817c1b80da1adf8a938271c5ced99579b03deb7c7085bc951502f3490890eccaf5f218ce25b138ebdb9be8d1
-EBUILD notmuch-0.17.ebuild 3807 SHA256 a403ba90051af8a8b780cea53d68e2efc69740c75a67141027162d6654cf0828 SHA512 433215cbd7c3e4edd26a91d7dac64f1b02d1b7a86763ba421fe6b3736a3d3a1fd81ffb01e9e003a4fc5a60fec4c43f6274d4b5d2628a393a59012cbc400684ec WHIRLPOOL 0b307881e24c39d7b098fb87482a81000ecaf06e9728b2e2dbe93b5d8ff0915947f4e85548bee1330010bde36e0ffc263e085e33bf82b44aa62c900a602f673e
+EBUILD notmuch-0.16-r1.ebuild 4047 SHA256 e16ee519c384c488a98f758ad52c32b6030c470a9f2785886bb81bf92240de7c SHA512 6da162b2888db64839d5b105a9ea3492891026566f251a976e382085b5dcdd09eb8a3dbf78a7f2991bf349b55586455aaffd98c5e3cc2f36a01a80fc38a6f883 WHIRLPOOL f55619f915056da81204ea5a43577caf722fb5cd1439d32d5d49bb9afe47e1e724fcfc674f600eb2d9931f70166e5642d3a04eef81b8cead1dd1e32afc4d407f
+EBUILD notmuch-0.17.ebuild 3680 SHA256 beaebadd7950b48ee32931dc3d060ec73386b4135b1ab06981cc3dd6643ebdfe SHA512 0659a2fd07f26bbafda5d13c04e14c9f8ed6c3d2a0b71c4ef3a98d9076beddadea16ddc474cf2344853eca76054af7bf0a341d120300b68e2ea2b538cf6236a4 WHIRLPOOL 8f4589ab5535bee916c9c1187f8352e0c2d718a955a257dad12c9c70c961d3a20133a9c625b1a62e5594fabdca25d41ed6ff616fa323146da6bc63ace5e0592d
 EBUILD notmuch-0.18.1.ebuild 4043 SHA256 330aa8a4d347757dfa7f54f8cc249887a714f3b4103f6f0ba7b67bb0f1ce3638 SHA512 0f048dd2bc48eda4978c73af5598cf8ed1a6458df91b72ebce7ced2068ce8aeef48eafbf76ef606eaf19817c0d65c19771035a049ff5143053a861e632dd6424 WHIRLPOOL 9dad544df662eb549026fa26389e5968d3dceefd82f3ca9c728ef18a8db6e22278a1a92d87a789203b2dc4681a18fa90f684545d06cb7ac242df17c82726874c
-MISC ChangeLog 30162 SHA256 93b9e75aa4f9442469d15d3568b39e44a2b6b08a4fdb7bbdf2764f5cdcef3aa6 SHA512 018a2972376725435555e37499147f7e5a7c739c371d4caf265d0806204b412a43d7de59b172ddcd3ca57d59f182916f6049e7d817038a21b5594b7a701244a7 WHIRLPOOL b0754a48122d659c66217350bbbd208410704a77e8a2266dadf046c0fce4065b1a6870dd5c52b7cf8eb75693b1e9985d08733da2203de82182102fe47915d71c
+MISC ChangeLog 30324 SHA256 acd2f802e0717f7c1f5980e9e1305913748ad8c2b2182e7262aa2d916fbe88f6 SHA512 04b14c7dbf95b0ee1c6ea6400fb8250e4cc8802d780df5edcf6d1efaff1b9a8f5d1cc895225a21b36e1dd01d9ad43041df66b26ad74c57728d120b880ca8bec0 WHIRLPOOL 18bbcd31cea4a185800b4cdbfc365dc1cd4230e16d12ebdcb2eccd1a6079ef38373b0c98151e2a0cfa1e7093cbef42faf8307f3cd33d93c6656a8d1d25b09e5b
 MISC metadata.xml 1074 SHA256 d47c3e91da2cbe2009bb0458e3858949883949b0aed2bf03b2dbd7ca7d4c1d14 SHA512 702cd1ad104daddbd22120ec417f2e7459e133d8a1fd2ff26f1485c6663949c63d00335c086fd298f8c251c3633e03d24575a1eb06ec29344577dd9dfea11792 WHIRLPOOL aa65462ae71e101d88b9d4b7eb1c1947c6bf794ea32c215916c41d592166c43334386e4e9196c98daa74b82049d73571b1533089e7319f9c2ca3e75b9ad0b63f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT/zk+AAoJEPATRTHh2/q19sQIAJvQ5TmNA3Vj/xXI2SsdGJFq
-yMicV1If0ijkOnYyXDwvr83r4I0uteNNxkg7BKBHDe1VNPp/aNdSYezWdjGs+DIv
-2gn1N8zhkTXe9QPf4W9+5awqO8+uOSlWqt5lCaA681e69nLtvzjepzrespj7m4eB
-xxVtu0xkhkeLiMoyr/BWU2R/B5PtFLREdlvzz5P3kCrGmdjXqn38+cSzlwbrB74Q
-QeuOOusc/4OmL4BX5YbGu9dKZEL7M6o01BSU/04KPs+M7B+chdBvqmjpcoW4HUTY
-78G5DQILyL3NXaecwH7z9uSKbqQdFdEt3aepOKvW0QF6hpL59wf88Q52pxLi/qE=
-=6Y6e
+iQEcBAEBCAAGBQJUBCZ6AAoJEPATRTHh2/q1xXoH/3yvSAWKfNOW3tRAGyp94v+m
+VTLqMDbyMeo4+QIZ6dIe5OlckMNEtJYNArO2wlHiHleQs8Orx4LcyUxzYfxd7kKH
+hewy1NusQ3+Fo5l6y//+NVIOfUnonV6//M3h0HRM80xNPNJNzeC6SwoSqZsAtgnc
+swmt9PFGuSGTS8F7hksCqT9P4EvDVS08uHud8pwlzmcCauUQn9tUGucHbJMnFgYL
+lVVBIfMexmYArPu3QFQXrc2+Y92HnghaxyFCLMTDiYC7XmZ1yF1ikytWtRxCeJi0
+k13OCg8NKpJKpgSb9M/z3xxnUKJJBc5drEdj3ztx/6xzt/iwLZ0P0DTnfmObrD0=
+=CGi/
 -----END PGP SIGNATURE-----
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[@]}"