gentoo resync : 02.02.2022

28 files changed, 191 insertions, 65 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 4ea476036ecc..7c914fffdf85 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index 730f0cb7fa64..89710f6062cd 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -3,5 +3,5 @@ DIST elt-patches-20210924.tar.xz 40140 BLAKE2B 81970936e9a362cb9ee51a381e4fd2f88
 DIST elt-patches-20211104.tar.xz 41608 BLAKE2B 971ec0f6753267d49a64ab65645ac547322fa4cfe64b3102bbaa4419c0ed0973c0ee44e40c15b2d34e94979cbe9c64b027f4bb7c5adf3d3acee07f3f98bd7704 SHA512 c583bfa45eb16835f83a881eb587c81f0fb2cfd3eff5239e794efb83c046f5cecceeee3f5387585b9d7f68efe5f439344d2cdfc83c9fad5b207e82dff3d8cc67
 EBUILD elt-patches-20201205.ebuild 775 BLAKE2B f091c227cb3c273c609f81904b1afa1425c323a5610055ced48a891ff97f60ec0d467d391af427a8b8c49d01d6b842a1094fdddcb966f0ab82d6c67e897df0e8 SHA512 19a1369fe2320337b224d37a5e744e3baf21387fe84b0a8e63a04027adc8a005ef17670db3ec0f44729c3063858e0112d9325a8b70ad41a8664fa2e17ad45682
 EBUILD elt-patches-20210924.ebuild 834 BLAKE2B d0dc4d0bdfb7840abbef2954f49e0c1ef6b4d195bec5957b253244dd6e430f9b21df89852751492ad05f19c971e0379ba1485b8fd3781923678d78779f28cae0 SHA512 67e9799adb8ab743043f19f30c67c67f75e9705c0dbcaead2e28dc8cd3d12e677a41db96fc3c7c5d7796335491f95bada5fe0b2e5a273e67dacd476a5f584919
-EBUILD elt-patches-20211104.ebuild 903 BLAKE2B 945ec5c398156508545adf665f68478f6c9d2c3804ef794111b74e1360dc7c70f99945237766cfbeee26b9508c18149a9b0f6612ef0c4edaf0e4df7d892a9979 SHA512 5ed6872e033f0f3768b965dbe88974b7a76617019e00567f9b10870622340e7bf47f0c8cfade999a457534f2a9549f048135eeed78c7bc4c5be2bc18b0141625
+EBUILD elt-patches-20211104.ebuild 895 BLAKE2B 9a49b69544d5123b3f8794ab09ea53f88a14a643582f338ff6aa51725eab3b8cf001f918913bcb4f779284b9150d02b2e7778cf3b5bbe2557b872556a9639a55 SHA512 92aaf1aaa3985ef4fa728b44737d9dafdb1e663515cb6046b13ed9c284a7690d539326f69748756886d6da480c152dcea5b405393298d3b17648b6469d8348ab
 MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/app-portage/elt-patches/elt-patches-20211104.ebuild b/app-portage/elt-patches/elt-patches-20211104.ebuild
index 35998947535c..9cf32e76ec39 100644
--- a/app-portage/elt-patches/elt-patches-20211104.ebuild
+++ b/app-portage/elt-patches/elt-patches-20211104.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="sys-apps/gentoo-functions"
 BDEPEND="app-arch/xz-utils"
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index eabc2c90c9a9..5fd60497cadf 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 1516 BLAKE2B 57eac471719d8e48cd108873aa89e5f2403c40bc90586bcf30775ceb7251ead0c69192f8cf125ff2ce2346ac8b73df1cd84bdd8405b8c3d1392f19dcea79dcd2 SHA512 48335d3be9e4fd3cb5c59ede3cfc45121a52ee9d3ba4544a65796db1759daca0218727a8cc817fdd5df5713c21df43cad3f9426dbb1e49bd2b2ab44117c65717
-EBUILD esearch-9999.ebuild 1065 BLAKE2B b9fcf1a98bbf27d9da7320c19fbd5dce960c1bb13e611196c9b4bb322e4b9553c8abbbda8965197c6cf2901a882527a5f83c40e69eb766bc74c1ef44c21ab57f SHA512 a669936741e59b8df1772a90400e9e2cd31655b5c5dd29b612f9b5006eab50d2628091bd0507e844f04e06692f36ae7e0ff5f0828a4405947bbb336c934a3477
+EBUILD esearch-1.3-r3.ebuild 1518 BLAKE2B cc5150236289c95a4fcdca09575280d9117a4556c410543d97a4f9dcd38e5981c292b08a754989682aafdbb969a5cf15702c1cd62e1dbfc97adbf159f3e0c8ad SHA512 33df2961ffbbbb0875ef4fd86ab2afecd4eeb6ec26ce08c93569e8ac7882d82114c3583b11de8ba157c3a7a0b772a61e4d536961dfee38312137d0d74bc62993
+EBUILD esearch-9999.ebuild 1067 BLAKE2B e77246f5ed621a2996fb6460ad96879d0a466c63601da3e58bbe57dc642f79b1d8a5065b92072e84cc54b2bb55bb30f4047f86ce980fdfad9dedf1f2b26d0d86 SHA512 e0798f50eccf83e5eb2fe9cd896ace563a58a70145f48e26e129e20c10067003ac690ceed0ec7845691a5726e5d795495b0f213ffa0e53ce28cdffdc7458bfdd
 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 dd92c1583dd0..1cbe38b2307f 100644
