gentoo resync : 25.08.2020

39 files changed, 408 insertions, 741 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 1470c9fc91f6..25b81ea37f77 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest
index e253f6d7ba5b..7f02e30abb3c 100644
--- a/app-shells/autojump/Manifest
+++ b/app-shells/autojump/Manifest
@@ -1,9 +1,3 @@
-AUX autojump-22.2.4-fix-__aj_error-typo.patch 755 BLAKE2B 022a80e29cf8a03e358c011f1bb5f8e3625a53d90371ac05b4d8abae94dfdd76a98976b75278b8d3477df2903706eb6a5a4fe16925d5101cb9e11d5549709b95 SHA512 8661ceae090ed70498f5ed34f447c80d3cf359eca304e16c122a992538af8fb5e046c26d739ccf9bcfd7ccd5706735aebc494f95ebcb2d3c300b126dc0e38136
-AUX autojump-22.2.4-fix-autojump.fish-bugs.patch 2100 BLAKE2B 5aef4c4363b0a34238e91a012b19a8a6041a2e72d9d071753ce2c14db2062e93cd7cae93862d3a78ed1645993b41f5c6a31d777dc204675983bd76578400c7dc SHA512 a0a2fb0a06e43f4b1321d0b785ffa3273ba5d35e103f4ac687d6f08502835dd0cd5135a871640e05b535fce31c11f2e9908728c1e6f62ffe1e313ed9c75b7670
-DIST autojump-22.2.4.tar.gz 52724 BLAKE2B 42d5db90d4a29c63f5cd79437ca005f9f6382a607ab9284244fd6bbcf539509c5043df71ab305a5e8420ec225f8d651411d327833762737e0a5ad828ac021d2b SHA512 bdfca07bb57b3a2733a2085af14f23c3e980b1b00db1c90247c2341ac73f60f171bdde29dd9917aac0808d0b8f2902d48096c990e09281745a71755f5abc921c
-DIST autojump-22.5.1.tar.gz 54721 BLAKE2B ea3a852dddc13ece5ff177be0b3f384e5dcb19795d31d22edae90dba19fe3e78a4b78f48f08c338521d89d57af6251d5690c62eab445229812adb154286b0d5c SHA512 ed1bb28b62d14a481d5c8ee8ebbfc286d21ca54c961904f81ac123c784e17810217dfe1689bdd4b50fd7a9d72509c0cb13583a9817074f6afe26dc3144f64243
 DIST autojump-22.5.3.tar.gz 55429 BLAKE2B 3a2773669f81d1a54c01cce9fe75bc01609265998b035b4ba1aa064f1132acf852b59eb04ebfa744e628152f0ab478cbef24e5aff326bf84cec6e2c9348e8360 SHA512 d1dd3cbb67fda4e0a17ec5028b947faf46be8a95a6cd8418127b927f42bc95b71538a06658b38b479c77d147a6cd5e8cef77639ef538c7d449414c469c13f140
-EBUILD autojump-22.2.4-r4.ebuild 2099 BLAKE2B e397cba8017516becef5073c70f8f4c147b5422cf115047928a4de8131ebd83579ea882d9470001095cfc76cfc5730cea100fc12f098eea2e6786e4dddca497b SHA512 00acd5242387bea3b63a500d5a21a5783c74bd60284d90ace76c2962af07696fccb3885a1ba372868352402a3eaf936aa31bb6286c9b09aceb82a9b22b7b92da
-EBUILD autojump-22.5.1.ebuild 1906 BLAKE2B ccdb4a0c1d1cbcede3cc3d1ff75c65eaf8cbf5da144c0f5f9f34c7d5904cde654c8dd9819ee90ee6bce9486016df6ccbbe1f0f1d88c6004c4f8d422ac8762240 SHA512 bbf08769ee09b308ab9e28adb6ecf1cacfa125801e982999b1f7adb511b1f666c4767fa4add5a68c56d4d0c2d0465c5ef48e13a031306df95566385ae7a46526
-EBUILD autojump-22.5.3.ebuild 1921 BLAKE2B 8faa33cafd1e4574b768c4e2eb79d7b2295faf9a97b6b9e915a706c8bee113400c30b07df1be72750cdb1c6a70cc6a389713858e852f9fbc8a127d4e6ca88aae SHA512 29f07a2173b0d14c33f95841d7b15f33ea8bbdd874e7e63ee97e9f70b8f100c8d781798dee9d09395a8b895848ec40ca38906772104bf72b17190c5ee0901c83
+EBUILD autojump-22.5.3.ebuild 1920 BLAKE2B 94a6ab588c642b4f7a1006e60f9099e38cbedf426c55109f8023364bd0b8641c77673df3dc9b29e4ad7a8f849cc7e31b494a19a1b66bf24e94258dda1f26625d SHA512 06cfeef316c217541f68c37350a94b201e8f7d471cb0608da39fb5d77e26708a79b651108cba55b87445a7cea87808a28bd59343f91aefe06427066de06468e6
 MISC metadata.xml 490 BLAKE2B 33ef64a70f2b0d3211861a9ae667a4ed930f850a0198661cd3371024ac6193c80d3121ca188f48cac4732741fdea08e918c8ef78161a921127ec82b1064dd1c1 SHA512 c7742421c4211de2b774bb6136261863bd69a93debe3f1ab4b921e9f19a7581ef2711fbe2090ada92b60f799cd6683368e48d974ab9698ae3c2b5f768cd34db9
