gentoo resync : 16.02.1018

12 files changed, 180 insertions, 126 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index dd83d74fe0b5..679ffc210e72 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 8072ee09883a..24ca3df369cd 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -3,7 +3,9 @@ AUX fish-2.7.1-fix-printf-o-handling-on-ppc.patch 408 BLAKE2B 61ca4723e06eb2c969
 AUX fix-histfile-test-on-ppc.patch 1068 BLAKE2B fa407d7f5d02f061a3ca9d79bdf09ae6b6f53e28be5832285e91092f4fbb7e5efc31bb1ab7ca2fbf9bec1b91e2f7d57817f5ddee38f2b3f120589fcbea1668f5 SHA512 07fb970b7eec223c3427b6058134101a5c032006d8ec16f2873352e9c701c38fe254506e9ff4e05f2ad684bd192c764452ec957af44a04f1beccf7f47bf58bb0
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
 DIST fish-3.0.0.tar.gz 6472393 BLAKE2B 9a8226ca4dce40a7bbc62ad5791c5238d1257cebea296cd97a195438d771d7394acb012be6af118bf355a9b6e391ddee1061d83298356f664e0d5dbe3d859012 SHA512 e4159821d4263e5afb67adee82e30cfed0ad30f3772dd95beb0df71423ff52c21354970f64967f2de9fd1d31caa702208cfd9f2ce281bbf33114f3aa7cd539a2
+DIST fish-3.0.1.tar.gz 6477550 BLAKE2B 31862bee18cc6db9b624850c87816ecc7d2a50671522ecafa887973ff2b9cb890d4880a567570025957064f0c68c4846810373efc03a4c6d616840b553ece625 SHA512 0bbf02d6be658f81e8dbb3a23066878087e1dc9f3abae43ff1c493e1b9d4394944e8fe7d176a3384f290ebd1e0c5325fd78eb7a654bab6b4f21687b24df40ca7
 EBUILD fish-2.7.1.ebuild 2420 BLAKE2B 79966656a80d6cc9a62595a9f25cfcb94f9d8e0533858406cd30176a7a2f361fca57d3ca6c5db1af9c26d2336a059564e5746bd4e60dd7e85faf60713b72a44a SHA512 5f16328f26090b2621c12fa2287548b575e634dddb8eece585064d64bb344e2e31065746e8f7060da71172a8f406e73c18cf167cf6c8a18bc527026f0781752a
 EBUILD fish-3.0.0-r1.ebuild 1691 BLAKE2B 16609403cc4902946841384b4c94fc54aaffbd5c30020aa6b9d16d141b4884c41a0e8fe743e7616031fd09db1096bc08a1458ce8ac6bfdf823a9b2fe7bd4ba8c SHA512 7d5b14ff707b72a5e5eb287b3a867e78cde669711a63b7f60f19a9e18f29983ad4da5eac621ef8f3192f47c8cce88974b5d4f84a95dd23e6d3073bfb7846b697
