gentoo resync : 20.03.2022

53 files changed, 337 insertions, 167 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index b74aaf564299..e3a20d49af83 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bsdsfv/Manifest b/app-arch/bsdsfv/Manifest
index 473feb202201..8cd8ac75f260 100644
--- a/app-arch/bsdsfv/Manifest
+++ b/app-arch/bsdsfv/Manifest
@@ -1,4 +1,4 @@
 AUX bsdsfv-1.18-64bit.patch 2388 BLAKE2B 377975f51f211c90cb9f7571c4b6e437cb75a536238aa703321efcc6ddd13e19b9649468eb8c5aaa23f5ad982148fe92bdb65fb8ef40023d7a4375133810d6c8 SHA512 5831956791b03972b1fdd3199687b10e7a55d562e815f94b863fb75a549eec14b85488bb0a9c9e5d2fb3241a95846f710dd5b19547ce33c425da756c685c18a5
 DIST bsdsfv-1.18.tar.gz 13301 BLAKE2B 663ae589e67455dbea968aeedaed74ed8f267fdb9790417da3d61aec9b3f50a5d87857c5e0f39a359d8b20ebd0bf706c5b775bf61c617669c479460ae8e2ff60 SHA512 f2742cfc5c56c915aff7534eb07025394c57bebf74d6505dc1d7e814e5ca098b474a718ae1c2aeb993cf95dd55fc792c56f9ac80344d112738da2f20157647e6
-EBUILD bsdsfv-1.18-r2.ebuild 565 BLAKE2B 850a490a0152d94dea25e8b095e0aa726d5d6ff6cfda2aefb9a69b3afd4ef1a298bcf5a69f9354d8395afedfff1a239c116d433e51720a9d79efc1400c99d166 SHA512 8b475b31a858cfc9ad5bdac676a4706f8064d1309d598c69102b99f9f98968a6f12d3ad4f9190ed95701c0aa5fa6e2e9877fbf8cee3e99f166be2f7b6486e8fa
+EBUILD bsdsfv-1.18-r2.ebuild 567 BLAKE2B 9dac3ee9c9b59d617be9cd2484fa920d60745dffcc3151b4aca2d31f45b3170214450c2719344b3fbbb59097c080da1b16a3468498b2d5d22837608ce049995f SHA512 3175c050ca61719fd458aba66ac543357b617dbbfa938799eb63c12d81f500c41a690708c0316d7ccee7eb7d0a83c5b2ce4f3a9b9e43672e1496f9d8ae64b6da
 MISC metadata.xml 247 BLAKE2B a7a241b690942d603b49d2cc4fc20eb28f6264bc00934c8e4df132a03b5dd79cab62fde7a682a3c9889fea8dbe919ed36d405e3c6a6cccbe323dcc9a270a1d16 SHA512 df60aa4971a8148f505716f545fd2aa66a44b7375223250e3986b56fc4cdb146bf4c992c288b24919e30a8a572237c481a45898fa9de201e15ba75779cd8a48c
