14 files changed, 33 insertions, 307 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index e3442368ecdd..ea988b0ed57a 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index 65bc64d3c38e..af819e23fdd3 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -1,13 +1,3 @@
-AUX cpp.patch 865 BLAKE2B 01f3d7827a53c5906f0883625e52ee2e92f4827444fd8d2ace95506eb0c20cb19b113ed789e11cdffd45e24dd1481cd7283bc7b4ac0fd7571e23aa74c5973cb2 SHA512 68b50627a548cfda24579ae5316ec1e42a959d6533df2c88dda572b0432e0080f0b6e4cbaa7a9a7f148a0f89ac1bda36ed414850a00fccfb36c2782a349fb1b5
-AUX ksh-prefix-r1.patch 2186 BLAKE2B 6d5e9bba057ab45a83936b8bd17966d6ff702917e19136ae5f06b6d53dddb70fedd4027e93870f1ea069d843584198ce82f03a0f92ce3c1fc01cd04f7e1c4e51 SHA512 0644ceebbcf003cce18b911e25d7979d68b22a051c9fea1cef0560b453cf533ec10d94354f1da558ecfa936392a3e82fcbf0cd77491ac9c58a1513860cee7ef5
-AUX ksh-prefix.patch 1780 BLAKE2B 21e49e421f82088e1d7ca0ed7a983b18ea9e2827c7a33e2865cab08ab7af379f0febae66eb1d3c64b246afe37a1c881365c65ec24d660a398b851262682fe1b2 SHA512 32ae89b988cc0bed839039646f5658c7a1e64b6b8a85ba4afecd02cfda4d6b64a968a4f8da8d290b90357b9b6231c609c51f4989935cc56ea378b5032569c315
-DIST INIT.2014-06-25.tgz 385531 BLAKE2B 9bd7fd46db725e134a6a35197c8793ada92a5aa293fbd21a94893443392cee5978c4526a09c47c19f650fc1b36eef0b0241ece4ebe6d4b6bdf2546195a5c26ad SHA512 9034cdf5b798c134472d786195d0f5d14e7e7a1f8226dcbccf962880cd59cd59d3a5597307587163f90a9187cce0232235cf79bcd66842044b2c624b335ba730
-DIST ast-base.2014-06-25.tgz 9609090 BLAKE2B 1a961eee6c4f40abbe92166ea0697c97c97a486165e225c8eceae9899f8cf8df84ba93135d0f64f67e8319d5734c3f9597cd2444a5710f2645639bce9c40bc37 SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737
-DIST ksh-93.20160110.tar.gz 26416127 BLAKE2B 2e3d7f24e1c7292283f2859b86abca6b31c9104949f870cd5b35dc726dd917eefc826363f19a3ae120bba022fca31a4e38c8998c9010ef46a6c186619068b763 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688
-DIST ksh-93.20180215.tar.gz 16056027 BLAKE2B 22ce7346ed2d034d4738b9fdb03559d93b08b92d32e7fd1ea18c1c4fb711e282e98561a0a6d24b1ce11ebaa813b49e5ffa4653f5efb41905aaf29418702e0e5b SHA512 175f6fdc9ab425ac08a5907b552faa25d2e3e7248d0077af300a9f0ca28a4cf46e48081c76f1126bedcc4fbf7db4a432d58f620b29a9543f887a60649f389d5b
-DIST ksh-93.20180331.tar.gz 16052423 BLAKE2B 63e1d08faec3f96ef6cf106404821497ff2b35fdd8bf5db0fbe6958b16fc760a46b8d840252402e12a32a37761ca419fb621335b46f5f43a2f441bb9256358b3 SHA512 6bc6c35804ef7a60f0592dd956c6f51588639dc69196b79548c3ea60d5168f46bdb8c446aeadfdb3b23994778f882d1d4b4869955fd654dba59a02ae2d9c7196
-EBUILD ksh-93.20140625.ebuild 1173 BLAKE2B 7e22ecae92c085791bacbb4ae8cad410a5abc18f6901a0e9667f9558cb3788e327acf73ebe10abb63723a7f6b97480c82873317a105aa120e99579271b6415d6 SHA512 9b93f2101fcc17470fdab5facd402143971edbcf06ffff74b6a969dbd7340d863bbd5a825e852bc661e3db52fc32542aa37a3507c9889ffd24a0f89da367b53c
-EBUILD ksh-93.20160110.ebuild 1115 BLAKE2B 12d12b1e67a4aa4b8d0157da5e3a1197d473e1c3339d928403019be1f5bb45348d6ca3522cc8aa5868e5ab4ef75647753e6a5eb98bee4e245fcb0eb2766986ba SHA512 09e6068ad0b4393a5b60ff40324045856b2ad8ed36fcb14d04412552ab601bad8305ddd1f9267a6382f06f64c6bf2058235391e850adbf2ffd39a9433b830f17
-EBUILD ksh-93.20180215.ebuild 722 BLAKE2B 6b3b900d36db2c46fe2891f27393aa44bdadecc68857cca00ab2d04409674772cb21db97761a992c9689baa650b3182c83504f599e1e9c146d42cb7ed3147963 SHA512 4f27a2d631b422a9b0542e1843bc4d79f8ac54a15cd626dfe7f742aaf559afc667a0b0304c3b73ca4facc52e31a4976dea19d785b90e8ccacf67240d4fc07ed4
-EBUILD ksh-93.20180331.ebuild 722 BLAKE2B 3a20a7bc23ef3484482dd8ed6bc4397916dae259a1ddbf86edfa8c1c939ab9a8f41482fefdc8ba9bcd683317db53bfddbe740040a1dad9b40905f3435966d137 SHA512 3fea34756bd4bc63ed578b8621f9d6b2ae6d16fb6b6d9e05ac2ab818bba571760cabbee58e2e85fa60f31d8a2f816796ec9db56171a99ce03e8dd4b7c6cbb1dd
+DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981
+EBUILD ksh-2020.0.0_alpha1.ebuild 598 BLAKE2B 05efbc081efdac93e1b8ce188d0e4d3e18ea7755a2e15e12bf79ed57f6496db4da2539bcaadea05c5e9fb6c907413a20d330bdf83f125392775bf99303e31594 SHA512 694bcb9a212ed86d0c50af3b518b6a1ed8bffe8769b56b9fe6652ecb42dfda074854f58d51b1cee3b42983b0dddd030b5a639233978678483861ff55723e458b
 MISC metadata.xml 1371 BLAKE2B ab655b6d15894748f8125dcc0d25fd15aee57623de8b643793b1ca456025ee35db091b500f91b59ca0801778eb65798162b732778c56b80adff4f0402b299638 SHA512 b74fe4a12ce5868839cd32fe9c4f88c216a0703a3f477b005dcf7b47f697d129c695a011a9b37894c39716b5d47ddc9abeb5bd4946ba6b6849707a73b5901810
