gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /app-shells
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
36 files changed, 471 insertions, 736 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 8258c0881dbd..c72586e11ec0 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest
index 7f5e017fa6af..1fed4e971cf3 100644
--- a/app-shells/autojump/Manifest
+++ b/app-shells/autojump/Manifest
@@ -4,4 +4,4 @@ DIST autojump-22.2.4.tar.gz 52724 BLAKE2B 42d5db90d4a29c63f5cd79437ca005f9f6382a
 DIST autojump-22.5.1.tar.gz 54721 BLAKE2B ea3a852dddc13ece5ff177be0b3f384e5dcb19795d31d22edae90dba19fe3e78a4b78f48f08c338521d89d57af6251d5690c62eab445229812adb154286b0d5c SHA512 ed1bb28b62d14a481d5c8ee8ebbfc286d21ca54c961904f81ac123c784e17810217dfe1689bdd4b50fd7a9d72509c0cb13583a9817074f6afe26dc3144f64243
 EBUILD autojump-22.2.4-r4.ebuild 2116 BLAKE2B e354d40e8f165ec2ddfc546ed7a82afe561cdd0ecfe0eff9c2dd8f6ff2f6c4faa5dfe8b884d97f4197399e3110b0635a19b8c1f141b3eda6083ed44b199df58c SHA512 c2a3239a7ba6ef8ec144ed271824e9b839b709ca2533d68d12499af0f3281cafb1b34ff58d8f85e9cee366f4674e46f5bfaf66be08b6038d121def8c06f0cb6a
 EBUILD autojump-22.5.1.ebuild 1923 BLAKE2B 0e8025ac920b11a9319fe56c0106c831940c8cce9cb88bf57049541e74e42a5aad037e10cca642b162d8543da2880c4bdf3011a5c89b9f20e25d18d900444e96 SHA512 3890a2fbf91e837aeb93c55b41da0536ef855b4edd27f37d28c8499e886eecc15caa5062f22cd39319367b888b3e2e7c9adbffc3058393e266bf1d09c8f95bb6
-MISC metadata.xml 503 BLAKE2B c2ead3167237d69f09ac2e5ebf8920b6ec2cf8d3800daf5aa8ce474067aeba88087914c39346414d707c3440c18592cae6d2c1e42718991bf41428a65136d733 SHA512 5173d3dcf39215a8ce67a9eb37127f4945d1420180a48f952d417d73e83bbd03fe1cdcbbb193b69f5eec3cfb994c12f8a92b4e6e22844b30753024dc0919a10d
+MISC metadata.xml 490 BLAKE2B 33ef64a70f2b0d3211861a9ae667a4ed930f850a0198661cd3371024ac6193c80d3121ca188f48cac4732741fdea08e918c8ef78161a921127ec82b1064dd1c1 SHA512 c7742421c4211de2b774bb6136261863bd69a93debe3f1ab4b921e9f19a7581ef2711fbe2090ada92b60f799cd6683368e48d974ab9698ae3c2b5f768cd34db9
diff --git a/app-shells/autojump/metadata.xml b/app-shells/autojump/metadata.xml
index b8e575f5b4d9..1546a6446e7d 100644
--- a/app-shells/autojump/metadata.xml
+++ b/app-shells/autojump/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
-  <upstream>
-    <bugs-to>https://github.com/joelthelion/autojump/issues</bugs-to>
-    <remote-id type="github">joelthelion/autojump</remote-id>
-  </upstream>
-  <use>
-    <flag name="ipython">Add support for <pkg>dev-python/ipython</pkg></flag>
-  </use>
+	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/joelthelion/autojump/issues</bugs-to>
+		<remote-id type="github">joelthelion/autojump</remote-id>
+	</upstream>
+	<use>
+		<flag name="ipython">Add support for <pkg>dev-python/ipython</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/app-shells/bashdb/Manifest b/app-shells/bashdb/Manifest
index f53bb386166d..b6315b29f364 100644
--- a/app-shells/bashdb/Manifest
+++ b/app-shells/bashdb/Manifest
@@ -3,8 +3,10 @@ DIST bashdb-4.4-0.92.tar.bz2 678961 BLAKE2B a47e964653238452fcad6f4e098df64de4d2
 DIST bashdb-4.4-0.94.tar.bz2 810610 BLAKE2B fa3a68349b0ab64e17c094c34b82c8ba054a86f83452bab50a55bc9f63181459fd49a7a39e2e7a7c66063ac291b8f2a03d4ba6b834a3d5869d2fe9b099f4eb2b SHA512 97e7d057f16d90d7f1677e1b29d2467d5ee263e9aaad64e2d7a8b8a19b3f3ca68023f23a45faea235fdba57e803fae762a19aab67f650b81e868a8a01c5b1fb7
 DIST bashdb-4.4-1.0.0-missing-test-files.tar.xz 996 BLAKE2B 7ea67884cceda11559cf49355645cad2cfd485537643ad2fa05398518f498163596b6f591756bedd0e7b7e013fed3c6a031e245d15cd0cf316d42ef4f5c8b3e6 SHA512 e19d41569c2001ce026e4c5f80cc21c81651ff9980be059236c45e215162769ceda266eb46aa4199000e377c0bb53dec98fa1b7c5290459c412f21329b3589a5
 DIST bashdb-4.4-1.0.0.tar.bz2 701749 BLAKE2B 2fa4bfd21f6c646c6bb1c2439dfed870478fb985dd52c8ba716e08fa0312da9adb0c29396594280bce525bb88f15b7398878c7a9bb2a39c078d4e5f17706c20a SHA512 eae45eb221c662e6bbf86814b861992944fcdef221e1bbc7df6c4fd0197022b82fabf4b7e5d583ba4fff94a0b486f71901d42f9df12a8b6a5f564e9236ad37e5
+DIST bashdb-4.4-1.0.1.tar.bz2 701807 BLAKE2B 8d41a39831ce9466f5fcd205cf84e337ca7d876fddaea8b8c013fe4ac93a143c9f5b5e46bcc8edbb50fe4c77e87bd282ff9a244e41df007897d3b37f732bb0a3 SHA512 306fc5a49490fe04828cd6c64b23302e0f48ba8558780c93d45d9c615206e91dac5d8ff3d0660e50bc3204873131d1296492bccc23119d2f58c990bd3603221c
 EBUILD bashdb-4.3.0.91-r2.ebuild 823 BLAKE2B 76e207846110a1c811ef649e5416543abe89bdc4a12511951f669eb5dd84b37222b540a415875404c6a2ef449deae190940eec88cbf55c4090e0559c811d0fb7 SHA512 c033a061731873fb0d2a355f05503a7c259c6b6d21829eaca4956a8c6aea28df6fd77046fa30cdb7b405397446e4ddac1e34e75c6801d5cc45df55edba5f1dc4
 EBUILD bashdb-4.4.0.92.ebuild 837 BLAKE2B 633488ec8ba934ff9a78b00f60ef9a7ab3623caf82658411cd876af9bad656b04dd040ac68e5b7feab89aeb8899f662fb6260a3cf203d0a069ca0115c8ef8c85 SHA512 986bf2b35d7b8d3a22225c3082077334909311b5a1e3b203af391ce17a93223054c592f759526277c7f88e3f69636a543f8db89c4641a77eff3ad199db020df0
 EBUILD bashdb-4.4.0.94.ebuild 837 BLAKE2B 235d50ad42282afbe67ef7a6ce742461983610f6061f42de8fcd190e15312aabbe79fd98bb4ee9a2f6d977d93d6595a130e6401a215ed5ee1fc872ccdcfc67b9 SHA512 f9adef378b907f9ed78e433c39a67a0801b664774b63c1aa76615b9e414491997549c71398952818d7e69c58c49ada1e0049bbae3fbc0789b4f7cd59efa4b4b2
 EBUILD bashdb-4.4.1.0.0.ebuild 1039 BLAKE2B 7a0c8e1b2f6c9540427f905cb374045d4e328445ab782da5981522d1147f38bfc9f4037caf3ff0f5265511e452eefca338859163dc8be2cd0e78d2c6ca3cf52f SHA512 c63ec5fffb2954227002d697d8e85263c8b5224f69b308111c3acd89ee236f1ee649c368bc528f3657e06af468db780e3f5d641f807bf16aeb24c6d3a0955683
