gentoo resync : 14.05.2020

31 files changed, 734 insertions, 589 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 8a034918840c..6ccc62c370cc 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 e739bc400d34..be8ec57bbf6a 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,8 +1,6 @@
 AUX bash-completion-2.1-escape-characters-r1.patch 1084 BLAKE2B 62a9ccb7b1cc4162db2f8e35fb20d3a24f9e4c067e5297816d91a85ffcdd3ff43695f3c361959cba59b887afd0d12e75fa317899054d3a615ee3da615a4409ec SHA512 b7cb548024fbc68e87d781208a378299c399d2661121290c500d62cd66855acc02848710b44c363917c3c4923e063212a2b56c9b0c08deb71aba308d75939cab
 DIST bash-completion-2.10.tar.xz 310764 BLAKE2B b6b96f049b44eb455805916bbbeb0c9578104aa4c8c736801fd27c7268e4de70424eebbb5d1e4d1841273b1c4e169da4f369f2f65276349ead4aa7944aa193b2 SHA512 d434e0e48b25328e8c6b43ed64e58f56459186434754ee972795edd031ce1864038b53926b218fe06e5b3882682db4dec5101b3124362c0137101d3fa6d87cd7
-DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
 EBUILD bash-completion-2.10.ebuild 4694 BLAKE2B 513fbe0f35bb1fc7cb2865ed7ac6fd3fb6a1168833cc254c31777d31c06d8ec3c9189010cb0f7ecc7ed5dea3388975c42f849a364e897af446d73cf249226d02 SHA512 f2c8c3da453145f1b002410048c44e579dbc42babd1d58cf153f3925e7f62018e9db37a776338ef09ae2e601cb2abb24d748b74691578b960e92524f6ad34113
-EBUILD bash-completion-2.9-r1.ebuild 4771 BLAKE2B 3a4848e0ad8c489b24868a9fdad27ecbf8e64734395e5a48d96dabcc2a335ba02feb96bdbe988a1ac675ca688090672e800d3baabdb83ec6c75fe383225beafe SHA512 34e8ede11736a4382c0049c1b4152473efe8f27c38d895416e83c19b40af0cd64461eec30dac9f8f8dcdb3d1e1ae734540236c3ad8dcaff23b999d3ca37e12a0
 EBUILD bash-completion-9999.ebuild 4702 BLAKE2B 1f8284b4cd7f93912eccdc0e90a6ff65939bc1df16d2701783bd1f00afe49c60701819438dd95548ca4654ef83713a6a644cecfaf1d642d537882e0eb147ec76 SHA512 46cb8472ea55fd468eca090474a1488389427265f9eb1d20a2b20011c5f6af19bd0f89b1c507667edc52f406b004215bb8f1c0ef2f7fa7dbd6b5949aa2978434
