gentoo resync : 02.08.2019

12 files changed, 25 insertions, 11 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index a66a4dfc8b23..7626d247cd6e 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 fb5b630cf5b0..4415da5c3f2f 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -7,6 +7,6 @@ DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7
 EBUILD bash-completion-2.7-r3.ebuild 4109 BLAKE2B b19159a733eb34738622add375c11d71dad1b5bee4c16b3d7bf2b2d588757e0b412807601a3e9ab9a2bb9e1a796354d59f3fbe796f91577d7eb5368c499896f5 SHA512 2e91fc722b51b39cef6ba2892645cac41321d840e14d3774732084f6a091859d5ff01282e10a7ce1cc5ed89ed8e1473fe7afee551f0df4c1104b4d44dd7c770a
 EBUILD bash-completion-2.8.ebuild 4057 BLAKE2B 09f82c80d498f02154d144730a7b8d2d4ddf254fe2e52d972bd1107d0ae3bdb583d161e04a3bd3c3a45d41b87c1bfbf187697d2789926e0af410dbb09cfefc9d SHA512 081ead91d74f818f4c3fdfeb3643fe55f744afa26730284b79242379d7358c957549efda8091cf108aaa5f8195d2fb3610474072a141eda1573d68121a7d7b23
 EBUILD bash-completion-2.9-r1.ebuild 4816 BLAKE2B fb10aa20dcace7020a209d479aa2346bdbddb28eb73f3d7a7aeda1cbd02820b8e2ddbc63ecc46f7ea255aa1a442a4341ab4416a1b566fe99657827f3f1adeaa0 SHA512 62f99d0f540441b5e14c26de777e0c41b40c1bb8eb03faf194d93ffcd3923b0adf573512a2056544e44a798f9645b7cf30c6dc870ce6a8774aaea66e710fdf6d
-EBUILD bash-completion-2.9.ebuild 4695 BLAKE2B fdf306283cbfb72626912911ddc1d7e2bcf6a72c95c712ef3918a3623535d4bc7322dd2a9928453180fe8e9d588fe9fd6c6675073769f42425f088abf1a45444 SHA512 0e7beeec373a736628c60b0eeb5b0427f1f7ecf28edf947b3b5b55603c647ac5720e074be1d7397ea72ec211eda8bf55a60e7938bd9d8cf90fbdf592db703123
+EBUILD bash-completion-2.9.ebuild 4694 BLAKE2B 5bff08075de6af572d855425a249eff6a858593128f59864601f77aa2526a6a59b7dd73a27eb7d7926104d1e8e269222931c59bb0bd11504ed3814efaffed28b SHA512 5559c40fbd2881cd9de31134721d2e7c7bea57c241820673e0cd8b9b495375e4c2f9b38cc4a1c7cc18e95bd36082e608fac41498201d9ad495fd258d497b2df2
 EBUILD bash-completion-9999.ebuild 4580 BLAKE2B d974f17d8526f30e9907d2f09ed6024f688e8829499a0069d042404752712e7e70b24182fb71a61acd9820c916b6af9c2bc785629959ca66e0491b8add77c9ce SHA512 1dadaf29fc2ca6c5f42a7eb954b060ad400ab4eac953a581d09d8412fd863343391e2c6f8ca31bad25595aecc2ba515c67ff04417b4c3e490d2a127cb77fb3f0
 MISC metadata.xml 1498 BLAKE2B ebfc4f05a48320d502076d9756cce9f0daf1a0c601ec491cdfb89538627f62c0613dd9e4db53c4791e094d6652e3c9a508003de3fa4f62a84396844c324325ef SHA512 6a83c672f45e7171d5b9959ac59c4e28bacb8ffdefa965288776603673396225b3bb01c149432edb3f901f04eaa39064bc8d813a35ce1e573231fd4b4570c62d
