gentoo resync 31.01.2019

15 files changed, 275 insertions, 112 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index d71969187387..75fd2d9ed524 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 3617fa2e924e..5918a322c12b 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -373,7 +373,7 @@ EBUILD bash-4.1_p17.ebuild 4142 BLAKE2B 5d8f2b031eb26211ff1f778629cfb8d9255b357e
 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_p12.ebuild 7127 BLAKE2B a5909b73ff2daa32a6e3af1f25f15b3bf1d9cb0dc1a176a8826f2d47d370367ec91731b062f1916f664edca442cdc91971fee227ff51f0a80d53d1ad146011de SHA512 92233876cf54b44c82ee67e4b56089a83b589a5c2570f3a1d53b1b647e29ba498c5a7128bf7b1b6efc9384c8ebb0afe7843373a57a016066260de546d8d90eba
-EBUILD bash-4.4_p23-r1.ebuild 7386 BLAKE2B d6c39d6108a74bbf6fa49446f373ebd1d61c832dd1a4e78a1de44bbde23ef8b53bb1ee99f1668ad88c3662bb66d25a49dbc512ac92ad87e7a44b6ad9c1b0c6da SHA512 f7467e10c43ee718420d170d2f5b1c9eafe863ce5e221d7283252977713a694a46e6432ca484e8bcd669e02b055aed0367f55cd7be8bd63745f3dbe1dc898837
+EBUILD bash-4.4_p23-r1.ebuild 7384 BLAKE2B a0f4af7f005a835afb706f7c70a25678786f6ea4e372d481b04fb86f840133527cb31ad1350cabd30da4cb31ee63b45ac2054b94a0fa33267fbc09554462be09 SHA512 ffecd6f68bd742b78dd1d06c3d2f99ce31735f50c0e3f36778679d55275c96789b007458987b7cf0fcdda3b89591b5e7f0fc5939f11f4de12e984690ace2bae6
 EBUILD bash-5.0.ebuild 7332 BLAKE2B 267bed85678ff687485811fd399403d4224874b41873c27ac1af9ec84b79c7f74e7cea281dd9e90f1ec5537b77c59849a909991f17897cff30b7558886949eea SHA512 d48a77249bf2173242dc81fa37ee933b34a574c129dfa0a3fdda9c5fd405004c8b29b731f331fbb8c456b012c4e9fa4fe4658ad8323665ffc1bedb77c5f2d369
 EBUILD bash-5.0_p2.ebuild 7271 BLAKE2B fed8e1be9d9378cb797a311c022315456c24b3435ae538f30713446a150c9f1577c59eaad3418b10fd5f5f89d7f220b8e13710d265c9dab97edca5e67391c5ee SHA512 864d8599f8dab8aa5cb315c6478458825466b347b5339b7029e9678e8ab0f3e7ac266a6a3be24c80182539902f1ce25b7edabe61ad4849dc5ffac1b49777a253
 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 86bdec0c2ad9..6d85bb7685dd 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 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/fzy/Manifest b/app-shells/fzy/Manifest
index acb1799d3dbe..c77861d3a6ef 100644
--- a/app-shells/fzy/Manifest
+++ b/app-shells/fzy/Manifest
@@ -1,6 +1,6 @@
 AUX fzy-0.9-cflags.patch 299 BLAKE2B 61685e7180741ec77449b5de6fa711b4939faedd94dfcfd84ec86be0ef963b13d5a5308e294f4f22e83682982671a528b64446979fe41e112aeb8c5d143e865e SHA512 f3ea9b90a75f0a013466ef00190dbca451b22015e0a3c3f7e823f61dc2e4ef7d64f90a9685fec311675fb6c5bc788bb7436da2fd89f4f6baade4dfbee8318635
 AUX fzy-add-utf-8-support.patch 2642 BLAKE2B bdece2ab5d9122c9c2f306271b1c795c1130c145e3a434d4b831dd680bbdc09e5241763391fc2efa16a6af50cfbaf49b3fe98364f5f56a25b2d78af8fcba8a1b SHA512 203c0e8e7a9583661cd7d85cc094016eed2149a82fb55a578075e5d2fe513cbe2f7241ea76660e5990efd6b5f573f584ab3345ae832439fbea80950c64f7803b
 DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc
-EBUILD fzy-1.0.ebuild 1101 BLAKE2B 6b372014004fff32821dc8e3dcb72fa38b7a628c8d3dff506102d30a8a986d691c360d2c9bf5fd9db2d3475b13dd785a5f9d59b53bf9147cab3d14497c69d1e4 SHA512 b589016e38dc18e2cca44744b6d6817b49a720e3485b5adb235f6c47850b887072444493ee5e148224e1c4348740362fb74e99ff2161228e970229d72e54f10e
-EBUILD fzy-9999.ebuild 1101 BLAKE2B 6b372014004fff32821dc8e3dcb72fa38b7a628c8d3dff506102d30a8a986d691c360d2c9bf5fd9db2d3475b13dd785a5f9d59b53bf9147cab3d14497c69d1e4 SHA512 b589016e38dc18e2cca44744b6d6817b49a720e3485b5adb235f6c47850b887072444493ee5e148224e1c4348740362fb74e99ff2161228e970229d72e54f10e
+EBUILD fzy-1.0.ebuild 1108 BLAKE2B 74ad203c978e5057efcd8b4a0dc69c08893e4e79074e4cdc3791d721a645b79437dae4aea10871280e457a2625d936b183dbd4b7c9bb11f518df0d92b37211a8 SHA512 905ae14042d9cbfa2c17ba61cbf2f9eca83c1f10bfa8097070379f111de62d9c12759a3c96c6b191c43dfe1db0f04f0314a6a238ad376de39c9a496644f753a9
+EBUILD fzy-9999.ebuild 1108 BLAKE2B 74ad203c978e5057efcd8b4a0dc69c08893e4e79074e4cdc3791d721a645b79437dae4aea10871280e457a2625d936b183dbd4b7c9bb11f518df0d92b37211a8 SHA512 905ae14042d9cbfa2c17ba61cbf2f9eca83c1f10bfa8097070379f111de62d9c12759a3c96c6b191c43dfe1db0f04f0314a6a238ad376de39c9a496644f753a9
 MISC metadata.xml 892 BLAKE2B 3182bda5d04463762d724265d2ff3644eef1615dfbd2db92ad7ab5e1bf3b9e5f0f727dc55939e0c0902ed16ac78d4a39ae331d22902ec7f7f10d53a7e65a59ba SHA512 202ff3dc44543bf072b32addfc5e1ad627ec6fa16585d9ff9ddbe68bfaa784aa0319ed152621215cd60f1c2a688bb0e3ca227b78fc6b62f5dca4f39b2ad8a55b
diff --git a/app-shells/fzy/fzy-1.0.ebuild b/app-shells/fzy/fzy-1.0.ebuild
index 5ae58b36b8b6..a3c83e613fea 100644
--- a/app-shells/fzy/fzy-1.0.ebuild
+++ b/app-shells/fzy/fzy-1.0.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 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Fuzzy text selector (interactive grep) for console"
diff --git a/app-shells/fzy/fzy-9999.ebuild b/app-shells/fzy/fzy-9999.ebuild
index 5ae58b36b8b6..a3c83e613fea 100644
--- a/app-shells/fzy/fzy-9999.ebuild
+++ b/app-shells/fzy/fzy-9999.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 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Fuzzy text selector (interactive grep) for console"
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index d444adda17e8..9c2c31cba097 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,3 +1,3 @@
 DIST loksh-6.4.tar.gz 250475 BLAKE2B 061538766834038677019ca8f1ccd16c77245855f0d666ec5af78fc24995e74b22637ccb29d92d6c436c377d21c1a9449dcb79568ab5ccf7f141e8f0b6040d99 SHA512 74cce1428346820331fb8bce8acf275077b05a3c46081bce5c35e8e0d47704446bb93ce3e457dbf2e379d5d9656844b78c736b1190b2fe39ee92717863adb86c
-EBUILD loksh-6.4.ebuild 613 BLAKE2B e3d3677ccb7a0dfbdc1f089e48b568da0ff2be45385d948aeb35bef7b1f6ae3fbc272f7b51098af9083339180e81e313d2c10e7792016de0351648b7eff36462 SHA512 0a63c2ba6be2e9ce194796abadde741238f8a18695386ef4a884f8d9d7137b6cf58486e86a2a7600f4be61697d017cd976cb0522a9f94a0be4e7ab5a2e4e9231
+EBUILD loksh-6.4.ebuild 620 BLAKE2B 0ac882c2c726d01536b191d54573f188d5353d7f9c269e492bd7b0885032ef433591e5d02f23d7c24e994a950494b72e2e6f9c036eb3b68251e3c631e53f9a59 SHA512 fcc94d5db4969d0bc231a46f5d0ff59cd9d1507aad1b7b0462729817ca1ae7c37160556e5122985ce7228e568c07c37a680195177754375a53cf38996940612d
 MISC metadata.xml 446 BLAKE2B 0a875fdcc5daa79b15353c9cabae32697f435edfd153759193cfca0fd17ca3c76f649b27cc32bae132a1270c99faad5ca91475ebb6a51f0bd04eba6cd95373a0 SHA512 4e987382f9f5fab554e34afdf016fa59550f64831b8dbfeecc30029a6e0eacf42d14e22117c47bb183abf584ba549d24e3d8dac7e0101e78e2e30ef7a9020069
