gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-arch
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
78 files changed, 554 insertions, 834 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index aa9a92b560ca..cca723360509 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 0e5255615e33..1849ac9235c3 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 1688 BLAKE2B a5ba00d724c413a364167e80954354396c82697704bb7515af35ce1d0f39a06e19a676009483dcef65a6065eeb44bc681aaebaabdf808e07c40d780ac654dcca SHA512 4888fa16c494b1b27698268fd6c01a0736c1feb9b374fe5ab8f12321881205b5e3d78a2e8c24e9f438b9a51d5eadc1126720f79e7114785465f39cbd5f777b85
-EBUILD brotli-1.0.7.ebuild 1648 BLAKE2B bda87fb539252d2ef7221f46bb380cc4c55b0eae55c7b6ef375ab077b96be7d0e3625ebe9c5eae786119f374be5a11a29fc81746cd521b7ef2ee93190b8e5cab SHA512 24c43e0c1c80f200c82fe5a780388846a56e4ec6121d057f29c21a161e1d0d014ca2a95656ee34adc8d91f96fdc4c601b5de07a54661350e2f996b40bbddec3b
+EBUILD brotli-1.0.7.ebuild 1650 BLAKE2B 5b7f5b52c2d3e44d794de6f4861ed4c590b3be805b46dfbdcd5bd9e617810afbe54996382d2ff79080f7d2d190a0e490597d3c4ada382be831f2fbd24cbcafa3 SHA512 12cc523630b741a34ad72b7f4c5a3c5a04de84055e73252cd5129a3b9f1ec77f7bfea9a6610464c3c80b18587f1bc131d6b1c4272753015be992c52ae351aef1
 EBUILD brotli-9999.ebuild 1656 BLAKE2B f9f9e46750995bc450b3be52e71571bc76d4d5b02157f1cc50f028c8c68659583cd84e0cdaeef395a9d84e0cd1e474e728ccab522a6a196b3d4cc98ab59c39e0 SHA512 0f54e7839f789f8b89a6fc66a1fe8e4dd845b2e8393ed8990a79d3fd67281ef121fbece382d8f21d4a629404625741763c9cfcb008f55b5a3eccb1bf0914e7cd
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.7.ebuild b/app-arch/brotli/brotli-1.0.7.ebuild
index 043e7e6232d7..4d8bb62d40e4 100644
--- a/app-arch/brotli/brotli-1.0.7.ebuild
+++ b/app-arch/brotli/brotli-1.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 
diff --git a/app-arch/deltarpm/Manifest b/app-arch/deltarpm/Manifest
deleted file mode 100644
index 26d1a77fe8d8..000000000000
--- a/app-arch/deltarpm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST deltarpm-3.6.tar.bz2 500420 BLAKE2B 650193ef0bff9b534a9ff60f4bd4d9b81533a62f70e95a2cca1b96cd73f7d8b374def3300b2b079aee4ea2a1a839a79c40fe2bcfbced111414047b8b701b4314 SHA512 0ef89d8d3e7c9d3d9da06542f293b434e42d95e18616aae1de95a66a77a5937142060ff405356869454cbcf8a7bb52f64c462641e52af0fad985105af07351d9
-EBUILD deltarpm-3.6.ebuild 1135 BLAKE2B f421861770bb6a9c48b494e4928c1377a741f87996084d38b788b4208dfcf28e3183631d4ba8e802f3da8d8b22c886450850583c92508b69a216f1907fe4cdcf SHA512 0fa50f84c7765cacd52642d5cb8127253eea4a33a1cceacc456f640f52251a4f189ea6cc1588c44ca6013fa4da86e7a6713baee2d70a6f80597b5b1f71cb66cd
-MISC metadata.xml 399 BLAKE2B 8851f133a5e6c5baae011e6c9245c53146b27eadacc80637c906d2ad5e7d22be2917849af8df4ad436f6ce2d97c91e39926a638d24bcda7fd30d7937816a51a3 SHA512 1d1d36249ac2ebae92a94364bb2aa25159f25081896be631dd29bb2fd10c0210cc889c81c6cf7d52df8fce49696cac84c9f7d96c98f88945ed2c670943da4c27
diff --git a/app-arch/deltarpm/deltarpm-3.6.ebuild b/app-arch/deltarpm/deltarpm-3.6.ebuild
deleted file mode 100644
index 8e7abf5cdb35..000000000000
--- a/app-arch/deltarpm/deltarpm-3.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs python-single-r1
-
-DESCRIPTION="tools to create and apply deltarpms"
-HOMEPAGE="https://github.com/rpm-software-management/deltarpm"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}/${P}.tar.bz2/2cc2690bd1088cfc3238c25e59aaaec1/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python system-zlib"
-
-RDEPEND="sys-libs/zlib
-	app-arch/xz-utils
-	app-arch/bzip2
-	<app-arch/rpm-5
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	MAKE_EXTRA_FLAGS=(
-		-j1
-		prefix=/usr
-		mandir=/usr/share/man
-		PYTHONS=$(use python && echo python)
-		CFLAGS="${CFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-		CC="$(tc-getCC)"
-	)
-	use system-zlib && MAKE_EXTRA_FLAGS+=(
-		zlibbundled=
-		zlibcppflags=
-		zlibldflags=-lz
-	)
-}
-
-src_compile() {
-	emake "${MAKE_EXTRA_FLAGS[@]}" all $(use python && echo python)
-}
-
-src_install() {
-	emake "${MAKE_EXTRA_FLAGS[@]}" DESTDIR="${ED}" install
-	python_optimize
-}
diff --git a/app-arch/deltarpm/metadata.xml b/app-arch/deltarpm/metadata.xml
deleted file mode 100644
index b1f9256af634..000000000000
--- a/app-arch/deltarpm/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>A tool to create and apply deltarpms.</longdescription>
-  <use>
-    <flag name="system-zlib">
-      Use system
-      <pkg>sys-libs/zlib</pkg>.
-      Do not enable features of rsync friendly.
-    </flag>
-  </use>
-</pkgmetadata>
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 940a23c230ac..c328fab70539 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,16 +1,19 @@
 AUX dpkg-1.18.12-dpkg_buildpackage-test.patch 215 BLAKE2B 9890d9f9bf0f2229f73d5639f1118fe32426485a6056c43cb4f443c3fa143a915c4a84ac6f484d2a1a1ad813344b9765d809b6e18cdc35191aca2151783e00a0 SHA512 c31aa285a9d896ea313ce7d04a959767811019781fb747714630d91b56c631557ea64716e6c0ff20f6f60da67ff8c143cc8697d7b482a2e387ca4712908d9154
 AUX dpkg-1.18.12-flags.patch 416 BLAKE2B c7fe40b28793420afa0b895585cc14a675f9be68784beef7965fe6e971f6b2d6ecaa7c8bae51bb9f774c9517a618bff85b723052360224952cbdd2b74759b42e SHA512 6c86e8519ab4a05a2c15a658f41c0da14429c4fba0fcd364426afce7db03cd886a69de3f04f167d0f7b6d36a05252455864c11b14f58baab0a4536249331369c
 AUX dpkg-1.18.12-rsyncable.patch 1245 BLAKE2B e1488cc6a6807d38ec7218ae6651b0d919fbc3ee5e2837540f91cf80229e669a6fe24d6de1c4bd1c1debdc34a0c04a2bbc6a21eb964032f24526986678eb1b14 SHA512 743f4780b4c93e53924836fae96d59c2f1098dae6ef683b2b30146ab0345109718a507486f86ff96cda5b705aff858da563cdc0d40c965bf964cafe7105994ae
+AUX dpkg-1.20.5-dpkg_buildpackage-test.patch 209 BLAKE2B d15000423abe8259e7bdd92e5ff2d38f8fd32622e8467259e791159df590f7d394647ba4efdd599b77d652f973cd07af09d64f29df920fb8015c995bce9b302a SHA512 046200d2a8c143a2b08e0c8113765c7a7a18846ce0b7a2dfd5a3f1167eacc70391415c6bcef21abe49e5d8225dbf08680fcdc405f0910e9c42071ad4cf8ae6d5
 DIST dpkg_1.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
 DIST dpkg_1.20.0.tar.xz 4738556 BLAKE2B 2e58b3881abd46854416b05b0f9d2e972c3b545412a506b7bc18f1ebae5d82eac8bc2b55920d706fee0ca02239871c4f1c121e0c780aef31404e0408fbfa76e8 SHA512 5dd7961bde19ccc891fd5b77ca0085f7fc0308c20380e20b393397ff92e50d1c0f54e7b57676c05876021b44aa3788af8258c21ff2b672110ac92c7ce0b408f9
 DIST dpkg_1.20.2.tar.xz 4710300 BLAKE2B 0d10ee7f5cc863a6496fd8340cf0457f9af3d7d7a74821d561d0cc500a056d52664d1418453fa45dcb27d01ef59e55eb299ce1fcccd1ae7cb72b7c9e43b6b120 SHA512 523713e40d4f49332d96fdcabaeaf4d97f56b40bbbd51f18d17b5c79598249d04fdf96dfc5c8684408a666cf04f622cbd30da60efe68ba2cf1cd836cb2503e02
 DIST dpkg_1.20.3.tar.xz 4712980 BLAKE2B 92a1ff07dbb01f8942452eee269eb45d4c164272bf3ae5d0a62a6086c4321e7fc3dd5b164089d7f2e476258f8ec8c480c1614d4f43e3a7a7f1e632bf13191d2e SHA512 5893ae34efc6f9d54e47fc403487c79233501666968681b827bbabbf39b1401cb7064f8fe8797708ed32bb37345dbb78a1daac04c6dc7064f2811265f3a4e82c
-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 1956 BLAKE2B c2bc7ce7f6caf26c282300b61f952310b9a864b6446a7e3098be3305399389b445bb1a552c9b8b41d2fff45f1da1488e9663b1e4f88ee47b8267d6e227f8c6b0 SHA512 0a3105efa877c86ecf7af70a7c49c71c59dae6184e275d811d3ff55b23ec4ccc342f20e9eb3b20ae1e1e1d8221678609fda731a2d96bd71afad3879d5795d058
-EBUILD dpkg-1.20.2.ebuild 1928 BLAKE2B 52add907caa6060be19af86a1f2c02731e4bd2a6d6e826d9bc3b1d0b36f565b7450088ba727f5ddd747e6a0bfdd974b00525d352cfc81d38b1e9e1b083f70d3b SHA512 d7cacc1d8d6a970c527951c902ce6c10f3ceb73c09036f180f50bbd4669bd6b738c3e39d1445d8b311d72a9dc8effa879cb426fa71f1e598628a5781006bc1ca
-EBUILD dpkg-1.20.3.ebuild 1928 BLAKE2B 52add907caa6060be19af86a1f2c02731e4bd2a6d6e826d9bc3b1d0b36f565b7450088ba727f5ddd747e6a0bfdd974b00525d352cfc81d38b1e9e1b083f70d3b SHA512 d7cacc1d8d6a970c527951c902ce6c10f3ceb73c09036f180f50bbd4669bd6b738c3e39d1445d8b311d72a9dc8effa879cb426fa71f1e598628a5781006bc1ca
+DIST dpkg_1.20.5.tar.xz 4715684 BLAKE2B 32b88cbd1ae75685b6c0b04b7c829372df323a9508ddd088076097e8bf2ac9050f1f4ec591fb7d40c4d4ea34207cef0edd430d0326cb73e1f7c8dd560db916be SHA512 6b3789c25c81022181b87a28ca9baa4a463a68940a871568c699a2a30e3b4ce705835ed6a171ac8c5902e377200b31cc0be1e03cbd7d35c4eaf92c7300d9227f
+EBUILD dpkg-1.19.0.5.ebuild 1811 BLAKE2B 5974b15ade93bd7bf18d859f25e20905bed3e6fc0b7e855f4d5f867240190c2e427257a99983074254314a7cda8fe6b8c685c10f85ac6aa6d3d50ead4fe2c158 SHA512 50cf30923b4458344d70339014979bcdfe48a4ceb69a944cc1b624e4fbad6dd191e93959d4e8ffdda1cbe84880275d60543a8e49d2d3f76c849a021232b16cb0
+EBUILD dpkg-1.19.6.ebuild 1960 BLAKE2B ef3fbf6a4a7add7936aafc4f643495ec37741ef5e6618badcdcf6253e8f4a94a10a197e428f2a1a2e665e106eec7b64585c62de0ed2ff9003226db94824faa92 SHA512 b4f21e5b0be4783a9a45d1153a7de938fa056537ef6b40f75e07a7d009fba8b5895b08d7249f1ba785e6e4e3a6324f0de953ed74b2e6315d210a9a77f04782d5
+EBUILD dpkg-1.19.7.ebuild 1960 BLAKE2B ef3fbf6a4a7add7936aafc4f643495ec37741ef5e6618badcdcf6253e8f4a94a10a197e428f2a1a2e665e106eec7b64585c62de0ed2ff9003226db94824faa92 SHA512 b4f21e5b0be4783a9a45d1153a7de938fa056537ef6b40f75e07a7d009fba8b5895b08d7249f1ba785e6e4e3a6324f0de953ed74b2e6315d210a9a77f04782d5
+EBUILD dpkg-1.20.0.ebuild 1919 BLAKE2B c7456dbda807d2195de6e0f19abab34c70eb6e768095ed7009a95e052105b0cf0cbeda02cc48f9b3b3fa6582b1f1e1bb7f32c1eec1b80f29fbe838b698c4bc5f SHA512 db416fdca740d42ebe57fec322a97c3571c6ca660eeef3f20079a3bceac9752cd13ad6247aa42b65faba2c7a33db0e3d043a494986e2bedf459734f332dd5ceb
+EBUILD dpkg-1.20.2.ebuild 1891 BLAKE2B 4b479ba923cc599f316a95c94047106b81d26c5b35fdaf18fddea3686c45111f6e128e1ff9c8b622daf326520cdc0bf3e490bb96ad07ee526605042dc4e8250c SHA512 f7f9d2cf745a1aff7ee3c42172bea29cd094f3e80ccbde8d1dcbd7519032fb59aeef98972b568c864d2287f97e0b5b9dd071c42b4ac8f5f8b1ce2f7987d10946
+EBUILD dpkg-1.20.3.ebuild 1891 BLAKE2B 4b479ba923cc599f316a95c94047106b81d26c5b35fdaf18fddea3686c45111f6e128e1ff9c8b622daf326520cdc0bf3e490bb96ad07ee526605042dc4e8250c SHA512 f7f9d2cf745a1aff7ee3c42172bea29cd094f3e80ccbde8d1dcbd7519032fb59aeef98972b568c864d2287f97e0b5b9dd071c42b4ac8f5f8b1ce2f7987d10946
+EBUILD dpkg-1.20.5.ebuild 2008 BLAKE2B 8303d63470637dc1df9a1db1c1f4499e8e4168d20ee17432b6d9b35fc5bd2b4a5dd25d4940543d0d382166258fe62219e6a307a33e1a10a6819df89cebcb4cf3 SHA512 1ca45b81c325f4963d61e4077404b1fb3016e66b1d23de000635fcd96e5dd691ac8ce4ad38e893bb32f0554807e8b04ac47b3ff65b0517694d3bc574392980a7
 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 2579db8341da..8e4d1b70a04d 100644
--- a/app-arch/dpkg/dpkg-1.19.0.5.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/dpkg/dpkg-1.19.6.ebuild b/app-arch/dpkg/dpkg-1.19.6.ebuild
index 841e049310cb..8caed6c98c4f 100644
--- a/app-arch/dpkg/dpkg-1.19.6.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.6.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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/dpkg/dpkg-1.19.7.ebuild b/app-arch/dpkg/dpkg-1.19.7.ebuild
index 841e049310cb..8caed6c98c4f 100644
--- a/app-arch/dpkg/dpkg-1.19.7.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.7.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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/dpkg/dpkg-1.20.0.ebuild b/app-arch/dpkg/dpkg-1.20.0.ebuild
index 8a0c90852c20..07b8ea26604c 100644
--- a/app-arch/dpkg/dpkg-1.20.0.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/dpkg/dpkg-1.20.2.ebuild b/app-arch/dpkg/dpkg-1.20.2.ebuild
index 371e6291f509..732d0c6d35b0 100644
--- a/app-arch/dpkg/dpkg-1.20.2.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/dpkg/dpkg-1.20.3.ebuild b/app-arch/dpkg/dpkg-1.20.3.ebuild
index 371e6291f509..732d0c6d35b0 100644
--- a/app-arch/dpkg/dpkg-1.20.3.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/dpkg/dpkg-1.20.5.ebuild b/app-arch/dpkg/dpkg-1.20.5.ebuild
new file mode 100644
index 000000000000..e72dc080fa4c
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.20.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=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
+	virtual/pkgconfig
+	test? (
+		dev-perl/IO-String
+		dev-perl/Test-Pod
+		virtual/perl-Test-Harness
+	)
+"
+BDEPEND="
+	sys-devel/flex
+	nls? (
+		app-text/po4a
+		>=sys-devel/gettext-0.18.2
+	)
+"
+DOCS=(
+	ChangeLog
+	THANKS
+	TODO
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.12-flags.patch
+	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
+	"${FILESDIR}"/${PN}-1.20.5-dpkg_buildpackage-test.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|\<ar\>|${AR}|g' t-func/deb-format.at t-func/testsuite || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR CC
+
+	econf \
+		$(use_enable nls) \
+		$(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
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/app-arch/dpkg/files/dpkg-1.20.5-dpkg_buildpackage-test.patch b/app-arch/dpkg/files/dpkg-1.20.5-dpkg_buildpackage-test.patch
new file mode 100644
index 000000000000..9f1494dc290c
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.20.5-dpkg_buildpackage-test.patch
@@ -0,0 +1,10 @@
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -264,7 +264,6 @@
+ 	t/Dpkg_Dist_Files.t \
+ 	t/dpkg_realpath.t \
+ 	t/dpkg_source.t \
+-	t/dpkg_buildpackage.t \
+ 	t/merge_changelogs.t \
+ 	t/mk.t \
+ 	$(nil)
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index 292a86fc9a36..d401c8258293 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -2,5 +2,5 @@ AUX engrampa-1.22.3-gcc-10-fno-common.patch 526 BLAKE2B 38fe4aa06e6a0d2a5a3a7238
 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.3-r1.ebuild 1709 BLAKE2B 0f4cb2a3697db9312e27c0c56948ac802b64cfe1d0849b513a2a3701b1a94997877020b44cfebb13b8196357089273dd8c414e618868c8d91ea8b627a54bda16 SHA512 0cc3737e8bc631c78a75122b6e3cdcdaf67c94e2b8a11eaef8b9a22a5c4619ddb2e260a7585c6b76ec4b08da74b09b7511d33a46c2ced7530b88b6d89efaab42
-EBUILD engrampa-1.24.0.ebuild 1706 BLAKE2B e6504459167554f6a7b613ef48a2f5fc67962818205a8830daedf5af46b5c18666a307fedd74b490017ca61d38a990be0bb8e2d90e8978e8e6dd6913654fc08c SHA512 f4d709b14061235b1c9cf51f446ca71021849f1ca79bfd392b26419d334465c514abe618e5cc720875588c4205eb82c773116a5aba44354aaf37390d388b9c65
+EBUILD engrampa-1.24.0-r1.ebuild 1720 BLAKE2B 1531fc29b54d2da788e3593659ca211fec90b31aa7cdc7c6886681e7440da305b99d6160ddb9ce31491832082ce68a0143861366b0560464995cbcf1a345a88b SHA512 3a2d0ff185ef36fa23328517c1f317a8819a59d6546853b183bf5cf29d01da6a8fe1d05f37038aff078d9aa550bc9e04c14db1228a57e7692e4c2bd9bd0bd9fa
 MISC metadata.xml 590 BLAKE2B a67378188ec008cbb9e6790dc02a042f0ae46e3f5c1bd2a277923bf3a05682523f884e1d9858f6406430cd54a6c33754a5dd695acb360bc99f7939bd3160e931 SHA512 9c3b2fbe1667d3408600a10b63be3141136acabfe6ed53a637ff5fbeff50a44ca7f0463b48597dc1473eb29ae31e7f222e11cc68432fdc12f34c7bca38bb89d5
diff --git a/app-arch/engrampa/engrampa-1.24.0.ebuild b/app-arch/engrampa/engrampa-1.24.0-r1.ebuild
index 27c5563509e5..ba457c153973 100644
--- a/app-arch/engrampa/engrampa-1.24.0.ebuild
+++ b/app-arch/engrampa/engrampa-1.24.0-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate readme.gentoo-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Engrampa archive manager for MATE"
@@ -23,6 +23,7 @@ COMMON_DEPEND="
 	virtual/libintl
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.22:3[X]
+	x11-libs/libSM
 	x11-libs/pango
 	caja? ( >=mate-base/caja-1.17.1 )
 	magic? ( sys-apps/file )
diff --git a/app-arch/fastjar/Manifest b/app-arch/fastjar/Manifest
index 1f10b9a19693..494abfab5c28 100644
--- a/app-arch/fastjar/Manifest
+++ b/app-arch/fastjar/Manifest
@@ -1,4 +1,4 @@
 AUX 0.98-traversal.patch 3010 BLAKE2B 76450d561450aa9c7d5386f53328c0037d6ce9df2d6aac79deb1e47cee7651723cf2863a0d27cb6431a58525a9d0d3c554820b4f22a3099d1fe43b2ea7bec0d1 SHA512 7bfcfebd681f9556e8231786da3326d12ee7ab071e2cadf9a4c17ba4e4e750aeb7e3d7cd78634c36e05179df4a369aae2e04a22533d1954668ada95f1d53d311
 DIST fastjar-0.98.tar.gz 717984 BLAKE2B 1715f1917076799fc58c6c6cea8fb53fc3261a694fa2392c0dc6e30101a7d42de0c5c55cd593627b4d2d0ffa45e3d44ef220c9579caec669721c6b1b9996e43c SHA512 c0f9fca7b58d6acd00b90a5184dbde9ba3ffc5bf4d69512743e450649a272baf1f6af98b15d79d2b53990eaf84ef402c986035e6b615a19e35ed424348143903
-EBUILD fastjar-0.98-r3.ebuild 515 BLAKE2B dae7a41a20e0de287b9d4b4e25a7403f73c87241d1e819797b9676cdfaef8a4b01fbadd5eb294a64d297b9e20724c0cf3daee3801c07c33a951d973462e28bf5 SHA512 a7f88602931712be65b24e158805d67a5b72dd8cf0fc544f622181e43b47f48e63426dc334a61b1dcf2777d28e289c859f439159432a6f528f05933dc824eff6
+EBUILD fastjar-0.98-r3.ebuild 522 BLAKE2B abb6f9204ae4b36d6017182f1b5b0a972a90ca4892d3e319b28e08ffe1f9c9e019fb4088ff9af2ca7648b38805b22713c363ce52893dc0433f310691f76e45a9 SHA512 3e92039ed773aa5e2c329081c9492867a34ae45e16b2d7704e5ceb4a42e1a77a87985c2ccd8c4dd5c27d3651f46d07dc1a433ee238b08a3d5754da7a4ee987ef
 MISC metadata.xml 478 BLAKE2B 91d7ee00197567dc201739072627c34a8a7073a28b89c5761793ce628d1f62432d91b36b13a65fb95f821101249697a041af339823bb26fe132873c4a20a7b54 SHA512 3b1f8a2998d8496947b8e6c60698db4311ca1afe7ddcd0fe9d4f7ae762acf4204a87f8ebcb9e0b0677727eb82fdda22a299cf3cafcdf83bd348d98ba16ff4214
diff --git a/app-arch/fastjar/fastjar-0.98-r3.ebuild b/app-arch/fastjar/fastjar-0.98-r3.ebuild
index 34ca86e5a0bd..c33c9d06c5b7 100644
--- a/app-arch/fastjar/fastjar-0.98-r3.ebuild
+++ b/app-arch/fastjar/fastjar-0.98-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 
 IUSE=""
 
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 49f2022b2863..bed5e8c46717 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,5 +1,8 @@
 AUX 3.32-packages.match 645 BLAKE2B 7bb6ec28fb8150e1f1989a9db4514556d857b4dea8b8225b1515f3f53b70a1e81b6a0a1068a0d356a33086d0127993a394cb0500e2991384c404dce7faaf32a0 SHA512 3c837c18afa12c5e022a80f85ccc83e5f55fc8fdd5ee8f19f1b2222d08560ad1fd349ed8b1bb7255119f6d6101399fa0dcd79e6a1754c719c0409343c231f65b
+AUX 3.36-packages.match 664 BLAKE2B 5ff5f4066c1b085829321280d0f86d9a9eda071a23bfb01aba94594ad2815d6f68d67b8c0b6d053ee442a0b3e70d81c2bde3788b14c98ed3e1e37fb16b101959 SHA512 e4518a143a164b699aeeb4309bf41697f9aab12de401217126513018352163ed034f3e8ef30fb22db0cb966650f08fc9b68079d171a861bd6185c13fa6b4a4c9
 AUX file-roller-3.32.4-fno-common.patch 693 BLAKE2B 2a2cd45f9bc5fd73d9bf1324944f70890bd52878d03c0197f0b4759f6a780fac5c964c240269bbcb89056591306fc87df4bb3403b18346079853541d9b81a644 SHA512 31c425704802c2d2095b8778177f7cfbd31fd1447a3e4b8fa3ffcc9c952231d400a11458d26a6db7e2595d6bae1ba9eec01fa6d925ed727660cba7af2589bbb5
 DIST file-roller-3.32.4.tar.xz 854444 BLAKE2B 04264e64af8ab4376fa6985683b16be7fef730a4e24044f726933b885aaaa6b630f347a256b09c2ce6183d0a0a392b33b4328715bf6d19cf7128c1980f9f4792 SHA512 16b5ddbdeacf4e9e61265ecff05e8f2e0034147c67ae7355d2442f9b26098ff253d24cb34c8e686c2ac031da6acac8e1e3c8a9f978e1eb2b446b1e045babafc7
+DIST file-roller-3.36.3.tar.xz 870608 BLAKE2B 4c57b99f2ca0eb4db3fac0216b63207d1664829ee54e21eb976a327bd65aec5abfd2a02b84bc80246fde131ede6ff63deaf8b63451db6a0fecc0121c8bce1a5b SHA512 41558ca8061276b1248fd3599e856051dcd69ca831fb4d8a33666dc373b4abed56e7ef204a6e041ceace05ea7234448d15bc7be8c48dc1809ac6d445de251370
 EBUILD file-roller-3.32.4.ebuild 2274 BLAKE2B 996cac999d6d1c1f4b4deba986f6001371d1b5f6c05c370e531679c6486a796c75a6e2679ef65c655cfed6af1dbde06840d1b6b916ec3cc5f89325cdc440d90b SHA512 a3e66c14e06a337a41591a55a1d8a6d273f57bacec3edb202bca83bbf952d980e2b4131c338a2ea71b31f76116195a772a4261a4b9caa634795de4f249ea632a
+EBUILD file-roller-3.36.3.ebuild 2177 BLAKE2B 51b493b38f0033fe685f2669d55d54e9ea498ff683eac6aff15113b9b759677d45f5e81d8fe7dd7b8c39c6cb3c1095783f46af81ffc9c13b1fe17ca793dfc201 SHA512 eaa74cfb8827efe8b4300f5f3f4794a1dbef609229fc796aaeaec6e9c7cb5b032895658518d85b9531d311fc218523c25b05b2f076f85b7309ae95581e14a120
 MISC metadata.xml 627 BLAKE2B cc3f28d4405c3939f1a24dbc25d3ac5dfa46438b769d29f4891e860a40b67de074defa0beff9ed9f542610eb38d3593b3d9602f886c57178db4e344e996c52e4 SHA512 6becde35161e28b9b829c97c6c3a67c011b2509647f4a15672ea67560909fc05a4e1aaf43aa4f4f308ab5541316b4107dada8cbe7e73fc2c076afbaa0a807eaf
diff --git a/app-arch/file-roller/file-roller-3.36.3.ebuild b/app-arch/file-roller/file-roller-3.36.3.ebuild
new file mode 100644
index 000000000000..4b13a2c788b1
--- /dev/null
+++ b/app-arch/file-roller/file-roller-3.36.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="Archive manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+IUSE="libnotify nautilus packagekit"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+
+# gdk-pixbuf used extensively in the source
+# cairo used in eggtreemultidnd.c
+# pango used in fr-window
+RDEPEND="
+	>=app-arch/libarchive-3:=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/json-glib-0.14
+	>=x11-libs/gtk+-3.22.0:3
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${PN} is a frontend for several archiving utilities. If you want a
+particular archive format support, see ${HOMEPAGE}
+and install the relevant package. For example:
+7-zip   - app-arch/p7zip
+ace     - app-arch/unace
+arj     - app-arch/arj
+brotli  - app-arch/brotli
+cpio    - app-arch/cpio
+deb     - app-arch/dpkg
+iso     - app-cdr/cdrtools
+jar,zip - app-arch/zip and app-arch/unzip
+lha     - app-arch/lha
+lzop    - app-arch/lzop
+lz4     - app-arch/lz4
+rar     - app-arch/unrar or app-arch/unar
+rpm     - app-arch/rpm
+unstuff - app-arch/stuffit
+zstd    - app-arch/zstd
+zoo     - app-arch/zoo"
+
+src_prepare() {
+	# File providing Gentoo package names for various archivers
+	cp -v "${FILESDIR}"/3.36-packages.match data/packages.match || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Drun-in-place=false
+		$(meson_use nautilus nautilus-actions)
+		$(meson_use libnotify notification)
+		$(meson_use packagekit)
+		-Dlibarchive=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-arch/file-roller/files/3.36-packages.match b/app-arch/file-roller/files/3.36-packages.match
new file mode 100644
index 000000000000..0a26adebb250
--- /dev/null
+++ b/app-arch/file-roller/files/3.36-packages.match
@@ -0,0 +1,35 @@
+[Package Matches]
+arj=app-arch/arj
+binutils=sys-devel/binutils
+brotli=app-arch/brotli
+bzip2=app-arch/bzip2
+cpio=app-arch/cpio
+dpkg=app-arch/dpkg
+genisoimage=virtual/cdrtools
+gzip=app-arch/gzip
+lha=app-arch/lha
+lrzip=app-arch/lrzip
+lz4=app-arch/lz4
+lzip=app-arch/lzip
+lzma=app-arch/xz-utils
+lzop=app-arch/lzop
+ncompress=app-arch/ncompress
+p7zip=app-arch/p7zip
+p7zip-full=
+p7zip-rar=
+rar=app-arch/rar
+rpm=app-arch/rpm
+rzip=app-arch/rzip
+tar=app-arch/tar
+unace=app-arch/unace
+unalz=
+unarchiver=app-arch/unar
+unrar=app-arch/unrar
+unsquashfs=sys-fs/squashfs-tools
+unstaff=
+unzip=app-arch/unzip
+xz=app-arch/xz-utils
+zip=app-arch/zip
+zoo=app-arch/zoo
+zstd=app-arch/zstd
+
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 4413c6b5637f..6e613620815c 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 1119 BLAKE2B 2596c9ed30b65889ed6ba229572a0a16452f3723ac02c76702bc5766c2d2770b4a28ec52cb7192df8b07d7df17f95bd18551422b4102402abaad9d6c957c183b SHA512 af3cec2ffb96af9c5d8ff1347bbcd1f3b17c251e821ffd740e73c3cd37402768ff308bd7cc96694aa644a4dc20b104eb828410f2ecf2bb876f69b891a7a20028
+EBUILD gzip-1.10.ebuild 1114 BLAKE2B e7a59a52e3aa289a70ed4c45e47678d282f8d6f917b3dd4640ea1f35502041fdb6f896c5ab2465117170d27d1def7051000390914901d67c83657846a5cc03e0 SHA512 197123e0c917d92b5e35cca30d26602e3fe6ead26dc4a75b9b279067acd8e3f68c95c2ec55be28d44d953c892dece1b746895de99283367bdc496293f8c1f1ea
 EBUILD gzip-1.9.ebuild 1152 BLAKE2B 35ed002a9ae553747b0cd64af53b183c9144def81d3c0220371daa5c697fcbaec8de2410f984825fb792d8352b985ecd03a05251b9f0ba230aab695744c09625 SHA512 d677cd25d67ed2300750ec6177d6d19c0d1b73ea1c6ca0f104ee1c53fc39ee9f4dbac4c6497a42ae5403fcafe05cd2d6d677fe4526cb34bb46af0edd02d44146
 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 470b1f4f5769..6819b4b49362 100644
--- a/app-arch/gzip/gzip-1.10.ebuild
+++ b/app-arch/gzip/gzip-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~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/innoextract/Manifest b/app-arch/innoextract/Manifest
index a71d26aa64e8..ae67fade65cf 100644
--- a/app-arch/innoextract/Manifest
+++ b/app-arch/innoextract/Manifest
@@ -1,5 +1,5 @@
 DIST innoextract-1.7.tar.gz 195123 BLAKE2B 5dffb49da7ec3f8e48a70d0809e059179e84610dd50397b8ca472b9f5a96a5edd0cf36898f0e513b3f70685829e2b8edbd7d7932c9f1b47706c2929f596867e5 SHA512 5e92625a411a4351dd4639d4b63e8664519c6697122a0679c010412e94a1e5da95324c33be16211f91c2b25b8cea40fe4ba4da5e19c12d0c27a4916159465ca4
 DIST innoextract-1.8.tar.gz 205553 BLAKE2B 223f0997ae00f2a854912befca25595b275ece8e0fe4f4451d6aa3db14ad1ed98474a19c919c56d958e99c0175be647d3eb3c14d7869504405a7bf6db3a35957 SHA512 2c68009333f02a8a677c084e9c95c835d84a73e60c9b0c70fee5f23fd9a7a640cf2aa7e0476c55579774ac7079498fa24668f9388493bbc13415ff5a5b06ac9c
 EBUILD innoextract-1.7.ebuild 731 BLAKE2B 2372ce7018c12a5317232d6ac6294297e017034059afbe49b934c017367cef9ff343b7d74f754b5409e212a907ea933d6e381c60a808534a7a667ae3f9cd1c72 SHA512 4f9f49dc8b2c5679bca97058401b5b071d879e192de1b6b2eeb5e43d0a2d41702fb100e7c45a22d3eca8020785e41c992e62e346432332ba684cf03e5dd3eded
-EBUILD innoextract-1.8.ebuild 690 BLAKE2B 1418215fd70eccf0b1286a103304954f886808e3870d9bee1be837d7012c1f309bd905a29506b7310ad91961bbc44ada907bbe57b4f60efece6b18dcac8c5220 SHA512 e32bd0510a1a68b0f026c1ec548fb2d61b935270a4dd67df40b4b11cb51f54d3fc3fef9f06d262cf1961d075e6d4caab644d0bce0c73cccf68976c80aa8ac496
+EBUILD innoextract-1.8.ebuild 697 BLAKE2B 3cf1864fba834a0038fcd39931a0749df4789192b0a9e12623e12dec256daa51d681f4c99ba1e313ac41567e6eedbf03543c86239f476890bba12acd630facdc SHA512 ce1ae8711b92e47bfaea06d3c87db6c35d4b8039afb8975d5699297c8d9bf07f104163f9d3fbf4983c956b8e8621b7eb4ab7efe6dc6fcb1befdbce1da5bfbe86
 MISC metadata.xml 928 BLAKE2B 032de64587c2ab814a132d09f624a86f6b87a5fb1c49a1385969fcce89a7f75975480c8b3b70889621a97bb26e1d37240d51ef5a9da868983ee2467fc5c18f92 SHA512 0fb9ebc491eec20dbeee81d92ae7616464717c88684170ea064726b42120d65ac74edfac474e2605c191d91901e952859199c17bc84af3657812671cb3fb9260
diff --git a/app-arch/innoextract/innoextract-1.8.ebuild b/app-arch/innoextract/innoextract-1.8.ebuild
index 2110d7779f25..5cf62179ba29 100644
--- a/app-arch/innoextract/innoextract-1.8.ebuild
+++ b/app-arch/innoextract/innoextract-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://constexpr.org/innoextract/files/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug +iconv +lzma"
 
 RDEPEND="
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index 762865bd3242..7bf49859f9db 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,7 +1,4 @@
 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
 DIST lha-114i_p20201004.tar.gz 220541 BLAKE2B 64268deb40de67d5f4888f7d4b4529fa1b6ca02c562bd041d9edd1ac9cc74ccfa43198c79310bd354806e3095f6aba8c97256b49686feb8c713e3d8110137103 SHA512 9a9337cbb6a3d71253597750301e37163c5b495e712f2374adf2ac0d19f731ed49482a3f8b639e4c48c7ef6fa7ed9f9081516d77548e9c88ed3b9ac037efeb06
-EBUILD lha-114i-r9.ebuild 1130 BLAKE2B e26cbbcbfa1b0b49b006806f3c22ee4249620eeae8c9d0d5c6882d5bf617d426ff0bffa6d08172573f59ada05245447b8b56a8ec96cc7820c09f31d73f2ceeb9 SHA512 b0d901706937a0e4f01f34303bc458431c2a7d91f09ce0f1194f3a696315c3a6518edc77af5aee4773bbfe0451555e6a75cd2acf5c26c281050c221966dbd829
 EBUILD lha-114i_p20201004.ebuild 880 BLAKE2B 0c18d20c1c6d7e72f08840c9aca4fa1a0f80afa4151c725002b9d86442bb2904036d9573a480735ac1df3f038bd74b6284bbb4b320214d3522683f8bfd6f6f0d SHA512 2fc38ca7669a3d466022f02a4787b4c643da9d23aff5fa49aa135ae5908d4b5d6beca93ed33095942d427db213ef641caf493d47fa6dd7b07e5c4febe6467c60
 MISC metadata.xml 434 BLAKE2B 414f7750d16ce40058d2ae20237ac880f3d239bb76111ae99afb6733876ae3f44d2aa5de0865a6139f4cc1efc706d2d35991ab61f5af4d5b74ad195c28eb9325 SHA512 8cfaf4a935f86fc33a86becdcd233d6edcf10fdec2f3d4e5af44cdf21c904917f29f83c203f2e00c31aca78d9e6189041f053edcbcb4573e258169fd21566e74
diff --git a/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch b/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
deleted file mode 100644
index 3c3b7dfd94c5..000000000000
--- a/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/getopt_long.c   2013-12-18 16:05:59.789413528 -0600
-+++ b/src/getopt_long.c   2013-12-18 16:06:01.200420472 -0600
-@@ -64,7 +64,7 @@
- 
- #ifndef USE_GNU
- #include <stdio.h>
--#include <getopt_long.h>
-+#include "getopt_long.h"
- 
- char *optarg;
- int optind;
diff --git a/app-arch/lha/lha-114i-r9.ebuild b/app-arch/lha/lha-114i-r9.ebuild
deleted file mode 100644
index 4e1a31c247e8..000000000000
--- a/app-arch/lha/lha-114i-r9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-MY_P="${PN}-1.14i-ac20050924p1"
-
-DESCRIPTION="Utility for creating and opening lzh archives"
-HOMEPAGE="https://lha.osdn.jp https://github.com/jca02266/lha"
-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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
-RESTRICT="bindist"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-file-list-from-stdin.patch
-	"${FILESDIR}"/${P}-fix-getopt_long-declaration.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e '/^AM_C_PROTOTYPES/d' \
-		-e 's/^AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
-		-i configure.ac || die #423125, 467544
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DPROTOTYPES #423125
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		export ac_cv_header_inttypes_h=no
-		export ac_cv_func_iconv=no
-	fi
-
-	econf
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		mandir="${EPREFIX}"/usr/share/man/ja \
-		install
-
-	dodoc ChangeLog Hacking_of_LHa
-}
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 424c4eaa07e4..422b9b096cb8 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,6 +1,4 @@
 AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe
-DIST libarchive-3.4.2.tar.gz 6979481 BLAKE2B eea90e4751ae487cd1a9b0eecd16598d1b81ffff665ae97a160e3858c8ffe60b82003f081af644f3f32260d0e1d3f3077240125e8279bf8111a79d93c68ac25d SHA512 a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021
 DIST libarchive-3.4.3.tar.gz 6990533 BLAKE2B 12f97e8e4032daf0fa8f9e1839f9c7ef80fda0b2a0ba703c67d860437fad6a293484a61417f72eff933179d544cfed45083e7886f462276bc6abbce1097e6256 SHA512 d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d
-EBUILD libarchive-3.4.2.ebuild 3682 BLAKE2B e933888d38791470063f370bc550105f96a9305d26ae2188f546f57605943658314c6bcfab52f4cde877f9e1eefd0c64c92e19a47502455533e13000b9100017 SHA512 fcca418f5d06b6b0460a69ea26eab3d3792ba7bca0f25d0c700e434664eaed29de81dc9b570e4694cea6570e6c7abda41258a300dd07d3dccac38a287af17c73
-EBUILD libarchive-3.4.3.ebuild 3770 BLAKE2B 4807869b7b89b14b1c97218ce92a316de81c806580049e134ebe39688d678462f0e8a4ee790c364ff0a3ec2879840990f6c337b5541e5db3e4f06ac91a133f1b SHA512 2aaa032adff8441721e42e6fe4de0787eaa9602f71f2e60735c6a0fbd388a0137f82e8058b1b635287d790774663575c673cfa5ba2a75a3f9940e81e903c2c00
+EBUILD libarchive-3.4.3.ebuild 3761 BLAKE2B 2d9bcb9f9e0d6ead67db818a64fb611ce6158b0a7b01f20aadbfcb73624db143b399c446e6b1797d25581f7fb89ffe3b9528377f72dfc96cf2f5db7a658e4570 SHA512 346b64cc503f74f0220d319f02fe8c8265c3468c54a5c09df23fd948be20262bd849a34648522f6774854afef004bfefef7fd3f0cc0ee52b1bd18ec99e978924
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.4.2.ebuild b/app-arch/libarchive/libarchive-3.4.2.ebuild
deleted file mode 100644
index d9f9a71caad5..000000000000
--- a/app-arch/libarchive/libarchive-3.4.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/"
-SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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
-)
-
-# 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.3.ebuild b/app-arch/libarchive/libarchive-3.4.3.ebuild
index dde837017a82..87a77a41f2c7 100644
--- a/app-arch/libarchive/libarchive-3.4.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 37a41936512e..655d9550cefb 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -1,5 +1,5 @@
 AUX lrzip-0.631-solaris.patch 372 BLAKE2B 93bfcfd952ebb976ac3fb2906eff79dd88b79906decefde76d3245e21cb711587b37750146a9a5db0221d37e7aea9259dc1ab85932463b8e94dc23e18ec7c4ac SHA512 eec9086ad4ed4a148540ef1729fc3be4e4763950a35e3f2eec981451353f9ab0358aaa754ae4675ba22d057a97f17c2478fae06c173a38e423e32338f1cf5784
 AUX lrzip-missing-stdarg_h.patch 259 BLAKE2B c191b888f7849030ef4584f3a461bd14eb44c9eed2d9ad2126ebf54f11f57f877a2c6e50847d53d6ab14e3a568118def65dbe7cbed522af411f3becca4ef0827 SHA512 33775d10e2588f55030033b845bb086abab9fd82798dd3257ab26692bcc3619169b32687cfd6d94de1fcc5afde8fd3eb4e2a40d9133249b5e83fd32499733dc8
 DIST lrzip-0.631_p20190619.tar.gz 259195 BLAKE2B d0bedfe02485011e48fa07240b1eef68560d8d61f5d28dae25bd9fcb1c41c1b8bc1b552acb06a49d853b70a0912371cec9caebb2bf7905ef528c2408d2153297 SHA512 f366c31c84a52f6ccfba56e8b11c0bcd270482d9d120e07783fbe310d7a62dddfa60ecd310a7630e7c98cfb961f57fc9e6b843d3857d0c90d36c580074528298
-EBUILD lrzip-0.631_p20190619.ebuild 1175 BLAKE2B 6e5b73b7f65bfe3ed7b905d39c46463c75b794461cb7fc651287a069b31f1b99a3544bf0d9fd96fb871f737e5673fa148a27dd82bab5043ab2e11e5c0bccbc20 SHA512 a554850ce0dfebb661aae18d76d74d24c611c1d0e7382b675e3b3fe5e42d4c9e7aeab4aebaddd9333cb200525c4f72ef17b6307b09b3d21f3a5c7743abe24624
+EBUILD lrzip-0.631_p20190619.ebuild 1181 BLAKE2B f9d4f157e9d7619d4dfac944ec62462c7370371542157812da44483001622be2c782ebf1e9183d1b6910bc77ca17cab9551add2fdfccd4aced3927c2634d2df4 SHA512 64fa14a1567a8b00388996f04c5c42a9866e8f12e072a386374ab52025f2f16caf144488f33afa41104a84b0d260e1fa442d076ca6a4dde15999a93c5292ec5f
 MISC metadata.xml 607 BLAKE2B 818153c4b56ca259dd824e13c396822f5373d094d50d104562984032f7656703dfd75e617d1d03279c05a52334a265191c633cd609d6c6e948a20fc937f866ca SHA512 7236540b6002789563681648ef8016c9b692f814134fac72ccaf7ada302c8cec3c53c88658bbf2afde7625d8c756dbb5efa6b8d395f8436fe028ed0d49c5206b
diff --git a/app-arch/lrzip/lrzip-0.631_p20190619.ebuild b/app-arch/lrzip/lrzip-0.631_p20190619.ebuild
index 6280be25f105..65be3c93370a 100644
--- a/app-arch/lrzip/lrzip-0.631_p20190619.ebuild
+++ b/app-arch/lrzip/lrzip-0.631_p20190619.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="https://github.com/ckolivas/lrzip/archive/${MY_COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/lzo
diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest
index d804fa1364e5..40f6c86a2b90 100644
--- a/app-arch/lxqt-archiver/Manifest
+++ b/app-arch/lxqt-archiver/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-archiver-0.2.0.tar.xz 155912 BLAKE2B e5c92d5939d3e6d42a79804596e9acc67b007126b630cd9317df7d0d07bb8f3e27cf9ecf6e16eef3289d31ef3627b4fa870cdb5eb52a36489df1080b03509acd SHA512 478a04d0e6e4601dc342ae260c5db4178b01191cae263154dbe400b394e5cd4cb9cd8a6bab7e7c59af57d6bf20c47a5ad2663a85d0eab5f71fbaf584f7588fd7
-EBUILD lxqt-archiver-0.2.0.ebuild 1175 BLAKE2B c33ba638b93d35bdb74f5a4c6b0a7bb9b62991520576415d070c885a7649c82241a8e83e8d1755b556477ae3817e396666b00480db654a93d548e43cfebfbf0e SHA512 aabd95530d60416584382ceaa728989cec84af6751c7ce50312b93f5d379d0b23e3c5616828f00742511c9ffd6ba554cb07aefefd7f9305c705b222474f82898
+EBUILD lxqt-archiver-0.2.0.ebuild 1173 BLAKE2B 6bdf4813f23abb209d0f53b4c612444827c55853e806072d0621b52d50cc073ceaa86dd93ad48b36bd45b877bc73f35805f5cffceb101492e2795642512c3b6e SHA512 74e054b528428fac654be8a64410fa16edc559d0da9f79ef0e029c7273eb2f296ca060032a68d4f89ba08d394c2ba53946ff52ea8cada203e547a2a60d21886f
 MISC metadata.xml 329 BLAKE2B a6082a9d0185aaa5f233d41d9de505901392c80159cbf4cf769e1a38008aaa06793e2283c974df743f2141488bdb2cc087e7990953b16b752092f31de7840c83 SHA512 42d4c3e67fbc3a84a79ed73710e8322f4a30ae6565e1aa2cbf122661e6864a8e102e67ab973942953fb2358754303b3f2d2963f3ebf15188bc23fd8ca31f5e60
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild
index dd4a15a89c32..39548d1e7e9b 100644
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/app-arch/lzlib/Manifest b/app-arch/lzlib/Manifest
index 9ec4412da002..13101841b15e 100644
--- a/app-arch/lzlib/Manifest
+++ b/app-arch/lzlib/Manifest
@@ -1,3 +1,3 @@
 DIST lzlib-1.11.tar.gz 105873 BLAKE2B 6caadc4c3b78db835bcf4f11e5290342f0f952943006589345898a85211b0a0ae5d775d0a8e7747c549eae00dd0abd2e2afb5c07eb75b4fda712a9361a71bd59 SHA512 5aa3ff084177efe906518724a98a78c32d1c0e02b967800a44388fc6af441de48fcc5899457913fca11fae3beb8bebc260ac447f0a336b1c14f3f13726114567
-EBUILD lzlib-1.11.ebuild 731 BLAKE2B 7a7160a8d0bf80d8b80270b8cd21ea1fc46bf8666e8e6bb853617265783efbbf29c3b3c338f74c14f3e0df5d36de4d66807b0ce7ae7feed7bdc9afcf42e69c88 SHA512 568461dddec8e5d4b73b01682cde270c1039873b2c62c5fb268b39d8954f29d2523880936eb8a6dc683da82db29688c1e60465a01ce031cbd6bb69669b1d8a14
+EBUILD lzlib-1.11.ebuild 738 BLAKE2B b4e6ac28601ad5482bf1f3aaca8c0a5e630fe58c60a87e5d42cc0f4184ee087a0a6a9e7d1770149f269a386bff30eb1a9e0551e6bcb115a8e13440a62623bcd1 SHA512 526c7731295813f44c96a9388cb57a59201a39743085b8090cfb07b705b3d255ed8e2de4f95d38cddcd7a34e10777fe547b276143679a4ae99176c04918ea040
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/lzlib/lzlib-1.11.ebuild b/app-arch/lzlib/lzlib-1.11.ebuild
index dea3fbb97a5d..1b4da858973b 100644
--- a/app-arch/lzlib/lzlib-1.11.ebuild
+++ b/app-arch/lzlib/lzlib-1.11.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
@@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
 
 LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 src_configure() {
diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
index 4c5764d52ffc..b8ac716b63aa 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
+EBUILD patool-1.12.ebuild 429 BLAKE2B 6fa76e23436a0175c0629a192ce7933ac1e587fa7141f79a8973dd1cf84a78eb00d318d3aaaaf6bd30eb672da0deb5c081e67c24a9c2a6c2fa99005cbd90551c SHA512 9a9cc6ef2f1daeb8e575db1dc9a2d79316d19f161c75287412a1619bfcb45351b03c879c9a40cbddbd2fc7ee6534b2770ffaa8f70cba5d6018c762ec34c7e092
 MISC metadata.xml 447 BLAKE2B ccafaf04ed84636b5770352177498e9eac1e32bf1ef3f78bb30f9fa06867a4d35f59606a59b1b7fb71f9162965e2667958f05eb0a1d779c16c43aa6f2e1e843f SHA512 4ae454d71fa13443d6b3e4abdd691589eb0e968cab22743a400529c4746391676919b7ef6bd6d46a0560ca9e36a37ecaafb084eac1dca49df6269237062eb896
diff --git a/app-arch/patool/patool-1.12.ebuild b/app-arch/patool/patool-1.12.ebuild
index 82eb33677c92..bba8d66cfe2c 100644
--- a/app-arch/patool/patool-1.12.ebuild
+++ b/app-arch/patool/patool-1.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 0432a7c1198f..28c3994fb4b9 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1,4 @@
+AUX 2.4-trailing-junk.patch 916 BLAKE2B 1487b9fc75bafe50cd00aac14e867f073c8d8db22067a645ed67aec9ebf46c1599d174679a56a23806d546b3a43739f6f5137dc9dd3f7e62b8b0aaaf61e0dd99 SHA512 8159a6b8c5c7086269dbaa06f73262fb53125edbb360ad22526d47364e8006735e72650d869f81335620177a78eb828aa87198905ec0e7ac41dea731261b10dc
 DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
-EBUILD pigz-2.4.ebuild 959 BLAKE2B ee8e0f81c1ec39d88cd57cc514f563e844ecaa59e7edad334faac77a160b7ceba3632b9c62e631085a2f4a3da1b7aba38542874feecc67d096a43031a083db58 SHA512 91e673c6cdcab6f888fa0321a5914f5767c273dd234b8c748b9e691a79a3a541dfa54eede8869a298f52e31ed4265823084d6ab12d8d02a73f68f7e09bff1d2b
+EBUILD pigz-2.4-r1.ebuild 1012 BLAKE2B 7266a3fd4be5134e3876ce16ff1149e4ed3edfef522344dd00911375da5fe68d0b5461e358d94d1454de6267360ca27b0f04392d18e00dc1075fccbbdb0b9996 SHA512 1bb48dfa233655425306a5bc5399279c0934e59fe2402775965253682d56df4d753553878504563bdd008063218f6f030cba6db16527ea5c575a10799a2b096a
 MISC metadata.xml 688 BLAKE2B 4dc6a54347303d0af5b2d77712a6bcbf4f02e81ebf2daf070f7820d0ea4e99896a5ca7e8134d4ecd6e14cf55d2fb178e9d4e95f6db15bf884d9a68d9c0f5b15a SHA512 f9f5fb0cb1f972ba85a2d80642eee5b061b7d81e4e20a4e2cd1abf958aa5702905b06dca8db65f7ed906ac08c0576e89f01e8a8630f8bd97fda6b5f6b0bb718d
diff --git a/app-arch/pigz/files/2.4-trailing-junk.patch b/app-arch/pigz/files/2.4-trailing-junk.patch
new file mode 100644
index 000000000000..eb5585b7d362
--- /dev/null
+++ b/app-arch/pigz/files/2.4-trailing-junk.patch
@@ -0,0 +1,27 @@
+From 1414ff3eb0b1ac9e5f096b0a28efa459cb8be1cd Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 10 Jul 2020 19:46:10 -0700
+Subject: [PATCH] Ignore trailing junk on .gz by default, to emulate gzip.
+
+backport of
+https://github.com/madler/pigz/commit/9696c84cb1963651707e649978afb07d0c11b254
+---
+ pigz.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pigz.c b/pigz.c
+index bbbfd2c..f2e79d7 100644
+--- a/pigz.c
++++ b/pigz.c
+@@ -3368,7 +3368,7 @@ local void infchk(void) {
+         cat();
+     else if (was > 1 && get_header(0) != -5)
+         complain("warning: %s: entries after the first were ignored", g.inf);
+-    else if ((was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
++    else if (( g.verbosity > 1 && was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
+         complain("warning: %s: trailing junk was ignored", g.inf);
+ }
+ 
+-- 
+2.27.0
+
diff --git a/app-arch/pigz/pigz-2.4.ebuild b/app-arch/pigz/pigz-2.4-r1.ebuild
index fe1190bc3a3f..29c9951c6bfa 100644
--- a/app-arch/pigz/pigz-2.4.ebuild
+++ b/app-arch/pigz/pigz-2.4-r1.ebuild
@@ -21,6 +21,8 @@ DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? ( app-arch/ncompress )"
 
+PATCHES=( "${FILESDIR}/${PV}-trailing-junk.patch" )
+
 src_compile() {
 	use static && append-ldflags -static
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index 751853df1a6f..a6957afb298e 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -1,5 +1,7 @@
 AUX pixz-1.0.6-avoid-unaligned-accesses.patch 1253 BLAKE2B e852f1c991bc7ba282b47516598d09a41182f01ceade67276dcfb192767c1bf33a36cf992d5de201bddc24790896af9e22e83f3fcd48a84f3ea3f6c9cfd7e50e SHA512 6390ec34f3d7d07be6ef6842a631d2e2ef87abe54e5f745846a6c08a4c1a7c15d50d3327afae131dd4b64a66ff187ada1d4cdae4f4503c33e249dc238082ce9a
 DIST pixz-1.0.6.tar.xz 119516 BLAKE2B 758a4985b946284587998ab2a653e51ded9838a7c77c7795c82c15c1693714468b07c2cbfd86a0c7ce7be34d9a5bd8fdc3285d503524ce299ba53179447e60ed SHA512 361a8d8b736c350e4e3fd19b5d36777129a087eb81439d05edc08f9378938583bef8fc70e440ffd22efb6dad1f6494c6c3e532d7dd1ab12c9350b6078aa993d7
-EBUILD pixz-1.0.6-r1.ebuild 1183 BLAKE2B 2d8986ce006b2cc210bd3b6f37ee6e597e4eb9ee67ada725d6361458821fff94960626c6eb22c0f47b30d8bbf476def3f480fd0902217cc90fb171b46da3f525 SHA512 257be5210265a0b7e29d905ad448e842e4c9b896b7308cfdf4f27bb9842a16124a73e3ebfabe763cc31178b0bad96ed861dac0a4f2eecfe02dc69241e79a5348
-EBUILD pixz-9999.ebuild 1126 BLAKE2B 497f27f12ac24fedd182a7d243f3146fed4fefee90b5ab3d1b973cb040ccaf20b221326babea0a79412b74bea4d8283a773e0dcc8ce9dda6f346ec2e40379d1c SHA512 162de9348066f59328d9f71f770f99ec5cc2fa649bacbc09c5fb8646d05491129e505130c67222defdba029858ed5274c777e6605984a0980831a504f8129882
+DIST pixz-1.0.7.tar.xz 120876 BLAKE2B 23563837169611d54dc4540715537b2e16c66bd9682097e4f37957e7422b487f221603b11aa30a39fd05c77dbeddc1697ac9ffe208d984c1da885a67f79a180f SHA512 7f343cb74958b9582b60a2e916243e72421fad1ebecc5867c9e046c881e8a318da9bb885edd71da8fe6953fd5d5c2f5119133cd0bbbf4d0f9b35f8aecd61120d
+EBUILD pixz-1.0.6-r1.ebuild 1181 BLAKE2B 46d6fdf0d1aaa4b1ed24aff66405fd92e0e40710f64a7d7afbe175e9d597ce4fbd56b63b264b5ab57f0640fb2bee0ae3ae3b33400635ddf9961c7aa33866782a SHA512 907db330a6197304585318a3dcee21e7f7a6656bffdc5cc0c6cf2824ecff29c20564bf680c77cfb196b9e3bd662b5471c2da272b57b0847da66a913c771415c5
+EBUILD pixz-1.0.7.ebuild 1161 BLAKE2B 0dfa4c22f5909ca72297c574b7418ba5e202763dfa09f4467f6ca89aed139b9765a578879cc92126922a4a230088c0f8db070b0ada0b34640293521ab1343fa9 SHA512 418e57b0aa7ce08351c0934e5d8c37cb2ce0e47077ccddcf1beca7830ca89b1cc27f2d1759d7bb0138923be789f61ac7dfb364b92383dbd2dc075f02621a5db7
+EBUILD pixz-9999.ebuild 1161 BLAKE2B 0dfa4c22f5909ca72297c574b7418ba5e202763dfa09f4467f6ca89aed139b9765a578879cc92126922a4a230088c0f8db070b0ada0b34640293521ab1343fa9 SHA512 418e57b0aa7ce08351c0934e5d8c37cb2ce0e47077ccddcf1beca7830ca89b1cc27f2d1759d7bb0138923be789f61ac7dfb364b92383dbd2dc075f02621a5db7
 MISC metadata.xml 331 BLAKE2B 15bff5a59c7a5ff1dc23d59a9c9acda8ad40691a1b79d992ea05eaab0436e56cf0419f0e70b4e8dbeed37bee33735bb6700a85a2f26d50fd857cb38eb55f152c SHA512 54391cfef5b3719b7ad708cc7367740ba68f3223e0d92ae8ae5992ff127f41291fc1afa0d0bd7a1a02cf53b76c3817a57696a16ae535f8522e9d9249f4ddf401
diff --git a/app-arch/pixz/pixz-1.0.6-r1.ebuild b/app-arch/pixz/pixz-1.0.6-r1.ebuild
index faee51a9f012..08b4bdc897d7 100644
--- a/app-arch/pixz/pixz-1.0.6-r1.ebuild
+++ b/app-arch/pixz/pixz-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
 DESCRIPTION="Parallel Indexed XZ compressor"
diff --git a/app-arch/pixz/pixz-1.0.7.ebuild b/app-arch/pixz/pixz-1.0.7.ebuild
new file mode 100644
index 000000000000..c6564c5abe3d
--- /dev/null
+++ b/app-arch/pixz/pixz-1.0.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Parallel Indexed XZ compressor"
+HOMEPAGE="https://github.com/vasi/pixz"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="static"
+
+LIB_DEPEND="
+	>=app-arch/libarchive-2.8:=[static-libs(+)]
+	>=app-arch/xz-utils-5[static-libs(+)]
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	append-flags -std=gnu99
+	# Workaround silly logic that breaks cross-compiles.
+	# https://github.com/vasi/pixz/issues/67
+	export ac_cv_file_src_pixz_1=$([[ -f src/pixz.1 ]] && echo yes || echo no)
+	econf
+}
+
+src_test() {
+	emake check
+}
diff --git a/app-arch/pixz/pixz-9999.ebuild b/app-arch/pixz/pixz-9999.ebuild
index 32751bd95c46..c6564c5abe3d 100644
--- a/app-arch/pixz/pixz-9999.ebuild
+++ b/app-arch/pixz/pixz-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit flag-o-matic
 
@@ -20,12 +20,17 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="static"
 
-LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
-	>=app-arch/xz-utils-5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+LIB_DEPEND="
+	>=app-arch/libarchive-2.8:=[static-libs(+)]
+	>=app-arch/xz-utils-5[static-libs(+)]
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+"
 DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc"
+	static? ( ${LIB_DEPEND} )
+"
+[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc"
 
 src_prepare() {
 	default
@@ -40,3 +45,7 @@ src_configure() {
 	export ac_cv_file_src_pixz_1=$([[ -f src/pixz.1 ]] && echo yes || echo no)
 	econf
 }
+
+src_test() {
+	emake check
+}
diff --git a/app-arch/plzip/Manifest b/app-arch/plzip/Manifest
index ebff61271147..d603fce9312c 100644
--- a/app-arch/plzip/Manifest
+++ b/app-arch/plzip/Manifest
@@ -1,3 +1,3 @@
 DIST plzip-1.8.tar.gz 72365 BLAKE2B 66b8881b6c70932c66e40edab22235103d671a870c980c0b0b08754e94fbc1b2d0f2eeb26deac4f27fbc89d69c3b588bd51cb973b7b59cbb2d0f6ab4cc9a115d SHA512 e8e822f8ae77e06178538b62075fa1c5d9cbc76c78bee7ad595a4637cd4077f53fd9e3fe61ca3fbddaa8b950e739d97527dc8fbecae04de1ac3ef83d0d5f13b4
-EBUILD plzip-1.8.ebuild 635 BLAKE2B 3aa1c02d8d704155c5997fa973d42a6c61ace03da77d1f4d3b01d3e7cb8dd0a1c88dcc029e3e4b8649261bbffde8cc5d27e940fd9a6d127e7601cc457788eb64 SHA512 52ffe082b6f8aba1f79a24658bd1ac048c1b046b0bc104b5ae4c1ed88d353454a8cc83566388461b76bf2be4696d1a428f24568f80cc46156615da82ba7af050
+EBUILD plzip-1.8.ebuild 642 BLAKE2B fc0d1ed84f7f24e47b375a351e2ded97c84ea0e8937cca87571916e9a4ae38f3bff266e1504c61a203f7f87dc19aab00ef336d52d41c118b3a768125a0d95c8b SHA512 9445cfcd39d0a71e00aefb5d84fc1695609150011edf335f78568b90f152ddd8982e5b449132f5c3cb5527d29d60566b9387dbaa635e8a6f26524159d28cca04
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/plzip/plzip-1.8.ebuild b/app-arch/plzip/plzip-1.8.ebuild
index 4513b61290a9..87f3445f1964 100644
--- a/app-arch/plzip/plzip-1.8.ebuild
+++ b/app-arch/plzip/plzip-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=6
@@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="app-arch/lzlib:0="
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 8d8ada890c82..e05f0223f8df 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,9 +1,5 @@
-DIST rarlinux-5.9.0_p20200330.tar.gz 606599 BLAKE2B 81803108938b82aec07e0a8aeffe764219c6965ddbda3ac73c04ee0c6c7f8ae6090bf7a39fc0215a639fec8f5b9af7f8518ae2c18bcd2a0f836c0560740fde38 SHA512 0c5328d3113e0c821d840dafdb7bc0b4f5161b8b7d76e2227bae3daa3bf55d99d06a167ece961157f69ec2494259bb56dcd87769b0782962614cc2c4de01892b
 DIST rarlinux-5.9.1_p20200625.tar.gz 606675 BLAKE2B fe8f26d422bc816fbba27405f9d2e4063e9af6e136ca4c270bb5274a67e99d9a7c97250b05e6041f3ed27517398b0500aad765a1f599474ff08ebb6bacf5b0a3 SHA512 3ed37adda5f5b2f5502ab2e549614dad2848157321a31174d7259aaf77cc773c6398eb0e19ee6597536c58a938289a587e7db9681e6c47c906a5307c2d362147
-DIST rarlinux-x64-5.9.0_p20200330.tar.gz 595460 BLAKE2B cc8e3dfdbd10a959b9643a4a6b12e8e346f6ed2797fee61fbfecd02b8570212f87514e749943e8998941fb00e026b300597ae52975ac326cc0a2962ba8d1a8a8 SHA512 a7d88a8705e4876686f880eee461180a3d2dac5c4bafb2efeec46a8c2bac2c07b09fc0827f39aa1417d0c8a64d3ed5b55244b08400ce5a0591984e0e9c5c853e
 DIST rarlinux-x64-5.9.1_p20200625.tar.gz 595595 BLAKE2B 68eb24da7ecb2fe8a2be68bc3c3397df85490f4cd5517a2dc5390ad0dafbdd0a04d15968276657d600cf6c127cd8f52b74e920f7ee9b86b7083b9edbf0a57141 SHA512 6e0aec1642118331bfe79a35fa654f7d5143e61c0315375fa21d862a3941b672c58eaed4da69b8ea23a024aaafcfd02a277251391e59220b845847d4b3b82562
-DIST winrar-x64-5.9.0_p20200330.exe 3226248 BLAKE2B 50459e4b476bf9ec6b59df712a61f5108442fdaf58f7ccb1c021f1638a3327e155a5b3573e0566d3a262b8129fc28c176ccc2e9a3edf2851986c8a5aeb3288d0 SHA512 8b0791eab87aeed9f30272f11fa304189f1f5d077457d3ea608c59e19dfd6ee9e05f98f03cba4803dbe24b5bb68f8332a59cd9bd2fae76d0da0405a92b8e3b3c
 DIST winrar-x64-5.9.1_p20200625.exe 3246712 BLAKE2B c0616e600b11aaa524154b9b0108ab1a62e09cdd27a968b5bf9fa6d742800c9006ee7655df39511f31b24506dd03eb431c3e016ea63a5fe8fff702ccd8d3b358 SHA512 da7a85d56f1ed4dd6204e51297175c90349a26896b223bf210055a0c38f315c59f9d9b8368d5c279049443467d962c72bad48a3c62c1d80f2260f8ecd4d17db6
-EBUILD rar-5.9.0_p20200330.ebuild 2232 BLAKE2B 35d9813aff0214bedd8580d884df51a57d6fa13a85bd1dff818c76a59a399c12da4fb61910508a351ed3519ea52d99719c09435d5d04192ba1c5c0463e71bab4 SHA512 09c59590aa819cf74013ef125710d5e86c67f036a9ea9ceecc47fb97acd600ae1bf6cd031de5c37d85407d2743f9da40c0a2bca31c2a62848a8e1c509a78081c
-EBUILD rar-5.9.1_p20200625.ebuild 2234 BLAKE2B 41a95f0e2089dd58c07be9195f123584c7566cb848e93eb01e49e1a403c635fd45fe0d01f57153a58863b32cf783261f6e9bce6c7902b21249d49034673595d7 SHA512 1697cc58d6d0fccd92b65ed6b175c3092f7ea47c3a9b48e994f2991d4449c9b787b5f028c2dc13f320c1129845e5d57f38ecc5a47856aa21d2161d548f965d87
+EBUILD rar-5.9.1_p20200625.ebuild 2232 BLAKE2B 35d9813aff0214bedd8580d884df51a57d6fa13a85bd1dff818c76a59a399c12da4fb61910508a351ed3519ea52d99719c09435d5d04192ba1c5c0463e71bab4 SHA512 09c59590aa819cf74013ef125710d5e86c67f036a9ea9ceecc47fb97acd600ae1bf6cd031de5c37d85407d2743f9da40c0a2bca31c2a62848a8e1c509a78081c
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-5.9.0_p20200330.ebuild b/app-arch/rar/rar-5.9.0_p20200330.ebuild
deleted file mode 100644
index b90959c703e9..000000000000
--- a/app-arch/rar/rar-5.9.0_p20200330.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://rarlab.com/"
-URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
-URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
-URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
-SRC_URI="x86? ( ${URI_x86} )
-	amd64? ( ${URI_amd64} )
-	all_sfx? (
-		${URI_x86}
-		${URI_amd64}
-		${URI_w64}
-	)"
-
-LICENSE="RAR BSD BSD-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="all_sfx"
-RESTRICT="mirror bindist"
-
-DEPEND="all_sfx? ( app-arch/unrar )"
-RDEPEND="sys-libs/glibc"
-
-S="${WORKDIR}/${PN}"
-
-QA_FLAGS_IGNORED="opt/rar/default.sfx
-	opt/rar/default-elf32.sfx
-	opt/rar/default-elf64.sfx
-	opt/rar/default-win32.sfx
-	opt/rar/default-win64.sfx
-	opt/rar/WinCon.SFX
-	opt/rar/WinCon64.SFX
-	opt/rar/Zip.SFX
-	opt/rar/Zip64.SFX
-	opt/rar/unrar
-	opt/rar/rar"
-QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
-
-src_unpack() {
-	local _file
-
-	for _file in ${A}; do
-		if [[ "${_file}" == rarli* ]]; then
-			if [[ "${_file}" =~ x64 ]]; then
-				if ! use amd64; then
-					continue
-				fi
-
-				unpack "${_file}"
-			elif [[ ! "${_file}" =~ x64 ]]; then
-				if ! use x86; then
-					continue
-				fi
-
-				unpack "${_file}"
-			else
-				die "Unknown SRC file '${_file}'!"
-			fi
-		fi
-	done
-
-	rm -f "${S}"/license.txt
-
-	if use all_sfx ; then
-		mkdir sfx
-		cd sfx
-		for _file in ${A}; do
-			if [[ "${_file}" == rarli* ]]; then
-				unpack "${_file}"
-				if [[ "${_file}" =~ x64 ]]; then
-					mv rar/default.sfx default-elf64.sfx || die
-				else
-					mv rar/default.sfx default-elf32.sfx || die
-				fi
-			elif [[ "${_file}" == winrar* ]]; then
-				ln -s "${DISTDIR}"/${_file} w64.rar || die
-				unpack ./w64.rar
-				mv Default.SFX default-win32.sfx || die
-				mv Default64.SFX default-win64.sfx || die
-			else
-				die "Unknown SFX file '${_file}'!"
-			fi
-		done
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	exeinto /opt/rar
-	doexe rar unrar
-
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar
-	dosym ../rar/unrar /opt/bin/unrar
-
-	insinto /opt/rar
-	if use all_sfx ; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
-	else
-		doins default.sfx
-	fi
-	doins rarfiles.lst
-	dodoc *.txt
-}
diff --git a/app-arch/rar/rar-5.9.1_p20200625.ebuild b/app-arch/rar/rar-5.9.1_p20200625.ebuild
index 7623c5c7ee5d..b90959c703e9 100644
--- a/app-arch/rar/rar-5.9.1_p20200625.ebuild
+++ b/app-arch/rar/rar-5.9.1_p20200625.ebuild
@@ -18,7 +18,7 @@ SRC_URI="x86? ( ${URI_x86} )
 
 LICENSE="RAR BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="all_sfx"
 RESTRICT="mirror bindist"
 
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index a65a2c43cd9b..b01ee71d5e77 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,9 +1,6 @@
 AUX rpm-4.11.0-autotools.patch 503 BLAKE2B e95c7d3b550f24310dd21c6cfd78785017ebaffbad9c2a14947c43e784ddaa349cc77da9ee7fb9e1ce4ee2dec296b57234a74d56c9e08449e067bca403fa7ee6 SHA512 fdec043c3db2315aaabd3da91067a8d299ba564eaf53ba6465840352586f0660a5216cfd291b19398a53b2646f4a0b312076e14e56004d8e941d4ae279d54305
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
 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 3360 BLAKE2B a15c7083a196c9a18f2da366fd102b06d25f5bdb586c48799c87c6a61ed6af65746f2efc69553b565a6197a3e08d4ba4b5dc249e160a943799cf3e92d23e87be SHA512 6fdbd4ab36d436021171bf44f0ec2c8c545d721559ea47b8ae42e705b0664f344b3a36c89239983a9456c513ae551a7e2252762ce8a367ca0c28bcb01c94c4f5
-EBUILD rpm-4.14.1.ebuild 3275 BLAKE2B 5c7c3854de61096015e5d420832ab282133ff901f78189905968591ba9e3c10bb7f4dc7001d48490dc48c16eb1ccc67034734d25af0a8990d3f53e2ac0dd084b SHA512 a1c6235c6b504694ecd03ebc558dca834521238af0f8235abeacb2f9e2f92b72f42f7d878b808537cdea2d347ac0b3e327943ad357c9a576a673e87ea5737969
-EBUILD rpm-4.14.2.1-r1.ebuild 3459 BLAKE2B 92bb8f100bfe33ec9631860e28978793365d14ef41665e5066c4626111ec5b5b7787c332f688ba107042cdec210c3fda7a5440befcd5a39b434f45d3aff06248 SHA512 9ded8bca98b34dee3012f96a4b85c52ed9a8a1d003914d7c517f26dd729669c294c2f5e6b61e648333a931553c78e4715502893374afd671628de026a005a2a7
+EBUILD rpm-4.14.2.1-r1.ebuild 3461 BLAKE2B 9d822a8d3d59899a7d84fb206af11f5b8d0d9e4efc5202f2eecf49f682a48f3a217bc690ee2ed4bf9dacce5b053731ecae4b3403b00476faf149f4ec2adcc05d SHA512 d385a795e3413cc621af265fc0de080e36063f5a0f0fadfdedecb9dcb1d46d0fb5322cb4f68bc94f7fbcbe41dc2e73ac88d5bd8ffd7cbf194d7945d89d481d1d
 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
deleted file mode 100644
index c2f5f37a528c..000000000000
--- a/app-arch/rpm/rpm-4.14.1-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="https://rpm.org
-	https://github.com/rpm-software-management/rpm"
-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 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# Tests are broken. See bug 657500
-RESTRICT="test"
-
-IUSE="acl caps doc lua nls python selinux test zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="!app-arch/rpm5
-	app-arch/libarchive
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/nss
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )
-	zstd? ( app-arch/zstd )
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	test? ( sys-apps/fakechroot )
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-4.11.0-autotools.patch
-	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
-	eapply "${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-	# fix #492642
-	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
-
-	eapply_user
-
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	econf \
-		--without-selinux \
-		--with-external-db \
-		--with-crypto=nss \
-		$(use_enable python) \
-		$(use_with doc hackingdocs) \
-		$(use_enable nls) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl) \
-		$(use_enable zstd zstd $(usex zstd yes no))
-}
-
-src_install() {
-	default
-
-	# remove la files
-	find "${ED}" -name '*.la' -delete || die
-
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary} || die
-	done
-
-	if ! use nls; then
-		rm -rf "${ED}"/usr/share/man/?? || die
-	fi
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CREDITS README*
-	if use doc; then
-		for docname in hacking librpm; do
-			docinto "html/${docname}"
-			dodoc -r "doc/${docname}/html/."
-		done
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #657500):
-	if has usersandbox $FEATURES ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	emake check
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}" || die
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}" || die
-	fi
-}
diff --git a/app-arch/rpm/rpm-4.14.1.ebuild b/app-arch/rpm/rpm-4.14.1.ebuild
deleted file mode 100644
index f0a7f10fd44c..000000000000
--- a/app-arch/rpm/rpm-4.14.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="https://rpm.org
-	https://github.com/rpm-software-management/rpm"
-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 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# Tests are broken. See bug 657500
-RESTRICT="test"
-
-IUSE="acl caps doc lua nls python selinux test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="!app-arch/rpm5
-	app-arch/libarchive
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/nss
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	test? ( sys-apps/fakechroot )
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-4.11.0-autotools.patch
-	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
-	eapply "${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-	# fix #492642
-	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
-
-	eapply_user
-
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	econf \
-		--without-selinux \
-		--with-external-db \
-		--with-crypto=nss \
-		$(use_enable python) \
-		$(use_with doc hackingdocs) \
-		$(use_enable nls) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl)
-}
-
-src_install() {
-	default
-
-	# remove la files
-	find "${ED}" -name '*.la' -delete || die
-
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary} || die
-	done
-
-	if ! use nls; then
-		rm -rf "${ED}"/usr/share/man/?? || die
-	fi
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CREDITS README*
-	if use doc; then
-		for docname in hacking librpm; do
-			docinto "html/${docname}"
-			dodoc -r "doc/${docname}/html/."
-		done
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #657500):
-	if has usersandbox $FEATURES ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	emake check
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}" || die
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}" || die
-	fi
-}
diff --git a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
index c1b09818389d..f4a6a46bc5ea 100644
--- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
 
diff --git a/app-arch/unar/Manifest b/app-arch/unar/Manifest
index 93e5ea2b4d10..33ed8b5b300f 100644
--- a/app-arch/unar/Manifest
+++ b/app-arch/unar/Manifest
@@ -1,4 +1,4 @@
 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.7.ebuild 1383 BLAKE2B 78fa169605a3c793396bbbb9066f8d33bd4a9e1f982abf77ee7d47f760f7a3ea468018b0ccef0c1f50d204049c2f5bfad9621418ff2cbf19999cb6dd55116182 SHA512 8a133b1416dd1c6b450417d28c60495756b659dddaa9f03458c03a8bc64fe5da800b3bc6d2fc4d5cc16ca01675fd99032945ea5fb6bce156cbe39eb9119f276c
-MISC metadata.xml 505 BLAKE2B 4b5721fddcc32af07444295a978b4f03b472988afc3b81512a27fba3965a37a0a78ba79bac297706261b8da826241d62a515911ccabd4b6ff307bfb400ea7d27 SHA512 ecf113d90b08e777d9afce3652dee4af5412af9929336eb55b06bb680e60d6a3a0f25285d7dc67653909a743c5c7040b3b036b57c612e089a1e4d6bb710429eb
+MISC metadata.xml 325 BLAKE2B bb876d7c10a9e39c2166cee5033bb21abf8b16424754c72ed390f027b67c81a6408984ce7e7fbb7210970d9c4355ba561b801bb87c0d2d5a0cb6dd6461c37cfd SHA512 8e2bb71d8ba48d5ae3227d2945bc7cf5cd4bf6de4506640ce1e8b61f8330e738b8ab4698c163fd31983559b1c661263d81a42e66b82e3dd3d814e7be764579fe
diff --git a/app-arch/unar/metadata.xml b/app-arch/unar/metadata.xml
index cf071f3d1c1f..e6cd877e7798 100644
--- a/app-arch/unar/metadata.xml
+++ b/app-arch/unar/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>robin@hallabro-kokko.se</email>
-        <name>Robin Hallabro-Kokko</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">MacPaw/XADMaster</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MacPaw/XADMaster</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/unp/Manifest b/app-arch/unp/Manifest
index 7bc0bae59978..f9ed4bfe1ecc 100644
--- a/app-arch/unp/Manifest
+++ b/app-arch/unp/Manifest
@@ -1,4 +1,6 @@
 AUX unp-2.0_pre7_p1-remove-deprecated-have.diff 339 BLAKE2B 9d060bc629bfbd669f0effde2d31d7571ad71041a49a66da003c49a383fc119013a3aeac5c39c1ebfce0e9c0642d5c394d823cf9837b31c1d4172818ff403111 SHA512 c5e683398572889e4c09d3dfccf8847566421be5e3a56d086217ebbb70c17c4ca23c124cfe5d146e7e5b71e0ecce914575c1c50bdbc8438d3f00a6282790edca
 DIST unp_2.0~pre7+nmu1.tar.bz2 17537 BLAKE2B 7ef6cfcc524daf95c7cd9dc41ba690cb8db1b1983cd45709c8764591af36d6d00631975bfef0359ac633aae1c11b73efe827e367931f73fe7c5fcc8832b0fe84 SHA512 1b30f14c8d17e0a6b149ca4795f2219e9180f814347410e7ff7fa2b9720a9d308190f2ded8fcfd11bac9b5bb7a64ffd93f140bdaffcba1127f0e15e3d2737362
+DIST unp_2.0~pre8.tar.xz 16336 BLAKE2B 6c6ffd75acda980e6c572c48944b238788a64d2bf1f854b45a3bc468da19fc6e593a8b604d99dac51b5b645ec88b27300be6af4d988a56470812a7ae92f19336 SHA512 58d2a6a9f7fe868773273532b46249109e1e757517dd46e485f2b3a77fea404aeea34edf4460e76376806ae0d28baefa55f1063919bdf1493617f1b361fe6039
 EBUILD unp-2.0_pre7_p1-r1.ebuild 1186 BLAKE2B b848b83c759df2f5b75266e0cd364c19b348d19343df3876f35cac50e0ffcda4b9594afc783049facb662b5922f01f61712e4ce09098d9a9cd9e4873c95fa6c0 SHA512 24a67fab5f587b547d9e44331fbafb9c80824cf3610b8f62c84c9c3974a29aa908810e7d3640dad955c682ae1db13cfbc996bdfd7377613e9dd8890d0c1d75c2
+EBUILD unp-2.0_pre8.ebuild 1105 BLAKE2B 0f1b06eefbfb7832fd722abc2d959cc7c854e5c88d221fc6d4a64b164b8335c065bdccd1a5c980eb20ee0a92648dc5ddafbb7d02ff8cb1efba2356a7935c1488 SHA512 c6fc4276c9134872156c60f12760ec4d8b83798ec88a1b21b3954df461e0bedfedfe984ea0def8eede6b8a45a124b045732e90200351d81f76753147e91c844f
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-arch/unp/unp-2.0_pre8.ebuild b/app-arch/unp/unp-2.0_pre8.ebuild
new file mode 100644
index 000000000000..8116fc04c3ae
--- /dev/null
+++ b/app-arch/unp/unp-2.0_pre8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils bash-completion-r1
+
+DESCRIPTION="Script for unpacking various file formats"
+HOMEPAGE="https://packages.qa.debian.org/u/unp.html"
+MY_PV="${PV/_pre/$'\x7e'pre}"
+SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${MY_PV}.tar.xz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls"
+
+DEPEND="nls? ( sys-devel/gettext )"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl"
+
+src_compile() {
+	if use nls; then
+		strip-linguas -i .
+		if [ -n "$LINGUAS" ]; then
+			emake -C po MOFILES="${LINGUAS// /.po }.po"
+		else
+			emake -C po
+		fi
+	fi
+}
+
+src_install() {
+	dobin unp
+	dosym unp /usr/bin/ucat
+	doman debian/unp.1
+	dodoc debian/changelog debian/README.Debian
+	newbashcomp debian/unp.bash-completion unp
+
+	if use nls; then
+		if [ -n "$LINGUAS" ]; then
+			emake -C po MOFILES="${LINGUAS// /.mo }.mo" DESTDIR="${D}" install
+		else
+			emake -C po DESTDIR="${D}" install
+		fi
+	fi
+}
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 3cd798c4301b..0523a4135803 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -6,5 +6,5 @@ DIST unrar-5.9.3.tar.gz 229917 BLAKE2B 6ab2141970535753197d3ed74521f80d3b20ecc2a
 DIST unrar-5.9.4.tar.gz 229921 BLAKE2B d87189a6b6b3566a0efac7f72e40732ff673cdcac6f4fdaa96b5a771025f02779d74e2822053681477b3490f45817196673aa5707846767c4061ca95718557a1 SHA512 4c026bc12c38314c7df6e1b2f296be681fffa4ba525e378809063519cb5d51889fe8d3cbce16e802023354f02b45b1bcc672b79a6fa81b4baa13a374ce22c8f1
 EBUILD unrar-5.9.2.ebuild 1885 BLAKE2B f83a1dc3eafefa33bf4ec25740e2a76c7e4afa7c9b497b8ab9be85bcd388db0e8bdc4cb5d3d36911b68591395f7513b51eb304b36fdc5c27d046f66ff74a3658 SHA512 7ca8fcd06c42689f6b3190795bd420d1492af1aa00006f449e0b8c9f89b4a55722bb83d6d8471e7b8307393a75b590c23c837a05a57da3bd7d30ccc58ac19587
 EBUILD unrar-5.9.3.ebuild 1893 BLAKE2B 0399f2fd6e2dbfa76b5f9590428657c0ff4e2ff6b4d02e4da409991eabde522913d41bdd8a8cc49db1727b90f936ca4f15de003a0f7793dfa7245301064d5126 SHA512 b31e6054332cf318893dbf6306bbc1cc34f6b601f03a1b7d687f2dabe6f347faed57365569182739bbd302c62d18bc90ef900125a3515111d80fc42cce8e232c
-EBUILD unrar-5.9.4.ebuild 1893 BLAKE2B 0399f2fd6e2dbfa76b5f9590428657c0ff4e2ff6b4d02e4da409991eabde522913d41bdd8a8cc49db1727b90f936ca4f15de003a0f7793dfa7245301064d5126 SHA512 b31e6054332cf318893dbf6306bbc1cc34f6b601f03a1b7d687f2dabe6f347faed57365569182739bbd302c62d18bc90ef900125a3515111d80fc42cce8e232c
+EBUILD unrar-5.9.4.ebuild 1891 BLAKE2B b3eb3f23463760f6bd477c8616197dbf0c8f8efd60773afc6ea7548797a06bc10122d5e45e9d2bf65d8cf008529a6070505abab376a66c811ff532590d3e8479 SHA512 bd968de2d9bdad07d3ceb9a73b39d521fdf51cdde8f774a1fe43a094a785a9bd820e7f5a52d5b39871991c247e001c0451c8e999cd6d2aa79594ad9eb84295b7
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.9.4.ebuild b/app-arch/unrar/unrar-5.9.4.ebuild
index 7a4b90b3f3b7..40d68a7cd57c 100644
--- a/app-arch/unrar/unrar-5.9.4.ebuild
+++ b/app-arch/unrar/unrar-5.9.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest
index 044ed3b2e00a..a5d11752900d 100644
--- a/app-arch/upx/Manifest
+++ b/app-arch/upx/Manifest
@@ -1,3 +1,3 @@
 DIST upx-3.96-src.tar.xz 792524 BLAKE2B 21af85dbcfdd1bf0151a653c865db13c9f30b9de0b9b4b94557ddd55736c7053dd829c5d72b9a7e5aa94a71ecc0151145dd66d7d98ded178c50ff7357d0ba442 SHA512 2d4d1be21d274d9bfdee9b9815396f5e5ff0bcdfb781b7be5fafa4d1e224028e412ec5f5ba607c482671aae27ccf9069abb2db0fb58f78f3a102a51897df2b11
-EBUILD upx-3.96.ebuild 798 BLAKE2B 382060b2fa4fc450d11d9bd1514b96e578d697ee12cfafa8f1f46853979f141694d5e2578d52bcd4b1d7282b483262cab08d69772d212c281362a639428771e5 SHA512 491bb5ada0771c35a13d163645ba393b1781e9fb655a03363e7e17c77c0ed9ce033755987a7e7803f0ab28c7c55ca07e674a92c4b7cab4d430cf8e4a60707537
+EBUILD upx-3.96.ebuild 810 BLAKE2B a7c7fabd58c3b527f48b7a6905032150aed66eea7efbfd5e07938367d0bd61dadf2f55924252bfbb2bcc1867af40ef7a55e46113ee2651695343dc6ffea8fb1a SHA512 221f0fc937505130b3c1d0014fd0236e2fbff597a0e2a1d19bb8b4a0dc5141800d50013f352f49b64599b106b6b0825b214854cbaaf181c4943364f79aaa66b1
 MISC metadata.xml 448 BLAKE2B 867df66ceb7f931bcbdf8e4fc8ebb935d398cd83c32f87f14ea66055e9d88a2b5e76007f394d46db0549128c1682de0b80bee74e290725b71a5be88876997ce0 SHA512 6a817175a939b260a01521d65f5add4569232da1fefe0662f977626ddef2053f9180a47a063e42d24f90de6b00ea29af451e7efaa604bbf80a2bb45d0d5d775c
diff --git a/app-arch/upx/upx-3.96.ebuild b/app-arch/upx/upx-3.96.ebuild
index 63ac18d24284..c9a668ebacec 100644
--- a/app-arch/upx/upx-3.96.ebuild
+++ b/app-arch/upx/upx-3.96.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/upx/upx/releases/download/v${PV}/${P}-src.tar.xz"
 
 LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/ucl-1.03
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 69a82c5388b2..52893b48de31 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,5 +1,3 @@
-DIST xarchiver-0.5.4.14.tar.gz 1081542 BLAKE2B 591d93dfbaa98164bc169105462155b09ed87dab8ad5adff6653e77673095a29d7f00cdaeed1b928039fe3cc5f668f8da46885905ae73d03f5b4c71dd279a7b4 SHA512 b38881e6cdfb402499efbd18ab25cac3869cd48ef96941a4bb3cb8b6b130a2317abe3b1d11bfc3d60e81eef7cafa34515fefc11e469443d96d139c2f09cf4498
 DIST xarchiver-0.5.4.15.tar.gz 1072943 BLAKE2B 6f80c8dba510bf5c05dfe5c8f12aafbd4f563861878c73b7da78562836ef4b85f9bc8e4ed7cda5d98c5e33a211a2677d163c2912f1bb605e0085627ca4ee5cbb SHA512 e5174241dd45dd6186d91b15a15b207a8b356480d9ce1a7b9ac2da167878cdb14316a3e7abf3f2aac8d41a02777df2131e205c7d5971a376ff7dd0ca70fbc82f
-EBUILD xarchiver-0.5.4.14.ebuild 1438 BLAKE2B 4a065c6d80da446dbcae9ffc46d6d4aebedeee9d18a089e304dc237dcbf0196165ca52044966bd99a453d09b3a80d23080a673066fc929c47a3401b82df98583 SHA512 7d2f73efd16745e0ad5670aac5f3c5ed81ba9184d0aa47ef9410ec5d8ec0d12c27698605491db8687f4f4936c72ecdb1f6b37ed84742df0e40227f3e722e96a9
-EBUILD xarchiver-0.5.4.15.ebuild 1440 BLAKE2B 7f739370dfb24d5dcb37fcc2decadb1145d4e8c7b50303cc75650ce6c78a257669aa0679106e5c78a572cdce4771b5d7733b93a7ca55d114e4d88030ff4ac812 SHA512 1206ef834af47ca298e6bf28fcffebf59e925f89027b4dc9861c4b60ca4ff9a5d586fc0ff09b4ec4cef3048b91987f019d2eb47fcc3ade3a1704e638713dcc30
+EBUILD xarchiver-0.5.4.15.ebuild 1436 BLAKE2B 145532a8b29399aeafa28a2e149a4c61accba5380476bba318c09f3298fc6ab82225e6e3de5a0267c0fb16fb9596986974bb4ed1449d61edafc2171fc9f48f69 SHA512 b57332feb7c010d17764f6235f86506f9e50b27ebf92acc566aa7791e8ee11a3194f30af33b4e5eb2fe250f84101fa43bbf30a3d891b63aaa076ccd14128068c
 MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild
deleted file mode 100644
index cd24f94b4a0c..000000000000
--- a/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg-utils
-
-DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
-HOMEPAGE="https://github.com/ib/xarchiver"
-SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-# older pigz versions have incompatible command-line processing
-# https://bugs.gentoo.org/661464
-RDEPEND=">=dev-libs/glib-2:=
-	x11-libs/gtk+:3=
-	!!<app-arch/pigz-2.4[symlink]"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xml-dtd
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)"
-
-src_prepare() {
-	sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.am || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable doc)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	elog "You need external programs for some formats, including:"
-	elog "7zip - app-arch/p7zip"
-	elog "arj - app-arch/unarj app-arch/arj"
-	elog "lha - app-arch/lha"
-	elog "lzop - app-arch/lzop"
-	elog "rar - app-arch/unrar app-arch/rar"
-	elog "zip - app-arch/unzip app-arch/zip"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
index e83f8d245d44..36790ad97d04 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 # older pigz versions have incompatible command-line processing
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 00f698c6c3f3..3b8fb53463d0 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -2,6 +2,6 @@ DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb08920
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
 EBUILD xz-utils-5.2.4-r2.ebuild 2684 BLAKE2B 914c3043b4d07614db0d77d61fa9de508ffe5df5bb64753d9d8e15da14e147bd7f76d0259fef404dba0b2d98ea76aa25e89fbb9ca6621a310e75bdd12b41c1bd SHA512 04ec2a56f2aabf58891f4db02c8375451ee5f8a925d12092ead17674d09f1467cb4d6cb09e38292a4d5bc0c5adfc0a340a92593ae9cb3fb539898d0b35e7549d
 EBUILD xz-utils-5.2.4-r3.ebuild 2618 BLAKE2B 551ef4b45317a49e63da1454adcd1d15e806fa543d0326e644de3ce9a57a508e569bd927214df0c9003c7cf461c3eadde74beea271454af0b48414a94705eb2c SHA512 b7ed40e81541eff5bfb9f193f4d8179f2f6b2fded0186321b8da6fee96e5fcfa119788aa7eb1a064416bae49e3511627e962ca7662ff5130f5c76df73c2dade8
-EBUILD xz-utils-5.2.5.ebuild 2805 BLAKE2B 4d6a91b14fc4688c02abce64ed70d7b3d8ccb93aeefa5c4f6ca77f1a0c78341cd1c400128bda0aa3ba22b0882746cbb08d309301ba6ef67c75ec9d6f9eaf668d SHA512 e7b563a13fe43204f5e8fd8d5e78736c2feedf727163ca5302837338c496df0e86b28d5f62621496a189f98d3b3a15c7a960f7b0a13e9a5b59886737f52ceac9
+EBUILD xz-utils-5.2.5.ebuild 2803 BLAKE2B 023e657fe7ce2874110983652d2d1bb1538977022a346cf146daa492714f4097ef67887cbf3de70b582354891629c944d73e34fb85f7ace472e4031380509187 SHA512 b74d1c64cbc5bb67013bb4cfa178d8aae1d94b0062bcf1771e682360a7598549c22d1570238caacfb26fbcbc41f57f80a2976bef2f05d87ca34cf3897b909766
 EBUILD xz-utils-9999.ebuild 2805 BLAKE2B 4d6a91b14fc4688c02abce64ed70d7b3d8ccb93aeefa5c4f6ca77f1a0c78341cd1c400128bda0aa3ba22b0882746cbb08d309301ba6ef67c75ec9d6f9eaf668d SHA512 e7b563a13fe43204f5e8fd8d5e78736c2feedf727163ca5302837338c496df0e86b28d5f62621496a189f98d3b3a15c7a960f7b0a13e9a5b59886737f52ceac9
 MISC metadata.xml 538 BLAKE2B 1ce32a16125c6af46b02bf0ebdef56c685d1d4903b74c2331b446e764096503b06fecf6d467ffb1c1627b8dabfa58092a1db21e5eda53d66f4e9ede4714d7978 SHA512 97dffaeaa9db4117a7e7770ac1ebfe16c0c32fc3de30f7cf099dea7a6565c3971146178140e0676e1946fcef609131124cc3d0bd971eb6fde1d45086da122310
diff --git a/app-arch/xz-utils/xz-utils-5.2.5.ebuild b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
index cae7bc97c8e9..8da89c79360e 100644
--- a/app-arch/xz-utils/xz-utils-5.2.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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
 
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index 0efa243a17c2..5b1f25ff2dfd 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -1,10 +1,11 @@
 AUX zip-3.0-build.patch 923 BLAKE2B 0a8b7d8fb98f9bc8750c3bb6ff9a672db86481ca88349e5e08d2e96ae0cabac4ef75651a91e9b0fb8e70e1c075ea721060a3851bdd6e103b1f4c020a8b4f4979 SHA512 c9cf162505938a0200eed0333849c2c4a3b59088a6549377a3af9ac89cd7a26fd388d09df55a6cd117e607c1a2f2960bc5e85f7384ff30565c2be01ce4ff442d
 AUX zip-3.0-exec-stack.patch 548 BLAKE2B 3ded2568eea78c89422ea043bb68917d4a508d6ee6d8d65e9db6c22f6d5dbcac15836a94ad5d1209112cb73c1da4f266346e722cafcf3a6a91080261c4d5df93 SHA512 575516abe5ed633bdda22c3ee41109400360eef437671f9b658d7591bb8fa3b3854c1cd92d6396e47d91545b23ecbbc1218190192e39a60b00d6b7b5bb793eab
-AUX zip-3.0-format-security.patch 507 BLAKE2B f595179f8267fc2866e21b8a943323e2146e118e44ed4dd6b03a65a2c433940efd5ccc98f72f8d85dd7291f9b0bcb8eb5068ad22b9bd6fa040265253e54d4b63 SHA512 172e842e1cd43006713f570ceb8bd4998595282b973569d0e264bd9599375668a4045d691fc952a75088ad6f17e6ff90baf22606388f73ad2f2c0ac64d250fa2
-AUX zip-3.0-natspec.patch 6800 BLAKE2B 6363c941894d7de7611392ea3e883ad724093bf6fb090ce84a4c99d36ab8688ef5083d09a83431bcc1f399327e1071d4b2c4cc03cef2c1548b776699ddb4763b SHA512 67cf89ad016d51ec99e153cb05ee150318c18b3243b04daad0a9a0c0fce7e908bf7ed6fcd6361029bdd4da68759c22abf02dcbcca704b45a75367b1f42ebe964
-AUX zip-3.0-no-crypt.patch 1108 BLAKE2B 92de0a453e128a87a6d37f0a9cca55f5451946c14316992898c8f3451336a7f526d8283a57fff841c5b990374b0cea163723a25522f5ecd194b294e39bf137d4 SHA512 89a99e694fa2ad289ecc93a514e7b408e4b9e01778e622b2c2928d98181de3823446e91085f401e3478afce1ccbf8775fb227c1908144889dd0106c2d7029b83
-AUX zip-3.0-pic.patch 499 BLAKE2B 0b3ad7552ed4b3900b720360145f2466bb2835823a828ed4e3fe7e8ce22c547296ff0f74416f8b9a75ae4ef70d9cce521f96becbbbcc9ddb89481c3944d6b501 SHA512 a5f4381de900821c91bb164f580b7abe0bb61ebbbcb00e376f38763255bc647bda678fd66af59e9d56cb8bb7a2166553a77af79cfa75f3e0ea4dbc515b876b8e
-AUX zip-3.0-zipnote-freeze.patch 2170 BLAKE2B b0080c9d5310a9cdd14eebc503d76e7463969982717476aa4359ae1c4651290112654f25c202defeddec5efaf1f32ec74c824a7370727b7e6a055dcac6211908 SHA512 c7db2d8c43d33bff4be6068c89603d2f67876f2b5ea72a01ad53f1baa42206c7a0a967f101a54092715f7fcc3ee2bf45a448e76a0ef55e64dc0fe0b204966367
+AUX zip-3.0-format-security.patch 511 BLAKE2B ca5bfe9f839b1fb0ab8a4785b4448fa346ba9ccfb0cde40a61e7a3442a70f06a4481c57d6aa995654d7ef4482d2f1f7022b7a568b5e47b1149f0430de8110fbf SHA512 6d3514b9df21b6f8a40b037f7d584a4b4a0a5364676bd2cf40d31e32545bc7edd2e5cfeccdc72302c4f19b607852d81ad568c4420750a8c78bbd325c5cf78b8f
+AUX zip-3.0-natspec.patch 6464 BLAKE2B 4c032896c5b331e235a9ea55c91e696aa37b192c46be5ff4c85f4809473a299ba06e34b3cc30b1e47dfbb091da5058c5babdbea41b74677788e6ef5b7b0f0650 SHA512 91472cf73c943a2fbcae7640ca6862f4ef9c2212cf31bd2128fd6e157d46db76b6882b08db2aea9d6d2e3631c56d1393e16f8e76628ea7812d062e6471a085e6
+AUX zip-3.0-no-crypt.patch 1116 BLAKE2B a4f12f492b3f844a0e822f27f1acb81d826484ddf6835941ba277eca8dc8a14c1051ae5362ebce3e9368fe3bd5b4f385712e6ff5ebb5d02acb28852d43b18ba5 SHA512 4146197dce4b536e116bdc1d5dade1486affaad379d28337338cf9663d6bc394422577c72b94dc87114c244ca73ca72c1c4bc60f2579f41637c1972f6088318a
+AUX zip-3.0-pic.patch 502 BLAKE2B 6ac03408e40986fbbc7219fa1f96f8e2fdc448071dcc1321e7f047068468ce2ba21b30bbea3f5cbd33cff528fd8f5493ce47b42e1c9a6f61c09a38a0fd12c3bd SHA512 055396cb0cfbf994d5be95533c4e7a8ad35120e2250dd2df1757f54b2b722c32d413dda61ac4bb96f0af93965d0a184794626ba6ca37a14ed04f984e544ae9c5
+AUX zip-3.0-zipnote-freeze.patch 1926 BLAKE2B 5976c4ad62d25f4ace8e17a85b77c99fb5ea75151d6ddd8fe27ee22cb7669d98281e26952c623b6e367fa880fce693d393a79fc619e13d8ba530b2aa38b8b70f SHA512 edd90964bc4f1bd3cc45f719905f3688ebd779aea5f10439b2331d668774ed55e645e025d9f408cedb8313848d4e26ba39726d019543e3533f79f1ef83620932
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
 EBUILD zip-3.0-r3.ebuild 1716 BLAKE2B baf91e89edf2f731c805627392d7a3eb1b8f8bff52ca73facc0dd861c8911e0bbae9036593c4a988fbd53b557e76c80276d51de93b742d14e88a65ccc0de6d0f SHA512 cb41bb9e9f782c35197156cde2a69d6997c35f5896bd7e8cbe402da7dff03313445cd14d33cfa1e51d6d2d1782d4774f51c29cc13510090a778fff85107e2e29
+EBUILD zip-3.0-r4.ebuild 1701 BLAKE2B c7ca9ef5630066dc7f0a60265fb500349bf41b0c621c39a4f792badc66a284a69aada7c4aef03d2316d97b6624a2cfdad1d9a30daff6f09cbfb333cebb8a4d4a SHA512 1c1667572a9dd23be8ecbf8f274ba36f3db7d9c459a79dfb3ac4c55074e24c006bfa2ef59eeb055626af7b2ba6a1a8835eaf6d9c63d2a4cbf7e11513f8c68f9d
 MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
diff --git a/app-arch/zip/files/zip-3.0-format-security.patch b/app-arch/zip/files/zip-3.0-format-security.patch
index 1edc2d6a1b88..63188b5063cb 100644
--- a/app-arch/zip/files/zip-3.0-format-security.patch
+++ b/app-arch/zip/files/zip-3.0-format-security.patch
@@ -1,5 +1,5 @@
---- zip.c
-+++ zip.c
+--- a/zip.c
++++ b/zip.c
 @@ -1028,7 +1028,7 @@
  
    for (i = 0; i < sizeof(text)/sizeof(char *); i++)
diff --git a/app-arch/zip/files/zip-3.0-natspec.patch b/app-arch/zip/files/zip-3.0-natspec.patch
index 1dfce09d1331..29ed4827e3ce 100644
--- a/app-arch/zip/files/zip-3.0-natspec.patch
+++ b/app-arch/zip/files/zip-3.0-natspec.patch
@@ -14,8 +14,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=275244
 pva@gentoo.org
 
 === modified file 'fileio.c'
---- fileio.c	2010-12-22 13:02:43 +0000
-+++ fileio.c	2010-12-22 13:03:00 +0000
+--- a/fileio.c
++++ b/fileio.c
 @@ -929,7 +929,7 @@
    }
    if ((zname = in2ex(iname)) == NULL)
@@ -27,8 +27,8 @@ pva@gentoo.org
  #else
 
 === modified file 'globals.c'
---- globals.c	2010-12-22 13:02:43 +0000
-+++ globals.c	2010-12-22 13:03:00 +0000
+--- a/globals.c
++++ b/globals.c
 @@ -32,7 +32,7 @@
  int scanimage = 1;      /* 1=scan through image files */
  #endif
@@ -40,8 +40,8 @@ pva@gentoo.org
  int filesync = 0;       /* 1=file sync, delete entries not on file system */
 
 === modified file 'unix/Makefile'
---- unix/Makefile	2010-12-22 13:02:43 +0000
-+++ unix/Makefile	2010-12-22 15:43:40 +0000
+--- a/unix/Makefile
++++ b/unix/Makefile
 @@ -38,7 +38,7 @@
  MANFLAGS = 644
  
@@ -73,8 +73,8 @@ pva@gentoo.org
  zipsplit$E: $(OBJS)
 
 === modified file 'unix/osdep.h'
---- unix/osdep.h	2010-12-22 13:02:43 +0000
-+++ unix/osdep.h	2010-12-22 15:45:29 +0000
+--- a/unix/osdep.h
++++ b/unix/osdep.h
 @@ -78,3 +78,6 @@
  #if !defined(NO_EF_UT_TIME) && !defined(USE_EF_UT_TIME)
  #  define USE_EF_UT_TIME
@@ -84,8 +84,8 @@ pva@gentoo.org
 +#  define OS_CODE  0xb00
 
 === modified file 'unix/unix.c'
---- unix/unix.c	2010-12-22 13:02:43 +0000
-+++ unix/unix.c	2010-12-22 13:03:00 +0000
+--- a/unix/unix.c
++++ b/unix/unix.c
 @@ -14,6 +14,11 @@
  
  #include <time.h>
@@ -153,8 +153,8 @@ pva@gentoo.org
  #else
 
 === modified file 'zip.c'
---- zip.c	2010-12-22 13:02:43 +0000
-+++ zip.c	2010-12-22 13:03:00 +0000
+--- a/zip.c
++++ b/zip.c
 @@ -2025,6 +2025,7 @@
  #endif /* ?MACOS */
      {"J",  "junk-sfx",    o_NO_VALUE,       o_NOT_NEGATABLE, 'J',  "strip self extractor from archive"},
@@ -183,8 +183,8 @@ pva@gentoo.org
          case o_ll:
 
 === modified file 'zipnote.c'
---- zipnote.c	2010-12-22 13:02:43 +0000
-+++ zipnote.c	2010-12-22 15:42:45 +0000
+--- a/zipnote.c
++++ b/zipnote.c
 @@ -21,6 +21,11 @@
  #include "revision.h"
  #include <signal.h>
diff --git a/app-arch/zip/files/zip-3.0-no-crypt.patch b/app-arch/zip/files/zip-3.0-no-crypt.patch
index 2858b51ec2c9..9a1302c1be02 100644
--- a/app-arch/zip/files/zip-3.0-no-crypt.patch
+++ b/app-arch/zip/files/zip-3.0-no-crypt.patch
@@ -4,8 +4,8 @@ forward ported from zip-2.32
 
 http://bugs.gentoo.org/238398
 
---- zip.c
-+++ zip.c
+--- a/zip.c
++++ b/zip.c
 @@ -3452,6 +3452,9 @@ char **argv;            /* command line tokens */
  
    /* Key not yet specified.  If needed, get/verify it now. */
@@ -24,8 +24,8 @@ http://bugs.gentoo.org/238398
    }
    if (key) {
      /* if -P "" could get here */
---- zipcloak.c
-+++ zipcloak.c
+--- a/zipcloak.c
++++ b/zipcloak.c
 @@ -744,6 +744,28 @@ struct option_struct far options[] = {
  
  int main OF((void));
diff --git a/app-arch/zip/files/zip-3.0-pic.patch b/app-arch/zip/files/zip-3.0-pic.patch
index b4c53de694f7..89a52e246f03 100644
--- a/app-arch/zip/files/zip-3.0-pic.patch
+++ b/app-arch/zip/files/zip-3.0-pic.patch
@@ -1,15 +1,15 @@
 if our toolchain generates PIC by default, then do not use the hand written
 assembly files as none of it is PIC friendly.
 
---- unix/configure
-+++ unix/configure
+--- a/unix/configure
++++ b/unix/configure
 @@ -29,6 +29,9 @@
  echo Check if we can use asm code
  OBJA=""
  OCRCU8=""
 +piclib="$(echo | $CPP -dM $CFLAGS - | grep -i __pic__)"
 +echo "Checking if compiler wants to create pic code"
-+[ "$piclib" == "" ] && \
++[ "$piclib" = "" ] && \
  if eval "$CPP match.S > _match.s 2>/dev/null"; then
    if test ! -s _match.s || grep error < _match.s > /dev/null; then
      :
diff --git a/app-arch/zip/files/zip-3.0-zipnote-freeze.patch b/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
index cfe78f0a100a..28f47d039b8e 100644
--- a/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
+++ b/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
@@ -1,6 +1,6 @@
 diff -dupr zip30-old/fileio.c zip30/fileio.c
---- zip30-old/fileio.c	2008-05-28 20:13:24.000000000 +0200
-+++ zip30/fileio.c	2012-06-12 17:30:29.794547493 +0200
+--- a/fileio.c
++++ b/fileio.c
 @@ -3502,7 +3502,7 @@ zwchar *local_to_wide_string(local_strin
    if ((wc_string = (wchar_t *)malloc((wsize + 1) * sizeof(wchar_t))) == NULL) {
      ZIPERR(ZE_MEM, "local_to_wide_string");
@@ -11,9 +11,9 @@ diff -dupr zip30-old/fileio.c zip30/fileio.c
  
    /* in case wchar_t is not zwchar */
 diff -dupr zip30-old/zipfile.c zip30/zipfile.c
---- zip30/zipfile.c	2008-07-01 00:15:30.000000000 +0200
-+++ zip30/zipfile.c	2012-06-10 01:59:42.571706181 +0200
-@@ -5406,6 +5406,8 @@ int putlocal(z, rewrite)
+--- a/zipfile.c
++++ b/zipfile.c
+@@ -5406,7 +5406,9 @@ int putlocal(z, rewrite)
      if (z->flg & UTF8_BIT) {
        /* If this flag is set, then restore UTF-8 as path name */
        use_uname = 1;
@@ -34,8 +34,8 @@ diff -dupr zip30-old/zipfile.c zip30/zipfile.c
        add_Unicode_Path_cen_extra_field(z);
      }
 diff -dupr zip30/zipnote.c zip30/zipnote.c
---- zip30/zipnote.c	2008-05-08 04:17:08.000000000 +0200
-+++ zip30/zipnote.c	2012-06-10 02:33:36.372663528 +0200
+--- a/zipnote.c
++++ b/zipnote.c
 @@ -575,6 +575,13 @@ char **argv;            /* command line
        strcpy(z->iname, a+2);
  #endif
diff --git a/app-arch/zip/zip-3.0-r4.ebuild b/app-arch/zip/zip-3.0-r4.ebuild
new file mode 100644
index 000000000000..8d72eb604270
--- /dev/null
+++ b/app-arch/zip/zip-3.0-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs flag-o-matic
+
+MY_P="${PN}${PV//.}"
+DESCRIPTION="Info ZIP (encryption support)"
+HOMEPAGE="http://www.info-zip.org/"
+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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="bzip2 crypt natspec unicode"
+
+DEPEND="${RDEPEND}"
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-no-crypt.patch #238398
+	"${FILESDIR}/${P}"-pic.patch
+	"${FILESDIR}/${P}"-exec-stack.patch #122849
+	"${FILESDIR}/${P}"-build.patch #200995
+	"${FILESDIR}/${P}"-zipnote-freeze.patch #322047
+	"${FILESDIR}/${P}"-format-security.patch #512414
+)
+
+src_prepare() {
+	default
+	use natspec && eapply "${FILESDIR}/${PN}"-3.0-natspec.patch #275244
+}
+
+src_configure() {
+	append-cppflags \
+		-DLARGE_FILE_SUPPORT \
+		-DUIDGID_NOT_16BIT \
+		-D$(usex bzip2 '' NO)BZIP2_SUPPORT \
+		-D$(usex crypt '' NO)CRYPT \
+		-D$(usex unicode '' NO)UNICODE_SUPPORT
+	# Third arg disables bzip2 logic as we handle it ourselves above.
+	sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
+	if use bzip2 ; then
+		sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
+	fi
+}
+
+src_compile() {
+	emake \
+		CPP="$(tc-getCPP)" \
+		-f unix/Makefile generic
+}
+
+src_install() {
+	dobin zip zipnote zipsplit
+	doman man/zip{,note,split}.1
+	if use crypt ; then
+		dobin zipcloak
+		doman man/zipcloak.1
+	fi
+	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
+}
diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest
index 20408f8e1667..b2e5e7124f77 100644
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@@ -2,5 +2,5 @@ AUX zopfli-1.0.2-makefile.patch 2505 BLAKE2B f00e9056738bc9cb64f7aae79c42388d1d8
 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 966 BLAKE2B cab9a7529b3516654f4c9fc84b38ba72d2b3000c70682d61b6ca42eae86655bab2ca3fc6929d481a140324a4669bf496a5b08d645f4c2b39895b677e73b17102 SHA512 401c5e1a4be1ab1dd813335758c04ead724d5029f631f960cc3017e036aca3a3d80043ba93b4064d12c041d1217129cce05aeb92fa6af40a9719babccab4db16
-EBUILD zopfli-1.0.3.ebuild 509 BLAKE2B 413d42ef7c870a5f19dd286f860fc3dba1b080900d1bb7380ed23b79d08f1cb914f8382942d9f7d1c42146cad8d9e9d55fd738950423f824bbe0ecf677891e89 SHA512 d27ec6229f28fb1ae6eec787eb4a45ab632d035127a68d22f9ba29b584bfa446d61066db14bdca7d82076c7838c9b02bb71436577917195d82c92eb3199084f1
+EBUILD zopfli-1.0.3.ebuild 500 BLAKE2B e017ce2f1362d078512b354b4c76a18f93455c694efc4ca731f07fb5a53cfc413dceb79c7df00dcc1d9007722f392b073c1295ba5127cb53c511ae62c4710027 SHA512 cd409422c8b75edefd3452e8e6d4b5808d9732b7c4e4bc220c6a5467614416780281efac1b5c1160ce064723519d59e90985bf8b204a39583a05c884aee2fabd
 MISC metadata.xml 384 BLAKE2B 0ea1ed6757cfd935a4e46b926d33891d99b5c943cd3145e9587b1e3d905d27c3756820f6d530afc329a552777ef19c6f4b4c54ae67798fd813b20363133a75f0 SHA512 f096a21a2f292028e07d029df22a40c252809879acc4b40c31c1bcf157c5ce28da0dc9d7466bfe6a6f13f0e61ac2d0e46e7a082135d7ae5fd945faad4837104a
diff --git a/app-arch/zopfli/zopfli-1.0.3.ebuild b/app-arch/zopfli/zopfli-1.0.3.ebuild
index 12b52c0d6387..5ee720b81960 100644
--- a/app-arch/zopfli/zopfli-1.0.3.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.3.ebuild
@@ -13,6 +13,6 @@ 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 )
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-arch
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)