gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /app-portage
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
67 files changed, 515 insertions, 476 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 12a492594f46..1df7d962aafb 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 481571833344..86abc0fe5bd3 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,4 +1,5 @@
 DIST cpuid2cpuflags-11.tar.bz2 83091 BLAKE2B 2225b6031505597050332d50f4cee69aebb263f9def8043fde64b61e7d06bd2b2ab306eab31701434435a5ede1da974004db3d800a9184011595ed5c16422c79 SHA512 0eeff4e6369eaca6ddb516ff95597c649a7619c1ad79b0d73f51ef9f903db55cb7a49c5ccec478c9a923abfcce63e4ee5b6436f08eb9092b0024c898e508750b
+DIST cpuid2cpuflags-12.tar.bz2 84750 BLAKE2B 0f7418eaad406427be02047c06f9a6e3f3b1cd953ef320c1cdf5082d309f6887f1caeb4828761287266e2f527d5bb9d6cd4c8848ac2b47a019d6d156231364f6 SHA512 e415a04b5963eaaf4027dbb191a30d4b3cc93a7708e33ea21f9dfe53ad90e735fc5f298fdfb35e155323391a8b8c6c208d988d5cbad811536ab27764bf1e5981
 EBUILD cpuid2cpuflags-11.ebuild 898 BLAKE2B a6dec0fba9a50f2b6b7664f74beba7672c2de26007754b9450d9e731f4fe18bad441b1213a867c3c9b66056ad9f941244a054bfc281b5bec78c3d5d11311e387 SHA512 a210a71fd02a56d8244939e44605d6a1031d2416743ddb8db1cc5068c4f16ea217a02d40cc07a733f9fc77bdf89814e62b356812c2f8beff4fe32cb144818bb1
-EBUILD cpuid2cpuflags-9999.ebuild 405 BLAKE2B fff9a10b348e61e1af045a39f10aaf81cb6d635d7c87056ab6665018c037b338a03890e0a1dee89f135b56b6805fdde0b2e547e0ab82832ae042c8c28d8bdd3c SHA512 36da5933134753af27f01b833ecf1e2d55c4c55eb58476c32e2de1c2ac6bb51de218e415c7168f97c574b0b2655825f0d981478ef8c17a147a3f38465eb0919e
+EBUILD cpuid2cpuflags-12.ebuild 427 BLAKE2B 8631d464b1b2c43fe0fab4a2853460552136c4b42aa7eda1339cf2a804ee639c4bcd53ccb429fb91b9c4fbd06894040a83b6357cab2dd6ceae91b4a2f9c5ce6e SHA512 a223d43fb970ed172d90a0b86b36b6dc0021fc1e15f011264d1d013f0b1c273867e24e455d80bfafb4c7dd0f9bc98837d6f9103b78b6dbd4d0cf470c231a4222
 MISC metadata.xml 344 BLAKE2B f374f330468fc02f2bb21ba9fb5d5e24ea9537b9f2ed83f8c770e9d60dfc5274e180225b5f362daeac65fd298893f58239a3c300e24d00faf1454584c8478c2d SHA512 2ad0184d5828342cc42f17ff74b6964acdde380ee489f70f90bcb60cf84aae84743b4af6afefe33c923a24d68cb18e2b1087df476ec287ed046d5a487e4860da
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-12.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-12.ebuild
new file mode 100644
index 000000000000..8c199aabf630
--- /dev/null
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-12.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
+HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags/"
+SRC_URI="
+	https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos ~x64-solaris ~x86-solaris"
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild
deleted file mode 100644
index 5192dad1280b..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/mgorny/cpuid2cpuflags"
-inherit autotools git-r3
-
-DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI=""
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-portage/diffmask/Manifest b/app-portage/diffmask/Manifest
index 60ce4d0ecb26..6d8992665d91 100644
--- a/app-portage/diffmask/Manifest
+++ b/app-portage/diffmask/Manifest
@@ -1,4 +1,4 @@
 DIST diffmask-0.3.3.tar.bz2 8605 BLAKE2B a7699dba6b619ff2e64a8148057e06be8d477605fba100b45f056957eb1b55cc50634b698250f68023137bcf01932635c7de798f42edfa1297cc38097e764f44 SHA512 5f28f68dc1adba2fb7b0db5e2a329e46017298de9c44765d521a0f338223eef2a77573636987e942595db9b89b72db93b68cf5b805091b0ebb1e91a18bfcd48b
 EBUILD diffmask-0.3.3-r4.ebuild 544 BLAKE2B 047990aac93ff7ceaee037c9ae1147f2474d2bdd4e024d468511a8c8bb8ad44bcc07a2266b1efeb0a60cb8ac90e424eddd3e4ed3fcb00ca06f975f36aa2a6ed2 SHA512 4831b31221f2427016ae54c163a19d7a4b1c7eb66e338982db14b2a2ea886949ad0b7c2c0d7ce323f51feed36dcaf30c205552317838abd0f69e7a2697adc5f0
-EBUILD diffmask-9999.ebuild 485 BLAKE2B f6d6d44baa235c774238f68383acb09f758760210af2f3772be724f20fc84ece0ada4abf8f95fdc906edca28fb8749cd79c74adf7936b3988d2e143efe4a424f SHA512 5542ccbaa3682f264a0b346a2bda6397bcc0bc1af264481567a5e1c8d9ec7d0a551a94687438dc0f80fbbeb3e19415db46279757072e205af98bb08da009b7e4
-MISC metadata.xml 866 BLAKE2B 3ca38629b0526da8eb440973c033966050c7777cd86b1ebe16541de74921664a352f1466d7dbaf5b78f84de218e3e3fc3c48c1e87325ab70b18d2d3af329eb63 SHA512 f0313dad68a7871ba798020ab058483c6b3de8462db068e7a95c755097425a66b42c8c2b76b1f620f91de5bd63a0915fb2c73bc50a7656d34c2d585cddf3d45b
+EBUILD diffmask-0.3.3-r5.ebuild 544 BLAKE2B 82bca667e0179945fdde82124932af1383d1bb2801aa8e7e11f512cf18d337967567c55a3a3a7c9eb1b54de655390a4509f00f6ac4635ac7a8291d65e3e35df2 SHA512 f163775c9d00a460c3d7d6646d7ed511a1a4fcae7e8b4c45c50f35e402b539dec7a912bc5f724e1dfbd57b731a0b229e1da4c76285e29cd86210ae151ca607a9
+MISC metadata.xml 752 BLAKE2B afe13741c466af0964e8df5675b09dd0951bb4a34b93f3bab8070b1385dff66a50e3013bb455c4c7b5deb32d8b922e9fab8959760692cca28536738001e895d7 SHA512 8b34c7a30cdb16e08df2808ff355b560c68bb674242b83c4f30d363b3d789472383cf40c0160a334f260bb0ced04774c89e091bb08a793b7906118b66424a79f
diff --git a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
new file mode 100644
index 000000000000..e1d32c613721
--- /dev/null
+++ b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
+HOMEPAGE="https://github.com/mgorny/diffmask/"
+SRC_URI="https://github.com/mgorny/diffmask/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]
+"
diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
deleted file mode 100644
index 413a58f1d2c3..000000000000
--- a/app-portage/diffmask/diffmask-9999.ebuild
+++ /dev/null
@@ -1,21 +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} )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
-HOMEPAGE="https://github.com/mgorny/diffmask/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/diffmask/metadata.xml b/app-portage/diffmask/metadata.xml
index ac3e588bedcf..0d301429aca9 100644
--- a/app-portage/diffmask/metadata.xml
+++ b/app-portage/diffmask/metadata.xml
@@ -13,10 +13,6 @@
 		the mask entries) and remove old unmasks.
 	</longdescription>
 	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
 		<bugs-to>https://github.com/mgorny/diffmask/issues/</bugs-to>
 		<remote-id type="github">mgorny/diffmask</remote-id>
 	</upstream>
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 71814d4e4d82..b8c1f7b15be0 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,5 +1,5 @@
-DIST eix-0.36.1.tar.xz 640084 BLAKE2B 10014bb847d71b803967354f3a415dc1c74ad37385b7b440f0c162c573453042d06bbc575582831ffc0aad6b0f7abeedbcb4e23b869505d4f85d6bd6b7cfbba4 SHA512 915a364b0f63124c53e43eb35165ce553f6eadaf8708f0c075dc2f4871fe83378cd0c8650d5605c1f87c512563fdd62f28efdc586b358fc7cd63ae42a404981d
 DIST eix-0.36.2.tar.xz 639632 BLAKE2B 962b998f91233e799421c1ea3325d5b9c727bdfdda6a9567ba4a9ea0f4f36798f5ba32ef2ba43043668aaf0829d9c2f50158f97d5ebfca40a58da612141c47a8 SHA512 813a19f9561bfd65a401a4dcf9884e39eedf5f971be1800411ba977d84af0c5b5498cab50f69566bff75cf254f1d4971acc5dab72af34162f8b5dd29cd6ffaea