diff --git a/app-shells/ksh/files/cpp.patch b/app-shells/ksh/files/cpp.patch
deleted file mode 100644
index 7075bcfc1f7f..000000000000
--- a/app-shells/ksh/files/cpp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-iffe depends on cc -E not inserting newlines between tokens
-
-https://build.opensuse.org/package/view_file/home:Andreas_Schwab:Factory/ksh/cpp.patch?expand=1
-
---- a/src/cmd/INIT/iffe.sh
-+++ b/src/cmd/INIT/iffe.sh
-@@ -3427,7 +3427,7 @@
- 						(eval "$src") <&$nullin || e=1
- 						;;
- 					mac*|nomac*)
--						if	compile $cc -E $tmp.c <&$nullin >$tmp.i
-+						if	compile $cc -E -P $tmp.c <&$nullin >$tmp.i
- 						then	sed -e '/<<[ 	]*".*"[ 	]*>>/!d' -e 's/<<[ 	]*"//g' -e 's/"[ 	]*>>//g' $tmp.i
- 						else	e=1
- 						fi
-@@ -3718,7 +3718,7 @@
- <<\"#define $v\">>	$v	<<\"/* native $v */\">>
- <<\"#endif\">>
- #endif" > $tmp.c
--					if	compile $cc -E $tmp.c <&$nullin >$tmp.i
-+					if	compile $cc -E -P $tmp.c <&$nullin >$tmp.i
- 					then	sed -e '/<<[ 	]*".*"[ 	]*>>/!d' -e 's/<<[ 	]*"//g' -e 's/"[ 	]*>>//g' $tmp.i > $tmp.t
- 						if	test -s $tmp.t
- 						then	success
diff --git a/app-shells/ksh/files/ksh-prefix-r1.patch b/app-shells/ksh/files/ksh-prefix-r1.patch
deleted file mode 100644
index d2cfd6c0c154..000000000000
--- a/app-shells/ksh/files/ksh-prefix-r1.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b7769b1f336ba533c4510f1b112fecf84a638a08 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 28 Jan 2018 16:14:42 -0500
-Subject: [PATCH] EPREFIX support
-
----
- src/cmd/ksh93/data/msg.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/cmd/ksh93/data/msg.c b/src/cmd/ksh93/data/msg.c
-index eabe59e2..61512280 100644
---- a/src/cmd/ksh93/data/msg.c
-+++ b/src/cmd/ksh93/data/msg.c
-@@ -182,7 +182,7 @@ const char e_heading[] = "Current option settings";
- const char e_sptbnl[] = " \t\n";
- const char e_tolower[] = "tolower";
- const char e_toupper[] = "toupper";
--const char e_defpath[] = "/bin:/usr/bin:";
-+const char e_defpath[] = "@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:";
- const char e_defedit[] = _pth_ed;
- const char e_unknown[] = "<command unknown>";
- const char e_devnull[] = "/dev/null";
-@@ -190,19 +190,19 @@ const char e_traceprompt[] = "+ ";
- const char e_supprompt[] = "# ";
- const char e_stdprompt[] = "$ ";
- const char e_profile[] = "$HOME/.profile";
--const char e_sysprofile[] = "/etc/profile";
--const char e_suidprofile[] = "/etc/suid_profile";
--const char e_sysrc[] = "/etc/ksh.kshrc";
-+const char e_sysprofile[] = "@GENTOO_PORTAGE_EPREFIX@/etc/profile";
-+const char e_suidprofile[] = "@GENTOO_PORTAGE_EPREFIX@/etc/suid_profile";
-+const char e_sysrc[] = "@GENTOO_PORTAGE_EPREFIX@/etc/ksh.kshrc";
- #if SHOPT_BASH
--const char e_bash_sysrc[] = "/etc/bash.bashrc";
-+const char e_bash_sysrc[] = "@GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc";
- const char e_bash_rc[] = "$HOME/.bashrc";
- const char e_bash_login[] = "$HOME/.bash_login";
- const char e_bash_logout[] = "$HOME/.bash_logout";
- const char e_bash_profile[] = "$HOME/.bash_profile";
- #endif  // SHOPT_BASH
--const char e_crondir[] = "/usr/spool/cron/atjobs";
-+const char e_crondir[] = "@GENTOO_PORTAGE_EPREFIX@/usr/spool/cron/atjobs";
- const char e_prohibited[] = "login setuid/setgid shells prohibited";
--const char e_suidexec[] = "/etc/suid_exec";
-+const char e_suidexec[] = "@GENTOO_PORTAGE_EPREFIX@/etc/suid_exec";
- const char hist_fname[] = "/.sh_history";
- const char e_dot[] = ".";
- const char e_envmarker[] = "A__z";
--- 
-2.16.1
-
diff --git a/app-shells/ksh/files/ksh-prefix.patch b/app-shells/ksh/files/ksh-prefix.patch
deleted file mode 100644
index c97cbe333ca1..000000000000
--- a/app-shells/ksh/files/ksh-prefix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/src/cmd/ksh93/data/msg.c
-+++ b/src/cmd/ksh93/data/msg.c
-@@ -180,7 +180,7 @@
- const char e_sptbnl[]		= " \t\n";
- const char e_tolower[]		= "tolower";
- const char e_toupper[]		= "toupper";
--const char e_defpath[]		= "/bin:/usr/bin:";
-+const char e_defpath[]		= "@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:";
- const char e_defedit[]		= _pth_ed;
- const char e_unknown []		= "<command unknown>";
- const char e_devnull[]		= "/dev/null";
-@@ -188,24 +188,24 @@
- const char e_supprompt[]	= "# ";
- const char e_stdprompt[]	= "$ ";
- const char e_profile[]		= "$HOME/.profile";
--const char e_sysprofile[]	= "/etc/profile";
--const char e_suidprofile[]	= "/etc/suid_profile";
-+const char e_sysprofile[]	= "@GENTOO_PORTAGE_EPREFIX@/etc/profile";
-+const char e_suidprofile[]	= "@GENTOO_PORTAGE_EPREFIX@/etc/suid_profile";
- #if SHOPT_SYSRC
--const char e_sysrc[]		= "/etc/ksh.kshrc";
-+const char e_sysrc[]		= "@GENTOO_PORTAGE_EPREFIX@/etc/ksh.kshrc";
- #endif
- #if SHOPT_BASH
- #if SHOPT_SYSRC
--const char e_bash_sysrc[]	= "/etc/bash.bashrc";
-+const char e_bash_sysrc[]	= "@GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc";
- #endif
- const char e_bash_rc[]		= "$HOME/.bashrc";
- const char e_bash_login[]	= "$HOME/.bash_login";
- const char e_bash_logout[]	= "$HOME/.bash_logout";
- const char e_bash_profile[]	= "$HOME/.bash_profile";
- #endif
--const char e_crondir[]		= "/usr/spool/cron/atjobs";
-+const char e_crondir[]		= "@GENTOO_PORTAGE_EPREFIX@/usr/spool/cron/atjobs";
- const char e_prohibited[]	= "login setuid/setgid shells prohibited";
- #if SHOPT_SUID_EXEC
--   const char e_suidexec[]	= "/etc/suid_exec";
-+   const char e_suidexec[]	= "@GENTOO_PORTAGE_EPREFIX@/etc/suid_exec";
- #endif /* SHOPT_SUID_EXEC */
- const char hist_fname[]		= "/.sh_history";
- const char e_dot[]		= ".";
diff --git a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild
new file mode 100644
index 000000000000..4927a8e7fe18
--- /dev/null
+++ b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
+HOMEPAGE="https://github.com/att/ast"
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CPL-1.0 EPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="!app-shells/pdksh"
+
+src_install() {
+	meson_src_install
+	dodir /bin
+	mv "${ED}/usr/bin/ksh" "${ED}/bin/ksh" || die
+}
diff --git a/app-shells/ksh/ksh-93.20140625.ebuild b/app-shells/ksh/ksh-93.20140625.ebuild
deleted file mode 100644
index c8a15396a51d..000000000000
--- a/app-shells/ksh/ksh-93.20140625.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs prefix eutils
-
-DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
-HOMEPAGE="http://www.kornshell.com/"
-
-KSH_PV=${PV:3:4}-${PV:7:2}-${PV:9:2}
-
-SRC_URI="https://dev.gentoo.org/~floppym/distfiles/INIT.${KSH_PV}.tgz
-	https://dev.gentoo.org/~floppym/distfiles/ast-base.${KSH_PV}.tgz"
-
-LICENSE="CPL-1.0 EPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="!app-shells/pdksh"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# Bug 238906.
-	sed -i -e 's,cd /tmp,cd "${TMPDIR:-/tmp}",' \
-		bin/package src/cmd/INIT/package.sh || die
-
-	epatch "${FILESDIR}"/${PN}-prefix.patch
-	epatch "${FILESDIR}"/cpp.patch
-	eprefixify src/cmd/ksh93/data/msg.c
-}
-
-src_compile() {
-	tc-export AR CC LD NM
-	export CCFLAGS="${CFLAGS}"
-	sh bin/package flat only make ast-ksh SHELL=sh SHOPT_SYSRC=1 || die
-}
-
-src_install() {
-	dodoc lib/package/ast-base.README
-	dohtml lib/package/ast-base.html
-
-	local myhost=$(sh bin/package host)
-	into /
-	dobin bin/ksh
-	dosym ksh /bin/rksh
-	newman man/man1/sh.1 ksh.1
-}
diff --git a/app-shells/ksh/ksh-93.20160110.ebuild b/app-shells/ksh/ksh-93.20160110.ebuild
deleted file mode 100644
index 13f64f1a69ea..000000000000
--- a/app-shells/ksh/ksh-93.20160110.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs prefix eutils
-
-DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
-HOMEPAGE="http://www.kornshell.com/"
-
-COMMIT="c506cb548d9b4bcebef92c86e948657728760e15"
-SRC_URI="https://github.com/att/ast/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CPL-1.0 EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="!app-shells/pdksh"
-
-S="${WORKDIR}/ast-${COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}"/ksh-prefix.patch
-	"${FILESDIR}"/cpp.patch
-)
-
-src_prepare() {
-	default
-
-	# Bug 238906.
-	sed -i -e 's,cd /tmp,cd "${TMPDIR:-/tmp}",' \
-		bin/package src/cmd/INIT/package.sh || die
-
-	eprefixify src/cmd/ksh93/data/msg.c
-}
-
-src_compile() {
-	tc-export AR CC LD NM
-	export CCFLAGS="${CFLAGS}"
-	sh bin/package flat only make ast-ksh SHELL=sh SHOPT_SYSRC=1 || die
-	# The build system doesn't exit properly
-	[[ -e bin/ksh ]] || die
-}
-
-src_install() {
-	into /
-	dobin bin/ksh
-	dosym ksh /bin/rksh
-	newman man/man1/sh.1 ksh.1
-}
diff --git a/app-shells/ksh/ksh-93.20180215.ebuild b/app-shells/ksh/ksh-93.20180215.ebuild
deleted file mode 100644
index 576ab31e881e..000000000000
--- a/app-shells/ksh/ksh-93.20180215.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson prefix
-
-DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
-HOMEPAGE="http://www.kornshell.com/"
-
-COMMIT="e3dd5b1a4b1bf58a018bbd9c8626b15113b72717"
-SRC_URI="https://github.com/att/ast/archive/${COMMIT}/${P}.tar.gz"
-
-LICENSE="CPL-1.0 EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="!app-shells/pdksh"
-
-S="${WORKDIR}/ast-${COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}"/ksh-prefix-r1.patch
-)
-
-src_prepare() {
-	default
-	eprefixify src/cmd/ksh93/data/msg.c
-}
-
-src_install() {
-	meson_src_install
-	dodir /bin
-	mv "${ED%/}"{/usr,}/bin/ksh || die
-}
diff --git a/app-shells/ksh/ksh-93.20180331.ebuild b/app-shells/ksh/ksh-93.20180331.ebuild
deleted file mode 100644
index 5d2cbc31a7d4..000000000000
--- a/app-shells/ksh/ksh-93.20180331.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson prefix
-
-DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
-HOMEPAGE="http://www.kornshell.com/"
-
-COMMIT="b9d0b8ebfead0edba9004fc32b1782d1e1410aeb"
-SRC_URI="https://github.com/att/ast/archive/${COMMIT}/${P}.tar.gz"
-
-LICENSE="CPL-1.0 EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="!app-shells/pdksh"
-
-S="${WORKDIR}/ast-${COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}"/ksh-prefix-r1.patch
-)
-
-src_prepare() {
-	default
-	eprefixify src/cmd/ksh93/data/msg.c
-}
-
-src_install() {
-	meson_src_install
-	dodir /bin
-	mv "${ED%/}"{/usr,}/bin/ksh || die
-}
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index ef3ac520c8a7..8fb816aa310c 100644
--- a/app-shells/push/Manifest
+++ b/app-shells/push/Manifest
@@ -1,3 +1,3 @@
 DIST push-2.0.tar.gz 2211 BLAKE2B 5875962c3aaa2e3eec2dcd3b70a0b5325684dffaf0b01b8f336db835bcfc4b24fc5d28817eb9032d8a10c5759089e2bbf42fba058403ebf420a77bb7d2754c95 SHA512 03c40bd8b3b09473952ecf13edd622533616de47638741214b40856b33993f9310d62be34fac6f68b950f58167c3111082554961a800a43a3ecf8a7d138ffdff
