gentoo resync : 25.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-25 11:37:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-25 11:37:10 +0100
commit: 38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree: 04e2cf4bd43601b77daa79fe654e409187093c5e /app-portage
parent: 623ee73d661e5ed8475cb264511f683407d87365 (diff)
54 files changed, 422 insertions, 232 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index aeac37831f1e..07241b883923 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 783949cc1b99..392b27b20c39 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,6 +1,8 @@
 DIST cpuid2cpuflags-8.tar.bz2 82432 BLAKE2B c4284106a4b1433e266e364b40dd50cf801f6b4afcb6928b13c1ac58ea1c3854b4a952f6ac914ef995aaa8bc9cfd8a4428c84386eb2949f83228a5b9d9781ada SHA512 167ee1620d6d726ef849d265785b568bb72a1aae15f5f0c527a903424c8ce9519033c49e8a143ae093b56e25fd71b4746793fb825233173fe60ac29eeecca20c
+DIST cpuid2cpuflags-9.tar.bz2 82841 BLAKE2B 6f866a29680b53975359c56f54f3ecd8e978fe55297fdfcb84b25f57dc38bb0fb5c2169dde83e29235d13667a43faa11d75fa15e3d8fbef65a86cea2832363c4 SHA512 61a265abfd5b0920e1b3c18d322dceb416a6a353b3d3ef3f01ab1d02aab1b45dd1ec4eed4ccf667eae82c953830f29d22a671dd7d7c2b4d309050033af1fd5b7
 DIST cpuinfo2cpuflags-1.tar.gz 1429 BLAKE2B 5126e643e5e2ea0be2418068fbcfbbae1781a0e3ab7903d909d4a5a291cb2e5db132a7a6a5c6db12a757688efca0557e4331a91f64af4b7e47deca415fd05b34 SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede
 EBUILD cpuid2cpuflags-1.ebuild 1044 BLAKE2B ed9ea1bd60d8aea784c8d9a44263c17ca5257b10822415346aa21d670c98c07501bc27d44fa03e79b4a51fa5d9408df6f408933f522ba5771c8c68077137e727 SHA512 e20138a528d97615db610a61fbe77e3f4e8cb3c811a635fe4e17220c93548b4ebeb10c05075e3dedd32c79972e7164a5cbad68ebd5253470f308b6bcab6b75f9
 EBUILD cpuid2cpuflags-8.ebuild 911 BLAKE2B 90b427fc9798c9d679686ef886ee4439f59804536926afc49eca9851dfd9a2128578cdb10c415542ec830cbd0c69c74ebe11646654f2a32884be8a3c56772124 SHA512 2b9f8cbf9d72156d32428db5bd1e4a457bf7c77f8ea0e16e40e9a6553348b260c163a3aa02ffae2ddba8e68273634585dc9db0aa662f3342441bd87c3938f3f6
+EBUILD cpuid2cpuflags-9.ebuild 909 BLAKE2B 129d7bdbb57eb91b0c7f4b828d1afe6f80ca743cc4b853bca4a4bcab03920eae30c687bac7bd7109a5964d0805a8d657b3bb4a8939f28a4b7bd3ad45541f464e SHA512 3e641a5619d24d470365a37371b23cc0d20aefb7bde712d7aee3c78f27462fdd5926524d5d3876e5bacefa1277ed93fb189eafc6653512c65ccd65b786e5491f
 EBUILD cpuid2cpuflags-9999.ebuild 405 BLAKE2B fff9a10b348e61e1af045a39f10aaf81cb6d635d7c87056ab6665018c037b338a03890e0a1dee89f135b56b6805fdde0b2e547e0ab82832ae042c8c28d8bdd3c SHA512 36da5933134753af27f01b833ecf1e2d55c4c55eb58476c32e2de1c2ac6bb51de218e415c7168f97c574b0b2655825f0d981478ef8c17a147a3f38465eb0919e
 MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild
new file mode 100644
index 000000000000..5914671097eb
--- /dev/null
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v%-r*} -lt 2 ]]; then
+			elog 'Please note that the output has changed in v2. The new format is suitable'
+			elog 'both for Portage and Paludis. To use it, e.g.:'
+			elog
+			elog '  $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
+			elog
+			elog '(you may need to convert package.use into a directory if you want to use'
+			elog ' separate file as presented here)'
+		fi
+	done
+}
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index b794f996eb52..26f823471db2 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -1,5 +1,5 @@
 DIST elogv-0.7.8.tar.gz 19554 BLAKE2B 653a1dd8d5cb142c78c27ad4c7110a7dac666eed649213ef62c1548d5248c4add561242290a59178470736cffc9ac15fb7ee796a2954239ba382001f1e6c9c4f SHA512 be90f01b4d2e114608b13aeba78ab368af6ed66ca329de6952d7f422c90356fd1c6988827f0c60ee66636ae92e089689c7cbd725f6eb20545747fb24d0d1daf2
 EBUILD elogv-0.7.8-r1.ebuild 1591 BLAKE2B 02a2079dc2bb538acce711cf185fdbae073af455262250eeacee9cf125ca0d8ec77b2636da279c42fef093654ab338f41553d387c1cbc1c543a644750f275c17 SHA512 c419b695f0db6cbc505eccc4225ee77a446b253a1997dc10f9b18d1bedccf3a6b2d46c9a87f7ecc13c7d5959a8c07ea9a5023ec89af964ab84081eada91c94db
 EBUILD elogv-0.7.8-r2.ebuild 1663 BLAKE2B d0945ca00a2a998ffc3a20e2ccd3a96fc69f609b6f640360f0302b621ce85734d79f88c61cd9796b2252292c5f92bad0458fac80e7830580004ac4362342bb4d SHA512 1706f0b8e7f3a0da7834f74d2245a7f1888c80f0ec93056526c6508e2300aa373f247db1139aa9d0d43482c1b476fae6b6566a85d17f78ef6712103286e33a73
-EBUILD elogv-0.7.8-r3.ebuild 1692 BLAKE2B bd822694ff56a02720cef2d647991b5db8b3cd390742a433d632856a33097c13f4a1e7718c38820f4114ceea58f5aba0790596272ccc9d98ac36298cea747530 SHA512 b2b411f8e526ad9d950dc7db9f7043f9c84a8187efa498d6bc60bca958a1c0c0540caac8683d421845310c6e426e1003a9cc0eb33b9bcbc5cb01027ca21c09c3
+EBUILD elogv-0.7.8-r3.ebuild 1688 BLAKE2B 93ce28876bd8cde79d9b331acc059545b25d958f6d0c93995cbd401e74cca48e4508e3fd8e76c43299d40076ac45686e05f99fab5a259e4bd7c5ef3267f1d4f6 SHA512 c3ca6657969e198b1dfcce2495928f182d12da63fb5391d4ef129d0ef734524491504ab8b5e300d7b572c608fea523b216ccfdb77232b8aa954e8340ca046d4b
 MISC metadata.xml 470 BLAKE2B b80ae78f2033fbe4623e47b9f24581e2781a374cb9b85ceb9f990b2505666c19cb003050dea8dd532c1641c0c4fc27d84347ec39c5a5624bf79adba1e42ab873 SHA512 ad99227415869525deb25fc3cd2ead8023a03cddd0d546d14a8669cd681e5aa47cc40977a1664d466aa40c6100479e24e1228b3761ff331bc2436443e9c1443c
diff --git a/app-portage/elogv/elogv-0.7.8-r3.ebuild b/app-portage/elogv/elogv-0.7.8-r3.ebuild
index 9bb9e95bbc71..af2d7a30cc5a 100644
--- a/app-portage/elogv/elogv-0.7.8-r3.ebuild
+++ b/app-portage/elogv/elogv-0.7.8-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index b88c0f089bb3..44cc49ff61da 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -2,8 +2,8 @@ DIST elt-patches-20170317.tar.xz 23356 BLAKE2B 8e402496e4c064a56a6bafbf369bf9771
 DIST elt-patches-20170422.tar.xz 27864 BLAKE2B 0b6a764a7030d78618139f2c2a51f33b224f38e9f117ce45d119375e20566df55266f9684b53d3d311f91570803f937922f93801ad5a3664dae70828ebbedd12 SHA512 90867925f797ec815cfd8f45655cbc0bdc5f46e1a84792988ca76aaed97489907a926acf8f50c0499c56f6e70ea7081732f71c74a8d49bf24a6d265a0a4202dc
 DIST elt-patches-20170815.tar.xz 27864 BLAKE2B ca699e3fc3f5903f660fba70aa424603d42ef3b3aaa5e8768cfad0561d423972b21e75e578faeaaa89d8b0932f5161079a57e5d0d4ab7b56d5a09b91fb0e8d46 SHA512 deba10767b6a8cb5e8139e6f47a30e6f8a4a9312adb1d3e0199df24321d89601915fc91003da2d14fda679e7cbd30a4d4cf39d94ba57bce06432eefc168650dd
 DIST elt-patches-20170826.1.tar.xz 27912 BLAKE2B 886644713651448784e040fbcde6ef11f98f12abffb347f2213b990c1f0ec2df3af6c729c18781235a393e6de907b4da6ec5d140f7fb856466de6e7cefd54b00 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3
