gentoo resync : 22.12.2021

20 files changed, 115 insertions, 20 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index bb51f90f24d5..76b373de8abd 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 85bae46b05a2..8542359fd827 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,8 +1,8 @@
 AUX dpkg-1.18.12-flags.patch 416 BLAKE2B c7fe40b28793420afa0b895585cc14a675f9be68784beef7965fe6e971f6b2d6ecaa7c8bae51bb9f774c9517a618bff85b723052360224952cbdd2b74759b42e SHA512 6c86e8519ab4a05a2c15a658f41c0da14429c4fba0fcd364426afce7db03cd886a69de3f04f167d0f7b6d36a05252455864c11b14f58baab0a4536249331369c
 AUX dpkg-1.18.12-rsyncable.patch 1245 BLAKE2B e1488cc6a6807d38ec7218ae6651b0d919fbc3ee5e2837540f91cf80229e669a6fe24d6de1c4bd1c1debdc34a0c04a2bbc6a21eb964032f24526986678eb1b14 SHA512 743f4780b4c93e53924836fae96d59c2f1098dae6ef683b2b30146ab0345109718a507486f86ff96cda5b705aff858da563cdc0d40c965bf964cafe7105994ae
 AUX dpkg-1.20.5-dpkg_buildpackage-test.patch 209 BLAKE2B d15000423abe8259e7bdd92e5ff2d38f8fd32622e8467259e791159df590f7d394647ba4efdd599b77d652f973cd07af09d64f29df920fb8015c995bce9b302a SHA512 046200d2a8c143a2b08e0c8113765c7a7a18846ce0b7a2dfd5a3f1167eacc70391415c6bcef21abe49e5d8225dbf08680fcdc405f0910e9c42071ad4cf8ae6d5
-DIST dpkg_1.20.7.1.tar.xz 4952736 BLAKE2B 0439cd9440c34597ff5c5e04bd8e1b79d34cd7675a216cbe1e7dc4d68460847143a8a7dff14b1845374d8e504d6fba63842b1d1ac37aa01f7b2a96b78ef0278d SHA512 beec7a7ba1cfbd6954b3d583e57c811af3bfa5e4e4554e6af6673d4a4be0e79fb4aded2f6aeeda592c2ba3d91facb82138f2eb8eb2338dc4fae1832911df2fd6
 DIST dpkg_1.20.9.tar.xz 4954428 BLAKE2B 4e04f7a90c8696971895081e18b220d9dee4bc5930428f131556ae71c673e61e18c363e279b566c2218da60a5aca421807c14cf518952502e707c7397769097b SHA512 904a4742f5f340dc65b2137364dce102a0b2eb42ccedb2a73f79c207362c699fbffaaf1379f1f6c8b8b0e490321af1d03c34b50ebe0c703f5ce8a7f75f17a839