-EBUILD eix-0.36.1.ebuild 2545 BLAKE2B 7787d6ff51099648f639abf815a4681aa5bab8d5054848b25a11005514ab451fc1cd914f892dce02924c9a305b8bbf8799b172b33785eb5ca8cc6ae529525b6f SHA512 81b421b9e80cd5e5cb26077f3f8912676a933fc1e602a930d4b11ae9c7b78e8cc8e22c40db0b83837c473bf9fff85aa4d2d734f072d255a70bb39ff1157add2c
-EBUILD eix-0.36.2.ebuild 2560 BLAKE2B 9ec9b14ee4636a8602cc07e12be34948d654aa75ed707b09d3e63f24f4aa8d68c3dfbce9d308b999e630f4b3ecf59a345896d28111b880cea41d7e455c4896ce SHA512 d833759655bfe420cb2b3f94a30c2bc2f77108c3816afa602306326268c44a7e418c89abb675ed9891aa95e9c6bbcf9a73bcb96c852904f702ebec5d7fc1e31e
+DIST eix-0.36.3.tar.xz 639864 BLAKE2B f74b7c4087e5145f3a2e6ee8b0034e5104de8ef81ec810f2d9fc75d161181f71396f27dc635466685650182473fdfb542f4cec6509ddee0a3bb0d7d620b7d42d SHA512 9fd7c64df6acf27e9ed07ee77ee7f209fb0fb2db9a3dbbc78c1f5b25e6d4786dffeea64bf8ddee3bfe4fe35445c8173103428e184c966964b2973d5737152679
+EBUILD eix-0.36.2.ebuild 2552 BLAKE2B e94b7a44857440c2a9f2423c1e27cfe8eb020ae89f9be58291f03769a4716f3c0787c3caad72742ea835c7977cc9d94c9473e09811c3a8cd52f52f9f3e1dee45 SHA512 e1862471ad658e566c031ae219011eb53c190666289707965f2ca9ddaca0315a89002b0f4cb0a1e756ab51962ffc2104f9ca6fae9b25f0e428bbc3713b971a40
+EBUILD eix-0.36.3.ebuild 2560 BLAKE2B 9ec9b14ee4636a8602cc07e12be34948d654aa75ed707b09d3e63f24f4aa8d68c3dfbce9d308b999e630f4b3ecf59a345896d28111b880cea41d7e455c4896ce SHA512 d833759655bfe420cb2b3f94a30c2bc2f77108c3816afa602306326268c44a7e418c89abb675ed9891aa95e9c6bbcf9a73bcb96c852904f702ebec5d7fc1e31e
 MISC metadata.xml 1066 BLAKE2B d86d5ac2b57cb98b85fb31719d76cfa74d8ca4e18473d4bea8c4c9c63ce35e6b1e1c0e41b3a6dc20f5ba464e3273f51035929ae1d37d36d0da8a3e8a30ca7a68 SHA512 c161c1e63cc7e9ca25bea3902f5c5806e6cde1253d74b8f2fbb876667b9fb8502edc81a309b0bde4a5de033594927da6b12254784fceb8e9a7452ae914ee5373
diff --git a/app-portage/eix/eix-0.36.2.ebuild b/app-portage/eix/eix-0.36.2.ebuild
index 635ccd707e0a..a62f25bdbeb2 100644
--- a/app-portage/eix/eix-0.36.2.ebuild
+++ b/app-portage/eix/eix-0.36.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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"
 IUSE="debug doc nls sqlite"
 
 DEPEND="
diff --git a/app-portage/eix/eix-0.36.1.ebuild b/app-portage/eix/eix-0.36.3.ebuild
index 106e1079762c..635ccd707e0a 100644
--- a/app-portage/eix/eix-0.36.1.ebuild
+++ b/app-portage/eix/eix-0.36.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools bash-completion-r1 tmpfiles
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${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 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
 IUSE="debug doc nls sqlite"
 
 DEPEND="
diff --git a/app-portage/elicense/Manifest b/app-portage/elicense/Manifest
index d3362b1e281c..37c060867777 100644
--- a/app-portage/elicense/Manifest
+++ b/app-portage/elicense/Manifest
@@ -1,4 +1,3 @@
 DIST elicense-1.0.2.tar.gz 9262 BLAKE2B fd1e808f577269758ed46c8e8965dc1be7649c825a094ff5b2e09dba12af5249a5a73dc5489ed131c8221e88642f92ac8b859ad5185d3a0c095bd1485178cd27 SHA512 ac6788e7726d962e72855da053be0c44722a013dfa7f500dc137ae46d946c176a285455ddaa5eeee1f6e224d5960aa2a578caa7c3182a5f93d3bbfae8cfd4a93
-EBUILD elicense-1.0.2.ebuild 918 BLAKE2B a553cd3983863363f486e0221b0320630afd92c5ebbd2f8d84b7294e16092fd11aa820d5bc722e4b193d553413373a2b161ea2c17b300712770267c3aca8956a SHA512 987302150d7d093c2c874c5e5d9177fc91bcadd694131dfb919597b1441fce92c4d713de5d7432a12503985dee81928a8c53a05f8eec1e94c41815fa9c3f45cd
-EBUILD elicense-9999.ebuild 926 BLAKE2B d3d89719d09baa18fe7371ce5e35b600b3fdbef99093ee1b9e0514174ab07a8efcd34db2060974ca53fbba0ebfc94a692f5899c464f9ef8fe3ad4b615620cc51 SHA512 75364b3b42bc05deb123dd1dbf9b9af3a8a4f040e0d3c84f3a553f3152c47d65779fcee31a00a19a08a867fb5067530ff56cedbc7cae2941942da359b6bd307d
-MISC metadata.xml 356 BLAKE2B 17e2e3633bf8890a621a7d98cda1481db41860b862d31f3e4d61646de8ddbfb0e61bbcfc5dae3822120077fd894661f9aa025390d61410a7ae10efbf501caa59 SHA512 6a90e16f124f94ee60fd037cf0897ee35c3bfd6a604022d90349e4db8edb918c24f49eecd4183f843d6e18ca3b28e523dc63d25bce31d2452c9afc5ee8079745
+EBUILD elicense-1.0.2.ebuild 924 BLAKE2B ba44b2ada1d7c0e180d7ff273758018f3e21413e2072a0317cddc3763badd92e0408f14bd1261527bd5be7a53f61cbe9c8a2883f03f91e6c091d2a4e20fafb62 SHA512 4aafabe1781223cbf1fcc611af9db065f4249a230bb7ec9a5c7b0892b6992ffb336822229cda867bcad78bfe9a44bddd4ea76929c9116d91ff0080e193a82611
+MISC metadata.xml 272 BLAKE2B a58ffba5c7814e19c96a8b5246bfbfcce3eaccda19d0534ba3bed5669ea58e20eb4e1d06500c823233d8d2c3cd6116f8984834f923a57da8a16a71e8e6ded761 SHA512 dc9f94b188709c97dc0960d8de15531502ce2a773c3f28d247bea93a12dfd0cf1b5a6e6543feaf090ed84377ec13234d4b062d6031ad5dcc594477a5af9057d6
diff --git a/app-portage/elicense/elicense-1.0.2.ebuild b/app-portage/elicense/elicense-1.0.2.ebuild
index d564118c306a..aff71477b274 100644
--- a/app-portage/elicense/elicense-1.0.2.ebuild
+++ b/app-portage/elicense/elicense-1.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]]; then
diff --git a/app-portage/elicense/elicense-9999.ebuild b/app-portage/elicense/elicense-9999.ebuild
deleted file mode 100644
index 831da3331919..000000000000
--- a/app-portage/elicense/elicense-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/Whissi/elicense.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Whissi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
-HOMEPAGE="https://github.com/Whissi/elicense"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.3.62[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	local MY_PV=${PV}
-	if [[ ${PV} == "9999" ]]; then
-		local last_commit=$(git rev-parse HEAD)
-		MY_PV="${last_commit:0:7}-git"
-	fi
-
-	sed -i -e "s/^MY_PV =.*$/MY_PV = \"${MY_PV}\"/" \
-		elicense || die "Failed to sed in version."
-}
diff --git a/app-portage/elicense/metadata.xml b/app-portage/elicense/metadata.xml
index d5e2ae1978ee..a84bb3c8b94d 100644
--- a/app-portage/elicense/metadata.xml
+++ b/app-portage/elicense/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Whissi/elicense</remote-id>
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index b8179390176b..383dfc7dd45d 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -1,6 +1,4 @@
-DIST elogv-0.7.8.tar.gz 19554 BLAKE2B 653a1dd8d5cb142c78c27ad4c7110a7dac666eed649213ef62c1548d5248c4add561242290a59178470736cffc9ac15fb7ee796a2954239ba382001f1e6c9c4f SHA512 be90f01b4d2e114608b13aeba78ab368af6ed66ca329de6952d7f422c90356fd1c6988827f0c60ee66636ae92e089689c7cbd725f6eb20545747fb24d0d1daf2
 DIST elogv-0.7.9.tar.gz 19556 BLAKE2B 5d5f1a4adab09cf8b56ca3433b2a1cd0d3572345ff92f34b6b3ad175178161c36531bf9211563f4ad18191c6ff99c2cdcf9c3d188eca293a1698157e0a9f04a2 SHA512 703d1e8f55f5ee17a393f3a331ee38ef1d4e4c918c316055d5e2297b96dbe7de0ca6df864f462520f2087ed1a7bb7f43db56bfd3864a865d349516694522a686
-EBUILD elogv-0.7.8-r3.ebuild 1601 BLAKE2B 068e81cb7f1b8c1eb0724b6ab263f00879e3370e5654835ca2cfbff81037e75bd01edff95a7656670274682b132e718a0a306d2c722de134862e15dda5ac08b4 SHA512 44e21eb3f9efa6a1f65b2210603611a16c86928f0cf03234bb1d6c51ecffebfd6da7e6590bf08849e8aa940cf077cd2389b3c228f34d03e2555db9cffbfeaf64
 EBUILD elogv-0.7.9-r1.ebuild 1714 BLAKE2B 42d91d41ada01e03e8c20a0ad32fe01fd6307dcc894f3f3ec67046298109e08fbed0f6dfa0e07b5bcb5473f051eb08fca742ad7d04c44c5f4e00dfb31a9e35af SHA512 2f6ff9a3561fef80ea947f9169c974d3fc41f295f74dce73ea56fd0b6ca29a416294a1082e3b5b59f2bd76dcdcae0599f6140c6b60b17e8651a5f1e5d6de3833
 EBUILD elogv-0.7.9.ebuild 1611 BLAKE2B 6935670ca36d1b8d69e853b092324ad20c37d0bb9f348d6e35b036251b7d644db14d04b40b761cd01d250bc75931b5405a615349e7aaac71b8b2c54984972faa SHA512 a6393159b864e0c85a312766abc7f933490c0e2446b33f991f251899e0d2f16c7574d0904e4f57a04c2e48cc1ae43c04a6c70a6d0442c972465c666ad0bc2602
 MISC metadata.xml 470 BLAKE2B 8929c8c694be9a3296adfdb126acc0505333cb9b780a6ede783b18046f45d90a75039fd02742b53982a67e10912fc091528a75775aae08aa725a16c9df37ab01 SHA512 16782cd7c0f06ab11b81ab3c3850b6084bcaf160e2e0e383f3a0cfa9737f73a9ad3f2532b1b3c779c7eea746aaadd2e360f6e2b57baace74f5a18e4ca266ef17
diff --git a/app-portage/elogv/elogv-0.7.8-r3.ebuild b/app-portage/elogv/elogv-0.7.8-r3.ebuild
deleted file mode 100644
index 4ca848e032c6..000000000000
--- a/app-portage/elogv/elogv-0.7.8-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://gitweb.gentoo.org/proj/elogv.git/"
-SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index 83e47f99811b..54adbd9db7ee 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,3 +1,3 @@
 DIST elogviewer-3.2.tar.gz 29046 BLAKE2B a880fde71df3c688572c33abbc163f3ac10a53c672b01b3139d02effa5e59a05f7ae1df35a4505b1a48d7a0cb6166a21b18d1d969e1eaebab03e3620298d4f38 SHA512 2503482f14e21c7b6f69ac0d6305c7c126fa3ac944b68acef7edec0c464d2e45bc2dc348f8d38033dbc276afc132d75863c737e222f66ad5ebe870b30fec2f39
-EBUILD elogviewer-3.2.ebuild 1678 BLAKE2B 2b50bb198bf6eb29727ffee567f19c2ca9cd749ce79d3dc34c6101815118d7baa2c07239b8d87cc630de0808cb712baa1da1a365bffcec5bf32ca8bbeb91f3f8 SHA512 9fe744351b65bcee6453e8e70130648a24185759f19f518c418110d0ba298805a2f543a037e54db3b73345008df4eaa0d789e9925d417b47f9475b0e88760cba
+EBUILD elogviewer-3.2.ebuild 1680 BLAKE2B fcc99de09039bad157d94ff5c5f7ab061c2d2cc6d24b4184836e452b29c8c8669967562c750fddc87db1b718893eeba5d51ff2240ae541db86d35f9d815117cf SHA512 3527ed08350a019a630922873c047673b08293953c505a5a3216a41f52457114d4f0392196d453c129bb9f0e4d3ea32d553931f815a3f7aad586b827450762da
 MISC metadata.xml 403 BLAKE2B 328a31cd1131b83154bf313dd3f32fe5038ab96f9239d9e15b5ca650d2932203ff1dce0ba547faa6ca20afdf30734fa810e46521c77911b2015c1a88e4223e27 SHA512 e400ef090331518b4c12a5daf2962595f894cb5c54665a47f61232b2687b796849c6ec13d6c9c2c8402b8c19cbd052b9c6984cc29ef2c67561a977ce07075d02
diff --git a/app-portage/elogviewer/elogviewer-3.2.ebuild b/app-portage/elogviewer/elogviewer-3.2.ebuild
index f1c4740e8354..7c799bcd65ff 100644
--- a/app-portage/elogviewer/elogviewer-3.2.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.2.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_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 DISABLE_AUTOFORMATTING=true
 
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index 5fd60497cadf..1d8cb1c24379 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 1518 BLAKE2B cc5150236289c95a4fcdca09575280d9117a4556c410543d97a4f9dcd38e5981c292b08a754989682aafdbb969a5cf15702c1cd62e1dbfc97adbf159f3e0c8ad SHA512 33df2961ffbbbb0875ef4fd86ab2afecd4eeb6ec26ce08c93569e8ac7882d82114c3583b11de8ba157c3a7a0b772a61e4d536961dfee38312137d0d74bc62993
-EBUILD esearch-9999.ebuild 1067 BLAKE2B e77246f5ed621a2996fb6460ad96879d0a466c63601da3e58bbe57dc642f79b1d8a5065b92072e84cc54b2bb55bb30f4047f86ce980fdfad9dedf1f2b26d0d86 SHA512 e0798f50eccf83e5eb2fe9cd896ace563a58a70145f48e26e129e20c10067003ac690ceed0ec7845691a5726e5d795495b0f213ffa0e53ce28cdffdc7458bfdd
+EBUILD esearch-1.3-r3.ebuild 1519 BLAKE2B 3c8065437c76a0eb979917a4134f6b111713b6acd05976012ca9021f204e227e81fd460a6915342cff156a7481b4588f8c395bdbc1250e5a239ea4b79652c53c SHA512 7bad0282f58ddf475dfd2615475bfc7c746f12c0c3a206b041f15aa1d7501d18ea8e68ed31fbc28d8e1b4c262205ee444b7fac83360fdd96f90da933f5b728fa
+EBUILD esearch-9999.ebuild 1068 BLAKE2B 467d06c26df13d5c91a25561d97deb2c752436ef5d6de85b2ad3ea5f1422c79699c8898d01127e281ed08fa74e0969ab4382ebfe90c5fdb15f65097650596220 SHA512 0b995193da6c3c26eaf7da5eb596354c9b109e16c921277cfd0e3eee28750c62d520dea2fc829180bb69c7d7e0a42d6bc6cdc26d680b663284f4994121ec19bb
 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 1cbe38b2307f..2d461194a0af 100644
--- a/app-portage/esearch/esearch-1.3-r3.ebuild
+++ b/app-portage/esearch/esearch-1.3-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 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 33983df846b5..2ac8846c0e61 100644
--- a/app-portage/esearch/esearch-9999.ebuild
+++ b/app-portage/esearch/esearch-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="readline(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
index 99e5866a1974..812648882987 100644
--- a/app-portage/flaggie/Manifest
+++ b/app-portage/flaggie/Manifest
@@ -1,4 +1,4 @@
 DIST flaggie-0.2.1.tar.bz2 16767 BLAKE2B fea0fbc505bfa97e7bee2c05f0cc19077b9b23a021b01aafa2c4b064466677f9dd4ae95c36f6de65b4ad07c5046d539ceb0cb667dcb791b60410d7a5e688813f SHA512 3f273ebeceaaedce7a3807126fb3f450e420338a883440066d06a4d6a95b63bd538bb5da882fea23e0d390b28a83f50375dbda2624f656327775b2b700f2b2e4
 EBUILD flaggie-0.2.1-r1.ebuild 1134 BLAKE2B 022cff23c92b9e98cc1a5ce369d31cb8e972a677ceb8aee977a5d3e346d9b1e851ea33298fc0e2951042b5b39edfbef3c7f80397637d709ca7376b9deeb2d45a SHA512 002c9e4e2200a674ada814d08184ba4bfe2844f7aaa446c8a59f7a364b1fce0a8577889f933a2699e8f731b6238bd342b5c7a1d30aaf8f569d4c88ffd848d612
-EBUILD flaggie-9999.ebuild 1057 BLAKE2B c5c42e151353564f6710bf366ab7037b13511d68dbd0c98ecebbe0afc69bd446e3bd4a0346f36c5579e0b2b9a7f28048776ae952d6600e0df522ee326c6d17bc SHA512 b30cfe61f2d21f27931f7805d4005f0a28e8a3b55da3e2cc10d09d9e7c52ab94da973d865a23f07957b5ec2df14b059c20d797fa1386988c4031aff1c66f33e8
-MISC metadata.xml 504 BLAKE2B 0f6ad8dfe835628f1907bf6f6aa41334c2c5d9655c99da6cfbf146c96974a3b1fcc23aeeae812a3ec5adbb1645eed389928f601f79e56991ec68c36d2ca6d3a2 SHA512 56fe51196d8280504f3625748fef0b61fd9f65fc81f569abfbaaef8a9437828497fba7e763b57288562decd9e24ec19b56541f4428a43f7486d697d4ff9aab38
+EBUILD flaggie-0.2.1-r2.ebuild 1134 BLAKE2B df4c0408ae5897f6be4759ed21c5e6da09d90979f4c9737a7d9d91d7df245afb4015e11fb8f278fbe055f8ea4bccb1ec251854a39dc44fc03ec78c76681603f2 SHA512 b1206e7bb6b8fdc78831754e1382cb827f293d3150607c7ff11ad4be2ff4fb16a466853c4743abdc0d7d856430b5381f98d5c9e630c72064d90ef98a4a7e2ba4
+MISC metadata.xml 414 BLAKE2B e1943db472d39833f39013b45ef474c54ea19e252a9dde019d083c8c5dde4b790758488b2135d11415f5a0fa60baa5831a7e554cbec83eeb854ea85e2709c8e3 SHA512 10a6e4a79ab5a6fa8810d06ca0aa22ccfe81aba18430227c6ee7874bb9aeb562d585515d98b522894a8b87b51504b5db35e2dc6afab5c53ccd049537afbedf8a
diff --git a/app-portage/flaggie/flaggie-9999.ebuild b/app-portage/flaggie/flaggie-0.2.1-r2.ebuild
index 054c1c210325..dc1e4ca5c0ae 100644
--- a/app-portage/flaggie/flaggie-9999.ebuild
+++ b/app-portage/flaggie/flaggie-0.2.1-r2.ebuild
@@ -1,24 +1,24 @@
-# 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..9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
 
-EGIT_REPO_URI="https://github.com/mgorny/flaggie.git"
-inherit bash-completion-r1 distutils-r1 git-r3
+inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="A smart CLI mangler for package.* files"
 HOMEPAGE="https://github.com/mgorny/flaggie/"
-SRC_URI=""
+SRC_URI="https://github.com/mgorny/flaggie/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]
+"
 
 python_install_all() {
 	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
diff --git a/app-portage/flaggie/metadata.xml b/app-portage/flaggie/metadata.xml
index c7ed5cc31b68..a1a932d16da1 100644
--- a/app-portage/flaggie/metadata.xml
+++ b/app-portage/flaggie/metadata.xml
@@ -5,11 +5,8 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
 		<bugs-to>https://github.com/mgorny/flaggie/issues/</bugs-to>
 		<remote-id type="github">mgorny/flaggie</remote-id>
 	</upstream>
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
index 5fc3142f2d89..273611733a4c 100644
--- a/app-portage/g-sorcery/Manifest
+++ b/app-portage/g-sorcery/Manifest
@@ -1,6 +1,3 @@
-AUX g-sorcery-0.2.1-py3.7.tests-fix.patch 4455 BLAKE2B 631c028024312fd25f5191191a953cb9db9eda0de2f97ee84c1e5266fea99ddedb2faa36f24740561f181b76d311c0997cf5c1c04fe3bf69df0828b0d3ed96cd SHA512 68674b89fe101770adf7de711f828207856d97ecb0f66d4a369c90136fc8168095b2d5548e5d722eebabb5a7ed2eb91832c2dbd2618c97fb5961ffd2dc4186df
-DIST g-sorcery-0.2.1.tar.gz 55546 BLAKE2B 56fb8a766c17c220a8279d2288f5de5c6976dc8fb380ac695bcf891616aa8a284f6b07c9be79c3c819c69faf7fcf9a7a826ee8b8b955db007c00e23d6417f2f8 SHA512 42c34ed8addaf721583029d5056751810b0a77546f798081c7c605223342fa2a99bd2e30f20f004a8606ccf847108f0e2ef2c479f3cbb55f2fe6648d4ffc075e
 DIST g-sorcery-0.2.2.tar.gz 55707 BLAKE2B 59466e116caff697618154f3c9d8a2c11809ac0c1d367a35a7773fdcad381e283c2426310ccd4f843e10e6fc5143061f2ee575bdd190a1a51d7691be0d452d73 SHA512 a63b6a49225fbf5105666a6d8094f04534674c4773eb8008e2cb8e2eb75291011d53ff3f1bf6dd456496469d537a97151feca73b9b26553cf1fda9d3128534cb
-EBUILD g-sorcery-0.2.1-r1.ebuild 1080 BLAKE2B d649e5985064d02bdc2f97aa078088126da6317866221104933a8abac80cd86a08246a03fe95cab2b79ef511377a12750033349c08f2178f611956def0e025c2 SHA512 49982f740bd26e71b16347a5a3ebc9e6e2fd10ea67deb5f31d68684b686caa26ae98c1f1690eb8997e8ef20f71c2a00845f56ae7796ea2f6e4bd1f26deef08fe
 EBUILD g-sorcery-0.2.2.ebuild 1087 BLAKE2B 869ea4560a4bee1841b0dd78ae35f8fe72e4dfa37f9d9c3c57ab919cff9173c91bdf5307c4090139e9f2649b40827268085f67ebdbedf0f2f30ead13235324f5 SHA512 8cfcbab98a37f83484404e667015eaaf23bb15f0a796fb693980ca33b1eb5e64eba85b5af2b40a256f8940ab743a0d0c0c2a7ed4af8d7cfb96648cb9374c0867
 MISC metadata.xml 335 BLAKE2B 3e6f323e6dfb1feb21d8bbb2c4b2ba3a16d7cbb302de4dd7a49b6878f44c92958fe2fd1d0b20fafe2a9b840fa19e33184096039ee31d6aaf3caf34406da32fdf SHA512 2fad27c61de25d403b79bb06e3bc4242edadf86fafb06c91e5560d51b69fe3652a18f28a998bee225706fd2b1319968f956e58f6d9c21e7c2dccd6d8988f6fdd
diff --git a/app-portage/g-sorcery/files/g-sorcery-0.2.1-py3.7.tests-fix.patch b/app-portage/g-sorcery/files/g-sorcery-0.2.1-py3.7.tests-fix.patch
deleted file mode 100644
index 84a702413ac8..000000000000
--- a/app-portage/g-sorcery/files/g-sorcery-0.2.1-py3.7.tests-fix.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff --git a/README.md b/README.md
-index 9bdd5b7..c2eb5ad 100644
---- a/README.md
-+++ b/README.md
-@@ -26,3 +26,5 @@ This project is aimed to create a framework for ebuild-generators for
- 3rd party software providers.
- 
- If you want to develop a new backend see [developer's instructions](https://github.com/jauhien/g-sorcery/blob/master/docs/developer_instructions.rst).
-+
-+[TODO list](https://trello.com/b/8WdY2ZIs/framework-for-automated-ebuild-generators).
-diff --git a/scripts/all_pythons.sh b/scripts/all_pythons.sh
-index af4c1f1..3c85974 100755
---- a/scripts/all_pythons.sh
-+++ b/scripts/all_pythons.sh
-@@ -2,7 +2,7 @@
- 
- DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
- 
--for VER in 2.7 3.3 3.4
-+for VER in 2.7 3.6 3.7 3.8
- do
-     echo
-     echo "testing python${VER}"
-diff --git a/tests/server.py b/tests/server.py
-index 51d49b7..aa895ea 100644
---- a/tests/server.py
-+++ b/tests/server.py
-@@ -4,20 +4,21 @@
- """
-     server.py
-     ~~~~~~~~~
--    
-+
-     test server
--    
-+
-     :copyright: (c) 2013 by Jauhien Piatlicki
-     :license: GPL-2, see LICENSE for more details.
- """
- 
- import os
- import threading
-+import time
- 
- from g_sorcery.compatibility import py2k
- 
- if py2k:
--    from SocketServer import TCPServer as HTTPServer 
-+    from SocketServer import TCPServer as HTTPServer
-     from SimpleHTTPServer import SimpleHTTPRequestHandler
- else:
-     from http.server import HTTPServer
-@@ -26,26 +27,27 @@ else:
- def HTTPRequestHandlerGenerator(direct):
- 
-     class HTTPRequestHandler(SimpleHTTPRequestHandler, object):
--        directory = direct
- 
-         def __init__(self, request, client_address, server):
-+            self.direct = direct
-             super(HTTPRequestHandler, self).__init__(request, client_address, server)
- 
-         def translate_path(self, path):
--            return os.path.join(self.directory, path[1:])
-+            return os.path.join(self.direct, path[1:])
- 
-     return HTTPRequestHandler
- 
--    
-+
- class Server(threading.Thread):
-     def __init__(self, directory, port=8080):
-         super(Server, self).__init__()
-         HTTPServer.allow_reuse_address = True
-         server_address = ('127.0.0.1', port)
-         self.httpd = HTTPServer(server_address, HTTPRequestHandlerGenerator(directory))
--    
-+
-     def run(self):
-         self.httpd.serve_forever()
- 
-     def shutdown(self):
-         self.httpd.shutdown()
-+        time.sleep(0.5)
-diff --git a/tests/test_DBGenerator.py b/tests/test_DBGenerator.py
-index 9a47c86..3c28278 100644
---- a/tests/test_DBGenerator.py
-+++ b/tests/test_DBGenerator.py
-@@ -4,9 +4,9 @@
- """
-     test_DBGenerator.py
-     ~~~~~~~~~~~~~~~~~~~
--    
-+
-     DBGenerator test suite
--    
-+
-     :copyright: (c) 2013 by Jauhien Piatlicki
-     :license: GPL-2, see LICENSE for more details.
- """
-@@ -81,11 +81,13 @@ class TestDBGenerator(BaseTest):
-         srv = Server(orig_tempdir.name)
-         srv.start()
- 
--        pkg_db = db_generator(self.tempdir.name, "test_repo",
-+        try:
-+            pkg_db = db_generator(self.tempdir.name, "test_repo",
-                               common_config = common_config, config = config)
- 
--        srv.shutdown()
--        srv.join()
-+        finally:
-+            srv.shutdown()
-+            srv.join()
- 
-         self.assertEqual(set(pkg_db.list_categories()), set(["app-test1", "app-test2"]))
-         self.assertTrue(pkg_db.in_category("app-test1", "test"))
-diff --git a/tests/test_PackageDB.py b/tests/test_PackageDB.py
-index 152c605..8be8f8a 100644
---- a/tests/test_PackageDB.py
-+++ b/tests/test_PackageDB.py
-@@ -70,11 +70,13 @@ class TestPackageDB(BaseTest):
- 
-             srv = Server(orig_tempdir.name, port=port)
-             srv.start()
--            self.assertRaises(IntegrityError, test_db.sync, sync_address)
--            os.system("cd " + orig_tempdir.name + " && mv good.tar.gz dummy.tar.gz")
--            test_db.sync(sync_address)
--            srv.shutdown()
--            srv.join()
-+            try:
-+                self.assertRaises(IntegrityError, test_db.sync, sync_address)
-+                os.system("cd " + orig_tempdir.name + " && mv good.tar.gz dummy.tar.gz")
-+                test_db.sync(sync_address)
-+            finally:
-+                srv.shutdown()
-+                srv.join()
-             test_db.read()
-             self.assertEqual(orig_db.database, test_db.database)
-             self.assertEqual(orig_db.get_common_data("app-test1"), test_db.get_common_data("app-test1"))
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
deleted file mode 100644
index 50cc18f1bbde..000000000000
--- a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="framework for ebuild generators"
-HOMEPAGE="https://github.com/jauhien/g-sorcery"
-SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bson git test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	git? ( dev-vcs/git )
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/g-sorcery-0.2.1-py3.7.tests-fix.patch"
-)
-
-src_prepare() {
-	hprefixify setup.py
-	default
-}
-
-python_test() {
-	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/*.8
-	dohtml docs/developer_instructions.html
-	diropts -m0777
-	dodir /var/lib/g-sorcery
-}
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 9bf960aee47d..a3c2c36320b9 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,4 +1,4 @@
 DIST gemato-16.2.tar.gz 80178 BLAKE2B c973c36bb1277d07618ba8d90f7d6820508d78aedae200f0678c8b2e1dde38e3b7f4d7dc24791dedb9c88791d3b71711c9bdeb749b5fc091a20aa87f71ad70d3 SHA512 9d59ba360afaf237e47c5ded0e5bc29ec44d5b1d73eadadc19ff834a1966e1e620da258eb7a1b6afbff5c66cbd7e39454fd5920f2f82fc510c2f8836c0b80462
-EBUILD gemato-16.2.ebuild 980 BLAKE2B 2f788931de2fc10fd19efb9683241c6ac5f6199899e7b764d094019226d24139ff25c2228f6926bdab4ecfebe36ceb471d59121ad92c4c09c3957f858f4f0916 SHA512 f2e41f8aee19cf691074990cc0ad7aa10e01008559910bc0b6ca2f83ca29e60725499f9f394880365b5580621c218975647cbf2221ce6b867bf639a174ada5b6
-EBUILD gemato-9999.ebuild 879 BLAKE2B 4f2a575ca2a5e13f7887280c71d7e9e50ed07d3f188c998caabce40b37e226ab66e632c1f4b045bad77cd7b34f26bc110619ef87393860e815a353bbb53c01ed SHA512 d5e7ebd0cdf6bbec6ea33f713b6fc168a9b65256a511fba130ab6010c9126b61ccc999c924c5c427052c8095de1de00a5abc75a6f2c784eef04c7bcf489897d9
+EBUILD gemato-16.2.ebuild 980 BLAKE2B a3616f07d88c1f656534f4cabf904d5d45eef85e03ee9c07197cf0333c335bd6c76b180702edc29549fe38c2ff96c8632505b91b76387859119a272427b72eeb SHA512 e3c4b0820d6228de1dcbb16b0014049445a4f7a9d81487a67906fa5d5007cb5e86bb36fae87ddf4e209ee7be3ca923b43bb0086c492ba5e96363dd46692ecca7
+EBUILD gemato-9999.ebuild 879 BLAKE2B e29bc4109bec2140b19df25b09479ebeb13a933f1fa7c07d86c8b037ba13d40260fa68b9a335cb21c0be5f3509f1e29acb25eb8e7c5b5131cae324d743ebb47e SHA512 848580249bf3288ed81c30c9439cf903832ba91fa9e7d0a3c87ab1717b9261273fe5c012b4c15f7af22566fb2525e52d68f114e98afbd6bf5859f09c12d935e4
 MISC metadata.xml 671 BLAKE2B c555b7c160f46b40318f5840b0ae759472e7b9ff906fd0aeab96f0eab75d7b36eb674d1c62e893d84381ce69e2896e17beea22db250dc494a2f77de9f606a6bd SHA512 8642b12245173140be27e00cb8449714a03c1c0554933cebab12c34b05b4930882a32d37fcdcda769d51ebb8fc833e1daf4b606e62c904be320c697c83b651e4
diff --git a/app-portage/gemato/gemato-16.2.ebuild b/app-portage/gemato/gemato-16.2.ebuild
index 91faae2f631c..81db99fc2309 100644
--- a/app-portage/gemato/gemato-16.2.ebuild
+++ b/app-portage/gemato/gemato-16.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit distutils-r1
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 5d6009149ea0..6892ffdf9023 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-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_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit distutils-r1 git-r3
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 1bc4e8b75ef8..6ccdb4d6cc93 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,4 +1,4 @@
 DIST gentoopm-0.4.tar.gz 39123 BLAKE2B c8ea81e2d1aa09d3aa838ccb2a1d221e29ba6cf20c5539435a36da058733ee6814864f11a5a96742b371c6d0f2e1ffa269edf197cd30cf4bc7d517f9fa6623cc SHA512 7af0d4d8b3562b009d8897b70b8621d2004e22a16006ec84144544174724757b39e09cbde98ee876adc166947a58e4afa85f752c66d4dbb03ff1d3a52074720f
-EBUILD gentoopm-0.4.ebuild 973 BLAKE2B 9e81ee8ebd209bdfb3f0b8b30cfa7fc798e1ec16c6b22adc2a6a7475cf3877b450a88158b651745a64f98f2b35d35b973ad87c830e4f8d4c09dfb7d6153badb3 SHA512 ead47b1c967ef6412ea1587287dd7eb8fffdf6e3db048893641f1aef7bafc01748f383f865329dbcaf1cf64a9dbdac7bd74df3218092862592e7f1c9ec741047
-EBUILD gentoopm-9999.ebuild 581 BLAKE2B 0d122c8db7e9ac80223d46d62b4b2271154b534acd8f8d989e6355844e94f6a265398b3174731710415df95fea8b71805769083432e28641ce931b8b9eaac890 SHA512 dd9bccbeb7eb8894240aa8e2c36591b8b959167bd60e4f1c4bbd48cfa5c6652277ca889a4a82f4232f4762c075f06f5dab09d8fae4fe6621793ac291703004f5
+EBUILD gentoopm-0.4.ebuild 979 BLAKE2B c38bb41ba66659b9bfe95d96739a023c7165bed7bb562c200a28183a6ec59da01d78deb216b9cd5f9e7c6599d6d08dd2d025da3b2e99c9449d5f531dffc08976 SHA512 7346b3b6416399ec52a439d4f5cbe59b2f8881d546558baa16bbc10834ef2e1d41068807a3ebaf5ab2df9757d24d1bb821b10600778ef6ff21924bcc8348d6d5
+EBUILD gentoopm-9999.ebuild 587 BLAKE2B 0e32cb8009f92072f675608d3ea41141b296c3bd9a09fa56fa74d94d41af5780c7a5e9f56d249009da955771871ff1056146bef67c95b42fc7da8dfaba4bcf7e SHA512 eb39068ae38aebf7006f056d2017b47eab1d000529a14924e00771db36b2056d04b8e23d9590eb5c05fa4fa94844c8ea6a10410fa318cdbd68a254b0c245fe01
 MISC metadata.xml 553 BLAKE2B cb858f45f3796fbada74b9ea3b84333132741537e4d92cd47bdde947e2308d2688128dc23686689d0b9bea81bed15ba928aaafefde1b14c6ca8109966ccf541e SHA512 e849549624dc1fc0e87dd51c612942d178850d82498a329c92a9358acf807e9a3a09ac513f086e7affca35d70c58c4633721d8ac2f8b637b4623ac1b7bf7a477
diff --git a/app-portage/gentoopm/gentoopm-0.4.ebuild b/app-portage/gentoopm/gentoopm-0.4.ebuild
index b5ba32c5fc84..a0239a1e00e6 100644
--- a/app-portage/gentoopm/gentoopm-0.4.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index f3f382633170..93e0b5ad6e14 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/golop/Manifest b/app-portage/golop/Manifest
index dffe0dba4b80..36ed0e9fde59 100644
--- a/app-portage/golop/Manifest
+++ b/app-portage/golop/Manifest
@@ -1,4 +1,4 @@
 DIST golop-0.2.1.tar.gz 9315 BLAKE2B 0b0410910f17121f334c270f71dfb0fb4a1eb909893a241c3bbf1b4473d70be5b1b6d318d61d25e1379e30b8956a0ca37b3cbf2aeb6efcecd6ee14d6c3571c9b SHA512 65a12771784d3676001ed55ac389dfc26f5c2120240a3fbd6efc1954abc19be4d9e1de403dcec1c9de3f3385b2286a6836604fb0ffe9eb071467454bf8c41f56
 EBUILD golop-0.2.1.ebuild 637 BLAKE2B 1934871f83e5f45415a8ca0b5fea9f0c49e5a45bab2f7823210bb52b677c3f21b37dde8356ddeb487ab5f8d7f8cc7fd19f55f10ca1e23a119d226214070a2cf9 SHA512 eaf6c0ed7226ce7f49ca98eff8f7e101e023550b7e8587147c1d9e5e7c36a582ee44587b138812c27b339437d5d6423354632d2948f6aec07966069f570fa13d
 EBUILD golop-9999.ebuild 763 BLAKE2B ac86fee8ac66116601f8fa44ae56f55fc168ef818f495125efb82b25c2d1d4711e3fb7a7855c1600d186e09de8eff1b242b278b33e4625d7f918455d8cc5fd76 SHA512 6c0b8e8ef068c0271bbc2e3ba3058e1ef0de9ee13775c1d09f4dab9b436db57d83aaedc1b5bd94484a113bfae6cf86e8e1e37a5bbe8ec2d0003de0d18acdf5aa
-MISC metadata.xml 468 BLAKE2B 12d6e2644f1a3b11d083ada4ee80daa939bba5e3a77e5933124d30f06a22b8820a1b806f739fd7ace627ffd9ae80d4fa2af0a2c154b0c51add4ebb869a6b05d3 SHA512 00a4e43720544a3e4ca852c74494ce6448adfd643140e6ac5fa366e95d9e9c512fe45c332838a53790df1d7cacac6d79597e4db5d46ae14a29c1a5ed66c96d05
+MISC metadata.xml 384 BLAKE2B 766a5245cff7800b8837614f30eec53c1fc27317adbe0b21fa2700fe7731b309f6507b20b563e00b536060f732f7e678b5c93ea40c30cee76bf1dbe0260950df SHA512 89204b427541b0b5391be51e58d16b56acc37719f037b0509f84bcf721e3bcf43e65743b78e7fdeba6ffac9e105cd479663051899fb283c069832e6beaf995db
diff --git a/app-portage/golop/metadata.xml b/app-portage/golop/metadata.xml
index 6fc024cacf56..94f2ca024598 100644
--- a/app-portage/golop/metadata.xml
+++ b/app-portage/golop/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/klausman/golop/issues/</bugs-to>
 		<changelog>https://github.com/klausman/golop/commits/master</changelog>
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 45ecb7a428f3..ec2cf339a1cb 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,5 +1,4 @@
 AUX implementations.txt 868 BLAKE2B d7319947a1e548f877a3fd2799cb9f5387d8c6d6787073edcc4763a15220c5dec2fcad48f81de0505569615dd5b67541a330044af61e4035cd4a697e4b989d46 SHA512 ff34a2a4c31799c21e1eb9001da8be85bd84b1e956e1905271b8c9e4b1e44cd9703b72dccf665c1122cd706da5e0b65e9ce409227f39c53d61cb24a2f1e17cd8
-DIST gpyutils-0.6.1.tar.gz 23914 BLAKE2B 1e799ce33a949037b68262cb7a6ca5fd99b4ca4ec74c3044bfb31ea08b59906a21f6c96cdf99330f6af16d68be6ee7ab49c3cf05979691899abaacc9d62032eb SHA512 74d984e496ccfa7124cfefd9f8f79d5fab4bb4dbf5e61f4400b39367dd54e23b871f286eef28007a5c255b862533a34948449bbf7aed55cf8fe315e76ac876ea
-EBUILD gpyutils-0.6.1.ebuild 533 BLAKE2B ea2261a01292c724986700c55c155ee2fa725590b949863a138d1ea30a34d531c176bfd8349a695833fd42d9f6654ec164da8896a3963594b582767e756951aa SHA512 d57486c1ef169e2e15e58d8457e0e1871fc8ce6e9d12a62f74ab252d68e31253bf78e95c57b911950b4acc16bace02b42a2f21855436f8e05d79fa88cf44f81d
-EBUILD gpyutils-9999.ebuild 511 BLAKE2B 02f8c0cf83880a564b6e7e9834bcb08ff64fb0960219dd29915033aa1917cc09ea6b103a12903c5c682ed861877f991d12bcd8d9a0938099ee2c141cb7e07fbb SHA512 3d6b9c811495251f80c29adf0154f5f13f8771f5c1d72833d1d1a28135447cacb413ee7b0b665b1a6ee5ff3704b3a7d20c9d1193b04d9d29dfc9c9baff853bd8
-MISC metadata.xml 553 BLAKE2B 17dbfd8784f55157775515f41be35ae972275f243e2831954d9df8e60c45c802b3abb3f2086d4af157e008239a4879e0eda0447498cd7ad86103502127724c11 SHA512 67cca2edeb180064e6a6e3226d9709e4ddf2eb818202b95d849c66d7672da00e61f86f9828c0cc4b8d2588411c4c5338cc7990e9d0f258d72ddd0de946b15ca1
+DIST gpyutils-0.8.2.gh.tar.gz 20247 BLAKE2B acbde89975e233ebd7d7dcaba629d35c09a9064be48ae1d529e9f5f814b9486e9a208506ff194894dcf827069cf24faa81efa14258866fb32cf5946dafadaf6f SHA512 932500c730635ed1f8f529012f7c65c48385d92db4a673abc0145fdbb14edf8c8b5a5ed4a4c7f892e7df310b92cd8fa0532af95340096f2bd4ef7047d6b6163b
+EBUILD gpyutils-0.8.2.ebuild 573 BLAKE2B 26a82edd9df60a4e93b4b778b74bb4df232a3943fb900699b3a20de252fe6cb2bb95e6261671f68a16ccf851450bf710e896687f04f41aec55f2c16ad547bed8 SHA512 13f4a6aae13f88f878548b9f3336ee89a298459af38ab08114a3d83c9cf272753915b7dc9e90666da63fc276b911678649d7c9e04c2d59fb09911f74d6678b59
+MISC metadata.xml 601 BLAKE2B 55e9b56b636971035d53b432dcdc5100127f286512a3d2c7568baf91970656803db20ec62ae8161fc2dfb0c27343ed8d869c73d71f0889860d4b648faaa9a96e SHA512 7f7e83d43dbe3fe944178e1547737973ff2012510aca40a8f30b9a081db894d23ad0126047f418f9fbe7748a8ea6133487af07e2f0f26ba5d04fe6a918853820
diff --git a/app-portage/gpyutils/gpyutils-0.6.1.ebuild b/app-portage/gpyutils/gpyutils-0.8.2.ebuild
index caf527892cce..d3a036a6fda0 100644
--- a/app-portage/gpyutils/gpyutils-0.6.1.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.8.2.ebuild
@@ -1,26 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
+HOMEPAGE="
+	https://github.com/mgorny/gpyutils/
+	https://pypi.org/project/gpyutils/
+"
 SRC_URI="
 	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND=">=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]
+"
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests pytest
diff --git a/app-portage/gpyutils/gpyutils-9999.ebuild b/app-portage/gpyutils/gpyutils-9999.ebuild
deleted file mode 100644
index c1d6bf513297..000000000000
--- a/app-portage/gpyutils/gpyutils-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-
-EGIT_REPO_URI="https://github.com/mgorny/gpyutils.git"
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gpyutils/metadata.xml b/app-portage/gpyutils/metadata.xml
index f25e0a24ce6c..a7e17ec45420 100644
--- a/app-portage/gpyutils/metadata.xml
+++ b/app-portage/gpyutils/metadata.xml
@@ -13,5 +13,6 @@
     </maintainer>
     <bugs-to>https://github.com/mgorny/gpyutils/issues/</bugs-to>
     <remote-id type="github">mgorny/gpyutils</remote-id>
+    <remote-id type="pypi">gpyutils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
index 7d22fb428c9e..8d775161e130 100644
--- a/app-portage/gs-elpa/Manifest
+++ b/app-portage/gs-elpa/Manifest
@@ -1,5 +1,3 @@
-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 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
deleted file mode 100644
index 447cc8818f70..000000000000
--- a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="g-sorcery backend for elisp packages"
-HOMEPAGE="https://github.com/jauhien/gs-elpa"
-SRC_URI="https://github.com/jauhien/gs-elpa/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="app-portage/g-sorcery[${PYTHON_USEDEP}]
-	dev-python/sexpdata[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/*.8
-}
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 04a65f9ef42a..98197a0083bc 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,6 +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
 EBUILD iwdevtools-0.10.1-r2.ebuild 1941 BLAKE2B 2f8bb7e3e85bdd622b2cec6b86c8a2ca5f575b0d6a27cae516ce188df5f06e49d0264874271c4ba792feb2173db9239ed77a034e33b6e4323490401daadee9ee SHA512 ad94f0baf09bd0d01bc5478bbfc6a5596cbe3c7839f9d83920b5d34db3bbca5c2c4d1b026940e266357ec7faf33f78377cce9b801bc6cd5c40620b5ebdd8572b
-EBUILD iwdevtools-9999.ebuild 1763 BLAKE2B 3309b1c749853a52d612cce50c3053596c22327854d6541e51ce72b636c63b7cfce21feeaedc115885eb06803a0988fd5624ceffb5cd7f64577247f2811344ad SHA512 5106ea7d1d23621ad510eb26a44e5b5b97daa3260c1b610a40348d37045b9719554b98aba72f573ccf34c1f6f271a046395e00f471bb02420494985adf66575c
+EBUILD iwdevtools-0.11.0.ebuild 1892 BLAKE2B 199e7b292e2f6afc3526fb223856f3b5f0922f1ca11a51ee2cc336406e028a778361c170e38b60cd5f873e30149d2b5087d06f845204087d22f356ce601c6622 SHA512 c50c52a5c7ed22a0fa724364a7c9bb102ba9e66b04226d882c585b8581966b8fefdcef63fa896d196b45e081284303f348ae162a895771002180f787611274d3
+EBUILD iwdevtools-0.11.1.ebuild 1892 BLAKE2B 199e7b292e2f6afc3526fb223856f3b5f0922f1ca11a51ee2cc336406e028a778361c170e38b60cd5f873e30149d2b5087d06f845204087d22f356ce601c6622 SHA512 c50c52a5c7ed22a0fa724364a7c9bb102ba9e66b04226d882c585b8581966b8fefdcef63fa896d196b45e081284303f348ae162a895771002180f787611274d3
+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.0.ebuild
new file mode 100644
index 000000000000..c5565f4af071
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.11.0.ebuild
@@ -0,0 +1,64 @@
+# 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	>=app-shells/bash-5.1
+	dev-libs/libxml2:2
+	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
+}
diff --git a/app-portage/iwdevtools/iwdevtools-0.11.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.11.1.ebuild
new file mode 100644
index 000000000000..c5565f4af071
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.11.1.ebuild
@@ -0,0 +1,64 @@
+# 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	>=app-shells/bash-5.1
+	dev-libs/libxml2:2
+	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
+}
diff --git a/app-portage/iwdevtools/iwdevtools-9999.ebuild b/app-portage/iwdevtools/iwdevtools-9999.ebuild
index 3f6545af3e21..0a3f9f336d58 100644
--- a/app-portage/iwdevtools/iwdevtools-9999.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-9999.ebuild
@@ -18,6 +18,8 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	app-misc/pax-utils
 	app-portage/portage-utils
+	>=app-shells/bash-5.1
+	dev-libs/libxml2:2
 	sys-apps/diffutils
 	sys-apps/file
 	sys-apps/portage
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 134c810b8055..045bc6143421 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -3,6 +3,7 @@ DIST metagen-0.7.3.tar.gz 9607 BLAKE2B 3c5b9debf10b0a6dda9bdf0e45e157c80019d0496
 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-r1.ebuild 910 BLAKE2B 73a3a8fefc4270b1f605c4bb409ce08bd3b7e7d32c5f42a98ebc8cbd69a3bbfeb854723a3108abc804e0596a6a1c8b67b612a24518cbc5d27cf6cb140323440a SHA512 a813ea4b4241909ba953d75744b25afcfcb345e9748be05209dc13a608e60a53e4adf175d2e83c910ec6d2073985918bb775f127ac87c4b3a78f0583ad6c7b2e
 EBUILD metagen-0.7.3.ebuild 907 BLAKE2B 06ae338c257137d117c7ec61d348cde9ecf4d211d5226c6868bb29ee2d8a1a34f6c6f4ae5508400812b116c07f25ac9e8b056e90295bec34b3c29f11e8c9f4dd SHA512 1725954d03287400e9fe88aaaaad61b05aad2f107a54443665142e66cc18ca45197196f07b41e41caf5f7bf5bb8419a75c9770a6ca337a2dee2a43f5436797d7
-EBUILD metagen-9999.ebuild 932 BLAKE2B e1ccb42a0aa761701f2370038bf13272bcb0144583317f1f6aff51969dac37f83fe55effb9917904fd9855d14a9a483f02136e8d1242e3d3949fc5750178c147 SHA512 86ad17b1e90ad1e602eaee0687471b360c839dfa87981e012aa3c84eedf720af69a3eafc8ebc8041bbfd8a5c210876f40f770af37b0702890daac6492c3bc555
+EBUILD metagen-9999.ebuild 855 BLAKE2B 5a9267fd79da98fb6b6f4f091c0ed77973b3888b007672ff4de4fc3e792c5fdca45d272ff16302b40e8ca302942df2a30b696758ced85d64afad5d3cb9da7186 SHA512 31d06fa0d5b3878c2bc6e84bc8804baaa2fd7826cd8384af652065bccf7affd555140eaf5af3d8d34f8744d1a22b7fc517c4ec735122eec49e9d69e174968134
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/app-portage/metagen/metagen-0.7.3-r1.ebuild b/app-portage/metagen/metagen-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..eb29b0bd9fb6
--- /dev/null
+++ b/app-portage/metagen/metagen-0.7.3-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..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/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
index 65f6e64cdfda..3c5877d7288b 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -1,9 +1,8 @@
-# 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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 git-r3
 
@@ -23,10 +22,6 @@ RDEPEND="${DEPEND}"
 python_install_all() {
 	distutils-r1_python_install_all
 	doman docs/metagen.1
-}
-
-src_install() {
-	distutils-r1_src_install
 
 	# Address expected path warning for /usr/share/doc/metagen-<not-9999>
 	mv "${ED}"/usr/share/doc/metagen-{*.*.*/*,${PV}/} || die
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index c83e039790a5..67a3cf5d3e97 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,3 +1,9 @@
 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
 MISC metadata.xml 272 BLAKE2B 583272860b0b9615e8d57fed7ced1a93035bf0c25285d230412ac7af2e48a8156c2e9d9c0581da80f913a2748eb76579b64648fd1e22ce0bc89da66aafa30809 SHA512 19c90c888b76564e32674364a753ba2d6a0b9ce6f3a97f45bb876c32f83c8206e6ec318e0960747b2003a4c3a426994f25c6b83da8b294d575f45e80c6105d89
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-17.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-17.ebuild
new file mode 100644
index 000000000000..3b3f636dbc02
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-17.ebuild
@@ -0,0 +1,29 @@
+# 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
new file mode 100644
index 000000000000..3b3f636dbc02
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-18.ebuild
@@ -0,0 +1,29 @@
+# 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
new file mode 100644
index 000000000000..3b3f636dbc02
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-19.ebuild
@@ -0,0 +1,29 @@
+# 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/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index f20ce6cbafe9..274b9f8b9be9 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,5 +1,7 @@
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8 SHA512 ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
+DIST mirrorselect-2.3.0.tar.gz 18039 BLAKE2B eebc4a02257b734c3dfd05cee541369689b92548b5421e977dd451442e8c83e426a03845a46e92eaa01507e0cba2b3679c97db2c00f012619cf9f551cfa1e1af SHA512 fc040bf6a9cc79f781157c7b65c6366c86dd54d583b4286845e3d037a2709c376e9132889e9dbe2cd40846cd7bd138aae7111d1a442a421101db756cc259b535
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
-EBUILD mirrorselect-2.2.6-r2.ebuild 1500 BLAKE2B 4a3dadc4384ee05c147dc9515b0356584365c2a22ca51e0b6d9f15814a6c77105e6bc51f594df1ea7cf5bcf7f20a3e9c559502054081588b98cfc1afa39867a0 SHA512 61810d6a011b19ba4c0bc445e30cb8dc7401a513fd32bd7ea9975018e3a6b8c91abc6001f2e1a32aba114d02a2d4c899a774a3f1037537245860a99fe33255ad
-EBUILD mirrorselect-9999.ebuild 1143 BLAKE2B 181f8357bb8b7679e1f26f969c0138f742266a6cec1a70e7c938d9c6f0dd1779ffc677cd75f816314b22cd8be39fc03910628cdf10a16ad24c5751c5d87a9f79 SHA512 717c8d0c302117424fe4193bfec1441e8e36220d97aff8377d45bfad6d147ca4fac755cc73e4dcfb000c9361a5f0c6d59e83948802fd7e8200892d3b780a782d
+EBUILD mirrorselect-2.2.6-r2.ebuild 1507 BLAKE2B 91374318bbdfb338811209f38db391a0d629af3157f65bde835d7f7844a4afbfed3346e04d8a39ea43d5ce21643424d0bdb78d2671e6ed70e4b3d6d89551e5c1 SHA512 87a34ec1476748a68df5b10fbc3e241ec39740566a0f52af3169265c2d6b7e71720edfc38543a8f52ebe1eb880e0049d9ae53574d8e04c892477681481367db9
+EBUILD mirrorselect-2.3.0.ebuild 1112 BLAKE2B f58b41ab17f42d95f9d923fe208c9f4424b53a8eaac8e55a0425a95f2835ca655ffed10643415a3ab870e189e90dfa80a5b9927881c791f396a7f90e19b1b219 SHA512 81b016ac837bac72e5c09ad83ceff233ac5c9e3de6e74850c63e6e397b3156dcf47cea2aab431e00f7eb3d6618525db329dfd6884859f5de4cd60f070df1e5a2
+EBUILD mirrorselect-9999.ebuild 1153 BLAKE2B ca42aec3a908267d192e7b74a82e3ae17fe254c1f9a3070273ae625c3398dd0bcecbe9abc79915f2137ff3fb213c8056fab579ffbb3b7139e232c8a2c8e03e7d SHA512 6def50cf976060cf3329fae96fc906f9322313b3a31d83854857ffa895aaffa193a9aa6a457135336657839e245378905b055506d3d48438bd9edfe890f1604f
 MISC metadata.xml 495 BLAKE2B ebc7faf279e0a14f107411622bb0855c36c2229ed8357d7abea7cc7ea6e49a7ae7d136d476c33c02da46bb93614adadf87d6b6e19d1698d14c78942f9eace139 SHA512 5e8f9c4e185318f2de112e02c2c15662553ccae75f35a14023eac9e55ade710a45f0f6b78d98c899fa7604043e28f0ec2109889459aca46b3708c97c444d858d
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
index 2cb16439ef1d..7d28ebbe54c9 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r2.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} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="ipv6"
 
 RDEPEND="
diff --git a/app-portage/mirrorselect/mirrorselect-2.3.0.ebuild b/app-portage/mirrorselect/mirrorselect-2.3.0.ebuild
new file mode 100644
index 000000000000..140f530d2904
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-2.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
+	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="ipv6"
+
+RDEPEND="
+	dev-util/dialog
+	>=net-analyzer/netselect-0.4[ipv6(+)?]
+	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	python_setup
+	eprefixify setup.py mirrorselect/main.py
+	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test || die "tests failed under ${EPYTHON}"
+}
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index d78005b03452..505417a219e3 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -1,15 +1,15 @@
-# 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"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
-DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 git-r3 prefix
 
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/mirrorselect.git"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mirrorselect.git"
 
 DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
diff --git a/app-portage/overlint/Manifest b/app-portage/overlint/Manifest
index 0e8ace3ab72c..4671d814b9b9 100644
--- a/app-portage/overlint/Manifest
+++ b/app-portage/overlint/Manifest
@@ -1,3 +1,4 @@
 DIST overlint-0.5.3.tar.gz 2706 BLAKE2B 78c76a72556213bbc84b91ada3ea1d71ad045fe4498baab1f6710190a55802e5ffee14d652540d2cb7caaecd407963f7bad9682cb72e5e6571597983384bf019 SHA512 348b59e5f013b1c4060312208fdc7fddad3252d6f386513d743b7685d8aafbf76ac626fb9000c2d47c362b85d223dea5f59b4cfec55dbf24a52185c5b943a149
 EBUILD overlint-0.5.3-r2.ebuild 492 BLAKE2B 88f8dffd215e12d3a4d702a6ccb9eff5eac8224943313e89d625407d4df9225da7f02ed4b480eb0155897646109f4e9f85729f73e2def914b54f1815b96a726f SHA512 5ea1480eb20656a499ebc9eb753d6377db7acf1388b3f8c34359d52eb806ce1e55fee4a5bb5ec3b8274f9ab027e7dfd810ffd821d2feb80caa2783fc29b7014d
+EBUILD overlint-0.5.3-r3.ebuild 493 BLAKE2B 343e054ddb1dccbb1b5f70310680e8d481bb5b05e4b1c6f84b5989a8788d0b2bf18e0bb20592e0db3abb3ce8c84a3450fb46f9451c680e472f9fcb4d26a7b28c SHA512 05ef59ccdc300e01cfc0c698fcbea090411b026e344a9666f0cbe427dc432d82a74e0bd174eb950774173d562d3c8fc26524d55f121bec80969d8970c89b0ece
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/app-portage/overlint/overlint-0.5.3-r3.ebuild b/app-portage/overlint/overlint-0.5.3-r3.ebuild
new file mode 100644
index 000000000000..2af4a8c15b75
--- /dev/null
+++ b/app-portage/overlint/overlint-0.5.3-r3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Simple tool for static analysis of overlays"
+HOMEPAGE="https://cgit.gentoo.org/proj/overlint.git"
+SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 0fdb16e6259e..bbada9a6ec43 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -2,9 +2,11 @@ DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 27c94694cab84970c0c92e835b9039d
 DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682
 DIST portage-utils-0.92.tar.xz 1819676 BLAKE2B 01798e3984745140bca1bcc1eda5c2aea7c517bee2656acfe1bd810fc8088ddcb474f2c64fee6832c5e1699e2ec8ad5a9c6d5afba8a2e2b6f1861d49fbf7fcb7 SHA512 7d36263c9c242c8e82786fa12e171a3f396f65520acb8caa91516862615bd71241699ab6c2232122f7009875aa0a10b06b614a842d45afc86e599b39711e12b3
 DIST portage-utils-0.93.3.tar.xz 1796828 BLAKE2B cfad7ab27ff2d92f631f4e31012e8903c5fa6113485f727338812059379cdd4a9552d80dc3aef6bb91264c361c0554fe9054a12347e274c4c5c3db66fd36008b SHA512 c1245aa78d236263cd266fc8565312c2ac30cb992037a7b0f26da04ecf2dfeebc85bff653784e186cf2c7d7468e4772fb0bd93bcdb3a37d46e493d000933e5a1
+DIST portage-utils-0.94.1.tar.xz 1871688 BLAKE2B bec5ddd514b397c157c3b1bff70d61730f15804a6751f56eb69c4030a35fc6a6b11fa1e2bde94332772660f02bf9428623210733ae9e2f1290f29aa3b31a1813 SHA512 29fdb4093997eb95703d407da6b00305c949f0a00ae3aa5cfb2c47b66bddc59e034fae114663b40b611f906332066b648018aa4e5bc1b935e61a64f4b4bf1088
 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 1525 BLAKE2B 31633b095b9fb0dbc0e9a4c5810be266484b0d353578969d587d725722c7f6870031453466b8e8ea70b094ff3129e94d71a81a7000b432f739f4b64a811df561 SHA512 c2f182e8b08adad0f5b22ff08bd1a41aec90a0fa03e40070ab3535947a5d3eee57d5fe4d6bec28b6d228ef9e8baddbe69203a4cc24833a7e02af5e2cfb615186
+EBUILD portage-utils-0.94.1.ebuild 1526 BLAKE2B 9f78548abcc178ec9771d894a942130b183f83014bad9e347528914239b3a81cc92f9c489a3ac6789d7d9750291ec4c8018b9bb329c5db37dc4392483db92663 SHA512 501ded3ec21c5efd4b38037050e87f66678dd2be9dbb8c7b1346ba5cbe3a339751b48983f611da2c7134e69f6ca1af169724f4c1ee4f4f0ea8d1dcd6fbec0753
 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.94.1.ebuild b/app-portage/portage-utils/portage-utils-0.94.1.ebuild
new file mode 100644
index 000000000000..f0936e338fac
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.94.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls static openmp +qmanifest +qtegrity"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+RDEPEND="
+	qmanifest? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			app-crypt/libb2:=[static-libs]
+			dev-libs/openssl:0=[static-libs]
+			sys-libs/zlib:=[static-libs]
+			app-crypt/gpgme:=[static-libs]
+		)
+		!static? (
+			app-crypt/libb2:=
+			dev-libs/openssl:0=
+			sys-libs/zlib:=
+			app-crypt/gpgme:=
+		)
+	)
+	qtegrity? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			dev-libs/openssl:0=[static-libs]
+		)
+		!static? (
+			dev-libs/openssl:0=
+		)
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable qtegrity) \
+		$(use_enable openmp) \
+		$(use_enable static)
+}
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index 2ca1f55e35fe..83c81ca472d5 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,4 +1,4 @@
 DIST smart-live-rebuild-1.4.0.tar.gz 17630 BLAKE2B 84faabbe702dc05dbd895961dba83b8b8968bafcc5e35bd1b7dc8644f98a904651168aaee081ecb0c101761def2f5d49046116179156e75f6b335a79595d82e6 SHA512 add82ac413c698a430afbb48a7d4c7d0dae26b9d37f01dcbe7f71ee2e2fbc1686ff63c6ea9ae1c24dbc3662d27247bec2ccc002841bd42c4c11729873a49617f
-EBUILD smart-live-rebuild-1.4.0.ebuild 810 BLAKE2B 44ac364a07a40600533fab609ece6732d36bba52f542ed51ae9706056cb66d8bc9cc2253050b574b86e91c6703b09e52b376d1b56e22048f0f77a636b9593f4e SHA512 204aa0ef8b2c802919cc910b12e10cb0ad623024498a9fc9c4c5f0a0761270a1e83590777893a04f2c526288d5c2a9eae93aaa26ece9157f2d3105434cb884c2
-EBUILD smart-live-rebuild-9999.ebuild 717 BLAKE2B adbb26e6abe05a7ec02232cf53f4991ecdc535c11fe687fd64f9157dc56ba5dbe1d84445a871cd54bf4516ca83bc090a542d29d22278bee78ef59f3204dffbac SHA512 728948aa46d7d237071cc12b7f857405e84328abc2f31da05461ac58f893c748fe5e5e71bed3b6178ac8673df32feecc472f95effd054c90dda57a8579f67a9c
+EBUILD smart-live-rebuild-1.4.0.ebuild 816 BLAKE2B 5c86d8a0e58ec7ccce434b303c7b4a9fc58c261060ddb7d1f645ea7eeecb41a7998c16fdf191daebc8232aa060b8ee2d93fdd72871fdf33d7f5310845b96444d SHA512 fee0e917fb37095ad5e11d34ef5aacaad0c0b470a717bc1c3244c2b5bb65d58dd9eec7e332c71f582309eab79807054b71e3ed154149839748ecb5db52547ede
+EBUILD smart-live-rebuild-9999.ebuild 723 BLAKE2B 757ddfda7dbcb90fce93a7bc3c967975a68ee372e089bebaf554f685869cd6f687f44f301fccb391ff784eb94c2b8ecc2df236017b6c17aa8a799f762e62b8ff SHA512 9e4f540f520f79307b094a5c745e764c0d921af037e89395645b8df406fc760a0fbcf0f8a28634e8f59c257c6745f8e5840d6bdf76fa58b78bb119db1f84912f
 MISC metadata.xml 794 BLAKE2B 24cd92d94a8efeb0b9a3ab601f9f5581dce5686365332decc71c80c5a3a431560929d33faa4736259a19bf8c92fc9e1b6557126e67678c3bf1c2573236eca3f9 SHA512 24d79d34c1aa3c213ff920ca9f6e010809f949d1c5487601735ead39da88ad8c285eee091336f4a45ab5d9a095597e3aea16511f17ad6e33416439e89521d35e
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
index aeed66f087c5..06f0f8a0098b 100644
--- 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
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
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 0e21252001fb..190ef2047ebe 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index b3b51cb59319..1a4c79e8c4f4 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 832 BLAKE2B 9fba3294216ec862386b426c0edae9a86d4c9b4f0457242220221cb20725382eddff90195ea2fcf957c8d3059112cb256c2ea6e9ca4bf42277c2eee309813538 SHA512 a14c9acd10e9ffaafd1157566b676ccd54361e1a51aa4a49aa6cf4b4f529ffe5178ed423fdbd39ef15169a0c3b2ac5ad68026e13611b17dbf4bf47b3d257667b
-EBUILD tatt-9999.ebuild 763 BLAKE2B 04c33f57cd3af03a13e6e96453f6a18d017bafeabef27449714ff185a9ce7df61f3f488b6345f622b14c94238450f4b46692718a682750a97e7e45377c7029c0 SHA512 4b97ef44e12c8c2d3d70dd15dd57a3cd317beb3024f8b4e3042a599f8aa032c399471e02395f04c5e5cbc16b38aa2ecedef339afd747353e2b35bb8eec726b90
+EBUILD tatt-0.9.ebuild 834 BLAKE2B e68ffa21b1f0d530b739189bd051cc894be385f340f182259c775174538f8d8c820981c5180f8f7addeec1fd17473b2c4ab6859f68db5fc482facae1e8c0d29f SHA512 7311e61c77c38173cdb8684582515e66c840eb97ce14dc17df7537d8a15c9f3d9be473266994925ce2e46ee69d7ff569418355d4f4f5f55c2bbee0d9b238c791
+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.9.ebuild b/app-portage/tatt/tatt-0.9.ebuild
index 5c41d2d22462..c241a0bb857e 100644
--- a/app-portage/tatt/tatt-0.9.ebuild
+++ b/app-portage/tatt/tatt-0.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/app-portage/tatt/tatt-9999.ebuild b/app-portage/tatt/tatt-9999.ebuild
index 057777352672..e59d8cfdfa8a 100644
--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-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_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 git-r3
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /app-portage
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)