gentoo resync : 20.03.2022

38 files changed, 224 insertions, 395 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 7c914fffdf85..3ed75e1ed278 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 29e80c92a8e1..fc1397bd4130 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,4 +1,6 @@
 DIST gentoopm-0.3.3.tar.gz 38624 BLAKE2B 018be741c6970b17525e56d5acdb23e15c8f78016fddda50ef329ea65b84e085a928e1e5e95c69757530c067c28aa578e9c56b8bd7546d7249a75e9c3cc3b57f SHA512 91ea07035b25bdccd8072c5691690ae0b40b6220a2ea29e4b051aeb8455f200e94569036af42ff2f5d7714344d332e5d71e3ff8dfde811f2aa6b6c1b3a895b21
-EBUILD gentoopm-0.3.3.ebuild 676 BLAKE2B 9063e8fe9479f21856a2c18a742313911f73eae15b28bd8c0ab0aa448206f1f1c3bcad4d2e11d0b74960ac7543b430f3204e0c07feecc1dc834263bbc22ca153 SHA512 8524a6a5268c11da7f5a1fe7d78c773b5b3f81febcc910a51d3a2355b39c88998f1c5c814419adb0091466f3ed40d68d12fafaef288036b04800592a53297b32
-EBUILD gentoopm-9999.ebuild 618 BLAKE2B a3bdad7c8ad96eeb9fcd123859c6868dd104e0130f76d9b5c21cf63a8d91e405b9b7527378de5e8715040525058be03dd92e812b781b96b7f379cf6a095c681c SHA512 1f4031557dd08aa9ab0da28e38e183843a58071bec302d3f85838747af69b65733b8a94c1fb8d03be2c7b09cd6695d199fdcb320000a083762e0100fba3f153e
+DIST gentoopm-0.4.tar.gz 39123 BLAKE2B c8ea81e2d1aa09d3aa838ccb2a1d221e29ba6cf20c5539435a36da058733ee6814864f11a5a96742b371c6d0f2e1ffa269edf197cd30cf4bc7d517f9fa6623cc SHA512 7af0d4d8b3562b009d8897b70b8621d2004e22a16006ec84144544174724757b39e09cbde98ee876adc166947a58e4afa85f752c66d4dbb03ff1d3a52074720f
+EBUILD gentoopm-0.3.3.ebuild 675 BLAKE2B 8af66cdd23576bad3a41a4ad80da0f0aedb3478686961a46bc16b0daf5d73f5f9238f46cf73d0cfaf836e8b8a6648b6e510924ac300fa3c1e20ea78dc51294a9 SHA512 eeee6a543f226e6863d0a05062a7c48f89ec18b03502dce02508d68c1183c82507cb947387587da4912588974866af3a69a63ba11d28956c9360323998e4cdf4
+EBUILD gentoopm-0.4.ebuild 978 BLAKE2B 8d070439fdfcd3a3c9fd714596ab5d2e0902206a35902df24fb030699c063775f4bf4a4664d5a5e8526b7b6881954cccd3d47d3cd5740d41f8f0640d31da7f6d SHA512 ad74ee11320840940595de21384fbb7f5f30ab467e676d5a7ae25ef64360d9b2e11c640620064cd761c68722b980135585faaffb0d24dcac361bdb6f3f02831a
+EBUILD gentoopm-9999.ebuild 581 BLAKE2B 0d122c8db7e9ac80223d46d62b4b2271154b534acd8f8d989e6355844e94f6a265398b3174731710415df95fea8b71805769083432e28641ce931b8b9eaac890 SHA512 dd9bccbeb7eb8894240aa8e2c36591b8b959167bd60e4f1c4bbd48cfa5c6652277ca889a4a82f4232f4762c075f06f5dab09d8fae4fe6621793ac291703004f5
 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 e542bf8b6924..7cfa28e7b892 100644
--- a/app-portage/gentoopm/gentoopm-0.3.3.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.3.3.ebuild
@@ -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 ~hppa ~mips ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~mips ~sparc x86 ~x64-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/app-portage/gentoopm/gentoopm-0.4.ebuild b/app-portage/gentoopm/gentoopm-0.4.ebuild
new file mode 100644
index 000000000000..ac0d89b5c90a
--- /dev/null
+++ b/app-portage/gentoopm/gentoopm-0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A common interface to Gentoo package managers"
+HOMEPAGE="https://github.com/mgorny/gentoopm/"
+SRC_URI="
+	https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	|| (
+		>=sys-apps/pkgcore-0.9.4[${PYTHON_USEDEP}]
+		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}] )"
+PDEPEND="app-eselect/eselect-package-manager"
+
+distutils_enable_tests pytest
+
+python_test() {
+	if has_version ">=sys-apps/pkgcore-0.9.4[${PYTHON_USEDEP}]"; then
+		einfo "Testing against pkgcore ..."
+		PACKAGE_MANAGER=pkgcore epytest
+	fi
+	if has_version ">=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]"; then
+		einfo "Testing against portage ..."
+		PACKAGE_MANAGER=portage epytest
+	fi
+}
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 840415f2aa12..f3f382633170 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -1,22 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{8..10} )
 
-EGIT_REPO_URI="https://github.com/mgorny/gentoopm.git"
 inherit distutils-r1 git-r3
 
 DESCRIPTION="A common interface to Gentoo package managers"
 HOMEPAGE="https://github.com/mgorny/gentoopm/"