-EBUILD push-2.0-r1.ebuild 678 BLAKE2B f6840ce890cc5401e8f74116bb303376dc1676f7f181df5efe4ff891c6019d3adc2582595cd05206630620cde1bd6b132660a9adae5bc7a9a0ab8dca58715d8a SHA512 13fcebf815d98a3cd07db7b6dd0b1b02fe4ddbfca4edda4194442e003db0aece0be478e51ff74b255dc5fda054c768677b98b6dbbc75b7ee1a257c601e77c05e
+EBUILD push-2.0-r1.ebuild 685 BLAKE2B efd6015d3450fc8ea514936bd003d7946b9735e7ba2a6e96f0abb01b498a4f32aaf1297f4040ae98c630906a1c3ae3d9d01347fce370371acfceab09d530e547 SHA512 bdd787c28f1e2fd31adcecd6c6ba11fe367b29b89e6441a3df446cefb8ddc17b66d561013346e2c073a3b6f1188198271fe350a62b10b854447f36fbcffbdd78
 MISC metadata.xml 698 BLAKE2B 69740256ef4db99512953ae2e9b896410814d64f45c8fd6f2b45628948e1c7bf3ed66e53605c0611e30bf9af75d59b554b6c8bfa942777d55a3db1fb0e4bb944 SHA512 ebd59b8ea97e30788644f33eaa98c2618fa2f90a62bc17bb5c9027253df3c04b6ab1e25671dfcbbf31101bb4cfe2aa2236c7d287a40b49a2b83c09734967fbc1