+EBUILD bashdb-4.4.1.0.1.ebuild 1039 BLAKE2B 7a0c8e1b2f6c9540427f905cb374045d4e328445ab782da5981522d1147f38bfc9f4037caf3ff0f5265511e452eefca338859163dc8be2cd0e78d2c6ca3cf52f SHA512 c63ec5fffb2954227002d697d8e85263c8b5224f69b308111c3acd89ee236f1ee649c368bc528f3657e06af468db780e3f5d641f807bf16aeb24c6d3a0955683
 MISC metadata.xml 333 BLAKE2B 3d15d5b1c4dc17fb6eb805020e6cacb0b835ec4113cccec2756d5b3ccd6be5ce427383598b136f9e13280452e1d9252a609671d3016fffd14ccd898fa7553ad8 SHA512 eb1b078a7e431900181f558710bba93fb5c4633733364664e85e07b4bd05c8ba7492948d4a3ac8cb4866f128b116d82b5b6f1c8b2966318fb9ed61a9c78dda82
diff --git a/app-shells/bashdb/bashdb-4.4.1.0.1.ebuild b/app-shells/bashdb/bashdb-4.4.1.0.1.ebuild
new file mode 100644
index 000000000000..2e08dfbbd120
--- /dev/null
+++ b/app-shells/bashdb/bashdb-4.4.1.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_P="${PN}-${PV:0:3}-${PV:4}"
+DESCRIPTION="bash source code debugging"
+HOMEPAGE="http://bashdb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2
+	test? ( https://dev.gentoo.org/~whissi/dist/bashdb/bashdb-4.4-1.0.0-missing-test-files.tar.xz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if use test ; then
+		einfo "Copying missing files ..."
+		# https://sourceforge.net/p/bashdb/bugs/52/
+		cp -vafn "${WORKDIR}"/missing-files/* "${S}"/test || die
+	fi
+
+	default
+
+	# We don't install this, so don't bother building it. #468044
+	sed -i 's:texi2html:true:' doc/Makefile.in || die
+}
+
+src_configure() {
+	# This path matches the bash sources.  If we ever change bash,
+	# we'll probably have to change this to match.  #591994
+	econf --with-dbg-main='$(PKGDATADIR)/bashdb-main.inc'
+}
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 45e9ddcad5e1..e27eac9fcf16 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,6 +1,10 @@
+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
 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
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/files/README.gentoo b/app-shells/fish/files/README.gentoo
new file mode 100644
index 000000000000..421d070ac574
--- /dev/null
+++ b/app-shells/fish/files/README.gentoo
@@ -0,0 +1,19 @@
+fish is now installed on your system.
+To run fish, type 'fish' in your terminal.
+
+It is advised not to set fish as a default login shell.
+see https://bugs.gentoo.org/545830 for more details.
+Executing fish using ~/.bashrc is an alternative
+see https://wiki.gentoo.org/wiki/Fish#Caveats for details
+
+To set your colors, run 'fish_config'
+To scan your man pages for completions, run 'fish_update_completions'
+To autocomplete command suggestions press Ctrl + F or right arrow key.
+
+Please add a "BROWSER" variable to fish environment pointing to the
+browser of your choice to get acces to fish help system:
+  BROWSER="/usr/bin/firefox"
+
+If you have issues with cut'n'paste in X-terminals, install the x11-misc/xsel package.
+
+Have fun!
diff --git a/app-shells/fish/fish-3.0_beta1.ebuild b/app-shells/fish/fish-3.0_beta1.ebuild
new file mode 100644
index 000000000000..cc6e0bba6178
--- /dev/null
+++ b/app-shells/fish/fish-3.0_beta1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/"
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
+else
+	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="doc nls test"
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.21[pcre32]
+	sys-devel/bc
+	sys-libs/ncurses:0=
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+	test? ( dev-tcltk/expect )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
+	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+		cmake/Tests.cmake || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DINTERNAL_WCWIDTH=OFF
+		-DBUILD_DOCS="$(usex doc)"
+		-DWITH_GETTEXT="$(usex nls)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	cmake-utils_src_make -j1 test
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
new file mode 100644
index 000000000000..cc6e0bba6178
--- /dev/null
+++ b/app-shells/fish/fish-9999.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/"
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
+else
+	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="doc nls test"
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.21[pcre32]
+	sys-devel/bc
+	sys-libs/ncurses:0=
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+	test? ( dev-tcltk/expect )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
+	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+		cmake/Tests.cmake || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DINTERNAL_WCWIDTH=OFF
+		-DBUILD_DOCS="$(usex doc)"
+		-DWITH_GETTEXT="$(usex nls)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	cmake-utils_src_make -j1 test
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-shells/fzy/Manifest b/app-shells/fzy/Manifest
index 8d98d2e6de22..6443e90c8f63 100644
--- a/app-shells/fzy/Manifest
+++ b/app-shells/fzy/Manifest
@@ -1,6 +1,6 @@
 AUX fzy-0.9-cflags.patch 299 BLAKE2B 61685e7180741ec77449b5de6fa711b4939faedd94dfcfd84ec86be0ef963b13d5a5308e294f4f22e83682982671a528b64446979fe41e112aeb8c5d143e865e SHA512 f3ea9b90a75f0a013466ef00190dbca451b22015e0a3c3f7e823f61dc2e4ef7d64f90a9685fec311675fb6c5bc788bb7436da2fd89f4f6baade4dfbee8318635
 AUX fzy-add-utf-8-support.patch 2642 BLAKE2B bdece2ab5d9122c9c2f306271b1c795c1130c145e3a434d4b831dd680bbdc09e5241763391fc2efa16a6af50cfbaf49b3fe98364f5f56a25b2d78af8fcba8a1b SHA512 203c0e8e7a9583661cd7d85cc094016eed2149a82fb55a578075e5d2fe513cbe2f7241ea76660e5990efd6b5f573f584ab3345ae832439fbea80950c64f7803b
 DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc
-EBUILD fzy-1.0.ebuild 1101 BLAKE2B 68c394ee66018550518409ba2c4251ca671ce6a69e3e2ce489fa57dd0cf58651248488cbdf3595ab8bdd0e996c058322a302f4aa6aca85a7eb956ca1b0cd214e SHA512 caef8f3c97cdf32f43ca18262c7506f123c92bb477634438773cd8b70aff71a28deb30aff303ca0be5ce28a05480c4e278378eec11d2444cf98220dcdccce8ed
-EBUILD fzy-9999.ebuild 1101 BLAKE2B 68c394ee66018550518409ba2c4251ca671ce6a69e3e2ce489fa57dd0cf58651248488cbdf3595ab8bdd0e996c058322a302f4aa6aca85a7eb956ca1b0cd214e SHA512 caef8f3c97cdf32f43ca18262c7506f123c92bb477634438773cd8b70aff71a28deb30aff303ca0be5ce28a05480c4e278378eec11d2444cf98220dcdccce8ed
+EBUILD fzy-1.0.ebuild 1096 BLAKE2B f37e48527a082e6199da3bac52291e0e75c6ac12f96b4b9602601ebd6670856d2c5690b63ac51ba1b324d372f91601254bd99d9b50e1ac41591f9a2dfaf12786 SHA512 8a7ddbaaf91fa98265fcd6f186fe801edb1db2191bdcdfd1c74ea57683c5b65f0c628b62c8804ffe4ae1197dfee25a1f2f678444d26bb63f7abce899c2b49217
+EBUILD fzy-9999.ebuild 1098 BLAKE2B 47fe52b38c6cb903178d0316d3a8504e22158213a19ef0d0f86602e9dceb33e998117d178268898a85869f13f30aaaf97ed0aac8dc4014f6b6052f8c381ad008 SHA512 e6958bf9a1ef90be991f7b23119ed9a879a57c050263df540726b4b9f0afb7d65c88541ae52274acc01a0821f025190c45954ddb3f4f625a6017ecb4623d4a10
 MISC metadata.xml 892 BLAKE2B 3182bda5d04463762d724265d2ff3644eef1615dfbd2db92ad7ab5e1bf3b9e5f0f727dc55939e0c0902ed16ac78d4a39ae331d22902ec7f7f10d53a7e65a59ba SHA512 202ff3dc44543bf072b32addfc5e1ad627ec6fa16585d9ff9ddbe68bfaa784aa0319ed152621215cd60f1c2a688bb0e3ca227b78fc6b62f5dca4f39b2ad8a55b
diff --git a/app-shells/fzy/fzy-1.0.ebuild b/app-shells/fzy/fzy-1.0.ebuild
index ba77064dac01..5789831aab17 100644
--- a/app-shells/fzy/fzy-1.0.ebuild
+++ b/app-shells/fzy/fzy-1.0.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 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
 else
 	SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Fuzzy text selector (interactive grep) for console"
diff --git a/app-shells/fzy/fzy-9999.ebuild b/app-shells/fzy/fzy-9999.ebuild
index ba77064dac01..f3986538cc79 100644
--- a/app-shells/fzy/fzy-9999.ebuild
+++ b/app-shells/fzy/fzy-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=6
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index e275dd9ce6dd..9bc6ce7b0cf1 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,5 +1,3 @@
-DIST loksh-6.3.tar.gz 249493 BLAKE2B 1790b3c272d0ab3f0129ee199c46905850f87a9fc0815833d005ebedde53605701a8820e4ff40761e5742d4e4cac8969c9a4d7004a8fd995e6a4585f352790d7 SHA512 414d25c10096485bd1bb6574d0f91526f452ee0102924398aff0b1451128e5bf3d5d7344bcc746f574ad1acdefd39a92ee59d0b86b05f0c149418302c4d2d3fb
 DIST loksh-6.4.tar.gz 250475 BLAKE2B 061538766834038677019ca8f1ccd16c77245855f0d666ec5af78fc24995e74b22637ccb29d92d6c436c377d21c1a9449dcb79568ab5ccf7f141e8f0b6040d99 SHA512 74cce1428346820331fb8bce8acf275077b05a3c46081bce5c35e8e0d47704446bb93ce3e457dbf2e379d5d9656844b78c736b1190b2fe39ee92717863adb86c
-EBUILD loksh-6.3.ebuild 571 BLAKE2B ebc8e10dbe921469fd25be5e6e9cdce08e177110847b44e02fbcf277d5f68b64fd1606b729339d05334a1453a2a0ad878c98534a2365158bc2b7123393b254a0 SHA512 f4c6e7873703c70bc2111d6805c5e96a7dca046eab53435e7dea6ce9ee9d96abd60c69b70b1747e035e771b8bc1bb99375fc7c7fd2c6073c7f9fa68aad4f41d1
 EBUILD loksh-6.4.ebuild 608 BLAKE2B c8e27b05cd194c18726e558032cc39845e2eccc5699ad3305fa9f0b80c1050c961d53970d7edcba3da99b1e4f664ca0d3f0c7dd16820d244d3671a09121a9884 SHA512 f78deb3b21e539c2f87f7ee01993ff2baaecc23dae39c948ee17c1f83212aa0d855b9d7e2295f09767e99b3a2222aa7d2652b6cbbbe725488267a5fb73111ce2
 MISC metadata.xml 446 BLAKE2B 0a875fdcc5daa79b15353c9cabae32697f435edfd153759193cfca0fd17ca3c76f649b27cc32bae132a1270c99faad5ca91475ebb6a51f0bd04eba6cd95373a0 SHA512 4e987382f9f5fab554e34afdf016fa59550f64831b8dbfeecc30029a6e0eacf42d14e22117c47bb183abf584ba549d24e3d8dac7e0101e78e2e30ef7a9020069
diff --git a/app-shells/loksh/loksh-6.3.ebuild b/app-shells/loksh/loksh-6.3.ebuild
deleted file mode 100644
index c86fd24adc85..000000000000
--- a/app-shells/loksh/loksh-6.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux port of OpenBSD's ksh"
-HOMEPAGE="https://github.com/dimkr/loksh"
-SRC_URI="https://github.com/dimkr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="!app-shells/ksh"
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_install() {
-	emake \
-		BIN_DIR="${EROOT}/bin" \
-		DESTDIR="${D}" \
-		DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" \
-		install
-
-	dodoc NOTES
-}
diff --git a/app-shells/mcfly/Manifest b/app-shells/mcfly/Manifest
new file mode 100644
index 000000000000..2180c1d641b9
--- /dev/null
+++ b/app-shells/mcfly/Manifest
@@ -0,0 +1,68 @@
+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
+DIST arrayvec-0.4.7.crate 22946 BLAKE2B 93d17ae9e706969e319980b4e00dd0a6c040c8d62cd41d1de34ab997e28798329e00d3dc3893da45ce5bc066fcf70dd5d8e98a79fbac8fc06d33a073a97b7b89 SHA512 195faecd7709eb908227cda7111e1b736ecf96120f9b615f1dc0a9a1cc61947e2ad4fedc7fc81d14405b51a4c8a216f81b8ed1d1d603a9fa451a38b4637e2bae
+DIST atty-0.2.10.crate 5962 BLAKE2B 36a2fe57eb500124f20464a7d67f86bc6270c2143f8273683011599adee180ee71fb0ea565c38171b9d471479d63041e4bbba4f713dfb92239b7d298e9d89e7e SHA512 76cbf960475073101d617bdaf12ed1e93dfdd96e22182674e1ec04c955fb1de2e3aa132345c50a1bebc579932d43c74c9aac64ae64107e98648a0f1f6562285b
+DIST backtrace-0.3.9.crate 31054 BLAKE2B 5d90d098d149198eabe4665b1eb2cf41c5f392ddc1c5cc499047dd72533d79b679943781445f7d86f269a15d3f8ca2775dfe89123935d32ccef4b8151547283e SHA512 edb485ad27d19e0cccea123cc6a9db5b3222831e48722d8fcec7349fd1c4b62b67ab1f488fea4973da82c8f17a86aeba4ea8f2fc1aa60f6528833cda39efa637
+DIST backtrace-sys-0.1.24.crate 522332 BLAKE2B aebfee4b257b44ce127f3bc13d7622dcb0d6cb4c1e73d504b8d77b6c0b1ed47e7ca310cb6b41798cd13e6589739c352d9e33072e20fae0547d292312604a27d9 SHA512 7e7b279bbe5f3d8bc2ff3234df11d7b08cb09209c861c24b3fa67dcd89699bd80a6fbf93d3b0b287544f73792983172bfb5e5c86caedee59f09ee66d259fd0c7
+DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
+DIST blake2-rfc-0.2.18.crate 15676 BLAKE2B fe942b3f09012ea2856d36a44dc59df0a90463eb4333e7afac3e2c5e1b53e7231f5f16242269d97a9731bcba4aa57889dad7decad142618802341678b2b0c6ce SHA512 f89c1067febcd0ed04e86674a42ea7a96aa432ad255210180504f0dec97a10714110eb044fa5004cc48fd75eefac7af4dc12d8a4ad84dad82851ab6d7d916f8e
+DIST cc-1.0.18.crate 42127 BLAKE2B 158cddc9672713ed156403cf3a9663046978d692aec6b0a0785508d9ee612546e21afcd4cbaf5c9b76aec4c22cc2083615503aea553336cb01533762336fc4f9 SHA512 7e419ed8ad9dd1cf76ac9e7df82f89d93693299a80925f189b96416fd99b0217dd42918e577c0b9dc64c2fd7b6300b81e3b1b4bb176c940cdae4eff4ea303c76
+DIST cfg-if-0.1.5.crate 7363 BLAKE2B ca668ccdb4cf082d2b874976e6ac38e85e2618430cbb5123f9359e328e38b61e59a492116bd6a9f8ed986796095a763d148291378d32ac3a9e7d501c5ac967fb SHA512 48ab0bb1fe89d6e388ac4bf851b9aaed6479f9ca7da62945e2ebe58800b5201897feaf6aabd2b028110b0205b33d5abca7f02826ab3c688647b944e7140e6d94
+DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST constant_time_eq-0.1.3.crate 1279 BLAKE2B 9c67df59e184ff479c5bcd0e11df936b0cac0ab899fe7c4a578df49c9ec6e8c83dd7cd9f1a70bcf08787b8f420ccd3e2c74b02743b350c47ffae8ce117933a6e SHA512 b605ef913ae39c4d9658e9240b9d3dc7736c8d668e83326fc3c68498ca177e40960047de1beee684a23ce96bdf3f80d5b76ef7db6f2758c7aeb14f7a2258a69e
+DIST csv-1.0.1.crate 889533 BLAKE2B 872f8020f12610124c62fcc6280c09d8a8c75087c0460b3144d05a203770f336ef9913813623e3668aa0654c6582122be5bf181d32545ae68fa23a93b390b70f SHA512 044edec1ee680430fe6a49e6a9f5009619b6f9ed873489b5588c3f50b1a1fe1ac0ed95b914476d6927f3c31bf2007839dabcccaf6b586f31d1bf7b46bd4d5a3d
+DIST csv-core-0.1.4.crate 25406 BLAKE2B 10c6493da7d9adf53fdfb44b7e8b229a40beb9dbb882053d778ef8b54d90001b7592fe6b9e9dc5e48e3f113e55ec01fb05d1399b133d9fd99078b8154ba7fbe0 SHA512 c2e5291489eb1d1c192c7d94cbe8be3c6bcf0a5d8ef2bb525ccdc20a9c512e3a42946241457de7ba219b59d330d87a2ce51995782621e6c1d4192e2a71e888f6
+DIST dirs-1.0.4.crate 12844 BLAKE2B 41807d6f2f2b69ee66fdfa9bbbe4148caa78afc951b63a4a67bfa0aad46c831fd7a255655e8832f8441ad9840900879cbd90e134e6393b257ee4afbc757b1b1d SHA512 a3416281a22eb4bd6929ff0857c963ffdd53ed9ffdd26d30603fd847ae0de68428b05691aba46232551b86b562d4b9dad18695fe7ee58247f9ad80a776863f44
+DIST failure-0.1.2.crate 31820 BLAKE2B 8cb6574450790100718d353878da4fc4ed8cf4626b8c95f428ba7a2cde8a422ad053e49e107e153726302318c26bdb480b3dec1b9d85f6ecdbe02a13397593a8 SHA512 248d0e61f7a1d87538e7c774eb294808b1a93325e992ab0a2b2df9c0489506a25c4227b20b706eaa5104fd22cad21b0db8a61cdc4a7def32559b2955a60cb0be
+DIST failure_derive-0.1.2.crate 4326 BLAKE2B 7bd8693ed01e20a70678dab39bf32df8184c79a1f763d75b62cede84316dbb939ff1c69843bc6e3432b6f213f671c1754c896fe9b0c73a89daab0b9e2179943c SHA512 244392baf1923c6a53b7db9cb72f88dc78c74ae4bd5a1df321c54bab7283f5623ae5c4f862156ad4fa32284b4e010d042a27aa4ec4a2881e1d7d1284d4f48c5c
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST lazy_static-1.1.0.crate 12317 BLAKE2B 18c1c0312bc9b7835cef8a35797421be17a706f21a9dcb174527807c7617987fc165f1f99b6c7c665099ff90ab022b0aa4727e7764adc3dd23eb70245135cb6c SHA512 82df91ddf79e2c6e46cda92d6dc8afe20d428f40940a16a352db3c3482ec21ec4b5147bf723dd0b16320ebe0fea489d715671c7fecaf8d0d7982edad3b6919c5
+DIST libc-0.2.42.crate 336080 BLAKE2B 0de0726bfb00ff42d67abf06efa26c1a4f8132b29be2f957b9089da2ef3e4dfddddea49ea23af3449a367d262dc563b70968c6b2b6a1dc81829e6c6a8a1dac63 SHA512 c99a4358805012d7552f416ae68c9651dfd260599bf0cd618b55036acd08ab8eeda8aa18c18b893f074c9613694ef6562e87f032639eb86b86514aa0fd815870
+DIST libsqlite3-sys-0.10.0.crate 2175426 BLAKE2B dc7cbbcb632e2de1e8fcd6372cb0a82ed044db1d8634fa88b4294efb01470528fc86cece8c1ba6c4800a97c39d78bebb4b858efaf7c3c74510f5cf675ca2a1f0 SHA512 df030105952e8e0ca9def15d914a2eb7fb81754c85465788f7a3df5626b647d4af7f93b11f2f6d6e3dba286fd101c779dd51de7f2732084ba9542120cbc0e299
+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 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
+DIST proc-macro2-0.4.20.crate 30516 BLAKE2B c292c4a88dd1c8d998cd683ed6e341fb98e334e481ab91dcb5ef69fd1b83e0d5cd294a3b1221787b641a8f1bb5f51090f87cbc20944af1c41c8ab902840dd5db SHA512 40c3bc5c147325523f02832db015925b7fdbbc7c430be39c8829bf8f7e9bae33fbb3313328daa1dc7d791545df5af76d27f1ec9f44943db91bee8c729a02df79
+DIST quote-0.6.8.crate 15530 BLAKE2B c33d890eb5b1fb530d261d49956ddae082129a76d8b3fdadf96df68aa57b05b0e1867b371968def9ea7ae8cbe205c4f696e2b3d5f73bd50c4949c19fc98a8816 SHA512 d436fd7b1a4a16362b5d4a67e051b87ca91012522b0ec2835654dbb15db46953a944521c1c7b7c411b7964ab1ecdab178bf003ef5569c6ab0592d753ab81d6d3
+DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
+DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
+DIST rand_core-0.2.1.crate 19262 BLAKE2B 6ab239b11f08b79f5319e0d278ec56985f4c91406f938c206f017f706508d73aa78ed3ef799ca7f20a9bf3ab860f76c5527bf14fb2464db914af3dac55ac0b64 SHA512 5e919f4229ee2e7d00f47f8bbbb7fd27e11f34aa5bd85a9d9e34d45af1601bdbe2507d9b0182b5af7a6eb4d93da3004d2708729f7e864b6c66ce9b3274fe1c64
+DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
+DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST redox_users-0.2.0.crate 11104 BLAKE2B 6768f135c7af11233adbdfc142c4d30aa3f802b3078a60d930bcd68385b6cea376ccb87652226d5b21c0d0bd61eed5e5a6fd377dbdfe6f75cc134b171ee0cf11 SHA512 00b15de3db031d94b68f39f60c56aed7f687da6c91a1b39463bfd838f6d39816b84bc2e071ad59e4ef7c142283fc4e6cf69613ce49462debd2cc52e96383aac1
+DIST regex-1.0.2.crate 245163 BLAKE2B 11db7370515901dd40aab09cf37af555b2a48474b4afbe2bf9bc299b0cc0366c42af4a948cd8fed26d4462c090570edd0c1b0e2e942e148330494d8188c55e82 SHA512 546d38e992c4474d6cec812c1b6f57c7a1991f27cc0d5772d814a21f670128ce11f1ea1750a6ade402fba8b31a8485a61891a9ccbccdc8483054316eca84a047
+DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
+DIST relative-path-0.4.0.crate 18095 BLAKE2B e56e5cee41f3aabb63e4fc18e5b5f29ca5c3d49ff64b868f9b5e4d97f3d52d21b5bb9eaf8b3f13f993df45b77ce54592d962942546093fbd1674178216782405 SHA512 88cbc9bb2394e89a2ed3be8432504dd9d070536933968c2064e4a54f70c5e346ec3024b8d46d3871f73b71d761bbb45ad27f33963aa0f611c2f3ef1f4648efe2
+DIST rusqlite-0.15.0.crate 82548 BLAKE2B 0ab242b15554dedae3970873aae8e20463f62d60872c9e86325e2ab8b91d5b23a9824bfa8f03f99d916ca1ee68525424d01c3e66526bc9da25f7e186e2b645e7 SHA512 c7a66aa3bed9c0338a4e54f00416fd2ff50b90c12ebe4895237ec2db8c537bf500d64f65ae5219f870ff25c3a13ffe269d6b6653f28a9081ee52c3b9d0d1c972
+DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
+DIST scoped_threadpool-0.1.9.crate 7800 BLAKE2B b6f887c1af054666ab7f717dfdafe5701bbc0a778169d885a1837202d4d215970af567ea620c6ef47db69fa664c6be65c782aa87d9efc1d9c8c280b6210e38f1 SHA512 df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33
+DIST serde-1.0.75.crate 72560 BLAKE2B af0b3730e56b70498491d5052cd487f47c7974b66c6656055706d9fec81c84ce4652f21193ad730ec742b2d89d311aabe741d70c8a09956c296fb6363aa25729 SHA512 a861d939a0123fafc48c3d9c84800637d3b6ae01f41935ba7d2147eeeb72ef7cdd5ce276f9612be5af0222de2d5ef93a4a8537c68dd33a5cb137059983ea354f
+DIST shellexpand-1.0.0.crate 13055 BLAKE2B d008c06c63d5c994f639334532700166819332a6513e538b09109912e7dd7b45fa6b4e72ece0590f531c0bbd4e5831f95e00171df4df92afe5fa4e7c49034f1a SHA512 a43004664346e6f7e6f56d04156bb47129e01254d28cccef24a37387e0b237eaf953ebabfefd345518b7679769d60018138d94bc406043a5f2c13944091276e6
+DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST syn-0.14.9.crate 135921 BLAKE2B dcd62de853764e3b481a8613efa6cce15de43575e19119d9b0d504c1294f6937ba776a69f84ea7548793c5a8472ebdfaa8e1f76fa3c40e7b9f558c93d5c05cb4 SHA512 909f2f77e8d90519b005909d5e198c5ba4279a3d430c58cb57b7408a21dbe60fcfce3207e8814149a6fb9482e10e9901706be4b8a617daa0360bcf476800fe2e
+DIST synstructure-0.9.0.crate 17651 BLAKE2B 8401b93fcf2db68f69fb1b61a246bc989029aa960dc7ce5d41a22467d275233c26fa75da669a25c0bce65c77df2f53bac87bf114df1bae55415b42742ff0998d SHA512 ad688b367317230b876d0a3fff6539a04d976d3d7025fb6161a0070acd38cc4ac1507a85313c4e1e804c778b3f9973957bb8a80ad2828096a31b5b53a899c605
+DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
+DIST thread_local-0.3.5.crate 11794 BLAKE2B 775c55a2165b942eec4cfaa78653e3ff06a6b951635e95dd176f8bde9c58f789a4e3698cc7fa5eb7a9d173fb6c1eb8da682c65a36aa29beded1facae01817336 SHA512 c17bb6bb58e8ef5f27cd6b0a4290752ec00c9856753c9800664e1debc347a26930970b073ba87d6f95936b1be540f87559a8410151b18d01ecc3fe77c45d6cb6
+DIST time-0.1.40.crate 29518 BLAKE2B 9102a29eeeda597100e8e9f1e6a021df99678383d02264c8b94b07f5bef73aac5f0cc77345aa5d7d5db3f33d67581b4970e5a80597773afc726bcf73d1415b5b SHA512 a14753e598ae9def3f479741968bfba028e55debdfb1243cd1becfbf468d2c5fd8457aca720197e16a6a2c63e58e07c51cab5712327ad8ae37605a2825a29bc9
+DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738
+DIST unicode-segmentation-1.2.1.crate 68223 BLAKE2B 935c15d99571fc7fd597c2af9cee9333ccb1f19153fe7c8a835dce4f8cf13bd69e424d9e42b0a056b7035a9122bb5169cfbb96239aa2b3839e317aa495559e70 SHA512 431da71eb9056902c51a5ab53d239c8cf6448dc2f87be727628cb40a4808f5700f427936a9da4ef41935156896d9e0234b9de80aaae342b839e95c9a80d053b3
+DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
+DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
+DIST vcpkg-0.2.4.crate 9571 BLAKE2B 1ebd2029c481961f45ea7cc9c62e83eb43b1f8b1c2a1b01019d54773a1143c1f87915f222c515e973ef39cb4c9e82009e2ef6d88ff1acf69faf76ea98bf4d925 SHA512 cf5ecb0fb60f655d36de3e9363f8b7be4b98cf1a99264977364a03bcdb488e2c1fee8d7c9ecbf4b32d3d1acc0952b68578cb1749bc5eeefadf8623c854dacad7
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST version_check-0.1.4.crate 7946 BLAKE2B 1122354fd571c8879aa29d80aa2011ccbb0fc64545af4eb15a62c84ac81a4aeffe223bf776f48824a52c159f31acaf3501ffc2613a1041a1a1179446d830af0e SHA512 766fd53ddcdb7c60f7a62959c767cc10e498f92ad0eaed7a0ade90e13ee4293121153d5310fb987b9dd9ad32c3f6889339be29444a2bfaa73bb3b6a719f77e46
+DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb6d380baacf3455fa43ec2d18061fad25b83c2022ffa36e30132358f3abf3bfdc74dd3fba6a5b54cf2eb5d10 SHA512 6d79a5cce1a234b5645fd1798d580602f89a202adb0672a213bd2fe54aec94c75b489d3c47320c6d5f53d415766a7cf628874f0713a347d9e3017e904449bf2f
+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
+MISC metadata.xml 754 BLAKE2B 9ffcd71049bc11d8ad580f9721158f931918b2d0cd4fc9e465fda580bad0a853a47c58b4b258d98a654102d195015b32f9d8cbe62343b2c14222a0ea229ea3a3 SHA512 8159ff903511596ba5c7779f89a827101a6c22b8b36bde69cabf89470dcc970fc1755f921bb26952778f9b8e9e518ac7b45edb92c08471b9ec89f01074e8ee9b
diff --git a/app-shells/mcfly/mcfly-0.2.5.ebuild b/app-shells/mcfly/mcfly-0.2.5.ebuild
new file mode 100644
index 000000000000..1141f801da05
--- /dev/null
+++ b/app-shells/mcfly/mcfly-0.2.5.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2017-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.6.6
+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
+lazy_static-1.1.0
+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
+regex-1.0.2
+regex-syntax-0.6.2
+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
+thread_local-0.3.5
+time-0.1.40
+ucd-util-0.1.1
+unicode-segmentation-1.2.1
+unicode-width-0.1.5
+unicode-xid-0.1.0
+unreachable-1.0.0
+utf8-ranges-1.0.0
+vcpkg-0.2.4
+vec_map-0.8.1
+version_check-0.1.4
+void-1.0.2
+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=""
+
+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/mcfly/metadata.xml b/app-shells/mcfly/metadata.xml
new file mode 100644
index 000000000000..1e6f47eb167a
--- /dev/null
+++ b/app-shells/mcfly/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		McFly replaces your default ctrl-r Bash history search with an intelligent search engine
+		that takes into account your working directory and the context of recently executed commands.
+		McFly's suggestions are prioritized in real time with a small neural network.
+
+		TL;DR: an upgraded ctrl-r for Bash whose history results make sense for what you're working on right now.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">cantino/mcfly</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 8810a5b53593..2c38723f5a1a 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,16 +1,8 @@
 DIST mksh-R52.tgz 383814 BLAKE2B f0563f19a3ba3b32e075bfb2d3db3a03ae9ada129d4b514573aad65f84ffa0d92a81a09baae0744e75a3d82d774a640dbd3a04856ccbdc7781ea3a1cec32efa8 SHA512 83b478baa401dc6116c363043d9d6629028bbcdf19448db939738c5b98f8e4f7da92932296c2ee813b317151d31a1b6cd55d27f062f79e587e22991b018a0285
-DIST mksh-R52b.tgz 385085 BLAKE2B b480501b6b9f92fcc46ea91a204b86f717b9a20a182d93975a6d76db113f801154a61042e4842cd9fa126f220f2a4256eb3ad606953c2d94b1f456299dc77f0b SHA512 d204f0d0e221a8592dc0efdb31b909ce522792708937ab1f3ec0a4b1098f2d5171c06cda029a9f7e63eb087a1acf53210f4701cee5564868c15c6294e6fe322f
 DIST mksh-R52c.tgz 386254 BLAKE2B 027cf8e2bff4b8cc00ccd574a8a11b0e5d0164d9e59a9ae18c1684a2b0f7c45ccb342d1cc0f8812b42c656a6e253cc24d14e25f55c1bf12d6f521b3f72bb4cba SHA512 f2434f2e165da290cc3f5d78846fb4774115a6e35ef3299d0343b1797b3773921d614396b0da78f8e9a451d6029df9abff503575c5cdcb232e18df7731d18da0
-DIST mksh-R53a.tgz 393344 BLAKE2B 4dd331eea194ffa354359134677272aeca07cbbec45a07198d75bee623285f368f2887042faa5f7f5a58a935f53dd2e1b4cd930bed6b48c13cda0a82305ae58e SHA512 634e1cbdba7eaa3b6a7d75d9ade23e6465c8874ef616adb708867f6c46e5722bd2e4818f92350aeb7908872678fb446635224fff990d4dcdd4cf4f666cf2e91c
-DIST mksh-R56.tgz 414865 BLAKE2B b50ff737efd899ff3a8d588717492c37b06f8f8dca147f34a974ccd15563259457472188886f0b1a73b78cf11531585c0bad40b86eec7841c4058a0572fb3355 SHA512 33839ed112b1b80eb6090f7fd3027d136e5b7c57ff5b3bd16f76f76fe1f39c8c0d49a0b43381ecfd3b20366c5edec515e554535151fe17021ab3dfaa70e84d82
-DIST mksh-R56b.tgz 415088 BLAKE2B fef8baf664cb61ddfb312e2ec1c81f192478bfdc889ad82e7dc51f50517ec54c13fb32586c70f3d3a276ac739a93ac64ee1a511492e1e592d015b4882f4107f3 SHA512 a6f9061b2bfd19e9f4fdf3212a1c5a53a53cdb52650c95287cd380530c08f4a65a1ccec4bdcbba5e7c34e4764bf04eb43abb01742bcbf83107847a6996cc77a8
 DIST mksh-R56c.tgz 417218 BLAKE2B 3512855dd177be8432fe503716ca571a3c06ab3eeb6b44de923ab7d9eb9246087f627b7d7a3e9bb29a849da126b88c223864f140b136e922776ec7bd4a04e96d SHA512 7e4cd2d24c6bca2ebad7c6b02d158188e766bd4693d93f5bed198d69238aef078d42ce911431ad4e419e4af55083047d823bfad53973db5c6d8a685482770135
 EBUILD mksh-52.ebuild 1082 BLAKE2B 5d2c18022c68e39de07d10458d85ad6e726fe1b45944b51d44570bbce8b88284f86259b6254ceda26d0c6adc6d2cdf251345b8bbdf0b5abbe202948920711b31 SHA512 90f87cb081ada2babc72b0048b6703beb1c35a3206aa174922b0a4b3b81466d4bbaf96898cd43c778fba62c4e78bde4517317cfe215faa42c77c579b395dcb27
-EBUILD mksh-52b.ebuild 1085 BLAKE2B c400c971f383fa4dddfb1ab063b255e5f0717895ca257800edfd661e7ceda26d072d4a24fbf134f9786911530a71e52e799d753b56042c903c01c270612050a3 SHA512 ca4a8a47682e493fd4c49fa9e35c91300958168136963e5945b8c6952e3d3e4679ee6992c1b7bad8397ccbca8574105906fcfe556b4efc2e50f8c36c8d381e27
 EBUILD mksh-52c.ebuild 1085 BLAKE2B cffad7a2f7e305c8e61364dc8c71ce57d255925298671bff3a4f5639ce20f53e0f30c0f632195e365bfca55f7f810e927bcfaa8c47ff5a3724862d655bc954a7 SHA512 b24cc00634ed94becd73b64a8ed60e2c39d9fa1c6ab2227ac4c82d1acfd892d3c76bd874b53c5599b6693e55ce713b7364dc1d3e0565d69f7a89a247edc60c95
-EBUILD mksh-53a.ebuild 1090 BLAKE2B 500c5b089bcfd80ab28903e0492866ec961778fba8e9b47b2328d7968ff5e426caf8770f312be1c18522f96f575cc60cd51b01bb7b12f0efab32f02bab3ac54c SHA512 836b10ec92c4139e27ef473e768a56edd19a2b6dac0261f8d0729d9afc2253fe909f85f33fb8c43501df61c3de5348e2e1548f796a924275ca5518343320fe78
-EBUILD mksh-56.ebuild 1085 BLAKE2B 5ce8a8c02755968976048d3597326e5f5a35ac168552fdc6746363bf01b4b4ab1dae6b3b8f81b5fac23e9b0e396c792c5179bfb2e21ad798ff21d0c9a3b5bf3e SHA512 2a8b4e31a3cb2fe1701cd884b2803eade709aeeccafef03327b3f581227b4c919b945c7fe56872d737658207fae09db19498b17285feddea474548779a3b1413
-EBUILD mksh-56b.ebuild 1085 BLAKE2B 5ce8a8c02755968976048d3597326e5f5a35ac168552fdc6746363bf01b4b4ab1dae6b3b8f81b5fac23e9b0e396c792c5179bfb2e21ad798ff21d0c9a3b5bf3e SHA512 2a8b4e31a3cb2fe1701cd884b2803eade709aeeccafef03327b3f581227b4c919b945c7fe56872d737658207fae09db19498b17285feddea474548779a3b1413
-EBUILD mksh-56c.ebuild 998 BLAKE2B a884854af8f0c063da2aca2327dcc24a010bbe99529fe4ee26e503d6e6fe6b14f2ff46846d10c3afcb562a71cb35d382e9ba19acabce25151d52b2e28991bd6e SHA512 f9f26d80c7a716deb944f3689c4ebe7096523e9b51c09fab67c126cab1a745fd01a10404fbda0fea85805fdf38041fad9286d7ea337963d18a02c1378ff001c3
+EBUILD mksh-56c.ebuild 992 BLAKE2B 1ecbe94f3d96371818512d89b3f077402118058f382f1e3dfd9f57826eb783256bc193b4697272626cce52ccb8fe29a479646107750e1db94859b95b7bb7c524 SHA512 1f17fcf0f5cae5de4128feded4c1c92c9d75b3c507deb7e265058251c225bbb852c9ad305ac5bac0f4fb8739eb38c325e0f85c33dc1fa10fe6ede6e4a71a41b6
 EBUILD mksh-9999.ebuild 1244 BLAKE2B b0ea3d58199d7c3f4ee45140c166bdd1fa535d41228e6690415cde5d2675e89282bdb8ab910a8991d585d76d3f75ce44ce11d5e69a35ab05521499b28e446353 SHA512 636cf54fe70436f74837d1e41fbfcf82dfd2c199a8b6a7fb85b72bf83b32373238b711fdb21fbcf57aab227460337a71a16055f264c76c2beea86cf8587581d5
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-shells/mksh/mksh-52b.ebuild b/app-shells/mksh/mksh-52b.ebuild
deleted file mode 100644
index 5542dd336260..000000000000
--- a/app-shells/mksh/mksh-52b.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static ; then
-		unset CC
-		export CC="/usr/bin/klcc"
-		export LDSTATIC="-static"
-	fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Build.sh -r || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
-
-pkg_postinst() {
-	ebegin "Updating /etc/shells"
-	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
-	eend $?
-}
diff --git a/app-shells/mksh/mksh-53a.ebuild b/app-shells/mksh/mksh-53a.ebuild
deleted file mode 100644
index 6f40bc3ba701..000000000000
--- a/app-shells/mksh/mksh-53a.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static ; then
-		unset CC
-		export CC="/usr/bin/klcc"
-		export LDSTATIC="-static"
-	fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Build.sh -r || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
-
-pkg_postinst() {
-	ebegin "Updating /etc/shells"
-	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
-	eend $?
-}
diff --git a/app-shells/mksh/mksh-56.ebuild b/app-shells/mksh/mksh-56.ebuild
deleted file mode 100644
index a538d6b19725..000000000000
--- a/app-shells/mksh/mksh-56.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static ; then
-		unset CC
-		export CC="/usr/bin/klcc"
-		export LDSTATIC="-static"
-	fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Build.sh -r || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
-
-pkg_postinst() {
-	ebegin "Updating /etc/shells"
-	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
-	eend $?
-}
diff --git a/app-shells/mksh/mksh-56b.ebuild b/app-shells/mksh/mksh-56b.ebuild
deleted file mode 100644
index a538d6b19725..000000000000
--- a/app-shells/mksh/mksh-56b.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static ; then
-		unset CC
-		export CC="/usr/bin/klcc"
-		export LDSTATIC="-static"
-	fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Build.sh -r || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
-
-pkg_postinst() {
-	ebegin "Updating /etc/shells"
-	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
-	eend $?
-}
diff --git a/app-shells/mksh/mksh-56c.ebuild b/app-shells/mksh/mksh-56c.ebuild
index fe3b54c6ab82..dcdea2831de2 100644
--- a/app-shells/mksh/mksh-56c.ebuild
+++ b/app-shells/mksh/mksh-56c.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=5
@@ -10,7 +10,7 @@ HOMEPAGE="http://mirbsd.de/mksh"
 SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 DEPEND="static? ( dev-libs/klibc )"
 RDEPEND=""
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index ca9a233cc96a..ab1638a5a8fa 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
-MISC metadata.xml 694 BLAKE2B d2b14b7d662ec3a49f74130054af3b3914ad497af6a222b26a1b4aec0510fe3521b29cc00c4ff059b44f3ab325a90166f7f9b369198fbecfc54753fb2b227f22 SHA512 af064b9c47b99ebb159da58edf5b950b5bdead3cbafbef2dcd7ac622009d9164308ca18e9898d42ba51b9aa4056631edf4280eff3cfa546837c5df5dfbe93216
+MISC metadata.xml 698 BLAKE2B 69740256ef4db99512953ae2e9b896410814d64f45c8fd6f2b45628948e1c7bf3ed66e53605c0611e30bf9af75d59b554b6c8bfa942777d55a3db1fb0e4bb944 SHA512 ebd59b8ea97e30788644f33eaa98c2618fa2f90a62bc17bb5c9027253df3c04b6ab1e25671dfcbbf31101bb4cfe2aa2236c7d287a40b49a2b83c09734967fbc1
diff --git a/app-shells/push/metadata.xml b/app-shells/push/metadata.xml
index cc23092c85c2..83005082d67b 100644
--- a/app-shells/push/metadata.xml
+++ b/app-shells/push/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
   </maintainer>
   <maintainer type="person">
     <email>martin@mvath.de</email>
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index 962eec434b27..9114c15d97e8 100644
--- a/app-shells/quoter/Manifest
+++ b/app-shells/quoter/Manifest
@@ -1,3 +1,3 @@
 DIST quoter-3.0_p2.tar.gz 10691 BLAKE2B 2fb196977c5c16654813e6077c148577e4629da25fb1aaf2131c19e33fbfbc670ad4d9af87611405f0b45a1365bc7b4b3f1b8cad47573ffae4939cc0329d50a4 SHA512 23d77105fa05d79a7d0bcaa3f6aead25b7cb3b6f459d2740314616da587e03cd3e6b0b1e8af8f79904309bbe76603db848d42996ed7ae5ef779e27184a434fb5
 EBUILD quoter-3.0_p2-r1.ebuild 793 BLAKE2B 00cf5370c37448172e8c4ae0b1eb9850a906577ffffb6286b5697646648ce2d77d9b4d9688524d0b137e311858ce4df071dadae5dc5c7ba7be9023c81b62c15c SHA512 bc255d51e52f564a5d325d590da492c7f1bb3c154f99ca592386902adddb67b5cf2e5169300b3ea57e6fef52e0c5ed6bb4dcb543af2cb432b3cb53d871196f66
-MISC metadata.xml 696 BLAKE2B dd6a68084f8a93ba5cd9d358c260bbf93bc8515c6610ae8d73004b53b7173e47103d9189123515e607826f1b8226fe909a17442ae3c89832a21f2686ed13c8c0 SHA512 30cfae6f7af84bdde697740d3d03d27ddaaed81cd631a9fb8e2b12f11e8acb0de2680437b5679def2c8e3bb09bd69c26651e89d4f67e46b2e72e6e8274cee358
+MISC metadata.xml 700 BLAKE2B 6dc4829d807dbc1ed2a511689c3fbe3ceb322236525770a55c86ddb3956bf974a58dedc1c0a7ff74b936e76c8729e1e2463ee0a51ac9e51ac89472a28dcee63f SHA512 c3cda33bc2aedb177d4734ad02cb2dbe0b2d52bc73406ee5277b7db57ff73c047cc174514c516ba3486c1ad5d93d414f77d2655c9cbff9de1820effac312a284
diff --git a/app-shells/quoter/metadata.xml b/app-shells/quoter/metadata.xml
index 531820332509..3a2246e9e6b4 100644
--- a/app-shells/quoter/metadata.xml
+++ b/app-shells/quoter/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
   </maintainer>
   <maintainer type="person">
     <email>martin@mvath.de</email>
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index c2b85f1e10c8..cb15cea83385 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,8 +1,10 @@
 DIST zsh-completions-0.27.0.tar.gz 218869 BLAKE2B 7214506be2100d596842988f946b0f25f9c434f31a6b1d66c40baa1ccf259f827be96011d790f41b85abecfcb0fc1e5d56a715ca80c9926a5fd6ccc779ab98b0 SHA512 1c25fce14117d6eb652e2d3bfb49e68baa9f7c5832031582ec8c3066b91f07491067ff887647177048b51146beda1bcac7080abf140ea5ef846fcdd8ac388b8c
 DIST zsh-completions-0.28.0.tar.gz 248600 BLAKE2B 406b8a91dc7d4471519444efdf2eedf644a696eea69c2e00f33fa61e71ca8cb34935f824f62e2d4312d5fd27fc25875d51b122b4f2d7cc8a1a16d9d46ce0e336 SHA512 744b2b02de2154b31548d12c73091e5d4ee501dc39552dd7d526c67908fb7f65c06074d799da7ebed3a8f62b532a1482ba74ed26239979b050dbede4be9986d5
 DIST zsh-completions-0.29.0.tar.gz 251934 BLAKE2B 474f15cc8d492da0bbabc2a93edf316b9bb44bfb64ef8b8feae67fc381393b76701d9aca6eb64f6430f881b73a136985c8b17b392da139bd64afabe71e8183ba SHA512 4b2d79dd69576ce688fe24fe8c6e337319f2b96f5e668b9d58c8eb04f68198695a2652e8ad1e93a7ef9cf04cc53265c8db62f420b9ab6e1a2aff97ae24414945
+DIST zsh-completions-0.30.0.tar.gz 227966 BLAKE2B 8f80be627f1fdb78f901c12fca5f3281562a161f295198344607ecc2187077576c3b37a7d8d764b8cef3607bf02226297ba58e27da0348ce6fa4c923d7072054 SHA512 a4469d13208aa93bff481a8754882ed272143c9ac38949eec38dd61d461b65faae8e51dcb73c6c3eb7216098322f5cf407a67f0ddab4c9e88a467e16ab249609
 EBUILD zsh-completions-0.27.0.ebuild 796 BLAKE2B 5fb690109c0d4817be942e3484280d3a8ca9b90b6b643d1a80e4ac545ab4ada26decacc8beea9613641fce830f801909a5e23db904c45bedff2a084a27c3379a SHA512 8139a065b8eb26dccd1a07a72f5300f33a02355e5fea596fc5f2d1a7dd6301c82be6b9e99f9ee6bca9b3ec6094fbdb0904932d7793d34e40aa7461ea46326dde
 EBUILD zsh-completions-0.28.0.ebuild 793 BLAKE2B f699b7b91fca760ecbd3cd58ee524481e0220d4f93452e6c53c0843b0832abddd9b68f1927a4a2180f927e4d88130a1a59815b2b9b5e0c869d1d6e16debc6e0b SHA512 2a6b46272a8ea217d9c059557a085900987e8562fbafc12e763f14792db6dd7aa25fc376a9fb736731332664205ed495a8d5dd47e23c1e675b60adb1a3b20ccb
-EBUILD zsh-completions-0.29.0.ebuild 794 BLAKE2B 68961192b3642b99adb7f511f6fdbfac4b3db256794392a79f90c5537f23368f7e11915a3a72c9a1832acb6e673219adf52bfe44d251b1351ba47872abb1acac SHA512 3af06d5cc2221e23cc4377bccd1e7d982e80f68bd50d15fbd0879ea9e376eaeef2bf35296f736e47a09cbcd8a09a8c3e4b80154df384bcd06e6b7a69e462bdd3
+EBUILD zsh-completions-0.29.0.ebuild 793 BLAKE2B f699b7b91fca760ecbd3cd58ee524481e0220d4f93452e6c53c0843b0832abddd9b68f1927a4a2180f927e4d88130a1a59815b2b9b5e0c869d1d6e16debc6e0b SHA512 2a6b46272a8ea217d9c059557a085900987e8562fbafc12e763f14792db6dd7aa25fc376a9fb736731332664205ed495a8d5dd47e23c1e675b60adb1a3b20ccb
+EBUILD zsh-completions-0.30.0.ebuild 794 BLAKE2B 68961192b3642b99adb7f511f6fdbfac4b3db256794392a79f90c5537f23368f7e11915a3a72c9a1832acb6e673219adf52bfe44d251b1351ba47872abb1acac SHA512 3af06d5cc2221e23cc4377bccd1e7d982e80f68bd50d15fbd0879ea9e376eaeef2bf35296f736e47a09cbcd8a09a8c3e4b80154df384bcd06e6b7a69e462bdd3
 EBUILD zsh-completions-9999.ebuild 785 BLAKE2B 41e5cb4e18fc3947a5478e4927c1552ff20441d8e249f2589efbe2b1796d625381bb02d6180d8eae4c7e415b66aacdf386993089ba360ac4b039df8fee89f700 SHA512 6801846ac6ca49cded07839324e97ac8d32fbb46454b60e56dd0a5644d918bff08b316ebfd9e5cb4c5d96cd4d12d3f1644abfc3893062e9267964386b4f5a8e7
 MISC metadata.xml 345 BLAKE2B 6d43d457793d6548b98d393ec863c59a4f1fadf22cdc64b8366cc2f96f7b1899bb1924006e95d42db0609d72dd7664e743468c99eb2cecc9033a5a29867ac191 SHA512 e09a3412d8ea166270e3d6ce1d708cb989efa6889116d219ff76d96d0d92d533d7988504208ebc5e6a186327b6acc4e8b2c719c21c86bd84154292f6eac4a430
diff --git a/app-shells/zsh-completions/zsh-completions-0.29.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.29.0.ebuild
index 926c471ffa08..0f1e354b7908 100644
--- a/app-shells/zsh-completions/zsh-completions-0.29.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.29.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
 else
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~sparc ~x86"
 fi
 
 DESCRIPTION="Additional completion definitions for Zsh"
diff --git a/app-shells/zsh-completions/zsh-completions-0.30.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.30.0.ebuild
new file mode 100644
index 000000000000..926c471ffa08
--- /dev/null
+++ b/app-shells/zsh-completions/zsh-completions-0.30.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
+else
+	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~sparc ~x86"
+fi
+
+DESCRIPTION="Additional completion definitions for Zsh"
+HOMEPAGE="https://github.com/zsh-users/zsh-completions"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="app-shells/zsh"
+
+src_install() {
+	insinto /usr/share/zsh/site-functions
+	doins src/_*
+}
+
+pkg_postinst() {
+	elog
+	elog "If you happen to compile your functions, you may need to delete"
+	elog "~/.zcompdump{,.zwc} and recompile to make the new completions available"
+	elog "to your shell."
+	elog
+}
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index db7ef8e75ea1..69cdc2ed14e0 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,18 +1,11 @@
 AUX prompt_gentoo_setup-1 820 BLAKE2B 26fc3348f16459462dddfd3f6864a3ae58bbcbbce0e85c04d653bed9c1f1c28a07621fffd22819d62050cf019f3d6d4c127088055bc69a0cc0cb990e8435f2be SHA512 262ad91d7536c11c3b1db176217e9a9bf21df5d25d72ddfc7dece6eafceb74a252212939c8cbe5bee1ccc0e25fc4e6e906660877747f5224e862d4d22d1200a0
-AUX zprofile-3 1130 BLAKE2B cfd0f5bcc9409cb2bd133ad1511356602c110b8f1d106ac16cf3812ea57c818902a7eacb061dabd08fdc8040d6deed088c13304b2176c2488fb886c8d2a2c8bf SHA512 d1059e427450e03d3e638e96ff4f43548cee5a385c4d4f00701023570ef6490b15cd01d738bd97e0e8d003aa7e375c51a80a2b841066c22d0910966a54c2cc2f
 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-doc.tar.xz 3216400 BLAKE2B 3d07b336222b08d7deff0ded6f603a47bcdcec978e6ad9c244b25f5249e07c22768ba30e67f02c8ebf4a0a8104997d0aa8959de7e3c39a428dca0b013c56e9b1 SHA512 0bde166bc4a4b8ea7512bd9d3ede53478959cb76ded65488b9a8993734cf2a8ffedcd38254fbf6ff73a5841289cb65715579744b10748afb038c9d93a01f987b
 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.5.tar.gz 4576506 BLAKE2B 4f5923d519b0c96475f4832cf0e5cabc1432e765d201c992903ead45b175d5bc76410ebe248c2bd01ad75a5b5939bc5bc58e9263bb4501f9b2c1f5b4d7755896 SHA512 aafa29e1bc29d35fb5822ad4ca5f4c64b1e4a4e3f9bff70e9e5976918fa9e7906467bd11f69291e694dfa77efa1e5433d7839fc668aa572228623f1c131c381f
-DIST zsh-5.6.1-doc.tar.xz 3199032 BLAKE2B 02b1eff0c1c0c49108f044f45f3d10f5d3c09bb1f52631e0090a06e1e87ae29e5b85e51f78f8aec918bcdb5122b0ac6dfcfda591f9f80de3ee54280917999356 SHA512 a3b64c01ce817d31c48bd8da7342af2a2adb116e6f58dab84f9c79fc9e687c4d83b2e5a2375ffe070376adc609b3f4f4f4114e5fd77f6f0b75859c5c30f7c752
-DIST zsh-5.6.1.tar.xz 3076732 BLAKE2B aaddea57cb3b926277fd90dd38a2a313ffb4e5222b24efe50b2baccb3b09af096a0107eed86746a5160f4112f8c91c3fa04f9bf86470607244d44f272379ec09 SHA512 45a60b864482a276277d8443f6faf41a2f63e11ab89a4ec0276c897971f34a874393f79c118af915b8f325a1b0265a457a1a82e8d33530f7fb797ece9c2adb7b
 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 5852 BLAKE2B 9e84514b923122ed5bc435fe0fd856adae7b71969c6353c845c66722729df15a81c14c1b1c6ee773435c3ffda1dbf59d083ad12f36784b98cc75b893f488055e SHA512 1ca86fb8fb5f67f12974bd1e5304f89471d3a641e60371522938d3db56001c43edd6ceb60adc24a632e5280ad8a9daf1c7c3674ddecab9435595d9ab40a9e199
-EBUILD zsh-5.5.ebuild 5851 BLAKE2B c048aafaa230a85b3623e18080a7b217930802aa5442f318cca5d26059711ae026e7b88b14d1414531e5ae8d7e67d3c15ee3081eaad59e3b8e181a4667a2b847 SHA512 a79ae0c2e4aa31f1dc169b6d25af1a60b1973019cf9706901db4e2e0a417eebe00ea5946a410e8898b3d96c9609c24e75935cd8f0163f07b2b434509d29f38d7
-EBUILD zsh-5.6.1.ebuild 5862 BLAKE2B 8a4e5cb785e200bd3f60aba78cc74a69e05345e26a82c88e36a734542ebeb81b425af6d98da77514cac667e93acc2e00c5beeac208777890371c108a311dd229 SHA512 2d55595c2a9184ee6fe478e21f2e999fbe286bc9c208830de718cb41757e024f759a7697301e78a2d42784ee917c9944c6aac0c5aa82f82e22ca01a395f86739
-EBUILD zsh-5.6.2.ebuild 5862 BLAKE2B 8a4e5cb785e200bd3f60aba78cc74a69e05345e26a82c88e36a734542ebeb81b425af6d98da77514cac667e93acc2e00c5beeac208777890371c108a311dd229 SHA512 2d55595c2a9184ee6fe478e21f2e999fbe286bc9c208830de718cb41757e024f759a7697301e78a2d42784ee917c9944c6aac0c5aa82f82e22ca01a395f86739
+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-9999.ebuild 5862 BLAKE2B 8a4e5cb785e200bd3f60aba78cc74a69e05345e26a82c88e36a734542ebeb81b425af6d98da77514cac667e93acc2e00c5beeac208777890371c108a311dd229 SHA512 2d55595c2a9184ee6fe478e21f2e999fbe286bc9c208830de718cb41757e024f759a7697301e78a2d42784ee917c9944c6aac0c5aa82f82e22ca01a395f86739
 MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/files/zprofile-3 b/app-shells/zsh/files/zprofile-3
deleted file mode 100644
index 6c223a5ef158..000000000000
--- a/app-shells/zsh/files/zprofile-3
+++ /dev/null
@@ -1,38 +0,0 @@
-# /etc/zsh/zprofile
-
-# Load environment settings from profile.env, which is created by
-# env-update from the files in /etc/env.d
-if [ -e /etc/profile.env ] ; then
-	. /etc/profile.env
-fi
-
-# You should override these in your ~/.zprofile (or equivalent) for per-user
-# settings.  For system defaults, you can add a new file in /etc/profile.d/.
-export EDITOR=${EDITOR:-/bin/nano}
-export PAGER=${PAGER:-/usr/bin/less}
-
-# 077 would be more secure, but 022 is generally quite realistic
-umask 022
-
-# Set up PATH depending on whether we're root or a normal user.
-# There's no real reason to exclude sbin paths from the normal user,
-# but it can make tab-completion easier when they aren't in the
-# user's PATH to pollute the executable namespace.
-#
-# It is intentional in the following line to use || instead of -o.
-# This way the evaluation can be short-circuited and calling whoami is
-# avoided.
-if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
-	PATH="${ROOTPATH}"
-fi
-export PATH
-unset ROOTPATH
-
-shopts=$-
-setopt nullglob
-for sh in /etc/profile.d/*.sh ; do
-	[ -r "$sh" ] && . "$sh"
-done
-unsetopt nullglob
-set -$shopts
-unset sh shopts
diff --git a/app-shells/zsh/zsh-5.5.1-r1.ebuild b/app-shells/zsh/zsh-5.5.1-r1.ebuild
index d36a0f2712da..501591706280 100644
--- a/app-shells/zsh/zsh-5.5.1-r1.ebuild
+++ b/app-shells/zsh/zsh-5.5.1-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
@@ -9,7 +9,7 @@ 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"
+	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 )"
diff --git a/app-shells/zsh/zsh-5.5.ebuild b/app-shells/zsh/zsh-5.5.ebuild
deleted file mode 100644
index 0d1b94fa1cee..000000000000
--- a/app-shells/zsh/zsh-5.5.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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-3)" 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.1.ebuild b/app-shells/zsh/zsh-5.6.1.ebuild
deleted file mode 100644
index 6b7bbf5c1e4a..000000000000
--- a/app-shells/zsh/zsh-5.6.1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic prefix
-
-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"
-	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 )"
-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 6b7bbf5c1e4a..be5c8a20dd48 100644
--- a/app-shells/zsh/zsh-5.6.2.ebuild
+++ b/app-shells/zsh/zsh-5.6.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=7
@@ -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 )"
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /app-shells
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)