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

24 files changed, 11 insertions, 573 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 865eb0af8dc2..dd907ff33f58 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 63a99c7971eb..7f67e60b0ec0 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -7,7 +7,6 @@ AUX bzip2-1.0.8-out-of-tree-build.patch 1997 BLAKE2B 87791ad7b5c702110a7a45bb4a0
 AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8ababee2b5ff0221965f1ee6675c4060cec841dcf4370018a7fc6376cced900c6410eca96579962d52fd07563d SHA512 19d1a721680e4113c3b3267af74fa5a7ec5947c6630946c60ac5cf165476d9e7c2229e0cb099029dc9f5708b5ba15864f84af198940709144b65dbd2cd3a76a8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d
-EBUILD bzip2-1.0.8-r3.ebuild 3343 BLAKE2B b0b9c71705eb40decdb293ac36edfbb9beb03a5d418c9397d575182b1a41b885fc2dffe57fcd2bc41320eb957e87daf4e4b05a534b0b696e1a4cb14bb1862edd SHA512 0d731c721a9c2df13a70ca40a13ce4cffb4f91dfc2787dd5e86fac97b3dc2d1e6bc0e86d58d50905a39b31d08c1890d02478ce61e5f04fbefc895f2113b4f3ff
-EBUILD bzip2-1.0.8-r4.ebuild 3479 BLAKE2B d992b5f642e0e9a94b8401d2a05e5e10d43985eeb24816c4c5d6117f95a36bcec9df77bbb88654308b35b81b857dbb1e3794b442402c9368c73af48748a1389e SHA512 6e39884be2689966902e7e436c47c44ced891c4e1883b81c2b20a9b0ce5514ebe69e35fe372228537ace898f212e347353a249e9059a6fe630aa8817f6bcf70e
+EBUILD bzip2-1.0.8-r4.ebuild 3474 BLAKE2B 50ef9774bd9cd025b40398f5d43f261295434cd36cbd7d3d63181e40471dbb9073b619d8329d0d0d6d07a1c58fe217e1e84a348753b0ecba7b17b2b9008f51fa SHA512 21e4c927c7e1286f99965f7979b85f1ea7e9f05cbb40f72a30fc78800d72cb49bb8df72fffa901ad6b6f43b39c4dfdd3782c1f12ec9f034c0763b6b7579313f9
 EBUILD bzip2-9999.ebuild 1369 BLAKE2B a85d94d4703d628af61968efc0a76c1f55d701b8be47dd081f342245994fea1394b044646d3e23bf6758abf24b5d65420bf74d3049827bee646d663cb6ec643d SHA512 96b75235e2e79071c2874f8028caf6d0017df56fc469f767ae12515f6d76411d646d284cc3260e8dea0f6d7a2ba9a48de8bc0a38af9068265dac651af0aecaf7
 MISC metadata.xml 384 BLAKE2B e74083bed23efd0279d23ea4f9fc048a9a0c253d48757f74a6c0044f5ca6a6b4cb86908db25d42f304b72a8dbf4c3627371ad6ab69aeab9267e8eb21c2053898 SHA512 c358db6bdaabfa401452ceaa8f85298b75ae00e5f7f189768741b4c74ed123be79405c03c7b94707db29b7d60710c441d089c10fa511262ad5a88cd106fb54f4