diff --git a/app-shells/push/push-2.0-r1.ebuild b/app-shells/push/push-2.0-r1.ebuild
index dcf848498b0d..d16b2e0640cf 100644
--- a/app-shells/push/push-2.0-r1.ebuild
+++ b/app-shells/push/push-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index b34b60faaa56..e9d97d7a325d 100644
--- a/app-shells/quoter/Manifest
+++ b/app-shells/quoter/Manifest
@@ -1,3 +1,3 @@
 DIST quoter-3.0_p2.tar.gz 10691 BLAKE2B 2fb196977c5c16654813e6077c148577e4629da25fb1aaf2131c19e33fbfbc670ad4d9af87611405f0b45a1365bc7b4b3f1b8cad47573ffae4939cc0329d50a4 SHA512 23d77105fa05d79a7d0bcaa3f6aead25b7cb3b6f459d2740314616da587e03cd3e6b0b1e8af8f79904309bbe76603db848d42996ed7ae5ef779e27184a434fb5
-EBUILD quoter-3.0_p2-r1.ebuild 789 BLAKE2B fb433f0498c96f300ac5c95838439a4922d3e6b74be9e2ced56b8d8bf665f14d55682793a4339320753ae4f7ef80c52a9d10cde6bbfb620e800160cd990d7363 SHA512 ec31d6efe14cfdbbe1cf69c67d5d9e26e9dcf15122a11e0b03f149ac4588add7925805f11f7d464a88c352a5749b173b6a7380d2b3b75f84d4116907e64a8813
+EBUILD quoter-3.0_p2-r1.ebuild 796 BLAKE2B 056e545068c311b7a2d795041384275ce13e0d70b448bc860085fb27f4411935ed8e68f4d8e8e5f2d08c6c714c17e4a731b4607f1b06c2d52b3cf90f97e20d92 SHA512 781bbbc238246136a280788e9349bf2697de2967af41c521b4b382b7743e7105f2d7861eeb41275ea85cb51504fe37d5503db8fc26bcdbb4bf45c31ddf1c5fe3
 MISC metadata.xml 700 BLAKE2B 6dc4829d807dbc1ed2a511689c3fbe3ceb322236525770a55c86ddb3956bf974a58dedc1c0a7ff74b936e76c8729e1e2463ee0a51ac9e51ac89472a28dcee63f SHA512 c3cda33bc2aedb177d4734ad02cb2dbe0b2d52bc73406ee5277b7db57ff73c047cc174514c516ba3486c1ad5d93d414f77d2655c9cbff9de1820effac312a284
diff --git a/app-shells/quoter/quoter-3.0_p2-r1.ebuild b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
index 7f68d0f93d75..07be4e136b7c 100644
--- a/app-shells/quoter/quoter-3.0_p2-r1.ebuild
+++ b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
@@ -10,7 +10,7 @@ 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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 
 src_configure() {
 	tc-export CC