-EBUILD elt-patches-20170317.ebuild 687 BLAKE2B 51066d0ac625802b23e8e98af3549357b060b66c78c777f3a675e0a7a711879eb23dea328e300f3ce9db8a22e539f341b39bc3f84955715a81a9de04bbf1b06e SHA512 f5f1d5142a29947066e8b80109669950e20135764ecba4633ebcd0144e4f2cbe323acb2e6c86376bbed7d4f1cf54f2c34ac548d65bf9fe1b551d1aace25fa487
-EBUILD elt-patches-20170422.ebuild 810 BLAKE2B 4c09b2ebc994004a107cf086842637e354ba1ee932f013045735aa0c6186114b614f46f59a6f4d53c3e61890bd5046efd53ed4b9406e702b0864aa7b53cf0644 SHA512 9b3911105ee19e6887ba32ecef0648d3c6a7e665173da22e83519cdd1b35352a563b008620cfef744e71ff5e7d8ea307d3e02646827393d09ee13d3ee8bbd9e3
-EBUILD elt-patches-20170815.ebuild 810 BLAKE2B 209b56985f82d856ce3135d097d7011c9c585f3615f6b4e8dbd84e70ab28c0492ca30bc41137a94afeffdb3665845d40d746052dbb6892d5edd14e0d545f99c2 SHA512 5e2175073c5918d943c4066b3f63fb30c9da82364ec04f80180ca99d8264b5fa9c33f1ac23a8e555c4d89c202c09c7eaf233c243369a64c259492b1229791a1d
+EBUILD elt-patches-20170317.ebuild 688 BLAKE2B dc82f16dd1eaaf61d7d2230077510a3632fc5b3d7c290befb05575d45dafc2cbe43d46b6188d3239d8a2672e82935a5a53d7ddb14f084d99adcefa8859da4fb5 SHA512 86c30f567058d4f34fcea513e3a298e6967c4ef45b52f633a869b87193f590081e5e3a370f696386af3940c78db80517626d173d38a587084fd52ad0dc4b10ed
+EBUILD elt-patches-20170422.ebuild 811 BLAKE2B 2ca9beead59be64373e7fb7247918df0571f730ae785b291169240d30ede0ee0bc167ea62f0b634b4cbad3b81dc4ca4826d2a6f72128b2e491a39f3b8d8c5572 SHA512 48968fc8561592271e1a6ce56f87b1eaef6d568e164ae30c9f3932918dba02b5322a9274e155acd41ec3077ab1da216ac1dbf27789d09ed93e72a636ce8ab789
+EBUILD elt-patches-20170815.ebuild 811 BLAKE2B 880f672a9d36dc7290afe0e35eb5da5b1eb5a2fd8fd304f0213a1e3f5e661c65e02a4a106f248d08adf782089f4addd2a2f739180c04517c1cdf6ad4a8077d1d SHA512 b0f128a7b20a8d9805dbee6dc9020d6f72051bdc747f8899f58a7e206fcf6fe22400490b739397ce6c790c9b3752254355d911cc6efc39bec4e657ac5b24e6e5
 EBUILD elt-patches-20170826.1.ebuild 827 BLAKE2B ec1bfaea05b583ac7cd3034936d1451a059213b392fd69a8c702bd528bd3031eac0f064874f3a335eb371a914c906858229f692dc5f4c409f791ad6f896eaaa2 SHA512 06c13a2651b68a7784797b7a26e95ac940c15a48dfada95cf42b35dbe332e335008dfec83be0c6fe3e5e79910cc8fc379618cadf4d5912c8a124caa1d6b452f4
 MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb
diff --git a/app-portage/elt-patches/elt-patches-20170317.ebuild b/app-portage/elt-patches/elt-patches-20170317.ebuild
index c14e604cccd1..b3a68c92282e 100644
--- a/app-portage/elt-patches/elt-patches-20170317.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170317.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/app-portage/elt-patches/elt-patches-20170422.ebuild b/app-portage/elt-patches/elt-patches-20170422.ebuild
index ab89d3f87f08..526135456625 100644
--- a/app-portage/elt-patches/elt-patches-20170422.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170422.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild
index 5d74337968bc..8836b8a3c500 100644
--- a/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170815.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/euscan/Manifest b/app-portage/euscan/Manifest
deleted file mode 100644
index 891949ce2af8..000000000000
--- a/app-portage/euscan/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST euscan-0.1.1.tar.gz 441780 BLAKE2B 7c0603cca9b9da1f849999b215db2d397656ffc1e8e87193174e6ada548497f1ebb30252f83d0fb4dbbfa92000480947b1731f1792d8612e1ad56fd56daa2b54 SHA512 2f55f8f4b0fd46b13c981ba94be29a62f16fe2890ce03f99ac14b1488c2ebb59abdaee12f671d679b934b4fd875ee27e751d2c305420f7cfb08e69ec899a75ab
-EBUILD euscan-0.1.1-r2.ebuild 807 BLAKE2B fb8cf202824136f53e63144c10d75449106d8f271d89d6992e545720605fdf953fa9c36f73d8063b50239a51097d4aa757c80d3fc13190330add7415fe4ee21d SHA512 6c76b0a096d31ac98830578605dbf5eb9ce81ccc6f32199e894c0c9849d34c2e78d9a534b4e41d84009bcdaa0a6b6a8480dd8d02578b4a800362dfeed984c2b7
-EBUILD euscan-9999.ebuild 760 BLAKE2B d07ed166d1012b011ba832a8d5f6b42ad0528c98d90a6c79586ae311ce23b298af70b8c209e0065fa594787f92e5dd6ff6b9336d7a7fe320db1dda0bb3dd2d77 SHA512 ad9e0fd9305246b618dcb09ede7db843215ddf3cf5c4ad25cb93f1adb61b7a289470c9e170d641d5db743071a9a240bf7299903062ff76ed77ad948f02634cbf
-MISC metadata.xml 340 BLAKE2B 9429176a710bbd82a9c4bfdbf3228422807daa00564201eec1d8bfa2a1b76f65b84e16e6083cb0847bed08745262f0b95b8563b7449e69be95d8bc2ecdba6d1c SHA512 de74198fe372171f19b6486164e81b3f256ae6a04451ce5c3c789909a0a3bff6ec15a42a3cf3387f227cef33f8dbb32eb9872af95d6f962f61ecd2fa64ad0b5d
diff --git a/app-portage/euscan/euscan-0.1.1-r2.ebuild b/app-portage/euscan/euscan-0.1.1-r2.ebuild
deleted file mode 100644
index 8fdedba92b28..000000000000
--- a/app-portage/euscan/euscan-0.1.1-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-DESCRIPTION="Ebuild upstream scan utility"
-HOMEPAGE="https://github.com/iksaif/euscan"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.2.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/euscan/euscan-9999.ebuild b/app-portage/euscan/euscan-9999.ebuild
deleted file mode 100644
index bd00ac7169a2..000000000000
--- a/app-portage/euscan/euscan-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Ebuild upstream scan utility"
-HOMEPAGE="https://github.com/iksaif/euscan"
-EGIT_REPO_URI="https://github.com/iksaif/euscan.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS=""
-
-DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.2.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
diff --git a/app-portage/euscan/metadata.xml b/app-portage/euscan/metadata.xml
deleted file mode 100644
index 2c94ca18e808..000000000000
--- a/app-portage/euscan/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-        <email>patrick@gentoo.org</email>
-</maintainer>
-<maintainer type="person">
-        <email>alicef@gentoo.org</email>
-        <name>Alice Ferrazzi</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
index 1fc872c8bc4b..388107559790 100644
--- a/app-portage/g-sorcery/Manifest
+++ b/app-portage/g-sorcery/Manifest
@@ -1,4 +1,5 @@
+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
-EBUILD g-sorcery-0.2.1-r1.ebuild 946 BLAKE2B 177e21f41214deed8c5b4a684a98492fed689954760fb87fdcacb27fad21ed417d153cfa2e1cc1c063152f7c2317c37ba2c2c021a29d179cafe44bc8f174eaf1 SHA512 c3f11f75cc31575aad2b31a7988a63aab826ea3f066c1ef1c8cd2fbd21f3d9794ab0f2fb85faea0615aa2ff3449bc25fbea19515aad46a93c1b469e73f00d850
+EBUILD g-sorcery-0.2.1-r1.ebuild 1056 BLAKE2B 90fff4ddb6e7f559e95e0ce943244c06207db6f89783d573698e671e6d0ae7057468da319dcc4ef8b41003288040f141b0553593430bd6b71e585cf55a2a8a90 SHA512 26a2f5e32f706fb192cf886cbe0f634a1fbf3a8816f333cf579e74841650e3b5665e30694d1f176da4edb42df33bc24d6dc2dc6160ec47a47896cadb850f26b3
 EBUILD g-sorcery-9999.ebuild 863 BLAKE2B 7082478f3614ef7cb55a51d5a1e916cf7d27e84d2978d60ce62df71080faf0df7a9c4639a4d96d73841a60382f703e4e410ddc2db95bd9f7fab4c6b8a327554f SHA512 673a78a06387d002a27271476fe12e61726bf9b7c7f949ae53d3d049a67ef7ca3a513ba2f791af44f9845970e4abb64ed03ecd6473b73e9d39ca3e0652a8751e
 MISC metadata.xml 416 BLAKE2B d1009974d29bf69e2938899e03cc44942f86476c92ba3dde3f3a56e7253f77307bcb30771ba2a860e2c84e5daa1a16039a69aade1227c0739668ceb766ef9134 SHA512 63d03d46ad0f346591ea9208c55d186da8419fbd8cb1ba9ec68dcd8484cfd6dec0200e46004829cc8a1c411e13e4cdfeeef8e8c9ac05679f8d595cf306d49f54
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
new file mode 100644
index 000000000000..84a702413ac8
--- /dev/null
+++ b/app-portage/g-sorcery/files/g-sorcery-0.2.1-py3.7.tests-fix.patch
@@ -0,0 +1,140 @@
+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
index 6bb6f3199cc5..a1e76e62e3d0 100644
--- a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=(python3_6)
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1 prefix
 
@@ -13,7 +13,8 @@ SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="bson git"
+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}] )
@@ -22,6 +23,10 @@ DEPEND="bson? ( dev-python/pymongo[${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
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 6f70bbd3e7fb..aa4fe8957fb9 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,4 +1,4 @@
 DIST gemato-14.3.tar.gz 71325 BLAKE2B d42a5182c12bcc0281df47ddb6b933bb332b9b842b2a5c874c3fa4030ab5a8a16759ee289609d428a3fc1338078cd73d234060354513be88c184d5a6bbec545d SHA512 99904b1a38b8a05ff7bf7c265aa463a56ea3aa6c77dd844dc2d154faae5460e3535f4e9799e8863fda256ee6cd374e051ed98193c9b1fc52dc30c9c2655010cd
-EBUILD gemato-14.3.ebuild 1185 BLAKE2B 484392bcb86f29d07db7c5e55ef2688ddfec501753887deb4a47ad4a20fecc7964d3342b4a4d9752a5a063d92f101762712a68b362e4c0dffce904e913e97ce0 SHA512 1650bf34a200d1448a2e5631063a01a0d2c4b8cf85077a18dfefc0f5717118f9ee2d1fe66774d8c348430c809efa547c64195068d394821181a55ef6c73d7f98
+EBUILD gemato-14.3.ebuild 1186 BLAKE2B 093d244f4b5b284833890d060daaa56463339061cc14e2eb3d5ad1442e526384e9f05a8636297c2c9b3f5164e80b7ca6feed20da5536c56c6d7e804d1525e9ab SHA512 73a36471c6db42cc98159bb32031ff90eb386a01a620b2a40dda660eccaf042839e4c12c40c4cda37b6f0ba7f886b442ba17da6ebaaef095e7b7fb310ab07cb2
 EBUILD gemato-9999.ebuild 1125 BLAKE2B a49efe2a16ad0d96457d76f75795b0f6777a4b277148db9eef515cd0239c91659387e8e58a70f45feed1605b7c6e5bbe9eb3693436fc97a02c2c212db7952998 SHA512 2b1471e8edcd22d39cd00b053c26e90434e4498805d86ceb2d719817be987aebca98499d9bd8de4568945950229ffa3a9889fb457a1eb8fb99e2f9d1ce19056e
 MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
diff --git a/app-portage/gemato/gemato-14.3.ebuild b/app-portage/gemato/gemato-14.3.ebuild
index e27830de9717..5a53b2fe11d2 100644
--- a/app-portage/gemato/gemato-14.3.ebuild
+++ b/app-portage/gemato/gemato-14.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="+blake2 bzip2 +gpg lzma sha3 tools"
 
 RDEPEND="
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
index 30c4d7df6f29..23e64ddd9c38 100644
--- a/app-portage/genlop/Manifest
+++ b/app-portage/genlop/Manifest
@@ -5,6 +5,6 @@ DIST genlop-0.30.10.tar.gz 20872 BLAKE2B e06088678598464c67b78cf10a7472d7bf7b22d
 DIST genlop-0.30.9.tar.gz 21160 BLAKE2B 4d8fd34c8ea1e49498ebb887782c02b2dd20bd20bd1559b469dc93ccaa9873b27681c8c50ca85d3a96ca687f28f77750d79d9d93ac50e10c3d0fac2a593dd1ea SHA512 659c85bb1d75a90e37449a194fca2c610b2684dab3eb722d566aa929626d958aa1584d12a623f31518d982543be9392786291886ea66a5511e61de1beb3a6936
 EBUILD genlop-0.30.10-r1.ebuild 759 BLAKE2B 9fc761292187aa6f21d34c5424cbeb99b7210bcb2efa17ab461c822fe7ecd0702c635a35a89fb0f799176ec30a34e63c08c3cca0e5198fc48f6a5799247e2b57 SHA512 777b6fad82012ed1bf6db16eda1d4ef89faa31643f9d4383fb94f83190a8debe6648152e6d4d311fdef985076ee1cc517e543e0bb5858eb80728cea2754ff807
 EBUILD genlop-0.30.10-r2.ebuild 786 BLAKE2B 305595717355e1d99ff7fd116ea2ca371d432f3156841da2740e9bda979be96b34e73142ac1ba33cf2b790296d4d4fc32ad3760f26bf29c00abf0e7b59e99112 SHA512 051bcf320d17e7eeb3eb36b5604e772565f9f46d104157e1dc6f0cacea9410a1b56489688f16a9df6cfb2232a87b61de5a92f72d231c3c0dfe0e9dd93d524762
-EBUILD genlop-0.30.9-r1.ebuild 701 BLAKE2B 171f8b5d936238577bdc14e9fd0a57f4c6df83f2015953582a8a7846f8e878431b65b3010edc0c498946ca1a7eae9de8ca94c8e173bd320ba990495054f716fa SHA512 bdcfc06754cbec91ec69f6a6938be7a8e520586c4933343add24f78d4cb4209a2a620ab27c0d5128521e2b538bad74cae9f8c11d5178b946904b10cedfa9f727
+EBUILD genlop-0.30.9-r1.ebuild 702 BLAKE2B e392b47ab8c5cb156e84fa5105928d42a9be19b15b210209432c3f73be33ae5d6bb1f0dfb21e32b73159eb1693b861c48542d466972434687afd4d29c3596020 SHA512 fceba862a9ca2c9536ed191621d9d6e52b7d2d8839bcb804a7e03490f06d4d6a32c1009d9e4df36b63797f6c834d41e517b8e166bee99aa22b0cfd289e5163c0
 EBUILD genlop-9999.ebuild 540 BLAKE2B a1785e1dd85c8d0fc365a21175f8df825390f5ce3ba9da561d99bb7138b965eedae647e54536567aeffe32014edfd2ee909a1030db96248ddae48a13b23c8f7d SHA512 7912f2f2cd550ecee97e1778a77613b22595839f0effe4815b7afc710a03530027b1bf29baabdd75705aac5a1cd2f0721c097a6514c0556e050a400866c5f162
 MISC metadata.xml 377 BLAKE2B 275b2a7cd7c400a7f16f8031457520d9a1e44ffdf0f2a53ffc06194a4f2e752ede65f13f36b852a24a67267907a6a2a8c7a81f1cc812c5b4c676edcc1fc492cc SHA512 3bc89900e1d25dc84831f78427b06089a1f0a16710d2adf31871af825041522b2446eb2a8156c4506d7e19cb6c73fa055f318b9dc48c9bd15d92511493098f1c
diff --git a/app-portage/genlop/genlop-0.30.9-r1.ebuild b/app-portage/genlop/genlop-0.30.9-r1.ebuild
index 98a1a12f4c9a..c78322a58d09 100644
--- a/app-portage/genlop/genlop-0.30.9-r1.ebuild
+++ b/app-portage/genlop/genlop-0.30.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo//${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 2416223782f2..087a0f94e100 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,8 +1,10 @@
 DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
 DIST gentoolkit-0.4.7.tar.gz 3205669 BLAKE2B e5f64b85546bc10ad16e7fa42d288965539177375e8796b40df699859efa13fb98bb86aec58e60363c955b2d5e4b2e6379a7597252ee4fdbeec49559de67b328 SHA512 0fab600b4323d23e12009eeb4ade595950880a88b05bcfbfeada1a9b9af615b96d31c568285629bf6e5de7b45ed857bdf98b6261dc54974fbaf70c924e093c76
 DIST gentoolkit-0.4.8.tar.gz 3206070 BLAKE2B 7f689ae85136827b8af50401165ccd44bc824e12bec43dad786c7221ec78ee3c1f14d538d197e277a2fedc23f570440f4ec7c0cc707a146814315ff6de48c115 SHA512 689b4229c5d2b6f4440b7d3d57e4b9be5265eead53737890c17dbd0510df287f5c19f86b924735d4ad146d1a500c59a15869b718cbf805b894b0bf115b69f838
+DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861
 EBUILD gentoolkit-0.4.6.ebuild 2289 BLAKE2B c405f76dc529c42474e0e160df1669f036bbe1000b29ea188a777808c7530f280cfd770a27bb5414e7dfdcdcc36bccc2add5ec4c6bd0aaf9ef004948b7f83837 SHA512 67ef3bc311e4ea96e6c940d7f413fe8b05b03d0d3412cb3b75fb0f2a8a180d72f10f35991eb3ef012ee0b5b176d230007ea1a7e254883f57c9f91c4cc48b6397
 EBUILD gentoolkit-0.4.7.ebuild 2306 BLAKE2B f979fb2faab8d450bfa47ae0fc51b032f7613807048f0e6ae52c6acd7d52dc336d605a3b78ab72582b481452ef05c27de9f20a3f782e47d559c1360ec3a53c77 SHA512 046b1c64203865794811eb01ba111a593600f7bf7a4878d9c2c0e8dcb1421451cd2c6b42ac7094061807de5f056f72ef582df999bbc61a8a7d13075b2f6ee90e
