13 files changed, 50 insertions, 122 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 76f6dbb5d650..039510739149 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 94e958949649..10a4ee7a41a1 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -2,7 +2,7 @@ AUX bash-completion-2.1-escape-characters-r1.patch 1084 BLAKE2B 62a9ccb7b1cc4162
 DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
 DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
-EBUILD bash-completion-2.9-r1.ebuild 4807 BLAKE2B e7de50c4d8364bf6dd2b6af273e58bb5ae9236030b81ab7183931b5cdbfef3ea8ea0fa5aca4088104253e362d6eb78eed43cf0937d8262bd2300c08c354a7384 SHA512 693f02a72e2cc80364bdbcf252f670d8c4f6579cc650fbb0b9502065cd04889082599b2a4224411a031c1047bc07bce363a026a95a3aa94f729d3c0cbd063865
+EBUILD bash-completion-2.9-r1.ebuild 4806 BLAKE2B 5d9ec27d3629f36165beb180d9d9e548c547b560e227b65b112b6cb4ff34d55f31a5d01193ed559f7c0d5beb3b95baebf37c6b9263a442865d8c2cb32f9b1da9 SHA512 150ae169e8997a01c403407b177d2ec7f34d5a6c7f422355af97e6f4a717d12fdf24431990455075b1c0d208ae344e6013e67daa1734abdb6e283cf4b3e44406
 EBUILD bash-completion-2.9.ebuild 4694 BLAKE2B 5bff08075de6af572d855425a249eff6a858593128f59864601f77aa2526a6a59b7dd73a27eb7d7926104d1e8e269222931c59bb0bd11504ed3814efaffed28b SHA512 5559c40fbd2881cd9de31134721d2e7c7bea57c241820673e0cd8b9b495375e4c2f9b38cc4a1c7cc18e95bd36082e608fac41498201d9ad495fd258d497b2df2
 EBUILD bash-completion-9999.ebuild 4580 BLAKE2B d974f17d8526f30e9907d2f09ed6024f688e8829499a0069d042404752712e7e70b24182fb71a61acd9820c916b6af9c2bc785629959ca66e0491b8add77c9ce SHA512 1dadaf29fc2ca6c5f42a7eb954b060ad400ab4eac953a581d09d8412fd863343391e2c6f8ca31bad25595aecc2ba515c67ff04417b4c3e490d2a127cb77fb3f0
 MISC metadata.xml 1498 BLAKE2B ebfc4f05a48320d502076d9756cce9f0daf1a0c601ec491cdfb89538627f62c0613dd9e4db53c4791e094d6652e3c9a508003de3fa4f62a84396844c324325ef SHA512 6a83c672f45e7171d5b9959ac59c4e28bacb8ffdefa965288776603673396225b3bb01c149432edb3f901f04eaa39064bc8d813a35ce1e573231fd4b4570c62d
diff --git a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
index d336aa2df2fb..220069bc3750 100644
--- a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 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"
+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="+eselect test"
 RESTRICT="test"
 
