12 files changed, 285 insertions, 64 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 42f81620da40..e3442368ecdd 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 4f529142c568..a974014ddfb6 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,8 +1,10 @@
 AUX bash-completion-2.1-escape-characters-r1.patch 1084 BLAKE2B 62a9ccb7b1cc4162db2f8e35fb20d3a24f9e4c067e5297816d91a85ffcdd3ff43695f3c361959cba59b887afd0d12e75fa317899054d3a615ee3da615a4409ec SHA512 b7cb548024fbc68e87d781208a378299c399d2661121290c500d62cd66855acc02848710b44c363917c3c4923e063212a2b56c9b0c08deb71aba308d75939cab
 DIST bash-completion-2.7.tar.xz 280048 BLAKE2B 88b09f451fd4e14daf8e139951a4b65aaa9d9b1d86dceade388a726ac7f3caff2546597695c3f0cbd5dd64e20472d0cf3e98e0f367898b81d696d4ccb8f2fb73 SHA512 514709ad2e5f6bd4e20027c7049a1144c1854a37b653d5c11fad1cdf7a46d0e1afca725d6ce75d49691149e0de57be85747f704ac1c429ef4cea114bfbff8fcd
 DIST bash-completion-2.8.tar.xz 286128 BLAKE2B a99faeb3c9ee2ea6d1cc9988e61951f4e688ac0b3c6837d1fd43381519fedf5f95167e8dbc166543b0235f3ac61d92af35eb8399efc0cd297a62849071dee5c7 SHA512 d839ef5a98811a2aade7ebdc0bc84c84a41c74db384f89913b06f3c25add1ba22528ac25392b19d27280685d258c74dcdc11247cbaae5b8d82f2c0b546abc268
+DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
 DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce
 EBUILD bash-completion-2.7-r3.ebuild 4109 BLAKE2B b19159a733eb34738622add375c11d71dad1b5bee4c16b3d7bf2b2d588757e0b412807601a3e9ab9a2bb9e1a796354d59f3fbe796f91577d7eb5368c499896f5 SHA512 2e91fc722b51b39cef6ba2892645cac41321d840e14d3774732084f6a091859d5ff01282e10a7ce1cc5ed89ed8e1473fe7afee551f0df4c1104b4d44dd7c770a
 EBUILD bash-completion-2.8.ebuild 4057 BLAKE2B 09f82c80d498f02154d144730a7b8d2d4ddf254fe2e52d972bd1107d0ae3bdb583d161e04a3bd3c3a45d41b87c1bfbf187697d2789926e0af410dbb09cfefc9d SHA512 081ead91d74f818f4c3fdfeb3643fe55f744afa26730284b79242379d7358c957549efda8091cf108aaa5f8195d2fb3610474072a141eda1573d68121a7d7b23
-EBUILD bash-completion-9999.ebuild 4273 BLAKE2B 8719ac5d05789b937b58f4f8a74b18a1bf148b95e7494274725a24baa82bfcbe05b892824e2caa4640ff72bb2b337aa233c44a009d40bdb9f7bcef5cdbba2bd0 SHA512 dcbd4bc4b8d11b841ac0d0d2d2f1ffc11b2ebe4b212a8922db5e1c96c229c57f07fd6cd2b09abcea39a8bc9d7392309769509e09fdfa723c128557183e8880ba
+EBUILD bash-completion-2.9.ebuild 4704 BLAKE2B a9a7dcc93f15aaecb10909f1f82c107168be24fa3b717632f76ef90196cadf8ab163354cd137d85329ac219cfaa7b98551870ddddd6f497b251e78ed50cc3983 SHA512 73d473f2f811aba2e32f2498115506fe6cfed7dc055b012ea4a6c45a6ae9e516996eed097c89cd67fb102bffe0b6e9299dc74918c4ee6d2c554fb24df4b6f4f2
+EBUILD bash-completion-9999.ebuild 4421 BLAKE2B 8c597c1aefa2a578376111283516ed30731fec0f1ce499fadb60828bc272d0f16fd009275e9945583f22027ca56d749d111f8ec3ebee797b9d4a11805c40dab7 SHA512 e94c33b431069544d88b34b0729ed0057efb26f65faa5471e7c54e70699fd11aafd64e9c00b747ad19eedf8b7fd0b9dd3495e42e69b9875142765f789b2572ef
 MISC metadata.xml 1309 BLAKE2B db08060cd74841bd7220e688e251225ddaf59e4da737c08785e7c6ce83c2d40600fbe38e9b9449fb559ccb2d03b8c2368295b647ec2a52191429fe1d3d1c7470 SHA512 3ee23fb6cbee1e80a0c8fab13f7bb67bdad3292fa8ec187e306b00804a7bf709358c8c08eda4101a5f5baa408e0892aa94c07ae466b5beae4edc18055b1192ee
