gentoo (leap year) resync : 29.02.2020

26 files changed, 102 insertions, 294 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 093a84f044e5..8a3def0eff60 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 a6c1a3924de7..fb2da841cd33 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.10.tar.xz 310764 BLAKE2B b6b96f049b44eb455805916bbbeb0c9578104aa4c8c736801fd27c7268e4de70424eebbb5d1e4d1841273b1c4e169da4f369f2f65276349ead4aa7944aa193b2 SHA512 d434e0e48b25328e8c6b43ed64e58f56459186434754ee972795edd031ce1864038b53926b218fe06e5b3882682db4dec5101b3124362c0137101d3fa6d87cd7
 DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
-EBUILD bash-completion-2.10.ebuild 4705 BLAKE2B d5248984f9f524ed77e3561272577a5b5777ceb73ca01ea4ba84c70f930cf76783fcd0ed76b5070eef84ebf240a8c82bbe405b85d8b1da179158b3017533f591 SHA512 d99b155ffb89e8e81e3d329f2d06a138a84cf96f16f88a07b9af277cdb201812d77ebf94459cded10f44020d7e539196a87b42e567e4e77c1d0c156c006e7dde
+EBUILD bash-completion-2.10.ebuild 4698 BLAKE2B 69c4c1682b5f0114965c8909678465760f5bd6e3971b049b9fc7c6a0870d451470ef0135b00cdbb7e21439bddc1204545c6b22d542f92a4ecf08d9454aeffbe1 SHA512 8d0d0a8d1681237f22a5890e8d6d6851ef781940b6fc06934e4179ec20bb7ba0a5da4c54b308aa1ef8154af93f2fcb5b844215e133f707f0e42100495571ac71
 EBUILD bash-completion-2.9-r1.ebuild 4774 BLAKE2B 9bb5a015182ff6e6b96c078f4d2c884f568a6d68a3c88be901db9d5fd4cc0ed02e08af3b007af112c3dbed6073231d57663a0ee25238875a04df66cd17b380ac SHA512 739563c3ebfef2b455b25cd3cfaac7cedb43c9872cfdb47afe93591b59052a7dc073b87f4ea2b719e22c4e0ce78c151e2930cdc7430700b793d7e3c472ba8409
 EBUILD bash-completion-9999.ebuild 4702 BLAKE2B 1f8284b4cd7f93912eccdc0e90a6ff65939bc1df16d2701783bd1f00afe49c60701819438dd95548ca4654ef83713a6a644cecfaf1d642d537882e0eb147ec76 SHA512 46cb8472ea55fd468eca090474a1488389427265f9eb1d20a2b20011c5f6af19bd0f89b1c507667edc52f406b004215bb8f1c0ef2f7fa7dbd6b5949aa2978434
 MISC metadata.xml 1498 BLAKE2B ebfc4f05a48320d502076d9756cce9f0daf1a0c601ec491cdfb89538627f62c0613dd9e4db53c4791e094d6652e3c9a508003de3fa4f62a84396844c324325ef SHA512 6a83c672f45e7171d5b9959ac59c4e28bacb8ffdefa965288776603673396225b3bb01c149432edb3f901f04eaa39064bc8d813a35ce1e573231fd4b4570c62d
diff --git a/app-shells/bash-completion/bash-completion-2.10.ebuild b/app-shells/bash-completion/bash-completion-2.10.ebuild
index 888d95a724f1..b7f92eb8702c 100644
--- a/app-shells/bash-completion/bash-completion-2.10.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.10.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/bash/Manifest b/app-shells/bash/Manifest
index ec0c2e5715b1..730a9ef1fe83 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -399,7 +399,7 @@ EBUILD bash-4.0_p44.ebuild 4396 BLAKE2B e3aff1b822053a1abb9c4a4ced40b3981a181f83
 EBUILD bash-4.1_p17.ebuild 4130 BLAKE2B 24e3fd94c8a75411f1214bdfad25eced1298d290bc76d092df2920d835a53a2dffe6b8bd9bf449de5829008ac8cbf3df40c837a152391f41e10328a440db1bc3 SHA512 1b7d7ba71a15801510295c0e612f1405d06351c855ac8e1e3bfa0324d5fc37df03f507b634f2ddf2c515c766d00af9ba840e69e18381aab28f2436be2be1f59a
 EBUILD bash-4.2_p53.ebuild 4320 BLAKE2B 24c89e3c331c5b4f0e7f0dcf4ac069717e2dfdcee32bcee94d086a272210c1f1206455b8901a1f9fcffc336a56b924e0c6b4e3ffdf4f895aacbee283e2938985 SHA512 66a03cc64cfde2e72905605d9312c6e70b65b58d960e6e15ab6888f6fcffbe0ab012c919b5f994bf58ffeb0ee76de65266894e13afa6a82debd0cd81201ba9cb
 EBUILD bash-4.3_p48-r2.ebuild 5618 BLAKE2B 8687afff77ab6a1979c90a27457ec8a9aa8551b1d886c73515e5ed71992e2f19e85089fcf0fd7f07decb9dd1ebf223817ee5ccb8b7ba3c9b3cdb9db4d366c3eb SHA512 7d3845c4df771da968a0e8797362adab344011f0756aa3ba27ae13f25d3ee02c3d946208cba7686533aa9c493af95adbaebd36b0462f8fc6284851518a24a4a1
