gentoo resync : 27.03.2021

25 files changed, 174 insertions, 85 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 0058e8af8270..7379b9a4d6a3 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/arc/Manifest b/app-arch/arc/Manifest
index beacb8a7a356..ab06b105b141 100644
--- a/app-arch/arc/Manifest
+++ b/app-arch/arc/Manifest
@@ -1,7 +1,7 @@
-AUX arc-5.21m-darwin.patch 268 BLAKE2B f353d9a5cfecb4c434cc65303190523fdc0a8af159c0e2d8ae6b13d19597611a12a55a983723b0b54f2fde737d6a1538c7757dc4cb2aaf8a6014d4e4a05a836e SHA512 1250a494f793d899286989f6715a504f22b651f60019149ad1b4b4d423ad2d59fc948bdd317e773ea99bb4f52f79771450a9e69263c994c7cda79bd3bec5e94f
+AUX arc-5.21m-darwin.patch 252 BLAKE2B b64cb9420b30f559fa2c22714774865305f1c5e175ab3138e259020e22358818357d3285310370ebff5af077e4a9231785cb595501353516d69a8c0785424866 SHA512 23e988706b346f9c9e1245d867e81e0f6c0302ce6bad5050921b9d93f2eb9e87c864f2e6c71bad725c24ae5a37b113260ecfcda79ff44345f780b69d46f153b2
 AUX arc-5.21m-gentoo-fbsd.patch 216 BLAKE2B 09d600cfddb692362e78aa5aa5770387b685ce23fde54f6e77c34e41ab52b29db52b29883d6772f735773e04209506ff61f36909d895595a34afe35ace7aec9d SHA512 6cf269ca19d5000deec43bcf7e766d28aefa53219c5af8f65429e80f4a8b8ec557199d73cb380665b4d14517118ac567a001edcee1514691901d8192109923c0
-AUX arc-5.21o-interix.patch 341 BLAKE2B b37abfafd5d0de28ddcf0f8c5392e2e9ea6921e5a8ebfe7d0fee836fb91513964f25bd60e65f8791f642b106b614c933d607af101408872f715f93a6d89f9d5f SHA512 7e204d6d70a5f5c591012a26b498cb2899f50a207358413e164a7b4cd39776c3eab1e8026eac4ab8c86c6cc37e2fbaf8bc34657f618b2f12295c56d6d59c99c8
+AUX arc-5.21o-interix.patch 216 BLAKE2B 650a4b2bc908c8c09f9d325a5d43c580de42b3209642042729e7895608d6d38f0f807d0de8173ece6fbbbdaadc70a6601b3f2797753401a4aee82c860fa5d287 SHA512 c6c01f2c6a91807f71825c07bc27d7223870e4b29fa59233edb0c40e6e8cb549fd796d7c2bdf53d7a595c60f04ee2762b9fac3eeec5b640f4f9045897a402ed2
 AUX arc-5.21p-fno-common.patch 934 BLAKE2B dc9c058a2e0053dacae271c599333cf02a262857c619c214c02e4c189a2e5f7491cea04f67950c16f840bbbb94149a15aa5417e33ab698dd983c9dc10ab349da SHA512 4f79298bc9ccc8ebf8cff50ef5d943841afb3d1281bf35581f1fe0bdf512bd8ac7edf04a0149d9d30df8a2c02e45828c38f2f97d5a918de9e6f1a1f50f245058
 DIST arc-5.21p.tar.gz 84791 BLAKE2B 3dc6c2e9c83a9021a9a865676e248278f88b3de868846b39e1b1a9365299c410e7bb3c0ed07cfd3ad1e3f6340eb0e3d21b57a7c6e8ea92f61b51a914d7e4fa0f SHA512 c70c01ec407cc27f6507e2715d8b553277609cb49369a1e65a83d007362a24b69bb09ef2bf168ee36ca6797bd4524644a89e9114d866351ae53fece193c2967c