diff --git a/app-shells/bash-completion/bash-completion-2.9.ebuild b/app-shells/bash-completion/bash-completion-2.9.ebuild
new file mode 100644
index 000000000000..bef979856f82
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.9.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASHCOMP_P=bashcomp-2.0.2
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit bash-completion-r1 python-any-r1
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion"
+SRC_URI="
+	https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+	https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE="test"
+RESTRICT="test"
+
+# completion collision with net-fs/mc
+RDEPEND=">=app-shells/bash-4.3_p30-r1:0
+	sys-apps/miscfiles
+	!app-eselect/eselect-bashcomp
+	!!net-fs/mc"
+DEPEND="app-arch/xz-utils
+	test? (
+		${RDEPEND}
+		app-misc/dtach
+		dev-util/dejagnu
+		dev-tcltk/tcllib
+		$(python_gen_any_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+strip_completions() {
+	# Remove unwanted completions.
+	local strip_completions=(
+		# Slackware package stuff, quite generic names cause collisions
+		# (e.g. with sys-apps/pacman)
+		explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+		# Debian/Red Hat network stuff
+		ifdown ifup ifquery ifstatus
+
+		# Installed in app-editors/vim-core
+		xxd
+
+		# Now-dead symlinks to deprecated completions
+		hd ncal
+	)
+	if [[ ${ARCH} != *-fbsd && ${ARCH} != *-freebsd ]]; then
+		strip_completions+=(
+			freebsd-update kldload kldunload portinstall portsnap
+			pkg_deinstall pkg_delete pkg_info
+		)
+	fi
+
+	local file
+	for file in "${strip_completions[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} ||
+			die "stripping ${file} failed"
+	done
+
+	# remove deprecated completions (moved to other packages)
+	rm "${ED}"/usr/share/bash-completion/completions/_* || die
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
+	# Bug 543100, update bug 601194
+	eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
+	eapply_user
+}
+
+src_test() {
+	# Tests need an interactive shell, #477066
+	# idea stolen from:
+	# http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	# override the default expect timeout and buffer size to avoid tests
+	# failing randomly due to cold cache, busy system or just more output
+	# than upstream anticipated (they run tests on pristine docker
+	# installs of binary distros)
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check RUNTESTFLAGS="OPT_TIMEOUT=300 OPT_BUFFER_SIZE=1000000" PYTESTFLAGS="-vv" \
+			&> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
+src_install() {
+	# work-around race conditions, bug #526996
+	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
+
+	strip_completions
+	# fix missing aliases
+	bashcomp_alias tar bsdtar gtar star
+
+	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
+
+	# install the eselect module
+	insinto /usr/share/eselect/modules
+	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+}
+
+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 766299412c53..bd5e53f21aa0 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 BASHCOMP_P=bashcomp-2.0.2
-PYTHON_COMPAT=( python3_{5,6} )
-inherit autotools eapi7-ver git-r3 python-any-r1
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit autotools git-r3 python-any-r1
 
 DESCRIPTION="Programmable Completion for bash"
 HOMEPAGE="https://github.com/scop/bash-completion"
@@ -36,33 +36,48 @@ DEPEND="app-arch/xz-utils
 	)"
 PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
 
-# Remove unwanted completions.
-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 ifstatus
-
-	# Installed in app-editors/vim-core
-	xxd
-
-	# Now-dead symlinks to deprecated completions
-	hd ncal
+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
 
-	# Installed by sys-apps/util-linux-2.28 (and now deprecated)
-	_mount _umount _mount.linux _umount.linux
+	local file
+	for file in "${strip_completions[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} ||
+			die "stripping ${file} failed"
+	done
 
-	# Deprecated in favor of sys-apps/util-linux-2.31
-	_rfkill
-)
+	# 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_unpack() {
 	git-r3_src_unpack
 	default
@@ -90,7 +105,7 @@ src_test() {
 	# 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" \
+		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}"
@@ -104,13 +119,7 @@ src_install() {
 
 	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
 
-	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
+	strip_completions
 
 	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 4a631cce6f4d..00c4280cf737 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -381,7 +381,7 @@ EBUILD bash-4.0_p44.ebuild 4408 BLAKE2B 13955f4505ba051f1880ce023f2f12e953143347
 EBUILD bash-4.1_p17.ebuild 4142 BLAKE2B 5d8f2b031eb26211ff1f778629cfb8d9255b357e3217346511b3b70e6fc55b6e697c4991e3f505420eb295da5d973b4faceb7edbfca03b91c278bf01b7464602 SHA512 e5f5e135c543aa5dfac81936b1b25e9894aa62918c01214f48abc6a4d1d1251fda8be3566164d324b8644822745f634dd7e4265805d276be822fc190fe2e8146
 EBUILD bash-4.2_p53.ebuild 4344 BLAKE2B 5565a97a0aa9465fd8eef2de0b78434c04096d84c988cdbb663af4b529e1207cc68d0030fa4d88e4028fa7bef08847df170a274ccba316213cceb7401163ed00 SHA512 d3cae3853f6c3b735dd9083b9f7d16bd96aac1ba29ba49e8d5e62140ebdb97f4c9d36e3bc36fcd96f32685236fe6bb80d53015b9dbb20a829968aa535a949a3f
 EBUILD bash-4.3_p48-r2.ebuild 5642 BLAKE2B f5d114b98272cf7e6a900707e0abc4798cc1b85bf509f3260487959dad69a35a0badae19e1522e4746bb74c06f00a767a50c6a3199339c42036f3d92924722af SHA512 e83786756c9e65c08e78137396b393e04a7950d9393c6206491d7d7b13eb46fb4504fe34335706aa0835b6abc651e9578bf6157d6248de8e7fc2dc1a90cba927
-EBUILD bash-4.4_p23-r1.ebuild 7382 BLAKE2B 1199ddb85f5ae9b85244e7e7be775b831a7ceacd839891b767c5e4b4d66af09d9a80d60440de6850d6d9354713eb214a14678e30e2e4a4b4f85cda3b5a2ec4f3 SHA512 49acd473c8280ea9830bf42ee80b4df859a2996f46cafb4fe7d8eb1c3e01f49b3aee75b76dc3b70b91deb3b3541be10f2a0972355397db4eecc1a2f43b6d51de
-EBUILD bash-5.0_p3-r1.ebuild 7618 BLAKE2B 7d20409cbeef90d517023d58900ed8e3ac044ad519757caf44f8d2c7ec07d20775527efd42b56dda664f88321c2f42dbbe11b4cb84997b8ce80bced56a2a12ab SHA512 52914b61a7f3aae2a6e84fa9b1a3b18927b221b1f3c5d378cde8b2ab14e6a4c78bdb7cd15204cb91adeaac687cdaed23b8deab1f2d88aa96d3254bba0842d4e9
-EBUILD bash-5.0_p7.ebuild 7562 BLAKE2B 043e31d12ce507d30ea1d08a094fa3188fc56f73fa285565072c3cef2ef075043f5e8e6f2d6adf9777ba3e01490ce5594d82e1aff147654ae76338447b2b8419 SHA512 f8dd1fee4dc68555f88ce9f605e1f936a3831ff68ec7c05223d7bf89653ad1fa25aad985f1efb14acab10cc8a78b596e2cb20ec309f630354a1579a70b7effb5
+EBUILD bash-4.4_p23-r1.ebuild 7389 BLAKE2B cffb239c13ab880e815dc9e5884020f2287cdbb3074e39862223fc3d3d56d64af121f4f04528e7e94b06df4fe4d520c805cf6a8f32088860cd7c4ffa2e612e2e SHA512 d9f730ce6353e99953eb95e1417d5e109ccf3612d5148087c2eab7c742d6cba979da5468ec260f3d258a9870a3b6b216dd45c67b2a79fa6fe818d6ba88a113c0
+EBUILD bash-5.0_p3-r1.ebuild 7625 BLAKE2B 81f6b4b55c5d8f6c311469d4e06f8a729f7ab8ba892cf21d8e5befefc9d12bb39ec339b3751cc720e42a83d982e988b76878b07f37f9f71f14ee137ccbefe55c SHA512 230b6db992527d721eaf0b328cba6232548038b070c6ee40f8fb811f390927ce5dc1c171f9203e0c6113cc1ed7762384dbc6d8ddd159856108b3be75b595a383
+EBUILD bash-5.0_p7.ebuild 7569 BLAKE2B ec03c5db2337f5bd9279f1717b791f850ac027320f602df801197ac831de3018552bc8e3eb5fb9b2634e9ead091e62c6a65315e4a9e58a3dd2d3ba2ad2e08482 SHA512 828d1606b9227bd0faedfce0f83d5bfa3585ccbb52dba5fffcfbdf5c5cdd27a10d25a53e9b86adb10246a2ba6cbe95aed453b59fb3dcfe01ce56558c1a1332a5
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-4.4_p23-r1.ebuild b/app-shells/bash/bash-4.4_p23-r1.ebuild
index 9a13a5fbb351..185406438614 100644
--- a/app-shells/bash/bash-4.4_p23-r1.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r1.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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/bash/bash-5.0_p3-r1.ebuild b/app-shells/bash/bash-5.0_p3-r1.ebuild
index d13f22168a61..a13f1c8965c2 100644
--- a/app-shells/bash/bash-5.0_p3-r1.ebuild
+++ b/app-shells/bash/bash-5.0_p3-r1.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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/bash/bash-5.0_p7.ebuild b/app-shells/bash/bash-5.0_p7.ebuild
index 5b9a47a025eb..1d9060d25619 100644
--- a/app-shells/bash/bash-5.0_p7.ebuild
+++ b/app-shells/bash/bash-5.0_p7.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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/mksh/Manifest b/app-shells/mksh/Manifest
index c17322be4481..0e3c010d9b75 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,6 +1,7 @@
 DIST mksh-R56c.tgz 417218 BLAKE2B 3512855dd177be8432fe503716ca571a3c06ab3eeb6b44de923ab7d9eb9246087f627b7d7a3e9bb29a849da126b88c223864f140b136e922776ec7bd4a04e96d SHA512 7e4cd2d24c6bca2ebad7c6b02d158188e766bd4693d93f5bed198d69238aef078d42ce911431ad4e419e4af55083047d823bfad53973db5c6d8a685482770135
 DIST mksh-R57.tgz 419604 BLAKE2B 11af09535ace3fdd982189fb7d7f3e5961776c3bdbf6b981f4f1506a66ebdbd893efb9aa50a5a36fd8b3b7bd3e149021aad154888dc81e0de29f41e91eeb583c SHA512 7d7fa557c17da4f1f62f82877a136439efb6d4f9fde52b2df39214db09868982e756df6e4fe83498f9013cbcf3252dc383b00ddfafaa4c9f143ffded7cd255b3
 EBUILD mksh-56c.ebuild 992 BLAKE2B 1ecbe94f3d96371818512d89b3f077402118058f382f1e3dfd9f57826eb783256bc193b4697272626cce52ccb8fe29a479646107750e1db94859b95b7bb7c524 SHA512 1f17fcf0f5cae5de4128feded4c1c92c9d75b3c507deb7e265058251c225bbb852c9ad305ac5bac0f4fb8739eb38c325e0f85c33dc1fa10fe6ede6e4a71a41b6
+EBUILD mksh-57-r1.ebuild 1010 BLAKE2B da381d59adade8902014bf730bbecf56730de750f81ea4462f904ec4459cd0f23bdf9ebb4a284f9b408b3e3cbcc08f80d124ba1c5269325a5619e4113a03c2b5 SHA512 6d9a8435f42fcf1a08a2d0a21daf95bc4706d704b0d9281e3efef49d06e4d0e557349c4e80ee8056e8543774ddb1b268847ae69ab6c62fb216fefa4647a69b16
 EBUILD mksh-57.ebuild 995 BLAKE2B 0e9efe4a046e26c35f3b5882e6fc6f81adb85f47acd9e84f7de768e6557e2725dcea05a18b30d8ff26e20383a452a4ba434c6dfebcb8476ce7c03fef8a2aa8da SHA512 e259c3b4c8cacc5655ea5fe444cacbcab8d646e4a1dbff949dfc8ffe2fb032a8c51cf1017c23f7b4191309285d08936a31a7791f0104384264865495f973e616
-EBUILD mksh-9999.ebuild 1244 BLAKE2B b0ea3d58199d7c3f4ee45140c166bdd1fa535d41228e6690415cde5d2675e89282bdb8ab910a8991d585d76d3f75ce44ce11d5e69a35ab05521499b28e446353 SHA512 636cf54fe70436f74837d1e41fbfcf82dfd2c199a8b6a7fb85b72bf83b32373238b711fdb21fbcf57aab227460337a71a16055f264c76c2beea86cf8587581d5
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD mksh-9999.ebuild 1010 BLAKE2B da381d59adade8902014bf730bbecf56730de750f81ea4462f904ec4459cd0f23bdf9ebb4a284f9b408b3e3cbcc08f80d124ba1c5269325a5619e4113a03c2b5 SHA512 6d9a8435f42fcf1a08a2d0a21daf95bc4706d704b0d9281e3efef49d06e4d0e557349c4e80ee8056e8543774ddb1b268847ae69ab6c62fb216fefa4647a69b16
+MISC metadata.xml 379 BLAKE2B b4d62877ff242c65d08dc06b33970d51545518b5e30dc231d1b700a47b984500ca8f64a77f705913070a51d7c45be61e1b9c25d4691d62142eabfec153dde5cb SHA512 ae67be4bd206bdc709c9d78f5256c8b286eae5383453d16156ce43a5fc389208053587284dfc339a4ed65a239304cc6ad40b87e0b4a6aec4695213beb1d69aff
diff --git a/app-shells/mksh/metadata.xml b/app-shells/mksh/metadata.xml
index 6f49eba8f496..9df017effeb6 100644
--- a/app-shells/mksh/metadata.xml
+++ b/app-shells/mksh/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>contact@hacktivis.me</email>
+		<name>Haelwenn (lanodan) Monnier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-shells/mksh/mksh-57-r1.ebuild b/app-shells/mksh/mksh-57-r1.ebuild
new file mode 100644
index 000000000000..3aa638fe2453
--- /dev/null
+++ b/app-shells/mksh/mksh-57-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ $PV = 9999 ]]; then
+	inherit cvs
+	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
+	ECVS_MODULE="mksh"
+	ECVS_USER="_anoncvs"
+	ECVS_AUTH="ext"
+	KEYWORDS=""
+else
+	SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="MirBSD Korn Shell"
+HOMEPAGE="http://mirbsd.de/mksh"
+LICENSE="BSD"
+SLOT="0"
+IUSE="static test"
+RDEPEND="static? ( dev-libs/klibc )"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-lang/perl
+		sys-apps/ed
+	)
+"
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	tc-export CC
+	# we want to build static with klibc
+	if use static; then export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+	sh Build.sh -r || die
+}
+
+src_install() {
+	into /
+	dobin mksh
+	doman mksh.1
+	dodoc dot.mkshrc
+}
+
+src_test() {
+	./test.sh -v || die
+}
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index 36449d037d42..3aa638fe2453 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 if [[ $PV = 9999 ]]; then
 	inherit cvs