diff --git a/app-arch/bzip2/bzip2-1.0.8-r3.ebuild b/app-arch/bzip2/bzip2-1.0.8-r3.ebuild
deleted file mode 100644
index 1bdda90d94f3..000000000000
--- a/app-arch/bzip2/bzip2-1.0.8-r3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
-#      (since we're building shared libs) ...
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg
-inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig
-
-DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="https://sourceware.org/bzip2/"
-SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
-SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
-
-LICENSE="BZIP2"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static static-libs"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )"
-RDEPEND="!app-arch/lbzip2[symlink(-)]
-	!app-arch/pbzip2[symlink(-)]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
-	"${FILESDIR}"/${PN}-1.0.8-saneso.patch
-	"${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
-	"${FILESDIR}"/${PN}-1.0.6-progress.patch
-	"${FILESDIR}"/${PN}-1.0.3-no-test.patch
-	"${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573
-	"${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch
-)
-
-DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
-HTML_DOCS=( manual.html )
-
-src_prepare() {
-	default
-
-	# - Use right man path
-	# - Generate symlinks instead of hardlinks
-	# - pass custom variables to control libdir
-	sed -i \
-		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-		-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
-		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
-		Makefile || die
-}
-
-bemake() {
-	emake \
-		VPATH="${S}" \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		"$@"
-}
-
-multilib_src_compile() {
-	bemake -f "${S}"/Makefile-libbz2_so all
-	# Make sure we link against the shared lib #504648
-	ln -s libbz2.so.${PV} libbz2.so || die
-	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
-}
-
-multilib_src_test() {
-	cp "${S}"/sample* "${BUILD_DIR}" || die
-	bemake -f "${S}"/Makefile check
-}
-
-multilib_src_install() {
-	into /usr
-
-	# Install the shared lib manually.  We install:
-	#  .x.x.x - standard shared lib behavior
-	#  .x.x   - SONAME some distros use #338321
-	#  .x     - SONAME Gentoo uses
-	dolib.so libbz2.so.${PV}
-	local v
-	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
-		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
-	done
-
-	use static-libs && dolib.a libbz2.a
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a bz2
-
-		dobin bzip2recover
-		into /
-		dobin bzip2
-	fi
-}
-
-multilib_src_install_all() {
-	# `make install` doesn't cope with out-of-tree builds, nor with
-	# installing just non-binaries, so handle things ourselves.
-	insinto /usr/include
-	doins bzlib.h
-	into /usr
-	dobin bz{diff,grep,more}
-	doman *.1
-
-	dosym bzdiff /usr/bin/bzcmp
-	dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
-
-	dosym bzmore /usr/bin/bzless
-	dosym bzmore.1 /usr/share/man/man1/bzless.1
-
-	local x
-	for x in bunzip2 bzcat bzip2recover ; do
-		dosym bzip2.1 /usr/share/man/man1/${x}.1
-	done
-	for x in bz{e,f}grep ; do
-		dosym bzgrep /usr/bin/${x}
-		dosym bzgrep.1 /usr/share/man/man1/${x}.1
-	done
-
-	einstalldocs
-
-	# move "important" bzip2 binaries to /bin and use the shared libbz2.so
-	dosym bzip2 /bin/bzcat
-	dosym bzip2 /bin/bunzip2
-}
diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
index 186e670e2c13..38cb103dd55b 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-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="static static-libs"
 
 BDEPEND="
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 3767d94e8d5b..7fba9d3d8f35 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -1,12 +1,7 @@
-AUX cpio-2.12-gcc-10.patch 740 BLAKE2B b129aff7f1c61305ba6b05e57d265439aea3b7da0761788e1a8e2594d903ae1458f757379284a41909765368dc0fad7e960e3a5f7509603f01fcd23c3cef0b1a SHA512 9b86cc1c7dd45333e5e0ceda52ccdb95d93f0be6e6f90bc11ff80a510fd8f707d3ce2b07173b020fcb96202343e06544ec5bf694a42c638313f0195f2a7493fc
-AUX cpio-2.12-name-overflow.patch 404 BLAKE2B f15aaffd716a6dca8b00f0831cd3bfa8971ca8beee6eb04b6ad3974c0d2770ac23669839b348013974ee827affb7b943d4dfa1be8d29b0b77c8ebea5e01791df SHA512 725468331dbb24e37333f9f56d8f295a7e521dd855f97993a2f62bf6b3a8f44d924b868ad5315dd90706ac28fcbb0b7da4c30e77ad5f401e7c5543410cc42f7a
 AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11504b075b1216d20cd8643591abdc3a69afe1db254800327ece8f07f83438756d88c5c10c606b4e14c76a309941dc4ed1f9 SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03
 AUX cpio-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch 1505 BLAKE2B 77be2bbd0df1b7b44e7517aedd4393d5b4cdb5e90508fa45aa961efe32b4061beaf43b23798908c714aa23a252e914402b22a494d0d6def0a4dc8294b8f84418 SHA512 a60cbfb3cc418d9d45e226e6da4c857176ce0517e829e288ffa7dd85b8fcca1c0a7c0ae0e0eab14fdb438be742f2625aa1c3169a41d1fa05c5e3cd426f270687
 AUX cpio-2.13-sysmacros-glibc-2.26.patch 413 BLAKE2B 3114697d3543abf2d1e8eb8a6443cd094cb378a185dd2e48d917d7cbb395a5bc2c2c1dd8207cc2b383f1118b01077a8f2d2f579466c811b41d1e392fda5ce0f9 SHA512 d709e9373a868681a3b9c5a9ad7c8df667df758162dbc0c701ed0826fd478d84f2fc92b21fb56e9366fc19d9816f64fc475df5e1a5a8b2ac790c89f561b121e4
-DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
 DIST cpio-2.13-CVE-2021-38185.patch.xz 7844 BLAKE2B e338950e03c3eed3b4288435c9c75af8f0c3497b43680be4ee347e628db7cfac616b437a848094bf82cfc2c7f29d59b388bf0f6368b3b99770022e3f9533be11 SHA512 4d2cafefcd1ae9d86cb5171de2896799713490dfd9ed27d3dce0886fa4588c8df2b16ad8508a5dbb9155c9de6e40b6d1083bdb4774d967193a270a1dcbe37a33
 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