-MISC metadata.xml 1498 BLAKE2B ebfc4f05a48320d502076d9756cce9f0daf1a0c601ec491cdfb89538627f62c0613dd9e4db53c4791e094d6652e3c9a508003de3fa4f62a84396844c324325ef SHA512 6a83c672f45e7171d5b9959ac59c4e28bacb8ffdefa965288776603673396225b3bb01c149432edb3f901f04eaa39064bc8d813a35ce1e573231fd4b4570c62d
+MISC metadata.xml 1439 BLAKE2B 06bfaf55046a8e6001e3de802ce5a2fc11b32897726930ce1e98b41e75faac78e54ff8ee947f4fc85a207b64c342c6359298ca08e66e39a74a0c8c99cd0fe4cd SHA512 2d6fab5c7b6f5539bc0ea7f56ca787524d0ef20777b86e58c87200423bd10081dc21053e21ba9084e7a7f4ec03d73d71ac4b7cc1082e1da3ca8d1499b996612f
diff --git a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
deleted file mode 100644
index c7c30545e25b..000000000000
--- a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASHCOMP_P=bashcomp-2.0.3
-PYTHON_COMPAT=( python3_{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 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
-	!!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/metadata.xml b/app-shells/bash-completion/metadata.xml
index 159d6c88d62d..0e24540d67ce 100644
--- a/app-shells/bash-completion/metadata.xml
+++ b/app-shells/bash-completion/metadata.xml
@@ -29,7 +29,6 @@
 	</longdescription>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="bitbucket">mgorny/bashcomp2</remote-id>
 		<remote-id type="github">scop/bash-completion</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index e13074ded86c..2adfef682d4a 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -391,6 +391,7 @@ DIST bash50-013 2328 BLAKE2B 8797fe0b8e01027222af9798ee8d57d161bfbedb617b257e914
 DIST bash50-014 1747 BLAKE2B d52f9160d74b340fd5722725b572ac1abe74caf41add5421dfa56fd44916ead691e4d698de3ba118ff0f8fc8eadade7a980551134eb0daf18b0767ff9601a4b4 SHA512 e8f65be24b425ecaf66672eb4271e0efac2f495f882aeb559d60b52359a468b51852ed7aeeea0ab77cf648a48c9d37f2a00e263d06d29e9fa75b67a648399d91
 DIST bash50-015 2565 BLAKE2B 7df76369726332299c089db156c1e9bc6619fe2e925732da46ca47ca627f1bd7df4ea188a2c0f636e42623f2ee7ca40bc98551b5bd339ed4d5bee20b24ba38d0 SHA512 3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9
 DIST bash50-016 1534 BLAKE2B 8c9bb752a441b70b11655a9bd48e48ec9756a34d0513837faa94c64675c11d57ba1fb0bfc43a033040539f9c475a0efd00f375cf8ffe04a6d9d1d1c19575572e SHA512 dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
+DIST bash50-017 6517 BLAKE2B d8ec55e796fa2b17774fdf846c7b24ab1428a1dd94210e0d6b3174f99afe7f9c7f33448e1116c81f43407cb8d95390dd634cb8bd543046699898f471ffd68433 SHA512 d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65
 EBUILD bash-2.05b_p13.ebuild 4600 BLAKE2B 6bf0599ce8ce0885c9e873a512fdd5f6d6afb94ab11098adc72df89946ddb7e291597923dc1dd82ac74d2967e41a05b58caeae34f2e93db1863da30c77954b5d SHA512 a20d87b518ec64acfcebd921a433214755f4a9b278d030deaf7b1c3038013a2daab47b475f560f18c1280a41857e4f84b6d4c813b6cd7f5ced072f3d62b54a69
 EBUILD bash-3.0_p22.ebuild 4733 BLAKE2B debacfdaee9f129e5135f994473e0e135d19360ee085ab15d09e48a560713fc00e7d607af0bdb577c6b870f9c9906bab41ce2361f5c0ab940ac35b7b35a31df7 SHA512 35ce9ba9085fa6eb72f7c9aba4caf32ea95a4d337b0949efb29be4d611d34e0703d33a8b3c1872882f12ca1971cdaef0e63b6d62da3f01cc7804edd1c5cc0c4b
 EBUILD bash-3.1_p23.ebuild 4414 BLAKE2B 54f79841105ae9f31025de47be4eed9a5c823f168a0cbda35a9984231664f9a44141240825b20cbf83b13f55e4ce08febd16a1c6ad4c07268ea7a8156d87169d SHA512 b91f3cb231850c331ba22e8d68df1a235b00799dda1c0579f1bf33192dc3387b3e96e1a0ebb3f73be606748022ee8c77342707184259d0642985d565d21918ba
@@ -399,7 +400,8 @@ EBUILD bash-4.0_p44.ebuild 4395 BLAKE2B 0d9d0f3ec78ebcdb3de84b35821f32706b422665
 EBUILD bash-4.1_p17.ebuild 4129 BLAKE2B 45cdcbdb040da11e2299730d3efbca1d6321f9059589e97131f9f192e6de40cdc4ee6a55857c0763732e25be60a2b1d8361d0e4da637440231180e8729b2d1d4 SHA512 2b2a7e816906f9f09d4b7bb94b215fb8dc7d0fb911a3136fad54c2ebf9a285a31101923721ac835d43a75458e08b2d479bd9cd82cf2e1106f2b6f662804186b0
 EBUILD bash-4.2_p53.ebuild 4319 BLAKE2B 38bbc2970101a2828ed508e7e0ad4574389eeac1867dc963b8a14ddfb74f6f7395ade37b2604391c7745416f99913dec6f663ba95adc623a85157163f265522e SHA512 d11094b1734e9fd63b1bbd174c771fe3a7a48bc1c550fb2283fe4d49d490d63db173216a275840feb4dff229a874d7a80939a8af22b4780feb9e1bc8aa244a31
 EBUILD bash-4.3_p48-r2.ebuild 5617 BLAKE2B 5febb079acc827cab20644f938f9b2526fb6f478c0bbb8d9868db7bf8378fecca1216cb539f857400bcdabde08d34c159f2f32fdcb05e6c059574ca8a366ee3d SHA512 e4ade3179cbffd11e928be37b721d9d42aa29287035efbdae230ac5340173988712aeff3beca1c5a937270f9092b9ceb71589e5e41199b8608503e739c7111f9
-EBUILD bash-4.4_p23-r1.ebuild 7307 BLAKE2B 1e109131319e211688d2e2a5bed8344babcde7037262350fe8eca4c1d5301d14d6ce464da59709c38933b1c4d0a049cde37f7695df7c4c6986fcf13d6a41fa65 SHA512 ae5a118cce1b0422494fc596bcec7b305c1fa5a652e5f8d083003db338d4fcf5db9faae2aea4e6b6c461139f1c833ca12194a331bc257ce63f2179a3bc69f397
-EBUILD bash-5.0_p11.ebuild 7364 BLAKE2B b4e5d6d31823963a153e4550d84f7ccfdb6cb7d1ec03082bdf4b2ac64ff525c559d87ebfce56a7df630dd63389aa068735c05429b2f134a1eab2897e99f1cdac SHA512 34db5bd4b01c479149b825130fdc0a55c04fea401183084d9c1824a68ec7a7d07c51f691be2afd3742ff9511014ddab8539edc97adc7cbe42748cf8a1b96df19
-EBUILD bash-5.0_p16.ebuild 7364 BLAKE2B b4e5d6d31823963a153e4550d84f7ccfdb6cb7d1ec03082bdf4b2ac64ff525c559d87ebfce56a7df630dd63389aa068735c05429b2f134a1eab2897e99f1cdac SHA512 34db5bd4b01c479149b825130fdc0a55c04fea401183084d9c1824a68ec7a7d07c51f691be2afd3742ff9511014ddab8539edc97adc7cbe42748cf8a1b96df19
+EBUILD bash-4.4_p23-r1.ebuild 7255 BLAKE2B 6d846ab53a56395d1bf40cac1f9b1ce9e5344851b78001ffbe57270c6905427f9413291342a33252e6d531c0d2ab4bf00def687e1abcb8208059ebcde2752c2c SHA512 bd66490f6982d689d6879f1fc8cf216e575a367da619b3ebc6dab1cdd9d476b739633c4cbceab609d9dd4d6941a9ca72cfad3b9d0a6946346b215f78026bcef9
+EBUILD bash-5.0_p11.ebuild 7312 BLAKE2B 3805c5443aa6774976a465aaa83690eb851d480484a1ed484fa87bee973e883a4b9ff85d276492110dab74cc82b138ed1dcd6c7cee4a7db42bd1e03ee405d6e4 SHA512 8ffde7c61d201159ba776232f54d6c8c2562dc96f86a6861581ca9b7c0f6c83ee571030236c064e2ebb89c3620e476f8ded95cf45760675f601bf79900a473c6
+EBUILD bash-5.0_p16.ebuild 7312 BLAKE2B 3805c5443aa6774976a465aaa83690eb851d480484a1ed484fa87bee973e883a4b9ff85d276492110dab74cc82b138ed1dcd6c7cee4a7db42bd1e03ee405d6e4 SHA512 8ffde7c61d201159ba776232f54d6c8c2562dc96f86a6861581ca9b7c0f6c83ee571030236c064e2ebb89c3620e476f8ded95cf45760675f601bf79900a473c6
+EBUILD bash-5.0_p17.ebuild 7304 BLAKE2B fcfc64bd1b9a6a4dd324d87c9a411a8a2ee2bf541ec64ad59a192068e40b8f3db13d2ee818c287cc8bfd4b035ee65fb207c2c2f9a02bc734179ae389cbcd2fe3 SHA512 ef7c9b35634c079f581b54b292ed25d19371b7892c15653f278d5cc08ee81d35bf3d959722c181f314b0d5948e2dc9e90e0afa43bfce351a8759135a71ffa8af
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-4.4_p23-r1.ebuild b/app-shells/bash/bash-4.4_p23-r1.ebuild
index dc2d39a7d27f..d939664e191b 100644
--- a/app-shells/bash/bash-4.4_p23-r1.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r1.ebuild
@@ -56,7 +56,6 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
 "
 # we only need yacc when the .y files get patched (bash42-005)
 #DEPEND+=" virtual/yacc"
@@ -218,12 +217,12 @@ src_install() {
 	if use examples ; then
 		for d in examples/{functions,misc,scripts,startup-files} ; do
 			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
 			for f in ${d}/* ; do
 				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
 					doexe ${f}
 				else
-					doins ${f}
+					dodoc ${f}
 				fi
 			done
 		done
diff --git a/app-shells/bash/bash-5.0_p11.ebuild b/app-shells/bash/bash-5.0_p11.ebuild
index 1cb910d9157b..6f6fa4bb6e82 100644
--- a/app-shells/bash/bash-5.0_p11.ebuild
+++ b/app-shells/bash/bash-5.0_p11.ebuild
@@ -56,7 +56,6 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
 "
 # we only need yacc when the .y files get patched (bash42-005)
 #DEPEND+=" virtual/yacc"
@@ -222,12 +221,12 @@ src_install() {
 	if use examples ; then
 		for d in examples/{functions,misc,scripts,startup-files} ; do
 			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
 			for f in ${d}/* ; do
 				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
 					doexe ${f}
 				else
-					doins ${f}
+					dodoc ${f}
 				fi
 			done
 		done
diff --git a/app-shells/bash/bash-5.0_p16.ebuild b/app-shells/bash/bash-5.0_p16.ebuild
index 1cb910d9157b..6f6fa4bb6e82 100644
--- a/app-shells/bash/bash-5.0_p16.ebuild
+++ b/app-shells/bash/bash-5.0_p16.ebuild
@@ -56,7 +56,6 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
 "
 # we only need yacc when the .y files get patched (bash42-005)
 #DEPEND+=" virtual/yacc"
@@ -222,12 +221,12 @@ src_install() {
 	if use examples ; then
 		for d in examples/{functions,misc,scripts,startup-files} ; do
 			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
 			for f in ${d}/* ; do
 				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
 					doexe ${f}
 				else
-					doins ${f}
+					dodoc ${f}
 				fi
 			done
 		done
diff --git a/app-shells/bash/bash-5.0_p17.ebuild b/app-shells/bash/bash-5.0_p17.ebuild
new file mode 100644
index 000000000000..d3ec8df9e06e
--- /dev/null
+++ b/app-shells/bash/bash-5.0_p17.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic toolchain-funcs multilib prefix
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+is_release() {
+	case ${PV} in
+	*_alpha*|*_beta*|*_rc*) return 1 ;;
+	*) return 0 ;;
+	esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="8.0"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+if is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+"
+RDEPEND="
+	${DEPEND}
+"
+# we only need yacc when the .y files get patched (bash42-005)
+#DEPEND+=" virtual/yacc"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Patches from Chet sent to bashbug ml
+	"${FILESDIR}"/${PN}-5.0-history-append.patch
+	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+)
+
+pkg_setup() {
+	if is-flag -malign-double ; then #7332
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/*
+		touch lib/{readline,termcap}/Makefile.in # for config.status
+		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/*
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+		--with-curses
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading Bug 7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+	tc-export AR #444070
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+	keepdir /etc/bash/bashrc.d
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+	if ! use readline ; then
+		sed_args+=( #432338
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					dodoc ${f}
+				fi
+			done
+		done
+	fi
+
+	doman doc/*.1
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+
+	if [[ -L ${EROOT}/bin/sh ]] ; then
+		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
+		# missing even temporarily causes a fatal error with paludis.
+		local target=$(readlink "${EROOT}"/bin/sh)
+		local tmp=$(emktemp "${EROOT}"/bin)
+		ln -sf "${target}" "${tmp}"
+		mv -f "${tmp}" "${EROOT}"/bin/sh
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/bashdb/Manifest b/app-shells/bashdb/Manifest
index 05932909f782..c45f758f7f51 100644
--- a/app-shells/bashdb/Manifest
+++ b/app-shells/bashdb/Manifest
@@ -1,6 +1,8 @@
 DIST bashdb-4.4-1.0.0-missing-test-files.tar.xz 996 BLAKE2B 7ea67884cceda11559cf49355645cad2cfd485537643ad2fa05398518f498163596b6f591756bedd0e7b7e013fed3c6a031e245d15cd0cf316d42ef4f5c8b3e6 SHA512 e19d41569c2001ce026e4c5f80cc21c81651ff9980be059236c45e215162769ceda266eb46aa4199000e377c0bb53dec98fa1b7c5290459c412f21329b3589a5
 DIST bashdb-4.4-1.0.1.tar.bz2 701807 BLAKE2B 8d41a39831ce9466f5fcd205cf84e337ca7d876fddaea8b8c013fe4ac93a143c9f5b5e46bcc8edbb50fe4c77e87bd282ff9a244e41df007897d3b37f732bb0a3 SHA512 306fc5a49490fe04828cd6c64b23302e0f48ba8558780c93d45d9c615206e91dac5d8ff3d0660e50bc3204873131d1296492bccc23119d2f58c990bd3603221c
 DIST bashdb-5.0-1.1.0.tar.bz2 693459 BLAKE2B f8697c0f4a10b57215b0923cfb49c76536cc75de5273e6ed1709aaa56fcced8c5b3f281f15f01b8bd72363ad7c47acbd6d06a3bb3ba58b9a2daae017c101ae46 SHA512 0da69ea426c57d2f2b3f208356ee893b3fa8b96c68bf321446b5747b6bfb2eac502be6a01e3922fa873684a3953c6a3ded4a30f5682e4030680d698ee5062143
+DIST bashdb-5.0-1.1.2.tar.bz2 574210 BLAKE2B 6de1cac2cb66022f60ab7f0385361762fedee56c26729f22acb070e24a7bcf317700fb5db314c1592b8f9ccf9f7d07bfc80afd5fc88a753d0ad2954325a7f078 SHA512 32ff6d315e8cf9d59485802d5284fde53fa2d9f40ec238428a479f8a1ed1359e9bea2946b192b78534e7ac835491d5d64d73f536c8dfa93583b4c6d55d4d4545
 EBUILD bashdb-4.4.1.0.1.ebuild 1062 BLAKE2B 51762bb709b2c6234197db4c0ad466219a7896dea92c9de7b614f1eb3a53bfc4bcb2991312b9df902d41fc3f67abccb0064846913797260a3f4b863db46bd461 SHA512 ac35a5096a77039d581d037c4857847c7e6e8aa65d447f23fc2492a9d7bba06407cbe325d30afb3889ec8f4dc456e0d0bf9a8bcb365d46df28d9303873f3102e
-EBUILD bashdb-5.0.1.1.0.ebuild 1064 BLAKE2B ea70dfbce1cdc413e11d981152d64f77e15dfd720b1f1e27bbc8cfd81b3a1b2f40b715bc39f5f97d6b2611f4d680918bbfbb12a8e4787f60e645c62074ff6d4b SHA512 a0d9696201f4e6e0672faa1a6f0f65119220dcd43be49743e54dc43435ae6faa38fc72a68ffd4c422c2aded0af3627cd4f306e794974c5bf0994285bdeffd24f
+EBUILD bashdb-5.0.1.1.0.ebuild 1085 BLAKE2B 07ed00ed009971aac23ab31025c1943a9fe2b9efdea156dea6208710c4c74edf81a66d4629ffa8fc71e94ca0f626cd0f5f180e756bf4bc524aaf080126ee0268 SHA512 5b15f0ce3a9ff0885a5c7882fc3fda9019ed0a882bd9068bcc5c4527bfb505a7121a2ff296759474de346372d7e21bbabb168b779966f9ecd5a7c69500518f48
+EBUILD bashdb-5.0.1.1.2.ebuild 1081 BLAKE2B c0bafeb58dd2bd2054184498eebd6d4ca6a4fc867f5a0ee67ee0322dba3603e211c90e8bc1c76aa47fc8a1988ff0fc1d3f27be451cfe8ef1fab05301c21f222d SHA512 6c4f259252dc1a56870c6b72d18520e2f4149d181bba5abd042459bfe07d3a2204728c3f160722c66c47b5565be5e8873e0ce9a4c262fb31ccdf963209a7236a
 MISC metadata.xml 333 BLAKE2B 3d15d5b1c4dc17fb6eb805020e6cacb0b835ec4113cccec2756d5b3ccd6be5ce427383598b136f9e13280452e1d9252a609671d3016fffd14ccd898fa7553ad8 SHA512 eb1b078a7e431900181f558710bba93fb5c4633733364664e85e07b4bd05c8ba7492948d4a3ac8cb4866f128b116d82b5b6f1c8b2966318fb9ed61a9c78dda82
diff --git a/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild b/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild
index 0448dc38e718..2d3d4513fe42 100644
--- a/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild
+++ b/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
+DEPEND=">=app-shells/bash-5
+	!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild b/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild
new file mode 100644
index 000000000000..01b050fcc7fb
--- /dev/null
+++ b/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+RESTRICT="!test? ( test )"
+
+DEPEND=">=app-shells/bash-5
+	!>=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/dash/Manifest b/app-shells/dash/Manifest
index 7c95713009d4..91064b1127bd 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,12 +1,8 @@
-AUX dash-0.5.10-dumb-echo.patch 2612 BLAKE2B dd5fef2307ebc988b01f558373a5fb2be6bfa4e4d3abd72b179ce3d06a326769c5843416324971d00f363db92bcc691e6a555f7bac05544f2d9d21ac64026f4a SHA512 7f583e17f5b8df244575c0d08e7be8f213933d647168b85e19cc56378f1bb02f7fb83b8c87337c556b1436aaaca7d7367cb8566edaa43e3e7a4aaa7d87401323
-AUX dash-0.5.10.1-parser.patch 1963 BLAKE2B 205503ebbe7c805ab0e69b4821a507c01aa650161b3c8ef228e6ad08fbf25d650b3866af5992caa1be352cca1b1f790b698931faa9f918a1d8ef3bce7442741c SHA512 51e8b5edd6295e924f95a01bcba8d65ee667eb6bc274678914a675c207af598f1c02657a239becfc40040ef8dfe49da105f50f941d13ff414451d4bb4f091424
+AUX dash-0.5.20.2-gcc-fno-common.patch 1131 BLAKE2B cce4ed8a97d95e294aa7679c0ef164337a836ed9f0b7e18b38a6032545796260eba8c7502817e57bc5948aadb74b9826eb7cb5b02e66cdb954e35a5ed762f460 SHA512 6056f196a353f382b97c6865e89dbc5a63295c404fc9be83551b1458e2a42f93786ec3d0b7dac1b674b40b59e90cd968d6f1e9e0c8ca953704f4de8bb9251cbb
 AUX dash-0.5.9.1-dumb-echo.patch 2592 BLAKE2B 95e79281e579d0d40e320f0433fa94185f22e971a2e5c6b8a7686e96479a490c2d7820545875de2bdb81f52f7ce0b7ea0811a207c41601d7e2272c0829f07d14 SHA512 8dcbee6a53b46b78986c17860f84f47c94b3137b84cf46cd521ec9e4f0b5b4f5a2afbc9e7faa8130b591b3a0f9d2c9dc7853803c8b092c4ec1b5c5b7411fecbf
 AUX dash-0.5.9.1-format-security.patch 374 BLAKE2B 63a9128f8a396e9c9808867ffdff90f1a176a99108db02d4ff03395d74c9eb69039604d3921cb26c42aced4411caa27cf20eafced3febbb4b175a7d118b66ca0 SHA512 4726d96ad1a86e47374c129f1cbd13bf5f2b6c77faa4e3e85be65978222cc040175313218fe29da176af2bbc2546c432d84247ea342d261a284b64b42ce138c6
-DIST dash-0.5.10.1.tar.gz 225253 BLAKE2B 55dbdca7f01d19656e002d6e210bcae920619e2e88d4d174a3e08cbbc40bf867ece3f24ce9690ec64f95b1f0995ab35cabc08381ac031a33b55282cec0b09e73 SHA512 7ca3bbcf8bac84d359cde710a9ab393f05cf8522e969a2c110d2e71620e53f349387128045e68738dc621afe0b48f43ae3d32851187f2ae02d49b3e2575ffa6b
 DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b2e05553a3e1a9939da7b00fd80f7b9fb35f33e18b0c11850bfb1b8377e9dc9bcfd80754fd29c9d160e0ce5a4d SHA512 0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640
 DIST dash-0.5.9.1.tar.gz 225217 BLAKE2B a80aa00ea5418d00b03c9ded21ef5c3a28d599059d1ac2f20082867b71ece6afac2f0bce9bc09946450c7618ad2c7f95df63b3d519a7f56552a291d09e44a71b SHA512 d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d
-EBUILD dash-0.5.10.1-r2.ebuild 2137 BLAKE2B 474472455ed9807e0174ebbafe18429f968466775ba78ec46d66f3e622db37ed6d2919a1f57da4c19c830b997dfbba113de656ab96add7c2f7aad7f0ef2b66c5 SHA512 2e9b16cac8090b4429fe6b8a8381d1ea92e2bd6a870ae508c1ea3f3f9fd900324a5ebbf87b9ac565b6a0b0e9af1e4ae49dfd16f90f5e4adbbb9764711724d7c8
-EBUILD dash-0.5.10.2-r1.ebuild 1557 BLAKE2B 4db90f27e28afe026c8e7c6e6a2f80d2ca31850dc3accd46399b39dc4bed85fad7cb707096ddb9fad319f61fb89819b18cb18956966c3a4528819b86ecf396af SHA512 3add9fa1ddfd5abd6b807cb5401b90315cc7c89d0406797238f95c9174892ba3fe84507780da7c263d4795440cb4351fe7cde3146ccdf3bcfcf5ba8f4061177a
-EBUILD dash-0.5.10.2.ebuild 2242 BLAKE2B 3c07b2e20dd6a37525e5eca1a2e7a9a7f9cad3488d1dcb3b0486615a79ed43866c00817c1d5b244fdc9572d242c0a12c266b804f35359d03625d8f3d2a627231 SHA512 3758d747dde92e5660f7d3b0d0752d978387b9165568c65f21d5e964af34d983473508a74e363594aba1b9e8502ae9c35b1e61fc44cd013981540720a37c8894
+EBUILD dash-0.5.10.2-r1.ebuild 1599 BLAKE2B bd791b7188f16fe8bf627321cc99b9bd165d35c4bd42f6c5c9de0446ba99277ffbe88f6df1cfd6c51518f5f506b9966680159e0bbc7fa46ee34d881368ae1ce9 SHA512 672b9b87555c251c071772a505b77f70190513692002ee974587e6905fc4f100eba3cde7d115f380ceb0d8102fc7e3091354e8693ce466cb48f7d88713ec0d3b
 EBUILD dash-0.5.9.1-r3.ebuild 2097 BLAKE2B b0b5217070496dba9ad28d466a20ec60d7e215ce08d232dd709a07db513d43734b4d82f551c14b4c3793555b4c0d6dc7e1cb2dbe9c1bf0db28b320b8408c693b SHA512 3fd4a0426acd6a10011c248f415e9c206fb027b18a83c7eab4d4c049ef50ff034e3a7f3c5def9b11dd4ec0b3d0f9a7121764606d5820e351dd0e3348fc902cdc
 MISC metadata.xml 598 BLAKE2B 0ec9bc56758f158bfce29ffcbbb84c45abe17cd477014fa428240a9af5a4a9f8740c5a66f4aa4828795135d7464426c65410702e81aea81befec5e11a07ec3fa SHA512 a477ff729919625c910ef9a0b95ea85e683122383c4026c1c51f163d8faca06749ec05eef8b4f01ed9eede68b49e637f24f94202b8a00e67bb01bc21294610e6
diff --git a/app-shells/dash/dash-0.5.10.1-r2.ebuild b/app-shells/dash/dash-0.5.10.1-r2.ebuild
deleted file mode 100644
index 16020298e800..000000000000
--- a/app-shells/dash/dash-0.5.10.1-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs versionator
-
-#MY_PV="$(get_version_component_range 1-3)"
-DEB_PATCH="" #$(get_version_component_range 4)
-#MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Debian Almquist Shell"
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
-if [[ -n "${DEB_PATCH}" ]] ; then
-	DEB_PF="${PN}_${MY_PV}-${DEB_PATCH}"
-	SRC_URI+=" mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libedit static vanilla"
-
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.9.1-format-security.patch
-	"${FILESDIR}"/${P}-parser.patch
-)
-
-src_prepare() {
-	if [[ -n "${DEB_PATCH}" ]] ; then
-		eapply "${WORKDIR}"/${DEB_PF}.diff
-		eapply */debian/diff/*
-	fi
-
-	#337329 #527848
-	use vanilla || eapply "${FILESDIR}"/${PN}-0.5.10-dumb-echo.patch
-
-	default
-
-	# Fix the invalid sort
-	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
-
-	# Use pkg-config for libedit linkage
-	sed -i \
-		-e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
-		configure || die
-}
-
-src_configure() {
-	# don't redefine stat on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		export ac_cv_func_stat64=yes
-	fi
-	append-cppflags -DJOBS=$(usex libedit 1 0)
-	use static && append-ldflags -static
-	# Do not pass --enable-glob due to #443552.
-	# Autotools use $LINENO as a proxy for extended debug support
-	# (i.e. they're running bash), so disable that. #527644
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-fnmatch
-		--disable-lineno
-		$(use_with libedit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if [[ -n "${DEB_PATCH}" ]] ; then
-		dodoc */debian/changelog
-	fi
-}
diff --git a/app-shells/dash/dash-0.5.10.2-r1.ebuild b/app-shells/dash/dash-0.5.10.2-r1.ebuild
index f04c97dff904..cb4780554abe 100644
--- a/app-shells/dash/dash-0.5.10.2-r1.ebuild
+++ b/app-shells/dash/dash-0.5.10.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit static"
 
 BDEPEND="virtual/pkgconfig"
@@ -19,7 +19,10 @@ RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
 DEPEND="${RDEPEND}
 	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
 
-PATCHES=( "${FILESDIR}/${PN}-0.5.9.1-format-security.patch" )
+PATCHES=(
+	"${FILESDIR}/dash-0.5.9.1-format-security.patch"
+	"${FILESDIR}/dash-0.5.20.2-gcc-fno-common.patch"
+)
 
 src_prepare() {
 	default
diff --git a/app-shells/dash/dash-0.5.10.2.ebuild b/app-shells/dash/dash-0.5.10.2.ebuild
deleted file mode 100644
index 4610e6318673..000000000000
--- a/app-shells/dash/dash-0.5.10.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs versionator
-
-#MY_PV="$(get_version_component_range 1-3)"
-DEB_PATCH="" #$(get_version_component_range 4)
-#MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Debian Almquist Shell"
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
-if [[ -n "${DEB_PATCH}" ]] ; then
-	DEB_PF="${PN}_${MY_PV}-${DEB_PATCH}"
-	SRC_URI+=" mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libedit static vanilla"
-
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.9.1-format-security.patch
-)
-
-src_prepare() {
-	if [[ -n "${DEB_PATCH}" ]] ; then
-		eapply "${WORKDIR}"/${DEB_PF}.diff
-		eapply */debian/diff/*
-	fi
-
-	#337329 #527848
-	use vanilla || eapply "${FILESDIR}"/${PN}-0.5.10-dumb-echo.patch
-
-	default
-
-	# Fix the invalid sort
-	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
-
-	# Use pkg-config for libedit linkage
-	sed -i \
-		-e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
-		configure || die
-}
-
-src_configure() {
-	# don't redefine stat on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		export ac_cv_func_stat64=yes
-
-		# if your headers strictly adhere to POSIX, you'll need this too
-		[[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
-	fi
-	append-cppflags -DJOBS=$(usex libedit 1 0)
-	use static && append-ldflags -static
-	# Do not pass --enable-glob due to #443552.
-	# Autotools use $LINENO as a proxy for extended debug support
-	# (i.e. they're running bash), so disable that. #527644
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-fnmatch
-		--disable-lineno
-		$(use_with libedit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if [[ -n "${DEB_PATCH}" ]] ; then
-		dodoc */debian/changelog
-	fi
-}
diff --git a/app-shells/dash/files/dash-0.5.10-dumb-echo.patch b/app-shells/dash/files/dash-0.5.10-dumb-echo.patch
deleted file mode 100644
index 35d324609302..000000000000
--- a/app-shells/dash/files/dash-0.5.10-dumb-echo.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-http://bugs.gentoo.org/337329
-http://bugs.gentoo.org/527848
-
-there's no requirement for `echo` to support escape sequences. bash, by default,
-does not, while dash always does.  POSIX permits either behavior:
-http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html
-
-however, since the behavior is not portable, no one should be relying on echo
-having any specific behavior.  they should use `printf` when they want an escape
-sequence.  it also makes dash smaller & faster to disable this logic entirely.
-
---- dash-0.5.10/src/bltin/printf.c
-+++ dash-0.5.10/src/bltin/printf.c
-@@ -457,22 +457,13 @@
- int
- echocmd(int argc, char **argv)
- {
--	const char *lastfmt = snlfmt;
--	int nonl;
-+	int i;
- 
--	if (*++argv && equal(*argv, "-n")) {
--		argv++;
--		lastfmt = "%s";
-+	for (i = 1; i < argc; ++i) {
-+		outstr(argv[i], out1);
-+		if (i < argc - 1)
-+			outc(' ', out1);
- 	}
--
--	do {
--		const char *fmt = "%s ";
--		char *s = *argv;
--
--		if (!s || !*++argv)
--			fmt = lastfmt;
--
--		nonl = print_escape_str(fmt, NULL, NULL, s ?: nullstr);
--	} while (!nonl && *argv);
-+	outc('\n', out1);
- 	return 0;
- }
---- dash-0.5.10/src/dash.1
-+++ dash-0.5.10/src/dash.1
-@@ -1182,43 +1182,15 @@
- option turns off the effect of any preceding
- .Fl P
- options.
--.It Xo echo Op Fl n
-+.It Xo echo
- .Ar args... 
- .Xc
- Print the arguments on the standard output, separated by spaces.
--Unless the
--.Fl n
--option is present, a newline is output following the arguments.
- .Pp
--If any of the following sequences of characters is encountered during
--output, the sequence is not output.  Instead, the specified action is
--performed:
--.Bl -tag -width indent
--.It Li \eb
--A backspace character is output.
--.It Li \ec
--Subsequent output is suppressed.  This is normally used at the end of the
--last argument to suppress the trailing newline that
--.Ic echo
--would otherwise output.
--.It Li \ef
--Output a form feed.
--.It Li \en
--Output a newline character.
--.It Li \er
--Output a carriage return.
--.It Li \et
--Output a (horizontal) tab character.
--.It Li \ev
--Output a vertical tab.
--.It Li \e0 Ns Ar digits
--Output the character whose value is given by zero to three octal digits.
--If there are zero digits, a nul character is output.
--.It Li \e\e
--Output a backslash.
--.El
-+No arguments or backslash sequences are supported as they are not portable.
-+They will be printed out exactly as passed in.
- .Pp
--All other backslash sequences elicit undefined behaviour.
-+You can replace `echo -n ...` with the portable `printf %s ...` construct.
- .It eval Ar string ...
- Concatenate all the arguments with spaces.
- Then re-parse and execute the command.
diff --git a/app-shells/dash/files/dash-0.5.10.1-parser.patch b/app-shells/dash/files/dash-0.5.10.1-parser.patch
deleted file mode 100644
index 0939b7cb7222..000000000000
--- a/app-shells/dash/files/dash-0.5.10.1-parser.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 469c5fd4f57622b1a6571172898ab29430319d4a Mon Sep 17 00:00:00 2001
-From: Herbert Xu <herbert@gondor.apana.org.au>
-Date: Fri, 11 May 2018 23:41:25 +0800
-Subject: parser: Fix incorrect eating of backslash newlines
-
-With the introduction of synstack->syntax, a number of references
-to the syntax variable was missed during the conversion.  This
-causes backslash newlines to be incorrectly removed in single
-quote context.
-
-This patch also combines these calls into a new helper function
-pgetc_top.
-
-Fixes: ab1cecb40478 ("parser: Add syntax stack for recursive...")
-Reported-by: Leah Neukirchen <leah@vuxu.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
----
- src/parser.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/parser.c b/src/parser.c
-index 8e40781..8bd3db4 100644
---- a/src/parser.c
-+++ b/src/parser.c
-@@ -853,6 +853,11 @@ static int pgetc_eatbnl(void)
- 	return c;
- }
- 
-+static int pgetc_top(struct synstack *stack)
-+{
-+	return stack->syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl();
-+}
-+
- static void synstack_push(struct synstack **stack, struct synstack *next,
- 			  const char *syntax)
- {
-@@ -915,7 +920,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs)
- 			attyline();
- 			if (synstack->syntax == BASESYNTAX)
- 				return readtoken();
--			c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl();
-+			c = pgetc_top(synstack);
- 			goto loop;
- 		}
- #endif
-@@ -929,7 +934,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs)
- 					goto endword;	/* exit outer loop */
- 				USTPUTC(c, out);
- 				nlprompt();
--				c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl();
-+				c = pgetc_top(synstack);
- 				goto loop;		/* continue outer loop */
- 			case CWORD:
- 				USTPUTC(c, out);
-@@ -1056,7 +1061,7 @@ toggledq:
- 					USTPUTC(c, out);
- 				}
- 			}
--			c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl();
-+			c = pgetc_top(synstack);
- 		}
- 	}
- endword:
--- 
-cgit v1.1
-
diff --git a/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch b/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch
new file mode 100644
index 000000000000..08d5ed08a398
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch
@@ -0,0 +1,38 @@
+From 4459ec7f6cd394b9d01bd9d537b0f04975583dff Mon Sep 17 00:00:00 2001
+From: Jeroen Roovers <jer@gentoo.org>
+Date: Mon, 16 Mar 2020 19:25:00 +0100
+Subject: [PATCH] input: Fix compiling against libedit with -fno-common
+To: dash@vger.kernel.org
+
+With -fno-common, which will be enabled by default in GCC 10, we see
+this error:
+
+ld: input.o:(.bss+0x0): multiple definition of `el';
+histedit.o:(.bss+0x8): first defined here
+
+To fix this, simply remove the definition as it is not needed.
+
+Signed-off-by: Jeroen Roovers <jer@gentoo.org>
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ src/input.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/input.c b/src/input.c
+index ae0c4c8..e84eca8 100644
+--- a/src/input.c
++++ b/src/input.c
+@@ -67,10 +67,6 @@ MKINIT char basebuf[IBUFSIZ];	/* buffer for top level input file */
+ struct parsefile *parsefile = &basepf;	/* current input file */
+ int whichprompt;		/* 1 == PS1, 2 == PS2 */
+ 
+-#ifndef SMALL
+-EditLine *el;			/* cookie for editline package */
+-#endif
+-
+ STATIC void pushfile(void);
+ static int preadfd(void);
+ static void setinputfd(int fd, int push);
+-- 
+2.25.1
+
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index e2d1b3cc09ae..0c9dd570f764 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -4,8 +4,10 @@ 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
 DIST fish-3.1.0.tar.gz 6810953 BLAKE2B 93143d9a2496b569ff6f73f4332beb3b738b7b03ede5357b0d7cc02a0c7da99852eb44a61c16d2524396ae37e76a1b439d708ae01488e79b0e03ba72504ebdec SHA512 143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff
+DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b SHA512 b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563
 EBUILD fish-2.7.1.ebuild 2446 BLAKE2B e3ef925138c3db3412cd276dbaa374e3073beca1371c7f3b26be53b4ceb62fd603b0574c888aea9949c195c0f1c3ae540096aab951cc4dba30b03771161aa847 SHA512 179f0ae63b1ca6694bc579fa93a1bdc86f1e7aface1ea98e6fe1a6c08fe0ff460e6599cc0d0e496a9b02aea271bdc2f416c9fc0e2c2f6d3e805c7246141b804b
 EBUILD fish-3.0.2.ebuild 1655 BLAKE2B fe92bb0efdfff55487758ce2729199743cf3ef7a00509178098a785d8dec6368e02fc18fe978ea403f0987b3ab7cf5f6adb948bd24c668c095205477da2f1ae9 SHA512 9ea057a38f500a0645bbd819c102501b308e5634e05dada1c5a976465327e958546b2b6695c7b3c39716c513bdb507faf499f1a48917c713d8f062d81701fda2
 EBUILD fish-3.1.0.ebuild 1557 BLAKE2B ccd54d16b09cd15983cb58ac4da97170fcdd8493f315968c5709e20ef06b9550192a67f7df82c69637ccb08ef8e07db199f90a1ce960d13fedfd6525852bdc11 SHA512 99fb79a548105a2df3c4c8098a2967ce91e52eee8a6d866e95606ef373a0bae8d23d81a322d3e307344f3ad04ed9d3a6240d3d25b84c1130bc54c2f7fb8a6570
-EBUILD fish-9999.ebuild 1571 BLAKE2B ac710d0493195aa67c3b75cc09e4082961c19e36eb654bd3e08cc23130b1b4337a62ff690eb1611431f17434578006d3810d29098b09e54ec5392754043481de SHA512 10db344a2da9151b78856dca5fd09028fed22af201afbf12a7c244de478c6052c97b791ba94f81a588ce2372d041872afc823a203146de223cde2a30fad31c17
+EBUILD fish-3.1.2.ebuild 1557 BLAKE2B ccd54d16b09cd15983cb58ac4da97170fcdd8493f315968c5709e20ef06b9550192a67f7df82c69637ccb08ef8e07db199f90a1ce960d13fedfd6525852bdc11 SHA512 99fb79a548105a2df3c4c8098a2967ce91e52eee8a6d866e95606ef373a0bae8d23d81a322d3e307344f3ad04ed9d3a6240d3d25b84c1130bc54c2f7fb8a6570
+EBUILD fish-9999.ebuild 1577 BLAKE2B aa41c8e8271d32267c94e09e7879f80e70fdbbd0007bcc4f0031f375189310448f6492e607e3ac8b39792372ec5e83c98fafecffb6170c60933addf843cd3bec SHA512 f18c48e2200f6f4837d9f572514181f13598a3b4681b7cd2d994793845f858751be475fa02105eb2266b4b924ebdb048a146f56d92738613450e2a136c82d775
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.1.2.ebuild b/app-shells/fish/fish-3.1.2.ebuild
new file mode 100644
index 000000000000..77f6617e11c3
--- /dev/null
+++ b/app-shells/fish/fish-3.1.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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 ~hppa ~ia64 ~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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.32[pcre32]
+	sys-libs/ncurses:0=[unicode]
+"
+
+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_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCURSES_NEED_NCURSES=ON
+		-DBUILD_DOCS="$(usex doc)"
+		-DWITH_GETTEXT="$(usex nls)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	cmake_build -j1 test
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index 24e78364e25d..44df9a8565df 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index 7002765f73b2..a0be8ea15c1d 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -1,5 +1,6 @@
 AUX fzf-0.21.0-makefile.patch 584 BLAKE2B 314673211be6170b0afc0d95ffa49f78afbc2bc2ca99295b109652b5d03f4664cbbef707dcd04ffbba4fd0e0ff21e54680fadc3f4b4ca34fdf950439e30974d4 SHA512 ca42041bf35405b07c9d9dda2b67590f22bfe4a12bba7116a7d138f730b288c916bd41df3302f9401cc46e03ddda5ec36a260b9a4b977f2eafd1d48ea3dc288f
 DIST fzf-0.21.0.tar.gz 161819 BLAKE2B 2da6b62425e88c10fa8d3ce3b7d2d25c67a9bd99bf3c402a8e0c84e567f931393fb914e365d0840d4a21409b06b6c76b7f622b68fe99fa5edd9fba8817eefea7 SHA512 8c3b7eb14ac98b386c26bd6621c54a27e904985f2e87c37ae8f31c3596196f32a817be17aa5e7dd399757cb90b5f25c35ce4a240453eb28f7d1d2fd837d8900d
+DIST fzf-0.21.1.tar.gz 163978 BLAKE2B 2f05379049229ca01570b3a58bbcaeab48f85330a556efccca2a19b6fbc80da160dd6cada27d35c3fbac3983e71141f408069e70916663aa3b5f40ed5ad22165 SHA512 db816446a2d562148f7bfe4fc99696e0786d4acfe021ba9bf31344c81219b8a61cae03ec7d4b279ab3dba9ca93fc883e655fc71a750fb6f1905612db071ac831
 DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
 DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
 DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
@@ -45,4 +46,5 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191011211836-4c025a95b26e.mod 212 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191011211836-4c025a95b26e.zip 2877934 BLAKE2B 193ec7c3e8b82001b06f630dbda8afb9383ac66d7a23fdfe27414f91a2f2e17490b98605023a8a990f5f9fc5f10144fd01b1854fdb1a39d608cd305b0243dceb SHA512 553de87d4a0fdf45e1ce5128ee704ef92c23d0dce1182671c80e324c0f0ef680732bd82b02d8d202d2c1ae7d4d1bb61a944b60d92d0f99f716a5dcc09ea4701d
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 EBUILD fzf-0.21.0.ebuild 6476 BLAKE2B 963c8c04123e93eb681e3f9bfc1e50f2636f1b89710623c2c6d52d21107369050455b356c53ab7d74c9ba6fe760f0665da7b4d1d774c842957047d701269c5e8 SHA512 3112aea2d3289b0450d11d6a3f40d29fbcce9d6ff1d9dc14cb6a48d43990c98572bf33d7d675f3e3ca31770938cde0758b73f7bcfe4fb3d476d9ea2c4da3b490
+EBUILD fzf-0.21.1.ebuild 4117 BLAKE2B a461ff1ccb839ca31ba79e72ac2825fdf8b5ba3d7246160c1e6581c71575a0e00d1fabb72984518b677d565bdb7cc6767455093e793af2281c2a264042bc2830 SHA512 050c6952140386b356e966c7600e300e805222d8adefe027c8b18422c4805841b17aa400d490d35a125ee494ce013f510e8b7ab259ae70ef7b5f90480e03ac83
 MISC metadata.xml 1466 BLAKE2B 7157dc754dbbd229dcc15e449274bafd3a87f73285ef609d09f6585a326cd43d13cf103928a0ec9cd10fe9fdb5803c1b0fe227e9111b67d0e773afc308a56d87 SHA512 d191d571b3626cdadfbd81728dce0180807c8b091bd7b3e73b8489b2b000414d02ec8b41e975312045bbf84fabb8fe1bd11ba46f19be0363126ad05ff30c04f7
diff --git a/app-shells/fzf/fzf-0.21.1.ebuild b/app-shells/fzf/fzf-0.21.1.ebuild
new file mode 100644
index 000000000000..54e6dff35dfa
--- /dev/null
+++ b/app-shells/fzf/fzf-0.21.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="A general-purpose command-line fuzzy finder, written in GoLang"
+HOMEPAGE="https://github.com/junegunn/fzf"
+
+EGO_SUM=(
+	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
+	"github.com/gdamore/encoding v1.0.0"
+	"github.com/gdamore/encoding v1.0.0/go.mod"
+	"github.com/gdamore/tcell v1.3.0"
+	"github.com/gdamore/tcell v1.3.0/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.2"
+	"github.com/lucasb-eyer/go-colorful v1.0.2/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.3"
+	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-runewidth v0.0.8"
+	"github.com/mattn/go-runewidth v0.0.8/go.mod"
+	"github.com/mattn/go-shellwords v1.0.9"
+	"github.com/mattn/go-shellwords v1.0.9/go.mod"
+	"github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e"
+	"github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d"
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756"
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e"
+	"golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+)
+go-module_set_globals
+
+EGO_PN="github.com/junegunn/${PN}"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( ${FILESDIR}/${PN}-0.21.0-makefile.patch )
+
+src_install() {
+	default
+
+	# Install fzf binary
+	dobin bin/${PN}
+	doman man/man1/${PN}.1
+
+	# Install TMUX utils
+	dobin bin/${PN}-tmux
+	doman man/man1/${PN}-tmux.1
+
+	# Install Neovim plugin
+	insinto /usr/share/nvim/runtime/plugin
+	doins plugin/${PN}.vim
+
+	# Install VIM plugin
+	insinto /usr/share/vim/vimfiles/plugin
+	doins plugin/${PN}.vim
+
+	# Install bash completion file
+	newbashcomp shell/completion.bash ${PN}
+
+	# Install zsh completion file
+	insinto /usr/share/zsh/site-functions
+	newins shell/completion.zsh _${PN}
+
+	# Install key-bindings for bash, fish and zsh
+	insinto /usr/share/fzf
+	doins shell/key-bindings.bash
+	doins shell/key-bindings.fish
+	doins shell/key-bindings.zsh
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To add fzf support to your shell, make sure to use the right file"
+		elog "from /usr/share/fzf."
+		elog
+		elog "For bash, add the following line to ~/.bashrc:"
+		elog
+		elog "	# source /usr/share/fzf/key-bindings.bash"
+		elog
+		elog "Or create a symlink:"
+		elog
+		elog "	# ln -s /usr/share/fzf/key-bindings.bash /etc/bash/bashrc.d/fzf.bash"
+		elog
+		elog "Plugins for Vim and Neovim are installed to respective directories"
+		elog "and will work out of the box."
+		elog
+		elog "For fzf support in tmux see fzf-tmux(1)."
+	fi
+}
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 83b4896783f7..01c3514a7488 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,6 +1,8 @@
 DIST mksh-R57.tgz 419604 BLAKE2B 11af09535ace3fdd982189fb7d7f3e5961776c3bdbf6b981f4f1506a66ebdbd893efb9aa50a5a36fd8b3b7bd3e149021aad154888dc81e0de29f41e91eeb583c SHA512 7d7fa557c17da4f1f62f82877a136439efb6d4f9fde52b2df39214db09868982e756df6e4fe83498f9013cbcf3252dc383b00ddfafaa4c9f143ffded7cd255b3
 DIST mksh-R58.tgz 435617 BLAKE2B c5dd16effc8c08ac5f4a3986a14d786990b64d9da76b1b7d27de8a2dfbfa6fe172e9c58681df8f428a1e3548e54b5f6b037714a924f1053bfa3eedacc8eba173 SHA512 711351f8bbe8e44fcf9e7963f8e749938ec3ccb362fafd5350d44593841c2acb6d54ffa115dbb6b83c30865728a4c5274c05feedb063e293361e2830d263d80f
+DIST mksh-R59.tgz 438821 BLAKE2B 4a737b47ab58a99707d93b680ec5474b7b6e190241778010879d0b20028f97bfca9b526c807ed0b37d03b6aef9a2eaf2506d73d1a00ac14b60b21e57791d8d4f SHA512 be5009ce8f02eab1392f95d7f85f5aad57b1445684b4fe8cd0284a7d79386170979303ef19f039fdbb53bd2a791f3e3603d2fe57e015fed4cb4a24ab710bcfbb
 EBUILD mksh-57-r2.ebuild 1634 BLAKE2B d52a0e303f6497382783afef1022ae09ae2a7a0a8d8cd070bbc23aaeb2f24c318540713fa476a267e8b91a074349065b5ed803b08b9de0beddd23d4f392d87d2 SHA512 2175d226c2e61da5dfa3d38930302e448971be92c6db47567edc82bf36a7db296db9e3fe0f6ff340d2b38c0f93e6d97ad5490eb269ed6f3c031685604f9f20b1
 EBUILD mksh-58.ebuild 1592 BLAKE2B d446f1a29cd10d3d9d19f88eab9a37a3e2ef38eccaa210d4366156fb5498f4e7e2752ea8dd51ba52179072e206a88c974cbf4387ca32f6256683e6086b5098e6 SHA512 149e584f485bc1a49dafe104946a569ad6f167217773cf25d680864abfb000d11a028e1b89ae59148955eb7d6c4c20e9a2220962bef138d171c151269e270d59
-EBUILD mksh-9999.ebuild 1592 BLAKE2B d446f1a29cd10d3d9d19f88eab9a37a3e2ef38eccaa210d4366156fb5498f4e7e2752ea8dd51ba52179072e206a88c974cbf4387ca32f6256683e6086b5098e6 SHA512 149e584f485bc1a49dafe104946a569ad6f167217773cf25d680864abfb000d11a028e1b89ae59148955eb7d6c4c20e9a2220962bef138d171c151269e270d59
+EBUILD mksh-59.ebuild 1615 BLAKE2B f3e78819674ff13d6e7562bc7c8cf9969bc479f8f12e23ce9f7ae136749e12d2149c1f48522902a46077210af5b64a90720413f10aabfd04cfd82d3d03a7f0b6 SHA512 38da9578d15a8541107e596fd2df28cfa19e9c28446fbd312133afad0d2a78ebc8b157076776e8736f5feb6c5fc9cad9cd79a105e8a57a7bb935caff1022a1f9
+EBUILD mksh-9999.ebuild 1615 BLAKE2B f3e78819674ff13d6e7562bc7c8cf9969bc479f8f12e23ce9f7ae136749e12d2149c1f48522902a46077210af5b64a90720413f10aabfd04cfd82d3d03a7f0b6 SHA512 38da9578d15a8541107e596fd2df28cfa19e9c28446fbd312133afad0d2a78ebc8b157076776e8736f5feb6c5fc9cad9cd79a105e8a57a7bb935caff1022a1f9
 MISC metadata.xml 565 BLAKE2B 7bbb94f30f910e5a73f6fca91db59bd8b9825e358903bfc3116222c9bcb9927b5609b4c31bb5f36db5898023631a0d8dd2ad8d6a218136bb2e1786337db58fed SHA512 a10bf827859a6176fef847313a096d8ce04dfb6a271452602f8fe3638c8aeb7da11a5ea7a9d30257e516d8344365e30372e4c16d31d23c19e97c3d7ddd333914
diff --git a/app-shells/mksh/mksh-59.ebuild b/app-shells/mksh/mksh-59.ebuild
new file mode 100644
index 000000000000..42d3bbb2ec9c
--- /dev/null
+++ b/app-shells/mksh/mksh-59.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit cvs
+	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
+	ECVS_MODULE="mksh"
+	ECVS_USER="_anoncvs"
+	ECVS_AUTH="ext"
+else
+	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="MirBSD Korn Shell"
+# Host is TLSv1.0-only, keep to http for compatibility with modern browsers
+HOMEPAGE="http://mirbsd.de/mksh"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="lksh static test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-lang/perl
+		sys-apps/ed
+	)
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+	if use lksh; then
+		cp -pr "${S}" "${S}"_lksh || die
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	use static && export LDSTATIC="-static"
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+
+	if use lksh; then
+		pushd "${S}"_lksh >/dev/null || die
+		CPPFLAGS="${CPPFLAGS} -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \
+			sh Build.sh -r -L || die
+		popd >/dev/null || die
+	fi
+
+	sh Build.sh -r || die
+}
+
+src_install() {
+	into /
+	dobin mksh
+	doman mksh.1
+	dodoc dot.mkshrc
+	dosym mksh /bin/rmksh
+
+	if use lksh; then
+		dobin "${S}"_lksh/lksh
+		doman "${S}"_lksh/lksh.1
+	fi
+}
+
+src_test() {
+	einfo "Testing regular mksh."
+	./mksh test.sh -v || die
+
+	if use lksh; then
+		einfo "Testing lksh, POSIX long-bit mksh."
+		pushd "${S}"_lksh >/dev/null || die
+		./lksh test.sh -v || die
+		popd >/dev/null || die
+	fi
+}
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index a3e79a49d42e..42d3bbb2ec9c 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -61,6 +61,7 @@ src_install() {
 	dobin mksh
 	doman mksh.1
 	dodoc dot.mkshrc
+	dosym mksh /bin/rmksh
 
 	if use lksh; then
 		dobin "${S}"_lksh/lksh
diff --git a/app-shells/peco/Manifest b/app-shells/peco/Manifest
index b40e2ad9f7ed..8b01c39b01b2 100644
--- a/app-shells/peco/Manifest
+++ b/app-shells/peco/Manifest
@@ -1,21 +1,22 @@
-DIST github.com-davecgh-go-spew-v1.1.0.tar.gz 42337 BLAKE2B 691ee430beca602ea686aa065b23af5e00356e866cbca2b014bf0c8f4cc965a2318e6a39232772098e250d61d5bd6707afb769fdf4223c81a8249cad267d1971 SHA512 20c9f0550a2d5030265dde8ad3ed009ce5c6490d010f184ad3f656b8fe5eb6e5c6abc9594408240aa731c0977afd9739d293490e6164cc0ce156652611b05b39
-DIST github.com-google-btree-0c3044bc8bad.tar.gz 14149 BLAKE2B 0042260a128569f42bd5cb03280d129893f15f3eec3e063a5892fa08d43c42f50c0fcfcab9a0dfd58dab1b198fb730fa45d61a474957e89157bc96804cd8097e SHA512 47885509723b39d9b1be6552e4c3ae49088e52daff2c0d0babfd2ca27c5b40f9665cba0f4b45f6a673d04d7ea906da3416cc3de4ea33cdcbf4d8ccf6e350a46b
-DIST github.com-google-btree-0c3044bc8bada22db67b93f5760fe3f05d6a5c25.tar.gz 14149 BLAKE2B 0042260a128569f42bd5cb03280d129893f15f3eec3e063a5892fa08d43c42f50c0fcfcab9a0dfd58dab1b198fb730fa45d61a474957e89157bc96804cd8097e SHA512 47885509723b39d9b1be6552e4c3ae49088e52daff2c0d0babfd2ca27c5b40f9665cba0f4b45f6a673d04d7ea906da3416cc3de4ea33cdcbf4d8ccf6e350a46b
-DIST github.com-jessevdk-go-flags-8bc97d602c3bfeb5fc6fc9b5a9c898f245495637.tar.gz 54382 BLAKE2B 5bb4a8609bb8d430e1e0adfca5f09bf8c8884832e0b248e93fd2b9e9f83d5fb816dff9afc46fdbfb65a97efa65e346b54898c14d26a302cdba6a4406a7e3a41a SHA512 65bd90bb6c3d9070ff415f514f2dd113bf886c0a2bcfcf3dbec6fe789df9f27683a4df83d71426f63d00a208b3b581cf791755d71f8dc0c7f7a684a38b7c8401
-DIST github.com-jessevdk-go-flags-v1.1.0.tar.gz 54372 BLAKE2B e8b86c553a759b99e9a774328c0be122ed40abb189f2be9cc27ab4bc2b05b3d634a5af2bf50a55118c2927742a80ffc5df459b8fa3795629a37f6a45cb896c71 SHA512 7e2472883ac227c263f82fb420ce4257796c229b3a9a34ef249c45020b612fa18b765e3d68d90af5727a6802c1070b0ef86583128b1e8cc33ae1eece005255bb
-DIST github.com-lestrrat-go-pdebug-2e6eaaa5717f81bda41d27070d3c966f40a1e75f.tar.gz 5178 BLAKE2B f90e9d643bc6e2829bea16c5ccd65db5235b5bbca7c5a6da0bab8ee99c6b6e517b94a896dbadbdd3f92208c33aa9342c77c79e83e648a9721183fba192135b13 SHA512 b974046135b8fe7f4272eb0f335f30bea93fb25ec9813a733dd34a2342cd6174a2a67ecd595db51e37eee03ffb5155a67cb86afb74b8b99a151d7cbc9aa52ac7
-DIST github.com-lestrrat-go-pdebug-39f9a71bcabe.tar.gz 5184 BLAKE2B 9917f86ec739bd28463ae3b97e0afe43cbd784ede6ecfb65b88de579c4eec69a2837affbd20fff8a298a78af0c8ed8a2b4eb73ecb193ede8b07bb21d12a1a1b5 SHA512 ec614b9fc419a36a49221faabfc815ba2074dedd7a071ba0b99b747d6d82fd88d7246d82de73c18a6072c2f610a0f48f4244d6d6209f302e674d92c5410ee017
-DIST github.com-mattn-go-runewidth-737072b4e32b.tar.gz 6862 BLAKE2B c74b5450128e0093d5ae7b37871024fbe9c8e6bf166520dfc32482e2636ba3c0981e3224d843cbde880fa218872c65b37a1046ef4823d7cc3c786ec5fa0bd969 SHA512 ff8389d189ed1480929954d2567026984d93910a6fa7cdc3c6a925e8dc876a3df10298b08bd7bbf6f7d90914d64212928b2b1b3032ee4bd89974a2938a77f853
-DIST github.com-mattn-go-runewidth-737072b4e32b7a5018b4a7125da8d12de90e8045.tar.gz 6862 BLAKE2B c74b5450128e0093d5ae7b37871024fbe9c8e6bf166520dfc32482e2636ba3c0981e3224d843cbde880fa218872c65b37a1046ef4823d7cc3c786ec5fa0bd969 SHA512 ff8389d189ed1480929954d2567026984d93910a6fa7cdc3c6a925e8dc876a3df10298b08bd7bbf6f7d90914d64212928b2b1b3032ee4bd89974a2938a77f853
-DIST github.com-nsf-termbox-go-93860e161317.tar.gz 32766 BLAKE2B dc03c1356c5c29ab5820904574f8e6bf7bba570e8cc78b64a1edf7937a3c7c3027e4ba0b84706927480c1a8992152caa64621d2881c505bef887056102bd1477 SHA512 15401bfeea3efdb545bdcd9445aec02c8e225b861d10041859093ab07113a9e5e33d3c94b083453183a50043541c830b1faa4c81eec8c8c1982c7a22876cee35
-DIST github.com-nsf-termbox-go-e2050e41c8847748ec5288741c0b19a8cb26d084.tar.gz 31443 BLAKE2B 821aa359d41a5aada4e184ad38159db5a6d1d581940fad86e175745757eb9451ccdf82de17217d8ddcbee87e5ae3390bba0e64ae656981a91623b952b214bdfa SHA512 81c1f9ce6c507404ee79238c655d7c043c895358ef38256c2e9b95498d88149e8aa6ba37659ec2ce42b46e200d87b043c6922e0d784538e7b9dfe9771ff73ea0
-DIST github.com-pkg-errors-248dadf4e906.tar.gz 11334 BLAKE2B 7d703863f2420dab1975063ab8fe27d4b1b203bfda9f279d288cf50b2ff97e94417fc6cd5dbbe1575b4ba8de3e64efbb1e2903965a3735b9bd6308126fb299c9 SHA512 ee488416799f9359958e1cf68cd17a13019a11687dccee7db2633fcd361c7a48da0f6afec6275977f09a38f8475625b66d9f51a4003d2337d07aadf091f5e1d9
-DIST github.com-pkg-errors-248dadf4e9068a0b3e79f02ed0a610d935de5302.tar.gz 11334 BLAKE2B 7d703863f2420dab1975063ab8fe27d4b1b203bfda9f279d288cf50b2ff97e94417fc6cd5dbbe1575b4ba8de3e64efbb1e2903965a3735b9bd6308126fb299c9 SHA512 ee488416799f9359958e1cf68cd17a13019a11687dccee7db2633fcd361c7a48da0f6afec6275977f09a38f8475625b66d9f51a4003d2337d07aadf091f5e1d9
-DIST github.com-pmezard-go-difflib-v1.0.0.tar.gz 11398 BLAKE2B 8f317c172d615e07c92337dd814c07c772347de3fe81b952bbc4fd1a643d495cfb6ec5b694a531f2745e1601eca2d4977ea2c1202ac7fb1e3cdba31e90c4ea34 SHA512 283927de73a3d0405bbca8b5b0c24137dde2f1063539c6ce4437331ed99e732175b2a384e5a70cb9a87cc74da94f5347e2a9785fbf3e46ec2431dc5071c3f045
-DIST github.com-stretchr-testify-18a02ba4a312.tar.gz 83549 BLAKE2B 7bdaac806a8ea401ad991f995e1f94fa2983debe6ed8ec4f54462a6f7641084c2ffe14814ad265aa825aa2132fc357d023fce43540e7ea3a433a16064cd3e833 SHA512 e9af02a015b8eff0c83ba7ad6236d83804f75206586ac7a260c2ee663764aa41af445420f296d793ab7ebd3ac9f346dfdd5f1bfda20a4cbdf0a7b29452c7ce37
-DIST github.com-stretchr-testify-18a02ba4a312f95da08ff4cfc0055750ce50ae9e.tar.gz 83549 BLAKE2B 7bdaac806a8ea401ad991f995e1f94fa2983debe6ed8ec4f54462a6f7641084c2ffe14814ad265aa825aa2132fc357d023fce43540e7ea3a433a16064cd3e833 SHA512 e9af02a015b8eff0c83ba7ad6236d83804f75206586ac7a260c2ee663764aa41af445420f296d793ab7ebd3ac9f346dfdd5f1bfda20a4cbdf0a7b29452c7ce37
-DIST peco-0.5.3.tar.gz 77415 BLAKE2B 9f060e191550d39eed8dbf4b4379e424886476589e40af2c8bd2758c90636c6e9ab8e7551a32726f1f2d3338c7e59d47432d58f6493f03bbd3b8670095e27382 SHA512 c1b5678b369caa35e3bd2679eee857762c73bcc8a815d83e136fa1c30e48728a60f22be5d92132c8a733d591728f9293a973fc387502db79f5676ae1f45c6774
+AUX peco-0.5.7-go.sum.patch 2306 BLAKE2B 8ea3583f82f9303bec31e828c120c9790bd0826a86af76f7863bff303c94b3fd68e1db504ca1d994896b7b567901a203858573134202e2c847ddda0f9d6b9edc SHA512 0048c59db535de29d0eb8b797b754808f68e107ac03058aa018d9b5446ab764bedef375dab4ef984b0c0bfd08a098c306278887d2e7351ea716ab0bc46d4f542
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip 60546 BLAKE2B e775860f49c6ee09a6c48902d38fdf5d2d77af4cd405d8d303902170e46493301d4aa873a48b4d12a16d92dafaa65290de1fd3a42545025fbfc82f15a3881e8d SHA512 53dc5484f488ae1f8d0eb672c3431bbf9fce33dfcee83dda7929103e3650559cf703f601716984a640422f01cc640860dba0b47e16aef04d0d2452a266fefbf9
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20161213163243-0c3044bc8bad.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20161213163243-0c3044bc8bad.zip 16808 BLAKE2B 87624dde52df22e98f4e7fea736baa4a694b905c609bfccbafab0555520e7bbd35ee2078b2c800fcb6b5374b66e82c1eeef11d5d68571e1ead2be94e4878b675 SHA512 414d39e5b7bcefdf0f6c1219499b83087355ffe626046e36fcd88e99da163bce59dafe480d83249bb72330a39bc80e614d40b8b677d7b00d4796bee83a1165a6
+DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.1.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
+DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.1.0.zip 72278 BLAKE2B 1c7341f09d17f8952c0f07e5b97c43809a73c828de995a126f65acc4695a6ba0e344b6910ddd7ec743161171eb69ca7fa50147eadc17fe42b724612743844311 SHA512 3730382370d4f7d444ae81ef7620340451b920a1d49e14679f68da1d2c7778bac0d2a717481ad24516c0af2c2e62e0f0da9dbe7a99a014f793407491a1b55345
+DIST github.com%2Flestrrat-go%2Fpdebug%2F@v%2Fv0.0.0-20180220043849-39f9a71bcabe.mod 37 BLAKE2B 8bb9752d99ab092a7eb74ae3f4ea059578a80cada605f4c7e092a0cb39222adf22e0dc2244eee6a532de33e8dd7006e27855e9b81d7ebdae84be8a199f5b6646 SHA512 b4e267014841318b3f02ee7da09ee71d11cb91f0807d87a415f27d7a375f943d7a541dec3cb1124f4560da4bce89626d1212a04f2b16c97b1805e53c60c1f554
+DIST github.com%2Flestrrat-go%2Fpdebug%2F@v%2Fv0.0.0-20180220043849-39f9a71bcabe.zip 9309 BLAKE2B 195de3b640e40975ee3b02931eb28c2b048fa0d0e4434b352ead6021af93bbb35a28c11009329eeef1067d45c4bb64399f00315f8198f4cef03292a27ef58575 SHA512 eef051aa4b0e8af382c740feb53293a5423c84f62678ea54267f9910bcefd7ada92b67f8ace6e0487fad715345e0f6ace1e11d73884978473183f2ecdee1ac70
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.0-20161012013512-737072b4e32b.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.0-20161012013512-737072b4e32b.zip 8885 BLAKE2B 930aed35cf7cad6fb3cbf19fcbdb557971efe0e3f9e25bbea99adf18cb94f1fb762648055ff2cbba0643be88c0ec62cd2c331832fcf9309cf41c8b83c792c26d SHA512 c2d68c0b96764a6f3eb419062d90786520b3bb2393b62627cf4ea8a642108520d6782ac9cfb3aa90ca5eecaa763faff7c821eb2409f38fd2f1fcf315d4667516
+DIST github.com%2Fnsf%2Ftermbox-go%2F@v%2Fv0.0.0-20190817171036-93860e161317.mod 33 BLAKE2B 3b94575248b0ca76fa0f9ace94919d628824ba1328d5dc087b270247c29817ad0d4fd6f24cb218541f598443828d440efad018d1d96c26ff070554fce840cd49 SHA512 d96b326f421417a67e9db79350043b29f2b2c9b7ca00f696955303f0ba090c8fd82f018f312ebef4d443ef87732af99d807dcb6f6e16187d00ba0c0502d78876
+DIST github.com%2Fnsf%2Ftermbox-go%2F@v%2Fv0.0.0-20190817171036-93860e161317.zip 46686 BLAKE2B abcaafbada748e06683f0e93de675bce85430f4036b4ef91152ca9b91779233d41c5af8b99640dab9e59f7907b64db00129773f45dde83efe33abb137d083f77 SHA512 ddd6cb4782d5fa0ade4a514cf8efdc34bd9ac9545bcd388b8e9a3330371e65ee61c7df76847df3e2ceb483f76556fbc48e56f1fc0f77f3826de7f62b6b857b3b
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.0.0-20161029093637-248dadf4e906.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.0.0-20161029093637-248dadf4e906.zip 15409 BLAKE2B 80b3ff6807561928d8ce49b1038ab570f7194a010632847191a1906f59f05860cea9341deebcb30c64da336443676fc0d3ae78d7cdc77ea15af6917939c5027a SHA512 4471251eec949c98dd2468132e59c39c20b67b27a1327d910a8be2c1222ed48d6a91d5f491bc044f59dd2685de264b5abf1e9d59056b6d6a4eefe02af766c992
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20161117074351-18a02ba4a312.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20161117074351-18a02ba4a312.zip 64565 BLAKE2B 6df66d84239453907b8fba81f24e2f54c0454bc2a4bb2ca574c9392edfc4910dfaa6ccb5151b9af3979249c78f79d501979f97d87fd40aacbe9152a38c19672a SHA512 e5fd6044defe077fd53a7e8b4258b134d58ea1299d8698c61ed5e6de51ca437300cca0a3b4a8eb1d39b5cb04d039bff769dc63ca73d3f016cfdae8e9e3963c0e
 DIST peco-0.5.7.tar.gz 79584 BLAKE2B 2e3119dd7ce344ce1534bf5fc17668eaa6e8fa9b0ff82a3f8f6d0b382280b15eeca4948439f906d2625a6259b575bb50066e77b678b148b2ceb50963e325841e SHA512 f657327a34e2565b2fdb8cce68485c6fab66640124dc7e1d5010ddd229072d6c54cfc37c1fe8d8ee4f1e03f8e41e6ac878b013949bed901dcafa30969160c843
-EBUILD peco-0.5.3-r2.ebuild 1486 BLAKE2B 29300f27965261a64269f68433ee707e91084f512c439da179d61df3b588d29358bbcdd1663a1aa532ea4190e42f12231405e4913ea85bb2960e0c352e967482 SHA512 ffa9cdf9e861b2093ab6f2fdacce82113b65d8e790a25bdeb380a0e06bfdb205a9ecd04cdb706fa48dbd6c83f3634fbd75f9218e737877975ac87712bb26557a
-EBUILD peco-0.5.7.ebuild 1033 BLAKE2B 2a2cfe927686571508a2404efa5e0006fdfbc62efc81e3a0984a98077d338763cf5717ef0d69f418ed6e81ba12f0b617c0bf568b75c27ac88053d1ad4f7384a9 SHA512 f67874f0512e20fb13b5a0ad7d7dee174695197e47e28038cf2f7b92163e2121d7837b19353994689b2f9056b923672ff760adc5730ba9da660a59c1046854e6
+EBUILD peco-0.5.7.ebuild 1732 BLAKE2B 66d0d1f56b55ec88556f561c72afb7b004289d8eac74ad8af82e31610a853255b540c8b55bd670d61141326e901bcb41cddfbe7d4f2b7b02b4dfa2bc50f663f7 SHA512 046d297d018816263e4968ad010a63a90eff3b1a4a297992054853ba06b8199a09791a4b8ba13b782e35bb7cf82d2f3ad79a5bde9c80ca3eecc59fd7e3541e94
 MISC metadata.xml 666 BLAKE2B e1594259e0f02808e487707acd6d8d1dcf20510aa92410aa03953606bace24777316a408c9079e342c8c6f7ab5680058fea2bfc65e5614751c7580aed78f00e2 SHA512 aab34e7bd48c51784cf3b1119c596893d56113b5a90dfa7e2782ca11e78d0ce2f80a9fdcde4e81e6fb6802a3075ba20bcd19fa9fb162fe2c68bdc1e91d3b6ef7
diff --git a/app-shells/peco/files/peco-0.5.7-go.sum.patch b/app-shells/peco/files/peco-0.5.7-go.sum.patch
new file mode 100644
index 000000000000..b3515c8e35d3
--- /dev/null
+++ b/app-shells/peco/files/peco-0.5.7-go.sum.patch
@@ -0,0 +1,37 @@
+From ca3293697032139414ed57d6c516389866b21477 Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Mon, 11 May 2020 16:43:20 -0500
+Subject: [PATCH] add go.sum
+
+---
+ go.sum | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+ create mode 100644 go.sum
+
+diff --git a/go.sum b/go.sum
+new file mode 100644
+index 0000000..f1e3f17
+--- /dev/null
++++ b/go.sum
+@@ -0,0 +1,18 @@
++github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
++github.com/google/btree v0.0.0-20161213163243-0c3044bc8bad h1:IIXE5Gtu2VS7SL3lhB61iSliE+jpOwuYDYAH4HGxGwY=
++github.com/google/btree v0.0.0-20161213163243-0c3044bc8bad/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
++github.com/jessevdk/go-flags v1.1.0 h1:Geou1o2RJhW9nUu+puVL2ASZMWjfj6+uy97+byGKL98=
++github.com/jessevdk/go-flags v1.1.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
++github.com/lestrrat-go/pdebug v0.0.0-20180220043849-39f9a71bcabe h1:S7XSBlgc/eI2v47LkPPVa+infH3FuTS4tPJbqCtJovo=
++github.com/lestrrat-go/pdebug v0.0.0-20180220043849-39f9a71bcabe/go.mod h1:zvUY6gZZVL2nu7NM+/3b51Z/hxyFZCZxV0hvfZ3NJlg=
++github.com/mattn/go-runewidth v0.0.0-20161012013512-737072b4e32b h1:idzeyUe3K4aU/SIZWMykIkJJyTD7CgDkxUQEjV07fno=
++github.com/mattn/go-runewidth v0.0.0-20161012013512-737072b4e32b/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
++github.com/nsf/termbox-go v0.0.0-20190817171036-93860e161317 h1:hhGN4SFXgXo61Q4Sjj/X9sBjyeSa2kdpaOzCO+8EVQw=
++github.com/nsf/termbox-go v0.0.0-20190817171036-93860e161317/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
++github.com/pkg/errors v0.0.0-20161029093637-248dadf4e906 h1:aXc/AM323HlkOXjl3QuSO06wbXK45HrzBT+pwVOufXg=
++github.com/pkg/errors v0.0.0-20161029093637-248dadf4e906/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
++github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312 h1:UsFdQ3ZmlzS0BqZYGxvYaXvFGUbCmPGy8DM7qWJJiIQ=
++github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+-- 
+2.26.2
+
diff --git a/app-shells/peco/peco-0.5.3-r2.ebuild b/app-shells/peco/peco-0.5.3-r2.ebuild
deleted file mode 100644
index 4bf612fe18c2..000000000000
--- a/app-shells/peco/peco-0.5.3-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_VENDOR=( "github.com/google/btree 0c3044bc8bada22db67b93f5760fe3f05d6a5c25"
-	"github.com/jessevdk/go-flags 8bc97d602c3bfeb5fc6fc9b5a9c898f245495637"
-	"github.com/lestrrat/go-pdebug 2e6eaaa5717f81bda41d27070d3c966f40a1e75f"
-	"github.com/mattn/go-runewidth 737072b4e32b7a5018b4a7125da8d12de90e8045"
-	"github.com/nsf/termbox-go e2050e41c8847748ec5288741c0b19a8cb26d084"
-	"github.com/pkg/errors 248dadf4e9068a0b3e79f02ed0a610d935de5302"
-	"github.com/stretchr/testify 18a02ba4a312f95da08ff4cfc0055750ce50ae9e" )
-
-EGO_PN="github.com/peco/${PN}"
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="Simplistic interactive filtering tool"
-HOMEPAGE="https://github.com/peco/peco"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="test"
-
-DOCS=( src/"${EGO_PN}"/{Changes,README.md} )
-
-src_prepare() {
-	default
-
-	# Don't install dependencies, make build verbose
-	sed -i -e '/peco\$(SUFFIX):/s/ installdeps//' \
-		-e '/test:/s/ installdeps//' \
-		-e '/go build/s/-o/-v -x -o/' \
-		-e '/go test -v/s#$(INTERNAL_BIN_DIR)/$(THIS_GOOS)/$(THIS_GOARCH)/##' \
-		src/"${EGO_PN}"/Makefile || die "sed failed"
-}
-
-src_compile() {
-	GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/"${EGO_PN}" build
-}
-
-src_install() {
-	einstalldocs
-	dobin src/"${EGO_PN}"/releases/peco_linux_amd64/peco
-}
diff --git a/app-shells/peco/peco-0.5.7.ebuild b/app-shells/peco/peco-0.5.7.ebuild
index 1f16d54fdb6e..abfd659e27e2 100644
--- a/app-shells/peco/peco-0.5.7.ebuild
+++ b/app-shells/peco/peco-0.5.7.ebuild
@@ -2,25 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-EGO_VENDOR=( "github.com/davecgh/go-spew v1.1.0"
-	"github.com/google/btree 0c3044bc8bad"
-	"github.com/jessevdk/go-flags v1.1.0"
-	"github.com/lestrrat-go/pdebug 39f9a71bcabe"
-	"github.com/mattn/go-runewidth 737072b4e32b"
-	"github.com/nsf/termbox-go 93860e161317"
-	"github.com/pkg/errors 248dadf4e906"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/stretchr/testify 18a02ba4a312" )
-
-EGO_PN="github.com/peco/${PN}"
-
 inherit go-module
 
 DESCRIPTION="Simplistic interactive filtering tool"
+
 HOMEPAGE="https://github.com/peco/peco"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(go-module_vendor_uris)"
+
+EGO_SUM=(
+	"github.com/davecgh/go-spew v1.1.0"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/google/btree v0.0.0-20161213163243-0c3044bc8bad"
+	"github.com/google/btree v0.0.0-20161213163243-0c3044bc8bad/go.mod"
+	"github.com/jessevdk/go-flags v1.1.0"
+	"github.com/jessevdk/go-flags v1.1.0/go.mod"
+	"github.com/lestrrat-go/pdebug v0.0.0-20180220043849-39f9a71bcabe"
+	"github.com/lestrrat-go/pdebug v0.0.0-20180220043849-39f9a71bcabe/go.mod"
+	"github.com/mattn/go-runewidth v0.0.0-20161012013512-737072b4e32b"
+	"github.com/mattn/go-runewidth v0.0.0-20161012013512-737072b4e32b/go.mod"
+	"github.com/nsf/termbox-go v0.0.0-20190817171036-93860e161317"
+	"github.com/nsf/termbox-go v0.0.0-20190817171036-93860e161317/go.mod"
+	"github.com/pkg/errors v0.0.0-20161029093637-248dadf4e906"
+	"github.com/pkg/errors v0.0.0-20161029093637-248dadf4e906/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312"
+	"github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/peco/peco/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
@@ -29,13 +39,16 @@ IUSE=""
 
 DOCS=( {Changes,README.md} )
 
+PATCHES=(
+	"${FILESDIR}/${P}-go.sum.patch"
+)
+
 src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
 	go build ./cmd/... || die "build failed"
 }
 
 src_test() {
-	go test -work ./... || die "test failed"
+	go test ./... || die "test failed"
 }
 
 src_install() {