-EBUILD arc-5.21p.ebuild 878 BLAKE2B 2f6f21289c1ebcc844b4b815da9a5bc610b937fac9fc14dc2b8d4cafd0bf7b4107fd16fa617fa95b7fe324f26363436284d442650c81e7e362a6848350aa3e8a SHA512 79c30408cd206f911affc23cf139b99b4c4746c5e7bb7471763614ed58f70e906671de1b98ff70f76e9250d317c9a6af9a745f2844f7a61fab412ba82650c81a
+EBUILD arc-5.21p.ebuild 870 BLAKE2B e8098d98d354e592fefb616ec49b6d8366787587130c6060457a64b5038a64c84736f667f8c998651d0ded3c8675fdfac4f78f14b747fb5da3b1483baf349016 SHA512 72ef8104d3465406f231d62c05650585cae96ca630729f8ddf31599604b147fbe023e9573eb418793e6c3d21a602a6e63d5391eab54dd57aebc056d0e10ff25d
 MISC metadata.xml 245 BLAKE2B ff465a2889a98102a34066d3adaa422ead459625ea37725edc0693f8c3cb2957614065f05262232fb3684a0664e71ae2bcf16ce5117f5ea5fe7f4e8f71d0a8e8 SHA512 d32b1e423299f63707758e535a7901995eb6dcc98142819003caad6f47977f3a3525051637b67bf730c27cbf81d2187dc1a0034ee3a681d4865a89e4e115bd6d
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild
index fafc0962ba1a..37ec75be30cc 100644
--- a/app-arch/arc/arc-5.21p.ebuild
+++ b/app-arch/arc/arc-5.21p.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.21m-darwin.patch
diff --git a/app-arch/arc/files/arc-5.21m-darwin.patch b/app-arch/arc/files/arc-5.21m-darwin.patch
index fb1eb5ea2598..85a36593dbf2 100644
--- a/app-arch/arc/files/arc-5.21m-darwin.patch
+++ b/app-arch/arc/files/arc-5.21m-darwin.patch
@@ -1,5 +1,5 @@
---- arc-5.21m/tmclock.c
-+++ arc-5.21m/tmclock.c
+--- a/tmclock.c
++++ b/tmclock.c
 @@ -14,7 +14,7 @@
  /* Julian day number of the Unix* clock's origin, 01 Jan 1970. */
  #define JD1970 2440587L
diff --git a/app-arch/arc/files/arc-5.21o-interix.patch b/app-arch/arc/files/arc-5.21o-interix.patch
index f95aee85e37d..8c90eed819f1 100644
--- a/app-arch/arc/files/arc-5.21o-interix.patch
+++ b/app-arch/arc/files/arc-5.21o-interix.patch
@@ -1,6 +1,5 @@
-diff -ru arc-5.21o.orig/arcdos.c arc-5.21o/arcdos.c
---- arc-5.21o.orig/arcdos.c	2008-03-30 15:44:53 +0200
-+++ arc-5.21o/arcdos.c	2008-03-30 15:45:51 +0200
+--- a/arcdos.c
++++ b/arcdos.c
 @@ -30,7 +30,7 @@
  #if	UNIX
  #include <sys/types.h>
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index cdc759d88061..8603acac1d77 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -19,6 +19,6 @@ DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B da185d9771dd83d59f2c13ea32e9a514ce50c97d6
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 EBUILD bzip2-1.0.6-r11.ebuild 3149 BLAKE2B 28c1c0f00331adefab03b4b09678253e2193519f5100bdd1aae3f853e9ff4b7b10182c4f30d5e75bfff3ed6ac053312b04900b6f8e99225240a3e9aa6d96c24a SHA512 cf104189d6affa11b90ca3f34ed69507174360af9d97acdaaf2eda58fb59a9b5eae0e390976e7889e5bb2d39d643ac75a60e5bec8a107d2644a371f4c0c0b4cc
 EBUILD bzip2-1.0.7-r1.ebuild 3013 BLAKE2B 8bc2d3f4c5622462b632002b44b039266d555f0d820d9f21fb4786426ee3704a5a14b7ba6d025e24329800c8f8c5fcc2f01d5e80a65799e679b2015fa1221808 SHA512 6d51134ac7304905e2c2a1b6fb75cb57256f751776026a0319cd75b8dec3a4c5b4ef7799655ace1e4a9de4284f05435cae24d44c9de783749457654d7d02081f
