gentoo auto-resync : 28:12:2022 - 02:11:45

4 files changed, 2 insertions, 100 deletions

diff --git a/app-alternatives/awk/Manifest b/app-alternatives/awk/Manifest
index fd2c3cd4bc32..fb2dc5123e2b 100644
--- a/app-alternatives/awk/Manifest
+++ b/app-alternatives/awk/Manifest
@@ -1,4 +1,2 @@
-EBUILD awk-1.ebuild 554 BLAKE2B 29fc3ad3018b3ce17a24c250e22789105c8a564fdda0c2185401fe999ccb2d33eae2afacef01042e3b58e968b906452e9fb623f0a804c0a0954042297146abf9 SHA512 53db324987a3b7dc3c49f4d5d2060b8d065aa5798be2084d75c5eea89344205118ca301ca21ecc438d45e28ea1eb60357d44c2fe0b52ae1602636bf85535d1d0
-EBUILD awk-3.ebuild 1892 BLAKE2B 12cd663174733bcfa68088e0cb1b300c61b7abc0f8c4d4893c208f92a54ccce30b5a16fc9dea84abbe36cc5f5fac76e3287b688a939598b7ed831eea00c7a36f SHA512 35014be447b3516fc04931d5bbfe2aa70a5bbbc55280c559d3b2bd4840b005a875ea96e6ece253677e5b4572b5a04aa0ff16a4f6356fe20d63d2eaa8752d6f98
-EBUILD awk-4.ebuild 2565 BLAKE2B 402884620dfc701f8dca5756775840b47da5aede1ba724235640f96793a675eeb3cccad877e66576ffa3349aafcedbbe2d4ceff533fa0e20002480fb3cf3cae0 SHA512 0931e2cf0292ec56b7b3a2b777689419f69087d82622bf8a5f47fbc74bbf5d80a80ce00c4f87dbf4ad89ccc5f712609986b5f1a35877ff578db3b35224ff4702
+EBUILD awk-4.ebuild 2557 BLAKE2B ac6afcaa55fe0e2cd3088c830ab73dd15ea8308ef0abd2e3cb4a9a31727794cf08c9eaba1a6d3918fc9e3e85f8d61c24966cda02a465b9916426827f4e89a407 SHA512 3244d51d466d5b0dc3dd9c4405045fbb56d9c0486e06353465448fbf2301b99a903181fbef2b5021d2de844ba5e76dcce22699f6923cf65e2da83b2540978abc
 MISC metadata.xml 829 BLAKE2B bf4375b33e702c61a3f8553e1b63110acab32b68d4ac2d905b6dd12a2204484bc5c2f3a34b2ec127a6c60aac8c105949dbc6eb5ade3a1c8c959afdabdd3658a1 SHA512 32252970d3b12c7a5b9fc7c7ffae821908b9bd4101372e699c70e64572fd7563121427ed5971462417d8c2e6155e47f567ac3bb057d457d58648c5b4d2458974
diff --git a/app-alternatives/awk/awk-1.ebuild b/app-alternatives/awk/awk-1.ebuild
deleted file mode 100644
index cef6aea276d2..000000000000
--- a/app-alternatives/awk/awk-1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for awk implementation"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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"
-LICENSE="metapackage"
-
-RDEPEND="
-	|| (
-		>=sys-apps/gawk-4.0.1-r1
-		sys-apps/mawk
-		sys-apps/nawk
-		sys-apps/busybox
-	)"
diff --git a/app-alternatives/awk/awk-3.ebuild b/app-alternatives/awk/awk-3.ebuild
deleted file mode 100644
index e47aaabd1b09..000000000000
--- a/app-alternatives/awk/awk-3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ALTERNATIVES=(
-	gawk:sys-apps/gawk
-	busybox:sys-apps/busybox
-	mawk:sys-apps/mawk
-	nawk:sys-apps/nawk
-)
-
-inherit app-alternatives
-
-DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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="split-usr"
-
-RDEPEND="
-	!app-eselect/eselect-awk
-"
-
-src_install() {
-	local alt=$(get_alternative)
-	local root_prefix=
-	use split-usr && root_prefix=../../bin/
-
-	# We could consider setting AWK=... like we do for yacc & lex,
-	# but it would need some testing with a fair amount of packages first,
-	# as autoconf prefers gawk.
-	case ${alt} in
-		busybox)
-			dosym "${root_prefix}busybox" /usr/bin/awk
-			;;
-		*)
-			dosym "${alt}" /usr/bin/awk
-			;;
-	esac
-
-	newman - awk.1 <<<".so ${alt}.1"
-
-	if use split-usr; then
-		dosym ../usr/bin/awk /bin/awk
-	fi
-}
-
-pkg_preinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		# if we are upgrading from a new enough version, leftover manpage
-		# symlink cleanup was done already
-		if ver_test "${v}" -ge 3; then
-			return
-		fi
-	done
-
-	# otherwise, remove leftover files/symlinks created by eselect-awk (sic!)
-	shopt -s nullglob
-	local files=( "${EROOT}"/usr/share/man/man1/awk.1* )
-	shopt -u nullglob
-
-	if [[ ${files[@]} ]]; then
-		einfo "Cleaning up leftover manpage symlinks from eselect-awk ..."
-		rm -v "${files[@]}" || die
-	fi
-}
-
-pkg_postrm() {
-	# make sure we don't leave the user without the symlinks, since
-	# they've not been owned by any other package
-	if [[ ! -h ${EROOT}/usr/bin/awk ]]; then
-		ln -s gawk "${EROOT}/usr/bin/awk" || die
-	fi
-	if [[ ! -h ${EROOT}/bin/awk ]]; then
-		ln -s ../usr/bin/awk "${EROOT}/bin/awk" || die
-	fi
-}
diff --git a/app-alternatives/awk/awk-4.ebuild b/app-alternatives/awk/awk-4.ebuild
index 127157897532..1407a6fc464c 100644
--- a/app-alternatives/awk/awk-4.ebuild
+++ b/app-alternatives/awk/awk-4.ebuild
@@ -13,7 +13,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="split-usr"
 
 RDEPEND="