diff --git a/app-shells/autojump/autojump-22.2.4-r4.ebuild b/app-shells/autojump/autojump-22.2.4-r4.ebuild
deleted file mode 100644
index cbaa265735d3..000000000000
--- a/app-shells/autojump/autojump-22.2.4-r4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit bash-completion-r1 python-r1 vcs-snapshot
-
-DESCRIPTION="change directory command that learns"
-HOMEPAGE="https://github.com/joelthelion/autojump"
-SRC_URI="https://github.com/joelthelion/${PN}/archive/release-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="ipython test"
-REQUIRED_USE="ipython? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not all tests pass. Need investigation.
-RESTRICT="test"
-RDEPEND="ipython? ( ${PYTHON_DEPS} )"
-DEPEND="test? ( dev-python/flake8 dev-python/tox )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-autojump.fish-bugs.patch"
-	"${FILESDIR}/${P}-fix-__aj_error-typo.patch"
-)
-
-src_prepare() {
-	sed -e "s: \(/etc/profile.d\): \"${EPREFIX}\1\":" \
-		-e "s:/usr/local/share:/usr/share:" \
-		-i bin/autojump.sh || die
-
-	# autojump_argparse is only there for Python 2.6 compatibility
-	sed -e "s:autojump_argparse:argparse:" \
-		-i bin/autojump || die
-
-	# upstream fixes to the autojump.fish script; the first patch is needed for
-	# the second patch to apply
-	epatch "${PATCHES[@]}"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin bin/"${PN}"
-	python_replicate_script "${ED}"/usr/bin/"${PN}"
-
-	insinto /etc/profile.d
-	doins bin/"${PN}".sh
-
-	insinto /usr/share/"${PN}"/
-	doins bin/"${PN}.bash"
-	doins bin/"${PN}.zsh"
-	doins bin/"${PN}.fish"
-	insinto /usr/share/zsh/site-functions
-	doins bin/_j
-
-	python_foreach_impl python_domodule bin/autojump_data.py bin/autojump_utils.py
-	if use ipython; then
-		python_foreach_impl python_domodule tools/autojump_ipython.py
-	fi
-
-	doman docs/"${PN}.1"
-	dodoc README.md
-}
-
-pkg_postinst() {
-	if use ipython; then
-		elog 'This tool provides "j" for ipython, please add'
-		elog '"import autojump_ipython" to your ipy_user_conf.py.'
-		elog
-	fi
-
-	elog 'If you use app-shells/fish, add the following code to your'
-	elog 'config.fish to get autojump support:'
-	elog 'if test -f /usr/share/autojump/autojump.fish'
-	elog '    source /usr/share/autojump/autojump.fish'
-	elog 'end'
-}
diff --git a/app-shells/autojump/autojump-22.5.1.ebuild b/app-shells/autojump/autojump-22.5.1.ebuild
deleted file mode 100644
index 245a0758bb79..000000000000
--- a/app-shells/autojump/autojump-22.5.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit bash-completion-r1 python-r1 vcs-snapshot
-
-DESCRIPTION="change directory command that learns"
-HOMEPAGE="https://github.com/wting/autojump"
-SRC_URI="https://github.com/wting/${PN}/archive/release-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="ipython test"
-REQUIRED_USE="ipython? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not all tests pass. Need investigation.
-RESTRICT="test"
-RDEPEND="ipython? ( ${PYTHON_DEPS} )"
-DEPEND="${PYTHON_DEPS}"
-
-src_prepare() {
-	eapply_user
-	sed -e "s: \(/etc/profile.d\): \"${EPREFIX}\1\":" \
-		-e "s:/usr/local/share:/usr/share:" \
-		-i bin/autojump.sh || die
-
-	# autojump_argparse is only there for Python 2.6 compatibility
-	sed -e "s:autojump_argparse:argparse:" \
-		-i bin/autojump || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin bin/"${PN}"
-	python_replicate_script "${ED}"/usr/bin/"${PN}"
-
-	insinto /etc/profile.d
-	doins bin/"${PN}".sh
-
-	insinto /usr/share/"${PN}"/
-	doins bin/"${PN}.bash"
-	doins bin/"${PN}.zsh"
-	doins bin/"${PN}.fish"
-	insinto /usr/share/zsh/site-functions
-	doins bin/_j
-
-	python_foreach_impl python_domodule bin/autojump_argparse.py bin/autojump_data.py \
-		bin/autojump_match.py bin/autojump_utils.py
-	if use ipython; then
-		python_foreach_impl python_domodule tools/autojump_ipython.py
-	fi
-
-	doman docs/"${PN}.1"
-	einstalldocs
-}
-
-pkg_postinst() {
-	if use ipython; then
-		elog 'This tool provides "j" for ipython, please add'
-		elog '"import autojump_ipython" to your ipy_user_conf.py.'
-		elog
-	fi
-
-	elog 'If you use app-shells/fish, add the following code to your'
-	elog 'config.fish to get autojump support:'
-	elog 'if test -f /usr/share/autojump/autojump.fish'
-	elog '    source /usr/share/autojump/autojump.fish'
-	elog 'end'
-}
diff --git a/app-shells/autojump/autojump-22.5.3.ebuild b/app-shells/autojump/autojump-22.5.3.ebuild
index 71d13b787032..4f243d7525f7 100644
--- a/app-shells/autojump/autojump-22.5.3.ebuild
+++ b/app-shells/autojump/autojump-22.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit bash-completion-r1 python-r1 vcs-snapshot prefix
 
diff --git a/app-shells/autojump/files/autojump-22.2.4-fix-__aj_error-typo.patch b/app-shells/autojump/files/autojump-22.2.4-fix-__aj_error-typo.patch
deleted file mode 100644
index 6a9ac3c83c8e..000000000000
--- a/app-shells/autojump/files/autojump-22.2.4-fix-__aj_error-typo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d188d7e6757a4d0cad619b6d5ab729fdc59b1593 Mon Sep 17 00:00:00 2001
-From: Scott Olson <scott@scott-olson.org>
-Date: Mon, 6 Jul 2015 23:12:35 -0400
-Subject: [PATCH] Fix typo (__aj_error -> __aj_err).
-
----
- bin/autojump.fish | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/autojump.fish b/bin/autojump.fish
-index ead7ea1..b16ef01 100644
---- a/bin/autojump.fish
-+++ b/bin/autojump.fish
-@@ -91,7 +91,7 @@ function jo
-             case cygwin
-                 cygstart "" (cygpath -w -a (pwd))
-             case '*'
--                __aj_error "Unknown operating system: \"$OSTYPE\""
-+                __aj_err "Unknown operating system: \"$OSTYPE\""
-         end
-     else
-         __aj_err "autojump: directory '"$argv"' not found"
diff --git a/app-shells/autojump/files/autojump-22.2.4-fix-autojump.fish-bugs.patch b/app-shells/autojump/files/autojump-22.2.4-fix-autojump.fish-bugs.patch
deleted file mode 100644
index 6048ca989376..000000000000
--- a/app-shells/autojump/files/autojump-22.2.4-fix-autojump.fish-bugs.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From f09d23e30d3159db18872a3e8f8f579ed9e77231 Mon Sep 17 00:00:00 2001
-From: David Frascone <David.Frascone@dishdigital.com>
-Date: Tue, 9 Jun 2015 14:32:38 -0600
-Subject: [PATCH] Fixed some bugs in fish script
-
-OSTYPE was not being set correctly.  It is in bash, not sh.
-    Since the value is unlikely to change, I read it once and
-    stored it globally
-Test logic was backward in jo function, causing error to always
-    be printed, unless you did NOT specify a directory name.
----
- bin/autojump.fish | 20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/bin/autojump.fish b/bin/autojump.fish
-index 2cf5001..19cb27e 100644
---- a/bin/autojump.fish
-+++ b/bin/autojump.fish
-@@ -5,6 +5,11 @@ if test -d ~/.autojump
-     set -x PATH ~/.autojump/bin $PATH
- end
- 
-+# Set ostype, if not set
-+if not set -q OSTYPE
-+    set -gx OSTYPE (bash -c 'echo ${OSTYPE}')
-+end
-+
- 
- # enable tab completion
- complete -x -c j -a '(autojump --complete (commandline -t))'
-@@ -34,7 +39,7 @@ end
- # misc helper functions
- function __aj_err
-     # TODO(ting|#247): set error file location
--    echo $argv 1>&2; false
-+    echo -e $argv 1>&2; false
- end
- 
- # default autojump command
-@@ -73,11 +78,7 @@ end
- function jo
-     set -l output (autojump $argv)
-     if test -d "$output"
--        __aj_err "autojump: directory '"$argv"' not found"
--        __aj_err "\n$output\n"
--        __aj_err "Try `autojump --help` for more information."
--    else
--        switch (sh -c 'echo ${OSTYPE}')
-+        switch $OSTYPE
-             case 'linux*'
-                 xdg-open (autojump $argv)
-             case 'darwin*'
-@@ -85,9 +86,12 @@ function jo
-             case cygwin
-                 cygstart "" (cygpath -w -a (pwd))
-             case '*'
--                __aj_error "Unknown operating system: '"$OSTYPE"'"
-+                __aj_error "Unknown operating system: \"$OSTYPE\""
-         end
--        echo end
-+    else
-+        __aj_err "autojump: directory '"$argv"' not found"
-+        __aj_err "\n$output\n"
-+        __aj_err "Try `autojump --help` for more information."
-     end
- end
- 
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index be8ec57bbf6a..59909833e9fc 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,6 +1,8 @@
 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.11.tar.xz 311004 BLAKE2B 98e3ab6669bd70b49b238a597f1bc1309dc7ddd51c5b17c5e054f9161115d75d26e85d547471bc087e070d10554448b790a6dfb557abc413b70079ecc94acce3 SHA512 41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06
 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-9999.ebuild 4702 BLAKE2B 1f8284b4cd7f93912eccdc0e90a6ff65939bc1df16d2701783bd1f00afe49c60701819438dd95548ca4654ef83713a6a644cecfaf1d642d537882e0eb147ec76 SHA512 46cb8472ea55fd468eca090474a1488389427265f9eb1d20a2b20011c5f6af19bd0f89b1c507667edc52f406b004215bb8f1c0ef2f7fa7dbd6b5949aa2978434
