gentoo resync : 04.01.2022

17 files changed, 35 insertions, 36 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 76b373de8abd..b60946ce8b1e 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/afio/Manifest b/app-arch/afio/Manifest
index b3fb858554ba..a856ce6555a0 100644
--- a/app-arch/afio/Manifest
+++ b/app-arch/afio/Manifest
@@ -1,5 +1,5 @@
 AUX afio-2.5.1-control-file-warning-fix.patch 776 BLAKE2B 6502ffa8200ef12394fe68678b7dd0ed8d61c8ab326eae660cfd1ea91d8c031dd8fe0895dfe41917add268ea3be2d053a5f132dd0033898eab8b606d346b407d SHA512 842c9bac9af3e5ece8c4bab55d5c1fd8f43585eb69e3f689d124e92e1972c5259510a206ba8c34d70f49f8e191ad1ad9b09a1b25efb63ed870c3322d00d6d249
 AUX afio-2.5.1-fix-build-system.patch 725 BLAKE2B 3ec8c1068d60db73727fabb02eae50005c1aef8db39df977add2ab312d627fbc16b107b1f007fad9be5b97d1afe02ec0fd38c97c80a804464f1e3985868a3f67 SHA512 ccf6af4e1591d9c8e519dcb9016c49c0a8601f2a03949270b205560bb13e90bdbd50079c4e0abcc3e6290a809ffb24455c00ee5cd70c0168b31b1c01b9bfc093
 DIST afio-2.5.1.tgz 191765 BLAKE2B 48a590c1180942444eb8fc17701563ee822cad9d0ae423e12996e7b3dff16ab7ba13d8041b78fb6415d1a422d14be8ba3443910ae1a57290dca801334ced7ffe SHA512 afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864
-EBUILD afio-2.5.1-r2.ebuild 743 BLAKE2B e4e62a2070c2b3d60ae1aee9b399acafafef36bb4bdeabbd40dd40a0e6dd8fd4b911b248cfda8e8acfeb7584f1ece80f172f6ae918f2b21cbfa1ac7db3388350 SHA512 c3ccebcff25395824f3ce62d5730339c522f16883be7173618a43a98df756ea00e8cb93cb8ab5fa82c61aa4b5409700bab1ded549338a2f55a1b58319291a599
+EBUILD afio-2.5.1-r2.ebuild 742 BLAKE2B 2665b0e6e1dd7388932b2e37ad74e0b4591f7cb8a936e6c0f956308f92a36daac92117059e59db4079819f3383a292c9784c4bfa87c4db8c27cd835e7ebcda4a SHA512 8e48103ca84a1260d7488de7e024e0d280c4dff72df5ac168d5c3849c9a37b8e2efaacd1c099f2d3c4a60b96f2976fecc9bd076249606ee225ebe35471316636
 MISC metadata.xml 592 BLAKE2B e32a69571a58e56104e38bdd515f908e74cc4fc60b90eb4187d96f91aada8ae1529f54e9b0a70f740440a66fff617a63ae4ae09b18f7d02c9c4c79638ccaf4be SHA512 9560a45e2f5139155c1a0ad0e33abb2d0c6d08ca3a0e70b3462319ae93e538a4741ef43357cad920013fc2142b81a78f1f54d637d44a20f03546165537b6429a
diff --git a/app-arch/afio/afio-2.5.1-r2.ebuild b/app-arch/afio/afio-2.5.1-r2.ebuild
index ccc6b32585da..8b7b67f12a2f 100644
--- a/app-arch/afio/afio-2.5.1-r2.ebuild
+++ b/app-arch/afio/afio-2.5.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit toolchain-funcs
 
