gentoo resync : 22.05.2021

25 files changed, 158 insertions, 326 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 3f50a477e225..9b878a1761af 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index 7a0a37588615..89efa2728c17 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -3,5 +3,5 @@ AUX makeself-unpack 2814 BLAKE2B cd96049b052b46a6d5273d78e27598f73046c1a29049af4
 DIST makeself-2.4.3.tar.gz 32613 BLAKE2B 2295b6d47a8105f2b495260abb0c9ae85875c821d0291a19b5af894c1cef669f338c4e10de8128fe38008e7e08079d1f29949884f202cab680c7fd62e2f00dd9 SHA512 d404c7920c7f69ae29c7168bcf76806b6e2aae2e8916bb7feed998d031ce8b2cd205b83ad960a90b01189c97f9242eb3ef574194ba3ee51c605fe99dafbd6c13
 DIST release-2.2.0.tar.gz 21640 BLAKE2B 32b06157829864918d225a136043a5c9b7c6c543351e981c0e3cdce84cbbe4c52f00870bb04d29bfd79e715c1c708b51cc9958d495a9633afb9a8d342601c20d SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73
 EBUILD makeself-2.2.0-r2.ebuild 695 BLAKE2B 24c8845a3765c0540fbc61a0d479a52aa48368c5992391b24a6e50d4d21df96973fd4c24dfb37d72eade758d1350b04dcce6061603e1e36df7aad1c461440cf7 SHA512 3686991760d6bdaca0ae09db9506f6337609550052041ec60a5d1da3321ed99a08f1f5e149c56228b0086f1a664531b8df81690496bf80774fe8f7546bb08022
-EBUILD makeself-2.4.3.ebuild 945 BLAKE2B 6ccc7d8b7311ae87c9c4d9d43e32457c1f2d9b2c32a6bf0e83da1e1c0564a73297b0b2a741e61f4df3485803e67f69a44ba4e7c709f8fc428a5f48938c0af2a2 SHA512 e5d953ccca8ddc860893480bf5a1e762ed310a3c60366406cc65e9f1f8578c5e465c955d6625d70609f742d10410371d4f4587dcc64d9d5323ccd12a9c8c4e6b
+EBUILD makeself-2.4.3.ebuild 942 BLAKE2B c9853c874c7653c35ab3656b80357bef22ebcee730a9f2be6eecc857302dce32dcf90e4ad5e15874babcbbd44f6331440517089a086f8c225cc1c1e2f14d490f SHA512 8357031146ec48a52bdf7957c8faa50eab5ca9fa6e68ceb6462666da63c7f2bb61892efe8bfea4ae50659dd3b60c41b7dab3669de1b0ba2131ba8fb99ec36d0c
 MISC metadata.xml 513 BLAKE2B 25f348226db47085523f7e1f74b1b557982acf56ba2b33252e250cc45400137be2090e29dad3b009e7b11c2d2942e564e7c499c7566c857ad5b05849553014c0 SHA512 48b0f4efee7e7dd1dc3e5bc0b2585748a15e4e2e0e41eb764709b41b4eb45d6ef98b712fc5265c2892e70b6c99c00e15542430e854811961d3acb5a803c6d5c5
