gentoo resync : 15.06.2021

35 files changed, 311 insertions, 597 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 096e4d1da7d3..667e0cdb08cd 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index ba5d28e84df6..0a252b4763f4 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -7,5 +7,5 @@ AUX bzip2-1.0.8-out-of-tree-build.patch 1997 BLAKE2B 87791ad7b5c702110a7a45bb4a0
 AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8ababee2b5ff0221965f1ee6675c4060cec841dcf4370018a7fc6376cced900c6410eca96579962d52fd07563d SHA512 19d1a721680e4113c3b3267af74fa5a7ec5947c6630946c60ac5cf165476d9e7c2229e0cb099029dc9f5708b5ba15864f84af198940709144b65dbd2cd3a76a8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 EBUILD bzip2-1.0.8-r1.ebuild 3244 BLAKE2B f9849e6e361a376c00937be79f22974f710d689c73be3364ee17bc17bba539ebc6d451a2509ced464ea7a4ebaebb18030474e5105081dbc02ff1ed71dcd2403f SHA512 620e109630e8755f7712f620e8a4360cf712c3dccececc9d00d02472deff1ffa99281273e7c9688c2c080f4a9b56bebdafd23f4327b6523f7892706109e4b379
-EBUILD bzip2-9999.ebuild 1678 BLAKE2B 9b5c0dd688618e60c0be87e75dfffa168271ed8b335c1050435fec76c70c0d52ca069768e1f8a6cf4a473c220ac51ea5c948b086141f13bade0e916b03338d20 SHA512 8231a7fee67e3df64687c10cc815184ec46d744e3248bbdd27dd93f33df8112a1bcdc4457c97e02eb55a68decbcc704bdc074966bd23692e6fad538dafc5ef3e
+EBUILD bzip2-9999.ebuild 1623 BLAKE2B 792eb2334df87eaa765d1f6d86216b63cb47f96e4087425ba6b5320ba1cdd5a6a9fa8d16252c62e7b6087812e9c33905cfe40fff2354aeb41eabd52ba4e5d999 SHA512 8551d0bd27cb3c8bc2d5859ceefad97a132e32f01e41430377fb95228419f5f008d77ba4be2c4bbaa180da20a0fa4a6458831bc628cb287a65b4f812ea14918e
 MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild
index 579f0b8f44dd..a5f4b823c2f1 100644
--- a/app-arch/bzip2/bzip2-9999.ebuild
+++ b/app-arch/bzip2/bzip2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit meson multilib-minimal usr-ldscript
+inherit meson-multilib usr-ldscript
 
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="https://gitlab.com/federicomenaquintero/bzip2"
@@ -29,10 +29,6 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_install() {
 	meson_src_install
 
diff --git a/app-arch/cksfv/Manifest b/app-arch/cksfv/Manifest
index 6e87d336ff7a..ec80c496d0f8 100644
--- a/app-arch/cksfv/Manifest
+++ b/app-arch/cksfv/Manifest
@@ -2,5 +2,5 @@ AUX cksfv-1.3.15-destdir.patch 566 BLAKE2B 4bd22c37f2e254edc2956db45515666711a7e
 DIST cksfv-1.3.14.tar.bz2 26114 BLAKE2B 696ae3499bc2b1c566a40da202b70d30777ee07a7923ac567345872098626c82820a9bb75b711915e2274a3e0f1d7804ba58f8ce41dcca375391d778ba135a02 SHA512 016c2f61632980678957fe4b5bc9ecb30360efd548ff09bfbb7a31cc6fc36f6fe7936d3d819fe468a6208c71f8b625662aa3ae0abd668435d7273e149d7e4519
 DIST cksfv-1.3.15.tar.bz2 27282 BLAKE2B c1df7bac982815915327753d8f6b888cc53395a0066bc5b34fb310d540c50c3006be2b9f31ebfac269d961126b0046a5b63fbbbe9c05c265953b2d2a94602a7a SHA512 a0b5286e0dce610e8b482a55cf8af38f8f8256e175435b6f2518c6566ea844c3cf2981f96c7600c7eb9b23b35cf19f1b55f540ba0f73f1267e4593e744858d43
 EBUILD cksfv-1.3.14-r1.ebuild 655 BLAKE2B fa3ff03e77bf86bcbaab1f73f5a591aa476f52b9f9693e903e714633ab7ac7f0e66e88c5b5eef02ee583a08b2b59225be9e6307eec9841ce437a369dd168caca SHA512 9690dacb7bf13035006bee9dccf634f008ecdbbb1b928452e97ec579bff51f8f00f41d397a5afa09960181219008f78a3901f803cdfa7623236f0178dba16b50
-EBUILD cksfv-1.3.15.ebuild 685 BLAKE2B ba3939af27410ad70502578249316e88ffbafa14b271c257abbc76ce26afbcc8ba22279e101952b21d441d60106b19454cc08e202cc6410f44197e836f95ed42 SHA512 cd92f1607e56d913a2ebf0d98dc584256afcfc90d0b193f33056eca92ea94a38727b8c1c672a1bd28658e1f4051e40d2fa5b3db5c6bee6eef35709782b296b26
+EBUILD cksfv-1.3.15.ebuild 682 BLAKE2B 80d587f6714489fddd371d659c0428d1f6dc9c37c3b484a37bc61b1380fc4e7d8fa7959a8d8ad16291c06298e97f40e8add5db97b3f2ac07d20f9810d10c8de5 SHA512 d65c6bc7d88f68c3b649f6bba3c6624b4cb021eca642210c86fd10bda3847321b30c747b2fa4f3dced5a407bc339412c049b5fed6c81a7606920973d8cb1037a
 MISC metadata.xml 250 BLAKE2B 464b7b91f238241d7ed54230c2199459d0b86905b0e76ccbcfda7fb8466d4a2fbd3ed3d043696d26fcd2bbb405c47745f315b1f9001797535636038c2ed94f8a SHA512 a231e0814a9c32fc71cd94600d49161847d4dea3c59612bed1ac6e85e8a48d94f357f3b23338c7dd709cbdbdf4b969b839954655122e4e4075afb6cc583c5819
diff --git a/app-arch/cksfv/cksfv-1.3.15.ebuild b/app-arch/cksfv/cksfv-1.3.15.ebuild
index 82027ff3bdc6..70423f58ab94 100644
--- a/app-arch/cksfv/cksfv-1.3.15.ebuild
+++ b/app-arch/cksfv/cksfv-1.3.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.15-destdir.patch
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 2b6ada78bb7e..5050ac4b7459 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,21 +1,8 @@
-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
-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 1825 BLAKE2B 330c350f617c7abceb91711f7c4829e621f4ddc12103cbb036c2396e6983ddcb341014614781119c25a7c771932159b02ce1fbb6052b6c3de56b5f1ba87f707b SHA512 07931dfe023c5ebea48a8e17820e40fbf9bcfb025209a258e025b1db8d2a21e96f5fbe2508aef9b3d91fd94c126641dee4b3fcba01fece28a20b623b763a1ac4
-EBUILD dpkg-1.19.6.ebuild 1973 BLAKE2B 199fc722c5e81e4df43975ae1c014c596c7dcecb95422104608577dfd48037233e8757d6a9ab5a4aea9e6c5fd07cfa49c7e721a69cb769e1d27b4bda5836aebb SHA512 64917f1600ab9b5fc2703229a5b6520d51392d86aee4993d07a83c1476f5517e8de6aa330f4e365c47c607017ed4a3241a60cc8c5d4f788c556195a80f3ebe09
-EBUILD dpkg-1.19.7.ebuild 1973 BLAKE2B 199fc722c5e81e4df43975ae1c014c596c7dcecb95422104608577dfd48037233e8757d6a9ab5a4aea9e6c5fd07cfa49c7e721a69cb769e1d27b4bda5836aebb SHA512 64917f1600ab9b5fc2703229a5b6520d51392d86aee4993d07a83c1476f5517e8de6aa330f4e365c47c607017ed4a3241a60cc8c5d4f788c556195a80f3ebe09
-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
-EBUILD dpkg-1.20.7.1.ebuild 2008 BLAKE2B 920c16b61438a5dac6c03308c52142a6578048405ae9def81ecb16a8ad53e834f6f7ab01c253dfe4fa60ccb9d91283b87367a7210f9004832d6e48a2b8d98ea7 SHA512 427c9b54fd34a6862b8a843d57de07c6412a1aac523e011e37eb0c3ec7da6c13ec5783a6c43405100ddc0d6b216b24350342ded817fc8b425ce2dc05b73b24f8
+DIST dpkg_1.20.9.tar.xz 4954428 BLAKE2B 4e04f7a90c8696971895081e18b220d9dee4bc5930428f131556ae71c673e61e18c363e279b566c2218da60a5aca421807c14cf518952502e707c7397769097b SHA512 904a4742f5f340dc65b2137364dce102a0b2eb42ccedb2a73f79c207362c699fbffaaf1379f1f6c8b8b0e490321af1d03c34b50ebe0c703f5ce8a7f75f17a839
+EBUILD dpkg-1.20.7.1.ebuild 2002 BLAKE2B 52e2f821c92f6cf0f64bfe36d13c264a7860a845bf39dd1b57f347ce1c88dc48d2e4dc9c01533ea9d6cdc990a7e834a7dc9f4a93cb68442a78a499bdda0cc2e8 SHA512 e12646a5773edec84e9918922435d9bc0441d6f25f28041b79a0efbd4a36d47ff8cb4f768595e97149dd7a238ce67ad88931e04eb8b83aab3e8df2245ce93d46
+EBUILD dpkg-1.20.9.ebuild 2008 BLAKE2B 920c16b61438a5dac6c03308c52142a6578048405ae9def81ecb16a8ad53e834f6f7ab01c253dfe4fa60ccb9d91283b87367a7210f9004832d6e48a2b8d98ea7 SHA512 427c9b54fd34a6862b8a843d57de07c6412a1aac523e011e37eb0c3ec7da6c13ec5783a6c43405100ddc0d6b216b24350342ded817fc8b425ce2dc05b73b24f8
 MISC metadata.xml 432 BLAKE2B 553e9f62e3a549d43f4e336d8ed7a73a3f87eb6cb7bd80bfd6f577acbb5ebaf78f58118540438feee04c58cdfde28ecb97e06b14db1ed6329c93bf84749bdd9c SHA512 7ff95b06796b982454546880b8761cbc9a618cbfff07694a4753f3f3e45f9ece8831908777fbda09896e9accc75bc6ebffe522e719eed4b484d3b301fd3f7932
diff --git a/app-arch/dpkg/dpkg-1.19.0.5.ebuild b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
deleted file mode 100644
index 0a0f4f3be9fa..000000000000
--- a/app-arch/dpkg/dpkg-1.19.0.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="https://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/perl-5.14.2:=
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? (
-		app-text/po4a
-		>=sys-devel/gettext-0.18.2
-	)
-	test? (
-		dev-perl/IO-String
-		dev-perl/Test-Pod
-		virtual/perl-Test-Harness
-	)
-"
-
-DOCS=(
-	ChangeLog
-	THANKS
-	TODO
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
-	"${FILESDIR}"/${PN}-1.18.12-flags.patch
-	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
-)
-
-src_prepare() {
-	use nls && strip-linguas -i po
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable nls) \
-		$(use_enable unicode) \
-		$(use_enable update-alternatives) \
-		$(use_with bzip2 libbz2) \
-		$(use_with lzma liblzma) \
-		$(use_with selinux libselinux) \
-		$(use_with zlib libz) \
-		--disable-compiler-warnings \
-		--disable-dselect \
-		--disable-start-stop-daemon \
-		--localstatedir="${EPREFIX}"/var \
-		--without-libmd
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	default
-
-	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
-	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-arch/dpkg/dpkg-1.19.6.ebuild b/app-arch/dpkg/dpkg-1.19.6.ebuild
deleted file mode 100644
index c8e12d60fd73..000000000000
--- a/app-arch/dpkg/dpkg-1.19.6.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="https://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/perl-5.14.2:=
-	bzip2? ( app-arch/bzip2 )
-	libmd? ( app-crypt/libmd )
-	lzma? ( app-arch/xz-utils )
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? (
-		app-text/po4a
-		>=sys-devel/gettext-0.18.2
-	)
-	test? (
-		dev-perl/IO-String
-		dev-perl/Test-Pod
-		virtual/perl-Test-Harness
-	)
-"
-DOCS=(
-	ChangeLog
-	THANKS
-	TODO
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
-	"${FILESDIR}"/${PN}-1.18.12-flags.patch
-	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
-)
-
-src_prepare() {
-	use nls && strip-linguas -i po
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode) \
-		$(use_enable update-alternatives) \
-		$(use_with bzip2 libbz2) \
-		$(use_with libmd) \
-		$(use_with lzma liblzma) \
-		$(use_with selinux libselinux) \
-		$(use_with zlib libz) \
-		--disable-compiler-warnings \
-		--disable-dselect \
-		--disable-start-stop-daemon \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	default
-
-	keepdir \
-		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
-		/var/lib/dpkg/{alternatives,info,parts,updates}
-#		/usr/$(get_libdir)/db/{alternatives,info,parts,updates} \
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-arch/dpkg/dpkg-1.19.7.ebuild b/app-arch/dpkg/dpkg-1.19.7.ebuild
deleted file mode 100644
index c8e12d60fd73..000000000000
--- a/app-arch/dpkg/dpkg-1.19.7.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="https://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/perl-5.14.2:=
-	bzip2? ( app-arch/bzip2 )
-	libmd? ( app-crypt/libmd )
-	lzma? ( app-arch/xz-utils )
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? (
-		app-text/po4a
-		>=sys-devel/gettext-0.18.2
-	)
-	test? (
-		dev-perl/IO-String
-		dev-perl/Test-Pod
-		virtual/perl-Test-Harness
-	)
-"
-DOCS=(
-	ChangeLog
-	THANKS
-	TODO
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
-	"${FILESDIR}"/${PN}-1.18.12-flags.patch
-	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
-)
-
-src_prepare() {
-	use nls && strip-linguas -i po
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode) \
-		$(use_enable update-alternatives) \
-		$(use_with bzip2 libbz2) \
-		$(use_with libmd) \
-		$(use_with lzma liblzma) \
-		$(use_with selinux libselinux) \
-		$(use_with zlib libz) \
-		--disable-compiler-warnings \
-		--disable-dselect \
-		--disable-start-stop-daemon \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	default
-
-	keepdir \
-		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
-		/var/lib/dpkg/{alternatives,info,parts,updates}
-#		/usr/$(get_libdir)/db/{alternatives,info,parts,updates} \
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-arch/dpkg/dpkg-1.20.0.ebuild b/app-arch/dpkg/dpkg-1.20.0.ebuild
deleted file mode 100644
index 07b8ea26604c..000000000000
--- a/app-arch/dpkg/dpkg-1.20.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="https://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? (
-		app-text/po4a
-		>=sys-devel/gettext-0.18.2
-	)
-	test? (
-		dev-perl/IO-String
-		dev-perl/Test-Pod
-		virtual/perl-Test-Harness
-	)
-"
-DOCS=(
-	ChangeLog
-	THANKS
-	TODO
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
-	"${FILESDIR}"/${PN}-1.18.12-flags.patch
-	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
-)
-
-src_prepare() {
-	use nls && strip-linguas -i po
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode) \
-		$(use_enable update-alternatives) \
-		$(use_with bzip2 libbz2) \
-		$(use_with libmd) \
-		$(use_with lzma liblzma) \
-		$(use_with selinux libselinux) \
-		$(use_with zlib libz) \
-		--disable-compiler-warnings \
-		--disable-dselect \
-		--disable-start-stop-daemon \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	default
-
-	keepdir \
-		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
-		/var/lib/dpkg/{alternatives,info,parts,updates}
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-arch/dpkg/dpkg-1.20.2.ebuild b/app-arch/dpkg/dpkg-1.20.2.ebuild
deleted file mode 100644
index 732d0c6d35b0..000000000000
--- a/app-arch/dpkg/dpkg-1.20.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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-dpkg_buildpackage-test.patch
-	"${FILESDIR}"/${PN}-1.18.12-flags.patch
-	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode) \
-		$(use_enable update-alternatives) \
-		$(use_with bzip2 libbz2) \
-		$(use_with libmd) \
-		$(use_with lzma liblzma) \
-		$(use_with selinux libselinux) \
-		$(use_with zlib libz) \
-		--disable-compiler-warnings \
-		--disable-dselect \
-		--disable-start-stop-daemon \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	default
-
-	keepdir \
-		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
-		/var/lib/dpkg/{alternatives,info,parts,updates}
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-arch/dpkg/dpkg-1.20.3.ebuild b/app-arch/dpkg/dpkg-1.20.3.ebuild
deleted file mode 100644
index 732d0c6d35b0..000000000000
--- a/app-arch/dpkg/dpkg-1.20.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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-dpkg_buildpackage-test.patch
-	"${FILESDIR}"/${PN}-1.18.12-flags.patch
-	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode) \
-		$(use_enable update-alternatives) \
-		$(use_with bzip2 libbz2) \
-		$(use_with libmd) \
-		$(use_with lzma liblzma) \
-		$(use_with selinux libselinux) \
-		$(use_with zlib libz) \
-		--disable-compiler-warnings \
-		--disable-dselect \
-		--disable-start-stop-daemon \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	default
-
-	keepdir \
-		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
-		/var/lib/dpkg/{alternatives,info,parts,updates}
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-arch/dpkg/dpkg-1.20.7.1.ebuild b/app-arch/dpkg/dpkg-1.20.7.1.ebuild
index fce1289c1427..a286db6882db 100644
--- a/app-arch/dpkg/dpkg-1.20.7.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.7.1.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"
+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.9.ebuild
index e72dc080fa4c..fce1289c1427 100644
--- a/app-arch/dpkg/dpkg-1.20.5.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.9.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
diff --git a/app-arch/dpkg/files/dpkg-1.18.12-dpkg_buildpackage-test.patch b/app-arch/dpkg/files/dpkg-1.18.12-dpkg_buildpackage-test.patch
deleted file mode 100644
index e9716758d41b..000000000000
--- a/app-arch/dpkg/files/dpkg-1.18.12-dpkg_buildpackage-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/scripts/Makefile.am
-+++ b/scripts/Makefile.am
-@@ -238,7 +238,6 @@
- 	t/Dpkg_Source_Package.t \
- 	t/Dpkg_Dist_Files.t \
- 	t/dpkg_source.t \
--	t/dpkg_buildpackage.t \
- 	t/merge_changelogs.t \
- 	t/mk.t \
- 	$(nil)
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 6549f3b02563..92a7060af857 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-autoar-0.3.2.tar.xz 298656 BLAKE2B d56498f2798b838729056f5d2194dc628de8cfd3e8964a718982cfd464e3e6848152624b2cbbe5377d813183eebae1f212bc56c1a8df2ea119af264786151670 SHA512 6685e44ed61388759ff820b7cd403304f32d47fab4e2f66f5571a5cc6d01c1287bda851f230b3782bb1beff6ef784c25434930f15ef6ed32d788db4b89435968
+DIST gnome-autoar-0.3.3.tar.xz 298536 BLAKE2B effbd3c15ab851c97f3c69f96bbf806f3639ce4865161df99b7f84ec2c4c8a3df9381517227d9a475b1006d88ac21eb02b4b474fd8bd27524959b56cf486e888 SHA512 41cda2670506e9b3f79c4995d2fdfbd5024777d8f8b3f85a2010af4e5f4303743d26ad9cad787c995362f83b65617ed5773d972c8aa2c7bdcd358d873cb86ec4
 EBUILD gnome-autoar-0.3.2.ebuild 938 BLAKE2B 14ef901e62956cb84ccec0790971e83dc176e73b8da92d2e785bb8b0136132b5bfed43964139409f915b43babf27ab09f7ad5cb3eac9c0b4c454e6552cbb7c47 SHA512 70a9f7e15c9db87e4d56c089a407da0b97bc274bcf6a6deed93e9c16828e5f2e51ac0d8bca55b684e98784ca80fcc3af0d52ee6768b4b8b74bb522fb9096fdc5