--- a/app-portage/esearch/esearch-1.3-r3.ebuild
+++ b/app-portage/esearch/esearch-1.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..9})
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="readline(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild
index 83b0591b76b4..33983df846b5 100644
--- a/app-portage/esearch/esearch-9999.ebuild
+++ b/app-portage/esearch/esearch-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..9})
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="readline(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 7b1f8583da55..29e80c92a8e1 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,4 +1,4 @@
 DIST gentoopm-0.3.3.tar.gz 38624 BLAKE2B 018be741c6970b17525e56d5acdb23e15c8f78016fddda50ef329ea65b84e085a928e1e5e95c69757530c067c28aa578e9c56b8bd7546d7249a75e9c3cc3b57f SHA512 91ea07035b25bdccd8072c5691690ae0b40b6220a2ea29e4b051aeb8455f200e94569036af42ff2f5d7714344d332e5d71e3ff8dfde811f2aa6b6c1b3a895b21
-EBUILD gentoopm-0.3.3.ebuild 670 BLAKE2B f9165305085974f4d359db7d45276cb8174c327f1d5e8b13260974f74e098d63babcf9e0e3c2e67520793905ad1618dfcc349536450cf8dc13dcd43381a80083 SHA512 91b500dbd24e4631290f95d6060a708abadf9e6cb65cd4d9c2581a07b72dd120177c8d08253ea91a4293c9bd1ae6c587ed6bf10ffa31c4109ec68bfd11b2d97c
+EBUILD gentoopm-0.3.3.ebuild 676 BLAKE2B 9063e8fe9479f21856a2c18a742313911f73eae15b28bd8c0ab0aa448206f1f1c3bcad4d2e11d0b74960ac7543b430f3204e0c07feecc1dc834263bbc22ca153 SHA512 8524a6a5268c11da7f5a1fe7d78c773b5b3f81febcc910a51d3a2355b39c88998f1c5c814419adb0091466f3ed40d68d12fafaef288036b04800592a53297b32
 EBUILD gentoopm-9999.ebuild 618 BLAKE2B a3bdad7c8ad96eeb9fcd123859c6868dd104e0130f76d9b5c21cf63a8d91e405b9b7527378de5e8715040525058be03dd92e812b781b96b7f379cf6a095c681c SHA512 1f4031557dd08aa9ab0da28e38e183843a58071bec302d3f85838747af69b65733b8a94c1fb8d03be2c7b09cd6695d199fdcb320000a083762e0100fba3f153e
 MISC metadata.xml 553 BLAKE2B cb858f45f3796fbada74b9ea3b84333132741537e4d92cd47bdde947e2308d2688128dc23686689d0b9bea81bed15ba928aaafefde1b14c6ca8109966ccf541e SHA512 e849549624dc1fc0e87dd51c612942d178850d82498a329c92a9358acf807e9a3a09ac513f086e7affca35d70c58c4633721d8ac2f8b637b4623ac1b7bf7a477
diff --git a/app-portage/gentoopm/gentoopm-0.3.3.ebuild b/app-portage/gentoopm/gentoopm-0.3.3.ebuild
index a97e106c1412..e542bf8b6924 100644
--- a/app-portage/gentoopm/gentoopm-0.3.3.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ~sparc x86 ~x64-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index e05e20aee4b9..370b16de6248 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,5 +1,7 @@
 AUX iwdevtools-0.8.1-tests.patch 2580 BLAKE2B f0fd374d2c2cca3f6da7f062ce2f82af2b9345e4c0e0625eb12f849a495fc74fdaba63e5c55355c3d64edf3c844c3382ae264357055af3c3fa41abb075804753 SHA512 4e73b5555da715b1227acafb9372a97888861fd68aa96696bca5d2f340c85851029145c400b70efd01458aea37f11da73c729470f860b71147f99b7cc5404e48
+DIST iwdevtools-0.10.0.tar.gz 60808 BLAKE2B 31f5288c54513a95199c3e41e7147778276ffaa2a63bb88e49a91680fa53602c4d1883ccf9b78bf63eba2fefec3fcd50e45ce7a599a0b252eadfaca62f2d9a09 SHA512 e03eda68eced8a23476d6681bd8090f80b642c40e5ed7e3ecb758fe04e51f496be02042bb87f6b42e150d28086e7ce14b278a6fdd05f06725b184b328405d412
 DIST iwdevtools-0.8.1.tar.gz 58058 BLAKE2B b9f17f68bb073ecf2d8a94fc8b97d95f7188e7526dd6a32cf33aa3b01fe82bf25c696cc2be9cbdc0aaa3a8279532e506ab287d3e25da5d5fb55789064d47aec6 SHA512 cb365e7010d620f2a255db0244ee1a38fd5714a17093b2e2a71627155764165853f99a4477b281b92061f7fe184297a222a8c79c2c62beb8e0656761feee859b
