gentoo resync : 22.12.2021

31 files changed, 154 insertions, 156 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index cffb9322b60f..becc0ccdff74 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index c9c24dd50182..c4289341d0f0 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -1,5 +1,5 @@
 DIST elogv-0.7.8.tar.gz 19554 BLAKE2B 653a1dd8d5cb142c78c27ad4c7110a7dac666eed649213ef62c1548d5248c4add561242290a59178470736cffc9ac15fb7ee796a2954239ba382001f1e6c9c4f SHA512 be90f01b4d2e114608b13aeba78ab368af6ed66ca329de6952d7f422c90356fd1c6988827f0c60ee66636ae92e089689c7cbd725f6eb20545747fb24d0d1daf2
 DIST elogv-0.7.9.tar.gz 19556 BLAKE2B 5d5f1a4adab09cf8b56ca3433b2a1cd0d3572345ff92f34b6b3ad175178161c36531bf9211563f4ad18191c6ff99c2cdcf9c3d188eca293a1698157e0a9f04a2 SHA512 703d1e8f55f5ee17a393f3a331ee38ef1d4e4c918c316055d5e2297b96dbe7de0ca6df864f462520f2087ed1a7bb7f43db56bfd3864a865d349516694522a686
 EBUILD elogv-0.7.8-r3.ebuild 1601 BLAKE2B 068e81cb7f1b8c1eb0724b6ab263f00879e3370e5654835ca2cfbff81037e75bd01edff95a7656670274682b132e718a0a306d2c722de134862e15dda5ac08b4 SHA512 44e21eb3f9efa6a1f65b2210603611a16c86928f0cf03234bb1d6c51ecffebfd6da7e6590bf08849e8aa940cf077cd2389b3c228f34d03e2555db9cffbfeaf64
-EBUILD elogv-0.7.9.ebuild 1604 BLAKE2B 112be12f989a1e827145dcc1a6d8ec3a643325558d337bcea4aba12732b6f97b35842c4df3f3f816c342222e3261a66ee15b98de54c4ddf44e8a3e3fef11c6dd SHA512 8571671d22220735a67ddaae0b32929471cb2538439c102a306a575ba65cfc3f66deccb0ae65299e741a70c4dd01473bad07cd84881a2b871bc065fc212c11aa
+EBUILD elogv-0.7.9.ebuild 1611 BLAKE2B 6935670ca36d1b8d69e853b092324ad20c37d0bb9f348d6e35b036251b7d644db14d04b40b761cd01d250bc75931b5405a615349e7aaac71b8b2c54984972faa SHA512 a6393159b864e0c85a312766abc7f933490c0e2446b33f991f251899e0d2f16c7574d0904e4f57a04c2e48cc1ae43c04a6c70a6d0442c972465c666ad0bc2602
 MISC metadata.xml 470 BLAKE2B 8929c8c694be9a3296adfdb126acc0505333cb9b780a6ede783b18046f45d90a75039fd02742b53982a67e10912fc091528a75775aae08aa725a16c9df37ab01 SHA512 16782cd7c0f06ab11b81ab3c3850b6084bcaf160e2e0e383f3a0cfa9737f73a9ad3f2532b1b3c779c7eea746aaadd2e360f6e2b57baace74f5a18e4ca266ef17
diff --git a/app-portage/elogv/elogv-0.7.9.ebuild b/app-portage/elogv/elogv-0.7.9.ebuild
index b480ee066563..7ebaf85ab842 100644
--- a/app-portage/elogv/elogv-0.7.9.ebuild
+++ b/app-portage/elogv/elogv-0.7.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index bbe1f90325ba..83e47f99811b 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,3 +1,3 @@
 DIST elogviewer-3.2.tar.gz 29046 BLAKE2B a880fde71df3c688572c33abbc163f3ac10a53c672b01b3139d02effa5e59a05f7ae1df35a4505b1a48d7a0cb6166a21b18d1d969e1eaebab03e3620298d4f38 SHA512 2503482f14e21c7b6f69ac0d6305c7c126fa3ac944b68acef7edec0c464d2e45bc2dc348f8d38033dbc276afc132d75863c737e222f66ad5ebe870b30fec2f39
-EBUILD elogviewer-3.2.ebuild 1671 BLAKE2B a3bc93f16c789f47455dfc7f80212a5bd654bfb9ee295096253fe31cba48d935a7015d2187fb70ca4bb78ef602a3dee4a645df29f184722f819e0bf7c89881e2 SHA512 cef96d1d292283b15fcef0027737794a567aef89349b1670e91671fcb7dc2cf50fe9bca7c3529b280b37348521efec9475ba418bfc674da58dc5c3c0eaa3312a
+EBUILD elogviewer-3.2.ebuild 1678 BLAKE2B 2b50bb198bf6eb29727ffee567f19c2ca9cd749ce79d3dc34c6101815118d7baa2c07239b8d87cc630de0808cb712baa1da1a365bffcec5bf32ca8bbeb91f3f8 SHA512 9fe744351b65bcee6453e8e70130648a24185759f19f518c418110d0ba298805a2f543a037e54db3b73345008df4eaa0d789e9925d417b47f9475b0e88760cba
 MISC metadata.xml 403 BLAKE2B 328a31cd1131b83154bf313dd3f32fe5038ab96f9239d9e15b5ca650d2932203ff1dce0ba547faa6ca20afdf30734fa810e46521c77911b2015c1a88e4223e27 SHA512 e400ef090331518b4c12a5daf2962595f894cb5c54665a47f61232b2687b796849c6ec13d6c9c2c8402b8c19cbd052b9c6984cc29ef2c67561a977ce07075d02
diff --git a/app-portage/elogviewer/elogviewer-3.2.ebuild b/app-portage/elogviewer/elogviewer-3.2.ebuild
index fed3a755fb78..f1c4740e8354 100644
--- a/app-portage/elogviewer/elogviewer-3.2.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~riscv x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-portage/epkg/Manifest b/app-portage/epkg/Manifest
index 9a2e01755c26..99e55432fac7 100644
--- a/app-portage/epkg/Manifest
+++ b/app-portage/epkg/Manifest
@@ -1,4 +1,3 @@
 DIST epkg-0.4.tar.gz 3696 BLAKE2B c0532ac424159bf9bd66c3afb549f6aacb8dfc47ec25e2bfa0b789aabc0a203d29c51f810e3d27de058c3374caae41e13b22fef0239fcec6ef491cddcf9770ac SHA512 2b9ef0e2d0ec123a1e333403371d0d4d750bc5247a05771dc2f694d225ea5db2702dbc9a126cec1d0ddca38dffa837dd66acaa046ac94d00a28890f3e3cd7879