-EBUILD cpio-2.12-r1.ebuild 828 BLAKE2B dbb7332b54ed751015b8e17c687f088344244543447ddd6f7bd1c66caf0af578f4fe96a8fa0389009aafff3fec0f9a433334dd4c4b047ff9bc0ef675542d2ef9 SHA512 803b31960635ce881ec7c2ce3a3f4e7176899d000c8e30c7a00ab9597c1c09a291e2f6b157226d41e527be740b9b54c7f1655641c52e395351611db7b61944cd
-EBUILD cpio-2.13-r3.ebuild 1364 BLAKE2B 0928510f98e6ad7ad51c7c0de3f488284f59d9c5716806f185bdd252ceaa9e3c1930de501c5ef5f1a17629b0c8347965d6a19b5cbf80dc4831415b82d12ab1ac SHA512 8fc572c47585462e46ea60a8aab904494b1fe5075117115736d479c21c3e9e875355d00e6544f337fb3265e66677af38ee63f32859130f083bcd6d682c98ca78
-EBUILD cpio-2.13-r4.ebuild 1463 BLAKE2B 949dd8cd32aba41a42f15802198ca70ffeef9c0d7edde1d436f3955bb634a37e93be6b2f765ce1a5d53bbac8e5c077aadcbd646c06414ea4e84802790e70888a SHA512 16de4bda8284dd9660814d5468c7bbdfe06a8e9b45a97c64104f069937479a6293d0199dced76517ac89608091fe7c66efd5fc072da05a5c958503fdd99df7f7
+EBUILD cpio-2.13-r4.ebuild 1458 BLAKE2B 8e25fb5922eb396d8c0168e66b04c3a152ac5051a18913b0e5e1c2beb4fc0d65049f5cd009ea4588873fa738a62ff2f17e9f5483c15d3babc30705916fb161e5 SHA512 8ed6030685afe67e1552128b95bc8685259521820c5094b94e47bc11222255d88d04f72d30ec00ef339ffdd61671e40264816c33c97f0ec3a195a72e5784f779
 MISC metadata.xml 328 BLAKE2B f8b8bff5b160351a92837553de20eda1da31a6c0594c1118e1f71b3cd19d9ea8d3420bdce943d83644f5ffc234950f95fb9229a213660767dc5281120085b26f SHA512 08e1c6a03b894946bf6332bf46c8a7534ed0998777b30cb9eecb9c746bb333b65fb41dfeeb6938cbc08d0ad0a303d752ea70a6a6a6ae2c5c2935b2b4e4d9928f
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
deleted file mode 100644
index 684d6aa82dfa..000000000000
--- a/app-arch/cpio/cpio-2.12-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A file archival tool which can also read and write tar files"
-HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
-SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-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"
-IUSE="nls"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
-	"${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428
-	"${FILESDIR}"/${PN}-2.12-gcc-10.patch #705900
-)
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--bindir="${EPREFIX}"/bin \
-		--with-rmt="${EPREFIX}"/usr/sbin/rmt
-}
diff --git a/app-arch/cpio/cpio-2.13-r3.ebuild b/app-arch/cpio/cpio-2.13-r3.ebuild
deleted file mode 100644
index a09ffc983c4c..000000000000
--- a/app-arch/cpio/cpio-2.13-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A file archival tool which can also read and write tar files"
-HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
-SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021-38185.patch.xz"
-
-LICENSE="GPL-3+"
-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"
-IUSE="nls"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
-	"${WORKDIR}"/${P}-CVE-2021-38185.patch
-	"${FILESDIR}"/${PN}-2.13-sysmacros-glibc-2.26.patch
-	"${FILESDIR}"/${PN}-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch
-)
-
-src_prepare() {
-	default
-
-	# Drop after 2.13 (only here for CVE patch)
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--bindir="${EPREFIX}"/bin
-		--with-rmt="${EPREFIX}"/usr/sbin/rmt
-		# install as gcpio for better compatibility with non-GNU userland
-		--program-prefix=g
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# make cpio a symlink
-	dosym gcpio /bin/cpio
-	dosym gcpio.1 /usr/share/man/man1/cpio.1
-}
diff --git a/app-arch/cpio/cpio-2.13-r4.ebuild b/app-arch/cpio/cpio-2.13-r4.ebuild
index 148c41211c5b..79d4ada19621 100644
--- a/app-arch/cpio/cpio-2.13-r4.ebuild
+++ b/app-arch/cpio/cpio-2.13-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021
 
 LICENSE="GPL-3+"
 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"
+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="nls"
 
 PDEPEND="
