15 files changed, 142 insertions, 302 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index c72586e11ec0..ad5c464efbf1 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index a0ea732b10a3..6e2616fa5b06 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -368,5 +368,5 @@ EBUILD bash-4.1_p17.ebuild 4142 BLAKE2B 5d8f2b031eb26211ff1f778629cfb8d9255b357e
 EBUILD bash-4.2_p53.ebuild 4344 BLAKE2B 5565a97a0aa9465fd8eef2de0b78434c04096d84c988cdbb663af4b529e1207cc68d0030fa4d88e4028fa7bef08847df170a274ccba316213cceb7401163ed00 SHA512 d3cae3853f6c3b735dd9083b9f7d16bd96aac1ba29ba49e8d5e62140ebdb97f4c9d36e3bc36fcd96f32685236fe6bb80d53015b9dbb20a829968aa535a949a3f
 EBUILD bash-4.3_p48-r2.ebuild 5642 BLAKE2B f5d114b98272cf7e6a900707e0abc4798cc1b85bf509f3260487959dad69a35a0badae19e1522e4746bb74c06f00a767a50c6a3199339c42036f3d92924722af SHA512 e83786756c9e65c08e78137396b393e04a7950d9393c6206491d7d7b13eb46fb4504fe34335706aa0835b6abc651e9578bf6157d6248de8e7fc2dc1a90cba927
 EBUILD bash-4.4_p12.ebuild 7127 BLAKE2B a5909b73ff2daa32a6e3af1f25f15b3bf1d9cb0dc1a176a8826f2d47d370367ec91731b062f1916f664edca442cdc91971fee227ff51f0a80d53d1ad146011de SHA512 92233876cf54b44c82ee67e4b56089a83b589a5c2570f3a1d53b1b647e29ba498c5a7128bf7b1b6efc9384c8ebb0afe7843373a57a016066260de546d8d90eba
-EBUILD bash-4.4_p23.ebuild 7188 BLAKE2B 4aae9dc68b5f1b59c64dc590b33557d279d9c1c926b69e24eeb2160888fe47e3a61f8220895256f7932f1791b828fbc3b21bfe0b10de2f5ce77737b99af5c5de SHA512 8d7744530c047665a3561aebdae6085cf82cd886be36ff7b4252fba6735f56d9730765c2e721096947dedbe0c0721f916593b6534bc82322751b097882839937
+EBUILD bash-4.4_p23.ebuild 7332 BLAKE2B 993cc0f3f3bf04a4e30f32bc42b2e8b4117d8e2618d19bd06a3d8b1cae6ce64eb271cc9b77c6b05a0b729b36a5395b29f84d1c194cdc62f55509dc5d7534d043 SHA512 c30d5a98507f1ff53b4489ca4d15ac257a5653094fb8466f4e346a149ba05ede0c945db0cef045b92b7f353cab9e349905a41e97684b739f384a509005d440da
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-4.4_p23.ebuild b/app-shells/bash/bash-4.4_p23.ebuild
index a7101773aeb9..acd7bdd38469 100644
--- a/app-shells/bash/bash-4.4_p23.ebuild
+++ b/app-shells/bash/bash-4.4_p23.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
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index e27eac9fcf16..2531716e4cf9 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,10 +1,8 @@
 AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15df7f8e2a8bc6ebf4baf6964ff27ce572e738c657696b1cd1446a18996a2270a620c3374f629f98 SHA512 20a0892d7e9c4aa7736bf5dbca485e848f817390325186bb2dd054ac56259679f0accf5b4c3b18c9cd398c43d1bb393b0423be26a4c15adfe070d6f06741f693
 AUX fish-2.7.1-fix-printf-o-handling-on-ppc.patch 408 BLAKE2B 61ca4723e06eb2c969a01c476e026777cdb5b98d367ecf05599f0471da6f79901ebc1f3a672ca78f4c2216d3c1ff121fb0624bf2498be08685f2f6eac1528d20 SHA512 05f859c9d32b0003b489088054828f9ee9aba282ea6d2e6c659e4896e2b731e4cb8c2c524cfe5247784607a7c0bb781f3d918a22d5de69f5d9fceaa3e3c1a38b