-EBUILD epkg-0.4-r1.ebuild 507 BLAKE2B e8b8690171597f12e44bc62efc24dc4899ba3808e7887dc1f36a284f0f838c7f9222b01588dfc28358563a2563b9a023130f70f601af10dd960f5ec055998e1e SHA512 37cec54872d5145b947bf4ea44d83e22edd244e72813c74ac5b292ff279e80fffda6f94047f6ab4251fde03efa114219a0d2283a13634858d513ebb45c190b30
-EBUILD epkg-0.4-r2.ebuild 500 BLAKE2B 2261cb0404e4b49ba040c02eee269de83058d106c94130f84f84c4de38a753be9632ed7d6ec986cab45b23f3cc26043f0e827c624f8e241f11a2da207b2078ad SHA512 35632e10e8189967556e91751d194eb1ee8ebcbf31d5bbc4149819c9e86b377baa6d7720679b21518e0f37185da1917e613109533d993f109afd6182a92bd344
+EBUILD epkg-0.4-r2.ebuild 498 BLAKE2B 4a651f5f8a5e5089588b36c5d1939901e41b4edc2fa2affc7e3116629af9824ea7a369ecc6b049c7ebf7352feb6d305d859eefbda942ab1f7af388b88624dd9a SHA512 5cfc22ea4a4e57bb73ee0c5117f1d520252eab455bc15f9dbb7118d74e83835b6b399c8fbc6db9bfb30b3b8bbd71f238dc08b9fa6a86c7f32fbe8e9eb15e8866
 MISC metadata.xml 247 BLAKE2B 069d0d8ac9c3e996f08cca692b772941e3e4776f17bc7a35ceffcd3c41b06cc4f33d30a5adb18f31f059268ac19b2d322daa4e287ad251395ff1ea70689887f5 SHA512 9f27a4436597b7fa2ab05b68ff1ac2a859d9236d5db06f315daf06afb031cacd40079206968c90623cfcdde9d3f35970c7037f26f234b2938bae81c3a787b3d5
diff --git a/app-portage/epkg/epkg-0.4-r1.ebuild b/app-portage/epkg/epkg-0.4-r1.ebuild
deleted file mode 100644
index 9d9ca1ddef1c..000000000000
--- a/app-portage/epkg/epkg-0.4-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A simple portage wrapper which works like other package managers"
-HOMEPAGE="https://github.com/jdhore/epkg"
-SRC_URI="https://github.com/jdhore/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${P}"
-DEPEND=""
-RDEPEND="app-portage/eix
-		app-portage/gentoolkit
-		sys-apps/portage"
-
-src_install() {
-	dobin epkg
-	doman doc/epkg.1
-}
diff --git a/app-portage/epkg/epkg-0.4-r2.ebuild b/app-portage/epkg/epkg-0.4-r2.ebuild
index 489131a2d8f7..5be72cf13641 100644
--- a/app-portage/epkg/epkg-0.4-r2.ebuild
+++ b/app-portage/epkg/epkg-0.4-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jdhore/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-portage/eix
 	app-portage/gentoolkit
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index 6b316b995a09..eabc2c90c9a9 100644
--- a/app-portage/esearch/Manifest
+++ b/app-portage/esearch/Manifest
@@ -3,6 +3,6 @@ AUX 1.3-Fix-setup.py.patch 792 BLAKE2B 1bbaa8f4499d48508c38c48e579849dd8b5cfae58
 AUX 1.3-updatedb-quoting.patch 1409 BLAKE2B 6bd2401216d0394e155cad28386ba2235fd11ae5fd6f5ceb809afb4ca10033c05ee076829b003f40abe89c6d3062d41e13eeab3dc648b3a49ca457dc3a58e318 SHA512 fce5c139969e1f0ab448a985e00a1e9a38b426f28566c506ed63b4c99c69f8240e88179dabd814de687bfed2a3b6ecf5601f4eb9e54a2c37101e92177a3f6aab
 AUX eupdatedb.cron 659 BLAKE2B c0e820e59ba42f9caf2997f0042836c564283edc1edbcd8fbae4d1a79c9acfe9df344d945dd2ffb1d13d0aeb36f32dada366332517b728e2e5fedfe725788f0a SHA512 4ebaa0f8f73215aa497dc0adb922eae1ca42047b7069d2d0dd279edca8c4d9e782ccbfbc421ccd4cdbbffcc5cd8cffcf0c56ab66747043c5743c217c1e33df92
 DIST esearch-1.3.tar.gz 19383 BLAKE2B 308cb075eff0a592135e883913bab3709b64a785602250ae06bfcb50eca6f8dacfb047bb4326b4b9476553bc8bd993b69295373cced7a18786a7834378e860e9 SHA512 7fbc1c362a320a76a40c45ddf83a29223eaafd3cfed1d8a9410a380e2025fb515eea26e38ebf0f304d14230c6c5cfc83ef2116b774b1d50ee4f7f4bb0ac046c4
-EBUILD esearch-1.3-r3.ebuild 1509 BLAKE2B 4734f119e5616184d22bb27ba0b8a131a6bb2c1eb76baa952b129b2437363a347640e26aea199cd556043cf745fe9fd34b8957453516cd7067e25db5752ef270 SHA512 d2caa2a84f19aab66a018db8b0a400d7cd71172abfd5f641ef9986d892c0b7dad62c00d9a93dc84556b2116b1a04eb36ca228adafa74262833dbff0ebef6711d
+EBUILD esearch-1.3-r3.ebuild 1516 BLAKE2B 57eac471719d8e48cd108873aa89e5f2403c40bc90586bcf30775ceb7251ead0c69192f8cf125ff2ce2346ac8b73df1cd84bdd8405b8c3d1392f19dcea79dcd2 SHA512 48335d3be9e4fd3cb5c59ede3cfc45121a52ee9d3ba4544a65796db1759daca0218727a8cc817fdd5df5713c21df43cad3f9426dbb1e49bd2b2ab44117c65717
 EBUILD esearch-9999.ebuild 1065 BLAKE2B b9fcf1a98bbf27d9da7320c19fbd5dce960c1bb13e611196c9b4bb322e4b9553c8abbbda8965197c6cf2901a882527a5f83c40e69eb766bc74c1ef44c21ab57f SHA512 a669936741e59b8df1772a90400e9e2cd31655b5c5dd29b612f9b5006eab50d2628091bd0507e844f04e06692f36ae7e0ff5f0828a4405947bbb336c934a3477
 MISC metadata.xml 358 BLAKE2B 0e08219c95e25b0881a162a5dbe9d7b7cae8610518aea5ce621bdf79709f2c01bf1b7566d70e9a01048ca9985138a05bbda2cfecfeaca0e382c53a7eb0d477ce SHA512 9e9c8abe3757ef59d0e0c7f07134d3ba78c11c457403f35f406e12720a1c685876ee5832207d1d365a99476346287ca9f0658f884049bf70a92b69dc3e1ebec2
diff --git a/app-portage/esearch/esearch-1.3-r3.ebuild b/app-portage/esearch/esearch-1.3-r3.ebuild
index 9ada78838ce7..dd92c1583dd0 100644
--- a/app-portage/esearch/esearch-1.3-r3.ebuild
+++ b/app-portage/esearch/esearch-1.3-r3.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="l10n_fr l10n_it"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 
 DEPEND="sys-apps/portage"
 RDEPEND="${DEPEND}"
diff --git a/app-portage/euses/Manifest b/app-portage/euses/Manifest
index ba0e2480ca7f..82b014fa3485 100644
--- a/app-portage/euses/Manifest
+++ b/app-portage/euses/Manifest
@@ -1,5 +1,5 @@
 DIST euses-2.5.9.tar.bz2 44281 BLAKE2B 2da1309f8eeb5b4999212ddb0b2fb59a8fbd17c49f2c8e7bbfa64bba5c7831f84289ef833d9787506ed735ea1be92dc1f0ab765501b30f123a7f2f168da42c60 SHA512 afbacdcb73bc10548b32050bc38f71e9ac8613277d2cd961f2f96e32e7fa1827c5a208e68a6994efdcaa9e4a64a581138daadab2296a5e60c5e29677dbbd9ef8
 DIST euses-2.6.0.tar.bz2 44315 BLAKE2B 90db468c60f439366c7a4bf1a111af48a67f6bc0a10a391563e79db926be34da423fcd5bf667359a9b6426882e95a240742555fe62de71fcca8fa92fa307df8d SHA512 b7f81b171380b2abd6d4b00f4294f7d6ef86e5b0ba8dc5b735bc389deed4b24c3d6cd45ec70f5a01e37182ca09e5798385a93afff413d4fd71841dc12ea3e86c
 EBUILD euses-2.5.9.ebuild 447 BLAKE2B b7bcf269341f4e92516b9ea1624bae52825f9eb2a28dee05a67202d20d89ed7b59d13ff925c13cbaa3490a75dac0167ff8c8e6e7aac6714aad1fa2933cb8d410 SHA512 cf77c6c8d59e81e3aff3f8df46d4d8869c757bd9048ab1417d5e29c58f1bcfd51dd233e74fcdf8dfe4bf9220b6604aa530e83c2a74ac30ea86d077c1d120e43e
-EBUILD euses-2.6.0.ebuild 439 BLAKE2B 9cced6cf03677fe0f080e0ae292ab1d54dbbf711daa906089e8a9d25ed39019e384ef9d82f7bac5a8b7bd44ecea57fecf4e74632c984f40836877159b7ed45d3 SHA512 00f4f7c51a653cbfb0d20f4e82684224396abfd4e1feff452b34027bcc64e9cd10865c02eba2f4f0c52d15a2da659c4b53c085c7909b5049ca3f620e21bf3eb4
+EBUILD euses-2.6.0.ebuild 446 BLAKE2B 7b06fbd5ffb4230180795ff829743822e98c8144415f7f861c6d20b540e0aa8c1854b52f409b2d6abf4770e9073de7f52ad6abcd9cc29e8b34357ebc8ef063a6 SHA512 ee47c86cdd148ce817d878498d9c112bced549f228235aa94532475e8c6aae730d274dd8cc0874b20fcacf0940fa42235310bb706a8c6ab4caea082077b7efc3
 MISC metadata.xml 263 BLAKE2B 54172c478044cadfeae3de903fe3c974ba1e7a69246a0f3c90f0f66e8c86a17a6997deb9517e641ae213dc4c9887ad718ee989d3441abc67e727aa5cfceb5d16 SHA512 03126019efa95388ae4feb87c2d8eaa105f061809a3299c072a622112bee314d48da94c0622e4d9b23bb1ec138af033a5c58bd876a7a55c5e7fa586f6c092df7
diff --git a/app-portage/euses/euses-2.6.0.ebuild b/app-portage/euses/euses-2.6.0.ebuild
index 7f9fe47dbad6..5d752fcaaf03 100644
--- a/app-portage/euses/euses-2.6.0.ebuild
+++ b/app-portage/euses/euses-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.xs4all.nl/~rooversj/gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 S=${WORKDIR}
 
diff --git a/app-portage/gander/Manifest b/app-portage/gander/Manifest
index 9f2868ba5c52..95a9c2789aba 100644
--- a/app-portage/gander/Manifest
+++ b/app-portage/gander/Manifest
@@ -1,4 +1,3 @@
 DIST gander-0.0.1.tar.gz 8882 BLAKE2B 29c25fedabff3936e13789ae31f2e06871cfe4eb31a0eed1d36150ec219e741d25ba1603d0151d026777c81dff8461a1c051e4c02bff2488d8b9d6888ebe9618 SHA512 d72b2fd92ddd646369f8eb16d73a67e7b793aa84109231365abebec3ab2e14a8c76bae301271ec1cc82850a71bcb217a72f969086554e6c850117b5492215d57
-EBUILD gander-0.0.1-r1.ebuild 794 BLAKE2B 7c2c0f5c04e4d637518af0379fd5fb4d27f3b2e6f0a42493764c3577a4ba437662da7e088b241cfff4ef52ff2bd5de3f4f92987806bed027dbb8e1d3f0611fc0 SHA512 e4094d3621399c4b1934e7be82bca25d6237e68f8bd932b6c8453e0c44823510e77ae9bbdcb160f1c92f79dd5207067a37dd64bb853a713cf285ca50085837b5
-EBUILD gander-0.0.1.ebuild 831 BLAKE2B 5de2b6988ced7af7af35252eada9e392c87e09373874f6b91e55f25fe8bd3548f11f9b4cefd4ce0b425caba18cc5f8ec921abd768077db7ff21ab0a8090dded8 SHA512 a85614b3c554a71520190b554c7c9fd271fff86c3f490e7ffdab332289420040cfa43b8c48f9a798b951caa4befe522c7d3779689c8c3ed1687669c3411e2371
+EBUILD gander-0.0.1-r2.ebuild 796 BLAKE2B 77fb5be23e306055ae5d297a60dfe541cf83478e74c254953abecb0ed37e1be403aa00cd06114a7c70c806b3b8008799f721e1add80656530c20b5030497e968 SHA512 7b22821068b83596e4bced8e8ebdd6b399653a6513131174008a65a20bb6efc31178c23caa0b79aae751842e448dd57b42d24f3818183c0a09e2938ad91ca953
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-portage/gander/gander-0.0.1-r1.ebuild b/app-portage/gander/gander-0.0.1-r2.ebuild
index a1d24b8b5151..b2903319f0c2 100644
--- a/app-portage/gander/gander-0.0.1-r1.ebuild
+++ b/app-portage/gander/gander-0.0.1-r2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
-PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Statistic submission client for Goose (anser.gentoo.org)"
diff --git a/app-portage/gander/gander-0.0.1.ebuild b/app-portage/gander/gander-0.0.1.ebuild
deleted file mode 100644
index 9aca0742932b..000000000000
--- a/app-portage/gander/gander-0.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..8} )
-inherit distutils-r1
-
-DESCRIPTION="Statistic submission client for Goose (anser.gentoo.org)"
-HOMEPAGE="https://github.com/mgorny/gander/"
-SRC_URI="
-	https://github.com/mgorny/gander/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-apps/portage[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Portage exports random configuration options *overriding* its own
-	# behavior into the build environment.
-	env -u PORTAGE_REPOSITORIES pytest -vv ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/app-portage/golop/Manifest b/app-portage/golop/Manifest
index caf5e2a4395a..09885efdbf60 100644
--- a/app-portage/golop/Manifest
+++ b/app-portage/golop/Manifest
@@ -1,4 +1,4 @@
 DIST golop-0.2.1.tar.gz 9315 BLAKE2B 0b0410910f17121f334c270f71dfb0fb4a1eb909893a241c3bbf1b4473d70be5b1b6d318d61d25e1379e30b8956a0ca37b3cbf2aeb6efcecd6ee14d6c3571c9b SHA512 65a12771784d3676001ed55ac389dfc26f5c2120240a3fbd6efc1954abc19be4d9e1de403dcec1c9de3f3385b2286a6836604fb0ffe9eb071467454bf8c41f56
-EBUILD golop-0.2.1.ebuild 630 BLAKE2B 1cc99db4140981f0dd5ff17a5ce44f310b07e93b5f888b570dae923fa5b1c9adfb9e57d5767c5727259a578d2f91521c92b9e3cdd375ff5c071db68eb0510683 SHA512 1b8adde3ef33a0537b2548a43b60e047b983e1544cedeafc34415d71a155026f39993086b5f40c860a43e74337b49c218e2c58386cabbf79318d5b2e539c0ddb
+EBUILD golop-0.2.1.ebuild 637 BLAKE2B 1934871f83e5f45415a8ca0b5fea9f0c49e5a45bab2f7823210bb52b677c3f21b37dde8356ddeb487ab5f8d7f8cc7fd19f55f10ca1e23a119d226214070a2cf9 SHA512 eaf6c0ed7226ce7f49ca98eff8f7e101e023550b7e8587147c1d9e5e7c36a582ee44587b138812c27b339437d5d6423354632d2948f6aec07966069f570fa13d
 EBUILD golop-9999.ebuild 763 BLAKE2B ac86fee8ac66116601f8fa44ae56f55fc168ef818f495125efb82b25c2d1d4711e3fb7a7855c1600d186e09de8eff1b242b278b33e4625d7f918455d8cc5fd76 SHA512 6c0b8e8ef068c0271bbc2e3ba3058e1ef0de9ee13775c1d09f4dab9b436db57d83aaedc1b5bd94484a113bfae6cf86e8e1e37a5bbe8ec2d0003de0d18acdf5aa
 MISC metadata.xml 580 BLAKE2B ab828a71577750e98aed64ee57553198990f7fb7bf3d3037cea52a20733b48d316450ee593791b0d2321ac308e542f329592232cf9e389bacfe699317e5f77e5 SHA512 83a895278fffc4c979d337983e21865cb11a8cbe63f8b388b92e3558dc8380e748c1349ab428f571e2f3e45e4ca1595d9bb1a7506ec038ba7e5aa69dcd4b623c
diff --git a/app-portage/golop/golop-0.2.1.ebuild b/app-portage/golop/golop-0.2.1.ebuild
index fa33821ab317..3b015bf34a83 100644
--- a/app-portage/golop/golop-0.2.1.ebuild
+++ b/app-portage/golop/golop-0.2.1.ebuild
@@ -7,7 +7,7 @@ EGO_PN=github.com/klausman/golop
 if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 	EGIT_COMMIT=v${PV}
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
index c568856fcd35..ed72a05ef47b 100644
--- a/app-portage/gverify/Manifest
+++ b/app-portage/gverify/Manifest
@@ -1,3 +1,3 @@
 DIST gverify-2.tar.gz 4609 BLAKE2B 73f97ba232fe0269ec56649bc5682650d48c001e432f8076c820a58a94c3d1de079dc89873d589a76b91164153e5c5be78870ef34b3b69f3c39ca0c0e388b114 SHA512 1756671d22047edc6ed1121b65af8c163afba854364a50a9089cef733213ccd6c9dd1276e876b9118741bcfa92ad02cde572fe2b6cebb22339664552c67d2957
-EBUILD gverify-2.ebuild 689 BLAKE2B cc047af611c5f4e7f14d73b1dbb6187b4dc2a7fa59b8ceb07cd63209a62b0fb69cc3c19994413b80709a625e05d14752fa63bf3a236619f040395f2a6ea728ef SHA512 c2208cfa89a87671ad2791a73d50e4ae55afca956437219860807a0ae7d2d7d4a7593f72e79cb64db1e2c78eb01caf267648ed933ba8acb95993a4aba1a8e1dc
+EBUILD gverify-2.ebuild 689 BLAKE2B 4732acae8f1ce9220685e1ccdf44c16f505c76dcb6b318f618ac87981cd2db45a4195ad6d9d11562967a989c3e4fc221a4e5d25661390ab7e92fe2c8756c7b85 SHA512 21ba14a2bd1f17bab89492520d8e601c3616c0ee7a95acf89b0a7d384ff6f441450fa4a9cba312181fba1f6a39828a3b1b0fc58c974d3253b37839a4464f3ea5
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild
index 95d5f0cde54a..a6afeed27f55 100644
--- a/app-portage/gverify/gverify-2.ebuild
+++ b/app-portage/gverify/gverify-2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit python-single-r1
 
 DESCRIPTION="gentoo.git signature verification tool"
@@ -17,7 +17,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
 	app-crypt/gnupg
-	app-crypt/openpgp-keys-gentoo-auth
+	sec-keys/openpgp-keys-gentoo-auth
 	dev-vcs/git"
 DEPEND="${PYTHON_DEPS}"
 
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 3b8cb52764ff..5aabfefd17e1 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,6 +1,5 @@
-DIST iwdevtools-0.8.0.tar.gz 57529 BLAKE2B b8068c7781b8b164b9b5d191f8a33a4a89854edb7c78c56d4f1312dd0d051d0b033f21611066303acb7efdf8403d6869458db98e7b1b2a293c779cca2bdcdd36 SHA512 df39fa02d7f4f72334286305bfa9c2db6d5db90bddc47194e3383a99492366796c7ae2e751bcf8af01d14cfa0bac88ea8d9c8678b7891f85aaa1b20e4a9e91cb
+AUX iwdevtools-0.8.1-tests.patch 2580 BLAKE2B f0fd374d2c2cca3f6da7f062ce2f82af2b9345e4c0e0625eb12f849a495fc74fdaba63e5c55355c3d64edf3c844c3382ae264357055af3c3fa41abb075804753 SHA512 4e73b5555da715b1227acafb9372a97888861fd68aa96696bca5d2f340c85851029145c400b70efd01458aea37f11da73c729470f860b71147f99b7cc5404e48
 DIST iwdevtools-0.8.1.tar.gz 58058 BLAKE2B b9f17f68bb073ecf2d8a94fc8b97d95f7188e7526dd6a32cf33aa3b01fe82bf25c696cc2be9cbdc0aaa3a8279532e506ab287d3e25da5d5fb55789064d47aec6 SHA512 cb365e7010d620f2a255db0244ee1a38fd5714a17093b2e2a71627155764165853f99a4477b281b92061f7fe184297a222a8c79c2c62beb8e0656761feee859b
