gentoo resync : 25.04.2020

3 files changed, 22 insertions, 16 deletions

diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 9bf604f09255..ea5b29de9351 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,7 +1,7 @@
 DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
-DIST gawk-5.0.0.tar.xz 3000432 BLAKE2B d7885442c615e2b7986d6cb617db3ac376a5e572ab2aca3c6b2bd0f43feca4374f310bbf2e2a875b617df97cfebf98cb983d169468d51db39058b83eb9771afa SHA512 9eb663bbcad53165b7ddb7d72cfb8377252b68004733a9eb8c191b2ddddaff857e48ba811280311384243eb67574fbe7ac9edf4e507f9a82d67b4b2adff8ef6e
 DIST gawk-5.0.1.tar.xz 3136004 BLAKE2B 1dd8a9bca2488f2d3c946406b01fcbdce0487922ece49fe2121c39d6d10bcfcb6a056edbbf88ba6c22772ef88a250fc8ffcba33ead399c0d7c8f5d19d0e896d3 SHA512 ff9842a91035f843482d93eac8a35cddf2ce16acaa43a0112c1efff08802aebf705ee70d47eff74a190dca7be330c31f7204ad27cb63bdee65333f9b9c984212
-EBUILD gawk-4.2.1-r1.ebuild 2163 BLAKE2B a4fe42c804df36f72fe71dcc52117b23695ede14ff72688d3191955264060ea3ce902ea9413e18b2ec990e5d430a51aa5b7e9f9cdc7c86bf25f91b791af926e2 SHA512 6c917331dfb5fa04d6be878f08e06a27f34a5cea2aadcd1c0bb737258a5b8d34b722b42b3219109e03d320620fd39ebee0bd0ccfbc5d4106732a21d4cc4a897f
-EBUILD gawk-5.0.0.ebuild 2173 BLAKE2B 65cd7d75669a250b9591a94f59afcd9fd6883d15a840166985ed2b8de28c6af212748353414e2f1c5e92d26393d7147bc7e3a5789aa4d905495b083233a26a35 SHA512 9a25342ba1cd13711c88d3deea98ffdd066ac65565439a0aacee948860721766f07668f73a01025671e4c2b8d6f7d5d3317a0212cf0c87fe330da3f4ecb3b29e
+DIST gawk-5.1.0.tar.xz 3154564 BLAKE2B a969b03f45e1d830d2b3760d75530de97eb521a35ac448cf441d7fd2d1a8c1059bd9240cb9571f58ef6ec122864ced3d274a07453c3138177deda895ac3433d9 SHA512 971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4
+EBUILD gawk-4.2.1-r1.ebuild 2164 BLAKE2B 09cbe472e3e9d6bcd194c27ead1d1d96f4c7eed3e5fb5ab68f0301b33cff378424c4caa92aa910c14675294d504a22cfb30067b70eb78121be681c640a4396b3 SHA512 f26f73852c3c26f7efcfb69bf11b6738e0bd4a9e03b22df753477160285675e35654c38f6777551f8607f8680b087a91948d2089e83c00e7474ef8645952cd65
 EBUILD gawk-5.0.1.ebuild 2231 BLAKE2B 337e5fc22b6eb3e0854df63663a1a1f3127af4b2ee9b4ef88e75ab32a6eaacc6575606e46ee3549e64f859e442f3934a1479b2e3774835787108fc96a6ef8549 SHA512 6f2c3d50656d342de6fb543f256764b43ee9217e99ca94c4378e312a5202ee3138104cbc509045b593c6acdc8e2eca6d735480c7e9ef5f1fb7c9b8e55addfda1
+EBUILD gawk-5.1.0.ebuild 2280 BLAKE2B 29352fd90acca40f4986842737909e282d1d082685e49ba35c125ccc0d30c575ed439e833100d3673d398c9c74b8c6955137d03e9afa93ceb605930e1aed6f54 SHA512 6249b492dc57bdbf408395711dabd0a1787372803d81b5852a78599dc1fba228a2c8acd2ca43862be17bdbd95829213c7ab1702061b0a4ef33cf20ebb9397e95
 MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
diff --git a/sys-apps/gawk/gawk-4.2.1-r1.ebuild b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
index 757e8a64e805..807061875e31 100644
--- a/sys-apps/gawk/gawk-4.2.1-r1.ebuild
+++ b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gawk/gawk-5.0.0.ebuild b/sys-apps/gawk/gawk-5.1.0.ebuild
index 1a1bc35f4c0c..850ebc1769ed 100644
--- a/sys-apps/gawk/gawk-5.0.0.ebuild
+++ b/sys-apps/gawk/gawk-5.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit toolchain-funcs multilib
 
@@ -19,8 +19,12 @@ RDEPEND="
 	mpfr? ( dev-libs/mpfr:0= )
 	readline? ( sys-libs/readline:0= )
 "
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-apps/texinfo-6.7
+	>=sys-devel/bison-3.5.4
+	nls? ( sys-devel/gettext )
+"
 
 src_prepare() {
 	default
@@ -30,7 +34,7 @@ src_prepare() {
 		-e '/^LN =/s:=.*:= $(LN_S):' \
 		-e '/install-exec-hook:/s|$|\nfoo:|' \
 		Makefile.in doc/Makefile.in || die
-	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in #413327
+	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die #413327
 	# fix standards conflict on Solaris
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		sed -i \
@@ -58,26 +62,28 @@ src_install() {
 	# Install headers
 	insinto /usr/include/awk
 	doins *.h
-	rm "${ED%/}"/usr/include/awk/config.h || die
+	rm "${ED}"/usr/include/awk/config.h || die
 }
 
 pkg_postinst() {
 	# symlink creation here as the links do not belong to gawk, but to any awk
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
 		eselect awk update ifunset
 	else
 		local l
-		for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk; do
-			[[ -e ${l} && ! -e ${l/gawk/awk} ]] && ln -s "${l##*/}" "${l/gawk/awk}"
+		for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk ; do
+			if [[ -e ${l} ]] && ! [[ -e ${l/gawk/awk} ]] ; then
+				ln -s "${l##*/}" "${l/gawk/awk}" || die
+			fi
 		done
-		[[ ! -e ${EROOT}/bin/awk ]] && ln -s "../usr/bin/gawk" "${EROOT}/bin/awk"
+		if ! [[ -e ${EROOT}/bin/awk ]] ; then
+			ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die
+		fi
 	fi
 }
 
 pkg_postrm() {
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
 		eselect awk update ifunset
 	fi
 }