diff --git a/app-shells/bashdb/Manifest b/app-shells/bashdb/Manifest
index ff7d1d08af5d..ebe14a13cddf 100644
--- a/app-shells/bashdb/Manifest
+++ b/app-shells/bashdb/Manifest
@@ -1,12 +1,6 @@
-DIST bashdb-4.3-0.91.tar.bz2 660370 BLAKE2B 5d0872cc637be064c4f620ea5f060335865bddcae0652978f3b2f529b16c7dbcffabdecbd8940a4178830714bdfa16a7e7326c67de87f590d543143e024b0dcd SHA512 903710e61efcf272213c3dcc20799842e8ef969e791e3d1a8eab071e5b7538a195f621320945019611042ed623d005e481bd75724194cc10cb6f668b615ce3af
-DIST bashdb-4.4-0.92.tar.bz2 678961 BLAKE2B a47e964653238452fcad6f4e098df64de4d230a796ccecafb09829727fa21521c9a28faac8a3d65b14a9689a15d45ae9ea5f087ca30d8d9f28eec7335e2a14f5 SHA512 68d5cdf4fb6cbacb0e7b69fb793ab9ead3114e152ea87dfb9d540103c9975af8dcaa78ad9a89b00a0f85f3ab1f090d9b6ca6a13c3e09673b5ab073762500fb80
-DIST bashdb-4.4-0.94.tar.bz2 810610 BLAKE2B fa3a68349b0ab64e17c094c34b82c8ba054a86f83452bab50a55bc9f63181459fd49a7a39e2e7a7c66063ac291b8f2a03d4ba6b834a3d5869d2fe9b099f4eb2b SHA512 97e7d057f16d90d7f1677e1b29d2467d5ee263e9aaad64e2d7a8b8a19b3f3ca68023f23a45faea235fdba57e803fae762a19aab67f650b81e868a8a01c5b1fb7
 DIST bashdb-4.4-1.0.0-missing-test-files.tar.xz 996 BLAKE2B 7ea67884cceda11559cf49355645cad2cfd485537643ad2fa05398518f498163596b6f591756bedd0e7b7e013fed3c6a031e245d15cd0cf316d42ef4f5c8b3e6 SHA512 e19d41569c2001ce026e4c5f80cc21c81651ff9980be059236c45e215162769ceda266eb46aa4199000e377c0bb53dec98fa1b7c5290459c412f21329b3589a5
-DIST bashdb-4.4-1.0.0.tar.bz2 701749 BLAKE2B 2fa4bfd21f6c646c6bb1c2439dfed870478fb985dd52c8ba716e08fa0312da9adb0c29396594280bce525bb88f15b7398878c7a9bb2a39c078d4e5f17706c20a SHA512 eae45eb221c662e6bbf86814b861992944fcdef221e1bbc7df6c4fd0197022b82fabf4b7e5d583ba4fff94a0b486f71901d42f9df12a8b6a5f564e9236ad37e5
 DIST bashdb-4.4-1.0.1.tar.bz2 701807 BLAKE2B 8d41a39831ce9466f5fcd205cf84e337ca7d876fddaea8b8c013fe4ac93a143c9f5b5e46bcc8edbb50fe4c77e87bd282ff9a244e41df007897d3b37f732bb0a3 SHA512 306fc5a49490fe04828cd6c64b23302e0f48ba8558780c93d45d9c615206e91dac5d8ff3d0660e50bc3204873131d1296492bccc23119d2f58c990bd3603221c