-EBUILD bash-4.4_p23-r1.ebuild 7375 BLAKE2B 34cf8b0f87964f308f00cf95872ebb75ce7752c188db87117a0e05009bafc14ee5fa8f144d4c4fc55939c05c91edea35f2b301a2e9080f1078a1c62bca4941cd SHA512 b75ba013b86ab787a701f92541aafb5dcb663ea6dc77f40a83432c5e552c3d9f280d0033ec23f02731cd4aaef2febc97a2250174bad652a76ad15b2720cba992
-EBUILD bash-5.0_p11.ebuild 7435 BLAKE2B 5b53775f5e973ebfbc0ef6c1a2c4a6dedcc68b27419e4a34e9b4d4d5fa1598027064e1a34741afadfaa935df6de1b3565d1bcd62ab48bd3fd72de557c2eaa492 SHA512 e6218fe2fbb2fab1879b09a70b7a0f2739ddb5b482db794150eec720acb5be48c5ccc6fad966eb6fa857e94dbae6af7fdc650be48dec9cfeaec7655fc002fc5a
-EBUILD bash-5.0_p16.ebuild 7435 BLAKE2B 5b53775f5e973ebfbc0ef6c1a2c4a6dedcc68b27419e4a34e9b4d4d5fa1598027064e1a34741afadfaa935df6de1b3565d1bcd62ab48bd3fd72de557c2eaa492 SHA512 e6218fe2fbb2fab1879b09a70b7a0f2739ddb5b482db794150eec720acb5be48c5ccc6fad966eb6fa857e94dbae6af7fdc650be48dec9cfeaec7655fc002fc5a
+EBUILD bash-4.4_p23-r1.ebuild 7308 BLAKE2B bff65714bf516b63669af0ab5d749958b2c9dff6c5c7fd760e55a991a1d8dc360d90cf29893e92fd54599a761e1e4c6e6c2f102d41e1f46a95b4d4bc7582639c SHA512 d988b2861b6592b3fa79c16548872cd2a0521e7b59df771d3f909c06367c98f003057b44c1a881ddb9ae936db8498d7fc4d08cf269ad0724387172307935b7ce
+EBUILD bash-5.0_p11.ebuild 7368 BLAKE2B 315c68138bc5740cfdef24eea0a9f404367637224d1ccd7327a651e776d69a774579662ad86516d82345be6c5da0b9be6379e9f552ba923ab6f6e72a2977670e SHA512 4824cd234275abb0d41ac9f5fe889c2da1701d48e17f3ae889f09f988938a2c08858094564a28b86656947fcf8a8db4856e67fc0fb121b5d4a054bd01cc3e5a6
+EBUILD bash-5.0_p16.ebuild 7368 BLAKE2B 315c68138bc5740cfdef24eea0a9f404367637224d1ccd7327a651e776d69a774579662ad86516d82345be6c5da0b9be6379e9f552ba923ab6f6e72a2977670e SHA512 4824cd234275abb0d41ac9f5fe889c2da1701d48e17f3ae889f09f988938a2c08858094564a28b86656947fcf8a8db4856e67fc0fb121b5d4a054bd01cc3e5a6
 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 7f7ec01858ef..867a266dbcde 100644
--- a/app-shells/bash/bash-4.4_p23-r1.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r1.ebuild
@@ -106,8 +106,6 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--disable-profiling
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
 		--with-curses
 		$(use_enable mem-scramble)
 		$(use_enable net net-redirections)
diff --git a/app-shells/bash/bash-5.0_p11.ebuild b/app-shells/bash/bash-5.0_p11.ebuild
index 514ef9e6aaa1..bdce76098cbe 100644
--- a/app-shells/bash/bash-5.0_p11.ebuild
+++ b/app-shells/bash/bash-5.0_p11.ebuild
@@ -110,8 +110,6 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--disable-profiling
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
 		--with-curses
 		$(use_enable mem-scramble)
 		$(use_enable net net-redirections)
