14 files changed, 294 insertions, 61 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 57b56be45bf4..86dee11916c7 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index a974014ddfb6..71aa438e7f58 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -3,8 +3,10 @@ DIST bash-completion-2.7.tar.xz 280048 BLAKE2B 88b09f451fd4e14daf8e139951a4b65aa
 DIST bash-completion-2.8.tar.xz 286128 BLAKE2B a99faeb3c9ee2ea6d1cc9988e61951f4e688ac0b3c6837d1fd43381519fedf5f95167e8dbc166543b0235f3ac61d92af35eb8399efc0cd297a62849071dee5c7 SHA512 d839ef5a98811a2aade7ebdc0bc84c84a41c74db384f89913b06f3c25add1ba22528ac25392b19d27280685d258c74dcdc11247cbaae5b8d82f2c0b546abc268
 DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
 DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce
+DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
 EBUILD bash-completion-2.7-r3.ebuild 4109 BLAKE2B b19159a733eb34738622add375c11d71dad1b5bee4c16b3d7bf2b2d588757e0b412807601a3e9ab9a2bb9e1a796354d59f3fbe796f91577d7eb5368c499896f5 SHA512 2e91fc722b51b39cef6ba2892645cac41321d840e14d3774732084f6a091859d5ff01282e10a7ce1cc5ed89ed8e1473fe7afee551f0df4c1104b4d44dd7c770a
 EBUILD bash-completion-2.8.ebuild 4057 BLAKE2B 09f82c80d498f02154d144730a7b8d2d4ddf254fe2e52d972bd1107d0ae3bdb583d161e04a3bd3c3a45d41b87c1bfbf187697d2789926e0af410dbb09cfefc9d SHA512 081ead91d74f818f4c3fdfeb3643fe55f744afa26730284b79242379d7358c957549efda8091cf108aaa5f8195d2fb3610474072a141eda1573d68121a7d7b23
