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

22 files changed, 18 insertions, 130 deletions

diff --git a/app-alternatives/Manifest.gz b/app-alternatives/Manifest.gz
index c1dd6e6aa469..2efcb15c5658 100644
--- a/app-alternatives/Manifest.gz
+++ b/app-alternatives/Manifest.gz
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="
diff --git a/app-alternatives/bc/Manifest b/app-alternatives/bc/Manifest
index 884f37f21138..8bb4d6dad69c 100644
--- a/app-alternatives/bc/Manifest
+++ b/app-alternatives/bc/Manifest
@@ -1,2 +1,2 @@
-EBUILD bc-0.ebuild 735 BLAKE2B ffe9200a60a5ea61c79807653369f8eb0112f4f84a1e396e742ea39b6e5ce96834b569f3a24e4e43267fd212580127d277f889e881abd81c671145a61173c82e SHA512 a64496bc98f8258bc85b12fa7cbcaa11c3f159091f01ae2efa67cf00962d72640e8d040eb77e27ff851a8bafb245600ff19cb4b2b2a0a363b6080450e535eae8
+EBUILD bc-0.ebuild 730 BLAKE2B e030f9c03bb3556881860af09175c7662e61373676c82e3371e067c3dc8748c146791798c210a7241aa6dd9f87b16c27acee8a8d1c66cb0b6e8c300dc325ce1e SHA512 1ab4b0b65a47a14a850b5fa0ef22618557ca1a8e7a3c50816344aa2375e14d062d4fb59f87e249ab349ba1bb7793e713459a9f5a1f9016836d7956086f84587b
 MISC metadata.xml 545 BLAKE2B ad10ffcda18dbd1728a7f63f504d4ecd8c3c864c7c3265416c8060bb8e685030e48df6d7e784083ee0d587b57f91be9b1e1401569880458b0c40e3fea63f4f5c SHA512 4a95c94b8a5f6f14171cccaacad08207570550d826f232033f581b8a974d095f73f2c3c0f70c3fd41d33507a7fa8644751724702b75467ae394edb39a44fd404
diff --git a/app-alternatives/bc/bc-0.ebuild b/app-alternatives/bc/bc-0.ebuild
index e7731ba6e204..0a4314eb3f6f 100644
--- a/app-alternatives/bc/bc-0.ebuild
+++ b/app-alternatives/bc/bc-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="bc symlink"
-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"
 
 RDEPEND="
 	!<sys-devel/bc-1.07.1-r6
diff --git a/app-alternatives/bzip2/Manifest b/app-alternatives/bzip2/Manifest
index c9f5e82e68e7..23aa6c92bff4 100644
--- a/app-alternatives/bzip2/Manifest
+++ b/app-alternatives/bzip2/Manifest
@@ -1,2 +1,2 @@
-EBUILD bzip2-1.ebuild 939 BLAKE2B 01adcf5e485ec8377bef2dcb92d8cef4534e1bd93df088ece7a3bd9a4679b8835836b3dd41bfd12c830854470413c04492513f534ee91afbd1f1cd0f9f5f75f0 SHA512 e923b6ee61474360beff66ac6275f494d62e587658fcaac01bc70f21ee4c454d5c8de2a4585e61453ba1cc6a5bbea182f8687613e9c54caa020afff688225280
+EBUILD bzip2-1.ebuild 934 BLAKE2B 1aba6cbf4ba3d2e2e6ff3c349054b1e07df043d19878ea9b78bc54c182337951f035faa163b5638db4190c3b3b78eb63464df53d7087c487f53db77fb717ded1 SHA512 4b512cfdfde59007642d7fa60ba930237f4790323b3e023fc6591384becab042a2a0960df2d174b24adebf9af8785044f94e994eb9ff0879050c39ea8616d9ea
 MISC metadata.xml 608 BLAKE2B a8bd6f79e552943ee891edc7e90399c77dca3347ce407767902446d0e25720eacc137a6ed31fb851553caf8a938cf6be63c7a1451b2b8aa4a3c367995204216b SHA512 a3863d41f2b3475e64903389efa2b0f8258bf5f21df4e83ff0e28fa44519b012ab92d4a773d05089d7fcf210e4c29da63d25be8e9e098d15284e13dc75bfcf6d
diff --git a/app-alternatives/bzip2/bzip2-1.ebuild b/app-alternatives/bzip2/bzip2-1.ebuild
index e7436a4d3fa8..01751e93d3f2 100644
--- a/app-alternatives/bzip2/bzip2-1.ebuild
+++ b/app-alternatives/bzip2/bzip2-1.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="bzip2 symlink"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="split-usr"
 
 RDEPEND="