-DESCRIPTION="Afio creates cpio-format archives."
+DESCRIPTION="Afio creates cpio-format archives"
 HOMEPAGE="http://members.chello.nl/k.holtman/afio.html https://github.com/kholtman/afio"
 SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"
 
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index b494966aefa4..c9481efa0fc2 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -5,6 +5,6 @@ DIST cabextract-1.9.1.tar.gz 469369 BLAKE2B 5bfc697b40cbf47b42ab7857804b703c9622
 DIST cabextract-1.9.tar.gz 466334 BLAKE2B 1a82bddca826ee35ed13e1c0b50deca3ae1b7e31d7f427f54b5d6cf9651a727b7cbf8049c1a4326237725e007baecb4356721489611bb5e015bd7460e2530758 SHA512 d144c1df9ed8e8c339bcadb3d1be2eb2576bb066e3f75a3480df0d5e81407a633554e4674b3bb43716c0cf33a0f2327e6f798cd6d7825bceefa0ad839fcc3f64
 EBUILD cabextract-1.8.ebuild 1108 BLAKE2B ac14bcc3a82f56b70258739c6c7823c83d20d080c49f62efc32de8104516cbd8dc34c06c63dbbc628b44103f7f50f73da09c8521ba468745fa7487a9661d17d8 SHA512 075916d28ef1e018f3ca9aa453be855e22b22b1a09e98615368e10a2ef1329c070f0c9f25b09c03ead7222c98624196ca73727fc3eff0877b772fb790b78d0f2
 EBUILD cabextract-1.9-r2.ebuild 1641 BLAKE2B 1b0c72199e57b43560849c8b786f2c51bc186fa369b3fe50c0309a5f4e1fe375a58c80c97ad779661e730f529954f41b5d0db7345d1f8b5e84cd89970c8a87bc SHA512 9522d40c288b10ac37148a925a2e09d7744a4c6a82121a4d70715a3e8f236a3a200d145b383458a1762a8be79b6ed82972f96984187413af4e5bce868c2e18ed
-EBUILD cabextract-1.9.1.ebuild 1548 BLAKE2B 5242408efaf04bde36f3283f5d57470ec85ad086a7ad16ba1aa5c3144551da9e643bd2a21549730957f3ba0199857c1cc075ad952e12559d84705efba595c857 SHA512 0babb10671093415daee4e2c8a75dcbb7293e654fbd8decdbd7822a26065c016fadddb6eeda07f5729ceeeecdf194d3a3e2ebb1c6725f88ea9327f3dc9eb71fd
+EBUILD cabextract-1.9.1.ebuild 1554 BLAKE2B a8fe49edb15d5667ca3bd4448cd281eeb6b4ca41dd1442217443754107ee11508c190ca0445b094f57842f491ecde11685eb2b8a08e739e07cb06b397768567a SHA512 6df79bac4ef3b86118820c51c25d4ef214e5bebb14feb62531aa8b331026390fb1265ff5da81c23544155b7af8e8fcdbd63321eaeb17a09d349f2665162364e7
 EBUILD cabextract-9999.ebuild 1535 BLAKE2B 6556c2a9d71753a292d3fe5e30803ea6e46db55f30f63432fb77702369543ccb339fbe822c84872ab0a6506e1cef80a141ce320e4f521881f12e255a1ede2221 SHA512 3def795abe480dc525e3d7f050a5f3688b22c63163b8e25e9cb4997e959527507f9421f0750d3b8589af2a9406787b9a34d3bcb849d3d8c140aba546ec02817b
 MISC metadata.xml 498 BLAKE2B fc12843653eb13c750e7615f65ac74aebbbe5c4096ec0a9e202e732ae6c11574f5a9d5039467d6a9a0298154f7742077172cd03400e01a2ff3e1c7affd658047 SHA512 e32632e4a68e80343953f5cdc77d3fcd542a5a5452495f16c869a6093cc16905d8179a5f5e5497e7f0a2c5fc47f41a1d82b91db4d7dc92b0fff8c08ba10dfbea
diff --git a/app-arch/cabextract/cabextract-1.9.1.ebuild b/app-arch/cabextract/cabextract-1.9.1.ebuild
index ae2d04bfcc58..05ef772888ec 100644
--- a/app-arch/cabextract/cabextract-1.9.1.ebuild
+++ b/app-arch/cabextract/cabextract-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index d1a9c45e815d..eb08c333742b 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,4 +1,4 @@
 AUX libarchive-3.5.0-darwin-strnlen.patch 732 BLAKE2B d20ffd1d898acf1e69e2f275bec2beda0769569ac37e179604dc7d0a5eca8fda2a06aa5b3811e28f465fb34c2061d15aa8073110f703244aec02cfa35afd8087 SHA512 9f5b86b6dc483f17a1d909d88841e1f82f5835dbef0bdfc18ffb982cd5f649d87fdc22f490169eb827de654fbd469fda77a5ce1bc0748b48f3f46e77318e672c
 DIST libarchive-3.5.2.tar.gz 7054934 BLAKE2B 1fc6ee0166573658dc5e0f170113c07ecdaa76b287cbf68bdee63ccd198dad615b3f2803a3fc1aed303cd1f7f32033e6d8e782ef6a8a991562cdc2a375894c9e SHA512 2003ec9b24086373451bd7317bdab86d81627f087c14a6f7df1a92e131a216749f9aa352504c3d04dc82b62078b59aeea5aad5543b7e6c1c21fcafa2955d3762
