gentoo resync : 22.01.2021

13 files changed, 116 insertions, 79 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 4e1dfb62d93f..925f9b74e414 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 58dedc62d1b3..5aafd1ee90f2 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -408,7 +408,7 @@ EBUILD bash-4.1_p17.ebuild 4129 BLAKE2B b985ccdc6a54a13ae8a025ca914ebe4658cb1607
 EBUILD bash-4.2_p53.ebuild 4312 BLAKE2B 3c38e3c0cbacb50e00221f3450dd3b1e18f8c23b86ee481ffd87789e7ab00d686d0aac1690a0a36d85b7d1af09d74bcb9c3203947f2282c3b8758bf9f1724926 SHA512 51a53607941c6dfd5e78deab48e8788b3004a2fb90f57b531cf6eae9484be33a9d3ffac6a09c9bdd0ded9511a2da5f60e03f17231525652d8c898ae0fe0e4dd5
 EBUILD bash-4.3_p48-r2.ebuild 5596 BLAKE2B 89b41a1e0e072dcee85e09b50ce10e4a9b6fb6efdac740982332aa029968ac3382ddb695148e361912ad44bd8a29aa5d972343ef403adc1efe406efd8c6c9248 SHA512 1857bc7a01ad80757271db0e3a404d6b171341a99d9cac4059d3f7ff0a88cd4ead1ab871098ed6ca8cf9ad19e4bf0f48c103d1958b4bf5eace410de404c1d258
 EBUILD bash-4.4_p23-r2.ebuild 5675 BLAKE2B e024d196ea9d17cccd70284f1db07d00252d862f257c2a4484705258820493a8d35c894858a7ac31f505a0ba7eb23a4a0c6126a049bff5154582db7ae081f18d SHA512 e6afcbe5db9c1160d600edead7bbb72dba88f427dcd0c34023cfb1ce2857475a5e5cb152e89398a92d187c32599fc44783805d50256e4fcb3c53984eb33522ff
-EBUILD bash-5.0_p11-r1.ebuild 7470 BLAKE2B a66bef1f71fa4f1c58c8dc691516e0d4ab85fa6ec92bde64ca2f5f59bde33d92b9bcead202efb01e73b7ff41b5b4765cb458a6285be9d6ab64be26756f602b2f SHA512 aab51808a60afb7ad39c6b25a32dc628104dd084f190698fe3b52bbe04483193fd49e23faa8f7aff3aaa062a15ee6c964af0eecb0d14ce918f8057336f705324
+EBUILD bash-5.0_p11-r1.ebuild 7452 BLAKE2B 761a8e88db4bd6c92ff09275c896a160b6af04bc28e7f9659683ce9b14461a0b28152c983d72245977a54f219462f89ed9cf6a297e43c4b79b612a6078566085 SHA512 4115f924509c6a250187f79163b2ce3eb1211b5f990cb95f84cb9f82ceaae1a95e182dca344cf3b7e525229c104c4c76576b96b8860e6bc381335998bcacbfb3
 EBUILD bash-5.0_p18.ebuild 7284 BLAKE2B 8a3781c21e3022604316428792c90a51c9da8641bac747e1cd2e018dc32a556be1a35b52196b4c723114a2e745da662cbeba8bbe1e62fb407bee9a8641c417da SHA512 aa6fc8edba678dbbfca3f4d2159f7c5b82475f4e2b35f65a72a1c456518464fde38a3facd369bb6f40d306496a99ae6689fa303aa98d9d91d832a53d75969ad9
 EBUILD bash-5.1.ebuild 7327 BLAKE2B f6a4f27c58e267bbbee3bef19231acbee6e5d9258af5468619da425032c03f6a9eb1d8a009319d2d7ccfee170f83ed4edda72c1e495a94375a73d6d25ce7bb9b SHA512 42a40ecb51c4a4834e1d11070bb7a218eb115bea9fece77d3c50f2d614ffb72c9a5412b784fc76879f2d70e46ec7b2a7a854669c04150780669cbce619897567
 EBUILD bash-5.1_p4.ebuild 7275 BLAKE2B 017818d2a5347f8daaea32470f3d365de2359c7c65ae6d361f119a7805353bccb4d539f0f414975050ea0169b7591ed993e7a313b3271fed03340f2cc2e5bd51 SHA512 94131f52fffa504048e85be4f3ad6cec37242c363717edd9a400825dea59e8d4fb3083d7286ea0dc876c5c44751db8ec545f37d7e4dd8b03eb76bfdd982fc6f1