+EBUILD iwdevtools-0.10.0.ebuild 2084 BLAKE2B 3c9a88d685e351a66cc08445b91c262be8dd7c48592313702dbb696a1ebc12d0eb6cbb1bd90a9e6b6549439d74d07760cdb0497eea0dfdaabf2ae6c7b97754a2 SHA512 720233a84c9488b79d2312f8fd290526e7e195d13523db84a03d9b4b6dac670d96faa55bbba6787803b216cec8d44fce4494fc15e5dc873130684dd5277e6f2c
 EBUILD iwdevtools-0.8.1.ebuild 2002 BLAKE2B 5882188d2c07ed11dc74bd73b67e716f07e37be8f31fa8ba5bd75e6560dcfc5249634f5f6b4d429f65410e50db9b65a0860e0bdca6472b1c31cc1abbeb26f428 SHA512 e025942e52c89bbc0d57d2bae53836ac930c5d0f275aa31a2043b1b3f095ff5cd34b077ca9cc6da388dcb668b46f9cffc181b1547001eff5b9d8420ad944fff2
 EBUILD iwdevtools-9999.ebuild 2005 BLAKE2B aba034397f28346a4028e484f4a7dc612da870e2b53d21c7d6fdd4306beda1d921d2983d572186e7a623e14b1afea152b45a1e1798d52594ea6e33d5ca44aad3 SHA512 3dedd1d47cb33736d396d3e42c777c3430e4ca3bfdea0dee5e7f1ffbae904c1f2a31d6571b114b38b33d7f34885945e930e4efeeb26d3e6a260e813e5f18c80f
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/iwdevtools-0.10.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.10.0.ebuild
new file mode 100644
index 000000000000..a667742fb6d0
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.10.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2021-2022 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 ~ppc ~ppc64 ~riscv ~sparc ~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 app-misc/getopt )"
+BDEPEND="
+	sys-apps/help2man
+	|| ( sys-apps/util-linux app-misc/getopt )
+	test? ( ${RDEPEND} )"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir=${PF}
+		-Deprefix="${EPREFIX}"
+		-Dshellcheck=false
+		$(meson_use test)
+	)
+
+	has_version sys-apps/util-linux || emesonargs+=( -Dgetopt=getopt-long )
+
+	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 [[ ${REPLACING_VERSIONS} ]] &&
+		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/layman/Manifest b/app-portage/layman/Manifest
index 946067e1f6bc..7ae2e1578346 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,4 +1,4 @@
 DIST layman-2.4.3.tar.gz 135311 BLAKE2B b83fd543468be904a10d6fbda11f8d603a6936ecef3029c9d1c82fe4c938d2cd299874a3e114ac3524485ce8a33c5ec21885adddc218f5e331519318c0b1ad5a SHA512 2f3d1180647b358d5ca929fd28c6c5f4664f1f6f24e3114a4dc886d23279ffcdde7ca292c64aab84f1710ddf7029c26483de07c2271ca527b8618888b0ea2b54
-EBUILD layman-2.4.3.ebuild 2193 BLAKE2B 00b4fae1b646797caa65156bc3120da2e97d9333a5a247ec6ea3c3e0ca9d7b2f7364f9c762e12abaafe2d272b2e25172670c29dba317946d712e76e2b0f1e698 SHA512 b400b87fbd867fdd3adfd1905b4072c3725088f8e879e51a43479433ea7482490e235ba1bb5be0c6f8af4526ce55a18423ba17c0b0535b2a8924b693fe5d14e5
-EBUILD layman-9999.ebuild 2401 BLAKE2B ad77acc64d1d512d5e11b725686e2041ad570ec0ba258029aeca7a90e0ce11056b1351a49878da5dd1e89e14fab77d8411595872c3d836e22810525775b562ba SHA512 146b1043e305bead8fc2709d462656fe9520def795bc2a142491dc221e8b119b6ed7907101b2f1f26abe108a17de5e96c006933326905b034d801a7b89362dae
+EBUILD layman-2.4.3.ebuild 2196 BLAKE2B e9e4218d9923e742e958f213929385599119b89990e389643add795f99e1aec1620c05bb63e20a77fc1cf0c0ebf028f7acac2eb9b9f3f8028252ad62e9ff119b SHA512 3cb7e0818bbd9b4f69d479d561c7c56b720108ee802e403d7f56542bc7874a04993ece538ec3772515c4fccc0e29cd18dbaf4fedf77d9036a83abbed3d60e4f9
+EBUILD layman-9999.ebuild 2404 BLAKE2B 76eaef174345acdb3f97f8f5e37c693bf183a59e6d32d650e5b1c31bd2c42b8ebcdb15313342b76e7f2635b1aedd2d6fc10766d2f97d6e1396db4d72127250f8 SHA512 7a82e03a219e271608114356643a04ced37b667a106580946d8f134e5b817e3900a73781e3441be9dfafc0b419570dd637c6d0e9b5eddd5bf1b1d90a6d9c7495
 MISC metadata.xml 1103 BLAKE2B 3a719da18a59c5262d096af809af56f9f905ab14434cb4b29affd031cf463d69a203c73b10268bb74280d5627788d3d2a4498fa3a7ec573ae4188025919f1bfd SHA512 53a40e4f7697ad39a8eb274c68af4dc5b95f8f1da741b8fdcd034e4ee3ac20a63e3b86005ec17dcfe3a78eb7dcc565fe431f8393f15c8019993070c0b856133d