-EBUILD bzip2-1.0.8-r1.ebuild 3244 BLAKE2B f9849e6e361a376c00937be79f22974f710d689c73be3364ee17bc17bba539ebc6d451a2509ced464ea7a4ebaebb18030474e5105081dbc02ff1ed71dcd2403f SHA512 620e109630e8755f7712f620e8a4360cf712c3dccececc9d00d02472deff1ffa99281273e7c9688c2c080f4a9b56bebdafd23f4327b6523f7892706109e4b379
+EBUILD bzip2-1.0.8-r1.ebuild 3243 BLAKE2B 9d6da63821a3123130b7c470063da3f419153b292398e77e3018c27bbef2a114aad15e4322f2385c780a7cb74775ea951303d3e54d7eb51a96c5b09e6d579849 SHA512 32902e86874650ddf542ae2947fd71e70518ae3b3232708fd16fe5a5e57e978226bb4b84ab7cb29de135ef152ba2d0cad67f674559015caf62a01024fd1f4379
 EBUILD bzip2-9999.ebuild 1678 BLAKE2B 9b5c0dd688618e60c0be87e75dfffa168271ed8b335c1050435fec76c70c0d52ca069768e1f8a6cf4a473c220ac51ea5c948b086141f13bade0e916b03338d20 SHA512 8231a7fee67e3df64687c10cc815184ec46d744e3248bbdd27dd93f33df8112a1bcdc4457c97e02eb55a68decbcc704bdc074966bd23692e6fad538dafc5ef3e
 MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index 49d36f93d65a..c6ca84ece131 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 563bfecd7908..2e627b2f43d2 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -3,6 +3,6 @@ AUX cpio-2.12-name-overflow.patch 404 BLAKE2B f15aaffd716a6dca8b00f0831cd3bfa897
 AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11504b075b1216d20cd8643591abdc3a69afe1db254800327ece8f07f83438756d88c5c10c606b4e14c76a309941dc4ed1f9 SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03
 DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
-EBUILD cpio-2.12-r1.ebuild 864 BLAKE2B 37ccc2b3193de87220107008a20fac0e0973e9e2efd5486831d2968c60bcbf9e20ad4117fb6ffeae83529081faa308c00bec5b1fccce9c590a78fbff71992a4c SHA512 795a65bdd66af849720eb286524ddb2afbc52859badc8dddcd8f0f905bad7f5e1447379d6acd0881687e2e88a97db820120d8993a41ae0ebc8230a81f54a223b
+EBUILD cpio-2.12-r1.ebuild 819 BLAKE2B 08d6696adb989e2dfafca2317758955812fac942bbff67e4b43940a4607a765ee1181e273f265bf179d5edd82701a471d2f787ed0ebab46d8fe498d32f0b1eac SHA512 ae83b97c08efc5c28d9d312e8c7884534ee6b37a9c4550cc2445e50a12b561c15b2cbb0cb1358d00233b59b234a8442464ee710f038bb4bd02178a141ac2f8be
 EBUILD cpio-2.13.ebuild 804 BLAKE2B e83fdf9524b6e956473f1fd974991d8ca50096d014335afc29d89739a6c1d541b18b1e1ef72e47de769e28920e9a137a65761bf0acfafeff161d7a42bce6f459 SHA512 1ed9849be48ed8effaac3046638090e4e7f4a3ab00a649bc69aa3b021d9663c55f1feb7ba1bf28ef4bd02fe97b4666bdbf1fccc8931ba9d63cd002f036fe83e9
 MISC metadata.xml 327 BLAKE2B 5f895635aeb7efdcc8e9999d6892fb8dd6668d204fbedf5492cf086a3ada6d9b1c71ffb2344de642b279de34d7ef459371d0eff173ed70cc404f6ef50d81987e SHA512 9aed569e7f3412d9891326d8d0bdbd48fd46dcbcb3d045ddbe7971e2d9e315e2d71ee9c5adebaa12425cfadf03de00ba5c70a16a4227634b9cf40e534d96fb05
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
index 6fabed098f88..4c3a5cf1d7d0 100644
--- a/app-arch/cpio/cpio-2.12-r1.ebuild
+++ b/app-arch/cpio/cpio-2.12-r1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A file archival tool which can also read and write tar files"
 HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