-EBUILD dpkg-1.20.7.1.ebuild 2001 BLAKE2B e236a5cd683fed0131efe0ba775f33372ab0ad2ea7b12eed1107dcdcbf164b9d4ba7f8be97f183f18fed82861e50552fbfc3cdacca98fbf84285c400239702c3 SHA512 2567e608fcecbcfc2c066f7861cf9f038d3f51d3c49efb1f2255cad6f44233e5eafb3bd6cb81ef65bb9215b678217b3d4ae6208b53f4477a8d406075d0088630
-EBUILD dpkg-1.20.9.ebuild 2007 BLAKE2B 89277102129ed9aba87de9c6822fa1c6f6cc160bc48b8749db62791010a141a9a06b2c53ae34fbe2ebe7a467fe1bd11b6aa29ea2c38e89341d39193ec0b864da SHA512 1cc6a2f47daf93fc44cdc5993d02c6c211bd9a3c7450fa1107b32248d86b152378c24c77359b32353d305670cfc21e4d67346b198d28c71456552f5502c05237
+DIST dpkg_1.21.1.tar.xz 4986936 BLAKE2B f5b0f9fe7ac5fe7ba47191a9e467356e748418846ce0fc9f3c61d731e035eb096932848b15e6a85a15938d3bbd6fa069c786ab0e89c77119958fe632a91c309f SHA512 3f3f263e1300f3e4b55e84521847703dcfe465aa54829a69c31c174a2ad5e8b6a8a251da7c6020d31a38e9e6744113924a71e9579469e32289328e91a48db07f
+EBUILD dpkg-1.20.9.ebuild 2006 BLAKE2B 205b3a0580fd350aee1b3efa8bd3abb4428cea981e1cb8be6eb7c899d5600b10e96f5494aba663e9cb0ffbba010b987ef9c450c3d11bca50f3ab80e0e4efeed8 SHA512 401fbeae5fc28ee3326bfb3135eeaa912e2160a0dbc7d50123d355c1727094b87d47f580d41d0eed807385beda57de448a8e8f69a2ee5b3dd276fd94cfd52b80
+EBUILD dpkg-1.21.1.ebuild 1990 BLAKE2B 43c4ac329dac6982401f88bb4bb75a949000fa3a7dd3159ecfad8ecfd8f46877aeebb660c4694384bb9003c95eed2015f322386e7dbbd49984e93580665d2f24 SHA512 dd322bdcb2e6a5ea34bc2102481ee929b70d2555be5db7e994fc1a4f4c0a730912c41663e6457a36afc54fab3d28ecbcddad55ed0feb3c01c2b7a972e14b6ed7
 MISC metadata.xml 433 BLAKE2B fe1e0ca0c96628891b711ca120d5c119f8effe66ce43198ebb2a16fce1cea23b7ab6ab88d807a71645298e2311bc3044dca4989fe83cf99e54a9e97f66835c69 SHA512 2882194685980d67acc10913c8863b55dc0a9215558db2e3cf33f0489d91e5477bf2ac0c0fc5b4a134f45593f6f5d3fde5e09493d20ca45224645b8c1c597fef
diff --git a/app-arch/dpkg/dpkg-1.20.9.ebuild b/app-arch/dpkg/dpkg-1.20.9.ebuild
index cf36a64ffc90..5a64aa7a6868 100644
--- a/app-arch/dpkg/dpkg-1.20.9.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/dpkg/dpkg-1.20.7.1.ebuild b/app-arch/dpkg/dpkg-1.21.1.ebuild
index 9c802e00c611..2a6982311b44 100644
--- a/app-arch/dpkg/dpkg-1.20.7.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.21.1.ebuild
@@ -10,11 +10,12 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	>=app-arch/gzip-1.7
 	>=dev-lang/perl-5.14.2:=
 	bzip2? ( app-arch/bzip2 )
 	libmd? ( app-crypt/libmd )
@@ -47,7 +48,6 @@ DOCS=(
 )
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.18.12-flags.patch
-	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
 	"${FILESDIR}"/${PN}-1.20.5-dpkg_buildpackage-test.patch
 )
 
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index 68d96f1e1410..e17150d4db93 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,5 +1,5 @@
 DIST engrampa-1.24.1.tar.xz 1680000 BLAKE2B 3059f98e5db99aabe270a89d7edf334ddca8b9cfd963a34f8b7b99356a1b7a9b14c9f641ea6582f893a5f6e4fe46dde00e5375d7b1c71b80299a7f5121839549 SHA512 9d51f24987cecfdd2c560b1ac8f8699bb5ed010bcd5b4a449a1103f725bc63046d0813d28424a3ae7dfcee0568dbf2a282f27ac5512b1c342dafeaec5bcd3b4b
 DIST engrampa-1.24.2.tar.xz 1687432 BLAKE2B b2ef407aef77f9ecd3f8b06d2e991615a39fa2d4487678292d035a7cab882551bc8c757c6a15037b828cb51aaba14c2ec25e85e891770f6f8c9b453753d87b42 SHA512 1e0acecfe42e3945fe43729283522dfd56dc4cee92a4d5998c995a496f42f41b284ec10f01eb142139c1cec65e3b5a037299b168b73a2e6e828ae3ab4b9c777d
 EBUILD engrampa-1.24.1.ebuild 1692 BLAKE2B 2584960bbad9ba530780d3a7919b27cfc4c801e68fbe922193a2bf878aa8c1dc6dcfa0c4d48689bb2ea6b2addd629a02798bd5929378e05b06408df458b657a2 SHA512 771abb1dd041a396a708b3f1a908228e07367a0141bfb9102da72904dd960ccbd3f3157962dd3d3f5db2392e1a0f7615a8ec23c7122a6839d333b6fcc3c8e82c