-EBUILD bashdb-4.3.0.91-r2.ebuild 823 BLAKE2B 76e207846110a1c811ef649e5416543abe89bdc4a12511951f669eb5dd84b37222b540a415875404c6a2ef449deae190940eec88cbf55c4090e0559c811d0fb7 SHA512 c033a061731873fb0d2a355f05503a7c259c6b6d21829eaca4956a8c6aea28df6fd77046fa30cdb7b405397446e4ddac1e34e75c6801d5cc45df55edba5f1dc4
-EBUILD bashdb-4.4.0.92.ebuild 837 BLAKE2B 633488ec8ba934ff9a78b00f60ef9a7ab3623caf82658411cd876af9bad656b04dd040ac68e5b7feab89aeb8899f662fb6260a3cf203d0a069ca0115c8ef8c85 SHA512 986bf2b35d7b8d3a22225c3082077334909311b5a1e3b203af391ce17a93223054c592f759526277c7f88e3f69636a543f8db89c4641a77eff3ad199db020df0
-EBUILD bashdb-4.4.0.94.ebuild 837 BLAKE2B 235d50ad42282afbe67ef7a6ce742461983610f6061f42de8fcd190e15312aabbe79fd98bb4ee9a2f6d977d93d6595a130e6401a215ed5ee1fc872ccdcfc67b9 SHA512 f9adef378b907f9ed78e433c39a67a0801b664774b63c1aa76615b9e414491997549c71398952818d7e69c58c49ada1e0049bbae3fbc0789b4f7cd59efa4b4b2
-EBUILD bashdb-4.4.1.0.0.ebuild 1039 BLAKE2B 7a0c8e1b2f6c9540427f905cb374045d4e328445ab782da5981522d1147f38bfc9f4037caf3ff0f5265511e452eefca338859163dc8be2cd0e78d2c6ca3cf52f SHA512 c63ec5fffb2954227002d697d8e85263c8b5224f69b308111c3acd89ee236f1ee649c368bc528f3657e06af468db780e3f5d641f807bf16aeb24c6d3a0955683
+DIST bashdb-5.0-1.1.0.tar.bz2 693459 BLAKE2B f8697c0f4a10b57215b0923cfb49c76536cc75de5273e6ed1709aaa56fcced8c5b3f281f15f01b8bd72363ad7c47acbd6d06a3bb3ba58b9a2daae017c101ae46 SHA512 0da69ea426c57d2f2b3f208356ee893b3fa8b96c68bf321446b5747b6bfb2eac502be6a01e3922fa873684a3953c6a3ded4a30f5682e4030680d698ee5062143
 EBUILD bashdb-4.4.1.0.1.ebuild 1035 BLAKE2B e6ba503594afcea73547da2b937945929285b50ba84afbb1efd5456c15a586ec792d8d7d585c692d50d8d2f733de741c69056e5b7b1173e516c4518419d2c575 SHA512 7e9d014345b909c635481975bbb1229cbfefc8440b3940507efb2e7bb65a2209a83d9960946018705de6e05ef88adf4b6ce7e50a199024b286e43ed19104bd58
+EBUILD bashdb-5.0.1.1.0.ebuild 1037 BLAKE2B 92d8611c4f984ccc50776c0f22b9395bf24ac202c7793308e64610018d19fa4fc04c552bb87209e98fdd813408651d0e64528897a12843ee20e43c0d3a0b5991 SHA512 d5adfd6d7fdf4a021b0f871103b391fc322c3b36dbdd797ca876ec740b4255e4ff46264d630e2860ca55f9a2f9c78a3ace5680de353697c4ebca2c048f592310
 MISC metadata.xml 333 BLAKE2B 3d15d5b1c4dc17fb6eb805020e6cacb0b835ec4113cccec2756d5b3ccd6be5ce427383598b136f9e13280452e1d9252a609671d3016fffd14ccd898fa7553ad8 SHA512 eb1b078a7e431900181f558710bba93fb5c4633733364664e85e07b4bd05c8ba7492948d4a3ac8cb4866f128b116d82b5b6f1c8b2966318fb9ed61a9c78dda82
