Remove the bash blocker, and just depend on bash. There is no point having || ( bash zsh ) when bash is obligatory for ebuilds.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 24 insertions, 21 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index c1c76934d38b..cc767391d34a 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.275 2014/11/09 20:41:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.276 2014/11/10 17:59:34 mgorny Exp $
+
+  10 Nov 2014; Michał Górny <mgorny@gentoo.org> bash-completion-2.1-r92.ebuild:
+  Remove the bash blocker, and just depend on bash. There is no point having ||
+  ( bash zsh ) when bash is obligatory for ebuilds.
 
 *bash-completion-2.1-r92 (09 Nov 2014)
 
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index a65f80988b5d..157aff63f172 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -9,26 +9,26 @@ DIST bashcomp2-pre1.tar.gz 3732 SHA256 fd201638bae06f134c243887cafe402ef0a21f9e6
 EBUILD bash-completion-1.3-r2.ebuild 3218 SHA256 65d588e08f44a8a654d88254fd135976a760c4e5574573cd27b6af65a2e7e8f4 SHA512 ffb70519062e81803c287444355e7b5c51ae70cca366b472aef221d4285535d4ce092bdbeed1359a7b9d5903f3f2bfd5d93734753724a283c861d91d8b2f1a63 WHIRLPOOL eeac8f6835e34e1e7d6dcdee6d6b3289097b2c6c619f024eb624248c2a1a454a1b18abec9df59a0b95107acf9808368cda9ec6ade626aeba2a5542731ee84493
 EBUILD bash-completion-2.1-r2.ebuild 4090 SHA256 34b75f419f50a4f9354775d573b60cae86e3d096904f7eae6faf355a33c64889 SHA512 f0236136e18d38d6a5fb99592c21975b7e2b5058ab9eb883e1be31acf3494f32cbc2dba7ebf424f4fd373a20ccab9dae511111dccd267bef262c850b79f5c13f WHIRLPOOL 3aca5eb741c1f6e0aa0036bada05d5ac7d4cfb0c81c7cb5ae730f99a4e3d905cad86274262d1450d2de5cca703261b265cb0c08d37aa86064d7a86efa60da6ca
 EBUILD bash-completion-2.1-r91.ebuild 3167 SHA256 5c063f0d34645e9b996f28abfbf9dca83c797d03aef112dacc93cce2df8663d3 SHA512 7c47ef36cee93ef33b06182d4e426cfe6b202ff195248120353b4f55689fcfc81f85868946751cf0856b666abef2a7a70922d96ed2450a15c5c91a9e87ab2eae WHIRLPOOL f70dc9429e24368f59e548cef0c006436bbfd8e2f5f3f53a374c24fbfa61db471950e430faf8a346810f68154f82ca2790ab361c7c68002d4588be56b536aea8
-EBUILD bash-completion-2.1-r92.ebuild 3256 SHA256 15ffac547a675b7ff49a4e120452bb325ffd45a00db2da152adf47784533c1f0 SHA512 9053ef23b6397743b800a403f52db01bf9957dc14ab76f5fc71273d1c2108ca4bac1d48dc8346614629d9eaf47979e272ec1f24518231a10d9248d668328e9f2 WHIRLPOOL a8bcd41b4f6aa418727ce5dae369d0487ebf0e6e97ce6eb4098d11805099f7e354bda1879bd07f2d0244d5cda7743badc7c544d72775441526bb21b6bf102318
+EBUILD bash-completion-2.1-r92.ebuild 3203 SHA256 e0f40223cf5217929f80c13c7f385b144f1fd281169e70cd1bcf55a80a70877b SHA512 bcbb5fc1d51c2849699caaa63748404304e1d9e3ea357ae7bbb1fab5268acba3e73a28af56a76b80bb5c73de629089aa21fb7ca8de850186978136162fe672f9 WHIRLPOOL cfd5554ad8d4b4b0e3a84971a9e95afdaaff6f67b2b64749aad0a4db64565a5c26559fe49bb5268d00b7896f02e287c3f64b825f2405873aa55afc9d2a92aa82
 EBUILD bash-completion-2.1.ebuild 3430 SHA256 f32bfb8898fd5591e95037095b4d646526448b2ae9d1c0b8045aafeba8f3f21f SHA512 f6b62b85d51b8c327933c58805e1c46cfb4c2fa82f009bab9b91f5e5af790f1f771f08eab8a3a6c2a03c9c9ed1932e4a5641f9afd1ba6cf937fbe6849bda8c9e WHIRLPOOL ad3948f6d1e05002e4d3c2dd3c84007e14fd47461f5973387d2a2d0e221eb1a06aaaaefd13dab69c071039a989d50a3b888d3a615e52a64088113e5afe12401b
