gentoo resync : 09.07.2022

18 files changed, 124 insertions, 157 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 1df7d962aafb..fab021737b6d 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/g-cpan/Manifest b/app-portage/g-cpan/Manifest
index db70900ebb6b..8955b9d09817 100644
--- a/app-portage/g-cpan/Manifest
+++ b/app-portage/g-cpan/Manifest
@@ -1,6 +1,8 @@
 DIST g-cpan-0.16.9.tar.gz 34463 BLAKE2B 7eff6b7da75219712504ac7b9ea1833e9eaa9ba4a49f609baec6407beb16f4764baf2c35e15c779c93ca8c09bba9058e6acb6fda7f3fd2df06296724f2c3c3fc SHA512 f26d81974fedb024808fe3671ae297fd36abc37a5b04783f36f6c9e8c6000a411c675e999e91da48801a7c84fde15a59587df02fa9d7b3833ccc0916993b1783
 DIST g-cpan-0.17.0.tar.gz 38786 BLAKE2B 3f4a165920c7c075919f0eeca9554fe32bd3f72cd8010fced4d7e45aa44e80de7800fb78587d1429ac88643dd812d58725b66fbbdce305bd762db8d4ca2f0720 SHA512 80475560a00fddce31f8a92dd460bd22e0de57445a56628ad76f35ab3fc4d2f801ebd2a2a9542ed675245a994e53bb7ae842f714c35ab1f6bdbc40dd49ce2d86
+DIST g-cpan-0.18.0.tar.gz 39099 BLAKE2B fd04d36706a63b66bf74d247d088397f77e42f8f33d6fcf068ea42601bfb89cca751ea35a6a10977077eeac2f3fd9b21d6f1d9990b87fe8cf60951a639730589 SHA512 bebb6187c80fb5228a6dcaa4dd51d7d9c9bb755e86d637ab1d740e4cbdc09c5b01f3d0b608f3c6b2b27a06e4e433ec77dfe49c6738cdef75f45c1e8231ebd9e9
 EBUILD g-cpan-0.16.9-r1.ebuild 1504 BLAKE2B f8881ff26a8df29ab71c4b7660ab6c79e862ab6dbe9a04ac2732953f073209c95b9ad87dd0099e47f76a2fc81b88073228ee63afa8ee8455b884d22a8a031529 SHA512 47e87d0d6ab7873db87f3cbc8c47e519b392af1ea05a52ac6c11d612794aecfa2a63b87ea00960d4eded7ce845c6c275599b24baf437963bfa05d143a3851f26
 EBUILD g-cpan-0.17.0.ebuild 1552 BLAKE2B cb4c8fc80e95b56311039f56b9815e8b25444b692150dbdd4c6e761b62e747dff6fd54c1dc3c017d293c80cf16a238c7a1be2d16e404fc124d32345c28c7e35a SHA512 022b215dc0e330d2042cbc63426ea56bc42c2bb4e393db5721f51c436662bd21159f65310ce07cdb047492dd62533fc98a0a08e118ec48afefbe0c028b305c40
