gentoo resync : 16.01.2018

10 files changed, 359 insertions, 2 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index b4199bfb9239..3658ffcfb388 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index f3f97eaffe7b..73851e2b1d62 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -44,6 +44,7 @@ AUX bash-4.3-arrayfunc.patch 439 BLAKE2B 8fd293185d6ebed88788999a671aae6d490ecff
 AUX bash-4.3-compat-lvl.patch 628 BLAKE2B 8b077871ff09cc61ab34287e57da9917170956086fb75b8fe6a49ad3d6f927a389faae15c427f593e6c1554e4f37d845b4f8bb40a0b7b557244cc2f0c7ced5d6 SHA512 c552e1c7154d69201329f26e039c06a61e1bbaf5eaf16b7eea4f89d56aef0f710ebdfb115a1c00f07bd94893e51f9cbceee12bb57e51f6009c0e2327d53d7286
 AUX bash-4.3-mapfile-improper-array-name-validation.patch 407 BLAKE2B 34644cc552d50cfd1db1904164fa69c84a315a8e0b0660bd0377669db532cca6af8f02f8e32d57ea117696f3caaf7a00e765773cf19c840a9aec57b3fd72f99a SHA512 214935a751c3275593654c36b471cbb47ca4f5bb6f2a19e0a7ff73b646e5318a861538bf923ebb5f84abafa6d0d6eeece7b2f36ef77ab8c582223e098b4eb356
 AUX bash-4.3-protos.patch 174 BLAKE2B 02d65bba8a12ab7d280a66d7e292e2ba6eea026fc252d302ee8a167e14bbccb9d3906a75728c9fe617b202ef63649fed13d82ff7407a71ee36baee6e1ad1c944 SHA512 4af0540467bbcf7cf041de6fe6ed080b149a2ff309e5dbe5e7b76bb30459aaeead813be678384feb01a7b64d3a649372f8a8aaf686f69ac7958baa87b25340b0
+AUX bash-4.4-jobs_overflow.patch 331 BLAKE2B 6897770ef49b5f3def669abaec3d18fd8c799fc54192c4a21a25da6a63390e0ae980cff88e0e8e74987a70c997a4205aa740bb6c7b60aad2dfbe4bcf595d958e SHA512 4b5d5c053b8bdad203a3440c084631fba2df79ccdb9cb0c0c41ece2af749382f4a8b2e9750cf0abff6558c91a5afed477cc1d49fd0911c913fe3d517da9faf42
 AUX bash-4.4-popd-offset-overflow.patch 1069 BLAKE2B b23ce9f427cdf252aebdf7330828074230f9b22b5bb59b712d1b148ecbf73aea78ce4e29d353198235b25fa19c4046405c8ae6eeb7fd1cf299d05b732f7cc37b SHA512 535f61b2e0c6423031520700be423750e9177ec96055be781aee5dbdd01c720c1dbc30fffa73b88464527981193c1c6a74ec4139753ef4f40a5bb0f55c4de61c
 AUX bash-4.x-deferred-heredocs.patch 1255 BLAKE2B 944c8d5feaba6a6818fe7e20300fdd44d1e162511c1aaf272bdb4d4c382e100908c16a17e4bef622134116e153f96f61fae4d7985e58cb881012058250a2e7f5 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
@@ -358,5 +359,6 @@ EBUILD bash-4.1_p17.ebuild 4154 BLAKE2B a8ff6552229406e76b6a9b49f3675630a3910b9a
 EBUILD bash-4.2_p53.ebuild 4356 BLAKE2B 1043056eed9633f3eca86a89e4ebc595ad7f59f057638088a7e56929d22a4aeb48a410660ecda72ffd5ec43921c067b783bbd8dd2dac4b80b99f03604292e729 SHA512 1bf922d25ededa1ba9f809f1281c0276a220e4f5f1265caddc6a2f095ec9f62f6026b8a9df93002891eeec6252c8943437940fcd08c61543261dbccb523609d2
 EBUILD bash-4.3_p39_pre0.ebuild 3581 BLAKE2B 51c88610e9a35420efa938d7bcedc09005a7c86cf5fe45a671607a89e517442f8316667f7883ef87bc5671ed1898097bbc4fd3d5e2d4baa515601cddf8abc8b3 SHA512 f41cf7c82dc1316f61e132a2b29a2e4ac5b7a20f3856b69d51d39a18723c7e4713fec3654331d8bf4425f84d8d43408834d4e63934f7369232d87ce12156d2a2
 EBUILD bash-4.3_p48-r1.ebuild 7260 BLAKE2B 82316e5db3a371f6856b0a22020b34842bf6d5313a0391d21e009c98381464c901638f7247a9eb38d72452c29f996629b3c8b4b53f894cba54b0d375b5f77aed SHA512 7b15ebc166dd814164deddd0821650b4d66e77ce35ee0d3d57682c1b404be4f7ed9437af1fd6bf58696849bd5e9d23d6d92701f44bed2d09362dc3aa3a2b715a
