gentoo resync : 31.05.2021

16 files changed, 78 insertions, 21 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index c72093c21bd9..3bfc6394e0e6 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/diffmask/Manifest b/app-portage/diffmask/Manifest
index d713361e43fb..e41713972f66 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 543 BLAKE2B 9e2dae35d9c7c7ed58297ea84069d80f335579e61498839f952aafa0ecf26c3e4bd8de219bcdd06565fa2a4e0ece201755f5320d831385c06da0778a36448268 SHA512 1ab77df3de44f8113bf9021d32eae8d3f064e663a6bd41079d6fda02e3e028f637b82551d29eb1ce091789d611cbf217060848951fd570b17d14990269f4d53b
-EBUILD diffmask-9999.ebuild 484 BLAKE2B bc90f70f4bab91eec9a0db48ef2ad0b2f4f3fb79e2f1ad51a328b78f80805a725df84c56fa9726f644424dc97f5b21ebb44146810d9cd0f4c32604634afc8073 SHA512 fae0020da6aa064ff60588381abe62c37fbf2610ffd86b6e3e23f98a1f85fcea167436103334f8dd04f2b6f55c0401ff9a5f12cf2a13d256fb1e40a30926ec91
+EBUILD diffmask-0.3.3-r4.ebuild 544 BLAKE2B 047990aac93ff7ceaee037c9ae1147f2474d2bdd4e024d468511a8c8bb8ad44bcc07a2266b1efeb0a60cb8ac90e424eddd3e4ed3fcb00ca06f975f36aa2a6ed2 SHA512 4831b31221f2427016ae54c163a19d7a4b1c7eb66e338982db14b2a2ea886949ad0b7c2c0d7ce323f51feed36dcaf30c205552317838abd0f69e7a2697adc5f0
+EBUILD diffmask-9999.ebuild 485 BLAKE2B f6d6d44baa235c774238f68383acb09f758760210af2f3772be724f20fc84ece0ada4abf8f95fdc906edca28fb8749cd79c74adf7936b3988d2e143efe4a424f SHA512 5542ccbaa3682f264a0b346a2bda6397bcc0bc1af264481567a5e1c8d9ec7d0a551a94687438dc0f80fbbeb3e19415db46279757072e205af98bb08da009b7e4
 MISC metadata.xml 865 BLAKE2B c9fac77bca18c860782a29fbbd18bcf32013f03d35a4caf12a720b9ccd8cf93becdf5a775e6673717da25d08b11c4b871150dd878241c8fea364e383fe1d1094 SHA512 e5f89a3756c6ad777fac8961bbf74f2a62d2b555ff9d7d5ebcba0533173ef6086d3e364460ae84932099d45f7bd9640acfa831d45e0d8317a47eceb1ddba314b
diff --git a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
index a2b84e49e5d4..4942a259424f 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
index eb4394d4ca93..413a58f1d2c3 100644
--- a/app-portage/diffmask/diffmask-9999.ebuild
+++ b/app-portage/diffmask/diffmask-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index 6f65f2c40c8d..0b6d4319678d 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -4,5 +4,5 @@ DIST elogviewer-3.1.tar.gz 28650 BLAKE2B b15d94095def5fb7fdcf77ad1e7bf1fc35af6bb
 DIST elogviewer-3.2.tar.gz 29046 BLAKE2B a880fde71df3c688572c33abbc163f3ac10a53c672b01b3139d02effa5e59a05f7ae1df35a4505b1a48d7a0cb6166a21b18d1d969e1eaebab03e3620298d4f38 SHA512 2503482f14e21c7b6f69ac0d6305c7c126fa3ac944b68acef7edec0c464d2e45bc2dc348f8d38033dbc276afc132d75863c737e222f66ad5ebe870b30fec2f39
 EBUILD elogviewer-3.0-r2.ebuild 1754 BLAKE2B 9dc22d3007857eea1581084249321f1079095995fa67581a1ee87ee00ed529587798a9e588e4f1e5901f54d5cabc3af4d6c5bf23041e74e3131f2fe83a3ded38 SHA512 8dd610e4dc94ff1fd69d2db221e8494ec136fc1813a04fad8fb36d335406ce623052a4c9aabd46aa8740dbd9925884b686ce82c212cd62472def108ac0e2fae8
 EBUILD elogviewer-3.1.ebuild 1750 BLAKE2B 3423aea8fa75f784ba54aa0c491ba75dfa57b8dd65e88c5f636d1ecd5ef19c56b98a7b06580837ee3a7b1cdb8e82be017245dfbd7b0296c71b66548942f8d463 SHA512 abaf4d80987e50f9299e5ca9568fa81a7e8aa820e7cee5b2d363d9c47be74c1050c0ee3c2eec6aaffca85b866cc139a2cf10dc90c9a2ed005746c7730d3f054a