diff --git a/app-shells/bash-completion/bash-completion-2.9.ebuild b/app-shells/bash-completion/bash-completion-2.9.ebuild
index 408124d2d2c6..da4cf1463bc5 100644
--- a/app-shells/bash-completion/bash-completion-2.9.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.9.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="test"
 RESTRICT="test"
 
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 8c3ed5eb0d53..4feaeeac7e94 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -4,6 +4,6 @@ AUX fix-histfile-test-on-ppc.patch 1068 BLAKE2B fa407d7f5d02f061a3ca9d79bdf09ae6
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
 DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3
 EBUILD fish-2.7.1.ebuild 2419 BLAKE2B b94dbcf8431311f50ec2b49ab8ad62e8af3519262b2518d4b72a0074e837b38bf3aea6e93655d7b60ccbb09ef2abbbab946ba5012337c15de73a3c7d910295a8 SHA512 d818578a42171939d35ecd9dadbe875bbf93427e662783fb6bfb3033f17ab3298df58999f4e71e4ec8af666c7388fbc6bd694af119c0d1532c78ff5de1286b41
-EBUILD fish-3.0.2.ebuild 1686 BLAKE2B 5584cd3239c40a13cd6f2cf74ed50547911fd2327feeb316c9e86d6614d63d30b8f07e72015e7ae65286dd3ea7d3fc268baa5db1758481513ab1663cabcb0b3a SHA512 1c16fee53eb2496bd8b0bd008af7f18b942ecf5aaea6240780fc3bc4d0ba91b35ba21012d67ab40c763d8499039323a414809df684b3b94ea9dd99d26f7a4209
+EBUILD fish-3.0.2.ebuild 1685 BLAKE2B 3ab99c8d632ff698afce7d304b05df5d0622020da6224f54e80c0148aa7a82ce2dffd9e160c57dee9516e1706c72eb6f4cfb9193c1d2807cd52fe1d0935bebde SHA512 882eea43aafe70967305a9833965fa37dab518a924367b567c8461f0ab3bf7af0e464619d744ed96854fe5b481d8916b14604ba9be9b153faaf583ee2500b854
 EBUILD fish-9999.ebuild 1619 BLAKE2B 0153dd8b58b2215d878421411226a7b32d7bca3ba69622456506b0c75bfde528a0ba2ad10000c046f87f4b4d77d828a1fa102c56be0f9972707d7017f7ce4e57 SHA512 f695e364fd3cd033775787fab19135bb8c10bdcb9f90d2943d7c62fe12dd8c0f8e4c58ad78577239a7019828b461da3fd820300cc5f0e314b215f72a7a3c9400
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.0.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild
index e6150ca3dcc6..047dd2c59a77 100644
--- a/app-shells/fish/fish-3.0.2.ebuild
+++ b/app-shells/fish/fish-3.0.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index a79b5b80d9c2..77202a7cbd07 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -2,9 +2,10 @@ AUX tcsh-6.18.01-aix.patch 474 BLAKE2B c794769b5ddb354ebbcad902df18db735f06b3e09
 AUX tcsh-6.20.00-debian-dircolors.patch 506 BLAKE2B 584808b9bd488c41a8b375d18b976ef89256771b9282b248c0ac4e500ea5dedb07a05af60c3a5995b511dce49ac95db1b0beb2ae2db11de241e9eea2a72c52cd SHA512 c761857c343c833aea5061baeb54dd86f7a8804424b7ea2009d05fd57b92ba3b892c05fe48a8f4e00a6eee39515086063a9c518004d726626dc5c466958a6dad
 AUX tcsh-6.20.00-use-ncurses-tinfo.patch 382 BLAKE2B 99d794389e3f65607887eae8df4d8af9f9361604f0d70e96a45f3a2b3ec648a6f04f335b2de8fb8b9b6c7441be6009ca38f9f8479ddd9e3e831c4cf0c0b48863 SHA512 d6e2346a0ed093651be7073b04cd31ec1bd587c52fc9a21295405699fed2a63d6ea8415e7c0d29e0f03732288b4a8749e14c9ee85c39a1b4f8e51cfa996166c3
 AUX tcsh-6.21.00-no-nls.patch 386 BLAKE2B 5df1b205d76e29b68530f50b661329e851ce46206306662e150452ffc340e82d2347a0d1407c3a4aed6ee5f1b93257d0dece87b37ebc51f4240ac83a110f471e SHA512 9ece39f524b0d377dd907772c37e9412cb4a700db5d828aa404a0b231b758638cdf1215d026ba574486c2a00b49f20888e7f5683ac4f712845fa484118a8109f