+EBUILD gnome-autoar-0.3.3.ebuild 941 BLAKE2B 6ae751624dac772991f506fa9162141cd1a6c7467a49aa31d515a348182ac40130cfb43ea2cc0b0218bed3901ea42d2c83d30d07efefdb0459886493a4da42ce SHA512 6a9271091797f149f8f1ccf1fc86702b4ea6e439223665f25bcef43e5d23bb5d83def3643dd9a2c99a5ca1f298d8e6d0b61478b4f2b4759f3d8032ac0b4fe360
 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.3.3.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.3.3.ebuild
new file mode 100644
index 000000000000..7da8c2332a5f
--- /dev/null
+++ b/app-arch/gnome-autoar/gnome-autoar-0.3.3.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://gitlab.gnome.org/GNOME/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/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index f63290e3a8ca..546ca3966904 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -1,5 +1,5 @@
 AUX lbzip2-2.3-s_isreg.patch 500 BLAKE2B 7839d78d204c0b88ee68d728d1279dc2bc2e6222046cb28c60001c194513de7f3343dfb93d6db91bc4424fb639e2a1cbe428db1ff6753ec2c5b3c004a2b8f321 SHA512 3158763b364e8ba41b0fea03529c6e4a0c6f3d17e7d0ce796fc9a6f6bc7e70fa7db759dc205026818619e137fb6343cf21534014b64dbf07c1cdb3bc1059cc04
 AUX lbzip2-2.5_p20181227-fix-unaligned.patch 1061 BLAKE2B a8c11adbbf53806b09d9b0b6b724247a17e450eac6953a9d9852539ab6d50901d739b243a0d4c72cc46cd7bfaa609fd6829af659e0c6ed6987e6725c471ca201 SHA512 0ddd04a06d2cc763b454074aba588d2cb252e0ab8c83c37133deb5cef2c265261fc38f6b32f8aed5ddbbc8aafdcb29e96df1b61f2f2cfd2e1b93818efd69114e
 DIST lbzip2-2.5_p20181227.tar.gz 704920 BLAKE2B e5da0091c0e4fb73724c5ea472d757d76356cffbf1fc679bf4ee05e25690b7712dceaf17f355383bfd4eb525c4aea04c2e5312592df5bb99159e000769bcee2e SHA512 53b29721a106d280927f2c18f33247645bb7fb3e67d835885d73e037910bf02e473f1210d848df41a387be30f829213d98ac9387b2a9201b94d12117809fbcf5
-EBUILD lbzip2-2.5_p20181227-r1.ebuild 852 BLAKE2B 7a74c59e4f2be8aec6dd63a367fe4e657a7ea46037acde43d7984650c0dd95f3ec65e642a2b6f01b90735d40aff90d178fc6b01747e19d38460678946677176b SHA512 e20b059c71684f695d66f42090a32febb1bcd2854593fdac5f48ab06fec64e278e56aed537fea9c91b255029408bcb6865c16d9e0347073d83df41d355e5821b
+EBUILD lbzip2-2.5_p20181227-r1.ebuild 911 BLAKE2B 1a9f41cdf7ef3c032d877f56838aeb5af584f7ac9a04b73f42d2f8d57b64249553eeb6daf3b2bb42515abf9b5131adb65abab5e006de78fd21430cbbea415896 SHA512 797263789b43b327c3997627bb677ba33cba641ae9970c9dd32cb223757f200f4dd6fb1511a773ad6f9ab3a0cd29d59a65d8a76b49b8e74e8864b49777a03c7f
 MISC metadata.xml 652 BLAKE2B d44ba0b1387022f4fff2ec24e78c041a50e58f336abdcf8d31c3e2f9e429cde183000c6775eb81dbd50e9598508dcbadff5b3999dd6ee69d15214e8d22165a54 SHA512 64391d7d185471ef1b02e71a877adbebaafdb4d7bc95432d980d3559440dc199c4f68b275e98b8c0a2d10bfebbaff3544a9fa5d4bd34349404836468a0ee41a2
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
index ab756306f95b..e8d3af562b38 100644
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Parallel bzip2 utility"
 HOMEPAGE="https://github.com/kjn/lbzip2/"
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug symlink"
+IUSE="debug static symlink"
 
 RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
 DEPEND=""
@@ -28,6 +28,8 @@ src_prepare() {
 }
 
 src_configure() {
+	use static && append-ldflags -static
+
 	local myeconfargs=(
 		$(use_enable debug tracing)
 	)
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 6921e0024e1e..0954d65b2476 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,3 +1,4 @@
+AUX lz4-1.9.3-negative-memmove.patch 740 BLAKE2B 8b13944ca6236ae50e4cf6b6bc42035a5e15ce6a63b3a1bed832d0a0c189240be4b9678badd267161bf36161ac5be6083287b2343c35798675195f49d90d1e80 SHA512 29038d80c4399ded52b49e69d0f0d80bef8bf424e3540de366ef539706c8c1119784d6137c96130f131239d74a4c110dd9790cae5c9b17c102820446582c5637
 DIST lz4-1.9.3.tar.gz 320958 BLAKE2B 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c
-EBUILD lz4-1.9.3.ebuild 770 BLAKE2B ccec090ad61d3899c4a0ac87feb1bf7e88bc8861f50d1ec0be672c5f7b6f400b81374f524c1edf072fb4eb472fdd76b0bf6ba5a017764d2e1f0816ff00d2d4f9 SHA512 144cea4029471a28d26511608095f4cf32cefa80c0a059a2c61c50227bf4744e1fbd7adaf8460fdef8f8377c97657df4ee5bc29a7d5a1db2e1b208a22957676a
+EBUILD lz4-1.9.3-r1.ebuild 826 BLAKE2B 33dece0f1646035b5c83166185aa8b8cdb84bb26f974e9fd1164f79d22f551d49138ef8b34cc61dadf55b786d794bb2b83030d49666f7ce067d9c1f9845fda93 SHA512 8b30b7dd7472d2c0a2997593ceb911c183da801aa880d8050c78efc05dc3aae58905b3d7833c5a4d8a00f16bc52f4293477144609d6de40dc4d3e95562b0fc89
 MISC metadata.xml 488 BLAKE2B ffeed518b26856fcf19099ec33e1f9e93d302411504037c2eea791dddcb64e7fbc13b425a6797bba3386dc69810c021b32c66223dda4838bb710d5a2a86e725e SHA512 bc9e9b477dd0fbf300efd55ce4c31350fee375ded0b3f463116488fd4e66ee685b55464a46338abae47e0ee845333019dfba9ee2e459dc0dd91b640d42bd4902
diff --git a/app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch b/app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch
new file mode 100644
index 000000000000..053958dfe872
--- /dev/null
+++ b/app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch
@@ -0,0 +1,22 @@
+From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001
+From: Jasper Lievisse Adriaanse <j@jasper.la>
+Date: Fri, 26 Feb 2021 15:21:20 +0100
+Subject: [PATCH] Fix potential memory corruption with negative memmove() size
+
+---
+ lib/lz4.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/lz4.c b/lib/lz4.c
+index 5f524d01d..c2f504ef3 100644
+--- a/lib/lz4.c
++++ b/lib/lz4.c
+@@ -1749,7 +1749,7 @@ LZ4_decompress_generic(
+                  const size_t dictSize         /* note : = 0 if noDict */
+                  )
+ {
+-    if (src == NULL) { return -1; }
++    if ((src == NULL) || (outputSize < 0)) { return -1; }
+ 
+     {   const BYTE* ip = (const BYTE*) src;
+         const BYTE* const iend = ip + srcSize;
diff --git a/app-arch/lz4/lz4-1.9.3.ebuild b/app-arch/lz4/lz4-1.9.3-r1.ebuild
index 02eac78fb6dd..2282b90c9bcc 100644
--- a/app-arch/lz4/lz4-1.9.3.ebuild
+++ b/app-arch/lz4/lz4-1.9.3-r1.ebuild
@@ -18,6 +18,10 @@ IUSE="static-libs"
 
 CMAKE_USE_DIR=${S}/build/cmake
 
+PATCHES=(
+	"${FILESDIR}"/${P}-negative-memmove.patch
+)
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index 89efa2728c17..356299366b15 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -1,7 +1,9 @@
 AUX makeself-2.2.0-help-header.patch 6728 BLAKE2B 7d0211074f68346ead19fd58d9440976ee0e5f0367b0776c186ced0ee77769cca7597948f2894aee68e9d3f42fb6e0e19dcdc378ce0dfe714596ab8ad705d13b SHA512 5cdee18f5190086e8421d091406df5aeefdc9fe3aaee6c26aa990b1eb7d6f415c8c8ebf67137a1b2a22470c14749d394808ed9e5a4fc6f737cd87c32651e2a8c
 AUX makeself-unpack 2814 BLAKE2B cd96049b052b46a6d5273d78e27598f73046c1a29049af406f0f82c2c301e3b8f95c40534a18313eaffb6ac7ce68cbde1d988efa3503bb46f950936706e41590 SHA512 ebfe1dd13a11cd00a853e6a4e7d6094b5f923fbe987f6b5a778fec09e00e2b2daf1e5daab0eb04850d4471019fb95f88a5d2b9d88520f5738a29997d81f2c1c3
 DIST makeself-2.4.3.tar.gz 32613 BLAKE2B 2295b6d47a8105f2b495260abb0c9ae85875c821d0291a19b5af894c1cef669f338c4e10de8128fe38008e7e08079d1f29949884f202cab680c7fd62e2f00dd9 SHA512 d404c7920c7f69ae29c7168bcf76806b6e2aae2e8916bb7feed998d031ce8b2cd205b83ad960a90b01189c97f9242eb3ef574194ba3ee51c605fe99dafbd6c13
+DIST makeself-2.4.4.tar.gz 38889 BLAKE2B eac74fa28ac39cbc6b18d11671bfa32d6c0b04b55b3603c6c928483dd64af38d416936ef242f55aa4840affd4bf7fb91c2987f87afab093816331e50f16379ab SHA512 3d4d03458f7f11a8df46340d1b489ca60d413d5ed857cc67bb8ef15335ce2848e4675e080791c26fdf29423f813d468b4b797438fe0876dad54e85c6346b9b8b
 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 942 BLAKE2B c9853c874c7653c35ab3656b80357bef22ebcee730a9f2be6eecc857302dce32dcf90e4ad5e15874babcbbd44f6331440517089a086f8c225cc1c1e2f14d490f SHA512 8357031146ec48a52bdf7957c8faa50eab5ca9fa6e68ceb6462666da63c7f2bb61892efe8bfea4ae50659dd3b60c41b7dab3669de1b0ba2131ba8fb99ec36d0c
+EBUILD makeself-2.4.4.ebuild 1171 BLAKE2B ebad131c264fd1caacb5bedeb4ff3298ff35c095db7954cf017e34d232c9631b427bea0d582a1b5b27373e16ab7d84477166fe23a401cba58d05f2f2442a8974 SHA512 e65cac5fb12545c8060434cde76c02911e0dc065ce3be4829e2cb5c051353f9d1853589b7791afbb10926d7c073315f7aba57b110f1fb5a13834c171e0000f72
 MISC metadata.xml 513 BLAKE2B 25f348226db47085523f7e1f74b1b557982acf56ba2b33252e250cc45400137be2090e29dad3b009e7b11c2d2942e564e7c499c7566c857ad5b05849553014c0 SHA512 48b0f4efee7e7dd1dc3e5bc0b2585748a15e4e2e0e41eb764709b41b4eb45d6ef98b712fc5265c2892e70b6c99c00e15542430e854811961d3acb5a803c6d5c5
diff --git a/app-arch/makeself/makeself-2.4.4.ebuild b/app-arch/makeself/makeself-2.4.4.ebuild
new file mode 100644
index 000000000000..17f5cf26fdd7
--- /dev/null
+++ b/app-arch/makeself/makeself-2.4.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit optfeature
+
+DESCRIPTION="Shell script that generates a self-extractible tar.gz"
+HOMEPAGE="http://www.megastep.org/makeself/"
+SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+# NB: The test framework requires bashunit (which isn't a big deal), but the
+# tests themselves are not of great quality.  You should avoid running them
+# yourself as they like to run commands like gpg against your own ~/ settings.
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	dobin makeself-header.sh makeself.sh
+	dosym makeself.sh /usr/bin/makeself
+	doman makeself.1
+	dodoc README.md makeself.lsm
+}
+
+pkg_postinst() {
+	optfeature "lz4 support" app-arch/lz4
+	optfeature "lzop support" app-arch/lzop
+	optfeature "pbzip2 support" app-arch/pbzip2
+	optfeature "pigz support" app-arch/pigz
+	optfeature "zstd support" app-arch/zstd
+
+	# Also bzip2 and xz are supported but they are in @system.
+}
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index a6cee6ee8d7e..7bf7c7ef4bd4 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -2,5 +2,5 @@ AUX pbzip2-1.1.10-makefile.patch 263 BLAKE2B 32043c1a47504a2e901d9c4cb4360f295d3
 DIST pbzip2-1.1.12.tar.gz 47826 BLAKE2B 62b1e47b7b67f2a27f31032654506552c33e68121dd50d3496dc746a405cf783807c4966058feb1aebda2080ae1d1d22e944d057ea3a0dba2f9247ea46b23eb0 SHA512 bb68e87867295b89ee6fb76a8b72834daebf0ca6c16b2f10bce67fe7386716a728acd28bf46a9732087202ca0cc774f02c741b0b58801184bb7550f6fd119cd6
 DIST pbzip2-1.1.13.tar.gz 48015 BLAKE2B 1bb410acadc728963c3a04d2665fb1b1f0c206a893ed90352a9c16512e9bd5f82c3f5f3b383b382134bbe904735a1c8a81615a8bc54de8c6bc91633d9ce72c57 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8
 EBUILD pbzip2-1.1.12.ebuild 1065 BLAKE2B 24d74afc0b0f91da9de6775bdefef2ca1e9447b48e2a921ca3ccfde4338d6f744597a41e8b0e9c9b340d8214ab626aa0914e8961c43c005e2d707f60cd5846cb SHA512 2c77819b5770e25e8a1f6257fb16d2129658d7fdbfa3d33ed3e685e305919b6d489306b2c3b656531b35e46054a31a67e824b244e9cc0d2cde83acbd56d1f169
-EBUILD pbzip2-1.1.13.ebuild 1140 BLAKE2B 3a1d4196b753b95b205b77fcff57552f7549938f0bd70bcf65db1f9208dee7761a0cd8f9f66fedde007918af2bac17d238181ee9b2ad48d837a7f3c006c93c19 SHA512 dfcb8bbcad2a4a44996cfe04f45ce7efe7d0618a8f6a00c9d6d62e8f9e04213c6d43e2f5b34012a036a0501f2e880e9b78524ef93132b0fb6dedb89b48b4e09f
+EBUILD pbzip2-1.1.13.ebuild 1171 BLAKE2B 974f7ce95fb7acc396592de66ab149945cab1cc50e90cbc62b2902d274458a1020a478709e0ee7ed5a8fb9dc964f4dfe0684cd89d826962d73bf9acaec213600 SHA512 2c049258df99ad8537f204f83ca337068f74d59caeff71fe462d3bd6e28c5416fb214167f9aeaac9a31439c10319d1a4b6f97cf3e5d8655d262f19dff79be145
 MISC metadata.xml 443 BLAKE2B 3a25a8281989265bb3339d4b46442e5c73920567ff19bd12e57a6aa41d40534428e409ca9dc548318d2487288e12e2c6bb305809c7585c3d6742c8709a649d9e SHA512 fbac33ec453bfd5c9cec5ca30ce938281a9d1d280e8936977d77e3fe23e802345814e343d9824cef18164aa3ad2b2aab421239593bfe36f100dcd787739761d0
diff --git a/app-arch/pbzip2/pbzip2-1.1.13.ebuild b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
index f9ccda454629..6304e2335b93 100644
--- a/app-arch/pbzip2/pbzip2-1.1.13.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="7"
 
-inherit flag-o-matic epatch toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
 HOMEPAGE="http://compression.ca/pbzip2/ https://launchpad.net/pbzip2"
@@ -21,10 +21,17 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.10-makefile.patch
+)
+
 src_prepare() {
+	default
 	# https://bugs.launchpad.net/pbzip2/+bug/1746369
 	sed -i 's:"PRIuMAX":" PRIuMAX ":g' *.cpp || die
-	epatch "${FILESDIR}"/${PN}-1.1.10-makefile.patch
+}
+
+src_configure() {
 	tc-export CXX
 	use static && append-ldflags -static
 }
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 16447f91ad51..3ed9171793dd 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,9 +1,9 @@
-DIST rarlinux-6.0.0_p20201201.tar.gz 609227 BLAKE2B 8cf0052a7b2d53c57ae5e24290f24f4815815682a199d99a9b4fe120d01b3c31699bf6cdf46ddabc144944ab7437fff4043f16153770c7e732ee337082308978 SHA512 1c7abf04b2fc67dbc329210ffba707faf2d368750789cab695a45f25381f219cf9c7ad09a071b9caf4889ffae24b87260ebdfd18900891230c1fc2d8ba7a9fd7
 DIST rarlinux-6.0.1_p20210407.tar.gz 610095 BLAKE2B 897a72f7fca5efe828bf21cfd6ce5a320b5aba8fb9ca7f83991fda292ab753f860188c632aa96fa5c8e50bc3bbfda644d163e349e68a655681f36e1d36d5991f SHA512 55627c4cf7ad1651f4f9d79650b9b6ea203e20573f65158c366e4a2ec5492549e0f74d7c5ec96b71f7264a6ecebd7f6b5d8706d294f0e4bb66ca7d5eb57d9f39
-DIST rarlinux-x64-6.0.0_p20201201.tar.gz 598314 BLAKE2B 778e4f2360617ae04a30cafdec54485c757c0aae66c925c353047850a9873a536e258d8835d78cdcf6b69b4000814c242db311fda74a8dee492bd5916c879e79 SHA512 7a9fbed46954c06b15109a5af6a945702e0dec949349e17b7e31753a04298abfb80c6f2514224926aea920d26f2f2578ae8fca61c8ee3f1883e9ed60139e0968
+DIST rarlinux-6.0.2_p20210611.tar.gz 610546 BLAKE2B 927a7f60af431e84e9ff19dc1abf52c4697068264d3c67a17ada324bfb00975824e26937a19dea023cda772066991de719ec68fb1fb380f6656130af67202131 SHA512 6b6ef629dd0e681702fb0835cf6fe9962dc2ce774291f800893308a93a0a498099775e7d897d69375f68107b0ce0862bb2a6a169b8fbda534091678e9be3f09c
 DIST rarlinux-x64-6.0.1_p20210407.tar.gz 598720 BLAKE2B 7b33c2d10064db20d9bea0d416e3531dbafec659733ac361fb6c87afd646bdbf8eb8ac8581c854ec2cf193a8fbb3fe3da028a20653ead6e566e9b8de4be3b1e9 SHA512 58b308ee90dbbb416cbb1d510372fc6099c499155787e521a9103347ca853d0c30552a3f0d74207cb456fa3081a7d41c11685208bc996325b825f832cba12b12
-DIST winrar-x64-6.0.0_p20201201.exe 3334088 BLAKE2B 37d7d4c3ede27a049eb3ca42b944e49570cd109c2c940ddaa40139700ed7ad32d292bdec6d9d6b60908bbeba2e363b8013cc91331419325dc4d3c1613b93d782 SHA512 c161d760070a133f249fba8730fa7268435b3c7f32f5cfa59ec228f3c7a94e915f0a201749e234df0314f1b436d8d46365bf1a7fc118a9b34e8f7419cb556b71
+DIST rarlinux-x64-6.0.2_p20210611.tar.gz 599150 BLAKE2B ff60f32ee5215403e622bc5c341b8212c3deee0020155043e4c7c3d5feff113da351412a91fd42f46e3293dc5975fd2beca558e3e45744cdc5356ace82af6c93 SHA512 909eb3b05c56327ccec101652d1d68ca5eb97ba3a7223954724fbccf4960b07ffa0ff5fe5405c53a248342a3ae171325e7bbf7fadeaf63c1c45bf00853e0a940
 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
+DIST winrar-x64-6.0.2_p20210611.exe 3348968 BLAKE2B 482e5c34cae9c452b539f6e9e89efc7db8e463cc58b4db43cd25caa7e3fc6ab7945a7a17e9605b9d6d505c31a9a343a29812531dc5ba319765bf80fcc775426e SHA512 4c2bd804465e6bd948de248a7a0893f4b38728665b8e67c65bfc14766475072960250057ad1afc457a0df1f128da96d69483b000a5da18826776ea0a4377230a
 EBUILD rar-6.0.1_p20210407.ebuild 2232 BLAKE2B c038b494adcc5ead0eae6c03f39518221598195be4f1aa99601264d01fc22c86dfd985fb88ea6ad3697d1afc71c42404ffd06437f9b046ffb2710226a051b0eb SHA512 ed19c27d77c6b806f780f61670632e2f4f1d19e77fef3871e722a9c6c34b91a8851b9cfd30fe10c0b7b3906c01c80e635dcc82d416392182830a2765c6e39809
+EBUILD rar-6.0.2_p20210611.ebuild 2234 BLAKE2B b8f103104510af1eff6ad4a0d44554a4d0d2e346a8c353c77fb7bde77f6e8937fa64058155840fcc18c676da4fb6ec4d5e66367959bbb11c4067b3eb0516c42e SHA512 5959dd9089df6285771f395c5ad07905c4a624fa4128e95d28f4ae938ae751dc470bbeea231780efcc79b986ad6bacb060edef0cfb523b70dfd0c33e82af40a6
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-6.0.0_p20201201.ebuild b/app-arch/rar/rar-6.0.2_p20210611.ebuild
index e94158b2ceaf..d927f40b3a30 100644
--- a/app-arch/rar/rar-6.0.0_p20201201.ebuild
+++ b/app-arch/rar/rar-6.0.2_p20210611.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/snappy/Manifest b/app-arch/snappy/Manifest
index 59d23a0d0452..6fa7b91a6963 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,4 +1,8 @@
 AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 970 BLAKE2B 5288f515e3806394b540bd5187cc277467b462526fac35dc2112fde0529f952083a02dc3bdd349e8fd6d24598f1021904861dec683a03bf9c98d9bfc60bb0aa7 SHA512 070e4bb4c2e4f67d6c22743d82660506478fee8c6fd936508a2beb687a57fbb7325283fa2e9b3f6cdac599a5bc19519b35236752d1926554047444322ac7689f
+AUX snappy-1.1.9_external_gtest.patch 1092 BLAKE2B 392ee98254749dbf65ae8317dd2c26dfc140b768a08fe265cca26a0dce0eb43a1283eb55659c1fbf8e36e7037e65ec3f5ef970eb6436822fb6af212981f1facb SHA512 0b867b60b6e90551ab3c1ce4990775f2b0085d68fae72c4b63925f772b565cd86e9ad36659dae3a5cfb621ee628a0a547c82356f0f44d67ca2cc4ad9bfe16333
+AUX snappy-1.1.9_gcc_inline.patch 3166 BLAKE2B b4d05035647a97709ba43ee9673fbdaf1a160cc5859fd7401a8cdb67e04ba49bdfe98a9801257356841326b26759eff1022af3d5253628a87b0035af122a8fdd SHA512 5e8389e31a8d6e092843a3456f4a75d1f5f26af25d9d7ddfec283573a423522ce779b9ed4da5d2e3b6346153b5d137070611f88ebc907cfec64748afd29759f2
 DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
+DIST snappy-1.1.9.tar.gz 1102382 BLAKE2B 926d03156168e3d4800dc17144db3de2c182c6eb9970d87a00b94fb09b67e403479a64cbed75833b83fd03173c1bb8caaf248a55627e89fe2a34456f12ff3b42 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024
 EBUILD snappy-1.1.8.ebuild 1825 BLAKE2B 4b19d78a843db8eda46fab568953a4f652dba370efa95f3fa8c8fec618b8a1dd35acf778fa1ca9fba4c5e49299218689feb7ef39a957d9bbd3c7d81afcee38aa SHA512 c1e57f6643737792ffc3ccfc11ad65e3255f8bed581b6ab2e41c2c2b7d7da916dad9d381bcedf9fb6e1587af6cd76386b8cf2516bcd378e2461fa0d5882c388c
-MISC metadata.xml 504 BLAKE2B 4acd6fe7edce1448a36e1c304406c3094b67522349872703f3820a62eb99e04b8ba5cf43452703eb3f45382c89fcfee859e484e0e52379db98f9839daaea67b8 SHA512 b0f13292d7a92ed44a5e43e96d4f6f06d84147c74c5e5ef00dd72cd6f82ea6c984dd2b7ce13aba4111fa79f2c114b373acc1fc05565e2b7b585b0c6af74ec696
+EBUILD snappy-1.1.9.ebuild 1124 BLAKE2B a8487e99baaf6d8b20010773f192bae10a7b7b5113ada809b96405f4400b228b188f25252be7e4cea6521ef3bb8d8d1b62394d771fd3f24f0efa3a720a973500 SHA512 7ea0e0638e04610958a0c5e0a11b23e4592e4720de032188e5aabb7bcd6b11e2090646571706a8f25187c17fe5207783e59d6653ba61892f4326d38fd2fa282f
+MISC metadata.xml 743 BLAKE2B a2fd45ba06200b0dff520db28f0c6dfa1a2a0f5e367d146f66255ee3864570502d0f243feba65488033d0c3fc72913bcfc922bb8c711e972766fe0a9526c9d15 SHA512 f271ff6e36ae3a3701f71633561c1f1a6a5d49f87822f3a6c6337f200508625126c1783f40069ddcd06599d9013b436a9a67e2657e256a70edc0901c157e289e
diff --git a/app-arch/snappy/files/snappy-1.1.9_external_gtest.patch b/app-arch/snappy/files/snappy-1.1.9_external_gtest.patch
new file mode 100644
index 000000000000..8aa4c1eabd22
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.9_external_gtest.patch
@@ -0,0 +1,34 @@
+From 9c1283f6022647a6ea39c1388321d6029fcdf80c Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Wed, 5 May 2021 21:19:22 +0300
+Subject: [PATCH] Use external GTest framework
+
+---
+ CMakeLists.txt | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 672561e..fc830fe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -291,15 +291,8 @@ if(SNAPPY_BUILD_TESTS)
+   set(build_gmock ON)
+ 
+   # This project is tested using GoogleTest.
+-  add_subdirectory("third_party/googletest")
+-
+-  # GoogleTest triggers a missing field initializers warning.
+-  if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
+-    set_property(TARGET gtest
+-        APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
+-    set_property(TARGET gmock
+-        APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
+-  endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
++  find_package(GTest REQUIRED)
++  include(GoogleTest)
+ 
+   add_executable(snappy_unittest "")
+   target_sources(snappy_unittest
+-- 
+2.26.3
+
diff --git a/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch b/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch
new file mode 100644
index 000000000000..04d35f56ee98
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch
@@ -0,0 +1,67 @@
+From 0c716d435abe65250100c2caea0e5126ac4e14bd Mon Sep 17 00:00:00 2001
+From: "Georgi D. Sotirov" <gdsotirov@gmail.com>
+Date: Wed, 5 May 2021 14:16:46 +0300
+Subject: [PATCH] Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE
+
+Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to
+fix the following compilation errors and a warning with GCC:
+
+[  2%] Building CXX object CMakeFiles/snappy.dir/snappy.cc.o
+/usr/bin/c++   -DHAVE_CONFIG_H -Dsnappy_EXPORTS
+-I/tmp/snappy-1.1.9/build -I/tmp/snappy-1.1.9  -O3
+-march=i586 -mtune=i686 -Wall -Wextra -fno-exceptions -fno-rtti -O3
+-DNDEBUG -fPIC   -std=c++11 -o CMakeFiles/snappy.dir/snappy.cc.o -c
+/tmp/snappy-1.1.9/snappy.cc
+/tmp/snappy-1.1.9/snappy.cc:1017:8: warning: always_inline
+function might not be inlinable [-Wattributes]
+ size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
+        ^
+/tmp/snappy-1.1.9/snappy.cc: In function 'std::pair<const
+unsigned char*, int> snappy::DecompressBranchless(const uint8_t*, const
+uint8_t*, ptrdiff_t, T, ptrdiff_t) [with T = char*; uint8_t = unsigned
+char; ptrdiff_t = int]':
+/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in
+call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**,
+size_t*)': function body can be overwritten at link time
+/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here
+         size_t tag_type = AdvanceToNextTag(&ip, &tag);
+                                                     ^
+/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in
+call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**,
+size_t*)': function body can be overwritten at link time
+ size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
+        ^
+/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here
+         size_t tag_type = AdvanceToNextTag(&ip, &tag);
+                                                     ^
+/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in
+call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**,
+size_t*)': function body can be overwritten at link time
+ size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
+        ^
+/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here
+         size_t tag_type = AdvanceToNextTag(&ip, &tag);
+                                                     ^
+CMakeFiles/snappy.dir/build.make:137: recipe for target
+'CMakeFiles/snappy.dir/snappy.cc.o' failed
+
+Just like with other functions using SNAPPY_ATTRIBUTE_ALWAYS_INLINE
+macro (i.e. __attribute__((always_inline)) ) it is necessary to use C++
+inline specifier.
+---
+ snappy.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/snappy.cc b/snappy.cc
+index 79dc0e8..51157be 100644
+--- a/snappy.cc
++++ b/snappy.cc
+@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* src, size_t size) {
+ }
+ 
+ SNAPPY_ATTRIBUTE_ALWAYS_INLINE
+-size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
++inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
+   const uint8_t*& ip = *ip_p;
+   // This section is crucial for the throughput of the decompression loop.
+   // The latency of an iteration is fundamentally constrained by the
diff --git a/app-arch/snappy/metadata.xml b/app-arch/snappy/metadata.xml
index c149214b3101..9fbbf8bb934e 100644
--- a/app-arch/snappy/metadata.xml
+++ b/app-arch/snappy/metadata.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">Snappy is a compression/decompression library. It does not aim for
-		maximum compression, or compatibility with any other compression
-		library; instead, it aims for very high speeds and reasonable
-		compression.</longdescription>
+	<maintainer type="person" proxied="yes">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">Snappy is a compression/decompression library.
+		It does not aim for maximum compression, or compatibility with any
+		other compression library; instead, it aims for very high speeds and
+		reasonable compression.</longdescription>
 	<upstream>
 		<remote-id type="github">google/snappy</remote-id>
 	</upstream>
diff --git a/app-arch/snappy/snappy-1.1.9.ebuild b/app-arch/snappy/snappy-1.1.9.ebuild
new file mode 100644
index 000000000000..ad43d4fa986c
--- /dev/null
+++ b/app-arch/snappy/snappy-1.1.9.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="A high-speed compression/decompression library by Google"
+HOMEPAGE="https://github.com/google/snappy"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+DOCS=( format_description.txt framing_format.txt NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}_gcc_inline.patch"
+	"${FILESDIR}/${P}_external_gtest.patch"
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSNAPPY_BUILD_TESTS=$(usex test)
+		-DSNAPPY_BUILD_BENCHMARKS=OFF
+
+		# Options below are related to benchmarking, that we disable.
+		-DHAVE_LIBZ=NO
+		-DHAVE_LIBLZO2=NO
+		-DHAVE_LIBLZ4=NO
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# run tests directly to get verbose output
+	cd "${S}" || die
+	"${BUILD_DIR}"/snappy_unittest || die
+}
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 08dfac2e44d2..ac2c8f13b125 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -2,8 +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
-DIST unrar-6.0.6.tar.gz 232874 BLAKE2B dd32f09167a641d7a63a2dc4979f6eb4462b1a16529e92fd0fb1e0e27f4eeb22e7ee15b96e7aa9d852db4dddd09d73efb53f2bcb2426e12612afa244f06f0387 SHA512 cb50cdde120c02461bb6618e4b8773a221982c5ba81309669001b9713fc14bedc42bc5a601f30a62674be7ffd5c674d51be285c02a468d6e3fe0ebc02da8bd8f
+DIST unrar-6.0.7.tar.gz 232903 BLAKE2B eba5179f622726046fabedac03e8c05f7dd2f64782dc0be18010deb22c1036b895cbb9429f44239e63d9c04f3e031b4f9787462f4f643f8bca11b135de08f547 SHA512 2c50d1f58f5189e59dad36eb25aa50a34572f583242e624846c9791c5609e83d4ee76314d785771fe514ec3378749dcb86e4c97a8d2a3ab7b469df49a5c5f412
 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
+EBUILD unrar-6.0.7.ebuild 1868 BLAKE2B fcfa10d454042f03584c0a5f775ba754f316adcda1710a53529e06288ea13adf81a850238bbe9c04238e3cc56675924680adc6c4b91d1faf328a1c002d3cd80e SHA512 8edf12f59856ca178d8ad82feaede9b8c62133483f7c708ac41f2a0b582581a12fc766ff1cb9a4be7ba1249e88ad709ecfe407b712fc2aad115228671f3df394
 MISC metadata.xml 520 BLAKE2B 14f38803f23547426b6d1d87101a52cc5260b65313dfc727c0c8d8a719326792ba10ed27b584dfaa2be23811fcca217fe5418daa22ba90a6217a38cf4db84267 SHA512 9654aa3df0a399d971cad519392a232e1cbd9f407702bd2fd6fa31472fe6fc8966df787b3a99861f43db2e9bc3f8ced5d2840c21b10cbff6c74b07923d60e116
diff --git a/app-arch/unrar/unrar-6.0.6.ebuild b/app-arch/unrar/unrar-6.0.7.ebuild
index 451427685623..451427685623 100644
--- a/app-arch/unrar/unrar-6.0.6.ebuild
+++ b/app-arch/unrar/unrar-6.0.7.ebuild