diff --git a/app-arch/cpio/files/cpio-2.12-gcc-10.patch b/app-arch/cpio/files/cpio-2.12-gcc-10.patch
deleted file mode 100644
index 9c7d7edd88f5..000000000000
--- a/app-arch/cpio/files/cpio-2.12-gcc-10.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 641d3f489cf6238bb916368d4ba0d9325a235afb Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Mon, 20 Jan 2020 07:45:39 +0200
-Subject: Minor fix * src/global.c: Remove superfluous declaration of
- program_name
-
----
- src/global.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/global.c b/src/global.c
-index fb3abe9..acf92bc 100644
---- a/src/global.c
-+++ b/src/global.c
-@@ -184,9 +184,6 @@ unsigned int warn_option = 0;
- /* Extract to standard output? */
- bool to_stdout_option = false;
- 
--/* The name this program was run with.  */
--char *program_name;
--
- /* A pointer to either lstat or stat, depending on whether
-    dereferencing of symlinks is done for input files.  */
- int (*xstat) ();
--- 
-cgit v1.2.1
-
diff --git a/app-arch/cpio/files/cpio-2.12-name-overflow.patch b/app-arch/cpio/files/cpio-2.12-name-overflow.patch
deleted file mode 100644
index f85246884c39..000000000000
--- a/app-arch/cpio/files/cpio-2.12-name-overflow.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/572428
-https://lists.gnu.org/archive/html/bug-cpio/2016-01/msg00002.html
-http://seclists.org/oss-sec/2016/q1/136
-
---- a/src/copyin.c
-+++ b/src/copyin.c
-@@ -1385,6 +1385,8 @@
- 	  break;
- 	}
- 
-+      if (file_hdr.c_namesize <= 1)
-+	file_hdr.c_name = xrealloc (file_hdr.c_name, 2);
-       cpio_safer_name_suffix (file_hdr.c_name, false, !no_abs_paths_flag,
- 			      false);
-       
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 17948b778d32..a7039944742a 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,6 +1,5 @@
 AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611823dfe81ab72f9e1a2bd3547b8fbbae07d2108ac255a1a9dae604f9acb77744bda3a9eec2a575580558a4ca7042164c563 SHA512 4a20d61d48c456c4f5cca31b38e6f26460f781782c66ff4cd1b193eb1a48dd9fa88967989b2698b5e45a61d64c9ce3b87fba0f6b67bf507c5bb386a847f477fd
 DIST gzip-1.12.tar.xz 825548 BLAKE2B 7e2d482c08555f5fb0ff5408c0afe48c61034e9779eed6e3dd8046c847234c0a8a6bc34d49a934a54db0d73033e12c71a228d373551384a4cd663315071637e0 SHA512 116326fe991828227de150336a0c016f4fe932dfbb728a16b4a84965256d9929574a4f5cfaf3cf6bb4154972ef0d110f26ab472c93e62ec9a5fd7a5d65abea24
 DIST gzip-1.12.tar.xz.sig 833 BLAKE2B ab7b4a759ef163d67f20773607ba0408ea9f1f7c7c224f43635fc3752acc521b74dbea4ec9ebb58a2f4fa13ecae19e00779b4b56c2cb95976301445beff817aa SHA512 1f4702797f7c5f1873c2f9c2f6210ba23824455d17ee82f50f0bf24240ed5bdf0090cf85338ccf76ba82422f8b4ad3a329d8bbf1350cb094d7bd61aa45550397
-EBUILD gzip-1.12-r2.ebuild 1715 BLAKE2B fa1cb140c6ff9bc61559a1b03124c57a484c7664012bee6d447717205c08468cdc7136e8f3de47144d54a8bf25ddf44915224ca48842a73dbcf780a1ac452d11 SHA512 3c9d7e44a6362dde64f1f44b833df22080b45119f4a4bd9f20fcba93a1e73e73d7f112ed3669c48ca6ff9da61f2751852c94dd399b1206a2e533a0777737a3b4
-EBUILD gzip-1.12-r3.ebuild 2221 BLAKE2B 3dbc658d3e008cb7ea36b744666fadd8df5b5f4c351cd45b2e4172f25bdb5f867d078eeb949f45fc24386c0cf29bf1b4cf2a7b41a962aca90290ac8a8e913857 SHA512 a59bfc5153683a106a3f20525b2d306403b22be6a08900f2c7af3aebb8aeb45af47920a09c778d164bcf7d25cd84c43eb145e8e1683acac01f057f795972881f
+EBUILD gzip-1.12-r3.ebuild 2216 BLAKE2B 0e504b091287555832c27f125e50641fdb517467ff815573242a7aa6a0850e25d6343ed3a2d49f381ff87b2391d131106fb75052d32c2a7e595cdaef76d44394 SHA512 5d4468f39482473c4fbfb2241a2ed80273aaf0e9f43db141b057a0e022df92e67895216f3dec2061ee9f61f65db84120e8544ed1d74628ee7eb07e361287585d
 MISC metadata.xml 422 BLAKE2B b3ba7db4fdf23c9b1b801f21a3230898f260b131344538ff8644bc842dcd5f6bef5e4e2f8d475267d6d39047a87c00e1138e69d49892d21d58249346bde1e57c SHA512 6241ec1357f2f326c745589a18622987e9444e515157a53cb1188a21cd90e14e392db1e31b24f833ba05647ddfcfd6a89e13f6125ca15451bceb1a14e80fbc23