@@ -12,45 +12,41 @@ if [[ $PV = 9999 ]]; then
 	ECVS_USER="_anoncvs"
 	ECVS_AUTH="ext"
 	KEYWORDS=""
-	DEPEND="static? ( dev-libs/klibc )"
 else
-	inherit unpacker
-	DEPEND="app-arch/cpio
-		static? ( dev-libs/klibc )"
-	SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz"
-	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+	SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MirBSD Korn Shell"
 HOMEPAGE="http://mirbsd.de/mksh"
 LICENSE="BSD"
 SLOT="0"
-IUSE="static"
-RDEPEND=""
+IUSE="static test"
+RDEPEND="static? ( dev-libs/klibc )"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-lang/perl
+		sys-apps/ed
+	)
+"
 S="${WORKDIR}/${PN}"
 
 src_compile() {
 	tc-export CC
 	# we want to build static with klibc
-	if use static; then unset CC; export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
+	if use static; then export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
 	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
+	sh Build.sh -r || die
 }
 
 src_install() {
-	exeinto /bin
-	doexe mksh
+	into /
+	dobin mksh
 	doman mksh.1
 	dodoc dot.mkshrc
 }
 
 src_test() {
-	./test.sh || die
-}
-
-pkg_postinst() {
-	ebegin "Updating /etc/shells"
-	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
-	eend $?
+	./test.sh -v || die
 }