diff --git a/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild b/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
index 9c59d15f47c6..1882a32eea98 100644
--- a/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
+++ b/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ S=${WORKDIR}/${PN}
 PATCHES=( "${FILESDIR}"/${P}-64bit.patch )
 
 src_compile() {
-	emake STRIP=true CC=$(tc-getCC)
+	emake STRIP=true CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 57496b8a8c36..905a9b4cda54 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -6,6 +6,6 @@ AUX bzip2-1.0.8-mingw.patch 330 BLAKE2B 27cfec9fb3fb16f624445d0f035d56a6a747eaa1
 AUX bzip2-1.0.8-out-of-tree-build.patch 1997 BLAKE2B 87791ad7b5c702110a7a45bb4a01908fcd2eb8f1b187c822991d818011e49165abaed679d899a2fa29adb6751faa82659e31c6e0f853b4548061f2913cb0cd18 SHA512 9008152aeb299825635eb9b6f4887951ba6ec190b7e545e12d82e2222ba4ed1ceb31e3eef1275b5f196b726e34a04da1e7c2c95a694c7c771a8852f20a1bf305
 AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8ababee2b5ff0221965f1ee6675c4060cec841dcf4370018a7fc6376cced900c6410eca96579962d52fd07563d SHA512 19d1a721680e4113c3b3267af74fa5a7ec5947c6630946c60ac5cf165476d9e7c2229e0cb099029dc9f5708b5ba15864f84af198940709144b65dbd2cd3a76a8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
-EBUILD bzip2-1.0.8-r1.ebuild 3244 BLAKE2B f9849e6e361a376c00937be79f22974f710d689c73be3364ee17bc17bba539ebc6d451a2509ced464ea7a4ebaebb18030474e5105081dbc02ff1ed71dcd2403f SHA512 620e109630e8755f7712f620e8a4360cf712c3dccececc9d00d02472deff1ffa99281273e7c9688c2c080f4a9b56bebdafd23f4327b6523f7892706109e4b379
+EBUILD bzip2-1.0.8-r1.ebuild 3349 BLAKE2B 6e2e37022f3a0cf14c3b3a48254ab65a5f2c7ca4a728c0ccbcf707ead49a808e8a608ae1c3c31f8d76955948473b481c5be9d6728151c03ef4d162669a9069d6 SHA512 becb679ee3e98e9e718888ad10a4a1b1b7642cf7fda14c1283af1f5d1b5566e8140a8e5f7d5fcbaa252172a346214be932487621425d4286c818ad12c63dc8fd
 EBUILD bzip2-9999.ebuild 1623 BLAKE2B 792eb2334df87eaa765d1f6d86216b63cb47f96e4087425ba6b5320ba1cdd5a6a9fa8d16252c62e7b6087812e9c33905cfe40fff2354aeb41eabd52ba4e5d999 SHA512 8551d0bd27cb3c8bc2d5859ceefad97a132e32f01e41430377fb95228419f5f008d77ba4be2c4bbaa180da20a0fa4a6458831bc628cb287a65b4f812ea14918e
 MISC metadata.xml 333 BLAKE2B 88bbfff022309d663b728da241623e9a9dd2cd00d4638cc97c4809433a3645421239d2f51360f9d848617891e7600ad6b63b17acf8c6ecd65a4e355dc1372084 SHA512 15620686ec250b2547fc7ff369c9c0854a7217e731da556db1224896cfd4e63eba836469722b12115e359a9701acea0ac09d7ecc89fa1dbf8683106432f1f9bb
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index 49d36f93d65a..20e9e8edeb87 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-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
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
@@ -8,6 +8,10 @@ EAPI=7
 
 inherit toolchain-funcs multilib-minimal usr-ldscript
 
+if [[ ${PVR} != 1.0.8-r1 ]]; then
+	die "Please remove libbz2.so.1.0 logic from multilib_src_install"
+fi
+
 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"
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 8542359fd827..33d186fd3361 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -3,6 +3,6 @@ AUX dpkg-1.18.12-rsyncable.patch 1245 BLAKE2B e1488cc6a6807d38ec7218ae6651b0d919
 AUX dpkg-1.20.5-dpkg_buildpackage-test.patch 209 BLAKE2B d15000423abe8259e7bdd92e5ff2d38f8fd32622e8467259e791159df590f7d394647ba4efdd599b77d652f973cd07af09d64f29df920fb8015c995bce9b302a SHA512 046200d2a8c143a2b08e0c8113765c7a7a18846ce0b7a2dfd5a3f1167eacc70391415c6bcef21abe49e5d8225dbf08680fcdc405f0910e9c42071ad4cf8ae6d5
 DIST dpkg_1.20.9.tar.xz 4954428 BLAKE2B 4e04f7a90c8696971895081e18b220d9dee4bc5930428f131556ae71c673e61e18c363e279b566c2218da60a5aca421807c14cf518952502e707c7397769097b SHA512 904a4742f5f340dc65b2137364dce102a0b2eb42ccedb2a73f79c207362c699fbffaaf1379f1f6c8b8b0e490321af1d03c34b50ebe0c703f5ce8a7f75f17a839
 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
+EBUILD dpkg-1.20.9.ebuild 1999 BLAKE2B 8c4eb6fde703797505d357ae6ba5f70ca15a514f60699a25eccc2896aad1daa10662da0f80ff1ef0ea6d94ca0381280f3c57f38df4340ac86098c65a91043313 SHA512 b50c6ac21dc86e8ca91d6cfd87855935c6aaa3ece8bc6cca6ebd53b46b7fa54e5b39b24edf8d81c6dac423c531b13379e17fda0d8946f4248b518a13c613eccd
+EBUILD dpkg-1.21.1.ebuild 1983 BLAKE2B 4d398a338bdf3af6ae3fa3d88af680363d72cb670b1b40e637e877e23c4caeb3c25cee5d7ecf432d622e17c3d11914289cc989d94e8302a5b716ee3e3099efdf SHA512 13aa5c69e986c6302e46f05d2080d773f4264387bcdc1b855bfbb38901af56a44b2d119fb3bf8efec32b3c035a9e4134d4f0c16231ed29260ba5cbeab9ed10ce
 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 5a64aa7a6868..e09448b39304 100644
--- a/app-arch/dpkg/dpkg-1.20.9.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib autotools toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Package maintenance system for Debian"
 HOMEPAGE="https://packages.qa.debian.org/dpkg"
@@ -78,7 +78,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 }
 
 src_install() {
diff --git a/app-arch/dpkg/dpkg-1.21.1.ebuild b/app-arch/dpkg/dpkg-1.21.1.ebuild
index 2a6982311b44..2a496910ba9e 100644
--- a/app-arch/dpkg/dpkg-1.21.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.21.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib autotools toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Package maintenance system for Debian"
 HOMEPAGE="https://packages.qa.debian.org/dpkg"
@@ -78,7 +78,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 }
 
 src_install() {
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 0656c54a5cba..ef2ad384dc3f 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,4 +1,4 @@
 AUX 3.36-packages.match 664 BLAKE2B dfe72c4eb0b44b8ab589fa81c0ceaa31bc3516dee78fabe2eb48f8131b25ed75a11630ae620e70646539ef42a7c4d7d283f71ffa0fa13f64ccf164d672acd95a SHA512 154438583492c571e4c8e1c926c3cb04972255cc4d1b74f186dfbe50c9756f25e11034fe64d893fdd8f2698c8eaaebba76682a818bb6523656c7c412f8e8b614
 DIST file-roller-3.40.0.tar.xz 876424 BLAKE2B fa2483677869d5a6b4ac91938eac6bf09965177ffa07bab76a77a0be58e331466f939e7e0728d5eeeb5703c6ff12f178f8080922f8ae9d726e77700bbbd518ed SHA512 224dbe4f4358aa62589d084d67244ad8d65d718f9b6adf708ba1425b38fca68e08b07a6163f66d95c6acfd164b6062939cfeb27873ea41353e0551e322b0eb26
-EBUILD file-roller-3.40.0.ebuild 2200 BLAKE2B 06653eca4437eea15cb618544d9ad77635ef13ba4a46007fa602a2e82729c0421d64aa9e191404462b0b954ef6267fe6cfba1f1c4a7043c7e7561e852ac5aca3 SHA512 55d71c563c4f1fdde88f9936cbdfe502ebb4f431609c4b76049f0cb8f17192ca159db329408b5002a1cd4707cf2cd6405a6b53b4c7d71d3f9f70f04ebd1302b2
+EBUILD file-roller-3.40.0.ebuild 2199 BLAKE2B 5acf854c76e94908a8d5af013d298df9827ab447208549623c2aa026c95bc105f5d10911aeabba3e78dcd3f313e1768c69b9a064875107176e048af5481be3c4 SHA512 fb686a7aa3ef1c5a5bd382a1b8c3556b59d0be208539b043f7da38092aa4136a3a9e272abbca962cee9a08827e3a2be63f744ee7a416ea76e31de50e70e38f6e
 MISC metadata.xml 523 BLAKE2B 44d1f4c6636070d561c1d0fdb6bfaaae0f92b81608f52de78f6b5168ca717a7ab0c54ca24a8bde59cd7a7e0be96f195bd8f7eb5e53e820917fec5cf692cea7ec SHA512 79b172bc5f64b91f389c6dee90da6dca10705f07fd469b04486eb90d11988a07002233c0718c3f223df9fd63050b3fb17dc3d5f56b8923e47dfbcc231834fdc9
diff --git a/app-arch/file-roller/file-roller-3.40.0.ebuild b/app-arch/file-roller/file-roller-3.40.0.ebuild
index d3a992cb7102..fbdf9bdda3b0 100644
--- a/app-arch/file-roller/file-roller-3.40.0.ebuild
+++ b/app-arch/file-roller/file-roller-3.40.0.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index b50bb91b15b3..842dcf97b5da 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,3 +1,3 @@
-DIST gnome-autoar-0.4.2.tar.xz 50656 BLAKE2B 5540f8dbda2b7c19b563567a3e24d39b29c882ccd12dbdae649fb9d50cbc76a2707480b05d07e476a819cebcdddc12adf00245aed3089d1e2f2264573b03af41 SHA512 2ea18164aa836e88457359643c8c35e4bc701a60efd3a0c3af32bf848fcd90cb6421a3042f26b6376d81cf9dc493fa3d7bdae312990a272687d6be9de515b572
-EBUILD gnome-autoar-0.4.2.ebuild 1092 BLAKE2B f3d9d9374555cded1eca7f06cb7b08b883b989e58686e690dc49b821af60f8a893d8c7d45e429dae2bd6f8adaaddf1f1e6ff4e2a8620e086e8305d1a6d07f7ca SHA512 3665122ed311da154c852dd901b8180375d85d08e8533cb463a0484748b926cb2afd636a40177743a9586d839a0f9a24c3c61599d7e7edb1b96a2bd4773248b4
+DIST gnome-autoar-0.4.3.tar.xz 50860 BLAKE2B ab7360d422e3f2d06cc00d765c203e6472a50d8cd9c220cc87b6fc40ca9bdfc3677a2a7d50b383b8f195bba1ffe72773b23773f703cbd24e5768f0f907790e10 SHA512 9f1ba584c4fc8e82d842fb21d3a113d64faa85f8f27cb7afb5d09919f510e350608b6a4e2f3ac527162ab338d008271bd430fb5b8ead265098c1810ffcbcef30
+EBUILD gnome-autoar-0.4.3.ebuild 1113 BLAKE2B 986bf33ec6114f06370df787b174ed4b661d6d1e67daa85a345c8b378b7ad382a384ec9533a6fe8537a2d37873e0d7480da96332d6c6da564472604d52350990 SHA512 d07257ec3fbf74eaec67079b3b0033d84ac911108accf70cdfd5c17827f502bf7f83762b489bb1144fec01e2fb53163fd22b3cc2187c09e92b2dea90cf4f7962
 MISC metadata.xml 465 BLAKE2B 11413058ead980c52d3389e3aeb7daf756c4a39e3caddee888e4da23e32490e912debf6448ff4a7d0222132545ec9bea295018d9c438475cb920e24cada3d81c SHA512 082d48f638537b52bce8cd7dcf3ac68cbd01cc5f4ab2a6a4dacf25e28c062bcd6cf7f20cebb9f1ad23ed4ce33ee9dfd1e5bac59965ea200ed28c1bc095a3510d
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.4.2.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.4.3.ebuild
index 859dcb24f3ab..ef6d958c4669 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.4.2.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.4.3.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
+	dev-util/glib-utils
 	gtk-doc? ( dev-util/gtk-doc
 		app-text/docbook-xml-dtd:4.3 )
 	vala? ( $(vala_depend) )
diff --git a/app-arch/hardlink/Manifest b/app-arch/hardlink/Manifest
index 04f693070aaf..4b3139ee8776 100644
--- a/app-arch/hardlink/Manifest
+++ b/app-arch/hardlink/Manifest
@@ -1,3 +1,3 @@
 DIST hardlink-0.3.2.tar.bz2 15479 BLAKE2B dd6cfc312ed75dc6d9e37b898215ed90efe4734c5974297c9e29a51a69c9b2d4e91d9aa3bca1d42679307eecd95ee46e6f636c211d1ceafef1ea52428761d1ec SHA512 1d027f7b2f1974c950044fa8872dc58101800ca557a4d66406652fb43f64653f7dd39a70f4ac65f5f6bca9116de4ce44aeba2ef1fe446834641ba5c4c5604dff
-EBUILD hardlink-0.3.2.ebuild 1076 BLAKE2B 6a0d9ac49371bb12f77899d7994b596ce654ea904f80800ad407260d7a4c97ee01e62e6d1f71e5e1468ee82624207ec2330d48b739c46832eb2bb280ae0873ef SHA512 d96f33ede57e1d190f4993c2928808b13005746bce63272359a3d1af5ee5a4e7c327e5d7caefbfe4023738db19c8898056fbeab036bc57725a27295e7db64ba5
+EBUILD hardlink-0.3.2.ebuild 1078 BLAKE2B 050db15d196ebef177a3339cedb39a79650bde599e309a7f2db2391692a3d5917a1b0c3fadbcd19e0685c3809264a552a96013006e54ab9685398bdb57ddee4f SHA512 d782f30244846804f525c29ef09293be395e2a3b2581ba9c08a0c18d3acb9e4cef60ed8024be6bca4d395b3c8d2532d5b346bd633ad29e4ce7ba2c570e39180d
 MISC metadata.xml 376 BLAKE2B 316bca94b25cc5fae281038d68c3248a33222648b397b0806e0bf87a2e60d3694fd03c606baf57f25f953052b0b8234f42cd1c2d1eefa81c640f7bcade611660 SHA512 7e61b69ff3e06de9aaadc91e0d1189aca5b79778ccb86475831d37d0c0e820acca1ada69843629674c820f1e39035866f533819242b072aa8f2be9e65fcb75a6
diff --git a/app-arch/hardlink/hardlink-0.3.2.ebuild b/app-arch/hardlink/hardlink-0.3.2.ebuild
index 04acefe5304e..41e4ede3f061 100644
--- a/app-arch/hardlink/hardlink-0.3.2.ebuild
+++ b/app-arch/hardlink/hardlink-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,5 +38,5 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
diff --git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest
index 3aef3199f053..af728f85b230 100644
--- a/app-arch/innoextract/Manifest
+++ b/app-arch/innoextract/Manifest
@@ -1,4 +1,4 @@
 AUX innoextract-1.9-fix-linkage.patch 311 BLAKE2B 777d3592d3b0c5ced8a36473b9b481395e2ae4b33dedf1d8a7393b150a2c048c764b1f4902fdaa23ff68749d04f393668ae8b4ba7fd8bdb82f7cbfb4142391c2 SHA512 df4f251c36ed2e01314f12cecc44082c4ecbbe8bbef9825bce98cfc880a7e92047da17051879b4f2d972dadf6fc41f07338fa958d773847394be4441c5db0dea
 DIST innoextract-1.9.tar.gz 206931 BLAKE2B 1d5f0d13a7cd52262b277263f061ecab85a3419197bceb22938a0d10000578603cc2c2b972a45474027cfea8e43b8bf89d680035034785210842477b147811fa SHA512 2b18f7bb7f50744bcb1bdcd25e57e0760193b179c77b55e0f63c537e55afc98de3b0380da3cae470ce97660ed41a7ffbb48c8c25329c9ce9b3811d9aec74bcde
-EBUILD innoextract-1.9.ebuild 763 BLAKE2B 00483d46965f4c8a9948b1b90ed2dd2611284c1390d8756d6cf39943f530dabed4205bc09156a54c7eafeaa5c2077f737c28eee995ca6fbf7e1c93d6da5c4056 SHA512 534ea71db7bc4105ead308ff6c9714b6ebe6668bfd01ca82bc40b5bb89c72209fd0c39b9268b066939a381f60e6b99ee959609c01fa8266521eab7b5a8d352fe
+EBUILD innoextract-1.9.ebuild 774 BLAKE2B f48ea5b5b8ea7a8354b1e311dc741114c5e1353733adc67ebb2e2026389a1115bd0b920860fd3c830c56c44f9a49aa00c1c2a922344b9ab71e5533f617a5f430 SHA512 dcc616411d8868e1e276f6afe60cefdf267810c5261699907a53867921408b1d5504b19270ac87e129d5e2677ed470e706744e7f675a21e5e29b78fa5942afa6
 MISC metadata.xml 808 BLAKE2B 92420ec3329ff620f12b5a8c86a742b0a7497cda47e199aca0759bc3d4a3743ebada88905850d9c244cc9f84978d0d00e599329734ee849b4a4c39acd237417b SHA512 4b506e00d5b77eb765fb6b638676cddbe245838e82d0beff2bcc55a1dfddcd725e588a4b7fa57c63e197469839c2e308d6fbd0299f284494847f5340fdf50524
diff --git a/app-arch/innoextract/innoextract-1.9.ebuild b/app-arch/innoextract/innoextract-1.9.ebuild
index 31ff8072913f..65728eeabe9a 100644
--- a/app-arch/innoextract/innoextract-1.9.ebuild
+++ b/app-arch/innoextract/innoextract-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://constexpr.org/innoextract/files/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~m68k x86"
 IUSE="debug +iconv +lzma"
 
 RDEPEND="
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index 0e40633a36b5..9374917e86d6 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -1,5 +1,5 @@
 AUX lbzip2-2.3-s_isreg.patch 500 BLAKE2B 7839d78d204c0b88ee68d728d1279dc2bc2e6222046cb28c60001c194513de7f3343dfb93d6db91bc4424fb639e2a1cbe428db1ff6753ec2c5b3c004a2b8f321 SHA512 3158763b364e8ba41b0fea03529c6e4a0c6f3d17e7d0ce796fc9a6f6bc7e70fa7db759dc205026818619e137fb6343cf21534014b64dbf07c1cdb3bc1059cc04
 AUX lbzip2-2.5_p20181227-fix-unaligned.patch 1061 BLAKE2B a8c11adbbf53806b09d9b0b6b724247a17e450eac6953a9d9852539ab6d50901d739b243a0d4c72cc46cd7bfaa609fd6829af659e0c6ed6987e6725c471ca201 SHA512 0ddd04a06d2cc763b454074aba588d2cb252e0ab8c83c37133deb5cef2c265261fc38f6b32f8aed5ddbbc8aafdcb29e96df1b61f2f2cfd2e1b93818efd69114e
 DIST lbzip2-2.5_p20181227.tar.gz 704920 BLAKE2B e5da0091c0e4fb73724c5ea472d757d76356cffbf1fc679bf4ee05e25690b7712dceaf17f355383bfd4eb525c4aea04c2e5312592df5bb99159e000769bcee2e SHA512 53b29721a106d280927f2c18f33247645bb7fb3e67d835885d73e037910bf02e473f1210d848df41a387be30f829213d98ac9387b2a9201b94d12117809fbcf5
-EBUILD lbzip2-2.5_p20181227-r1.ebuild 911 BLAKE2B 1a9f41cdf7ef3c032d877f56838aeb5af584f7ac9a04b73f42d2f8d57b64249553eeb6daf3b2bb42515abf9b5131adb65abab5e006de78fd21430cbbea415896 SHA512 797263789b43b327c3997627bb677ba33cba641ae9970c9dd32cb223757f200f4dd6fb1511a773ad6f9ab3a0cd29d59a65d8a76b49b8e74e8864b49777a03c7f
+EBUILD lbzip2-2.5_p20181227-r1.ebuild 910 BLAKE2B a9b0378c19e72eedb5e784b89ea322ac4fcc5684ffc19f627166232cae339079ca55fd0d9901e0ac1498aa42ad456bd3230165a90ad8e453e371f8bf91e39bf2 SHA512 d92c81cb4a3f99b08e5ab9a8c075ebd0eb4b5f8aedd67064d9fabefcd24ad93cb1731ee272b502d699e1d25e4bd96536131be57c4cbf7accaaf9b77faa7fa248
 MISC metadata.xml 653 BLAKE2B ff003286604e6fa124d9dd2e75f967986a86866e9666b5108aa6249267a52272c4b517201e19c6882c2117cc70534ea30067773ad04556c609f57aa0ae55093b SHA512 4d6ae02763acc84078d6573f7999566d183b63d7c75bc34f59695ed07e72529503a5320e7c4050b131044b6cd3b70c2b7504304b42be3b807f76bd3bd0fcf6c7
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
index e8d3af562b38..63e6126d770a 100644
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-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
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug static symlink"
 
 RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 648f6ea8d42c..ed7030cb1d29 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,4 +1,5 @@
-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 3404 BLAKE2B 64597581b7d72a04441818b7b1c6b2edcad1cb124b7e9c096a24716e90f8f9e27247d19f69e956aa77b773ac80003bf24a0ec190c9bfec5eebcd88b710b525f8 SHA512 0f9b1fe30d32a92915bef2b01f6e702c94861eaa67c9479a3ec8bcb5935a8d5aac5002babf0fa83dc3073cd03fff5e7dde4e2ae15df7253c53af9394e7d2e0e4
-MISC metadata.xml 1515 BLAKE2B c30009d41ef242d07f1f047b96f72e436e930f4ef6a316fc3054865061f3b32450239392df9da6b4431eb3a959f0a892425065f292253b4b4e145f56c0575161 SHA512 ff5508fb73ec4dca5d84525ebdd176ab626071f2ae6693c60dcfabf7ef29342340ed6af10230d983424d20d3927770b028fb866c1d0a179f5ad3c7c63c721319
+DIST libarchive-3.5.3.tar.gz 7038767 BLAKE2B a9f8b44c42efadb29cba2597c201bf9064d69632db92dad07df3f1bc9667257d8578c2ae7fae65ffc53e075466e3d326e4fe77d18d3f06656a4a255324a81fba SHA512 889879e869f7391e3b85b5e3c2bbad3c1a5e50ec7b62c0be8f2817e2dfa8410e6eb409a3c4dce2675b9e7134bae3f129475e331bc3d15d637b91412c7eb026a2
+DIST libarchive-3.6.0.tar.gz 8570393 BLAKE2B 57a8e1681485a489dc9d3823cc8c9b0d68e7d84510a3eff0b6adc268825bb9aa6179d8a810b249c3f72e3674e1df6e5ba2ed0043196458bedc3c1d880c5d4a0b SHA512 700579c5dd15b61333cc4dbf01ebfbd26d6e8c20d5cbe6525683634418fec5c87a5a1e28a81cc59ad7c94218682e406aa3b55d81036bd9fa31d83d989c6d764c
+EBUILD libarchive-3.5.3.ebuild 3209 BLAKE2B 02b25ad0cdfd9de03e63254a4b8f879d5d8e0b49f00d350e9a3ff345dc70627e49a73be71706d2f18321610a16d9b9d3b564a52c2c8a846432b709adda3809fc SHA512 9660b299d7b16e656e33673f00bf510c1d8b615b1a162d0992863d96b4fb55fa3a64cab8ff4975d3a0c692c3c42155fa1795f533d53bcfcbb006f8d8d6e547ac
+EBUILD libarchive-3.6.0.ebuild 3217 BLAKE2B 06dce877cd9c5181ca33b831f0d325fcbf819f9dc5adbd983653f5a3e06e8e98e6bffb0b12382945b70006d02539eb0fe51cc5abebff742ec7e5471ff8235ab3 SHA512 ab2572229c867721700df28e42e7faed4defbd5aad3dd55e225e936286b4c5f96cebd418c9e67b8d300430dc071cc9714a46229404fe01b7503626f416acf6f3
+MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b
diff --git a/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch b/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch
deleted file mode 100644
index 8f540e4aa07b..000000000000
--- a/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/macports/macports-ports/blob/master/archivers/libarchive/files/patch-libarchive-3.5-strnlen.diff
-
-next release should have a fix for this
-
---- a/libarchive/archive_read_support_format_mtree.c
-+++ b/libarchive/archive_read_support_format_mtree.c
-@@ -65,6 +65,20 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_mtree.c 2011
- #define O_CLOEXEC	0
- #endif
- 
-+#ifdef __APPLE__
-+#if  __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070
-+static size_t strnlen(const char *s, size_t maxlen) {
-+  size_t l = 0;
-+  while (l < maxlen && *s) {
-+    l++;
-+    s++;
-+  }
-+  return l;
-+}
-+#endif
-+#endif
-+
-+
- #define	MTREE_HAS_DEVICE	0x0001
- #define	MTREE_HAS_FFLAGS	0x0002
- #define	MTREE_HAS_GID		0x0004
diff --git a/app-arch/libarchive/libarchive-3.5.2.ebuild b/app-arch/libarchive/libarchive-3.5.3.ebuild
index 7d264e642f3f..8e9ae0485b26 100644
--- a/app-arch/libarchive/libarchive-3.5.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit libtool multilib-minimal toolchain-funcs
+EAPI=8
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Multi-format archive and compression library"
 HOMEPAGE="https://www.libarchive.org/"
@@ -11,9 +11,10 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
 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 blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr +zlib zstd"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
 
 RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
 	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
 	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
 	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
@@ -28,7 +29,6 @@ RDEPEND="
 	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
 	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
 	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	kernel_linux? (
@@ -36,15 +36,6 @@ DEPEND="${RDEPEND}
 		e2fsprogs? ( sys-fs/e2fsprogs )
 	)"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch  # drop on next release
-)
-
-src_prepare() {
-	default
-	elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
 multilib_src_configure() {
 	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
 
@@ -61,7 +52,7 @@ multilib_src_configure() {
 		$(use_with lzma)
 		$(use_with lzo lzo2)
 		$(use_with nettle)
-		$(use_with zlib)
+		--with-zlib
 		$(use_with zstd)
 
 		# Windows-specific
@@ -69,9 +60,9 @@ multilib_src_configure() {
 	)
 	if multilib_is_native_abi ; then
 		myconf+=(
-			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
+			--enable-bsdcat="$(tc-is-static-only && echo static || echo shared)"
+			--enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)"
+			--enable-bsdtar="$(tc-is-static-only && echo static || echo shared)"
 		)
 	else
 		myconf+=(
diff --git a/app-arch/libarchive/libarchive-3.6.0.ebuild b/app-arch/libarchive/libarchive-3.6.0.ebuild
new file mode 100644
index 000000000000..ab2dcccb7b74
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.6.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="https://www.libarchive.org/"
+SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+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 blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
+
+RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+	)"
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=(
+		$(use_enable acl)
+		$(use_enable static-libs static)
+		$(use_enable xattr)
+		$(use_with blake2 libb2)
+		$(use_with bzip2 bz2lib)
+		$(use_with expat)
+		$(use_with !expat xml2)
+		$(use_with iconv)
+		$(use_with lz4)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		--with-zlib
+		$(use_with zstd)
+
+		# Windows-specific
+		--without-cng
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			--enable-bsdcat="$(tc-is-static-only && echo static || echo shared)"
+			--enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)"
+			--enable-bsdtar="$(tc-is-static-only && echo static || echo shared)"
+		)
+	else
+		myconf+=(
+			--disable-bsdcat
+			--disable-bsdcpio
+			--disable-bsdtar
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake libarchive.la
+	fi
+}
+
+src_test() {
+	mkdir -p "${T}"/bin || die
+	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
+	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
+	local -x PATH=${T}/bin:${PATH}
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	# sandbox is breaking long symlink behavior
+	local -x SANDBOX_ON=0
+	local -x LD_PRELOAD=
+	# some locales trigger different output that breaks tests
+	local -x LC_ALL=C
+	emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+	else
+		local install_targets=(
+			install-includeHEADERS
+			install-libLTLIBRARIES
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${install_targets[@]}"
+	fi
+
+	# Libs.private: should be used from libarchive.pc instead
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
index d3de9d873aa0..a8ad4ecadcd9 100644
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/metadata.xml
@@ -24,13 +24,6 @@
 		<flag name="nettle">
 			Use <pkg>dev-libs/nettle</pkg> as crypto backend
 		</flag>
-		<flag name="zlib">
-			Allow accessing gzip-compressed archives through
-			<pkg>sys-libs/zlib</pkg>. This only affects libarchive's native
-			support: bsdtar will keep using gunzip as a filter if that's not
-			built-in. It's also needed for supporting extraction of ZIP
-			files.
-		</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libarchive:libarchive</remote-id>
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index 514dba72f398..90ff851378ad 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -1,5 +1,9 @@
 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
+DIST lrzip-0.650.tar.gz 238952 BLAKE2B 5013de6f8948aebf1bb7545c392b623a1628f74298cab3316555ec6a1acbbc64f81abcf1f5c8a7a67a547d8748f7bb05d0d88cb58b6fa3ab765baad596acb756 SHA512 30a3217703748f6894fbac438976e3179a46e3f6af59e5849f7f8460d1a094275a4b41790617f4bd1ae7c7476548d2daadcfab9ab60c167ce5c24cd593e70964
+DIST lrzip-0.651.tar.gz 238854 BLAKE2B 2680867ccbee6ff669581017c9bb22db4d7eba0fda80b935bd088191809cb8baa833a03e7732cd1fe5a0487edfe577b34f34dcdcda121c114145bff9fc17ba79 SHA512 97671c4705bc06dfd037e38f4384a5ffaf2e3508da217406ac43642b88eae16576818a378bce519812204fecefbd6552a75fc3e74af729ab7b11724b7a6d1998
 EBUILD lrzip-0.641-r1.ebuild 1295 BLAKE2B 094ea991f24be2d7dad3c7c49ecb772fe6151350896174c5d73bdd02753ef3867c556c5ad8a3888fcfac86fc203c468450806917d70b7b0367b1c9e35059b24b SHA512 5b71095e1acb73057efb04b14819bde577242b36246a17b67d3124d8a13db5ed14a9873cfcb02d357f6cdd5b3f5722f07eff4235d90273877d6f8223a54a9cd4
+EBUILD lrzip-0.650.ebuild 1199 BLAKE2B 3ea96d2eedfd04abf96829cfb29797472d9baed3d05b6b9f8a58d0644f51e9f84a6ef6550bb2fa1b844d8ae7936bb180c1465d110a2df4e34478d7cc33df2aa3 SHA512 24f86bc6e6c1db491f2fd8d6f81af3f78639fa6fa579245a8138c4c93802424ece852740bf30ea79cb019623de28cc976af39cfe513da61fb09273e720039024
+EBUILD lrzip-0.651.ebuild 1199 BLAKE2B 3ea96d2eedfd04abf96829cfb29797472d9baed3d05b6b9f8a58d0644f51e9f84a6ef6550bb2fa1b844d8ae7936bb180c1465d110a2df4e34478d7cc33df2aa3 SHA512 24f86bc6e6c1db491f2fd8d6f81af3f78639fa6fa579245a8138c4c93802424ece852740bf30ea79cb019623de28cc976af39cfe513da61fb09273e720039024
 MISC metadata.xml 608 BLAKE2B 30dea4aadd66ede896608352c35f848994c266849269253644e6cc72f737988d389459f38dc3b3cb45d9dd4bd3d36c194c2972b13da89e9349a2822dbe816f73 SHA512 8e239a83dd093400158111390385bc46280962a4162858bafc5a3ef3389ed4f136976d39bce1b07f5a49b95351cadc4c3b4803ea6fb2f3b83562484d7e8e7c49
diff --git a/app-arch/lrzip/lrzip-0.650.ebuild b/app-arch/lrzip/lrzip-0.650.ebuild
new file mode 100644
index 000000000000..9cb8ed8b2d4e
--- /dev/null
+++ b/app-arch/lrzip/lrzip-0.650.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
+HOMEPAGE="https://github.com/ckolivas/lrzip"
+SRC_URI="https://github.com/ckolivas/lrzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="app-arch/bzip2
+	app-arch/lz4
+	dev-libs/lzo
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-perl/Pod-Parser
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# 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() {
+	default
+	# Don't collide with net-dialup/lrzsz and /usr/bin/lrz, bug #588206
+	rm -f "${ED}"/usr/bin/lrz || die
+	rm -f "${ED}"/usr/share/man/man1/lrz.* || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-arch/lrzip/lrzip-0.651.ebuild b/app-arch/lrzip/lrzip-0.651.ebuild
new file mode 100644
index 000000000000..9cb8ed8b2d4e
--- /dev/null
+++ b/app-arch/lrzip/lrzip-0.651.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
+HOMEPAGE="https://github.com/ckolivas/lrzip"
+SRC_URI="https://github.com/ckolivas/lrzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="app-arch/bzip2
+	app-arch/lz4
+	dev-libs/lzo
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-perl/Pod-Parser
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# 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() {
+	default
+	# Don't collide with net-dialup/lrzsz and /usr/bin/lrz, bug #588206
+	rm -f "${ED}"/usr/bin/lrz || die
+	rm -f "${ED}"/usr/share/man/man1/lrz.* || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index d17d33cf4e97..992280953b7d 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,3 +1,5 @@
 DIST lzip-1.22.tar.gz 120769 BLAKE2B d6d4faaff981d64219e27364c7072f9e1309507220e80d4195d866c3429db537a9fa9b7a4ac67ef5c267cad0f6e43ce997a98f1e47a88b228bd1aa437c991140 SHA512 318de74effdbdfa79070d28919459a85bf1efe662b818b8af2a3daa964b6c24e3386c37de360c6d5b8b624d549b5c9ed777c6234561129c477e03d92ac2db206
+DIST lzip-1.23.tar.gz 121817 BLAKE2B 934a35e31b0db76c4dcbe2fe903f04b60471485118aa5d4001599a3c23a7db74f05f703cf430bb299795be7025f71efb225afddff85c8245e962bdadcf82aef7 SHA512 482804205b6e92fdf9cb17fb9482df7987227c7b1bef9e42d78787acfabe73995f5b1a66f847d2176423f22dce56f1122c5b1c9670f0b778c0bdad2852369c85
 EBUILD lzip-1.22.ebuild 764 BLAKE2B 4f27d76030045b7e78f3a85a7ac04d7b261680c9356c236b6c07db1e8b38c92d094259891435967f823729a152be78d34f330444515b4808d1e355ae6b8a817e SHA512 2ac60aae9a0642bfe51ec653749e20d348f44ed28f87ec67dffddd90312f4c685d0738e28c9e4f92b3610b1ea4ada86d18cafa5e4d99cee5c53666a6c322b700
+EBUILD lzip-1.23.ebuild 772 BLAKE2B f541332f046b8591ba7e45c6f26ed9990bbc02bfd4c6b78518bd38561d034833bbc1dabdff25f253fad1aebb7132c67b38a0e1d278333e1b7cb2e0e1c543cb6f SHA512 703ba03caa725c8613c4457111b601def14bf35f86b82d6ce770f8fda12015f4a41af4ac450c410a68920ec63c192742d6def2161837771bb7ffcef8513b29a0
 MISC metadata.xml 358 BLAKE2B c0e0c2c610a33aa6f8bff1325deb8c583fbde09ceaef09f4ddc1f343feaf3cc81a0e59ff2e4f3cd81bf6e3294e18026fa4ae6870eef8d213ff44c73edbb7df0a SHA512 faa29e9bc8f49b51279e643a7d9f0dc4b5463b434f9874901625af9f13c4460c19888913ee9d4105ee9eda4257526af50383fbe936d5834b2713eb027e75773f
diff --git a/app-arch/lzip/lzip-1.23.ebuild b/app-arch/lzip/lzip-1.23.ebuild
new file mode 100644
index 000000000000..9472e59e3d1d
--- /dev/null
+++ b/app-arch/lzip/lzip-1.23.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="lossless data compressor based on the LZMA algorithm"
+HOMEPAGE="https://www.nongnu.org/lzip/lzip.html"
+SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P/_/-}.tar.gz"
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+src_configure() {
+	# not autotools-based
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		CXX="$(tc-getCXX)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" || die
+}
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index eab693936dc2..d71f240f3185 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -1,3 +1,3 @@
 DIST makeself-2.4.5.tar.gz 39012 BLAKE2B f79cf1c087e89c4fd09f328fb795a3f8a78ee38060dbbd1590e3dcdf22a346b0c12bf6837d1636efadb2a66f6a762308de7ee9dd2fc62a7c88d417d257c5f0f6 SHA512 1dae74586f6bd5afb526801b7ffa7fc7962ff74b0f190cdd51da93c21421864b72f5fe18090cb2ff6ad27f0907fbf3aeb5545f3f70e33dbc9e505a78505f5f90
 EBUILD makeself-2.4.5.ebuild 1155 BLAKE2B 25578f47579ccd101e31428439449f9e55c509c1e3268c794b80035f5a40a1dc05bf1a8f7575ddf28155216522db114b1da7f5e12b92103c552f788861440f5d SHA512 d165630a20a4feb643d6fe780f1933202621f01f9f50523e1f67421df71d075d8ce07ed308c4996ca7938b1bfd633222803f405c224a42eb2b2b35c53b2b19f3
-MISC metadata.xml 514 BLAKE2B ccb9fd9f251b529d56b53183f909ec7e2a6f1636da5d0db428032ab974613bcdcab9251e8b0d5c4e00b97eff196c52c212376c3307e96f62be71268a7eb27768 SHA512 b1c2a61936a614de1c969c9d1b7ef630d70068116fcefb6c7216ef93a21f5987cec605253b6d2af759559d9b661442163eb20b864fa91b0abc8cba142567d2c0
+MISC metadata.xml 365 BLAKE2B cc6a2d3abc5c2724d52a1c5f3f5ccffec988ed8d504231da0c7ee6f5fad3cc2379f27f65721d8c0b649a7989db70d647a63adbedd3a1c2b96ce380d31effd688 SHA512 1eebd8a8998499ff26f1f3f64dfbd5bce5d17ebec596bdae93c1f2b8a6f7ba6ab7ff3ba38a3a2e6477713b53d013c643fef040bb8b4824175ca1ceaa458c8bfc
diff --git a/app-arch/makeself/metadata.xml b/app-arch/makeself/metadata.xml
index e3be9c723678..8e783c72a1db 100644
--- a/app-arch/makeself/metadata.xml
+++ b/app-arch/makeself/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>matt@offtopica.uk</email>
-    <name>Matt Smith</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="person">
+    <email>matthew@gentoo.org</email>
+    <name>Matthew Smith</name>
   </maintainer>
   <stabilize-allarches/>
   <upstream>
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index 3d02fd7407a0..476b5fc9398b 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,3 +1,3 @@
 DIST ncompress-5.0.tar.gz 34185 BLAKE2B 7b296bd00024bfb483d3261ff8aa6e47a6be8c62b445c3d456d702b69fbc2a7b731326f7ea91aa331ba8e8a27936f4318b3e252cc978b6bf3198e8812988913f SHA512 5bc886f98f25b03d034e8d8ebb0ee9388d727ee3e0c6d8a906698b2f8fa5c930f55d857486244b7f40447c7b74f3c620626600db619d0c6d6fd434f52912be42
-EBUILD ncompress-5.0.ebuild 757 BLAKE2B f4e4c703857af06135a7b9a64577255d7c60ca51ab3792129704f161e234b2c6343fcd019b2692883cb35b80e570cb62055092ce5a7acebc402e27724995ab9e SHA512 aa491fa0a7b6b34c638fd947d78cc612b7da4cdac177169b8effece4e66cb4f8580d2e7e4a194651c97e3c406ce6f98167cb65c65ee1e8fbb7a366125934e28b
+EBUILD ncompress-5.0.ebuild 756 BLAKE2B 6368d22eced6c197e6eca19db29989e6320f37858f71cb2a4dce56d80eb0ba10c294a498556fdd88f3671bd3eb5c34799ed7ee88c0878ece955ab2b992d91759 SHA512 9332b53efc5df725a3c3a2ac2de3fd36b46596edf888fc8890cecd85a9625cf3183794aa01e0b01a00353bbac6313e6323e13204e5613fc7578aa73b8ff9a818
 MISC metadata.xml 393 BLAKE2B 24133518bbc568fc7861bb255fcd6ebb34d8ed24912889ac7df4f0517f34fcb281a3eff0c75d5a285891f820956b680270b42cdb1f5cf7a417f43241b46d392f SHA512 7b5f6f0ea16f60fb9b05d9a27701b56e80b62c8e9d1fbf05ecc75015f51dc010f53546661013ec36831051985360e21fb374bc8b5006ecc14f707f9b715fe745
diff --git a/app-arch/ncompress/ncompress-5.0.ebuild b/app-arch/ncompress/ncompress-5.0.ebuild
index 88f47ec0935f..b7f993e7128d 100644
--- a/app-arch/ncompress/ncompress-5.0.ebuild
+++ b/app-arch/ncompress/ncompress-5.0.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"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index a40eca0d58ac..05f45b00ac21 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -5,5 +5,5 @@ AUX CVE-2018-5996.patch 6427 BLAKE2B a60d4c51470d9a1ee58afc4ced5190dc589c78604df
 AUX WimHandler.cpp.patch 413 BLAKE2B 06e1ef38fbb8ae11f9c28df68c7e15db52060974930f61bdd5a04d970bc71f724a5122b05ad24b0e89d6b2142f54762ce4b6467d25345fca89075d6626abf9b3 SHA512 c246a7d912ec965b5212a510893aa1c9bd47b66b8f0fb47c03d46e5f3f891e2134cb8733594fd84f7e6034ebf07a9aac633230e2a0eebfb476f6429469058a75
 AUX p7zip-16.02-darwin.patch 2134 BLAKE2B f8890b8b3e0a3ade007f162e5d3b7fdc9925e8960c6e22463a5ebc474e4ebb2577f0cc0312fda6c129bd1a02dc3ac6d3de17f2c551ee710ab36d0658acfaec52 SHA512 ed8689e39e5bd55eb9cc74c02c94782ac893fc30079492dbde459f24d07037ca63c91526ea428934814febbfbcd1f80c0683cd40d48eab055a3f856b1d78fb37
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
-EBUILD p7zip-16.02-r8.ebuild 4109 BLAKE2B 16fb104195bd827684ea993864b5b76b7bbc1895383bdfe2f62f7032c3b0782eba2a0860185bb81362fa45b45fa7cfdcbab32057bf9df38e78a4b6b1b6516ac1 SHA512 b1912d8a6a80144c48ebe284334dd5c7e3537d380d2be2135ff81de177a0e8eb312fd4859556d9bad621ec483f03975c649179eaa91e898509055b41ed496d78
+EBUILD p7zip-16.02-r8.ebuild 4121 BLAKE2B 4ef2d330b6101f3b7d483063aaf43a11c4bf534a47232964907b36406588636211203cea3677dd5a84033599011cdcba2fdc74a6582eac713678acfda5164025 SHA512 b6ef5b20415ee9c4d458ae973c1b5334de3814268c8edf8ffdc7a9dff81a18cf5a30183e1bdd48a2edaf35123945db39814d2f55073b08fb4c71c067243ee954
 MISC metadata.xml 394 BLAKE2B b24ef3a3f4e4c20632e2c01682aad6050ac6e988e0126064fc445ec167c0d60b991a98d45eafcf5c18b58ff26f7ccddd80bb120c07689cf894e75f9cf60cf8b5 SHA512 498c69a7e2a9643c3e2584a6fcb20afcc46ee10645e3b77e2ac517cbeac6a3013bd3526832cbb4c274a1a97d1cf94d958d71496407db5633fe33a59276463057
diff --git a/app-arch/p7zip/p7zip-16.02-r8.ebuild b/app-arch/p7zip/p7zip-16.02-r8.ebuild
index 2846c75537c9..d0bf79b50d69 100644
--- a/app-arch/p7zip/p7zip-16.02-r8.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -88,14 +88,14 @@ src_prepare() {
 	if use kde || use wxwidgets; then
 		setup-wxwidgets unicode
 		einfo "Preparing dependency list"
-		emake CC=$(tc-getCC) CXX=$(tc-getCXX) depend
+		emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" depend
 	fi
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" all3
 	if use kde || use wxwidgets; then
-		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
+		emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -- 7zG
 	fi
 }
 
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index b283334caed8..f788325806b7 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,5 +1,5 @@
 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 966 BLAKE2B 0ab657b6c18b981f9b608b1b7bdfecd54edc83ecb3b2d36f712b84c4c042ed31d2453621d121f173b4f7964d70c6e6c4a6287e2b492cdeee92adabb84e858191 SHA512 204512015258a1db29827415d7a27a09bbbf52f0f3ddaed3bf7e1602416317fb0bca526e45d7b9c7d0040520d22c9cb5f0cae580150977fd70525c0b346b4063
+EBUILD pigz-2.6.ebuild 965 BLAKE2B f238267fd6360bb0041821f69a383b0157bde1428614b3f83506fb8f75aa021d64c79ae401805e2b287ed96ea836f519e636b090cb7e5b5503a72a68f0771800 SHA512 f96e775caf6a88c49f800a68df13a170608c0def6c3bf3d05d768441ea262a74b8097733ce33427b26542300683d85ac22271309245c730f56b782944028b9ea
 EBUILD pigz-2.7.ebuild 973 BLAKE2B 6e78189b7cca66ce5b99841ce49bb1a7c62dcc54e952c8ab5b91536c6debac0061ee8544b29d9c6e613cecb82002f84eb62666d6181df18555b78fac4d40ecc7 SHA512 43f7e84e30292b12e40bb57a84ba17cf3366ac82e8cfce9a5de3a87945c4f6c4642c935353651c4aae2d415b8581d2d9101e951a6b6770db305e197ef6ef39a9
 MISC metadata.xml 740 BLAKE2B f16110bdf40040ccabd1674c4eab628d44b019d6b17174b286e5bdeb0e2817ade6898202afccf02461ae6adfea61ffa41a8345d9b88234fbf3b0e5d41a396aa8 SHA512 7779fb38f750f9a3dee07e26cbd37d9cc5228422168a8cd59091c452969d7384d611b8153d87311ca922702e76a697f0a5c233c0e947ad4c2ac076453376d61f
diff --git a/app-arch/pigz/pigz-2.6.ebuild b/app-arch/pigz/pigz-2.6.ebuild
index 73d2eb703ca9..94c255643611 100644
--- a/app-arch/pigz/pigz-2.6.ebuild
+++ b/app-arch/pigz/pigz-2.6.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
@@ -11,7 +11,7 @@ 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"
+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 )"
 
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index ea7d9e960925..b9abb3602a59 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -1,4 +1,4 @@
 DIST pixz-1.0.7.tar.xz 120876 BLAKE2B 23563837169611d54dc4540715537b2e16c66bd9682097e4f37957e7422b487f221603b11aa30a39fd05c77dbeddc1697ac9ffe208d984c1da885a67f79a180f SHA512 7f343cb74958b9582b60a2e916243e72421fad1ebecc5867c9e046c881e8a318da9bb885edd71da8fe6953fd5d5c2f5119133cd0bbbf4d0f9b35f8aecd61120d
-EBUILD pixz-1.0.7.ebuild 1161 BLAKE2B 393cf983613866e107e8741b671f9756aee325827f7b210384873106572a9a400f8e562850ce7090fc2adb53058685050a04e96d8612bace98648ccdaf3cb6ea SHA512 947c7e50f6914ec0fd6bfd0971e5018494fd27fdb11dbe2ca9c6c54bf4714016a5bbeaaf0a44254f9d921cabafa238468c4cc8611e2627a09dcbf7ec271859f3
+EBUILD pixz-1.0.7.ebuild 1160 BLAKE2B f16ccf5e205eadc5192231c222fe32dfa628730bfd79201576490d34565dac7dbe0f3e79b88c564b2634f2d42efb5664a4c80ea077908f81e4a9bc2d692edf82 SHA512 73fc02527178c5148a4a0c43c33ee87b03566f20e7cd64b6831ab5664749bbcc173eb73e86394b63fa760b423d33c525593902ec6e6098fb98ffc7c9929cb91b
 EBUILD pixz-9999.ebuild 1161 BLAKE2B 0dfa4c22f5909ca72297c574b7418ba5e202763dfa09f4467f6ca89aed139b9765a578879cc92126922a4a230088c0f8db070b0ada0b34640293521ab1343fa9 SHA512 418e57b0aa7ce08351c0934e5d8c37cb2ce0e47077ccddcf1beca7830ca89b1cc27f2d1759d7bb0138923be789f61ac7dfb364b92383dbd2dc075f02621a5db7
 MISC metadata.xml 332 BLAKE2B abab0a5f43e5804d6f84a00007db2114e5a1167b32c7fa7d9c56777bab8e19c52a419633fa8a1547b86801eabcfe50ba91eb9b4f18e478056df69777548fc2a9 SHA512 9fc1e0881130a254dae5e1cf745026c067df22bd77a44c92f2b0a453d7ca56d89d2247d4aa2245414ab9bdb24ae171869b1152482b01d729a7c46a573e0f3b9b
diff --git a/app-arch/pixz/pixz-1.0.7.ebuild b/app-arch/pixz/pixz-1.0.7.ebuild
index 3be55349c9ab..cb614f55b91a 100644
--- a/app-arch/pixz/pixz-1.0.7.ebuild
+++ b/app-arch/pixz/pixz-1.0.7.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
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Parallel Indexed XZ compressor"
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 017dfc9fd194..1cd757885c6d 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 3905 BLAKE2B a1de093f15f925aa568be75a98224b29de1ef49985fc218535fbc20adbd3aaff5c4605a185a76a597dbb079e8f5db0632c64405d412e183e115abfc605146214 SHA512 f49533e216d74577797ce78f7caa22aa395de5aaab0f05a3c4af136052ef7647cf8bbf2bb1b496119952e27a8cd5b5802bcb9f3b2f9622760a924f6f5ba86d1b
+EBUILD rpm-4.17.0-r2.ebuild 3993 BLAKE2B 5679659f233757cfe4a346402dd5c0b5cb691ca3bdd2898f937ba50396d1980ba08cb8347bd866d579f2ae220fb0351aff0972830b6f15c16e3bfc3f8b92cf23 SHA512 3b6620c0cc78145ba2433571339bf997a9ed9ead43879e697d40979f670b72ccbdd09921130f67c080353979f1d5b50de29ed2668d16463ca5b14ef383a8376e
 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-r2.ebuild
index 19b33b3904ef..77e2508c4dd6 100644
--- a/app-arch/rpm/rpm-4.17.0.ebuild
+++ b/app-arch/rpm/rpm-4.17.0-r2.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
@@ -21,7 +21,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc
 # Tests are broken. See bug 657500
 RESTRICT="test"
 
-IUSE="acl caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd"
+IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd"
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -38,12 +38,13 @@ DEPEND="!app-arch/rpm5
 	>=sys-libs/zlib-1.2.3-r1
 	virtual/libintl
 	${LUA_DEPS}
+	acl? ( virtual/acl )
+	audit? ( sys-process/audit )
+	caps? ( >=sys-libs/libcap-2.0 )
 	dbus? ( sys-apps/dbus )
 	sqlite? ( dev-db/sqlite:3 )
 	python? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )
 	zstd? ( app-arch/zstd:= )
 "
 BDEPEND="