diff --git a/app-arch/gzip/gzip-1.12-r2.ebuild b/app-arch/gzip/gzip-1.12-r2.ebuild
deleted file mode 100644
index 4b4363030fef..000000000000
--- a/app-arch/gzip/gzip-1.12-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gzip.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="https://www.gnu.org/software/gzip/"
-SRC_URI="mirror://gnu/gzip/${P}.tar.xz
-	https://alpha.gnu.org/gnu/gzip/${P}.tar.xz"
-SRC_URI+=" verify-sig? (
-		mirror://gnu/gzip/${P}.tar.xz.sig
-		https://alpha.gnu.org/gnu/gzip/${P}.tar.xz.sig
-	)"
-
-LICENSE="GPL-3+"
-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"
-IUSE="pic static"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"
-RDEPEND="!app-arch/pigz[symlink(-)]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
-)
-
-src_configure() {
-	use static && append-flags -static
-
-	# Avoid text relocation in gzip
-	use pic && export DEFS="NO_ASM"
-
-	# bug #663928
-	econf --disable-gcc-warnings
-}
-
-src_install() {
-	default
-
-	docinto txt
-	dodoc algorithm.doc gzip.doc
-
-	# Avoid conflict with app-arch/ncompress
-	rm "${ED}"/usr/bin/uncompress || die
-
-	# keep most things in /usr, just the fun stuff in /
-	dodir /bin
-	mv "${ED}"/usr/bin/{gunzip,gzip,zcat} "${ED}"/bin/ || die
-	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
-}
-
-pkg_postinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		local ver
-		for ver in ${REPLACING_VERSIONS}; do
-			if ver_test "${ver}" -lt "1.12-r2"; then
-				ewarn "This package no longer installs 'uncompress'."
-				ewarn "Please use 'gzip -d' to decompress .Z files."
-			fi
-		done
-	fi
-}
diff --git a/app-arch/gzip/gzip-1.12-r3.ebuild b/app-arch/gzip/gzip-1.12-r3.ebuild
index 481c60650046..652ddbb3151e 100644
--- a/app-arch/gzip/gzip-1.12-r3.ebuild
+++ b/app-arch/gzip/gzip-1.12-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" verify-sig? (
 
 LICENSE="GPL-3+"
 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"
+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="pic static"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index 7bbe2b346295..028bb4d93006 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1,4 +1,4 @@
 AUX pbzip2-1.1.10-makefile.patch 263 BLAKE2B 32043c1a47504a2e901d9c4cb4360f295d39ae70fa7733d687fda7f620c0f5a0d5a4fbfbf65b82c841f21c31d761ff8840f77fa3a624e7c9456dd45299a9b7bb SHA512 f20db966b7da75ccb29578d54dac6d7445165bb5e6d6d29756ca43e0e32ed6abd67384330b652c61f7fdf904393e93d807ad0af5e2657ebb54d625d1fa5659df
 DIST pbzip2-1.1.13.tar.gz 48015 BLAKE2B 1bb410acadc728963c3a04d2665fb1b1f0c206a893ed90352a9c16512e9bd5f82c3f5f3b383b382134bbe904735a1c8a81615a8bc54de8c6bc91633d9ce72c57 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8
-EBUILD pbzip2-1.1.13.ebuild 1017 BLAKE2B f2c65625085dc4303b4cb0636b1fa0f14605b657e91208f3d24d7b50822306811ce4bc34db77ff43f926bcf101a5206d1646b0c9b508a58b097b155421fb53a4 SHA512 042d350d0c8295204a2ff0c0efdcbf42544c56245309d8d767f77ef10a3b1d295a3aed74e2bf3ec99499f751e72e6bc773b25fe09826e7cd000279f572b23135
+EBUILD pbzip2-1.1.13.ebuild 1016 BLAKE2B a3a87527db46a3da6305e822ceb297a35a0f70cbbad19173bdb361a175ab00f95bc2accafd54fd59b424c717f143f920e7dca5f6c0b4ec7a71970ce917f98d9f SHA512 12408320c472e18749680359c649f8e63d6283289c7fbdf730ecaef122f9a5f7a1eca0a919f10fc4cf75a5cbca2ead65b0b902579354d7b34b53e14087b6f168
 MISC metadata.xml 242 BLAKE2B 949ae0f39edecf24ba4622d46ad2da5d3cf7bd469da83452be87427fee22b991217152db3a347febfe91208fd9b0f46a2d8e6c8b75dd490464dfbc0e464bf3dc SHA512 e705dc986b554970dd33b240338223b3d2949c228f3f07ca649e41cd55b56f342b10018dd00bd9678beb1bbc8a2f8ad7d3488612faab493efb8f1ccf3256784c
diff --git a/app-arch/pbzip2/pbzip2-1.1.13.ebuild b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
index 554e95c56fb8..45b38f64b96d 100644
--- a/app-arch/pbzip2/pbzip2-1.1.13.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index e3d0f9f17984..680304a9622f 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,5 +1,3 @@
-DIST pigz-2.6.tar.gz 106840 BLAKE2B 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba SHA512 04d2e44bc7a7eb061c3c48100ce5b8fc79931aeac72340abd768fd2a4499ff1004e2bc009772fc2003a4c599f6e90f3abc8bef5c377d6397f1c8e9f7c49f95e2
 DIST pigz-2.7.tar.gz 108102 BLAKE2B d391522fd6f8eb6918d671fb1c9517034941f3ae8e05ffcd7bece141e6dae110cde1560bad02bd2bcca2f868cdba2a8a16b5606ad6637d40d5ced5ec9bfffcc8 SHA512 9f9f61de4a0307fc057dc4e31a98bd8d706d9e709ecde0be02a871534fddf6a1fe1321158aa72708603aaaece43f83d2423b127f7689b6219b23aea4f989e8f5