diff --git a/app-shells/loksh/loksh-6.4.ebuild b/app-shells/loksh/loksh-6.4.ebuild
index 1e5d4a69359b..b297e6e61ac3 100644
--- a/app-shells/loksh/loksh-6.4.ebuild
+++ b/app-shells/loksh/loksh-6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dimkr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 14d188657720..e7f2d207edff 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,8 +1,4 @@
-DIST mksh-R52.tgz 383814 BLAKE2B f0563f19a3ba3b32e075bfb2d3db3a03ae9ada129d4b514573aad65f84ffa0d92a81a09baae0744e75a3d82d774a640dbd3a04856ccbdc7781ea3a1cec32efa8 SHA512 83b478baa401dc6116c363043d9d6629028bbcdf19448db939738c5b98f8e4f7da92932296c2ee813b317151d31a1b6cd55d27f062f79e587e22991b018a0285
-DIST mksh-R52c.tgz 386254 BLAKE2B 027cf8e2bff4b8cc00ccd574a8a11b0e5d0164d9e59a9ae18c1684a2b0f7c45ccb342d1cc0f8812b42c656a6e253cc24d14e25f55c1bf12d6f521b3f72bb4cba SHA512 f2434f2e165da290cc3f5d78846fb4774115a6e35ef3299d0343b1797b3773921d614396b0da78f8e9a451d6029df9abff503575c5cdcb232e18df7731d18da0
 DIST mksh-R56c.tgz 417218 BLAKE2B 3512855dd177be8432fe503716ca571a3c06ab3eeb6b44de923ab7d9eb9246087f627b7d7a3e9bb29a849da126b88c223864f140b136e922776ec7bd4a04e96d SHA512 7e4cd2d24c6bca2ebad7c6b02d158188e766bd4693d93f5bed198d69238aef078d42ce911431ad4e419e4af55083047d823bfad53973db5c6d8a685482770135
-EBUILD mksh-52.ebuild 1082 BLAKE2B 5d2c18022c68e39de07d10458d85ad6e726fe1b45944b51d44570bbce8b88284f86259b6254ceda26d0c6adc6d2cdf251345b8bbdf0b5abbe202948920711b31 SHA512 90f87cb081ada2babc72b0048b6703beb1c35a3206aa174922b0a4b3b81466d4bbaf96898cd43c778fba62c4e78bde4517317cfe215faa42c77c579b395dcb27
-EBUILD mksh-52c.ebuild 1085 BLAKE2B cffad7a2f7e305c8e61364dc8c71ce57d255925298671bff3a4f5639ce20f53e0f30c0f632195e365bfca55f7f810e927bcfaa8c47ff5a3724862d655bc954a7 SHA512 b24cc00634ed94becd73b64a8ed60e2c39d9fa1c6ab2227ac4c82d1acfd892d3c76bd874b53c5599b6693e55ce713b7364dc1d3e0565d69f7a89a247edc60c95
 EBUILD mksh-56c.ebuild 992 BLAKE2B 1ecbe94f3d96371818512d89b3f077402118058f382f1e3dfd9f57826eb783256bc193b4697272626cce52ccb8fe29a479646107750e1db94859b95b7bb7c524 SHA512 1f17fcf0f5cae5de4128feded4c1c92c9d75b3c507deb7e265058251c225bbb852c9ad305ac5bac0f4fb8739eb38c325e0f85c33dc1fa10fe6ede6e4a71a41b6
 EBUILD mksh-9999.ebuild 1244 BLAKE2B b0ea3d58199d7c3f4ee45140c166bdd1fa535d41228e6690415cde5d2675e89282bdb8ab910a8991d585d76d3f75ce44ce11d5e69a35ab05521499b28e446353 SHA512 636cf54fe70436f74837d1e41fbfcf82dfd2c199a8b6a7fb85b72bf83b32373238b711fdb21fbcf57aab227460337a71a16055f264c76c2beea86cf8587581d5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-shells/mksh/mksh-52.ebuild b/app-shells/mksh/mksh-52.ebuild