+EBUILD fish-3.0.1.ebuild 1691 BLAKE2B 16609403cc4902946841384b4c94fc54aaffbd5c30020aa6b9d16d141b4884c41a0e8fe743e7616031fd09db1096bc08a1458ce8ac6bfdf823a9b2fe7bd4ba8c SHA512 7d5b14ff707b72a5e5eb287b3a867e78cde669711a63b7f60f19a9e18f29983ad4da5eac621ef8f3192f47c8cce88974b5d4f84a95dd23e6d3073bfb7846b697
 EBUILD fish-9999.ebuild 1619 BLAKE2B 0153dd8b58b2215d878421411226a7b32d7bca3ba69622456506b0c75bfde528a0ba2ad10000c046f87f4b4d77d828a1fa102c56be0f9972707d7017f7ce4e57 SHA512 f695e364fd3cd033775787fab19135bb8c10bdcb9f90d2943d7c62fe12dd8c0f8e4c58ad78577239a7019828b461da3fd820300cc5f0e314b215f72a7a3c9400
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.0.1.ebuild b/app-shells/fish/fish-3.0.1.ebuild
new file mode 100644
index 000000000000..8cc9571025c2
--- /dev/null
+++ b/app-shells/fish/fish-3.0.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 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=[unicode]
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+	test? ( dev-tcltk/expect )
+"
+
+PATCHES=( "${FILESDIR}/fix-histfile-test-on-ppc.patch" )
+
+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"
+		-DCURSES_NEED_NCURSES=ON
+		-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 c77861d3a6ef..4f32e67062ab 100644
--- a/app-shells/fzy/Manifest
+++ b/app-shells/fzy/Manifest
@@ -1,5 +1,4 @@
 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 1108 BLAKE2B 74ad203c978e5057efcd8b4a0dc69c08893e4e79074e4cdc3791d721a645b79437dae4aea10871280e457a2625d936b183dbd4b7c9bb11f518df0d92b37211a8 SHA512 905ae14042d9cbfa2c17ba61cbf2f9eca83c1f10bfa8097070379f111de62d9c12759a3c96c6b191c43dfe1db0f04f0314a6a238ad376de39c9a496644f753a9
 EBUILD fzy-9999.ebuild 1108 BLAKE2B 74ad203c978e5057efcd8b4a0dc69c08893e4e79074e4cdc3791d721a645b79437dae4aea10871280e457a2625d936b183dbd4b7c9bb11f518df0d92b37211a8 SHA512 905ae14042d9cbfa2c17ba61cbf2f9eca83c1f10bfa8097070379f111de62d9c12759a3c96c6b191c43dfe1db0f04f0314a6a238ad376de39c9a496644f753a9