-EBUILD pigz-2.6.ebuild 965 BLAKE2B f238267fd6360bb0041821f69a383b0157bde1428614b3f83506fb8f75aa021d64c79ae401805e2b287ed96ea836f519e636b090cb7e5b5503a72a68f0771800 SHA512 f96e775caf6a88c49f800a68df13a170608c0def6c3bf3d05d768441ea262a74b8097733ce33427b26542300683d85ac22271309245c730f56b782944028b9ea
 EBUILD pigz-2.7.ebuild 877 BLAKE2B 6abf1e5602039f5ab0e2759d6f7279b8a55ba92458a30f03388aa307becbbb431a562699e035a8db3863cc5f6af029e0d66fc037ad9f4e1de17f70987ebbca15 SHA512 c91c8eb9ae2fe111ceaf44225ca54503ee039ae9056ff1a187e211f861311ec073f4a9d688af51211903c8ac43959c4b51430441267dfd1d25aeae382738babf
-MISC metadata.xml 740 BLAKE2B f16110bdf40040ccabd1674c4eab628d44b019d6b17174b286e5bdeb0e2817ade6898202afccf02461ae6adfea61ffa41a8345d9b88234fbf3b0e5d41a396aa8 SHA512 7779fb38f750f9a3dee07e26cbd37d9cc5228422168a8cd59091c452969d7384d611b8153d87311ca922702e76a697f0a5c233c0e947ad4c2ac076453376d61f
+MISC metadata.xml 623 BLAKE2B d072cc2f7d8e182752cc3c4ae118ec674782f2e0cb08c4ca6b2d4d56a6e4621a837143bf782ae0f65af418f0a90c01f24b5603bfe7f75d0221be68f9d193d34f SHA512 3a7fdb19cf75dd27f1c7a30707ee23d8e4c300f5fa419820e7aaf9b75aa9c09add1dcc488e0241a75552cc91a45a37e8603285da7c631d1c7860a18c28929859
diff --git a/app-arch/pigz/metadata.xml b/app-arch/pigz/metadata.xml
index 90b45f869af8..2a434f0824c1 100644
--- a/app-arch/pigz/metadata.xml
+++ b/app-arch/pigz/metadata.xml
@@ -10,9 +10,6 @@
 		is a fully functional replacement for gzip that exploits
 		multiple processors and multiple cores to the hilt when compressing data.
 	</longdescription>
-	<use>
-		<flag name="symlink">Install symlinks which override <pkg>app-arch/gzip</pkg> implementation</flag>
-	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:zlib:pigz</remote-id>
 		<remote-id type="github">madler/pigz</remote-id>
diff --git a/app-arch/pigz/pigz-2.6.ebuild b/app-arch/pigz/pigz-2.6.ebuild
deleted file mode 100644
index 94c255643611..000000000000
--- a/app-arch/pigz/pigz-2.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A parallel implementation of gzip"
-HOMEPAGE="https://www.zlib.net/pigz/"
-SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
-IUSE="static symlink test"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( app-arch/ncompress )"
-
-src_compile() {
-	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/un${PN}
-	dodoc README
-	doman ${PN}.1
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/gzip
-		dosym un${PN} /usr/bin/gunzip
-	fi
-}
diff --git a/app-arch/pxz/Manifest b/app-arch/pxz/Manifest
index dc12b6bfa271..580cb1422dbf 100644
--- a/app-arch/pxz/Manifest
+++ b/app-arch/pxz/Manifest
@@ -1,5 +1,4 @@
 AUX pxz-5.0_pre20220509-fix-xz-path.patch 484 BLAKE2B d81b33465655a24ce1de0c503f5186ab8ee279f930f43eee9e6493f84a95902594335b757a6c707dc0b05b95622067bbceab61464175529b0c6a1688e4f6131d SHA512 e730ac3ccf4a3d0e7c57c65eafe3242596ce0bce06f3d21e5d9603a66fe4c611f8311bb9aba4206a68d3fffce3d26bf9ffc86fcb8d8cbf74d1446b84582569af
 DIST pxz-5.0_pre20220509.tar.gz 12375 BLAKE2B 5d954d4cd1b139dc94a9ecc5aa99c19a1484812eb62fce089b8f33bfc0ce3ed3ad8053cdc58843c429a365439cd13b3a4b14ebc34de7f2a99deae7cd995cd4e6 SHA512 b1de877d2b8ee9ea5190af4c1a0dc97f7777c35a084137db6d86e23de99b332ea361a82ed995ac2ea12b7bf0670ae92a822235be3b19a1145b6cf5604074f960
 EBUILD pxz-5.0_pre20220509-r1.ebuild 1091 BLAKE2B 5a42f3be3771548bc2d62260fff0a290d40389598e7e5dba042f75d1b7cc96d2ef0f9f82060b8f171d1bfe929e4f03284b2e8034e800c04eb2ce4819e25a77ec SHA512 85646406965e0c40006db72f69e5d08696077b980164ad9bbb0b5706073f71e35e2a8f2a11db65995ec67b7adbc721dcc47f561341ed095f5bc60f79bcb2cc1f