diff --git a/app-shells/bash/bash-5.0_p16.ebuild b/app-shells/bash/bash-5.0_p16.ebuild
index 514ef9e6aaa1..bdce76098cbe 100644
--- a/app-shells/bash/bash-5.0_p16.ebuild
+++ b/app-shells/bash/bash-5.0_p16.ebuild
@@ -110,8 +110,6 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--disable-profiling
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
 		--with-curses
 		$(use_enable mem-scramble)
 		$(use_enable net net-redirections)
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index b3c8dd59e06d..1f6c11bb0eb2 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,3 +1,3 @@
 DIST loksh-6.6.tar.gz 251931 BLAKE2B 8671b2a7b5f4d8247c8572a925a078a7bbf7e6f0ae11b9198798c66def35c5bdb5c3b39e5c37e0dcbc068a1757e6cdcb667088640c6c9a556c64a9a4c0582102 SHA512 7f5188b3f0af3167f1c5847043689a35f22d5075cee2ec4ce3ebd324a59233e89db1c864dc62a05ad036ddd541ee89c680fa82e22b85cd2c82ad32c5ebad51be
 EBUILD loksh-6.6.ebuild 655 BLAKE2B 43e662f026305b41e36c948185ddbc88e1a6c7bb0079ca88b275f61ec0cda330b0aae325b4456a1829e5018e49c208305c6b199999a588ebd09e4084736d6e1b SHA512 a4604492b6354377003a39839dc6dae4edce00c981201e6a95a0d3f0938e838a9059c25181a029b7b91b88ddeac0a6982f01bb2a550ee617c322ee8c5b2ababe
-MISC metadata.xml 446 BLAKE2B 0a875fdcc5daa79b15353c9cabae32697f435edfd153759193cfca0fd17ca3c76f649b27cc32bae132a1270c99faad5ca91475ebb6a51f0bd04eba6cd95373a0 SHA512 4e987382f9f5fab554e34afdf016fa59550f64831b8dbfeecc30029a6e0eacf42d14e22117c47bb183abf584ba549d24e3d8dac7e0101e78e2e30ef7a9020069
+MISC metadata.xml 328 BLAKE2B 74e5126dbb36b09f5711c125eec5a9be8209f5f340e3e45f342dd274548ebea9ff3859b0452e999f06cececb81e6a75434ffb32e6bbdc414483d7460fd974831 SHA512 f7118cf845948d1bae282c8cecfe861802163b20ddc0ad1f7c427211dc0333471bf6e18fc807837359247fb021749c7b2b910b6233e55b389551e09429fc7b58
diff --git a/app-shells/loksh/metadata.xml b/app-shells/loksh/metadata.xml
index 8f520c48ee8d..f3587d6da381 100644
--- a/app-shells/loksh/metadata.xml
+++ b/app-shells/loksh/metadata.xml
@@ -5,9 +5,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>	
-	<longdescription lang="en">
-		Small, interactive shell targeted at resource-constrained systems.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">dimkr/loksh</remote-id>
 	</upstream>
diff --git a/app-shells/mpibash/Manifest b/app-shells/mpibash/Manifest
index e18e37b2caca..2e6304de1823 100644
--- a/app-shells/mpibash/Manifest
+++ b/app-shells/mpibash/Manifest
@@ -1,6 +1,5 @@
-DIST mpibash-1.2.tar.gz 347083 BLAKE2B 75b79d8e1f418de8220ff502245bc094774984f4760d922297a2ad2fcdb7d87a4a5d28015fd2686fbc68939ac532551046f8a987166accaa8b96025cce9fc79e SHA512 db755dd2c6212a8d7dfd6cbff17d5dffcbc3b6a0286abdad4d2e21790453d2356e88c566abe4648da138d6964098fad581b8fd5beae1335f5787de92f4659104
+AUX mpi-3.patch 806 BLAKE2B 4a5f6db66474f1df8edb63390ffebc8d1648cd77d56f494d1951559df6d060edf53e0ef4223764b55b0ecde7d61961d8903b21892f35dd679101b39f25517491 SHA512 ad60f6b22f29cf389123aafde2778bfcf5b6690463d99ee5689adb17a4af4037c8e4722a0b8d9c66a97ee8c19268be9439968ef8aa9067158bcc7bfb14eaecb1
 DIST mpibash-1.3.tar.gz 369803 BLAKE2B b1959deaa2d5b3bce1a66e5ef0ff41ad156093aec9cc1efcd12873b6d5814ad1586ff951d6fd7f37dab6a55040378774b435edc4e2c8892952480539864f91fa SHA512 4728565239aae80013322231a928fd1e9a59484614a92cf7e314d0cd5c090d3a47de395507ce52f71a6900245855089d659c6509f8c4df3bfd88e46fc2187749