diff --git a/app-shells/fzy/files/fzy-add-utf-8-support.patch b/app-shells/fzy/files/fzy-add-utf-8-support.patch
deleted file mode 100644
index 886957379a83..000000000000
--- a/app-shells/fzy/files/fzy-add-utf-8-support.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 8dd7a9f49c2b65f28025902106f364ff11d4170d Mon Sep 17 00:00:00 2001
-From: syrrim <syrrim0@gmail.com>
-Date: Mon, 23 Apr 2018 01:25:48 -0400
-Subject: [PATCH] add utf-8 support to input, fixes #21
-
-- non ascii bytes won't be ignored
-- one can seek over and delete whole utf-8 codepoints at a time
-- the cursor will be positioned properly around double width chars
----
- src/tty_interface.c | 31 ++++++++++++++++++++++++++-----
- 1 file changed, 26 insertions(+), 5 deletions(-)
-
-diff --git a/src/tty_interface.c b/src/tty_interface.c
-index a7d506e..35f2919 100644
---- a/src/tty_interface.c
-+++ b/src/tty_interface.c
-@@ -7,6 +7,14 @@
- #include "tty_interface.h"
- #include "../config.h"
- 
-+static int isprint_unicode(char c){
-+	return isprint(c) || c & (1<<7);
-+}
-+
-+static int is_boundary(char c) {
-+	return ~c & (1<<7) || c & (1<<6);
-+}
-+
- static void clear(tty_interface_t *state) {
- 	tty_t *tty = state->tty;
- 
-@@ -95,7 +103,10 @@ static void draw(tty_interface_t *state) {
- 		tty_moveup(tty, num_lines);
- 	}
- 
--	tty_setcol(tty, strlen(options->prompt) + state->cursor);
-+	tty_setcol(tty, 0);
-+	fputs(options->prompt, tty->fout);
-+	for(size_t i=0; i<state->cursor; i++)
-+		fputc(state->search[i], tty->fout);
- 	tty_flush(tty);
- }
- 
-@@ -138,9 +149,13 @@ static void action_del_char(tty_interface_t *state) {
- 		if(state->cursor == 0) {
- 			return;
- 		}
-+		size_t original_cursor = state->cursor;
- 
- 		state->cursor--;
--		memmove(&state->search[state->cursor], &state->search[state->cursor + 1], length - state->cursor);
-+		while(!is_boundary(state->search[state->cursor]) && state->cursor)
-+			state->cursor--;
-+
-+		memmove(&state->search[state->cursor], &state->search[original_cursor], length - original_cursor + 1);
- 	}
- }
- 
-@@ -178,13 +193,19 @@ static void action_next(tty_interface_t *state) {
- }
- 
- static void action_left(tty_interface_t *state) {
--	if (state->cursor > 0)
-+	if (state->cursor > 0){
- 		state->cursor--;
-+		while(!is_boundary(state->search[state->cursor]) && state->cursor)
-+			state->cursor--;
-+	}
- }
- 
- static void action_right(tty_interface_t *state) {
--	if (state->cursor < strlen(state->search))
-+	if (state->cursor < strlen(state->search)){
- 		state->cursor++;
-+		while(!is_boundary(state->search[state->cursor]))
-+			state->cursor++;
-+	}
- }
- 
- static void action_beginning(tty_interface_t *state) {
-@@ -315,7 +336,7 @@ static void handle_input(tty_interface_t *state, const char *s) {
- 
- 	/* No matching keybinding, add to search */
- 	for (int i = 0; input[i]; i++)
--		if (isprint(input[i]))
-+		if (isprint_unicode(input[i]))
- 			append_search(state, input[i]);
- 
- 	/* We have processed the input, so clear it */
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 9e743044cf66..64b102a2f82a 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -1,6 +1,5 @@
-DIST gentoo-bashcomp-20140911.tar.bz2 30258 BLAKE2B c41814a51b74b169dc0e92e4af0630a152145f9d8fd81afb29c5c6e28d9c80caf3a57450a02a7f653762a0c91c8e1639f101e7749761b68e75482dad8e303467 SHA512 cacd1c3353bce7e67d00758a714829860111932ab7addd0a84a06cae9218ff18aff4ea562e0682ca4db859408ca15817edd81548d54144223ed5016667549f7f
 DIST gentoo-bashcomp-20180302.tar.bz2 21485 BLAKE2B 887ac5cfa8c6ba431a6aa5f5918b8bdfbe6a1ae9a2e7ac21b3c06ec2062b448d924f928b1372e81749ece6d4aa673bbbaaa364ca744124c842e3819349917169 SHA512 6b4551b078505e6348cb10ca2d67faab4d323a0f0ddefc872145314303d6f95fe31f9706d43d9f20c0139610ce47e4cf70ba7516d911dc4927cfbf5d863bc063
-EBUILD gentoo-bashcomp-20140911-r1.ebuild 867 BLAKE2B 2aad70a398381b631162623f63b178ab0a73b07d9aa2689e45acdf3ed3fab6e06b974e20f76c9ee20a5ee3247b6adaf1dd412957d6719149fbe4232ca32ac6e0 SHA512 d3ad74a641ece757a9431aff9d541a7178d53e6b30f79a6325548412eba958e42eea178c413e6eb80d6cecf04fb864dd0ed5622e91b20bb5e602e162ae52341b
-EBUILD gentoo-bashcomp-20140911.ebuild 740 BLAKE2B d08ffed7d83ccb43ff04a21b9e7c72eb04fdebd946d065c9d4b46117c2e7d7110fdc56163f1f18826ab8d35946c8fe075a1b8684b36f05d9da488967e212dded SHA512 7e48b33205887c87bccd740a8d61c03feaa7185148dd659d28bdb543e01f190a0e95c80064fef323209cd9b2f0b2b097e315a155bebac0cf09d264fd69f366eb
+DIST gentoo-bashcomp-20190211.tar.bz2 21508 BLAKE2B 410994819f62b0bd105ca398c335d76993fd694b8e7f56c761b94fc1e2f6e90f2010f2f2a88febd71ac0c5643fc0e923c60151fbf9411e8a553b5917d6bcd8db SHA512 4b0a5e79f90ee8122fa8d0a7224fee6472b1762a0dda680ea1c0e8d4069760be9b6472e052b1b166a389c0e779816b98715386dbc62a3574e7ad851b2567a070
 EBUILD gentoo-bashcomp-20180302.ebuild 754 BLAKE2B 2710c6b2625132ab96e2816ea6e0959f4b7ea9d509ab4f7fb10798d6a2977e2d503f1991c4531db61fb92ec0a93eef58aa36b4930c1e20fae79207baf0ec35ee SHA512 915c00c55a783b550a373ad9c4b3b89fc4920b80e9e47878789a10614c671847c526def6e152134a2b7b08cccbe1b0ed25c581ce07e9db1eed34cbce99b4d234
+EBUILD gentoo-bashcomp-20190211.ebuild 753 BLAKE2B 8532699668e0912e0b6de7b5a3b9bc62a316f8f11e214f54ad5d6105c0662520e7e94ca3089f151673c2cee6bdbcfd7f594a8b97eba0db05f75c40defb2a5ce7 SHA512 df859cb7971261d2005ed7e877e9ae76a757372cb3524b085dfa9f1b7e8d926ba95c7ca3a7c38c0b5255c293d071c4584b1b1d4ded499c3a2f558ab6d7621fdb
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild
deleted file mode 100644
index 9fa1d8ef71a7..000000000000
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		completionsdir="$(get_bashcompdir)" \
-		helpersdir="$(get_bashhelpersdir)" \
-		compatdir="${EPREFIX}/etc/bash_completion.d"
-}
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911-r1.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
index 0827601e2003..645f24d76822 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911-r1.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
@@ -1,23 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit bash-completion-r1
 
 DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)"
 HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
