gentoo resync : 11.05.2018

3 files changed, 2 insertions, 81 deletions

diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index a9e89da34a11..1e45fb425789 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,16 +1,14 @@
 AUX filefuncs/Makefile 1112 BLAKE2B 2aac64b80953a3253730209b9496164cfa2d3e9d18c90547cc7290329e2639ba4499a7d9c9a87b79c05f31a8cea3ace1663de8adaaef5d75d6b25ab8017951a0 SHA512 9bf5acfca439e6589247db3b4b16985765e748bcb66577e7038247830f92137929f139f6ab72ecb9e2b3b03f9406c8ecf7ca349329979ee8d70fbf44b4feb2b8
 AUX filefuncs/filefuncs.c 10875 BLAKE2B 7da403cea52ba69b3822aa892ad8faa12fd59d64d434f35048e34a38273f57fac73a42d74d88e68c33feae015ac241395c2f71c3e7e7e99b526814d9347d8c73 SHA512 48da0dce39759a8d57097b286dcee2ebf1e1799b694a4a7926716df727eb294a7912117c405e1b63a1722fa3a2427cb2139d92fac723ffd8d2e697632719f974
 AUX gawk-4.1.3-bsd_configure_readline.patch 1899 BLAKE2B a7c8ce8aa8fb25ce3adc74fb195bf8c9dbd7b83084f4f901c61758f5a51969510aa3ae8c9f2668266d798d43563f6fcb7e8659ae9f7cf7514f86de2f5443fed6 SHA512 ed3b6c4efe5bcb53bca6eeb50df0e3871eca266dd3d6ea4369f42dce31b771ed0a4f0aac03b09124706539d18c8d1dfe549e43d2ef4cf80a45353e14238ddaec
-DIST gawk-3.1.8.tar.bz2 1984129 BLAKE2B 9e3c130aa246f3dcfc03ce88da644d0fdceff01fc98fb25c1638d3a03e9ad4c435960c41746eced0f7d955c6aeefde68b75c4449bc95be26be59720b267b4f84 SHA512 a8046c1a5a6ffc8bd90cc6062d97ba6301b7a707f4a34a06355a83aaaea2ccdf4c4476563fc6f444b529a2d8d3a2de2126b53434ba50aad8bd898fb3299904dd
 DIST gawk-4.0.2.tar.xz 1626808 BLAKE2B f66ebc3650c7288d46ed4548f07c83cbd591873a5d364965d6768e6455f64334cb03cb91e83a110d5edaa917c7fed714cf66154cea5c0ec22ef982429ad03265 SHA512 069f68b6792521d94d4003764006ad8fbe9a17c60a88212629204d9a5eb3f662903fff6d91dd3c1834597b76c18f9d3231c93a033f456c59c0571ac13eb77b27
 DIST gawk-4.1.3.tar.xz 2311268 BLAKE2B 956872ef3c8bdf27ccf9c3f7f158f161f42bb8607af7f966e843e24cb4e4e89380cd05a3169157cc822ea5ce8d849993b952795ecd0ecf14213f0bdd689d1b16 SHA512 8b9470a1bba397353f10e4e652e8589a637a49e8235fb39ca7681ae662fd27cd140c193d0634179c800f99e19b0e49aef55dfa6612f9695ba80760a36936a1c3
 DIST gawk-4.1.4.tar.xz 2367832 BLAKE2B 67004e2867e4c4f43aac7142a52c83642d8bb3b0a5451293418bc15e575a8ed1d97c0a975e084bf46ffd1c27dc70e48de492cd2e007773622ef14886b9269ee1 SHA512 6a0e9cf086544212f54b54261dcd517b611aaf495ef99c4b7740d07e363bb00c5632f3d7fd5e12a954d5aa9793764162a57453e0e18884b29c6c54b5f444c097
 DIST gawk-4.2.0.tar.xz 2948108 BLAKE2B 6e46b70480184edd3a70bcea2b4e4448b4dfbac317be6e1a6d9225bc6c0b42abe49fe9380231cb3fc87efd449d2c5232ac7099b4c4472c3815a52200ef0013a3 SHA512 3076b2f42e43fff0ce63dcaa3fb749ce421473d0abc3e1e2d9dd375207d3e35c98d5bf91c3179f49156e8a4977424c16bb2d3d662846ad487153729dd4cfeb4c
 DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
-EBUILD gawk-3.1.8.ebuild 1782 BLAKE2B a960ff46bb378cadf1b7125fff29ac6045e403d1052025621fe565145f792a43a79cc4ac540faf217670f69ffc8a0b9b5af4b7a231de624c3c0d6832737c68ac SHA512 747c9f7f32af7469b7359bbaa7e329a84c78aaf0c8c122a0003bb3e32dad47d1470edd30f215504e0305027b40a3e72e8000ee3889e7cbc4c427ebd12bae884c
 EBUILD gawk-4.0.2.ebuild 2076 BLAKE2B 73d9ce392a42ee14556b70be84ed284108212c471d7e31faaaf07305c525ed73d16df7d3bdc12539ca50352c861a4ed7ca291a376e7516c0f4facf1bc1e813c7 SHA512 69f941d2eb134277c70b4e7ea4364a8902d7522903064192c7f306219128fb45f0a2d42ed79c852da918acb0c740e49052d36a5e27d331d239c6e6d811b7cc41
 EBUILD gawk-4.1.3.ebuild 2003 BLAKE2B 55c637567276e73fbb4032c3d297480a769ee0769a354ec491a857da2afb9708ad650d5f70db1224d315dd82675316cff38ef0ac3af83cbcf280dbfbbc24078c SHA512 87b224aa2cd9b231eb088b588242860ef323913ec64cb403f7622504f82e8d4431fc7f0b53d5bfe33df5c2852b5b6390b235870d4a9e3058fd4803dab2eeadd4