-EBUILD engrampa-1.24.2.ebuild 1701 BLAKE2B 4b46c3cfd29f8da0c228e346d816cc5d8b90c3d3f92d8a63e7623555e6a52823249c9424564fe5847af5cc6fdb072fc50f1d39b7663cd7d70cdd435c69177f01 SHA512 d242fa6d432688e85c9103611765ada8f9b7e96668631630d76faa35db874a8af4ffc08ad305bf010309dd79416280c0fc71def3594b461cccc5c3727944608d
+EBUILD engrampa-1.24.2.ebuild 1699 BLAKE2B 79545465856fc52234172d35976b482e52b2d059506bfb86e0e35f1e2ca1dde115161d3cf84feefe916ed2c5bb71db895249aa5c29bee92237e30cc0e56af4bc SHA512 fad518471e6e1e6235915b0661dcdf4d07a94e78576caf8db3adcd830de7e741217e24ae6b061084bfb116182178625d681c6fe7a0b8bf48b758d3ab4ec461e7
 MISC metadata.xml 591 BLAKE2B 9a58776d887b3437f4edccb14ba8cd85139acfadece0e4c7a9c7ed7f5f02d5276fc86d30affeb1b605eba15a8ed34a7c40847564436c320e2a8cef5a313de12f SHA512 b0ae271bbdb0046308b9e06df3259bb5dc9d43e406830e000e4513d817fddccfee4b0af956f1c218ad6800e21d79682deddb4561789a42226ee1afa005cc7b3b
diff --git a/app-arch/engrampa/engrampa-1.24.2.ebuild b/app-arch/engrampa/engrampa-1.24.2.ebuild
index bd864fdd4652..5637db196c21 100644
--- a/app-arch/engrampa/engrampa-1.24.2.ebuild
+++ b/app-arch/engrampa/engrampa-1.24.2.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate optfeature readme.gentoo-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 DESCRIPTION="Engrampa archive manager for MATE"
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 9a6b9f1b7046..cc6cd7f2442c 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -2,5 +2,5 @@ AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
 DIST gzip-1.11.tar.xz 804096 BLAKE2B c251066f0bded6a6557a5cbfe5d20090c6446051c31fad610af4f9f7b2537c28fed1cfab424a459452db73b7d1df1361e5aeba163a9e980fc611faf408cac128 SHA512 af297c173297d588722f4d0f140a2ae4d3ea3861464191772fb2e11e47be43644b5ae01ed63f0051d6eb4751666284de53e14c4dd9f0c1d25f61cf676fbf11f3
 EBUILD gzip-1.10.ebuild 1081 BLAKE2B af51b89c49e389fd2f38996790b6102730594d4bd66c7a4177de9643523c9c9142b5758f7aa610aba7150f4c03f9871c59bf32a3f125084d636de066f77fb4bd SHA512 5616d9ae48821f18464c7e9227aee73293179febfb6b76aca227efa97edf58ad5ba776c5e3b3c5852089ddc86e06a7edb99955176a5f9d3b05e10a630c1abf69