-SRC_URI=""
+EGIT_REPO_URI="https://github.com/mgorny/gentoopm.git"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
 RDEPEND="
 	|| (
@@ -24,6 +21,4 @@ RDEPEND="
 		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}] )"
 PDEPEND="app-eselect/eselect-package-manager"
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests pytest
diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
index d54641eb2e65..7d22fb428c9e 100644
--- a/app-portage/gs-elpa/Manifest
+++ b/app-portage/gs-elpa/Manifest
@@ -1,5 +1,5 @@
 DIST gs-elpa-0.1.3.tar.gz 15486 BLAKE2B 6e34aa27aae9d7e27d41e122ed18890b5b63a18e5803f83aaa2fe5c82cf95fb010f7d428e576ce1c8493b27fbb587e37f74f8c9ed3ed9320722ec61eff1f535e SHA512 616c6cc33e89094e727c9ebe577d211cf9200a95b7ad6fd4b350b16d6982e3d509278b63a145880cdbc8f83481ba409b650e43260d463bf90a22e2a705997020
 DIST gs-elpa-0.2.1.tar.gz 15808 BLAKE2B b37c8d8ecb57277db89b399dd9151348a46269054722f5f29aff6b04511e098a6ddfadc163130d7f9dfbb1af6ff2d76feda695717e021a44422b67a3f335a15e SHA512 d17dab0a0dcabcd3b9fb0fe1a81dcd175808033b46cb7368c017561c060110bd39998117f6feab3e16ace7304e9dc3cf10e684efd0e77b252d8b249317c37475
-EBUILD gs-elpa-0.1.3-r1.ebuild 642 BLAKE2B 7bbea1856876e9fbd605f34cb565fe54f1cdf3c4f33c18cd77832a17ce187b7006fb08e3e6a801108e3f92e842d8223b2b7b77b98a098799ce6277469647a16d SHA512 12dcded1712ace296e6d3737d7b972185037bc6e9fc08d9cc1ebcc150ebdbff1c3b96ff1421699156452192e4a623aca62b7906dd6c4254285cd3787312506ed
-EBUILD gs-elpa-0.2.1.ebuild 679 BLAKE2B 34287423a0cf612f1cd993e9c07df0e001634f5a924f0257000deaa2e0b840a78a5507866d3a0e1554115788dd7044b78946e4983ca56e34e3fcb0362fe6b13a SHA512 077f0b063604782937499a5ed9264e1f966c88293e1b9fdad161547b7cb0f669781356d65376f3b3135d2ace6476380b76305430f0dc3b65b73cc4b540e4bb11
+EBUILD gs-elpa-0.1.3-r1.ebuild 614 BLAKE2B c03d8c0a1d7810f48f99dd32c006c573a3c6d0096cf10491e44dda01ec3a949865c2dba2fcaead16d32acd048dfd279640b0a3d27164f67bf954d47f474b9175 SHA512 3178a4a19614f3d651979d26539214830766ef01722fb452d9b947fadeb4685139973d8f7a5f059f3600647541eedb14d509507032365c7b34f4d0bb5a319bf2
+EBUILD gs-elpa-0.2.1.ebuild 651 BLAKE2B 111fe8117ab87059105b2f6bb20876c0dd958ca9b069a9dfe8debe622943b0c300cade831510714709e130a68fa48921a3aaa13e2b0266509be58acac5b6dcf4 SHA512 045fbdb944dae0c462afccfcbd328af07978eebffe4bb1165b159b2ecedecf0fa5ab712fd5bd045fe10b88f4961fcb763a6466d86808f634ec50d7962589a58c
 MISC metadata.xml 375 BLAKE2B 9f073e2e46f0e1d760cfbb53583a93a74713b142a27c84dff0397ba67abec7f0537189525282ae0b5d2ae929d38e71c9f011e012fa034364cba582166f25cd02 SHA512 7b040d04358c8a742bb1724cc5a2ea5bd6fec03ec19a8bca8ae5d00e1d028dbdff60a885bea4f5f6eb0ae7e58a9831cfd359e3e9a0eed3f11ac6c65836d8dd5f
diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
index 82ed6a255852..447cc8818f70 100644
--- a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,8 +16,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="app-portage/g-sorcery[$(python_gen_usedep 'python*')]
-	dev-python/sexpdata[$(python_gen_usedep 'python*')]"
+DEPEND="app-portage/g-sorcery[${PYTHON_USEDEP}]
+	dev-python/sexpdata[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 python_install_all() {
diff --git a/app-portage/gs-elpa/gs-elpa-0.2.1.ebuild b/app-portage/gs-elpa/gs-elpa-0.2.1.ebuild
index a523564f65f3..0e58f531dcd8 100644
--- a/app-portage/gs-elpa/gs-elpa-0.2.1.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-0.2.1.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
@@ -17,8 +17,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="app-portage/g-sorcery[$(python_gen_usedep 'python*')]
-	dev-python/sexpdata[$(python_gen_usedep 'python*')]"
+DEPEND="app-portage/g-sorcery[${PYTHON_USEDEP}]
+	dev-python/sexpdata[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 python_install_all() {
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 370b16de6248..1dcacfe7298d 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,7 +1,6 @@
-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
+AUX iwdevtools-0.10.1-diff-off-by-one.patch 674 BLAKE2B dd43504fb924a4a4300d93af80c704a043ed5c5819bad64394bae1c52ba9c5f3b09bcc520798369bfac591a1233a1689d6845e5951285af19c40dafb7ea46264 SHA512 80029ec4559b2dd067e99eb0aeab6c366563fcefb6215d9e8df24e4b435e888d735b0675e34e63a2c9bb7e80958b4c4b11e31d8f855aaec436e47dd8b373a8e2
+AUX iwdevtools-0.10.1-ldpath-regression.patch 840 BLAKE2B 9276d0c413bd377bc97856653eb1e8037a6a41efda68d287d91ffa19c30d986106af2ca862cb9372e6a0a80caf073b371e73058d57653405f7147e8e34ef7322 SHA512 26f58b46f70d9646bcb7f6f5e4279cb1be73b5b12cb0a47bc0411ec076ba822df2e212a7756505845e005e138b1b9989073d4c842f710d53d200715a72b20e03
+DIST iwdevtools-0.10.1.tar.gz 61117 BLAKE2B fd5508a40a854987db7f2ecc0e68e100cd6a8b6cc5b90a9901bbf6c16336ebc497861e05a6c1683ac9082aa9f12a03cb47f7116da793fbd8e105ed78aae2bbb3 SHA512 0f04850f15edc8af368a87bbc665c62d5588f4220c2d15ca5c0dd00d2c8135f7e1294217c8aec313650b7b7aae6433b87bdc32306c2c4c6e6747e55a13adbbe0
+EBUILD iwdevtools-0.10.1-r2.ebuild 1934 BLAKE2B 6951b7759792620ba78862fd5778443908eb878f74101c815ebef0bb6ca43a1689dc7e956e68c1a10e2f826c97816bd5c78967b5ee3ff063a155c57fe623bbaa SHA512 836a82348993825368380e924e0c8b9cb32898dcedd293904eda8e5fe6e10a16f7dd563ea96a261393ce59147efc8478b17f2bf9ea93cd8247210cd7d9a574a3
+EBUILD iwdevtools-9999.ebuild 1763 BLAKE2B 3309b1c749853a52d612cce50c3053596c22327854d6541e51ce72b636c63b7cfce21feeaedc115885eb06803a0988fd5624ceffb5cd7f64577247f2811344ad SHA512 5106ea7d1d23621ad510eb26a44e5b5b97daa3260c1b610a40348d37045b9719554b98aba72f573ccf34c1f6f271a046395e00f471bb02420494985adf66575c
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/files/iwdevtools-0.10.1-diff-off-by-one.patch b/app-portage/iwdevtools/files/iwdevtools-0.10.1-diff-off-by-one.patch
new file mode 100644
index 000000000000..87564b0b1445
--- /dev/null
+++ b/app-portage/iwdevtools/files/iwdevtools-0.10.1-diff-off-by-one.patch
@@ -0,0 +1,20 @@
+https://github.com/ionenwks/iwdevtools/commit/74d7b913a9bea5cfbf59e451d8db4a4c6140cba8
+From: Ionen Wolkens <ionen@gentoo.org>
+Date: Wed, 16 Mar 2022 09:51:00 -0400
+Subject: [PATCH] qa-vdb: fix off-by-one in diff output
+
+This wrongly assumed f1 array was always at least as big as f2
+
+--- a/scripts/qa-vdb
++++ b/scripts/qa-vdb
+@@ -203,8 +203,8 @@ vdb-get_libdiff() {
+ 	# create combined output
+ 	local -i len=0
+ 	local o mark changes=false
+-	for ((i=0; i < ${#f1[@]}; i++)); do
+-		: "${f2[i]:=}"
++	for ((i=0; i < (${#f1[@]}>${#f2[@]}?${#f1[@]}:${#f2[@]}); i++)); do
++		: "${f1[i]:=}${f2[i]:=}"
+ 		if [[ ${f1[i]} == "${f2[i]}" ]]; then
+ 			${O[full]} || continue
+ 			mark=' '
diff --git a/app-portage/iwdevtools/files/iwdevtools-0.10.1-ldpath-regression.patch b/app-portage/iwdevtools/files/iwdevtools-0.10.1-ldpath-regression.patch
new file mode 100644
index 000000000000..5a5312639979
--- /dev/null
+++ b/app-portage/iwdevtools/files/iwdevtools-0.10.1-ldpath-regression.patch
@@ -0,0 +1,22 @@
+https://github.com/ionenwks/iwdevtools/commit/4e89c42455330b6660583ff1a4b54384346a123d
+From: Ionen Wolkens <ionen@gentoo.org>
+Date: Fri, 25 Feb 2022 04:20:17 -0500
+Subject: [PATCH] qa-vdb: fix ldpath include regression
+
+commit dd0bb44a3b190c756ce55c190b70f33bf350b7c5 was meant for
+directories, however this is /not/ a directory. As a result
+gcc's ld.so.conf wasn't included which could result in:
+
+ * VDB: detected possibly incorrect RDEPEND (app-text/qpdf-10.6.2)
+ *                > cross-aarch64-unknown-linux-gnu/gcc:11
+--- a/scripts/qa-vdb
++++ b/scripts/qa-vdb
+@@ -674,7 +674,7 @@ _vdb-set_ldpath() {
+ 				path=${1%/*}/${path}
+ 			fi
+ 			for path in ${path}; do
+-				[[ -d ${path} && -x ${path} ]] || continue # ignore bad includes
++				[[ -r ${path} ]] || continue # ignore bad includes
+ 				_vdb-set_ldpath "${path}"
+ 			done
+ 		fi
diff --git a/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch b/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch
deleted file mode 100644
index 4cbe6712140a..000000000000
--- a/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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.10.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.10.1-r2.ebuild
index a667742fb6d0..c4d90017aac1 100644
--- a/app-portage/iwdevtools/iwdevtools-0.10.0.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.10.1-r2.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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -27,6 +27,11 @@ BDEPEND="
 	|| ( sys-apps/util-linux app-misc/getopt )
 	test? ( ${RDEPEND} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-ldpath-regression.patch
+	"${FILESDIR}"/${P}-diff-off-by-one.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddocdir=${PF}
@@ -59,10 +64,4 @@ pkg_postinst() {
 		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/iwdevtools/iwdevtools-0.8.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
deleted file mode 100644
index 020799722038..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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"
-BDEPEND="
-	sys-apps/help2man
-	sys-apps/util-linux
-	test? ( ${RDEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
-)
-
-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 [[ ${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/iwdevtools/iwdevtools-9999.ebuild b/app-portage/iwdevtools/iwdevtools-9999.ebuild
index 377e0ed0f31c..3f6545af3e21 100644
--- a/app-portage/iwdevtools/iwdevtools-9999.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-9999.ebuild
@@ -59,10 +59,4 @@ pkg_postinst() {
 		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/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index df900882ac14..4e0c169d03dc 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,7 +1,5 @@
-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 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
+DIST mgorny-dev-scripts-14.tar.gz 10869 BLAKE2B 674f20874b1815d6c5e2e507f33e86da8dce5c2024cc77b66a47bfd0203718ae149729c3ed5d70714f89e5e754b3b68f2d0c2f0cbc40505e51fc2d352e823e7c SHA512 57822f981db90b9e4b1ea14a6117e14ab8d6668b6d01e63c719637b870e5ddae3c1fd9bf7aed27618c42c12df8c40476c96de36d6c753dfbae92a1d0bf7d3b8b
+EBUILD mgorny-dev-scripts-13-r1.ebuild 675 BLAKE2B e04bb5b1253c790d68c2566458eebb4dd02ec2971cab0140ddbd6d7734d32ca8a02098910fc5afbe1ce9946dae4255421af83f5924c4ca637b10675cd2987f4f SHA512 febefd52c6747ad3695d18ae6f03e0b31984ff80dfd5d4ca6d7f10e1c18abb6db07a0a1b1e8b0522da429dd7b8db44ccde696bf36b5aa69ca816cb4d76622668
+EBUILD mgorny-dev-scripts-14.ebuild 659 BLAKE2B 357641acbf5864e216858116b6e1efd3ef672d37d3b60bace922a79f72b8f11ace506c7b5f41b2a8dfc17eeb2741fa3d4c65997639060f0dace96c4f21db6b5d SHA512 c4dd773ce868cd8416af70c9fc51b867600403f3a7f57ce97d480ebd816c34e7f8fbdb54fc8f38121a73317ce84270c694484962313b6f6767917802e4e7d36d
+MISC metadata.xml 272 BLAKE2B 583272860b0b9615e8d57fed7ced1a93035bf0c25285d230412ac7af2e48a8156c2e9d9c0581da80f913a2748eb76579b64648fd1e22ce0bc89da66aafa30809 SHA512 19c90c888b76564e32674364a753ba2d6a0b9ce6f3a97f45bb876c32f83c8206e6ec318e0960747b2003a4c3a426994f25c6b83da8b294d575f45e80c6105d89
diff --git a/app-portage/mgorny-dev-scripts/metadata.xml b/app-portage/mgorny-dev-scripts/metadata.xml
index 076793e3f54b..996eb9fa78a2 100644
--- a/app-portage/mgorny-dev-scripts/metadata.xml
+++ b/app-portage/mgorny-dev-scripts/metadata.xml
@@ -5,4 +5,5 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-11.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-11.ebuild
deleted file mode 100644
index 61e26b0344e0..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
-SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-12.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13-r1.ebuild
index 61e26b0344e0..5b5fe99fba2a 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-12.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,10 +9,11 @@ SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	app-portage/gentoolkit
+	app-portage/repoman
 	dev-perl/URI
 	dev-util/pkgcheck
 	dev-vcs/git
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-14.ebuild
index 3353890244b8..0ada4ceeb0dc 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	app-portage/gentoolkit
@@ -19,7 +19,8 @@ RDEPEND="
 	net-misc/wget
 	sys-apps/portage
 	x11-misc/xdg-utils
-	!dev-util/pkgdiff"
+	!dev-util/pkgdiff
+"
 
 src_install() {
 	dodoc README.rst
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index 9259047ab789..7358f15ab3bc 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,4 +1,7 @@
 DIST nattka-0.2.19.tar.gz 93800 BLAKE2B 65efff2454cdb24f3b71dc5713adbf3bda3976ed958622f7adec14e3708a53531aac6801e838fd21346ce02974fa79bcb82c3f4d2a6555095fa8d81db9ad2992 SHA512 7508a78fa774a9229caa573426839ec84210e9a2d38b7ca9cd47d857b9922b946e9e31fadf946f001565ce6dc65103bca8af58935d7eb2fcf32da423345ce61a
+DIST nattka-0.3.1.tar.gz 95368 BLAKE2B cefe8236694ceffe9adf3c5af9c8c3521613fbc09b6e27804ee855a376f940baa5e7bf3d6d5d62371d37cea090748ec7053963dd675e88b9cedb48d595425ff4 SHA512 14b04b2f6fff41cc9705afe5cfc522a3009b14afa4ff5759c1913387afd04c97231fe2ad5661cef43c5ebfe764012cec251fd78463bbca924fbf33068a31aaee
+DIST nattka-0.3.tar.gz 93914 BLAKE2B c38ec336ed202e508e1cb4bfcae0586b94a6fd55df97d5be514caddf0113b9588496492ebc68dbda45c4a3034451368d32a3f53f5ebc8f3136515614ac70ecab SHA512 390b276ab11e5de056e165f95574b5a97edbcad3adf876e20bb6ef8accf94629428c4fc60bbea4eaf883d5e0a9f6e7ea00aff74989d31bdd59c418041d9164dc
 EBUILD nattka-0.2.19.ebuild 875 BLAKE2B 24bfcc07d615796c60c42dd28359891c30b1d2a6f05e263260062bcf359abb93df2053a953c3aca10712d520736b2c541a2c58040e5f253c399024510a6aaa53 SHA512 3182ea2999de12771ed47e91d9a84a39fb0f949ac9a14fa22ce2c7a699f97eb9bdd90a32c4ed1f9772a6d2f67f0dbe1a92e114c4e4c0f9180f6cc4a31b043149
-EBUILD nattka-9999.ebuild 818 BLAKE2B 2532291ee841df3052269b4cce9dd5ff17777ef2f2364e1e55c17be1462095e9002648d43f4e7e155e8ba4ff086fd05dd02f81fe336876ea18cf57cf1c6e7f43 SHA512 a8449aa98fbd5b0501e4fd1f91bb7df96f717efbf32acbecc349beba84ceaadceeef9ca9ac300e289de1df33f7d1a0507c038d2ee72b7dfc62533c95c0f9b9f4
+EBUILD nattka-0.3.1.ebuild 960 BLAKE2B f7412a4ebd6c873ce7cb9e0c26f50d7f7bf61c58aa46d775f9241b48a78c2c3744951023ac11c82ee6938d5ba8f5dc978afc3db08cd9a9a3fd4f2d08c4c8b071 SHA512 04b119abf893e5cbacff7a0d44bd529532f3e03905c0d356b9d45c04102eb012c5b257567fc02eb7202a3ff95ce4ab3593da6a3c9ef1d983c45b92e19371bb84
+EBUILD nattka-0.3.ebuild 912 BLAKE2B 06830bc583fed8ca0d18946ba3f17cc90b7bd3ece16002e23ecfb01d4efcf086ee102370e96ad3beae4ae8cd9ffacb01ab00c20615c93494e44446ac84170faa SHA512 ef7bae9fab8841793c83023d791ddcef4a64bf00504ca54535631254b1406282bcc0caa79a231bfe05f155b8ed5c41cc316ba32a5ea94c56abc7b73058aacd98
 MISC metadata.xml 385 BLAKE2B 97f0d4b35764704354cef28141e2748cc081007a35ba3bd1a6e910a7f57b063e4c3f6b7340de9d9f7238b56bfb49fc5a9ddbd868a64402633fef00839ef5c1c0 SHA512 a441b1042c972d3b1f31be7f7fb3e21fec98a89fa1a9a583e3e19c996c561d36ba29f315098170d02f13b185f78fcf522ea5332dabf6dd2139fce08fc45256f0
diff --git a/app-portage/nattka/nattka-0.3.1.ebuild b/app-portage/nattka/nattka-0.3.1.ebuild
new file mode 100644
index 000000000000..21887d3d2c57
--- /dev/null
+++ b/app-portage/nattka/nattka-0.3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
+HOMEPAGE="https://github.com/mgorny/nattka/"
+SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="depgraph-order"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-util/pkgcheck[${PYTHON_USEDEP}]
+	dev-vcs/git
+	sys-apps/pkgcore[${PYTHON_USEDEP}]
+	depgraph-order? (
+		dev-python/networkx[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/flit_core-3.7.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
diff --git a/app-portage/nattka/nattka-9999.ebuild b/app-portage/nattka/nattka-0.3.ebuild
index 62f83dc85154..92798cde8626 100644
--- a/app-portage/nattka/nattka-9999.ebuild
+++ b/app-portage/nattka/nattka-0.3.ebuild
@@ -1,18 +1,20 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 git-r3
+
+inherit distutils-r1
 
 DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
 HOMEPAGE="https://github.com/mgorny/nattka/"
-EGIT_REPO_URI="https://github.com/mgorny/nattka.git"
+SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="depgraph-order"
 
 RDEPEND="
@@ -23,12 +25,13 @@ RDEPEND="
 	sys-apps/pkgcore[${PYTHON_USEDEP}]
 	depgraph-order? (
 		dev-python/networkx[${PYTHON_USEDEP}]
-	)"
+	)
+"
 BDEPEND="
 	test? (
-		dev-python/networkx[${PYTHON_USEDEP}]
 		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_sphinx doc --no-autodoc
 distutils_enable_tests pytest
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index ff155ba33bdc..759329a4ea87 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -2,5 +2,5 @@ DIST pfl-3.1.tar.gz 5521 BLAKE2B fdc6e82c5d61d694a188c479b0566aafc507bcc2bbd1f17
 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
+EBUILD pfl-3.2-r2.ebuild 1270 BLAKE2B 0ba80c1c509b78f73faf66e8981b24f23a4d3018f453bd4224e45e68e9aff704f3342c9f62b9931b215a1f56928dac97c8a228c844fdc44f1c788b95a0f6c2ea SHA512 97db8c180a24c966757538789e67129118d87f8bd0a2b20378151dc36d5ff4a2d23ddf86fffe3fbed79d641d94861abc32f6564ea56a4e7ea8e27c4c32f3ea2d
 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-r2.ebuild
index c7efacdcd5c1..a6828df22df9 100644
--- a/app-portage/pfl/pfl-3.2.ebuild
+++ b/app-portage/pfl/pfl-3.2-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1 systemd
@@ -20,7 +20,6 @@ IUSE="+network-cron"
 
 DEPEND=""
 RDEPEND="
-	${DEPEND}
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
 	sys-apps/portage[${PYTHON_USEDEP}]
diff --git a/app-portage/pkg-testing-tools/Manifest b/app-portage/pkg-testing-tools/Manifest
index ffd52dfc4a0b..2fb5b1f2c9f9 100644
--- a/app-portage/pkg-testing-tools/Manifest
+++ b/app-portage/pkg-testing-tools/Manifest
@@ -1,3 +1,3 @@
 DIST pkg-testing-tools-0.1.0.tar.gz 6131 BLAKE2B 6d8dddb81e57159df9f2e1897718433d29f330286afb868a1111db4e0bb7a53823df57a5d7084a24fd5807787f169fff137f5c6c0bdcddeec2c59090d9b90775 SHA512 05165d3790b4d38c939226d1149c0c44cd62fe222a199bce8f1e108d12475710f8482f82e2e2e45223ba24fd1b50451dea8b3761c8f474a59e660b9a67bf8ab4
-EBUILD pkg-testing-tools-0.1.0.ebuild 475 BLAKE2B 3d30ccaf52f71a82f07170b852cf2040be7de86d3cc2fa8ae3b4c33d69e7879c7bbd8ea2f30d606f80cbc38bd48d82feafcf0410a3a7f953ef1b56b1388530bc SHA512 2e2a7274f21b5aabe70a90f1bc58829c9679656da83f23e44bed72c904909bc02682967cb201aa264a4f62938400d8b238dc45ae5840871ffb87bfce000f54c8
+EBUILD pkg-testing-tools-0.1.0.ebuild 482 BLAKE2B 15045e465b1ad3e7f64230ab0ca93e023ec0abfaa16db5d5030cce9cfde6c488ee227696db5dac0c31ae88d57eb5d0e424c25b5940012c45ab03ec6df7dc9009 SHA512 b92798bbd0c16d4fe7dcae5999d4a941f12d154b6ad16842bc584d45deec7b16e0c7a9330e128381d8ef03b99cc056ca43a53393d468d6030dc814ec8ccf58be
 MISC metadata.xml 346 BLAKE2B 3722dffc5927806f50a95438483030320544f0ba1c23dc286373bc801241416eb54269849de2fa9dbcd7921607f52baf63d6ee3dc509a5c1270895d9e8dbc450 SHA512 f41ac37cdfba066c194e16d89e2741a44388e8811cadd601811e858452c6c848dd5463b499a674f40c24250ee5aac98ba774fc227994f3ebca307700b6901377
diff --git a/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild b/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild
index 5ff3aab7cbab..ad95483225e8 100644
--- a/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild
+++ b/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/slashbeast/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
diff --git a/app-portage/recover-broken-vdb/Manifest b/app-portage/recover-broken-vdb/Manifest
index ac1e5eff008f..d86a6d54fb71 100644
--- a/app-portage/recover-broken-vdb/Manifest
+++ b/app-portage/recover-broken-vdb/Manifest
@@ -1,6 +1,4 @@
-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 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-0.0.9.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.9.ebuild
deleted file mode 100644
index ce233e99dd61..000000000000
--- a/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Check Portage's VDB for internal inconsistency on ELF metadata"
-HOMEPAGE="https://github.com/thesamesam/recover-broken-vdb"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Require latest version of pax-utils to avoid users breaking their systems again
-# The tool itself works fine with older versions
-RDEPEND=">=app-misc/pax-utils-1.3.3
-	sys-apps/file
-	$(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]')"
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index e701e55575e0..4baa9e1a9606 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,11 +1,7 @@
-DIST repoman-2.3.23.tar.bz2 87108 BLAKE2B c1190433bd8aedf59e1ddf192dd14cca13e3bdae7367decd6bf64a79021f54a63f21ec49d5737b90c46be3894f4d3ff11bf5bd2868c9ebf65e44b4eb3bb4eee0 SHA512 9d01fadc5820501a9bfb9c1b6d9634ecbc14aacdc448bb440d1e37d47f7e4bcdea8269f8ba90e3783d84f31121870a9d7b165f58b78f0d0f0f4e822a25687d1b
-DIST repoman-3.0.2.tar.bz2 88258 BLAKE2B 32c4d6750fd225cf9fc071be0ffbb38563ffdaf50f1f1ac7247ce3733bd781cd699052101df8b6565fd3d32ec6d9a54efb611b815a722b7954d8100ce01de146 SHA512 fd5b4549a0b108ed1ad37fc0766fc73db127bba8b023a74566ee0167e2a9c56c8597b83ead16522aaf84f158a9a5d0d59e4b5bcc908e6024724c087c837e1fa2
 DIST repoman-3.0.3-unit-test-bug-779055.patch 4153 BLAKE2B 80dd075ca2930f5b14be72eb46d92f83804a87f0ad43b1970cba5b086b5925a0ff9e9b00abcac23f50175ca59a272d7f5b73a051e79ed170511654a0237e0d7b SHA512 badeb6435495a716d0e7a00790bf12fe68031c7207b8fc53a50538adc1dd6a57aa628d8469b924519501b27c39088f316fe018c1ffa3a8d099a34d9dc1bd1d71
 DIST repoman-3.0.3-unit-test-bug-779967.patch 1205 BLAKE2B f8ff8f98031dcf93ff2812c2e5416d6f731adb948dd8c62304443dc401ab0c7e21a25d59a951fe3ae35e417cb8e0badb2863d97e6d9ff6cacba4ee17054f2dce SHA512 b82ec000d73e93949aa7150005556cff9c4ef7ee11a06b5456af375ea7cf81985f91b0a152d40767a1cd768f30cb1d155d01adfe0e15ed49c9f50ab03c33b808
 DIST repoman-3.0.3-version-bug-779508.patch 1887 BLAKE2B bc3a49266fe64d55ec95537196cb4fd3881bfdfd2a6bd30bc0e55ced674d4a12688264a3802f3f72ac291c108ab1d81c45fd0571dc0f2a6b0af8a05177d873b4 SHA512 75c41144e18833e7e46aeb9d57ea4ca29019701d5522be827ea28db2238baa6cf0b220461aba01bcfa7b42d979e2b284613d76a099f8a34eedd62d619df82dd9
 DIST repoman-3.0.3.tar.bz2 90373 BLAKE2B a4ea542c452d44b1f4aef235d67390b0a0f139f32da33ab9ad8992797965724f4ef8123a49b681e9205b6e3fe279dd248b65b0119659b7a0038fe9884bec0797 SHA512 09855a8a0098482c1ce0a7f50d2481528e713fb6796a4004475c841de59f9df8d264f2e9342fdaee87c71d275137234b7e3adc3454f7f33dcf75e32a0ae3f0e9
-EBUILD repoman-2.3.23.ebuild 1938 BLAKE2B 54c79d7a62e3ef16ef068c6e09cfde0193dcaf3521e662386726457ec95be61fc51d2e5aa3e227f2054b2d646e75ea6cee484be0b9a8c61a55297dc96c1e363c SHA512 2cc9e9f701c97e4caae34950249920a380d86be7268241faea551d6b198049fbfe9fc623a8905861533977000c9b4f45fcaf12edd03007b6fa1508b1d3ac2c94
-EBUILD repoman-3.0.2.ebuild 1944 BLAKE2B c277bf0e07c9c24fd74689ace176c50c1eaf68b86d813fedacef3fdc681e961260175494affaa8c9d923466ebf598bf79ceac2680652645296909467aa7a39b4 SHA512 cdd803942694a76f348a6214599dad241462f6a85446d8cf841e5c2b7772ff417c824db7121d3b2160f1fa26b0e16f3bcdeb6590e43288b324753f7547e3ec59
 EBUILD repoman-3.0.3-r1.ebuild 2638 BLAKE2B 564efc81ef162f1130477fd6d15613e60904aa9f2d113cc49b550d48c1cae40a8a83f45c40bf124bf4b3a378c2601259538d52b8e5cf4132f64436a838da8f9a SHA512 7f4f06ac07c0ee1c9d52318d5e1d5709dc0f63707bb14b1fc57734a2fbf30c20635f0a8010b338ba93379f2281727ca96a2b5a4067f135760828f2a0108e9b93
 EBUILD repoman-9999.ebuild 1986 BLAKE2B f392c8de0be23a3161eb0141afb91d6669b050f83835b948283f6dce6d367a0cd5f1a7d5f27484f07915fa6caf1313d30a60424330703cdfb46715af32c4538c SHA512 7c3cacbca70f4660f5621d8227d96920c1b8663adcd45cd18f04781e799d910a6fd6e16cc50d606b9a68a84c6d0e9b2e2a39ca2194bffce346982b5a120fb8c9
 MISC metadata.xml 473 BLAKE2B e115ce6e127efb1578b490ad1ef7972faf86ce41db82aed02cf5a4be79ca33e3734b95fd46e599039a02fba8cfd7bf33564c89f4f31fb6fddc53165c945612c2 SHA512 0cb95b5b229551e75cd5cd0d2c0ee731366bea0070a975c4e3f0af9c7658fb0165758dec51c6223474beaa6d6dee746581ab5da2457995a1fe67ebabed60d235
diff --git a/app-portage/repoman/repoman-2.3.23.ebuild b/app-portage/repoman/repoman-2.3.23.ebuild
deleted file mode 100644
index b3feb3e073da..000000000000
--- a/app-portage/repoman/repoman-2.3.23.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	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
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.80[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog ""
-		elog "This release of repoman is from the new portage/repoman split"
-		elog "release code base."
-		elog "This new repoman code base is still being developed.  So its API's"
-		elog "are not to be considered stable and are subject to change."
-		elog "The code released has been tested and considered ready for use."
-		elog "This however does not guarantee it to be completely bug free."
-		elog "Please report any bugs you may encounter."
-		elog ""
-	fi
-}
diff --git a/app-portage/repoman/repoman-3.0.2.ebuild b/app-portage/repoman/repoman-3.0.2.ebuild
deleted file mode 100644
index 51b9c15a580a..000000000000
--- a/app-portage/repoman/repoman-3.0.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	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
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-3.0.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog ""
-		elog "This release of repoman is from the new portage/repoman split"
-		elog "release code base."
-		elog "This new repoman code base is still being developed.  So its API's"
-		elog "are not to be considered stable and are subject to change."
-		elog "The code released has been tested and considered ready for use."
-		elog "This however does not guarantee it to be completely bug free."
-		elog "Please report any bugs you may encounter."
-		elog ""
-	fi
-}
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index 311d6f196dce..bed664bfd100 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,4 +1,6 @@
 DIST smart-live-rebuild-1.3.7.tar.gz 17283 BLAKE2B 9de30e07b7c950c7e0e3d7f20a364ef65028fe425a017cf46de73a4aaa2c82f13359bc8e2d3269ed50b201b95c41af16c6f233576c1176f8c9b6394227bc8e14 SHA512 47111fa0e4ef9630a60b262566166822ac3245338c9cabc9e5959922e6f60cac70087025321fc9946ef7527b02ce7eb25d74e22d045f9e875c82d6f7877feb4b
-EBUILD smart-live-rebuild-1.3.7.ebuild 865 BLAKE2B 666c1c808a76f056df868446ee072614ff7f53b858145a15464c74dd0c943bf3414a24ed37d9123e908cabec67dd5386edab3191a3d6f04daf52f9de3c396b5f SHA512 fcc3f243078b57171a04621aefa462dcde37ee860b3c30e17ae998c679b51e92d5092c401143a2e93b4898655fad7fe5147201abeccf13dae35d9f2abb89589e
-EBUILD smart-live-rebuild-9999.ebuild 754 BLAKE2B 3059fb3c3325ba070f24084b5d62e008582b69bc55e2bce58a3a3c013f80424abc93452846dc2247e3c9bbe2bb8de05ce97114ad2419f59150b8c9d9c1c03193 SHA512 9733aa8e3bfacaac9aea937fe0ededfa6f6cf605a1376eacfcbf722c8a89695ebed0e57ed227e53b8743632842e2b29c6ee69a83cb32a459966fb699ed5d1aa9
+DIST smart-live-rebuild-1.4.0.tar.gz 17630 BLAKE2B 84faabbe702dc05dbd895961dba83b8b8968bafcc5e35bd1b7dc8644f98a904651168aaee081ecb0c101761def2f5d49046116179156e75f6b335a79595d82e6 SHA512 add82ac413c698a430afbb48a7d4c7d0dae26b9d37f01dcbe7f71ee2e2fbc1686ff63c6ea9ae1c24dbc3662d27247bec2ccc002841bd42c4c11729873a49617f
+EBUILD smart-live-rebuild-1.3.7.ebuild 864 BLAKE2B e6b44aaf0772849dd222f19ddd161e53e53d98d63f2e2fad16c711dc2d748358f786be8f3c6d5670a4ad9416a208af748920d18f61966fdb0a6cf86e90c3aee4 SHA512 7beab75a18dff74637faeea311e126355d1248e2c8d22dcfbfc0b5c0dc700e339b62963ce66538cb9ed17e5be0b0feb0e64e66a233d165b5f8248942782ea6e2
+EBUILD smart-live-rebuild-1.4.0.ebuild 815 BLAKE2B 3db90ea2e2deb17fb97f0e166ebd029c83c0e9c4f6a27d8aa0f65f3fc45e4a151751d2e7d8a766755becfd4529e2a57e84812249a4d0f20e29600b0efc82870e SHA512 d7c90f537cc0f53f17517dc9afc5423277c5ef5ea162ba7498119f369581a54105829701982c1943437c007532aff227d4dfe2d3a66e2ac874f8be059efd135e
+EBUILD smart-live-rebuild-9999.ebuild 717 BLAKE2B adbb26e6abe05a7ec02232cf53f4991ecdc535c11fe687fd64f9157dc56ba5dbe1d84445a871cd54bf4516ca83bc090a542d29d22278bee78ef59f3204dffbac SHA512 728948aa46d7d237071cc12b7f857405e84328abc2f31da05461ac58f893c748fe5e5e71bed3b6178ac8673df32feecc472f95effd054c90dda57a8579f67a9c
 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 e4be77e78392..62ac7c7bd7c8 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
@@ -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 ~hppa ~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/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild
new file mode 100644
index 000000000000..70bc47266ae7
--- /dev/null
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Check live packages for updates and emerge them as necessary"
+HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
+SRC_URI="https://github.com/mgorny/smart-live-rebuild/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/portage
+	newins smart-live-rebuild.conf{.example,}
+	insinto /usr/share/portage/config/sets
+	newins sets.conf.example smart-live-rebuild.conf
+}
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
index 22d242d6b73c..0e21252001fb 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -1,28 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{8..10} )
 
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Check live packages for updates and emerge them as necessary"
 HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
-SRC_URI=""
+EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
 RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests pytest
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 08ce22b3f3c3..667108f9d908 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 825 BLAKE2B 21167a3b0e0eedbfa75e22adcd6a5273fdc6706d5e01d74af98a7f04313ae4f3ddc859d7e0a6954e7820e70b462b46c95e492be693a6317d0ea608eb38698cce SHA512 a99f855e9540e941d54876d901152f99037b1b7ce7692d2137682a8d20017cd9b44234bde373a6c11f1e9fbe0165ed1d204efe141d4f925274703824eb4a08dc
+EBUILD tatt-0.9.ebuild 832 BLAKE2B 9fba3294216ec862386b426c0edae9a86d4c9b4f0457242220221cb20725382eddff90195ea2fcf957c8d3059112cb256c2ea6e9ca4bf42277c2eee309813538 SHA512 a14c9acd10e9ffaafd1157566b676ccd54361e1a51aa4a49aa6cf4b4f529ffe5178ed423fdbd39ef15169a0c3b2ac5ad68026e13611b17dbf4bf47b3d257667b
 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 49a38627ef6b..5c41d2d22462 100644
--- a/app-portage/tatt/tatt-0.9.ebuild
+++ b/app-portage/tatt/tatt-0.9.ebuild
@@ -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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+templates"
 
 RDEPEND="