-EBUILD gawk-4.1.4.ebuild 2091 BLAKE2B be60bed6d3882d4c879928a513b335a9027a4bdd3679170c5b6e8ecedab5d2d1ecab44b8d48796eaea8de617dbe4f8ecad55ea53a0058a02cc7672a54f4593bc SHA512 6e5491b47841e72d192b7e968d480b9b12ed41d8cbd702dd9d1afe948bf80e98e48c90a9a89d7f6377c9e69c2b0f3e86bfc8fdab6e03d1e50c87307660568d27
+EBUILD gawk-4.1.4.ebuild 2090 BLAKE2B 157b0b2d6eed94587109451db8aeae9b809f16e2adff1735d9111ff486ccacdeb0f0add59cb23f58ef80e72fbd746bdf80ee029bffd1ccba5219f6609b124d00 SHA512 59ba5329f4334688408e6afd9fcc0556f87e46bc5f860ae140197c7b0a2a62dfc6236199a9588c1ee57f4ab946ee924bbba804abbfd0125f8acf4dbecaeb9589
 EBUILD gawk-4.2.0.ebuild 2217 BLAKE2B 7167b9d789eb38036c4ae2d46ee00c8ab29dcf959920e92a3529380fd132126c27ef5125cfa52165551fb6134217230512f98a31259316f4977ff5013df56038 SHA512 8711fd432cb13b920561bf5ced80694c3cfdca84932301bf5ffa505a3fdc0d1d07f108534ba18cb386cc05061afa00466d301d46b69abc5502f315d094a982aa
 EBUILD gawk-4.2.1-r1.ebuild 2574 BLAKE2B 887cc51f129b56ace31986b3718c3ffadb8f19a197aa59427ccc706032e4373d0bb80ac6484405da2f2fd8417e8d7759a07d7b895ad59d415d6d9889ccdb6920 SHA512 4abd41cb11ba0cbbf8ccb2ef9459678af6ac6507a400a8cbd7d96f41045847101ab22721ffc2637e2717bf88f591f04adb817ae91360e8573ded16ea16c4c31b
 EBUILD gawk-4.2.1.ebuild 2204 BLAKE2B 82c60e85badb8d968c796c6aa83ed366b0b399fb32342bfecabc6aeba7dbfce73361b5a7968d9a61269d0c25cfda7c5add6159f62aee7dd6fc35f4f1bf93445b SHA512 b814c89f185cf3086c7a06f2bfe2a1bae616a9b5bfd062ab9c230c043f9072ead65ab438295b5c7abb430bcbc9a5c601ce41eb8ce1a0b8e429fbbb9a3881bb6d
diff --git a/sys-apps/gawk/gawk-3.1.8.ebuild b/sys-apps/gawk/gawk-3.1.8.ebuild
deleted file mode 100644
index 8d9f004395f2..000000000000
--- a/sys-apps/gawk/gawk-3.1.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils 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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND="!>=virtual/awk-1"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-SFFS=${WORKDIR}/filefuncs
-
-src_unpack() {
-	unpack ${A}
-
-	# Copy filefuncs module's source over ...
-	cp -r "${FILESDIR}"/filefuncs "${SFFS}" || die "cp failed"
-}
-
-src_prepare() {
-	# 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
-}
-
-src_configure() {
-	export ac_cv_libsigsegv=no
-	econf \
-		--libexec='$(libdir)/misc' \
-		$(use_enable nls) \
-		--enable-switch
-}
-
-src_compile() {
-	emake || die
-	emake -C "${SFFS}" CC="$(tc-getCC)" || die "filefuncs emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	emake -C "${SFFS}" LIBDIR="$(get_libdir)" install || die
-
-	# Keep important gawk in /bin
-	if use userland_GNU ; then
-		dodir /bin
-		mv "${D}"/usr/bin/gawk "${D}"/bin/ || die
-		dosym /bin/gawk /usr/bin/gawk
-
-		# Provide canonical `awk`
-		dosym gawk /bin/awk
-		dosym gawk /usr/bin/awk
-		dosym gawk.1 /usr/share/man/man1/awk.1
-	fi
-
-	# Install headers
-	insinto /usr/include/awk
-	doins *.h || die
-	# We do not want 'acconfig.h' in there ...
-	rm -f "${D}"/usr/include/awk/acconfig.h
-
-	dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README README_d/*.*
-	for x in */ChangeLog ; do
-		newdoc ${x} ${x##*/}.${x%%/*}
-	done
-}
diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild
index 90886233ae56..6798442e0645 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 ~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 ~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= )