-EBUILD gzip-1.11.ebuild 1332 BLAKE2B 7cb55947297327ac5887613bedc882fbb18766fbe6dde763e6a6954b3392c0392d82c109ecb77a8a434cca89a66cdf15c9237607d20a279d2efcc804cd3eeeba SHA512 26557604af167b197280f99d28ac374b536f33bec0062eaaf3e6bf23112287ef4d8d10f85adc24ee066afb2b14db2ade1cf38263d9d74369f1929fbaa3d7f2f9
+EBUILD gzip-1.11.ebuild 1324 BLAKE2B 693f9cbdc28a916a2f63be4f78c2d8159523d80306d21f9dd3def5cc056a91a6509295debccb34d7649d61147c7b4490f0bbefcd467adede767877aaf3030066 SHA512 e04b3db6451b240339d0dcdc7a9abd667172d2e4bfb025322ff07f28dbca4a4fe6506b0a387e87b413313878c43ee13511a4baeefd36f338504f7c8ab989bd10
 MISC metadata.xml 422 BLAKE2B b3ba7db4fdf23c9b1b801f21a3230898f260b131344538ff8644bc842dcd5f6bef5e4e2f8d475267d6d39047a87c00e1138e69d49892d21d58249346bde1e57c SHA512 6241ec1357f2f326c745589a18622987e9444e515157a53cb1188a21cd90e14e392db1e31b24f833ba05647ddfcfd6a89e13f6125ca15451bceb1a14e80fbc23
diff --git a/app-arch/gzip/gzip-1.11.ebuild b/app-arch/gzip/gzip-1.11.ebuild
index 395fb2de49bb..1c68d7110487 100644
--- a/app-arch/gzip/gzip-1.11.ebuild
+++ b/app-arch/gzip/gzip-1.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
 
 LICENSE="GPL-3"
 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"