diff --git a/app-shells/bashdb/bashdb-4.3.0.91-r2.ebuild b/app-shells/bashdb/bashdb-4.3.0.91-r2.ebuild
deleted file mode 100644
index 665558ef2924..000000000000
--- a/app-shells/bashdb/bashdb-4.3.0.91-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-${PV:0:3}-${PV:4}"
-DESCRIPTION="bash source code debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
-
-S="${WORKDIR}/${MY_P}"
-
-# Unfortunately, not all tests pass.
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# We don't install this, so don't bother building it. #468044
-	sed -i 's:texi2html:true:' doc/Makefile.in || die
-}
-
-src_configure() {
-	# This path matches the bash sources.  If we ever change bash,
-	# we'll probably have to change this to match.  #591994
-	econf --with-dbg-main='$(PKGDATADIR)/bashdb-main.inc'
-}
diff --git a/app-shells/bashdb/bashdb-4.4.0.92.ebuild b/app-shells/bashdb/bashdb-4.4.0.92.ebuild
deleted file mode 100644
index e48a511f0157..000000000000
--- a/app-shells/bashdb/bashdb-4.4.0.92.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="${PN}-${PV:0:3}-${PV:4}"
-DESCRIPTION="bash source code debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
-
-S="${WORKDIR}/${MY_P}"
-
-# Unfortunately, not all tests pass. #276877
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# We don't install this, so don't bother building it. #468044
-	sed -i 's:texi2html:true:' doc/Makefile.in || die
-}
-
-src_configure() {
-	# This path matches the bash sources.  If we ever change bash,
-	# we'll probably have to change this to match.  #591994
-	econf --with-dbg-main='$(PKGDATADIR)/bashdb-main.inc'
-}
diff --git a/app-shells/bashdb/bashdb-4.4.0.94.ebuild b/app-shells/bashdb/bashdb-4.4.0.94.ebuild
deleted file mode 100644
index 8a43d82f6358..000000000000
--- a/app-shells/bashdb/bashdb-4.4.0.94.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="${PN}-${PV:0:3}-${PV:4}"
-DESCRIPTION="bash source code debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
-
-S="${WORKDIR}/${MY_P}"
-
-# Unfortunately, not all tests pass. #276877
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# We don't install this, so don't bother building it. #468044
-	sed -i 's:texi2html:true:' doc/Makefile.in || die
-}
-
-src_configure() {
-	# This path matches the bash sources.  If we ever change bash,
-	# we'll probably have to change this to match.  #591994
-	econf --with-dbg-main='$(PKGDATADIR)/bashdb-main.inc'
-}
diff --git a/app-shells/bashdb/bashdb-4.4.1.0.0.ebuild b/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild
index 2e08dfbbd120..d83f4069ad11 100644
--- a/app-shells/bashdb/bashdb-4.4.1.0.0.ebuild
+++ b/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 MY_P="${PN}-${PV:0:3}-${PV:4}"
 DESCRIPTION="bash source code debugging"
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index 46781eeed9fb..eb8b5d08d2b0 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,5 +1,7 @@
 DIST loksh-6.4.tar.gz 250475 BLAKE2B 061538766834038677019ca8f1ccd16c77245855f0d666ec5af78fc24995e74b22637ccb29d92d6c436c377d21c1a9449dcb79568ab5ccf7f141e8f0b6040d99 SHA512 74cce1428346820331fb8bce8acf275077b05a3c46081bce5c35e8e0d47704446bb93ce3e457dbf2e379d5d9656844b78c736b1190b2fe39ee92717863adb86c
 DIST loksh-6.5.tar.gz 251099 BLAKE2B bca8bcb7b6a9bf2e31f45af190705e15a36ddd3e70aa24c20dd7eccf867ee7847511d322ea3ffa3f84480346931b0d3fcb21e6ea659656a71cbdd718888f3089 SHA512 35eb7d8bc8e01787034981c6f8d3733419065548efc21c6d6dcafe4cbe1912ef8c1fe911f1ae9955900bfeb363604230470280944f6eae0628def711bb6f8d93
+DIST loksh-6.6.tar.gz 251931 BLAKE2B 8671b2a7b5f4d8247c8572a925a078a7bbf7e6f0ae11b9198798c66def35c5bdb5c3b39e5c37e0dcbc068a1757e6cdcb667088640c6c9a556c64a9a4c0582102 SHA512 7f5188b3f0af3167f1c5847043689a35f22d5075cee2ec4ce3ebd324a59233e89db1c864dc62a05ad036ddd541ee89c680fa82e22b85cd2c82ad32c5ebad51be
 EBUILD loksh-6.4.ebuild 620 BLAKE2B 0ac882c2c726d01536b191d54573f188d5353d7f9c269e492bd7b0885032ef433591e5d02f23d7c24e994a950494b72e2e6f9c036eb3b68251e3c631e53f9a59 SHA512 fcc94d5db4969d0bc231a46f5d0ff59cd9d1507aad1b7b0462729817ca1ae7c37160556e5122985ce7228e568c07c37a680195177754375a53cf38996940612d
 EBUILD loksh-6.5.ebuild 648 BLAKE2B a499dd70690ccf53c4bc54a015e7061fcfa791a0b981b77bff506bbe4f52b948683d7e9a68b9357d3545127f018a54f6a8a02c0a93147b5a4f68c7a949df05f1 SHA512 621c398cbcc1add898457ece3acd9603bb3c32afe493d068c5716df73280c9c4655cc46acd8acce4b42a4315e3600d6d79f9d4ef11678757788af05261ffbc23