-EBUILD pxz-5.0_pre20220509.ebuild 982 BLAKE2B 11d699f7c63449e37e3f655d0c4124e6c309610f55fc3947f55e0c84217e07bcec1b935bc99141382f56478d58659a87067e6169baff54909942edcd058cf287 SHA512 b21486e0204d8a7493d0a95f5500bfc91ffda25bbd8e6809ba11a9fc7f6e58430abb47bcb1e20dbbc63ed94452f654569cca2221f341d728fdf4de8581f32de6
 MISC metadata.xml 677 BLAKE2B 970357f7a9fbc5bbfefe6d2a8d8c72a27d3d62f37987a578811f056df9452efb7417c8a3cdd446f54ea0ffd1f12c4217a6ea8c8df9e699e88975c2e2b1afa183 SHA512 35091887bb484b965b915e280a4233f20fca36b19e893a1cc8eeae983f92a7afaf6ad67df87cf337083611e7805db6f80dcf184cab79ce4f0c2d877f28b01d6d
diff --git a/app-arch/pxz/pxz-5.0_pre20220509.ebuild b/app-arch/pxz/pxz-5.0_pre20220509.ebuild
deleted file mode 100644
index 44c00d324932..000000000000
--- a/app-arch/pxz/pxz-5.0_pre20220509.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs vcs-snapshot
-
-PXZ_COMMIT="136e5c25daf545753329d7cee1b06ae482fb9c44"
-DESCRIPTION="Parallel implementation of the XZ compression utility"
-HOMEPAGE="https://jnovy.fedorapeople.org/pxz/"
-SRC_URI="https://github.com/jnovy/pxz/archive/${PXZ_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux"
-
-# needs the library from xz-utils
-RDEPEND="app-arch/xz-utils"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	if use elibc_musl ; then
-		sed -i -e '/<error.h>/c\#define error(R,E,S,...) fprintf(stderr, S "\\n", ##__VA_ARGS__); exit(R)' pxz.c || die
-	fi
-}
-
-src_configure() {
-	tc-export CC
-	export BINDIR="${EPREFIX}"/usr/bin
-	export MANDIR="${EPREFIX}"/usr/share/man
-}
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index fca3105b0e7b..b73048d8b6cb 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,7 +1,5 @@
 AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
 DIST tar-1.34.tar.xz.sig 181 BLAKE2B 2fae91293a9dacda0374706e1f83498042a9d5224f80f6f0e14abdb914cb5a8e980f720eb4a453485844c7fe26e0525f230c0eab11c7fa89159a1a929370795c SHA512 55297f41549deee511f5b14c6b5dc7bb3d9282dad52bcc85f9dddfad24b677f989ba86387ad9b133c3698feedbd6b6cd7e9f005e8e4c89f72c80543eeceb78f7
-EBUILD tar-1.34-r1.ebuild 2217 BLAKE2B 37c22ae778857a27fa5a1d5e11842533ea3b546a073472707ed7df4f5c70f5c26554eee6b32d2d2e4dc3c3c0d6dccaf11ed8fb82464c0071df8729655f8e4e15 SHA512 eeffe0637d8a5ad354dd5f7a347dc52ebd82b8b359523da872e918d02a299771b9acd0e614e1a7aea1c138f261f66017352cf26bf93428072c94aea29528eaf8
-EBUILD tar-1.34-r2.ebuild 2342 BLAKE2B b4d9e1036d7b846248ce7852f4d350d1226785126c4281865178397b2f94b989ad40adb7df97dc853223172a01a446c07d3eac89baf067ec75e820a2bb7b4809 SHA512 a0aded7e171e39263cf68daad52ceb8e718be2ecfb0d63e18c16fa3220f18a6268fca07fe184ebe5dacff9f409540b6da1132a3e3875f77cbf528368975a597a
-EBUILD tar-1.34.ebuild 1970 BLAKE2B a09388c9f7daa6a088185230d456add799c9e1aadf7c9ef96c984599fe7561de7b74ff6d265d0019fe62ed5347605413a329c65c79db4f32c16e881692013974 SHA512 c2f47fd426b78f8e077e9b08b68ab32b65fa9b4a9fb64493d171e81042b5e95455d9850b53f9a1d08c58d07bb2bdcda0b3b57ba1721ba452b5d2b0da03696787
+EBUILD tar-1.34-r2.ebuild 2337 BLAKE2B bc105fb61c846997dc563cc7df364856f144fd672396e354a2367ec347d2fd27ae96141c564dd1a74a2538e5b78e4019c8817005d27ef940f5a9d9ce3b1694cf SHA512 e65a72439e50ad84ce14eb1f47fe451a6d89c5981510d0e500feac9dc021b125cf857e996caa5d9234e9d109a727e9032b7c650ed5d50d2b337ab3e1e454583a
 MISC metadata.xml 388 BLAKE2B 85aba561c0c0ad8c72d8d33f66ef6504bed7747957059c19fc5b0267b048bbddbd1112239bd4d3bcdf1c2f465018a2128e086a253253205dd7b815c11f3cc6ca SHA512 83e4c69e150b6420ab2ef4b777d930fd5e0f5cc1244bf8cd9a7cf0f867219100578a4777043fccf5f95a6a44ee264b88381d94924f4f18c80cb2ff339efbce64
