gentoo resync : 22.05.2021

4 files changed, 15 insertions, 181 deletions

diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 5eac25c4b372..7df82ea3476e 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,7 +1,3 @@
-DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
-DIST gawk-5.0.1.tar.xz 3136004 BLAKE2B 1dd8a9bca2488f2d3c946406b01fcbdce0487922ece49fe2121c39d6d10bcfcb6a056edbbf88ba6c22772ef88a250fc8ffcba33ead399c0d7c8f5d19d0e896d3 SHA512 ff9842a91035f843482d93eac8a35cddf2ce16acaa43a0112c1efff08802aebf705ee70d47eff74a190dca7be330c31f7204ad27cb63bdee65333f9b9c984212
 DIST gawk-5.1.0.tar.xz 3154564 BLAKE2B a969b03f45e1d830d2b3760d75530de97eb521a35ac448cf441d7fd2d1a8c1059bd9240cb9571f58ef6ec122864ced3d274a07453c3138177deda895ac3433d9 SHA512 971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4
-EBUILD gawk-4.2.1-r1.ebuild 2134 BLAKE2B 255819f4770c9e4796b12afba955c8f630b0a172355046a1f82784cc05831bd6a100560ccf48bb613a5c72b44f03ec5e73e8d3a13274b0ddbcc439c9dcaf92c4 SHA512 c08ca0cd2b39c6363f584c1c7f282716463212c412e4da669093e4b1993f1cbdffe0295895ff05423df140f4a120c6c249320df88a3d9e27bc4ca2b6fa730e22
-EBUILD gawk-5.0.1.ebuild 2192 BLAKE2B e375f9837533cf752da243d6b57654e9ffb7fa48f9c373326ce52d0f0e3e7472d415510dfb0f55359143dd3b6a2c904b61c6477477608d3904faba634e6771ca SHA512 77592089b5a3874b9da86656d4d5e23cfdeb4915a4ced2b12e103f69544313ba85675a372002a79e418dc2a7576aa4d8080d668c138ee1749ba173b91926e0fc
-EBUILD gawk-5.1.0.ebuild 2241 BLAKE2B ada491a20edaadb144bd0e74b0e17465ee9f1279d7db8aa7f0384816dc3d2c9fbfb625143626a99e60ce616e47742180b2dc78c1d352f888bd088f6472ffca3e SHA512 79f4156c388d0ef5fcd39df99df35e17620871a30c07d9e30939b006e675a6a263cebf70e2324e7fc3090d3ce19b4a74a58201f06b4d99c1de91c73d6579c368
+EBUILD gawk-5.1.0.ebuild 2253 BLAKE2B 85d67442d466b13c314f13322c6fc95ac5f374bcdd5950aa9aa4699d17a78cf7553cc72391405c401ed8c60131c1fbe271569834935b2cd3fd74c9976b2dfcc4 SHA512 b3d7a425ab63b1d0ddf625be4dc1521518adaa4140d19403e79d87c494abc9f61745b75a2b8e39615a8a7a5f5e71a4ff3f78d36bf8941235b3e3c474d04c699b
 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
deleted file mode 100644
index 0fb4a83be30e..000000000000
--- a/sys-apps/gawk/gawk-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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
-	# fix standards conflict on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i \
-			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
-			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
-			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
-	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
-}
diff --git a/sys-apps/gawk/gawk-5.0.1.ebuild b/sys-apps/gawk/gawk-5.0.1.ebuild
deleted file mode 100644
index 4d4f28b7627a..000000000000
--- a/sys-apps/gawk/gawk-5.0.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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}"
-BDEPEND="
-	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 || die #413327
-	# fix standards conflict on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i \
-			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
-			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
-			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
-	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
-			if [[ -e ${l} ]] && ! [[ -e ${l/gawk/awk} ]] ; then
-				ln -s "${l##*/}" "${l/gawk/awk}" || die
-			fi
-		done
-		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
-		eselect awk update ifunset
-	fi
-}
diff --git a/sys-apps/gawk/gawk-5.1.0.ebuild b/sys-apps/gawk/gawk-5.1.0.ebuild
index 3ab54c018ff1..3c3416405784 100644
--- a/sys-apps/gawk/gawk-5.1.0.ebuild
+++ b/sys-apps/gawk/gawk-5.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs multilib
+inherit toolchain-funcs
 
 DESCRIPTION="GNU awk pattern-matching language"
 HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
@@ -29,13 +29,16 @@ BDEPEND="
 src_prepare() {
 	default
 
-	# use symlinks rather than hardlinks, and disable version links
+	# 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 || die #413327
-	# fix standards conflict on Solaris
+
+	# bug #413327
+	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die
+
+	# Fix standards conflict on Solaris
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		sed -i \
 			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
@@ -46,17 +49,21 @@ src_prepare() {
 
 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
+	# Automatic dodocs barfs
+	rm -rf README_d || die
+
 	default
 
 	# Install headers
@@ -66,7 +73,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	# symlink creation here as the links do not belong to gawk, but to any awk
+	# 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
@@ -76,6 +83,7 @@ pkg_postinst() {
 				ln -s "${l##*/}" "${l/gawk/awk}" || die
 			fi
 		done
+
 		if ! [[ -e ${EROOT}/bin/awk ]] ; then
 			ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die
 		fi