+EBUILD bash-completion-2.11.ebuild 3980 BLAKE2B 4e2259f50e70ccf30c10314eb462de85c3af181a57fef41cb0d9ab120ee51493387da28df3656003b2edeb4212c8203f7769d8afddd702af8ae2c21841b5063d SHA512 530dc47995274b63a8a265b21e6cb8cd77c75ae8ed8d59a2624d894a95d85f65d227e70e5d24b80ee4efbd34a3a1029183b10704b6921e70ea2b2d604ad669b6
+EBUILD bash-completion-9999.ebuild 3895 BLAKE2B 4029f4c92080e9a351cc5f4d3042f39faced24da1d45ae990264424c19e12388394be53b3917eb894d44d1bdde7a048df122a3044ede67e54d192c5b026894ea SHA512 6a58d0a8fa1546525070694f8a3f72a6c9fea9a2a40332cf71a81cdb85d7acf4196fdffc8fab83c7ab6603ba6f54b73be5f91189ee4e8ac529c74de12929c1be
 MISC metadata.xml 1439 BLAKE2B 06bfaf55046a8e6001e3de802ce5a2fc11b32897726930ce1e98b41e75faac78e54ff8ee947f4fc85a207b64c342c6359298ca08e66e39a74a0c8c99cd0fe4cd SHA512 2d6fab5c7b6f5539bc0ea7f56ca787524d0ef20777b86e58c87200423bd10081dc21053e21ba9084e7a7f4ec03d73d71ac4b7cc1082e1da3ca8d1499b996612f
diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild b/app-shells/bash-completion/bash-completion-2.11.ebuild
new file mode 100644
index 000000000000..b386f822ac36
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -0,0 +1,137 @@
+# 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..9} )
+inherit bash-completion-r1 python-any-r1 user-info
+
+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? ( test )"
+
+# completion collision with net-fs/mc
+RDEPEND=">=app-shells/bash-4.3_p30-r1:0
+	sys-apps/miscfiles
+	!!net-fs/mc"
+DEPEND="
+	test? (
+		${RDEPEND}
+		$(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
+}
+
+python_check_deps() {
+	has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use eselect &&
+		eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
+
+	# redhat-specific, we strip these completions
+	rm test/t/test_if{down,up}.py || die
+	# not available for icedtea
+	rm test/t/test_javaws.py || die
+
+	eapply_user
+}
+
+src_test() {
+	# portage's HOME override breaks tests
+	emake check HOME="$(egethome "${UID}")" PYTESTFLAGS="-vv" NETWORK=none
+}
+
+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
+
+	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
+
+	# install the eselect module
+	if use eselect; then
+		insinto /usr/share/eselect/modules
+		doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+		doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+	fi
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 2.1-r90; then
+			ewarn "For bash-completion autoloader to work, all completions need to"
+			ewarn "be installed in /usr/share/bash-completion/completions. You may"
+			ewarn "need to rebuild packages that installed completions in the old"
+			ewarn "location. You can do this using:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+			ewarn
+			ewarn "After the rebuild, you should remove the old setup symlinks:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+		fi
+	done
+
+	if has_version 'app-shells/zsh'; then
+		elog
+		elog "If you are interested in using the provided bash completion functions with"
+		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		elog
+	fi
+}
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index 9a5d22feb862..7e52aa2b889a 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit autotools git-r3 python-any-r1
 
 DESCRIPTION="Programmable Completion for bash"
@@ -23,9 +23,6 @@ RDEPEND=">=app-shells/bash-4.3_p30-r1:0
 DEPEND="
 	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}]
@@ -85,42 +82,24 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply_user
 	if use eselect; then
 		# generate and apply patch
 		emake -C "${WORKDIR}"/bashcomp2 bash-completion-blacklist-support.patch
 		eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch
 	fi
 
-	# our setup is close enough to container to cause the same tests
-	# to fail
-	sed -i -e '/def in_container/a \
-    return True' test/t/conftest.py || die
+	# redhat-specific, we strip these completions
+	rm test/t/test_if{down,up}.py || die
+	# not available for icedtea
+	rm test/t/test_javaws.py || die
 
+	eapply_user
 	eautoreconf
 }
 
 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"
+	# portage's HOME override breaks tests
+	emake check HOME="$(egethome "${UID}")" PYTESTFLAGS="-vv" NETWORK=none
 }
 
 src_install() {
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 315b68412e13..be9a23cacceb 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -391,6 +391,7 @@ DIST bash50-014 1747 BLAKE2B d52f9160d74b340fd5722725b572ac1abe74caf41add5421dfa
 DIST bash50-015 2565 BLAKE2B 7df76369726332299c089db156c1e9bc6619fe2e925732da46ca47ca627f1bd7df4ea188a2c0f636e42623f2ee7ca40bc98551b5bd339ed4d5bee20b24ba38d0 SHA512 3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9
 DIST bash50-016 1534 BLAKE2B 8c9bb752a441b70b11655a9bd48e48ec9756a34d0513837faa94c64675c11d57ba1fb0bfc43a033040539f9c475a0efd00f375cf8ffe04a6d9d1d1c19575572e SHA512 dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
 DIST bash50-017 6517 BLAKE2B d8ec55e796fa2b17774fdf846c7b24ab1428a1dd94210e0d6b3174f99afe7f9c7f33448e1116c81f43407cb8d95390dd634cb8bd543046699898f471ffd68433 SHA512 d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65
+DIST bash50-018 1242 BLAKE2B e5f811ede6938e3b09d2ca658dc2ff2b30d6debed4334369ddf7755992cd1c591188595465552f4b5d0ab7d2d62759ff0b4f14a07466650cde0d25778b26df7c SHA512 cfbad36b1805ad76cb21d9136843171d794e57383318a014522e2d35905cf262d6721615f0a79972cacc45152de636977c957cbbad08ccb52f96de40b09bba5c
 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,8 +400,7 @@ 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 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-4.4_p23-r2.ebuild 5678 BLAKE2B 9d8b60a26838050aa18131b6967c6a196559b9521789d1a82f1ebf8dd42eb6a1ad0c4a0022c4046021aa120b7b3b9dff15c91f0b2ebd601a01d7878cc82bfa31 SHA512 608c289575ba3eeb3417c69557888b317da4b9189551db87a5e3484274201b3a4ceb5c61cec01fdfdd0374d6eb46420eec4471ef46430dfdf56475ac43ea3d35
 EBUILD bash-5.0_p17.ebuild 7303 BLAKE2B b2444276a28b999222cd9010dd59969a0f0d82b688813c93a122fed323653e5e816ca9d5b59e064f25b089732c41fa00d075f80e0b423147c08f93f736e4e75c SHA512 5c8280ff54b2c1ae1b0b16e56c898ea41bdb49cd8d2dc89806c6b878d9f43cb7a4c7d40d2793713fe21f90f0afc9613f28a0dd767824963c9893879db438e722
+EBUILD bash-5.0_p18.ebuild 7306 BLAKE2B b111ba0b0faecfff6d237c13b98ee080e1b72c694d3406387ae1426ee0dc27ad01545d3121eb0d5667c2568446fd4092b7feac0de09f0e980ef0cd41cc75ebf5 SHA512 2ab3b03d7f180f66de35c2bb44275179a8dfc8009306223d57ac37fd1c78d3ecd1f8428b307e04028485e30e560364a6c134166c86906429aa3ed5903dac4993
 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-r2.ebuild
index d939664e191b..645851b12aff 100644
--- a/app-shells/bash/bash-4.4_p23-r1.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils flag-o-matic toolchain-funcs multilib prefix
 
@@ -45,14 +45,14 @@ else
 fi
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="${MY_PV}"
 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=
-	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
 	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
 "
 RDEPEND="
 	${DEPEND}
@@ -175,83 +175,15 @@ src_compile() {
 }
 
 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
-}
+	into /
+	newbin bash bash-${SLOT}
 