+EBUILD loksh-6.6.ebuild 648 BLAKE2B a499dd70690ccf53c4bc54a015e7061fcfa791a0b981b77bff506bbe4f52b948683d7e9a68b9357d3545127f018a54f6a8a02c0a93147b5a4f68c7a949df05f1 SHA512 621c398cbcc1add898457ece3acd9603bb3c32afe493d068c5716df73280c9c4655cc46acd8acce4b42a4315e3600d6d79f9d4ef11678757788af05261ffbc23
 MISC metadata.xml 446 BLAKE2B 0a875fdcc5daa79b15353c9cabae32697f435edfd153759193cfca0fd17ca3c76f649b27cc32bae132a1270c99faad5ca91475ebb6a51f0bd04eba6cd95373a0 SHA512 4e987382f9f5fab554e34afdf016fa59550f64831b8dbfeecc30029a6e0eacf42d14e22117c47bb183abf584ba549d24e3d8dac7e0101e78e2e30ef7a9020069
diff --git a/app-shells/loksh/loksh-6.6.ebuild b/app-shells/loksh/loksh-6.6.ebuild
new file mode 100644
index 000000000000..409607ab680a
--- /dev/null
+++ b/app-shells/loksh/loksh-6.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux port of OpenBSD's ksh"
+HOMEPAGE="https://github.com/dimkr/loksh"
+SRC_URI="https://github.com/dimkr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND="sys-libs/ncurses:0="
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	!app-shells/ksh"
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_install() {
+	emake \
+		BIN_DIR="${EROOT}/bin" \
+		DESTDIR="${D}" \
+		DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" \
+		install
+
+	dodoc NOTES
+}
diff --git a/app-shells/yash/Manifest b/app-shells/yash/Manifest
index 90b7e44392cc..845242131a24 100644
--- a/app-shells/yash/Manifest
+++ b/app-shells/yash/Manifest
@@ -1,5 +1,5 @@
-DIST yash-2.47.tar.gz 1161675 BLAKE2B 8491d5f977b9e23071098016443e8384bc584b8b1160e84b725a2965d032d8b8f5a7ac8b16b1a1e62d808b0543650e0bc42ddc52806c5475a7ca9e26640e84aa SHA512 c9607990a1cf947f9cf294f818d9c6de314dca92a9f106dc65e8d0fdeb6ac91b21a394c711c4b8aabae33b60fc70b72dc9483b6ac48d4e3be3019501ebc26332
 DIST yash-2.48.tar.xz 736280 BLAKE2B bbb7d2f723000bbb168ce8d354c27d80b350d5b5b1fc450987b8ff45a3d0f3c94986632ead5510de70b27689498cdc370bef8bbcdded66dc8d43061358c438b8 SHA512 51201a5bec24ebfb550d3e6b52114c83221d2e4b54cde577b76def1ccdd3476758ea2c8e1468047bcfccd6e8cdc3fc1d35d6c0dc8b7017c8d290c4aea66350f3