-EBUILD bash-completion-2.9.ebuild 4704 BLAKE2B a9a7dcc93f15aaecb10909f1f82c107168be24fa3b717632f76ef90196cadf8ab163354cd137d85329ac219cfaa7b98551870ddddd6f497b251e78ed50cc3983 SHA512 73d473f2f811aba2e32f2498115506fe6cfed7dc055b012ea4a6c45a6ae9e516996eed097c89cd67fb102bffe0b6e9299dc74918c4ee6d2c554fb24df4b6f4f2
-EBUILD bash-completion-9999.ebuild 4421 BLAKE2B 8c597c1aefa2a578376111283516ed30731fec0f1ce499fadb60828bc272d0f16fd009275e9945583f22027ca56d749d111f8ec3ebee797b9d4a11805c40dab7 SHA512 e94c33b431069544d88b34b0729ed0057efb26f65faa5471e7c54e70699fd11aafd64e9c00b747ad19eedf8b7fd0b9dd3495e42e69b9875142765f789b2572ef
-MISC metadata.xml 1309 BLAKE2B db08060cd74841bd7220e688e251225ddaf59e4da737c08785e7c6ce83c2d40600fbe38e9b9449fb559ccb2d03b8c2368295b647ec2a52191429fe1d3d1c7470 SHA512 3ee23fb6cbee1e80a0c8fab13f7bb67bdad3292fa8ec187e306b00804a7bf709358c8c08eda4101a5f5baa408e0892aa94c07ae466b5beae4edc18055b1192ee
+EBUILD bash-completion-2.9-r1.ebuild 4816 BLAKE2B fb10aa20dcace7020a209d479aa2346bdbddb28eb73f3d7a7aeda1cbd02820b8e2ddbc63ecc46f7ea255aa1a442a4341ab4416a1b566fe99657827f3f1adeaa0 SHA512 62f99d0f540441b5e14c26de777e0c41b40c1bb8eb03faf194d93ffcd3923b0adf573512a2056544e44a798f9645b7cf30c6dc870ce6a8774aaea66e710fdf6d
+EBUILD bash-completion-2.9.ebuild 4699 BLAKE2B 9bb3a90bee16acb270a76a669e710c1c6095d07bb89803ff51668cf37e60809b31f58ba22c2d15b772292b3cfbddaaadcfdf843a8f503b772f7c5c7685607d98 SHA512 330b4679a4e98c39d14f25c02a25626fd216c65cce2fbc80b6dac894837e87028e448730f2bfdf63397349ec7525fcf3b96e6f67ccab47295cae271b95d3a299
+EBUILD bash-completion-9999.ebuild 4580 BLAKE2B d974f17d8526f30e9907d2f09ed6024f688e8829499a0069d042404752712e7e70b24182fb71a61acd9820c916b6af9c2bc785629959ca66e0491b8add77c9ce SHA512 1dadaf29fc2ca6c5f42a7eb954b060ad400ab4eac953a581d09d8412fd863343391e2c6f8ca31bad25595aecc2ba515c67ff04417b4c3e490d2a127cb77fb3f0
+MISC metadata.xml 1498 BLAKE2B ebfc4f05a48320d502076d9756cce9f0daf1a0c601ec491cdfb89538627f62c0613dd9e4db53c4791e094d6652e3c9a508003de3fa4f62a84396844c324325ef SHA512 6a83c672f45e7171d5b9959ac59c4e28bacb8ffdefa965288776603673396225b3bb01c149432edb3f901f04eaa39064bc8d813a35ce1e573231fd4b4570c62d
diff --git a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
new file mode 100644
index 000000000000..91aa3bb0061a
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASHCOMP_P=bashcomp-2.0.3
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit bash-completion-r1 python-any-r1
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion"
+SRC_URI="
+	https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+	eselect? ( https://github.com/mgorny/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE="+eselect test"
+RESTRICT="test"
+
+# completion collision with net-fs/mc
+RDEPEND=">=app-shells/bash-4.3_p30-r1:0
+	sys-apps/miscfiles
+	!app-eselect/eselect-bashcomp
+	!!net-fs/mc"
+DEPEND="app-arch/xz-utils
+	test? (
+		${RDEPEND}
+		app-misc/dtach
+		dev-util/dejagnu
+		dev-tcltk/tcllib
+		$(python_gen_any_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+strip_completions() {
+	# Remove unwanted completions.
+	local strip_completions=(
+		# Slackware package stuff, quite generic names cause collisions
+		# (e.g. with sys-apps/pacman)
+		explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+		# Debian/Red Hat network stuff
+		ifdown ifup ifquery ifstatus
+
+		# Installed in app-editors/vim-core
+		xxd
+
+		# Now-dead symlinks to deprecated completions
+		hd ncal
+	)
+	if [[ ${ARCH} != *-fbsd && ${ARCH} != *-freebsd ]]; then
+		strip_completions+=(
+			freebsd-update kldload kldunload portinstall portsnap
+			pkg_deinstall pkg_delete pkg_info
+		)
+	fi
+
+	local file
+	for file in "${strip_completions[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} ||
+			die "stripping ${file} failed"
+	done
+
+	# remove deprecated completions (moved to other packages)
+	rm "${ED}"/usr/share/bash-completion/completions/_* || die
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	use eselect &&
+		eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
+	# Bug 543100, update bug 601194
+	eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
+	eapply_user
+}
+
+src_test() {
+	# Tests need an interactive shell, #477066
+	# idea stolen from:
+	# http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	# override the default expect timeout and buffer size to avoid tests
+	# failing randomly due to cold cache, busy system or just more output
+	# than upstream anticipated (they run tests on pristine docker
+	# installs of binary distros)
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check RUNTESTFLAGS="OPT_TIMEOUT=300 OPT_BUFFER_SIZE=1000000" PYTESTFLAGS="-vv" \
+			&> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
+src_install() {
+	# work-around race conditions, bug #526996
+	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
+
+	strip_completions
+	# fix missing aliases
+	bashcomp_alias tar bsdtar gtar star
+
+	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
+
+	# install the eselect module
+	if use eselect; then
+		insinto /usr/share/eselect/modules
+		doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+		doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+	fi
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 2.1-r90; then
+			ewarn "For bash-completion autoloader to work, all completions need to"
+			ewarn "be installed in /usr/share/bash-completion/completions. You may"
+			ewarn "need to rebuild packages that installed completions in the old"
+			ewarn "location. You can do this using:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+			ewarn
+			ewarn "After the rebuild, you should remove the old setup symlinks:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+		fi
+	done
+
+	if has_version 'app-shells/zsh'; then
+		elog
+		elog "If you are interested in using the provided bash completion functions with"
+		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		elog
+	fi
+}
diff --git a/app-shells/bash-completion/bash-completion-2.9.ebuild b/app-shells/bash-completion/bash-completion-2.9.ebuild
index bef979856f82..0046eb1249db 100644
--- a/app-shells/bash-completion/bash-completion-2.9.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE="test"
 RESTRICT="test"
 
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index bd5e53f21aa0..ee27e7fcf8fe 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -3,19 +3,17 @@
 
 EAPI=7
 
-BASHCOMP_P=bashcomp-2.0.2
 PYTHON_COMPAT=( python3_{5,6,7} )
 inherit autotools git-r3 python-any-r1
 
 DESCRIPTION="Programmable Completion for bash"
 HOMEPAGE="https://github.com/scop/bash-completion"
 EGIT_REPO_URI="https://github.com/scop/bash-completion"
-SRC_URI="https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
 # completion collision with net-fs/mc
@@ -23,7 +21,7 @@ RDEPEND=">=app-shells/bash-4.3_p30-r1:0
 	sys-apps/miscfiles
 	!app-eselect/eselect-bashcomp
 	!!net-fs/mc"
-DEPEND="app-arch/xz-utils
+DEPEND="
 	test? (
 		${RDEPEND}
 		app-misc/dtach
@@ -79,13 +77,21 @@ pkg_setup() {
 }
 
 src_unpack() {
-	git-r3_src_unpack
-	default
+	use eselect && git-r3_fetch https://github.com/mgorny/bashcomp2
+	git-r3_fetch
+
+	use eselect && git-r3_checkout https://github.com/mgorny/bashcomp2 \
+		"${WORKDIR}"/bashcomp2
+	git-r3_checkout
 }
 
 src_prepare() {
-	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
 	eapply_user
+	if use eselect; then
+		# generate and apply patch
+		emake -C "${WORKDIR}"/bashcomp2 bash-completion-blacklist-support.patch
+		eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch
+	fi
 
 	eautoreconf
 }
@@ -124,9 +130,9 @@ src_install() {
 	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
 
 	# install the eselect module
-	insinto /usr/share/eselect/modules
-	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
-	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+	use eselect &&
+		emake -C "${WORKDIR}"/bashcomp2 DESTDIR="${D}" \
+			PREFIX="${EPREFIX}/usr" install
 }
 
 pkg_postinst() {
diff --git a/app-shells/bash-completion/metadata.xml b/app-shells/bash-completion/metadata.xml
index 2bb3ef236242..159d6c88d62d 100644
--- a/app-shells/bash-completion/metadata.xml
+++ b/app-shells/bash-completion/metadata.xml
@@ -9,6 +9,12 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
+	<use>
+		<flag name='eselect'>
+			Support blacklisting of completions via 'eselect bash-completion'.
+			This enables custom Gentoo patching of upstream completion loader.
+		</flag>
+	</use>
 	<longdescription>
 		Since v2.04, bash has allowed you to intelligently program and extend its
 		standard completion behavior to achieve complex command lines with just a
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 34a256cad8b4..8c3ed5eb0d53 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -4,6 +4,6 @@ AUX fix-histfile-test-on-ppc.patch 1068 BLAKE2B fa407d7f5d02f061a3ca9d79bdf09ae6
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
 DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3
 EBUILD fish-2.7.1.ebuild 2419 BLAKE2B b94dbcf8431311f50ec2b49ab8ad62e8af3519262b2518d4b72a0074e837b38bf3aea6e93655d7b60ccbb09ef2abbbab946ba5012337c15de73a3c7d910295a8 SHA512 d818578a42171939d35ecd9dadbe875bbf93427e662783fb6bfb3033f17ab3298df58999f4e71e4ec8af666c7388fbc6bd694af119c0d1532c78ff5de1286b41
-EBUILD fish-3.0.2.ebuild 1687 BLAKE2B d46f0eab97bb5ee1e40ec2fba96904da49a939332144dc893c1b1f7f9454ebf7551256db444bff6f47bb1226b2bbf8b8dabe49a9b965ee0fe8e88e74646b4dcb SHA512 ab99cd6976905444e75bf65dc296c890f90be9d616d0638a15d595f5d548f3f037bf26948e1325836de7d782644651742ede7329b3f2bce721035ed6e4103f47
+EBUILD fish-3.0.2.ebuild 1686 BLAKE2B 5584cd3239c40a13cd6f2cf74ed50547911fd2327feeb316c9e86d6614d63d30b8f07e72015e7ae65286dd3ea7d3fc268baa5db1758481513ab1663cabcb0b3a SHA512 1c16fee53eb2496bd8b0bd008af7f18b942ecf5aaea6240780fc3bc4d0ba91b35ba21012d67ab40c763d8499039323a414809df684b3b94ea9dd99d26f7a4209
 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.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild
index 207077a6dcf4..e6150ca3dcc6 100644
--- a/app-shells/fish/fish-3.0.2.ebuild
+++ b/app-shells/fish/fish-3.0.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	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"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index af819e23fdd3..7e17b8da1e66 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -1,3 +1,5 @@
 DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981
-EBUILD ksh-2020.0.0_alpha1.ebuild 598 BLAKE2B 05efbc081efdac93e1b8ce188d0e4d3e18ea7755a2e15e12bf79ed57f6496db4da2539bcaadea05c5e9fb6c907413a20d330bdf83f125392775bf99303e31594 SHA512 694bcb9a212ed86d0c50af3b518b6a1ed8bffe8769b56b9fe6652ecb42dfda074854f58d51b1cee3b42983b0dddd030b5a639233978678483861ff55723e458b
+DIST ksh-conftab.patch 118773 BLAKE2B 63466e18a77cb86af80d6f6b4af74e3ac1edbfa735decfcd772633808a4593f6d4b057a99547482d17b22445e68c6d3e2becdf68516f913c73550da718f2abc3 SHA512 b29a70e8e31a259ac5bf556ddcdb5d4742a8dac4d11c06e4b5fc3043012e08b26d136cce8c18e9e8a1fe751044699d2258388d618408b09379732bea89a51765
+DIST ksh-solaris.patch 12317 BLAKE2B 90681bde2f3bad0e097a9367ea5a3f1d4c95f70c6e0c872dad769609f97a6332328e21399a3b9ba20f3840b3387a02370831ae4663457728bd8e41b7471c675b SHA512 5a0b818f44a860210e2a7795335d0edec01c61dd5ad04670bb2ca505690ff1b111dbda12d0d15e8b264113d4e7a5a42a49f64c9aba0cff809c2ce3185921acad
+EBUILD ksh-2020.0.0_alpha1.ebuild 881 BLAKE2B dbeac3ac74490d77d17e65dd2a0c612f5cdad924cd6de08a74b52c8f6a24a85aa387c0f7ac362cb41ed93ab838611b5bc6c5dbafd10dd4e6138c0e02c297bced SHA512 2ed9f8f485ed1ccd5fdc891f4a96fe7974c6d7b65d234b125e7f7cb442073975c67cf8217695d909cfad44b238d6d31b7b0067dd1d3eb07fc9ed2b5657bef28b
 MISC metadata.xml 1371 BLAKE2B ab655b6d15894748f8125dcc0d25fd15aee57623de8b643793b1ca456025ee35db091b500f91b59ca0801778eb65798162b732778c56b80adff4f0402b299638 SHA512 b74fe4a12ce5868839cd32fe9c4f88c216a0703a3f477b005dcf7b47f697d129c695a011a9b37894c39716b5d47ddc9abeb5bd4946ba6b6849707a73b5901810
diff --git a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild
index 4927a8e7fe18..b8f743ad437e 100644
--- a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild
+++ b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild
@@ -10,7 +10,9 @@ HOMEPAGE="https://github.com/att/ast"
 
 MY_PV="${PV/_/-}"
 MY_P="${PN}-${MY_PV}"
-SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz
+	https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ksh-solaris.patch
+	https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ksh-conftab.patch"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="CPL-1.0 EPL-1.0"
@@ -19,6 +21,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="!app-shells/pdksh"
 
+PATCHES=(
+	"${DISTDIR}"/ksh-solaris.patch
+	"${DISTDIR}"/ksh-conftab.patch
+)
+
 src_install() {
 	meson_src_install
 	dodir /bin
diff --git a/app-shells/mcfly/Manifest b/app-shells/mcfly/Manifest
index 08b7ea0c58bb..4857a7ef4837 100644
--- a/app-shells/mcfly/Manifest
+++ b/app-shells/mcfly/Manifest
@@ -23,6 +23,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.3.tar.gz 242714 BLAKE2B 05f038bfb502d0dd6938c6ecf2a8f36673a26e7bebd8b8f543f12c500db0b1b431c476384641fc0d66efc9fd537a2c94c0ef41bf26d1b2f78f3ddd551e94b51c SHA512 b68484256421f0e8f11326cc4e321fdc0bdccb9fb01e919c143338ec315c0a69c90e2d9977265096a34d3db5f2709663579e851f41b637903e3d12ca92959631
+DIST mcfly-0.3.4.tar.gz 193516 BLAKE2B e30e438460788ab385924e729d1bd1a00eb6642eaa2f09d378ad20431218dee56153ac8a22c310b733202ac1929dc4e8c800ad480c66cfe3a21f96a79cff43b6 SHA512 49a69c6b4af6814333860262ced4d0d83703d397f5c2f46f9d4351eec9def91c0eff39069982ae67c8fbd5371d562e9e6afbb778472d83dee13aace62f456bf2
 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
@@ -55,4 +56,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.3.ebuild 1648 BLAKE2B e8189acac680a7036bbe74ccfda2d82d060272b540e59ac7068b541adbae6c59ba6c168637ec743f00f0ae719372bb428daa60bad7678d94872ef46dd04067c2 SHA512 f06fcb0cb38d6c643aabbf5378d22b73eaa576e4c2e482f2889b8e2129ee4e61b402267110ac2cf26d00c59eb3edea27bd6e62162b29598f2287654a42dc4af1
+EBUILD mcfly-0.3.4.ebuild 1648 BLAKE2B e8189acac680a7036bbe74ccfda2d82d060272b540e59ac7068b541adbae6c59ba6c168637ec743f00f0ae719372bb428daa60bad7678d94872ef46dd04067c2 SHA512 f06fcb0cb38d6c643aabbf5378d22b73eaa576e4c2e482f2889b8e2129ee4e61b402267110ac2cf26d00c59eb3edea27bd6e62162b29598f2287654a42dc4af1
 MISC metadata.xml 754 BLAKE2B 9ffcd71049bc11d8ad580f9721158f931918b2d0cd4fc9e465fda580bad0a853a47c58b4b258d98a654102d195015b32f9d8cbe62343b2c14222a0ea229ea3a3 SHA512 8159ff903511596ba5c7779f89a827101a6c22b8b36bde69cabf89470dcc970fc1755f921bb26952778f9b8e9e518ac7b45edb92c08471b9ec89f01074e8ee9b
diff --git a/app-shells/mcfly/mcfly-0.3.4.ebuild b/app-shells/mcfly/mcfly-0.3.4.ebuild
new file mode 100644
index 000000000000..1ce9fc5247ae
--- /dev/null
+++ b/app-shells/mcfly/mcfly-0.3.4.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/rc/Manifest b/app-shells/rc/Manifest
index f560f8c97eff..f0cfdf1a6a2c 100644
--- a/app-shells/rc/Manifest
+++ b/app-shells/rc/Manifest
@@ -1,4 +1,3 @@
 DIST rc-1.7.4.tar.gz 215206 BLAKE2B df01f618cd4d3c5bbf155768ada49c20fe7916e2b999ae13d08487b00c4565c3c4d1d45d16dddef70fe58cf7c405d293832b31dc8a66d8b36b2503675b260db1 SHA512 49e124207b5370b88b8fba0376dda33451451a58bfb85fabfc06ae59eb88fedf38d7aeaaf292e4f380e2c00efc8301ba68d12180923186d1c53ef94f78f7e435
 EBUILD rc-1.7.4-r1.ebuild 931 BLAKE2B 68829f9ee2219282bfb380ded88f23dbfea27a78a8d78f7a150172df26deedb28878324bff39ec04b9d87c31d64310f8b32ef5d217903a72dae79ab44b3209eb SHA512 74abce16dd79d884cc7067585b5295b16704edfe1695caaecd6c8389bea8821465533e71f0da2219417ae4b81f9798ed94542483baa12fca57b81b915a699ba0
-EBUILD rc-1.7.4.ebuild 891 BLAKE2B cd4906a048ce647f7bdf36bb6e6bb57075190cca66f14e52e5216fdf8af2661315d7e76850d6e624be390d824c420210e928dbbb2f417b0bce721e8b93a5978c SHA512 510499cf748c113ec3a2ed6338e3a36256da9166ec3a6fcb49f31597e75c078409387ca40a883236c7158e150e01919f3993bc5aef6e052d2a74787b7efa988b
 MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/app-shells/rc/rc-1.7.4.ebuild b/app-shells/rc/rc-1.7.4.ebuild
deleted file mode 100644
index 71bf031e21ab..000000000000
--- a/app-shells/rc/rc-1.7.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A reimplementation of the Plan 9 shell"
-HOMEPAGE="http://static.tobold.org/"
-SRC_URI="http://static.tobold.org/${PN}/${P}.tar.gz"
-
-LICENSE="rc"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libedit readline"
-
-RDEPEND="readline? ( sys-libs/readline:0 )
-	libedit? ( dev-libs/libedit )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local myconf="--with-history"
-	use readline && myconf="--with-edit=readline"
-	use libedit && myconf="--with-edit=edit"
-
-	econf \
-		--disable-dependency-tracking \
-		"${myconf}"
-}
-
-src_install() {
-	into /
-	newbin rc rcsh
-	newman rc.1 rcsh.1
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	if ! grep -q '^/bin/rcsh$' "${EROOT}"/etc/shells ; then
-		ebegin "Updating /etc/shells"
-		echo "/bin/rcsh" >> "${EROOT}"/etc/shells
-		eend $?
-	fi
-}