-IUSE=""
-
-src_prepare() {
-	# resolve openrc file collsions for bug 649144
-	rm completions/rc-{service,status,update} || die
-}
 
 src_install() {
 	emake DESTDIR="${D}" install \
diff --git a/app-shells/mcfly/Manifest b/app-shells/mcfly/Manifest
index 6546d1a9757a..b036136a53fc 100644
--- a/app-shells/mcfly/Manifest
+++ b/app-shells/mcfly/Manifest
@@ -24,6 +24,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.3.1.tar.gz 242505 BLAKE2B 178dc23567708593b89daa653ebdb5dab823197c56d9655abf8b15996736cfbc92acdd8643931c669678aab31eb8a14a4771c98373dec816d61ce0fb0e097b4d SHA512 308aeba0243b59d04655ffb06ce8ad20a3b7077543a3232e783581ef453a64f20c9c6fb5869cff23eac818103cc634c466340e8225346fb135c1b7cbe01d72bf
+DIST mcfly-0.3.3.tar.gz 242714 BLAKE2B 05f038bfb502d0dd6938c6ecf2a8f36673a26e7bebd8b8f543f12c500db0b1b431c476384641fc0d66efc9fd537a2c94c0ef41bf26d1b2f78f3ddd551e94b51c SHA512 b68484256421f0e8f11326cc4e321fdc0bdccb9fb01e919c143338ec315c0a69c90e2d9977265096a34d3db5f2709663579e851f41b637903e3d12ca92959631
 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
@@ -56,4 +57,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.3.1.ebuild 1705 BLAKE2B 1834f531ffa27c70f4583ecc87fcc30032eec6f498fe3cfa83622fc4183532dcd75554f9cd5697d66583ef40d689e50661eb108e7e1f87e47da4687d063fe317 SHA512 bd5bb108edb8d536c18815834ccb41834952a520220c11912e03bcb379a6bc624d62f9982bfe12ef661dff14d419ef7435cd2f91190198fc7950201f81c92841
+EBUILD mcfly-0.3.3.ebuild 1648 BLAKE2B e8189acac680a7036bbe74ccfda2d82d060272b540e59ac7068b541adbae6c59ba6c168637ec743f00f0ae719372bb428daa60bad7678d94872ef46dd04067c2 SHA512 f06fcb0cb38d6c643aabbf5378d22b73eaa576e4c2e482f2889b8e2129ee4e61b402267110ac2cf26d00c59eb3edea27bd6e62162b29598f2287654a42dc4af1
 MISC metadata.xml 754 BLAKE2B 9ffcd71049bc11d8ad580f9721158f931918b2d0cd4fc9e465fda580bad0a853a47c58b4b258d98a654102d195015b32f9d8cbe62343b2c14222a0ea229ea3a3 SHA512 8159ff903511596ba5c7779f89a827101a6c22b8b36bde69cabf89470dcc970fc1755f921bb26952778f9b8e9e518ac7b45edb92c08471b9ec89f01074e8ee9b
diff --git a/app-shells/mcfly/mcfly-0.3.3.ebuild b/app-shells/mcfly/mcfly-0.3.3.ebuild
new file mode 100644
index 000000000000..1ce9fc5247ae
--- /dev/null
+++ b/app-shells/mcfly/mcfly-0.3.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2017-2019 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"
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	cargo_src_install --path=.
+
+	insinto "/usr/share/${PN}"
+	doins "${PN}.bash"
+
+	einstalldocs
+}
+
+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/zsh/Manifest b/app-shells/zsh/Manifest
index 945fd523ed76..853404deca88 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,5 +1,5 @@
 AUX prompt_gentoo_setup-1 820 BLAKE2B 26fc3348f16459462dddfd3f6864a3ae58bbcbbce0e85c04d653bed9c1f1c28a07621fffd22819d62050cf019f3d6d4c127088055bc69a0cc0cb990e8435f2be SHA512 262ad91d7536c11c3b1db176217e9a9bf21df5d25d72ddfc7dece6eafceb74a252212939c8cbe5bee1ccc0e25fc4e6e906660877747f5224e862d4d22d1200a0