-EBUILD g-cpan-9999.ebuild 1552 BLAKE2B cb4c8fc80e95b56311039f56b9815e8b25444b692150dbdd4c6e761b62e747dff6fd54c1dc3c017d293c80cf16a238c7a1be2d16e404fc124d32345c28c7e35a SHA512 022b215dc0e330d2042cbc63426ea56bc42c2bb4e393db5721f51c436662bd21159f65310ce07cdb047492dd62533fc98a0a08e118ec48afefbe0c028b305c40
+EBUILD g-cpan-0.18.0-r1.ebuild 2007 BLAKE2B 497e756d8f7b941ac52b3df646f2b0eb67e1f07895c8b5d2bc79fcd32cb663ca02c7b6b9fd4b191488913d2535771fb11b7204dc799c72d432a1d8aad490860b SHA512 0c09b6dcb02f584285240209f229f4df505e09d981551f3b6c119a7deaeafbdd94b2765058baaa9fc6ead1d7cec7aa719cf542441dded7965950c3d7a1d82029
+EBUILD g-cpan-9999.ebuild 2013 BLAKE2B 1b2ab97c270643cff7a7be76b5c0a019b2cfe7aa0c11d58e490f8ac7774865924cb5899d684d744adf584256e5407166acd065add5c0ade4757060ba67f2806e SHA512 59bce9e18c20a105f1e9747b8d20fda72fa9a1db7a4ff118bb0effcb7c20d1098df677ae3a4b1ae3a455f309fbd61639273f35373d04ba4ea11a72de2c3dc542
 MISC metadata.xml 480 BLAKE2B c438c0267eb220d45dbd24a611c246e528059c50b12f03e9c42a84b9352b54a15542033b72c6da41207de7c6b84652a96e2bc76706f3f99691a8012f944d4a20 SHA512 dce5096008dff924c9c2856b379b1c101db447cf96626042846931ee1d5e96844cc6376da8d9c918677ca625870f1d2ec25da7dd307994dc46369b07dbaa9926
diff --git a/app-portage/g-cpan/g-cpan-0.18.0-r1.ebuild b/app-portage/g-cpan/g-cpan-0.18.0-r1.ebuild
new file mode 100644
index 000000000000..01a9e11c8b90
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-0.18.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+fi
+
+DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-perl/Config-Tiny
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	dev-perl/Log-Agent
+	virtual/perl-Memoize
+	virtual/perl-IO
+	dev-perl/Path-Tiny
+	dev-perl/Shell-EnvImporter
+	virtual/perl-Term-ANSIColor
+	>=dev-perl/YAML-0.60
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/portage-2.0.0
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.940.0 )
+"
+
+src_install() {
+	perl-module_src_install
+
+	if ! use prefix; then
+		diropts -m0775 -o portage -g portage
+	else
+		diropts -m0775
+	fi
+
+	dodir /var/tmp/g-cpan
+	dodir /var/log/g-cpan
+	keepdir /var/log/g-cpan
+}
+
+pkg_preinst() {
+	has_version "<app-portage/g-cpan-0.18.0-r1" && HAD_EAPI5_GCPAN=1
+}
+
+pkg_postinst() {
+	if [[ ${HAD_EAPI5_GCPAN:-0} -eq 1 ]] ; then
+		ewarn "Please re-create your overlay with generated g-cpan ebuilds!"
+		ewarn "The old ebuilds will use EAPI 5 and be incompatible with newer"
+		ewarn "Perl eclass changes. This newer version of g-cpan (0.18.0+)"
+		ewarn "generates EAPI 8 ebuilds without this problem, but it cannot"
+		ewarn "change existing ebuilds. See bug #819513."
+	fi
+
+	elog "If you want to use g-cpan as non root user you may wish to adjust"
+	elog "the permissions on /var/tmp/g-cpan or add users to the portage group."
+	elog "Please note that some CPAN packages need additional manual"
+	elog "parameters or tweaking, due to bugs in their build systems."
+}
diff --git a/app-portage/g-cpan/g-cpan-9999.ebuild b/app-portage/g-cpan/g-cpan-9999.ebuild
index fca42099a130..d37683277b73 100644
--- a/app-portage/g-cpan/g-cpan-9999.ebuild
+++ b/app-portage/g-cpan/g-cpan-9999.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit perl-module
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
 	inherit git-r3
-	SRC_URI=""
 else
-	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
@@ -22,7 +21,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-COMMONDEPEND="
+COMMON_DEPEND="
 	dev-perl/Config-Tiny
 	virtual/perl-File-Path
 	virtual/perl-File-Spec
@@ -34,27 +33,43 @@ COMMONDEPEND="
 	virtual/perl-Term-ANSIColor
 	>=dev-perl/YAML-0.60
 "
-RDEPEND="${COMMONDEPEND}
+RDEPEND="
+	${COMMON_DEPEND}
 	>=sys-apps/portage-2.0.0
 "