+EBUILD bash-4.4_p12-r1.ebuild 7234 BLAKE2B a51bf6dd560d28f9a728581649b6e1e67455b70de6b35adcee1b54f8bb9323ae9e62d072b0947f9d28e375fd2e0b80ee346e37a7e2c7a137bb7150fe585c4d72 SHA512 0b1b27ab481b77bff2ae1a652b27474dba0599d8208b7c75bb0191bba8dc347fa6c082024014ed965628ff9b0bfc46b0fbb4ee3f7f9f25e8037b6a44b6243455
 EBUILD bash-4.4_p12.ebuild 7178 BLAKE2B 0ac21583041940a5b2f4bab801b9a497d9830092c8f3cbd850bc6518e7fe2e4281a374a101cf6f2eabf003bca78c851735b780dde79ac5bc2db0001985440afe SHA512 ccbfa406cffa505d90ab3abb16c5106b32e80bca45f58e62c323046bbaa7d3ee6fe3dd0bb55e3161a3e33279a0d5bbfb3afcb9cdd1279bb24ed9c09fd531509d
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-4.4_p12-r1.ebuild b/app-shells/bash/bash-4.4_p12-r1.ebuild
new file mode 100644
index 000000000000..5e54bf0070ba
--- /dev/null
+++ b/app-shells/bash/bash-4.4_p12-r1.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs multilib prefix
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.4-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="7.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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+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 )
+"
+RDEPEND="
+	${DEPEND}
+	!<sys-apps/portage-2.1.6.7_p1
+	!<sys-apps/paludis-0.26.0_alpha5
+"
+# we only need yacc when the .y files get patched (bash42-005)
+#DEPEND+=" virtual/yacc"
+
+S="${WORKDIR}/${MY_P}"
+
+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)
+
+	eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" #644720
+
+	# 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_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--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}
+			insinto /usr/share/doc/${PF}/${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					doins ${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/files/bash-4.4-jobs_overflow.patch b/app-shells/bash/files/bash-4.4-jobs_overflow.patch
new file mode 100644
index 000000000000..8753d62ec6c1
--- /dev/null
+++ b/app-shells/bash/files/bash-4.4-jobs_overflow.patch
@@ -0,0 +1,14 @@
+https://lists.gnu.org/archive/html/bug-bash/2017-12/msg00025.html
+https://bugs.gentoo.org/644720
+
+--- bash-4.4/jobs.c
++++ bash-4.4/jobs.c
+@@ -750,7 +750,7 @@
+   else
+     nsize = bgpids.nalloc;
+ 
+-  while (nsize < js.c_childmax)
++  while (nsize < (ps_index_t)js.c_childmax)
+     nsize *= 2;
+ 
+   if (bgpids.nalloc < js.c_childmax)
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index 9c250d827478..5b9781830aea 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,4 +1,6 @@
 AUX hstr-1.23-tinfo.patch 481 BLAKE2B 3279671caf216d810c3fef490c5ae219906e59430dc15a850118bbafe49140f46fb1645be1c0a8a8977c795af018164027f928d4fcb0a664186c97f2b968edfb SHA512 64c1e0a5b2ee28354f85563472dd301a9e45eb568fe74c0d601765ee25095650320b8f853c95280f294f323eec6b7f9a155c2a09a5fde2e52568d2c9809c1e91
 DIST hstr-1.23.tar.gz 47239 BLAKE2B dec630f1e8161edc40544561dd85ea1c128a6704eeeaeb39eb6987bdc096a070c9e242b938bed01b80e208aadf08606518a007919d353f76ff1c36e7906aeabb SHA512 234c72587d0492d788b1c001b5e53f74820790a9ebe670e8abd28cd82fc7db65996d54160e675055be54cab110686838fe6e36dbefe0fbef9175613633bc5910
+DIST hstr-1.24.tar.gz 47523 BLAKE2B 6e84ea6bd26cb0745f48e5f8701d4d956ae4b83ed825398fdc401fd0b7f13eb9874de62d438e71a57fa048a535a538504e7fabd7b4a698665a10a901e0a570e6 SHA512 fe522374e33150007c0bbe5d11d38e63c355519350f5777c8787aae62826553b61a358185994d196d015590649fb3accf75948e340233459409d594e51874658
 EBUILD hstr-1.23.ebuild 631 BLAKE2B d3eb2ade2c30a1e61cc58349e52fe33d76ddb14ca490416aae276b106961287d79c1546b48ba8d56396ea84f95d741b1931b19516cc3e4a173398b644b75b99d SHA512 355201bac2ed090066c79e2c4d6d195510c28a18dd7105a0d23142724292221f2bdeb8f70de0db4ca6f2ae43e59969201110b00f4a461b49fe776f34d790042f
+EBUILD hstr-1.24.ebuild 590 BLAKE2B da2f711c59a6de9a7df26352289b14d60a3c08176c62a4b9dfb50c649fea996d8784fe045f48de2e4ffd0524163dc1a4fd36b6d73f5fe621a74a5941290427a7 SHA512 6528964c77fd4867b4d0f54afdc563325ca2b799bafcabebd4242c402e99fa5651ce347bd55756d7acfc5c68ec2828b92157fd4b2242a6913b4141857d6ff2d5
 MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e
diff --git a/app-shells/hstr/hstr-1.24.ebuild b/app-shells/hstr/hstr-1.24.ebuild
new file mode 100644
index 000000000000..0f8e9981f2a3
--- /dev/null
+++ b/app-shells/hstr/hstr-1.24.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Shell history suggest box"
+HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
+SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+
+RDEPEND="sys-libs/ncurses:0="
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( CONFIGURATION.md README.md )
+
+src_prepare() {
+	default
+	sed \
+		-e 's:-O2::g' \
+		-i src/Makefile.am || die
+	eautoreconf
+}
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 563b1eca1dbf..8810a5b53593 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -4,11 +4,13 @@ DIST mksh-R52c.tgz 386254 BLAKE2B 027cf8e2bff4b8cc00ccd574a8a11b0e5d0164d9e59a9a
 DIST mksh-R53a.tgz 393344 BLAKE2B 4dd331eea194ffa354359134677272aeca07cbbec45a07198d75bee623285f368f2887042faa5f7f5a58a935f53dd2e1b4cd930bed6b48c13cda0a82305ae58e SHA512 634e1cbdba7eaa3b6a7d75d9ade23e6465c8874ef616adb708867f6c46e5722bd2e4818f92350aeb7908872678fb446635224fff990d4dcdd4cf4f666cf2e91c
 DIST mksh-R56.tgz 414865 BLAKE2B b50ff737efd899ff3a8d588717492c37b06f8f8dca147f34a974ccd15563259457472188886f0b1a73b78cf11531585c0bad40b86eec7841c4058a0572fb3355 SHA512 33839ed112b1b80eb6090f7fd3027d136e5b7c57ff5b3bd16f76f76fe1f39c8c0d49a0b43381ecfd3b20366c5edec515e554535151fe17021ab3dfaa70e84d82
 DIST mksh-R56b.tgz 415088 BLAKE2B fef8baf664cb61ddfb312e2ec1c81f192478bfdc889ad82e7dc51f50517ec54c13fb32586c70f3d3a276ac739a93ac64ee1a511492e1e592d015b4882f4107f3 SHA512 a6f9061b2bfd19e9f4fdf3212a1c5a53a53cdb52650c95287cd380530c08f4a65a1ccec4bdcbba5e7c34e4764bf04eb43abb01742bcbf83107847a6996cc77a8
+DIST mksh-R56c.tgz 417218 BLAKE2B 3512855dd177be8432fe503716ca571a3c06ab3eeb6b44de923ab7d9eb9246087f627b7d7a3e9bb29a849da126b88c223864f140b136e922776ec7bd4a04e96d SHA512 7e4cd2d24c6bca2ebad7c6b02d158188e766bd4693d93f5bed198d69238aef078d42ce911431ad4e419e4af55083047d823bfad53973db5c6d8a685482770135
 EBUILD mksh-52.ebuild 1082 BLAKE2B 5d2c18022c68e39de07d10458d85ad6e726fe1b45944b51d44570bbce8b88284f86259b6254ceda26d0c6adc6d2cdf251345b8bbdf0b5abbe202948920711b31 SHA512 90f87cb081ada2babc72b0048b6703beb1c35a3206aa174922b0a4b3b81466d4bbaf96898cd43c778fba62c4e78bde4517317cfe215faa42c77c579b395dcb27
 EBUILD mksh-52b.ebuild 1085 BLAKE2B c400c971f383fa4dddfb1ab063b255e5f0717895ca257800edfd661e7ceda26d072d4a24fbf134f9786911530a71e52e799d753b56042c903c01c270612050a3 SHA512 ca4a8a47682e493fd4c49fa9e35c91300958168136963e5945b8c6952e3d3e4679ee6992c1b7bad8397ccbca8574105906fcfe556b4efc2e50f8c36c8d381e27
 EBUILD mksh-52c.ebuild 1085 BLAKE2B cffad7a2f7e305c8e61364dc8c71ce57d255925298671bff3a4f5639ce20f53e0f30c0f632195e365bfca55f7f810e927bcfaa8c47ff5a3724862d655bc954a7 SHA512 b24cc00634ed94becd73b64a8ed60e2c39d9fa1c6ab2227ac4c82d1acfd892d3c76bd874b53c5599b6693e55ce713b7364dc1d3e0565d69f7a89a247edc60c95
 EBUILD mksh-53a.ebuild 1090 BLAKE2B 500c5b089bcfd80ab28903e0492866ec961778fba8e9b47b2328d7968ff5e426caf8770f312be1c18522f96f575cc60cd51b01bb7b12f0efab32f02bab3ac54c SHA512 836b10ec92c4139e27ef473e768a56edd19a2b6dac0261f8d0729d9afc2253fe909f85f33fb8c43501df61c3de5348e2e1548f796a924275ca5518343320fe78
 EBUILD mksh-56.ebuild 1085 BLAKE2B 5ce8a8c02755968976048d3597326e5f5a35ac168552fdc6746363bf01b4b4ab1dae6b3b8f81b5fac23e9b0e396c792c5179bfb2e21ad798ff21d0c9a3b5bf3e SHA512 2a8b4e31a3cb2fe1701cd884b2803eade709aeeccafef03327b3f581227b4c919b945c7fe56872d737658207fae09db19498b17285feddea474548779a3b1413
 EBUILD mksh-56b.ebuild 1085 BLAKE2B 5ce8a8c02755968976048d3597326e5f5a35ac168552fdc6746363bf01b4b4ab1dae6b3b8f81b5fac23e9b0e396c792c5179bfb2e21ad798ff21d0c9a3b5bf3e SHA512 2a8b4e31a3cb2fe1701cd884b2803eade709aeeccafef03327b3f581227b4c919b945c7fe56872d737658207fae09db19498b17285feddea474548779a3b1413
+EBUILD mksh-56c.ebuild 998 BLAKE2B a884854af8f0c063da2aca2327dcc24a010bbe99529fe4ee26e503d6e6fe6b14f2ff46846d10c3afcb562a71cb35d382e9ba19acabce25151d52b2e28991bd6e SHA512 f9f26d80c7a716deb944f3689c4ebe7096523e9b51c09fab67c126cab1a745fd01a10404fbda0fea85805fdf38041fad9286d7ea337963d18a02c1378ff001c3
 EBUILD mksh-9999.ebuild 1244 BLAKE2B b0ea3d58199d7c3f4ee45140c166bdd1fa535d41228e6690415cde5d2675e89282bdb8ab910a8991d585d76d3f75ce44ce11d5e69a35ab05521499b28e446353 SHA512 636cf54fe70436f74837d1e41fbfcf82dfd2c199a8b6a7fb85b72bf83b32373238b711fdb21fbcf57aab227460337a71a16055f264c76c2beea86cf8587581d5
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-shells/mksh/mksh-56c.ebuild b/app-shells/mksh/mksh-56c.ebuild
new file mode 100644
index 000000000000..fe3b54c6ab82
--- /dev/null
+++ b/app-shells/mksh/mksh-56c.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="MirBSD KSH Shell"
+HOMEPAGE="http://mirbsd.de/mksh"
+SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+DEPEND="static? ( dev-libs/klibc )"
+RDEPEND=""
+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
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+	sh Build.sh -r || die
+}
+
+src_install() {
+	exeinto /bin
+	doexe 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 $?
+}
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 23bcad4f9b6a..0a036e1ef2b5 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -12,7 +12,7 @@ DIST zsh-5.3.1.tar.xz 2928832 BLAKE2B b561629f8641dac70a5b35e12333fb3b214c83ebd9
 DIST zsh-5.4.2-doc.tar.xz 3198880 BLAKE2B 9ef3c6690251025b669a1cb46d3903d26a7407bc9fc0463c6d3678db57180b690f11302b202346a67afde16f6177fc8a597edca53bf55aaa835a5208e205b75e SHA512 5dcf561380ec46358754a0a03224152cb0db197d8a1558c6457342a6fd0ec6ea43bc3c1c1a79390a2a6034e09e0e668466962462ab14e90807170436a36f82b7
 DIST zsh-5.4.2.tar.gz 4482413 BLAKE2B c3b9eb2b1458d88d8849898fa468a5e8575ac06f7859c809e741410b672a61c877027d4d5057b8c2295e6f15ce1f2fed9c0ca3eacf4024b8478b9e1d287c0378 SHA512 5eaa2ff3dc8052dfb50d2be19bfeed1856b00f7c2dc698129c95c2373a516ee61dba5b42ded390ac20b171abe352b1875f177a4dda8fdc15a4f2a05bb7a024e2
 EBUILD zsh-5.2.ebuild 5904 BLAKE2B ff2f87b4eef53df352533abb8055dba59f164ef2e228dced3a2a6f5a790ca21468438cf8be9dacb3b3aa08f36f93cd6cbe29d48c98e9f2748622c6cf82eef9f8 SHA512 4e1194cebc50f0dcf2c3b7c1398b3e19842876bd3a2e9ae74c8734aa4fc260e9f3e4cfa396372c6dc21e4330102934e9d0cb5f3544c174175b400714b36dfcaa
-EBUILD zsh-5.3.1.ebuild 5997 BLAKE2B 002eab805afe9874b4db8092fc166d21cae909fe5408da338ef36c4857d4ad7c8f6fa7f8a72d2e4fad89af9753443fd7adc9fb9ea1d952a11ef42d6d7c6a989f SHA512 222ea7724eee76d969134a2b601271d433a35f9878c9c6f26fcf0e059519d2bcf519281a7e066c09f524a4334db54d871faf01b6c43c9ff1668464d5f7741ae9
+EBUILD zsh-5.3.1.ebuild 5993 BLAKE2B 5b27a02b20427761294a85f4163ec29d42703e7e2a29f839b0db3c31623808d8bc2441a3a81819eb786c2f5eb9dc450be2e9b94c9b4cdbd9a0a1abb178051217 SHA512 816c85c535046f44defbf2a79a46b8f92ec39b287d4bc7a3caa614e5c13f99f4d191c4e7f5b88333c4b23d3556561d8e9eb65e57ffe240b2ddb158e7842b31c9
 EBUILD zsh-5.4.2-r1.ebuild 5831 BLAKE2B 0152c2e02b368e88b616099df8a26b5132491ff0d18bd2c6c5dc390a909351d3f8025577d723d5dcdc234502a73e0b5bf0e79698d682af70bfd7d551c39eb00d SHA512 caf124ecd8eec33070546272dce04702b68b1c693e6b32c8f6abfe8d005a02c5159936fcfb83a3ee8fa272fc9de15cd8cc74fcdf7bff89f0a796a2aef7f84ee5
 EBUILD zsh-9999.ebuild 6010 BLAKE2B 6740b811aee76184fb1e1c4e8f0f8f8497fb27314cd2651a8a03734bbcbf34363084e0326ac7cefedf857129eead29f0c4c84a45e1edbab1dd23cd6b72682cda SHA512 8ce2a9c12b57f2c34b99f09d220aab57204a3c737dd132073f7220be55b3a848519444463e0205e470a4de332c085265556d425e77ec07ad5902042861e820e6
 MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/zsh-5.3.1.ebuild b/app-shells/zsh/zsh-5.3.1.ebuild
index 62b5c6462022..434a0b32d8cd 100644
--- a/app-shells/zsh/zsh-5.3.1.ebuild
+++ b/app-shells/zsh/zsh-5.3.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-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 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
 		doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi