gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-arch
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
144 files changed, 1215 insertions, 930 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 325a5200fcca..57af3d394e06 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/alien/Manifest b/app-arch/alien/Manifest
index 9b5ec8d87a14..182f53549941 100644
--- a/app-arch/alien/Manifest
+++ b/app-arch/alien/Manifest
@@ -1,5 +1,5 @@
 AUX alien-8.95-tar-extensions.patch 733 BLAKE2B 75aa07b9c3b4b3e48d381309caeef41ad312c7d71c81958eb74193752276240dcf6ca91fbf5a4dc6279a35cf6a6c90e77a11ee8ec7f5b087a50bfd6ba089710f SHA512 6bcaea2b8a0dd5bd5a493aaf6f0b19edb691e49fc7684486da2331621619745baeaa30d88889d8aa345f989016a096745b875aca2c01c5b8127e93903f4e8b10
 DIST alien-8.95.tar.xz 56940 BLAKE2B c2f6b71d39800a7bc4ab00bcd50d165855bad4eb1a17fe217aeb302c6b7af701bcd9445276d7e522db7e6c81f1e8d7e9e2ada99f9d7505e6ec958ae87df7c9f7 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c
 EBUILD alien-8.95-r1.ebuild 757 BLAKE2B 4405c7b813c6dc61473768888c500c7d6044fd119e4703e2d333f399e8fe404d171365e9020095879365ba26e597379ab8fa0ec579417961d0aa11c4d31f2fd5 SHA512 f6fc5b2d718907090c14de20501414f3e3125b9f62779f29190526222be223deed56443bd0c74c1b12cfff058efa22facf45833fff20c85913ec4c5f29d46c56
-EBUILD alien-8.95.ebuild 695 BLAKE2B 31ad497d230ccf8dcd4091afa22bd2c92937885a43e03a4566f2e26406bd0a74c7b53e8822e55e123294537b48e95c7128b8b363d8276cc004937bd7b68077a0 SHA512 0495cbf77e0a3cfeb370efe62549552c6d6f8795bb938e52e0b6dda75e1560ce84264d6c04c18c0b61db5741abc5ce0504817c93e26279882ffd4f786561694f
+EBUILD alien-8.95.ebuild 696 BLAKE2B 1785203f35b867eded394f0d69ca38f2dbb7c567ffed5926b7955346effa7ae98b83104ed22eed28584dbb021a458f88ca0a149aa42c8576dc387f9c4e1743a2 SHA512 12fb32985c5b140412c5d3fedb6ead77df3b56bd53810add90b4dfefefc9c77744335ccd390f7f7e9178ad5cd7e587bf1a38c03e71e4d734dc882aea837ee7b2
 MISC metadata.xml 299 BLAKE2B f0c85fbabcb5ea8dd194f3560a66469354932c2df8a09aacfa26eb980bf1b301ff1d59e5c5196e4014fc637b7f78361ab031930409509c4529a08e78c8d540b6 SHA512 bdfc3c82d7f1c34ba9ee5c104ce164a73e4dea8d9cbbed424f2f9e6a16da20ccd081d02a39a45000a49d265bbcbd362b34ed91c4688396cf73e423591de2b46b
diff --git a/app-arch/alien/alien-8.95.ebuild b/app-arch/alien/alien-8.95.ebuild
index cc04127f5f2f..be9c45f58237 100644
--- a/app-arch/alien/alien-8.95.ebuild
+++ b/app-arch/alien/alien-8.95.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 x86"
 IUSE="+bzip2"
 
 RDEPEND="
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 13322ef35e2a..c866d4eb7b4a 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,6 +1,6 @@
 DIST brotli-1.0.6.tar.gz 23827656 BLAKE2B 8d31eb1c4119de44702f2239fba9db72f1ae81801d06e51716432ff2f8aa78259c52cbd57b8fcd005c1bc14ada81b6e47a35c5d3864bb10bb02d113e30bd321b SHA512 b9847375471de3ae815ef4bb45a29653c343fad0a891a79d5132fcdee34c85caafd82289c8b413c3ef609049f2e8c4af9f9abd1736a2408ba44544c5fefc0010
 DIST brotli-1.0.7.tar.gz 23827908 BLAKE2B b9fc554cd23c8387b648638b6f9bb2d29fa87035856d03cf284662f9281984f3bf8e40109e61155ece18673f4391bc0fff704f8ab800a2041d3ce1824478d2ae SHA512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a
-EBUILD brotli-1.0.6-r1.ebuild 1695 BLAKE2B 0a0eafdf97cf47da4f148ddd1eb760a66276827f74ecae63d4c928b4a4017d2444f5ad7a21692d60f5093cca00f41dc79b6c1bbc04efe40e0ec228df54231eb6 SHA512 8e5b65427f85d383e4bcfd1404e257ee11ae735f5a4759790b48c5105942fd8f7dcccfb4303cefe165df9bef5cfb7bbf0225b80130f81f6e90cf96359f5bf512
-EBUILD brotli-1.0.7.ebuild 1655 BLAKE2B 2882562ebb4c2c0a909c73d69712d4a66861719bfe0e90180d834c7db15d43f40479360afcd0cf37848a0eef0d8e291116b6ad4d3a4e50e201aad5ba354f3b8e SHA512 e59bda4674bad89a28875fe4e4a0b1269f7723bc92713730ad8e4c2c842f7c3b8943ed8ccbd0731083b2bca8f57fd3284ca6ac800a9116bad6ded9992a57d446
+EBUILD brotli-1.0.6-r1.ebuild 1696 BLAKE2B b6d099d34d2363fe0840ac2c035cb5a1662ef086fe87c91dba3183143c129979b134e7efa6566f31d41996e8b99fd37a5672079922a340b63cd5f9ce468da80b SHA512 0eb201f1a263b4b35aaef42a885c3db27539d8aea18196556fe8ea668da502450e30997466c72c5a4af0411dbb154a1cdd2bebbccd358b7bd85964963a79b7d3
+EBUILD brotli-1.0.7.ebuild 1656 BLAKE2B 021aa2065db039f64862798af2034cc67138732effb80beee0ffc559570072e9be01ccedfac684a954a99fad683b5543fe73ed5668db9172c0c4cac05c2e3019 SHA512 d4613a66d6589a270d648d4e4bcf30166cb896c4c2a74bf053d9d74c21454cd408bb57587e5e244456f1fd36536413a3bd65c57fb3e1cfc9482b790966661023
 EBUILD brotli-9999.ebuild 1664 BLAKE2B 87ce537311bf6b25a092547c0f52d2001731e0c93d8ad87ee65d9e3ffff5f0adb6c88cadf18a706f722c2af515408ce0f27502cd47ef8803c49472f3ab703d4a SHA512 702f431d796b45fa366eab7ba1b2eb6c8e7c3c216adce9fa6aef2e71d92f06ed1c03626a5a27d2a9ccae7de9e2c75bc7e7c704283897d31e0ce8ea3904ec2580
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.6-r1.ebuild b/app-arch/brotli/brotli-1.0.6-r1.ebuild
index 9e9784ed2647..6d37d76bc92a 100644
--- a/app-arch/brotli/brotli-1.0.6-r1.ebuild
+++ b/app-arch/brotli/brotli-1.0.6-r1.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/brotli/brotli-1.0.7.ebuild b/app-arch/brotli/brotli-1.0.7.ebuild
index ae09bf54d54f..4829a8723e79 100644
--- a/app-arch/brotli/brotli-1.0.7.ebuild
+++ b/app-arch/brotli/brotli-1.0.7.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/bsdsfv/Manifest b/app-arch/bsdsfv/Manifest
index 406f9f71efb0..0debe5a06325 100644
--- a/app-arch/bsdsfv/Manifest
+++ b/app-arch/bsdsfv/Manifest
@@ -1,4 +1,4 @@
 AUX bsdsfv-1.18-64bit.patch 2388 BLAKE2B 377975f51f211c90cb9f7571c4b6e437cb75a536238aa703321efcc6ddd13e19b9649468eb8c5aaa23f5ad982148fe92bdb65fb8ef40023d7a4375133810d6c8 SHA512 5831956791b03972b1fdd3199687b10e7a55d562e815f94b863fb75a549eec14b85488bb0a9c9e5d2fb3241a95846f710dd5b19547ce33c425da756c685c18a5
 DIST bsdsfv-1.18.tar.gz 13301 BLAKE2B 663ae589e67455dbea968aeedaed74ed8f267fdb9790417da3d61aec9b3f50a5d87857c5e0f39a359d8b20ebd0bf706c5b775bf61c617669c479460ae8e2ff60 SHA512 f2742cfc5c56c915aff7534eb07025394c57bebf74d6505dc1d7e814e5ca098b474a718ae1c2aeb993cf95dd55fc792c56f9ac80344d112738da2f20157647e6
-EBUILD bsdsfv-1.18-r2.ebuild 572 BLAKE2B cf07aa4d1ddb320d3e99216326314572b1d9d73e0d10cf5ea325ce1c72886ad7c4daa80782b392587436fdfee39a4822e0d17afbec680e0ec048ce7d24551213 SHA512 622b0c5d62d4b1108bad6b4d3e5978875064a9cfdfa37f2a21f45fcd5b7f776baf8e80b273088c9a0155f0911256ffe5862b87df001221509e9c7b1f18e4d442
+EBUILD bsdsfv-1.18-r2.ebuild 565 BLAKE2B 850a490a0152d94dea25e8b095e0aa726d5d6ff6cfda2aefb9a69b3afd4ef1a298bcf5a69f9354d8395afedfff1a239c116d433e51720a9d79efc1400c99d166 SHA512 8b475b31a858cfc9ad5bdac676a4706f8064d1309d598c69102b99f9f98968a6f12d3ad4f9190ed95701c0aa5fa6e2e9877fbf8cee3e99f166be2f7b6486e8fa
 MISC metadata.xml 309 BLAKE2B 4b2f7c2d25c38ffd3a43fdc64bdafb3e28dead993ce6fdf2302b4cfea2a947e77d1242d145f0bf668ac85a6a118524da418a1f361a69b7064851d14ec8007888 SHA512 a741f56a3f1ccde998c0504b75dac3e3cdf49b2fd7f08f1906f97be7a496ef04b3692a90f27863b7e1d9b8361ac7aeebd8bbc337bc2134eff3324a41ad7353ea
diff --git a/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild b/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
index 587200385df2..9c59d15f47c6 100644
--- a/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
+++ b/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~m68k ppc ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ~hppa ~m68k ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 S=${WORKDIR}/${PN}
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 4e66a06afa75..6d9e22f878b7 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -9,16 +9,16 @@ AUX bzip2-1.0.6-out-of-tree-build.patch 2121 BLAKE2B ff2d18e161e2ed437b3452639b3
 AUX bzip2-1.0.6-progress.patch 5716 BLAKE2B 8f89dcc1f9d95440cba7df54ee80e861e02e8f88d1ad906ef4bcecf4796ec125434b0e4d56f83715f30114d808aad9811b72cc890e85ace1901350d96f9d3f91 SHA512 e72ada256b08b539e4489d714d4d8612c643549cd25b1ec4e455b2c769c0955fe0e1f54504b259db213f3c72aa78c08d1f0513ce1ae113182691b504bd9c09b7
 AUX bzip2-1.0.6-saneso.patch 443 BLAKE2B b496406e6f3c520886fff99c9206d6d1a01dc0e55a8491bec0318741dc53ad6da321553e73c8929c5fb4938e7275671c04d4b5c86730b580a042a18bb81b7116 SHA512 b9798368d12ab3547ccd3bb614e3a81f1b232990c0f9e3e4472532a8070a3c212274d5b9d093cd046cfee7c8d25da9cfd368c7ca4bd86fbb67f34510107159ab
 AUX bzip2-1.0.6-ubsan-error.patch 921 BLAKE2B a2d746725ed9e40f24ac7c83cdbea06884e0013121bad5a2c748975817293c8f300735d46c85e646e008a54d49d002331a86a31726bc7231451514e628ad4637 SHA512 871ad39056b5b5dba35d90f30e1753569241f1054a2564f115d65186232fd84c427c92199e88ba012b4a646d9f18469b3681ef2992ec028b1004f6b7e13a110d
-AUX bzip2-1.0.7-out-of-tree-build.patch 1999 BLAKE2B b1737d4d693a092819227d70b8ab762257481cf1b776ff21a5327f0a6f185ddc440f963f798e597a09bbb34b69b36a3d5a6b6971d835367f35696ef8ea83208f SHA512 db8e9214e21bc1ee28bab614f0f086fc5b58fe9ce22ceb9341ecc6411dac26fcb5f72d94f02c0520eb6ffb4ab12e98858f5000ce9982be7a38db48701828f91d
-AUX bzip2-1.0.7-saneso.patch 465 BLAKE2B 166abf5793c924e0501716e59feb42366b352670bda399e39141a1461048b30c05c89cf81092f84acd9d8b5ed8a45e018cb394a3d0d644e0012b4ec9d3609c62 SHA512 09d671a8bab59392b3e75529b3b09dc50c8270005885baa1e5fb956568528b662de2ed2bc54c6bb58e4eb532d6a0c01318fb348ea76447263f9873aee3992a32
+AUX bzip2-1.0.7-out-of-tree-build.patch 1997 BLAKE2B f4cb04658aa8bba2300a07080009e4b949875e206e302b0d39167899f507572d5f2a2065a22a2df70c3513e8c26bc4a89de7cf3dd8a3850061cd774236a194bd SHA512 f2c8a5ca920f5c3d6a515692fd657e10f381257bca14c1a296b6f54a8823a223aa8da881f9618df035601afad6778ba374a11d83ebf993f7f2e4c51855399e77
+AUX bzip2-1.0.7-saneso.patch 463 BLAKE2B e16398fa15e9eae5f277c1b075c171c351f234e403386c4a8702f9dc7ed2999ac9735f130796d3dab8349222a33997d371d873a76d8cf6c1e3300b88e9a40e17 SHA512 a039db1147236245743b844f68543f58f39e7e996f90d8e444d3b385bb56717ceb66703696be486fd57094971e52d88a87e36fcdd46cf8aa7f935bb7245b0723
 AUX bzip2-1.0.8-mingw.patch 330 BLAKE2B 27cfec9fb3fb16f624445d0f035d56a6a747eaa1e602f92e651e6c041bb94ff78a17d0fb03314e2c1ac52afdff42f58cce725f1d733052ad3c4ad2574fe5a1c8 SHA512 49accf2bf744079b5fc4e4349e26dfaaf79a791ac871ffeb1220f8a3c700ca9d502ae78a8ec57b06f072707de1a0df64799d2bc6fe5f26d2c2b58637bb9103f4
-AUX bzip2-1.0.8-out-of-tree-build.patch 1999 BLAKE2B 45eb5383f1d52adb5c426937f6495c53f665220f0ab8680ae47c124935518199ab7d8ab1b2a893b2a3c9914a82b0c119d60b37673410e8052c5931f3f7b5b948 SHA512 d0dcda2614ee215245165fc5e6530f9e6850bd235b7894ab297d730378c63e6e71b1698e71606552497fbdc452546929f1ad8ee43fd99b28c9727cf6e9cf4c5c
-AUX bzip2-1.0.8-saneso.patch 465 BLAKE2B 7af873611a22431a80e1781a219de6d8838a2cb7c4af89c5354b01668fec71072eb9dec9a721d793680d0cc3307ac4d9657c1571a2a3bee69a22031aca961a28 SHA512 3c1171a441d73e098dde2ecc676419eeda2bc3a04491496781d60371ef73d13f80419f7a04fc5162a34373f9fda5c54eb9139399ba59a3ee52d7defb9bb91375
+AUX bzip2-1.0.8-out-of-tree-build.patch 1997 BLAKE2B 87791ad7b5c702110a7a45bb4a01908fcd2eb8f1b187c822991d818011e49165abaed679d899a2fa29adb6751faa82659e31c6e0f853b4548061f2913cb0cd18 SHA512 9008152aeb299825635eb9b6f4887951ba6ec190b7e545e12d82e2222ba4ed1ceb31e3eef1275b5f196b726e34a04da1e7c2c95a694c7c771a8852f20a1bf305
+AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8ababee2b5ff0221965f1ee6675c4060cec841dcf4370018a7fc6376cced900c6410eca96579962d52fd07563d SHA512 19d1a721680e4113c3b3267af74fa5a7ec5947c6630946c60ac5cf165476d9e7c2229e0cb099029dc9f5708b5ba15864f84af198940709144b65dbd2cd3a76a8
 DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
 DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B da185d9771dd83d59f2c13ea32e9a514ce50c97d69145ca2c4c8f28749fc85c1aec491c5100f4fc6b2183ee397015b7e74a0407dc1d7a360db159a0a3676fd7a SHA512 e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
-EBUILD bzip2-1.0.6-r11.ebuild 3150 BLAKE2B f62cf794d8b4ebe499cacb70570485fe6798818160fbc61ba2a40fec56c6a359bf3bd98af46b2d7010a44fe808fce8a6c114b063041397b55b31ae606d4a16f3 SHA512 98205fa216aef015a55698a92c06438255df5319fcbc4df3a777fcf244c588256d092daf20e84020bb95cccc03cc53613cf27b927c36f7a9d75df472bc7e261d
-EBUILD bzip2-1.0.7.ebuild 3017 BLAKE2B c53ac9c2079a0c3d7dbad1834eb2ecc023f7954ec23420b27d9670ebd3400256cc44cae80d1e9acf2b4d7df7e4fcf4a554af31428b254d7d05e6eaeaa72185d4 SHA512 a8981ceadd8c39e6a3d544c14db01605db3173a6d9adf4fde767712fa602027bc1033d4c2b9b8b85beeffeb67c5579ebed2ff94d4dccf27f2b4f0d4810a822ea
-EBUILD bzip2-1.0.8.ebuild 2964 BLAKE2B 24d35a378df299fb6de58a6784c0ebf44476699e62515c719182ee712b7dedeaae55c767fbfa74dac9fc09a6f1b26532cdf8cda01e9491f0de541400fd67203d SHA512 3b93c95003795e0667fc7b0705abed7ed2f575aabb000f30e5db4b9263e10a9ea1c04d30dc25deeebfac503dc522e30e368dad580a56078418c1a34c66fbce35
-EBUILD bzip2-9999.ebuild 1395 BLAKE2B 5da5e48cbd8fe10d149bea4e31c8ce977ca31b9bfd1a47aafb3c14f34b6556ad3eb9cb3aba29fb534c42d65edd77229f7aa11b16e52c9b908a085ede6722b441 SHA512 60d3b6244fb19fe8691a4b72ba596be0fbe5a2620da151cb4638656a8ffaa631bd0e473ee23c43b86c57921aa87f3cad76a92aba4c5fd8c351c011d275c3b716
+EBUILD bzip2-1.0.6-r11.ebuild 3148 BLAKE2B ab21689beaecfd55c0d4262079ef57ec00c38a4bb25fdddd63e6ea97be3514405458ee62caa20b6d08a469a65e48542d65b152aecd2afe7813b0d9744b973c43 SHA512 cd927c7d0467f0a3499f2a72cdaab67583afe14ffe42e7ea378aaf28851d98b555219f2ea1a0f89fc038d0275172dca5d0bb170e1a83c0f97837c9c8e82dc8f2
+EBUILD bzip2-1.0.7-r1.ebuild 3013 BLAKE2B 8bc2d3f4c5622462b632002b44b039266d555f0d820d9f21fb4786426ee3704a5a14b7ba6d025e24329800c8f8c5fcc2f01d5e80a65799e679b2015fa1221808 SHA512 6d51134ac7304905e2c2a1b6fb75cb57256f751776026a0319cd75b8dec3a4c5b4ef7799655ace1e4a9de4284f05435cae24d44c9de783749457654d7d02081f
+EBUILD bzip2-1.0.8-r1.ebuild 3252 BLAKE2B 8dd88c02318e290e7d11d40c4ad0ad4ca5a746933b7780827bc75eca8baf8c10da93bae6513376976422d25999ef97b0b51c51e96519ad6ab0ee5c33c0618962 SHA512 c49de662256a41a6467cd00780839f5a2777cbca7e24aac113dc00c18af6f9f49f1767142f4519a8b4ef3c5228b9322e258001da2d8c16edb7ef1dacfcefa504
+EBUILD bzip2-9999.ebuild 1678 BLAKE2B 9b5c0dd688618e60c0be87e75dfffa168271ed8b335c1050435fec76c70c0d52ca069768e1f8a6cf4a473c220ac51ea5c948b086141f13bade0e916b03338d20 SHA512 8231a7fee67e3df64687c10cc815184ec46d744e3248bbdd27dd93f33df8112a1bcdc4457c97e02eb55a68decbcc704bdc074966bd23692e6fad538dafc5ef3e
 MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
index c140ad8820f8..87ba02ba5c7e 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/bzip2/bzip2-1.0.7.ebuild b/app-arch/bzip2/bzip2-1.0.7-r1.ebuild
index 95c7e67969f4..37ab7244dad5 100644
--- a/app-arch/bzip2/bzip2-1.0.7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/bzip2/bzip2-1.0.8.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index 98b583d85c46..34b92d2ea541 100644
--- a/app-arch/bzip2/bzip2-1.0.8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="static static-libs"
 
 PATCHES=(
@@ -71,6 +71,14 @@ multilib_src_install() {
 	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
 		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
 	done
+
+	# Install libbz2.so.1.0 due to accidental soname change in 1.0.7.
+	# Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24.
+	# OK to remove one year after 2020-04-11.
+	if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then
+		dosym libbz2.so.${PV} "/usr/$(get_libdir)/libbz2.so.1.0"
+	fi
+
 	use static-libs && dolib.a libbz2.a
 
 	if multilib_is_native_abi ; then
diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild
index ac95fff0d7be..579f0b8f44dd 100644
--- a/app-arch/bzip2/bzip2-9999.ebuild
+++ b/app-arch/bzip2/bzip2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/federicomenaquintero/bzip2.git"
 else
 	SRC_URI=""
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
@@ -36,6 +36,13 @@ multilib_src_compile() {
 multilib_src_install() {
 	meson_src_install
 
+	# Install libbz2.so.1.0 due to accidental soname change in 1.0.7.
+	# Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24.
+	# OK to remove one year after 2020-04-11.
+	if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then
+		dosym libbz2.so.1 "/usr/$(get_libdir)/libbz2.so.1.0"
+	fi
+
 	if multilib_is_native_abi ; then
 		gen_usr_ldscript -a bz2
 
diff --git a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
index 977d9b3cd309..64cca58eac34 100644
--- a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
@@ -49,7 +49,7 @@
 @@ -36,24 +36,10 @@
  
  all: $(OBJS)
- 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
+ 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 $(OBJS)
 -	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
 -	rm -f libbz2.so.1.0
 -	ln -s libbz2.so.1.0.7 libbz2.so.1.0
diff --git a/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
index 5ab0cb52d050..d63226684f66 100644
--- a/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
@@ -6,7 +6,7 @@
  all: $(OBJS)
 -	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
 -	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
++	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 $(OBJS)
 +	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
  	rm -f libbz2.so.1.0
  	ln -s libbz2.so.1.0.7 libbz2.so.1.0
diff --git a/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch
index 4a641fdb2e81..04818265b7e2 100644
--- a/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch
@@ -49,7 +49,7 @@
 @@ -36,24 +36,10 @@
  
  all: $(OBJS)
- 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
+ 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS)
 -	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
 -	rm -f libbz2.so.1.0
 -	ln -s libbz2.so.1.0.8 libbz2.so.1.0
diff --git a/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
index 08430831baad..63409f5a8576 100644
--- a/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
@@ -6,7 +6,7 @@
  all: $(OBJS)
 -	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
 -	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
++	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS)
 +	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
  	rm -f libbz2.so.1.0
  	ln -s libbz2.so.1.0.8 libbz2.so.1.0
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index 0bc7cf45ba01..be318d380da7 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -3,8 +3,8 @@ AUX cabextract-1.9-remove-spurious-test_files.patch 423 BLAKE2B 33c226d287ab77a3
 DIST cabextract-1.8.tar.gz 289256 BLAKE2B ba9fea0cd12859b0de97b13362eaf276066650eb7151e0115af7ed2586cfa7497f72be2f9287d3ccb5ce5256ec26ca69e729df5bb0a327bb9f32ded25391460c SHA512 f8d676d6b738b0b13ac1cac7716c2fb46db423ef30b05ee64f00fcb19596131fbd34341c8b417af3de04896e9b6a8abf0d5976ee4bf87d016806a71317246d7a
 DIST cabextract-1.9.1.tar.gz 469369 BLAKE2B 5bfc697b40cbf47b42ab7857804b703c9622d8dae1648aae1bb5c0ec7c7978bff01b7ca2526f1b6090f193d88c00e3f49ae111f348d03fec9f575bddbb4b4096 SHA512 c354a4b20a222b40813f01baf8311c9a76611da427f9f44e977a3fd09508e24a18b486e3eef889a9debdca459f1b0c28d5d25429ccd555d3a2e4ff92d91cec14
 DIST cabextract-1.9.tar.gz 466334 BLAKE2B 1a82bddca826ee35ed13e1c0b50deca3ae1b7e31d7f427f54b5d6cf9651a727b7cbf8049c1a4326237725e007baecb4356721489611bb5e015bd7460e2530758 SHA512 d144c1df9ed8e8c339bcadb3d1be2eb2576bb066e3f75a3480df0d5e81407a633554e4674b3bb43716c0cf33a0f2327e6f798cd6d7825bceefa0ad839fcc3f64
-EBUILD cabextract-1.8.ebuild 1129 BLAKE2B febd5f7eb9fb85aabc47af400c1e5016fe008095d6db6c33890b4dac0f03f762ee5e886a37e6f6e2af08cae130e3087f1f20cc0d7ad02aff70ef7230861a29cc SHA512 cae7de45d2fcd0fb934ae7edd9e1409304f6da8e1535ab70dd5de78c93fd839e49ffe2f0af789cde5b7dd00dc0d295036e144a895169c1b0eb2baa163bb5e0d5
-EBUILD cabextract-1.9-r2.ebuild 1661 BLAKE2B 59dc28b9730cf0afe5f41c576297aafe278d6abc6ad043a47e2c4e692d6d1152271c643f2a6d79b76d6b7b9648b4522ce68ff84bfa7e8680b3b86f343516dbc0 SHA512 e2c1485a7cf14c0744d0c29391966ab7f55a22212d36676f21a6b9f09584d479297af15d44a9ec47a8b81b5129fafe4b02f94401f0d8dad554b584f7caa2ab57
-EBUILD cabextract-1.9.1.ebuild 1556 BLAKE2B c50d31f7964003f738bbbbd6192c86118d7ff1850530242797f1fd891b70a0981e50ac4432530fcb38458ae6c7cc913846527ad2239db852cb11dbe7bbc7b46d SHA512 5b0ee9bdf4eae5a960665f6ed3a7afead1e3f8f4bdf8e1bd16b8a28b3b2fa8494fc94f516fc9de31dc1babfee82943e739198e2bd181825bb3ad93fc79831ef2
-EBUILD cabextract-9999.ebuild 1556 BLAKE2B 8c40b40fb3c76a602d50fb36ba5d36b24a84e8f056d98ab964259987766ef4e0ae8338f9fb16efee7e3cd0c7e07dc0e9f7529a7f0b3a9893be4182ad8e9520e3 SHA512 3a2566ac2a8643d5e3107c59676f521f94860e9ae2eefec4f3361b6037bf2e194944972d962793dfe6bca6dd3b7d498557aff8c84a9c75736a928630c79c112f
+EBUILD cabextract-1.8.ebuild 1125 BLAKE2B a5533c53e71f9f9c360e134d4f19caccf99f924e7f4cd581c70d488da1deaa56a4739e159eff1b87026bc053c12934d4057731a5ab23601a5deca3f44a41207a SHA512 34cfc9820368ed36651b7b007c0b243a52d964a09137582a45c754ad070cad0b56dea167c545b911389f15a51c54f5b141d6724a148c75031684927bd105d249
+EBUILD cabextract-1.9-r2.ebuild 1658 BLAKE2B 99b3a19c6983940afc6eea49a176b0a276f96a245b3f43032533e91c431a2d039352814427d6786f7f8f2221a878841e4473324cef4ae370467f4c4d927d86f7 SHA512 3df13ea1f6ef8739c6f216296f386ffff15fade6eb35ed9aa8d5d87a4b9f65e0184529055972765a29bd9d17cb74fc215bc5b62adb913d604d10f6cd2f9bb54d
+EBUILD cabextract-1.9.1.ebuild 1552 BLAKE2B 252932a24ba89ce0dacf9d6440a3b8a3793cc3e7b2ba1d289a3753fd8ecde658bf50f304c95a2c27b21f50eb3cf8005d14a26e4d177c783cdcabd54aa017caa2 SHA512 aceaee8d06e03f8aac85e63b116b355d9d4bf75274d7652e3371a132c31d2a4c9fed92fb032fcfe0ca6fccf574dff62dba4c50c7ecbe5c64c57900b596c10a6b
+EBUILD cabextract-9999.ebuild 1552 BLAKE2B 252932a24ba89ce0dacf9d6440a3b8a3793cc3e7b2ba1d289a3753fd8ecde658bf50f304c95a2c27b21f50eb3cf8005d14a26e4d177c783cdcabd54aa017caa2 SHA512 aceaee8d06e03f8aac85e63b116b355d9d4bf75274d7652e3371a132c31d2a4c9fed92fb032fcfe0ca6fccf574dff62dba4c50c7ecbe5c64c57900b596c10a6b
 MISC metadata.xml 497 BLAKE2B dc1c758e518500bcadecefb0a3ac5d6bcd62e97113ccf69ee034707c416e8d7e8282060609f24d2406ada0a443624600b2a9ef554c4adaa9b315a6712491213f SHA512 5e1dc4d999b091846720b303fa59358955610a73cfa15f33bd51488d32e099f1651939e903227814b90857751c1b6408280493d8a0ae3c0f94828c61db53b6e3
diff --git a/app-arch/cabextract/cabextract-1.8.ebuild b/app-arch/cabextract/cabextract-1.8.ebuild
index c97854959b5a..b938acb234af 100644
--- a/app-arch/cabextract/cabextract-1.8.ebuild
+++ b/app-arch/cabextract/cabextract-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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="extras"
 
 RDEPEND="extras? ( dev-lang/perl )"
diff --git a/app-arch/cabextract/cabextract-1.9-r2.ebuild b/app-arch/cabextract/cabextract-1.9-r2.ebuild
index c5c6ae499b75..1f1183ae23fc 100644
--- a/app-arch/cabextract/cabextract-1.9-r2.ebuild
+++ b/app-arch/cabextract/cabextract-1.9-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
 else
-	KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm 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"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
diff --git a/app-arch/cabextract/cabextract-1.9.1.ebuild b/app-arch/cabextract/cabextract-1.9.1.ebuild
index 71d12ab8e370..4f03b18057e1 100644
--- a/app-arch/cabextract/cabextract-1.9.1.ebuild
+++ b/app-arch/cabextract/cabextract-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~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"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
diff --git a/app-arch/cabextract/cabextract-9999.ebuild b/app-arch/cabextract/cabextract-9999.ebuild
index 5cf2a83afa2d..4f03b18057e1 100644
--- a/app-arch/cabextract/cabextract-9999.ebuild
+++ b/app-arch/cabextract/cabextract-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~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"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
diff --git a/app-arch/cksfv/Manifest b/app-arch/cksfv/Manifest
index 28df2a1d0197..d8f79c53a84d 100644
--- a/app-arch/cksfv/Manifest
+++ b/app-arch/cksfv/Manifest
@@ -1,4 +1,4 @@
 DIST cksfv-1.3.14.tar.bz2 26114 BLAKE2B 696ae3499bc2b1c566a40da202b70d30777ee07a7923ac567345872098626c82820a9bb75b711915e2274a3e0f1d7804ba58f8ce41dcca375391d778ba135a02 SHA512 016c2f61632980678957fe4b5bc9ecb30360efd548ff09bfbb7a31cc6fc36f6fe7936d3d819fe468a6208c71f8b625662aa3ae0abd668435d7273e149d7e4519
-EBUILD cksfv-1.3.14-r1.ebuild 654 BLAKE2B caeaa09e1732e5415e89b7347118deea75a92aacc9b4416d7e598b0122f0f63c48854d9c79c2fa68286c14740201886cba6319b7b55186daed1ea3e55018ead2 SHA512 0399418a919b904e22a42710f1a74a831c3d937440bd952fe6f0e8ddd55d44c94e0ffc67322ebb9bc955b7d6e2497ef4c43b909cc4247bf1dafa806f3cbc231a
-EBUILD cksfv-1.3.14.ebuild 725 BLAKE2B 0af707f07518c31cf4dab75942a11f1ff5dfb6f0970ef5f95626825eba5e840669ee731a4c91ac83a6f9e5c87511edd8a0cc8d7ab472779df5023b1a29e5e6ec SHA512 9dc031116128625a7f8787e4a71258533261d78084e95c8cd8e4d13101b8e4054e6eeba3c0a58b9ccc3f3a897b72cbc733990a5dbd590119c49e716958ff6356
+EBUILD cksfv-1.3.14-r1.ebuild 655 BLAKE2B fa3ff03e77bf86bcbaab1f73f5a591aa476f52b9f9693e903e714633ab7ac7f0e66e88c5b5eef02ee583a08b2b59225be9e6307eec9841ce437a369dd168caca SHA512 9690dacb7bf13035006bee9dccf634f008ecdbbb1b928452e97ec579bff51f8f00f41d397a5afa09960181219008f78a3901f803cdfa7623236f0178dba16b50
+EBUILD cksfv-1.3.14.ebuild 726 BLAKE2B 41edf729c6a69b432547c3fd7c1148d042538ff207fa92b949171abfa301f3c764fd928f0170e7c01960cfcca6adb5b8b8597d17439aa03b918c13e9e57ca77e SHA512 cb0874a7f8d3cf0909da52d699513323baff037d322eca3b877b5f11bbd207549de8ded03d72e7001d1f7763a440d4c875f699fddd19ca652dba519e55b89289
 MISC metadata.xml 301 BLAKE2B bf0c52408a86e4790cfe0b17bc66819caa5727da92ac3f1604375ed77738dbd24f825a3ca264a5a118901494a3dd8a39a890d96ee6f132edd009bfa3d02af472 SHA512 a38f8d748665081d9bf4e09899e6f67f6fc48cb7d648a8a7dbdd79a086cf99cdd89997519d1e723043b1ebd050c910a3fd67da9a520417a6d8b72f3b82468278
diff --git a/app-arch/cksfv/cksfv-1.3.14-r1.ebuild b/app-arch/cksfv/cksfv-1.3.14-r1.ebuild
index 092cd3472687..eb3bd336958d 100644
--- a/app-arch/cksfv/cksfv-1.3.14-r1.ebuild
+++ b/app-arch/cksfv/cksfv-1.3.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	# note: not an autoconf configure script
diff --git a/app-arch/cksfv/cksfv-1.3.14.ebuild b/app-arch/cksfv/cksfv-1.3.14.ebuild
index a839a75b2042..ba064ccb4898 100644
--- a/app-arch/cksfv/cksfv-1.3.14.ebuild
+++ b/app-arch/cksfv/cksfv-1.3.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 src_configure() {
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index faa12033d8bc..86b2dbe09c7b 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 889 BLAKE2B fb4329258be540186dc002b2c3d9c91113114d8ae016ceb6f44a508b8484800e3af938f6acb475321a5bcef8a07af91cefa09181d7d58775bf7c830804e128fd SHA512 a43e99b759ec77acecc025b3f6465a578fc36acaa9ba40bb82c04732be454df1dbd1ebc7c9e6294d372fb2cc45db0861c94113458597b545d31b79992faa546f
-EBUILD cpio-2.13.ebuild 839 BLAKE2B 9d2dbc2747dc0baed13f6309be27d92dc5b38d49f9414ca8cc82ce9a1df335a4c6baaa158dc3d2ee9f4c0781a0a6e7f2029cf521aa449f6905bafe5547d065db SHA512 a9595430eb8d6b4b57c57f1691388e0f12740c6c7ad59716c7e7af250756f47a0e23e99ffd17a2c8c7cf4a3e6f3ab05c643068b9aa83e1ffff288c68116ec1cf
+EBUILD cpio-2.12-r1.ebuild 887 BLAKE2B 1d0fcf17b01a912baa3861ae6aa21ec491c9b7f139a63fa34d6261bdb150b318379b7d19423170010044ec65c59b77e9d69e1629ce90e98ae82d81c07af21c6e SHA512 8c5202cd493b7c264edf73a49cf72e7af9bc866a26f86b231e9fd0ba06d389a4b8031ab2c2f9cac4d5ddd4c6cd427b0fd9456e15531abf151fcdd5cd421f6d35
+EBUILD cpio-2.13.ebuild 835 BLAKE2B 48239da96717672d14805ea91f99bfb88a7d5980fe626569ba4d6ecefdb0f378ce476fba9f0b1984135aa039551766172e00f3c335ed166974e5b2defd23eada SHA512 4a7c5647cf3a2c3622f3aa16fa4dd194ce53cd396edf0546b8c71ce199f29f0d0ef07216c9a3406911bd7e64240fda709b3ce820042ad6de1f5e14a0c651ac17
 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 2c74b76cbc14..190a74c19b0e 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 s390 sh 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 4f5966691a58..1c53d1e5fb82 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 ~sh 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 PATCHES=(
diff --git a/app-arch/deb2targz/Manifest b/app-arch/deb2targz/Manifest
index c68ce3e9dccc..4aa5beb32dc4 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 620 BLAKE2B 65616c39e460262c9183d2f9a2ef93a911f4b44bdc8eb60d96381bcbb9bc281b8a96290dc26394de73c392dd029d6e18ff561f74ee47ce192747dac623d998ef SHA512 6965c313eced6137fdb6b49236715d552207a5b8c58433e59ff54ea9dc6309cb826d635df57dd4721c88387ffa9fc30e0a313683a003639c8392f90996715750
+EBUILD deb2targz-1-r3.ebuild 621 BLAKE2B 4bdf076664def3d6648901a2f46cfc809b76001c9a3c02c4510137dc678aee7aa34cf708c5397fb7cf4961839fe5e24e86d509da2aa53ccd9cc817e9311dd374 SHA512 de678c32a1fa70a4520e2e8dd7a8107ee1074005bbc7c7235d03afd174b914816b5b2b5dbcd00280135f189fdf239d22c08566c2f35cfedce11662a31d8a9ace
 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 17ef253cbfb5..7d7e092e9d90 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 ~ppc-aix ~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 2d1f92de1d6f..b18ae11d5b79 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -4,7 +4,9 @@ AUX dpkg-1.18.12-rsyncable.patch 1245 BLAKE2B e1488cc6a6807d38ec7218ae6651b0d919
 DIST dpkg_1.19.0.5.tar.xz 4557428 BLAKE2B 99c31705bfad1cfa024366c788264f4e747a7143f87c581730797975303c1054003e41fd65ecf80df1dc053ba87c0e8449ec574ddcb158228b41ae57a23db18f SHA512 60d7198ffe6ea759c30ad82143b3107d41ce59224b853cb5a7beb79af0de6ba6a69414c365e6b3555a0a9c60e3cf9b543a3a448d80a734be38ccecb77ae963a9
 DIST dpkg_1.19.6.tar.xz 4802832 BLAKE2B e35a805942e2b26a90cec80493a14697461cfb1c1352fa7fadce7171c8cca88785ff2590d34b8f0bd4763642cb21ee7bf449df86b01eef223554daba4604d1b1 SHA512 71981079835ea4bd5c4a381ca8702cf489c788034e29c129899eb288cfaf4ec55eb58c0aea13145dcde99f15a47d2de71fba7b5e7eb8e6b1b1d6f016de8a919d
 DIST dpkg_1.19.7.tar.xz 4716724 BLAKE2B d65200fc5da986db8b66e31e1ea45b9757b87e0fa15f7fc0579f1c1c63de78829c1a10bbc72726fe3b75bf6c11cbe1fe3c9b62f8374c796f990835f9f0e79dd2 SHA512 9ca441dc265baf5359c71617aef1c57504a7097c26ea57108b88dadc511bfa9918fcc765d8c67cec9def9916c5df92d6cabe508446dbc7223a29b45260445e81
-EBUILD dpkg-1.19.0.5.ebuild 1851 BLAKE2B f44f6bd325490770f4c28f9946cb910e62196bd8501c311313bd3c25d2c829bc923050c29ce556e0a2b35476896d515e5b40f7f6426b4e96b808d25d92c0a69b SHA512 8f861f7e8945819fb557b2b96b218669a378aad3f323f1735635c9812a46ba56fa2e6c5c3bccaca200874e6eae0108275b7283db16f8dd16f66c2049a31cc676
+DIST dpkg_1.20.0.tar.xz 4738556 BLAKE2B 2e58b3881abd46854416b05b0f9d2e972c3b545412a506b7bc18f1ebae5d82eac8bc2b55920d706fee0ca02239871c4f1c121e0c780aef31404e0408fbfa76e8 SHA512 5dd7961bde19ccc891fd5b77ca0085f7fc0308c20380e20b393397ff92e50d1c0f54e7b57676c05876021b44aa3788af8258c21ff2b672110ac92c7ce0b408f9
+EBUILD dpkg-1.19.0.5.ebuild 1848 BLAKE2B d3a5aae22d24450b92205a2bdfda810a3c5b5047b8b7db37c09a66c0b18d8ca87b2c40b5111f3df5ec7a160edccea988e011a9c5954dc4d15be88a04111532ca SHA512 02c7e77565269ef09b1f0c6f96774079fc9c4003fffedf7c60ede89ae7afa9e16cbc433ef949415cf6896a8d77d43adc80b863840741ca33f883ad466003feb4
 EBUILD dpkg-1.19.6.ebuild 1997 BLAKE2B fcf91e8fa0ba143a92c9508f90e4edc9e8a24544e9c1f5c9169d4c8ecece4c7c6c57848ea8b77398f6cecb3a7b4ef751083f0ce2de66dae5bf711e7375874205 SHA512 39ed5665ee5902488a6c8b6fb951b09ade9fe067fae4ee59ac8b1b27b443af22ba6d9f297a501923203fbe335f1a19cae21dd9c83da15f7031d9c5567bf44ba0
 EBUILD dpkg-1.19.7.ebuild 1997 BLAKE2B fcf91e8fa0ba143a92c9508f90e4edc9e8a24544e9c1f5c9169d4c8ecece4c7c6c57848ea8b77398f6cecb3a7b4ef751083f0ce2de66dae5bf711e7375874205 SHA512 39ed5665ee5902488a6c8b6fb951b09ade9fe067fae4ee59ac8b1b27b443af22ba6d9f297a501923203fbe335f1a19cae21dd9c83da15f7031d9c5567bf44ba0
+EBUILD dpkg-1.20.0.ebuild 1949 BLAKE2B 3a9c231a342c812726441fbfa82db3c925b663acc2c0a45fa06c6b0fd1fe1e5293d6d523dd7061e85b7942896826c7246c18625f26c31e114ee48bc1f55d32e0 SHA512 c5e2b22a5eb603105b2de86d8dcfc4103c2cfd5d7d8e1f615d9fc1848ad2f3b967cc17278e3413d1f972579bd1058b7ae068d7b4b5d6c7fc58b378bc16fc9cb1
 MISC metadata.xml 433 BLAKE2B bfddf84314750bbaf97250dc51916485e8226379d3d3aa925f7879ca456c3052e062b1516592c49b4b048a0fe76a55c6302b719747ba43a7a8d6fbd65c9eb8ec SHA512 da157c95d0dcf2086b37482bad4bd1c52da16c015e71411653f12e3f5e0f25d710e1819675a0d5b8e92a9e185dc61f602007e3a8875aa1b05b78f128de1b0ca1
diff --git a/app-arch/dpkg/dpkg-1.19.0.5.ebuild b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
index d6cb3e00ce9b..2579db8341da 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/dpkg/dpkg-1.20.0.ebuild b/app-arch/dpkg/dpkg-1.20.0.ebuild
new file mode 100644
index 000000000000..155450d1586a
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.20.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib autotools toolchain-funcs
+
+DESCRIPTION="Package maintenance system for Debian"
+HOMEPAGE="https://packages.qa.debian.org/dpkg"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/perl-5.14.2:=
+	bzip2? ( app-arch/bzip2 )
+	libmd? ( app-crypt/libmd )
+	lzma? ( app-arch/xz-utils )
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? (
+		app-text/po4a
+		>=sys-devel/gettext-0.18.2
+	)
+	test? (
+		dev-perl/IO-String
+		dev-perl/Test-Pod
+		virtual/perl-Test-Harness
+	)
+"
+DOCS=(
+	ChangeLog
+	THANKS
+	TODO
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
+	"${FILESDIR}"/${PN}-1.18.12-flags.patch
+	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
+)
+
+src_prepare() {
+	use nls && strip-linguas -i po
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode) \
+		$(use_enable update-alternatives) \
+		$(use_with bzip2 libbz2) \
+		$(use_with libmd) \
+		$(use_with lzma liblzma) \
+		$(use_with selinux libselinux) \
+		$(use_with zlib libz) \
+		--disable-compiler-warnings \
+		--disable-dselect \
+		--disable-start-stop-daemon \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	default
+
+	keepdir \
+		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
+		/var/lib/dpkg/{alternatives,info,parts,updates}
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
index 15d4363289da..f3154b8d8193 100644
--- a/app-arch/dump/Manifest
+++ b/app-arch/dump/Manifest
@@ -1,5 +1,5 @@
 AUX dump-0.4.46-openssl11.patch 3324 BLAKE2B 5cc60ef04e7f53e96e900bc78e41f4c4bcf46f3000663ac7bb1995856b5cf067c69d84331b5dfd52da4ef2649e61f6e410e59f9a99bff3be44f9e46df1b75b4f SHA512 ae7c2549683a4cf33760685fe5b07ca88b158e81f5e3b866e58f618dced4c5909dec231d07a1df590a5ebbbc9f0eee575e63f4ffae719afe01315d53d63a76b0
 DIST dump-0.4b46.tar.gz 578200 BLAKE2B 91102bdba06f3affdf4ebd9de525145c0a4cc1b9fb4c6ff222c411c118b3b7835f3aad666d530019d8b9ee46590e4a283a143d188d6800218100cecf67877274 SHA512 a30e72ab6c4d18497dffe3d25634c2e55ca90861d1cd8a6c0fd44709e735a217dbf4cdabb8c80e02053def94d9a22cf1d685ee0d0f24f5b748ee5f0de19cf17d
-EBUILD dump-0.4.46-r1.ebuild 2157 BLAKE2B 9d94da9d8a214fbdcf3ecdf3fbf7635867fc1bf24aadcb0dbe0e519bb99cd0ae45f3b7900e9f8dfc8954d00d03a45c6d739518ce2d6f826ea90bd205c836ffa6 SHA512 e1f25eb0774c7e60ea3b0086c68e27b99b550470f26f74bda42846a933e8e05712f821fd34c6db8a578a0f18916085fcc73a329e423bf5734d5f88807a0a7d56
-EBUILD dump-0.4.46.ebuild 2138 BLAKE2B 24a4491ccfab7ec00a19d3639cbbe24b39bee2e688f3e01ec6896bd143123e7e4eb3c22baddd0069f36d59d73f8bdcdbefd5dbf724ddeec33ab529edf7cd6900 SHA512 f9e915a061244bd2f90dceecb55a2388257a23f1094d3ced693ae561d1a72be18883f9ab99050aecaff583f14d1c1ee6afaf90d89a2d442b97e51c4cab6f873f
+EBUILD dump-0.4.46-r1.ebuild 2158 BLAKE2B 8c5cdda5ec805dd9fa7ef6b06ca0cc127f7cedef8c85d9c745fe06e978376050f31439c2699a7eb8c08bb7cc08fa3cdb34fc87ba1a8aa80ed462c8e2a5d27b0b SHA512 12b8a4af5901751d728df14e8d631b97f9565d4104b8172cdf05879355304d0275a160eada6c510127070defb0ee5a5a900a7435078654c88581ca9c85332162
+EBUILD dump-0.4.46.ebuild 2139 BLAKE2B 8c214683d2c223b6223e76c30b0d458dd5e8ea35247908c222b3aee69e687d016f369e4b54e9b7cda6a1101a5be419ddf92556302593d31d94e37fd0ea888c6b SHA512 409678d809e15a545e1a9fb74afddb9e0776575307d020bde5c61401a1f4afc9a3d6e8551d94f52b22a3952322420b3d129eec91f823b4d697db1d0a2a3e1192
 MISC metadata.xml 542 BLAKE2B beff8763f8b3848f9592dbf200cb547e9c416e7d675b4e9015f20b417861523949916da4a6a38553abf7fdf5fc839841870f74258becb4e8dbbcbca9c564e328 SHA512 670b1e0032f69e22337cbd18c25ecda11a239d63345c32526e111ad2eb23199892aa7e1f39a79168bb4b81b6ebde4c7796f8ccf78233f3244bfbaf62c7e0345d
diff --git a/app-arch/dump/dump-0.4.46-r1.ebuild b/app-arch/dump/dump-0.4.46-r1.ebuild
index 6f84c5ba717e..c768fa8534d8 100644
--- a/app-arch/dump/dump-0.4.46-r1.ebuild
+++ b/app-arch/dump/dump-0.4.46-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 # We keep uuid USE flag default dsiabled for this version. Don't forget
 # to default enable it for later versions as this is the upstream default.
 IUSE="bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib"
diff --git a/app-arch/dump/dump-0.4.46.ebuild b/app-arch/dump/dump-0.4.46.ebuild
index e11031dbc8a9..f7ff465b84eb 100644
--- a/app-arch/dump/dump-0.4.46.ebuild
+++ b/app-arch/dump/dump-0.4.46.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 # We keep uuid USE flag default dsiabled for this version. Don't forget
 # to default enable it for later versions as this is the upstream default.
 IUSE="bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib"
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index b49c128f231b..78faffa244a7 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,3 +1,8 @@
+AUX engrampa-1.22.3-gcc-10-fno-common.patch 526 BLAKE2B 38fe4aa06e6a0d2a5a3a72384f94aabcffc08f8e2b62d29b70acc5ca42bb9a36b9b854445d5d51424feebe7b9d47a17f5efe7781af62d6610e12059f66fc2db0 SHA512 dc35417a64de6898705b638d19f2a73b33c32cb7e18c89c77e51a0e6bece8a971a9301b2aeac0ac8acb83d3cdba73f0ac38e1bb369669125b035fb86b9b4d0e3
 DIST engrampa-1.22.1.tar.xz 1363488 BLAKE2B 0f71e94af50443f9f562b0eed461ca1160fab0a5a3cd02c845fac09ee2466cb8634a458a6a4488ff5ac6674b0f525eccf754b8b1cc7e3f1729d4eb6ac224e025 SHA512 111eeb470555ae8edb7754159bb2e70b03cbbc7b1c9d61c253d9d67e50d84ff0e0654e16547883c39aeeb223e8ba58201d45b50819784fc6cf7a21f0cf176c70
-EBUILD engrampa-1.22.1-r1.ebuild 1680 BLAKE2B c4c11eb9ed21b405777c6957200bcf5cd9d1f6bf34f10a9c8133a4c89a7975674bd614f7d2829e180178542ed76cb0428b52907f65265919642ee3de3aa26936 SHA512 16356039e8f8b466896b418b9f804a0984d661bedc4643ab5d021c93783f4b4dca22d9571749165bece0e1a6392e763bca02f3d8d3862f7b16c60bd54cd3ff89
+DIST engrampa-1.22.3.tar.xz 1407412 BLAKE2B d6963da4c18137600c26cff01b2a42d2aaf9a8a435779593b7712e6f7ff920fd25b5fa462edd3d321d63f131b3e4a4486a6f795f2392f6679ae3ef9b343fe8e1 SHA512 fd110b2bc188207645985a6f788b8e618cb4910a275950dfb17c0bcc42eff8765a4c7a36760dec2636485685a7a2f4adefb8e2c83537d1b3a819582e3878c9db
+DIST engrampa-1.24.0.tar.xz 1678920 BLAKE2B c40ba6a77d667f25853f6ae8cef51a54b32402e9446d6712bcfe8b6cfbddcc39e076604fad6ead1717bcedc52716be028ac9bf912c5762fa204e3ee5d6be10bb SHA512 b6996e224ef52d8fd7102e4498193faa62056e8c22aa260ab5c6361533744f78755d500536ec0e03fd8b42b71da56d3f58d9d760809d20b572bee02fdee07cce
+EBUILD engrampa-1.22.1-r1.ebuild 1698 BLAKE2B 9968621d6728b1cd75b97050344b39e272801cb3cca9a89c1272d4675e7f864de2e032d80fa63b9aff50d4108a850190dbf5db356a7ef33c0873e82b3382fea9 SHA512 ae5c3d1af629c3e2bd30dbd7f8aac7dfbbd98e2c5127103f4f5a2a38eba1f76682e8dc4764e5920733e5b37d61ac8fdaa160243df8d74489aedd07940672dce2
+EBUILD engrampa-1.22.3-r1.ebuild 1711 BLAKE2B 1cf4d43d8d06755c6e4e4e518d7369833fbfd88736be60967efcda9ae4af0f7a8814a91db7d5e2b86ddce1b08ad1bbd8a1f409b3b8178024f1bc39d5d5cb62e5 SHA512 08e05a965aca5193c0973d46207f578499a19c818f7577913a2dc28f017405d0caedba8e12493176104c1147e74b5ef46eb6735020c4a8faf389ad82d4ed453d
+EBUILD engrampa-1.24.0.ebuild 1706 BLAKE2B e6504459167554f6a7b613ef48a2f5fc67962818205a8830daedf5af46b5c18666a307fedd74b490017ca61d38a990be0bb8e2d90e8978e8e6dd6913654fc08c SHA512 f4d709b14061235b1c9cf51f446ca71021849f1ca79bfd392b26419d334465c514abe618e5cc720875588c4205eb82c773116a5aba44354aaf37390d388b9c65
 MISC metadata.xml 611 BLAKE2B a8d57ae0c1657b6f17d961b3059746d47249007387dbf3d5dc555279e054e91fbff524e8abf17ffa64d788a3bc8b80f0a7e77977e3544bea849b5843e3ec860f SHA512 304268690ba4159d1bd296c24551b527b2ae9bfa9b99531f686e983d4954b9f00f540792d020d1a2fd46ec9c8a330c87e1bf7bf0073ba379ccdf8f36d49b434e
diff --git a/app-arch/engrampa/engrampa-1.22.1-r1.ebuild b/app-arch/engrampa/engrampa-1.22.1-r1.ebuild
index 3a1520eee9ed..dbd3baf302e1 100644
--- a/app-arch/engrampa/engrampa-1.22.1-r1.ebuild
+++ b/app-arch/engrampa/engrampa-1.22.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
 
 IUSE="caja magic packagekit"
diff --git a/app-arch/engrampa/engrampa-1.22.3-r1.ebuild b/app-arch/engrampa/engrampa-1.22.3-r1.ebuild
new file mode 100644
index 000000000000..92299844e0fa
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.22.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit eutils mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="caja magic packagekit"
+
+RDEPEND="
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/json-glib-0.14
+	virtual/libintl
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[X]
+	x11-libs/pango
+	caja? ( >=mate-base/caja-1.17.1 )
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+	!!app-arch/mate-file-archiver"
+
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		$(use_enable caja caja-actions) \
+		$(use_enable magic) \
+		$(use_enable packagekit)
+}
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-10-fno-common.patch"
+)
+
+src_install() {
+	mate_src_install
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+	optfeature "Support for 7-zip"  app-arch/p7zip
+	optfeature "Support for ace"  app-arch/unace
+	optfeature "Support for arj"  app-arch/arj
+	optfeature "Support for cpio"  app-arch/cpio
+	optfeature "Support for deb"  app-arch/dpkg
+	optfeature "Support for iso"  app-cdr/cdrtools
+	optfeature "Support for jar,zip"  app-arch/zip app-arch/unzip
+	optfeature "Support for lha"  app-arch/lha
+	optfeature "Support for lzma"  app-arch/xz-utils
+	optfeature "Support for lzop"  app-arch/lzop
+	optfeature "Support for rar"  app-arch/unrar
+	optfeature "Support for rpm"  app-arch/rpm
+	optfeature "Support for unstuff"  app-arch/stuffit
+	optfeature "Support for zoo"  app-arch/zoo
+}
diff --git a/app-arch/engrampa/engrampa-1.24.0.ebuild b/app-arch/engrampa/engrampa-1.24.0.ebuild
new file mode 100644
index 000000000000..27c5563509e5
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.24.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate readme.gentoo-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="caja magic packagekit"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/json-glib-0.14
+	virtual/libintl
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[X]
+	x11-libs/pango
+	caja? ( >=mate-base/caja-1.17.1 )
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!!app-arch/mate-file-archiver
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8:*
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		$(use_enable caja caja-actions) \
+		$(use_enable magic) \
+		$(use_enable packagekit)
+}
+
+src_install() {
+	mate_src_install
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+	optfeature "Support for 7-zip"  app-arch/p7zip
+	optfeature "Support for ace"  app-arch/unace
+	optfeature "Support for arj"  app-arch/arj
+	optfeature "Support for cpio"  app-arch/cpio
+	optfeature "Support for deb"  app-arch/dpkg
+	optfeature "Support for iso"  app-cdr/cdrtools
+	optfeature "Support for jar,zip"  app-arch/zip app-arch/unzip
+	optfeature "Support for lha"  app-arch/lha
+	optfeature "Support for lzma"  app-arch/xz-utils
+	optfeature "Support for lzop"  app-arch/lzop
+	optfeature "Support for rar"  app-arch/unrar
+	optfeature "Support for rpm"  app-arch/rpm
+	optfeature "Support for unstuff"  app-arch/stuffit
+	optfeature "Support for zoo"  app-arch/zoo
+}
diff --git a/app-arch/engrampa/files/engrampa-1.22.3-gcc-10-fno-common.patch b/app-arch/engrampa/files/engrampa-1.22.3-gcc-10-fno-common.patch
new file mode 100644
index 000000000000..61e23e087cf6
--- /dev/null
+++ b/app-arch/engrampa/files/engrampa-1.22.3-gcc-10-fno-common.patch
@@ -0,0 +1,22 @@
+From 623bd665371e3afd9dc6fa29f9e1cfe735681358 Mon Sep 17 00:00:00 2001
+From: rbuj <robert.buj@gmail.com>
+Date: Wed, 29 Jan 2020 15:52:44 +0100
+Subject: [PATCH] Fix build using gcc 10 -fno-common flag
+
+---
+ src/main.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 56e75ea0..a9e297dc 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -33,8 +33,6 @@
+ 
+ #include "fr-init.h"
+ 
+-gint          ForceDirectoryCreation;
+-
+ static char **remaining_args;
+ static char  *add_to = NULL;
+ static int    add;
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 6c79f38b851d..70ea89702897 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,3 +1,5 @@
 DIST gcab-1.3.tar.xz 77900 BLAKE2B 9ab61c1ab36561cd0bce075c8d491c8e28651c26ff5943a2ddc294a369f7627c300ed698363980dd839b64d512b678d7b3903addeea05657551af308b6e0c5ed SHA512 fd34722bc57a75e9a2aaec354af4629a35936928eb6db5646659c8dd51c8c6fd7fc6786c23f7e91a33a727bf8548327f50725081a8c7b1e0facb877341887b22
-EBUILD gcab-1.3.ebuild 1111 BLAKE2B f386863d00f036acb4946197744fc7465c21cc71d37a6933f5c143c2ff4c8e39aa5d6622847ed9068512cee7c8eee2e96e838eaa486e105ea9f9c2f1bba2f4e1 SHA512 ae86364415d64e1ed1259423075f86528d32e1460d0c0aed97e4b4878764f9fb06ceb4c047e5db6b06541649535a0ffbf9d91459eddb3f8b48513d8914b50dbb
+DIST gcab-1.4.tar.xz 78240 BLAKE2B 8b857c116fab636db93463cee7d6b809c3c7b2bdf3896b7b5b5b66ebf270b284b356710933ec17584143bcef5c1f5c555811dd05ea98399f327047476a33fc16 SHA512 66a2e0d0a5888c555153356ce808f602053e71b76af19794db7e3bbf9516fe791805068838b4e208698cd645ada7a08610ac95f846fa81e00a9b955016306299
+EBUILD gcab-1.3.ebuild 1112 BLAKE2B b0dd04f6c01430785d0c3350aa4b9d5b03d5c236d6f4b12acb75fcb1769ed865ae9376f7953be4b246a17e2bc303faa0dbf6b624a66676706d0048d8d9de5de7 SHA512 8950ff175c3d2b19a3c7f07ec6ad9771391391021afada620b62c4cad6888b85c771f843d20bf03b34f1c0ae730eb646a1769834128bc7fa4992e9f70b021595
+EBUILD gcab-1.4.ebuild 1123 BLAKE2B ac06f63c1dbb325f816577497937902fb220343f96b2444bfe68b503ac9a90d76be484cb2cea84cfd7dceeb0590920e5831c79bc6d21c79f61867e3e0fc0a772 SHA512 cbfdd871b15dc824ad7631f4d5bc041f78ad291a1f66aec9f2e57023b48edb990aac820a9f2eb7b78b27309ce28cf18ea28d10a1b77b42d4e63f47df9a9e8844
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-1.3.ebuild b/app-arch/gcab/gcab-1.3.ebuild
index 6e8f338607d5..271947393aa5 100644
--- a/app-arch/gcab/gcab-1.3.ebuild
+++ b/app-arch/gcab/gcab-1.3.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/gcab/gcab-1.4.ebuild b/app-arch/gcab/gcab-1.4.ebuild
new file mode 100644
index 000000000000..fc5fcda22bdd
--- /dev/null
+++ b/app-arch/gcab/gcab-1.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
+HOMEPAGE="https://wiki.gnome.org/msitools"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.62.0:2
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/meson-0.50.0
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection)
+		-Dnls=true
+		$(meson_use vala vapi)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 7c782982463f..0aa6bb22c400 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 1123 BLAKE2B 1b462094be39010a69fe52ca6985471549f1229a52799ac5ea6bb948c4f13bc75da4155420d1ad71a94d40ef7b11c850a3deb3b8032379828575e9eaf6a88338 SHA512 9f9d38b1f7913dd41445672cc9d88529253130dd27867fde7e6e1f3ffdb97f717cb9caadcdd92bf101c57f96c36a4615db734518ee146bda2868873b81b47979
-EBUILD gzip-1.9.ebuild 1153 BLAKE2B a65a638485619f176e71e3afbad405e97c3b99fd75c9d3a28f8ac61991cd6648ef761b99e4f953f862131d440717a2a437f3ef9eb8951340ca3d2c1cde7d63cd SHA512 30cd68e53eaaff730ae20af775926f24a7f69f1e1b4507f990d430b9085a0f2561125f14e1e38170463ab2540702a3286405ccbcd47599e50c92367d6f70fc1d
+EBUILD gzip-1.10.ebuild 1119 BLAKE2B 2596c9ed30b65889ed6ba229572a0a16452f3723ac02c76702bc5766c2d2770b4a28ec52cb7192df8b07d7df17f95bd18551422b4102402abaad9d6c957c183b SHA512 af3cec2ffb96af9c5d8ff1347bbcd1f3b17c251e821ffd740e73c3cd37402768ff308bd7cc96694aa644a4dc20b104eb828410f2ecf2bb876f69b891a7a20028
+EBUILD gzip-1.9.ebuild 1151 BLAKE2B 3b072468fb0def0e2252d67c07be26241da725a09b631598690efe9f55dcdf3f3d68c944fc8a53a19df8678a6acce2b12bd124db8dae777aa8b627575fa9f50a SHA512 3283ed763af8ca8e5322c2e43e832298344b660d7423689bc523b0cc49bc408667c4ba2f74b1317acd0a1504511cf09c8fbe34c95d96750ad18cee0227bdb4b5
 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 8a25973c52ac..470b1f4f5769 100644
--- a/app-arch/gzip/gzip-1.10.ebuild
+++ b/app-arch/gzip/gzip-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sh ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 1de3ecfbee18..36242b75f245 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 sh 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 PATCHES=(
diff --git a/app-arch/ipkg-utils/Manifest b/app-arch/ipkg-utils/Manifest
index 14effd0316a9..c449146ff6d2 100644
--- a/app-arch/ipkg-utils/Manifest
+++ b/app-arch/ipkg-utils/Manifest
@@ -1,4 +1,4 @@
 AUX ipkg-utils-1.7.050831-hashlib-r2.patch 534 BLAKE2B d1e1dd0ca3f332f372de1a0e471ac74e7a1eda58527fcb9e34318fd279e809578ad407ab812eb2966033892fb55920b9426e41481db703334b89511602e30e9d SHA512 88a1d2bd32c696953943136d30ab5d4cc8efb280b7c39e142880b05cb6b233d95530331c989e75afad607e3b2d3ee94840ac403e14d97c30865ead63fc098180
 DIST ipkg-utils-050831.tar.gz 29175 BLAKE2B 4f1d4b5efb7f808e6987a7b62f830463e28fca998c49b4d6683a58c2d2225e24820e6f2b47642e5cceafa34e0ab3ff8172267ef734bbbf1c8f94b8777172efc8 SHA512 7375c4815225eb755699954d3005dfa88bc0f0e6c2678b7bad565f63204a32735d483dbef23e7b9b75c5f0428ff04c13744b8a10e68bb69fedb96a59c069e1aa
 EBUILD ipkg-utils-1.7.050831-r3.ebuild 1417 BLAKE2B 3982d150af3b1d8aaa8e16f48b46acf2e818d44eefc143504c259db3d745cfb9678ff195548080538a1db910f26cf0660c24878df61f9a9dfa30cfb91b3a830c SHA512 50b8bf15728512dce830c09045543cafa434d39b001f996e57b624a24303225bdc060228b2068e570303f5addef4fcc3fc371340d684f854edec386b09f0254b
-MISC metadata.xml 440 BLAKE2B f58f839dd54a3d68454f781aa5a2ccc2ec21a0418fa6de240f084568a4d8853ab191e4de2ed5d26761412109dd57564188aadc141f73646ae4ac93d31dad175f SHA512 ba8bf9b429d587c2fad985c311a8107a08d4362c161a72bc1243a8a14ba842d0c7ee7cc08a0278881a9d61a05702e3cf5817db34234e31761ad7e518d74d29de
+MISC metadata.xml 359 BLAKE2B a97f8ef461dc169b98e81bf0e54b0ac526704308f2dd6c493b7df3e793d9442e327a851fe89482955ff079f3ed171847cffda5b1813635587650f74d197f5b15 SHA512 83d1c80142e026180c764b24a4c92b71144d1425ddd819e85189f7de02362608558322a1ce71275939ba972a8bc72e1e91bd62a12315c84804ca70461b1703d4
diff --git a/app-arch/ipkg-utils/metadata.xml b/app-arch/ipkg-utils/metadata.xml
index bbd0686ff3f8..bc97cc574b18 100644
--- a/app-arch/ipkg-utils/metadata.xml
+++ b/app-arch/ipkg-utils/metadata.xml
@@ -9,7 +9,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>
-		Tools for working with the ipkg format.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index 90661056aac9..0c3cf2e69915 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 851 BLAKE2B 9f7fd60f38b895adaf4c5793dfbef3ff5dee8fa2a2813a02ed9747d559287c9653c8fc2a656ae51f65439e84cf6f92e100b026ac3a7c8cf30285c2ce76ddd97b SHA512 bc87c4a74be406563c9f4977f39b7570283ebd5706f350c388f2863384cadc178b89ed3c554ee590b7f54fa08e8786e9df9e91ccf5394152a4837d9f38524def
+EBUILD lbzip2-2.5_p20181227-r1.ebuild 849 BLAKE2B 849f48f6c9321ce58ffadf221e07ad84bf6ff85b0ca0c57424203efbc1ce9e0c1c1ac2632260855b63b1141ead04575ce8ff14ae891d93cd4dbe9f4774105ea7 SHA512 7f1200c3970a723eb7c039b21272b8a7fa714c300a48d880f604f88933b76d1ca7cc89211e04d126c8a27d3803ecd023f6854d32bf49d32820320129a4c681da
 MISC metadata.xml 534 BLAKE2B e09b3c70d05c66c9edffa19cc3e52be55ecade605c97da4e2f4f6c930dd1ebb548ddb873d31c50c995c0493fd3329978db661796c43ae029a5db79ac0e1974f0 SHA512 86b03f188fb14168b7d2d6956fa2df4941d94c95ff00e6bfd27451fe76b9318dac477bdb13b6443ae0186837335d66cf3e52ddc4ccc2f2979e60fe287f5ac2b2
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
index 1ce9c2d04fc6..ebd9c24d38fd 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 sh 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/lcab/Manifest b/app-arch/lcab/Manifest
index 2049076a7ae2..a8943994d372 100644
--- a/app-arch/lcab/Manifest
+++ b/app-arch/lcab/Manifest
@@ -1,3 +1,3 @@
 DIST lcab-1.0b12.tar.gz 74907 BLAKE2B 3b53c9a97319b1029a3fae8e1cc090b041ac12ff3329d7c49f7cba097c6ff47d0842ec009a3483e3bf2d9dfb8f351a5e965e275479a811bfb859798e1337996c SHA512 7aeb1b2aa0b9171963b771cfbec13d1a6d4b2519f0f6f2705b505d0ec7a7425764996de00ed1d2919d08c525617d029035a586e8c7e2fad2f44945fddd2afbcf
-EBUILD lcab-1.0_beta12.ebuild 510 BLAKE2B 7a69003a2e260be21e7eb0164d5474c08c541060ed8f56253865fe9c7a7beef201a0c036545958bef14d7a96e46e035899aa171bea07630c656877e43a8df36c SHA512 2e8a844f3ad6aa5d13083420fc569f901d1998304e446b8cbceea18a213d79847ec71753bf42b00d70cd7eba22913a9609836b1c18de3bf0c95af7e3d5d002bd
+EBUILD lcab-1.0_beta12.ebuild 506 BLAKE2B 3a2b40dd5ba0a72b6aeafd954e7d563600924ef9a2d3dba6d0cdd606b9f88f58157d6b038de1e0db9f3e6d80c1e9a039c92c681e76f8c4a90ed159701ba2fa7b SHA512 d4adad172f3f06757f253238a62455e217a284664208e060a0de89340f02fe751e43ba3670417944e50ca47f654873578979a2e22287f7566fc7a4f67e5bee47
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/lcab/lcab-1.0_beta12.ebuild b/app-arch/lcab/lcab-1.0_beta12.ebuild
index c9cc63e792b5..27fe02473de4 100644
--- a/app-arch/lcab/lcab-1.0_beta12.ebuild
+++ b/app-arch/lcab/lcab-1.0_beta12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 inherit autotools
 
@@ -15,11 +15,11 @@ SRC_URI="ftp://mirror.ohnopub.net/mirror/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
 	sed -i "s:1.0b11:${MY_PV}:" mytypes.h || die
 	eautoreconf
 }
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index c4c893caeb6c..2f2dcfb56f87 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,5 +1,5 @@
 AUX lha-114i-file-list-from-stdin.patch 999 BLAKE2B f039b70dfbb82f9d2ada3df90621b4a10117c33e4a201c5f22f8093ede4da5ace496af62b24af0c7f59a8ab28a10afbb6cc2be4ccd1c427f5a4e796455f8cf69 SHA512 28c79640e0bc1b7e7e29f06bea319ebdb594568d5752f1067db472d054c91101fd5d9d769448e32463025d162adf70fd067a161a9aa4ad1b1e38aa0e8023173e
 AUX lha-114i-fix-getopt_long-declaration.patch 263 BLAKE2B d5b53f0624a9b039167289f32369ba2b2905e8a223201404ba8d9a63d1a2fd9cb73f7e5d40fc2a14bcb510a4e49905545947bb21cfd38871e80c92591ba0007b SHA512 0216d24e001b7dc0db179d8e809fa838fd1d1d965e7d3f4ead79b9b276c39ee2666d6268fd835f9ce35664452d662aaadeeab00cb121f3485765db4c6be9d145
 DIST lha-1.14i-ac20050924p1.tar.gz 285518 BLAKE2B 7e10ee4cfaeb7212f9dfbe254d33ec7b97bce41a042eed3d6f826790650f5059a19d2a334cc41a86112ba8d80904168a0b3c2785e7670577b2bda0b4d27f0dcc SHA512 efe43d407d273f8f724f7b205223bd122c76adac4b67ad5e9811e88cae03f1f3c3af4297aa6f24951a02558975bbafacf697e97ab0da578b4e0115b89237566f
-EBUILD lha-114i-r9.ebuild 1131 BLAKE2B 0c158971d4412ea45cdda5d6c2689288540d15cbebac2d4e984b7b08ca651a515ec24095ba4a295e5e2cf57241ab91652baf86f1d1ef44ea6f36f03b19b5ecc2 SHA512 e126d124f63f0f11b1c79e1f83d3ff95332d5002cdaffc7398b9c99a9a299a2894c8c97422902e1ffe0e3f4d5d10f0ec9a48f4563611328b0c58a65765062526
-MISC metadata.xml 534 BLAKE2B 861f00b0b2b6c547ba122d9dbc9da0d9b84bd49b553a2c8f2d2fa5dd7ef7dcd86caca75292a825dccb74becd7ad8c34a4f9cbe71cd5096ba7617953c4f612c7c SHA512 499669685613b31d118c1878fda13c25551d13eedb1532507d2952a490725b1083dd16aaf4d6927bb2cc8ca859c2d29e1a064d15f9d4e099108ad7ea80fc040f
+EBUILD lha-114i-r9.ebuild 1129 BLAKE2B 93f1152a5aeec828b8c6c2a8c713acda8e608902329e2addf3214fb8d984438f029366475cfaad4d7a8927ca10f075dde3291c81a4ef30c0b89a4c8b876f1edb SHA512 92040e27aa9bbb00afa76936c3d8edc7dfe77bde277de87be81c4108e035915a1da59beed1075e3f8f48f9d4974070640923b1851ae025ea7ce365fe9e105e25
+MISC metadata.xml 434 BLAKE2B 414f7750d16ce40058d2ae20237ac880f3d239bb76111ae99afb6733876ae3f44d2aa5de0865a6139f4cc1efc706d2d35991ab61f5af4d5b74ad195c28eb9325 SHA512 8cfaf4a935f86fc33a86becdcd233d6edcf10fdec2f3d4e5af44cdf21c904917f29f83c203f2e00c31aca78d9e6189041f053edcbcb4573e258169fd21566e74
diff --git a/app-arch/lha/lha-114i-r9.ebuild b/app-arch/lha/lha-114i-r9.ebuild
index b53863911a31..8547747745c5 100644
--- a/app-arch/lha/lha-114i-r9.ebuild
+++ b/app-arch/lha/lha-114i-r9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
 
 LICENSE="lha"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh 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 ~m68k-mint"
 RESTRICT="bindist"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-arch/lha/metadata.xml b/app-arch/lha/metadata.xml
index ee8ee630babf..e96717a9369c 100644
--- a/app-arch/lha/metadata.xml
+++ b/app-arch/lha/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		A utility for creating and opening lzh archives.
-	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge-jp">lha</remote-id>
 	</upstream>
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index be6b962df259..a4a8a0effd7c 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,7 +1,4 @@
 AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe
-AUX libarchive-3.4.0-without_zlib_build_fix.patch 4850 BLAKE2B 2f4a670afa2ca1ec22036b3544d03b04f7cd5fed4ce9829017c07323c45f4d0eae40555856d26a81345f65f6b65d0cb026ae4fa17ed3c1a42392190e390cf069 SHA512 1ae44704d4fcf5477baec6fdbf518dac6b9f40d3648d1a0447c0311b8388a3ab11fdea3db8b249a1cdfde65fcd27c4f41076d3f50444e67ec9bcec1a801775bc
-DIST libarchive-3.4.0.tar.gz 6908093 BLAKE2B 6da5798ceabb542d8b877b3d672f6e6431ed7340ec0160a5d8cef28591b516b55d426002379eddc632a478bfd2f034a358f8552f55c9f066fd7f5c31c218b462 SHA512 2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852
 DIST libarchive-3.4.2.tar.gz 6979481 BLAKE2B eea90e4751ae487cd1a9b0eecd16598d1b81ffff665ae97a160e3858c8ffe60b82003f081af644f3f32260d0e1d3f3077240125e8279bf8111a79d93c68ac25d SHA512 a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021
-EBUILD libarchive-3.4.0.ebuild 3740 BLAKE2B 04ab8c8883d737e487a7958126f67ce33fee85fe718a1d96f3ecd2973bce9cf88a5b63ae7a2cd92855829e5b7ded008810d19099a1b84103c504be291214ea4a SHA512 3c01e29150aaf15a326bf8e88357520964dc5f171640c2ffe35517bbfee74669345e55f2e3bd399407866fc14042260d121d720a5bf9751da211f27614f069b3
-EBUILD libarchive-3.4.2.ebuild 3687 BLAKE2B e7f1d8e58c55ab50f4bcf6ba6e4843a743b415ac570348ba8045062e4eefb89c0ed89a11c12e69a62e2d738ede0289efaba5c9f98f14c278f0699b1508a95b7f SHA512 63d65186bf7efd972da77779312493f76e2c690ab0f98e50dd1433004b5cca8175641071e6081e35f2a57adae6a06cc7b94e3fcbbbf82aca7468d3cd239304ed
+EBUILD libarchive-3.4.2.ebuild 3682 BLAKE2B e933888d38791470063f370bc550105f96a9305d26ae2188f546f57605943658314c6bcfab52f4cde877f9e1eefd0c64c92e19a47502455533e13000b9100017 SHA512 fcca418f5d06b6b0460a69ea26eab3d3792ba7bca0f25d0c700e434664eaed29de81dc9b570e4694cea6570e6c7abda41258a300dd07d3dccac38a287af17c73
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch b/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch
deleted file mode 100644
index e0a3167390f0..000000000000
--- a/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 64333cef68d7bcc67bef6ecf177fbeaa549b9139 Mon Sep 17 00:00:00 2001
-From: Martin Matuska <martin@matuska.org>
-Date: Sat, 29 Jun 2019 00:20:58 +0200
-Subject: [PATCH] Unbreak compilation without zlib
-
-Fixes #1214
----
- libarchive/archive_read_support_filter_gzip.c | 54 ++++++++++++-------
- libarchive/test/test_read_format_raw.c        |  4 ++
- 2 files changed, 39 insertions(+), 19 deletions(-)
-
-diff --git a/libarchive/archive_read_support_filter_gzip.c b/libarchive/archive_read_support_filter_gzip.c
-index 458b6f729..9fa9e2b0d 100644
---- a/libarchive/archive_read_support_filter_gzip.c
-+++ b/libarchive/archive_read_support_filter_gzip.c
-@@ -131,12 +131,20 @@ archive_read_support_filter_gzip(struct archive *_a)
-  */
- static ssize_t
- peek_at_header(struct archive_read_filter *filter, int *pbits,
--	       struct private_data *state)
-+#ifdef HAVE_ZLIB_H
-+	       struct private_data *state
-+#else
-+	       void *state
-+#endif
-+	      )
- {
- 	const unsigned char *p;
- 	ssize_t avail, len;
- 	int bits = 0;
- 	int header_flags;
-+#ifndef HAVE_ZLIB_H
-+	(void)state; /* UNUSED */
-+#endif
- 
- 	/* Start by looking at the first ten bytes of the header, which
- 	 * is all fixed layout. */
-@@ -153,8 +161,10 @@ peek_at_header(struct archive_read_filter *filter, int *pbits,
- 	bits += 3;
- 	header_flags = p[3];
- 	/* Bytes 4-7 are mod time in little endian. */
-+#ifdef HAVE_ZLIB_H
- 	if (state)
- 		state->mtime = archive_le32dec(p + 4);
-+#endif
- 	/* Byte 8 is deflate flags. */
- 	/* XXXX TODO: return deflate flags back to consume_header for use
- 	   in initializing the decompressor. */
-@@ -171,7 +181,9 @@ peek_at_header(struct archive_read_filter *filter, int *pbits,
- 
- 	/* Null-terminated optional filename. */
- 	if (header_flags & 8) {
-+#ifdef HAVE_ZLIB_H
- 		ssize_t file_start = len;
-+#endif
- 		do {
- 			++len;
- 			if (avail < len)
-@@ -181,11 +193,13 @@ peek_at_header(struct archive_read_filter *filter, int *pbits,
- 				return (0);
- 		} while (p[len - 1] != 0);
- 
-+#ifdef HAVE_ZLIB_H
- 		if (state) {
- 			/* Reset the name in case of repeat header reads. */
- 			free(state->name);
- 			state->name = strdup((const char *)&p[file_start]);
- 		}
-+#endif
- 	}
- 
- 	/* Null-terminated optional comment. */
-@@ -236,24 +250,6 @@ gzip_bidder_bid(struct archive_read_filter_bidder *self,
- 	return (0);
- }
- 
--static int
--gzip_read_header(struct archive_read_filter *self, struct archive_entry *entry)
--{
--	struct private_data *state;
--
--	state = (struct private_data *)self->data;
--
--	/* A mtime of 0 is considered invalid/missing. */
--	if (state->mtime != 0)
--		archive_entry_set_mtime(entry, state->mtime, 0);
--
--	/* If the name is available, extract it. */
--	if (state->name)
--		archive_entry_set_pathname(entry, state->name);
--
--	return (ARCHIVE_OK);
--}
--
- #ifndef HAVE_ZLIB_H
- 
- /*
-@@ -277,6 +273,24 @@ gzip_bidder_init(struct archive_read_filter *self)
- 
- #else
- 
-+static int
-+gzip_read_header(struct archive_read_filter *self, struct archive_entry *entry)
-+{
-+	struct private_data *state;
-+
-+	state = (struct private_data *)self->data;
-+
-+	/* A mtime of 0 is considered invalid/missing. */
-+	if (state->mtime != 0)
-+		archive_entry_set_mtime(entry, state->mtime, 0);
-+
-+	/* If the name is available, extract it. */
-+	if (state->name)
-+		archive_entry_set_pathname(entry, state->name);
-+
-+	return (ARCHIVE_OK);
-+}
-+
- /*
-  * Initialize the filter object.
-  */
-@@ -306,7 +320,9 @@ gzip_bidder_init(struct archive_read_filter *self)
- 	self->read = gzip_filter_read;
- 	self->skip = NULL; /* not supported */
- 	self->close = gzip_filter_close;
-+#ifdef HAVE_ZLIB_H
- 	self->read_header = gzip_read_header;
-+#endif
- 
- 	state->in_stream = 0; /* We're not actually within a stream yet. */
- 
-diff --git a/libarchive/test/test_read_format_raw.c b/libarchive/test/test_read_format_raw.c
-index 0dac8bfba..3961723b4 100644
---- a/libarchive/test/test_read_format_raw.c
-+++ b/libarchive/test/test_read_format_raw.c
-@@ -36,7 +36,9 @@ DEFINE_TEST(test_read_format_raw)
- 	const char *reffile1 = "test_read_format_raw.data";
- 	const char *reffile2 = "test_read_format_raw.data.Z";
- 	const char *reffile3 = "test_read_format_raw.bufr";
-+#ifdef HAVE_ZLIB_H
- 	const char *reffile4 = "test_read_format_raw.data.gz";
-+#endif
- 
- 	/* First, try pulling data out of an uninterpretable file. */
- 	extract_reference_file(reffile1);
-@@ -119,6 +121,7 @@ DEFINE_TEST(test_read_format_raw)
- 	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
- 	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
- 
-+#ifdef HAVE_ZLIB_H
- 	/* Fourth, try with gzip which has metadata. */
- 	extract_reference_file(reffile4);
- 	assert((a = archive_read_new()) != NULL);
-@@ -144,4 +147,5 @@ DEFINE_TEST(test_read_format_raw)
- 	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
- 	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
- 	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
-+#endif
- }
diff --git a/app-arch/libarchive/libarchive-3.4.0.ebuild b/app-arch/libarchive/libarchive-3.4.0.ebuild
deleted file mode 100644
index 1c960f7b3326..000000000000
--- a/app-arch/libarchive/libarchive-3.4.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 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 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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}"/${P}-without_zlib_build_fix.patch #693202
-)
-
-# Various test problems, starting with the fact that sandbox
-# explodes on long paths. https://bugs.gentoo.org/598806
-RESTRICT="test"
-
-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
-}
-
-multilib_src_test() {
-	# Replace the default src_test so that it builds tests in parallel
-	multilib_is_native_abi && 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/libarchive/libarchive-3.4.2.ebuild b/app-arch/libarchive/libarchive-3.4.2.ebuild
index 0febd6af539f..d9f9a71caad5 100644
--- a/app-arch/libarchive/libarchive-3.4.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.4.2.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 ~sh 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 ~m68k-mint ~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/lrzip/Manifest b/app-arch/lrzip/Manifest
index 967cd250d3e7..37a41936512e 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -1,9 +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.621.tar.bz2 503286 BLAKE2B 3fb80f72f0bb81340d4e83b996ad2cd94fc0067b8e67599defb535e86614ad4a2436d8e6ab00bae24e4c9799a01aef267a7078cc6745d68acf868d0f1dbd606a SHA512 be94f54c3d84c93e3c1ab7b08ca6d2a02bc343983785be4884f42521520d2babc31db3abbec4b77dc9f710d18648adcc3d24b203289d8d4728afb3ef0fb90c0a
-DIST lrzip-0.631.tar.bz2 522158 BLAKE2B d0ffe63e1bdd21304d6d7a7dc969d4e79770fed105cf03ea9d504f890cda35178566afa5f88e13beadcc1095f052a014deada3b3f102247eadb8c746d989d119 SHA512 6420cd465ccd4581066408482335a82089f84f0aca1b05249b9fc6039b7e67df94457a7c871859e363206df3a40e93cfde576388785113f6c99b31d34c00a307
 DIST lrzip-0.631_p20190619.tar.gz 259195 BLAKE2B d0bedfe02485011e48fa07240b1eef68560d8d61f5d28dae25bd9fcb1c41c1b8bc1b552acb06a49d853b70a0912371cec9caebb2bf7905ef528c2408d2153297 SHA512 f366c31c84a52f6ccfba56e8b11c0bcd270482d9d120e07783fbe310d7a62dddfa60ecd310a7630e7c98cfb961f57fc9e6b843d3857d0c90d36c580074528298
-EBUILD lrzip-0.621.ebuild 745 BLAKE2B 12ef6b7b498e7978b590dab5ea4842bb2378235a0b2348eeed8645d12d4ed4db1b4d717f801d87f15028ef0c9e32cd9d0b72e666f4c56dc57247573ed6d734e2 SHA512 65d3dcaca49a97b840f271ab93b1ab0ff9a64dcce99907f6d6bda28c6db0e9a467c00a0731bc0462d7cee4ce1a045bcdb2ea01ec05b2ab9803ab35c183cc7bff
-EBUILD lrzip-0.631-r1.ebuild 993 BLAKE2B 0921eb7f050fb6e8b36c969b88cea2a25224c03297c43dd560c39d2b85e5fc9167c628d4082016f95241c813d99c18c25ad3fc0493915a08570e9641b8427ba6 SHA512 ceff4787d87829524566ca225564fdb7ff573efd797b88d9bc482b8413d6276dfaf18262dffa5698d6562d266fee817d076ff75289b86c6fcb194b4b8455ea37
 EBUILD lrzip-0.631_p20190619.ebuild 1175 BLAKE2B 6e5b73b7f65bfe3ed7b905d39c46463c75b794461cb7fc651287a069b31f1b99a3544bf0d9fd96fb871f737e5673fa148a27dd82bab5043ab2e11e5c0bccbc20 SHA512 a554850ce0dfebb661aae18d76d74d24c611c1d0e7382b675e3b3fe5e42d4c9e7aeab4aebaddd9333cb200525c4f72ef17b6307b09b3d21f3a5c7743abe24624
 MISC metadata.xml 607 BLAKE2B 818153c4b56ca259dd824e13c396822f5373d094d50d104562984032f7656703dfd75e617d1d03279c05a52334a265191c633cd609d6c6e948a20fc937f866ca SHA512 7236540b6002789563681648ef8016c9b692f814134fac72ccaf7ada302c8cec3c53c88658bbf2afde7625d8c756dbb5efa6b8d395f8436fe028ed0d49c5206b
diff --git a/app-arch/lrzip/lrzip-0.621.ebuild b/app-arch/lrzip/lrzip-0.621.ebuild
deleted file mode 100644
index 2c3c973d99c2..000000000000
--- a/app-arch/lrzip/lrzip-0.621.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
-HOMEPAGE="http://ck.kolivas.org/apps/lrzip/README.md"
-SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-libs/lzo
-	 app-arch/bzip2
-	 sys-libs/zlib"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	virtual/perl-Pod-Parser"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-missing-stdarg_h.patch
-}
-
-src_configure() {
-	econf --docdir="/usr/share/doc/${P}"
-}
-
-src_install() {
-	default
-	rm "${D}/usr/share/doc/${P}/COPYING"
-}
diff --git a/app-arch/lrzip/lrzip-0.631-r1.ebuild b/app-arch/lrzip/lrzip-0.631-r1.ebuild
deleted file mode 100644
index 4f1a1fd92f5a..000000000000
--- a/app-arch/lrzip/lrzip-0.631-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
-HOMEPAGE="https://github.com/ckolivas/lrzip"
-SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/lzo
-	 app-arch/bzip2
-	 sys-libs/zlib"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	virtual/perl-Pod-Parser"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-missing-stdarg_h.patch
-	"${FILESDIR}"/${P}-solaris.patch
-)
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	# Don't collide with net-dialup/lrzsz and /usr/bin/lrz, bug #588206
-	rm -f "${ED}"/usr/bin/lrz
-	rm -f "${ED}"/usr/share/man/man1/lrz.*
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index a25e4fde1780..02c68a3b7a55 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,4 +1,4 @@
 DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
-EBUILD lz4-1.9.2.ebuild 895 BLAKE2B 16a587c0a91bbc9f7f8964a5a50f6d9470f2d86bd6876b0cae79255c2b7af778ef85d285201b3db58e3eba8dc2a6aa1bfc2372906a855518726de21877d812be SHA512 40189b923f1f39fcc08d5fcf9eeb3486cdb8a6c238f72db65044471103d88b47fded1c77659702c0299ac5cdb3a01c04dafdc0123425b7d3ec1c4635299dec1f
-EBUILD lz4-9999.ebuild 912 BLAKE2B e4cdda81ea0a79c7fc3a70510e7180b7925547be14e1b373a4690032aae8abe9fb9cdef6a0e4a5db758db9a96aa5854ba9e52fda1ed47e9dcc1c543dc7541a89 SHA512 a5a2960cf77ff026c77c60bf0b19de4297a3d20ccbba1addc2b7b86f30ba8f7fd2a0d9a5031ca8f0368a68a32417eec1d20815cefc33a858d260ba9f3ab8ec8f
+EBUILD lz4-1.9.2.ebuild 893 BLAKE2B 3a29e3489eb5596a5042a65dcdadbaeb01f0a8c070cd39dc928f839d6b3897d78ed17b5a4dc12e3b1e1ec439e4d9eeaf7bdb2126f71508437c1454d2842fe577 SHA512 d076d2af31b676b7566bcc3f060169c04ceb82be1931f368fb8e74ada0e7992b3541d568b389b4926dcdb23d53a10d2b11e6f9f3d757649a7e2ad7ca2e623c25
+EBUILD lz4-9999.ebuild 908 BLAKE2B 354fd13dbf07584303e6a570cf3cbb74d17f625c578db292ac6285550ec284924b8173f1a059a1bd8845ef116a1c8f8d2fcca661a85a7a9774e980f0960cb334 SHA512 a0de9680dec5c6810fd7298c5be32ef3b054577e041726d66e0a354fa76cec7ce7fff007a0c862f539db9c4edbc1fd6c5c85cea276b2dc5f8fe3fe0f172ac136
 MISC metadata.xml 537 BLAKE2B fe6b4b4291dd1358a873cf34cd4f62fc6b08ac0db2449c7bb2840a715f13c68521140b244f66f00e8881ed53b4d66e988d71baf75bc6b5c79dbbabc2d12f6615 SHA512 4fc89afbcd032d88e43f346105f02da50e946c706f60aa7991c64e768941409e335005c6a4f283c0dd4d2ddc8faba53e4968334763e9c8c46538bc5810fe9699
diff --git a/app-arch/lz4/lz4-1.9.2.ebuild b/app-arch/lz4/lz4-1.9.2.ebuild
index 235404d993bc..9063dac0d718 100644
--- a/app-arch/lz4/lz4-1.9.2.ebuild
+++ b/app-arch/lz4/lz4-1.9.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild
index 2cbe311b2b2e..d1ea0341d333 100644
--- a/app-arch/lz4/lz4-9999.ebuild
+++ b/app-arch/lz4/lz4-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index a32ec449f8c4..0645d7faad3a 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 773 BLAKE2B a69b5ae5e0798b954e7e709bd407150ee961f7eac8f4fd5d6abb485e878e4730c1b2a68b6f69c081aaf7b74eca1b323f3e45ea6995e447e6c94057f99606992e SHA512 b0d57cf8fad4d8985e56a454a55d625cfce15b5e4d709f31e6de623f84e6d2eeae3ca51e4d2bb7c5a380a0f5f57eaa6a753b7ef35b19cfb8892c4dbb395222e1
+EBUILD lzip-1.21.ebuild 769 BLAKE2B b79481b3d1cc7d64708e4316c0ab92367e4da885aaf1e1bd556d941e02e35a58ccca1006137b31aebc1f9150858c727908fb69df5254c311ea61fb4fa40f9598 SHA512 1587e92228baf8a4b0cc3be74b2575591e4884a94b28847939604e64c40cf841c202b8cb92e7aadd47470d39d7ba42ce5c7800feadaff49bf3fc15ff5c70070f
 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 a72b24235f3d..cde6febef71c 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 ~s390 ~sh 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 ~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/lzma/Manifest b/app-arch/lzma/Manifest
index 88fe37c0b944..fc437a048152 100644
--- a/app-arch/lzma/Manifest
+++ b/app-arch/lzma/Manifest
@@ -1,3 +1,3 @@
 DIST lzma-9.20.tar.bz2 534077 BLAKE2B c1be526d6fb9f68da10b654940a92420b6c708c7aefe213394cf1c7650b3d65c4f54d3ca0663e52be13aa9f996ff9cc87262fac8b76dd0654e839cefc073c374 SHA512 1c495530834107430a675fb48c006093edc301ec7a2c2f273efd62ff260f3056503bb2c3ddef63e82f5ff04b1347381055cf6cacd59eee9d451c4d841c13cd35
-EBUILD lzma-9.20-r1.ebuild 902 BLAKE2B 0106ff9acd07f759755c3d1ce6fc421d2897a1757148607762dcd64ba6dec4b9c9df7e46969e15e15510e4d9b337931dd4283428a84e678b3b7a71bcd697c579 SHA512 5a7e0c8b4d780df118f559ec2ef301b507c1c62974855fc1bfe846c11a74fc47cd9528a8dcffcee1cd7514baef9c1db4ca18dff74e8d4bbb7ced1e76017b03ef
+EBUILD lzma-9.20-r1.ebuild 902 BLAKE2B 768a2f1db8ffa970a91e108e9666a1ce3fb2d7061bd8f79c678333ee2c7f864391e0d605d4255bf73934288f3b2afbd84bb0ae4385a49b3cb763851602a6fb08 SHA512 c472806e0b31156679c40ef8ae60e6a6b4b079e49c721a8879683b5991dfae9630550663c983289bf3533dc5eda47eb6eae92c0b5830dd84c545ba0d073afdac
 MISC metadata.xml 250 BLAKE2B e05a373f0ea02a1a107bb27632d2f6b87bb754d82a7a7c6f56b7bb6041a92a0bea6ef1a6353cd535f5f9d992b10cb68e402c4efa3189d7f65d2c9fc904a4610a SHA512 7bd753e69082bd70f8afe68f12584dd5ee18b9972c27c523570075d4d0168f3e3d8eb638da7ca08ab3969904e39ec2c76f4891fd649a26553abd4115a41b70bb
diff --git a/app-arch/lzma/lzma-9.20-r1.ebuild b/app-arch/lzma/lzma-9.20-r1.ebuild
index 2618388b9359..32cff7d3dea7 100644
--- a/app-arch/lzma/lzma-9.20-r1.ebuild
+++ b/app-arch/lzma/lzma-9.20-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 S=${WORKDIR}
diff --git a/app-arch/lzop/Manifest b/app-arch/lzop/Manifest
index 7c1e1e719796..5fdf6aa07a44 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 962 BLAKE2B bb47311b89987a93b2903a51dd7cae7aede3f26162fde50603e21d649aafc6f2ac6f6397a22047bc7892836f02986947c3ab0c9461ea1f492863d662a997f815 SHA512 287a66bbab2ce034617a2c3b130a7462b7ae386085486a7d629094eec292470e8af29561c21f1db105c136e80ff46472147277639efb849e0fee12261b86cac6
+EBUILD lzop-1.04.ebuild 963 BLAKE2B f5f8690851f9004bd68ee004eba7c8b890c71c2f55cb90bae35ff033b7d2f6e20a72adc5fe89e1f9da060b4a7927dc3302f385818337b8c2eef129efc9c0f51c SHA512 3ff2fc808a95295f317cff28f126618673c0d33ae45ef8d712e7cd732e5d8e2196bf09fc098cde9c0f44ca12cbe292b63725ce25cb75d5a9fed87fb7065735a5
 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 33c0be75182a..96e63bc39402 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/mt-st/Manifest b/app-arch/mt-st/Manifest
index 184d37763db6..5ad612956474 100644
--- a/app-arch/mt-st/Manifest
+++ b/app-arch/mt-st/Manifest
@@ -1,4 +1,4 @@
 DIST mt-st-1.3.tar.gz 35341 BLAKE2B c58eee9bd58a3fa5105fe3f8dfb56f1af1c5ed73f99e5179ea14bc11d66151d1e6b6c99f61194c700ed79ce10a7e7f75f78ffe9b7d2c45c85e620d4da1aaeb5c SHA512 1d026ae85e1ca367e72f1810042314070f592306d9ddec331b95ea4e1153dc3edee68d8798bdf7e055a4cf9c67ec8c539e5d188e87f0546f48b5f4ee4bc6a820
-EBUILD mt-st-1.3.ebuild 571 BLAKE2B 999275f482708c429e8b49d6fabce3a9cfa92ed3d171c070b18283a84c18cf8f814eef35bdb4b59a431292a60ee8c9597bd28106ec77b7d5258704abf9233cd5 SHA512 a2580556cfa0d6ac96c4012225b43e256ec4ac5e9108dd8c43b1b2fd1a25c6f021155cdaf3be8faaa0d84e5d6d8d9e90549b0ac257622cd19ad117f528119b5c
+EBUILD mt-st-1.3.ebuild 572 BLAKE2B 0ba3850e06c4c09f843fdc7dc6642c1661ccd5e60270f7c38976e98269537db3bad4ccf5c0aef986319f4534668a928e0b9b377dee5eade3115663ce82f78c4e SHA512 50d98822137156b4f507e8f91a960264564101f3a7cc2d40a31ca564f541202309a86170a5f4de199c66cd95f1b32ede6d65f7801c604fcd36faca608505f15c
 EBUILD mt-st-9999.ebuild 453 BLAKE2B 92c6e6718a621bdec7e78722c742ad1deb91da0192f20115b0d941194c4f7bb5ef0f95cb22484815999eb1d44b658498b6584cd0d71c412ffccf404b21910720 SHA512 a1241b5d9bebc4b7bd4e10d939f2f6305b1d166a4d12270484b5533c28894dd361e347b74cbc477b50e00e154c3ddee060a9b46bcef5a4d6bfcaca080d4aa416
 MISC metadata.xml 321 BLAKE2B 3f2c57ecada60ab514926a4ddfe2fc0bdc11148a50bdeed1d336f13863e735f83056d4e647e80995c90fba92466252c2ec202e2fa9e3c667ba5a8ae6acbcece1 SHA512 79dc941553281909153cdda8422d4ac5da172a6d782936986b581a1300dcf4b4781704bb7c730f48905f0dc487f5ce781bd96abde16691d67bf5da220eb94471
diff --git a/app-arch/mt-st/mt-st-1.3.ebuild b/app-arch/mt-st/mt-st-1.3.ebuild
index 2c207cbf943c..9b9387f7de4d 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 cf64ce9e87f4..5d13e430b4ae 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 713 BLAKE2B 91f648868ff86c61ed48691eeaba54ee149f1b009d7a584453c0adc8ce5ba0a75263be3de79549d951091dde19fc382116ef07aafec55295dd86419adf69e312 SHA512 0106cf2c033c9d4851b9ca2d6e91fde2ec87fd9d10467634e6e858f89a03580e9f600394bddb58d8a746920aa6798471dc7a1483ba22daf62fbede74435b66e4
-EBUILD ncompress-4.2.4.6.ebuild 761 BLAKE2B 1ff3e12e18e5c753aa1fafbbf33e87f307fe192371be63cfb990ca967dc5e87f7fcf4ce7f4f8c3b1265d0f55a85a63b62249f474f28258d3186a5822d4aa5996 SHA512 0d7e69bb735cd2a8390943b0150061bfdc7e153e50a71d80fe2c3c804c380370baa2fbcdace580f9911764a54cb6190d6f771b7d03f58bbcc64764183aed53d2
+EBUILD ncompress-4.2.4.5.ebuild 711 BLAKE2B f495fe210baee8ca47d6c02569c3d9ddcf38f6e3547292aa897cfd6437105736d905b15cd6b412bcdefcf0b15a01ed210c682fbcaff5dcae5c844cd11497e5b5 SHA512 1b3f69064de0a3c003bd71e0e8b3980768a1a5f57220f9833d8dce696a88c4e1de0d3864bae96b8b576935e107b4d08f23d6ffb95ece82263e5f83ad81eca971
+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 7edfcc5ebfc1..1d65de24f5e1 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 sh 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/ncompress/ncompress-4.2.4.6.ebuild b/app-arch/ncompress/ncompress-4.2.4.6.ebuild
index 01c7341ac7ec..b6a8705dfcee 100644
--- a/app-arch/ncompress/ncompress-4.2.4.6.ebuild
+++ b/app-arch/ncompress/ncompress-4.2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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_prepare() {
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index cb9432f884ba..594b0aec5d31 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -5,6 +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 4635 BLAKE2B d68cff6789a738114fc9d0fc724af210f23bd6ac20e0eca231a96067fa0e7648924ee21607c016612e2646ee9fe3618d907dfc4f32f23956d0a858644ac2ed6d SHA512 cbc2d6017d79100cf4db2a2427b724b1ebb3ed74bbf0e1701668bb4bcaecc152a107705232b0bc4bb050d7fea6b65bf649f1a79ebae249ef645117e8d0c00cf6
+EBUILD p7zip-16.02-r4.ebuild 4636 BLAKE2B 9fdb8cccf0921c95670f251114c5e32925cec4c68c28b68b3326947344bf30faaa6a32e2385100b52565053fa9b5de06067c5b5b4390e51c9c467e61a10976a3 SHA512 82861403e305d2ee2b980e158b2614d3acf563097a07e920e7ffdcde6ac261ceaf02789ad540816067ed445050dfa67961ff0a88bd456cf8bf1e1149fd9d88aa
 EBUILD p7zip-16.02-r5.ebuild 4802 BLAKE2B 98405f4baabcf5ba6c482b133f9451f0a786e7460007b9ba09a135fe0975e08c813d7bb6569190da9def27bfb0b4c548dd9d6b92c0e652bc049839e500a3c669 SHA512 092759547ee6849b3fae31cf1ada4333d82955a7c91ef6db25b7c2ab153daa1105dd4a166b9412cd3cba8ca204c64adae4d8d08d22fb8ebe2c0b34787abd870e
+EBUILD p7zip-16.02-r6.ebuild 4780 BLAKE2B 4e214432fd6115bf7c2c0737d3784cba214b8166ad6b2ba6fad97b34a0d8737b39b13be3f4675e6e42d7888d17d5e38ca184224d59120999800647ce240d9a94 SHA512 9d2a0d7c7f504fed119dce4f81c7435008a47716b99116651dc6a6a2f38c5c1c4c7cce0ac8483b8351fa1e0a9fc53b245ec718e37e00c64b01f28dc3df36570e
 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 31e070b1fb1a..4474ae1c94c8 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/p7zip/p7zip-16.02-r6.ebuild b/app-arch/p7zip/p7zip-16.02-r6.ebuild
new file mode 100644
index 000000000000..94a2fca9fe53
--- /dev/null
+++ b/app-arch/p7zip/p7zip-16.02-r6.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0"
+
+inherit eutils toolchain-funcs wxwidgets
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="http://p7zip.sourceforge.net/"
+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"
+IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+DOCS=( ChangeLog README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-darwin.patch
+	"${FILESDIR}"/CVE-2016-9296.patch
+	"${FILESDIR}"/CVE-2017-17969.patch
+	"${FILESDIR}"/CVE-2018-5996.patch
+	"${FILESDIR}"/CVE-2018-10115.patch
+	"${FILESDIR}"/WimHandler.cpp.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use pch; then
+		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+	fi
+
+	sed \
+		-e 's|-m32 ||g' \
+		-e 's|-m64 ||g' \
+		-e 's|-pipe||g' \
+		-e "/[ALL|OPT]FLAGS/s|-s||;/OPTIMIZE/s|-s||" \
+		-e "/CFLAGS=/s|=|+=|" \
+		-e "/CXXFLAGS=/s|=|+=|" \
+		-i makefile* || die
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed \
+			-e '/Rar/d' \
+			-e '/RAR/d' \
+			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
+		rm -rf CPP/7zip/Compress/Rar || die
+	fi
+
+	if use abi_x86_x32; then
+		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use amd64; then
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use x86; then
+		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU
+		# linker, it doesn't matter so much for bitwidth, for it doesn't
+		# do anything with it
+		cp -f makefile.macosx_llvm_64bits makefile.machine
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
+		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
+			CPP/Windows/DLL.cpp || die
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/makefile.list \
+			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
+	elif use x86-fbsd; then
+		# FreeBSD needs this special makefile, because it hasn't -ldl
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+	fi
+
+	if use static; then
+		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
+	fi
+
+	if use kde || use wxwidgets; then
+		need-wxwidgets unicode
+		einfo "Preparing dependency list"
+		emake CC=$(tc-getCC) CXX=$(tc-getCXX) depend
+	fi
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
+	if use kde || use wxwidgets; then
+		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
+#		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zFM
+	fi
+}
+
+src_test() {
+	emake test test_7z test_7zr
+}
+
+src_install() {
+	# this wrappers can not be symlinks, p7zip should be called with full path
+	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
+	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
+	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+
+	if use kde || use wxwidgets; then
+		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
+#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
+
+#		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
+
+		dobin GUI/p7zipForFilemanager
+		exeinto /usr/$(get_libdir)/${PN}
+#		doexe bin/7z{G,FM}
+		doexe bin/7zG
+
+		insinto /usr/$(get_libdir)/${PN}
+		doins -r GUI/Lang
+
+		insinto /usr/share/icons/hicolor/16x16/apps/
+		newins GUI/p7zip_16_ok.png p7zip.png
+
+		if use kde; then
+			rm GUI/kde4/p7zip_compress.desktop || die
+			insinto /usr/share/kservices5/ServiceMenus
+			doins GUI/kde4/*.desktop
+			dodir /usr/share/kde4/services/ServiceMenus # drop these lines after konqueror:4/krusader:4 are gone
+			for item in "${ED}"/usr/share/kservices5/ServiceMenus/*.desktop; do
+				item="$(basename ${item})"
+				dosym ${EROOT}"/usr/share/kservices5/ServiceMenus/${item}" "/usr/share/kde4/services/ServiceMenus/${item}"
+			done
+		fi
+	fi
+
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
+	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
+	doexe bin/*$(get_modname)
+	if use rar; then
+		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		doexe bin/Codecs/*$(get_modname)
+	fi
+
+	doman man1/7z.1 man1/7za.1 man1/7zr.1
+
+	if use doc; then
+		dodoc DOC/*.txt
+		docinto html
+		dodoc -r DOC/MANUAL/*
+	fi
+}
diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
index c670d4213208..4c5764d52ffc 100644
--- a/app-arch/patool/Manifest
+++ b/app-arch/patool/Manifest
@@ -1,3 +1,3 @@
 DIST patool-1.12.tar.gz 69146 BLAKE2B e97f64b4ba41860c1f7e506f63f249adeb02974b71bf83eb1673ae1fd93b8f9b698818cb57f961b3d3a5d4e445c5e7a3a349db54e1eb11a8fc165ad07722ace9 SHA512 b8c67526ce79448de703b03ca9b363c0e04cfe56bfc6168bcb96202f95022b6bbcaa92be86a85ee9608070206acd09382b0dfd08a2f805c5e8e5683c7c3f18cc
 EBUILD patool-1.12.ebuild 431 BLAKE2B 8a34c7a48d6fbd4d2648af65c4398c8612151f936ea329e0803e19c67a8ef289b1bc21687b852faa99811b1b87a386dee3c80a6f35be800745751ed86916e378 SHA512 789250f3504ef89d37c9290984e6227d0caf79dec9565af416c268e397dc40dc6e9b2d11e45817dce73fff82ee5e73d684acd1d06bcbf98bb637bba5a9b2c947
-MISC metadata.xml 455 BLAKE2B 7e079e454e413cbafeb93e91a28ae913348ef108667e76e5cb5e4f63106e43fb8d55cdc6549f110af324acfa1d280e2d483bdc7f648f0bbffbba0c361adc1272 SHA512 d6d0b1c1a2704fbf8949295fe2a4e3f527bbd9b4cf509f3d6da756cf358fb123afc717b87a7cc463c90246fc597bef8394d4a70f1bee68b0c58f8ce99178201b
+MISC metadata.xml 447 BLAKE2B ccafaf04ed84636b5770352177498e9eac1e32bf1ef3f78bb30f9fa06867a4d35f59606a59b1b7fb71f9162965e2667958f05eb0a1d779c16c43aa6f2e1e843f SHA512 4ae454d71fa13443d6b3e4abdd691589eb0e968cab22743a400529c4746391676919b7ef6bd6d46a0560ca9e36a37ecaafb084eac1dca49df6269237062eb896
diff --git a/app-arch/patool/metadata.xml b/app-arch/patool/metadata.xml
index a4abc22153ba..aea3a803cd76 100644
--- a/app-arch/patool/metadata.xml
+++ b/app-arch/patool/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>horea.christ@gmail.com</email>
+    <email>chr@chymera.eu</email>
     <name>Horea Christian</name>
   </maintainer>
   <maintainer type="project">
diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest
index 202b7754e3d1..07ba378dacb8 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 1459 BLAKE2B c0aa6eb6da7bf93cc98aa7137d8fedf9f772f331ed9ccb65ee50198634f3c1cc5ae2de461cb32b9d1aa385bc3183284e5169e1d6d0c661b0698c1db9d6496736 SHA512 7d90917ec6d9a6a6d2b385a2f6ebd99b949f2474eddd116911b73c5fd5f73fd5fb513268ba51c2537084d255e75e29ed8730e0c93471023e14713bc1ec66185b
+EBUILD pax-20161104.ebuild 1456 BLAKE2B 8e85d6984aaf0e4b2a186a193106e68e36827fbbbd46dd5cc433faeb632d411b973dadc5aa6c7ba62b73020aea716c5f228bf42560d9726850bfcef4523fa7b7 SHA512 14837018df539a7cac92eb5f40526d9911d6eead2bd15dbf2bc4b9354c6ed5d949d650956af9f001085739fd960ff368582c569a8320fd1aa8ebf57856b7f74b
 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 c7fdcdfe4ac7..65117db6a47c 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 ~sh 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 dfc896b1a9ce..8b7665ff8163 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -2,7 +2,7 @@ AUX pbzip2-1.1.10-makefile.patch 263 BLAKE2B 32043c1a47504a2e901d9c4cb4360f295d3
 AUX pbzip2-1.1.12-data_truncation_fix.patch 3348 BLAKE2B 848afb0cb6311a28ba958346fdda210aa7bb325c8e3a174c7359e574322f8eb41a04d8e785aa70332de953db170706e9c1fefef6d7274ebfbc211769f4dc88dd SHA512 c6bac8fe33f9d123358c1a01cdb94a8dd6be4c63553f62568311f06b25cf371ab7d881797ebb0d66d9f772c5644fe1f38a70fdbd64b99adaaed82f1e96dcc966
 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-r1.ebuild 1125 BLAKE2B 7e4cd75a680ca14e3e6b3aa55a35fbd16ed9889d86ca5a6ec74fa28217d57ee36f67b62273bd9bdaad132ce8d0a431569b056422dd9499e04ea588de1db9388f SHA512 25822ffd6cd69cc8d3de6590265d61d8ebe3f3f30113b40b5b7c455585588dfb7e5161f14d46c758a57429c803cfe653037dc4237c097f570fb76ce27a307e8f
-EBUILD pbzip2-1.1.12.ebuild 1064 BLAKE2B 079c7bb7b22f2d58522b6b5cf71d6cda169d3a7583f7d0ec13b502135225c31b1fe9a7624ca28dbe83eba3e19a2e25caa42cd5d4cf24e329a08dd97e3d0611b5 SHA512 d65ed490af78b5965ddab9c71b70cddce0594db0f29113b8985606e874fd51e74d7457c87fd793d0770eecde41b8c9ee68d0e49aeca08f4682b313f84cf2f119
-EBUILD pbzip2-1.1.13.ebuild 1144 BLAKE2B 469aa7167f20ad067eb61e5295b0891e6327c80a16bcb4acc0fc2ab357ef183149aaeca40fa740154aecbf0cf6341e0b41ff0a1f9b082eb774886c0841ba118f SHA512 bd9abb69f0c54c60ac4836253faec12b55dd6292da903bcdb17c5f08d6c990feddc05d86ab90aaf341acb9b1f9b16d8f139f773dde8c32901f544448dbc124be
+EBUILD pbzip2-1.1.12-r1.ebuild 1121 BLAKE2B 14a9f667c480bda2dfad9cf6f0128b58464743f094c0c7bf0127d49e2c6ae9074442c7a4929440b317c500fe9778a172ff9b18254e2eec1a75e0cbe64de7fdc4 SHA512 e8c84b0a868234a6072873f9b3b51166466d53a406068625189287f0a9037e5296f73c9b28a3041c3f6c1d642c4bcdfa474946dae44e04a0a3e7134fe21afbd6
+EBUILD pbzip2-1.1.12.ebuild 1062 BLAKE2B 42de6329e8a1ce041d54293a1d08595e886ce0e7f79ea9f30d411ccd22c360d4e630de4db99b4ce02cbe2e55bdeb5f51cc98ec3960dd26dd8bca125567fdcadb SHA512 911c129fd8942ee15913ceb2d86f97fdca629134f0d524b5b5a30912b04e8e5ebccad77e4cc5a5d0b51ddf7e9fe6457bb15dd39346852241381022480f087bb5
+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-r1.ebuild b/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
index 46b9973a1e9f..8590d21d4811 100644
--- a/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.12-r1.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 ~sh ~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/pbzip2/pbzip2-1.1.12.ebuild b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
index a262d448ac11..0cf5fd0d7382 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 sh 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/pbzip2/pbzip2-1.1.13.ebuild b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
index 0da12986a25d..18d59a91340f 100644
--- a/app-arch/pbzip2/pbzip2-1.1.13.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 b9a780dabcb1..0432a7c1198f 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1,3 @@
 DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
-EBUILD pigz-2.4.ebuild 961 BLAKE2B 03b35aa60d2a9c8998cbb56b5ccc1607c074541df1a12fc69846c9d6bb833b0ea514f2db88158f078656568924d421a80cdd4cec543703fb5f62a33aa1191ca6 SHA512 9d0e1aae18358b6fd085c0bf9ed34563972acf4e63ebba9922d9a7d1cde47eae291d97014535fa651b19d7d950c20b5e62e631209b91e4ae43db2bd56c7d95f5
+EBUILD pigz-2.4.ebuild 959 BLAKE2B ee8e0f81c1ec39d88cd57cc514f563e844ecaa59e7edad334faac77a160b7ceba3632b9c62e631085a2f4a3da1b7aba38542874feecc67d096a43031a083db58 SHA512 91e673c6cdcab6f888fa0321a5914f5767c273dd234b8c748b9e691a79a3a541dfa54eede8869a298f52e31ed4265823084d6ab12d8d02a73f68f7e09bff1d2b
 MISC metadata.xml 688 BLAKE2B 4dc6a54347303d0af5b2d77712a6bcbf4f02e81ebf2daf070f7820d0ea4e99896a5ca7e8134d4ecd6e14cf55d2fb178e9d4e95f6db15bf884d9a68d9c0f5b15a SHA512 f9f5fb0cb1f972ba85a2d80642eee5b061b7d81e4e20a4e2cd1abf958aa5702905b06dca8db65f7ed906ac08c0576e89f01e8a8630f8bd97fda6b5f6b0bb718d
diff --git a/app-arch/pigz/pigz-2.4.ebuild b/app-arch/pigz/pigz-2.4.ebuild
index a716aa5a4f99..fe1190bc3a3f 100644
--- a/app-arch/pigz/pigz-2.4.ebuild
+++ b/app-arch/pigz/pigz-2.4.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 sh 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 f357fb775093..751853df1a6f 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD pixz-1.0.6-r1.ebuild 1185 BLAKE2B 3704f7974737bca5286d4b06935f0856324652e040514470bac6b6f16f11994ae4611a15ab4c19b86d38a15a13fa1bd69e006e3cb8bbc1fc7bebff885ea34f59 SHA512 8b4286de3fbc729aa5c8b0860e0b63b839e7e700f2d71db2c461e8cdb74d718e3d6d09b57012eec4cd828a62016240650999efd59738d3d7000ac6f1ca0a98ee
-EBUILD pixz-9999.ebuild 1130 BLAKE2B f04a81379a912fc19d19e64d6b9d111de1686f8b0bb75c93ce40ecc17d1da590aa2e728a9792613e7d1bf10f6bb725f5c674b8d3805a20301ae014b52bbb75fb SHA512 bad7eceee00c8e404d28cc82524b7bb9da4ef92b354fcbb00d01df951e8892cb431a6dc14c4e1acbec6321d9e520770f265eb7a8d05175a219020efbf40c5f28
+EBUILD pixz-1.0.6-r1.ebuild 1183 BLAKE2B 2d8986ce006b2cc210bd3b6f37ee6e597e4eb9ee67ada725d6361458821fff94960626c6eb22c0f47b30d8bbf476def3f480fd0902217cc90fb171b46da3f525 SHA512 257be5210265a0b7e29d905ad448e842e4c9b896b7308cfdf4f27bb9842a16124a73e3ebfabe763cc31178b0bad96ed861dac0a4f2eecfe02dc69241e79a5348
+EBUILD pixz-9999.ebuild 1126 BLAKE2B 497f27f12ac24fedd182a7d243f3146fed4fefee90b5ab3d1b973cb040ccaf20b221326babea0a79412b74bea4d8283a773e0dcc8ce9dda6f346ec2e40379d1c SHA512 162de9348066f59328d9f71f770f99ec5cc2fa649bacbc09c5fb8646d05491129e505130c67222defdba029858ed5274c777e6605984a0980831a504f8129882
 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 37d6b9ffdf67..faee51a9f012 100644
--- a/app-arch/pixz/pixz-1.0.6-r1.ebuild
+++ b/app-arch/pixz/pixz-1.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 sh 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/pixz/pixz-9999.ebuild b/app-arch/pixz/pixz-9999.ebuild
index a1998849bea6..32751bd95c46 100644
--- a/app-arch/pixz/pixz-9999.ebuild
+++ b/app-arch/pixz/pixz-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 ~sh ~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/qpress/Manifest b/app-arch/qpress/Manifest
index 1066cd43b93e..c56d5581c55a 100644
--- a/app-arch/qpress/Manifest
+++ b/app-arch/qpress/Manifest
@@ -2,4 +2,4 @@ AUX qpress-1.1-fix-build-system.patch 231 BLAKE2B e8fa8dad2a660d37e927f254804ad9
 AUX qpress-1.1-fix-includes.patch 158 BLAKE2B fa446d129cfc56fc7d53c342df334810311de9c5e903ee8402e78b196583d5caefee29bdc2381e4f5c9193f57a328f196e68e0c79031ca37fbe40ce7d7aedeed SHA512 321cdafc7ca71597c4ccf94a8493ff5156cb7103266d5c71ad4e650efded68e91dc655ae567562f5bc28913b137d9d3f142fbe295703864277e4e53729bf4658
 DIST qpress-11-source.zip 26998 BLAKE2B 08dd943f248f7211e8588fbaf7a2c2eee988d33b17aebfb5f1178647d80314fde576caec9b4aab67d69689f5931d086f88fd51204c1df6d3abc2cca583830380 SHA512 986754cca8bb2cdcfc7e197f7e123c6b2da90db840642a6385f14613f49f7ec6b2c18944838405fe35d5382d71fcd5d69050a036dda4c5de2e588d144e16ea6b
 EBUILD qpress-1.1.ebuild 589 BLAKE2B 0335a96ebdca99ddf6fc95ab3baa9c519dd2a5786df3f1f3bcbd68186b439cb273ccd137813b585ec92a4d5196dbb0a288307a704da15ad1c3ab711062e2167d SHA512 a1825c173d6c2222a8533bb363d87c6432e77e2c064832d52aea57c934ed3543e19abb26604dc9e588c78489db614c751eb5d63147ef6588ba6ebd1624d69773
-MISC metadata.xml 477 BLAKE2B ac47bfa42430372f34f6bb63148e95db752d885f1f64740d3d2a817189e01921659914c1b16c5e5b5ec3810c9e654c9a56b2803c164249d5c009bd76de1e0af0 SHA512 e75146f4a742e9c51d47ea4e0c2e4058547378907abc0fce61e83d048c7af2eebe67fbb2f52d9affdef9a793e7c6abf63c5a1799dbe45b37c3dba74cafeffaba
+MISC metadata.xml 376 BLAKE2B e46b4a437666942d54605eb173680bd311df035914586e643a2029b95d3d23d1ab4bbbecc6afa5be4421762861e8bc9e9519007aa2f4da0d0b3095aad3438911 SHA512 360cff53dc314b9b94a0aeaafda9b8dfa63ba77264f09412062151bd5be877ea0354fab3f2b3148658c7aff45e96a773c04f1b3e70e8ffa838839b31676f2282
diff --git a/app-arch/qpress/metadata.xml b/app-arch/qpress/metadata.xml
index f326e2195f06..49901e8a0d40 100644
--- a/app-arch/qpress/metadata.xml
+++ b/app-arch/qpress/metadata.xml
@@ -9,7 +9,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		A portable file archiver using QuickLZ algorithm.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index ccb81b3e0d54..0c8685c8625f 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,5 +1,5 @@
-DIST rarlinux-5.8.0_p20191205.tar.gz 564176 BLAKE2B 78251a10d995c47766d2d6f0b553aaf1230e3d47b0098a7f137d499d3e182bbebd3d1c35551032f5c88166c646037733f9be8833b05a1aef136918cf2b29b556 SHA512 0b8d2347a4b14e26285dd99add5fdf9c2f1a9d9e1bf7524e7b31052d9aac6337e592da02ed5dc4dc9ab9020587bf89de865b53a5632ac76097c9410ec7cf916a
-DIST rarlinux-x64-5.8.0_p20191205.tar.gz 551942 BLAKE2B 57fb02ee14571e508515b107adbce2055998cfc05c1c0b5d297fdb021c418c59c9e9cf594cdaa919c205193c7f4454af59d68c98559f85e3e8c3b00e7fec1c0b SHA512 625138adc3c9fb0ceca54c72ee53a0c260e9c9ca53df5c192386884474482dab34477b0efeba760366fd31c5c59cdb2baf6516977b5c61927606bbde146ee350
-DIST winrar-x64-5.8.0_p20191205.exe 3214504 BLAKE2B 41b23a157c0af9d024bbf404c134bad5d026d5668eb18c7bc21b9627b5b82ea2dcfd81cbbcae8a7150a5f3cf1b7982477e23eeed3640dc0dbf29ccb190176a6a SHA512 7b55ab2daaa9a11e32b9d7ff3df1c76de6786d415a8d3650cfae9b5cd27003b53b67336c8916ed138ccb996797392f9dbd2f49aeea9ba5cef04f6331a82c0e0b
-EBUILD rar-5.8.0_p20191205.ebuild 2232 BLAKE2B 6a64615a5e321272e4517c42268f4503b0756e0c8cee81e9b16123c542e568fb8ee5504c66d14059d209c2f3fb1806867146e0405ff603ce2970f61f5452c177 SHA512 2ef3262db0c9f9d862f2da94fb72a0e513e5f04bf74f51656aecb08b5e786ccdc9abd04d15ff555fe41e5d01cc7b01ef920b58254a52a097b8f5001fba58c29f
+DIST rarlinux-5.9.0_p20200330.tar.gz 606599 BLAKE2B 81803108938b82aec07e0a8aeffe764219c6965ddbda3ac73c04ee0c6c7f8ae6090bf7a39fc0215a639fec8f5b9af7f8518ae2c18bcd2a0f836c0560740fde38 SHA512 0c5328d3113e0c821d840dafdb7bc0b4f5161b8b7d76e2227bae3daa3bf55d99d06a167ece961157f69ec2494259bb56dcd87769b0782962614cc2c4de01892b
+DIST rarlinux-x64-5.9.0_p20200330.tar.gz 595460 BLAKE2B cc8e3dfdbd10a959b9643a4a6b12e8e346f6ed2797fee61fbfecd02b8570212f87514e749943e8998941fb00e026b300597ae52975ac326cc0a2962ba8d1a8a8 SHA512 a7d88a8705e4876686f880eee461180a3d2dac5c4bafb2efeec46a8c2bac2c07b09fc0827f39aa1417d0c8a64d3ed5b55244b08400ce5a0591984e0e9c5c853e
+DIST winrar-x64-5.9.0_p20200330.exe 3226248 BLAKE2B 50459e4b476bf9ec6b59df712a61f5108442fdaf58f7ccb1c021f1638a3327e155a5b3573e0566d3a262b8129fc28c176ccc2e9a3edf2851986c8a5aeb3288d0 SHA512 8b0791eab87aeed9f30272f11fa304189f1f5d077457d3ea608c59e19dfd6ee9e05f98f03cba4803dbe24b5bb68f8332a59cd9bd2fae76d0da0405a92b8e3b3c
+EBUILD rar-5.9.0_p20200330.ebuild 2232 BLAKE2B 35d9813aff0214bedd8580d884df51a57d6fa13a85bd1dff818c76a59a399c12da4fb61910508a351ed3519ea52d99719c09435d5d04192ba1c5c0463e71bab4 SHA512 09c59590aa819cf74013ef125710d5e86c67f036a9ea9ceecc47fb97acd600ae1bf6cd031de5c37d85407d2743f9da40c0a2bca31c2a62848a8e1c509a78081c
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-5.8.0_p20191205.ebuild b/app-arch/rar/rar-5.9.0_p20200330.ebuild
index e7514ff5be78..b90959c703e9 100644
--- a/app-arch/rar/rar-5.8.0_p20191205.ebuild
+++ b/app-arch/rar/rar-5.9.0_p20200330.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 DESCRIPTION="RAR compressor/uncompressor"
 HOMEPAGE="https://rarlab.com/"
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index cb0886525d2f..688f6d1396f0 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -3,7 +3,7 @@ AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400
 AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4f84c7239fed6ee9830611de98b7a0bf0e7675b861c27a436b73dad64dee674e2780644ad712164beafbfa2276e SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc
 DIST rpm-4.14.1.tar.bz2 4103880 BLAKE2B 3fa7579a251b02ec89943b5505ad9ca7303a444eb64b1018fc74bc6dfb1c19d4f30d96189172c4450925f3357174cde70b298116b53b9155223b52a593a67aea SHA512 29e95eaaf40a6ddf7f23446ea6cb8a1dcd12a45d4965595a705cb9130890d772a40ecfa475b189865da51248b3d2414e4f4b1a40cbfd7ca538c482d87c50a218
 DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
-EBUILD rpm-4.14.1-r1.ebuild 3374 BLAKE2B 692e47af07ac2290b756d4cbcaacc1c5c607dbf6b7055de567905bbe3851bf5c0dcd8a2ff38efdf907eca81493ca666436932ac27fe9ea2736ff40434aecaa82 SHA512 95744eaffc959a301fcdd21d528ce64eeead6078c0ad6967ca6b6c2da4586d1a391d1683ace0721e9efced306746f779bd0d50935a92e16f750fa8dbe623dfff
-EBUILD rpm-4.14.1.ebuild 3229 BLAKE2B a330bec697534f5268935a40caec3b938d559c18944a9acaba947a4356c43b8c2d4dc330a8068e8f2a45d22c00eba182aff23ff427202f5ca698ca16e0fb6d9c SHA512 db431012cc8a81b0abaccfa0ba568fc64a5fa76d47b1b956a5669be4f084ae80d2c3fbcf36e569b90189bbefcd5bef60177f4b26d1610fd5fb27b68784a522b7
-EBUILD rpm-4.14.2.1.ebuild 3446 BLAKE2B 49ef7481446e401923378bd40fdb348eeb90ce093e04e785cfbaf84ff2607b1571906769f6e1570a543d4362b24afbf408a929e8cc6304dfcea15191679ac065 SHA512 778d758b80463b673a62a209a8d0eafa809d2e52c2e2f46d76fb560345d191a0f3571e7550906beeeb2b07197a28ea5cec5eb0b748f53d06cbf1a1e7390e71f0
+EBUILD rpm-4.14.1-r1.ebuild 3370 BLAKE2B 91d16125d242b9e47d3d5d574a1fb3bcb06eea579a6a9dd86c74ba68f589b43ceab3ebb92e8e34101a3962c5c2f37fa264035fae2cad266a1de82fa464fc9870 SHA512 04970130008be7b6af851317db973f418363958805c851d090e046d9406fc82a233618f5c356f9bbf2c457690304a732ef5f245ec90edecc4467570189335e1b
+EBUILD rpm-4.14.1.ebuild 3226 BLAKE2B 688ea6295eab51b9c822f124070e3b0a45388f91c213392ee2fb7b70ad73614592e3afa04201ff645ec9ba0813d1e4bbf8dc68cdc5291856471a26e84663eb0a SHA512 d1fdbeb1010e1948ba93c23f2785e76844401edfd0faae29fc4031fa647b8bc253669df78548f2c2990470f8cd72cd07865b07456fb42c6c6c5c73f34a3f47ae
+EBUILD rpm-4.14.2.1.ebuild 3442 BLAKE2B 26439f164abf522c84d70ed279c4f13d8ae10e4de5ae642788320895c35d30fb23e9523f38cfd915d8ab7faa90137b08280ea0a109dcd1c653a48403ffd4ea23 SHA512 c3aad1d7759d7aeb66147b2fd2d606225dd0c43934066aa66e9a2cb6a2a24ed0a80189d294283ee319cee89c0efe5d828186b2f2cd1dfce7eb2f6535fd654d0b
 MISC metadata.xml 337 BLAKE2B d01523bdc86c3b93ae548f601265338290470dcb578a79757ba7d3b2c4be257c89e76c97b5d411f9271d9ee754981a004b03e2a5cfe9b6bd56e32932796771c9 SHA512 20a89c9f7af0c1a7dd5f325eb3c1af65044a6f09e6ea8c70033bf35819ee18faf8c3a0ee2cebcbc0849a84e962dbbdd2111e02b3369d0feccf3719dc0bcfa6cc
diff --git a/app-arch/rpm/rpm-4.14.1-r1.ebuild b/app-arch/rpm/rpm-4.14.1-r1.ebuild
index f95c369665b7..52ab90d95289 100644
--- a/app-arch/rpm/rpm-4.14.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # Tests are broken. See bug 657500
 RESTRICT="test"
diff --git a/app-arch/rpm/rpm-4.14.1.ebuild b/app-arch/rpm/rpm-4.14.1.ebuild
index c71cfe517173..a0b7fb616cf5 100644
--- a/app-arch/rpm/rpm-4.14.1.ebuild
+++ b/app-arch/rpm/rpm-4.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # Tests are broken. See bug 657500
 RESTRICT="test"
diff --git a/app-arch/rpm/rpm-4.14.2.1.ebuild b/app-arch/rpm/rpm-4.14.2.1.ebuild
index 404c615c4bca..138f3de74f04 100644
--- a/app-arch/rpm/rpm-4.14.2.1.ebuild
+++ b/app-arch/rpm/rpm-4.14.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # Tests are broken. See bug 657500
 RESTRICT="test"
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index e4eb88663363..6ae95e9a8529 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,3 +1,4 @@
 DIST rpm2targz-9.0.0.5g.tar.xz 5740 BLAKE2B 88c903119fc19bd1d2eec1ccc7616e05594465a0595b75be8ab8095b5404420a8a09ba8fb176ee21efa5df3b12d4436b60119a637f70910cc020bcb3dcc3833b SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549
-EBUILD rpm2targz-9.0.0.5g.ebuild 752 BLAKE2B 6798d59a892b9a4ddf6ab6351695b66c4414a01f6d2b2880e697a1af765251a82308f11f0f372ddb88c10300a54aa97ccb9a7584697a9e98e5733d3548e76a4f SHA512 f9e0dcbafb43e5225ca34e5502837391d2808a2eebea71b87b4e03f49175eef3e471d635fb04e6f54d5008f6cd8c067fdc6500a26da19a7bc95c036f2692aac0
+EBUILD rpm2targz-9.0.0.5g-r1.ebuild 743 BLAKE2B 9eaecabf868282a941374ebc9c0a9a15bf8f7fd7f59c52d1a2636138fb6d8254af3f1ca5815023611248fc09efb9621b1b66371556c94fe1b1e2a3586bb90fc5 SHA512 66c04f41e728f7e77317eb1ad0f6ca28afcb3e44df57c0b59f6ac10d96057bb19fa0e8702ae603c05684f00d0a13155b3a581c8320937cad8ef814009872dcfe
+EBUILD rpm2targz-9.0.0.5g.ebuild 750 BLAKE2B f2b6867c0c6cf0019562db31814a518d83d630b21d92458be6b7e0976bafb772b65c5d6cf37f85b95ab856752dafee90f93cbac2f96df1c8b4ebcac0cec45090 SHA512 87d0c659846b4d14838145856a3e23ba97670d553969a006356d00f76a20d898a6196918909aa3a1195da8a62a5eeddc017a2ca88018e169a36f83b10a2fd963
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r1.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r1.ebuild
new file mode 100644
index 000000000000..8408bbd8e307
--- /dev/null
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
+HOMEPAGE="http://www.slackware.com/config/packages.php"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="BSD-1"
+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"
+IUSE=""
+
+RDEPEND="app-arch/cpio"
+DEPEND=""
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install # need explicit install line #397835
+	dodoc *.README*
+}
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
index 696d4c72b76b..e91ab284149c 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.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 s390 sh 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-arch/cpio"
diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest
index 36b1c3acf873..83e5f9aba905 100644
--- a/app-arch/sharutils/Manifest
+++ b/app-arch/sharutils/Manifest
@@ -1,5 +1,5 @@
 AUX sharutils-4.15.2-CVE-2018-1000097.patch 500 BLAKE2B 581ee4fa93ac9b7f2eb0a5b605f0072a15af174f8462f1983833d1314eb3b7dc7763af60f32e6baa054ad00abf4ca4a10a7ae88b59415ab8ea9de3cb674ccf67 SHA512 6415da74c4f6f203bc4ad617bd05fa6ac86e1079538236148763e0b5e81ca8ea4004ea58e9e4755ba371246a7c469ef1e421576260494043d3ce3fc80e73cf69
 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 1049 BLAKE2B 315f26b1c04893044ba0d1d01f927a4f58c8ecbb3462e050951982bbc139a4f99fcb00b5b0b7f1007e565bf7c2e1b1828d1c858e28a3e106585f9f69cfcbfe40 SHA512 4b7ab29223f2948c0d8ccfa5daf6e82b5638f3f563042ba4e7de32688db50437372e4842338cebc915f095888acd850bdad13f117146258e6bb0201fd45399a3
+EBUILD sharutils-4.15.2-r1.ebuild 1047 BLAKE2B 382b6afd9dda17e55374839a84f89e302180778dc2ddc72d228f91a2d8da496f6e84f35c4f122fbaa94061a60869ae6899aefe285c4c2b041905012a43a50f5e SHA512 513195217444a68799264055432a63e1026c929a2a428e6b633baa6db471d7de98ce109943a563869b2b124bcf025e9b6775455e47b08041475e6c67bece6e7e
 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 bf018da9bb7b..9c505cb4f75f 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 sh 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 de1e54d575e5..e0292fd591e7 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,6 +1,6 @@
 AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 970 BLAKE2B 5288f515e3806394b540bd5187cc277467b462526fac35dc2112fde0529f952083a02dc3bdd349e8fd6d24598f1021904861dec683a03bf9c98d9bfc60bb0aa7 SHA512 070e4bb4c2e4f67d6c22743d82660506478fee8c6fd936508a2beb687a57fbb7325283fa2e9b3f6cdac599a5bc19519b35236752d1926554047444322ac7689f
 DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
 DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
-EBUILD snappy-1.1.7.ebuild 1952 BLAKE2B b84f334b1bed916c25b36f5c0c32b8927164484651cc222c9aab6550ac595fd0bfd1063a63a5b4ce6dac349e3a2d1f4a738134c6fff1bf1dc336ddbe6953983f SHA512 1696057f25759ff815d51d7ef2d6c33687515b91ebe8eade891ad85b71f92e56c07eeb8191b2d65561cad48cfaf8bd7ccc50c32496c52cc005f7809ef2f72bc6
-EBUILD snappy-1.1.8.ebuild 1804 BLAKE2B 4d5df14dec4124658bf0fbd19b604ea5f4e30e550aeb0c9dddbfc8dde98feee42745eb1d6b6f7cf7a5388ddc2c43c1ad66f6a9308f206900a667d852f4ae2228 SHA512 16966dd32e29b178fd9dca61775cfc1c6db641a3b427b0835f9e14b984c8d7000c6800105c92fa1792be558fe8f0b57c2a2747656829886e435bc7bdccd0a76a
+EBUILD snappy-1.1.7.ebuild 1953 BLAKE2B a7573f26da03773394dc43d0098f30cdc04747ea4411fa4b0861f1cb0028211c714e5a977a19fc1ca72e8d01caa725b6a4b6b28c58b0eee9ebb81019c75847c8 SHA512 cd174fe770ad3e669409e9bdf6f79af5c8d86b811d63f0d88743f19666b2ad95cd1b03759b388d932513972eae8cf92ae719b16a91b10078e6084daab8a37ccc
+EBUILD snappy-1.1.8.ebuild 1804 BLAKE2B e8e9caaa8e080c6c56eebedfbf11e9d294ecdeda48e42cd24029f10138d5fcce0397f3607de64e176f17eade8a4d3c3a34046ac3c1406c5fcf4385c13b935402 SHA512 fefb29548ce8674cd7d11ceba5768fae44fe4908ca5106205fcda86cde178da3ca174a38693e1f4e63650bb62a5f5fbb28851bfdb2625a45fe969eb61327a0b8
 MISC metadata.xml 584 BLAKE2B 9972ee3948809ca45ea18129bde88c5a93fbe73d24c6e125cd13a45bb381099110dc0e006cf76a57d0baf7d18001bf261dd1d6db1025750b114903725e2e3aa4 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552
diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild
index bca5d2da156d..b72edb15b8f9 100644
--- a/app-arch/snappy/snappy-1.1.7.ebuild
+++ b/app-arch/snappy/snappy-1.1.7.ebuild
@@ -10,7 +10,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="static-libs test"
 RESTRICT="!test? ( test )"
 # upstream killed static lib support with build system update
diff --git a/app-arch/snappy/snappy-1.1.8.ebuild b/app-arch/snappy/snappy-1.1.8.ebuild
index cbc5476fba22..73dbbab511f0 100644
--- a/app-arch/snappy/snappy-1.1.8.ebuild
+++ b/app-arch/snappy/snappy-1.1.8.ebuild
@@ -10,7 +10,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 7e0cba5c4d95..0134a85059aa 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 2241 BLAKE2B 7278283c24c652daf44dc8b4c9f3874f16d9dd1c951ccb3e3282f0152d2e8d15b8473838fec99214186d0b2f697c001139a1dcea7d2d07f8850e7a0cc43f5e0a SHA512 7ddff2e4d12bbff96553a3b546868fd724b120372c7f3c96393aeb82d26f65699080969896fe2347e0c6e502e11484cc0a216da318e837272dc4327f20ffb327
-EBUILD tar-1.32.ebuild 2181 BLAKE2B 0ce314d4b1ef4b3b3a42fa62d325105e4638d207adef039182bf0baaa2f6acb609bcaf4cc10549c528e6b514c45a7a4859118939710b737ec5b469c99a9e6317 SHA512 0ca38fb76212006266c152977949b49f61070a8bc77ca96fe2f5b34f803ba482ed6a0ffad142bd88a35d1f380f6bf209d7fd26d4325d49c8868e24172f09f452
+EBUILD tar-1.32.90.ebuild 2237 BLAKE2B eee92c59adfaa94ed6f58a82d23ec0b715b834b4addaacfc0f98b90f5362fccac213ef4466313568f06b0513af4f99314c9279cda076ef0f2f1c3ad458a037c4 SHA512 c608dcf7c17d5add5e461d109ff6d78c6663c0860e3a9fee62286be0f07d92f5073b35bc3dc9cd624fa4aea3bab2a166cb9e36047fc267406b5b5899f1139649
+EBUILD tar-1.32.ebuild 2179 BLAKE2B 2d990fa4862680344060c1fcf175b1d6d84584661d070aa6a57db1caed50f950d466954452a098fa44d4ae3a87d68cfb79bf7b36d02ed4b400ca7010aa1b4674 SHA512 663958fad90912cd0b38fbb740143935a75c4ef7a802c79e5dc407202f5014da92894a1e431878417ec71bc09b27b6b0d4cb1b0474ef7a7bddb8c472a9801219
 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 64746b702785..e24fc8e11b86 100644
--- a/app-arch/tar/tar-1.32.90.ebuild
+++ b/app-arch/tar/tar-1.32.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sh ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 d57bff060419..a4ed6e4cb287 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 sh 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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/unar/Manifest b/app-arch/unar/Manifest
index fa0da1b7bf8f..cf159b78100a 100644
--- a/app-arch/unar/Manifest
+++ b/app-arch/unar/Manifest
@@ -1,6 +1,4 @@
-DIST XADMaster-1.10.6.tar.gz 2064628 BLAKE2B 34203e5280a8e450db616849a953eb9f5147c8fe2922fabdcfce8585fd4bbe2c3aad76921368818e546d60d64b9c59de942cb63008edec83efa29ce4f5caae7f SHA512 f6e51943fd3ced9d0a0a2189db0a7a45d7f59e8109e78406b8c434f568fb53d791613e51437996cb1debae7d4490cdfabc9fa1fdfcc621ad97a43770af6b13e8
-DIST unar1.10.1_src.zip 2552535 BLAKE2B 678c90dae6572cf9de6f90d044de650d82293df3918eb298de27fe5a557efdda1c1da284c6829c667bb2812033627fcb1a31bf22318d277e9467ca965435f6b2 SHA512 2755f1e2dcca68912f748587f195887d785d5c30933ca0d7a7de1dd35c6c1c115571e49f462fe15722e1b34560f02503382727e1df19a1f23d4a3cc75750434e
+DIST XADMaster-1.10.7.tar.gz 2064770 BLAKE2B f6119dfb46f3d617fafb5847f41d6c0f3e5e87c8cd0763cd8e5986fae1d5b1c6e6761e9e7e4fa84125003979151b2b34d35ff47dc9be3271107cf53f1be22644 SHA512 3447b6d8f3f4fa5eea93c6628a1633017da6ff09c580d5ce4fd422027b3b79acbf38d6e41a059806d1e60eb25a9d66889938b32599168dc2c0ca648e1c1976b1
 DIST universal-detector-1.1.tar.gz 196274 BLAKE2B d84dc1f850031213d88c288341edcbb588197f23ae0d10632ed129e73e4cc2b7670c8c862bba2165fcc7421c265e4dc3e791ea188e3d2b647bd1ab9b428bb866 SHA512 e514670b3d37b2472ed3e9cb0fdc3298a8479772264b7573411f104be554222bec2e01f73e1f35db95620fe785bee2dcf9ddc9c2b1f4ff6b522fa64d14d020f5
-EBUILD unar-1.10.1.ebuild 1182 BLAKE2B 19606fe1687ab46d2080b7441eed97febdba4d99b738e2b2251007d66d94a1d46c5f628ae8c4ef2ec8fdec2e44fefe26c6acc30135fd57af52ce3d00b3821e4e SHA512 2ecbd3d4d8061c2ac9f1f8e3bc0deb978442ebe38d0f9adf35670619f322b754583b292c095a775f0a3e22260a7ca02857e99c6bf1286dac4e6628ef6f07f567
-EBUILD unar-1.10.6.ebuild 1382 BLAKE2B 0f96855ee431dbdf70c35d09b4243b44681df61f580c1e3c39932475ff06e705a2a20b00e7f5a3da31da72ae4b0f8136798235a2419e1daf7c1d4d3ed5813e7c SHA512 1b71fdcc97e02e49217aa435ee8ff66bb4df0184fc0182082d391883539889c7d3f053c788501f5dc4f08a47a4663af61856f2124d4a9d076c1802470d34961b
+EBUILD unar-1.10.7.ebuild 1381 BLAKE2B b232260fbde8c11de8772e2d17e9cfe2baf8a2fb0b78e32658fa11bf00238b3d3c81dd1e04128828781352683c8a5366ff0461178b7db21c9821d8adbcd46fbc SHA512 543643d1fbd3932a7b092ee19b65b131f0a8a92e7d532b438f63846f639843d75b1a61400e593d1f291430e39d5b68678a0da0970b047038e81bd7dcb5a768a6
 MISC metadata.xml 499 BLAKE2B 421812ffc3267f8786e62b36886bf0364ebffa55568f81d68bdfd32b0e10345b0501aae1a1196e7c91836bdec985b19c664f60c123ea5f42d40402176c31909e SHA512 784d45167cd50ca9bd5b3e0e5a2ec7f4086b3f653ed095f71246cbe7f8aa9515577611030e1d4a868b3cb690385afcd13c4839ca34c70902f9e07132e916e4a9
diff --git a/app-arch/unar/unar-1.10.1.ebuild b/app-arch/unar/unar-1.10.1.ebuild
deleted file mode 100644
index dc34191d66c9..000000000000
--- a/app-arch/unar/unar-1.10.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="unpacker for various archiving formats, e.g. rar v3"
-HOMEPAGE="https://unarchiver.c3.cx/"
-SRC_URI="https://unarchiver.c3.cx/downloads/${PN}${PV}_src.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="
-	app-arch/bzip2:=
-	dev-libs/icu:=
-	gnustep-base/gnustep-base
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=gnustep-base/gnustep-make-2.6.0[native-exceptions]
-	sys-devel/gcc[objc]
-"
-
-S="${WORKDIR}/The Unarchiver/XADMaster"
-
-src_prepare() {
-	default
-	# avoid jobserver warning, upstream bug:
-	# https://bitbucket.org/WAHa_06x36/theunarchiver/issues/918/dont-call-make-from-makefile
-	sed -i -e 's:make:$(MAKE):g' Makefile.linux || die
-}
-
-src_compile() {
-	emake -f Makefile.linux \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		OBJCC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		OBJCFLAGS="${CFLAGS}" \
-		LD="$(tc-getCXX)" \
-		LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime ${LDFLAGS}"
-}
-
-src_install() {
-	dobin {ls,un}ar
-	doman ../Extra/{ls,un}ar.1
-}
diff --git a/app-arch/unar/unar-1.10.6.ebuild b/app-arch/unar/unar-1.10.7.ebuild
index dfaa376110b8..47614f3e18da 100644
--- a/app-arch/unar/unar-1.10.6.ebuild
+++ b/app-arch/unar/unar-1.10.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="
 	sys-devel/gcc[objc]
diff --git a/app-arch/unarj/Manifest b/app-arch/unarj/Manifest
index 7c231a988cf0..2c12e783606e 100644
--- a/app-arch/unarj/Manifest
+++ b/app-arch/unarj/Manifest
@@ -3,5 +3,5 @@ AUX unarj-2.65-Wformat-security.patch 1303 BLAKE2B c13a77846264f9e5e8ab552179d00
 AUX unarj-2.65-gentoo-fbsd.patch 168 BLAKE2B db8ad647f7666cc2e0032b35f5cfc36d63a38f918e4424681778f8d3ad599a1356c4c0733c35d4140618a311b8e07da61b035d7ff391efec1f1ae6fea7de9a78 SHA512 fc3d42d7ee9b38e871938c159398e773102e9d83896393f074f0cf02b4619d6d663668cea50d84d04b1372b7b5d4f6e46db36345123a65750b545416ef7f2eb2
 AUX unarj-2.65-sanitation.patch 2710 BLAKE2B 814acc285392cdc44d2f4151e2aa10b9664f3dfec0968028e6f6c20207586034182cbeab9dee8e8340fe52f1a2bd7bb4d1793714d2f6806889128d2bb200d0c6 SHA512 86c30be41bbce6a330ea95d0aff52abadd20d01a2a0a2d63d5c53006b27b23d9c37a800b44a93508e6954da8d2595e650893a1f80fe55fc92681a82af823c755
 DIST unarj-2.65.tgz 21568 BLAKE2B 9b4d15782ebbac841937fc30c049e300d4c4324cb0cd7a585a228454ee35e7177e73cb6523e6cd03a509f9ad20103790ce3eac77552956557290414d57af2bdd SHA512 1b152063017042a343f49e487e5284c3d4c548222baa52e2066cefe6d2add60213ffd2653f42e38582681a1fd89efb8f1d3a6ef6389fc33e5397760ad9e72386
-EBUILD unarj-2.65.ebuild 686 BLAKE2B f3f0ec3e126745cfdbe2e0fb56fd651ef4dbaa6a3d6182908fec5aa1d92e4fc3deda746b4f179ef2c60a1ab72c466323ed224153d64e797cf0dcc979cad809f2 SHA512 4e97f389162e773605b34e9b859d79603c8b5ad94702fd0bd816426289c0c3b408be748a55d54bf54d5a6420c7bff2177236f95fc8b4b8504678e52dd4cb63ce
-MISC metadata.xml 438 BLAKE2B f481e5ad2c0786e15e1f0c2aa835fd356d239f84ad59319f8330538466576c342f3c10a7c04b646ce3474d04e8fa52d592368ea2958cd03c60d514e178cfb049 SHA512 507f17fa799964dd8c11492327b7077f9a2e667aefe2c9249a05df95f8f0a7a1c4ffd1735a2f9292f999c0914ba901f7f3a534c626c72eb69dff04a0f5ca22a6
+EBUILD unarj-2.65.ebuild 687 BLAKE2B 4cfa1532f79418be46fbd7ec67b6c08e90d079ed784cd5b413151d211386c7b638bfd616c9e29fcc3f68082f6485bfe0cfcb8734d9b8a52469109155ac4c8176 SHA512 e042fff2d5392daa16cba8d9f10f1c73418162227460404ec40cca2d50237243355d39b99f42fb6827a687ba1487ef688148bf529e3a07be2d0360feb74fb96b
+MISC metadata.xml 370 BLAKE2B dde78def1c5287616f524c558826b8a5c187095765a784f354175d5eb6a06d27d87a9f513cf47134c08367e7eb0430ccc210c0bf8f2e7403bb43851987dde75a SHA512 27e3f62781092689242a6f69bff5428cfe6eec2f599a6cd150d78d43dcce790a040032883434ebb2c8ff5898087199f2720c3d9c3950235658ecb4a36ae81eb1
diff --git a/app-arch/unarj/metadata.xml b/app-arch/unarj/metadata.xml
index e8c216b62618..aac88eec27d4 100644
--- a/app-arch/unarj/metadata.xml
+++ b/app-arch/unarj/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>nitro@legroom.net</email>
-  <name>Jared B.</name>
-</maintainer>
-<maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-</maintainer>
-<longdescription>A utility that is designed to open arj archives.</longdescription>
+  <maintainer type="person">
+    <email>nitro@legroom.net</email>
+    <name>Jared B.</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-arch/unarj/unarj-2.65.ebuild b/app-arch/unarj/unarj-2.65.ebuild
index c2dbc45e6a02..ccd1ce99ae14 100644
--- a/app-arch/unarj/unarj-2.65.ebuild
+++ b/app-arch/unarj/unarj-2.65.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="arj"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index e6c300bd7029..439a438ea040 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,9 +1,5 @@
 AUX unrar-5.5.5-build.patch 1021 BLAKE2B f11426cac10efe195a0507ea99c77813284ff8d03aa47f4c10f8d4c93689eac919aa68651bf20393fbadd94bb88439fddaa1448cf00153a2dbfb0468c938f1b1 SHA512 c6875ef2ed3f1cd5e8baae74fdc92c7c44c694169bfaa2b63af10eaacb52dd27ff12360ac6757a82499a0f14fb78cfa1bfbd8391435f95b125a81b2e776f28a0
 AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
-DIST unrar-5.7.5.tar.gz 228818 BLAKE2B 2bd9cfaed07802147af9a3457cea3f78f464cc26e2e20ef2c15817fffb7dc275fd326fd96b089257a8044982c0ae130ca3dc42126356d973ee6a8afd43e28df0 SHA512 101a21a20d8e30ca2cccc1605e332579064d362feacb36e9d4a7cd5218585298dcb48ec2805ff9523ae9b25e8e3d3e7557b73ea457702c6cb6d8c50d324ea1f4
-DIST unrar-5.8.5.tar.gz 229641 BLAKE2B 132453d2e2ddb1b1b2151be15bd092dc06fe7ab96d8fa640db95dc1acdee90f6b259a5d04c1da959a398e3a9beb22862a14db9b41b19055771373e00d89e958b SHA512 bacd36c78c6bab2720b13796b73b376bd0ae693916b8130637cc4e6bbd76f6bd103347d9033d2d6cf6301587ba62449ec88b3aa4c18c8557ad5ace3475b41a7c
-DIST unrar-5.9.1.tar.gz 229913 BLAKE2B 0969678b0676fbf8058e214e2ac8725ebbfbd391d23690eb0f55bdbbaa86b0a0752d4028bd52a95b455aacb324be5180dee485864b9f6cf63e2c1efc90b52af7 SHA512 dcc1ae8cd886f711f7ce400c2dc496e170e62f17f41f96bb26e3900bea82c3923114678efee07b88a9bf55ce22d7d07d36400744e42f2b59231a51724b04c138
-EBUILD unrar-5.7.5.ebuild 1861 BLAKE2B faaf4048d71534ad0e28ca429e941552b398300a8acffc25af2c94caddfb062094608e613436dc4adbc82a902440a5f90138a7056ab6e6c9204e5896f17edaa6 SHA512 a57d7dcb6a02d884ca70ee4de4d9b826c3a392b7d15c31bacf9fcbcf5ff655d30f0e23d9ad044c2d69b7265eb879e8a0f117430bfbc0681099e822d301cff2cf
-EBUILD unrar-5.8.5.ebuild 1874 BLAKE2B b4dff343451dff39f39527d40028111e55ba10f09a80be5e9570b426cf9b81a5938b8c1b5aeefee7842885ee13d649a89665e8ba53bc3e6b66160e1d66a4e4ad SHA512 8525bd45c3b74f2bf3af1140040b5a1dbfa1984a3d7a79492c55b85cedc0123e5f359b331ad78d09e20d4b145192ed9f30bc6a9b4a58f95bb202e23c22a13c75
-EBUILD unrar-5.9.1.ebuild 1880 BLAKE2B 9130011293bb6bb4668aac8d8e5b99d0f89b63fec3f126bb81d2b5c09623e81bffddbd0c8a2054bd7eedadb1161b2bb4b78ec0a77219f90e6d06fd7157cf30fc SHA512 efce6e14033e39c4b95ca1eb1b753f81e63acd80cdebabf223adcdf664d7d37a56ee9d04211f083f3ad0f456d6ece1e956a71d5b57cf7bde0c82eeb34ba707ea
+DIST unrar-5.9.2.tar.gz 229900 BLAKE2B a941ef6566a5b58990d88e6e99cc23c169fd7d99fe2c8ef1313db860f9f220510ea002990740c4b3a3f980c037f9b3be4cdad84624a9a6f5094b1074721800d4 SHA512 e48dd3327d57522aa676e8fd6e29b7133ee9921eb1525d90ddedc61716ecfeefb51a7eb3a667f4f81f21a5ce8654727617d33463a5b6a40a7bc32252fa9f25df
+EBUILD unrar-5.9.2.ebuild 1867 BLAKE2B 64fd502af2ec7cc438dd04121e832d017510a722238fba02fec1e0cb654d0d2e066b9e36af5058f6c7b7cd50506dec1aeecb0acc81f3130e00c93d295b2170df SHA512 e9e8ef1fa3b1da490619ff5995dae4c7cce7aa73457b4165022c7ab09515f4518496a86e6504120f25a550094889b0d100c702d9f26d31ade6e7f795cf3d07fc
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.7.5.ebuild b/app-arch/unrar/unrar-5.7.5.ebuild
deleted file mode 100644
index 9745c0265ad1..000000000000
--- a/app-arch/unrar/unrar-5.7.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic multilib toolchain-funcs
-
-MY_PN="${PN}src"
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-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 sh 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"
-
-S=${WORKDIR}/unrar
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.5.5-build.patch
-	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
-
-src_prepare() {
-	default
-
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile || die
-}
-
-src_configure() {
-	mkdir -p build-{lib,bin}
-	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
-	cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
-
-	unrar_make -C build-bin
-}
-
-src_install() {
-	dobin build-bin/unrar
-	dodoc readme.txt
-
-	dolib.so build-lib/libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-
-	find "${ED}" -name "*.a" -delete || die
-}
diff --git a/app-arch/unrar/unrar-5.8.5.ebuild b/app-arch/unrar/unrar-5.8.5.ebuild
deleted file mode 100644
index 892d9759c304..000000000000
--- a/app-arch/unrar/unrar-5.8.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs
-
-MY_PN="${PN}src"
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-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 ~sh ~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"
-
-S="${WORKDIR}/unrar"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.5.5-build.patch
-	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
-
-src_prepare() {
-	default
-
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile || die
-}
-
-src_configure() {
-	mkdir -p build-{lib,bin}
-	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
-	cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
-
-	unrar_make -C build-bin
-}
-
-src_install() {
-	dobin build-bin/unrar
-	dodoc readme.txt
-
-	dolib.so build-lib/libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-
-	find "${ED}" -type f -name "*.a" -delete || die
-}
diff --git a/app-arch/unrar/unrar-5.9.1.ebuild b/app-arch/unrar/unrar-5.9.2.ebuild
index 232fbdb7ddd2..c2d18f5b6e61 100644
--- a/app-arch/unrar/unrar-5.9.1.ebuild
+++ b/app-arch/unrar/unrar-5.9.2.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 ~sh ~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 6bed3969c74f..f1d678ca7141 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -1,9 +1,8 @@
+AUX unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch 2046 BLAKE2B 5332ab104f11993501bf866d9131375e5edbd6f1c6bc02f54a037ee6f0cb2695d1bae9f125a83d83cb22da43dd8ab4aa108439241a30c769299d71ea4d7d0a94 SHA512 6a95564aa4716b7b1b04c42f36f4452d7f790aa95bbc18b7164ad7c109efbab7db138ed5c77077b11717bd0a97cb645c6df62dd1ff93fea631294f591d4c8599
 AUX unzip-6.0-format-security.patch 4424 BLAKE2B c76ac7c9874238ff20c85e35d8bab809c4b668ff22eb93a3ac614653ab3843fbd80aebb552d285640b13f38f5bb264f6fe3c192b1d30128dfbd33fd9f28da40f SHA512 78340a1a16ed1951e5311fcfb76e38ec58ec0b6dcd74951624dc7778e41ae067d7dba38f394ed3a03436df197582f5d47c49e7c2d62d04c4fcd974eedb9bc726
 AUX unzip-6.0-natspec.patch 14304 BLAKE2B 87f724fcdb0960bfa17d609dbb764f3469b1ddfee1abc810e57cef52780482abd8c25950cf0da4d976d89745f4aa65b6269f21d0eac290230621b782fa1e0d06 SHA512 189ce2045430d2d04e27049672a3cfb205319edab1ac1522700a7f89344e5718235d8a15238390f6b4317af493796a65cac6a83f7dceb402bc736628d7a89cda
 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-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
 DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
-EBUILD unzip-6.0_p21-r2.ebuild 2572 BLAKE2B bf67737947b20c821b651c7b303f3e025b5d64511df7329efca1d4373224059a2889fb846db378b49b34d0fab3ab4fa279fa0cea130d06b044358dcae35cd6c4 SHA512 659a920e518635f92630543c3ec86ba2875f2cfa1ee21e0daddb775c4ca8bfdf2ba0e7f1963a619d59f56758bbc3cfcd9083f140582e8f6470c0b06529cedeea
-EBUILD unzip-6.0_p25.ebuild 2575 BLAKE2B 2b3efa2f332208b07273e2806c3c00ce4e565ad6188a13a1420b86f40665ec6bea57f485da284aa42bbca423425df3313628cdf8eca8de2276143be929f9db5f SHA512 162e64fe61ba6343592733923183e741c0d77b0dbb832cdcc93a2a917cbf70ac48d25639ad0cf0040843df17d0e28b613446ee0b207d0964c65c8c4069d39276
+EBUILD unzip-6.0_p25-r1.ebuild 2653 BLAKE2B bbdaf5cd2811fc28dfe28161f590592b201c26cfeb7871c44adfc88ab9ea7c01971ff04a75efdf0ef6bae17c9441f6cb33800e256bce2541da9b5dfc1736bbab SHA512 c8400756f02606f70ebfd247c0bba3de7b3f7d69e355a9897a3600125ee02678d732514522262c80ffd8133823da179e7cfa70eb83f77fdff03e4660968bad07
 MISC metadata.xml 534 BLAKE2B a6baad9ace7880a38dea2a34ea8cebb730e8a0742bd4447ebc9147a713eff82aed50e97dfeaed5589a7025c2ba7d9a244d101508f21f69a3dfd79c0ed61c214e SHA512 b4735d77d58b041bb5259d362f493247cdd9217423d79eab06567a5d7f1ebdfae0f80085ab3c3a842e68c6f5a6122913cb13c210d6e7fbfe398ff5ade29b97d5
diff --git a/app-arch/unzip/files/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch b/app-arch/unzip/files/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch
new file mode 100644
index 000000000000..ad6a157c568a
--- /dev/null
+++ b/app-arch/unzip/files/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch
@@ -0,0 +1,50 @@
+From 13f0260beae851f7d5dd96e9ef757d8d6d7daac1 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Sun, 9 Feb 2020 07:20:13 -0800
+Subject: [PATCH] Fix false overlapped components detection on 32-bit systems.
+
+32-bit systems with ZIP64_SUPPORT enabled could have different
+size types for zoff_t and zusz_t. That resulted in bad parameter
+passing to the bound tracking functions, itself due to the lack of
+use of C function prototypes in unzip. This commit assures that
+parameters are cast properly for those calls.
+
+This problem occurred only for ill-chosen make options, which give
+a 32-bit zoff_t. A proper build will result in a zoff_t of 64 bits,
+even on 32-bit systems.
+---
+ extract.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 1b73cb0..d9866f9 100644
+--- a/extract.c
++++ b/extract.c
+@@ -329,7 +329,7 @@ static ZCONST char Far OverlappedComponents[] =
+ 
+ 
+ /* A growable list of spans. */
+-typedef zoff_t bound_t;
++typedef zusz_t bound_t;
+ typedef struct {
+     bound_t beg;        /* start of the span */
+     bound_t end;        /* one past the end of the span */
+@@ -518,7 +518,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+         return PK_MEM;
+     }
+     if ((G.extra_bytes != 0 &&
+-         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
++         cover_add((cover_t *)G.cover,
++                   (bound_t)0, (bound_t)G.extra_bytes) != 0) ||
+         (G.ecrec.have_ecr64 &&
+          cover_add((cover_t *)G.cover, G.ecrec.ec64_start,
+                    G.ecrec.ec64_end) != 0) ||
+@@ -1216,7 +1217,7 @@ static int extract_or_test_entrylist(__G__ numchunk,
+ 
+         /* seek_zipf(__G__ pInfo->offset);  */
+         request = G.pInfo->offset + G.extra_bytes;
+-        if (cover_within((cover_t *)G.cover, request)) {
++        if (cover_within((cover_t *)G.cover, (bound_t)request)) {
+             Info(slide, 0x401, ((char *)slide,
+               LoadFarString(OverlappedComponents)));
+             return PK_BOMB;
diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
deleted file mode 100644
index 533f9275b79f..000000000000
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV//.}"
-MY_PV="${MY_PV%_p*}"
-MY_P="${PN}${MY_PV}"
-
-DESCRIPTION="unzipper for pkzip-compressed files"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
-	mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-linux"
-IUSE="bzip2 natspec unicode"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local deb="${WORKDIR}"/debian/patches
-	rm "${deb}"/02-this-is-debian-unzip.patch || die
-	eapply "${deb}"/*.patch
-
-	eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
-	eapply "${FILESDIR}"/${PN}-6.0-format-security.patch
-	use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
-	sed -i -r \
-		-e '/^CFLAGS/d' \
-		-e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
-		-e '/^STRIP/s:=.*:=true:' \
-		-e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
-		-e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
-		-e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
-		-e 's:LF2 = -s:LF2 = :' \
-		-e 's:LF = :LF = $(LDFLAGS) :' \
-		-e 's:SL = :SL = $(LDFLAGS) :' \
-		-e 's:FL = :FL = $(LDFLAGS) :' \
-		-e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
-		-e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
-		unix/Makefile \
-		|| die "sed unix/Makefile failed"
-
-	# Delete bundled code to make sure we don't use it.
-	rm -r bzip2 || die
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-	i?86*-*linux*)       TARGET="linux_asm" ;;
-	*linux*)             TARGET="linux_noasm" ;;
-	i?86*-*bsd* | \
-	i?86*-dragonfly*)    TARGET="freebsd" ;; # mislabelled bsd with x86 asm
-	*bsd* | *dragonfly*) TARGET="bsd" ;;
-	*-darwin*)           TARGET="macosx" ;;
-	*-cygwin*)           TARGET="cygwin" ;;
-	*) die "Unknown target; please update the ebuild to handle ${CHOST}	" ;;
-	esac
-
-	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
-	use bzip2 && append-cppflags -DUSE_BZIP2
-	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
-	append-cppflags -DLARGE_FILE_SUPPORT #281473
-}
-
-src_compile() {
-	ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
-	emake -f unix/Makefile ${TARGET}
-}
-
-src_install() {
-	dobin unzip funzip unzipsfx unix/zipgrep
-	dosym unzip /usr/bin/zipinfo
-	doman man/*.1
-	dodoc BUGS History* README ToDo WHERE
-}
diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25-r1.ebuild
index b0f5ed79c0d8..6b5a505d3d58 100644
--- a/app-arch/unzip/unzip-6.0_p25.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 ~sh sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
@@ -32,6 +32,7 @@ src_prepare() {
 
 	eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
 	eapply "${FILESDIR}"/${PN}-6.0-format-security.patch
+	eapply "${FILESDIR}"/${PN}-6.0-fix-false-overlap-detection-on-32bit-systems.patch
 	use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
 	sed -i -r \
 		-e '/^CFLAGS/d' \
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 940f3c9459b8..6f18845486f2 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -4,6 +4,6 @@ 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 1457 BLAKE2B b05b21eb91cfde9054a9a6fab084af525c35d412e7135bfb89f8730f6d60742ea953eb87e88233f4d5b3f9f3bc9df42408ad8ac7b0836768ef5078a5fb7a8aa7 SHA512 ba8a2e53128f70856f9d833031e3ea7751fa9ed24cbdc4bd07c8f5109817a9be86f100a24fefc31dd73c812f7dfa542f71775b046450a1c5ad6b215639646fc9
+EBUILD xar-1.8-r2.ebuild 1458 BLAKE2B 555288ffa046e123dd907ffc82149fcb8475d8e0523832843ada29a45e0a93e54c231d1ffc0fd0f34a11ca19456c38299a92c631ca07e521146c2408a625968a SHA512 56560c834837cc754a67b75a62e6a6d55e66e01e529013b418371dd241572b0cba263ed259750c2f4864eece26bb2d2de4d4925e575bceaf859b7f06b20890f7
 EBUILD xar-1.8-r3.ebuild 2001 BLAKE2B 3dab7ee32ea82cc9e495437b12fd3938a91b9892723af22f96a73eda4a9dfa06d9f8b35f96996dff63ae17416f442fd034d6bd4dfc53d6e0eb7dc3d00dcab621 SHA512 243ba1c4497bd3148b55719a2fcf28a82c84140241663721d7886d9736332e9e3a6c4188209b6cfddb8699e7f7fc33915b660856e0c812eb715540bd65428e16
 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 274c83f01b67..3a28821b3a2e 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 d882d8cb5366..33e6fa212e2d 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,5 +1,7 @@
 DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb089206e8e545e280b32ff5372f7fb4a1b0c27cb6fdf0d0a27a668e9772ecc3fffc181df95d081ca9c2e987b83b SHA512 e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578
-EBUILD xz-utils-5.2.4-r2.ebuild 2685 BLAKE2B 59733d2e627e8e981c336a96159ad174ce1935936c45b44c9d55156cfff56297a2a7cbbe1fd931f1efd653d799d84b175c5ff620bf5faaa42c6244c644518ac8 SHA512 8d139e5923ad8c7b5e77928db96b6c90597fa2bde4f4a318315e1315756fc23e868fe9cae7830e108bd3cfe76299b7d962101d88cd0f1ee321bab5301711d927
-EBUILD xz-utils-5.2.4-r3.ebuild 2622 BLAKE2B c89cd916d3c885a82a31750211baf37c0016c43d97ae350c3c1553a3c939af9cbc2840790c19d11fb405c5ca1c85a55d340046f762704e157afc13ead3fcd3e2 SHA512 cb418fc449d14e57bcf9f4fc2539777cdc14643142a5aa739126814a2e4de23054f3ac2f54974b899363c8d1dcaf50cbd578af5db9c07ca553ae44223d686fa0
-EBUILD xz-utils-9999.ebuild 2622 BLAKE2B c89cd916d3c885a82a31750211baf37c0016c43d97ae350c3c1553a3c939af9cbc2840790c19d11fb405c5ca1c85a55d340046f762704e157afc13ead3fcd3e2 SHA512 cb418fc449d14e57bcf9f4fc2539777cdc14643142a5aa739126814a2e4de23054f3ac2f54974b899363c8d1dcaf50cbd578af5db9c07ca553ae44223d686fa0
+DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
+EBUILD xz-utils-5.2.4-r2.ebuild 2683 BLAKE2B 5fff9a67d8213c8216d2fa3003d4fd834c9d03165d51b9e2b6181550773b5ecb6b83ae493620d46a89dca570843f6db05ce0cdfab5f076941c348773c05da294 SHA512 97f15b8cce8b2e577eeed356f3638c65f3f12c3cfd081f8881e2adff1a7a715561b5d37c3e2efb2958bc7949bed4be57b5575e37b6436d6f4e16b0b6a10c9243
+EBUILD xz-utils-5.2.4-r3.ebuild 2618 BLAKE2B 551ef4b45317a49e63da1454adcd1d15e806fa543d0326e644de3ce9a57a508e569bd927214df0c9003c7cf461c3eadde74beea271454af0b48414a94705eb2c SHA512 b7ed40e81541eff5bfb9f193f4d8179f2f6b2fded0186321b8da6fee96e5fcfa119788aa7eb1a064416bae49e3511627e962ca7662ff5130f5c76df73c2dade8
+EBUILD xz-utils-5.2.5.ebuild 2617 BLAKE2B 1ac7ba23432956c33b5e2e6ecefa62bbf406ac78eb5c988f3d9009baa614fa99890a567d534cb9b79c95c91ab2ef383369ef7fdf65c151d536bc2c3b1247c959 SHA512 35112af6f220cbfc1f8b75de97f8637dacb69cfd027b9743bee217b2abd398c563ce38d45d0e8808a41290618b216dc01683cde43f10451ff73e0ce5a46506b9
+EBUILD xz-utils-9999.ebuild 2617 BLAKE2B 1ac7ba23432956c33b5e2e6ecefa62bbf406ac78eb5c988f3d9009baa614fa99890a567d534cb9b79c95c91ab2ef383369ef7fdf65c151d536bc2c3b1247c959 SHA512 35112af6f220cbfc1f8b75de97f8637dacb69cfd027b9743bee217b2abd398c563ce38d45d0e8808a41290618b216dc01683cde43f10451ff73e0ce5a46506b9
 MISC metadata.xml 538 BLAKE2B 1ce32a16125c6af46b02bf0ebdef56c685d1d4903b74c2331b446e764096503b06fecf6d467ffb1c1627b8dabfa58092a1db21e5eda53d66f4e9ede4714d7978 SHA512 97dffaeaa9db4117a7e7770ac1ebfe16c0c32fc3de30f7cf099dea7a6565c3971146178140e0676e1946fcef609131124cc3d0bd971eb6fde1d45086da122310
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
index 5763d9796550..f56e4c467079 100644
--- a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r2.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 sh 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 	EXTRA_DEPEND=
 fi
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild
index 4086a001c985..3a7654adc714 100644
--- a/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Remember: we cannot leverage autotools in this ebuild in order
@@ -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 ~sh ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 	EXTRA_DEPEND=
 fi
diff --git a/app-arch/xz-utils/xz-utils-5.2.5.ebuild b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
new file mode 100644
index 000000000000..e129349a96fc
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=7
+
+inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs usr-ldscript
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
+	SRC_URI=""
+	BDEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+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"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!<app-arch/p7zip-4.57
+	!<app-i18n/man-pages-de-2.16"
+DEPEND="${RDEPEND}"
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize  # to allow building shared libs on Solaris/x64
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable threads)
+		$(use_enable static-libs static)
+	)
+	multilib_is_native_abi ||
+		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+	if ! use extra-filters; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 4086a001c985..e129349a96fc 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
 
-EAPI=6
+EAPI=7
 
 inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs usr-ldscript
 
@@ -12,14 +12,13 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
 	inherit git-r3 autotools
 	SRC_URI=""
-	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+	BDEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
 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 ~sh ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
-	EXTRA_DEPEND=
 fi
 
 DESCRIPTION="utils for managing LZMA compressed files"
@@ -31,9 +30,9 @@ SLOT="0"
 IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
 
 RDEPEND="!<app-arch/lzma-4.63
-	!<app-arch/p7zip-4.57"
-DEPEND="${RDEPEND}
-	${EXTRA_DEPEND}"
+	!<app-arch/p7zip-4.57
+	!<app-i18n/man-pages-de-2.16"
+DEPEND="${RDEPEND}"
 
 # Tests currently do not account for smaller feature set
 RESTRICT="!extra-filters? ( test )"
@@ -78,8 +77,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
 }
 
 pkg_preinst() {
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index e98970c4dbdc..0efa243a17c2 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -6,5 +6,5 @@ AUX zip-3.0-no-crypt.patch 1108 BLAKE2B 92de0a453e128a87a6d37f0a9cca55f5451946c1
 AUX zip-3.0-pic.patch 499 BLAKE2B 0b3ad7552ed4b3900b720360145f2466bb2835823a828ed4e3fe7e8ce22c547296ff0f74416f8b9a75ae4ef70d9cce521f96becbbbcc9ddb89481c3944d6b501 SHA512 a5f4381de900821c91bb164f580b7abe0bb61ebbbcb00e376f38763255bc647bda678fd66af59e9d56cb8bb7a2166553a77af79cfa75f3e0ea4dbc515b876b8e
 AUX zip-3.0-zipnote-freeze.patch 2170 BLAKE2B b0080c9d5310a9cdd14eebc503d76e7463969982717476aa4359ae1c4651290112654f25c202defeddec5efaf1f32ec74c824a7370727b7e6a055dcac6211908 SHA512 c7db2d8c43d33bff4be6068c89603d2f67876f2b5ea72a01ad53f1baa42206c7a0a967f101a54092715f7fcc3ee2bf45a448e76a0ef55e64dc0fe0b204966367
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
-EBUILD zip-3.0-r3.ebuild 1719 BLAKE2B bdf9e3b3d764f9b2e00f04efa8e4e392db658f6f79efc973b5c9a83c06f505ee284b91122787457b9300e61a2cf5679deef5c738873fa239edd633b33e9eead5 SHA512 498ebd9a1889898e1b57ec76bd0f5f0ec3015e7fb3cf19fdffc2312a7171c299abbf1f3bf5b81f5332edc80d7d014b7fd62ec09b2bb02002999ba244789e188c
+EBUILD zip-3.0-r3.ebuild 1716 BLAKE2B baf91e89edf2f731c805627392d7a3eb1b8f8bff52ca73facc0dd861c8911e0bbae9036593c4a988fbd53b557e76c80276d51de93b742d14e88a65ccc0de6d0f SHA512 cb41bb9e9f782c35197156cde2a69d6997c35f5896bd7e8cbe402da7dff03313445cd14d33cfa1e51d6d2d1782d4774f51c29cc13510090a778fff85107e2e29
 MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
diff --git a/app-arch/zip/zip-3.0-r3.ebuild b/app-arch/zip/zip-3.0-r3.ebuild
index 5321fa4006e1..34ee51562039 100644
--- a/app-arch/zip/zip-3.0-r3.ebuild
+++ b/app-arch/zip/zip-3.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="bzip2 crypt natspec unicode"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest
index bc8138c7d270..20408f8e1667 100644
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@@ -1,6 +1,6 @@
 AUX zopfli-1.0.2-makefile.patch 2505 BLAKE2B f00e9056738bc9cb64f7aae79c42388d1d8a0e78287ca8c309bc4c464104cb5c5febd2587b05fcd83de45c5ae45df9a7dc9dc7d3e4c77d687c5aec001cf1125c SHA512 354541b72fbc9539b514489ebd9f17c2bcdfe09f7d5ff8a102aa301ae22bc63698e5b20493692b4810dfca287ed315571d13a213d8c8d1a5722ddff1c11afc32
 DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e
 DIST zopfli-1.0.3.tar.gz 195227 BLAKE2B fed322e6d0baf8e9008e91fef4c459e8f67f0e7d62942469893d89b8ca39ace6d1ac68cbbc322e938e66a613ea9a36e3ae9f59550b5f4964107bec490a07038a SHA512 362cbeee0b3f04a4c5da512f82671491f874d4ec7b693dca9724ae42123d7ac184cc4d5de1872b4f1fc938c97f79dfdb482f62d1fca4a17cff6d267f6021e8d2
-EBUILD zopfli-1.0.2.ebuild 965 BLAKE2B 34d65920bbd583f8d5b26a62f9968882632843e49fbbe1d47d36d8b9af27add5dab9124fdd987e596dcd7202168c95b6ce3d5e932a244b477b2e02a2885a8f59 SHA512 91ec7625a4bea43d148c495a38b2226391a50b563e28387ffc658af9b30467a4d4cbd8aa2ea9fc8faf7ad8c526b4c514b8d0359f120789448785ea8a79b34965
+EBUILD zopfli-1.0.2.ebuild 966 BLAKE2B cab9a7529b3516654f4c9fc84b38ba72d2b3000c70682d61b6ca42eae86655bab2ca3fc6929d481a140324a4669bf496a5b08d645f4c2b39895b677e73b17102 SHA512 401c5e1a4be1ab1dd813335758c04ead724d5029f631f960cc3017e036aca3a3d80043ba93b4064d12c041d1217129cce05aeb92fa6af40a9719babccab4db16
 EBUILD zopfli-1.0.3.ebuild 509 BLAKE2B 413d42ef7c870a5f19dd286f860fc3dba1b080900d1bb7380ed23b79d08f1cb914f8382942d9f7d1c42146cad8d9e9d55fd738950423f824bbe0ecf677891e89 SHA512 d27ec6229f28fb1ae6eec787eb4a45ab632d035127a68d22f9ba29b584bfa446d61066db14bdca7d82076c7838c9b02bb71436577917195d82c92eb3199084f1
 MISC metadata.xml 384 BLAKE2B 0ea1ed6757cfd935a4e46b926d33891d99b5c943cd3145e9587b1e3d905d27c3756820f6d530afc329a552777ef19c6f4b4c54ae67798fd813b20363133a75f0 SHA512 f096a21a2f292028e07d029df22a40c252809879acc4b40c31c1bcf157c5ce28da0dc9d7466bfe6a6f13f0e61ac2d0e46e7a082135d7ae5fd945faad4837104a
diff --git a/app-arch/zopfli/zopfli-1.0.2.ebuild b/app-arch/zopfli/zopfli-1.0.2.ebuild
index c1e54842aa97..b1ceb137f61c 100644
--- a/app-arch/zopfli/zopfli-1.0.2.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DOCS=( CONTRIBUTORS README README.zopflipng )
 
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 4650a1496027..ac6010c0f538 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,6 +1,8 @@
-AUX zstd-1.4.4-pkgconfig_fix.patch 2371 BLAKE2B 534be17dbd9886687b6d86a5bf808d674fda79492f59e1371147c1bbc2c102f98870c17bf451702edec7a7d4c01cba5ed975f0f1f03b1673ce0f108f5b6d353e SHA512 b7a9f10a878d52de87c599817e990d8dadf8fa7847ffc79c667842bf4d80c83c0a4e59d6321427aabe9ba02e93a58b1e86b49033dffb38dfba477997ad96ac59
+AUX zstd-1.4.4-make43.patch 3577 BLAKE2B 55e6e743b44f8ad9048d4ab94c7058b82fc3fdbcf7863dbd7fe1933c62f736bbfed1d57a1fbd26f24159bae96094b393e1067b0bf467aeb40a464c7b34e741c5 SHA512 800c6dd70c09705ad7eb3e031c451d6e9cf0a06b1a42f0fbb0e474e0873596641bb5e4c03681955ec883d34ffaa4aa8ae207f399c4753c0f6f05afe70f56254f
+AUX zstd-1.4.4-pkgconfig_libdir.patch 8322 BLAKE2B 2c7bcc57cbbf549919d0f7ce4538afd5ef8face1624b4bb348d77725aa22349e306614a8bd75666fae0308f05fc64645211dbc2f3fe4efaddf7027c845fd5d0d SHA512 e748145592281a218495076c44d081c994923605fff2f9561a04ad3a00ba38847e4855549610da4d91d50c4bd5198270482ae59277571e9723a46b967a088632
 DIST zstd-1.3.7.tar.gz 1825458 BLAKE2B 2a689289ec70fd510575aecebf88ad763bd150e578d70d9fbb1678cba314c90a60339697232a5515990505e3c889aac92c3c2c4c3fc48e0d434b4dfd6cac9df1 SHA512 b7a432b13e237ac1490cd82b87727f6a4385d5ea7b89f566dea61a3993e17909c03288f727326ada326e36eb47ea5f9eab67c097808ee42f52cc800a7f7e1738
 DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf
-EBUILD zstd-1.3.7-r1.ebuild 1346 BLAKE2B 0b170be985174fd9be728938f0fa0b65734f273da0c24ea5f5d9baabe9f280601ec9a12d47a0dea7fb4765a4b775abdf12fa09105c160e5cd49dc549d3d289e9 SHA512 ecd75b82128de7566e391ea62afacf4667055b20b4c1c2f357a1c46bcb7eb0123e95b6b2b9f5c0da4d1f821a3b2c25142147172ea53e312958e2ee9d36c87d59
-EBUILD zstd-1.4.4-r2.ebuild 1443 BLAKE2B a3551c159df6a6aeca641aab738a796a225e4346d2f1e716508bb3244bf37120b6b16b391939a80394e1d4550d5672b79131226e58f6b21be38bbb2b6c765841 SHA512 3f39c47f535388a2c7e2c4abd7b366e6c7c2b1a26b6dac12d4f5139ad9a040b09518b7c17228d0e42487bac8ebcc077e835b5068ae1ec16447681191bed0512c
+EBUILD zstd-1.3.7-r1.ebuild 1344 BLAKE2B 9449557df432dd005393a76feddc4f1e0dd172dd20147b564689aaae6470b00df092d4539e716fb13e4003b87d91e6959e14db80e03535d1aa1c2c7514d32e05 SHA512 17c9c951a00c964deda47240c6bb9a55b5b43aea991dbd0f20936a9cc07d97548fba586d3131cc3f0805d9b2f335a18abe06ab9acfaff11ae4e8a166c022ff48
+EBUILD zstd-1.4.4-r3.ebuild 1558 BLAKE2B e60061922b9e01df894bf199cc7a0ddb8b999f7d44c84b3db332548d8732c32c948afa4301ae3383a59949a8f23ab7e83972b4eebdeb760ec14b86b2c8868d2f SHA512 1a862c0d9a7c4c8e04ee3c98e5ffba5ae85bf66163016c7d2a7332191e3bdf41444c194cc5bb08a6935fff890a3683a7881ec88f49c624e399580e920814e8e0
+EBUILD zstd-1.4.4-r4.ebuild 1787 BLAKE2B 31055fad1e85154c917617351915d0f4ea179a47df05a7105a983df94cd03cd465d4ad74cf57ff33b3c109c72b99aeb92b9c5b4e50076d2dc8a7b97322ea1296 SHA512 121a30b7c015181c56cbc107858cbe1fe2f478a57859a89e85e6f98f67eb32778ca8ce99fbe025538dc025815e2bc483bd37105f14bb0cf6eb15487f47157dc3
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/files/zstd-1.4.4-make43.patch b/app-arch/zstd/files/zstd-1.4.4-make43.patch
new file mode 100644
index 000000000000..679e0b791e33
--- /dev/null
+++ b/app-arch/zstd/files/zstd-1.4.4-make43.patch
@@ -0,0 +1,60 @@
+From 06a57cf57e3c4e887cadcf688e3081154f3f6db4 Mon Sep 17 00:00:00 2001
+From: Bimba Shrestha <bimbashrestha@fb.com>
+Date: Thu, 6 Feb 2020 14:10:51 -0800
+Subject: [PATCH] [build-issue] More portable header prefix usage (#) (#1987)
+
+* make 4.3 build issue fix
+
+* Changing header name and adding comment
+---
+ programs/Makefile | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/programs/Makefile b/programs/Makefile
+index b75314a8..a9ee3cb5 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -94,9 +94,12 @@ endif
+ 
+ VOID = /dev/null
+ 
++# Make 4.3 doesn't support '\#' anymore (https://lwn.net/Articles/810071/)
++NUM_SYMBOL := \#
++
+ # thread detection
+ NO_THREAD_MSG := ==> no threads, building without multithreading support
+-HAVE_PTHREAD := $(shell printf '\#include <pthread.h>\nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c)
++HAVE_PTHREAD := $(shell printf '$(NUM_SYMBOL)include <pthread.h>\nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c)
+ HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS))" ] && echo 1 || echo 0)
+ ifeq ($(HAVE_THREAD), 1)
+ THREAD_MSG := ==> building with threading support
+@@ -108,7 +111,7 @@ endif
+ 
+ # zlib detection
+ NO_ZLIB_MSG := ==> no zlib, building zstd without .gz support
+-HAVE_ZLIB := $(shell printf '\#include <zlib.h>\nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c)
++HAVE_ZLIB := $(shell printf '$(NUM_SYMBOL)include <zlib.h>\nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c)
+ ifeq ($(HAVE_ZLIB), 1)
+ ZLIB_MSG := ==> building zstd with .gz compression support
+ ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS
+@@ -119,7 +122,7 @@ endif
+ 
+ # lzma detection
+ NO_LZMA_MSG := ==> no liblzma, building zstd without .xz/.lzma support
+-HAVE_LZMA := $(shell printf '\#include <lzma.h>\nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c)
++HAVE_LZMA := $(shell printf '$(NUM_SYMBOL)include <lzma.h>\nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c)
+ ifeq ($(HAVE_LZMA), 1)
+ LZMA_MSG := ==> building zstd with .xz/.lzma compression support
+ LZMACPP = -DZSTD_LZMACOMPRESS -DZSTD_LZMADECOMPRESS
+@@ -130,7 +133,7 @@ endif
+ 
+ # lz4 detection
+ NO_LZ4_MSG := ==> no liblz4, building zstd without .lz4 support
+-HAVE_LZ4 := $(shell printf '\#include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c)
++HAVE_LZ4 := $(shell printf '$(NUM_SYMBOL)include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c)
+ ifeq ($(HAVE_LZ4), 1)
+ LZ4_MSG := ==> building zstd with .lz4 compression support
+ LZ4CPP = -DZSTD_LZ4COMPRESS -DZSTD_LZ4DECOMPRESS
+-- 
+2.24.1
+
diff --git a/app-arch/zstd/files/zstd-1.4.4-pkgconfig_fix.patch b/app-arch/zstd/files/zstd-1.4.4-pkgconfig_fix.patch
deleted file mode 100644
index 2fab9804c139..000000000000
--- a/app-arch/zstd/files/zstd-1.4.4-pkgconfig_fix.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From a025c46969b76a10ce1618df4dbb11a09563c413 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 20 Nov 2019 16:41:18 +0100
-Subject: [PATCH] Revert "In pkg-config File, Derive Lib and Include Dir from
- Prefix at Use-Time"
-
-This reverts commit 74bd76c3ffb3837a3fefc055edbc347620447236.
-
-This breaks systems that use lib32 and/or lib64 instead of lib
-See https://github.com/facebook/zstd/issues/1900
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- build/cmake/lib/CMakeLists.txt | 3 ++-
- lib/Makefile                   | 2 ++
- lib/libzstd.pc.in              | 5 ++---
- 3 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
-index 7adca875..77b389ca 100644
---- a/build/cmake/lib/CMakeLists.txt
-+++ b/build/cmake/lib/CMakeLists.txt
-@@ -134,10 +134,11 @@ if (UNIX)
-     # pkg-config
-     set(PREFIX "${CMAKE_INSTALL_PREFIX}")
-     set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
-+    set(INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
-     set(VERSION "${zstd_VERSION_MAJOR}.${zstd_VERSION_MINOR}.${zstd_VERSION_PATCH}")
-     add_custom_target(libzstd.pc ALL
-             ${CMAKE_COMMAND} -DIN="${LIBRARY_DIR}/libzstd.pc.in" -DOUT="libzstd.pc"
--            -DPREFIX="${PREFIX}" -DVERSION="${VERSION}"
-+            -DPREFIX="${PREFIX}" -DLIBDIR="${LIBDIR}" -DINCLUDEDIR="${INCLUDEDIR}" -DVERSION="${VERSION}"
-             -P "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig.cmake"
-             COMMENT "Creating pkg-config file")
- 
-diff --git a/lib/Makefile b/lib/Makefile
-index fd1710cf..97375ad2 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -244,6 +244,8 @@ libzstd.pc:
- libzstd.pc: libzstd.pc.in
- 	@echo creating pkgconfig
- 	@sed -e 's|@PREFIX@|$(PREFIX)|' \
-+             -e 's|@LIBDIR@|$(LIBDIR)|' \
-+             -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
-              -e 's|@VERSION@|$(VERSION)|' \
-              $< >$@
- 
-diff --git a/lib/libzstd.pc.in b/lib/libzstd.pc.in
-index e7880be4..1d07b91f 100644
---- a/lib/libzstd.pc.in
-+++ b/lib/libzstd.pc.in
-@@ -3,9 +3,8 @@
- #   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
- 
- prefix=@PREFIX@
--exec_prefix=${prefix}
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib
-+libdir=@LIBDIR@
-+includedir=@INCLUDEDIR@
- 
- Name: zstd
- Description: fast lossless compression algorithm library
--- 
-2.24.0
-
diff --git a/app-arch/zstd/files/zstd-1.4.4-pkgconfig_libdir.patch b/app-arch/zstd/files/zstd-1.4.4-pkgconfig_libdir.patch
new file mode 100644
index 000000000000..e8d745a56aa2
--- /dev/null
+++ b/app-arch/zstd/files/zstd-1.4.4-pkgconfig_libdir.patch
@@ -0,0 +1,215 @@
+From e668c9b52896e1cf92c99da3b01e3bdbbae77100 Mon Sep 17 00:00:00 2001
+From: "W. Felix Handte" <w@felixhandte.com>
+Date: Tue, 18 Feb 2020 10:50:38 -0500
+Subject: [PATCH 1/3] Fix pkg-config File Generation Again
+
+Revises #1851. Fixes #1900. Replaces #1930.
+
+Thanks to @orbea, @neheb, @Polynomial-C, and particularly @eli-schwartz for
+pointing out the problem and suggesting solutions.
+
+Tested with
+
+  ```
+  make -C lib clean libzstd.pc
+  cat lib/libzstd.pc
+
+  # should fail
+  make -C lib clean libzstd.pc     LIBDIR=/foo
+  make -C lib clean libzstd.pc INCLUDEDIR=/foo
+  make -C lib clean libzstd.pc     LIBDIR=/usr/localfoo
+  make -C lib clean libzstd.pc INCLUDEDIR=/usr/localfoo
+  make -C lib clean libzstd.pc     LIBDIR=/usr/local/lib     prefix=/foo
+  make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/include prefix=/foo
+
+  # should succeed
+  make -C lib clean libzstd.pc     LIBDIR=/usr/local/foo
+  make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/foo
+  make -C lib clean libzstd.pc     LIBDIR=/usr/local/
+  make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/
+  make -C lib clean libzstd.pc     LIBDIR=/usr/local
+  make -C lib clean libzstd.pc INCLUDEDIR=/usr/local
+  make -C lib clean libzstd.pc     LIBDIR=/tmp/foo prefix=/tmp
+  make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp
+  make -C lib clean libzstd.pc     LIBDIR=/tmp/foo prefix=/tmp/foo
+  make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp/foo
+
+  # should also succeed
+  make -C lib clean libzstd.pc prefix=/foo LIBDIR=/foo/bar INCLUDEDIR=/foo/
+  cat lib/libzstd.pc
+
+  mkdir out
+  cd out
+  cmake ../build/cmake
+  make
+  cat lib/libzstd.pc
+  ```
+---
+ build/cmake/lib/CMakeLists.txt |  5 +++--
+ lib/Makefile                   | 14 ++++++++++++--
+ lib/libzstd.pc.in              |  4 ++--
+ 3 files changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
+index e92647bf1..29ff57aa0 100644
+--- a/build/cmake/lib/CMakeLists.txt
++++ b/build/cmake/lib/CMakeLists.txt
+@@ -134,11 +134,12 @@ endif ()
+ if (UNIX)
+     # pkg-config
+     set(PREFIX "${CMAKE_INSTALL_PREFIX}")
+-    set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
++    set(LIBDIR "${CMAKE_INSTALL_LIBDIR}")
++    set(INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
+     set(VERSION "${zstd_VERSION_MAJOR}.${zstd_VERSION_MINOR}.${zstd_VERSION_PATCH}")
+     add_custom_target(libzstd.pc ALL
+             ${CMAKE_COMMAND} -DIN="${LIBRARY_DIR}/libzstd.pc.in" -DOUT="libzstd.pc"
+-            -DPREFIX="${PREFIX}" -DVERSION="${VERSION}"
++            -DPREFIX="${PREFIX}" -DLIBDIR="${LIBDIR}" -DINCLUDEDIR="${INCLUDEDIR}" -DVERSION="${VERSION}"
+             -P "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig.cmake"
+             COMMENT "Creating pkg-config file")
+ 
+diff --git a/lib/Makefile b/lib/Makefile
+index fd1710cf1..dbd64994c 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -224,6 +224,16 @@ LIBDIR      ?= $(libdir)
+ includedir  ?= $(PREFIX)/include
+ INCLUDEDIR  ?= $(includedir)
+ 
++PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(exec_prefix)\\(/\\|$$\\)@@p")
++PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(prefix)\\(/\\|$$\\)@@p")
++
++ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(exec_prefix)\\(/\\|$$\\)@ p"))
++$(error configured libdir ($(LIBDIR)) is outside of prefix ($(prefix)), can't generate pkg-config file)
++endif
++ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(prefix)\\(/\\|$$\\)@ p"))
++$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(exec_prefix)), can't generate pkg-config file)
++endif
++
+ ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
+ PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
+ else
+@@ -239,11 +249,11 @@ endif
+ INSTALL_PROGRAM ?= $(INSTALL)
+ INSTALL_DATA    ?= $(INSTALL) -m 644
+ 
+-
+-libzstd.pc:
+ libzstd.pc: libzstd.pc.in
+ 	@echo creating pkgconfig
+ 	@sed -e 's|@PREFIX@|$(PREFIX)|' \
++             -e 's|@LIBDIR@|$(PCLIBDIR)|' \
++             -e 's|@INCLUDEDIR@|$(PCINCDIR)|' \
+              -e 's|@VERSION@|$(VERSION)|' \
+              $< >$@
+ 
+diff --git a/lib/libzstd.pc.in b/lib/libzstd.pc.in
+index e7880be47..8ec0235ad 100644
+--- a/lib/libzstd.pc.in
++++ b/lib/libzstd.pc.in
+@@ -4,8 +4,8 @@
+ 
+ prefix=@PREFIX@
+ exec_prefix=${prefix}
+-includedir=${prefix}/include
+-libdir=${exec_prefix}/lib
++includedir=${prefix}/@INCLUDEDIR@
++libdir=${exec_prefix}/@LIBDIR@
+ 
+ Name: zstd
+ Description: fast lossless compression algorithm library
+
+From 73737231b95976f24b7b9bff96240976b11dcce0 Mon Sep 17 00:00:00 2001
+From: "W. Felix Handte" <w@felixhandte.com>
+Date: Tue, 18 Feb 2020 13:17:17 -0500
+Subject: [PATCH 2/3] Allow Manual Overriding of pkg-config Lib and Include
+ Dirs
+
+When the `PCLIBDIR` or `PCINCDIR` is non-empty (either because we succeeded
+in removing the prefix, or because it was manually set), we don't need to
+perform the check. This lets us trust users who go to the trouble of setting
+a manual override, rather than still blindly failing the make.
+
+They'll still be prefixed with `${prefix}/` / `${exec_prefix}/` in the
+pkg-config file though.
+---
+ lib/Makefile | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index dbd64994c..b067c11a2 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -227,12 +227,21 @@ INCLUDEDIR  ?= $(includedir)
+ PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(exec_prefix)\\(/\\|$$\\)@@p")
+ PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(prefix)\\(/\\|$$\\)@@p")
+ 
++ifeq (,$(PCLIBDIR))
++# Additional prefix check is required, since the empty string is technically a
++# valid PCLIBDIR
+ ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(exec_prefix)\\(/\\|$$\\)@ p"))
+ $(error configured libdir ($(LIBDIR)) is outside of prefix ($(prefix)), can't generate pkg-config file)
+ endif
++endif
++
++ifeq (,$(PCINCDIR))
++# Additional prefix check is required, since the empty string is technically a
++# valid PCINCDIR
+ ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(prefix)\\(/\\|$$\\)@ p"))
+ $(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(exec_prefix)), can't generate pkg-config file)
+ endif
++endif
+ 
+ ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
+ PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
+
+From e5ef935cf6160768e20cd73db3d9450aa8b7f8cf Mon Sep 17 00:00:00 2001
+From: "W. Felix Handte" <w@felixhandte.com>
+Date: Tue, 18 Feb 2020 13:40:58 -0500
+Subject: [PATCH 3/3] Fix Variable Capitalization
+
+---
+ lib/Makefile | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index b067c11a2..db35207bb 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -219,27 +219,28 @@ DESTDIR     ?=
+ prefix      ?= /usr/local
+ PREFIX      ?= $(prefix)
+ exec_prefix ?= $(PREFIX)
+-libdir      ?= $(exec_prefix)/lib
++EXEC_PREFIX ?= $(exec_prefix)
++libdir      ?= $(EXEC_PREFIX)/lib
+ LIBDIR      ?= $(libdir)
+ includedir  ?= $(PREFIX)/include
+ INCLUDEDIR  ?= $(includedir)
+ 
+-PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(exec_prefix)\\(/\\|$$\\)@@p")
+-PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(prefix)\\(/\\|$$\\)@@p")
++PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(EXEC_PREFIX)\\(/\\|$$\\)@@p")
++PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(PREFIX)\\(/\\|$$\\)@@p")
+ 
+ ifeq (,$(PCLIBDIR))
+ # Additional prefix check is required, since the empty string is technically a
+ # valid PCLIBDIR
+-ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(exec_prefix)\\(/\\|$$\\)@ p"))
+-$(error configured libdir ($(LIBDIR)) is outside of prefix ($(prefix)), can't generate pkg-config file)
++ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(EXEC_PREFIX)\\(/\\|$$\\)@ p"))
++$(error configured libdir ($(LIBDIR)) is outside of prefix ($(PREFIX)), can't generate pkg-config file)
+ endif
+ endif
+ 
+ ifeq (,$(PCINCDIR))
+ # Additional prefix check is required, since the empty string is technically a
+ # valid PCINCDIR
+-ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(prefix)\\(/\\|$$\\)@ p"))
+-$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(exec_prefix)), can't generate pkg-config file)
++ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(PREFIX)\\(/\\|$$\\)@ p"))
++$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(EXEC_PREFIX)), can't generate pkg-config file)
+ endif
+ endif
+ 
diff --git a/app-arch/zstd/zstd-1.3.7-r1.ebuild b/app-arch/zstd/zstd-1.3.7-r1.ebuild
index 381d7c89a8d1..17a59e2a5d70 100644
--- a/app-arch/zstd/zstd-1.3.7-r1.ebuild
+++ b/app-arch/zstd/zstd-1.3.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-arch/zstd/zstd-1.4.4-r2.ebuild b/app-arch/zstd/zstd-1.4.4-r3.ebuild
index 4af98aeb8cd8..d9f50e824921 100644
--- a/app-arch/zstd/zstd-1.4.4-r2.ebuild
+++ b/app-arch/zstd/zstd-1.4.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,14 +12,15 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="lz4 static-libs"
+IUSE="lz4 static-libs +threads"
 
 RDEPEND="app-arch/xz-utils
 	lz4? ( app-arch/lz4 )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.4.4-pkgconfig_fix.patch" #700780
+	"${FILESDIR}/${P}-pkgconfig_libdir.patch" #700780
+	"${FILESDIR}/${P}-make43.patch" #708110
 )
 
 src_prepare() {
@@ -38,7 +39,9 @@ mymake() {
 }
 
 multilib_src_compile() {
-	mymake -C lib libzstd libzstd.a libzstd.pc
+	local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') )
+
+	mymake -C lib ${libzstd_targets[@]} libzstd.pc
 
 	if multilib_is_native_abi ; then
 		mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
diff --git a/app-arch/zstd/zstd-1.4.4-r4.ebuild b/app-arch/zstd/zstd-1.4.4-r4.ebuild
new file mode 100644
index 000000000000..6fa907a2ecfd
--- /dev/null
+++ b/app-arch/zstd/zstd-1.4.4-r4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="lz4 static-libs +threads"
+
+RDEPEND="app-arch/xz-utils
+	lz4? ( app-arch/lz4 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-pkgconfig_libdir.patch" #700780
+	"${FILESDIR}/${P}-make43.patch" #708110
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+
+	# Workaround #713940 / https://github.com/facebook/zstd/issues/2045
+	# where upstream build system does not add -pthread for Makefile-based
+	# build system.
+	use threads && append-flags $(test-flags-CCLD -pthread)
+}
+
+mymake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		"${@}"
+}
+
+multilib_src_compile() {
+	local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') )
+
+	mymake -C lib ${libzstd_targets[@]} libzstd.pc
+
+	if multilib_is_native_abi ; then
+		mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
+
+		mymake -C contrib/pzstd
+	fi
+}
+
+multilib_src_install() {
+	mymake -C lib DESTDIR="${D}" install
+
+	if multilib_is_native_abi ; then
+		mymake -C programs DESTDIR="${D}" install
+
+		mymake -C contrib/pzstd DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-arch
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)