deleted file mode 100644
index a68670f3d6d1..000000000000
--- a/app-shells/mksh/mksh-52.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 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\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || 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/mksh/mksh-52c.ebuild b/app-shells/mksh/mksh-52c.ebuild
deleted file mode 100644
index fd3888862257..000000000000
--- a/app-shells/mksh/mksh-52c.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 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\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || 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 c539fb62c85e..2a10b19ed13c 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,8 +1,12 @@
 AUX prompt_gentoo_setup-1 820 BLAKE2B 26fc3348f16459462dddfd3f6864a3ae58bbcbbce0e85c04d653bed9c1f1c28a07621fffd22819d62050cf019f3d6d4c127088055bc69a0cc0cb990e8435f2be SHA512 262ad91d7536c11c3b1db176217e9a9bf21df5d25d72ddfc7dece6eafceb74a252212939c8cbe5bee1ccc0e25fc4e6e906660877747f5224e862d4d22d1200a0
 AUX zprofile-4 1297 BLAKE2B 2e4252a7ecbfe8a193bc916f0a5a3337e2de33856fa974e78479a30df6cc29bc86d75d5dca67cb0970642348e32a70e38ffcc55222ea64061aa7bdd08194c61a SHA512 f610937e8fccc88d0ea09e8ffddd365ee3015f04b50f56c2e4f20648e77784e80e4efc2969768b5ed41640acf290ea319306cf57a52aabc3b6917543ff94fd5e
 AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd
+AUX zsh-5.7-fix_infinite_recursion.patch 1102 BLAKE2B b5bcf1cec800e83726479be36525870329e6543220e58b72c9a9ed89d9c28f459fc5fedea2986a8e6b89bbeeb303e4d9a1e00e3ab2a3602e9c09389d745a9a16 SHA512 f72285f2ddedf1da44f419c13b54dca2a1845027ff36a4b00ea58aadf3e19986aed3568325afbc4ff7b7e92820875ac75263287dce73c2ba1d16409d5def0353
 DIST zsh-5.6.2-doc.tar.xz 3198932 BLAKE2B 7e701bb12e0114b7d9847caad1146fa3d538f8f6d859a765037660fb18341f1c79002811a42ec795e41eb2bbe899e12d4bcd055ea5c66e7b73bd488bdf8bbb55 SHA512 5102314e2857b032c6e6b4b715c261970b2f0c28663aff99fb87f7bb6c3971f88f8e8892ed349793570beae3fb68ff7923c82e99a3c1bb485e4639f01caaad4a
 DIST zsh-5.6.2.tar.xz 3077368 BLAKE2B 8c6ce22436f9f51eff809c779efad02f4a0730b4431630ab305abc9f1ef722698f7c565d0aa421b0d94c21f2c830f9d529709fd62a4205be1a20acf0f94a845a SHA512 f0a49e41b55eb478692ab5471d7c9828956b7e96bc82944202b0ef1c49a889b21a0e7682aa5f59fd0054ebfd866c2244c8a622e7aa46c13038af5c226c48a3a2
+DIST zsh-5.7-doc.tar.xz 3062428 BLAKE2B 1ee818fd3625c3c96add6fb8f0ccb42dd05eeb33b4f4513e4e436974f835465fdb9dd4092c652bcda24762bc39307946e14c4969e03038ae43f77c24871a5449 SHA512 4b5f256ed39c0594daf2fdb2f995c60944c70556438b986fcf6f4e40dbfdc58e70eb65691c841d5dbb973a20b30255abe55ed140482b7afd446e1911c4efd395
+DIST zsh-5.7.tar.xz 3124708 BLAKE2B 6b3822d3bb647aaf1072b9d499dbe9a65dc6cec0b83fb7fb09050e26bcc71fc0fb2846a1b754f9f206b602632add39e52465c1092f131f9000a149dbd2b469de SHA512 cfef5604d6ff30aeb081ed2a2660c861027c0a90169231cdb6b19093ffa6d63946be7b1fde527769e60e5b14bb6853b590bf4a207b63d6ec66fffd30d9a94958
 EBUILD zsh-5.6.2.ebuild 5849 BLAKE2B 4e665d07154f52a0cd12ed3eb5b3b7facf5dc802f2fbb8faeb77b33c897c9aaf05f843f3670b09b92ede76a1d34b0f4c30469b1e07a176cbb9cfafd9e8340bbc SHA512 0552a4a7dd72536eaf8371cbfc5a2c7e479c93e3632bede86803b7073cf31f293f77668e19b3101957cdb2ce91f10ac7b955b36c61b6ce77c4fabff3ead4f0d0