+AUX tcsh-6.21.00-use-ncurses.patch 388 BLAKE2B 5938d6ceee5cafa254d3bedb36705a7d1d6f3c41cb30d8eb22181cf053bbe39302c9dcb14191383e755f47c08fa1a0dd3fc20cc7f813cf9737e60850327a7e71 SHA512 eef51644cde4bf27a614a1f099b5f21e46600ca396e4baafa6ece005f3fb4901ab1862176ee715b7294216894f6a2d84c1a5b1c38c1086cf95914f6f44358595
 DIST tcsh-6.20.00.tar.gz 1001696 BLAKE2B dfebde21c70f236e1070a93621a331ce1a53efab4496c44f25b51e98e843a8d0e3ca503da46a4fc0177b57b682e3ecc07f8120cde25ecf466c8ff094df5f9463 SHA512 c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9
 DIST tcsh-6.21.00.tar.gz 1001909 BLAKE2B 7f2be382a3a344d55e0785eace79377e20dd2cd2eb9e9533168fbb6286631cdcd35bdc06cd42d9439a29a7cd1a911416bfe6b0245065535aebdf5adb58d2c301 SHA512 d7f46588a35b9cd01cfa33d0f9bbae09e9692605b5c045c2b58e66dba958ab904ddfe45aa7361767034e6cc03a34ad9ba4d14fa836df723bade29f3f6a18a46c
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
 EBUILD tcsh-6.20.00.ebuild 2666 BLAKE2B 39f2c0351674773e9e53b5a3c2b53a92fb7c67ccdf17daffe8c39e67a60256472db7fce023fca677283aea36f92537c0869bcd78c3998eb81e5c1497daf8d970 SHA512 d2a9e1afeb3f376402b4e0963884a6817d2767bdef93a75751868f6470b2a377df4b042b4f22b7994a597bf57ad2a82777434822d0d1782c479f5ad158506811
-EBUILD tcsh-6.21.00.ebuild 2670 BLAKE2B 4d88893031a1f492cd7c39000408691a885d99ec121834940494bffc983dab0b95e36971470ed07775bfd852c41d84803122250a09e7e459ba677f4aee5a1203 SHA512 aaf85f7b7fb21111562557e424266930e2bcf27e517117b4ba6be4aac41e28b3a6d5e23f91c4200061266556848184038d5d8a153d14c82c47c1a8abe646537e
+EBUILD tcsh-6.21.00.ebuild 2717 BLAKE2B b4c41e00e208649b674b20a67bfe3e4715e3917e7f53a03651cd48a4c20c4aafee10b9ace59df0500567dd3166a8194c9e9bf69e5006e8c2fa4ea791970b8b85 SHA512 1f65a60e43a5847363f774e906279ed600058802f4a76cbcffd1035b796000ff9b15c160e582985d38ad1edb8fda3041ce5ba09b672fd5b6e2a11c03199a1e00
 MISC metadata.xml 645 BLAKE2B 6a9d41c4ca043c899c0bfd8c5140958799c4eaf988f301551e8b8302995c81b0968981a2fda9247189965fc28887841eb30e1f3433262a58c843c0f890f857e5 SHA512 0f36e708c427083603b31df4bd4d808147333ff2711addff30936178e72b10f1020534046cb15ef1fecafee656c37d357ad3b5922320980ee15fddda11912f22
