3 files changed, 90 insertions, 2 deletions
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index ae40c24c790a..4c7749efc308 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -5,10 +5,12 @@ DIST gawk-3.1.8.tar.bz2 1984129 SHA256 5dbc7b2c4c328711337c2aacd09a122c731312226
 DIST gawk-4.0.2.tar.xz 1626808 SHA256 21e1f28c51b5160f0a4bf1a735c6109b46a3bd6a43de808eabc21c17bb026d13 SHA512 069f68b6792521d94d4003764006ad8fbe9a17c60a88212629204d9a5eb3f662903fff6d91dd3c1834597b76c18f9d3231c93a033f456c59c0571ac13eb77b27 WHIRLPOOL 8b2916d964c5fa67a46c0a5fc39d424b03e6b39a3335ad796a224feb760528631199c1ec6ee2b6719bdc014ab190ddf38092211685020c92851d617e6ca08690
 DIST gawk-4.1.3.tar.xz 2311268 SHA256 e3cf55e91e31ea2845f8338bedd91e40671fc30e4d82ea147d220e687abda625 SHA512 8b9470a1bba397353f10e4e652e8589a637a49e8235fb39ca7681ae662fd27cd140c193d0634179c800f99e19b0e49aef55dfa6612f9695ba80760a36936a1c3 WHIRLPOOL ddcd0f218a08c7d54beaaa28db3a965c57b1d394dd294f142970cbf3b4777a407bbb491b7442f9e4de0b7435167919e76b16f4c5ab28eb62758a3d44d11a49e1
 DIST gawk-4.1.4.tar.xz 2367832 SHA256 53e184e2d0f90def9207860531802456322be091c7b48f23fdc79cda65adc266 SHA512 6a0e9cf086544212f54b54261dcd517b611aaf495ef99c4b7740d07e363bb00c5632f3d7fd5e12a954d5aa9793764162a57453e0e18884b29c6c54b5f444c097 WHIRLPOOL 5103388e7260cd9d4e777a5b53e93ae2eb1270c5baec462d0d4c244fde12bb29d41864ebb22de5c9b797fb9678c548cf3059a39488d35660b508b90c802346ff
+DIST gawk-4.2.0.tar.xz 2948108 SHA256 d4f3cd31c001fd0ed52832d4fbfbdfeaa38ad541c182f80ff8fdf87324a6a9f2 SHA512 3076b2f42e43fff0ce63dcaa3fb749ce421473d0abc3e1e2d9dd375207d3e35c98d5bf91c3179f49156e8a4977424c16bb2d3d662846ad487153729dd4cfeb4c WHIRLPOOL 5fe8f46d78effeef2563446b6c73c7e5bcc4e1f8b565ca2bed3bbf30017683e784daa9655cfb7722ea090a8c9a3ce6f5740f278c0ff3a70d85ec67d7a8b5808a
 EBUILD gawk-3.1.8.ebuild 1794 SHA256 b794beff4f8ce3bb31d416ea4e7cffa083ee432991e4f6b86a1a071b63444845 SHA512 ca82d7bba5d88aadb4616817d0d55f001446a90da3def7fd49fb817c5b2674cd389f5a92efe82736e562ea0f46c9a214286f96137f324ee2be2149d09f298f61 WHIRLPOOL 9b2abe1d8028961d76032e39a359ae76d82ab647008e48d79c887e6ad3b2bd017ab33d7e877582fb34868ee604ed78d8169134c75d1dbfc6b466507847eb2a78
 EBUILD gawk-4.0.2.ebuild 2088 SHA256 aeb7bc3dda2def791ba830ff3052247292249a6fcb270c81412651a5fd013761 SHA512 b15b3c32c04c724e7b0c5c6f8d7cae86e3118c1560ca2fae0f5ded39fc098afa29987e425733e96daedbf1db5757e15fb21059a023c5158498f5b6168809f063 WHIRLPOOL 0197d1effc02f2668e3834108eab717407fb02bb880fdd1a964fdbc0a5bfb44a0f5cd1ab6893af0da3aadd0e22c1e9444af46a98b2fdd74b341877d7d9fd00fd
 EBUILD gawk-4.1.3.ebuild 2201 SHA256 e973870920b273d6f516ccb6a47265d0b793916d60a3a72aa8c7153cd90ff8c3 SHA512 fd78556fbd0d2ba92c2816d4a82330a365ca99985b042a3431e075e7a1390954bec0139d7dc63370c564eb90ab3f0a97c6966230a7309d46462d5e934b090d0b WHIRLPOOL 8c4ab7736911b57077dda94446831b6bb1b7fe1c839f6d06b22f42b6d7cc0b763a94e2b5aca899ae0b6641bc5b9a0dc79aafc07f325a885a9ea9f2aa336c7d1a