-EBUILD zsh-9999.ebuild 5862 BLAKE2B 8a4e5cb785e200bd3f60aba78cc74a69e05345e26a82c88e36a734542ebeb81b425af6d98da77514cac667e93acc2e00c5beeac208777890371c108a311dd229 SHA512 2d55595c2a9184ee6fe478e21f2e999fbe286bc9c208830de718cb41757e024f759a7697301e78a2d42784ee917c9944c6aac0c5aa82f82e22ca01a395f86739
+EBUILD zsh-5.7-r1.ebuild 6009 BLAKE2B 5bf15af8a761a17510505bf53bef50ed23a115194db4e22e30440aad51a83841a08da5e00bc146efa56b92872f4f557821f3501a0a40e32bdcfc70d709e784f5 SHA512 1eec250682c62a4fad3fc52d1d5ac28281cbd7b284a52120d42f921ff62d4607b87f396a920bcb0014e867a03195366fb1fa792fc5441d8b781bd3b90ff7bc72
+EBUILD zsh-9999.ebuild 5947 BLAKE2B e3e0d42d2e80a8329ad215408a5c2e8a6b16451e030b4ec57255d1911ca4fd20bf91f80a922798947b8e3d1218195bda77dd104158af20fa821c08e55537f219 SHA512 041f7afc610f666384665fa3da6ad27de66d3a3353a6fd5b7192032a24ffe0e042c06903b3d12be157e2c0176857b5169cb4cf21b2aa2a302d9bbe2cb2e1baad
 MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch b/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch
new file mode 100644
index 000000000000..042b948b23d7
--- /dev/null
+++ b/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch
@@ -0,0 +1,35 @@
+From b70919e0d9dadc93893e9d18bc3ef13b88756ecf Mon Sep 17 00:00:00 2001
+From: dana <dana@dana.is>
+Date: Sun, 27 Jan 2019 00:26:31 -0600
+Subject: [PATCH] 44020: VCS_INFO_detect_p4: Fix infinite recursion
+
+---
+ ChangeLog                                      | 5 +++++
+ Functions/VCS_Info/Backends/VCS_INFO_detect_p4 | 1 -
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 81668ccc9..be243c1b8 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2018-01-27  dana  <dana@dana.is>
++
++	* 44020: Functions/VCS_Info/Backends/VCS_INFO_detect_p4: Fix
++	infinite recursion
++
+ 2018-01-24  dana  <dana@dana.is>
+ 
+ 	* unposted: Config/version.mk: Post-release version bump
+diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
+index d171c68ee..5ec21da9f 100644
+--- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
++++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
+@@ -44,7 +44,6 @@ VCS_INFO_p4_get_server() {
+ }
+ 
+ 
+-(( ${+functions[VCS_INFO_detect_p4]} )) ||
+ VCS_INFO_detect_p4() {
+   local serverport p4where
+ 
diff --git a/app-shells/zsh/zsh-5.7-r1.ebuild b/app-shells/zsh/zsh-5.7-r1.ebuild
new file mode 100644
index 000000000000..113f397ad17a
--- /dev/null
+++ b/app-shells/zsh/zsh-5.7-r1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
+		https://www.zsh.org/pub/old/${P}.tar.xz
+		mirror://sourceforge/${PN}/${P}.tar.xz
+		doc? (
+			https://www.zsh.org/pub/${P}-doc.tar.xz
+			mirror://sourceforge/${PN}/${P}-doc.tar.xz
+		)"
+fi
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="https://www.zsh.org/"
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1:0=
+	static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+	caps? ( sys-libs/libcap )
+	pcre? (
+		>=dev-libs/libpcre-3.9
+		static? ( >=dev-libs/libpcre-3.9[static-libs] )
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	!<sys-apps/baselayout-2.4.1
+"
+DEPEND="sys-apps/groff
+	${RDEPEND}"
+PDEPEND="
+	examples? ( app-doc/zsh-lovers )
+"
+if [[ ${PV} == 9999* ]] ; then
+	DEPEND+=" app-text/yodl
+		doc? (
+			sys-apps/texinfo
+			app-text/texi2html
+			virtual/latex-base
+		)"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_infinite_recursion.patch
+)
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# fix zshall problem with soelim
+		ln -s Doc man1 || die
+		mv Doc/zshall.1 Doc/zshall.1.soelim || die
+		soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
+
+		# add openrc specific options for init.d completion
+		eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
+	fi
+
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-etcdir="${EPREFIX}"/etc/zsh
+		--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
+		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
+		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
+		--enable-function-subdirs
+		--with-tcsetpgrp
+		$(use_enable maildir maildir-support)
+		$(use_enable pcre)
+		$(use_enable caps cap)
+		$(use_enable unicode multibyte)
+		$(use_enable gdbm)
+	)
+
+	if use static ; then
+		myconf+=( --disable-dynamic )
+		append-ldflags -static
+	fi
+	if use debug ; then
+		myconf+=(
+			--enable-zsh-debug
+			--enable-zsh-mem-debug
+			--enable-zsh-mem-warning
+			--enable-zsh-secure-free
+			--enable-zsh-hash-debug
+		)
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=( --enable-libs=-liconv )
+		append-ldflags -Wl,-x
+	fi
+
+	econf "${myconf[@]}"
+
+	if use static ; then
+		# compile all modules statically, see Bug #27392
+		# removed cap and curses because linking failes
+		sed -e "s,link=no,link=static,g" \
+			-e "/^name=zsh\/cap/s,link=static,link=no," \
+			-e "/^name=zsh\/curses/s,link=static,link=no," \
+			-i "${S}"/config.modules || die
+		if ! use gdbm ; then
+			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
+				"${S}"/config.modules || die
+		fi
+	fi
+}
+
+src_compile() {
+	default
+
+	if [[ ${PV} == 9999* ]] && use doc ; then
+		emake -C Doc everything
+	fi
+}
+
+src_test() {
+	addpredict /dev/ptmx
+	local i
+	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+		rm "${S}"/Test/${i} || die
+	done
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install $(usex doc "install.info" "")
+
+	insinto /etc/zsh
+	export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
+	newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
+
+	local i
+
+	# install miscellaneous scripts (bug #54520)
+	sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
+		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
+		-i {Util,Misc}/* || die
+	for i in Util Misc ; do
+		insinto /usr/share/zsh/${PV%_*}/${i}
+		doins ${i}/*
+	done
+
+	# install header files (bug #538684)
+	insinto /usr/include/zsh
+	doins config.h Src/*.epro
+	for i in Src/{zsh.mdh,*.h} ; do
+		sed -e 's@\.\./config\.h@config.h@' \
+			-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
+			-i "${i}"
+		doins "${i}"
+	done
+
+	dodoc ChangeLog* META-FAQ NEWS README config.modules
+
+	if use doc ; then
+		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+		docinto html
+		dodoc Doc/*.html
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf}
+		popd >/dev/null
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you want to enable Portage completions and Gentoo prompt,"
+		elog "emerge app-shells/gentoo-zsh-completions and add"
+		elog "	autoload -U compinit promptinit"
+		elog "	compinit"
+		elog "	promptinit; prompt gentoo"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Also, if you want to enable cache for the completions, add"
+		elog "	zstyle ':completion::complete:*' use-cache 1"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Note that a system zprofile startup file is installed. This will override"
+		elog "PATH and possibly other variables that a user may set in ~/.zshenv."
+		elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
+		elog "or other user startup files that are sourced after the system zprofile."
+		echo
+		elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
+		elog "one method is to use a separate path-setting file that is conditionally sourced"
+		elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
+		elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
+		echo
+		elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
+		echo
+	fi
+}
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index 6b7bbf5c1e4a..7455f1937729 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,11 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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="https://www.zsh.org/pub/${P}.tar.xz
 		https://www.zsh.org/pub/old/${P}.tar.xz
-		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
+		mirror://sourceforge/${PN}/${P}.tar.xz
+		doc? (
+			https://www.zsh.org/pub/${P}-doc.tar.xz
+			mirror://sourceforge/${PN}/${P}-doc.tar.xz
+		)"
 fi
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"
@@ -58,7 +62,7 @@ src_prepare() {
 		eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
 	fi
 
-	eapply_user
+	default
 
 	if [[ ${PV} == 9999* ]] ; then
 		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die