-EBUILD yash-2.47.ebuild 731 BLAKE2B f7f40d1d3c5da22393a7d81ab7a41ca8263ddc83b47cba0f0bb9a3a8414cbf4c2c502445d43caec54b73218450ff5544e7f0b7801ef149b7ab30436ae3cd4875 SHA512 ddf926f1d4460b413b86b70eae6dc7564a89613800008ec85932d562d297fa1910c5374b6afa85dde9768640391b41eede965cbb300f4f525ebbebcb0963d7f8
-EBUILD yash-2.48.ebuild 730 BLAKE2B 66d149fa0918f7491b1591a3eb186de5734dbeb090ac4a2046215e12240e273664a99d799fb26f00811c0b00da72cb4cb029dfc9f03526208f4c9f7b2a1fbaf9 SHA512 1f96b0af72a4b07e2e1971b5baab5715b7b925875877f828927b4d948151b77f45cfba5fca79feaacaabd7446e5820637a85dc7ea25c013f0d457fe476826ac2
+DIST yash-2.49.tar.xz 740780 BLAKE2B 61fa2d2ab8a5f672cb21cc39c78f18076a4acd79d84fa2285bb35b03a697a58fa77584e5d66268dedbf69b5b2f2e00a7d2b6f6954ffa37a5e9fee3995851034b SHA512 99d98cfbe09aa746f2707217ecb506d8d5998df4a603ac276a8a67782fdcb3a7bd41fb34744f3834e319b0fdb0b1fd480cf9e2a4b835fec3e758280e13036db5
+EBUILD yash-2.48.ebuild 728 BLAKE2B 322f44099ad24c88e751e95073415c72d4a2dcfeac513e2616fb0c918c0f91dd6b6544acd740a14e87617fdeb29926fa06392634beb16962ba5ae0fd92f44c76 SHA512 9c46a3de5e306c0fc0d91b5c1248878d5f0a92bf8fdba02843356b2e7fc216d20e12ca1023c885fdda3c29605b1502b84f7664f84fbf72a1b9c04d1ca405018e
+EBUILD yash-2.49.ebuild 730 BLAKE2B 67e8e580bea8e2d4f2358e4b4ab6b8504b316702beb2a52b8e8f1b08200e2cac73c7aa973807948ae064578c1e1234c824a6f6479450b9243d63bf5e6b606c6a SHA512 47f92402c93603ea3a34ea991b12619333bc23614249dd0d7e914f3c9d62afbe67a85a524effd25105abd2ecdb215f81d1a3381f8c62ebcf96de544ed6d42bbc
 MISC metadata.xml 1043 BLAKE2B a83b4a65aace09de65f4c1f44b99711171ffe1d5abc453f0c616fc02d0dfb63828ca7dc7ca431641c6c87d4aab15c5160802ee534de055e0f53bc0350a4110d5 SHA512 004f1faa56032de6e2f37af8199f165c4394a4f7a3c2e2eebd79254a5155bf429e0e0d1e97e7b025037d7a3fbcf91d14b67e37dbe0313fe1ca38a2a7d56ec9f4
diff --git a/app-shells/yash/yash-2.48.ebuild b/app-shells/yash/yash-2.48.ebuild
index d3d60ce0fc4c..1b5d2260d0db 100644
--- a/app-shells/yash/yash-2.48.ebuild
+++ b/app-shells/yash/yash-2.48.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70439/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls test"
 
 RDEPEND="sys-libs/ncurses:=
diff --git a/app-shells/yash/yash-2.47.ebuild b/app-shells/yash/yash-2.49.ebuild
index ba1b7b0c6c20..2a5af19fe466 100644
--- a/app-shells/yash/yash-2.47.ebuild
+++ b/app-shells/yash/yash-2.49.ebuild
@@ -1,18 +1,18 @@
-# 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"
 PLOCALES="en ja"
 
 inherit flag-o-matic l10n toolchain-funcs
 
 DESCRIPTION="Yash is a POSIX-compliant command line shell"
 HOMEPAGE="https://yash.osdn.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/69353/${P}.tar.gz"
+SRC_URI="mirror://sourceforge.jp/${PN}/71638/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls test"
 
 RDEPEND="sys-libs/ncurses:=