-EBUILD iwdevtools-0.8.0.ebuild 1886 BLAKE2B 58b7db6dce9bdd9ea1cce3c5ee3889aa1fa3107b57908d2b6d01776ef6037ff45a57568b4174f2cf97c40e010338543c8f1b9d6cbb88f713374b502bbe7ce11b SHA512 4432156adc76ea8a8b2db83548e5ad3c676f63aaecc29c045e8e074dae7bb57dbc1264717ec1c164b8f27a7a40bcf44eb955200915386c7d67ec31ebed24651a
-EBUILD iwdevtools-0.8.1.ebuild 1919 BLAKE2B ae899a1f817add16cfa17e4ab3d8cabf0400caea0b3df5a40fae03908b3bb7dd4f801c6e3ff761d4befb17d11ad096284fc34b3d6efb5be405595d589b83b2b1 SHA512 0fa9c0a926aa54eb66814bb1bcc00209766606710691ed73d345c4fa7574ba4b46984caf99baee7e1e6e9b8c44a73f9748fd14b717b0236093d9f516a523ce86
+EBUILD iwdevtools-0.8.1.ebuild 1976 BLAKE2B 52b80193e13ceecabe40bc8132d254fa0feb982967f14151863660d2215a36677dc6623e8ef76c7e948cc2aee5661adea8d4e15b18e4f78af7f53df6838b52f0 SHA512 fcd4f2882587fd912bf397ee8d9fb35cc19341227e18f4207913cf2b34acd6faceab2d67e43cb370da186af3070a4e8da9d48494e90d92f52d926f871e3db9f5
 EBUILD iwdevtools-9999.ebuild 1859 BLAKE2B 040a0a3481f04bc8c414000b6e6f3afc80fdeb0807f0c92300c86659f58b91bb23de6ec8596f8c5170f2bbeb7a1ca165542c75be91f89688eda87c4e151c05f5 SHA512 2aa5fb6f48366ec6ecc219c6efe0ec8808b91db83d235c22cd3f37729629ea75f35aef138cff73210797d145a65c2d044e695882534835990aa9c0943436d937
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch b/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch
new file mode 100644
index 000000000000..4cbe6712140a
--- /dev/null
+++ b/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch
@@ -0,0 +1,50 @@
+https://github.com/ionenwks/iwdevtools/commit/a679594f115e8c9fd54aa70fc0742b7d560a2204
+From: Ionen Wolkens <ionen@gentoo.org>
+Date: Tue, 21 Dec 2021 00:36:40 -0500
+Subject: [PATCH] tests: relax globs for some stderr output checks
+
+portage may add noise to these depending on the system, e.g.
+
+!!! Repository 'gentoo' is missing masters attribute in '/var/db/<snip>
+!!! Set 'masters = iwdevtools' in this file for future compatibility
+
+But these tests are only checking if our own expected error is there,
+the rest is not important.
+
+Reported from: https://bugs.gentoo.org/829740
+--- a/tests/eoldnew/test-pick
++++ b/tests/eoldnew/test-pick
+@@ -7,4 +7,4 @@ export EOLDNEW_EMERGE_CMD=echo
+ expect "old: dev-test/test-1.5.0*new: dev-test/test-2.0.0*" dev-test/test
+ expect "old: dev-test/test-1.0.0*new: dev-test/test-2.0.0*" 2 dev-test/test
+ expect "old: dev-test/test-1.0.0*new: dev-test/test-1.5.0*" =dev-test/test-1.5.0
+-xfail 1 expect -2 "Error:*older version*" =dev-test/test-1.0.0
++xfail 1 expect -2 "*Error: failed to find an older version*" =dev-test/test-1.0.0
+--- a/tests/eoldnew/test-skip-new
++++ b/tests/eoldnew/test-skip-new
+@@ -6,4 +6,4 @@ ebuild "$(get_ebuild test 2.0.0)" merge
+ export EOLDNEW_EMERGE_CMD=echo
+ expect "*=dev-test/test-1.5.0" - dev-test/test
+ expect "*=dev-test/test-1.0.0" 2- dev-test/test
+-xfail 1 expect -2 "Error:*older version*" - =dev-test/test-1.0.0
++xfail 1 expect -2 "*Error: failed to find an older version*" - =dev-test/test-1.0.0
+--- a/tests/qa-cmp/test-missing
++++ b/tests/qa-cmp/test-missing
+@@ -1,4 +1,4 @@
+ set_portroot
+ ebuild "$(get_ebuild test 1.5 :)" install
+-xfail 1 expect -2 "Error:*nothing*" -cI dev-test/test
+-expect -2 "''" -cI --allow-missing dev-test/test
++xfail 1 expect -2 "*Error: found nothing to compare*" -cI dev-test/test
++expect -! -2 "*Error: found nothing to compare*" -cI --allow-missing dev-test/test
+--- a/tests/qa-cmp/test-system
++++ b/tests/qa-cmp/test-system
+@@ -5,7 +5,7 @@ ebuild "$(get_ebuild test 1.5 :)" merge
+ ebuild "$(get_ebuild test 2.5 :)" install
+ expect -! "CMP:*" -c dev-test/test
+ ebuild "$(get_ebuild test 2.5 bin:file{1..2} lib.so:"${LIBD100}")" clean merge
+-xfail 1 expect -2 "Error:*" -c dev-test/test
++xfail 1 expect -2 "*Error: found nothing to compare*" -c dev-test/test
+ expect "*CMP: listing*" -c --single-all dev-test/test
+ ebuild "$(get_ebuild test 3.5 bin:file{3..4} lib.so:{"${LIBD200}","${LIBA300}"})" install
+ expect "*FILES: usr/bin/file3*SONAME: libalt.so.3*FILES:-usr/bin/file1*FILES:+usr/bin/file4*SONAME:-libdummy.so.1*SONAME:+libdummy.so.2*" -c --single-all dev-test/test
diff --git a/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild
deleted file mode 100644
index 5d03e033a003..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature
-
-DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
-HOMEPAGE="https://github.com/ionenwks/iwdevtools"
-SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-misc/pax-utils
-	app-portage/portage-utils
-	sys-apps/diffutils
-	sys-apps/file
-	sys-apps/portage
-	sys-apps/util-linux"
-BDEPEND="
-	sys-apps/help2man
-	test? ( ${RDEPEND} )"
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir=${PF}
-		-Deprefix="${EPREFIX}"
-		-Dshellcheck=false
-		$(meson_use test)
-	)
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Optional portage integration relies on using /etc/portage/bashrc."
-		elog "The example bashrc can be used as-is if not already using one:"
-		elog
-		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
-		elog
-		elog "Otherwise, inspect the tools' --help output and the example to integrate"
-		elog "(if not defining the same phase functions, the example can be sourced)."
-		elog
-		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
-		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
-		elog
-		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
-	fi
-
-	if ver_test ${REPLACING_VERSIONS} -le 0.7.0; then
-		elog "qa-* bashrcs now use \`eqawarn\` for portage output. If no longer"
-		elog "seeing messages post-emerge, ensure 'qa' is in PORTAGE_ELOG_CLASSES."
-	fi
-}
diff --git a/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
index 5add38623491..1d98d6de0beb 100644
--- a/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -26,6 +26,10 @@ BDEPEND="
 	sys-apps/help2man
 	test? ( ${RDEPEND} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tests.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddocdir=${PF}
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index d1255a973625..df900882ac14 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,7 +1,7 @@
 DIST mgorny-dev-scripts-11.tar.gz 8045 BLAKE2B 3b2b023b87902c1ee9c5bec7cb1b70bbfbc141383167b497d5dd67fa4b46b4d0882be49d3595db0b699ff0112cf2431653c0cdb72c187589c958f7052aeeb663 SHA512 5b053d2a053e73208cf5ccd4aa00b61733c4ba14f1df9e0cabfc8667e0cce8637c18be09c6366e384cffce3b8954d29619efd9085c21fb72afa0de61a7b833b9
 DIST mgorny-dev-scripts-12.tar.gz 8063 BLAKE2B e31a0b2ffd59ade462cf8686ea4cd6d48c9da2f9d18156509a39138afea0f1ec896871cf83c44ff1f1075848239065335a408b74befab9276f04b2d7b9d0e075 SHA512 a7e2739197a331b9abfd67873f4727fc85f7c38a30630dddc8a76e51e74a91e42ecd748c9e6572da85de48db6bcd144b13654b8e1a7b74ca7fe46779d0e14967
 DIST mgorny-dev-scripts-13.tar.gz 8162 BLAKE2B 0ac4b8d61119b64d3d6420861ac466f975606972e5274be76a3a66210536783077ab4c066167553e11d5f913ea32ce49536f6757e2b806a355f85e2698c858f9 SHA512 53bb2fcc99f9bd048adf14b6b760a1293bb87e5b48ec1959d3037cd2b8a09583150309632451444e6048abfe9296f3a63346720c4a5de6c6103a9807f13874cc
-EBUILD mgorny-dev-scripts-11.ebuild 615 BLAKE2B e388d2b1a15895e18da3b2109c4ea1c22cd3275aa6440766499c26203e2a9783ef1c4190a16c3f9baf2eeae29caab6944043c526799149162408ef2850bb2fe7 SHA512 18ccc0cb3ebf73cbe34b1301d953ff803ac7018202c6557adffd299399689d5b7684f016112bfa617d354412f7f121a522ac7df9d2fa01c81d515b160e4a436e
-EBUILD mgorny-dev-scripts-12.ebuild 615 BLAKE2B e388d2b1a15895e18da3b2109c4ea1c22cd3275aa6440766499c26203e2a9783ef1c4190a16c3f9baf2eeae29caab6944043c526799149162408ef2850bb2fe7 SHA512 18ccc0cb3ebf73cbe34b1301d953ff803ac7018202c6557adffd299399689d5b7684f016112bfa617d354412f7f121a522ac7df9d2fa01c81d515b160e4a436e
-EBUILD mgorny-dev-scripts-13.ebuild 622 BLAKE2B 1ad6c1e97f453eade895ead78e908e790f72e1259bd99a9238f77cbf7ed7937b8f8bedea0bd6e187d08f52af6c8fbb13fa99040765c47e2c01f69c4be0e7078b SHA512 9d6a14ded378dc04e3882c0e9cad9c39286603576a6dfa2d3242f2a06920cd12cdc8f17b1ffe4221fa13af850342729614caa139587972f08d21816771f7200b
+EBUILD mgorny-dev-scripts-11.ebuild 626 BLAKE2B 77ff2f591bef2bfb28ff4aaced0b4a65c8474d50d2e4943f64234f930fee1e8e85b780b779ce50c40db54dbe1034490fba4486f1bf23bccb31e101440df70121 SHA512 7f20a8ddf1c08b3e6a367454a20940d19b6265eca9385e47cb06230a1c395ac6c3a9971197e59105cb2afe218116b978562d6c7edb418f6c8da01817fd328d3b
+EBUILD mgorny-dev-scripts-12.ebuild 626 BLAKE2B 77ff2f591bef2bfb28ff4aaced0b4a65c8474d50d2e4943f64234f930fee1e8e85b780b779ce50c40db54dbe1034490fba4486f1bf23bccb31e101440df70121 SHA512 7f20a8ddf1c08b3e6a367454a20940d19b6265eca9385e47cb06230a1c395ac6c3a9971197e59105cb2afe218116b978562d6c7edb418f6c8da01817fd328d3b
+EBUILD mgorny-dev-scripts-13.ebuild 633 BLAKE2B 8f05befd012402da886afbb052f31cae15ce6f93753113013c5c5488b35e1fa8c6286351f1b5dbbbd4cb8993bdd114eba941733da39d0b8cec7587234d1b296a SHA512 def1dcbe9d4089b86109aaf5921723cde1febdada4ce6900440be46e3604391e7af4e31a824c03b054d27c4f6049be60063997e463e23655bda9eefd733309a8
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-11.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-11.ebuild
index 0897d3c3330d..61e26b0344e0 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-11.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
 
 RDEPEND="
 	app-portage/gentoolkit
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-12.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-12.ebuild
index 0897d3c3330d..61e26b0344e0 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-12.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
 
 RDEPEND="
 	app-portage/gentoolkit
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13.ebuild
index 013d8f6f9efd..3353890244b8 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 
 RDEPEND="
 	app-portage/gentoolkit
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index 9263dacd0708..bf7bd203605d 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -1,5 +1,5 @@
 DIST pfl-3.1.tar.gz 5521 BLAKE2B fdc6e82c5d61d694a188c479b0566aafc507bcc2bbd1f176cd2771586b13de86a43a5d2e156beb4c9b5d10cd718046a05fce099894430c8f3d04c0922078e988 SHA512 b2bf79445a5b15caf339106f376d64accf5aad2c60038ba88180d64ce49e23dc3015efa2fcbeec886ba591cada053dfdc96873bda71b092be4622608062b6dcc
 DIST pfl-3.2.tar.gz 5373 BLAKE2B 3fcb771a6d67ec7198b83eeeb161d7caea7ccbc3933ff3ef7a48b106e9c86c331f2ac1a4c589135a4f57f40bfcd668f075f17865ff58feb027cd02d90b52bc2a SHA512 e424b5a5c6dbb848057fe357ae98196f2c238351dfe7fd19a9b7f423c245b1372ec270c6b8d2e8265a05a442d7afc2c5feef6dbe5eed5e240e78c88a6748d1d5
 EBUILD pfl-3.1-r1.ebuild 1237 BLAKE2B 1a7d996b467166a8b5316608fd8d67ce07ea7efecd3515aba191f3799b9e8f0c8962037f723f3fd4f88818622f404a8406a46edc4cc61969e99fb47e0243d9b4 SHA512 4be1fb60b06394dad3ace70b8c4fc4ad7558ba98510376a7df2eb7a6d7b98ded243277c31346a8ab314b8e017cd31e4db941def29be389890ebd5cb293bca652
-EBUILD pfl-3.2.ebuild 1269 BLAKE2B 7c4162d31ac37867b1faece56146e918ef2f3cedb8029f4ee8d933b0bd7733f78c2531a555e5c0f7be5b7cbdb9c34e393189017feaabf59e24ea8eb3088de3e8 SHA512 e2bb872c838863e41041bccd108fc8f190165d4a983aa1fb25f37efa41e1cef8a82a49a66977742e6399fc734c813d50ab050ed7c762d7757f42efcee38bb988
+EBUILD pfl-3.2.ebuild 1276 BLAKE2B e412cacab3405652cf4239ccaed3583a58d423988a157e50afbba441ce6349c8afc737016d47d63cc5e95a63f878894c551a1728bddde1e6f544de553f083a55 SHA512 6da1d23a42ea3d40535a943850e373f6d3c8f5ac903c75a27b5720ed1cff31130b3b09125ba5a50962621349ba5611a0196db396d0859c6db3705959fee46cfe
 MISC metadata.xml 520 BLAKE2B d00ce805891280e0f73e051f0083e511ec670101253995b437d3e352fa0e390b1bbe65de02d4b501a965f330f5c6b30b218af26b327bb31c9c1e50b7d65b86a5 SHA512 8d11818801dae3dcc52ab93ca33fce7842c2a9ba159fd85fce19c316781a4e611c166672e640ac56e34cea34a92500f958b06335e27e3804e5becc645ce11d42
diff --git a/app-portage/pfl/pfl-3.2.ebuild b/app-portage/pfl/pfl-3.2.ebuild
index e68f6bf29bbc..c7efacdcd5c1 100644
--- a/app-portage/pfl/pfl-3.2.ebuild
+++ b/app-portage/pfl/pfl-3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+network-cron"
 
 DEPEND=""
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 2c1a82990102..def794953665 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,8 +1,10 @@
 DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 27c94694cab84970c0c92e835b9039d9420fbfa20f9f2e03f4f53d118df4dc243cddce33994095a3e41bd1027a42c9c29cda65cb7cf4f45279a028b21555f4f8 SHA512 67290a69ad6ac40da3ce0f41d2630096690e69bb97a1428af921ccc582dcfbf903bbf98259f68afdbe9e96aef81672ea3352a9266a649e75f99acec7fa00cd8a
 DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682
 DIST portage-utils-0.92.tar.xz 1819676 BLAKE2B 01798e3984745140bca1bcc1eda5c2aea7c517bee2656acfe1bd810fc8088ddcb474f2c64fee6832c5e1699e2ec8ad5a9c6d5afba8a2e2b6f1861d49fbf7fcb7 SHA512 7d36263c9c242c8e82786fa12e171a3f396f65520acb8caa91516862615bd71241699ab6c2232122f7009875aa0a10b06b614a842d45afc86e599b39711e12b3
+DIST portage-utils-0.93.tar.xz 1795964 BLAKE2B 496bed1cbe53c309ceda3eed7b0c343bbf428cc9e8871ff52759f754c5f1d4a834cd648a6ea25b10e7e043077b5a65e40eeebe9101b04f5e5920665aadec822c SHA512 23e85b358fd79c59474aab752fc259e825e90c2b0dd8885cfada79caf59fe71425135e0b6177fcb857e53f1644d159f2e42f1d9116d26757822eb8e6b3ce9989
 EBUILD portage-utils-0.90.1.ebuild 1344 BLAKE2B aa2a6db5a845dae33a6a5e711b3cc2f49d39458bb89bb3498b1b29a87909456f6e361f2108aff2b0dc36bd73189b5d6b0826e352ee47d80c0388bd47b5e08a92 SHA512 54523cfaa4e7362efe036e37f75cb8a40c356569952293ac2e9ee1a8ac289ea1e5f32b0c41c65ad505b5d3e0b686dd1bd4b6ac463ed78b33f89e2850119e170f
 EBUILD portage-utils-0.90.ebuild 1524 BLAKE2B 75878900c8ba8a8a6c8382a0be0a48bf5bb75ef28b12583e437a577cbf3138f6e562675344bb79b3516c7510baed5bf5d69339d0e6924570e21fc45c2f248c0e SHA512 9bd404d97610fedb1e036e5548be12932570fe7916ab486e02835baa1bfa8d8fa59a7c31689b17728d72ee9d8d1a4733823dc611a6c9b2eecc1d58f78b1165ac
 EBUILD portage-utils-0.92.ebuild 1520 BLAKE2B 7dd754e763e53568562d2022bcb09df5c0be58b38675593569bd6c446fb3fd96b2c03919216b42a8e14391578f1d99f368bde20fd093cca0cc4a5d92c358814e SHA512 aa9224219077cbe9e2dbe64594c8f794beead0621e3bc2d1c17d75b2cf1c66fcd625f8b47c74bb73644d7d78c2cf8087f88b2f1964ba4c0d053e2876e81bb66c
+EBUILD portage-utils-0.93.ebuild 1526 BLAKE2B 15441470809e412e45b4ff193a93a473049c68cc641585a33e117cb6994269f8b57a6838b4b93dccde6dda2fea6c11dddd2aaf8be6e7db1e873385a28515ede2 SHA512 376f34ca2ef7f551bf8576fcf237cde6f484a7d7a2fabb615b1932fc2947715632e7f7e3eff7968a73dc294d7186fae626a6d5f4abbf2294d9faa075af670e55
 EBUILD portage-utils-9999.ebuild 1528 BLAKE2B 6ffd2e8918b698d5bd889466372feb394b8aed16a16a388f4e2a17d33a94cac296359255efc8a2b339422a6b10ba957e68021895ce90c36c30997e2fb1d97416 SHA512 8aa781c65ec4e0cb67f9b34c1fc184f50b6c81d3c4b3518d51adbe6710d3f6f76ba53e8c6362a70750e2c72aec84b4be87794a8d8135e037bbef4ddcc5ad81e3
 MISC metadata.xml 574 BLAKE2B 1448e8343748e8bbc61128f3a621010ae1f7095872c271962ac24e62abcea8cca7c52034008c0d5691a56ca7f2e242ab4cec7d38fceecc2c39f858d1ceb30ab1 SHA512 dcf9949c990845794a534b34e44e820b16b3700bc993e13707bfac6d26269d2aba00fd3f873b9157ead222d2fa5cdd63d263c098bfc79c1b1f66097fa24f552e
diff --git a/app-portage/portage-utils/portage-utils-0.93.ebuild b/app-portage/portage-utils/portage-utils-0.93.ebuild
new file mode 100644
index 000000000000..f11ea5afcccd
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.93.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls static openmp +qmanifest +qtegrity"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	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"
+fi
+
+RDEPEND="
+	qmanifest? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			app-crypt/libb2:=[static-libs]
+			dev-libs/openssl:0=[static-libs]
+			sys-libs/zlib:=[static-libs]
+			app-crypt/gpgme:=[static-libs]
+		)
+		!static? (
+			app-crypt/libb2:=
+			dev-libs/openssl:0=
+			sys-libs/zlib:=
+			app-crypt/gpgme:=
+		)
+	)
+	qtegrity? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			dev-libs/openssl:0=[static-libs]
+		)
+		!static? (
+			dev-libs/openssl:0=
+		)
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable qtegrity) \
+		$(use_enable openmp) \
+		$(use_enable static)
+}