diff --git a/app-arch/tar/tar-1.34-r1.ebuild b/app-arch/tar/tar-1.34-r1.ebuild
deleted file mode 100644
index 35df40e4465b..000000000000
--- a/app-arch/tar/tar-1.34-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/tar.asc
-inherit verify-sig
-
-DESCRIPTION="Use this to make tarballs :)"
-HOMEPAGE="https://www.gnu.org/software/tar/"
-SRC_URI="mirror://gnu/tar/${P}.tar.xz
-	https://alpha.gnu.org/gnu/tar/${P}.tar.xz"
-SRC_URI+=" verify-sig? (
-		mirror://gnu/tar/${P}.tar.xz.sig
-		https://alpha.gnu.org/gnu/tar/${P}.tar.xz.sig
-	)"
-
-LICENSE="GPL-3+"
-SLOT="0"
-if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	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"
-fi
-IUSE="acl minimal nls selinux xattr"
-
-RDEPEND="
-	acl? ( virtual/acl )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${RDEPEND}
-	xattr? ( elibc_glibc? ( sys-apps/attr ) )
-"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-tar )
-"
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-backup-scripts
-		--libexecdir="${EPREFIX}"/usr/sbin
-		$(use_with acl posix-acls)
-		$(use_enable nls)
-		$(use_with selinux)
-		$(use_with xattr xattrs)
-
-		# autoconf looks for gtar before tar (in configure scripts), hence
-		# in Prefix it is important that it is there, otherwise, a gtar from
-		# the host system (FreeBSD, Solaris, Darwin) will be found instead
-		# of the Prefix provided (GNU) tar
-		--program-prefix=g
-	)
-
-	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# a nasty yet required piece of baggage
-	exeinto /etc
-	doexe "${FILESDIR}"/rmt
-
-	mv "${ED}"/usr/sbin/{gbackup,backup-tar} || die
-	mv "${ED}"/usr/sbin/{grestore,restore-tar} || die
-	mv "${ED}"/usr/sbin/{g,}backup.sh || die
-	mv "${ED}"/usr/sbin/{g,}dump-remind || die
-
-	if use minimal ; then
-		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
-			-type f -a '!' -name gtar \
-			-delete || die
-	fi
-
-	# make tar a symlink
-	dosym gtar /bin/tar
-
-	if ! use minimal; then
-		dosym grmt /usr/sbin/rmt
-	fi
-
-	dosym gtar.1 /usr/share/man/man1/tar.1
-	dosym grmt.8 /usr/share/man/man8/rmt.8
-}
diff --git a/app-arch/tar/tar-1.34-r2.ebuild b/app-arch/tar/tar-1.34-r2.ebuild
index 23851cee49ec..9db23837e033 100644
--- a/app-arch/tar/tar-1.34-r2.ebuild
+++ b/app-arch/tar/tar-1.34-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? (
 LICENSE="GPL-3+"
 SLOT="0"
 if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	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"
 fi
 IUSE="acl minimal nls selinux xattr"
 
diff --git a/app-arch/tar/tar-1.34.ebuild b/app-arch/tar/tar-1.34.ebuild
deleted file mode 100644
index d8a77bc9b826..000000000000
--- a/app-arch/tar/tar-1.34.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/tar.asc
-inherit verify-sig
-
-DESCRIPTION="Use this to make tarballs :)"
-HOMEPAGE="https://www.gnu.org/software/tar/"
-SRC_URI="mirror://gnu/tar/${P}.tar.xz
-	https://alpha.gnu.org/gnu/tar/${P}.tar.xz"
-SRC_URI+=" verify-sig? (
-		mirror://gnu/tar/${P}.tar.xz.sig
-		https://alpha.gnu.org/gnu/tar/${P}.tar.xz.sig
-	)"
-
-LICENSE="GPL-3+"
-SLOT="0"
-if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	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"
-fi
-IUSE="acl minimal nls selinux xattr"
-
-RDEPEND="
-	acl? ( virtual/acl )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${RDEPEND}
-	xattr? ( elibc_glibc? ( sys-apps/attr ) )
-"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-tar )
-"
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-backup-scripts
-		--libexecdir="${EPREFIX}"/usr/sbin
-		$(use_with acl posix-acls)
-		$(use_enable nls)
-		$(use_with selinux)
-		$(use_with xattr xattrs)
-	)
-
-	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# a nasty yet required piece of baggage
-	exeinto /etc
-	doexe "${FILESDIR}"/rmt
-
-	# autoconf looks for gtar before tar (in configure scripts), hence
-	# in Prefix it is important that it is there, otherwise, a gtar from
-	# the host system (FreeBSD, Solaris, Darwin) will be found instead
-	# of the Prefix provided (GNU) tar
-	if use prefix ; then
-		dosym tar /bin/gtar
-	fi
-
-	mv "${ED}"/usr/sbin/backup{,-tar} || die
-	mv "${ED}"/usr/sbin/restore{,-tar} || die
-
-	if use minimal ; then
-		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
-			-type f -a '!' '(' -name tar -o -name tar ')' \
-			-delete || die
-	fi
-}