-EBUILD gawk-4.1.4.ebuild 2301 SHA256 26d24d086963e0347732c0c450a18eb3827779a4259f8173683c05f41c780235 SHA512 7264a7180f127dbe7147db5eaee201f37bd4ec25f1478029086720ee59fa96ac3d3516ae1eafeccdfffd8ccb5107152310311953e40c1d0ec9053a6e1a53c27c WHIRLPOOL 93816fee2ee67f75f898f28e2966c90d3f5ef1878213ab0110a63782a4cf3baae7509dfc13ce982058f21b90b9ac253bb552c8674b6e8b8adcedd8089ef19f6a
+EBUILD gawk-4.1.4.ebuild 2300 SHA256 d8f662346008bbd6b0ffce8bda3b720a81a22382689e58b41aa18e5a1f23c27d SHA512 3b8a5f9fa6b07b50eac243ccf6857a709dbed88d18fc9711d114c9ea8e89d72c9aae5fd776cffb383961d8082c55fc01f718fa0954f93c91c08cfc93c072b741 WHIRLPOOL 3958171ffacbac65767b9616331fcb3ca2dbc74a86e53e4d79da31cad490be6d5c91fa623293c5dae270b926af0fa28d0441cb24a960e36333441a137980d3cf
+EBUILD gawk-4.2.0.ebuild 2370 SHA256 f8860f720eba40291cfcd692fbdd34a6c4147d940caf3765fb0ce63d865caa45 SHA512 c5bf4b2ca22f4d630105f091a80c5c41dbb63189c794ef7c2b42c960b714b87bf927e9c345dcc86bba40931597f72f66d5177a59a9080a336e81e04ac0ece31d WHIRLPOOL 80f680fe852472fc45e974e6ac32a26eda5f0951b738dc8c758818b6417e95b5a85954bb11a210c3fbd6eddcfa48979b024a445ef9a398900f5f2edc33636571
 MISC ChangeLog 5037 SHA256 d91b8f1506cf9102f4f46dbdd03d6c757ed521c54e08b1f03c70ea61d950ee1a SHA512 22fec5534ecd42063f666080c6e9690197120700d23277ca718181306715c41e2253f684efb4c9cdb4456c1a0609d6b45c8a644c4f2e3b86f5e9f5f84a5ec3d6 WHIRLPOOL 69b1294e44f270910dcf450bf3a83167d1665d195b8767f950f45443ab5c5e187afa22c8d49246a3a5c1721650698983407c9e80fa9e964290fc7ca35b0e2f7d
 MISC ChangeLog-2015 25235 SHA256 bde68cfbf1ddb7ec621042d675bab7b5aeffed7f3f092dc278b0c0ac2cd602de SHA512 243495808dbef55124b5a8d02e27b87550ad40104b427ed9bb63d3c8785a84d0acd3675a8d15c8579553c22f06809a47d19530eea0300a0b616ed2e3fb527dee WHIRLPOOL 70afaf3d02a4f5a3e4b4b13bb3c9f912d55c4b4c6f06beb10412f52b59fd82e5b6bfb9548fbe1a625e933750e903cb179cf31267b4abba103b3539d95622e8d8
 MISC metadata.xml 347 SHA256 cfaa5b9985d20997a4800b7a60f7804bf8660d217ef2421732c2e296532d6862 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e WHIRLPOOL f4cc92f281dfb2f436c979257347ac8694056a8d9a4a3c794056027a12c64f6cf04023641b0462d57a376335d93c55f3b6722504e7f7e32baf702c4c7578e5f9
diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild
index 303da0e8c823..6de13808dc55 100644
--- a/sys-apps/gawk/gawk-4.1.4.ebuild
+++ b/sys-apps/gawk/gawk-4.1.4.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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="mpfr? ( dev-libs/mpfr:0= )
diff --git a/sys-apps/gawk/gawk-4.2.0.ebuild b/sys-apps/gawk/gawk-4.2.0.ebuild
new file mode 100644
index 000000000000..da57da475731
--- /dev/null
+++ b/sys-apps/gawk/gawk-4.2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multilib
+
+DESCRIPTION="GNU awk pattern-matching language"
+HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
+SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="mpfr nls readline"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	mpfr? ( dev-libs/mpfr:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	# use symlinks rather than hardlinks, and disable version links
+	sed -i \
+		-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
+	# disable pointless build time hack that breaks cross-compiling #493362
+	sed -i \
+		-e '/check-recursive all-recursive: check-for-shared-lib-support/d' \
+		extension/Makefile.in || die
+	# fix standards conflict on Solaris
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i \
+			-e '/\<_XOPEN_SOURCE\>/s/$/600/' \
+			extension/inplace.c || die
+	fi
+}
+
+src_configure() {
+	export ac_cv_libsigsegv=no
+	local myeconfargs=(
+		--libexec='$(libdir)/misc'
+		$(use_with mpfr)
+		$(use_enable nls)
+		$(use_with readline)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	rm -rf README_d # automatic dodocs barfs
+	default
+
+	# Install headers
+	insinto /usr/include/awk
+	doins *.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
+		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}"
+		done
+		[[ ! -e ${EROOT%/}/bin/awk ]] && ln -s "../usr/bin/gawk" "${EROOT%/}/bin/awk"
+	fi
+}
+
+pkg_postrm() {
+	if has_version app-admin/eselect \
+			&& has_version app-eselect/eselect-awk ; then
+		eselect awk update ifunset
+	fi
+}