-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
+	newman doc/bash.1 bash-${SLOT}.1
+	newman doc/builtins.1 builtins-${SLOT}.1
 
-	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
-}
+	insinto /usr/share/info
+	newins doc/bashref.info bash-${SLOT}.info
+	dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info
 
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
+	dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
 }
diff --git a/app-shells/bash/bash-5.0_p16.ebuild b/app-shells/bash/bash-5.0_p16.ebuild
deleted file mode 100644
index 6f6fa4bb6e82..000000000000
--- a/app-shells/bash/bash-5.0_p16.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# 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/bash/bash-5.0_p11.ebuild b/app-shells/bash/bash-5.0_p18.ebuild
index 6f6fa4bb6e82..b001a72e609f 100644
--- a/app-shells/bash/bash-5.0_p11.ebuild
+++ b/app-shells/bash/bash-5.0_p18.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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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="
diff --git a/app-shells/ctypes-sh/Manifest b/app-shells/ctypes-sh/Manifest
index 9288f202ac96..a7b0eda90e9f 100644
--- a/app-shells/ctypes-sh/Manifest
+++ b/app-shells/ctypes-sh/Manifest
@@ -1,4 +1,3 @@
-AUX ctypes-sh-1.1-makefile-fix.patch 893 BLAKE2B a665dbb0278fa98408da8e68c0a6fcd7c4558d1b99efc99bee5946f41a2ab864112fb5f7d9f44db5e182b0e190481da44e17a17fba5d954bb3f5b8e353936097 SHA512 4acbc4639058b628c09082aafeb7592b1f85e3db5ffe77d6db8807a6b4ae787c24685f305149ed9a76c5558c01e3d17fd6714aa1103c435364166b76df7baa26
-DIST ctypes-sh-1.1.tar.gz 437637 BLAKE2B d4279812d613a771ed405499dc623fce5faa00c22e75067857cea0a31e4a36a1531f7b27a1edff89075961bf5e8183bf0787a703cb36c1a8cbd7c03d8a18710f SHA512 0e136f5b9fc342875d02b1087daed60eed46f411765538f185d1da61430205113db72994ecdb125aded3eae114b3f487e7af398c1326334efdd197ee7de18a61
-EBUILD ctypes-sh-1.1.ebuild 740 BLAKE2B a4464f179f13d0763e24b4b13bc45679e7a1d63147e1b10240392779379982299b030166b382c63bcfc6ae1c9a1730df21897bd86aef4482df988c37eb6bee01 SHA512 7a698c3831b7c4f551e803c6d1d1fc7f28b293d316a92d2b5b738802bcdfd925bd31aef83cc8ad6f8e706e30ee90f164a553bee46cd4032a7d29f7f14d9e1382
+DIST ctypes-sh-1.2.tar.gz 475531 BLAKE2B 6fe00415244227629b952a0c18f9c95659a3fb22b9f17e109554f11084d27bf4c23eca5bfc49679b63367fa9fe74a20f206ac79955ed6588418033f37b776729 SHA512 23e9c30acc8ed5b4fe93fe1427c406e7c7b18067bbfc3f948126683910efc645cc69e426d771beb715148b54dffce75351b7773d8b54ac13f74d9787db8529f6
+EBUILD ctypes-sh-1.2.ebuild 731 BLAKE2B cbdee5849bad59fcf3a0ab7956e31e0323c4ec0dab15693e05257f2f2982dd6409857b08b9ef31f4f07c9d39777894c2c3f682eb2b5f50eb9fce39054f1ba97e SHA512 901d2817e18509b6a7470a6d48e22b6e3fe65dbb21133ad487d5d0996ddf023684bb28ef4f767fa133e1b653786ac5faa92521bc613e7dc22fda513b8684e655
 MISC metadata.xml 558 BLAKE2B 820b7e4f6e8c7fec2ba02cc164090f20464b78a137f53697532224a360c63952e219c77aebfad40f75673e2c8e82b08100358232290701d47fdf6b66426bfebb SHA512 514d59c04f3c419abcf7ab54a8860506bbcca810c2cafb911b4dcf468cb7b81f63e6f5c01b92c3bb5b2d10c2266bb7adf0ba264aba3bfe632aebcf7d1d3fb1a7
diff --git a/app-shells/ctypes-sh/ctypes-sh-1.1.ebuild b/app-shells/ctypes-sh/ctypes-sh-1.2.ebuild
index e737d10f3e87..a64a6db88110 100644
--- a/app-shells/ctypes-sh/ctypes-sh-1.1.ebuild
+++ b/app-shells/ctypes-sh/ctypes-sh-1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools toolchain-funcs
 
@@ -13,17 +13,16 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="virtual/libffi
-	virtual/libelf
-	app-arch/xz-utils
+RDEPEND="
 	app-arch/bzip2
-	app-shells/bash[plugins]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile-fix.patch"
-)
+	app-arch/xz-utils
+	app-shells/bash[plugins(-)]
+	dev-libs/libffi
+	virtual/libelf
+"
+BDEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	default
@@ -31,9 +30,9 @@ src_prepare() {
 }
 
 src_test() {
-	pushd test
+	pushd test >/dev/null || die
 	PATH="${S}:${PATH}" \
 		LD_LIBRARY_PATH="${S}/src/.libs" \
 		make CC="$(tc-getCC)" || die "make check failed"
-	popd
+	popd > /dev/null || die
 }
diff --git a/app-shells/ctypes-sh/files/ctypes-sh-1.1-makefile-fix.patch b/app-shells/ctypes-sh/files/ctypes-sh-1.1-makefile-fix.patch
deleted file mode 100644
index 9a2965a62bc5..000000000000
--- a/app-shells/ctypes-sh/files/ctypes-sh-1.1-makefile-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 5e305160cc219fa63658148e3d258cb62dd043a3
-Author: rtlanceroad <rtlanceroad@gmail.com>
-Date:   Wed Jul 27 14:49:21 2016 +0800
-
-    fix Makefile.am in src dir
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8a9b682..71347bb 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -11,6 +11,6 @@ ctypes_la_LIBADD     += libstruct.la
- noinst_LTLIBRARIES   += libstruct.la
- noinst_HEADERS       += struct/dutil.h struct/dwarves.h struct/elf_symtab.h struct/gobuffer.h struct/hash.h struct/list.h struct/rbtree.h struct/strings.h
- libstruct_la_SOURCES  = struct/dutil.c struct/dwarves.c struct/gobuffer.c struct/struct.c struct/strings.c struct/dwarf_loader.c struct/dwarves_fprintf.c struct/elf_symtab.c struct/rbtree.c
--libstruct_la_CFLAGS   = -std=gnu99 -D_GNU_SOURCE
-+libstruct_la_CFLAGS   = -std=gnu99 -D_GNU_SOURCE $(FFI_CFLAGS)
- libstruct_la_CPPFLAGS = -I../include -I../lib
- endif
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 512c01b43a8f..b1829ebb6d4f 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,7 +1,9 @@
 AUX dash-0.5.20.2-gcc-fno-common.patch 1131 BLAKE2B cce4ed8a97d95e294aa7679c0ef164337a836ed9f0b7e18b38a6032545796260eba8c7502817e57bc5948aadb74b9826eb7cb5b02e66cdb954e35a5ed762f460 SHA512 6056f196a353f382b97c6865e89dbc5a63295c404fc9be83551b1458e2a42f93786ec3d0b7dac1b674b40b59e90cd968d6f1e9e0c8ca953704f4de8bb9251cbb
 AUX dash-0.5.9.1-format-security.patch 374 BLAKE2B 63a9128f8a396e9c9808867ffdff90f1a176a99108db02d4ff03395d74c9eb69039604d3921cb26c42aced4411caa27cf20eafced3febbb4b175a7d118b66ca0 SHA512 4726d96ad1a86e47374c129f1cbd13bf5f2b6c77faa4e3e85be65978222cc040175313218fe29da176af2bbc2546c432d84247ea342d261a284b64b42ce138c6
 DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b2e05553a3e1a9939da7b00fd80f7b9fb35f33e18b0c11850bfb1b8377e9dc9bcfd80754fd29c9d160e0ce5a4d SHA512 0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640