diff --git a/app-shells/tcsh/files/tcsh-6.21.00-use-ncurses.patch b/app-shells/tcsh/files/tcsh-6.21.00-use-ncurses.patch
new file mode 100644
index 000000000000..d268474d9783
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.21.00-use-ncurses.patch
@@ -0,0 +1,11 @@
+--- tcsh-6.21.00/configure.ac
++++ tcsh-6.21.00/configure.ac
+@@ -317,7 +317,7 @@
+ dnl Checks for libraries
+ AC_SEARCH_LIBS(crypt, crypt)
+ AC_SEARCH_LIBS(getspnam, sec)
+-AC_SEARCH_LIBS([tgetent], [termlib tinfo termcap curses ncurses], [], [
++AC_SEARCH_LIBS([tgetent], [tinfo ncurses], [], [
+    AC_MSG_ERROR([unable to find the tgetent() function])
+ ])
+ AC_SEARCH_LIBS(gethostbyname, nsl)
diff --git a/app-shells/tcsh/tcsh-6.21.00.ebuild b/app-shells/tcsh/tcsh-6.21.00.ebuild
index c4e52506794f..3dc6aa72e6bf 100644
--- a/app-shells/tcsh/tcsh-6.21.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.21.00.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.20.00-debian-dircolors.patch # bug #120792
 	"${FILESDIR}"/${PN}-6.18.01-aix.patch
 	"${FILESDIR}"/${PN}-6.21.00-no-nls.patch
+	"${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch
 )
 
 src_prepare() {
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index b62dd11fcfae..3a2c4e383cda 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,6 +1,6 @@
 DIST zsh-completions-0.29.0.tar.gz 251934 BLAKE2B 474f15cc8d492da0bbabc2a93edf316b9bb44bfb64ef8b8feae67fc381393b76701d9aca6eb64f6430f881b73a136985c8b17b392da139bd64afabe71e8183ba SHA512 4b2d79dd69576ce688fe24fe8c6e337319f2b96f5e668b9d58c8eb04f68198695a2652e8ad1e93a7ef9cf04cc53265c8db62f420b9ab6e1a2aff97ae24414945
 DIST zsh-completions-0.30.0.tar.gz 227966 BLAKE2B 8f80be627f1fdb78f901c12fca5f3281562a161f295198344607ecc2187077576c3b37a7d8d764b8cef3607bf02226297ba58e27da0348ce6fa4c923d7072054 SHA512 a4469d13208aa93bff481a8754882ed272143c9ac38949eec38dd61d461b65faae8e51dcb73c6c3eb7216098322f5cf407a67f0ddab4c9e88a467e16ab249609
 EBUILD zsh-completions-0.29.0.ebuild 793 BLAKE2B f699b7b91fca760ecbd3cd58ee524481e0220d4f93452e6c53c0843b0832abddd9b68f1927a4a2180f927e4d88130a1a59815b2b9b5e0c869d1d6e16debc6e0b SHA512 2a6b46272a8ea217d9c059557a085900987e8562fbafc12e763f14792db6dd7aa25fc376a9fb736731332664205ed495a8d5dd47e23c1e675b60adb1a3b20ccb
-EBUILD zsh-completions-0.30.0.ebuild 793 BLAKE2B c306baccd998c99abfeaed959e885ad1ebc83b2696342d4305083b185595d79b7c48ec04f6049b900ed09a0e106bc58bef949ee6c1c31c81fbfde5bea48535a0 SHA512 5b1700ce722df46e6a0e6743955b78d95fc98d9368ff6cb93541aefb704755a5b61b4d4399d6dc22caf8f5b31411124723bb12fe94985d5c2838ea93319c4974
+EBUILD zsh-completions-0.30.0.ebuild 800 BLAKE2B 8cd0c838f544a7dff4cd7e5ab1c38308a25cbedfe141bcbadd9909e6af260c739fe1a961e265b8a90851be304077f38792c0043e15d732fdcf16351f0da86131 SHA512 565c3633835f5fa660f1cf25129455b1909e772faf3357b0eac5150d81f574b1caeb2d7a7c0bc4b3abe180a70feba08f0f5444d90dd3a01c05a22141a0a7f792
 EBUILD zsh-completions-9999.ebuild 785 BLAKE2B 41e5cb4e18fc3947a5478e4927c1552ff20441d8e249f2589efbe2b1796d625381bb02d6180d8eae4c7e415b66aacdf386993089ba360ac4b039df8fee89f700 SHA512 6801846ac6ca49cded07839324e97ac8d32fbb46454b60e56dd0a5644d918bff08b316ebfd9e5cb4c5d96cd4d12d3f1644abfc3893062e9267964386b4f5a8e7
 MISC metadata.xml 345 BLAKE2B 6d43d457793d6548b98d393ec863c59a4f1fadf22cdc64b8366cc2f96f7b1899bb1924006e95d42db0609d72dd7664e743468c99eb2cecc9033a5a29867ac191 SHA512 e09a3412d8ea166270e3d6ce1d708cb989efa6889116d219ff76d96d0d92d533d7988504208ebc5e6a186327b6acc4e8b2c719c21c86bd84154292f6eac4a430
diff --git a/app-shells/zsh-completions/zsh-completions-0.30.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.30.0.ebuild
index e15fd2263281..062d59b04010 100644
--- a/app-shells/zsh-completions/zsh-completions-0.30.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.30.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 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Additional completion definitions for Zsh"
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 853404deca88..17a0acc63ca1 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -10,6 +10,6 @@ DIST zsh-5.7.1.tar.xz 3126308 BLAKE2B 4f1aa2d5aea0341ba7839cf05687020889b5ca6879
 DIST zsh-5.7.tar.xz 3124708 BLAKE2B 6b3822d3bb647aaf1072b9d499dbe9a65dc6cec0b83fb7fb09050e26bcc71fc0fb2846a1b754f9f206b602632add39e52465c1092f131f9000a149dbd2b469de SHA512 cfef5604d6ff30aeb081ed2a2660c861027c0a90169231cdb6b19093ffa6d63946be7b1fde527769e60e5b14bb6853b590bf4a207b63d6ec66fffd30d9a94958
 EBUILD zsh-5.6.2.ebuild 5849 BLAKE2B 4e665d07154f52a0cd12ed3eb5b3b7facf5dc802f2fbb8faeb77b33c897c9aaf05f843f3670b09b92ede76a1d34b0f4c30469b1e07a176cbb9cfafd9e8340bbc SHA512 0552a4a7dd72536eaf8371cbfc5a2c7e479c93e3632bede86803b7073cf31f293f77668e19b3101957cdb2ce91f10ac7b955b36c61b6ce77c4fabff3ead4f0d0
 EBUILD zsh-5.7-r1.ebuild 6009 BLAKE2B 5bf15af8a761a17510505bf53bef50ed23a115194db4e22e30440aad51a83841a08da5e00bc146efa56b92872f4f557821f3501a0a40e32bdcfc70d709e784f5 SHA512 1eec250682c62a4fad3fc52d1d5ac28281cbd7b284a52120d42f921ff62d4607b87f396a920bcb0014e867a03195366fb1fa792fc5441d8b781bd3b90ff7bc72
-EBUILD zsh-5.7.1.ebuild 5947 BLAKE2B e3e0d42d2e80a8329ad215408a5c2e8a6b16451e030b4ec57255d1911ca4fd20bf91f80a922798947b8e3d1218195bda77dd104158af20fa821c08e55537f219 SHA512 041f7afc610f666384665fa3da6ad27de66d3a3353a6fd5b7192032a24ffe0e042c06903b3d12be157e2c0176857b5169cb4cf21b2aa2a302d9bbe2cb2e1baad
+EBUILD zsh-5.7.1.ebuild 5971 BLAKE2B 85afb37a3f4e9072107e5aa9091b40e93a4a88c84961451c56d75e95cd1911157b42e7f0d512c1b0b8cd0a1f5aa3234e2f992f3995aabb1d49fd8694096761c8 SHA512 ea209cd0b6da1311450c82dd49a86cc655b097fdac636af7d01555be69d4c4f619ebce0503b8f8d523e9a41b93c1f5f866774ae556477869ff68defb1149ec27
 EBUILD zsh-9999.ebuild 5947 BLAKE2B e3e0d42d2e80a8329ad215408a5c2e8a6b16451e030b4ec57255d1911ca4fd20bf91f80a922798947b8e3d1218195bda77dd104158af20fa821c08e55537f219 SHA512 041f7afc610f666384665fa3da6ad27de66d3a3353a6fd5b7192032a24ffe0e042c06903b3d12be157e2c0176857b5169cb4cf21b2aa2a302d9bbe2cb2e1baad
 MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/zsh-5.7.1.ebuild b/app-shells/zsh/zsh-5.7.1.ebuild
index 7455f1937729..103eb4abf6a4 100644
--- a/app-shells/zsh/zsh-5.7.1.ebuild
+++ b/app-shells/zsh/zsh-5.7.1.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-inherit flag-o-matic prefix
+inherit autotools flag-o-matic prefix
 
 if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3 autotools
+	inherit git-r3
 	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"
@@ -64,10 +64,11 @@ src_prepare() {
 
 	default
 
+	hprefixify configure.ac
 	if [[ ${PV} == 9999* ]] ; then
 		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
-		eautoreconf
 	fi
+	eautoreconf
 }
 
 src_configure() {