-AUX zprofile-4 1297 BLAKE2B 2e4252a7ecbfe8a193bc916f0a5a3337e2de33856fa974e78479a30df6cc29bc86d75d5dca67cb0970642348e32a70e38ffcc55222ea64061aa7bdd08194c61a SHA512 f610937e8fccc88d0ea09e8ffddd365ee3015f04b50f56c2e4f20648e77784e80e4efc2969768b5ed41640acf290ea319306cf57a52aabc3b6917543ff94fd5e
+AUX zprofile-4 1273 BLAKE2B df8730eceb621ffe6b38a9185e1ca0a46d6ac2cc5e28e3e9888a2f26f4a6adedc6adfd39744b20aa450a613284b9670dffe02038f40f78edff22e951e209dbf5 SHA512 fbe89782f757bf351a60f691e40d70786324b8b8eea90ca5e788ae349fa5642daa24969e303af6029b8d38d0b5505ba422523081b91ae7b71fec388624ad48d0
 AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd
 AUX zsh-5.7-fix_infinite_recursion.patch 1102 BLAKE2B b5bcf1cec800e83726479be36525870329e6543220e58b72c9a9ed89d9c28f459fc5fedea2986a8e6b89bbeeb303e4d9a1e00e3ab2a3602e9c09389d745a9a16 SHA512 f72285f2ddedf1da44f419c13b54dca2a1845027ff36a4b00ea58aadf3e19986aed3568325afbc4ff7b7e92820875ac75263287dce73c2ba1d16409d5def0353
 DIST zsh-5.6.2-doc.tar.xz 3198932 BLAKE2B 7e701bb12e0114b7d9847caad1146fa3d538f8f6d859a765037660fb18341f1c79002811a42ec795e41eb2bbe899e12d4bcd055ea5c66e7b73bd488bdf8bbb55 SHA512 5102314e2857b032c6e6b4b715c261970b2f0c28663aff99fb87f7bb6c3971f88f8e8892ed349793570beae3fb68ff7923c82e99a3c1bb485e4639f01caaad4a
diff --git a/app-shells/zsh/files/zprofile-4 b/app-shells/zsh/files/zprofile-4
index 6402ca718d38..2e33b11f4915 100644
--- a/app-shells/zsh/files/zprofile-4
+++ b/app-shells/zsh/files/zprofile-4
@@ -25,7 +25,7 @@ umask 022
 if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
 	# Check to make sure ROOTPATH is sane before we use it.
 	# https://bugs.gentoo.org/656400
-	if [[ :${ROOTPATH}: == *:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:* ]]; then
+	if [[ :${ROOTPATH}: == *:/usr/sbin:* ]]; then
 		PATH="${ROOTPATH}"
 	fi
 fi