-DIST fish-2.6.0.tar.gz 3575346 BLAKE2B 8697dc6e50836d93d0ed22663e86016fec8e567cd4e129ea92008f52da6dd629bf11b70719beabe5c08bd3d7ba43d8017441f103d49a82c0faec3bc749e83764 SHA512 d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
-DIST fish-3.0b1.tar.gz 6471932 BLAKE2B d65ed7e7f4de1f967f5f2090b01be86b778a46f8e5c112daf99234bc584e01992c466976d6547814f84730d1092e39bc3f2bfa55592e71bf1a93a42fb8846b34 SHA512 f13c4ca9e62ecdd6afc4961cb4f6ec5d4b7f51b9c3b3ba97f280b7a9ed2cdeb9be193ff58b9f556b01af0815b78ab540f25c473a253651c96db03f8cb1652dde
-EBUILD fish-2.6.0.ebuild 2089 BLAKE2B 93e47993b0fbf6efad4f3a3e8bd961e9975285c7fe4b46d54d9d65646f92a3f3079cb220150b930675863a334bcb0c096c5a860d45d7de7e1d0a4ef95a9f31f8 SHA512 f4aa8a54f89a8d5bb0a41dba319f75a713ce52681ca1631b06d96e39f4b52f5f5c441ea7420a3e3ea4049e82aef7dc562bfe45955d51644b8abc6c668633fd88
+DIST fish-3.0.0.tar.gz 6472393 BLAKE2B 9a8226ca4dce40a7bbc62ad5791c5238d1257cebea296cd97a195438d771d7394acb012be6af118bf355a9b6e391ddee1061d83298356f664e0d5dbe3d859012 SHA512 e4159821d4263e5afb67adee82e30cfed0ad30f3772dd95beb0df71423ff52c21354970f64967f2de9fd1d31caa702208cfd9f2ce281bbf33114f3aa7cd539a2
 EBUILD fish-2.7.1.ebuild 2377 BLAKE2B 262fe7b6e70908e8142146126f2f2c4d9126734beb2e6a3a4cc5296098970ee06018252e91f433ca5b350ee102e6fbe13a5805a69071d2ed1579f0eb5391725f SHA512 45a88d8be56d4bbec5a87d02dfe33713bdfa7e87c27e12a22a483b99c2e956768bbd2bb3f4b02b5429ff4622cddc4f29d2fb2bdfef7e529a6df3255bb37f6dfd
-EBUILD fish-3.0_beta1.ebuild 1597 BLAKE2B cabdc4dedac6e21a484420c6f19df86fc2f398ff939ace36db29c3deeb3f4403dffcf10c4f862eb6997ca41713aac033f04c9065a440f476b9dbdd7ee6f85485 SHA512 0c14fffaa6778653dc6f5d61b9c4f5ec10fba1ef5002f045785e3177f945c2afe7e8a1187798b5e77408bcb53c9c9565159863d31d052d4cf8dfc3b036dfbf36
-EBUILD fish-9999.ebuild 1597 BLAKE2B cabdc4dedac6e21a484420c6f19df86fc2f398ff939ace36db29c3deeb3f4403dffcf10c4f862eb6997ca41713aac033f04c9065a440f476b9dbdd7ee6f85485 SHA512 0c14fffaa6778653dc6f5d61b9c4f5ec10fba1ef5002f045785e3177f945c2afe7e8a1187798b5e77408bcb53c9c9565159863d31d052d4cf8dfc3b036dfbf36
+EBUILD fish-3.0.0-r1.ebuild 1633 BLAKE2B d33ddd9809d9fd2eb88828995bd99af52f7a3d58dca9bcf17843a2519b4688154a56ed0c6e051701c3f5f5b1964e1b1586d344afd60747f314f4f3b839f82673 SHA512 979ce8515ebf080480eddd7fd90c9066cc2317ac7aeecf6dc7d10ee92b2646dfb0c8121523ed9b4846732068c07bef7566c20662a753da1ccef3aa63dd8c28e3
+EBUILD fish-9999.ebuild 1619 BLAKE2B 0153dd8b58b2215d878421411226a7b32d7bca3ba69622456506b0c75bfde528a0ba2ad10000c046f87f4b4d77d828a1fa102c56be0f9972707d7017f7ce4e57 SHA512 f695e364fd3cd033775787fab19135bb8c10bdcb9f90d2943d7c62fe12dd8c0f8e4c58ad78577239a7019828b461da3fd820300cc5f0e314b215f72a7a3c9400
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-2.6.0.ebuild b/app-shells/fish/fish-2.6.0.ebuild
deleted file mode 100644
index 2d5bbce6f54d..000000000000
--- a/app-shells/fish/fish-2.6.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="
-	>=dev-libs/libpcre2-10.21[pcre32]
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bc
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	# Set things up for fish to be a default shell.
-	# It has to be in /bin in case /usr is unavailable.
-	# Also, all of its utilities have to be in /bin.
-	econf \
-		docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--bindir="${EPREFIX}"/bin \
-		--without-included-pcre2 \
-		$(use_with nls gettext)
-}
-
-src_test() {
-	if has_version ~${CATEGORY}/${P} ; then
-		emake test
-	else
-		ewarn "The test suite only works when the package is already installed"
-	fi
-}
-
-pkg_postinst() {
-	elog "fish is now installed on your system."
-	elog "To run fish, type 'fish' in your terminal."
-	elog
-	elog "It is advised not to set fish as a default login shell."
-	elog "see bug #545830 for more details."
-	elog "Executing fish using ~/.bashrc is an alternative"
-	elog "see https://wiki.gentoo.org/wiki/Fish#Caveats for details"
-	elog
-	elog "To set your colors, run 'fish_config'"
-	elog "To scan your man pages for completions, run 'fish_update_completions'"
-	elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
-	elog
-	elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
-	elog "browser of your choice to get acces to ${PN}'s help system:"
-	elog "  BROWSER=\"/usr/bin/firefox\""
-	elog
-	elog "In order to get lzma and xz support for man-page completion please"
-	elog "emerge one of the following packages:"
-	elog "  dev-python/backports-lzma"
-	elog "  >=dev-lang/python-3.3"
-	elog
-	elog "If you have issues with cut'n'paste in X-terminals, install the"
-	elog "x11-misc/xsel package."
-	elog
-	elog "Have fun!"
-}
diff --git a/app-shells/fish/fish-3.0_beta1.ebuild b/app-shells/fish/fish-3.0.0-r1.ebuild
index cc6e0bba6178..e9917b07a6c8 100644
--- a/app-shells/fish/fish-3.0_beta1.ebuild
+++ b/app-shells/fish/fish-3.0.0-r1.ebuild
@@ -27,7 +27,7 @@ IUSE="doc nls test"
 RDEPEND="
 	>=dev-libs/libpcre2-10.21[pcre32]
 	sys-devel/bc
-	sys-libs/ncurses:0=
+	sys-libs/ncurses:0=[unicode]
 "
 
 DEPEND="${RDEPEND}
@@ -50,6 +50,7 @@ src_configure() {
 		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCURSES_NEED_NCURSES=ON
 		-DINTERNAL_WCWIDTH=OFF
 		-DBUILD_DOCS="$(usex doc)"
 		-DWITH_GETTEXT="$(usex nls)"
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index cc6e0bba6178..3e54844e456b 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -25,9 +25,8 @@ SLOT="0"
 IUSE="doc nls test"
 
 RDEPEND="
-	>=dev-libs/libpcre2-10.21[pcre32]
-	sys-devel/bc
-	sys-libs/ncurses:0=
+	>=dev-libs/libpcre2-10.32[pcre32]
+	sys-libs/ncurses:0=[unicode]
 "
 
 DEPEND="${RDEPEND}
@@ -50,6 +49,7 @@ src_configure() {
 		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCURSES_NEED_NCURSES=ON
 		-DINTERNAL_WCWIDTH=OFF
 		-DBUILD_DOCS="$(usex doc)"
 		-DWITH_GETTEXT="$(usex nls)"
diff --git a/app-shells/mcfly/Manifest b/app-shells/mcfly/Manifest
index 2180c1d641b9..1510865a91bd 100644
--- a/app-shells/mcfly/Manifest
+++ b/app-shells/mcfly/Manifest
@@ -1,3 +1,4 @@
+AUX mcfly-0.3.1-cat-dev-urandom.patch 770 BLAKE2B 461b8e65a2c7e3730a9e9921df4ff29a974322dcd631b375079333fa0bd01104f83579ce383b6d78c3eceac922fa4fa6e2bcafffcc7072ea16f2a2dcfc3cf750 SHA512 b142f01e6d347164fc7dcdcb0c4d64547df78b74fa9b15eed1de258c8201939b819d189f2e8efc577a7fc29c3ed452e713b3b2a7bbbeb9b958d0c53a8fde92e3
 DIST aho-corasick-0.6.6.crate 26330 BLAKE2B dbdfcba15832736cf1ec65c9f93943e7ef368fc71e5545e1481788428ce1ebacaf87b4d045cb22695c1738ac6a0c579b38e886a461bd665b07898ca3a7f9e808 SHA512 6ac654a3e670ca53350ae6a4b21f7cc50335a42ac8557f34712575e9e9871991d29e45a45280f8c32a8a44340a54ac33585e7f1ab9b549462002e0ec24da2caa
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST argon2rs-0.2.5.crate 353096 BLAKE2B 9f8136f54f96cd95facd78572e31d83d49474b77205277805173aa4afe3ebdccf2592dfcb72a68cfc8e7434b89cdf36058038b2c2d452c8289a5c0f4fbb3ed3b SHA512 09a47467d09ed5bb4efdc4b8392e6282da6f4434063f4352c225c6dd1b668b51623e7d8960deb56c7c18eaca890a3515c1dc833acac1c68dc999e56b63e9b04f
@@ -25,6 +26,7 @@ DIST libsqlite3-sys-0.10.0.crate 2175426 BLAKE2B dc7cbbcb632e2de1e8fcd6372cb0a82
 DIST linked-hash-map-0.4.2.crate 15980 BLAKE2B f31e0dc6f6bb3af355981491e42ce70ac91cbcf059c3d7da8ad2160c40c379bf6d10aab1fdc8400df4497e30ae8dc8c37149ec23084b589fb9a17b8dcf7fbdb4 SHA512 e9ca0dcf09338b8bf2e669eae241b1d07a08c430b2c1fb8adde9a79218aac8f0ad3a13d515202fbf7d0d6f3607e64c4fb3b8b9fe9190655897ae7aeeeb91dbce
 DIST lru-cache-0.1.1.crate 8645 BLAKE2B 027f7051ce930701b97017638f2091efef0b3be330fe1cf534d31c7040c8eb55d73d8e397644584d642e370ed2c109f6df61a6da020f6df5f5756cfccbdf9216 SHA512 f397be62edf59bcb36767e338427684274c3ec900d96f92c75859c61ae52f78c42a551bb298e256b76f65bc7b5765c453a07baa61dcb01bfb93ca8a41612b521
 DIST mcfly-0.2.5.tar.gz 242543 BLAKE2B 6e98cf65dd4184b475d58470eb241aa7f793fd51dc638a77e3407a71bd4e937db75d6f2bbc99d7f34b04ffbf216bfe48339763ca2fb670ac5740b5637bd6d6a9 SHA512 a0b2728d017271e8d7fc62fca08a433dc59bc0d7cc4c0bf1ab3d000fbd6bdb8a0aa94de2fc6334dc9035b654d529a4cbdae239a769a14f0a43723716e7ba46fa
+DIST mcfly-0.3.1.tar.gz 242505 BLAKE2B 178dc23567708593b89daa653ebdb5dab823197c56d9655abf8b15996736cfbc92acdd8643931c669678aab31eb8a14a4771c98373dec816d61ce0fb0e097b4d SHA512 308aeba0243b59d04655ffb06ce8ad20a3b7077543a3232e783581ef453a64f20c9c6fb5869cff23eac818103cc634c466340e8225346fb135c1b7cbe01d72bf
 DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
 DIST nodrop-0.1.12.crate 3033 BLAKE2B 69792f5ac9722dc570749795b6e0e6c6373c44614bf5861846af08d426d18e5929ad3c5b957adf3480e8c77444cec9d33b3e8b272eea9c7200f0cedf0d78e7ac SHA512 8f2856a6467715565ea5b3be181fc957f6cbc885797c15582ef5be5a71089201292ea58f94877496737dfd427b19523228fa4bde49d9413a8399d2e7888b99aa
 DIST pkg-config-0.3.11.crate 13227 BLAKE2B f22a748d9330848379d9bcc32026c9ba4bcffc043495b864af95dde36ce3fe71344bf5b0534aa61574f677b9a3d1ec0e09f774dea0ee57c1810f1e6bd7edc1e4 SHA512 c5e53a9dd777bce55889fdf7028418443896890ff120beb2fda5e5fcc55624aaefc2ac058c2b4bc88519d48bacc477351b0ab1c4d4a65b4e4bf66a69a419aae6
@@ -65,4 +67,5 @@ DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD mcfly-0.2.5.ebuild 1916 BLAKE2B c130cffe242d62cada49b83fda14bf60a1b7efe96e4a4f57ed46e51bedf8e688ba1ff278d6774f34319db4126e1dfd3f18193664d5f86a49462793d55e5f114c SHA512 71f24c21fb2741696e66f6f9ee7b0755427d7ea49c0e99710498f6a41d38b5e1dc77f919eee19ad5dfb9ab236fde2fc6e7811f788f9e5301382f9bea3ceb1478
+EBUILD mcfly-0.3.1.ebuild 1801 BLAKE2B 04441cbb9ab48771e83d8933c600649d7a69a7636133a62efb62fa11f79d94b3a8b4c4676c52e041831a7df7d9116ff7f5938b960976c82e6eb40f64d97a30c9 SHA512 6824718aca5002dd90aac15e697ac34d1c9e1839379c88c9ac0ee35d555fb710939ee5a6fa08acbc22cf6b3968bcfa82d38b483b71ed90a20ad3959db7318a74
 MISC metadata.xml 754 BLAKE2B 9ffcd71049bc11d8ad580f9721158f931918b2d0cd4fc9e465fda580bad0a853a47c58b4b258d98a654102d195015b32f9d8cbe62343b2c14222a0ea229ea3a3 SHA512 8159ff903511596ba5c7779f89a827101a6c22b8b36bde69cabf89470dcc970fc1755f921bb26952778f9b8e9e518ac7b45edb92c08471b9ec89f01074e8ee9b
diff --git a/app-shells/mcfly/files/mcfly-0.3.1-cat-dev-urandom.patch b/app-shells/mcfly/files/mcfly-0.3.1-cat-dev-urandom.patch
new file mode 100644
index 000000000000..86d016b9d076
--- /dev/null
+++ b/app-shells/mcfly/files/mcfly-0.3.1-cat-dev-urandom.patch
@@ -0,0 +1,22 @@
+From 51cc1520ee19b241813ecdce82ff26bd84225eeb Mon Sep 17 00:00:00 2001
+From: Melkor333 <samuel@ton-kunst.ch>
+Date: Wed, 26 Dec 2018 20:21:13 +0100
+Subject: [PATCH] fix 'cat /dev/urandom' not closing
+
+---
+ mcfly.bash | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mcfly.bash b/mcfly.bash
+index f2b5be7..84261cd 100644
+--- a/mcfly.bash
++++ b/mcfly.bash
+@@ -5,7 +5,7 @@ if [[ "$__MCFLY_LOADED" == "loaded" ]]; then
+   return 0
+ fi
+ __MCFLY_LOADED="loaded"
+-export MCFLY_SESSION_ID=$(cat /dev/urandom | env LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w 24 | head -n 1)
++export MCFLY_SESSION_ID=$(cat /dev/urandom | env LC_ALL=C tr -dc 'a-zA-Z0-9' | head -c 24)
+ export MCFLY_HISTORY=$(mktemp -t mcfly.XXXX)
+ export HISTFILE="${HISTFILE:-$HOME/.bash_history}"
+ 
diff --git a/app-shells/mcfly/mcfly-0.3.1.ebuild b/app-shells/mcfly/mcfly-0.3.1.ebuild
new file mode 100644
index 000000000000..db606e07b5f0
--- /dev/null
+++ b/app-shells/mcfly/mcfly-0.3.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2017-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+ansi_term-0.11.0
+argon2rs-0.2.5
+arrayvec-0.4.7
+atty-0.2.10
+backtrace-0.3.9
+backtrace-sys-0.1.24
+bitflags-1.0.3
+blake2-rfc-0.2.18
+cc-1.0.18
+cfg-if-0.1.5
+clap-2.32.0
+cloudabi-0.0.3
+constant_time_eq-0.1.3
+csv-1.0.1
+csv-core-0.1.4
+dirs-1.0.4
+failure-0.1.2
+failure_derive-0.1.2
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+libc-0.2.42
+libsqlite3-sys-0.10.0
+linked-hash-map-0.4.2
+lru-cache-0.1.1
+memchr-2.0.1
+nodrop-0.1.12
+pkg-config-0.3.11
+proc-macro2-0.4.20
+quote-0.6.8
+rand-0.4.3
+rand-0.5.5
+rand_core-0.2.1
+redox_syscall-0.1.40
+redox_termios-0.1.1
+redox_users-0.2.0
+relative-path-0.4.0
+rusqlite-0.15.0
+rustc-demangle-0.1.9
+scoped_threadpool-0.1.9
+serde-1.0.75
+shellexpand-1.0.0
+strsim-0.7.0
+syn-0.14.9
+synstructure-0.9.0
+termion-1.5.1
+textwrap-0.10.0
+time-0.1.40
+unicode-segmentation-1.2.1
+unicode-width-0.1.5
+unicode-xid-0.1.0
+vcpkg-0.2.4
+vec_map-0.8.1
+winapi-0.3.5
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Context-aware bash history search replacement (crtl-r)"
+HOMEPAGE="https://github.com/cantino/mcfly"
+SRC_URI="https://github.com/cantino/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}/${P}"-cat-dev-urandom.patch )
+
+src_install() {
+	cargo_src_install
+
+	insinto "/usr/share/${PN}"
+	doins "${PN}.bash"
+
+	einstalldocs
+}
+
+src_test(){
+	cargo test -j $(makeopts_jobs) $(usex debug "" --release) || die "tests failed"
+}
+
+pkg_postinst() {
+	local p="/usr/share/${PN}/${PN}.bash"
+
+	elog "To start using ${PN}"
+	elog "Add the following to your ~/.bashrc"
+	elog
+	elog "[[ -f ${p} ]] && source ${p}"
+}
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index ab1638a5a8fa..ef3ac520c8a7 100644
--- a/app-shells/push/Manifest
+++ b/app-shells/push/Manifest
@@ -1,3 +1,3 @@
 DIST push-2.0.tar.gz 2211 BLAKE2B 5875962c3aaa2e3eec2dcd3b70a0b5325684dffaf0b01b8f336db835bcfc4b24fc5d28817eb9032d8a10c5759089e2bbf42fba058403ebf420a77bb7d2754c95 SHA512 03c40bd8b3b09473952ecf13edd622533616de47638741214b40856b33993f9310d62be34fac6f68b950f58167c3111082554961a800a43a3ecf8a7d138ffdff
-EBUILD push-2.0-r1.ebuild 682 BLAKE2B 0994f08d2a75b53f0fe44636b803a9ff35706bce9e31632d0cbcb5cebfdf8324e48a35f74defa6bf546c6478730f2f016523ac4d541a57cd2e99304918e4d3ea SHA512 bb61471ba841c9b8ada0da50351391219d23497a38297c4aa6f8da5f9c997786db41d5e4432f133fe3ed3c825932c523d41074b137402f96a766d38153913a88
+EBUILD push-2.0-r1.ebuild 678 BLAKE2B f6840ce890cc5401e8f74116bb303376dc1676f7f181df5efe4ff891c6019d3adc2582595cd05206630620cde1bd6b132660a9adae5bc7a9a0ab8dca58715d8a SHA512 13fcebf815d98a3cd07db7b6dd0b1b02fe4ddbfca4edda4194442e003db0aece0be478e51ff74b255dc5fda054c768677b98b6dbbc75b7ee1a257c601e77c05e
 MISC metadata.xml 698 BLAKE2B 69740256ef4db99512953ae2e9b896410814d64f45c8fd6f2b45628948e1c7bf3ed66e53605c0611e30bf9af75d59b554b6c8bfa942777d55a3db1fb0e4bb944 SHA512 ebd59b8ea97e30788644f33eaa98c2618fa2f90a62bc17bb5c9027253df3c04b6ab1e25671dfcbbf31101bb4cfe2aa2236c7d287a40b49a2b83c09734967fbc1
diff --git a/app-shells/push/push-2.0-r1.ebuild b/app-shells/push/push-2.0-r1.ebuild
index 48c863ae8224..dcf848498b0d 100644
--- a/app-shells/push/push-2.0-r1.ebuild
+++ b/app-shells/push/push-2.0-r1.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 69cdc2ed14e0..c539fb62c85e 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,11 +1,8 @@
 AUX prompt_gentoo_setup-1 820 BLAKE2B 26fc3348f16459462dddfd3f6864a3ae58bbcbbce0e85c04d653bed9c1f1c28a07621fffd22819d62050cf019f3d6d4c127088055bc69a0cc0cb990e8435f2be SHA512 262ad91d7536c11c3b1db176217e9a9bf21df5d25d72ddfc7dece6eafceb74a252212939c8cbe5bee1ccc0e25fc4e6e906660877747f5224e862d4d22d1200a0
 AUX zprofile-4 1297 BLAKE2B 2e4252a7ecbfe8a193bc916f0a5a3337e2de33856fa974e78479a30df6cc29bc86d75d5dca67cb0970642348e32a70e38ffcc55222ea64061aa7bdd08194c61a SHA512 f610937e8fccc88d0ea09e8ffddd365ee3015f04b50f56c2e4f20648e77784e80e4efc2969768b5ed41640acf290ea319306cf57a52aabc3b6917543ff94fd5e
 AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd
-DIST zsh-5.5.1-doc.tar.xz 3216632 BLAKE2B ef1274799604d74eb9cec3c29927703c98bb63bde3aa5ce4880eda45420fe1eb79c54a693fe529c9e79161f924a76bc2a650253216c7b1e565af65f1ac3c0d91 SHA512 e240f6c6aa2efb941c2baaaf749c66c9e304ba54ce2be90586671ba47e380aac89315516e5dce41fa0ae1d8fccfc36f61ed1400b6aab3382927e2715a77d62e6
-DIST zsh-5.5.1.tar.gz 4578700 BLAKE2B b58fc763bc64e8ed6de0db2e0fd454aef995fcc86b18c2ffd4b39e037ce1cdeb04e6e2a44b2495ca89218af41ad1dd7d29e429d21fbab39377d95e62d249732e SHA512 c4f7327a3f5480bd9a169fb07e34812e0106fa9de3b5f7d38bb0db85a3e4d01b9a4a8f35553da03a15d7d819108305cfaa2811c945273e2cac84512219e69ebb
 DIST zsh-5.6.2-doc.tar.xz 3198932 BLAKE2B 7e701bb12e0114b7d9847caad1146fa3d538f8f6d859a765037660fb18341f1c79002811a42ec795e41eb2bbe899e12d4bcd055ea5c66e7b73bd488bdf8bbb55 SHA512 5102314e2857b032c6e6b4b715c261970b2f0c28663aff99fb87f7bb6c3971f88f8e8892ed349793570beae3fb68ff7923c82e99a3c1bb485e4639f01caaad4a
 DIST zsh-5.6.2.tar.xz 3077368 BLAKE2B 8c6ce22436f9f51eff809c779efad02f4a0730b4431630ab305abc9f1ef722698f7c565d0aa421b0d94c21f2c830f9d529709fd62a4205be1a20acf0f94a845a SHA512 f0a49e41b55eb478692ab5471d7c9828956b7e96bc82944202b0ef1c49a889b21a0e7682aa5f59fd0054ebfd866c2244c8a622e7aa46c13038af5c226c48a3a2
-EBUILD zsh-5.5.1-r1.ebuild 5848 BLAKE2B 64764038b1a41956c4f2a30b8a504d6fade61946a8b48fe1908c7f213325c50689df2757965d9dfa5b7a50303b70c83f2abcfe5794534f239c4d05662fc14d0e SHA512 ae3376f6626a1cfdf51b00c0982aaff4ed3976dd0b20b70648479471568da4e2119c388d93e968493eb666af56ca4402d309682344615b9c9fcdab2eaea578ac
-EBUILD zsh-5.6.2.ebuild 5850 BLAKE2B b1b0a05ca2ea49cd02eee075793166e8a58e347c9ef5114ec86213a2779d228a60afebd49b0e76c55c98c6f12ffcc28d04bcd3fb32f1466bbce081207c29c353 SHA512 5bb51131d6ac67341133bd3a9cf0457ae46658569224c299f507456b223ba9db6ac284378e63844883b530f97a03c0366e1694beb503aae01ba344e079b48899
+EBUILD zsh-5.6.2.ebuild 5849 BLAKE2B 4e665d07154f52a0cd12ed3eb5b3b7facf5dc802f2fbb8faeb77b33c897c9aaf05f843f3670b09b92ede76a1d34b0f4c30469b1e07a176cbb9cfafd9e8340bbc SHA512 0552a4a7dd72536eaf8371cbfc5a2c7e479c93e3632bede86803b7073cf31f293f77668e19b3101957cdb2ce91f10ac7b955b36c61b6ce77c4fabff3ead4f0d0
 EBUILD zsh-9999.ebuild 5862 BLAKE2B 8a4e5cb785e200bd3f60aba78cc74a69e05345e26a82c88e36a734542ebeb81b425af6d98da77514cac667e93acc2e00c5beeac208777890371c108a311dd229 SHA512 2d55595c2a9184ee6fe478e21f2e999fbe286bc9c208830de718cb41757e024f759a7697301e78a2d42784ee917c9944c6aac0c5aa82f82e22ca01a395f86739
 MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/zsh-5.5.1-r1.ebuild b/app-shells/zsh/zsh-5.5.1-r1.ebuild
deleted file mode 100644
index 501591706280..000000000000
--- a/app-shells/zsh/zsh-5.5.1-r1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
-else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SRC_URI="https://www.zsh.org/pub/${P}.tar.gz
-		https://www.zsh.org/pub/old/${P}.tar.gz
-		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
-fi
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="https://www.zsh.org/"
-
-LICENSE="ZSH gdbm? ( GPL-2 )"
-SLOT="0"
-IUSE="caps debug doc examples gdbm maildir pcre static unicode"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1:0=
-	static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
-	caps? ( sys-libs/libcap )
-	pcre? (
-		>=dev-libs/libpcre-3.9
-		static? ( >=dev-libs/libpcre-3.9[static-libs] )
-	)
-	gdbm? ( sys-libs/gdbm:= )
-	!<sys-apps/baselayout-2.4.1
-"
-DEPEND="sys-apps/groff
-	${RDEPEND}"
-PDEPEND="
-	examples? ( app-doc/zsh-lovers )
-"
-if [[ ${PV} == 9999* ]] ; then
-	DEPEND+=" app-text/yodl
-		doc? (
-			sys-apps/texinfo
-			app-text/texi2html
-			virtual/latex-base
-		)"
-fi
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# fix zshall problem with soelim
-		ln -s Doc man1 || die
-		mv Doc/zshall.1 Doc/zshall.1.soelim || die
-		soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
-
-		# add openrc specific options for init.d completion
-		eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
-	fi
-
-	eapply_user
-
-	if [[ ${PV} == 9999* ]] ; then
-		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--enable-etcdir="${EPREFIX}"/etc/zsh
-		--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
-		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
-		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
-		--enable-function-subdirs
-		--with-tcsetpgrp
-		$(use_enable maildir maildir-support)
-		$(use_enable pcre)
-		$(use_enable caps cap)
-		$(use_enable unicode multibyte)
-		$(use_enable gdbm )
-	)
-
-	if use static ; then
-		myconf+=( --disable-dynamic )
-		append-ldflags -static
-	fi
-	if use debug ; then
-		myconf+=(
-			--enable-zsh-debug
-			--enable-zsh-mem-debug
-			--enable-zsh-mem-warning
-			--enable-zsh-secure-free
-			--enable-zsh-hash-debug
-		)
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=( --enable-libs=-liconv )
-		append-ldflags -Wl,-x
-	fi
-
-	econf "${myconf[@]}"
-
-	if use static ; then
-		# compile all modules statically, see Bug #27392
-		# removed cap and curses because linking failes
-		sed -e "s,link=no,link=static,g" \
-			-e "/^name=zsh\/cap/s,link=static,link=no," \
-			-e "/^name=zsh\/curses/s,link=static,link=no," \
-			-i "${S}"/config.modules || die
-		if ! use gdbm ; then
-			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
-				"${S}"/config.modules || die
-		fi
-	fi
-}
-
-src_compile() {
-	default
-
-	if [[ ${PV} == 9999* ]] && use doc ; then
-		emake -C Doc everything
-	fi
-}
-
-src_test() {
-	addpredict /dev/ptmx
-	local i
-	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
-		rm "${S}"/Test/${i} || die
-	done
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install $(usex doc "install.info" "")
-
-	insinto /etc/zsh
-	export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
-	newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
-
-	keepdir /usr/share/zsh/site-functions
-	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
-	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
-
-	local i
-
-	# install miscellaneous scripts (bug #54520)
-	sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
-		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
-		-i {Util,Misc}/* || die
-	for i in Util Misc ; do
-		insinto /usr/share/zsh/${PV%_*}/${i}
-		doins ${i}/*
-	done
-
-	# install header files (bug #538684)
-	insinto /usr/include/zsh
-	doins config.h Src/*.epro
-	for i in Src/{zsh.mdh,*.h} ; do
-		sed -e 's@\.\./config\.h@config.h@' \
-			-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
-			-i "${i}"
-		doins "${i}"
-	done
-
-	dodoc ChangeLog* META-FAQ NEWS README config.modules
-
-	if use doc ; then
-		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
-		docinto html
-		dodoc Doc/*.html
-		insinto /usr/share/doc/${PF}
-		doins Doc/zsh.{dvi,pdf}
-		popd >/dev/null
-	fi
-
-	docinto StartupFiles
-	dodoc StartupFiles/z*
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "If you want to enable Portage completions and Gentoo prompt,"
-		elog "emerge app-shells/gentoo-zsh-completions and add"
-		elog "	autoload -U compinit promptinit"
-		elog "	compinit"
-		elog "	promptinit; prompt gentoo"
-		elog "to your ~/.zshrc"
-		echo
-		elog "Also, if you want to enable cache for the completions, add"
-		elog "	zstyle ':completion::complete:*' use-cache 1"
-		elog "to your ~/.zshrc"
-		echo
-		elog "Note that a system zprofile startup file is installed. This will override"
-		elog "PATH and possibly other variables that a user may set in ~/.zshenv."
-		elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
-		elog "or other user startup files that are sourced after the system zprofile."
-		echo
-		elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
-		elog "one method is to use a separate path-setting file that is conditionally sourced"
-		elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
-		elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
-		echo
-		elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
-		echo
-	fi
-}
diff --git a/app-shells/zsh/zsh-5.6.2.ebuild b/app-shells/zsh/zsh-5.6.2.ebuild
index be5c8a20dd48..dbbb337d6e96 100644
--- a/app-shells/zsh/zsh-5.6.2.ebuild
+++ b/app-shells/zsh/zsh-5.6.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 		https://www.zsh.org/pub/old/${P}.tar.xz
 		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"