-EBUILD elogviewer-3.2.ebuild 1693 BLAKE2B 8c0959871e7a5ac538ca75e55fa74adc9455eafbfdcc51d55d4275dad3fc47c9028b0bb6412ea95087509782a364bdb26be2cc254791a8e56408ea4b59d4b20f SHA512 de8d6a336f218a7f4b8fa8f58e0361bc882ee0f9293b88ffca2be5a92b191632e47290a3cac20e3bed14bf91319ae174110d7261cdbd6dbc2bb2f2e45b0e626d
+EBUILD elogviewer-3.2.ebuild 1691 BLAKE2B ccfb82357e50dfb71b9e89c9b994ec1bb5a73194e51e8aa30275cd741c462f140830ce342fafb4b79d417190e2f46e8f64403262cbbbecf9cfae4e76f5b855d4 SHA512 2821f34ecb038cc8c62fe1f56bd00121bf5b79c94b8aaffdda66f5f09b0108d46d7e351c6de83cdee3541c7287a13902e8aedea1eafb784aade90b88fc3c8550
 MISC metadata.xml 402 BLAKE2B 4cc6503c5c74f4f0883d2c167bb06515878ad1324931d38d9402b463c774b009d14ad2ec5b8d2611ea361e0793ffa3b4d463e88173f2f08dd0b1c0a988bed44a SHA512 77f982c8b1070592bcea3b91ae6e4c2fd815c5be0a63b7160793f7e7fbd1b1e60c3e3a993da1e7d2933b22ca621d6320955f7ac360b7ed09dc04a149ee32d567
diff --git a/app-portage/elogviewer/elogviewer-3.2.ebuild b/app-portage/elogviewer/elogviewer-3.2.ebuild
index 281fda711797..67fed128f29e 100644
--- a/app-portage/elogviewer/elogviewer-3.2.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
index c2f80eaa8f49..2df357c44243 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 1127 BLAKE2B 6f0b23831ee56ecf588b72292d6bb4aa376c1f03d25b47648b5ca1403ee62288f25f437728196ebb3e3e256ecc7fcade360802f9318d1f41a12ed66209753cd2 SHA512 47976711646b038efce19110630fbdd9b9ec42df29c14daa40c72933e5f6b9c67fcacfbf8b9d436fd64b4f9ef1c9d4c3a1c4f966d23316e1f7d2c6c687870f23
-EBUILD flaggie-9999.ebuild 1056 BLAKE2B a2cb23659ab3078774c57945a383c66b1ca8017bb42508ab4c4f3049ef5e2f53a66c93416e23320cce35d63e6c6f33616567a1c86ff0a6839f6b2b18919ff00f SHA512 6f1cf5fa8018a9832387ab70d1da5d02252a9bf4693a97557cf0e7dd5a98bf9af271a4b21aefaf87797a5edff2f6f847b94ea0bf9906644dc528ee9c5935b56e
+EBUILD flaggie-0.2.1-r1.ebuild 1128 BLAKE2B 2b082a3b04c09a85ceef15e2cbcfa29ab4e482ebceba038b48925e19da468f9c62f28cad50fbe0d5e324dbbe8b2aa23cae0f0a6be5e31bdebdc2b8a7c4ded217 SHA512 1d17dcd0eae77a95e542f96eb1c0fc27bdb14a3320a6bfa723ba99bba46aa20531b16ee2feed0f59a7f7312bb29cf6e8856719407ce086f62f11dfeea0377ccd
+EBUILD flaggie-9999.ebuild 1057 BLAKE2B c5c42e151353564f6710bf366ab7037b13511d68dbd0c98ecebbe0afc69bd446e3bd4a0346f36c5579e0b2b9a7f28048776ae952d6600e0df522ee326c6d17bc SHA512 b30cfe61f2d21f27931f7805d4005f0a28e8a3b55da3e2cc10d09d9e7c52ab94da973d865a23f07957b5ec2df14b059c20d797fa1386988c4031aff1c66f33e8
 MISC metadata.xml 503 BLAKE2B f86cc20c12e1bf2bfb8d04b6ec0ae1cb66fd4a239cfe41885b1277abc2590fbed0a27dcdad6c0290227f140e4b783ffcbeb8c4556fa4874f0cb4e1d77e691165 SHA512 d406c0b2397c2d40c1aab0db4d4a54c2b928075558c823da63fe21762ed618da5aa20fcfc86c4b3066d8a7bbbc4dcc55d6037025db27a7873de274282dc0a88f
diff --git a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild b/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
index a7a5da9f1188..7fa8f87b0bbb 100644
--- a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
+++ b/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/app-portage/flaggie/flaggie-9999.ebuild b/app-portage/flaggie/flaggie-9999.ebuild
index 63eb61617176..054c1c210325 100644
--- a/app-portage/flaggie/flaggie-9999.ebuild
+++ b/app-portage/flaggie/flaggie-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 EGIT_REPO_URI="https://github.com/mgorny/flaggie.git"
 inherit bash-completion-r1 distutils-r1 git-r3
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
index 0cec5a2ee797..5c702f3c981d 100644
--- a/app-portage/g-sorcery/Manifest
+++ b/app-portage/g-sorcery/Manifest
@@ -2,5 +2,5 @@ AUX g-sorcery-0.2.1-py3.7.tests-fix.patch 4455 BLAKE2B 631c028024312fd25f5191191
 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 1070 BLAKE2B 4fc7d608be55214f1e44bb41bb38261eca37e4dca23aca16ff34819bf0a3a386ea0825ee1110481ecc8aab9c4999f4e796778404fa9f167ffd6b30f56e429f34 SHA512 0f9bc9dc2f5df362c6dcc2fefff45d900b3aacfb6f3949572414188f2c45d07ae436cf57a63f31f4497330bbbae9e822f6e7ce27a0422b447a03f4f16d881a53
+EBUILD g-sorcery-0.2.2.ebuild 1080 BLAKE2B 67f1167fc7dc9802d2bef5ce7f7a974d74b36b01c7af288752494a9c7c8ea8b321992ffad513ec52525314b249f348775cd890abcd1b8a5e7651a7869c7b6db5 SHA512 0b37a339789d5637fc91b91c1cf510d5da1a2ffab5f83c5570024f35570592cabb732e71ed296404c9382aca71be0287a1b8c1d896eedef282bda07ab5e3e8e4
 MISC metadata.xml 334 BLAKE2B 6064d759a710731b62d8bbd56c2c07ba4cbcbac211d63024cdba8a2dd16fb268ce1198200990ce205164e573f00e88a3dfcef373a18215292cb693f2d165cfbe SHA512 0280e3f6d3d5c908e87c1996ffa41f98977053976b65439953fa9364e2714bb2eb344eee3f3d753b46c2176029749494f500d4b94ccb3327eb2441a3cbe04df2
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.2.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.2.ebuild
index e05a407dfc0e..368e36a04f05 100644
--- a/app-portage/g-sorcery/g-sorcery-0.2.2.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 prefix
@@ -19,10 +19,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bson git test"
 RESTRICT="!test? ( test )"
 
-DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+BDEPEND="
+	bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	git? ( dev-vcs/git )
 	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${BDEPEND}"
 PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
 
 src_prepare() {
@@ -31,7 +32,7 @@ src_prepare() {
 }
 
 python_test() {
-	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
+	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py || die
 }
 
 python_install_all() {
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 9fa2ef9810b5..d55abb893b70 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,5 +1,9 @@
 AUX implementations.txt 849 BLAKE2B a1f00e70488afc1bb98b86316af963d80953ad57cf8851aa624148c8c622613aa3b2b2824776ab0bfa0ddff985d472f47dfda2a203f2b88945fab4f4d38e308e SHA512 72e73b2397dc2cc0124986bd8ec7b4f87fb6af56a87bf32939c53615d3043ed2f58aaf41f2da5b63105bb5a5286e4a6d5e860a9cf1b5ac40a53db11521e5b866
 DIST gpyutils-0.4.5.tar.gz 20037 BLAKE2B f628c11e0ae2c9bb02a024e1b7dcab7092e7b01c14078683c47a8ca00d71021b988c51d80ab8b322891f9ecd4bb11c7bfe7d300f3bcbe489a977b18244ead085 SHA512 f68c87b5a35aece182bf2f9f93fe89f061dd49b4b75fabb7637038aee1e5301797af1d889a75829048eeb05dda0233461a2f2600e185214600a282cea50d1d3c
+DIST gpyutils-0.5.1.tar.gz 23480 BLAKE2B 90e7a0f54526ede6a3c0342558cbbc379a8e8453aca1bc79751c12e292322d3cd3da8dad69f8a6aed7704bf043fe9e2324b567b3b6f7eff49c0e7a3e2bb2ea31 SHA512 5be4e4e03a5fef746eaf9bfed70f58801ed0dcec34cfdeef8d0936b92690b9519802fa3cdc3ca446ba688c4ff1604b5819d14b723c7ed2e6dd8f5b39ee76996f
+DIST gpyutils-0.6.tar.gz 23862 BLAKE2B 6992aa6260dcb495bb6d1ec3615d9acbb60d79bdaa50f2ba29da0ee1ed9f0931726a2e71cce296eb05d37715b94386352137e86072a7ced789c53dd1dc9e9a2c SHA512 1174ed9f645eb0e7b435677c0f8ad19eeae54479f319aa1d192215e2c83642df68ba37d9e0113a505468f9e05f8e6822ae32b5965e8d7601a545f4d0c9387231
 EBUILD gpyutils-0.4.5.ebuild 532 BLAKE2B 008b08ed4d228f7845270cf644ff68199d02bbc85d85eeaaaf0fe0de68afed8e041fd605f749dd230d849b4863b124d031ac0d196f1c831c0c2bf5cc02f89d0b SHA512 3dcb448ffb5567b411293d9c28562a599ea7e174464966b05a328b586d757d399355697f1775b1e00e735d60159b7a461d028d096a0c443d7751f91f0b2222d4
+EBUILD gpyutils-0.5.1.ebuild 534 BLAKE2B 1d051ceb16f09033b7a325369e76457e456f0fff78d3bdd9775e8470899a34a1c77134f8ec22fd4b6110de36d9772aa09e5ca0d5560b31b3a1eb669e467963b7 SHA512 b66fc3f9bc934de79d6d843db98291d433e6c0bf9ff475927a8dfc8dbda81ff0d07731b6c2063b0c1e2e1164e5798897f6cb387916bb07a134ad46c3875bab1a
+EBUILD gpyutils-0.6.ebuild 534 BLAKE2B 1d051ceb16f09033b7a325369e76457e456f0fff78d3bdd9775e8470899a34a1c77134f8ec22fd4b6110de36d9772aa09e5ca0d5560b31b3a1eb669e467963b7 SHA512 b66fc3f9bc934de79d6d843db98291d433e6c0bf9ff475927a8dfc8dbda81ff0d07731b6c2063b0c1e2e1164e5798897f6cb387916bb07a134ad46c3875bab1a
 EBUILD gpyutils-9999.ebuild 510 BLAKE2B f1368e0bf4df4d14e0f5309cf9fdfa76264eff5d627cfcffe62935b0d11fb2fa3b398798ef5677aef44ff30cb1fad36ffb84aa526b3358dfe1955d52f941a2c4 SHA512 4252aa88d5c50bcc697a46daf883494afa20998996e8fd7955d16d131c7481be77df80bd0f6c8e26f82d455e400c41b3374e9a67889434a6417232838631b7c4
 MISC metadata.xml 552 BLAKE2B 1f0cbee3cc1240b53c9c60122f488628643742b1afc4f68e9780bccbd959f0d45fb612ffbe9a8f9ac0cb8b5b6586af133c3a5d43884d42b09c8f3a8e2d44076a SHA512 f6788974678b69e9f38f9813333b62bd53c0e41beb5aee3f1d962ab6a739e8a2e2d3b2e1e03e6200172641b73df5ae0eb2cd74ee664ad20ea665ed63686ac7d1
diff --git a/app-portage/gpyutils/gpyutils-0.5.1.ebuild b/app-portage/gpyutils/gpyutils-0.5.1.ebuild
new file mode 100644
index 000000000000..07c9616731d5
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.5.1.ebuild
@@ -0,0 +1,26 @@
+# 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_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="https://github.com/mgorny/gpyutils/"
+SRC_URI="
+	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/gpyutils/gpyutils-0.6.ebuild b/app-portage/gpyutils/gpyutils-0.6.ebuild
new file mode 100644
index 000000000000..07c9616731d5
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.6.ebuild
@@ -0,0 +1,26 @@
+# 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_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="https://github.com/mgorny/gpyutils/"
+SRC_URI="
+	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index b7fb802b3ea0..42d165c46445 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,6 +1,6 @@
 DIST nattka-0.2.12.tar.gz 92954 BLAKE2B c4ffd44030da0224963d7fa367336d7ab9076b17f03292f5e65b7855823b34374b8d7626c4b97c155d10797f2d550f3c20cac39f68cfbfc4b8038406f37b21b0 SHA512 f1e775895d66505b09a3098525f998f87bb1561538f0e75b993b264f87f61937d7d5c71999018fe93c683366ef81dff5b7fef1e1d44af63153003f70d7933273
 DIST nattka-0.2.13.tar.gz 93917 BLAKE2B 48e5245234d0ef0fd47353bac0d971d6187f59d94c0fb58f4cce160ee28f847a8fb32f8399af3148daaac299b32b590899de716dee1ee9cf107b1efe2451189f SHA512 0d3428cb3b5dee3fcdc29b9d22b5c05d626d26060fcd5518f789493fc68e51762edf9162a9b5b19c6c08fb9cb9c0e350faa41d96c53bd924b50475176140ccdb
 EBUILD nattka-0.2.12.ebuild 901 BLAKE2B f3d6838efeb395764fe0e1c98792e6061fe6b015f81ff325cfd0ae743a3bd10e20759822246b4bfedbbfc519e9645b18625a08d08a83aeff4621249f9f498abb SHA512 9734db90cc7964e6c9b274a41dd8be93380b632e936bacdf27e250f837042a866bfa113237ebe5e8e791cfd826af0739474903fa4883ba65c2930ca4aadc1f2a
-EBUILD nattka-0.2.13.ebuild 909 BLAKE2B 0c2b80451df8b3a41c88349c1e9827e7321253a087f89505fd5952a0ac1eb26e8af1acc5ec020f4ca9bc7fe77da526067111482065a692327024b7655dd571a8 SHA512 da0dc01fa9c5367e69c802fe78993295e9964c08dcb1df009a5f50ad7a275b5c9e02c06504386916c008675d36edc54736a64cf607e55646913b188d7f73177a
+EBUILD nattka-0.2.13.ebuild 916 BLAKE2B 5c31b30a1d1990fcd6395bdf267e1ceb2cdf764cb10092e948d5899a23c9a81c2d0ba497e6c3a92963c13b3929422361cb234185fbf7aedeaac1ee6a4472b12f SHA512 1a7a69d3abeb2e5a6ea5f20503cde5fe0efcd2b0a178c83a001295f126998187c3b0cb0289dde5e144c79031250051a165e432419a349972b4eee3bf7546938f
 EBUILD nattka-9999.ebuild 851 BLAKE2B f451fe8c8b8b742e217607780e1f3f34e8ce1f3dc3f2dde019b79807fc802284906c40e42fd7ca7e33ac3ddd117117cb5e05b806baed2e54485a9d63351ccd17 SHA512 9dc88faf76c7c84e49ee69b9e899547c215fc86823c446a5bba052d9d4eb11f537578f1063b2d4fa9a4f5122ba157e8226514c913d7080eab52424d7a7446f50
 MISC metadata.xml 384 BLAKE2B 190cdbb5b8976f88c21c364eedd2548b16d7a0bdd72c546058271b9b70fe98fe52d29e26f16cf6039aee0be0a89d058ca80da3dbfbe7c8cfa9906c7797cf2393 SHA512 6f50634a08f13a36a3b8070e4cf41dcc8517e4677f973709003996321e38a61dd049a5415eaf3c12dfe21f03c347f3729e02c4740c012e2c4e9133230e9fc971
diff --git a/app-portage/nattka/nattka-0.2.13.ebuild b/app-portage/nattka/nattka-0.2.13.ebuild
index ebcdaf95687e..9686c26c34ba 100644
--- a/app-portage/nattka/nattka-0.2.13.ebuild
+++ b/app-portage/nattka/nattka-0.2.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="depgraph-order"
 
 RDEPEND="