diff --git a/app-shells/bash/bash-5.0_p11-r1.ebuild b/app-shells/bash/bash-5.0_p11-r1.ebuild
index a2adb6b02922..bb06e48ea224 100644
--- a/app-shells/bash/bash-5.0_p11-r1.ebuild
+++ b/app-shells/bash/bash-5.0_p11-r1.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
@@ -252,7 +252,7 @@ pkg_preinst() {
 		# 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)
+		local tmp="${T}"/sh
 		ln -sf "${target}" "${tmp}"
 		mv -f "${tmp}" "${EROOT}"/bin/sh
 	fi
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 865161ad5e7e..42f303068015 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,5 +1,4 @@
-DIST dash-0.5.11.2.tar.gz 244475 BLAKE2B 4edc85a70af62684b29fec7fd9c599aaade38ffcfb62b873dd149c4ada9e750f24cddf9a390c512313bc7dde67cab3d7b57776c92fe5f8e08bf8bdc164a4e5ec SHA512 2f846c26f3722ea3315aae73461f9c21a0a8a9ac712e1caf8dd9993e34729227c7648bf6f72fad8488247986e560298f95aa2411bd4e395410565c0b527b9db4
+AUX dash-0.5.11.3-check_nflag_in_evaltree.patch 1195 BLAKE2B 9624038cf627e68f65126cbac7499c34928827057656f35ac53132b697e886f4995b55361bad82fa76c9364a376f1c0056075da2eac8f82d2c77d544e5d103c2 SHA512 1b826edc306c109b3595ec38b07657df81bf6dc380e2390c482d668f97acbaeef670d22cbf04b88e005b49ebf1969169afbc6c1a51ae7d148ad2abc118158bc4
 DIST dash-0.5.11.3.tar.gz 244507 BLAKE2B 06d4bd9f4c93e76ddf895f5a0ebca0c18d9554f5d4fd30a948eafc862db0f4cd523f623dad75969ddb5f510ac85d174f3b3aac3726f9d3ca8fbdb4377715b244 SHA512 ffe69b8de3586aba298d936168c329524e385252e12979aa1db28761e882048eb5a80673e93a2a2227f61b52fd8b56546b78c5db9c21a022072f536267f8bc20
-EBUILD dash-0.5.11.2.ebuild 1721 BLAKE2B 03b88984516aa5b8e2df9923903c6d76d73845ef950d0b3bb4ae2e84ac0effd516293deef1e84ad9cd12de615675dc61ea94bab32e7203daaa9a6bb4b710b70c SHA512 9c91c6955bb6a6e0710f036fbdebfbd8d09dbbdc2d688efe5db6c19cca9410beb493b701c7201670ff89f96c4fdf4d87d1360ecfa8037ebba16cc59e13f4c5ef
-EBUILD dash-0.5.11.3.ebuild 1728 BLAKE2B fb40e4a3dfe315f5179c698c177a14240b0814f961d04d3be77d2bc1717567e14e1141c03da60ee5a90b86bc88949801610ff7d98411ae1bb69b3f55ca1b67c3 SHA512 fc00abcec3712ba989b1923cdbc52d116a7438b9c807d500b5dae4ae616c5700d54a8e6dc5a3d3751981a5c24c5e518db1b8cc4c078ff6de526c0b3fbabe6de7
+EBUILD dash-0.5.11.3-r1.ebuild 1802 BLAKE2B b4ed4b396ad07bc350e2eb78db47167051ac38a305b8c80fdfa3ba12677498c83840dd7d5b453e5c14a59f9666e463f3a2a89c716704ca684b3371e3fc09cbc1 SHA512 6062ceecdef0bd6b9042d36b2e77958477a499bf563eeb5e0cfdfc1dc0944d9f5e946bb2ff6d54c1a0d63a3f3081cdcfd4958dcbd8d129b858478d19af5f2847
 MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.3-r1.ebuild
index 0b87dea2b6c6..d0227a4ecae0 100644
--- a/app-shells/dash/dash-0.5.11.2.ebuild
+++ b/app-shells/dash/dash-0.5.11.3-r1.ebuild
@@ -19,6 +19,10 @@ RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
 DEPEND="${RDEPEND}
 	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.11.3-check_nflag_in_evaltree.patch" #754267
+)
+
 src_prepare() {
 	default
 
diff --git a/app-shells/dash/dash-0.5.11.3.ebuild b/app-shells/dash/dash-0.5.11.3.ebuild
deleted file mode 100644
index 7f5b894786bc..000000000000
--- a/app-shells/dash/dash-0.5.11.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-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"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libedit static"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
-DEPEND="${RDEPEND}
-	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
-
-src_prepare() {
-	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() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# don't redefine stat, open, dirent, etc. on Solaris
-		export ac_cv_func_stat64=yes
-		export ac_cv_func_open64=yes
-
-		# if your headers strictly adhere to POSIX, you'll need this too
-		[[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
-	fi
-	if [[ ${CHOST} == powerpc-*-darwin* ]] ; then
-		sed -i -e 's/= stpncpy(s, \([^,]\+\), \([0-9]\+\))/+= snprintf(s, \2, "%s", \1)/' \
-			src/jobs.c || die
-	fi
-	append-cppflags -DJOBS=$(usex libedit 1 0)
-	use static && append-ldflags -static
-	# Do not pass --enable-glob due to #443552.
-	local myeconfargs=(
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		--bindir="${EPREFIX}"/bin
-		--enable-fnmatch
-		$(use_with libedit)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-shells/dash/files/dash-0.5.11.3-check_nflag_in_evaltree.patch b/app-shells/dash/files/dash-0.5.11.3-check_nflag_in_evaltree.patch
new file mode 100644
index 000000000000..94740223fc8e
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.11.3-check_nflag_in_evaltree.patch
@@ -0,0 +1,46 @@
+From 29d6f2148f10213de4e904d515e792d2cf8c968e Mon Sep 17 00:00:00 2001
+From: Herbert Xu <herbert@gondor.apana.org.au>
+Date: Thu, 4 Jun 2020 21:53:55 +1000
+Subject: eval: Check nflag in evaltree instead of cmdloop
+
+This patch moves the nflag check from cmdloop into evaltree.  This
+is so that nflag will be in force even if we enter the shell via a
+path other than cmdloop, e.g., through sh -c.
+
+Reported-by: Joey Hess <id@joeyh.name>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+---
+ src/eval.c | 3 +++
+ src/main.c | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/eval.c b/src/eval.c
+index d10be38..9476fbb 100644
+--- a/src/eval.c
++++ b/src/eval.c
+@@ -213,6 +213,9 @@ evaltree(union node *n, int flags)
+ 
+ 	setstackmark(&smark);
+ 
++	if (nflag)
++		goto out;
++
+ 	if (n == NULL) {
+ 		TRACE(("evaltree(NULL) called\n"));
+ 		goto out;
+diff --git a/src/main.c b/src/main.c
+index 7a28534..5c49fdc 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -233,7 +233,7 @@ cmdloop(int top)
+ 				out2str("\nUse \"exit\" to leave shell.\n");
+ 			}
+ 			numeof++;
+-		} else if (nflag == 0) {
++		} else {
+ 			int i;
+ 
+ 			job_warning = (job_warning == 2) ? 1 : 0;
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index d62810d939d6..e4d956941f54 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -1,5 +1,5 @@
-DIST fzf-0.24.0.tar.gz 173438 BLAKE2B bb990ea3f819ae83c13e71ff2b2e8f312b532f634375a137178afca943defe20177a3ec6751acd92debfa434fd02d1ebc24901cc40edf63f016f4cee97f2b856 SHA512 0746aee0542574488ee17dbc86618a74a01aa2d7e9042219db37112584f74be7e1686494bd7e3307f161b480053496a58cac18c67a6eec7e2a992f5dea2569a0
 DIST fzf-0.24.4.tar.gz 175421 BLAKE2B 8c06f6abb2e8a8a407f36e613efc084d63cc9797bb8c076c7d9a497b52b86865243b3cf3e80147cd2db0f6a98e850a28dc58dc949109a152ca6adf330dd41ff1 SHA512 348cc000b4e28054bff56a37171ef4dd7ac22c7c292c19c3c0b95f3d30856b443887447604e1e38cfd71b421a22c1135a13cb40c78e5b34d477acaa3dcadb821
+DIST fzf-0.25.0.tar.gz 176905 BLAKE2B fd0fa18643947428d8a7257f9aebf579e3d57fbc0216d4629ed77616d1729d2cc68514125b5de5b2e85b65b26d6c95e69942f076aa99aa27e57d4f9b778f8923 SHA512 73b65374334531ac81a64bb973cb976f4dab7c6458eb2705f323349223880294fa6238b0eeea3412ff121c5c1b70905b261ceb7994c2b00425b02c88286b36e3
 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
 DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.mod 250 BLAKE2B 46093e9211011e814962ba2eafec4392948f185d27a202a8b626e16299e3a3fa4554a604933ceab584b27cca2b7a6b1f51d4e5fe10d673e875e38eca08de64ec SHA512 412dee57c525bd5a3c0ce9c482e7933814758e36ebb226a16392e648f57e280485f86e30f17be2339eed427b52e4b0b601401503d0bd324c7fa874e2fcba2b60
@@ -35,6 +35,6 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-EBUILD fzf-0.24.0.ebuild 3402 BLAKE2B 2ee9945e33370f3d120eef1941d9567c07f3462e589b49c5b9994c572a60ba212852246edd69c4439264e82a35a4f6e367dbbc342022650fd9af26c7f74acb49 SHA512 d3bdc6b66c7e99e4ca15acfaef78106e45da65ace9e3f306ad98665c9581ccd2791aa428e2d849203363da89ca0a187d707f68ad821a74defca3955f9e76c0c9
 EBUILD fzf-0.24.4.ebuild 3402 BLAKE2B d1dd4807695d3b53a8b103f65f736090da52d882a8c3060d0a878033c17d50c50764476c701db57c77b1a7bfe9089fcddc25d79fdf1265ae7bfe29175ec3eb3d SHA512 771227334e51ad4226ed2fa332870f91af52c044de2cd65f3f04c6d15eb10f8814ae97089033dca38f67b0a7d77a9dcd6afb6c573e449cd6a34d5758dc86bf8f
+EBUILD fzf-0.25.0.ebuild 3402 BLAKE2B cf7e0d862812d3d1529b09d39dd3b63672481cb95d7b6c6437ce0a913a5835658a8f1a59f15d557e1930124acaedfc29ce8970f8e492bf24522bfeac4acd895a SHA512 9562bfd4473d057f1100b682206b950d05fd12d005e9f3069eb0d1a98049d234300df88de12d940ccc50240cdbcd62838f60a08f6e468401078fcf02c755f49e
 MISC metadata.xml 575 BLAKE2B d6fa25687111f71da6dbe80c20e8387ef699e5d8022a903b1d8c60a3c0c58692166141fbf4bdc55f305e31a87aaa2a4dcaf0d4429f8b94dc71fdb9305675694c SHA512 14efc2b0b44734d0092306392b5dba2e0745dbdca7801fd6507f1739d5e6431fad622c15cb5b2f7d297abea58b54ebd09391ff9fd9b01c9778b067b9f88ff98b
diff --git a/app-shells/fzf/fzf-0.24.0.ebuild b/app-shells/fzf/fzf-0.25.0.ebuild
index b2573fddd82a..5e56f7480e11 100644
--- a/app-shells/fzf/fzf-0.24.0.ebuild
+++ b/app-shells/fzf/fzf-0.25.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="A general-purpose command-line fuzzy finder, written in GoLang"
 HOMEPAGE="https://github.com/junegunn/fzf"
 
 # For fancy versioning only. Bump on the next release!
-MY_GIT_REV=0d5f862
+MY_GIT_REV=8c533e3
 
 EGO_SUM=(
 	"github.com/gdamore/encoding v1.0.0"
diff --git a/app-shells/peco/Manifest b/app-shells/peco/Manifest
index 8b01c39b01b2..a6df3c97e729 100644
--- a/app-shells/peco/Manifest
+++ b/app-shells/peco/Manifest
@@ -18,5 +18,7 @@ DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d1
 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
+DIST peco-0.5.8.tar.gz 79589 BLAKE2B 04ae33b276686fb227de348a0ad4843a9ef15a3ef3ec051f82cf5a2955099a7092c4eb598cb718eac0092799f552066a32d4ca7773c0d1cf9a46b08ae115593a SHA512 7ab831a55eecd2091637da6e9044f2dce188b29748d5ccf2ff81ceff49c5013dd7cba52137ada3ad9aa779955197f7963cb7261f0d9551ddd13c5a0f5c8f835b
 EBUILD peco-0.5.7.ebuild 1732 BLAKE2B 66d0d1f56b55ec88556f561c72afb7b004289d8eac74ad8af82e31610a853255b540c8b55bd670d61141326e901bcb41cddfbe7d4f2b7b02b4dfa2bc50f663f7 SHA512 046d297d018816263e4968ad010a63a90eff3b1a4a297992054853ba06b8199a09791a4b8ba13b782e35bb7cf82d2f3ad79a5bde9c80ca3eecc59fd7e3541e94
+EBUILD peco-0.5.8.ebuild 1738 BLAKE2B 1a739f0284b85ee7b67810abb8f0b315613212f7e47f0ec5226f8f35c14e46ce1f1d9f7db92c00e4c805b41783bfdafba171a8166d9e2a346b098d2233f06126 SHA512 d484805b816b6f3efb8325c8acf8224068625197dd08679608822df3ab6fcadccc84580dae2be18e67e90abdb2ee0a9264c163ff3777f67c76cfe854f8970aea
 MISC metadata.xml 666 BLAKE2B e1594259e0f02808e487707acd6d8d1dcf20510aa92410aa03953606bace24777316a408c9079e342c8c6f7ab5680058fea2bfc65e5614751c7580aed78f00e2 SHA512 aab34e7bd48c51784cf3b1119c596893d56113b5a90dfa7e2782ca11e78d0ce2f80a9fdcde4e81e6fb6802a3075ba20bcd19fa9fb162fe2c68bdc1e91d3b6ef7
diff --git a/app-shells/peco/peco-0.5.8.ebuild b/app-shells/peco/peco-0.5.8.ebuild
new file mode 100644
index 000000000000..bc378f41cc92
--- /dev/null
+++ b/app-shells/peco/peco-0.5.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+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
+
+DESCRIPTION="Simplistic interactive filtering tool"
+HOMEPAGE="https://github.com/peco/peco"
+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"
+KEYWORDS="~amd64"
+IUSE=""
+
+DOCS=( {Changes,README.md} )
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.7-go.sum.patch" )
+
+src_compile() {
+	go build ./cmd/... || die "build failed"
+}
+
+src_test() {
+	go test ./... || die "test failed"
+}
+
+src_install() {
+	einstalldocs
+	dobin peco
+}
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index a5f20cef926d..423c3b0e5c7d 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,6 +1,5 @@
 AUX tcsh-6.18.01-aix.patch 474 BLAKE2B c794769b5ddb354ebbcad902df18db735f06b3e098069e025e5b976b3fdf3758104b48881a94f38f620ba8cb5b307ee3f5a61f528988bd31ff9edd19efb58872 SHA512 ae5dd2f5aee7c14734e775b55f780aa430dd2efc8407b671308215c69e3b97ad37a3b54ad2bc7fabe84b1806997a78ccd15b06ac59491c93dcad14bb14032bd5
 AUX tcsh-6.20.00-debian-dircolors.patch 506 BLAKE2B 584808b9bd488c41a8b375d18b976ef89256771b9282b248c0ac4e500ea5dedb07a05af60c3a5995b511dce49ac95db1b0beb2ae2db11de241e9eea2a72c52cd SHA512 c761857c343c833aea5061baeb54dd86f7a8804424b7ea2009d05fd57b92ba3b892c05fe48a8f4e00a6eee39515086063a9c518004d726626dc5c466958a6dad
-AUX tcsh-6.20.00-use-ncurses-tinfo.patch 382 BLAKE2B 99d794389e3f65607887eae8df4d8af9f9361604f0d70e96a45f3a2b3ec648a6f04f335b2de8fb8b9b6c7441be6009ca38f9f8479ddd9e3e831c4cf0c0b48863 SHA512 d6e2346a0ed093651be7073b04cd31ec1bd587c52fc9a21295405699fed2a63d6ea8415e7c0d29e0f03732288b4a8749e14c9ee85c39a1b4f8e51cfa996166c3
 AUX tcsh-6.21.00-fno-common.patch 613 BLAKE2B bd9d68b9f4a7655d519a49c8937d150e8d4521fea2f1be26b3827369905d865e2115ff2a51a1d491b3ce2c80352d0845cdbc127d808f58556842fa5555dde41b SHA512 d67b82c6dcb7042c8d6e33d97c30b6937244af0667ac9b5928f4316b4bb69e4080f7d609271f2e1beed03b5d896bbc70c171e9f9a58684ab29409918ad77f40d
 AUX tcsh-6.21.00-no-nls.patch 386 BLAKE2B 5df1b205d76e29b68530f50b661329e851ce46206306662e150452ffc340e82d2347a0d1407c3a4aed6ee5f1b93257d0dece87b37ebc51f4240ac83a110f471e SHA512 9ece39f524b0d377dd907772c37e9412cb4a700db5d828aa404a0b231b758638cdf1215d026ba574486c2a00b49f20888e7f5683ac4f712845fa484118a8109f
 AUX tcsh-6.21.00-use-ncurses.patch 388 BLAKE2B 5938d6ceee5cafa254d3bedb36705a7d1d6f3c41cb30d8eb22181cf053bbe39302c9dcb14191383e755f47c08fa1a0dd3fc20cc7f813cf9737e60850327a7e71 SHA512 eef51644cde4bf27a614a1f099b5f21e46600ca396e4baafa6ece005f3fb4901ab1862176ee715b7294216894f6a2d84c1a5b1c38c1086cf95914f6f44358595
diff --git a/app-shells/tcsh/files/tcsh-6.20.00-use-ncurses-tinfo.patch b/app-shells/tcsh/files/tcsh-6.20.00-use-ncurses-tinfo.patch
deleted file mode 100644
index e17841863d81..000000000000
--- a/app-shells/tcsh/files/tcsh-6.20.00-use-ncurses-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tcsh-6.20.00/configure.ac
-+++ tcsh-6.20.00/configure.ac
-@@ -317,7 +317,7 @@
- dnl Checks for libraries
- AC_SEARCH_LIBS(crypt, crypt)
- AC_SEARCH_LIBS(getspnam, sec)
--AC_SEARCH_LIBS([tgetent], [termlib termcap curses ncurses], [], [
-+AC_SEARCH_LIBS([tgetent], [ncurses tinfo], [], [
-    AC_MSG_ERROR([unable to find the tgetent() function])
- ])
- AC_SEARCH_LIBS(gethostbyname, nsl)