-DEPEND="${COMMONDEPEND}
+BDEPEND="
+	${COMMON_DEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? ( >=virtual/perl-Test-Simple-0.940.0 )
 "
 
 src_install() {
 	perl-module_src_install
+
 	if ! use prefix; then
 		diropts -m0775 -o portage -g portage
 	else
 		diropts -m0775
 	fi
-	dodir "/var/tmp/g-cpan"
-	dodir "/var/log/g-cpan"
-	keepdir "/var/log/g-cpan"
+
+	dodir /var/tmp/g-cpan
+	dodir /var/log/g-cpan
+	keepdir /var/log/g-cpan
+}
+
+pkg_preinst() {
+	has_version "<app-portage/g-cpan-0.18.0-r1" && HAD_EAPI5_GCPAN=1
 }
 
 pkg_postinst() {
+	if [[ ${HAD_EAPI5_GCPAN:-0} -eq 1 ]] ; then
+		ewarn "Please re-create your overlay with generated g-cpan ebuilds!"
+		ewarn "The old ebuilds will use EAPI 5 and be incompatible with newer"
+		ewarn "Perl eclass changes. This newer version of g-cpan (0.18.0+)"
+		ewarn "generates EAPI 8 ebuilds without this problem, but it cannot"
+		ewarn "change existing ebuilds. See bug #819513."
+	fi
+
 	elog "If you want to use g-cpan as non root user you may wish to adjust"
 	elog "the permissions on /var/tmp/g-cpan or add users to the portage group."
 	elog "Please note that some CPAN packages need additional manual"
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 98197a0083bc..98e98c15fdee 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,10 +1,10 @@
 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
-DIST iwdevtools-0.11.0.tar.gz 81975 BLAKE2B 241c04488cc3da265c1c5a0cbf90ddb938b4e0da10942094f25dcb1d32a0da314a80fba1fc99b1ec54a449905be8eddab896d67194d8e511c1a7378856fd7df2 SHA512 cccbe9461f27233e228529a5fe9c729620647b1e134c723f407bdd23b4fa85f04c6294fc6579a22667dec65b20ad1c26ac9d71b214407c49463aeed6fbaed7d1
-DIST iwdevtools-0.11.1.tar.gz 83067 BLAKE2B 8fbdbe21242ccb3e578a8060ced5d4562acc70ffa8789991af00ddeaf8cb232177d2482f06f8092d6b60cc128c1b55a3f5df2eaba985f1d63795e6730c2fa1be SHA512 d893efbc75a3fa7056c2dbe5fa75bbbf262f40f8ddd44347e98559ff4e51572b64698c93b8fb3e92e73d84151cf0a11457d58f898295aae05455ac86fd4bd07d
+DIST iwdevtools-0.11.2.tar.gz 84518 BLAKE2B 1d3920b8a1503a916f913d0c075a1f3c703ca238c55761c0cd6423f68e0395e2eb0c8ab07bf069c3cdf44ab9d07b4652184d790d9b74e1f00cb74e8b86290de6 SHA512 7e4584f8f2141b54bf32828801415e039ceec319095268fccb40f4960d66af2504da97fd6f18b1763f6beaef477ac3b6b0bf7ae9bac08a474de73b420ebd5a43
+DIST iwdevtools-0.11.3.tar.gz 84838 BLAKE2B a4f501c24cc70b13ded5ca88599a3c11b076ae3a3464d065fe3999c8cb9268cfd17fc116197c09ddc6b968d7527409b348c0c1bdb939f6ed1b7a2abdfc868774 SHA512 38a62654042b714689fcf813a533ad463b7bdc0a4b501dc37c498e528792104a3db601f82781d889407217c824a9f48233544fb56a012de19fd34fa92d1de06d
 EBUILD iwdevtools-0.10.1-r2.ebuild 1941 BLAKE2B 2f8bb7e3e85bdd622b2cec6b86c8a2ca5f575b0d6a27cae516ce188df5f06e49d0264874271c4ba792feb2173db9239ed77a034e33b6e4323490401daadee9ee SHA512 ad94f0baf09bd0d01bc5478bbfc6a5596cbe3c7839f9d83920b5d34db3bbca5c2c4d1b026940e266357ec7faf33f78377cce9b801bc6cd5c40620b5ebdd8572b
-EBUILD iwdevtools-0.11.0.ebuild 1892 BLAKE2B 199e7b292e2f6afc3526fb223856f3b5f0922f1ca11a51ee2cc336406e028a778361c170e38b60cd5f873e30149d2b5087d06f845204087d22f356ce601c6622 SHA512 c50c52a5c7ed22a0fa724364a7c9bb102ba9e66b04226d882c585b8581966b8fefdcef63fa896d196b45e081284303f348ae162a895771002180f787611274d3
-EBUILD iwdevtools-0.11.1.ebuild 1892 BLAKE2B 199e7b292e2f6afc3526fb223856f3b5f0922f1ca11a51ee2cc336406e028a778361c170e38b60cd5f873e30149d2b5087d06f845204087d22f356ce601c6622 SHA512 c50c52a5c7ed22a0fa724364a7c9bb102ba9e66b04226d882c585b8581966b8fefdcef63fa896d196b45e081284303f348ae162a895771002180f787611274d3
+EBUILD iwdevtools-0.11.2.ebuild 1890 BLAKE2B 4dc6fd1395f96dbd7f0fd6729894cd4666a9a42bf7ef21e06c769f671b30e5f30f0c08386c479a1efbdde7d2bdaf452facce8f11e036f0eb56bf5e725be9e467 SHA512 f70d833f6b63f381befa3097f82640f4b4ba9964404f9ebf0d36c07b25f33d7a0a9fcf9243ebad419f25d0f9f1cc02c437e67326eaa92f80ce6c852537c76bcb
+EBUILD iwdevtools-0.11.3.ebuild 1890 BLAKE2B 4dc6fd1395f96dbd7f0fd6729894cd4666a9a42bf7ef21e06c769f671b30e5f30f0c08386c479a1efbdde7d2bdaf452facce8f11e036f0eb56bf5e725be9e467 SHA512 f70d833f6b63f381befa3097f82640f4b4ba9964404f9ebf0d36c07b25f33d7a0a9fcf9243ebad419f25d0f9f1cc02c437e67326eaa92f80ce6c852537c76bcb
 EBUILD iwdevtools-9999.ebuild 1806 BLAKE2B 90e7cd55d1f57c126a6c59489b4bfacf39266a48875370659693efcdd90fef644bbc21e67ecb21c665000139b28008c3d0979796b7f2f2312ca2deebb3860250 SHA512 56e8546414c77b124a5da1b334833384bf2e78adfc385918f6a05a336d1a22cae705d3e526846b8e7a483f929fb9327288d9527c9c157a607a69c362743d9d11
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/iwdevtools-0.11.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.11.2.ebuild
index c5565f4af071..67662de04000 100644
--- a/app-portage/iwdevtools/iwdevtools-0.11.0.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.11.2.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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-portage/iwdevtools/iwdevtools-0.11.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.11.3.ebuild
index c5565f4af071..67662de04000 100644
--- a/app-portage/iwdevtools/iwdevtools-0.11.1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.11.3.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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 67a3cf5d3e97..0572860a31b9 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,9 +1,5 @@
-DIST mgorny-dev-scripts-16.tar.gz 11300 BLAKE2B f90c9149eb161606415789db12b83d8fd3afe7737aad5d9993ec5de73f7a45e61da8bb8400974d835faab25c19fbca83690905bf1d2da2257cb8d88dfb333d21 SHA512 3c99080eae230527f95a789ced9ce668ff640383f24d7ed4e16c694ff004ef0c65254106e886deec5bee467cce332e10ebfd352e5745e58cbcd37f6040dcb7ff
-DIST mgorny-dev-scripts-17.tar.gz 11380 BLAKE2B 4483efc401fc65c814e6ec5307ebf81a1224199b5138befe618809ddc606aced81e7acbc69f5045512efbcf86b70ea406899bf6a1e2491da0cecf654a25b1f74 SHA512 7b006289d833e12cbb9f4d89c74b807ec72c196386a614e6d67048fd5ba6ae4b907a95ad48acfbc9a01f705ed1b36e9cb8a3465f363213b026f637e5e0f51158
-DIST mgorny-dev-scripts-18.tar.gz 11568 BLAKE2B 976cbc79f2f5fd56793f860fdb52cbf60dd24959c57be80d883b779f24b0a12d3f6a055590a7defc6c1a95d11c6127d11d05d6e4bd3da43e1c7e92e07ab95b4e SHA512 0e328d25e0040d310a9c0858ad69874d288c506159d19241cc8e850627c56c9dfe8721bac3a49b9be5de295df968019c910e6f137691d3eff600430595d10968
 DIST mgorny-dev-scripts-19.tar.gz 11566 BLAKE2B ca6cf6867d402c40844eba9975c1241abdcef05988dd15416b14ec90826a6fe6e56b09dbc579fd96f478dcac805da66759eda3bdfd506cac4ab62f2623b4b33f SHA512 5835e7cc2a49de277a92b53b732357e49e63a0ccd74ede4a763479ffb2efd22566644a7c48c05ab5c6a1cca98b5cbdc993e3ab2d058cd938269d30f483c8ab7f
-EBUILD mgorny-dev-scripts-16.ebuild 662 BLAKE2B 19c9b1e870586b42036e48983021b78c5237ad4492d2819fa74a4c9090f9123dc69aa938dcab8c1d6cd78b637e4820ed34a3233b394fad7d46eba11f82945eb7 SHA512 c26fde3efa808e48b2414ef1f7106ff2d1788c3c868efe50a2405977d060149e7116c8c6f8a5220cb4870ffc28d4b9d3298f57ca9ded609e45be71aa557f055d
-EBUILD mgorny-dev-scripts-17.ebuild 666 BLAKE2B d710ad936e36c317afcd07ecedd163a30c30669e259d0f9379abf123ff8081a178d95c92aa9f05f267bb69173819ae0d8e3ff0a69b53bfd33fd0d05b41672455 SHA512 28fd5a01b940970ee1a5eead332cde991ed0feae7b030aed7cef34b866e75572d6abe9f48c3cbe9ccf89e1444707964d87aa6c5d3a6425f8d775be00315f801f
-EBUILD mgorny-dev-scripts-18.ebuild 666 BLAKE2B d710ad936e36c317afcd07ecedd163a30c30669e259d0f9379abf123ff8081a178d95c92aa9f05f267bb69173819ae0d8e3ff0a69b53bfd33fd0d05b41672455 SHA512 28fd5a01b940970ee1a5eead332cde991ed0feae7b030aed7cef34b866e75572d6abe9f48c3cbe9ccf89e1444707964d87aa6c5d3a6425f8d775be00315f801f
-EBUILD mgorny-dev-scripts-19.ebuild 666 BLAKE2B d710ad936e36c317afcd07ecedd163a30c30669e259d0f9379abf123ff8081a178d95c92aa9f05f267bb69173819ae0d8e3ff0a69b53bfd33fd0d05b41672455 SHA512 28fd5a01b940970ee1a5eead332cde991ed0feae7b030aed7cef34b866e75572d6abe9f48c3cbe9ccf89e1444707964d87aa6c5d3a6425f8d775be00315f801f
+DIST mgorny-dev-scripts-20.tar.gz 11579 BLAKE2B 62a8463388e1edc6341b0d8d7c885fb432f8d2e381b39ff379e882b08ecb759cbc1c8b3de22bdc13388a2923babc9da833317292400ad0fa348da31efca51670 SHA512 98ec7cc92085397005800e1cecb99cc95a33236400c3a4afc82860260e20da0ad0e0ae3877cf9b88ca7e5644a486718fe6d70b3f31632141e47b46b05c725296
+EBUILD mgorny-dev-scripts-19.ebuild 662 BLAKE2B 19c9b1e870586b42036e48983021b78c5237ad4492d2819fa74a4c9090f9123dc69aa938dcab8c1d6cd78b637e4820ed34a3233b394fad7d46eba11f82945eb7 SHA512 c26fde3efa808e48b2414ef1f7106ff2d1788c3c868efe50a2405977d060149e7116c8c6f8a5220cb4870ffc28d4b9d3298f57ca9ded609e45be71aa557f055d
+EBUILD mgorny-dev-scripts-20.ebuild 666 BLAKE2B d710ad936e36c317afcd07ecedd163a30c30669e259d0f9379abf123ff8081a178d95c92aa9f05f267bb69173819ae0d8e3ff0a69b53bfd33fd0d05b41672455 SHA512 28fd5a01b940970ee1a5eead332cde991ed0feae7b030aed7cef34b866e75572d6abe9f48c3cbe9ccf89e1444707964d87aa6c5d3a6425f8d775be00315f801f
 MISC metadata.xml 272 BLAKE2B 583272860b0b9615e8d57fed7ced1a93035bf0c25285d230412ac7af2e48a8156c2e9d9c0581da80f913a2748eb76579b64648fd1e22ce0bc89da66aafa30809 SHA512 19c90c888b76564e32674364a753ba2d6a0b9ce6f3a97f45bb876c32f83c8206e6ec318e0960747b2003a4c3a426994f25c6b83da8b294d575f45e80c6105d89
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-16.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-16.ebuild
deleted file mode 100644
index e607c80581a5..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-16.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2022 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 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 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-18.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-18.ebuild
deleted file mode 100644
index 3b3f636dbc02..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-18.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2022 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 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~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-19.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-19.ebuild
index 3b3f636dbc02..e607c80581a5 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-19.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-19.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	app-portage/gentoolkit
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-17.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-20.ebuild
index 3b3f636dbc02..3b3f636dbc02 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-17.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-20.ebuild
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 4baa9e1a9606..ee41ca6d91a2 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -2,6 +2,5 @@ DIST repoman-3.0.3-unit-test-bug-779055.patch 4153 BLAKE2B 80dd075ca2930f5b14be7
 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-3.0.3-r1.ebuild 2638 BLAKE2B 564efc81ef162f1130477fd6d15613e60904aa9f2d113cc49b550d48c1cae40a8a83f45c40bf124bf4b3a378c2601259538d52b8e5cf4132f64436a838da8f9a SHA512 7f4f06ac07c0ee1c9d52318d5e1d5709dc0f63707bb14b1fc57734a2fbf30c20635f0a8010b338ba93379f2281727ca96a2b5a4067f135760828f2a0108e9b93
-EBUILD repoman-9999.ebuild 1986 BLAKE2B f392c8de0be23a3161eb0141afb91d6669b050f83835b948283f6dce6d367a0cd5f1a7d5f27484f07915fa6caf1313d30a60424330703cdfb46715af32c4538c SHA512 7c3cacbca70f4660f5621d8227d96920c1b8663adcd45cd18f04781e799d910a6fd6e16cc50d606b9a68a84c6d0e9b2e2a39ca2194bffce346982b5a120fb8c9
+EBUILD repoman-3.0.3-r2.ebuild 2682 BLAKE2B 3a78d7007bbd8b790d32fe8f85dbf7b67329e144593cdabbae73d1f662d520746effa3e281a7826e6f1264dc7e08ef13638fcfc61d76621cfd9344c1b0b8b9c5 SHA512 502d6e694b2599c575edef90418f352b8f258efac3ce396cc9240d2f1e166bbe1de5963fd47f041853b525c91fc56affc5d77bf9abcc422464b30d1673a63dca
 MISC metadata.xml 473 BLAKE2B e115ce6e127efb1578b490ad1ef7972faf86ce41db82aed02cf5a4be79ca33e3734b95fd46e599039a02fba8cfd7bf33564c89f4f31fb6fddc53165c945612c2 SHA512 0cb95b5b229551e75cd5cd0d2c0ee731366bea0070a975c4e3f0af9c7658fb0165758dec51c6223474beaa6d6dee746581ab5da2457995a1fe67ebabed60d235
diff --git a/app-portage/repoman/repoman-3.0.3-r1.ebuild b/app-portage/repoman/repoman-3.0.3-r2.ebuild
index 1a721bcc7e8a..13f7e3218bff 100644
--- a/app-portage/repoman/repoman-3.0.3-r1.ebuild
+++ b/app-portage/repoman/repoman-3.0.3-r2.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
@@ -30,6 +30,7 @@ IUSE=""
 
 RDEPEND="
 	>=sys-apps/portage-3.0.18[${PYTHON_USEDEP}]
+	<sys-apps/portage-3.0.31[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
deleted file mode 100644
index 0ba9ff39dfda..000000000000
--- a/app-portage/repoman/repoman-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{8..10} 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.18[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	unset REPOMAN_DEFAULT_OPTS
-	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/tatt/Manifest b/app-portage/tatt/Manifest
index 1a4c79e8c4f4..9423f521f4af 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 834 BLAKE2B e68ffa21b1f0d530b739189bd051cc894be385f340f182259c775174538f8d8c820981c5180f8f7addeec1fd17473b2c4ab6859f68db5fc482facae1e8c0d29f SHA512 7311e61c77c38173cdb8684582515e66c840eb97ce14dc17df7537d8a15c9f3d9be473266994925ce2e46ee69d7ff569418355d4f4f5f55c2bbee0d9b238c791
+EBUILD tatt-0.8.ebuild 831 BLAKE2B 43464d138b5b457e22ec268c01d9298c333753d073f0096e5de8616520c6630ec3ddbc501d987f45a943adcd9426af2d174f35e58114b615c80f153ba966060a SHA512 cb4e4905dcb66e7a602e427b86ca879e587b834e9d8d4b63775a9a9b19ac368e239670b262818fb49c7ae44cef232a42a8ba9059aeeaddb448886292fba68925
+EBUILD tatt-0.9.ebuild 840 BLAKE2B 57e323116cb1cf1889f5d67de15ecaa25b5dea94ccc32573e3d0198a4aede035376dba73853460a556885fa4cf6fcd981107818d6cf22b2886839b304d4f1006 SHA512 e8f1fa1e924b4144e492595a83c8910af696da22ac7d96fd2af0a3888943932f58d7fe447ced5353b816c077478b7c3ee466fad82fc55c9c606007228b7f2c69
 EBUILD tatt-9999.ebuild 765 BLAKE2B d597b7926de4aaff1bf09fa9026dd77bd7522803b77ed6db9917005008ebf2297d5da4080effc13a1f28619c3fcffe33f0a27ad63ce184a2c394ba67cb7b1fd8 SHA512 ab1b5348c2f31a5396224b5c172f2be8852da7c1d341d3ab3adfce6335644b15a73b92e16ad4dcec17e4ecdb4b5644c531464cd692c2f89eee9debfbe7dbb8b7
 MISC metadata.xml 696 BLAKE2B ed42b5e56f6d8024e51b12a3ce5e6ed766b77605ee64d79b2757febc23e1690ef6ef2e2f19d583b16ee1912729560f8b536a5a3b85f8958b23c6e6d75369bc7b SHA512 df7c66f1305a46a0e3a4f2c6b828c8f2b2e51c9de4306f49b6339da821cb9b338112943e079cdf43964d2cbc006aab569f5829042f8ed74620c309fe3452c35e
diff --git a/app-portage/tatt/tatt-0.8.ebuild b/app-portage/tatt/tatt-0.8.ebuild
index 0e71cc61b02e..0ce84ac8d82e 100644
--- a/app-portage/tatt/tatt-0.8.ebuild
+++ b/app-portage/tatt/tatt-0.8.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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+templates"
 
 RDEPEND="
diff --git a/app-portage/tatt/tatt-0.9.ebuild b/app-portage/tatt/tatt-0.9.ebuild
index c241a0bb857e..029254ec28bb 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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+templates"
 
 RDEPEND="