@@ -90,6 +91,7 @@ src_configure() {
 	# https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
 	econf \
 		--without-selinux \
+		--disable-inhibit-plugin \
 		--with-crypto=libgcrypt \
 		$(use_enable berkdb bdb-ro) \
 		$(use_enable python) \
@@ -99,6 +101,7 @@ src_configure() {
 		$(use_enable sqlite) \
 		$(use_with caps cap) \
 		$(use_with acl) \
+		$(use_with audit) \
 		$(use_enable zstd zstd $(usex zstd yes no))
 }
 
@@ -109,7 +112,7 @@ src_install() {
 	find "${ED}" -name '*.la' -delete || die
 
 	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
+	for binary in rpmquery rpmverify; do
 		ln -sf rpm "${ED}"/usr/bin/${binary} || die
 	done
 
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 8a34bf1c62e9..843e16abee22 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -6,6 +6,6 @@ AUX snappy-1.1.9_remove-no-rtti.patch 1420 BLAKE2B de5194681f365e8d34ac9f56fb395
 DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
 DIST snappy-1.1.9.tar.gz 1102382 BLAKE2B 926d03156168e3d4800dc17144db3de2c182c6eb9970d87a00b94fb09b67e403479a64cbed75833b83fd03173c1bb8caaf248a55627e89fe2a34456f12ff3b42 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024
 EBUILD snappy-1.1.8.ebuild 1832 BLAKE2B 7fb98c5cb96af2d0c928871ec1f53c1402e536d1b9063b137822d6229ac90f6ea397a81a92269a3c67bb3e5551b05158439e552b6ac4deb3905ed8e34ee92f8d SHA512 11813434621156c662bdbb1acce6b1279f8ad3e7ddf0eb446cac0961357334cd3b89fa9f640c01cb29e49d8c560253184287eee0cc763d1da7cb83840fa09f11
-EBUILD snappy-1.1.9-r1.ebuild 1191 BLAKE2B 3cdbd74367582d55d7e6dc02b81be64e5feeed2192397f89630832e965916b8bf8ebbc14747676ad0f69dca1e9c14d873a1cdd986981622937e225c5b3d3c3c8 SHA512 9e4f4ecaad7cbc652bf34a4402da75e616c4cdb78f2c3c70ac1dbc1ef6d0f335c889fa1261d58f4c32da754920bbb1ed4cc73a828e1fff24ae7e6316983c29ff
+EBUILD snappy-1.1.9-r1.ebuild 1185 BLAKE2B efb485e69d13588ddfcfc203a17fb59487e7d7a00ba1fad2c744ba16307bf4ac5a8cac69f9fc6a99083aefdc0708d15b003854b815687a33b0ddc5a9681619c4 SHA512 c08b957866d565edf67740a999391850060971c9aa57da4ca51d0cac8aefbd15e7e8609b3c8fe5f32b9102d9a7907a53991c663ea177fcdb8519a926d0f1ee33
 EBUILD snappy-1.1.9.ebuild 1171 BLAKE2B 561f36ded3988a51e03ead969d965d11415348e0cc1541fe1d52ec2264bd62feb52db7c4ccc8fc5a26e5a109544395a893b42b71c9f752580386f2767f9f1d81 SHA512 3c1af7733450e69145afc58f568d27735d20ea7570af7f9b4939a88ce440ed096f0888794e495271d848eba08d28e2301473a26af7fc018f9a35b07b6cb9ecb7
 MISC metadata.xml 744 BLAKE2B b404083b800d59914c748d3a31aa13bb341dcb8f5fc227d3c003428455d459d0d011b2cd10e7d5d3cef3e73f66b14611fd04be409567392943cf1d09f0e4f066 SHA512 204079f9e40c81853343be190058b8dda25a25015c91704c98574151e7b06760d9c8f475790f95ebcbdce48c0b06a8e3e612c3183db1f4aa0b7ced8024c22fd2
diff --git a/app-arch/snappy/snappy-1.1.9-r1.ebuild b/app-arch/snappy/snappy-1.1.9-r1.ebuild
index 74b9e884e633..4c52dd3908ad 100644
--- a/app-arch/snappy/snappy-1.1.9-r1.ebuild
+++ b/app-arch/snappy/snappy-1.1.9-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
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/unmakeself/Manifest b/app-arch/unmakeself/Manifest
deleted file mode 100644
index f00963f625b0..000000000000
--- a/app-arch/unmakeself/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST unmakeself-1.1.tar.gz 3635 BLAKE2B 650a7f45dc5204f5ae42002addc5892fb3ce3d4d2b8b5ed343329cd34ae7086e1f680ddcb25123255feff1dd2a70d4427a30aa0a8ac7c0309b19847fefcb5390 SHA512 3e8a05a907b8807080208300f6c20577587a0e87000c6746ba457c276e4dff37c8d61227bd1db37e60ac20d9532290c4110a1204c8389a8a1e97a121b68c682b
-EBUILD unmakeself-1.1.ebuild 650 BLAKE2B 1c5979c4b1dc9bb6e72ae30fa82e96c8ab267ec75244658cf2d678a1e197a1ce6994e4bda91998c0c64532f3975000850b6416afa6b4f096f80a093214701a4a SHA512 223b4154e20e4b028353f5e417fefb5660f986cb80e5db698cf446c4b90b4160e82423050dc6c5e71de996e1bea49641b6d0c74c3328d4f88fdea275c0bde4b1
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-arch/unmakeself/metadata.xml b/app-arch/unmakeself/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/app-arch/unmakeself/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-arch/unmakeself/unmakeself-1.1.ebuild b/app-arch/unmakeself/unmakeself-1.1.ebuild
deleted file mode 100644
index f826b09d6035..000000000000
--- a/app-arch/unmakeself/unmakeself-1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Makeself archive extractor"
-HOMEPAGE="https://www.freshports.org/archivers/unmakeself"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-arch/libarchive:=[bzip2,zlib]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	append-cppflags $($(tc-getPKG_CONFIG) --cflags libarchive)
-	export LDLIBS=$($(tc-getPKG_CONFIG) --libs libarchive)
-
-	tc-export CC
-}
-
-src_compile() {
-	emake ${PN}
-}
-
-src_install() {
-	dobin unmakeself
-}
diff --git a/app-arch/vimball/Manifest b/app-arch/vimball/Manifest
index 13afe8a131c9..bb9c0a2ed30b 100644
--- a/app-arch/vimball/Manifest
+++ b/app-arch/vimball/Manifest
@@ -1,4 +1,4 @@
 DIST vimball-0.5.1.tar.gz 5246 BLAKE2B 8ce95bfe8872f69e501b4453e5a6644d8019367173f8675325775dee58e08618b9ec0908bca9df04839bc165b086d8e5195a0753827d6038d8ccd8adbab80c35 SHA512 f89ba7291e3f4146f2ada7934b0ca74524abc639e586da12e19882e9aebe3f14858a6145b830a32dc19b0deb61f652375d8a56dc7847fd0061d14a2d77208549
-EBUILD vimball-0.5.1.ebuild 549 BLAKE2B db3cbd2a234916d970fede779ff7ca49a75a8a1a1641c975026c16a4d4bc1b075ab253330cc3784c2a849a4b0887e49c2b461c4a36aca8a8213a2100b94ee83a SHA512 8e7a2efade57df3ef3328294dc76901f245bbf97fe387b69aea65f0b97205f5d663b0f1b713d5f82bd644556fc79ae2ba2361637c83ef54d945cf4a01c906b91
-EBUILD vimball-9999.ebuild 551 BLAKE2B 89199d823fba2a60578c2c2c8e1feab7d4f7b8ca0c952ca992681d429c3ada1af17f4f23a917f304e102dfdf691407aaa98202ca8c0220574750af137fc560d4 SHA512 2a097004eeca0ff5759812d0de0274ca2c68539600444e3c71809de76a6a29bb4c5ed9ae6eed96d2a23d355f746bc2520720954f72d8f4fa21b5ed68d5c3ed68
+EBUILD vimball-0.5.1.ebuild 549 BLAKE2B a911622f6e873ae9370f3b6ee3971ee3f0e69357d36d5f6518bc54d38073eabf603f6ee55034610e183405f1bedaf47d8e716064bbde6d4ce30dc2564f9589ea SHA512 11d6711576545d68e3d3ab8d3553a46e31e66309685ab71b1c2f4552dbf1495ce219b124c3f55ab49ea972de594386c52536fd48d54e02873a57857fb7fef44d
+EBUILD vimball-9999.ebuild 551 BLAKE2B 1a1fda075ae6d359326877a22071042a6e600add0f103974dcc18d11ea865cfc5432637a65de6acc4e8dc5ffdc1275ee9fef97e1411012b42174e7566be4440f SHA512 539e9d5ae05f38f4b5ed994f42a967cc54f8d4c17b97dbd3c95e4a2bf4c80fa6cfb5acd92bf6b5b7dc10183ddf3c5797a540d567e68bdab3945091e12f2b5a86
 MISC metadata.xml 302 BLAKE2B 9a62e3ddd0221a93e319b7d4b10226a0f1a9f136f856a286c09a18b10cd575a4735e97aae127b26aeaa6884500ebd5dc69f630bf2f8eba0c2710b318f9bbbe4b SHA512 2a6a6012078822bc42c369427a42341098b4dbe84676573d2fd8e9699da735123d98bf22bbc816b2d55fa604052f45b2fc32f949239300dce394bc603285df25
diff --git a/app-arch/vimball/vimball-0.5.1.ebuild b/app-arch/vimball/vimball-0.5.1.ebuild
index 1c9ba30f2f58..9f827470a310 100644
--- a/app-arch/vimball/vimball-0.5.1.ebuild
+++ b/app-arch/vimball/vimball-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/app-arch/vimball/vimball-9999.ebuild b/app-arch/vimball/vimball-9999.ebuild
index ee51ee899907..99f665cb9aba 100644
--- a/app-arch/vimball/vimball-9999.ebuild
+++ b/app-arch/vimball/vimball-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index fe13086d8d44..06d65885f8e5 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,3 +1,3 @@
 DIST xarchiver-0.5.4.17.tar.gz 1077111 BLAKE2B f68f22258dbfaeb37333fab3d2ea1b06e23e143f90df6cd94f7601961636d1e5a929e1353ac956ac9a7341813593fcfb35d5197666dbb0920ddf63e4365f34e1 SHA512 5b19fd0fb90f99aee0ac2576bc4efce9ef4eef9119fc118815f6d925e3877c0895475fbdf7363d8adfb6371fb7fd73299ea3a7cb3b6d9fff19c89d1d287d3a84
-EBUILD xarchiver-0.5.4.17.ebuild 1321 BLAKE2B e73601d3de6623693f48fd5f9066a53ae51d7818c7b8dc14fb5ca4b39fedcc0706299142099fab2fd270237b8bb3e903b88ca044be7d61294195ca6f07705c32 SHA512 be310c9b116415454862cf04d46ffa2f747a0b6dabb7f209d198589e0d190dc8153945c98a545e7bcf67b2b98b595a9655fea42ff29068e336521867a463d076
+EBUILD xarchiver-0.5.4.17.ebuild 1311 BLAKE2B de6be005c5d78c1c1c8fac4fbba763cba20b12fb2d548df3cdc6740ef6fefbcd7578bc775ad12846f801e49184c8453691718a6a1dd2cb37c824d33dfed647b3 SHA512 8f9febe38458f3caa4e27c67c3439f9b7a707a40f3f088a57c78ac7233814155ab136d4ce2c59102e51a571715e6575c953ab5f6c07edfc781ae65e14c14dd48
 MISC metadata.xml 448 BLAKE2B 5eb8d55f09ade402a421e0a40bdcea04b72fb284c6a705c03be6454e7862253344d5c8e91adc37510759745eccfe68ccd4945192e7a24beae0ad881b04f68337 SHA512 240dc27cb546ec70d0b85db8d9b8c77a38ca4773389caaaba3bc52e9dc823803c330d5a83213c6ec6a6cf3a56ffb8eb09692c446df7af42f3ecf844cbd6b13a4
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.17.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.17.ebuild
index e0200e4bdb6a..10d8290b2ada 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.17.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools xdg-utils
+inherit xdg-utils
 
 DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
 HOMEPAGE="https://github.com/ib/xarchiver"
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 855ad1b7e2e7..123a021022f1 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -5,6 +5,6 @@ DIST zstd-1.5.1.tar.gz 1948539 BLAKE2B 2f82fb7872c49c41c8ccae17e343825dabceae307
 DIST zstd-1.5.2.tar.gz 1950967 BLAKE2B 9d474e9fdcf7e5eb09d1f606712b05ca3001e8f6f7451254d8dba3f429101048532fd9c84a5b9083ae90d0457e9e1b1d48256581a1697e7db19b09d73595f070 SHA512 e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e
 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-r2.ebuild 1803 BLAKE2B a6df1ec189bbbe326193e58cee2c87867a493b8d6262ddfa6f69cb50762486ac3e11a28b683b322d670c74b9ba44fb34210848a3bfb8897e466e872e0c51fbb0 SHA512 d9e0ab2859fd85f88a3d4960a0a44c283cee74bc0442dc73e31ae40c225ae97212b554b96c641bb421f77eceb38a0b442029382f993123c6c1915604660922ed
-EBUILD zstd-1.5.2.ebuild 1457 BLAKE2B 4563719da58273c20f7e0214e974974d5ff2236decc2f3e50b23f026e3ea52319db41051a8c97706783f43d3f0572f8486e4203df29ff714bbbb6a1463a821f8 SHA512 da8c3f54c143bf7a77dea1478df6be221a5947aba598af33e1953048487bb8d4f60e26fecae1b5ed7e7944737d44ff1dd37aa5b6f53ff3199912df1e00c0ee83
+EBUILD zstd-1.5.1-r2.ebuild 1803 BLAKE2B 1309e5ea2c9d98ea1c496be3cc14b1ebc076577532b8622e787470fbc804dd1f225694431477aef8846c3a4283ac5697faa6a2eced78daf36607086d7cd6bb74 SHA512 9c953dae97b02decaa82090909c74bc3ad3c07724ccac56c348238051d4a671dddc29266c0b76828eb29924996acdd58fbb88ac1516b150569fdc1552827e8e1
+EBUILD zstd-1.5.2.ebuild 1449 BLAKE2B e00a54cbe399a2f40420c0e0a269797be671ceda87747b637bb8b3aa14d7dd415dc6be66ed244f33cf8a154fb1e8a3b9dd0375c155e0e6bce2cb91732943e8d5 SHA512 2d14f9a928f5713bfbefb963017c8aea590b2e9473773bd080e03e37571ce6ad10f4d3a9f418d2c87ae773d438708b9564f501a4b0aa823d7dc707b3f35682ac
 MISC metadata.xml 410 BLAKE2B c8c6cf3dc2e96b8d70bc199c8691f57fe43c561c3bdbeb71e49fc13f205bdf673e96e58d530b2e18c8ad2b99cd047ba5934437fda7828fe6ba177f5badc72a93 SHA512 3973ebd433d598c05023af411bbbb26b0f097d66e34c22fdcd31479ccc68c5a7bb318c29067a94de07ead566c5eec397d12b70a15d99e53ba08e6e9c999b61cf
diff --git a/app-arch/zstd/zstd-1.5.1-r2.ebuild b/app-arch/zstd/zstd-1.5.1-r2.ebuild
index 68a45fd7660c..29168c5fe5d2 100644
--- a/app-arch/zstd/zstd-1.5.1-r2.ebuild
+++ b/app-arch/zstd/zstd-1.5.1-r2.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
diff --git a/app-arch/zstd/zstd-1.5.2.ebuild b/app-arch/zstd/zstd-1.5.2.ebuild
index d284760d9866..13b97f431df0 100644
--- a/app-arch/zstd/zstd-1.5.2.ebuild
+++ b/app-arch/zstd/zstd-1.5.2.ebuild
@@ -11,7 +11,7 @@ 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"
+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