diff --git a/app-alternatives/cpio/Manifest b/app-alternatives/cpio/Manifest
index 49f78ee4c7ea..44db64fb2b1e 100644
--- a/app-alternatives/cpio/Manifest
+++ b/app-alternatives/cpio/Manifest
@@ -1,2 +1,2 @@
-EBUILD cpio-0.ebuild 803 BLAKE2B df789e6062dc351d48951878960fc6e8ebc7e73a146b43b9d99cfa2205b74fb7ee15878cbbbf215f4e136cefc36960f489bccaae106a776f032589433e68ce82 SHA512 61bceaf7fa8e3ffea57bd5cfb771d0b9b42763eaff9d118e7bb523b9a1258dca75a10ef73eb2ba71d1ed2a14937c6d53fb76a4dcdbf269573dd457b478d59f1a
+EBUILD cpio-0.ebuild 798 BLAKE2B 881a4001dca1f2aa2958ed27f0b2c19dfcb35bbcb317f19e1a7c54ad798a1977a20e450697f84d0d45af1303d3fd34fdad7adf61f268395e3fded8decbafb3cc SHA512 0fc2dbdf48383baa69fbf30c42e8ea2b6b223f6029123d4f98322e15330472ba2021efd7e345c1923aab28286ea36eead0011c3571ca7b0ffadee4501d73fac8
 MISC metadata.xml 556 BLAKE2B 50f93b411b7b21af21a4d071bba8533ed58c6ff5bfa1f18bf6025c1c11dfea1be089777f3e59972c72deefcfb54bedc2065f188e0b75c369bb683b9a17ece639 SHA512 7db5fac74ffcbe3344a06f5a9f5360c07648aac7b5080985b110f2b072412ead598ac5bbc5c2f48bd15077e1bc11e36fc8491a7bb898a761f8c6977a753f067a
diff --git a/app-alternatives/cpio/cpio-0.ebuild b/app-alternatives/cpio/cpio-0.ebuild
index 34e2c56b3dfe..a7b0273d1d09 100644
--- a/app-alternatives/cpio/cpio-0.ebuild
+++ b/app-alternatives/cpio/cpio-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="CPIO symlink"
-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="
diff --git a/app-alternatives/gzip/Manifest b/app-alternatives/gzip/Manifest
index 2709cf1e655b..3a988bbff91b 100644
--- a/app-alternatives/gzip/Manifest
+++ b/app-alternatives/gzip/Manifest
@@ -1,2 +1,2 @@
-EBUILD gzip-0.ebuild 1094 BLAKE2B 9de64372afa52ea2b2326a391cba2e658d087b7eff0dc67fab776e354f7763c7f6abfd3709b2fe65a4d0e6987993cd33bb342351a8566ffc32247b40820937e8 SHA512 f1aa57dcd9ff101890eaa13b3931091b121e88e0f5438c085d6de0c82fb4ba6d26bd58ae651eca148ed76af2800fd0715fb5cede805bb18f36d92d30422c9684
+EBUILD gzip-0.ebuild 1089 BLAKE2B 04a7c9913442ca5933686c9be94425e262378f42804a9002e7aef5d81b1c5c5315fd2f55ff3941139bb5ecb3434fe374ebe233d2c720f1358964e46d34fdb8e2 SHA512 69b5f59f4abb04727eabaa5a795a0f6a5f45fe0ee65860cf0ce81e7426c5e57a10c1c2bb47532ef15d430d01a9e64dca5e0f75e3f75ec14681ed654b020f0bff
 MISC metadata.xml 528 BLAKE2B 099aec3cb340caeedc0fc6e2f62162baf276b1262b4758dd39695a03ee5110c717a9b553190762c939171d7776b2048fe73c1fc7a966eef916e992abeed0ec21 SHA512 e654f8d548769c00425cd9a3f796c17af28300ea297294b335166f023164a5696216135badc82074b6a88669114f7db819af827aad8144987c7cfc7a474a2191