+DIST dash-0.5.11.1.tar.gz 244439 BLAKE2B 88f877954aca739621133fadd32cf8bf1ca5d334ef212da622501b1235caee3a91e9b8b481c7a45f3fb6d6eee1036c2e0f1fd387638c910eff90e8e0a1eaa419 SHA512 6403ac793c87c9101bd5f3b2df74200ce1a992d0c432aa79375d4479b87c83279f303239af5080728c8a64ef4520e39fe8f0f1e037a0a38ffce1e4dd057d9c72
 DIST dash-0.5.11.tar.gz 238776 BLAKE2B 0d399b35c10a33f6a22f51f7b74b9e092fb11d47ae45948f43fab0dd1416061145e7f930f0f0d1119d02cc45790ba19ce040c951322c131e706e5f3f32f2612b SHA512 41c3afa8aa4788f7899b9a4c1bce2dc8629f4405184cdc7269993e72c695cf9537c9e68b654d56f06c604a82ffa73c9160b91368e82a3593a12ff7dea10505d1
 EBUILD dash-0.5.10.2-r1.ebuild 1599 BLAKE2B bd791b7188f16fe8bf627321cc99b9bd165d35c4bd42f6c5c9de0446ba99277ffbe88f6df1cfd6c51518f5f506b9966680159e0bbc7fa46ee34d881368ae1ce9 SHA512 672b9b87555c251c071772a505b77f70190513692002ee974587e6905fc4f100eba3cde7d115f380ceb0d8102fc7e3091354e8693ce466cb48f7d88713ec0d3b
+EBUILD dash-0.5.11.1.ebuild 1524 BLAKE2B 61e65acdde52d2d8ef6076b23f4b635760f818a0c8efccd019b7519d4b8e461b34ad8567797c12e98600f17e2fc4c237715c48150d832caca96219e3b048aa3f SHA512 99050808032d7641373293b183294e9a863801bc7c1cd4c872f3f263c5650f9149bcf256442c54a536337a0f40c4a6bfab8c0cc5d2a8203f317afb852a0fd603
 EBUILD dash-0.5.11.ebuild 1529 BLAKE2B 024ab6c9362510e03778238a95f3ec21d3d19211258aff8f14d9d6bf15436689b39cc73543e068e687fd0ff9f4390611c4e6b01de497a31d8ff6b42ea80297e9 SHA512 74cc3b72b2d6179d20caa9d8a2bc0341a9428944caaafb366ccd770946555b9f9a746831212a3a35a99166e6e6af9b5f7315b29861e0ed0334fb80d57510120c
 MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild
new file mode 100644
index 000000000000..d4176f23f384
--- /dev/null
+++ b/app-shells/dash/dash-0.5.11.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 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 ~x86-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() {
+	# 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.
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		--bindir="${EPREFIX}"/bin
+		--enable-fnmatch
+		$(use_with libedit)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index c6e59fd1d1f6..1d28bafc2143 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -6,7 +6,7 @@ DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c21
 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 1662 BLAKE2B 803c662cd6cda8a2cc4b17d69fac6d89707770c7aaf140acebffda40f690d90f38a253424db4ea19fcea155f0d6e49d6bd92495fade96b750b1d451a04f57903 SHA512 e51b71e0a7bbbcb54a50dea245facd141bfc6e07e5d45199dbad5e2e1a6747b16a5f269b55ffafeffdefa0227c29c39e3b0b039eabacaae700476b14fe9fac09
+EBUILD fish-3.0.2.ebuild 1667 BLAKE2B 6c0aafa9c02a6e39f23b3887990898a48ed669fe727c5947149911f057c002f4476062ba6b93f6d838a941dd636bba2422112f72d100f6806e52caf2aaf0ba6b SHA512 203cd9ce0a233b1010d990ac006077c15b3f5af5d9478752d4723c1c0aff745109a385ee9ca3ee2a120ec991cbb015f9d3c20c5a3d097006c6a9b36c4829d587
 EBUILD fish-3.1.0.ebuild 1557 BLAKE2B ccd54d16b09cd15983cb58ac4da97170fcdd8493f315968c5709e20ef06b9550192a67f7df82c69637ccb08ef8e07db199f90a1ce960d13fedfd6525852bdc11 SHA512 99fb79a548105a2df3c4c8098a2967ce91e52eee8a6d866e95606ef373a0bae8d23d81a322d3e307344f3ad04ed9d3a6240d3d25b84c1130bc54c2f7fb8a6570
 EBUILD fish-3.1.2.ebuild 1571 BLAKE2B 91cf51764d5969c2d941612b5f74456133de08c4ab101e38d80d2169da6661e5711ce449edf677106bfdb55a75a75549efbea36673dc0b11384a10c137819391 SHA512 b8b956ae839cfec8acfece28ca1b6b9b8cc9875112f27a728ab32f7d3b1a929ea9044f0e3dabf3723683c92309b6e2e56cc04638f1e74741de0da4779b19e68a
 EBUILD fish-9999.ebuild 2057 BLAKE2B 8c6efe43984f467ef77552f189eae1f947334e2a3e1558a5b1a51cb2376e5bf8a7de85cc780d882bfc99e22a04919eb5a9db9795e546e0ab719481d8d27af17b SHA512 915e41d259b8401b4d4bb08152744d3493fea9e326e6923beb43dddd2dc6b9bd1d4105dbb53238788e6ae9b6035461e7bb797bd4d2bb20cd1f5bf1782644a78e
diff --git a/app-shells/fish/fish-3.0.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild
index 03142f16ead5..4fbf72a7b15c 100644
--- a/app-shells/fish/fish-3.0.2.ebuild
+++ b/app-shells/fish/fish-3.0.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc 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 9a97dd32af73..647bc69313ee 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -1,6 +1,7 @@
 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 fzf-0.22.0.tar.gz 168483 BLAKE2B 0be859b9b5b0f4990273e1254b2530f0d651ea612af12a690c570b0fcfbdc23e3b1df8356aaa6bc3d9d042c3cf6c87fc35efe6becdc992bdbcb1b94695961b42 SHA512 003b187c93f0ab2e8a1adbd4eb9586e05e12fb9a86e445ac8ff48ba391ae16f104d60d18934bb46765537d5007035f549c15d6970c901f72813d55001d3bc6e5
 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
@@ -47,4 +48,5 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191011211836-4c025a95b26e.zip 287793
 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
+EBUILD fzf-0.22.0.ebuild 3863 BLAKE2B 03d8d3b3f8db71e5832b78ba0ff1ecd0569d3db75034157a6880df5fbe6c1605d2838d6fcefb438d6f99bc328cecc152652560374dde32e3df4a81cf5d3bc72f SHA512 8a6d1ca80495c9b0112d08ef1337f78011767b79fb1200245eb4371ce6b823f307e07b36d6a9c1a819138b872f2ac731d94b2c3249f3120ee532f1cdb177b9b5
 MISC metadata.xml 577 BLAKE2B 119ae624d966298426aa682f1e018c9445063356a9c9b99513c6e1819f8ba2f8701958e36d71a48d44d7383cd2793dab779d11e2b60366d2cbf7675b00429681 SHA512 3c9936fee0571f7271fae7b4029f96a14f154d0ad1951d6f2fb32970ae9efd703217c237e1c26e3dc4555a7b16598073d13d7b8bef0421e44c4a661ba6a2ea29
diff --git a/app-shells/fzf/fzf-0.22.0.ebuild b/app-shells/fzf/fzf-0.22.0.ebuild
new file mode 100644
index 000000000000..ede17a3ea609
--- /dev/null
+++ b/app-shells/fzf/fzf-0.22.0.ebuild
@@ -0,0 +1,111 @@
+# 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"
+
+src_install() {
+	default
+
+	dobin bin/${PN}
+	doman man/man1/${PN}.1
+
+	dobin bin/${PN}-tmux
+	doman man/man1/${PN}-tmux.1
+
+	insinto /usr/share/vim/vimfiles/plugin
+	doins plugin/${PN}.vim
+
+	insinto /usr/share/nvim/runtime/plugin
+	doins plugin/${PN}.vim
+
+	newbashcomp shell/completion.bash ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins shell/completion.zsh _${PN}
+
+	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/fzy/Manifest b/app-shells/fzy/Manifest
index a5422642ea0a..b0fde6702832 100644
--- a/app-shells/fzy/Manifest
+++ b/app-shells/fzy/Manifest
@@ -1,5 +1,5 @@
 AUX 1.0-cflags.patch 882 BLAKE2B 451086d7f84b97fd78518838ac34541b961cdcc76e929153f1bdfbf0bf95e6ee50d923a33b70514314cb70b35dd48d3930a5f5281eb1d80588f3263cc5e6e972 SHA512 173dda551294d4ac83e286844e63af46e988d5ceaf812537e7300ade56a8d1ba5da4db2db9da49dce7ab491324888860692746e2ec47e8cf44dce16300b54dfe
 DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc
-EBUILD fzy-1.0-r1.ebuild 1136 BLAKE2B 7cb7b5534ad6ad7d612f084d5ca99ad823dd0907e870f5b887de7e797eb7cf4f91f0bf9830046f6ca44c83023eaeb06108b9d76eba1c56ce2def103a23364327 SHA512 f34088afe6520391e35addbd2d4b1d8a46989a852ab1adaf1262235c9b38a5335cb44fb0d860271bc421f75e5c8cbe2d724114a210c6872e1c8c809de0e2af91
+EBUILD fzy-1.0-r1.ebuild 1135 BLAKE2B a61b7accd0f20505c52d5d4c279d9a75fc0eeab63ca5a890104aa53161338c334636f233e522c7f86f497b4958142557473d1fe7b2269b6b9b7dbb82654d792c SHA512 dc5d2df93884bc841f043d97a0558b0b7b9a6d47d34a4a3913dc6cef8190a8e5921194d3f9a98f64a855a4743ba720f8a2d7297e6c6afd75691a82c42abe0ec2
 EBUILD fzy-9999.ebuild 1144 BLAKE2B b921ad2772abc770e3f263555ecbbb8403c37bb4678ebe57cd5f6bcbca1f7286bab86509fc44175d9cd3a177730d5df13b6285a5e0bea1f3d1038ffbaab7cb68 SHA512 8817316a9f1c35d39fbedaef6abfbcdb382779156b8f379e2de04c3748f15a0f5ab23cbb03f7553032393919337d29aa00c73699049e090f12bd1b0b1e23de22
 MISC metadata.xml 892 BLAKE2B 3182bda5d04463762d724265d2ff3644eef1615dfbd2db92ad7ab5e1bf3b9e5f0f727dc55939e0c0902ed16ac78d4a39ae331d22902ec7f7f10d53a7e65a59ba SHA512 202ff3dc44543bf072b32addfc5e1ad627ec6fa16585d9ff9ddbe68bfaa784aa0319ed152621215cd60f1c2a688bb0e3ca227b78fc6b62f5dca4f39b2ad8a55b
diff --git a/app-shells/fzy/fzy-1.0-r1.ebuild b/app-shells/fzy/fzy-1.0-r1.ebuild
index 660ca21138e7..57e59b500d79 100644
--- a/app-shells/fzy/fzy-1.0-r1.ebuild
+++ b/app-shells/fzy/fzy-1.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
 else
 	SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc64 x86"
 fi
 
 DESCRIPTION="Fuzzy text selector (interactive grep) for console"
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 24cb39f96dd8..658a1b70dcc9 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -1,5 +1,5 @@
 DIST gentoo-bashcomp-20180302.tar.bz2 21485 BLAKE2B 887ac5cfa8c6ba431a6aa5f5918b8bdfbe6a1ae9a2e7ac21b3c06ec2062b448d924f928b1372e81749ece6d4aa673bbbaaa364ca744124c842e3819349917169 SHA512 6b4551b078505e6348cb10ca2d67faab4d323a0f0ddefc872145314303d6f95fe31f9706d43d9f20c0139610ce47e4cf70ba7516d911dc4927cfbf5d863bc063
 DIST gentoo-bashcomp-20190211.tar.bz2 21508 BLAKE2B 410994819f62b0bd105ca398c335d76993fd694b8e7f56c761b94fc1e2f6e90f2010f2f2a88febd71ac0c5643fc0e923c60151fbf9411e8a553b5917d6bcd8db SHA512 4b0a5e79f90ee8122fa8d0a7224fee6472b1762a0dda680ea1c0e8d4069760be9b6472e052b1b166a389c0e779816b98715386dbc62a3574e7ad851b2567a070
 EBUILD gentoo-bashcomp-20180302.ebuild 744 BLAKE2B 79e049b8badb4ac977ac7dc2cd2322cfa22baa717d827aa3034532b017432cef76fee54feb0db7a7c54ea87b4497b5dc7d5bfb2c22a98e31d1d2991216132114 SHA512 9b4da0add28c7af16350430d37962153b92945f08406cbeace1a2b571f9df4ca7f15d96a78b54b45ac9c48ecf27b35d45effeaff4a6241333ec59a283701ec77
-EBUILD gentoo-bashcomp-20190211.ebuild 749 BLAKE2B 01ddb68b7d26cb138e112ad3e653fe84f01f938b3e42e8a9e21183addca0fa342470d20317ffd0c4b858f2a3ae558870744be01339b1bc7ab99f6bc9bbac4af1 SHA512 bc9f17589d01cb9c28b10c6e6ccb555f79a6d673903a14d06cdb49f1653a9607276a62a06fe715b545f55dc25ee8edb3ab6d675ab5c6bd104fc772e9e535c940
+EBUILD gentoo-bashcomp-20190211.ebuild 747 BLAKE2B ac177c13db9cf4933933ee0539ee388a27c1d509f725f7709e86af5a48269db4aa45b345d5765f7148e8cc311e29064e4227be709af180e305a72022cabcccb1 SHA512 380211e60b3a732e4c30e4f3f97976e2f96bbb4806d4003d6bbc663acf5935c7f214c8b5cd9e1fc8c5cf72ea516e39ca1a73aaad8adc3dcec6aed2d70ec1ccb6
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
index 228eba698120..02f6a3dceced 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 
 src_install() {
 	emake DESTDIR="${D}" install \
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index d3b598a32462..ad14f31d8a9f 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,3 +1,3 @@
 DIST loksh-6.7.2.tar.xz 209520 BLAKE2B 37635721b4ed99b3a8ffd0bc6806e29e96c68618db32d8aad32e8cafb2c669ff44e0228588631478c189fb804a790245a66abe700bd78d06f3fdbd3baaa03778 SHA512 0008905c97c0d65ab246c05ddcd733925cdf2e35bc0eb09dd4301718236cab3f2682bee250e3630f3f9d801c1e20ee2db71194ac01f9ea4c2c8ff437328f5d08
 EBUILD loksh-6.7.2.ebuild 641 BLAKE2B 56dbb90d38a9aefe788c4788926c6f47c1796b43364511cfd95fd57272c0bfd3027656992509336ce08766912e843c376bf76a6196e0c1177c0597c6b0bfdc46 SHA512 ef92665722e956b8d29c2294990593668117ba0bf18eea19cd3436974a40668eb04a44898b28ad6290fa024839f2137da5f74530adfcee0e777eaf2ca94e2d85
-MISC metadata.xml 328 BLAKE2B 74e5126dbb36b09f5711c125eec5a9be8209f5f340e3e45f342dd274548ebea9ff3859b0452e999f06cececb81e6a75434ffb32e6bbdc414483d7460fd974831 SHA512 f7118cf845948d1bae282c8cecfe861802163b20ddc0ad1f7c427211dc0333471bf6e18fc807837359247fb021749c7b2b910b6233e55b389551e09429fc7b58
+MISC metadata.xml 243 BLAKE2B eb91d465a397650cd6dc48e2fd31f6acae56f92fdeeb4b8e0cc6bd172e864799c8e97dc4d80e2be5abcdc2001cd0f031a007edc5d909d6320b9f4688e3712953 SHA512 ff4eec04c2c9918783436eda2f303569ab56d3bbd7da1d2f8f9af3385279f98ccef3109ac1f22ae10765cb9539c577f370405962d551dc12b741adac465efab4
diff --git a/app-shells/loksh/metadata.xml b/app-shells/loksh/metadata.xml
index f3587d6da381..4ac932989cfa 100644
--- a/app-shells/loksh/metadata.xml
+++ b/app-shells/loksh/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>	
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">dimkr/loksh</remote-id>
 	</upstream>
diff --git a/app-shells/mcfly/Manifest b/app-shells/mcfly/Manifest
index 79d4d5faaa23..8c56bd76ff9e 100644
--- a/app-shells/mcfly/Manifest
+++ b/app-shells/mcfly/Manifest
@@ -55,4 +55,4 @@ DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD mcfly-0.3.6.ebuild 1737 BLAKE2B 37e9c1d41060efb090ce9255ce41b37177c9043427c42e3c90c53033e07c0b1ac935bede751a87013c1944ff210c003dfa5df992e5ce315fc1c1b5730302e723 SHA512 69925b2ee2b7946ab6e0eb7d54141b3a826130679aaac1d4a71b69991345c435c7d5099695ca7d74a2f432602ff26c5a845248cc05859b710cb701e98f0949db
-MISC metadata.xml 754 BLAKE2B 9ffcd71049bc11d8ad580f9721158f931918b2d0cd4fc9e465fda580bad0a853a47c58b4b258d98a654102d195015b32f9d8cbe62343b2c14222a0ea229ea3a3 SHA512 8159ff903511596ba5c7779f89a827101a6c22b8b36bde69cabf89470dcc970fc1755f921bb26952778f9b8e9e518ac7b45edb92c08471b9ec89f01074e8ee9b
+MISC metadata.xml 670 BLAKE2B f1b6b4fa985de99294f9d8ece8a128d0290e03f11024b65aac0abc2a966292e280c19e891d28e09865e4207fdaeaf42af206d8fd838fa50a10aff6e983d0dcf0 SHA512 6cc99e9feb180116b64771d7c0adfecf027b6539815f972ca00380991efcff157e4afff817790055d9e1719a83436c27db916ab26af351766b9ff740590940c2
diff --git a/app-shells/mcfly/metadata.xml b/app-shells/mcfly/metadata.xml
index 1e6f47eb167a..8d0da20cda26 100644
--- a/app-shells/mcfly/metadata.xml
+++ b/app-shells/mcfly/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		McFly replaces your default ctrl-r Bash history search with an intelligent search engine
 		that takes into account your working directory and the context of recently executed commands.
diff --git a/app-shells/posh/Manifest b/app-shells/posh/Manifest
index 944cc1163029..a0370e3f7807 100644
--- a/app-shells/posh/Manifest
+++ b/app-shells/posh/Manifest
@@ -1,7 +1,3 @@
 DIST posh-debian-0.14.1.tar.bz2 208385 BLAKE2B 0670d529f0d2f3b27e212d0efd66b42de4d37a6ce99f18d6fdd0b681a61ed313df5a9cecfee840eacb95df73b611fa3fa24163529d59423a3c0ac3f33bf5cccc SHA512 2beb8af9edbc318da243a82e1fbaec4ac81ec166b3e602f6b37867e4bbe548247a299dd748df4da88b2ff2930785945d91c5b84b563c339bc239299ecf67beec
-DIST posh-debian-0.14.tar.bz2 208192 BLAKE2B b2a974fdb55d39260bf21831c2df1518e6ef2e7c982e7a15c70ba470dff9e1eac41ac5b7e6709b630d7dcb2cd2871268328c70f876778fb9196f70dd1702fedf SHA512 8e30245146197f379ae7bccc6f56a1d0d38796d7b5499bf334d0c4375e8caacabaf8293e838bc827e511a57c6ae70701bfb1887c0756bce3bb9a4b69b9fd07ae
-DIST posh_0.13.2.tar.xz 267492 BLAKE2B 44a06528825485ac1c5d899e9b625785ec733fee945241dc0708e51e1f2145a31aae04023477f6b3abb8053ab42714d2ceac6b5a1d776780ea2ab78ca1fd44d5 SHA512 1d0de10e47e66cb654a47c18bb7f8b5361eff2d99e6c0b215ed9a1052134b534276ed58feafd53fe0ee2fbc3e048dc9cf747752568fb361ea47700e02a3478f0
-EBUILD posh-0.13.2.ebuild 481 BLAKE2B 3e0b08947628fed0afbb6d9b0b87893b9cd6cab5c362f1f62a5d11e31800bdf7bf4a82776fac69e53b2518a72a31bb68968ea3ee2101c2dbc269e878492da482 SHA512 62cc5bb9d7a9ef2c3b1d1e714ff8f8a4c265c7c3293aa5a870870f0beec64a4794a6fa716a84640deed97d3cd8a6f7545831b62567f1c31c30bf6a9fc6de6b9d
-EBUILD posh-0.14.1.ebuild 616 BLAKE2B e7dd7a7bad0022e77695edf8fb30f9b690dac46ac87e6c188979070af56e163f10e9659c18ce53f3664b60cbdef6e84dbf1a3d19987ef20c6fe57a99e3cb67d0 SHA512 c10a0cd92ba8f1f2789aa47ea9a6b30a7f1b797cee9a311e2f89e78b33f5103626a11d82f79850dcbf9ac3b26d8f1a4066bf387b716ac956a1a68a3db0c9f045
-EBUILD posh-0.14.ebuild 616 BLAKE2B e7dd7a7bad0022e77695edf8fb30f9b690dac46ac87e6c188979070af56e163f10e9659c18ce53f3664b60cbdef6e84dbf1a3d19987ef20c6fe57a99e3cb67d0 SHA512 c10a0cd92ba8f1f2789aa47ea9a6b30a7f1b797cee9a311e2f89e78b33f5103626a11d82f79850dcbf9ac3b26d8f1a4066bf387b716ac956a1a68a3db0c9f045
+EBUILD posh-0.14.1.ebuild 613 BLAKE2B 605d2e8f93c8522d898b87fb26b67c72ee89811a9913cf5ffe9b98d70c33e3236b3cd87623d039c02f392247ba6ceee09d9fd3ba5793725a054c581e76356d26 SHA512 440cae993fa6278eac079691cb1c025296b12be156c9b452024d17268889d0c1794638f91bf79c652d77bdb10efc5104094ebf149545aed9746c6b5880fd93a8
 MISC metadata.xml 217 BLAKE2B 2c342b84369a3ba13606f35f163ee0aab11a086c23c83066fb5fd7d0ffcac5282b2cbb228982745c8ae1c1575b7d1605556f3562175ee150de6c701d86e347c8 SHA512 94cad0e7f10d53a2ee488ff9be4c417377f7cc6fed1ea4bad878364978cdbeb648974764477a18d2b222ad9111082ef0e00b14832ec7318646a47b56c58c828e
diff --git a/app-shells/posh/posh-0.13.2.ebuild b/app-shells/posh/posh-0.13.2.ebuild
deleted file mode 100644
index b5f53776db4e..000000000000
--- a/app-shells/posh/posh-0.13.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
-HOMEPAGE="https://salsa.debian.org/clint/posh"
-SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2+ BSD public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-
-src_configure() {
-	local myconf=(
-		--exec-prefix="${EPREFIX:-/}"
-	)
-	econf "${myconf[@]}"
-}
diff --git a/app-shells/posh/posh-0.14.1.ebuild b/app-shells/posh/posh-0.14.1.ebuild
index 9ebc1b24bbaf..e2a2f5104576 100644
--- a/app-shells/posh/posh-0.14.1.ebuild
+++ b/app-shells/posh/posh-0.14.1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2+ BSD public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/app-shells/posh/posh-0.14.ebuild b/app-shells/posh/posh-0.14.ebuild
deleted file mode 100644
index 9ebc1b24bbaf..000000000000
--- a/app-shells/posh/posh-0.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P=posh-debian-${PV}
-DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
-HOMEPAGE="https://salsa.debian.org/clint/posh"
-SRC_URI="
-	https://salsa.debian.org/clint/posh/-/archive/debian/${PV}/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2+ BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--exec-prefix="${EPREFIX:-/}"
-	)
-	econf "${myconf[@]}"
-}
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index 885f2ce9479b..3004289ca91d 100644
--- a/app-shells/push/Manifest
+++ b/app-shells/push/Manifest
@@ -1,3 +1,5 @@
 DIST push-2.0.tar.gz 2211 BLAKE2B 5875962c3aaa2e3eec2dcd3b70a0b5325684dffaf0b01b8f336db835bcfc4b24fc5d28817eb9032d8a10c5759089e2bbf42fba058403ebf420a77bb7d2754c95 SHA512 03c40bd8b3b09473952ecf13edd622533616de47638741214b40856b33993f9310d62be34fac6f68b950f58167c3111082554961a800a43a3ecf8a7d138ffdff
+DIST push-3.3.tar.gz 2794 BLAKE2B 98bc36a27e10e4b548f35802eb56ccab0ecd59ae512cde946382653aff0d8744c9908abda748e07b7eb398780a7bc4e2fdbe157b409cc71c9a184d36fe4debb8 SHA512 e0b26af53eb89ba706c681d8fbdc77f7be8d18e02446aa9a1096faa2ead714fcea4687f4dd28c422a598465721b69b075485ef29289effc9c9dd58ed0d915c9a
 EBUILD push-2.0-r1.ebuild 640 BLAKE2B b4d5973bc0b1f1a16326c0d886cc7cf844af312e2792524befd0ffb474eedc62a3158387508f8ee7c4ef2fa5166330f33ff7711ad51878cddcdf026df7a99137 SHA512 8922475dbd40d4c4e883d377702ff02355b99494039fc73e45149f11ae6310789cdb80099900705ea1170b72f107ef8aec4ad2e92384271a42cb1feef41b55a5
+EBUILD push-3.3.ebuild 666 BLAKE2B 911ba62286ef202a9f9bfdbbca22d8fc97f3d1ab0a7b762756c0aba42901888a71d35f26a5e54e921c0501889cef73111f06e126aa554ffbd542fe313adef227 SHA512 895017850f3600e78e2b35a9b07dfe76feb594933c459be64bf8ded39b747839fea99cb9c9dfdbcbdce82ab3d8dfaeddfec67574a322cb4f5848177e0ac388f8
 MISC metadata.xml 698 BLAKE2B 69740256ef4db99512953ae2e9b896410814d64f45c8fd6f2b45628948e1c7bf3ed66e53605c0611e30bf9af75d59b554b6c8bfa942777d55a3db1fb0e4bb944 SHA512 ebd59b8ea97e30788644f33eaa98c2618fa2f90a62bc17bb5c9027253df3c04b6ab1e25671dfcbbf31101bb4cfe2aa2236c7d287a40b49a2b83c09734967fbc1
diff --git a/app-shells/push/push-3.3.ebuild b/app-shells/push/push-3.3.ebuild
new file mode 100644
index 000000000000..e47ede3a3d18
--- /dev/null
+++ b/app-shells/push/push-3.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A POSIX shell function to treat a variable like an array, quoting args"
+HOMEPAGE="https://github.com/vaeth/push/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+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 ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins bin/push.sh
+	dodoc README.md
+}
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index e6e3e5fc1ac4..d0bb576cfd97 100644
--- a/app-shells/quoter/Manifest
+++ b/app-shells/quoter/Manifest
@@ -1,3 +1,5 @@
 DIST quoter-3.0_p2.tar.gz 10691 BLAKE2B 2fb196977c5c16654813e6077c148577e4629da25fb1aaf2131c19e33fbfbc670ad4d9af87611405f0b45a1365bc7b4b3f1b8cad47573ffae4939cc0329d50a4 SHA512 23d77105fa05d79a7d0bcaa3f6aead25b7cb3b6f459d2740314616da587e03cd3e6b0b1e8af8f79904309bbe76603db848d42996ed7ae5ef779e27184a434fb5