-EBUILD gentoolkit-0.4.8.ebuild 2306 BLAKE2B f979fb2faab8d450bfa47ae0fc51b032f7613807048f0e6ae52c6acd7d52dc336d605a3b78ab72582b481452ef05c27de9f20a3f782e47d559c1360ec3a53c77 SHA512 046b1c64203865794811eb01ba111a593600f7bf7a4878d9c2c0e8dcb1421451cd2c6b42ac7094061807de5f056f72ef582df999bbc61a8a7d13075b2f6ee90e
-EBUILD gentoolkit-9999.ebuild 2079 BLAKE2B d9907f6e1a70545548ad15f74c247f7d59fb03e692dac268934d966d63a3340db301b4a1d3d58e804e948bd5d18bd5b4af1956eaf5d66f31a515fcc5b6a2dcbf SHA512 c526f20479299dc0849bc3cc55b540c4713e0220a511aba0668b6e9fdb781b52fb3ba51bf9940bde1615ee98a8042b325f0158c412bc002825b44ee3a7e34009
+EBUILD gentoolkit-0.4.8.ebuild 2297 BLAKE2B 10d21be291c5222f70be925db74d50698d305cc591ff174842ad384a158f06d76e8b11e606bfe773970c2925ce7e15f0b2665a600bac98ae0642030aadff72b6 SHA512 6af0f28b49cde8aeba62e4f4a7d4d536609d38ec14c4d378b2e71deaca4a1b0442ba9f0b9d9dad853e7bba6d8ed7b3e099a1e7d723bbcbed7be2caa14fd0e30e
+EBUILD gentoolkit-0.5.0.ebuild 2280 BLAKE2B c98ef3c98a7a0f7e773e2ab3aa79ac92aceec9970e050c4b8302c029b80a1a4d665ac8cddb7a3cc9f5007d1dea7cf1db135622855bf5d978bf0f928ca134209d SHA512 7f23a153b8e85079099f272381813ca2b132325d1ce75a37a95ec2f7df87032898aa8dd02d6c36cae6fe7acb6f455c9a76132162fc63b3e4f63267dfcfb1440f
+EBUILD gentoolkit-9999.ebuild 2055 BLAKE2B b5afb916af8f235a53452b1cd99b369438eabedd7bb4db23893ec29d30d26695cfc4328c8da559eb7c5c3b906a353ca001d79a5b6b67b0203276d2b2517b8351 SHA512 7e782f89a184ac8bd3f4a23513fe67069ab2d3d0e20338e5337793553df850409699e24cffac872335208b5237739b7ccc9938c05644fd9c806235b94b7a4986
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
index 34ae357f65de..d2a61bf8f622 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
new file mode 100644
index 000000000000..fff875e880ec
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	sys-apps/gawk
+	sys-apps/gentoo-functions"
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
+		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
+	fi
+}
+
+pkg_postinst() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT}"/var/cache
+	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
+
+	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
+		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
+		elog "part of the gentoolkit package."
+		elog "The gentoolkit-dev package is now deprecated in favor of a single"
+		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
+		elog "are now obsolete/unused with the git based tree."
+	fi
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/install-mask"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 1bb4f4cc13d5..39237afdc316 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -20,11 +20,14 @@ IUSE=""
 
 KEYWORDS=""
 
-DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+DEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	sys-apps/gawk
 	sys-apps/gentoo-functions"
 
