gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /app-arch
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
77 files changed, 221 insertions, 238 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 16da4951f027..fd7e7b131f03 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/arc/Manifest b/app-arch/arc/Manifest
index afbc0e51375d..beacb8a7a356 100644
--- a/app-arch/arc/Manifest
+++ b/app-arch/arc/Manifest
@@ -3,5 +3,5 @@ AUX arc-5.21m-gentoo-fbsd.patch 216 BLAKE2B 09d600cfddb692362e78aa5aa5770387b685
 AUX arc-5.21o-interix.patch 341 BLAKE2B b37abfafd5d0de28ddcf0f8c5392e2e9ea6921e5a8ebfe7d0fee836fb91513964f25bd60e65f8791f642b106b614c933d607af101408872f715f93a6d89f9d5f SHA512 7e204d6d70a5f5c591012a26b498cb2899f50a207358413e164a7b4cd39776c3eab1e8026eac4ab8c86c6cc37e2fbaf8bc34657f618b2f12295c56d6d59c99c8
 AUX arc-5.21p-fno-common.patch 934 BLAKE2B dc9c058a2e0053dacae271c599333cf02a262857c619c214c02e4c189a2e5f7491cea04f67950c16f840bbbb94149a15aa5417e33ab698dd983c9dc10ab349da SHA512 4f79298bc9ccc8ebf8cff50ef5d943841afb3d1281bf35581f1fe0bdf512bd8ac7edf04a0149d9d30df8a2c02e45828c38f2f97d5a918de9e6f1a1f50f245058
 DIST arc-5.21p.tar.gz 84791 BLAKE2B 3dc6c2e9c83a9021a9a865676e248278f88b3de868846b39e1b1a9365299c410e7bb3c0ed07cfd3ad1e3f6340eb0e3d21b57a7c6e8ea92f61b51a914d7e4fa0f SHA512 c70c01ec407cc27f6507e2715d8b553277609cb49369a1e65a83d007362a24b69bb09ef2bf168ee36ca6797bd4524644a89e9114d866351ae53fece193c2967c
-EBUILD arc-5.21p.ebuild 877 BLAKE2B d171ea2003663e9a98391587682fd1f1d49109c895a88747071450ebaa87fcdb2731a9c76a0469c171aaeae7bb9b269717b1bfc5bd79fe4e5f770574a128e2fd SHA512 9eb187ec8f47b773cd795ddcde59a88d5e3bf2e9d5b2ab183e79a800088ef738e591a21605c67372928b3e67b6afa64d29e48d7f9cf027638bd66637405625a1
+EBUILD arc-5.21p.ebuild 878 BLAKE2B 2f6f21289c1ebcc844b4b815da9a5bc610b937fac9fc14dc2b8d4cafd0bf7b4107fd16fa617fa95b7fe324f26363436284d442650c81e7e362a6848350aa3e8a SHA512 79c30408cd206f911affc23cf139b99b4c4746c5e7bb7471763614ed58f70e906671de1b98ff70f76e9250d317c9a6af9a745f2844f7a61fab412ba82650c81a
 MISC metadata.xml 245 BLAKE2B ff465a2889a98102a34066d3adaa422ead459625ea37725edc0693f8c3cb2957614065f05262232fb3684a0664e71ae2bcf16ce5117f5ea5fe7f4e8f71d0a8e8 SHA512 d32b1e423299f63707758e535a7901995eb6dcc98142819003caad6f47977f3a3525051637b67bf730c27cbf81d2187dc1a0034ee3a681d4865a89e4e115bd6d
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild
index f62a74e54786..fafc0962ba1a 100644
--- a/app-arch/arc/arc-5.21p.ebuild
+++ b/app-arch/arc/arc-5.21p.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 2d845ae1dcef..1a424b8370a4 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -3,6 +3,6 @@ AUX cpio-2.12-name-overflow.patch 404 BLAKE2B f15aaffd716a6dca8b00f0831cd3bfa897
 AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11504b075b1216d20cd8643591abdc3a69afe1db254800327ece8f07f83438756d88c5c10c606b4e14c76a309941dc4ed1f9 SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03
 DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
