gentoo resync : 27.03.2021

7 files changed, 10 insertions, 10 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 03bbc4fbb451..d948e92be61c 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index 8481c80e0e9d..86c774085d8c 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,6 +1,6 @@
 DIST zsh-completions-0.31.0.tar.gz 247806 BLAKE2B 1923013feab9800f2dd0eef7b2263b0e252dd35b21d865e3f42f7946eeba2d1a882179e05fd16fdf473006646896ef87ca1da5cbc9bf69b52c66bcf99e82c010 SHA512 3f707e96c5d08103359304905cd36889d2b8dae82f0ea3781048a8fbd2f1db509abc1a181dc75215552214a59ee532d207897167fdb3850a5b1cc40e13b2b108
 DIST zsh-completions-0.32.0.tar.gz 273885 BLAKE2B 73400a13543f63c45fd32d78752f0294e3eaef9a63d41700aa004e445f123673c8bd8cba7aa3c0969fee0e188ea019b3f92cae2a6de341bf9b2f0f5842792785 SHA512 f1ef5dab3343675a9d82f6df0db4f541196d1904386becc94753b69a4515229ddcc133fe491c33e4a736ea0789c667f50306e60fbe5e61b97d0b3fd4946bf69a
-EBUILD zsh-completions-0.31.0.ebuild 811 BLAKE2B a9f2789602a387e450ee62ea911423b4356fed1a3d3e31e032d7595739185d8b2bdbfb29b039fdbdf6770c1868c18262c2fd87a5b09b1a144cdff00af94bbd5e SHA512 f3a1388dc1ec14f79d1e16a3cd9dab154a4e7637f94bc3eb1b2f395ebebb8c13c95f31a34cdcccf97c491e3b7779c7986dcc7943a240495ac64d7ffd57e46812
-EBUILD zsh-completions-0.32.0.ebuild 810 BLAKE2B 69ecc2f0a92833ae988f788f5f2c39722523bfb29f2baf22500c86f0b343cac4a84d0d1c877dbe1a7549e60b6e9e12905b86a5124fe0322f90d199388a4c9a30 SHA512 b3c4cd6637f0aba3e385059394ceb9bb53703b1df221b9ccf27064768ec124084ecb64194f9aadd7312fd0cc2b9c422a9f5478442a2e40476ed349d81070516d
-EBUILD zsh-completions-9999.ebuild 812 BLAKE2B 018adb830906a95aee0971fa2ff56b0d3d0be3ea3c067154ca80d57917546d0a9e202b7620d44be0b63561a1372874dd264dcd2c4fe04d5d854af766e040f847 SHA512 406f8b5a42e9dde02754c31e0d9d5ea9c9e0a13f59bf70112b22302e82b0b999699191fc3dbfe253dac0858000cc60b8e00e502d3dd2ea0b1aa9bffc896f1190
+EBUILD zsh-completions-0.31.0.ebuild 818 BLAKE2B fd9238a601a7fb790cb9736931ac8211ebd2b5cd8ec192286d3ab86917bc3c2d53dcc42f5b7d73b678c9912df61d4b69973236183cbc4d13ac971568714f372f SHA512 e02e1d59619fd1ddf24ba39f40dc92e4628438bfa7ecc45d3fd02af754c3376088160450bd6723809b1f20d291273f586d69a637436ee930cc3d0b25102c1c8c
+EBUILD zsh-completions-0.32.0.ebuild 819 BLAKE2B 61e533c9d46fcb94e9a0f8b7fb53ccaeff60a676e22c958e044d83828b3f18736cc3f52dd6e7b936dd9d2e85630bd80e42738f99da53f22b3e5de4614ba96d70 SHA512 721b5c31f558ac75e65d610085e64915dbdb8816941449258ca1e1e08b1b2e975fa1dbc3278678e1f82b9c9a93e37c672ea1477be5cea22bd7c96dda9e5b92e0
+EBUILD zsh-completions-9999.ebuild 824 BLAKE2B 0a600a312e772b208d2d5ed551a83a5932caa643cc9690f06d97c61566f4eb30099a8e895ac1e11c51034d1cd5359eb937a1b0689ec782d1e204c8ac859f3cab SHA512 05404cb95a57230944e4c83636634a7b1a34674dc2cad14243d86dde54453b9334461f9e348561a17d51113ea3c1da3960debb483a8427da6cedfce4449dbdf6
 MISC metadata.xml 287 BLAKE2B 4fc6f5facc5b1a0002e5910677c2a10bc05bad985b664bf1b0369c31803594b2360ee4b74c05ed08115b2c5c7f696fd5ef1fcca60df9744564b6051d59a2c142 SHA512 801d3f30ce96bb8acd812bb4e34f447717c886b05f6dc328dc375ed896f419a15f964f5a808682a9977cb0c12ead6a1cd78657f3f71e18d4a57c6616865558b1