+distutils_enable_tests setup.py
+
 python_prepare_all() {
 	python_setup
 	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
@@ -32,10 +35,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
 pkg_preinst() {
 	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
 		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
index 92852f384274..05011475546b 100644
--- a/app-portage/gs-elpa/Manifest
+++ b/app-portage/gs-elpa/Manifest
@@ -1,4 +1,4 @@
 DIST gs-elpa-0.1.3.tar.gz 15486 BLAKE2B 6e34aa27aae9d7e27d41e122ed18890b5b63a18e5803f83aaa2fe5c82cf95fb010f7d428e576ce1c8493b27fbb587e37f74f8c9ed3ed9320722ec61eff1f535e SHA512 616c6cc33e89094e727c9ebe577d211cf9200a95b7ad6fd4b350b16d6982e3d509278b63a145880cdbc8f83481ba409b650e43260d463bf90a22e2a705997020
-EBUILD gs-elpa-0.1.3-r1.ebuild 601 BLAKE2B 97a6e89212b673a7fb35ed5fa84e214ad1e01ef53cf608a8ee83b06b588f20ffc5451768c2e03f0393f84eb713e2ffa1c58ce1571508a81158ac75d77016b758 SHA512 40b1b0e553e3b01db388d6bfea79e3325db0047c8c9edc4575baf875a2269cc329f5b14cbb28dd4945e638a0c1f7a8fe4cc500cbdcf654d7e6beede64bb106e9
+EBUILD gs-elpa-0.1.3-r1.ebuild 613 BLAKE2B fdf8c0d02c4b104dd29bd91bdd0c9555450103603f9b4c2d682073a60ceccd496b44cc7a7c5515aeb578c62d28fd718808ec739780482f23a36dd64bbdc3f661 SHA512 acaaa8acf0d690c63d53322ab856fc14bbf070d1e82efba42589bdf5ceb55a2b1afdcb47ce6413940fea86b091621561e48a208cca238276f8698ea14934749e
 EBUILD gs-elpa-9999.ebuild 593 BLAKE2B 23ef195780293ace28a7c6ca4c9729abdebaa11cfc661cb5316030ff4ef9cf98c4b6f600b817c491d9511c6df4a6cfe887eaab330e708582a7473fe326bcc6bc SHA512 f99650ffcc462906b7fd0f72a4c3b21ba6cd2a102a56feed7fdcd7a805bfd97ce6624d3105279005b1c72ed6acbc658f44f9281c3dea9c1f8d56bd79528f910c
 MISC metadata.xml 332 BLAKE2B fba6bf848c564260ffecdccc4a972f929bc0bec8b8df1a5842da68943d1877a27eebe514d3b6d963d398050f3411b8c6626be4cf743382559646099cd681d570 SHA512 cd0d491e5d3362c673b23769d802067f467d48038f0590d94a3a93fdcd6ebd3edc2162829854d0123576dc92a7b1bf49dd3fbad2a0e2a85c311701027d8d4fb9
diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
index 9d3af3fb369e..14fa6f91c461 100644
--- a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=(python3_6)
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index c40126ba0aad..b320b42b9436 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,5 +1,6 @@
 DIST layman-2.4.2.tar.gz 137893 BLAKE2B ad925b974e280c0c933cb7c7d5131946fbb40d15410a671be3d93fa895e2d92a4f3218bce99abc8f2c1e007e72bd51662a18665579bf2ded7f349eb9ed5c652c SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf
-EBUILD layman-2.4.2-r1.ebuild 2173 BLAKE2B d7642b6f87045257e4fcd0bbe0732699801ea618f9a45561a1fc6ed7f1e104bf04a0f8c6a6268025968806d9163e0ceebb122d3d31a45ce780fe4f682285674b SHA512 2e5aa1718a6cd1c9b630b85b4a5b5fabde279402ce68eeba9d2cb22f7804a48b5172136edfdfee77b54324803909a3c970d93c5d91276624f7ccf6263d532c32
-EBUILD layman-2.4.2-r2.ebuild 2316 BLAKE2B ebc560bee1bf5dd7427a1207433481e2f8447c930df718a48be79df9255e81ea1e47743840133ce5aa90f4299d7f98a367398d56253bc6eeadebe01ba0de8aa4 SHA512 6dc4b86805d883fd4258598914e9ad778f2224b9dd2dacf6724312b0cf19d096a4bf1caecf44d33cb65fb8151e3c02ae9cd03d5267417e68e3d20f6db1091308
-EBUILD layman-9999.ebuild 2316 BLAKE2B ebc560bee1bf5dd7427a1207433481e2f8447c930df718a48be79df9255e81ea1e47743840133ce5aa90f4299d7f98a367398d56253bc6eeadebe01ba0de8aa4 SHA512 6dc4b86805d883fd4258598914e9ad778f2224b9dd2dacf6724312b0cf19d096a4bf1caecf44d33cb65fb8151e3c02ae9cd03d5267417e68e3d20f6db1091308
+DIST layman-2.4.3.tar.gz 135311 BLAKE2B b83fd543468be904a10d6fbda11f8d603a6936ecef3029c9d1c82fe4c938d2cd299874a3e114ac3524485ce8a33c5ec21885adddc218f5e331519318c0b1ad5a SHA512 2f3d1180647b358d5ca929fd28c6c5f4664f1f6f24e3114a4dc886d23279ffcdde7ca292c64aab84f1710ddf7029c26483de07c2271ca527b8618888b0ea2b54
+EBUILD layman-2.4.2-r1.ebuild 2072 BLAKE2B b97f6552d5779f157ae2d89bf48194bfcd018f6c6576aa708a9a05949e09687bf46b124781db36760fa08f3b11d05d1add4f9cff1dbb9baf423f3f6073359acd SHA512 b22c3e6797549eb93c8db5799275d5d2bfcd1c05a59bc28d4b32ffac7662576f7d576d3a6da2a50abcf88e6956a8b3064c199c24303a92a88ac016d16801a0fa
+EBUILD layman-2.4.3.ebuild 2247 BLAKE2B 8d15c448de4899111a45c0374bd8c83497e2cb3b5d52a9bc3a897957af871255b732e1274e9e225e1c878f4fb4aac14de562cca1c6c0ffe366d6a71eacd9356c SHA512 0dd9a39c99199db9722370cf348c114b53590a603774603b65673035102980b86e08881a3ab53450c27132b0e44a5038360d8cfd0b2b1cfb4337f1692c94d569
+EBUILD layman-9999.ebuild 2247 BLAKE2B 8d15c448de4899111a45c0374bd8c83497e2cb3b5d52a9bc3a897957af871255b732e1274e9e225e1c878f4fb4aac14de562cca1c6c0ffe366d6a71eacd9356c SHA512 0dd9a39c99199db9722370cf348c114b53590a603774603b65673035102980b86e08881a3ab53450c27132b0e44a5038360d8cfd0b2b1cfb4337f1692c94d569
 MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
diff --git a/app-portage/layman/layman-2.4.2-r1.ebuild b/app-portage/layman/layman-2.4.2-r1.ebuild
index 8540842c8cf7..6ed498235fd2 100644
--- a/app-portage/layman/layman-2.4.2-r1.ebuild
+++ b/app-portage/layman/layman-2.4.2-r1.ebuild
@@ -28,13 +28,7 @@ RDEPEND="
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
 	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
+	subversion? ( >=dev-vcs/subversion-1.5.4[http] )
 	gpg? ( >=dev-python/pyGPG-0.2 )
 	sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
 	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
diff --git a/app-portage/layman/layman-2.4.2-r2.ebuild b/app-portage/layman/layman-2.4.3.ebuild
index a82ec4d06a4c..dae60bcf5c63 100644
--- a/app-portage/layman/layman-2.4.2-r2.ebuild
+++ b/app-portage/layman/layman-2.4.3.ebuild
@@ -3,8 +3,9 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE="xml(+),sqlite?"
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit eutils distutils-r1 linux-info prefix
 
@@ -34,13 +35,7 @@ RDEPEND="
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
 	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
+	subversion? ( >=dev-vcs/subversion-1.5.4[http] )
 	gpg? ( >=dev-python/pyGPG-0.2 )
 	sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
 	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index a82ec4d06a4c..dae60bcf5c63 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -3,8 +3,9 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE="xml(+),sqlite?"
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit eutils distutils-r1 linux-info prefix
 
@@ -34,13 +35,7 @@ RDEPEND="
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
 	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
+	subversion? ( >=dev-vcs/subversion-1.5.4[http] )
 	gpg? ( >=dev-python/pyGPG-0.2 )
 	sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
 	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 8c4e473088af..259f6416cfcd 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -2,8 +2,8 @@ DIST mirrorselect-2.2.3.tar.gz 15230 BLAKE2B 7234ab8a681713c63b201e1ae362ea9a28d
 DIST mirrorselect-2.2.4.tar.gz 16085 BLAKE2B 67d3de3e25a993a4bfc546ae7d188b2a7e61da1cfbc85ac50119c88a81c4966959e31f88101880ba86ef27f0b0674a3d279b11135d2475d0b2fed1ea899021f5 SHA512 8749a916911088d128f9064d5aa78c3bf8b529d583db86eb6f7190959008257e231f7b0bae9a2f2fd6edc45f6d0ffb07364c16a3f190f8c97b88472c2d082037
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8 SHA512 ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
-EBUILD mirrorselect-2.2.3.ebuild 966 BLAKE2B 4a278535f80b1898145a7907337d5ef1f6338e7fcbe3911764c60f34d6f234f254c6e6043d7a9d03c1eb99a1c0db8c58f30c31a7eaeadd5bffbf9c0ee9c2f42a SHA512 39cf152886e81046caafe57c2819c999c5eceb743b947d294c7e841eca9c9899fbb10475c1ba12adab02e7e4d9f5bb3913a6715538c0e03c7c3dec74b5db45b0
-EBUILD mirrorselect-2.2.4-r1.ebuild 955 BLAKE2B 59e18454b543436aa008ad34e67cb9e5685f824a3f9ea046faa3bcf8fc20df5cffee5abb6b02a93f140d1f25f1a7084911822cd10aa5f1adab795647ebff9602 SHA512 e67fc6886d86a488e8b019a68738320dd87c7daafdc9e639653b54b894c3db95d7e7e437529e779ce730abb66cf587d575e6aafb18b85aec97291e28f8d1b509
+EBUILD mirrorselect-2.2.3.ebuild 967 BLAKE2B 984f1f693742988f6f4a585786ccbe1aabc7e0359651497dabb0bcaa300d5c3704148919e5f3e4d1bb2c38e0faaeb6bf28017cc1ba9a8f3d50972d691534dd3a SHA512 98ffc5154ef2b894e950417a0755a7a9af28601c36f248bfce6c387240f5f75c5414bf0c8c1a73aad464f29d50e17cfdb7524fa89554a42edfcb7bcff5edffe2
+EBUILD mirrorselect-2.2.4-r1.ebuild 956 BLAKE2B 17dae176c4bb7897e38b4bab0141bb58c0e49058d44027ff246b4356575b8b3619064415f34d8c01ab66e3840c4a484ec0aee22fa6ef2e780926da0d59783e9a SHA512 e6f8bfd830a0c82099f959ab7ae8a29348b42d8b90f99f223056ba8c399547c387033e7ae4df754d8fede0ee341db5fd08a672a47574b889de4820fb0245d58a
 EBUILD mirrorselect-2.2.6-r1.ebuild 1483 BLAKE2B affc56795fb7eb3f0ca93f20fce510e7b6ac920df4fd290225e72a58025c0fb471545a42e150072084d59d153d5a97d46f4a15b366df1f336a2ed3b570743104 SHA512 b79de2fd09a365441bbece931153fa6f8b07331f6c6cf2d3ae720db8547b1fd48165066f86f32b4502fa81248f27bb398a5689ba0c7346f16fffcbc51156d302
-EBUILD mirrorselect-9999.ebuild 1124 BLAKE2B b5bc70646394397d5460aeb2cb3f43bcb2ec7134640c69ee22f189434470ca10091b82c82b544a1a96c2f5af9f22fe66b4c74928510cb399be46d55fb100d736 SHA512 d07b7665c53147c268eb77f276e8ad63c876e938b58781e440efc9cd3c336bd0cd291db6cf6bb5bba5f6bf3db988b0ef917014ab29f5789a4d6df86b5c990ac3
+EBUILD mirrorselect-9999.ebuild 1124 BLAKE2B d62d53b4ea567ab380d3335a4cef175dd393767e593174d6163d5615f2eb8617aa40fe2670f95122bdd5384735fc72a5e732f8f0685c1d6f7864189c9496701e SHA512 1477928867032a8291e9aed8e5d10ccd4537d2cd3208789bb3f5acf3935ffe0559dcf4e3dc6c68cb9321f0a52bdf0bcfd8fe8ce30561f85730ecae41e2f5cea6
 MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
index f8fec29fc941..6cffdf27d924 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-util/dialog
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
index 2551b0b8b953..9adc65c1d761 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc ~x86"
 
 RDEPEND="
 	dev-util/dialog
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index 14f0555e4126..eaf8d49e634b 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -23,7 +23,7 @@ KEYWORDS=""
 RDEPEND="
 	dev-util/dialog
 	>=net-analyzer/netselect-0.4[ipv6(+)]
-	=dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
+	~dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
 	"
 
 python_prepare_all() {
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index 4fb6e193bf45..c3500cd094a8 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,6 +1,4 @@
-DIST nattka-0.1.2.tar.gz 73791 BLAKE2B 9e4d59f72b2e657958f7a8ac4b7d059079ab1c3ef6aea6544d4988aaa4acb3e09d6cb3a7cfcd7a01a4e7d891d7f2e544e3739470b0dbb961702e4c02575915b4 SHA512 1ef5af9b4c14dad5dce3eca427e77ec1f9f13137698a4cdb53dca58b1ff9f66d79508f69091ee96829a8d2703ebe7189a57e8257e20e586b90f2bf46a999cd0f
-DIST nattka-0.1.tar.gz 72870 BLAKE2B 0d4750a0367b3c00ee0de3eb37a7b15bbdc84ba693c2e3cb3a7baa1684c062f58458ded01b63afffe128b8d003cb14460bd60da91e61b100913801a3bf0d42ff SHA512 536be042d384f99631587108e2dfb24a3effbec1cf547b7f546fd8cbe736fa2e76ff1e9ca751ac7633fa34bea887da3ebe5967e915434ec8d8f6bd9c49a5a21f
-EBUILD nattka-0.1.2.ebuild 883 BLAKE2B 39711636bc65b43b1fabb999f698f64d475bb7416537280de4a6a0841ebbca10c265dc31cdd9483246685b48a9d527de81b49ad401564568535da03017d33b4e SHA512 1e0c4ac0434cd38cbf21e19c50b2760fae13a56ffd1f302a5884b4b172ef9c046ff6d2e408e63edcb9944652aae403059279b2ddfb2aa067bf9d36668de79f26
-EBUILD nattka-0.1.ebuild 883 BLAKE2B 39711636bc65b43b1fabb999f698f64d475bb7416537280de4a6a0841ebbca10c265dc31cdd9483246685b48a9d527de81b49ad401564568535da03017d33b4e SHA512 1e0c4ac0434cd38cbf21e19c50b2760fae13a56ffd1f302a5884b4b172ef9c046ff6d2e408e63edcb9944652aae403059279b2ddfb2aa067bf9d36668de79f26
-EBUILD nattka-9999.ebuild 822 BLAKE2B d9e20d954921bdb43253d93f6eee963f45b9ada0ac51263fb145337cc503ab014befdabcf7a7522280c2664e7b3227186588487ce44013b6f7dc72faa0fe35af SHA512 624d6b7a9ed6f1f0a1642dc452123022a9cf82c4aa954e2a9393f832cd0800b738d6c5bf13587eca73ba71f1bb217bd935cd4d687959ca8a4c5df2a300186eb6
+DIST nattka-0.2.2.tar.gz 85213 BLAKE2B f940287f3d781d60c1d32cd4ac913e3a290e4438ab45b786cd715a4f61e48eb066a3380c5343f1cde12cc003d16bd25ae94dfb9129f0fd414add90c8ec016c5f SHA512 c83c8138843a52487f45a5d1c78839bfb40d918c9cff0feced9a6e43cb5760a21ac0faef342ee3d9ba0c58f22ac1be51fd764770d3ab7a148da92c565b964c89
+EBUILD nattka-0.2.2.ebuild 962 BLAKE2B e203fe87ed20d5caf9990733046bc329962708fb1efc06a37d7fbd2ccda74e3deee910715befafc831d04c730821b8e28abcfa0eff9d486fd7aa808e3deaa200 SHA512 a207ebbea79b849d97c653c547b360d9eeac431596f8eed60d3b6b1b11ff7b1f2c2775433e3ccdb126fb3b96a8d139c7932b094c1d4eddfe8604db0526b42e9b
+EBUILD nattka-9999.ebuild 901 BLAKE2B ab2eeec84d3d42bf4ff13b9331fd281057e901b618e97003d54e8d6d615c08cd11af73ef3b68da7e59b84e391bf99dadc4edfafbe2610fe159983cb1faf01c28 SHA512 c472b49493336aee8a9efee0b8857bac0c66b1a4fe56e337b456575979d9158024d770f97eaa2c0fa6f392d3b6e6fd782f5529cbb0841ad40f5567c75293f072
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/nattka/nattka-0.1.ebuild b/app-portage/nattka/nattka-0.1.ebuild
deleted file mode 100644
index e8440d1114c2..000000000000
--- a/app-portage/nattka/nattka-0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-util/pkgcheck[${PYTHON_USEDEP}]
-	dev-vcs/git
-	sys-apps/pkgcore[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/vcrpy[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	elog "NATTkA can optionally use:"
-	elog "  dev-python/networkx"
-	elog "to sort 'apply' output in dependency order."
-}
diff --git a/app-portage/nattka/nattka-0.1.2.ebuild b/app-portage/nattka/nattka-0.2.2.ebuild
index e8440d1114c2..b3077c8bda28 100644
--- a/app-portage/nattka/nattka-0.1.2.ebuild
+++ b/app-portage/nattka/nattka-0.2.2.ebuild
@@ -17,12 +17,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-util/pkgcheck[${PYTHON_USEDEP}]
 	dev-vcs/git
 	sys-apps/pkgcore[${PYTHON_USEDEP}]"
 BDEPEND="
-	test? ( dev-python/vcrpy[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_sphinx doc --no-autodoc
 distutils_enable_tests pytest
diff --git a/app-portage/nattka/nattka-9999.ebuild b/app-portage/nattka/nattka-9999.ebuild
index 8d274617226a..f575cbb977e6 100644
--- a/app-portage/nattka/nattka-9999.ebuild
+++ b/app-portage/nattka/nattka-9999.ebuild
@@ -17,12 +17,16 @@ SLOT="0"
 KEYWORDS=""
 
 RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-util/pkgcheck[${PYTHON_USEDEP}]
 	dev-vcs/git
 	sys-apps/pkgcore[${PYTHON_USEDEP}]"
 BDEPEND="
-	test? ( dev-python/vcrpy[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_sphinx doc --no-autodoc
 distutils_enable_tests pytest
diff --git a/app-portage/overlint/Manifest b/app-portage/overlint/Manifest
index 2b1b01615a23..1e6f5eab4a0c 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-r1.ebuild 470 BLAKE2B 3146ac2cacd8414f45fd24defded68eef79c7f5df7e0e610b3127b3cdab35cc0955857f6d4fbed5d28c458a87304476ee51c04ef8c24ea5756ac7bee779993b4 SHA512 031951143a76dfb005de2eb1ba9ba4329e4877fc8413ec3b85c84f517477898654233baa12c961ca75e5161a535289d4c59e36f1b6d95e4fd9c6b02c5fb90c64
+EBUILD overlint-0.5.3-r2.ebuild 496 BLAKE2B 2f5d9896b0aac92b0028bc46d8bf106c12782b272906168339dfb7ceb0309c9a41fb0a872ddd3243683a52231c6c019e5f69fa8ca506dbc3d1e2910a146696a7 SHA512 21a0295405067b7c83d80a482b82295d96e8878122cb56fe3f6047bae21676eedacc18867612452602b285422aaf070a4a599f4afef86ba5ec924afa98b4b93f
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-portage/overlint/overlint-0.5.3-r2.ebuild b/app-portage/overlint/overlint-0.5.3-r2.ebuild
new file mode 100644
index 000000000000..341df749e53f
--- /dev/null
+++ b/app-portage/overlint/overlint-0.5.3-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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/pfl/Manifest b/app-portage/pfl/Manifest
index 54efb69d02ea..74e6277c41c2 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -1,6 +1,8 @@
 AUX e-file-function.patch 535 BLAKE2B 507a9a8a83585613e37fb9810ad65c04f0d78be5fd24cb8cacf41cd56c4bc878b1562dfd65c65a0d0f8e59dd112d20b7f62ab62acfb1a3a2420b9da2f3433c5e SHA512 23b7b4b8d3d894b79973b4c5484bdbeeae13398b33d2316774e9da43e072da0d5a55d47774e3f201e71147a29857818b4b3a40cf9f7b868d642bf5db72eb4dbc
 DIST pfl-3.0.1.tar.bz2 4635 BLAKE2B 9610c46e3096bc5f2ff212980026b36b99056a9839b179c2618c3c7d508b90ecb21b0fa566eef54e6a24957251934b04b0013af41b88de57e7e1db558831d883 SHA512 f045ca21360f33f87816e72a4564d862275ea1415b3a79e32815aaa20d7548da3f38ca9ee9247db3150adbdd54155b330c4ae6d3bee878db6cd5cf78dada81b5
 DIST pfl-3.0.tar.bz2 4332 BLAKE2B 8e1dd17d0017cd972c02a9e8d3610a036447d7b898c6f0a9557ef2c598c0581a09ee7a72ca04860f3695d06d3fe3ee9426a99b1158db71e232ccaff69479d068 SHA512 94f7cc575689f46a0b9ce50c3de7d6a42767766c8c447616c7f3587438a6b3c09e5d00b3b80cd71b0d386ead1e396d49aa266ff408146f85b18e25ebfe887108
+DIST pfl-3.1.tar.gz 5521 BLAKE2B fdc6e82c5d61d694a188c479b0566aafc507bcc2bbd1f176cd2771586b13de86a43a5d2e156beb4c9b5d10cd718046a05fce099894430c8f3d04c0922078e988 SHA512 b2bf79445a5b15caf339106f376d64accf5aad2c60038ba88180d64ce49e23dc3015efa2fcbeec886ba591cada053dfdc96873bda71b092be4622608062b6dcc
 EBUILD pfl-3.0-r2.ebuild 996 BLAKE2B 43675b3f64c07d6c6231a9726ec9f5fad4a61a143dd54aef849826435fdab90232a20538b29a0175c6e24fbfed8fc90b5488a1273816dc5f9d2610d9cfa48520 SHA512 419871bf91008cfd15d1f6f6209562f13553225087d460eeca7098a2b62867694dddd321b3ed49d227f1aad2f8fb5b04ff4d51a0bdb340c5abd5932cd015b232
 EBUILD pfl-3.0.1-r3.ebuild 1109 BLAKE2B 20ed3547c9a661f6e280fb9eed4c4c763531922c1f727178472a34a4bbde48e107debab695d23768f2f09ae68d9255ef17c68123a513a62021cdaafe96686053 SHA512 33a6b3284da802b61bd68890b95d0d16e32eddce93887b79fb9b7d7403a00100a8328d5f4842cc63c6e6c988b1851ffe2db2b658120ad21324715744bd3b7f99
+EBUILD pfl-3.1.ebuild 1237 BLAKE2B 0a63a468a07b5a704dabca539628a21ff9dff04ee48ebbc825bef5d7474a2a1d63a4997945feffb5de1c1a9531541e42a039d232889d57cad234c8fb525cd674 SHA512 d01b7805e9d1c16bae89e0424feee284586b39fbd06e7affa24bc0a431bdfbed8a0f2509203660eb2e1f5aed1fd122abe11318b68d09ef4d72f7d3338ef5479e
 MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b
diff --git a/app-portage/pfl/pfl-3.1.ebuild b/app-portage/pfl/pfl-3.1.ebuild
new file mode 100644
index 000000000000..0704d5f48fa5
--- /dev/null
+++ b/app-portage/pfl/pfl-3.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Searchable online file/package database for Gentoo"
+HOMEPAGE="http://www.portagefilelist.de https://github.com/portagefilelist/client"
+SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+network-cron"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	dev-python/requests[${PYTHON_USEDEP}]
+	net-misc/curl
+	sys-apps/portage[${PYTHON_USEDEP}]
+	network-cron? ( sys-apps/util-linux[caps] )
+"
+
+S="${WORKDIR}/client-${PV}"
+
+python_install_all() {
+	if use network-cron ; then
+		exeinto /etc/cron.weekly
+		doexe cron/pfl
+	fi
+
+	systemd_dounit systemd/pfl.{service,timer}
+
+	keepdir /var/lib/${PN}
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}/var/lib/${PN}/pfl.info" ]]; then
+		touch "${EROOT}/var/lib/${PN}/pfl.info" || die
+	fi
+	chown -R portage:portage "${EROOT}/var/lib/${PN}" || die
+	chmod 775 "${EROOT}/var/lib/${PN}" || die
+}
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index efa217caa390..b4b874d3fde1 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -2,7 +2,7 @@ DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c
 DIST portage-utils-0.80.tar.xz 1762692 BLAKE2B 32e4502d517ec088eadf17a4a348b9b9bc33348380b65f93ac7c043150732ba3ff0d18ee96f8877c697a91000fdc036de392d6e6711d62248bb7c57e25d4433f SHA512 cca86877e87e5bd2e9423822db4b7afa15e8f291717c808ef0455b121db0778b2364552e9f1d5e1a8bad3f1f8880ae2b5dbd586bf1dd74d7c4f4e72fa990c78c
 DIST portage-utils-0.86.tar.xz 1774232 BLAKE2B 57971b2157050d7b086aee5a7b26bbe6396609476fc66d443c9b7f0b4ea27123bc569acb822f666f4901d4c8c26dcbf49dc2760f8938162fb9ad8c548e661f5a SHA512 46edfbf8062654682f2fff38db2e2ae54965f7b0e4e7077154771e1a1105cc333a01002b9b8db483b7ed9a6e692128a6a0f9d4f222aaaacb09f3a6e3589b31c7
 EBUILD portage-utils-0.74.ebuild 1050 BLAKE2B 684e5579c453eb22e719826ada74e446859fae46227dd2f3af3c78dd165810cd25cd9067fe9c223eaaf86a48dc46c7c125b3573364f07dbf8bee2324b465913c SHA512 524900b75ab3d60a4880ffc64734341c6eadeb0ff1afe0b9cba8464989c56f17ae1cdd681a4003f2b4f3c7f316093ba0627e9b48039661c8c43206a5680b6a58
-EBUILD portage-utils-0.80.ebuild 2250 BLAKE2B d188c4013a60dec7f23f01c3ee677c89da07098a058639e026e2b2c16fbf9e5a5fa301ace8052578b34ffb93ae60dd37d55e94571edca828df9b9caa7bdcd19a SHA512 6441d11e256944715b3edd18291cbd8e9059420a0cff093efe5d019db63d56dbc39c714c84a7dc996e04af478b4add2313d4c5eff89299a8b670baba8b24f792
+EBUILD portage-utils-0.80.ebuild 2251 BLAKE2B fd603d2da46ebb4b85e719119fabc82f09fde52bc3ab47704b711c4fbaede96818eace742c98bebd007c7b639634aad1b5690e249ecc5969902b38956235cc8a SHA512 67cd408528edabc58b78627bfe75676b6744b52f7b3269e929348f63390a08cdb9fa4672514b75f6e99915de38679f4ae7c573ae4ddc264e01cf47bdf33de042
 EBUILD portage-utils-0.86.ebuild 2179 BLAKE2B ecbd90f21ef26d89e423e198bd0e8e275aa63a8eabe515a0236c18370a755c18319c1b21c22b07a41eadf338a430bdeb13e753db0830b298853ed72b48aec6fd SHA512 401ce43ba8704b8d2936307e5250cf7335ad555fe4d8e9766ac7577a01540c1018252dc77c145913bb494891fae5f6860f33f80a17d58ab0b5bcd42e8c1652cf
 EBUILD portage-utils-9999.ebuild 1806 BLAKE2B aa1b8f6e780d3939433ef354cc9bd57f131bb40668ce150f84ecfef4a46bcff7dbfb3a4a2e453a3d671498152a6cc9b75f180a09841aba5fdeb754d96712ef95 SHA512 2ddc921350fc44bedae040a9521d90745d768c1292ca50fc4eb486c31a50963c129d16b6dc149183d47793629e11a2b4b35043e7a2115021880881dc4b4f166f
 MISC metadata.xml 490 BLAKE2B 36af527c82aa05f09ef3187a5c93ec34412a625a00016ad87fa1f6e7a00108f87bd3c8af42aad0aec87fa11e1ec25da71f1f4776c0da053e7426b8006d876103 SHA512 eacb9a20b0228c67896f7633619e67ef0e2de38444436ed720f849b8d9fcbed3c2569d2534e38fb7060cd755195bfd74cbcc9d77dbd5da4fb7b1654f87f70a1f
diff --git a/app-portage/portage-utils/portage-utils-0.80.ebuild b/app-portage/portage-utils/portage-utils-0.80.ebuild
index 0fdb639693f6..dfef3cd8c858 100644
--- a/app-portage/portage-utils/portage-utils-0.80.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.80.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 RDEPEND="
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 0be449d827fc..bf005ab4d915 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,4 +1,4 @@
 DIST portpeek-2.1.27.tar.gz 13000 BLAKE2B a134d7c9a99dc4bfd8cbd56343a6d049c215eadde745f1db6af234c5b561f916f2bf3393a8a01ae44ea4a74bd501b46abdd150cd1403d5254d70c12ad7d7545f SHA512 aeaf47cd5701531c0488709ac63cf38faacec73dafbc96502c34cf279051679242f63bb452fcf14c1b739d08821981e59af3734f4795905d7af31dcaa95f26d2
-EBUILD portpeek-2.1.27-r1.ebuild 689 BLAKE2B f42bf733273706cd29899adeac31b1d87f91e5d8795d09d1ffbadfad00d72ba7338597750dfe7a2aa575656cbf700fde24114d8c0705b390fe3932dc2ace4d23 SHA512 e28ba1901e384245fc12fdfdd1d46790b0b3fa6d3ca47ece1cdca10a82f359211dc45e524e512907f04915ca0923675c55edac3605e54b5f96000913191a6238
+EBUILD portpeek-2.1.27-r1.ebuild 684 BLAKE2B 21ace422df498f2d278e59d6e0d9bc332f709d4952e9d7dff45c373a14a12fcbb4632d522a2386ff8d5a2269e307baf3f4bf5bf7d4236ef6b44ef89dc05d362c SHA512 daaddb997c16b465fd31c5e2697347f1efeee6dbf34a9fadbb948a469df702c70ae1e18e660a131346f4e7eb0bfd6fd4667570a0e054fc1fa3803aa815ce48c7
 EBUILD portpeek-2.1.27.ebuild 686 BLAKE2B cef2678482877d963c47af57a6000818859a942ddefd27d2e00a064f43781806d0632c02d780f5aa21818fceea512fbe8a46558fa0de242f1135a098d2630b9d SHA512 7b62e8d8a3c363d587367742738cd37a3f4133a464812b90b5be41aa2718d7d1b82d96b0531b8a8d0d3f7dd3ea42ba90b9beeab0bf6b2d81b1f96b7f93506f2a
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/portpeek-2.1.27-r1.ebuild b/app-portage/portpeek/portpeek-2.1.27-r1.ebuild
index a1b5331b43d8..77591f2240e8 100644
--- a/app-portage/portpeek/portpeek-2.1.27-r1.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.27-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="amd64 arm ppc sparc x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index 114b67a8f4cc..7e91264767d5 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,3 +1,5 @@
 DIST pram-8.tar.gz 7918 BLAKE2B cc5bea629e49b229622a77c585a62710234e00ae245b68cbcfbae5be538b82752e8b2e8da5ae82f571dd4d7368ecaacd1233affe975fd9e20177122808dc39cc SHA512 bbd9e7ce3207550f1651d63a045474d90c4aaf20ab0c541b2a78e6af6351f9c7bd278b649ee57ed1b3b85cbc4f38f1b98a008e791bf9d19e4ea718892544bd46
+DIST pram-9.tar.gz 8206 BLAKE2B cf490edd53d307e5d9c715d0ca68e38d04ebd5a1dc75f89232605ac5cc9cbc9567b3895b1e2445a14c5acf119f054dc2b982ea7b9949177519a70062e648272b SHA512 a9e718ca0cdc93a67f442f2db5dd6a854357aa493ad7836e5d75ede68c3fad06d2343f1ee34f00bb66203d41575c7773999772f9251a9a2d6fc74702ce875c4d
 EBUILD pram-8.ebuild 567 BLAKE2B deab4cc1384177a5b0d7a2ceeaa0c400262c616cee0a8dd70668d635d5f748fd9515c816c9f303926ab8eb38b6c2828c2b18472eb7ca1d59a71ecdc8c6f32040 SHA512 a89b7018accdb5d2a27ac58a45025e9a1343feae7efa251738a53aacf99f008c3f2f83d2b91937c95098956cf424313b44942c0bead8276ce481b68b0a6944cd
+EBUILD pram-9.ebuild 568 BLAKE2B 5b2e31f41cfe1b314bdf3ab1588a5275cf64d67ed4fc2cfa2480db5c3a72b81cb9cb6dfa44ee56fa96560e0c64b8314df5571f39c344c11084759cf56daef6fb SHA512 96c439e3b537d89c9907b9d13c58b8ee973f60692b6423ebade4731706022a85132c8d999425a29774184ed9fbfd1dad57b9f30a1ce7a23fe54327d123eeb8b0
 MISC metadata.xml 521 BLAKE2B 666d2a5e1366b0623f3ee47cae65ec248612729ffd0d39b009f0bb95ea79fefb1b0fa3343eff98841d2b1b0f6ccf03c6579370415cb4240441cff5f942557ed5 SHA512 36326936f659a738a0a7a0d1e7b6388820e4f19acf29dbd9efa646cdeb7ad65814b509f9619dddb822fc012ea8b2e06258d2887c5825283db6c77365a6fdc77d
diff --git a/app-portage/pram/pram-9.ebuild b/app-portage/pram/pram-9.ebuild
new file mode 100644
index 000000000000..651fd1085139
--- /dev/null
+++ b/app-portage/pram/pram-9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Tool to ease merging Pull Requests and git patches"
+HOMEPAGE="https://github.com/mgorny/pram"
+SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-vcs/git
+	net-misc/wget[ssl]
+	virtual/editor
+	!dev-perl/Gentoo-App-Pram"
+DEPEND="
+	test? (
+		${RDEPEND}
+		app-crypt/gnupg
+		sys-apps/diffutils
+	)"
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index eb8f0d7611d2..2c3dae8e443d 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -2,7 +2,7 @@ DIST repoman-2.3.16.tar.bz2 86739 BLAKE2B dc3e3b5e72df751cfacc17e6f5c847160438a4
 DIST repoman-2.3.20.tar.bz2 87313 BLAKE2B cc0ff9b651e01b12202b32d48979f42ffde6e8a7c72095a3f75228a54892bc11c521f015738443133bec223f9ca0faf5687388680ddfd19e07514f873094b0f9 SHA512 edb5564de920156fd89b4df136d86b73401d4d5cf591abc2fbbf97f0ebb7bb43ed17d076560a76a1f3269d19a64c7c52d48540134a9fb86d9fa952d1702e01e2
 DIST repoman-2.3.21.tar.bz2 87094 BLAKE2B feb972d9585440d2a5ed6800146a1d7027fde4c5e7a70904905837261776b9c09bc9bfc6c4da8248a1420635ad8443b31d7716990e6425db3403c8bb74ddca5d SHA512 537c6f6152134df4cd99321b812a1e02608ef0621e674214789dc79ca6540ff1ddab05d100e2bbc2fd0d85664cd92549fb39f8da3cf6850c1a190a88a95814e5
 DIST repoman-2.3.22.tar.bz2 87026 BLAKE2B 52262339410b95d47df19e225493075d6e9f763e85b7fa9c982c47ed88b652620d3ab083781c9e4747d8e3659795de7a05163b00339065ce5d84f8babfadc1dd SHA512 8be75f58127452ed162b0f5feac96110b82f7a06fa904c65f6084dff4c542602870cde7fde5cf4108b04142d433c1167dc5bccdf839064dbce2278ea789f77ae
-EBUILD repoman-2.3.16.ebuild 1937 BLAKE2B ae27dff19630b29f47d1ce5a74857fab402d5b083b8f55d7788ac8e1b7cd44e39740e7903a7dbf925c4dcf1c3a1e06cd51e799ca29dfb897863cddfe870acb94 SHA512 62f3f17d006ce2001b1350d3fed012f2ea42ee47c7e47880cbe345de453616ef948bac529c34d410b702e7f8215de7eb2e62be6c98093d42f319f1b2e69800da
+EBUILD repoman-2.3.16.ebuild 1938 BLAKE2B d9d1b277e1d47c55860fa63cc64679506a9804ff377901040b9544193b822837e9badcf226e43e14d347fe3affdb37a07725d60e770f382aaa72062795857046 SHA512 24d352d5e56a61297459450f976cbb585a6d6cbdf6b995a85443596d7f92b457d40f2c3ba162c1bdd728306668794cbd81374ced5d949fea2713fbc6a4c2ff23
 EBUILD repoman-2.3.20.ebuild 1968 BLAKE2B 73858d208a8664ade18846502077c7d612b00cd17cd4d075ef0fdba27933f1654a039b1ffb7a3812de8be6b00623e52da004bbcf6c4e91fca2899a421ded3c76 SHA512 1d1ab128783bc184c40565e27bdf9d878fdf9e8a8918c9a823b1cde4fae8b070ef39e65430de2acd7857301302c415fc7f9eaa8382667c994f833c090efa6a48
 EBUILD repoman-2.3.21.ebuild 1977 BLAKE2B 41da484879b21c481600ce57bcfbc1c64cd0561d0d67803651596d89a447c6a4b0a2053f652b0e8e3074b4c22356096d54bd5e0c9b00aadcd6e66f6d3909109f SHA512 68e092e1446425de2d01488a8257888d1487547653bce8a4a13b7ff99a01033d1307a27df2d8e55e520661a18db1993a48e7bae0db24eb4ac4f92123cb5720cb
 EBUILD repoman-2.3.22.ebuild 1977 BLAKE2B 41da484879b21c481600ce57bcfbc1c64cd0561d0d67803651596d89a447c6a4b0a2053f652b0e8e3074b4c22356096d54bd5e0c9b00aadcd6e66f6d3909109f SHA512 68e092e1446425de2d01488a8257888d1487547653bce8a4a13b7ff99a01033d1307a27df2d8e55e520661a18db1993a48e7bae0db24eb4ac4f92123cb5720cb
diff --git a/app-portage/repoman/repoman-2.3.16.ebuild b/app-portage/repoman/repoman-2.3.16.ebuild
index 702a174e214f..d142e1a16cfb 100644
--- a/app-portage/repoman/repoman-2.3.16.ebuild
+++ b/app-portage/repoman/repoman-2.3.16.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index fc68f588dd48..0345726da30b 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,8 +1,5 @@
-DIST tatt-0.5.tar.gz 23249 BLAKE2B d98456bab4ec4d820bddc2ec614e02582f5b0385d806c876a5155cb09bd1468908ded3f5c879fc38f2cb4211f8415dddd640dd20b6b123c926b02387d49dced1 SHA512 0e2fa0dc12339be2ee2408a9dfa06201857bd2ef570b1c5ab46f0c4f0dc07492fc16d74c8f05cdef9232361b77843703d5f7e6752bff17a1ca2c3aa3cb1c1f29
-DIST tatt-0.6.tar.gz 21689 BLAKE2B d11bfb616cd27f1a303d4c95dec875cad42d31d72654be4649dac2c7b3f086b7c5a1886d9c9fbd0a858d9e042c9db0a7b5e2f4167c46b6291509f9d97a654097 SHA512 c12ea273af8b5bb410493f297776d730b7c36748a5f1b735c94dfb0542f9f03d28482060858951ac9fa161fc299c21473f5bdeaa4d89fb88ef61187a809dcac2
 DIST tatt-0.7.tar.gz 21802 BLAKE2B a0195f253e2777a8756fd7d1f83804bf3a4ca90fdeb07b2f8dc28dcb6f1d1f3c47fd948e0d001103f7972dc8cb8ee45a237dd24b3dc149392aa9841fe3d6532a SHA512 1f2a144512801d50585d40074553049ebd08bc5f084a0623b89d901acb9448657e7f42f2c8da5f613e0b2ff5c3fe59fbada1ad911c9693846923e256a2e97ecd
-EBUILD tatt-0.5.ebuild 817 BLAKE2B 2cfba9753e8489dfbe47588eb61a74aba5bdee846bf3d7dbf4a10c10e61a23dfa8271a807573511cfc5af465c760fda81bbf0973cbbffa02f27dbce6915e6a58 SHA512 783889f0ab7c3b2ca88a0861dce022639c5f389802e5e05bcc3d6a1b1d4a3798d599a5436e5506ffd0c741d8ce654f8d80aad1a1c7f28704da19d0df56625cbd
-EBUILD tatt-0.6.ebuild 819 BLAKE2B 9c92e7ffebbd06a132467fd3a097a5dc194c307922de06885da08b109c892ca1e597e82b175bbb916ce9df7ab14ef1528936272fea082494fd6fabc79157f284 SHA512 3d3fd320f0940b7c3198cafb42f4e6fc85ea893e0e52f2210cc8b49a939c8e81bcb8775f67b74b9abfefd963b6340da023464d181020b2e979b77d29fbb450e3
+EBUILD tatt-0.7-r1.ebuild 832 BLAKE2B 452b66d0293a07ca2fe071b20fbb62a1ccd3cefd068697d291ee3e377d85054b12a56464bf284e761dff93177e65414e0e743039096f4825b819aea78e0981cf SHA512 9dc04e848a9efe2a578d55becdf89854ef4efe3c1bb75f835eaae65a80fb686d0eac74b3a7172906432995d03810a9832b21a89358b8b1910cf245426a749d27
 EBUILD tatt-0.7.ebuild 806 BLAKE2B f200c82442e60229610d81de78b96da996259254a29bc17fca69618393ddab5e568bf1b09fa5e452a0e13f53ca8341cd718e732461fd0aed4a0f80136215efe5 SHA512 7a63e8421385cd27ca0b6f5946afe6382118df8907f95951b3a48600389ee76d1a4be165f9c77bb6222c8fe447fe7a7dd3cfb6ab61f42c06f507dfd8c2d59dff
-EBUILD tatt-9999.ebuild 768 BLAKE2B 8db6c40f1f015a07a6247cc90396a33ea9682043ed8ee9a6d532616567a10c51ff57d3b19fd26ae88e6be5550a9b8d881467cd178959e9fd3eb6534a857b5e07 SHA512 9b11b302618d9657e3ac80e17c2358ddd4b4cbe0556ee7ab4cd03c1a7534348d2453f72d11e7cda1480db58df8ea89d930613e267b8e25d02a0d1358dddf0616
+EBUILD tatt-9999.ebuild 790 BLAKE2B 33868fca56e672ae123e20c2b1c5037fbbb457c3e2de5b365e169315f547fc2b82930a8f6a008d38b30b7aa69c3d10ec9cb1effb23b80e924f396d089548ac34 SHA512 850a79edd2944005a3dac0f749eb856516416819e4f1d3dbf64f1fdcd3505da902135369c540b8f347102f23260b2ff572d924a66ef84531693b6c20898e4b69
 MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/tatt-0.5.ebuild b/app-portage/tatt/tatt-0.5.ebuild
deleted file mode 100644
index 347603126f66..000000000000
--- a/app-portage/tatt/tatt-0.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="arch testing tool"
-HOMEPAGE="https://github.com/gentoo/tatt"
-SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+templates"
-
-RDEPEND="
-	app-portage/eix
-	app-portage/gentoolkit
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	www-client/pybugz
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use templates; then
-		insinto "/usr/share/${PN}"
-		doins -r templates
-	fi
-	doman tatt.1
-	doman tatt.5
-}
diff --git a/app-portage/tatt/tatt-0.6.ebuild b/app-portage/tatt/tatt-0.7-r1.ebuild
index ead88748c274..fd1e8f3e5408 100644
--- a/app-portage/tatt/tatt-0.6.ebuild
+++ b/app-portage/tatt/tatt-0.7-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -18,12 +18,12 @@ IUSE="+templates"
 
 RDEPEND="
 	app-portage/eix
-	app-portage/gentoolkit
+	app-portage/gentoolkit[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	www-client/pybugz
 "
-DEPEND="${RDEPEND}
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
diff --git a/app-portage/tatt/tatt-9999.ebuild b/app-portage/tatt/tatt-9999.ebuild
index 15cbacda910d..e998e0c14c15 100644
--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 git-r3
 
@@ -19,7 +19,7 @@ IUSE="+templates"
 
 RDEPEND="
 	app-portage/eix
-	app-portage/gentoolkit
+	app-portage/gentoolkit[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	www-client/pybugz
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-25 11:37:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-25 11:37:10 +0100
commit	38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree	04e2cf4bd43601b77daa79fe654e409187093c5e /app-portage
parent	623ee73d661e5ed8475cb264511f683407d87365 (diff)