diff --git a/app-alternatives/gzip/gzip-0.ebuild b/app-alternatives/gzip/gzip-0.ebuild
index 9140ff3fb3b5..4d19fb28ba7c 100644
--- a/app-alternatives/gzip/gzip-0.ebuild
+++ b/app-alternatives/gzip/gzip-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="gzip 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="
diff --git a/app-alternatives/lex/Manifest b/app-alternatives/lex/Manifest
index 169fde41b90f..308b081e46a3 100644
--- a/app-alternatives/lex/Manifest
+++ b/app-alternatives/lex/Manifest
@@ -1,2 +1,2 @@
-EBUILD lex-0-r1.ebuild 652 BLAKE2B 4a9310be1dfb360c11947ff281b74c574fd6a5f29bb917ed050488de7dbed3a129e2ea7d4e62268f11ae949cf27e79c899b3325f3ef78b656eeabe5128008442 SHA512 38035bce596e4aff3b28dadc42167a0e73b5cb660c4fe8f03e4540325d50bbdf766d46faad7cae9d8a027de49fbb5b0caa44e22d9633b70e4dc00f2767f09fed
+EBUILD lex-0-r1.ebuild 647 BLAKE2B 910a78bcf568b3cd819bb1321960e5a0a4afa3b0560a4b176925def2bae4038c86eba85ec4830ac64362ed3ef9fdd07f7defcd71a357906e30de47d2f5371031 SHA512 ec6f1890fe4d84ddf257afe272d027e5ffce541ddcebed05bd8a1a9156849888507c238c7201e2682a78a32f673a3e9778a8e5cc2f7dfadfbd5179e5f179e304
 MISC metadata.xml 529 BLAKE2B 6873948a644263911a6e796fde57e41b69c108e3ec01b9c07a120c1786250a9718f4d736fb5918be27c9b72ee36cf5cab4621478f2917f9bcd45f6276a7e645d SHA512 d48d002ecfba6746fcea824310b738f7839c744e7bfbb4ca95c3c037258103f30dedfb8ca2284d21e6bd56910bc5e9618f8b9351a7f7e290850ae06034e37f3a
diff --git a/app-alternatives/lex/lex-0-r1.ebuild b/app-alternatives/lex/lex-0-r1.ebuild
index adc26f7ee445..74bc78455949 100644
--- a/app-alternatives/lex/lex-0-r1.ebuild
+++ b/app-alternatives/lex/lex-0-r1.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="lex 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"
 
 RDEPEND="
 	!<sys-devel/flex-2.6.4-r5
diff --git a/app-alternatives/sh/Manifest b/app-alternatives/sh/Manifest
index 9882e835d5b7..3137e367d114 100644
--- a/app-alternatives/sh/Manifest
+++ b/app-alternatives/sh/Manifest
@@ -1,2 +1,2 @@
-EBUILD sh-0.ebuild 832 BLAKE2B f0b3e6215332597638af6d8c8333ce201bf228d420bd83481b5d311ec1836141d9078dce9056ddbafded22d4bb8261e65af510f081b27d37fc26783dc80a044d SHA512 b9e5f227428a3c2d358016f2802069d2d8c1fd359f7f06a22667cd5e097830ee848579e19d20a39b21a2d9cd8ec89cad400db06b72a1c182f7308183d8ca2eae
+EBUILD sh-0.ebuild 827 BLAKE2B b9615d38bd8bb2e1804f8d1bd63049986043e06592b93547803a06938aa870c3dedb825ee513bfed9926371e78fe83b5f31c4b9096c0509afaeb2445927826b8 SHA512 c23964f6d0c65ef17856cc8193516023e8590634f6623683e228f330cd652d33279cf4c8363690a126d5ed0f2d223b5d8c34722529b060acd280301804b14ee1
 MISC metadata.xml 759 BLAKE2B 4f691499f0da47c72c61999275d72604093856ff5440a7f72fdf9a6fe09ac86ce8d07e453d8a88ee9747142cf506cb4824223f9372ba2c8f0414086a3390a239 SHA512 2d2c06a26faf1cb72fea2f201a3bdabed020d8e2f1fb6bd86fdb985274a76db14080410982c74d3d5e5ccf483f1c280f2ea77d3d083d87985f36b54c190b2ec9
diff --git a/app-alternatives/sh/sh-0.ebuild b/app-alternatives/sh/sh-0.ebuild
index 42d3ba34092b..4cd530a89d9c 100644
--- a/app-alternatives/sh/sh-0.ebuild
+++ b/app-alternatives/sh/sh-0.ebuild
@@ -14,7 +14,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="/bin/sh (POSIX shell) symlink"
-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"
 
 RDEPEND="
 	!!app-eselect/eselect-sh