diff --git a/app-arch/makeself/makeself-2.4.3.ebuild b/app-arch/makeself/makeself-2.4.3.ebuild
index a46a9d81b0c7..2cd2a9fa8709 100644
--- a/app-arch/makeself/makeself-2.4.3.ebuild
+++ b/app-arch/makeself/makeself-2.4.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
 
 src_prepare() {
 	default
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 66ee55cb6509..16447f91ad51 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -5,5 +5,5 @@ DIST rarlinux-x64-6.0.1_p20210407.tar.gz 598720 BLAKE2B 7b33c2d10064db20d9bea0d4
 DIST winrar-x64-6.0.0_p20201201.exe 3334088 BLAKE2B 37d7d4c3ede27a049eb3ca42b944e49570cd109c2c940ddaa40139700ed7ad32d292bdec6d9d6b60908bbeba2e363b8013cc91331419325dc4d3c1613b93d782 SHA512 c161d760070a133f249fba8730fa7268435b3c7f32f5cfa59ec228f3c7a94e915f0a201749e234df0314f1b436d8d46365bf1a7fc118a9b34e8f7419cb556b71
 DIST winrar-x64-6.0.1_p20210407.exe 3342736 BLAKE2B d85763f9f78528c0da838efc4ad131eaffd0c97087394df32373847110127735f8199fedc7d577dee7fff97cb31566d1431eb31a202c36f340cbf5acbea045ce SHA512 9b897be51947871cbc4a3395e4f25644ac5bf328c86b033c58b127710264abb1486dac28f91b421c6f8e1196466fd91313acd379077fdfba7795df8cb929a7b2
 EBUILD rar-6.0.0_p20201201.ebuild 2232 BLAKE2B c038b494adcc5ead0eae6c03f39518221598195be4f1aa99601264d01fc22c86dfd985fb88ea6ad3697d1afc71c42404ffd06437f9b046ffb2710226a051b0eb SHA512 ed19c27d77c6b806f780f61670632e2f4f1d19e77fef3871e722a9c6c34b91a8851b9cfd30fe10c0b7b3906c01c80e635dcc82d416392182830a2765c6e39809
-EBUILD rar-6.0.1_p20210407.ebuild 2234 BLAKE2B b8f103104510af1eff6ad4a0d44554a4d0d2e346a8c353c77fb7bde77f6e8937fa64058155840fcc18c676da4fb6ec4d5e66367959bbb11c4067b3eb0516c42e SHA512 5959dd9089df6285771f395c5ad07905c4a624fa4128e95d28f4ae938ae751dc470bbeea231780efcc79b986ad6bacb060edef0cfb523b70dfd0c33e82af40a6
+EBUILD rar-6.0.1_p20210407.ebuild 2232 BLAKE2B c038b494adcc5ead0eae6c03f39518221598195be4f1aa99601264d01fc22c86dfd985fb88ea6ad3697d1afc71c42404ffd06437f9b046ffb2710226a051b0eb SHA512 ed19c27d77c6b806f780f61670632e2f4f1d19e77fef3871e722a9c6c34b91a8851b9cfd30fe10c0b7b3906c01c80e635dcc82d416392182830a2765c6e39809
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-6.0.1_p20210407.ebuild b/app-arch/rar/rar-6.0.1_p20210407.ebuild
index d927f40b3a30..e94158b2ceaf 100644
--- a/app-arch/rar/rar-6.0.1_p20210407.ebuild
+++ b/app-arch/rar/rar-6.0.1_p20210407.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 1e53a6070ccc..802c6d52011c 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -9,5 +9,5 @@ DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd
 DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
 EBUILD rpm-4.14.2.1-r1.ebuild 3461 BLAKE2B bac45050bb09146ca2e266747f3b35bbf37bcd089d87800bf332ae348e087fb1443f4b86a4a8676083739f2fdd74bfe54c20ff99cb680a8147dc01987632b6ae SHA512 533a3687b8f56e219bb7cacb3dcc6f2dc29fa6546977d70c8e33c6ab97ad43ebfd00cdd9c4ca6188bf0cba1c4b40911b83e2c5ab1702c6911899a1a77d52b7e9
 EBUILD rpm-4.16.0.ebuild 3935 BLAKE2B ca9fcf934a6acdfc918ccf658b1959528c5c11d0b5784402f5f599743a0a9536bf054ef8eef3cf3d9b0dfd13ce0c63d5e961d97790fb423c418cd4e48e87faff SHA512 bcbeec2d9533cdb7c41dde254fed52b579e118834cfbe033b7afa283e9813d34bb10fbd63bd31097bf974bfb1ca1037611ffdba87087d405c2aead85fb3b7f6c
-EBUILD rpm-4.16.1.3.ebuild 3638 BLAKE2B 9f9268febc26d1f74b513e39c5317081f228f15285ae8e64f61c8e5c5afc5cca0bc1dbbfea53a569591ad4f25971c8ecaf44cce816f596439c5f5b996458e253 SHA512 174cff4ee03cfac24c23e90d47f48a070303a6fc77cf8631c22a449d9ebd9b5c1e16ec877b68d13033533ecd6f191b737724f87371e01604b711f996a4dc0967
+EBUILD rpm-4.16.1.3.ebuild 3632 BLAKE2B 81e8d2c8181bb2778fa6abc36b6c37db4470fd6bc2b6355f9f19a062b0d35eb7f102253c7b386baced9a2a7af054cb96be359c3c86b949c137370df72884049b SHA512 b2505da0564792233c403369f951696ee16ed5686718e616c249b438a2119fc73b656b63d4dae11c43bb759c8714923567adaebbf6ec2278e87bda10484c1bda
 MISC metadata.xml 337 BLAKE2B d01523bdc86c3b93ae548f601265338290470dcb578a79757ba7d3b2c4be257c89e76c97b5d411f9271d9ee754981a004b03e2a5cfe9b6bd56e32932796771c9 SHA512 20a89c9f7af0c1a7dd5f325eb3c1af65044a6f09e6ea8c70033bf35819ee18faf8c3a0ee2cebcbc0849a84e962dbbdd2111e02b3369d0feccf3719dc0bcfa6cc
diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild
index 32b827a153fc..1302a5a779e0 100644
--- a/app-arch/rpm/rpm-4.16.1.3.ebuild
+++ b/app-arch/rpm/rpm-4.16.1.3.ebuild
@@ -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/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 528f2e93d0b5..c7a44ff807cd 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,6 +1,3 @@
-AUX rpm2targz-9.0.0.5g-add-zstd-support.patch 719 BLAKE2B 0450ee5f7e6010db15f77d474da633fdab17c7b39657971bd64aebf89876a368c7bdbd4572e30a51825ae741efcad6f0845b10aed362c8502101d54485369cd5 SHA512 dd5ea497a2983c45f7c2055b7f47b911f86a5246b90bb1d55d8f75dcb1c9f25f2c20d75e7f19a3df65b62320e8397d465d25f5d5ea234a65230da4922b274079
 DIST rpm2targz-2021.03.16.tar.xz 6500 BLAKE2B fac1122fbfcab2b982ea6f5369b95b30814d438d0f853d846ef62a33ceaaf81d44b2a743bc20a3ef46defb63331bff06f9a268a5a805ecd899b11f86ec414bc2 SHA512 efd677642fbf73d4b8c90f338eea20452052f2bdc2b7a3a61c0e9215676575b5063aad733ec3ea4840baf281eb332db8f6fdeef600cc8a8aa7e208f2fa8ee599
-DIST rpm2targz-9.0.0.5g.tar.xz 5740 BLAKE2B 88c903119fc19bd1d2eec1ccc7616e05594465a0595b75be8ab8095b5404420a8a09ba8fb176ee21efa5df3b12d4436b60119a637f70910cc020bcb3dcc3833b SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549
 EBUILD rpm2targz-2021.03.16.ebuild 735 BLAKE2B ea5f063c9c9d375f9ccff3598b75733440e1f0f689bfa9d8420ea5d98bd188221f0da9ff6fcc0a5d0dd73a7e54565fb872adaaaf0d6ba446dc684ac29826463f SHA512 408cafd75fce7f7186ac71ec47cb4664727e52b5665c3beef30934c51e89d710fddb4d1d1a02768d5c9b4218d6d934af562df7d96aca6ee102754a173025fe95
-EBUILD rpm2targz-9.0.0.5g-r2.ebuild 791 BLAKE2B 29b329dc66c931358b9e6d378081d348900fb3191768b86b4283f27d3613b5ab84573e0688425f98b412bdf91f0fb865062cf3ac28ea94688f9584b5a4520e67 SHA512 ab2bac841a63959bd172fac9d08cf2b84f8945b7247307f4c56c68a159387bf1a006df8412bf9c0943d92cb14a2028ee6deadb7279673edf24af650b1a3ad5d0
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-arch/rpm2targz/files/rpm2targz-9.0.0.5g-add-zstd-support.patch b/app-arch/rpm2targz/files/rpm2targz-9.0.0.5g-add-zstd-support.patch
deleted file mode 100644
index cc0c46aee033..000000000000
--- a/app-arch/rpm2targz/files/rpm2targz-9.0.0.5g-add-zstd-support.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Origin: https://bugs.gentoo.org/719208
-Author: Rafał Mużyło
-
---- a/rpmoffset.c
-+++ b/rpmoffset.c
-@@ -58,11 +58,13 @@ int is_magic_lzma(const char *buf)
- static const unsigned char magic_gzip[]  = { '\037', '\213', '\010' };
- static const unsigned char magic_bzip2[] = { 'B', 'Z', 'h' };
- static const unsigned char magic_xz[]    = { 0xFD, '7', 'z', 'X', 'Z', 0x00 };
-+static const unsigned char magic_zstd[]  = { 0x28, 0xB5, 0x2F, 0xFD };
- static const magic_t magics[] = {
- #define DECLARE_MAGIC_T(t) { .type = #t, .magic = magic_##t, .len = sizeof(magic_##t), },
- 	DECLARE_MAGIC_T(gzip)
- 	DECLARE_MAGIC_T(bzip2)
- 	DECLARE_MAGIC_T(xz)
-+	DECLARE_MAGIC_T(zstd)
- #undef DECLARE_MAGIC_T
- };
- #define MAGIC_SIZE_MIN 3
- 
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
deleted file mode 100644
index d2cb2194cd49..000000000000
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
-HOMEPAGE="http://www.slackware.com/config/packages.php"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-arch/cpio
-	app-arch/zstd"
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0.0.5g-add-zstd-support.patch )
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install # need explicit install line #397835
-	dodoc *.README*
-}
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 7cb6a16a6744..1780701ad477 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,8 +1,4 @@
 AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152
-DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6
-DIST tar-1.33.tar.xz 2224824 BLAKE2B 500bcf4b919881da13f7336c617b4d618b5f898e4d8606867c8917be165d4a3718783a2959896226df451d7acdd78ba2fd1d9fc774d7905fe0dbe2375e3329fb SHA512 d7c31147fafcd815bb54e3862c078dccc3f192a9fa149c2275bd89a21fcd54a4bdaa8343cacf4f76cadc2f57fd4ed955682c1b6f23d438add5a13cc35bd25260
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
-EBUILD tar-1.32-r1.ebuild 2013 BLAKE2B e3b6541a23e734fc1d929c7e7bde258d2730a31e00259456846fb41dfbcd03fb9010b5a4e386055439da8c89cc4b78ffe90ecae5437cade3283cdc2f5aba88d1 SHA512 61f259fb0399165481772697ab198c50d9489ee706e91f540d1387c52f49efde8ad2d0855208ba2c3701a35c73223d3dc43786aee5be87d574f9bee4e18917d2
-EBUILD tar-1.33.ebuild 2071 BLAKE2B a3059d9bee7ce72e6d0404d1164b3480fc29da18bf11fe8d9ea12e969db486c973d9038f6b3869608e9d14c1cb2be87a283304fa8602b4239247c0131a6ec028 SHA512 b360b92f120f41dbc9515dfbc4ea0a8e63e01d8f95ffa6c067ad5a72dc54001a50d2d0036ca13fc041bdf0ba276245fe2703ae7e3132c7dd90453ce37149e81c
-EBUILD tar-1.34.ebuild 2063 BLAKE2B b8f3db3b5a8dd956795949139f79ad6a7ffb2de34cd2b6875b5f5b3860c29c133f43d390f4b55ee015d797ae89a3332c37a13cdd4cd2f74693948abdcad4505f SHA512 be9fabb9b6589e567569be68b4bbaba05d1756b654e2f8f02e5d74069fc40ac66c80156d64559f7f31546adb0da640182ca1d211822fa4c4ad44af33e977cd3a
+EBUILD tar-1.34.ebuild 2041 BLAKE2B 9579378c3bf040a772edcc87992ddcdb9aa092c01e4598bbdfaa2ed662dd5f2b73aca2f4d96e21a6c94fd5d2804c2b9ed5e7a6003f2749c983245dbc2c9dc94e SHA512 82937b0e2d708b6b60db0c47efc7fda4facec2a4bcaaa8bb57b11d5d8e48dd076697ed8d4ace888bdac1e0791378a5abc6c09fdabf80af1b90f794ee81e91cc0
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/tar-1.32-r1.ebuild b/app-arch/tar/tar-1.32-r1.ebuild
deleted file mode 100644
index 7d3bb9785671..000000000000
--- a/app-arch/tar/tar-1.32-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Use this to make tarballs :)"
-HOMEPAGE="https://www.gnu.org/software/tar/"
-SRC_URI="mirror://gnu/tar/${P}.tar.bz2
-	https://alpha.gnu.org/gnu/tar/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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="
-	acl? ( virtual/acl )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.10.35 )
-	xattr? ( elibc_glibc? ( sys-apps/attr ) )
-"
-
-src_prepare() {
-	default
-
-	if ! use userland_GNU ; then
-		sed -i \
-			-e 's:/backup\.sh:/gbackup.sh:' \
-			scripts/{backup,dump-remind,restore}.in \
-			|| die "sed non-GNU"
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-backup-scripts
-		--libexecdir="${EPREFIX}"/usr/sbin
-		$(usex userland_GNU "" "--program-prefix=g")
-		$(use_with acl posix-acls)
-		$(use_enable nls)
-		$(use_with selinux)
-		$(use_with xattr xattrs)
-	)
-	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local p=$(usex userland_GNU "" "g")
-	if [[ -z ${p} ]] ; then
-		# a nasty yet required piece of baggage
-		exeinto /etc
-		doexe "${FILESDIR}"/rmt
-	fi
-
-	# autoconf looks for gtar before tar (in configure scripts), hence
-	# in Prefix it is important that it is there, otherwise, a gtar from
-	# the host system (FreeBSD, Solaris, Darwin) will be found instead
-	# of the Prefix provided (GNU) tar
-	if use prefix ; then
-		dosym tar /bin/gtar
-	fi
-
-	mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die
-	mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die
-
-	if use minimal ; then
-		find "${ED%/}"/etc "${ED%/}"/*bin/ "${ED%/}"/usr/*bin/ \
-			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
-			-delete || die
-	fi
-}
diff --git a/app-arch/tar/tar-1.33.ebuild b/app-arch/tar/tar-1.33.ebuild
deleted file mode 100644
index 3edc9849a1e3..000000000000
--- a/app-arch/tar/tar-1.33.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Use this to make tarballs :)"
-HOMEPAGE="https://www.gnu.org/software/tar/"
-SRC_URI="mirror://gnu/tar/${P}.tar.xz
-	https://alpha.gnu.org/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"
-IUSE="acl elibc_glibc minimal nls selinux userland_GNU xattr"
-
-RDEPEND="
-	acl? ( virtual/acl )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${RDEPEND}
-	xattr? ( elibc_glibc? ( sys-apps/attr ) )
-"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-
-	if ! use userland_GNU ; then
-		sed -i \
-			-e 's:/backup\.sh:/gbackup.sh:' \
-			scripts/{backup,dump-remind,restore}.in \
-			|| die "sed non-GNU"
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-backup-scripts
-		--libexecdir="${EPREFIX}"/usr/sbin
-		$(usex userland_GNU "" "--program-prefix=g")
-		$(use_with acl posix-acls)
-		$(use_enable nls)
-		$(use_with selinux)
-		$(use_with xattr xattrs)
-	)
-	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local p=$(usex userland_GNU "" "g")
-	if [[ -z ${p} ]] ; then
-		# a nasty yet required piece of baggage
-		exeinto /etc
-		doexe "${FILESDIR}"/rmt
-	fi
-
-	# autoconf looks for gtar before tar (in configure scripts), hence
-	# in Prefix it is important that it is there, otherwise, a gtar from
-	# the host system (FreeBSD, Solaris, Darwin) will be found instead
-	# of the Prefix provided (GNU) tar
-	if use prefix ; then
-		dosym tar /bin/gtar
-	fi
-
-	mv "${ED}"/usr/sbin/${p}backup{,-tar} || die
-	mv "${ED}"/usr/sbin/${p}restore{,-tar} || die
-
-	if use minimal ; then
-		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
-			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
-			-delete || die
-	fi
-}
diff --git a/app-arch/tar/tar-1.34.ebuild b/app-arch/tar/tar-1.34.ebuild
index a089bfec1d43..aba5e27209f9 100644
--- a/app-arch/tar/tar-1.34.ebuild
+++ b/app-arch/tar/tar-1.34.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit flag-o-matic
-
 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="https://www.gnu.org/software/tar/"
 SRC_URI="mirror://gnu/tar/${P}.tar.xz
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 392794bdf55c..08dfac2e44d2 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -2,6 +2,8 @@ AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40
 AUX unrar-5.9.3-build.patch 943 BLAKE2B 1f482772b491269413e11e600e049ed608ccb4b0b0271d43d3df43849cbcfe60a4fd4546fb5e69dbe95d6729b344f705b97483a5bc0c1d11edc21ce8e08bca6b SHA512 b6d3e5c6bf0e3605c3390b97bdd1f0747fff32eb7780a7ec967421841203a6cacb42ce16041bec84f88fa1eb2fd15b9235da1f37d517c9e7d876034a5bd79466
 DIST unrar-6.0.4.tar.gz 232379 BLAKE2B 39382eeb71cafdeaa608ef497c44cd88d950d761e5c8395a224b2bdd530328a0060dec658aec943f9af8e135ce29cf86c3522ed17799f869cd0d84cbd7acc74a SHA512 9d2beb39fa0e3c60298b482967f1ae51d8a6531c88f5b8b053cc8905c033c0235cabb776d8449f9d96da6b81946167b84d19acdf93dda7ada14cc3c53bb7df19
 DIST unrar-6.0.5.tar.gz 232702 BLAKE2B 8e33d116ae9de06818379f4303241dd7f44ba319619829d0eb2c9257b3fd27e473b636d40edd6049a1ff096ea722fee0a71bf145456923b2664087dbf7d4554d SHA512 cd6d9b316a2daf2f3f81b28b4d6054cbe7ca9a7e39087a5dc7e4c554e5d5590b395243f03f019bf358e127be48dd219e827fdb6af7543305a52c3f87f6e32dd7
-EBUILD unrar-6.0.4.ebuild 1883 BLAKE2B f5d07b289b8446ae79daeb3b49be0f9c908b31b2bb22e5209d8c48a8f6e11da75aeaee912edc0d9b9d42397b7bb41f322427f6303e269c132caf7b979b7b386a SHA512 9619fb9a9f6f5d18f9ddb6377b99d62a8227c7464af4dd1794173537ff3432c7b3bca1d28d73a8d411f3ff44af3fc3633f5ab36569f35527869ecc04abb89449
-EBUILD unrar-6.0.5.ebuild 1889 BLAKE2B a4af1d6556180110b67f6581699c3f282ab4c039c8a5672b0c39c8819cc313ccc9cc522d342915061139bd8297beca26113e28d622ed1daa90c0b800c1966625 SHA512 008cd6a077705d080d4dcc8c3678e15343e56f08d011a5611ed6c36a426554247e3809f45764e00bd93b693e48bb3f4d4a2c0cdcb75c418c7332698cb3b6967a
+DIST unrar-6.0.6.tar.gz 232874 BLAKE2B dd32f09167a641d7a63a2dc4979f6eb4462b1a16529e92fd0fb1e0e27f4eeb22e7ee15b96e7aa9d852db4dddd09d73efb53f2bcb2426e12612afa244f06f0387 SHA512 cb50cdde120c02461bb6618e4b8773a221982c5ba81309669001b9713fc14bedc42bc5a601f30a62674be7ffd5c674d51be285c02a468d6e3fe0ebc02da8bd8f
+EBUILD unrar-6.0.4.ebuild 1862 BLAKE2B 785443182da522d483e6efbcf32999755ff897d36bb1f59c8b77d57a7060348759cccaf653af7a017149a927215cecbe78179c85389e2b9e1df1a18e1b83a805 SHA512 4c887ff1f51183c96b76cbdd62774bf74fd98e53f48bee5a948fa84e91fb87d4f1724efabdeab40b2f7d4cb1b59c97774aabebe4899a146067f485b842d1b6d4
+EBUILD unrar-6.0.5.ebuild 1863 BLAKE2B a151fcc7bcc6e015450a00216793be440c50241726aa0c238c246e8708afb3976dbb548d7de9eaf5f8842a46ad283aaf41593211bb57a60169b08d974d6f7ef2 SHA512 27de8a6deac82faab6419b01651c7f24d69a3c430614b75c304fee9477d4cece38d5791a0afa9326a70dc1f8cc8682f61daf858e7458d62772da71948285c9ff
+EBUILD unrar-6.0.6.ebuild 1868 BLAKE2B fcfa10d454042f03584c0a5f775ba754f316adcda1710a53529e06288ea13adf81a850238bbe9c04238e3cc56675924680adc6c4b91d1faf328a1c002d3cd80e SHA512 8edf12f59856ca178d8ad82feaede9b8c62133483f7c708ac41f2a0b582581a12fc766ff1cb9a4be7ba1249e88ad709ecfe407b712fc2aad115228671f3df394
 MISC metadata.xml 520 BLAKE2B 14f38803f23547426b6d1d87101a52cc5260b65313dfc727c0c8d8a719326792ba10ed27b584dfaa2be23811fcca217fe5418daa22ba90a6217a38cf4db84267 SHA512 9654aa3df0a399d971cad519392a232e1cbd9f407702bd2fd6fa31472fe6fc8966df787b3a99861f43db2e9bc3f8ced5d2840c21b10cbff6c74b07923d60e116
diff --git a/app-arch/unrar/unrar-6.0.4.ebuild b/app-arch/unrar/unrar-6.0.4.ebuild
index ff89fa03aada..adc92be38a0c 100644
--- a/app-arch/unrar/unrar-6.0.4.ebuild
+++ b/app-arch/unrar/unrar-6.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit multilib toolchain-funcs
 
 MY_PN="${PN}src"
 
@@ -15,7 +15,6 @@ LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/6"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
 
diff --git a/app-arch/unrar/unrar-6.0.5.ebuild b/app-arch/unrar/unrar-6.0.5.ebuild
index 4715611272fb..e7805e6a50aa 100644
--- a/app-arch/unrar/unrar-6.0.5.ebuild
+++ b/app-arch/unrar/unrar-6.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit multilib toolchain-funcs
 
 MY_PN="${PN}src"
 
@@ -14,8 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
 
diff --git a/app-arch/unrar/unrar-6.0.6.ebuild b/app-arch/unrar/unrar-6.0.6.ebuild
new file mode 100644
index 000000000000..451427685623
--- /dev/null
+++ b/app-arch/unrar/unrar-6.0.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S="${WORKDIR}/unrar"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.3-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 6f460908e0e7..34b830abbb55 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -3,8 +3,6 @@ AUX unzip-6.0-format-security.patch 4424 BLAKE2B c76ac7c9874238ff20c85e35d8bab80
 AUX unzip-6.0-natspec.patch 14304 BLAKE2B 87f724fcdb0960bfa17d609dbb764f3469b1ddfee1abc810e57cef52780482abd8c25950cf0da4d976d89745f4aa65b6269f21d0eac290230621b782fa1e0d06 SHA512 189ce2045430d2d04e27049672a3cfb205319edab1ac1522700a7f89344e5718235d8a15238390f6b4317af493796a65cac6a83f7dceb402bc736628d7a89cda
 AUX unzip-6.0-no-exec-stack.patch 381 BLAKE2B c298afe0df1c903c0894bf55e55b3f4f0d616662e3fa706bcb9813707af3f2bfebff1a2b4290d943718ca35aa2ce098f20b5d370a624c1a16b81d4e921a3bdeb SHA512 a00ba3c805aa64bebeb3194cd75093c1e7c951366d40bba4852837dcb355eedf1ca6a6e648ea007fcb71124e778e54b5168a7b38a7b7268bc3983d87594633a5
 DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
-DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
 DIST unzip_6.0-26.debian.tar.xz 23708 BLAKE2B 7655396df2f8c4443bbd37a2fab590f1e66b3b8531871a6d95f281ac702e64a0e602f2412a58ff2addf4ce9cae8d146af650a18b02919d120c9db6c49df480b5 SHA512 9a56e400ad0984f87c7ee0548429349be549e35a3cae4c9acb88a8fb97a1d1fbd116cfa3292622ad8b2c67ffe79ae268861ddec1269993ba98f1a6a411b7611f
-EBUILD unzip-6.0_p25-r1.ebuild 2804 BLAKE2B 5494fe51d269c97c8ddb3cec2632e87f8066835e9ef382579cfe988cebfb8c76595c7a86cc049484801ca121775e3e4301c96ba32aed6a144f954f1e0b226a2c SHA512 bc7ab1b7d4358ab4a6edd677e110c287b9f2c091cb0694f647883d88e9ef4db28c104bb5fde015f0bae79291dab3f7db5d6a9bb066b3950d188779d0131a38ed
 EBUILD unzip-6.0_p26.ebuild 2804 BLAKE2B 5494fe51d269c97c8ddb3cec2632e87f8066835e9ef382579cfe988cebfb8c76595c7a86cc049484801ca121775e3e4301c96ba32aed6a144f954f1e0b226a2c SHA512 bc7ab1b7d4358ab4a6edd677e110c287b9f2c091cb0694f647883d88e9ef4db28c104bb5fde015f0bae79291dab3f7db5d6a9bb066b3950d188779d0131a38ed
 MISC metadata.xml 586 BLAKE2B 67250bd2c90d0621ff6dc6c609d4b7938b213cc0907081165136c6ff985772d9292738719d2176964a93e6c99701dbc2129333d31abb42079e39f5333ce797e1 SHA512 dc3b7a2f09a84656771c2d3c2bec757ec9fcc6ed34208dc789ae669a20a247d6791cc34f67b33f374b6e6322a138a1777da8b26c35f71f7715173391eaa2f7bf
diff --git a/app-arch/unzip/unzip-6.0_p25-r1.ebuild b/app-arch/unzip/unzip-6.0_p25-r1.ebuild
deleted file mode 100644
index 398013305c5d..000000000000
--- a/app-arch/unzip/unzip-6.0_p25-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PV="${PV//.}"
-MY_PV="${MY_PV%_p*}"
-MY_P="${PN}${MY_PV}"
-
-DESCRIPTION="unzipper for pkzip-compressed files"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
-	mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 natspec unicode"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local deb="${WORKDIR}"/debian/patches
-	rm "${deb}"/02-this-is-debian-unzip.patch || die
-	eapply "${deb}"/*.patch
-
-	eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
-	eapply "${FILESDIR}"/${PN}-6.0-format-security.patch
-	eapply "${FILESDIR}"/${PN}-6.0-fix-false-overlap-detection-on-32bit-systems.patch
-	use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
-	sed -i -r \
-		-e '/^CFLAGS/d' \
-		-e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
-		-e '/^STRIP/s:=.*:=true:' \
-		-e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
-		-e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
-		-e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
-		-e 's:LF2 = -s:LF2 = :' \
-		-e 's:LF = :LF = $(LDFLAGS) :' \
-		-e 's:SL = :SL = $(LDFLAGS) :' \
-		-e 's:FL = :FL = $(LDFLAGS) :' \
-		-e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
-		-e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
-		unix/Makefile \
-		|| die "sed unix/Makefile failed"
-
-	# Delete bundled code to make sure we don't use it.
-	rm -r bzip2 || die
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		i?86*-*linux*)       TARGET="linux_asm" ;;
-		*linux*)             TARGET="linux_noasm" ;;
-		i?86*-*bsd* | \
-		i?86*-dragonfly*)    TARGET="freebsd" ;; # mislabelled bsd with x86 asm
-		*bsd* | *dragonfly*) TARGET="bsd" ;;
-		*-darwin*)           TARGET="macosx" ;;
-		*-solaris*)          TARGET="generic" ;;
-		*-cygwin*)           TARGET="generic" ;;
-		*) die "Unknown target; please update the ebuild to handle ${CHOST}	" ;;
-	esac
-
-	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
-	use bzip2 && append-cppflags -DUSE_BZIP2
-	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
-	append-cppflags -DLARGE_FILE_SUPPORT #281473
-}
-
-src_compile() {
-	ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
-		emake -f unix/Makefile ${TARGET}
-}
-
-src_install() {
-	dobin unzip funzip unzipsfx unix/zipgrep
-	dosym unzip /usr/bin/zipinfo
-	doman man/*.1
-	dodoc BUGS History* README ToDo WHERE
-}
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 7b350286aa70..f3b494ab1a35 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,4 +1,4 @@
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
-EBUILD xz-utils-5.2.5.ebuild 2766 BLAKE2B 0dcf3293012914303c1893602ac12389a8994206bee0ff2edc80283e6c46e1105d69252446dbb72dcb795dd63e0faa94c9d01e4badd9f0ace598a7e44aa1d37a SHA512 a46bf8554c455558edbf7cd220eb611a59778ba5d6a46f5d59356aff94feea6675aed9b395865ab6d281ae7c82ee50bf2a1f7125cf5708ececc8a7117f58d101
-EBUILD xz-utils-9999.ebuild 2774 BLAKE2B 5fc27d6432e3c91a091bd78e1cf876e7e2231e98658eb3aa8794104a1b8be72f1390ebd7f939e8ad13bc53c1b7478d9cd64805283cab31bebc03cdcaa1851ab3 SHA512 d94eb53b779f2c5dbf077f7d89b136d43ab164a18b881c5bf14f3e0a1da10d9e36a2ed1df8078eaa721e6e3d54906e2b1ecddf9a1ba64ebbc18ec27402340210
+EBUILD xz-utils-5.2.5.ebuild 2750 BLAKE2B 070d4a08f519ab557890b6587c2617025e0386f1216feff40b7e842f89f2b4497048d6468669f63e207f28f8a95553e3413dfc1f4f14fea691fee24b7159db6b SHA512 7db43473bc7120250ef288ea83a257fd4a576b3d958dd9d8c99e0942288ea8d1a8c753e3d3e106ac5a08d411b0fe26f4376669c6f28a2ecc8d1300b7f0543215
+EBUILD xz-utils-9999.ebuild 2758 BLAKE2B 577f2c05c90dbd5361114e1032556978b4fb028a97358ff07d6a19ca8e204505ae7b3a45790b53394db0db2b908bef453ccf511c5fdb5afa50320b1c7890eb0c SHA512 e52511314356824d8706c885b69ae6b2bbcd5799712d916b39718f1ca12cf7d66c6f4dc0c6512e02b130a6fcaf17d62864b5b0c606fdd501915e9cb05a73b06a
 MISC metadata.xml 538 BLAKE2B 06981ff73e0b5996d9231d91eb18dfc31f03c7120d68eae5eb1bf98a5b99fecea4622ee0e3649fc655db4abc455a46627a0b77c971afb5729f7c8c5e50b0f616 SHA512 1f1cc9d8bb737ec14e06c1cc41f27dfc4140efb2e9c5bcb749ecc4cba11df9ee5513d8874e0f78a8ba8d597e16c532ad25891f31824beab2ec02e3455a95f8c3
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 f3623aeb5329..fbfae9e95d0e 100644
--- a/app-arch/xz-utils/xz-utils-5.2.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs usr-ldscript
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 8def0cac063c..f4e55c873afd 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs usr-ldscript
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 8bf2ad229419..e34da484194c 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,3 +1,5 @@
 DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
+DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
 EBUILD zstd-1.4.9.ebuild 1670 BLAKE2B 4ecc7d03f5dd84ea8d21325d79e605e0240a97b437aa89f086b29f70236c91122021e793e02c96481e6ff44b2aedca24d56fbc5bcac016f54016e3a65afa1c3f SHA512 f5556bfc7c0118b6a757b464d905e59cdbbf8de0739f1816b17fcff7c12eee6576c834f78408a3c9253615bcf5e967f8a9d4bf6183399a9d24549df64bfc6f96
+EBUILD zstd-1.5.0.ebuild 1678 BLAKE2B 7544c7630e0a7b31f0c536c9704ae93f8ac35e5c2ced17b3f728f960d85cc584739e9e1995383cd198d595620366d7b1fd91dc2a57a29b3bb57ba3903adb7661 SHA512 45126b517b8c50c5ed7a21f742bbd05f66b9cc4ea3976532b3f8bb20aed04920867be2b1126e7d5889aa4f7f3a1e10e7ada9cb2d388ddfed40f79564cfaa08ae
 MISC metadata.xml 409 BLAKE2B c955efa52a6bb0508c7a648281351c4eb37c8d0381b71317948fb33fcf49acd837ebaa86a66d46c561ec86b97a914f64795ea424ee2f9fc06ae13a5e00343ac8 SHA512 d3a660c20edfc5f404dd02df9819178e7501483db8a548b434cd6f19d9634352b80a6118d5bb5bd27496f0d1a7d5e1aa9adbbc21f1604bfa3f78aa99a252d1b6
diff --git a/app-arch/zstd/zstd-1.5.0.ebuild b/app-arch/zstd/zstd-1.5.0.ebuild
new file mode 100644
index 000000000000..a7b21ee6fe57
--- /dev/null
+++ b/app-arch/zstd/zstd-1.5.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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
+	lz4? ( app-arch/lz4 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+
+	# Workaround #713940 / https://github.com/facebook/zstd/issues/2045
+	# where upstream build system does not add -pthread for Makefile-based
+	# build system.
+	use threads && append-flags $(test-flags-CCLD -pthread)
+}
+
+mymake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		"${@}"
+}
+
+multilib_src_compile() {
+	local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') )
+
+	mymake -C lib ${libzstd_targets[@]} libzstd.pc
+
+	if multilib_is_native_abi ; then
+		mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
+
+		mymake -C contrib/pzstd
+	fi
+}
+
+multilib_src_install() {
+	mymake -C lib DESTDIR="${D}" install
+
+	if multilib_is_native_abi ; then
+		mymake -C programs DESTDIR="${D}" install
+
+		mymake -C contrib/pzstd DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}