diff --git a/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild
index 5ff3f6657faa..888a5693eb24 100644
--- a/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
 else
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Additional completion definitions for Zsh"
diff --git a/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
index 3a5bb0cd1a39..7a3a90c7a581 100644
--- a/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
 else
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Additional completion definitions for Zsh"
diff --git a/app-shells/zsh-completions/zsh-completions-9999.ebuild b/app-shells/zsh-completions/zsh-completions-9999.ebuild
index 76ce34750ad6..8ec707f726f3 100644
--- a/app-shells/zsh-completions/zsh-completions-9999.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
 else
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Additional completion definitions for Zsh"
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 4aaf3ad30680..2af08476faab 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,5 +1,5 @@
 AUX prompt_gentoo_setup-1 820 BLAKE2B 26fc3348f16459462dddfd3f6864a3ae58bbcbbce0e85c04d653bed9c1f1c28a07621fffd22819d62050cf019f3d6d4c127088055bc69a0cc0cb990e8435f2be SHA512 262ad91d7536c11c3b1db176217e9a9bf21df5d25d72ddfc7dece6eafceb74a252212939c8cbe5bee1ccc0e25fc4e6e906660877747f5224e862d4d22d1200a0
-AUX zprofile-4 1273 BLAKE2B df8730eceb621ffe6b38a9185e1ca0a46d6ac2cc5e28e3e9888a2f26f4a6adedc6adfd39744b20aa450a613284b9670dffe02038f40f78edff22e951e209dbf5 SHA512 fbe89782f757bf351a60f691e40d70786324b8b8eea90ca5e788ae349fa5642daa24969e303af6029b8d38d0b5505ba422523081b91ae7b71fec388624ad48d0
+AUX zprofile-4 1285 BLAKE2B 15bfee359925ee6a3377f99548d11ac045c558ad4b5647e9ee83511f9b73a5f30585b0470697e258cda7846c335ea26adf29ad266493830e2efbfec0def76e2c SHA512 20a5e39993f43a349f48083d8644b579d66f9b8e9d18f64d9121157e001cdcfb2535ae2440cc1bb14e961ba993c413303a8b703f9d8bad4a855fa08b05bc7ead
 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.8-doc.tar.xz 3088696 BLAKE2B f738bf15b137e84df91fff8500b6c309884d8a1777e3158807f6028a411ae3f345e6ccba49bdff04c6607c4eb06fc2913313e84e1f78be0a0f92d23e46ba87db SHA512 38cc549818eb9c6952051b714dd2008d99605aba4ca4f614e62b033c9b067dd2031fff766ac5c1efe5bb52eae32bd482dea5df2b2d46decb7ecdb458f3da9d52
diff --git a/app-shells/zsh/files/zprofile-4 b/app-shells/zsh/files/zprofile-4
index 2e33b11f4915..b92c245784dd 100644
--- a/app-shells/zsh/files/zprofile-4
+++ b/app-shells/zsh/files/zprofile-4
@@ -2,7 +2,7 @@
 
 # Load environment settings from profile.env, which is created by
 # env-update from the files in /etc/env.d
-if [ -e /etc/profile.env ] ; then
+if [[ -e /etc/profile.env ]] ; then
 	. /etc/profile.env
 fi
 
@@ -22,7 +22,7 @@ umask 022
 # It is intentional in the following line to use || instead of -o.
 # This way the evaluation can be short-circuited and calling whoami is
 # avoided.
-if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
+if [[ "$EUID" = "0" ]] || [[ "$USER" = "root" ]] ; then
 	# Check to make sure ROOTPATH is sane before we use it.
 	# https://bugs.gentoo.org/656400
 	if [[ :${ROOTPATH}: == *:/usr/sbin:* ]]; then
@@ -35,7 +35,7 @@ unset ROOTPATH
 shopts=$-
 setopt nullglob
 for sh in /etc/profile.d/*.sh ; do
-	[ -r "$sh" ] && . "$sh"
+	[[ -r "${sh}" ]] && . "${sh}"
 done
 unsetopt nullglob
 set -$shopts