+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="pic static"
 
 PATCHES=(
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index 607a0e1cbb94..514dba72f398 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -1,5 +1,5 @@
 AUX lrzip-0.631-solaris.patch 372 BLAKE2B 93bfcfd952ebb976ac3fb2906eff79dd88b79906decefde76d3245e21cb711587b37750146a9a5db0221d37e7aea9259dc1ab85932463b8e94dc23e18ec7c4ac SHA512 eec9086ad4ed4a148540ef1729fc3be4e4763950a35e3f2eec981451353f9ab0358aaa754ae4675ba22d057a97f17c2478fae06c173a38e423e32338f1cf5784
 AUX lrzip-missing-stdarg_h.patch 259 BLAKE2B c191b888f7849030ef4584f3a461bd14eb44c9eed2d9ad2126ebf54f11f57f877a2c6e50847d53d6ab14e3a568118def65dbe7cbed522af411f3becca4ef0827 SHA512 33775d10e2588f55030033b845bb086abab9fd82798dd3257ab26692bcc3619169b32687cfd6d94de1fcc5afde8fd3eb4e2a40d9133249b5e83fd32499733dc8
 DIST lrzip-0.641.tar.gz 262761 BLAKE2B 5a81d9ca8b40c141c90488e9ffcd1dfd5bef3fe7cf9b02c00b9382cd902ef8cd891401f21c9cdd5d5750daf639c05a1e6f1f010fcbf42a9cdaa4f11921fac783 SHA512 cb14dda15485faa24cb840dd94ecd4741bd47464770ae8b27f97b5c263d8a32e40ceb17b288f0f70426598ef2acf84b091593fc8cf7a0f2db0abde88d09a301f
-EBUILD lrzip-0.641-r1.ebuild 1102 BLAKE2B 53f2f6facbb851b90f8387c2667470923cce8b7e92842825aa74e42a119725fb5e9653417144d0721db309e8fe7759b2c835241dcb7fbc5df0f136aaedd2f5fa SHA512 ef64f229456b7a1db15ecc5f64040065c53e40f58445328c5e8e3e470ef699b2630d7249c2426c1d82005544611e5edd319748bb2f21393a8fe29fb96f7b0db7
+EBUILD lrzip-0.641-r1.ebuild 1295 BLAKE2B 094ea991f24be2d7dad3c7c49ecb772fe6151350896174c5d73bdd02753ef3867c556c5ad8a3888fcfac86fc203c468450806917d70b7b0367b1c9e35059b24b SHA512 5b71095e1acb73057efb04b14819bde577242b36246a17b67d3124d8a13db5ed14a9873cfcb02d357f6cdd5b3f5722f07eff4235d90273877d6f8223a54a9cd4
 MISC metadata.xml 608 BLAKE2B 30dea4aadd66ede896608352c35f848994c266849269253644e6cc72f737988d389459f38dc3b3cb45d9dd4bd3d36c194c2972b13da89e9349a2822dbe816f73 SHA512 8e239a83dd093400158111390385bc46280962a4162858bafc5a3ef3389ed4f136976d39bce1b07f5a49b95351cadc4c3b4803ea6fb2f3b83562484d7e8e7c49
diff --git a/app-arch/lrzip/lrzip-0.641-r1.ebuild b/app-arch/lrzip/lrzip-0.641-r1.ebuild
index 6c8ec1c9d02f..b8363c1ee90d 100644
--- a/app-arch/lrzip/lrzip-0.641-r1.ebuild
+++ b/app-arch/lrzip/lrzip-0.641-r1.ebuild
@@ -20,9 +20,10 @@ RDEPEND="
 	app-arch/lz4
 	sys-libs/zlib
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-perl/Pod-Parser
+	amd64? ( dev-lang/nasm )
 	x86? ( dev-lang/nasm )
 "
 
@@ -38,7 +39,15 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	# ASM optimizations are only available on amd64 and x86, bug #829003
+	local asm=no
+	if use amd64 || use x86; then
+		asm=yes
+	fi
+
+	econf \
+		$(use_enable static-libs static) \
+		--enable-asm=${asm}
 }
 
 src_install() {
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index c206ab40c693..017dfc9fd194 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -5,5 +5,5 @@ AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400
 DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
 DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8
 EBUILD rpm-4.16.1.3.ebuild 3642 BLAKE2B 20e3eebb5667d0367ae7d40892a0898c093e81a5d06a7e663b662bdbe93a9b1f8e5c9c48295ad5ca0aa49d2ff14974c79453d9625fc1ab607f818a02ccdd976a SHA512 092048f92e01f0c8aa7f42ee16a416fd3119b9571bf59f8c27a89e4bf328ac1ee56e2200d3ba227c2caaeafe86c3bc21817a34b603d0a3e0e56b1266a8008604
-EBUILD rpm-4.17.0.ebuild 3911 BLAKE2B dc7861a2407f74e2b53e18d49767c8e74cb03615f5e6338e7bba9edac6ff58e39df41d41d65ec95900556e1dc3e98a09c7c486e15d68e46713c706b16eb43dc0 SHA512 21fd70ad3bec10245f074b08120fa8869e55164b35781661f7d1fc80c7ff7ea91e6a9a0f32f5c65febac0862e8a1f7ae5a5ac661219ff0f66d164d696592f7d7
+EBUILD rpm-4.17.0.ebuild 3905 BLAKE2B a1de093f15f925aa568be75a98224b29de1ef49985fc218535fbc20adbd3aaff5c4605a185a76a597dbb079e8f5db0632c64405d412e183e115abfc605146214 SHA512 f49533e216d74577797ce78f7caa22aa395de5aaab0f05a3c4af136052ef7647cf8bbf2bb1b496119952e27a8cd5b5802bcb9f3b2f9622760a924f6f5ba86d1b
 MISC metadata.xml 260 BLAKE2B 00f83151d62c157bea18101b36007f01e6da9d16d438671c37b929b1e19cfc202f379816a1b0d9e3faea99c44a43f97a5d43100266c683487dabba09f1378eea SHA512 d6fc386bd5be91d5dff3d7aa514f4d72e7301a47f888db95573d72505ee86987ae6412fdd8aec82842c006abe831d99f6178b1ac78a04a7dbf9e5bce1d249cb7
diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild
index 2bc134671182..19b33b3904ef 100644
--- a/app-arch/rpm/rpm-4.17.0.ebuild
+++ b/app-arch/rpm/rpm-4.17.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # Tests are broken. See bug 657500
 RESTRICT="test"
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
index 9f48f8272ba3..aedc6323b63a 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -1,5 +1,5 @@
 DIST wimlib-1.13.3.tar.gz 1030667 BLAKE2B 2b897392bed3c4a390479f34925474c229ee835ab624c81a0baa7ebb8f3484f27aa4efb2a440debdcafe23b152b385bbe0f198d6f0560e8f88a34c7328a74edd SHA512 5c6e3bd1d7bda55812c818cc527cd241ac8a15276648f2a307db1f2a858de0b322e9f2beffda5bab991811aee3f4a953c3e31847bfa76a7d32ad5850595a15d4
 DIST wimlib-1.13.4.tar.gz 1040411 BLAKE2B 4563429d42be39b959a15ef66ac4c173531ff0c0b0f1a341812a4f870c9f189478f3ce78bf6240544f71b1746d98c9eae3f7182d646355343e26526559384f07 SHA512 480fe6fa6c6e8f1bf9c3960f5e1671f3266535b18dc72e9d7c4c05c7fb833d9b00db5ae9fb49154da6e71e536cae8b562cbf81ab5a124e2a79326927e2cf7344
 EBUILD wimlib-1.13.3-r1.ebuild 1469 BLAKE2B 4acd9822147cb0f49c946e72925bed37da0f433a4960ac2ad8c15b5c2a9f56d6abf9d0e2b7eb9008bfa7255c36040586fec25ade9ff363ecf921647478e12795 SHA512 54de7e8167aea45a54818fd6ab698db64f5a4896b1c1d487525128923f3d47c6d1d372a2fe7a96bbca086e8d982fca1df85f762bf249e9a23c189d91949cc27c
-EBUILD wimlib-1.13.4-r1.ebuild 1482 BLAKE2B 56329e664ceddca71a17f759f8ccae7035a2e8cf15ac9abbf71f17f8f179ced82ce1bff97c103bcc28a62f8e6d22386aed736c23441d23e9486df7f5646d0785 SHA512 dc703b9ec36452135c74ea99ad2cf562f1fd603f189ec582190522200de2e62f257e446557b5c7fa3fabaf86a2ecf39c724d76c699bbbeb64eb378f1c4a660e3
+EBUILD wimlib-1.13.4-r1.ebuild 1480 BLAKE2B 8cb36da172e3897b2abbc1efc6b07acfa58c41ba56d39716b40f3d0d299db4f4b02737c97d2beaf1fad48c593bac33e4e9d0dbf27d7dcc18bbc2aaaea77aa203 SHA512 030fcf7ff66bcc05253e7b164158be0cb70ebd8baf79c394a2b63b7b87ba89d54e6e78f3ca53075a2f19572b8989bd94a2d702f47e53c7540f58050d52d94c85
 MISC metadata.xml 561 BLAKE2B f1c2470ce49b460a973f435422190466523039f9bee92f96f8e52b07182e9d6ef59b079be20ba733fcf6a35a8cf5f49fc6eaa210f75db3cac2b07bc21d655d64 SHA512 7ea07a44c715bcb37e39fb1ff2b05e7a921aa585b7f002be2d5edadb1372454b522e6969518261a7121308792eb5be80e9b62227e471c7108d3c723a48fc3982
diff --git a/app-arch/wimlib/wimlib-1.13.4-r1.ebuild b/app-arch/wimlib/wimlib-1.13.4-r1.ebuild
index a914e9a0896b..13d1b0f2922b 100644
--- a/app-arch/wimlib/wimlib-1.13.4-r1.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.4-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="The open source Windows Imaging (WIM) library"
 HOMEPAGE="https://wimlib.net"
 SRC_URI="https://wimlib.net/downloads/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
 SLOT="0"
 IUSE="cpu_flags_x86_ssse3 fuse iso ntfs ssl test threads yasm"
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 6c0e21760084..7394857f24c0 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -6,7 +6,7 @@ AUX xar-1.8.0.0.452-linux.patch 2763 BLAKE2B 1d8d5739c16a7693771303bf4e5f04c1f2a
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
 DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
 DIST xar-452.tar.gz 220690 BLAKE2B 9728c73734a4bcb31e6e72d3d1a6735d5c78e384e15415641c4f40068f2da9498e9808cc36df6eaf7d3addf8be6d9eb90bdfa2900321e4dbe482156075bcdcd7 SHA512 d6ae9e5687020d20ec12579178f84c852fd485c52cff0ad23b7b31d2eabbde8c7fc85ab33e82eb81a5ddb59df4c26b756894be85061195cd191ab32be1f56b10
-EBUILD xar-1.8-r2.ebuild 1415 BLAKE2B f55f09ee399e2f99aad1a0b3f488edea094085132dcf6498370ae366ec62effaa079d90806dfd77a72f1452f4380ce4a0762ed5bb3c9442119dca8fae5294f60 SHA512 5a7198d75841f02f8da6ecf53b861511afdfb586b092c55867e7f5969db66121076d9968322d4e3a2c3e3dc3ccbc6e02ceed1ab8246b34bffe027d5cbf20006e
+EBUILD xar-1.8-r2.ebuild 1532 BLAKE2B f452c7c7482c9d47da3051b243730abe14b43760b0088d4ce8cacc7598644ce3a77a6e16588cc89b3589f9c02ea1af658e2e3562523910635a1a8291d203c685 SHA512 b45c30c1c7684ed9de5aed30db0998bf9e71ae25af33cd86a48ffe9eb99603f171457e9e6ef40e3ba2155c1281ade53060965e980e7706ae894429d7fe16b55d
 EBUILD xar-1.8-r4.ebuild 2419 BLAKE2B 79f316c9983b4d02e7c344f3604e3c9d74b26179482998e1fd9e9ca797aa90d50a5a7791ff0075d163260a99565ba61e3eb11b33ef6ebd6ca3e5afb8bf724abc SHA512 d3849273275eba79b7888f7774853f96b53bac5291cafe1617f714ed29b0fd0ae78d8333ecefa10fa0d4de796f0280b55eb1f8fb526556e7b08f7bebbad9583f
 EBUILD xar-1.8.0.0.452.ebuild 2583 BLAKE2B c3f7136cffff772d5d4405b8a7f8606d13498f4a06f34ad6a39b81e163a138cf663768280928a555a32b0fb880ed141c29cfb3d4bc12961cf883addaecf37460 SHA512 667cb5b095802ae52fac391d97d32903f30612b9ea5a788668fb53f9992ecc5b8d658aa7d8f10e33a978bd6a319de1787a70147130ea88e77d9e02bef2121878
 MISC metadata.xml 896 BLAKE2B 6276428173e9e59e3bd792a6df84b865eb695bf2591a8586b9903d1eb275af3a10d2295c9e37f452e911aa771f30a902c7b1361c83a1c5280f442a6652437c59 SHA512 7088753baae558cf466eb6a3af584d406ea09c5065f235d1e44d891731055fb88acd8957e764554b41d86d8fbf7cea21deaacdd2b38d9f8b05744202252ec271
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild
index 6fb089e9d2eb..264e285e6be8 100644
--- a/app-arch/xar/xar-1.8-r2.ebuild
+++ b/app-arch/xar/xar-1.8-r2.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~
 IUSE="kernel_Darwin"
 
 RDEPEND="
+	elibc_musl? ( sys-libs/fts-standalone )
 	!kernel_Darwin? (
 		!kernel_SunOS? ( virtual/acl )
 		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
@@ -39,6 +40,7 @@ S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
 
 multilib_src_configure() {
 	use kernel_Darwin || append-libs $($(tc-getPKG_CONFIG) --libs openssl)
+	use elibc_musl && append-libs $($(tc-getPKG_CONFIG) --libs fts-standalone)
 	ECONF_SOURCE=${S} \
 	econf \
 		--disable-static
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 0862a78693a0..76590f277c6c 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,5 +1,8 @@
+AUX zstd-1.5.1-respect-CFLAGS.patch 228 BLAKE2B df2d41007faeedd776a77d63201bd467d9473c5083b7b10ee717457c425d7e7538c0e1f923b99cb2088530a04020c22a39aeb45e5c832d7edec90f65d0409370 SHA512 f866ff12f0582f9205be791c454b824e03c62ac09b3fed9a30516251af5d9c59dd2b153744d84a080e928563c1332910dccdd8ca696f7d3233d2ef9719dd402d
 DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
 DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
+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 1441 BLAKE2B 3492aa70c3b9084c52c638053629bba1684ffa32418f5d692662f4458a84734920c0c0685513bf37dcd215231b4ba7ab851a71b9c25404f2c609a9aa64a3f6b0 SHA512 90850faeef55f62dcab40e44c4364caca16232affbe7b3a2214eda840ccd243b7d44ed630d7a7b71285638e07517f1ec4cb2b0ba25247bc4b4cc057bb2566844
+EBUILD zstd-1.5.0.ebuild 1449 BLAKE2B 1985dcc6336b6cb5617bc48a3d80400f3d642d281e098576c597b5e807cdacd2e738f66de94c58cef35a54f78f34eb21c77f4e5bd10a9f430d633f77c62d696e SHA512 31e0ab933fe30b781a1c0923ff4a8ab7437d95ee957e0b44e3d1b41687308ee6652ab13e4f490c39ec2b954bdeded743ac3642ebde9563a57d74d6dfa27c6e5d
+EBUILD zstd-1.5.1.ebuild 1518 BLAKE2B e1a415bf4a6c1ec7dc9e7680b707d5a01b68a9c0e463b98a806e6d8c4e6acdb92087579155b5604e3041dfb4d429d97636fc74d0c2e8421803faa725aec46b50 SHA512 da28b6a39814c02fb862ae8638d03401412de02a652f215b1a82cd30935d33b50c8f9c4cec90777fdecfff5583c410381345be1735ce064851b982c09d6acf35
 MISC metadata.xml 410 BLAKE2B c8c6cf3dc2e96b8d70bc199c8691f57fe43c561c3bdbeb71e49fc13f205bdf673e96e58d530b2e18c8ad2b99cd047ba5934437fda7828fe6ba177f5badc72a93 SHA512 3973ebd433d598c05023af411bbbb26b0f097d66e34c22fdcd31479ccc68c5a7bb318c29067a94de07ead566c5eec397d12b70a15d99e53ba08e6e9c999b61cf
diff --git a/app-arch/zstd/files/zstd-1.5.1-respect-CFLAGS.patch b/app-arch/zstd/files/zstd-1.5.1-respect-CFLAGS.patch
new file mode 100644
index 000000000000..63f0f47459d9
--- /dev/null
+++ b/app-arch/zstd/files/zstd-1.5.1-respect-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/lib/libzstd.mk
++++ b/lib/libzstd.mk
+@@ -78,8 +78,6 @@ else
+ endif
+   CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
+             -DDYNAMIC_BMI2=0 -DNDEBUG
+-else
+-  CFLAGS += -O3
+ endif
+ 
+ DEBUGLEVEL ?= 0
diff --git a/app-arch/zstd/zstd-1.5.0.ebuild b/app-arch/zstd/zstd-1.5.0.ebuild
index f46edb314bdb..8e810dcf9fc1 100644
--- a/app-arch/zstd/zstd-1.5.0.ebuild
+++ b/app-arch/zstd/zstd-1.5.0.ebuild
@@ -30,6 +30,7 @@ mymake() {
 		AR="$(tc-getAR)" \
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		V=1 \
 		"${@}"
 }
 
diff --git a/app-arch/zstd/zstd-1.5.1.ebuild b/app-arch/zstd/zstd-1.5.1.ebuild
new file mode 100644
index 000000000000..ee5d6e6b7871
--- /dev/null
+++ b/app-arch/zstd/zstd-1.5.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="lz4 static-libs +threads"
+
+RDEPEND="app-arch/xz-utils
+	lz4? ( app-arch/lz4 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-respect-CFLAGS.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+mymake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		V=1 \
+		"${@}"
+}
+
+multilib_src_compile() {
+	local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') )
+
+	mymake -C lib ${libzstd_targets[@]} libzstd.pc
+
+	if multilib_is_native_abi ; then
+		mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
+
+		mymake -C contrib/pzstd
+	fi
+}
+
+multilib_src_install() {
+	mymake -C lib DESTDIR="${D}" install
+
+	if multilib_is_native_abi ; then
+		mymake -C programs DESTDIR="${D}" install
+
+		mymake -C contrib/pzstd DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}