diff --git a/app-portage/layman/layman-2.4.3.ebuild b/app-portage/layman/layman-2.4.3.ebuild
index 9b27ecf065e7..f07e9364aa7b 100644
--- a/app-portage/layman/layman-2.4.3.ebuild
+++ b/app-portage/layman/layman-2.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 PYTHON_REQ_USE="xml(+),sqlite?"
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 98fd69757d53..47a4cf73907d 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 PYTHON_REQ_USE="xml(+),sqlite?"
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 5ee6e39b4a66..134c810b8055 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -1,6 +1,8 @@
 DIST metagen-0.7.2.tar.gz 8391 BLAKE2B 3ec53ff7fa12ea816c88bcbd4e45a3cc66527e6a507f01bc8934abc6bb6ae142e6c6620f82af7c6775b9001d6549832d6fab42c1b44c966f72a40ec0a0f66b2a SHA512 8a78d47ce8228df73a36d4c0f346d75250fbf8568ca6c8cc9ff9313b61c43ba514cf6dc13b36ea90f1ea5b194337748224ff81449d56527fbfc6b7a91e408054
+DIST metagen-0.7.3.tar.gz 9607 BLAKE2B 3c5b9debf10b0a6dda9bdf0e45e157c80019d0496d93f5af18e7be1b502c320fdbf7bd28f382e9021580d3aaa373566d7b342f3fa57f736fcb3676bafdd4d6e2 SHA512 d7293125685ad3be35dd9213b5d52c9219b6a5bcee4ab15fb2426bdccdb95b4df5567c2178bdefc0e75987080cd51026b5b089a4d4cf6402f455429d55d3a9e8
 EBUILD metagen-0.7.2-r1.ebuild 708 BLAKE2B 096b3982cd7b27b127b44528b628ed5fd29717ec6f927ef2a84a61107a0177c9caf53c291729618487db0d60aaa9e1af43fe8083ba5dbe8cad360e2b42ced17b SHA512 e62a3ccaaaa439ec322774f7cb0b2c6912a0d1b0c8312fbe34447482f6012298976f9c180c7f8692317a46d074b7b009c46cef61588991796011758c9647c9a1
 EBUILD metagen-0.7.2-r2.ebuild 834 BLAKE2B 92e3d9180b49fcd49ec41f7a3bc92810dfaf31b96a6c3b828ba841f4476bfeb5be56e2d31cbb3457452346cbd654b2fa81875fe22170e06d3df36cd84a077175 SHA512 848ce0bcc332cd1eec100747eea6feb63d94019e71af55295077f9da3da1045bb19352c6227ccdbca0f5ea033419d03ae91bbfbeb277bf43c08758ea7de67151
 EBUILD metagen-0.7.2.ebuild 737 BLAKE2B b8abed80940833688f245cef82963833ddea9994479d11896016bf601677c36b03531a4bba48ac5a7ffd7cd0ca15cb30e1db7890496e8f8e78507b4205e501db SHA512 3e4eef66d79eab73b0c1e4b7c0dd0b6fafe7fed3d529a399729bb9378ce68bb8d75f8eddca165fb7f814470bcceedf828e5dd239948895cea9a2b04d73e847b9