-EBUILD libarchive-3.5.2.ebuild 3697 BLAKE2B 7cc0f99b45e07c716a3c513bb3bc08bc80aa60228d6d64a4bf0d7db946e5149e8c6e902a97922cf076744773ffb6b3b510f4f00bc2072f372514e88c2a454ec0 SHA512 af165fcf46e79ba56fd814cc646ecbd993d4bd6d73e38f86dffd6485be39aa8e64d1ec9a1938f6097128965f0c7e63792aee7b88381105f2278335bf90104d8c
+EBUILD libarchive-3.5.2.ebuild 3417 BLAKE2B cd8c560927f1018cf6a838fe184ee89eb03eed5cc5af2ac09957657cd5f14cf23a5ac031e138e27dedcaa64cc35ad8f68113b15c90545f10f9497fba48c6e541 SHA512 6dc88e3983f5d9b4d72ff11c20c728d4df87b1c33f3aa1e5769731da33b44d87b8b14f7ab5e51028cd36c878bba265b7b94d7f00cf7edb9a2ba5f6c0e809fc25
 MISC metadata.xml 1515 BLAKE2B c30009d41ef242d07f1f047b96f72e436e930f4ef6a316fc3054865061f3b32450239392df9da6b4431eb3a959f0a892425065f292253b4b4e145f56c0575161 SHA512 ff5508fb73ec4dca5d84525ebdd176ab626071f2ae6693c60dcfabf7ef29342340ed6af10230d983424d20d3927770b028fb866c1d0a179f5ad3c7c63c721319