+DIST quoter-4.2.tar.gz 11128 BLAKE2B 6b13a8eabae57c50c12dcbf9a65e28990ee6d74ee2c45c4a6127f5ed98c2ae029fd5d00f82444c46ab6a21057c6279e9f3d19c432f921d04ca3bf3eaa9507cb0 SHA512 0080ae6d5f5308b9e2f9e414619049f10246c221a9524f9f0dc0d329af3592694ae9d6ef6a086615b895c5f6598fbed7ec7164b5a847d11108fbe3687316c02d
 EBUILD quoter-3.0_p2-r1.ebuild 759 BLAKE2B 834746ed908c95f45f09c08e4a93a1e0a054b606628f79a10a48be823660cc73ff2f4157d51438ffb2ac92f6e0fb48559db69025832a994029448b6e6816973d SHA512 8da8ce840b416bfa2ce03e653e33d0ca06dec49b6a43016ef69a164c95b1ac54650e6e4b88432e888536b8e2a2b27c2620dd4dfd5219f028460e7b979051c447
+EBUILD quoter-4.2.ebuild 768 BLAKE2B d8824eb44ad83bdcc0630f983f7b2db41af9769c950effd75544dfa492782abe4f3ed02e8ccf7acf5cff69ca4b506c531bcf0391d399fd3fbcba73c7aa8306cb SHA512 0d71a65f004e0de0f8d4d7d614417d80eb9daae4c3fbcdd6fca78dc19a8cd75ef73e915de5dd5c41670accbe7d74fe299b5d5b57096ec237d0a076d1c050ee13
 MISC metadata.xml 700 BLAKE2B 6dc4829d807dbc1ed2a511689c3fbe3ceb322236525770a55c86ddb3956bf974a58dedc1c0a7ff74b936e76c8729e1e2463ee0a51ac9e51ac89472a28dcee63f SHA512 c3cda33bc2aedb177d4734ad02cb2dbe0b2d52bc73406ee5277b7db57ff73c047cc174514c516ba3486c1ad5d93d414f77d2655c9cbff9de1820effac312a284
diff --git a/app-shells/quoter/quoter-4.2.ebuild b/app-shells/quoter/quoter-4.2.ebuild
new file mode 100644
index 000000000000..71913b702e01
--- /dev/null
+++ b/app-shells/quoter/quoter-4.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2016-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Quote arguments or standard input for usage in POSIX shell by eval"
+HOMEPAGE="https://github.com/vaeth/quoter/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+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 ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	rm -f "${ED}"/usr/bin/quoter_pipe.sh || die
+	insinto /usr/share/${PN}
+	doins bin/quoter_pipe.sh
+}