+EBUILD metagen-0.7.3.ebuild 907 BLAKE2B 06ae338c257137d117c7ec61d348cde9ecf4d211d5226c6868bb29ee2d8a1a34f6c6f4ae5508400812b116c07f25ac9e8b056e90295bec34b3c29f11e8c9f4dd SHA512 1725954d03287400e9fe88aaaaad61b05aad2f107a54443665142e66cc18ca45197196f07b41e41caf5f7bf5bb8419a75c9770a6ca337a2dee2a43f5436797d7
 EBUILD metagen-9999.ebuild 932 BLAKE2B e1ccb42a0aa761701f2370038bf13272bcb0144583317f1f6aff51969dac37f83fe55effb9917904fd9855d14a9a483f02136e8d1242e3d3949fc5750178c147 SHA512 86ad17b1e90ad1e602eaee0687471b360c839dfa87981e012aa3c84eedf720af69a3eafc8ebc8041bbfd8a5c210876f40f770af37b0702890daac6492c3bc555
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/app-portage/metagen/metagen-0.7.3.ebuild b/app-portage/metagen/metagen-0.7.3.ebuild
new file mode 100644
index 000000000000..81ea3b03c351
--- /dev/null
+++ b/app-portage/metagen/metagen-0.7.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+
+	# Bug 814545 and 832069
+	if [[ ${PF} != ${P} ]]; then  # to be robust across bumps
+		mv "${ED}"/usr/share/doc/${P}/* "${ED}"/usr/share/doc/${PF}/ || die
+		rmdir "${ED}"/usr/share/doc/${P}/ || die
+	fi
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index bf7bd203605d..ff155ba33bdc 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -1,5 +1,6 @@
 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-r1.ebuild 1266 BLAKE2B b00c9e430659099a828ce93653028c8d87ed8793e9ca936df0e362835a49727fac055cf18224145d794d134eefcb8785970a158cba442a8fe92f0610dfc7d035 SHA512 222dca8cc37824953ea24ee79e51b8c34f38cfd34edae78081e6e4d4918bee5aa6bc4794afb3fd9fc1e34a8e63be98160e4fb172e6b266084b6e7efcd383afc4
 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-r1.ebuild b/app-portage/pfl/pfl-3.2-r1.ebuild
new file mode 100644
index 000000000000..28f10306a4f3
--- /dev/null
+++ b/app-portage/pfl/pfl-3.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Searchable online file/package database for Gentoo"
+HOMEPAGE="http://www.portagefilelist.de https://github.com/portagefilelist/client"
+SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+network-cron"
+
+DEPEND=""
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]
+	network-cron? ( sys-apps/util-linux[caps] )
+"
+
+S="${WORKDIR}/client-${PV}"
+
+python_install_all() {
+	if use network-cron ; then
+		exeinto /etc/cron.weekly
+		doexe cron/pfl
+	fi
+
+	systemd_dounit systemd/pfl.{service,timer}
+
+	keepdir /var/lib/${PN}
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}/var/lib/${PN}/pfl.info" ]]; then
+		touch "${EROOT}/var/lib/${PN}/pfl.info" || die
+	fi
+	chown -R portage:portage "${EROOT}/var/lib/${PN}" || die
+	chmod 775 "${EROOT}/var/lib/${PN}" || die
+}
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 1031eec963f8..8585e01930ee 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -5,6 +5,6 @@ DIST portage-utils-0.93.3.tar.xz 1796828 BLAKE2B cfad7ab27ff2d92f631f4e31012e890
 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.3.ebuild 1526 BLAKE2B 15441470809e412e45b4ff193a93a473049c68cc641585a33e117cb6994269f8b57a6838b4b93dccde6dda2fea6c11dddd2aaf8be6e7db1e873385a28515ede2 SHA512 376f34ca2ef7f551bf8576fcf237cde6f484a7d7a2fabb615b1932fc2947715632e7f7e3eff7968a73dc294d7186fae626a6d5f4abbf2294d9faa075af670e55
+EBUILD portage-utils-0.93.3.ebuild 1518 BLAKE2B eb2ebaa3f97ac7eddc79b2e63065d0d2605742d698d3dab36b060eab82e7dd8d26817d7ed59b2ec522dea513e1b334ddee62cdb654b3a4457f8350814a0fadb3 SHA512 d8dbf0e58f94bc500b9f83f4b2bfad7545cf2229c62d52905b62babb46282bd4714faca4e1dfdcae6debe18af4b491d9f6e487a2d78c5c244d201645e8f68854
 EBUILD portage-utils-9999.ebuild 1526 BLAKE2B 9f78548abcc178ec9771d894a942130b183f83014bad9e347528914239b3a81cc92f9c489a3ac6789d7d9750291ec4c8018b9bb329c5db37dc4392483db92663 SHA512 501ded3ec21c5efd4b38037050e87f66678dd2be9dbb8c7b1346ba5cbe3a339751b48983f611da2c7134e69f6ca1af169724f4c1ee4f4f0ea8d1dcd6fbec0753
 MISC metadata.xml 574 BLAKE2B 1448e8343748e8bbc61128f3a621010ae1f7095872c271962ac24e62abcea8cca7c52034008c0d5691a56ca7f2e242ab4cec7d38fceecc2c39f858d1ceb30ab1 SHA512 dcf9949c990845794a534b34e44e820b16b3700bc993e13707bfac6d26269d2aba00fd3f873b9157ead222d2fa5cdd63d263c098bfc79c1b1f66097fa24f552e
diff --git a/app-portage/portage-utils/portage-utils-0.93.3.ebuild b/app-portage/portage-utils/portage-utils-0.93.3.ebuild
index f11ea5afcccd..67a59e37d9ff 100644
--- a/app-portage/portage-utils/portage-utils-0.93.3.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.93.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	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"
+	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="
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 90e9c2bdd7eb..1b42ab86c9a9 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,5 +1,3 @@
-DIST portpeek-3.2.1.tar.gz 13538 BLAKE2B efd8566b0fd54cc9f76eb05d330a566999c2e301c2e62e38b12d6fa7063d57cf4803db0e1ca5fe3067a31075294e4c4e5f794acc914f2ed2abfc340c6bbf8278 SHA512 f5888f63c5683e48d601c6560800566586c1558541f928aacb0476cb7534e8e6910517d96c083519747d6074e1ee2739780f050fdffa6e5a1913399e2b2d108a
 DIST portpeek-3.2.2.tar.gz 13550 BLAKE2B 4d0ba85d270699ebb7ca770d1fb3959d3f82135f3d75a65ec35f154ab6d46a9a51b9a2603940d16ed0f7f789f6ab628ef0a1536c2a2cf877b8e19e758e55568e SHA512 9362419f41ccc437ca8d90c0196044b2b17c683f3f2474c6f0bf484209a20fa8af1f17d69a0553038691190bdd410df0bbde51c016e2da944c6772651e99d7a5
-EBUILD portpeek-3.2.1.ebuild 691 BLAKE2B 1872abc019d1e843e9b3bca8e9cc54570ed4d8418ed69a5edbe7e25b00ee1ad97cc18d5ef5d701bee88de9bb3ba55b557394a6212b025b93d522b4b38f23cd1b SHA512 4ae8ab3897c034caf3876a55c7fbea0e976d71de6a80c6e56d4abfdad4f3e0768561c987619fcfc0e59f05986e04d13754f58e99dbdae861e11d0712795c6a13
-EBUILD portpeek-3.2.2.ebuild 697 BLAKE2B dcc40440e62d4ffc5cd875a108cbf0350e2d36ffe13947ecf18cc1835d3a5ed359b50d3b472937c2bb8173d355f0800c0d31866680f870c7b134681a32324f9c SHA512 33a85f086f317bc9a9edacf97e56b1275c0bcc363146ab63c3a1918f86f76fa2663bd84d3ddf68bdb60b1c8b9c13829aee681aee1dd53c85e333f563bdd4249a
+EBUILD portpeek-3.2.2.ebuild 691 BLAKE2B 7cca6179cbe0aec6608bfa7f49e8f4f9064f4ee63936d018d03a04851fa3b7662febdd46ce5973c7b848682ab7e91e0c0e0ea639b73c6971b5fa5d671e20f1ea SHA512 227a2fc1b259daf63e1b2dd5c7d717348cb346c5bb73537819b43610a77542039fa15a370566b4cc04eebc800be3ba6b0ebc5b0b769d47645ad4c7b5629bcacd
 MISC metadata.xml 248 BLAKE2B 7f522eaf9289775b9bb4dfb1b10a86d17c43440c6bf02a98eef73591e3ffdbf9605c4daa6f20025ffdfa7e17848fe0ad33f4a88ebbdf746d280a5302ef9e74fd SHA512 a04923b3582e779f1f6f8567d31b61b25c3ddcc8b9e1162ff735bc4ae0bcb7124b078d12f3398ce3266fa50be592fb7ed1a89b99c2587db4d52d8411c8b17315
diff --git a/app-portage/portpeek/portpeek-3.2.1.ebuild b/app-portage/portpeek/portpeek-3.2.1.ebuild
deleted file mode 100644
index 05c054c57f1b..000000000000
--- a/app-portage/portpeek/portpeek-3.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="https://www.mpagano.com/blog/?page_id=3"
-SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc sparc x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.5.1
-	|| (
-		>=sys-apps/portage-3.0.20[${PYTHON_USEDEP}]
-	)"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-3.2.2.ebuild b/app-portage/portpeek/portpeek-3.2.2.ebuild
index c381f3941efe..670dfa718f8e 100644
--- a/app-portage/portpeek/portpeek-3.2.2.ebuild
+++ b/app-portage/portpeek/portpeek-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -12,7 +12,7 @@ SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc sparc x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-portage/recover-broken-vdb/Manifest b/app-portage/recover-broken-vdb/Manifest
index 557b9a6e38cf..ac1e5eff008f 100644
--- a/app-portage/recover-broken-vdb/Manifest
+++ b/app-portage/recover-broken-vdb/Manifest
@@ -1,6 +1,6 @@
 DIST recover-broken-vdb-0.0.9.tar.gz 15410 BLAKE2B c8fffa07e817ef2ff825add92aac732036676dd08b2cbdcca60a7c1fa2fc740f0473be2147635701971fb9a0a871c65115a1fa9ea05486cffe747207e432d8fd SHA512 0fd9f5e0d046344ac6c86e446b7c52c11238b1d90cf330558da357b71b5fa577b157adfc6903e94f065de6afb0296df2ae191078836311792ec319f614e39d37
 DIST recover-broken-vdb-1.0.0.tar.gz 15723 BLAKE2B a2c39f64f1db3c0cb1e285deb37654575f35fbdd419b5eaabef52293299e70d98cf7804654f596655fb68beff88699cb9f87628ea29ffd1a29cf2893589f9508 SHA512 4a6428b65c33be4128936423c6770f6af9574fe6caef90837a7d9a1d62d4a595c798b29021f81df4dcd39db4e086abb18f256345f2a8f1e0e7c6687863dea092
 EBUILD recover-broken-vdb-0.0.9.ebuild 964 BLAKE2B 96b8034955645ba574f79d5c8bf63c791d97d60d34ebdd3e6b5e9ac3d445d4a763fcb558738f8ea2139e6b876eba769d276dd7ee5b6d7ff821743617c2500d5d SHA512 099352bee1d1fe36d3897ed7724dec5524e1626821376e227329e8416558f51683ea953a5a6c2cf4f809675dfcd2de42cd22ce93217448d2cf4aa6f25b4c84f2
-EBUILD recover-broken-vdb-1.0.0.ebuild 972 BLAKE2B 306c767a94c17e3a943fedd7c72eab00578b68ae671d59c6597c9f26eac9a1b92c77cc50d776cdbffb6b8ad2acf4f26b08e0c10d5f6f40c0cc5d0acca8f71951 SHA512 6bc0864b42ef78c3eeabc7bf04e5715d5c3c1cfdf737eef2301746b741909e1eb716b2926f1417c8a299829410e6d953bbc8ad9cf1d8897da96c3bf8cd5c3ece
+EBUILD recover-broken-vdb-1.0.0.ebuild 964 BLAKE2B 92ef03ff5a332139c8927d64c4e1220daeb5cd5a21861933d13a10d7badaa67350fedfdd0898f17303f7616a45d8499d3efe621bd1a851e5421c893dfe2f5736 SHA512 0b066644397306a527eca59b998d45de1e8a36e8a1f9857e88d0b31720a21e15b528140192412e76da8691dc795bd98704558d3cf29da021979fb1bdfc043e20
 EBUILD recover-broken-vdb-9999.ebuild 972 BLAKE2B 306c767a94c17e3a943fedd7c72eab00578b68ae671d59c6597c9f26eac9a1b92c77cc50d776cdbffb6b8ad2acf4f26b08e0c10d5f6f40c0cc5d0acca8f71951 SHA512 6bc0864b42ef78c3eeabc7bf04e5715d5c3c1cfdf737eef2301746b741909e1eb716b2926f1417c8a299829410e6d953bbc8ad9cf1d8897da96c3bf8cd5c3ece
 MISC metadata.xml 542 BLAKE2B c65008fabc6fcf791a935f514a218eebff103d0ce07290b84c545d1551ad8f7834b2245299081bb97c659280670bd2b4b252dbe328a0df946ae29c9110f34fc3 SHA512 dda7cb383905a922852267329a6a848f3e1c19c0fa0a97952dff0995192d00bf227722415194514edc778bd68a1634efdee1ab89cc8b0ce2e9433b8420d478a4
diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild
index 6bf736875162..1aa783fa8e1b 100644
--- a/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild
+++ b/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/thesamesam/recover-broken-vdb.git"
 else
 	SRC_URI="https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index 875633fbae29..311d6f196dce 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,4 +1,4 @@
 DIST smart-live-rebuild-1.3.7.tar.gz 17283 BLAKE2B 9de30e07b7c950c7e0e3d7f20a364ef65028fe425a017cf46de73a4aaa2c82f13359bc8e2d3269ed50b201b95c41af16c6f233576c1176f8c9b6394227bc8e14 SHA512 47111fa0e4ef9630a60b262566166822ac3245338c9cabc9e5959922e6f60cac70087025321fc9946ef7527b02ce7eb25d74e22d045f9e875c82d6f7877feb4b
-EBUILD smart-live-rebuild-1.3.7.ebuild 859 BLAKE2B 0ff1fcf38ca8e6f17da63a34e8c4540c930678859ea1abea10e46d5cfc08322190b7f3f86cd4d4da4a86ceebe643b4a98dcd554a55ad4d3816667a452b279cb9 SHA512 6ea06a8f46cac40967e3b20d956c9780e78208a4cee52cbadc0d00db86b1f9c78428f39a242ff3e21378c17ec44892ed33864bbf4e5728f6d6586a0843e558d5
+EBUILD smart-live-rebuild-1.3.7.ebuild 865 BLAKE2B 666c1c808a76f056df868446ee072614ff7f53b858145a15464c74dd0c943bf3414a24ed37d9123e908cabec67dd5386edab3191a3d6f04daf52f9de3c396b5f SHA512 fcc3f243078b57171a04621aefa462dcde37ee860b3c30e17ae998c679b51e92d5092c401143a2e93b4898655fad7fe5147201abeccf13dae35d9f2abb89589e
 EBUILD smart-live-rebuild-9999.ebuild 754 BLAKE2B 3059fb3c3325ba070f24084b5d62e008582b69bc55e2bce58a3a3c013f80424abc93452846dc2247e3c9bbe2bb8de05ce97114ad2419f59150b8c9d9c1c03193 SHA512 9733aa8e3bfacaac9aea937fe0ededfa6f6cf605a1376eacfcbf722c8a89695ebed0e57ed227e53b8743632842e2b29c6ee69a83cb32a459966fb699ed5d1aa9
 MISC metadata.xml 794 BLAKE2B 24cd92d94a8efeb0b9a3ab601f9f5581dce5686365332decc71c80c5a3a431560929d33faa4736259a19bf8c92fc9e1b6557126e67678c3bf1c2573236eca3f9 SHA512 24d79d34c1aa3c213ff920ca9f6e010809f949d1c5487601735ead39da88ad8c285eee091336f4a45ab5d9a095597e3aea16511f17ad6e33416439e89521d35e
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
index 8dfa9ae35508..e4be77e78392 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/smart-live-rebuild/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ~sparc x86 ~x64-macos"
 IUSE=""
 
 RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 3c20c9dbb449..08ce22b3f3c3 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,6 @@
 DIST tatt-0.8.tar.gz 22215 BLAKE2B 6c21acb9378045679c4a03badcb7c60638c4007ba19857d7519f68d4d658cd1418e952cf15a64679c6a9b28090856a588e60e9db1abb360d0625a633491deb3d SHA512 31be6573e3d7c9a690e57d64adcbf87983d5dd226afd162c7bfa425847a84705beda530cd5b648ac85cf8cd3907d46ae638bb0ca0d903d8d1968d0ac30703703
 DIST tatt-0.9.tar.gz 22659 BLAKE2B c67da6d71bd46a7a1e73810f6f837cbe18b4fcfdf18da2401ab696e69d05c3ccbdeacaf152999dbf49d39c20e0e9e656e05c294a5eb7128015ee06d25bf95fcb SHA512 4f8d4f6d56ce1389caee8a67d1ae13967692fad90e1bc484ec9ffd9fa057e858c2fc4e6cefa496b33c7565b06e7f71e012a94653de4a501f3b25ec77d07cea92
 EBUILD tatt-0.8.ebuild 825 BLAKE2B 77c5f43f27e9559a38b378a162fd52d9b5bd9c71ecc68965282f36fc8167b13e664edd907a5e8a8c4277f226351be882e153538f8d76b6ee23a6eb60561ccc45 SHA512 c05b802f73e050e8cec6e32373b791d684f9c77318fc26e0c69728952e1156fe6adb24b0e022e3994de5a95cbf91ecb744618b5ca0ddba97943678c166cd1974
-EBUILD tatt-0.9.ebuild 833 BLAKE2B 2e5f9a440704dfe25376227b9a1920b16c9b45cf1dd104f182b46a12a8a03d9b0db77392f30ec4e63d9198b84332843bf79887623f1076e50c8e721a6a4af026 SHA512 de8802d3402f563cfa5cdda16c8f54f6835b0ff5e1013d30b957c66393710755c16787deea65c56b33dad27bd950d6d325cbd9e0006445d1574b68e0d455bd77
+EBUILD tatt-0.9.ebuild 825 BLAKE2B 21167a3b0e0eedbfa75e22adcd6a5273fdc6706d5e01d74af98a7f04313ae4f3ddc859d7e0a6954e7820e70b462b46c95e492be693a6317d0ea608eb38698cce SHA512 a99f855e9540e941d54876d901152f99037b1b7ce7692d2137682a8d20017cd9b44234bde373a6c11f1e9fbe0165ed1d204efe141d4f925274703824eb4a08dc
 EBUILD tatt-9999.ebuild 763 BLAKE2B 04c33f57cd3af03a13e6e96453f6a18d017bafeabef27449714ff185a9ce7df61f3f488b6345f622b14c94238450f4b46692718a682750a97e7e45377c7029c0 SHA512 4b97ef44e12c8c2d3d70dd15dd57a3cd317beb3024f8b4e3042a599f8aa032c399471e02395f04c5e5cbc16b38aa2ecedef339afd747353e2b35bb8eec726b90
 MISC metadata.xml 662 BLAKE2B 41d4761e0fc0b84bce1a256fd31240eb5e726a4b0c0f82d511896624e90afb1a962983d9eecd31eca47108264a63e3a2ac66f09c3916a7212931ec1b2eab41e2 SHA512 494ae31329284b214df2202da88fa829e7d8e1c45f9110350fb3dd6a466f73406f732bdae0391a8272e876841b98cbc65b3867877e49ef52fe4dcf62739c9183
diff --git a/app-portage/tatt/tatt-0.9.ebuild b/app-portage/tatt/tatt-0.9.ebuild
index b68190910f9b..49a38627ef6b 100644
--- a/app-portage/tatt/tatt-0.9.ebuild
+++ b/app-portage/tatt/tatt-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+templates"
 
 RDEPEND="