-EBUILD cpio-2.12-r1.ebuild 895 BLAKE2B 3d2abc7d0ed98ab8d854833b26b7c4079233af8529c72de640c0a7e2b8457b1feff1e3f2533bf65f063dadcfeddd8bb89121e0efc0f576261fba86ff5ceca3c1 SHA512 8cebfa78677df8115047a08da9a891e9f369d7fe214896e59742dc7162ddee0f0849acd20443316aac20de42da2548ebea40568502a34d3357dd526e89725799
-EBUILD cpio-2.13.ebuild 835 BLAKE2B 48239da96717672d14805ea91f99bfb88a7d5980fe626569ba4d6ecefdb0f378ce476fba9f0b1984135aa039551766172e00f3c335ed166974e5b2defd23eada SHA512 4a7c5647cf3a2c3622f3aa16fa4dd194ce53cd396edf0546b8c71ce199f29f0d0ef07216c9a3406911bd7e64240fda709b3ce820042ad6de1f5e14a0c651ac17
+EBUILD cpio-2.12-r1.ebuild 875 BLAKE2B fce4bfb4b10c633622b9de8f0b5dbd0e061bb721f62e330d44ab14f64f859cbfd624755ad85976a8703b2366a02cba13f6f3fe207ce6d2d4999d80effe3c8372 SHA512 3d1a559b56de3eb3ad1aed2bf8d59f4f64c90c0dbefbb1249a49b26e73ed0ad120c2b6268141a390682bff6232f20f32bb7faa834e2ebde3807a0a3e44fb0861
+EBUILD cpio-2.13.ebuild 815 BLAKE2B c5c2c221854693f5e1fa3cfefbe78d58911695c359e181851424675141d3156fd1926aeb6d1f9c1d217b8363d4aa4001c7246368effa1c1386b6fa12fe97703a SHA512 75cbaecbd8ab6e586f44f79977e202b03470063d8a6a4616ab18a5d2265639b61d264a6d0702aabe7a41805cacf2fe22a519089a0d46e4a27166d86cf9463cde
 MISC metadata.xml 327 BLAKE2B 5f895635aeb7efdcc8e9999d6892fb8dd6668d204fbedf5492cf086a3ada6d9b1c71ffb2344de642b279de34d7ef459371d0eff173ed70cc404f6ef50d81987e SHA512 9aed569e7f3412d9891326d8d0bdbd48fd46dcbcb3d045ddbe7971e2d9e315e2d71ee9c5adebaa12425cfadf03de00ba5c70a16a4227634b9cf40e534d96fb05
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
index 08fcea1fbad4..bf9400475618 100644
--- a/app-arch/cpio/cpio-2.12-r1.ebuild
+++ b/app-arch/cpio/cpio-2.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 src_prepare() {
diff --git a/app-arch/cpio/cpio-2.13.ebuild b/app-arch/cpio/cpio-2.13.ebuild
index 1c53d1e5fb82..4d62e23de161 100644
--- a/app-arch/cpio/cpio-2.13.ebuild
+++ b/app-arch/cpio/cpio-2.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 PATCHES=(
diff --git a/app-arch/deb2targz/Manifest b/app-arch/deb2targz/Manifest
index 4aa5beb32dc4..1aedb5047679 100644
--- a/app-arch/deb2targz/Manifest
+++ b/app-arch/deb2targz/Manifest
@@ -1,4 +1,4 @@
 AUX deb2targz-any-data.patch 602 BLAKE2B ee85b284a594cc937e73ea66c24960fdbecf547742c1db010d90e10af72aa667c267fb13f858ca221d80c16af26c09fcaa9812567f0f5b7e9b015d5a44d3cb66 SHA512 0dfc301d17b171e52867e0837701596b60c697cc7a0520f0c003be8146d1d1470305186d443c1f7a4757938b06b2261cfb66f84f5a5776998681b9300bc20903
 DIST deb2targz 1947 BLAKE2B bfbe08a5671bda8da3a5d897f58aca863988a9ec7b7cf23ee81fb45e2bf85bd8b0909457bdc2cb545d42ccb5f56fda5559bd40547231c1c52441bf0b3560173b SHA512 9b6a533fbe232721304f3bc1d9ea952f78fb108ace3bd0a0eab206be8462bc547ff49ab9310f209079b9ed6f86413c8f0819a117b95c67b6082e37d416716b1c
-EBUILD deb2targz-1-r3.ebuild 621 BLAKE2B 4bdf076664def3d6648901a2f46cfc809b76001c9a3c02c4510137dc678aee7aa34cf708c5397fb7cf4961839fe5e24e86d509da2aa53ccd9cc817e9311dd374 SHA512 de678c32a1fa70a4520e2e8dd7a8107ee1074005bbc7c7235d03afd174b914816b5b2b5dbcd00280135f189fdf239d22c08566c2f35cfedce11662a31d8a9ace
+EBUILD deb2targz-1-r3.ebuild 613 BLAKE2B c1593b302b4a411e497aeaac01813d47d14a0da5b4e2137541d639488f144a6c35a375ac89b06fd1832a1836ee9f589057a27b58b642b012802c49627b1f442a SHA512 2f6e08d810442a374b1430a8b9ca9d127c721adfa346a544ae509e010be504a5a38a3a9799e72cd75434a325aa014750a57755155b5d41c9cd20e4bce3e9fa38
 MISC metadata.xml 213 BLAKE2B a6b42a8b7c6f0c5a0b853af172e748301d2f4b9f2aa0424e217029affb54c88b1061dd970241a942e59a2a5ec66521ab9b67818181c03bd1dd019965e39eab3d SHA512 bddb1ae151571d0cd8833b083fd24fb4f1372e8fef6e726833ac8837abff03fb86ef85c7d954837ac82ecb906f1be4418d32d1011a2bc4be7711f2ab69a43380
diff --git a/app-arch/deb2targz/deb2targz-1-r3.ebuild b/app-arch/deb2targz/deb2targz-1-r3.ebuild
index 7d7e092e9d90..0ec378aa25f9 100644
--- a/app-arch/deb2targz/deb2targz-1-r3.ebuild
+++ b/app-arch/deb2targz/deb2targz-1-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.miketaylor.org.uk/tech/deb/${PN}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 495c5aaf6939..c075bb4806a2 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -9,7 +9,7 @@ DIST dpkg_1.20.0.tar.xz 4738556 BLAKE2B 2e58b3881abd46854416b05b0f9d2e972c3b5454
 DIST dpkg_1.20.2.tar.xz 4710300 BLAKE2B 0d10ee7f5cc863a6496fd8340cf0457f9af3d7d7a74821d561d0cc500a056d52664d1418453fa45dcb27d01ef59e55eb299ce1fcccd1ae7cb72b7c9e43b6b120 SHA512 523713e40d4f49332d96fdcabaeaf4d97f56b40bbbd51f18d17b5c79598249d04fdf96dfc5c8684408a666cf04f622cbd30da60efe68ba2cf1cd836cb2503e02
 DIST dpkg_1.20.3.tar.xz 4712980 BLAKE2B 92a1ff07dbb01f8942452eee269eb45d4c164272bf3ae5d0a62a6086c4321e7fc3dd5b164089d7f2e476258f8ec8c480c1614d4f43e3a7a7f1e632bf13191d2e SHA512 5893ae34efc6f9d54e47fc403487c79233501666968681b827bbabbf39b1401cb7064f8fe8797708ed32bb37345dbb78a1daac04c6dc7064f2811265f3a4e82c
 DIST dpkg_1.20.5.tar.xz 4715684 BLAKE2B 32b88cbd1ae75685b6c0b04b7c829372df323a9508ddd088076097e8bf2ac9050f1f4ec591fb7d40c4d4ea34207cef0edd430d0326cb73e1f7c8dd560db916be SHA512 6b3789c25c81022181b87a28ca9baa4a463a68940a871568c699a2a30e3b4ce705835ed6a171ac8c5902e377200b31cc0be1e03cbd7d35c4eaf92c7300d9227f
-EBUILD dpkg-1.19.0.5.ebuild 1811 BLAKE2B 5974b15ade93bd7bf18d859f25e20905bed3e6fc0b7e855f4d5f867240190c2e427257a99983074254314a7cda8fe6b8c685c10f85ac6aa6d3d50ead4fe2c158 SHA512 50cf30923b4458344d70339014979bcdfe48a4ceb69a944cc1b624e4fbad6dd191e93959d4e8ffdda1cbe84880275d60543a8e49d2d3f76c849a021232b16cb0
+EBUILD dpkg-1.19.0.5.ebuild 1812 BLAKE2B 3a31644cf63a67d657ca7c44a64ae0553761d2561740c7d06f2ffa5d6e10b3058fa03f92a45517fe3d1bb8c246979d268a127e90a6313b093fe26f2c6d145ae6 SHA512 cd356dc118a52b4579c84e36dee342e5f15c9ee218d6ce8bc80a787a6aa2ba70597788f652fd51855beed966a09a04b0b4c56f8682acb70b643572f08e0d98c4
 EBUILD dpkg-1.19.6.ebuild 1960 BLAKE2B ef3fbf6a4a7add7936aafc4f643495ec37741ef5e6618badcdcf6253e8f4a94a10a197e428f2a1a2e665e106eec7b64585c62de0ed2ff9003226db94824faa92 SHA512 b4f21e5b0be4783a9a45d1153a7de938fa056537ef6b40f75e07a7d009fba8b5895b08d7249f1ba785e6e4e3a6324f0de953ed74b2e6315d210a9a77f04782d5
 EBUILD dpkg-1.19.7.ebuild 1960 BLAKE2B ef3fbf6a4a7add7936aafc4f643495ec37741ef5e6618badcdcf6253e8f4a94a10a197e428f2a1a2e665e106eec7b64585c62de0ed2ff9003226db94824faa92 SHA512 b4f21e5b0be4783a9a45d1153a7de938fa056537ef6b40f75e07a7d009fba8b5895b08d7249f1ba785e6e4e3a6324f0de953ed74b2e6315d210a9a77f04782d5
 EBUILD dpkg-1.20.0.ebuild 1919 BLAKE2B c7456dbda807d2195de6e0f19abab34c70eb6e768095ed7009a95e052105b0cf0cbeda02cc48f9b3b3fa6582b1f1e1bb7f32c1eec1b80f29fbe838b698c4bc5f SHA512 db416fdca740d42ebe57fec322a97c3571c6ca660eeef3f20079a3bceac9752cd13ad6247aa42b65faba2c7a33db0e3d043a494986e2bedf459734f332dd5ceb
diff --git a/app-arch/dpkg/dpkg-1.19.0.5.ebuild b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
index 8e4d1b70a04d..e7b089e808d8 100644
--- a/app-arch/dpkg/dpkg-1.19.0.5.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.0.5.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 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 6f93f9c099c0..0b5ae83b56c1 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,10 +1,6 @@
-AUX 3.32-packages.match 645 BLAKE2B b3ebf8eab5fd5fd57a19af06d3728d09f77ebd1c76aebae2e2bebae13f8071a86e60f5534460239436befb3d43f59441bec42c2787d5c5ee3c4e439fac02ca32 SHA512 894aabfba489ddf5aaaccccc10d5b7198dc03577a36798e418ebc0aa2b12689e04c2ce97052e0e105eaf93799964ce8196a234ed69f50fa0cf572cc723232690
 AUX 3.36-packages.match 664 BLAKE2B dfe72c4eb0b44b8ab589fa81c0ceaa31bc3516dee78fabe2eb48f8131b25ed75a11630ae620e70646539ef42a7c4d7d283f71ffa0fa13f64ccf164d672acd95a SHA512 154438583492c571e4c8e1c926c3cb04972255cc4d1b74f186dfbe50c9756f25e11034fe64d893fdd8f2698c8eaaebba76682a818bb6523656c7c412f8e8b614
-AUX file-roller-3.32.4-fno-common.patch 693 BLAKE2B 2a2cd45f9bc5fd73d9bf1324944f70890bd52878d03c0197f0b4759f6a780fac5c964c240269bbcb89056591306fc87df4bb3403b18346079853541d9b81a644 SHA512 31c425704802c2d2095b8778177f7cfbd31fd1447a3e4b8fa3ffcc9c952231d400a11458d26a6db7e2595d6bae1ba9eec01fa6d925ed727660cba7af2589bbb5
-DIST file-roller-3.32.4.tar.xz 854444 BLAKE2B 04264e64af8ab4376fa6985683b16be7fef730a4e24044f726933b885aaaa6b630f347a256b09c2ce6183d0a0a392b33b4328715bf6d19cf7128c1980f9f4792 SHA512 16b5ddbdeacf4e9e61265ecff05e8f2e0034147c67ae7355d2442f9b26098ff253d24cb34c8e686c2ac031da6acac8e1e3c8a9f978e1eb2b446b1e045babafc7
 DIST file-roller-3.36.3.tar.xz 870608 BLAKE2B 4c57b99f2ca0eb4db3fac0216b63207d1664829ee54e21eb976a327bd65aec5abfd2a02b84bc80246fde131ede6ff63deaf8b63451db6a0fecc0121c8bce1a5b SHA512 41558ca8061276b1248fd3599e856051dcd69ca831fb4d8a33666dc373b4abed56e7ef204a6e041ceace05ea7234448d15bc7be8c48dc1809ac6d445de251370
 DIST file-roller-3.38.0.tar.xz 877960 BLAKE2B af1c4800e24adfb36a8f8f108740f9cad14bcd40f797b2430d00e428d723587de75be03848aca612536cee768b6b372534e0b6a322dc40d7ab1c41eef540916b SHA512 9c2e3c105397bceb08e30c9796b9242633fe49772aed2e7f67461c34a51be1493e922301b1fc29bdcb0fa50d220f4a7db2ee7642f629007ce2bef00334d7110e
-EBUILD file-roller-3.32.4.ebuild 2274 BLAKE2B 996cac999d6d1c1f4b4deba986f6001371d1b5f6c05c370e531679c6486a796c75a6e2679ef65c655cfed6af1dbde06840d1b6b916ec3cc5f89325cdc440d90b SHA512 a3e66c14e06a337a41591a55a1d8a6d273f57bacec3edb202bca83bbf952d980e2b4131c338a2ea71b31f76116195a772a4261a4b9caa634795de4f249ea632a
 EBUILD file-roller-3.36.3.ebuild 2176 BLAKE2B 6e5b451ec8ce8a4f43b59a5c51ddf2c7389489fe80549efede5ebb23463f699e9a27ee86932d1a43b011def4a7d0cb4327f3fd1959aca409df649fa08bd3d477 SHA512 b7de40066a28fb6761595db964f13d0b41710da2bb542a9a78740677b36ea4fcf3faff79a592090c11a1c3fb537718c667a2257b98f7109eb5b30d758da75a02
 EBUILD file-roller-3.38.0.ebuild 2119 BLAKE2B 10345b6fbc51320329ecba9c26333faab979a61e9c204a385cb0d3e209298fa93e687c52f8d11a6ca44dab19253b2b425c43d60d5596f14132015cfd32f293f1 SHA512 b93f320df766fafef3deadfffdac670ba8df2088417a5b8740578b16be2e060129872dd84824d3283689397f1aded23fa2631c27105064d0fd63cd85f3d3e50f
 MISC metadata.xml 627 BLAKE2B cc3f28d4405c3939f1a24dbc25d3ac5dfa46438b769d29f4891e860a40b67de074defa0beff9ed9f542610eb38d3593b3d9602f886c57178db4e344e996c52e4 SHA512 6becde35161e28b9b829c97c6c3a67c011b2509647f4a15672ea67560909fc05a4e1aaf43aa4f4f308ab5541316b4107dada8cbe7e73fc2c076afbaa0a807eaf
diff --git a/app-arch/file-roller/file-roller-3.32.4.ebuild b/app-arch/file-roller/file-roller-3.32.4.ebuild
deleted file mode 100644
index ddcfe39897c2..000000000000
--- a/app-arch/file-roller/file-roller-3.32.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# gdk-pixbuf used extensively in the source
-# cairo used in eggtreemultidnd.c
-# pango used in fr-window
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/json-glib-0.14
-	>=x11-libs/gtk+-3.13.2:3
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
-	nautilus? ( >=gnome-base/nautilus-2.22.2 )
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular archive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip   - app-arch/p7zip
-ace     - app-arch/unace
-arj     - app-arch/arj
-brotli  - app-arch/brotli
-cpio    - app-arch/cpio
-deb     - app-arch/dpkg
-iso     - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha     - app-arch/lha
-lzop    - app-arch/lzop
-lz4     - app-arch/lz4
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zoo     - app-arch/zoo"
-
-PATCHES=(
-	# https://gitlab.gnome.org/GNOME/file-roller/merge_requests/31
-	"${FILESDIR}"/${PN}-3.32.4-fno-common.patch
-)
-
-src_prepare() {
-	# File providing Gentoo package names for various archivers
-	cp -v "${FILESDIR}"/3.32-packages.match data/packages.match || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Drun-in-place=false
-		$(meson_use nautilus nautilus-actions)
-		$(meson_use libnotify notification)
-		$(meson_use packagekit)
-		-Dlibarchive=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-arch/file-roller/files/3.32-packages.match b/app-arch/file-roller/files/3.32-packages.match
deleted file mode 100644
index b8f879c2d13d..000000000000
--- a/app-arch/file-roller/files/3.32-packages.match
+++ /dev/null
@@ -1,34 +0,0 @@
-[Package Matches]
-arj=app-arch/arj
-binutils=sys-devel/binutils
-brotli=app-arch/brotli
-bzip2=app-arch/bzip2
-cpio=app-arch/cpio
-dpkg=app-arch/dpkg
-genisoimage=app-cdr/cdrtools
-gzip=app-arch/gzip
-lha=app-arch/lha
-lrzip=app-arch/lrzip
-lz4=app-arch/lz4
-lzip=app-arch/lzip
-lzma=app-arch/xz-utils
-lzop=app-arch/lzop
-ncompress=app-arch/ncompress
-p7zip=app-arch/p7zip
-p7zip-full=
-p7zip-rar=
-rar=app-arch/rar
-rpm=app-arch/rpm
-rzip=app-arch/rzip
-zip=app-arch/zip
-zoo=app-arch/zoo
-tar=app-arch/tar
-unace=app-arch/unace
-unalz=
-unarchiver=app-arch/unar
-unrar=app-arch/unrar
-unsquashfs=sys-fs/squashfs-tools
-unstaff=
-unzip=app-arch/unzip
-xz=app-arch/xz-utils
-
diff --git a/app-arch/file-roller/files/file-roller-3.32.4-fno-common.patch b/app-arch/file-roller/files/file-roller-3.32.4-fno-common.patch
deleted file mode 100644
index 9239810c901d..000000000000
--- a/app-arch/file-roller/files/file-roller-3.32.4-fno-common.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 55fa0fb287e7fb7cee336cac0a6c1a94e505dc84 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Wed, 19 Feb 2020 13:18:18 +0100
-Subject: [PATCH] Fix compiling with GCC 10
-
-* GCC 10 defaults to `-fno-common`.
-
-Bug: https://bugs.gentoo.org/706728
----
- src/fr-application.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/fr-application.c b/src/fr-application.c
-index c148c4f9..00ebe552 100644
---- a/src/fr-application.c
-+++ b/src/fr-application.c
-@@ -42,7 +42,6 @@
- #define SERVICE_TIMEOUT 10
- 
- 
--gint                ForceDirectoryCreation;
- static char       **remaining_args;
- static char        *arg_add_to = NULL;
- static int          arg_add = FALSE;
--- 
-2.25.1
-
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index f51ab2e6d46c..9f3b9fbda2f2 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,3 +1,3 @@
 DIST gcab-1.4.tar.xz 78240 BLAKE2B 8b857c116fab636db93463cee7d6b809c3c7b2bdf3896b7b5b5b66ebf270b284b356710933ec17584143bcef5c1f5c555811dd05ea98399f327047476a33fc16 SHA512 66a2e0d0a5888c555153356ce808f602053e71b76af19794db7e3bbf9516fe791805068838b4e208698cd645ada7a08610ac95f846fa81e00a9b955016306299
-EBUILD gcab-1.4.ebuild 1114 BLAKE2B 9500962bde5773ccd2002a8fe81fcbd2b84a50570d5e4f8e99c9df8fcb9d9cf846f6512bd6761adc9df7c64d6b25863bacd65ba36746bf67ab6ab763b150d6ef SHA512 56c9d4958df8a2f3f4c2a7fae774e94271586c68efee81af148b24ad72c7768eb07cf8d8589000b15359f7ee4d5ec41cc8bde6b9c24bee370048a27f52a39b94
+EBUILD gcab-1.4.ebuild 1115 BLAKE2B 384d5ef62f9354bd0182075d86e86e1bffeea178bf02472942898aea81c083f128d71fd883eee96fe44abeb8352fc2b48a07f1cb202d79979ea7f77a6d273ccd SHA512 a9084265d337bf85582d08579849a3f01cd02908a3346570ec480e49ad813faf7591ab2ac0e2b1b392783c9eea1d7d709a2effe27a722aa725b90b98e6707f3d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-1.4.ebuild b/app-arch/gcab/gcab-1.4.ebuild
index ae198f6020d2..71661b471bf8 100644
--- a/app-arch/gcab/gcab-1.4.ebuild
+++ b/app-arch/gcab/gcab-1.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 1d5b959c76be..9218690dece8 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -2,6 +2,6 @@ AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611
 AUX gzip-1.9-gnulib-glibc-2.28.patch 5422 BLAKE2B 1c514d2ba6b3ff1596930b7efc32591bd7175bf5cbf07ef323f2566e0723fe8b125f746492ab25ef4cd892f75c832f79dba74d81da0814944898c83d03f54fa7 SHA512 5111b961d50906a5e27432628f5becbb63b993077861f4441cf445cbed3f4ec4e5c69aee22f209f05ccaa5514cace53b5805ef9f96886276d8f1b46620d614e3
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
 DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
-EBUILD gzip-1.10.ebuild 1110 BLAKE2B 4052dcff5145120ace6d5ee24b041f580258ee28db1a76adcd013d66ac1ae7bff3f8916090362a9d944cb0d8575f51e9ae98636c2e90ca84b54648a76979c2f9 SHA512 a140728e33b453a42f1132cec726a1cdb0e80c8751ccb5eadefe30efdd363f9c89aab138b86f19a90c99f89c7a16c7013930405b9856039e3d8e1dae091d89db
-EBUILD gzip-1.9.ebuild 1152 BLAKE2B 35ed002a9ae553747b0cd64af53b183c9144def81d3c0220371daa5c697fcbaec8de2410f984825fb792d8352b985ecd03a05251b9f0ba230aab695744c09625 SHA512 d677cd25d67ed2300750ec6177d6d19c0d1b73ea1c6ca0f104ee1c53fc39ee9f4dbac4c6497a42ae5403fcafe05cd2d6d677fe4526cb34bb46af0edd02d44146
+EBUILD gzip-1.10.ebuild 1090 BLAKE2B 7da06f874153d96652d17d2658af4d83474ca705270ad6817f09c37a54df676a807efc825efcb5d0371321188c5d647ee0951db931fe0c3b9cbcec26e9311a15 SHA512 57860ab0e4ee78d8f80e108f971db0c8214c7c23e153f89c73e8862194946278a82c52d8015bcfa7879ae3abf735368f7c9cb676f020f2a4c88a8c5aaf789496
+EBUILD gzip-1.9.ebuild 1132 BLAKE2B 2537e9e4eec7f5c4221db27542a6ea0476b8a5f0d31cdb4d151d2b2101e3aa06c0496ec9e82973e89ba26c412191255b7e1c231fe6a97f22f54ba05105b61d5d SHA512 a83daccb7b17a2a560eacfc75591a83e1530967598fc17aba4a3024823e207bf2ac85186fef99740359d3264bb5979238506d4126b3da69492be1931da182bda
 MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96
diff --git a/app-arch/gzip/gzip-1.10.ebuild b/app-arch/gzip/gzip-1.10.ebuild
index a73ef7a9df83..8c376d775e26 100644
--- a/app-arch/gzip/gzip-1.10.ebuild
+++ b/app-arch/gzip/gzip-1.10.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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 PATCHES=(
diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild
index 05432bd427eb..43eb0f38df89 100644
--- a/app-arch/gzip/gzip-1.9.ebuild
+++ b/app-arch/gzip/gzip-1.9.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 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 PATCHES=(
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index fcb6cb73dafd..1602e7f6a37d 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 850 BLAKE2B 84e382732bde42229ba5d22ecd2c4c95ee7fdb0b3b7ad2a52e6b59ee781cab68ca258034db12765992b79887c64b9c13aaea2f1ed8d51d2c4759cbeba860006e SHA512 1bfb5eb652ec2fb5271a5d439348af8707b9f27a1cd462af48aa5803de8ff88a434ef4b767db721210263ebd2705dadc131a726d455f2711a878feb47c8498e1
+EBUILD lbzip2-2.5_p20181227-r1.ebuild 851 BLAKE2B 427826bfec931181d64aa582b6bb82fa209f8dd52f364c42cb19661e644e1cdd85286b1e51f924ae60147f1474c1a596ffb12475560346fcac21ae4ff5cb523d SHA512 c17f5c769a6c651c8b7dab469f782f6c7af24ba3cbca05cb9a7ec2f454ed8d8bacb34d4d8780c1296d7b00ba38e580daeecc609b5124532aacd260005ed4ff8f
 MISC metadata.xml 652 BLAKE2B d44ba0b1387022f4fff2ec24e78c041a50e58f336abdcf8d31c3e2f9e429cde183000c6775eb81dbd50e9598508dcbadff5b3999dd6ee69d15214e8d22165a54 SHA512 64391d7d185471ef1b02e71a877adbebaafdb4d7bc95432d980d3559440dc199c4f68b275e98b8c0a2d10bfebbaff3544a9fa5d4bd34349404836468a0ee41a2
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
index 0891bba85d7f..822636019153 100644
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
@@ -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 symlink"
 
 RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index 6a25d56d7f88..f7f9ad322af7 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,4 +1,4 @@
 AUX lha-114i-file-list-from-stdin.patch 999 BLAKE2B f039b70dfbb82f9d2ada3df90621b4a10117c33e4a201c5f22f8093ede4da5ace496af62b24af0c7f59a8ab28a10afbb6cc2be4ccd1c427f5a4e796455f8cf69 SHA512 28c79640e0bc1b7e7e29f06bea319ebdb594568d5752f1067db472d054c91101fd5d9d769448e32463025d162adf70fd067a161a9aa4ad1b1e38aa0e8023173e
 DIST lha-114i_p20201004.tar.gz 220541 BLAKE2B 64268deb40de67d5f4888f7d4b4529fa1b6ca02c562bd041d9edd1ac9cc74ccfa43198c79310bd354806e3095f6aba8c97256b49686feb8c713e3d8110137103 SHA512 9a9337cbb6a3d71253597750301e37163c5b495e712f2374adf2ac0d19f731ed49482a3f8b639e4c48c7ef6fa7ed9f9081516d77548e9c88ed3b9ac037efeb06
-EBUILD lha-114i_p20201004.ebuild 880 BLAKE2B 0c18d20c1c6d7e72f08840c9aca4fa1a0f80afa4151c725002b9d86442bb2904036d9573a480735ac1df3f038bd74b6284bbb4b320214d3522683f8bfd6f6f0d SHA512 2fc38ca7669a3d466022f02a4787b4c643da9d23aff5fa49aa135ae5908d4b5d6beca93ed33095942d427db213ef641caf493d47fa6dd7b07e5c4febe6467c60
+EBUILD lha-114i_p20201004.ebuild 870 BLAKE2B 20a7842d83b43155289a5866a7f024669081784c3678012c47d2717f225f408386b1a245d460830b15dab9c285f7562bb91dee9484524c6df00e75f99a22477c SHA512 8bbea41dd634ed95a201b98f7b70f77f3cefafb615b6f6219e4f950ef7739c7a82b3ef61aa921db8c62382f93c4862326cf05ca13d94ca95070824d7dc9aee98
 MISC metadata.xml 323 BLAKE2B d62440b3345512ef9a0f084ae6b4a8e1026825106313de9ef0262e8c48f823615ca258ed718a14c5f9a0fdf09036db3980c3a8caa4c817fcaf6c466eb86dd832 SHA512 e1dcabab6c7ebb049bc73543800cd05e0ee7c911dfb399d4ec1b735494f6b5820d98546e5c2eb86274215c06008116a4b779d413aa982cad0fa068b8d470f1d0
diff --git a/app-arch/lha/lha-114i_p20201004.ebuild b/app-arch/lha/lha-114i_p20201004.ebuild
index 2301e49b8312..654cab125457 100644
--- a/app-arch/lha/lha-114i_p20201004.ebuild
+++ b/app-arch/lha/lha-114i_p20201004.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jca02266/lha/archive/${MY_COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="lha"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 0c2dc30d8967..9deb3ba3352c 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -2,6 +2,8 @@ AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a01
 AUX libarchive-3.5.0-darwin-strnlen.patch 732 BLAKE2B d20ffd1d898acf1e69e2f275bec2beda0769569ac37e179604dc7d0a5eca8fda2a06aa5b3811e28f465fb34c2061d15aa8073110f703244aec02cfa35afd8087 SHA512 9f5b86b6dc483f17a1d909d88841e1f82f5835dbef0bdfc18ffb982cd5f649d87fdc22f490169eb827de654fbd469fda77a5ce1bc0748b48f3f46e77318e672c
 DIST libarchive-3.4.3.tar.gz 6990533 BLAKE2B 12f97e8e4032daf0fa8f9e1839f9c7ef80fda0b2a0ba703c67d860437fad6a293484a61417f72eff933179d544cfed45083e7886f462276bc6abbce1097e6256 SHA512 d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d
 DIST libarchive-3.5.0.tar.gz 7017726 BLAKE2B 651c9e28d1a1b0a6dd2dbd2aefa0a47ba23d5fb5e96c1bc8c059152952c284f089ce16626b9fbc2cbea70dac2d16ab949235bf4c28f38235f23aeb6da3d69f0d SHA512 9a3d4ce9d4bc856c8d85b846d9d0c9f30369393aa107941c202ba0100c6bac009952c92d809e6981276b3bf91e9f37d018e7f1446b17c0c1c316fe5aafe15440
-EBUILD libarchive-3.4.3.ebuild 3761 BLAKE2B 2d9bcb9f9e0d6ead67db818a64fb611ce6158b0a7b01f20aadbfcb73624db143b399c446e6b1797d25581f7fb89ffe3b9528377f72dfc96cf2f5db7a658e4570 SHA512 346b64cc503f74f0220d319f02fe8c8265c3468c54a5c09df23fd948be20262bd849a34648522f6774854afef004bfefef7fd3f0cc0ee52b1bd18ec99e978924
-EBUILD libarchive-3.5.0.ebuild 3842 BLAKE2B d3ab821827e0769f33ba9d2a4e1b49293f9dfe31565a59c40817e13459904bbe040959ea5179c8a8eb47df6885359bb6f1c308adbeadaeffa2ac23f405cd630e SHA512 83aca2391ae164efa577756ffcad24164bb9714f64d08208c0396a893adb4bb9298ae7126b29a3edb2ba4f8b91048dbee8667c1417d4017aac58e1f228a64117
+DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9 SHA512 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996
+EBUILD libarchive-3.4.3.ebuild 3750 BLAKE2B c87ef37660b0b027fc536e13c95bd248bcc7d72ce78d4d89f5e471e711b17b3730ac6d270b38f3be90a0f2f980dbad114949e6fa22afd918c33a63b8e85d4360 SHA512 d4ec7cc1678af9e9f845772fa09c18bea4c9435da1f495e42de2122040d98137890329b58782e657cd87502482de472d32c91d7d03851b66f6b2910c322c73f9
+EBUILD libarchive-3.5.0.ebuild 3831 BLAKE2B ff82a7645534199759bd53d859e636a6f19b797953a9439c878dded7e5efd9174ef8b05fcad709e508c8107f4662d599f44312c3d6f2ed1bd6b310eb515550d4 SHA512 d953ffbc9713dba4f249f2110ea5c17e455c0f0627f4bab572ccb421ec3bcf9be8aedb2e519e6e19bf261cd1885b1ce6adad1fbdf494a4b3eed16677d6b3a267
+EBUILD libarchive-3.5.1.ebuild 3831 BLAKE2B ff82a7645534199759bd53d859e636a6f19b797953a9439c878dded7e5efd9174ef8b05fcad709e508c8107f4662d599f44312c3d6f2ed1bd6b310eb515550d4 SHA512 d953ffbc9713dba4f249f2110ea5c17e455c0f0627f4bab572ccb421ec3bcf9be8aedb2e519e6e19bf261cd1885b1ce6adad1fbdf494a4b3eed16677d6b3a267
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.4.3.ebuild b/app-arch/libarchive/libarchive-3.4.3.ebuild
index 87a77a41f2c7..7423ba54e7bb 100644
--- a/app-arch/libarchive/libarchive-3.4.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.4.3.ebuild
@@ -10,7 +10,7 @@ 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 ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
 
 RDEPEND="
diff --git a/app-arch/libarchive/libarchive-3.5.0.ebuild b/app-arch/libarchive/libarchive-3.5.0.ebuild
index d59eb05c046f..d4abd6c7a5ae 100644
--- a/app-arch/libarchive/libarchive-3.5.0.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.0.ebuild
@@ -10,7 +10,7 @@ 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 ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
 
 RDEPEND="
diff --git a/app-arch/libarchive/libarchive-3.5.1.ebuild b/app-arch/libarchive/libarchive-3.5.1.ebuild
new file mode 100644
index 000000000000..d4abd6c7a5ae
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.5.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit libtool 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
+
+RDEPEND="
+	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}] )
+	)
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[threads=,${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? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.3-libressl.patch
+	"${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
+
+	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)
+		$(use_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=
+	emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+
+		# Create symlinks for FreeBSD
+		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
+			# Exclude cat for the time being #589876
+			for bin in cpio tar; do
+				dosym bsd${bin} /usr/bin/${bin}
+				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
+				doman "${T}"/${bin}.1
+			done
+		fi
+	else
+		local install_targets=(
+			install-includeHEADERS
+			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
+}
+
+multilib_src_install_all() {
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index 655d9550cefb..9c4c861512af 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.631_p20190619.tar.gz 259195 BLAKE2B d0bedfe02485011e48fa07240b1eef68560d8d61f5d28dae25bd9fcb1c41c1b8bc1b552acb06a49d853b70a0912371cec9caebb2bf7905ef528c2408d2153297 SHA512 f366c31c84a52f6ccfba56e8b11c0bcd270482d9d120e07783fbe310d7a62dddfa60ecd310a7630e7c98cfb961f57fc9e6b843d3857d0c90d36c580074528298
-EBUILD lrzip-0.631_p20190619.ebuild 1181 BLAKE2B f9d4f157e9d7619d4dfac944ec62462c7370371542157812da44483001622be2c782ebf1e9183d1b6910bc77ca17cab9551add2fdfccd4aced3927c2634d2df4 SHA512 64fa14a1567a8b00388996f04c5c42a9866e8f12e072a386374ab52025f2f16caf144488f33afa41104a84b0d260e1fa442d076ca6a4dde15999a93c5292ec5f
+EBUILD lrzip-0.631_p20190619.ebuild 1182 BLAKE2B 22fa4d5a5fa78faa173b118fdd5d0aecef923eb5bd4ba39c093d212a8a8340ea8e5ff1ccaaf36e373cd2acd04e742547d830c6d824aeed7fbdc20591aa2f7b1b SHA512 dd983679a45d7029d0e01cc09a02690e2fde907c148094b9a82c0bc4dc2413ce6ae235df24ea0b98b98bf21b71c2e64196c34be976ed296e3c74b46588dc1a58
 MISC metadata.xml 607 BLAKE2B 818153c4b56ca259dd824e13c396822f5373d094d50d104562984032f7656703dfd75e617d1d03279c05a52334a265191c633cd609d6c6e948a20fc937f866ca SHA512 7236540b6002789563681648ef8016c9b692f814134fac72ccaf7ada302c8cec3c53c88658bbf2afde7625d8c756dbb5efa6b8d395f8436fe028ed0d49c5206b
diff --git a/app-arch/lrzip/lrzip-0.631_p20190619.ebuild b/app-arch/lrzip/lrzip-0.631_p20190619.ebuild
index 65be3c93370a..4600e8d1820e 100644
--- a/app-arch/lrzip/lrzip-0.631_p20190619.ebuild
+++ b/app-arch/lrzip/lrzip-0.631_p20190619.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ckolivas/lrzip/archive/${MY_COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/lzo
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index e517b47ad08a..7bc145e0a89b 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,3 +1,3 @@
 DIST lzip-1.21.tar.gz 105558 BLAKE2B 07658ec901bdfc255fef5af24b62614b2db9821b9a2820daa5137fd47ede0b68bbf3eac340ad5484d2ef7011d15c2eaccf19abc9e33b5c96273fc9b9d323083e SHA512 02e31a8fc9431e88edbb0fd467e9dd0947203e693e6581be1a8d25d96c74d9c3794f1fef9e4c993553ba74330c8f5851cad6315b49f263fe9cf2444225af4362
-EBUILD lzip-1.21.ebuild 776 BLAKE2B 7d9cb2f04c55873fe47242ddea592235ed8b464a20bdc13a31a9dc05d754fff145fc580e20da08b98f1c2177acdf4f44037d06018ae654e16104bfd54a54065b SHA512 a345d18d328af8ee6e73726b9968ef209fd676e000b5b4de4463aceeefef404d1b8cf584058edc158cecb22326422a43a7d33020fe49a1eac811c455df4f3092
+EBUILD lzip-1.21.ebuild 777 BLAKE2B e082b25dc5b32aee943413895f24a84941500e33c3740f3ea322e1dac5f18b57eaf5bfee6e5c5902e2f375c74d19f2c759780181717f237e9d09445c3256bd1b SHA512 1d7e06390d6b07cd1d115e789c3c0fda2a188261ab9628fade252929fd40a613446126ecb4ba4e990423452e389449f2eb835f90e97c205e5d6b3cb5ed99a74d
 MISC metadata.xml 357 BLAKE2B baa377044f421ed8bc913a5bbdc72e49e026bf0529190f07aa2d0081208870453f140af7ce3d3a97121b563891b4a4b36196db233a3fdb6a98b6eee34af9e9ba SHA512 e5f560cf4a71e085f50e0710d39e81aeddff8fb72fb07126f86a080970dc2b79acef11522b2ca471fccbf4e20e34ea57712b0b178eaaaed7c9ab5df9910542e9
diff --git a/app-arch/lzip/lzip-1.21.ebuild b/app-arch/lzip/lzip-1.21.ebuild
index 84286251e21d..74494bc80ba0 100644
--- a/app-arch/lzip/lzip-1.21.ebuild
+++ b/app-arch/lzip/lzip-1.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P/_/-}.tar.gz"
 
 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}/${P/_/-}"
 
diff --git a/app-arch/lzop/Manifest b/app-arch/lzop/Manifest
index 5fdf6aa07a44..dd1407a94356 100644
--- a/app-arch/lzop/Manifest
+++ b/app-arch/lzop/Manifest
@@ -1,3 +1,3 @@
 DIST lzop-1.04.tar.gz 393483 BLAKE2B ebeceac9492ce45e6976cd5cde262d9755286e1649802e3e16bfae0abdd74714bf86b076816aa309542cadef5bb65971342208763e1b2761fce2332dc9daa38c SHA512 5829b4495ffefab549aa697a05c536ce593c572c9eee6004460583a0090abcd317c6074c4f981dfee6be61ac8d127f02dd37053b6cb782af64db41586a8bbb6e
-EBUILD lzop-1.04.ebuild 963 BLAKE2B f5f8690851f9004bd68ee004eba7c8b890c71c2f55cb90bae35ff033b7d2f6e20a72adc5fe89e1f9da060b4a7927dc3302f385818337b8c2eef129efc9c0f51c SHA512 3ff2fc808a95295f317cff28f126618673c0d33ae45ef8d712e7cd732e5d8e2196bf09fc098cde9c0f44ca12cbe292b63725ce25cb75d5a9fed87fb7065735a5
+EBUILD lzop-1.04.ebuild 964 BLAKE2B 11960b7be0456402b5aa3b46ab7a8dc5aac078a8fe0b4b34c1dcf978d2207ef8923d647c5e7772c532248e0099038792dd762ff1abf18d7c8aca07d176f660cb SHA512 5f789e75150a3977344b9a107061a3cbdbebcc85ae7d3fbfe7a1da719009c4000cef6a8ac28ce01e1bd27fbcbda34266a25461ec2370db116c5efe356de66410
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/lzop/lzop-1.04.ebuild b/app-arch/lzop/lzop-1.04.ebuild
index 96e63bc39402..e8ae50e90434 100644
--- a/app-arch/lzop/lzop-1.04.ebuild
+++ b/app-arch/lzop/lzop-1.04.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.lzop.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/lzo-2"
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index 2e296a5685fa..55e1bb5f435b 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -1,5 +1,5 @@
 AUX makeself-2.2.0-help-header.patch 6728 BLAKE2B 7d0211074f68346ead19fd58d9440976ee0e5f0367b0776c186ced0ee77769cca7597948f2894aee68e9d3f42fb6e0e19dcdc378ce0dfe714596ab8ad705d13b SHA512 5cdee18f5190086e8421d091406df5aeefdc9fe3aaee6c26aa990b1eb7d6f415c8c8ebf67137a1b2a22470c14749d394808ed9e5a4fc6f737cd87c32651e2a8c
 AUX makeself-unpack 2814 BLAKE2B cd96049b052b46a6d5273d78e27598f73046c1a29049af406f0f82c2c301e3b8f95c40534a18313eaffb6ac7ce68cbde1d988efa3503bb46f950936706e41590 SHA512 ebfe1dd13a11cd00a853e6a4e7d6094b5f923fbe987f6b5a778fec09e00e2b2daf1e5daab0eb04850d4471019fb95f88a5d2b9d88520f5738a29997d81f2c1c3
 DIST release-2.2.0.tar.gz 21640 BLAKE2B 32b06157829864918d225a136043a5c9b7c6c543351e981c0e3cdce84cbbe4c52f00870bb04d29bfd79e715c1c708b51cc9958d495a9633afb9a8d342601c20d SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73
-EBUILD makeself-2.2.0-r2.ebuild 705 BLAKE2B b875164894c64ca897952cb4bc6ef8e9c0b5ec8e793e9e2ae2470d07190520306ebf3b92ae086b4ce0ca030a2a261656efb70d770985a7f8dc0aabb4810ab84b SHA512 d2f7fa649ef481a7b5a7fce78aebc7b7581ac374216bf778b26af642251ca44bcfbde3fdda261fe314cd9c5d1e1679e46941d0e8008c8f4c6a3ce106e27b1b81
+EBUILD makeself-2.2.0-r2.ebuild 706 BLAKE2B 310acea611438b2796a39feb28edf9e51454a33498845220995e9d4d1212e35fb96847949b11758c33624fd4ec6301d080e1cdd383904036b7c3bdf33dd12235 SHA512 aa4211a08ffaad8b4d116d98474efa9dfb6208e8dd9d30a7044ed50c4bb3c150fde5c97c2d383f19f5bc6e98c9d530f7ecd5011b15237b4de9df555ba1c49bd9
 MISC metadata.xml 254 BLAKE2B 3ab17d846132717878fe0587992dc65ac209a16e145e687773a2221f2ea17cb0568d03b4c3b20954ff4ad7deb6e15ead243d5b0410742c2c4c7dd24c56d69081 SHA512 fb782a70e1be3e60d1cc5465b54e05eb5eb3956d281d0951cc53a7b0f320255bc0ec62ffd08b18c765dd6ee0ad3f8c364c93c52ea884375f2782a1bcb90fb9eb
diff --git a/app-arch/makeself/makeself-2.2.0-r2.ebuild b/app-arch/makeself/makeself-2.2.0-r2.ebuild
index 798ab5b911ef..b172fd0d2204 100644
--- a/app-arch/makeself/makeself-2.2.0-r2.ebuild
+++ b/app-arch/makeself/makeself-2.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/megastep/makeself/archive/release-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-apps/gentoo-functions"
 
diff --git a/app-arch/mscompress/Manifest b/app-arch/mscompress/Manifest
index b22dae68621a..73231c7a65b1 100644
--- a/app-arch/mscompress/Manifest
+++ b/app-arch/mscompress/Manifest
@@ -1,5 +1,5 @@
 AUX mscompress-0.3-amd64.patch 541 BLAKE2B 44c2d4da298bf95aa2d7bf93dab257b9ad194df8e3ae7057c1e5065fdde02f7368b12ca97e6a9d0772366f0c98f799a5295a0bd092efb0526e4d74194378711e SHA512 ade981933d3cfeeea5dde44473aa0a108e9151877b6d825f36ed2d164d4ad9680677c9b0327ffb882959268ab880c246e188afc478f6f07ac6481a314591e134
 AUX mscompress-0.3-makefile.patch 467 BLAKE2B bb5c6f88194ab577e167b0c0ab4f0e8174674d82bd3337e8c618532084811bc0ac8521b2a3950d5cb73d164c620a6ea3a5c22d93682cf75298934be8864495ed SHA512 d633867a102ba099576c6671967c802bca293a81896ba6ecd5486ad025dfa66220dec9ecc4615c97db22deea914183d8dbedf5ab75221abeb5a65e0c7e949669
 DIST mscompress-0.3.tar.bz2 40989 BLAKE2B b8aeca23fb62a6b4b779da4d4155ba835085e79fea0d69d4da2e65ececb856531d43ee45b44c24415d5827c749c3dc7ceff9de3043fc6174244939a3f75b4c68 SHA512 e69a95e9c12979e852227553028b578f324ec38472ead11f9c0cce85b77bc817ea39d5ecf74599c7935c692eaac537456ebefe110400514a3c834b12597dde14
-EBUILD mscompress-0.3-r1.ebuild 734 BLAKE2B 6f78fa7ba9d91ef3b785c086f517111579a407810fbcbbd8b190c8ced140afd9269ecb33c409f651c3635f5a95c7d9e04856472efbb8c7409e2f7348d7e47fb8 SHA512 ed7254e0da765a59de21825cdacea9d9576f382cc30dee838174271f5399446b7f469535cf8bb2fbcd1180e7e75e7a222f24381a9cfd3a9c77d5a4d4358967fe
+EBUILD mscompress-0.3-r1.ebuild 735 BLAKE2B 9ee3bc46d72c97391feda57f14fd10f79333b0d085f646f426ca7ace4b97e180347796ee07f86882c188192104e2bc9b99973171b17ad7baedf7445eb695174e SHA512 cf30442919548a72f695483f3d20f691d257544df582e2e70254c122d9d480893b82df8c9cdda96421bd67c8de0e5c31ae2074c3f1b4e333b0495ad3f9b250ce
 MISC metadata.xml 245 BLAKE2B 6979761502adbfee033d45b63d2d47bf55a4cdb16acfd46bf85f5010c8b5daab257d57cbee66bf79135ec276a8a5cad3dea126eff6840e90b02bc045c4e081e4 SHA512 6623d61f7eb4a232480f4d29ac2bef906d50adf8b6aabf080f33f37a316e34835e809557de1c830b1d6433ae9ad7360dd9db49e4498487b982f2b4e2a9480c1f
diff --git a/app-arch/mscompress/mscompress-0.3-r1.ebuild b/app-arch/mscompress/mscompress-0.3-r1.ebuild
index 7cb1bda438f0..779b372736d4 100644
--- a/app-arch/mscompress/mscompress-0.3-r1.ebuild
+++ b/app-arch/mscompress/mscompress-0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.penguin.cz/pub/users/mhi/mscompress/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-makefile.patch
diff --git a/app-arch/mt-st/Manifest b/app-arch/mt-st/Manifest
index de14c0e980aa..d420a79b3ada 100644
--- a/app-arch/mt-st/Manifest
+++ b/app-arch/mt-st/Manifest
@@ -1,6 +1,6 @@
 DIST mt-st-1.3.tar.gz 35341 BLAKE2B c58eee9bd58a3fa5105fe3f8dfb56f1af1c5ed73f99e5179ea14bc11d66151d1e6b6c99f61194c700ed79ce10a7e7f75f78ffe9b7d2c45c85e620d4da1aaeb5c SHA512 1d026ae85e1ca367e72f1810042314070f592306d9ddec331b95ea4e1153dc3edee68d8798bdf7e055a4cf9c67ec8c539e5d188e87f0546f48b5f4ee4bc6a820
 DIST mt-st-1.4.tar.gz 37864 BLAKE2B 25ae656b6442e53570366405ba76da9150cf1d4fe33c612bf922d8be967ce6b60be191948507a62bb1881d4be63ed192f7d03f1d63c38f5772aec2f3d2fe455b SHA512 e6655a5957d3ac470c0cb0a1955a12397aa22f3ea1a427cf776f6bf2d6fd665439b2bfa54c3870b7974da537f0fe71d3be43126be1a7db903e6bc7be4cfb10ec
-EBUILD mt-st-1.3.ebuild 572 BLAKE2B 0ba3850e06c4c09f843fdc7dc6642c1661ccd5e60270f7c38976e98269537db3bad4ccf5c0aef986319f4534668a928e0b9b377dee5eade3115663ce82f78c4e SHA512 50d98822137156b4f507e8f91a960264564101f3a7cc2d40a31ca564f541202309a86170a5f4de199c66cd95f1b32ede6d65f7801c604fcd36faca608505f15c
+EBUILD mt-st-1.3.ebuild 573 BLAKE2B 0ddffdc56bf6b6b405258820a6999931b2a868236c430e489dacc472526d5d9f6a0b5a14305e7c01850b8850ca4a04e68371eeaec8fa17141358b92424a8cf89 SHA512 53ad80258a22e1de26e7d1442762944653e3748e65db9bff40e735aec48b1978429462b1c8b396cba1b058659f1d2d6e422dded35d9cca4379de9fca5692ad95
 EBUILD mt-st-1.4.ebuild 532 BLAKE2B 4e902de4d3aee2c5b94066c8fba3753c8386dc8b2205dc8d39ca9a41a80a3d9f7011faabcda3d6694fecf71b998f85cfb64fdb4d7660758ec90a3d3e7952da08 SHA512 f0d074fdb440a7a5308006b8f20f74bf6d92b5ec1f2a5c9ac52785679b9c5e9fda61f8f342bf5b19a3824d884ab207c1ae891bf856f92cde38bd981314a1cc8c
 EBUILD mt-st-9999.ebuild 453 BLAKE2B 92c6e6718a621bdec7e78722c742ad1deb91da0192f20115b0d941194c4f7bb5ef0f95cb22484815999eb1d44b658498b6584cd0d71c412ffccf404b21910720 SHA512 a1241b5d9bebc4b7bd4e10d939f2f6305b1d166a4d12270484b5533c28894dd361e347b74cbc477b50e00e154c3ddee060a9b46bcef5a4d6bfcaca080d4aa416
 MISC metadata.xml 244 BLAKE2B e551dd172f35c5abea703cec8f7c899f1fec22dff135d50208419088aaeb0b2464e3ab44fe7c759147d43e9d0897a3fc8c8087089b4dfdff158907e835d5626b SHA512 904a7d356000f52257174f15912a3b79fe0b6bee390128a2f9821e749b393964c626f9afd751d88414086d7e28eab2183ad41dbaab911aad6ac5480e3b265922
diff --git a/app-arch/mt-st/mt-st-1.3.ebuild b/app-arch/mt-st/mt-st-1.3.ebuild
index 9b9387f7de4d..6124ae9ca95d 100644
--- a/app-arch/mt-st/mt-st-1.3.ebuild
+++ b/app-arch/mt-st/mt-st-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/iustin/mt-st/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index d7f5768bbbe0..b319c3f68521 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,5 +1,5 @@
 DIST ncompress-4.2.4.5.tar.gz 35562 BLAKE2B a09661659a72cf4be40e143d8cff53779de7423c0337d8c92863509390d8adc355d660da98db9de431bb4c990f8d10955e19a97188b100450ff9ea2caf19ae8d SHA512 487e8d5ca743c3aba19cf69f7ec62bdc0784e43af5737f06d6d4257f2f33899eb3d293ed049f57b3164e344a0fddc077bc73437564977bad8de45816354c8bf3
 DIST ncompress-4.2.4.6.tar.gz 36006 BLAKE2B 1460fe803ed621e5e6e5ab506d8909acbfb1d3b91421cf7c7bc10b6b03b0cb6bb4ea616240a7aa500813d5fbf0a958e1e981da8a5f752d985ddcbf7fe9280d9c SHA512 03dd9670c48548d6f7a028dd307758ce7ac61997297c1075d65457ac849e8f2d710bc38fa9eb42e4b2cac163c1b93b7cf7eb197e90cbd689a1274df3de2a3ed8
-EBUILD ncompress-4.2.4.5.ebuild 712 BLAKE2B 4b483d58e24e09ad00fe5d75504b20f9df53d40acc1e8ea6ecaf0891f009f2da8cccf2d29a9d4d84fb8d355085cfcecff02306aba83fe2357ee540f9f8b06202 SHA512 6cf18ba918862179d46cbbf269cbc566dcc2323e5936bb6fed5a81ea3ed0cdaf452f1907fb37c2d250550dfb9e2f94d914d343a0cefdc296a891987dd1cdeda1
+EBUILD ncompress-4.2.4.5.ebuild 713 BLAKE2B df9874c6a19d0e5aa1ad9d8b50247c3bbaabc02fc5c9d8e337f5000e46e9e997d32374d3132e4c1410d8c8701797c84c1a07f82d5a8d348ac6dc11df533ee510 SHA512 85fba2c9e4d1cd14f32fbb1d6db47c5b67b9488be3ade284cfa81027a1cf154cdfa48adac53403a5bb881c95bf76766de35a5e2ce837225e8721191e60b0135f
 EBUILD ncompress-4.2.4.6.ebuild 757 BLAKE2B 1d2c306d614db2608463f3d1db440c6c96732642a94c1dadb69dcc790c4b2f728ba80ed9308a326669bb57d21b37d228be54dbaa73742028b98ad099838c7ef5 SHA512 86704d7ea8d9cba09042fb814c464878787c028ad3d6509133ca2df00f823eda37f61b466a21374a35967a23f46480504f861c55bbcc28cb2e3988f902279c5c
 MISC metadata.xml 392 BLAKE2B 1e59934b640d08d7728f15bd88534fb4e72e0c8cc6c39cf4fa5f5a188c4443bfaacf081a8284d2c508806b7c11553d1ea5c18cc477db48fa733875d2d4535cd8 SHA512 7f91577b6e22f6bbb9b28a59a5a4391a52e81fd6f654348602e3b7908a70972df4b34729c42e029a5e1e2354a973c60578a6cd0408f0bcce0200e3d0fba8bc13
diff --git a/app-arch/ncompress/ncompress-4.2.4.5.ebuild b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
index 33754e58912e..ae90effb56e2 100644
--- a/app-arch/ncompress/ncompress-4.2.4.5.ebuild
+++ b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
@@ -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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_compile() {
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index d4079c5371a4..f129331d9ae6 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -5,7 +5,7 @@ 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-r4.ebuild 4636 BLAKE2B 9fdb8cccf0921c95670f251114c5e32925cec4c68c28b68b3326947344bf30faaa6a32e2385100b52565053fa9b5de06067c5b5b4390e51c9c467e61a10976a3 SHA512 82861403e305d2ee2b980e158b2614d3acf563097a07e920e7ffdcde6ac261ceaf02789ad540816067ed445050dfa67961ff0a88bd456cf8bf1e1149fd9d88aa
+EBUILD p7zip-16.02-r4.ebuild 4637 BLAKE2B 536c013bf1b4ae945f7b6e6a4e879a67dbfab2f07a5521e5c402ccdd46fa236846ed91f3dd5bc3a3c921497afed1b66d251532fd146f9f903d705d07456ca0af SHA512 d46b4a74ea9fa2d764bc0128181563aefb08a4edbc18801e62b489fd0b64fde0e620b61be03bf0101aaffae345ad37f1494bd44e7c88279fbe30b1f958c0c026
 EBUILD p7zip-16.02-r5.ebuild 4802 BLAKE2B 98405f4baabcf5ba6c482b133f9451f0a786e7460007b9ba09a135fe0975e08c813d7bb6569190da9def27bfb0b4c548dd9d6b92c0e652bc049839e500a3c669 SHA512 092759547ee6849b3fae31cf1ada4333d82955a7c91ef6db25b7c2ab153daa1105dd4a166b9412cd3cba8ca204c64adae4d8d08d22fb8ebe2c0b34787abd870e
 EBUILD p7zip-16.02-r6.ebuild 4787 BLAKE2B 41ee68409dda5a17e160163b6b124be6e83d78fbad95e578cc6846322e17fdbc52ca16d66231d7930deadf01a202f7634cd2980d66cd7abd5926557651186937 SHA512 6f9c26790ce42a08c62628602d9db81748f87c65d1c9490d6bea44768a960bd8bfaec87ea991f0c9f14b0a4461796d9b9ec31dcfdc8f9ceedace592c4b6b45fc
 MISC metadata.xml 393 BLAKE2B 6ab87f3e2f35dded47136efbf8f93c7a899a5918b4a8e3ab6658a427da8085e8eb0e6ce2aec09fd0ea5fb14909081600b79027878b7e5b8ef9d476def057e52f SHA512 50eb24c1e60e0be2c02d8054a5039c5e2b11ac82aea3f90c0a37c21e68b01135de88878b1079ec46eeb8d1f8ab52fb8c9f58f88a498feb38ae5743adb7519176
diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild b/app-arch/p7zip/p7zip-16.02-r4.ebuild
index 4474ae1c94c8..510b8f6eff95 100644
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 
 REQUIRED_USE="kde? ( wxwidgets )"
diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest
index 07ba378dacb8..d82800f26762 100644
--- a/app-arch/pax/Manifest
+++ b/app-arch/pax/Manifest
@@ -1,4 +1,4 @@
 AUX pax-20160306-glibc-to-linux.patch 852 BLAKE2B ebca2d148954e511d3a4f79ef96cadad0eb93c35e9959a2fe6833c8371aa8c2d20f2a471ef3e8e19efbebd2f15ae1ff66ab976191166603998cf4b4ccbc705ce SHA512 f6ee4abbc2f9a422a735fc6a09098a6bec9b855211bcdce088cc7362cb88def65ec574d91ad7cc48ee055e0438d481ed1e4b6ff650419ce3c7c09449ab82b69a
 DIST paxmirabilis-20161104.cpio.gz 148061 BLAKE2B 997a126d3048488e1a4e49ff9753de2ebdbe75b7daedbea8c95ab5f1902d4768d4b12b13fa684cb2a7c2fe8470ab60e19ea3f9430429a6a4e6e1d57993130fd4 SHA512 42ec8365a5efb9ffb9d383cece39ffaac85c1c8d69856ec557a5567cf0d28d98a0f2d4b7fed53572366eba12c71111cc80b591d51c6a19a3e6437efb62af33ce
-EBUILD pax-20161104.ebuild 1456 BLAKE2B 8e85d6984aaf0e4b2a186a193106e68e36827fbbbd46dd5cc433faeb632d411b973dadc5aa6c7ba62b73020aea716c5f228bf42560d9726850bfcef4523fa7b7 SHA512 14837018df539a7cac92eb5f40526d9911d6eead2bd15dbf2bc4b9354c6ed5d949d650956af9f001085739fd960ff368582c569a8320fd1aa8ebf57856b7f74b
+EBUILD pax-20161104.ebuild 1457 BLAKE2B e35c5025b585d700f6770f7ebbefa27473b819cd35bdc2631ac5351d62011c60b27ea6856dd13a83cb592b7cb6a8c86f411b369d499f234b48492c9af2c12575 SHA512 68867a75d0108f3528750275179cf4e1ac2ff5243aa56270fbfd5ec9651e7a96fb10d881171f4272588d619bb86b09449e4d24ad913852ec34d515d7189cf7f5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/pax/pax-20161104.ebuild b/app-arch/pax/pax-20161104.ebuild
index 65117db6a47c..3ce22473dcb5 100644
--- a/app-arch/pax/pax-20161104.ebuild
+++ b/app-arch/pax/pax-20161104.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	dev-libs/libbsd
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index 01d5334b0191..24b63ef627f4 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1,6 +1,6 @@
 AUX pbzip2-1.1.10-makefile.patch 263 BLAKE2B 32043c1a47504a2e901d9c4cb4360f295d39ae70fa7733d687fda7f620c0f5a0d5a4fbfbf65b82c841f21c31d761ff8840f77fa3a624e7c9456dd45299a9b7bb SHA512 f20db966b7da75ccb29578d54dac6d7445165bb5e6d6d29756ca43e0e32ed6abd67384330b652c61f7fdf904393e93d807ad0af5e2657ebb54d625d1fa5659df
 DIST pbzip2-1.1.12.tar.gz 47826 BLAKE2B 62b1e47b7b67f2a27f31032654506552c33e68121dd50d3496dc746a405cf783807c4966058feb1aebda2080ae1d1d22e944d057ea3a0dba2f9247ea46b23eb0 SHA512 bb68e87867295b89ee6fb76a8b72834daebf0ca6c16b2f10bce67fe7386716a728acd28bf46a9732087202ca0cc774f02c741b0b58801184bb7550f6fd119cd6
 DIST pbzip2-1.1.13.tar.gz 48015 BLAKE2B 1bb410acadc728963c3a04d2665fb1b1f0c206a893ed90352a9c16512e9bd5f82c3f5f3b383b382134bbe904735a1c8a81615a8bc54de8c6bc91633d9ce72c57 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8
-EBUILD pbzip2-1.1.12.ebuild 1063 BLAKE2B c3c26ee7b9a2793bed7b3f1beafbabe30a73b61bd5fcddf604668c4a88cf46fca08774fed7b0e3c592b4f72f9d9fc20b7b25d00614cb725cab7aea51a3ed3c79 SHA512 455ea431161a116e62f3ebb1cdd6547e418cd43d60588c47f0dfca520fd6ea0bb884103a3f5d314a2556d8a7d92d2e659cde734fac478a545c7aeace83e21c32
+EBUILD pbzip2-1.1.12.ebuild 1064 BLAKE2B e4031113be7ccedef8e3d602621822b3d96be3f9e7b2da85111b1d9f99ad662f3ab065f0f38acd9437f38f3e3ee4b577d029320f4928f2bc03d1630d81bd58cb SHA512 b2b09892db8c5dc40a619937a643cbfdf4393bff17c935a4a016466ad7f0a3cb7c2f519443be598f96ac6040df71b7f2ce59be100a7fd1e69448b6f698f235e7
 EBUILD pbzip2-1.1.13.ebuild 1140 BLAKE2B 8af7cf7d85ca0e1b5392d840cf739a018de1212c7d6cda213417b452ff5066f2b11270e2edeb4a8ef70fa35de68e6a0d2cfc16c393acd45cd820dc263b387cec SHA512 35b0abcb9cef5d09a2452569a25a9182e73705b6b3c22d1147eb5804388009d48d4fca388729c254eee3108336ebda13f20904f08d17792e8f9af0c3953f1ed9
 MISC metadata.xml 443 BLAKE2B 3a25a8281989265bb3339d4b46442e5c73920567ff19bd12e57a6aa41d40534428e409ca9dc548318d2487288e12e2c6bb305809c7585c3d6742c8709a649d9e SHA512 fbac33ec453bfd5c9cec5ca30ce938281a9d1d280e8936977d77e3fe23e802345814e343d9824cef18164aa3ad2b2aab421239593bfe36f100dcd787739761d0
diff --git a/app-arch/pbzip2/pbzip2-1.1.12.ebuild b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
index 1f7a715f73c3..b1c5fe68fa03 100644
--- a/app-arch/pbzip2/pbzip2-1.1.12.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static symlink"
 
 LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 28c3994fb4b9..f4ae8a02dfab 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,4 +1,4 @@
 AUX 2.4-trailing-junk.patch 916 BLAKE2B 1487b9fc75bafe50cd00aac14e867f073c8d8db22067a645ed67aec9ebf46c1599d174679a56a23806d546b3a43739f6f5137dc9dd3f7e62b8b0aaaf61e0dd99 SHA512 8159a6b8c5c7086269dbaa06f73262fb53125edbb360ad22526d47364e8006735e72650d869f81335620177a78eb828aa87198905ec0e7ac41dea731261b10dc
 DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
-EBUILD pigz-2.4-r1.ebuild 1012 BLAKE2B 7266a3fd4be5134e3876ce16ff1149e4ed3edfef522344dd00911375da5fe68d0b5461e358d94d1454de6267360ca27b0f04392d18e00dc1075fccbbdb0b9996 SHA512 1bb48dfa233655425306a5bc5399279c0934e59fe2402775965253682d56df4d753553878504563bdd008063218f6f030cba6db16527ea5c575a10799a2b096a
+EBUILD pigz-2.4-r1.ebuild 1013 BLAKE2B cb4817729c56465f5e9b6ca1b44019e85c9bf30464c0fc1cdab21fce8dab3526453c4805842e7968ae1a632e7c208b9d70b24b76198d881d148cedf6a843d7d0 SHA512 786ae83a1269c9b7feb23e8d356902156f1cac318239d8551c00424889a1f8e5ef884d80b597ad3590763e539ae267c5d5240b325c76ce8e8def54b04d1f179f
 MISC metadata.xml 688 BLAKE2B 4dc6a54347303d0af5b2d77712a6bcbf4f02e81ebf2daf070f7820d0ea4e99896a5ca7e8134d4ecd6e14cf55d2fb178e9d4e95f6db15bf884d9a68d9c0f5b15a SHA512 f9f5fb0cb1f972ba85a2d80642eee5b061b7d81e4e20a4e2cd1abf958aa5702905b06dca8db65f7ed906ac08c0576e89f01e8a8630f8bd97fda6b5f6b0bb718d
diff --git a/app-arch/pigz/pigz-2.4-r1.ebuild b/app-arch/pigz/pigz-2.4-r1.ebuild
index 29c9951c6bfa..d579c3e41013 100644
--- a/app-arch/pigz/pigz-2.4-r1.ebuild
+++ b/app-arch/pigz/pigz-2.4-r1.ebuild
@@ -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 s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 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 b84e6b7dce9f..c46969100cf3 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -1,7 +1,7 @@
 AUX pixz-1.0.6-avoid-unaligned-accesses.patch 1253 BLAKE2B e852f1c991bc7ba282b47516598d09a41182f01ceade67276dcfb192767c1bf33a36cf992d5de201bddc24790896af9e22e83f3fcd48a84f3ea3f6c9cfd7e50e SHA512 6390ec34f3d7d07be6ef6842a631d2e2ef87abe54e5f745846a6c08a4c1a7c15d50d3327afae131dd4b64a66ff187ada1d4cdae4f4503c33e249dc238082ce9a
 DIST pixz-1.0.6.tar.xz 119516 BLAKE2B 758a4985b946284587998ab2a653e51ded9838a7c77c7795c82c15c1693714468b07c2cbfd86a0c7ce7be34d9a5bd8fdc3285d503524ce299ba53179447e60ed SHA512 361a8d8b736c350e4e3fd19b5d36777129a087eb81439d05edc08f9378938583bef8fc70e440ffd22efb6dad1f6494c6c3e532d7dd1ab12c9350b6078aa993d7
 DIST pixz-1.0.7.tar.xz 120876 BLAKE2B 23563837169611d54dc4540715537b2e16c66bd9682097e4f37957e7422b487f221603b11aa30a39fd05c77dbeddc1697ac9ffe208d984c1da885a67f79a180f SHA512 7f343cb74958b9582b60a2e916243e72421fad1ebecc5867c9e046c881e8a318da9bb885edd71da8fe6953fd5d5c2f5119133cd0bbbf4d0f9b35f8aecd61120d
-EBUILD pixz-1.0.6-r1.ebuild 1181 BLAKE2B 46d6fdf0d1aaa4b1ed24aff66405fd92e0e40710f64a7d7afbe175e9d597ce4fbd56b63b264b5ab57f0640fb2bee0ae3ae3b33400635ddf9961c7aa33866782a SHA512 907db330a6197304585318a3dcee21e7f7a6656bffdc5cc0c6cf2824ecff29c20564bf680c77cfb196b9e3bd662b5471c2da272b57b0847da66a913c771415c5
+EBUILD pixz-1.0.6-r1.ebuild 1182 BLAKE2B 028af73c2881e148fcfb20f037c58666353ca0842276e744a2fa89b229139a566bf30d06294e42919ee7510b4970743c3b6bc0c24f7963aa21d733718dac318c SHA512 8861d797668b563dfcc1b736320239125530d3932e4ada96467d37e8240f1aa31d785c807a3994577e5a5fdbc48efa8ad973602a2d5937401021c4cc405b0411
 EBUILD pixz-1.0.7.ebuild 1153 BLAKE2B d66b37b1874a4687d50453c036c8089d0886d65a48603a9c3f28a5b68f1ffb93c4cb8221aa0f8fd699a9eb3c38f9e3812fe4129c32a2453c674a0c4525b6320a SHA512 305f8e96edb4b34b9c8b48f2746fff3e42605cbc111d4f5f24d9f810141b12d5224ef1c194885df9e83f25955804d3212d38fe099615cd5d1455ae3087958414
 EBUILD pixz-9999.ebuild 1161 BLAKE2B 0dfa4c22f5909ca72297c574b7418ba5e202763dfa09f4467f6ca89aed139b9765a578879cc92126922a4a230088c0f8db070b0ada0b34640293521ab1343fa9 SHA512 418e57b0aa7ce08351c0934e5d8c37cb2ce0e47077ccddcf1beca7830ca89b1cc27f2d1759d7bb0138923be789f61ac7dfb364b92383dbd2dc075f02621a5db7
 MISC metadata.xml 331 BLAKE2B 15bff5a59c7a5ff1dc23d59a9c9acda8ad40691a1b79d992ea05eaab0436e56cf0419f0e70b4e8dbeed37bee33735bb6700a85a2f26d50fd857cb38eb55f152c SHA512 54391cfef5b3719b7ad708cc7367740ba68f3223e0d92ae8ae5992ff127f41291fc1afa0d0bd7a1a02cf53b76c3817a57696a16ae535f8522e9d9249f4ddf401
diff --git a/app-arch/pixz/pixz-1.0.6-r1.ebuild b/app-arch/pixz/pixz-1.0.6-r1.ebuild
index 08b4bdc897d7..4ef78d45feb3 100644
--- a/app-arch/pixz/pixz-1.0.6-r1.ebuild
+++ b/app-arch/pixz/pixz-1.0.6-r1.ebuild
@@ -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 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
 DESCRIPTION="Parallel Indexed XZ compressor"
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 148a4a40c6c2..34c578bbe2a5 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,4 +1,4 @@
 AUX rpm2targz-9.0.0.5g-add-zstd-support.patch 719 BLAKE2B 0450ee5f7e6010db15f77d474da633fdab17c7b39657971bd64aebf89876a368c7bdbd4572e30a51825ae741efcad6f0845b10aed362c8502101d54485369cd5 SHA512 dd5ea497a2983c45f7c2055b7f47b911f86a5246b90bb1d55d8f75dcb1c9f25f2c20d75e7f19a3df65b62320e8397d465d25f5d5ea234a65230da4922b274079
 DIST rpm2targz-9.0.0.5g.tar.xz 5740 BLAKE2B 88c903119fc19bd1d2eec1ccc7616e05594465a0595b75be8ab8095b5404420a8a09ba8fb176ee21efa5df3b12d4436b60119a637f70910cc020bcb3dcc3833b SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549
-EBUILD rpm2targz-9.0.0.5g-r2.ebuild 821 BLAKE2B 82b097f45b60d997957b51b7566538d081ecd811900b59625aa0c08e3fa5bf21c91cf3b63f6e92ebb8614e6c2eda7bbcca3ab55d0e5c1147196bfea96aacb653 SHA512 1fffdd6cd1a8c9f47600321a06576e8486f8957ad1dec32e8c2e4ae01385999cb4e08dc859918e266c11961b1214f904de2b1cbc7986ded06cf4d5f58ba5ea0f
+EBUILD rpm2targz-9.0.0.5g-r2.ebuild 801 BLAKE2B d8a691845d91218b850db7b44005f2cff88082f8bfd94c429b034b0947d30cd5bc0733ab4d21e7bd94b72e9cb061bd0782500c1ab50e57d151b2a6b38ba205d3 SHA512 f24f056dca7a3bb4808c2ae25ac1240a52ba54c73a685a532d84fc62edf391893f3917707310aafa7ae623e5a3a69edf1f86319e9befaf7f2084e153708111f7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
index 1eee219709f9..3512a3e15b58 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-arch/rzip/Manifest b/app-arch/rzip/Manifest
index 4cc217a623a4..4bed7e95c1da 100644
--- a/app-arch/rzip/Manifest
+++ b/app-arch/rzip/Manifest
@@ -1,5 +1,5 @@
 AUX rzip-2.1-CVE-2017-8364.patch 1006 BLAKE2B dc84fc222e5fcf1c0e5a37eda05bfb136b9603eb3c510edabd91bfc639b2c4a9f9956ce8cf152c94fb255c1b749a5eb8dfd0d13f65a2a4682a008f6fc236ab4d SHA512 18f594eca2f805770dad7569ad8cffbb934e74b85b04cc91cbcbb04fbc936529f68121504c50b037cfb848e9ba90131a5b35a1d236f0c1453d55fd8b415a7ed6
 AUX rzip-2.1-darwin.patch 4829 BLAKE2B 7e6cd7273573517aa29e73f0556e6b33d4386d71872d643d448859a48308b8fcd59b1a2c6749117e39c8184ac4239053a97757b2e4e821b7b9e7232e99af2120 SHA512 a3cd2c98a486626767eacd5a949ecf1f328f11bd663a1f4b9f758314dde709e9fd73fb1239dec8737d4511f61225f47682b610b9a2609646613a774d6f6ad5f8
 DIST rzip-2.1.tar.gz 46785 BLAKE2B da38d7ae74149824dd33f3ecb1a7f6f63d63a8ee54c57565e4edc5915b503882d4de20b19c22228e8d3fc698477b6c8f095c2a399d442101a83ee66f4bfbcc63 SHA512 06ed760ba2b7f09781a2e9312b645d41c145f96e3ee55ddf573714493e92466366ec6394267e5e06b0d8c42dcb67e1ae99dafa417a84737ce2b4a650a9059a6f
-EBUILD rzip-2.1-r3.ebuild 1098 BLAKE2B 1e460e70954a817ddb95638de32d3333079741a6101c33f55c0b5dd16911343253ecdf3e6e41ad18f7ddd4ba1ca2593d4c476a5475aadf320086457b79deeeb2 SHA512 a3789a90c00622d6e2d9c54bdee2a3b9c69a18cb9d266d150088dee340062f243af38056f767c6cfc094e6f6c537dbcb7c1974a8816075c9045b94b8ef0eed39
+EBUILD rzip-2.1-r3.ebuild 1099 BLAKE2B df47add991b4b905aee0710e0a4837314c23179cdb530a78f47c7874cbc67bbe86e5ca872d2c4d0a0443727163f7fe39b79760013ec1e18675557e6ca3249acc SHA512 1cb9bb863c1690861130a49fc5a504de7470f73aa191e418996a4a012fe12e0a2db1eb86a7fd65ffe7025d777293e5900a5471118dcb2779fe710c74aaca5601
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/rzip/rzip-2.1-r3.ebuild b/app-arch/rzip/rzip-2.1-r3.ebuild
index 915c6deeef2b..a069fe7ccf31 100644
--- a/app-arch/rzip/rzip-2.1-r3.ebuild
+++ b/app-arch/rzip/rzip-2.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://rzip.samba.org/ftp/rzip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="app-arch/bzip2:="
diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest
index 8a0ea5305f00..a89d10d042c1 100644
--- a/app-arch/sharutils/Manifest
+++ b/app-arch/sharutils/Manifest
@@ -2,6 +2,6 @@ AUX sharutils-4.15.2-CVE-2018-1000097.patch 500 BLAKE2B 581ee4fa93ac9b7f2eb0a5b6
 AUX sharutils-4.15.2-gcc-10.patch 1048 BLAKE2B 4148ca1ffd1fd5469234a0af1efefa38f179a19527fc18b4df638d63a3d128f4f2f3934b94e3c862a515555199d16da4d59a508cc4aab1d097aa6e390967be2a SHA512 75fcd9ea81d1d8c63eee8525aac8eeeaa4c8caebf223670951489f0869dc50f0af84b647443df60927f184a89659c44c91c6f6a7ce12b874821037322ce079ae
 AUX sharutils-4.15.2-glibc228.patch 3807 BLAKE2B 644163c477f51b407211e8c9e6d3120ae38307753666fffb7aecbc758793b0b897920246b1f070e727e28728d76eb3283b80ababb881f39f909f9aa96b6e1ace SHA512 179272ae9b528719700bac5b06e4c70116d3d8a06973a69069617fc8dc0fa095227f7ab703b4c5b2beed649d5ffdc661d1d7ad7885185cb6ba6c62fce020e1cf
 DIST sharutils-4.15.2.tar.xz 1122476 BLAKE2B e2acae027679ebdf723ecae6f243608f501f5c24685a19223dd27580ccf76bc7d38905a9d202b30cf2633e5580d727821398f1162b170233f03c17f3da683917 SHA512 80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d
-EBUILD sharutils-4.15.2-r1.ebuild 1100 BLAKE2B d3ca42174d648e988149f4d00df6772c3d530696414ed40ab195419a48c570af871f9a1f97139ff6b62c2d8b11b1d2e03da48db162852fc87b8c19073e7b0cfa SHA512 2b8bfba8fa8c430f8eb948e844629fd4916588c278eebbbfcd6387a617dac17a2d0c77c89bbbcb2e3162825d240966c5f2e43c9a3fd2308aae6889a13b5094f6
+EBUILD sharutils-4.15.2-r1.ebuild 1101 BLAKE2B e64b1a5a57ad324fdc6601293b436821352d59c4011158ebd737e8723ee467b6bab0f5d458888f26387d6cc3e408942617b64ce1ad7acad671275843e361dc53 SHA512 aebc0103d0bb284899bae0a4c4a5fef4870be42b2241c863a3121daf03e1b2e5239a35790aff12da1033fe090c19ee73bfad11188e12a88cb4b50adad19d019d
 EBUILD sharutils-4.15.2-r2.ebuild 1088 BLAKE2B fe83829e4a3d8fd938d2c2fd3d1773705b9cb673c501a1faf015f7aa701da0bc48c373b0de14085118d55b159a1149815275c9a11f8ffd4bbd1fe48e840f02f3 SHA512 74bc3c664e0dcdc5b5b1b6710dfb1ff2ec35fa2a97f4dc1c00591f2cec3cd897ad60d6fdffa751028e2a8b350df7b3f34314642431eeb4f634b922275f9c7e92
 MISC metadata.xml 335 BLAKE2B ff8d1603a99aeb199526f9ec3c768adc461d09ae2d5dc5d73bdf2bea0d369dafc75c358b23ed68d4567e8f691b3d84d706356e8496d2b5d181e58563bdca8826 SHA512 4670be25ae746c8384beeff118f00b44d00fb9db553d4d64934bbb6f972eb21e2a4b28e2d5a6a6a708280acd51bed2b2acbb7552165c43a75eb497eb0c04dd94
diff --git a/app-arch/sharutils/sharutils-4.15.2-r1.ebuild b/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
index 00e6532922b5..d1e5ecac5cf1 100644
--- a/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
+++ b/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="app-arch/xz-utils
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 96e7fea2a8a7..fd26222328b0 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,4 +1,4 @@
 AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 970 BLAKE2B 5288f515e3806394b540bd5187cc277467b462526fac35dc2112fde0529f952083a02dc3bdd349e8fd6d24598f1021904861dec683a03bf9c98d9bfc60bb0aa7 SHA512 070e4bb4c2e4f67d6c22743d82660506478fee8c6fd936508a2beb687a57fbb7325283fa2e9b3f6cdac599a5bc19519b35236752d1926554047444322ac7689f
 DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
-EBUILD snappy-1.1.8.ebuild 1812 BLAKE2B caa25d000cdeb3386393238af579fe73f8fa8fe34cc51d669aa3c1354c827063dd24df8cdb9ba4f471c75f1b70af94027a9043ee9e9edfb3250a636521c9b064 SHA512 28229c15989275bda0bf84c3cbc0a6958c644ef49ba559e1c456e8418c9425801e0e977d75107348f3a5a7f96923481b1e6d53213268dd8f2454f8fe4d348128
+EBUILD snappy-1.1.8.ebuild 1813 BLAKE2B 7c723f8270d90b9d398e2047f2a1570b0b076993567ec2aaa6ab3122bd874077b526becaa318d25962090bd80eb38e95db8e02841826bff72db98efeb11f0a1b SHA512 33be426220c1f269fa9c88e8f8c0df6575ec6d6859a45291fbb723e399c9e65e011ccb05ce7cd25a1c086a64d785789d089395d7ed3e74cd8cca8ed8dde60074
 MISC metadata.xml 584 BLAKE2B 9972ee3948809ca45ea18129bde88c5a93fbe73d24c6e125cd13a45bb381099110dc0e006cf76a57d0baf7d18001bf261dd1d6db1025750b114903725e2e3aa4 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552
diff --git a/app-arch/snappy/snappy-1.1.8.ebuild b/app-arch/snappy/snappy-1.1.8.ebuild
index 9f4dd1f9c58e..bb233447d5e7 100644
--- a/app-arch/snappy/snappy-1.1.8.ebuild
+++ b/app-arch/snappy/snappy-1.1.8.ebuild
@@ -12,7 +12,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 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index d9100410f605..eafdcaf38ff2 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,6 +1,6 @@
 AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152
 DIST tar-1.32.90.tar.xz 2145976 BLAKE2B 95f1442da87bcbd58e0a6aad303b8c9da9179cc32a6e835d3fbe2e090ad4316e96265a54f573906b262034b92d8d3e56f3ff2609145249bd16dd4ea2a79bb601 SHA512 a42703b73ec3c1f462849469f00dd190a0164972fd2e97f128c3b559a6e9c79e87d5bbf47fca17ca9f8b6810221fbc727b6c15e38693256d9e43a2c2a2d7b593
 DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6
-EBUILD tar-1.32.90.ebuild 2236 BLAKE2B a1623fb1e0281632fbb8bf8b92c71b38387bab385ce53dd3b34b52da3fe5daf2564ced044592b79c6d1639b3086849fc61e4bc5354c2994da3a6e5bc40a6ee0d SHA512 072d546a821cc9b181798c02aae7b953fc0cf21fbf4c7cb4b8657e8a1762784b0c87b5508a4cf655a7ad60a1681e425bd6bb184b8751966dfc49e9eb41583d7f
-EBUILD tar-1.32.ebuild 2180 BLAKE2B 291864f047fe16e580af9fbcd21b01103ae196d1bdae9fa2547928cc82c24c045f650fcb517876a444a6fef33151949add692f17bf364b3d1ff3773e9faf7156 SHA512 2ca61d0e6adc803e336ab87c0c8f0ea8438e541cb297a5f66231d0595329a89b79523906a2f8d9d5f834299434f2ca4775ed870b46f537e5c814edef20df7cf0
+EBUILD tar-1.32.90.ebuild 2216 BLAKE2B e5040ab8081ff8867664e5e6d7cc9860c987a4c5894b2baf55673de0b83a0423d2ec28de2a7cf773ae2ac39168fb4424ac234b4bfe6da3f7b3cbe941660253d9 SHA512 c7f8eb3a45dedc4da17060b75d9f3cab39c4577c29e28879a9d632c9a61cb88639dde94a990b1c6f9568d4314245ef22dc98e7e955437a58f4205ee4dd302a0a
+EBUILD tar-1.32.ebuild 2160 BLAKE2B f58d226643b6b53035f5b4fe017c6cb85bddd5e099f4d1bf11be3be552dc750ced4bfef1f393e8d61570f037fe4cb3e92e09923e9ab7816c05910565381a5387 SHA512 ad373e662fd076591c7d3cee70e026d5038785ded5e9e7e977b08d115476e3308ea38fbc6b3c9d3366af79942a19f4e1ee2e88e23b769a99c59744402b887a2d
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/tar-1.32.90.ebuild b/app-arch/tar/tar-1.32.90.ebuild
index 87f3d927f1c8..067def3d8efd 100644
--- a/app-arch/tar/tar-1.32.90.ebuild
+++ b/app-arch/tar/tar-1.32.90.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.xz
 LICENSE="GPL-3+"
 SLOT="0"
 [[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
diff --git a/app-arch/tar/tar-1.32.ebuild b/app-arch/tar/tar-1.32.ebuild
index 81267f7aa858..334f50b87cd1 100644
--- a/app-arch/tar/tar-1.32.ebuild
+++ b/app-arch/tar/tar-1.32.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
diff --git a/app-arch/unace/Manifest b/app-arch/unace/Manifest
index 142036d5776c..3fd304c99fe5 100644
--- a/app-arch/unace/Manifest
+++ b/app-arch/unace/Manifest
@@ -1,4 +1,4 @@
 DIST unace-nonfree_2.5-9.debian.tar.xz 16900 BLAKE2B f7120278d0bd7b5ccccd76b4ffb16e4c501510f88c4b20e214026d1a39f93e3a1e37129d8b54b61f90aa04ca56d9bb1bb186ea3d394772ef48660d6926312ea3 SHA512 bb704cc1881601b3319b6052bce71f1c98d638b6822f32b9595c9b5434898187d747220c7167cc4acb2bbdbe8bde8618856fdcd277a69026a4bef41950cbb46b
 DIST unace-nonfree_2.5.orig.tar.gz 122509 BLAKE2B b395139e2f58bf0ef65774a0725bd3340eb1aca4a6680915eaecb93d5d744fca9f5e53a8866e861421b4fa08f462571d7662f68c091c35ed84e3bc367d9f846c SHA512 f7e9f3431f882160693cb55a90449e881aead9dc501bb4bb8303f04530bd3f6e1d84bbc2775d23e7c680e1e2d55a06872658c4b14c7bf51dd2db73fdcdea953b
-EBUILD unace-2.5-r5.ebuild 675 BLAKE2B e16ad819d455c68258b0cf4b9c6cac16a1adc567b7643299b4f25a4e2180dbd8402f6322d7084b9e8ce4c048d5409a86067aca537887e6952fc90a49dc34af21 SHA512 0cfedddab9bebe187aee9434e79878b84348beb758d82a5f15be680dff5fd564343d5c3a16a72a783c51a5ba623ee971fc56a8725c14619095ec4b4a775c905a
+EBUILD unace-2.5-r5.ebuild 676 BLAKE2B 85f2faa74d8edf4e5ed2416c9158c3ba6c8176393b8de55290839474a4ab3cfbb9adca2d353f695052f48d2abf5a48110c11a9acf6b519a9f25c9b22b8d9536f SHA512 4217d27125a6af348d8351c4bdd2929b45d976c7d25bea86ed3ec8a29a6c9f2f587df81f6d8ef8180c7145430610a586d203f0d339e87e01fb6a4504b3866367
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-arch/unace/unace-2.5-r5.ebuild b/app-arch/unace/unace-2.5-r5.ebuild
index 44e46a2e81c2..51a526825234 100644
--- a/app-arch/unace/unace-2.5-r5.ebuild
+++ b/app-arch/unace/unace-2.5-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.
 
 LICENSE="freedist"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE=""
 
 PATCHES=( "${WORKDIR}"/debian/patches/ )
diff --git a/app-arch/unadf/Manifest b/app-arch/unadf/Manifest
index 94f244259159..acb76c108296 100644
--- a/app-arch/unadf/Manifest
+++ b/app-arch/unadf/Manifest
@@ -1,4 +1,4 @@
 AUX unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch 5191 BLAKE2B f888e30e1a4d7caefbb407e1cb0fc76345deb960fce974f5ad80e3cad41d3dfde78e34370bdedc11f5dc2729c6695a339db1eab3d37ed5f0bfae9e104c0d2949 SHA512 d1c9a8efcf026d58eaee61e92ee99304c52672836a63dd69f5e1e0472c9b2278521b5a2597f55449ffd23dd307e2c045324bed9b5bf89d160ab517542706aca3
 DIST adflib-0.7.12.tar.bz2 135412 BLAKE2B 964ef195c0539779c33acb2f3c103f97f7fd7f78bb32a83af9d586157700664f5e531908121aea8234592bb00fb8bff2e8f754e620f989d6d4e52537675c030e SHA512 d63846f0780bd57cae5ff667eb70f98a0ba3659cfd0b12b3ae2f29ac96631e522088f911b1ba6e5ee3b00620a28a802f14d93cdf8462e18a7e3f749915ab5af3
-EBUILD unadf-0.7.12-r1.ebuild 711 BLAKE2B 3f5f4f4ce0b60f1cc8e5f52b12b52ce83159bb12286613eae5360d3b5145324da315fa0eb719289dbb275619c70a1726a3aa152db80a2432eef7a00f6bbe0b44 SHA512 8fdca2e22a57466c677457a56124ffece2f87578b97b70b8d3e2faba0b8062c31a6ab2505a47309e021e83dddc15c3f1fc62335d6d105e1382742c66019fc62a
+EBUILD unadf-0.7.12-r1.ebuild 712 BLAKE2B d3b7c30a3646c35f0c231f0ebb28a4e2ed615a61f061e250217569421c0f3384aff24d5f7103525fcec6d08aff2f380490a38e3851f1978eb36e9616d973b1f8 SHA512 5f7f95bc553a624af88bb31bb87fda728ac3a1a9042d76e4fdccceee2fd7c665d83b29ace890e581555760a0fc8ad5840dbb1338a4622fba21303cb88d20521f
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-arch/unadf/unadf-0.7.12-r1.ebuild b/app-arch/unadf/unadf-0.7.12-r1.ebuild
index 1bbe4e3b7be6..fb1aed5c2ad7 100644
--- a/app-arch/unadf/unadf-0.7.12-r1.ebuild
+++ b/app-arch/unadf/unadf-0.7.12-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://lclevy.free.fr/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index a46969004f53..7e3b111144ad 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -4,7 +4,7 @@ DIST unrar-5.9.4.tar.gz 229921 BLAKE2B d87189a6b6b3566a0efac7f72e40732ff673cdcac
 DIST unrar-6.0.1.tar.gz 232142 BLAKE2B 0f048f67769b31c67988131b5d8cca33dc9fa2abc6b39e5be63aa8f6061cbf93fa7d7e2055641f286f6be4de2733d2a123441d26381335e2779b3c7d7004ad11 SHA512 2c88dd05252237d7d62ad34332673ac9e457bb43b0ed980be977d557d0deb3d5bd19372d41ac2e254d94e20ecb1ca62b1c15781320cf231f2a7bfa12fe176d8a
 DIST unrar-6.0.2.tar.gz 232306 BLAKE2B d0f410364d2be74dbcc061b8f54b79eb37f7d66e1910e3c6a80c59cf3d4e14a39cf0fb2f465f94757a2c30b886dff0b970fc44dbc166c50f5357e56148f82367 SHA512 fd5598499863f734563213acb67cee41c997eac69c5814d275468c9eb627286c016de23ddbf9c96ef9ba0b985ac57476b26382c8263d8f81c55b8bca1c013671
 DIST unrar-6.0.3.tar.gz 232331 BLAKE2B bcea5219daf8338cbb73fc43131d1c7e7a4c576164a30d79352d1bb3a96b3c66fd190dc40a5149b9bf38e723c0654bc5d5d45e246276c2ea18c1c8dc9904e555 SHA512 1ec20e7a122cb7f48936c691a8c3dc96b4dd989aa8416e6a96332733a0839490996baa22f709af3eb07be17e5987d871f995b5dbc36284cb951bed8047bdfb7c
-EBUILD unrar-5.9.4.ebuild 1885 BLAKE2B a3d674f2b906716a0b94cefddbf230b1cc8af84f61eeec97db50c38a04d046cd2366ecb4f23150049a0f3205b1e74419694f11c747c2f44ecea3e0f66eadeef2 SHA512 e84d1a513b32c739767a0d445c3c7a156b1e381fa0f0b191d606385bb416e3e243e0bb0ba1d9616c68dc3490097338c31e8b4b318df52f5b011abb1d56aa6348
+EBUILD unrar-5.9.4.ebuild 1886 BLAKE2B 62fa85b86fbfcbca767591ba613ef432ccafef69ca8a4df5470960446995d0eca96072bd9b30f491b4db0f8fac9a4a1cd3f0fe8e91d89acd9af87703552ec0ba SHA512 00a9bd33df1f66671bb28e463d09d3429b24c6fab6400f524e535605d0cb1ed606dcefd2126f75e8546379c319f333db559fad92f801de8d59f8d43c3d521e80
 EBUILD unrar-6.0.1.ebuild 1893 BLAKE2B 944cf1df78f3f3f2e6db04b5a50f0d5727d81a959cb4d85c2ef6a0532ab1660ce70b7f4b04cb91f488c7149fda139b2d3d2c968092b7120c66c021b8c93a73bf SHA512 fba8c1d0cb692af1f73f2bec15270be668cbcb46df5609794b587ada792e18e1b77dc2f301ea0e2ef67df88b697260a57088e2f5ae4500b56e427af1c6167b68
 EBUILD unrar-6.0.2.ebuild 1893 BLAKE2B 944cf1df78f3f3f2e6db04b5a50f0d5727d81a959cb4d85c2ef6a0532ab1660ce70b7f4b04cb91f488c7149fda139b2d3d2c968092b7120c66c021b8c93a73bf SHA512 fba8c1d0cb692af1f73f2bec15270be668cbcb46df5609794b587ada792e18e1b77dc2f301ea0e2ef67df88b697260a57088e2f5ae4500b56e427af1c6167b68
 EBUILD unrar-6.0.3.ebuild 1893 BLAKE2B 944cf1df78f3f3f2e6db04b5a50f0d5727d81a959cb4d85c2ef6a0532ab1660ce70b7f4b04cb91f488c7149fda139b2d3d2c968092b7120c66c021b8c93a73bf SHA512 fba8c1d0cb692af1f73f2bec15270be668cbcb46df5609794b587ada792e18e1b77dc2f301ea0e2ef67df88b697260a57088e2f5ae4500b56e427af1c6167b68
diff --git a/app-arch/unrar/unrar-5.9.4.ebuild b/app-arch/unrar/unrar-5.9.4.ebuild
index 5665bd061bcf..b14cd752533a 100644
--- a/app-arch/unrar/unrar-5.9.4.ebuild
+++ b/app-arch/unrar/unrar-5.9.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 79755b4d1f80..f9174ede0262 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -4,5 +4,5 @@ AUX unzip-6.0-natspec.patch 14304 BLAKE2B 87f724fcdb0960bfa17d609dbb764f3469b1dd
 AUX unzip-6.0-no-exec-stack.patch 381 BLAKE2B c298afe0df1c903c0894bf55e55b3f4f0d616662e3fa706bcb9813707af3f2bfebff1a2b4290d943718ca35aa2ce098f20b5d370a624c1a16b81d4e921a3bdeb SHA512 a00ba3c805aa64bebeb3194cd75093c1e7c951366d40bba4852837dcb355eedf1ca6a6e648ea007fcb71124e778e54b5168a7b38a7b7268bc3983d87594633a5
 DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
 DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
-EBUILD unzip-6.0_p25-r1.ebuild 2654 BLAKE2B 45af44e13ca62134a360bc44bcefa01134a4db3c4c24eabe516c01242ada0a06d580f2b5539e0413fdf24c9e1b942fd567d4b7a63aa9926f90ba3db7a8830591 SHA512 fc82b4b9a40486fe1077619869363ad862317f7ed998044efa231c02588285ce54c6e928319361dd06ceafc5cb6101f0bc3e61c04746a44e5e664c558e2711c4
+EBUILD unzip-6.0_p25-r1.ebuild 2814 BLAKE2B 31b1f887444c0932c0f9256a2bd70338e534f9aeb548a30f9eb3fdb54cb68aead59ad50303cacc428a992cacd75721649940d7535de1b51be8570a801c14d090 SHA512 687d5f727cee5494905baa6811bc8a232a2b00044aa53d215e85f5c30b72b01075844b8d9c0541ad7b7c27c4f8e7f6c9930876ebd88f4fcb21eea40a7ec08e92
 MISC metadata.xml 534 BLAKE2B a6baad9ace7880a38dea2a34ea8cebb730e8a0742bd4447ebc9147a713eff82aed50e97dfeaed5589a7025c2ba7d9a244d101508f21f69a3dfd79c0ed61c214e SHA512 b4735d77d58b041bb5259d362f493247cdd9217423d79eab06567a5d7f1ebdfae0f80085ab3c3a842e68c6f5a6122913cb13c210d6e7fbfe398ff5ade29b97d5
diff --git a/app-arch/unzip/unzip-6.0_p25-r1.ebuild b/app-arch/unzip/unzip-6.0_p25-r1.ebuild
index 14c6c97da95d..686a13f3f854 100644
--- a/app-arch/unzip/unzip-6.0_p25-r1.ebuild
+++ b/app-arch/unzip/unzip-6.0_p25-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
@@ -64,7 +64,8 @@ src_configure() {
 		i?86*-dragonfly*)    TARGET="freebsd" ;; # mislabelled bsd with x86 asm
 		*bsd* | *dragonfly*) TARGET="bsd" ;;
 		*-darwin*)           TARGET="macosx" ;;
-		*-cygwin*)           TARGET="cygwin" ;;
+		*-solaris*)          TARGET="generic" ;;
+		*-cygwin*)           TARGET="generic" ;;
 		*) die "Unknown target; please update the ebuild to handle ${CHOST}	" ;;
 	esac
 
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 9980440659c0..310a61dd9cb6 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -4,7 +4,7 @@ AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2
 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
 DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
-EBUILD xar-1.8-r2.ebuild 1458 BLAKE2B 555288ffa046e123dd907ffc82149fcb8475d8e0523832843ada29a45e0a93e54c231d1ffc0fd0f34a11ca19456c38299a92c631ca07e521146c2408a625968a SHA512 56560c834837cc754a67b75a62e6a6d55e66e01e529013b418371dd241572b0cba263ed259750c2f4864eece26bb2d2de4d4925e575bceaf859b7f06b20890f7
+EBUILD xar-1.8-r2.ebuild 1459 BLAKE2B b57602bd8f826674141737df4367f078306927908b1d0b5ea98cff7eed229f50c19ba0be8cf248030e970db67930f4454d12ccccb86d625ddaf5cb628408c2af SHA512 2fed7d2c80f306726571803b111f0d0fcae545ef3c972f97e868abdf5d043ff942aba0c60682f56d5ea9ddb5f71a9ea4226f035b6a657a1255cf58b230c983a9
 EBUILD xar-1.8-r3.ebuild 2008 BLAKE2B 8c75abf68299e7f82df130cff852346dbabd599b5fe65dcec09d57902cce9ce587d98a3731ca3011ae64d78d0c77919cbaaf84a8b50cafe52728fd04596d2ba1 SHA512 95fd1cefb6f5d117ce6abb5ca6c27d55a9c61186c570e8dbb7b9efe289f1c57a12e605153a235279c700b2a9d7c53393c80be86d5d9a72f97743264aba50f4df
 EBUILD xar-1.8-r4.ebuild 2460 BLAKE2B d1a502c4d69ed2fa1a63a056fb080122deac98861067e0712daac8e55c287bd3a1701c580a5b4acd1bf4ab52721a50bbba50d9a8aaed01687899d1161634bedf SHA512 39cdca2fe8601eaddd1a10e116216cbbb0cafa197058222ffb4b8d060b6cae34432b19f9f2723e5fdd7b4d2afb90e005767e461dcaef557e07a1e9363f50517c
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild
index 3a28821b3a2e..c0682a7404dd 100644
--- a/app-arch/xar/xar-1.8-r2.ebuild
+++ b/app-arch/xar/xar-1.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl kernel_Darwin"
 
 DEPEND="
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 5477bad96fdc..8e2340fb5ec5 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,4 +1,4 @@
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
-EBUILD xz-utils-5.2.5.ebuild 2796 BLAKE2B 55c74db033adc1182d6007aabd29ce1405e90cdde09792aeac1d60109dca63408c9da7e1a8b88791ddadb17597919e931b3049db7850806b213d8ff42f643702 SHA512 0c7900e598f9c07c53a42efde81ea34d0db5656e099c7d9c8237cf78fa07d13704b52d55214352e803f9fb2d04bb41ca26be22595d956defafdc45f26fcaa4f2
-EBUILD xz-utils-9999.ebuild 2805 BLAKE2B 4d6a91b14fc4688c02abce64ed70d7b3d8ccb93aeefa5c4f6ca77f1a0c78341cd1c400128bda0aa3ba22b0882746cbb08d309301ba6ef67c75ec9d6f9eaf668d SHA512 e7b563a13fe43204f5e8fd8d5e78736c2feedf727163ca5302837338c496df0e86b28d5f62621496a189f98d3b3a15c7a960f7b0a13e9a5b59886737f52ceac9
+EBUILD xz-utils-5.2.5.ebuild 2776 BLAKE2B 288cee125d9e090910d05043fdb09e0154b973256590f6e3b60cc819cb082bf90f91b9f265784ffe382597d1f0a453e527974a0e78637ca7b6263536ffe15ecc SHA512 27e1562fded8dc89470e1502ce85a44f475497033691128f8a189f23f2992a7c0ce1385c53a0d8ed9c86df5beb5d64ff87235ee8b43d79b112eda07c4db5d7d8
+EBUILD xz-utils-9999.ebuild 2785 BLAKE2B ee1db91522d639a7480375e4b714fd7dd963821d7f2daa3acbbb9f85f0271e2c905478df1c24a2ead88a81db9c11d465f8e403f64d2d165b94286df8c8da6219 SHA512 7e48bb78b250d12eeec3126410064f70f57669165555ca80f0142c8803f0318d184638b3c6f310e64031dc602fa21c8c00e1e55d7e78a2aff46b419f29ffde21
 MISC metadata.xml 538 BLAKE2B 1ce32a16125c6af46b02bf0ebdef56c685d1d4903b74c2331b446e764096503b06fecf6d467ffb1c1627b8dabfa58092a1db21e5eda53d66f4e9ede4714d7978 SHA512 97dffaeaa9db4117a7e7770ac1ebfe16c0c32fc3de30f7cf099dea7a6565c3971146178140e0676e1946fcef609131124cc3d0bd971eb6fde1d45086da122310
diff --git a/app-arch/xz-utils/xz-utils-5.2.5.ebuild b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
index 7ae8dd90a4d0..4f095b615b50 100644
--- a/app-arch/xz-utils/xz-utils-5.2.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index cae7bc97c8e9..053d3e8ebd89 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest
index 512978582683..7b2f4b9db227 100644
--- a/app-arch/zoo/Manifest
+++ b/app-arch/zoo/Manifest
@@ -1,5 +1,5 @@
 AUX zoo-2.10-gentoo-fbsd-r1.patch 744 BLAKE2B 76c60ceef76f9325ed6212b8a879da4b11808e0fa1445f765f8fd60b2627b7b1b9becb844bca43de5e9eb82dada9050a732971f48914a7e79f4670332e8f9140 SHA512 083e94a0ab2089b046f6ddf469ec21d0c9d31223a9ae109c360de368b815e551f1ad28b53fb2e1497290b231a8fc6d67e5716c5cf604b3e8088569ddc439a068
 DIST zoo_2.10-28.debian.tar.xz 14984 BLAKE2B e45ed5381e64d7ccac0e8100df12a8f55abbf7961e54a05ad6d3f07cca1a939f9320caa69196895a35dbea5d4aa82975ee2e5fb2202f793f33f4ebd7d5ff65e8 SHA512 07fdb16bf011ae8c8badbb0040ebd82777f11560dc231b70060fe8f71ba706707769934411043197e44b10ad38d7efd8432fdbea03e265f9f6aa58acb1cc2708
 DIST zoo_2.10.orig.tar.gz 172629 BLAKE2B 9789f0ca53b2dd538e0032c31fa945f3f4f0fc739cadf536ec38621824cc89409d9def036e5df893a7cd4c5873302273d638c087a51cf7b1477501567c6578b5 SHA512 1847fd6a6aac534386736ca04fa5a88db26c7c06315a0ea2c8e86ff944a133b7506c297cda67e44f797d9ef39446c132e847714732b9f138bf9b46c1525e574f
-EBUILD zoo-2.10-r5.ebuild 829 BLAKE2B a0eb30d14b9fdc867ab89d9368621fcb9d0c70aec6df9d990456c325876567da723e8e241d7094e76f4252a728d5f83f00d1a31b47b254de993b1a67cf0f7802 SHA512 79ae3f25b136c13e43732827159ec9663bdfbc5e70e9beca4a97675e04509487d1b9662eca203982f1f124e7762013cf7b77d4565aa4fe2f9849f75b0436c635
+EBUILD zoo-2.10-r5.ebuild 819 BLAKE2B 63ab99ddbd1516e22535d341cb8f9bf6146c2cef38f4fbe937ef7e877e555f4cfc3a9e4ce44e78324dfd6882ec188d05db369014a0637ca680a5c15fc5da4537 SHA512 03bf01cac9c4a398c9484fb00039a0c50c51026a4f3fc28afcf62002b722e0664e26273c8fc7d1f6de7f77cd130200ebe33c42c2888d5f03f9c112c7cdbcb38f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild
index 610c3c251622..6c1f749c178c 100644
--- a/app-arch/zoo/zoo-2.10-r5.ebuild
+++ b/app-arch/zoo/zoo-2.10-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${P}.orig"
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /app-arch
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)