-MISC ChangeLog 46629 SHA256 2b66b15627f13748db31585847d35e94f97670cd74bc5749f749f065c1f245f9 SHA512 20ce31e2320bab1e404158f0c62d26c68515e1d8b6dec9ecc5f8b97792c313449543be4b89e3a6bf2c6760aa2a67cff82ca44319dbe724318c7b6867aeb34221 WHIRLPOOL 57d1cf6dca9ec78c51b0a0eadc7524f030c58b83ee9e90971456cabfaaab79fd2dd0000081e6118e9d5aa184f1dfd113c923249bcb972cfdb95c480bcf5a86e0
+MISC ChangeLog 46844 SHA256 7f9ad7219f471f1665bd3942f59c04a3982f28994dcf9d61ae7e4e7ff5a3b00b SHA512 dd01b41e17f6debd9f44a6ad2512c481fdc90a86c8455d80cc469f13fc3726caac764d7963c86b8cde03a1f44d5023550c4697456674b053c5fa986eda0c5a70 WHIRLPOOL 00033b1c1e58e631e4e22e6114fe1b0636e1f922fdf5fb1bb91a1f77fe9ea99f94926d43771e154f0f48a677141f77f5490670ccff20f29fad8c7612fdd9769f
 MISC metadata.xml 1020 SHA256 785eaa20ef6e8c3d46916e22ecbf772ddc9ac12243d2f50ffd149b5f0e5c51c2 SHA512 305eddc1c77d281e6c64417c9d1c2373d20b6a88ae1f27764488814343eb7d5409705e645b31fb978774352c76cf4a14d0d51949a2f2945a8e8e168dd6d59528 WHIRLPOOL 52db2505ddd82f53c74675babc2ea35d3551091254f13638390662cb151bd65f87d36b26245ae90605cb6c9b8ba74cb25ce27158ce2016e8e2192ee47ea6f979
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUX9GEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUYP0MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOFcMQAMj3Yr04RQ+hFFjyjfMBqE7h
-fg38itqpU9g4ZMI6EwEfEi/K4UwNxf7rJIjHDUxNYdbVoMpK+Rqp8f+W7dUPyPV/
-Xv8F6CWwwHRJtxvC5Nnk0OrLoGjuywGJmf1wHZcSyMRJRfTggO+z4sJbwVLfC3om
-9xR+CKzqW+4nACYZcTTwK+J5WrX/8yblwt1Mp4PULtCePA6sngSUhBpx9+g51b7D
-1byBlReo0KNF5zQUj2FfQYPata3UO2aqaRRoQub/dW8hVM5IMTomLO5pRQzlWmjg
-oMOzLEtAgPHQ55Y2wRimMPqLabFdC0tgL9O7pNsT/GLa6BBsRQer0mHpoOVvpycX
-Wg5nCxKbMXustHzYfTF5JyUtx8r3Hc71ef+LjKHT2DAwOs8yPqSHfRUfXXcw/OM6
-2FmHsy/INF/atPW+LbgsaKNFZysd//c0aP97LSI0/l1TpP+jbnXORV06NJy+44My
-sEb8fx5iuZxWo9Qsnr3P5SIRDs7NkwP6vyXaimkKWzMYrNOysvFu67VL9vudKE6F
-3dd1esXXxCWSAJlPClQgak101FYUN68cCYV6rE386HEuoMwhrOzx8zapT+VlioHO
-UVuYkTgWyJtNoj/lemut7or1IfR3+G1P3wGxM3l0+QYd9ZM2a9lBHqlFNqc5Op6W
-BmfmCLUG5oqv6hrukElJ
-=z7ct
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBCwQAJmXAMbxl5EHfN8tB0xvRXuP
+1Oza+e1Vzy07Snv+iADa8/AoIgQ6H0fNJo5Td6CcY8RCX2YNjTYyKK07+drvQ0GZ
+tLT+N4tq6TETdueuT6YHUqR9C6HhEZbtEKxxASwh8/i9XRGolt8XMVWrle0thAOj
+wV3NhXZGVPVu2pBJnSaFTxexwwETH203PyOGWWkHwnotlLY/6bcAZQrhV201lCbN
+t1XQrNB7Sumb8nyfT2E9/5Z6w8FudvsxXf5qWCOeyerqk8HztfHMU7ryeA0M+qal
+mWjRoPMnpSKMHgRXUs2nKlfpdzpGhv6c/qG8GXPoXaYQkNBAXYTWWQFcHCIDAtuN
+1NT9aDFPtOMntX9dxwES1sWXw/CKwcpljDplJQThcxrsY3zr7GISTM/eEEyZh7B/
+MJz3f4AKpzTQq4jfMLJ3nQSeBb0Tc8MUYkKFm4oveK60PD4rtA4eOI0gB3C81W3D
+0Cx+ZW4jirY06TgBmb2L6QngZe3QovNOHo2GqN82kQkC393QVsX8dK+BeoLJl2fq
+UZX88biJjexG2obn9O+DmMGd1UIHiz48t3aRgAccn3MonBHQa07VDL3B65Ezf/oG
+8a41jrBh0JMwT+zwI2HYjJDGgM/Pqb6AP9We+GJCeEqAdHLn9GiPGrDNIJ/qVO0d
+FYrflt59GbHOMQjmqR51
+=6a44
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-2.1-r92.ebuild b/app-shells/bash-completion/bash-completion-2.1-r92.ebuild
index 1d9053d77592..c6b810b58ce3 100644
--- a/app-shells/bash-completion/bash-completion-2.1-r92.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.1-r92.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/app-shells/bash-completion/bash-completion-2.1-r92.ebuild,v 1.1 2014/11/09 20:41:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r92.ebuild,v 1.2 2014/11/10 17:59:34 mgorny Exp $
 
 EAPI=5
 
@@ -16,10 +16,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
-RDEPEND="|| ( >=app-shells/bash-4.3_p30-r1 app-shells/zsh )
+RDEPEND=">=app-shells/bash-4.3_p30-r1
 	sys-apps/miscfiles
-	!app-admin/eselect-bashcomp
-	!!<app-shells/bash-4.3_p30-r1"
+	!app-admin/eselect-bashcomp"
 
 # Remove unwanted completions.
 STRIP_COMPLETIONS=(