-EBUILD mpibash-1.2.ebuild 1018 BLAKE2B 97e15e59ee643cbd1aee1f23bd6920add75e4cf29132df2aecbca07f000ffae35c04d2fa6f8d1b1ddbc3ebeb4f3b6e45db941cc6c1897a0787fbcc41d8a1f404 SHA512 ed96bc0db5a157c7c6698398ad49f310a1569a908530ee25ec434557be6e28fd2427e574e1559f73a88622428549bdd72a524457c21bd621702207883f376dc2
-EBUILD mpibash-1.3.ebuild 984 BLAKE2B 0d584b8c22c26c47a714582e7afa1a33a1b43a71121f5e9410046b5b484f9ade04b465fd6842e8deb647a1a20ccea3549c1e2f77efd7ff9cc083ff9de192759f SHA512 07f27042d47c45352d90d849d034c1ae6c850db03c36af8077d69b78315d81cc1755d0892aba55eafc9fa71c8b3964c9d9c683c5702903523395fad02c906abc
-EBUILD mpibash-9999.ebuild 984 BLAKE2B 0d584b8c22c26c47a714582e7afa1a33a1b43a71121f5e9410046b5b484f9ade04b465fd6842e8deb647a1a20ccea3549c1e2f77efd7ff9cc083ff9de192759f SHA512 07f27042d47c45352d90d849d034c1ae6c850db03c36af8077d69b78315d81cc1755d0892aba55eafc9fa71c8b3964c9d9c683c5702903523395fad02c906abc
+EBUILD mpibash-1.3-r1.ebuild 1022 BLAKE2B 35d66033ca0b935726ec14a83a675d36005f06a39c2ceacabc4453e9f1af503633b70e0da8578725d480024ced9390c6be7d913a24b57ce76a4f50769353a195 SHA512 fb159713a7dc10df82bdc91faf01f073543b5c9e63d242609ef9346d7c560bdaff9f568e4958ec69aa7b613335c35c56bfed7622d760190c7e7ed6d59fdefd0f
+EBUILD mpibash-9999.ebuild 983 BLAKE2B e7f061a7dfbf7165be9cf27fce717ea682519591ffcbc41c98cc9542305a1dabbe2ff7053fff7f244ead99cac095ba09d1a7732a29fdad14e1777143b20ac89e SHA512 7967bb9d2651ca505ce7760f549d13556a53a51ede1ac5e17b281a8ee5604eb46642dd7fae46398490cdfe99c4f6378e287517357224aec90f0ce0b7cdc8583b
 MISC metadata.xml 461 BLAKE2B 6bc032dcf773dc99625ddc538fff75f78d47d301645c1e5f2a6a6d037260519cad4c76aa4b1f6ff4fd4b90552a73307505008e4ae2a825685eb60c53d5f7027c SHA512 c859d865a24aa9ba99b293ce2ef438ae6060860faed308d358c173d83f3a17017a51f509e80e1e63347781fae2db0bcd7e4a03e8c16561d0f09210ccbdde0c64
diff --git a/app-shells/mpibash/files/mpi-3.patch b/app-shells/mpibash/files/mpi-3.patch
new file mode 100644
index 000000000000..7b7e1ec820de
--- /dev/null
+++ b/app-shells/mpibash/files/mpi-3.patch
@@ -0,0 +1,24 @@
+From 0b396b62ac314ae509ac3ca5fa9d5119e862be51 Mon Sep 17 00:00:00 2001
+From: Scott Pakin <pakin@lanl.gov>
+Date: Wed, 19 Feb 2020 13:43:40 -0700
+Subject: [PATCH] Replace deprecated MPI_Errhandler_set with newer
+ MPI_Comm_set_errhandler
+
+Resolves #17.
+---
+ src/init.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/init.c b/src/init.c
+index cd070a7..46b1127 100644
+--- a/src/init.c
++++ b/src/init.c
+@@ -77,7 +77,7 @@ mpi_init_builtin (WORD_LIST *list)
+ 
+   /* Make MPI errors return instead of crash.  Also, store our rank
+    * and number of ranks. */
+-  MPI_Errhandler_set (MPI_COMM_WORLD, MPI_ERRORS_RETURN);
++  MPI_Comm_set_errhandler (MPI_COMM_WORLD, MPI_ERRORS_RETURN);
+   MPI_Comm_rank (MPI_COMM_WORLD, &mpibash_rank);
+   MPI_Comm_size (MPI_COMM_WORLD, &mpibash_num_ranks);
+ 
diff --git a/app-shells/mpibash/mpibash-1.2.ebuild b/app-shells/mpibash/mpibash-1.2.ebuild
deleted file mode 100644
index 594ac6bc88cb..000000000000
--- a/app-shells/mpibash/mpibash-1.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/lanl/MPI-Bash.git"
-	inherit git-r3
-	KEYWORDS=""
-	AUTOTOOLS_AUTORECONF=1
-else
-	SRC_URI="https://github.com/lanl/MPI-Bash/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Parallel scripting right from the Bourne-Again Shell (Bash)"
-HOMEPAGE="https://github.com/lanl/MPI-Bash"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="examples"
-
-DEPEND="virtual/mpi
-	>=app-shells/bash-4.2[plugins]
-	sys-cluster/libcircle"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		--with-bashdir="${EPREFIX}"/usr/include/bash-plugins
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	sed -i '/^export LD_LIBRARY_PATH/d' "${ED}/usr/bin/${PN}" || die
-	use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die
-}
diff --git a/app-shells/mpibash/mpibash-1.3.ebuild b/app-shells/mpibash/mpibash-1.3-r1.ebuild
index 76bbce43cda2..fcb33db81ee9 100644
--- a/app-shells/mpibash/mpibash-1.3.ebuild
+++ b/app-shells/mpibash/mpibash-1.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools multilib
 