diff --git a/app-alternatives/tar/Manifest b/app-alternatives/tar/Manifest
index edf3c67b94b5..4c993c88c80b 100644
--- a/app-alternatives/tar/Manifest
+++ b/app-alternatives/tar/Manifest
@@ -1,2 +1,2 @@
-EBUILD tar-0.ebuild 792 BLAKE2B 9a1773917a62b18ce1abd8da9761e29b6549f5292c656c736c1e42a342fdd9978376e984195364a477aca6f610ea074dd8b765c85d550b6d1eb200b39b49099e SHA512 10ac11d68eeae4c3666b2433d5bb01c85c33d5f4070b9045dddd67a76bfc3fb38a2b3945e038238950b7ff99434c6c0eacebb2b8c929730bdc46cc82579c1dc0
+EBUILD tar-0.ebuild 787 BLAKE2B 9eeff77f5894db11d27ccc1450cac32a2ebfcee21461448c759119ef700ca98e661836a04391c122f0a1b00b83079d444b2f8aca1b23b307c161f902efc5f685 SHA512 0a3368b868ccc6d7136af1f9af9201253cbe0e090c82133f46880b6bae1e922640ac0de479fecf12506c1a0bea908a1f1790ee9f972dbf36dde70f1583418a0f
 MISC metadata.xml 553 BLAKE2B 084e137dd7317424c0d3555fd867ae581bb3b629705e5be59985577dbf7acb6dbc2f250ee35300cab20f0a6e7b960af12a85192c8c23fe4d3e366b176d4ac1df SHA512 4c7467710211812afcb8f91c412ce2f909a2d206ab05c9279c616a9579be67f8a000559613c50f7c7246607626dd2dc0270818f14c14f98cd7bff2eda22a9e9f
diff --git a/app-alternatives/tar/tar-0.ebuild b/app-alternatives/tar/tar-0.ebuild
index 067085895738..a62d6ee20436 100644
--- a/app-alternatives/tar/tar-0.ebuild
+++ b/app-alternatives/tar/tar-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="Tar symlink"
-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="
diff --git a/app-alternatives/yacc/Manifest b/app-alternatives/yacc/Manifest
index 8595eeeadb84..e2d700c9449a 100644
--- a/app-alternatives/yacc/Manifest
+++ b/app-alternatives/yacc/Manifest
@@ -1,3 +1,2 @@
-EBUILD yacc-0.ebuild 536 BLAKE2B ccb4b1c59c0452254507b81a52c1d9147a109fdf968ad2e71b5776735e5c59c8aa0447964614941e22d927b995c5ec045bdfa8f890fb5a1874f462ca64459f21 SHA512 aff6ef4ac24044dcec4484395cd4b155617035f8c632fd6550e8a17b1c467e0c164880ca1d0ac9df86f00df09d0879f26063457b85807874361fac822879fe57
-EBUILD yacc-1-r2.ebuild 1187 BLAKE2B 6369f6bfccf9e15370bf3fbbb8f874c57e433e1794d712a6f85ca8e084109b5a177934a7511d8f7d714469799a80e591c71e4045cda89724fae1caffd4e708f4 SHA512 4a020a4a8f16113a1f9679668ff87c264cd3c8b6674ede711a0876759fa2847f8627ee20b4ad3a9b6214e3c5dc72e3d1fafa9583e8876937930b11dc235d87f9
+EBUILD yacc-1-r2.ebuild 1182 BLAKE2B b9b9ff690049e09962d3c141e3adf28aac4cbd53292de69f0f0dbb8d13d7b7bedc859da7c9b1240bfe97800eaf3750bfa0a07a9ebbfc3109a34c7e32096de223 SHA512 111e4de170a027c877a02528e881b06d295cbdaeef28cfbbdff4ad6f795231e5851bb4c0e0311be7a2a8bfe5a0f5f8faa3247bc83e45621ae14b24ae195f7819
 MISC metadata.xml 604 BLAKE2B a40366e6a7aab1ac9658b2b46cc6409486d2e2b7ac456209b4151974f48facc65e68d2e44965a6eb0680af47663a379da050bfbcf480e6af50951ec6d03647e5 SHA512 24329bbcc9bd0a589559c621a89b0dc26f304f47cdbd62e09bf5d33cb190bdecfc352527970c072080a3c9a7e4a7193b6d7c71ab0a0c83d0dcb76f03e0699a5c
diff --git a/app-alternatives/yacc/yacc-0.ebuild b/app-alternatives/yacc/yacc-0.ebuild
deleted file mode 100644
index 40f51b6795ac..000000000000
--- a/app-alternatives/yacc/yacc-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for yacc (yet another compiler compiler)"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="metapackage"
-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"
-
-RDEPEND="|| ( sys-devel/bison dev-util/byacc dev-util/yacc )"
diff --git a/app-alternatives/yacc/yacc-1-r2.ebuild b/app-alternatives/yacc/yacc-1-r2.ebuild
index f3530cc61e9f..2ea175912138 100644
--- a/app-alternatives/yacc/yacc-1-r2.ebuild
+++ b/app-alternatives/yacc/yacc-1-r2.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="yacc 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"
 
 RDEPEND="
 	!<dev-util/yacc-1.9.1-r7