@@ -14,11 +12,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
-	epatch "${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428
-	epatch "${FILESDIR}"/${PN}-2.12-gcc-10.patch #705900
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
+	"${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428
+	"${FILESDIR}"/${PN}-2.12-gcc-10.patch #705900
+)
 
 src_configure() {
 	econf \
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index c075bb4806a2..c09f63a05951 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -9,6 +9,7 @@ DIST dpkg_1.20.0.tar.xz 4738556 BLAKE2B 2e58b3881abd46854416b05b0f9d2e972c3b5454
 DIST dpkg_1.20.2.tar.xz 4710300 BLAKE2B 0d10ee7f5cc863a6496fd8340cf0457f9af3d7d7a74821d561d0cc500a056d52664d1418453fa45dcb27d01ef59e55eb299ce1fcccd1ae7cb72b7c9e43b6b120 SHA512 523713e40d4f49332d96fdcabaeaf4d97f56b40bbbd51f18d17b5c79598249d04fdf96dfc5c8684408a666cf04f622cbd30da60efe68ba2cf1cd836cb2503e02
 DIST dpkg_1.20.3.tar.xz 4712980 BLAKE2B 92a1ff07dbb01f8942452eee269eb45d4c164272bf3ae5d0a62a6086c4321e7fc3dd5b164089d7f2e476258f8ec8c480c1614d4f43e3a7a7f1e632bf13191d2e SHA512 5893ae34efc6f9d54e47fc403487c79233501666968681b827bbabbf39b1401cb7064f8fe8797708ed32bb37345dbb78a1daac04c6dc7064f2811265f3a4e82c
 DIST dpkg_1.20.5.tar.xz 4715684 BLAKE2B 32b88cbd1ae75685b6c0b04b7c829372df323a9508ddd088076097e8bf2ac9050f1f4ec591fb7d40c4d4ea34207cef0edd430d0326cb73e1f7c8dd560db916be SHA512 6b3789c25c81022181b87a28ca9baa4a463a68940a871568c699a2a30e3b4ce705835ed6a171ac8c5902e377200b31cc0be1e03cbd7d35c4eaf92c7300d9227f
+DIST dpkg_1.20.7.1.tar.xz 4952736 BLAKE2B 0439cd9440c34597ff5c5e04bd8e1b79d34cd7675a216cbe1e7dc4d68460847143a8a7dff14b1845374d8e504d6fba63842b1d1ac37aa01f7b2a96b78ef0278d SHA512 beec7a7ba1cfbd6954b3d583e57c811af3bfa5e4e4554e6af6673d4a4be0e79fb4aded2f6aeeda592c2ba3d91facb82138f2eb8eb2338dc4fae1832911df2fd6
 EBUILD dpkg-1.19.0.5.ebuild 1812 BLAKE2B 3a31644cf63a67d657ca7c44a64ae0553761d2561740c7d06f2ffa5d6e10b3058fa03f92a45517fe3d1bb8c246979d268a127e90a6313b093fe26f2c6d145ae6 SHA512 cd356dc118a52b4579c84e36dee342e5f15c9ee218d6ce8bc80a787a6aa2ba70597788f652fd51855beed966a09a04b0b4c56f8682acb70b643572f08e0d98c4
 EBUILD dpkg-1.19.6.ebuild 1960 BLAKE2B ef3fbf6a4a7add7936aafc4f643495ec37741ef5e6618badcdcf6253e8f4a94a10a197e428f2a1a2e665e106eec7b64585c62de0ed2ff9003226db94824faa92 SHA512 b4f21e5b0be4783a9a45d1153a7de938fa056537ef6b40f75e07a7d009fba8b5895b08d7249f1ba785e6e4e3a6324f0de953ed74b2e6315d210a9a77f04782d5
 EBUILD dpkg-1.19.7.ebuild 1960 BLAKE2B ef3fbf6a4a7add7936aafc4f643495ec37741ef5e6618badcdcf6253e8f4a94a10a197e428f2a1a2e665e106eec7b64585c62de0ed2ff9003226db94824faa92 SHA512 b4f21e5b0be4783a9a45d1153a7de938fa056537ef6b40f75e07a7d009fba8b5895b08d7249f1ba785e6e4e3a6324f0de953ed74b2e6315d210a9a77f04782d5
@@ -16,4 +17,5 @@ EBUILD dpkg-1.20.0.ebuild 1919 BLAKE2B c7456dbda807d2195de6e0f19abab34c70eb6e768
 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
+EBUILD dpkg-1.20.7.1.ebuild 2008 BLAKE2B 920c16b61438a5dac6c03308c52142a6578048405ae9def81ecb16a8ad53e834f6f7ab01c253dfe4fa60ccb9d91283b87367a7210f9004832d6e48a2b8d98ea7 SHA512 427c9b54fd34a6862b8a843d57de07c6412a1aac523e011e37eb0c3ec7da6c13ec5783a6c43405100ddc0d6b216b24350342ded817fc8b425ce2dc05b73b24f8
 MISC metadata.xml 432 BLAKE2B 553e9f62e3a549d43f4e336d8ed7a73a3f87eb6cb7bd80bfd6f577acbb5ebaf78f58118540438feee04c58cdfde28ecb97e06b14db1ed6329c93bf84749bdd9c SHA512 7ff95b06796b982454546880b8761cbc9a618cbfff07694a4753f3f3e45f9ece8831908777fbda09896e9accc75bc6ebffe522e719eed4b484d3b301fd3f7932
diff --git a/app-arch/dpkg/dpkg-1.20.7.1.ebuild b/app-arch/dpkg/dpkg-1.20.7.1.ebuild
new file mode 100644
index 000000000000..fce1289c1427
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.20.7.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 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/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 2c2da4ea2b3c..49e1da30d02b 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-autoar-0.3.0.tar.xz 297072 BLAKE2B 7c7204d605c80a6e0735e0be6dec1024e6073cb99d6bde885a1c8b10b7f6e6476a181c99b5bbb755abfdf86bc56aff3d9b174189ff29cc58d24607b482f242ab SHA512 2f5962e115b25be9578ecad51d9906e426bb60b675e42b364d9f0b67f0751cf59d4afd4dbfc8adc0d13256e5dcee445c5195262e6ff0839ef88350b1c6e5293a
+DIST gnome-autoar-0.3.1.tar.xz 297904 BLAKE2B 607c9b3a26cf23eed3b9b19c32e2e0b3b9127977b5836b0b263cc3163490fd10052716e073264bbe946e351ec096021dd243560f6e7781400029263705308328 SHA512 a8ece09f66d7f1761fb4217f267b8a6dd1dee2266cc10f9944b1860c364e0d671286c6bf9477bdee5d0dd231b959ebefdd7a7003d679c38fe1553863033311dc
 EBUILD gnome-autoar-0.3.0.ebuild 936 BLAKE2B b58a09009e3a27bcc77dea24117043e78e65608666277bb19b2b0cc029d048021ed9788a38b9c3399e1c85c5c2f6b571b8ca9b11778aeb3bbe32acb86c279ce3 SHA512 8cf3c31ad17f7239e6d43e11f23767fd05ab51d2268e3dfe05667cc62ec7900dfa5dfdd18a15e398a247fc6896715860b13ff68894c0b80d99637cab86da9d45
+EBUILD gnome-autoar-0.3.1.ebuild 939 BLAKE2B fea7fb981052b074386410ba62748af7a4fd09e08c11794a8f330123fcf988a92f132e30277b4ea632680e2ccb963dd8d4ab03583ff0629294234a2deac18c58 SHA512 afd3808574bd3a393e77ade4779ec49ccaa889a543d31e01d3dbec0dd92dfc5bf77d9f5946cacc3cb24da68ca8b357b61168363a7a932074c1c2fa7d053dad04
 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild
new file mode 100644
index 000000000000..5ef87130fe55
--- /dev/null
+++ b/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Automatic archives creating and extracting library"
+HOMEPAGE="https://git.gnome.org/browse/gnome-autoar"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=app-arch/libarchive-3.4.0
+	>=dev-libs/glib-2.35.6:2
+	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(use_enable gtk)
+}
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 4f7cf023c779..718da0fd6749 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 1086 BLAKE2B f0c05758c344467c6e70a45ac67406c6ba89e3744e938e518d0cf7e5d4b723788899331109b2f89804e4a3b49a59241d17e4d396c63ba9f8e2dd06d33073408e SHA512 0fea04bed2f2a9898e6fa52ea2fb8ccc351f60175f5cc7c1d27ccf0dd0e0da37678d6886145032182014e30db6fab30de9be444d6a25d17f212b91e6717cafe4
+EBUILD gzip-1.10.ebuild 1080 BLAKE2B b8a0d64a37ca54fb45fcf8392b948e5f62fcaaf18969bce500a28d25988bf3049ef0a0c9a124fe7d6401e5997583e15c35fd8f978bca85812fda9189b75a4461 SHA512 d1bfeb944eb54c9383aabc1416063ed259afb86a47c1875dcab872954e5b627530cab5251c2527de3026c62c5e47049455c36139dc42700ccabdd228f3d02799
 EBUILD gzip-1.9.ebuild 1128 BLAKE2B fcc7de9606ccf57da14239d909ae785a872115ea13bd0d5caab544b8bec7f843774dc12c4f8de1900ccdc2aff13683ab59d76fe7f15905a51ed2aa1806e970ff SHA512 d1f7d608cc4d92f1b804b7c4a035ef01576c1b3f8982f26946cefb7814d5ed0fcc7c7c678461f21789dbbf8748c4e03434d18c57ce6be2c7035e1a4735bc19e0
 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 320d210311fa..e1c3fc545fcc 100644
--- a/app-arch/gzip/gzip-1.10.ebuild
+++ b/app-arch/gzip/gzip-1.10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 
@@ -34,6 +34,6 @@ src_install() {
 
 	# keep most things in /usr, just the fun stuff in /
 	dodir /bin
-	mv "${ED%/}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED%/}"/bin/ || die
-	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED%/}"/bin/gunzip || die
+	mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die
+	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
 }
diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest
index 4c11121ffde5..2aca87d55f50 100644
--- a/app-arch/lxqt-archiver/Manifest
+++ b/app-arch/lxqt-archiver/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-archiver-0.2.0.tar.xz 155912 BLAKE2B e5c92d5939d3e6d42a79804596e9acc67b007126b630cd9317df7d0d07bb8f3e27cf9ecf6e16eef3289d31ef3627b4fa870cdb5eb52a36489df1080b03509acd SHA512 478a04d0e6e4601dc342ae260c5db4178b01191cae263154dbe400b394e5cd4cb9cd8a6bab7e7c59af57d6bf20c47a5ad2663a85d0eab5f71fbaf584f7588fd7
 DIST lxqt-archiver-0.3.0.tar.xz 157492 BLAKE2B 05d9862c75cacf3b73670333a5b2dafb6abfcfd7433a1ebc3d27948122db875f892eb58a05221c880d1ac23530362ae4d9e7c6ebe0f06552b10bb903d51a6868 SHA512 840fae890611b081a1355ceb58ca65276784e6825822859ff2d6506190212268f1c67733dc94c65c9c5758f8d6a25c286c2b339356a50f29474b0c7ce2569d2c
-EBUILD lxqt-archiver-0.2.0.ebuild 1173 BLAKE2B 6bdf4813f23abb209d0f53b4c612444827c55853e806072d0621b52d50cc073ceaa86dd93ad48b36bd45b877bc73f35805f5cffceb101492e2795642512c3b6e SHA512 74e054b528428fac654be8a64410fa16edc559d0da9f79ef0e029c7273eb2f296ca060032a68d4f89ba08d394c2ba53946ff52ea8cada203e547a2a60d21886f
 EBUILD lxqt-archiver-0.3.0.ebuild 1173 BLAKE2B ed90bcdc16bfe9a9401ef0ee07cbba79cf7c1bba6dd4f87be0a535442f96f63c69b534bb62d0a6767dd974d6ea92c7ad3f05ca8710b66e1f117ac477dbee1f28 SHA512 7396a031b3c47f978d67a01f2cef96cfd7bfd3375b8c409bf6af5dd22f438eb922379d4c70c000f8ac0f56bb7f2652c76598bd962a42911b7e3bdcea5a117385
 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
deleted file mode 100644
index 39548d1e7e9b..000000000000
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt GUI File Archiver"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	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"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.7.0
-"
-DEPEND="
-	dev-libs/json-glib
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=x11-libs/libfm-qt-0.15.0
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "Please note that this is only a graphical front-end, and additional"
-	elog "packages are needed to have support for specific file formats."
-	elog "For example, to be able to work with the 7-Zip format, the"
-	elog "'app-arch/p7zip' package may be used."
-	elog "For the full list of supported formats, see the 'README.md' file:"
-	elog "https://github.com/lxqt/lxqt-archiver/blob/master/README.md"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index bc8f0ab1fccb..c5db7b862083 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -6,5 +6,5 @@ AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4
 DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
 DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
 EBUILD rpm-4.14.2.1-r1.ebuild 3460 BLAKE2B cc58ef05231af0d5b76b4ac6157a5def7646529000b34ef091717c73c3927c45567735538fd3199f5aff5e28d6e7d80d33e022d7ec5d7d64188cb13ffe5ea318 SHA512 1c86cd41ab1dcd1ee54eea05d99dbc7f04a0f7bab57f4a8190c1c8d6ea6d308a4e47c987c5b02acca091e1351847f04baef4219a6f1ea40a417296be43517c40
-EBUILD rpm-4.16.0.ebuild 3452 BLAKE2B b4c90af4ff390b598f400ed6bc03d1b329ccda88437195af3dc554b44a7a11017495aba3580015f0aea17ef63d3a009ab29cefda200c1c90a963acfd35db067f SHA512 e6b9f6e3574bededf15fbd20f5adcf6e54b13159df3ae2da40cabb452ab5a2a677185b592ccd6f23aa653fee97438acc6bfd92001c12eeb881ea876acfbe4e08
+EBUILD rpm-4.16.0.ebuild 3447 BLAKE2B 97c70da29498eab733fe8a2b33b19b7d3403e015bf85df9b8052e28497c6cac6fba53c0a1a3246ad1c4707689aa55e2244a8a9314b50a193eb288cf7b36c2839 SHA512 9b6ca679b277c9dfa66d63a488bc6410919cc14e0776d51f05cb1164617042b8dab88dc27f20c98dc45e5ad3e7a11409ed9f99650576201997ad41aef90b2f6a
 MISC metadata.xml 337 BLAKE2B d01523bdc86c3b93ae548f601265338290470dcb578a79757ba7d3b2c4be257c89e76c97b5d411f9271d9ee754981a004b03e2a5cfe9b6bd56e32932796771c9 SHA512 20a89c9f7af0c1a7dd5f325eb3c1af65044a6f09e6ea8c70033bf35819ee18faf8c3a0ee2cebcbc0849a84e962dbbdd2111e02b3369d0feccf3719dc0bcfa6cc
diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild
index 5408cec1f1b1..1742df61ac57 100644
--- a/app-arch/rpm/rpm-4.16.0.ebuild
+++ b/app-arch/rpm/rpm-4.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # Tests are broken. See bug 657500
 RESTRICT="test"
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 98b94be7be91..604f3ea98701 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -4,5 +4,5 @@ DIST tar-1.33.tar.xz 2224824 BLAKE2B 500bcf4b919881da13f7336c617b4d618b5f898e4d8
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
 EBUILD tar-1.32-r1.ebuild 2012 BLAKE2B 766a281a21badf8a0be405419b962c09952ea2af2b8fb103e8c64fec188568a02d28e9cade253049b12ef7bdcb881791ed56585058f7280d26eaf68a0690a9eb SHA512 c4c707e16510174b57b36eb1c567ed97cd617adaadf78b56c3c6bbf8b2f44f64b6bc35582d37d6de7a51e8e965be56016dc984c5e20df0bd439056362ca5b9c3
 EBUILD tar-1.33.ebuild 2071 BLAKE2B a3059d9bee7ce72e6d0404d1164b3480fc29da18bf11fe8d9ea12e969db486c973d9038f6b3869608e9d14c1cb2be87a283304fa8602b4239247c0131a6ec028 SHA512 b360b92f120f41dbc9515dfbc4ea0a8e63e01d8f95ffa6c067ad5a72dc54001a50d2d0036ca13fc041bdf0ba276245fe2703ae7e3132c7dd90453ce37149e81c
-EBUILD tar-1.34.ebuild 2071 BLAKE2B a3059d9bee7ce72e6d0404d1164b3480fc29da18bf11fe8d9ea12e969db486c973d9038f6b3869608e9d14c1cb2be87a283304fa8602b4239247c0131a6ec028 SHA512 b360b92f120f41dbc9515dfbc4ea0a8e63e01d8f95ffa6c067ad5a72dc54001a50d2d0036ca13fc041bdf0ba276245fe2703ae7e3132c7dd90453ce37149e81c
+EBUILD tar-1.34.ebuild 2064 BLAKE2B da27104fadd674fd74186a4c60c09425cbc60844a4af8653575ccf2e1b9d98cca084fe70b9d1cca59cf8eec7ae81b4714a280747a5967788c7173e672fdcabf2 SHA512 15912963a002315a1b7abdae06b8ed877819d833fa3449e198b904480419c0e296eb592d64d02529a39ec08e98c2bde45e72e0d1177ffdaa7d305142395cc488
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/tar-1.34.ebuild b/app-arch/tar/tar-1.34.ebuild
index 3edc9849a1e3..c0ae4fe56e54 100644
--- a/app-arch/tar/tar-1.34.ebuild
+++ b/app-arch/tar/tar-1.34.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.xz
 LICENSE="GPL-3+"
 SLOT="0"
 [[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl elibc_glibc minimal nls selinux userland_GNU xattr"
 
 RDEPEND="
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 89d118879735..00a4d532a735 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -5,4 +5,4 @@ AUX unzip-6.0-no-exec-stack.patch 381 BLAKE2B c298afe0df1c903c0894bf55e55b3f4f0d
 DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
 DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
 EBUILD unzip-6.0_p25-r1.ebuild 2803 BLAKE2B 756d32ff21b15b3462f6437192130582fe49855a93dc1edafcbe6ad0dd01ffdd1161b81f16b35b86bd159e6b0f73224b7fe2a34e3ae8848d274bf1be7e84eb2a SHA512 d7748c46afc50ecbfc2d7ed99f3813da25edce920075687c40a6f9836ef0310a338e3e3373649795415a31ab269656e470f5f16148e9d460d9d99b6bee02843f
-MISC metadata.xml 534 BLAKE2B a6baad9ace7880a38dea2a34ea8cebb730e8a0742bd4447ebc9147a713eff82aed50e97dfeaed5589a7025c2ba7d9a244d101508f21f69a3dfd79c0ed61c214e SHA512 b4735d77d58b041bb5259d362f493247cdd9217423d79eab06567a5d7f1ebdfae0f80085ab3c3a842e68c6f5a6122913cb13c210d6e7fbfe398ff5ade29b97d5
+MISC metadata.xml 586 BLAKE2B 67250bd2c90d0621ff6dc6c609d4b7938b213cc0907081165136c6ff985772d9292738719d2176964a93e6c99701dbc2129333d31abb42079e39f5333ce797e1 SHA512 dc3b7a2f09a84656771c2d3c2bec757ec9fcc6ed34208dc789ae669a20a247d6791cc34f67b33f374b6e6322a138a1777da8b26c35f71f7715173391eaa2f7bf
diff --git a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml
index ed43f8ee64f6..a151503ed287 100644
--- a/app-arch/unzip/metadata.xml
+++ b/app-arch/unzip/metadata.xml
@@ -10,6 +10,7 @@
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:info-zip:unzip</remote-id>
+		<remote-id type="github">madler/unzip</remote-id>
 		<remote-id type="sourceforge">infozip</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index f57d2c0ce6a3..a900a420d5e0 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -8,5 +8,5 @@ DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd
 EBUILD zstd-1.4.4-r4.ebuild 1829 BLAKE2B af328824a7bf0d2c624eb44b2944fb6722a8029fd60a27699099b43df8bf185632da2e22c33dd817e0882431f5969e43442011dec99d6373ad6b335702458550 SHA512 0a78f7dc6ac514feb22cab76f61ba43e5bbe23399cdcaffcdd5073cb4ff01cda577c11082e9421973f9143e7eac07a511e0b7660c92d601d4ce56574a7fa7758
 EBUILD zstd-1.4.5.ebuild 1730 BLAKE2B 7512b6b7c94c40a397af11f7ba0a829efa992c1850100eb210cafbc0c37fc348be18b3cc0b3a729ee8b21e613cdf3adc5a864e1cba26f8e6b300ae93730cd949 SHA512 657b61078f485e216f2315e9ce3c586e36c14a1655d7f252e748c027ea69e38f71dbd439996f897056eba1a277104387a3e6d7012d10978e3e892bfd9e7742f1
 EBUILD zstd-1.4.8-r1.ebuild 1678 BLAKE2B 7544c7630e0a7b31f0c536c9704ae93f8ac35e5c2ced17b3f728f960d85cc584739e9e1995383cd198d595620366d7b1fd91dc2a57a29b3bb57ba3903adb7661 SHA512 45126b517b8c50c5ed7a21f742bbd05f66b9cc4ea3976532b3f8bb20aed04920867be2b1126e7d5889aa4f7f3a1e10e7ada9cb2d388ddfed40f79564cfaa08ae
-EBUILD zstd-1.4.9.ebuild 1678 BLAKE2B 7544c7630e0a7b31f0c536c9704ae93f8ac35e5c2ced17b3f728f960d85cc584739e9e1995383cd198d595620366d7b1fd91dc2a57a29b3bb57ba3903adb7661 SHA512 45126b517b8c50c5ed7a21f742bbd05f66b9cc4ea3976532b3f8bb20aed04920867be2b1126e7d5889aa4f7f3a1e10e7ada9cb2d388ddfed40f79564cfaa08ae
+EBUILD zstd-1.4.9.ebuild 1670 BLAKE2B 36cefbd7cd1ac3d6845409c2ad18999c29fb7539c9545ad2ee31b6627485e06cc3c41f32265707206e8a64352fce3d92bf4f8da7c3261bd9858fc6e5e1463332 SHA512 09ca34b1d8ac65cf1800d49e9be043bdfe268df36e68a52596ff6f9fd31c33fbf33cccea1935b31023c0becc5a2dab6eb42d59fc549152be909d26683e22d95e
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/zstd-1.4.9.ebuild b/app-arch/zstd/zstd-1.4.9.ebuild
index a7b21ee6fe57..28bd4413d0df 100644
--- a/app-arch/zstd/zstd-1.4.9.ebuild
+++ b/app-arch/zstd/zstd-1.4.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs +threads"
 
 RDEPEND="app-arch/xz-utils