@@ -22,10 +22,12 @@ SLOT="0"
 IUSE="examples"
 
 DEPEND="virtual/mpi
-	>=app-shells/bash-4.2[plugins]
+	>=app-shells/bash-4.2:0[plugins]
 	sys-cluster/libcircle"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/mpi-3.patch" )
+
 src_prepare() {
 	default
 	[[ ${PV} != 9999 ]] || eautoreconf
diff --git a/app-shells/mpibash/mpibash-9999.ebuild b/app-shells/mpibash/mpibash-9999.ebuild
index 76bbce43cda2..5832bd90df0a 100644
--- a/app-shells/mpibash/mpibash-9999.ebuild
+++ b/app-shells/mpibash/mpibash-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools multilib
 
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="examples"
 
 DEPEND="virtual/mpi
-	>=app-shells/bash-4.2[plugins]
+	>=app-shells/bash-4.2:0[plugins]
 	sys-cluster/libcircle"
 RDEPEND="${DEPEND}"
 
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index 845705d0dff7..5967f98388ac 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 664 BLAKE2B 86a1be1bfd9535eb253032fae259f51b5da8ec311d08410d807fc9084097c64a350ca33fc3cd105a07e021f0a23ac6c1916311189f268b22de3474b851919fd6 SHA512 1403476d13395d0480c250c8b82d6e462faa3dd2827b7c43af8382987f0e51fc6d41bbbd5c742dd8f263d30460d7e7ecaf138f708231daab3716dd705810e015
+EBUILD push-2.0-r1.ebuild 643 BLAKE2B d980af27d4f14e230a3645ab3a17e7536cfcb4c24d83873c30a59657a50db8962c1ae46712da6e18b0432b766ac3f845ab905cb91236359897b5f0d8cd32cb7a SHA512 e2c0799acb240a053d0162b68758fbdf7f8e9652725c470ad651fd3f4024e6ecfbad0db8b7598a665726656d5d932a6163dda7ed5c7bba231ff7b8540a510131
 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 d1657efa64f1..02beb3e3b74c 100644
--- a/app-shells/push/push-2.0-r1.ebuild
+++ b/app-shells/push/push-2.0-r1.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit vcs-snapshot
 
 DESCRIPTION="A POSIX shell function to treat a variable like an array, quoting args"
 HOMEPAGE="https://github.com/vaeth/push/"
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index 607f4d9b35bd..626317289b81 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 775 BLAKE2B c3d6afa1c114e2d37a57f8215f9a8d37a08b2bd6c134b25cd95cbc7e0a5536e6d8da8a06e233c58c77bd989e3e54a0e180824db27369277f1b0ce6eeb5373abd SHA512 64ff813813e571009ef4a4a614a3669b30961a6de33e3a6ac9a7b63fa3b3546e36b77eb3240b37c34d3602cfb6d39ba6df1ab26c6e3bab2022997996b426290e
+EBUILD quoter-3.0_p2-r1.ebuild 762 BLAKE2B f6cf95639dc28e39d85de64ac30876f099591ee8bbc69263299c700c65b926658d0d64e76c79aae5bf389f60bd97d3d85a728534c7b2959ba34a2663d8ab8cc3 SHA512 5e750aff67ad8231be5914f0cb4c3daae2da5cb7f8f376173d54216b48a56b8d20ddf54da1aab390a177300fad84aabf8d41eed2b7e2ec48bc4255e0bc5f4fe0
 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 944f18a4fc0e..4c8b9a03f92c 100644
--- a/app-shells/quoter/quoter-3.0_p2-r1.ebuild
+++ b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs vcs-snapshot
+inherit toolchain-funcs
 
 DESCRIPTION="Quote arguments or standard input for usage in POSIX shell by eval"
 HOMEPAGE="https://github.com/vaeth/quoter/"
diff --git a/app-shells/rc/Manifest b/app-shells/rc/Manifest
index f0cfdf1a6a2c..4e52c7007df4 100644
--- a/app-shells/rc/Manifest
+++ b/app-shells/rc/Manifest
@@ -1,3 +1,3 @@
 DIST rc-1.7.4.tar.gz 215206 BLAKE2B df01f618cd4d3c5bbf155768ada49c20fe7916e2b999ae13d08487b00c4565c3c4d1d45d16dddef70fe58cf7c405d293832b31dc8a66d8b36b2503675b260db1 SHA512 49e124207b5370b88b8fba0376dda33451451a58bfb85fabfc06ae59eb88fedf38d7aeaaf292e4f380e2c00efc8301ba68d12180923186d1c53ef94f78f7e435
-EBUILD rc-1.7.4-r1.ebuild 931 BLAKE2B 68829f9ee2219282bfb380ded88f23dbfea27a78a8d78f7a150172df26deedb28878324bff39ec04b9d87c31d64310f8b32ef5d217903a72dae79ab44b3209eb SHA512 74abce16dd79d884cc7067585b5295b16704edfe1695caaecd6c8389bea8821465533e71f0da2219417ae4b81f9798ed94542483baa12fca57b81b915a699ba0
+EBUILD rc-1.7.4-r1.ebuild 890 BLAKE2B 10ade84c2dd5f77a63450c4ab9be6d30344162ac32a45e97cfc84403d774d88442768b2df2af138249f7c6f25d2724b36b41e145d376fc5be973cf11f7eb716a SHA512 9b915a58614610f4326d8359772f7f536349e6844a823976b8256affbdbb4f3cc61f0d28d7a14319a1cff2c5ffebbe4fe6e08e02ddfddc0b60a5b98ac35b116b
 MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/app-shells/rc/rc-1.7.4-r1.ebuild b/app-shells/rc/rc-1.7.4-r1.ebuild
index 9e73cae38eae..473941979124 100644
--- a/app-shells/rc/rc-1.7.4-r1.ebuild
+++ b/app-shells/rc/rc-1.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,9 +23,7 @@ src_configure() {
 	use readline && myconf="--with-edit=readline"
 	use libedit && myconf="--with-edit=edit"
 
-	econf \
-		--disable-dependency-tracking \
-		"${myconf}"
+	econf "${myconf}"
 }
 
 src_install() {
diff --git a/app-shells/zsh-syntax-highlighting/Manifest b/app-shells/zsh-syntax-highlighting/Manifest
index afd63a49bc94..28cf466607a8 100644
--- a/app-shells/zsh-syntax-highlighting/Manifest
+++ b/app-shells/zsh-syntax-highlighting/Manifest
@@ -1,3 +1,5 @@
 DIST zsh-syntax-highlighting-0.7.0_beta1.tar.gz 130063 BLAKE2B cf0f6319af22b47cb8a280de682a69b0479dc59033be5ce84840507b77dd2df0441b8d260af55bccb303c87d7f5a7e4cc6db9f46860aee040b4b8115c76f5e07 SHA512 1692015aad58103c752e2dd4161ea87f26aaa09d34eb2faec1f651fea1d9bfad29226455468017160a5393a87c1f7ed0514b09b0802b1810377beef72bfa6c87
-EBUILD zsh-syntax-highlighting-0.7.0_beta1.ebuild 1001 BLAKE2B c57f7c1481dfddccf9757faf2956563382bd43b32faceb7edaa47feb228c331064a664c4177e9cfac0066cbecef42b5b43ffc7fd9bdd7bb9d0ad4a30e4c1462b SHA512 37a1966be8434416fbd1a3a992a0cc3b0dc1a49293763b63a9f009060372208275f44c70304ecf707f002248bb5a41541680089a782a92f86506111074a9aace
+DIST zsh-syntax-highlighting-0.7.1.tar.gz 133554 BLAKE2B cd55a0ad69670b25edc4bfa78ad76d1e2ef501deeca3e93adbef0aca305896722b4906d7717be3ad61bc0cf6b6496e217626406e5ff4168ece4b75bffd94bbf0 SHA512 e7e86b88cdac9b9ed5f973823ba8efff99dd720b9ed929f765f9f9266b9d6e147274f5957ceb630d51a660e396fc22e97f10cfbc5cdde941b907f3773bb1ea2b
+EBUILD zsh-syntax-highlighting-0.7.0_beta1.ebuild 999 BLAKE2B 5912b92c1b31242b364cea1fcb91b11aafa8753be046ceb2291bb10735f35a63470f6bc49b920375db3528b696c6a8cdd6bc5450bfb44615d0ad797034537d4c SHA512 fd1b4b6083ee119afd5104a91995e4227e393bd399989751e996435994d42299194ebbcac500bae6dfe13c6ca4c3f36586c4b2dc1361e16c402f722c7a123a55
+EBUILD zsh-syntax-highlighting-0.7.1.ebuild 1001 BLAKE2B c57f7c1481dfddccf9757faf2956563382bd43b32faceb7edaa47feb228c331064a664c4177e9cfac0066cbecef42b5b43ffc7fd9bdd7bb9d0ad4a30e4c1462b SHA512 37a1966be8434416fbd1a3a992a0cc3b0dc1a49293763b63a9f009060372208275f44c70304ecf707f002248bb5a41541680089a782a92f86506111074a9aace
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.0_beta1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.0_beta1.ebuild
index 8ca8ffb2e2b8..0ba4e019c3f3 100644
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.0_beta1.ebuild
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.0_beta1.ebuild
@@ -11,7 +11,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_PV=$(ver_rs 3 -)
 	SRC_URI="https://github.com/zsh-users/zsh-syntax-highlighting/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.1.ebuild
new file mode 100644
index 000000000000..8ca8ffb2e2b8
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+if [[ -z ${PV%%*9999} ]]; then
+	EGIT_REPO_URI="https://github.com/zsh-users/${PN}.git"
+	inherit git-r3
+else
+	MY_PV=$(ver_rs 3 -)
+	SRC_URI="https://github.com/zsh-users/zsh-syntax-highlighting/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+DESCRIPTION="Fish shell like syntax highlighting for zsh"
+HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="app-shells/zsh"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
+. /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh
+at the end of your ~/.zshrc"
+
+src_prepare() {
+	sed -i -e 's/COPYING.md//' Makefile || die
+	default
+}
+
+src_install() {
+	emake \
+		SHARE_DIR="${ED}/usr/share/zsh/site-functions" \
+		DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		install
+	readme.gentoo_create_doc
+}
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index e166e5744f21..d7b4e0154b83 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -2,12 +2,11 @@ AUX prompt_gentoo_setup-1 820 BLAKE2B 26fc3348f16459462dddfd3f6864a3ae58bbcbbce0
 AUX zprofile-4 1273 BLAKE2B df8730eceb621ffe6b38a9185e1ca0a46d6ac2cc5e28e3e9888a2f26f4a6adedc6adfd39744b20aa450a613284b9670dffe02038f40f78edff22e951e209dbf5 SHA512 fbe89782f757bf351a60f691e40d70786324b8b8eea90ca5e788ae349fa5642daa24969e303af6029b8d38d0b5505ba422523081b91ae7b71fec388624ad48d0
 AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd
 AUX zsh-5.7.1-ncurses_colors.patch 1379 BLAKE2B dafadc92d84237182f44accfe0ff4e76f664d5a203af4b4f160ef86751e582cd6475f25666b252296c0d579b055e35721866872ea869726a6c934184c24c3f67 SHA512 6e8a4e41dacf9464435726e8a7db65ff02c104c6328f4acdf24963d08786051ea6845558beb102f47ab7ffc3116f572d1f6b3263a69e7673653f80bd2280d5e2
-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.1-doc.tar.xz 3062112 BLAKE2B cb67aada97d79b4b5b1116fb0737294785a2a510c2f4396cf77b671b62631e778ee9d57a32dcd257e079a9e4c35acaeeb68c0ec951b6ae8d8d8b647c05ef365c SHA512 e51bc8eb408bcb20bf8a4f0b8588f7803fdd433445efa282f598a3bec4575cba7feaad117cd2d5077f51150bf0ba41a673ffb925ade33c435db498f1d791cc8c
 DIST zsh-5.7.1.tar.xz 3126308 BLAKE2B 4f1aa2d5aea0341ba7839cf05687020889b5ca6879654a376ce838986211af4bddb7ab521a8a35cc06701f730a75a9778c633726b447f31845f5c140ec1e8d80 SHA512 a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0
-EBUILD zsh-5.6.2.ebuild 5797 BLAKE2B 964eb4646bee2ef50ab8af221aa67e61b77d034d87a58db1e57e1e1cf283b4e908955a39f1a7b04a17b360254f6a75637d8d91befb5111b4ece9f1cf7b58fb7f SHA512 85d52f571d15b6dfab51804aa2162ae450471a6c1fd18cc187117cf82324569916cf6b8b308e07601339131191d040549410784a8f38b4acad08fd2436a17cb3
+DIST zsh-5.8-doc.tar.xz 3088696 BLAKE2B f738bf15b137e84df91fff8500b6c309884d8a1777e3158807f6028a411ae3f345e6ccba49bdff04c6607c4eb06fc2913313e84e1f78be0a0f92d23e46ba87db SHA512 38cc549818eb9c6952051b714dd2008d99605aba4ca4f614e62b033c9b067dd2031fff766ac5c1efe5bb52eae32bd482dea5df2b2d46decb7ecdb458f3da9d52
+DIST zsh-5.8.tar.xz 3193284 BLAKE2B b1186dd27aede3318763d7c42253e919e60d00a018d085b2de7e8d985c872e9756a3ce112f623a088ec0878abd7a38d04dfa5ec552ef0f0a72e623191a7ba5e3 SHA512 96198ecef498b7d7945fecebbe6bf14065fa8c5d81a7662164579eba8206b79575812d292adea1864bc7487ac0818ba900e25f9ab3802449340de80417c2c533
 EBUILD zsh-5.7.1-r1.ebuild 6040 BLAKE2B 47d603e484c1ede076575eeee7ef8c2d3e06b2bdc9f3300c30aa9a726f138d23acf52c284bedf7a6a1e30b6fd312f08d4b1a48766c4316c51122559a255de1b3 SHA512 98fdb4a06741c7b250a96c6ed6690ef3033010912305ac0af680bbb3155188c9801d1de966fd3ddc6edf2da4e144b77c844a6e239f6ba035284affa79a19cf28
-EBUILD zsh-5.7.1.ebuild 5918 BLAKE2B 157c02c1885f49e39ef74ffcb4a8f3725cab0ab3bb909a163da7d4f9987e26c39d6ba63e3456a39deefd84442236498f839f5761c1dc92b53f60c10e38cff863 SHA512 dd61bccc222da83e4b4bb05fcb36aa929068698f7006f9425f90c0800763e1541acfdde472bb9e030d8246548d5ce6a6463445839823576d04df4b264063f973
+EBUILD zsh-5.8.ebuild 6049 BLAKE2B fd54fc6bf4b482854832dca43b3ee6de22100e111aa6c5ef67c9e8d3ca425a6f9ce063c2e2ea4e2a5892f921dba16da0aee79fda15818be2beee1eea509d36c4 SHA512 9d027ecde0a35d2796440528bd93034ced65239c4d1400236aa0721b303184d88610e04c8bd0ee172598aa49ddb43eae72eb6afa658cf9b509d8bf0754058c6e
 EBUILD zsh-9999.ebuild 5988 BLAKE2B 75c08411ac48ed84ff2b2f870ef8b5495cbbfa601039c328c6fff902736876d5c21f2237dbf82f345feec4b03337349bf842fa165ba9f0f31212b1c105ee8d0a SHA512 528ad315f72b5237313d6438da799cbe8288c85e2150a8cdbc7c623b70ad6238f31ae67d212a4ba5e5beb2351e384128f4780700756e30de88bc1355cb5c06e7
 MISC metadata.xml 514 BLAKE2B 63d77a851911c67bbf8bd722cd8a4766bd0ff0184c2cc6bd2629b27186ea1bdba9b15bed73cee6a261ff499a22a9ef9b8582b22b76eb3752709553bf49e92071 SHA512 bb460e1e123c3f9b7bcad9a6abfcd42ac69f9a2071d6b2dcbee968c3fe82b9bb940e28021b1d619642d99fc595f492247b1a97e6ad51133be73bbb5fd997ef0d
diff --git a/app-shells/zsh/zsh-5.6.2.ebuild b/app-shells/zsh/zsh-5.6.2.ebuild
deleted file mode 100644
index aa8fb589ad6a..000000000000
--- a/app-shells/zsh/zsh-5.6.2.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2020 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-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 )"
-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
-
-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
-
-	eapply_user
-
-	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
-		dodoc Doc/zsh.{dvi,pdf}
-		docinto html
-		dodoc Doc/*.html
-		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-5.7.1.ebuild b/app-shells/zsh/zsh-5.8.ebuild
index c9003dab0f4e..394c7e4ed886 100644
--- a/app-shells/zsh/zsh-5.7.1.ebuild
+++ b/app-shells/zsh/zsh-5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -51,6 +51,10 @@ if [[ ${PV} == 9999* ]] ; then
 		)"
 fi
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-ncurses_colors.patch"
+)
+
 src_prepare() {
 	if [[ ${PV} != 9999* ]]; then
 		# fix zshall problem with soelim
@@ -81,6 +85,7 @@ src_configure() {
 		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
 		--enable-function-subdirs
 		--with-tcsetpgrp
+		--with-term-lib="$(usex unicode 'tinfow ncursesw' 'tinfo ncurses')"
 		$(use_enable maildir maildir-support)
 		$(use_enable pcre)
 		$(use_enable caps cap)