diff --git a/app-arch/libarchive/libarchive-3.5.2.ebuild b/app-arch/libarchive/libarchive-3.5.2.ebuild
index 4693ba4bc318..a28809430238 100644
--- a/app-arch/libarchive/libarchive-3.5.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -112,16 +112,6 @@ multilib_src_test() {
 multilib_src_install() {
 	if multilib_is_native_abi ; then
 		emake DESTDIR="${D}" install
-
-		# Create symlinks for FreeBSD
-		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-			# Exclude cat for the time being #589876
-			for bin in cpio tar; do
-				dosym bsd${bin} /usr/bin/${bin}
-				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-				doman "${T}"/${bin}.1
-			done
-		fi
 	else
 		local install_targets=(
 			install-includeHEADERS
diff --git a/app-arch/stenc/Manifest b/app-arch/stenc/Manifest
index b9579ace865f..581d00c7e53a 100644
--- a/app-arch/stenc/Manifest
+++ b/app-arch/stenc/Manifest
@@ -1,5 +1,5 @@
 DIST stenc-1.0.7.tar.gz 107096 BLAKE2B 678be2fea4eb3db5cf84a70243fd61dcb574627bacb59b2f9af682e2e0851d41187565b4706313c98bb5b297f865b1424bc47c52f15efa2a2e8b2c7413b09009 SHA512 84cb0114c969e1a5122a8621d2c136663ee2a2d9aae1d455631c1d4555e947f4841004b74a1f63b800be713cfae637c19ea34adf40f0bc81f1c56a555a27ba31
 DIST stenc-1.0.8.tar.gz 29297 BLAKE2B 269310fb7a9063eb3b367dfec534096201003e6178a31aeb73aa7a73ed0473d4a606634ac9cf7377d17240dee074345efa49fc907d9487f573a75ec44c3454f6 SHA512 4fd882861d248cf59cde1782833bd3e4f7e01e8b6c00424c55f26454a620510b22de0d42f2d7f6c4e67c2b277776a174fe687756a75f410026fda55554f9dc87
-EBUILD stenc-1.0.7.ebuild 392 BLAKE2B 0c77bb626edfa95d7daf8d0af5812188d9bd847ef5973ef9a8093a7144fcb3a4e888b1ef056237d0e7561bd269aabb56c0cca2d76d18c51568ef66d22d2b96b9 SHA512 161372826f561a9b8b483740a6dd953e0f0d990fe072e281fb574ae477828b3ae712db0139e03f13bcb26107c42ba09e8630017fe1c658ad30fc8e4acd443387
-EBUILD stenc-1.0.8.ebuild 604 BLAKE2B bde130036d51c49c2bf4d9253a1deb71ba9572880892ae7410771b6285e7ff74894e3800af2f53783978cc194690455c16e14479627e5de0c064d8c7c30a36d5 SHA512 465ca081e80635dd6ad080ce89d597f8eae69aa8d63ab8524184e810f6b6ebefdab6ff380fab956003d6d69a52ce3c35c9d4265b7430817658ebe62531bced09
+EBUILD stenc-1.0.7.ebuild 388 BLAKE2B a9b3ddab46d41596f553b270bd0fd0b246015831abf5cb96929092090894983611342e41c2936cf4b73c78634a94e6b1ce99b046a29bea0dd2b1c78f779e7bc0 SHA512 edd127263cd278ea1884c979940cd0c79827f75992a83f7d8329b601117df9a60bc47832606faeb25d45c5bb7aafd0cd33537a518db65cfd505002b778f5b62b
+EBUILD stenc-1.0.8.ebuild 603 BLAKE2B cf85af4c7dcf7e4bb16bc6d0490cde321fafb353488847952f318018b4b411c6c1e8a2f04d20f52d544fd736d5c4e06711e3806c0425e7cea5fbe0413bb8a494 SHA512 2741bce011657def0e9de1b7b9eb14669655488892bff0783ce23da2ce8e5dfdefd8288ea90419407d3bb5bae02d4e999c451f42a45177bccf7cd50c18092e96
 MISC metadata.xml 671 BLAKE2B 0b3c581b011dff8e93244f1630e44237ad342dc5b3658da56831c598e6419e6e91b6e9efdcba51b7809593cdaef8be721768ae7ff25ae513d3c56a14c84d669c SHA512 af54957f3e928fbbfabe4bd22f1f106cd6ecf1af38a763e3f490afdfbff3e1297187d20913d52c330b53bba253a56080402b6155c501db033a230a89e237c7e9
diff --git a/app-arch/stenc/stenc-1.0.7.ebuild b/app-arch/stenc/stenc-1.0.7.ebuild
index 2a47f9366245..54552541a979 100644
--- a/app-arch/stenc/stenc-1.0.7.ebuild
+++ b/app-arch/stenc/stenc-1.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-DESCRIPTION="SCSI Tape Encryption Manager enables AES support for LTO drives."
+DESCRIPTION="SCSI Tape Encryption Manager enables AES support for LTO drives"
 HOMEPAGE="https://sourceforge.net/projects/stenc/"
 SRC_URI="mirror://sourceforge/${PN}/source/${P}.tar.gz"
 
diff --git a/app-arch/stenc/stenc-1.0.8.ebuild b/app-arch/stenc/stenc-1.0.8.ebuild
index 1f9c5860f701..2ac8822df2ec 100644
--- a/app-arch/stenc/stenc-1.0.8.ebuild
+++ b/app-arch/stenc/stenc-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="SCSI Tape Encryption Manager enables AES support for LTO drives."
+DESCRIPTION="SCSI Tape Encryption Manager enables AES support for LTO drives"
 HOMEPAGE="https://github.com/scsitape/stenc/"
 
 LICENSE="GPL-2"
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 3e4873cfea36..2410a2b01fc2 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,4 +1,4 @@
 AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
-EBUILD tar-1.34.ebuild 2041 BLAKE2B 9579378c3bf040a772edcc87992ddcdb9aa092c01e4598bbdfaa2ed662dd5f2b73aca2f4d96e21a6c94fd5d2804c2b9ed5e7a6003f2749c983245dbc2c9dc94e SHA512 82937b0e2d708b6b60db0c47efc7fda4facec2a4bcaaa8bb57b11d5d8e48dd076697ed8d4ace888bdac1e0791378a5abc6c09fdabf80af1b90f794ee81e91cc0
+EBUILD tar-1.34.ebuild 2029 BLAKE2B af7396250da4d86eae332ea1f34a8a2029b22978ae1b61ab04f3122f039bfe5073b09e2acfc9c0122729ac2d3c814657cdad06be718dd12b0afb0014c0d7e229 SHA512 cd6c2058aaccaa7ea82e164ef70a096bde3d36fd1aa4fe28601273d3f3722ac23535ba753758586deab0e9e33b8262aa00618f46482378e32cc35f0e2f1d0b93
 MISC metadata.xml 388 BLAKE2B 85aba561c0c0ad8c72d8d33f66ef6504bed7747957059c19fc5b0267b048bbddbd1112239bd4d3bcdf1c2f465018a2128e086a253253205dd7b815c11f3cc6ca SHA512 83e4c69e150b6420ab2ef4b777d930fd5e0f5cc1244bf8cd9a7cf0f867219100578a4777043fccf5f95a6a44ee264b88381d94924f4f18c80cb2ff339efbce64
diff --git a/app-arch/tar/tar-1.34.ebuild b/app-arch/tar/tar-1.34.ebuild
index aba5e27209f9..efbb004e37fe 100644
--- a/app-arch/tar/tar-1.34.ebuild
+++ b/app-arch/tar/tar-1.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 [[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \
 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="acl elibc_glibc minimal nls selinux userland_GNU xattr"
+IUSE="acl minimal nls selinux userland_GNU xattr"
 
 RDEPEND="
 	acl? ( virtual/acl )
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 67b132448d0a..f158fe61146e 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,4 +1,4 @@
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
-EBUILD xz-utils-5.2.5-r1.ebuild 2736 BLAKE2B caf809358d5cca6b53534d2a3e12c74ea592ba2d4c27c3464fed1e37e76730a6c070ff12ebd0a89d5083bb75f6556574fff577809365fe0ce7fa97c304def8aa SHA512 bc662f0c55445f9cbc2fb49047d0c65cc8564cdc90cc6fdf1fb348865982b4050fe90a508fada72ff4cdefcca877d243b01efa5f8c3ba73a6100346af2f3e5c3
-EBUILD xz-utils-9999.ebuild 2744 BLAKE2B 6d7541d509b95264c5e29cd18eeaa755be7e3cb190bcb9907c18b6a2c8df6a27c3d8548a1b8aded4d723d2b71cc4b8822bbe644174d27ce57072185e25ead892 SHA512 7293c540ba6114237b58e5788cae3499645a655d1c4e96821b932e477147ae8a645dbb39cc7762113d10d5229496e3e59f12970260931eeff6bfc58ab062b133
+EBUILD xz-utils-5.2.5-r1.ebuild 2660 BLAKE2B 5fc3dd2d38beccbc29717e9c1d3b142e5182088863ad72518ecf721b0313b5b6a7344c32351c5042fd0d1a3a8699521f6baff98be277c0bb8c5fd748ead28090 SHA512 9411d78194f2964bf7d299645a1e0d43a377bb5dcb5e61d316fb45e71234ddfbb835a3bd351f50e19b34b303a84411cd94eb3e8d5bf9526e1be019c337fbf03d
+EBUILD xz-utils-9999.ebuild 2668 BLAKE2B f9ede09dc4650c384799272ea7666e67ad4585c72695f75ab6006dcb4976e10517539f07c5fac12bded5da360dc52154515eb3c647a93a52daedee686245066e SHA512 7d004c0c34b3d9ea7b1ec7f68c367a55015ff6f7de9cc4b10a3cec7b79f835962928b1a137a8e74e0fd52d14f79e088df66288603c52c4ba3f8d88a5e3c128be
 MISC metadata.xml 539 BLAKE2B 57809a0b57c640a42eca00c3cfbec8a549647b82afc6229b904c769b94b3ee109610d412af69cefe6b86c7cce9a7c363cf376bb87c19b5cee96b45bdd980cddc SHA512 5b86a0f7c76d5b33f32e5db91dafe675dc01399659c5304fafd77adf83b403c936019afadeed1f075834bbb31169d60c87c9d9e69783e7c7a720890f512172a7
diff --git a/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild
index d628150b10fa..7a24ca8fbd0d 100644
--- a/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Remember: we cannot leverage autotools in this ebuild in order
@@ -27,7 +27,7 @@ HOMEPAGE="https://tukaani.org/xz/"
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="elibc_FreeBSD +extra-filters nls static-libs"
+IUSE="+extra-filters nls static-libs"
 
 RDEPEND="!<app-arch/lzma-4.63
 	!<app-arch/p7zip-4.57
@@ -73,7 +73,6 @@ multilib_src_configure() {
 		export gl_cv_posix_shell=${EPREFIX}/bin/sh
 	fi
 
-	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index ae5ec60bf348..0b2c2d879fb8 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Remember: we cannot leverage autotools in this ebuild in order
@@ -27,7 +27,7 @@ HOMEPAGE="https://tukaani.org/xz/"
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="elibc_FreeBSD +extra-filters nls static-libs"
+IUSE="+extra-filters nls static-libs"
 
 RDEPEND="!<app-arch/lzma-4.63
 	!<app-arch/p7zip-4.57
@@ -73,7 +73,6 @@ multilib_src_configure() {
 		export gl_cv_posix_shell=${EPREFIX}/bin/sh
 	fi
 
-	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 76590f277c6c..84993abe87ab 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -4,5 +4,5 @@ DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434
 DIST zstd-1.5.1.tar.gz 1948539 BLAKE2B 2f82fb7872c49c41c8ccae17e343825dabceae3070266e49468c2019a1324758b825d7fc1bc3b62602b4d726538260258dc9134fa81d3c5e5085a8a1b531a8c5 SHA512 ed8ea0143b7bbd85afdcc8f95d44589a0903cff8375059836ebe577cc4b3ea49c0c756db6a3649655e478377f48b3120ef87dc768fd449bd4bfac786209bfd31
 EBUILD zstd-1.4.9.ebuild 1676 BLAKE2B 31a1c1f3b06f03aee1f79be98fd352ebc850cf763a5fca287810fae13042587d434e28f1826e0e86194bffeadb60704d9b36f0b0036aa72a51fa7be11257e814 SHA512 b878ad96130da9450c92597354335b294b24341c6ac0b8f236f9bcd55efda8c46f700f0571ac80822da34a5b854d463d02cf8707ea1e7b3b2b713a6f6924025c
 EBUILD zstd-1.5.0.ebuild 1449 BLAKE2B 1985dcc6336b6cb5617bc48a3d80400f3d642d281e098576c597b5e807cdacd2e738f66de94c58cef35a54f78f34eb21c77f4e5bd10a9f430d633f77c62d696e SHA512 31e0ab933fe30b781a1c0923ff4a8ab7437d95ee957e0b44e3d1b41687308ee6652ab13e4f490c39ec2b954bdeded743ac3642ebde9563a57d74d6dfa27c6e5d
-EBUILD zstd-1.5.1.ebuild 1518 BLAKE2B e1a415bf4a6c1ec7dc9e7680b707d5a01b68a9c0e463b98a806e6d8c4e6acdb92087579155b5604e3041dfb4d429d97636fc74d0c2e8421803faa725aec46b50 SHA512 da28b6a39814c02fb862ae8638d03401412de02a652f215b1a82cd30935d33b50c8f9c4cec90777fdecfff5583c410381345be1735ce064851b982c09d6acf35
+EBUILD zstd-1.5.1-r2.ebuild 1803 BLAKE2B a6df1ec189bbbe326193e58cee2c87867a493b8d6262ddfa6f69cb50762486ac3e11a28b683b322d670c74b9ba44fb34210848a3bfb8897e466e872e0c51fbb0 SHA512 d9e0ab2859fd85f88a3d4960a0a44c283cee74bc0442dc73e31ae40c225ae97212b554b96c641bb421f77eceb38a0b442029382f993123c6c1915604660922ed
 MISC metadata.xml 410 BLAKE2B c8c6cf3dc2e96b8d70bc199c8691f57fe43c561c3bdbeb71e49fc13f205bdf673e96e58d530b2e18c8ad2b99cd047ba5934437fda7828fe6ba177f5badc72a93 SHA512 3973ebd433d598c05023af411bbbb26b0f097d66e34c22fdcd31479ccc68c5a7bb318c29067a94de07ead566c5eec397d12b70a15d99e53ba08e6e9c999b61cf
diff --git a/app-arch/zstd/zstd-1.5.1.ebuild b/app-arch/zstd/zstd-1.5.1-r2.ebuild
index ee5d6e6b7871..68a45fd7660c 100644
--- a/app-arch/zstd/zstd-1.5.1.ebuild
+++ b/app-arch/zstd/zstd-1.5.1-r2.ebuild
@@ -28,6 +28,16 @@ src_prepare() {
 }
 
 mymake() {
+	# We need to turn off asm for certain arches (!amd64) for now.
+	# - bug #829849
+	# - https://bugzilla.redhat.com/show_bug.cgi?id=2035802
+	# - https://github.com/facebook/zstd/issues/2963
+	local asm="ZSTD_NO_ASM=1"
+
+	if use amd64 && [[ ${ABI} == amd64 ]] ; then
+		asm=
+	fi
+
 	emake \
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \
@@ -35,6 +45,7 @@ mymake() {
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		V=1 \
+		${asm} \
 		"${@}"
 }