15 files changed, 70 insertions, 13 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 93e954948965..028927c389a6 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 1439adf22ce7..8df3f5cb1ad5 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,10 +1,12 @@
 DIST cpuid2cpuflags-5.tar.bz2 72050 BLAKE2B e9b7022ae5b7d51c88b5e41d9d7af1175498cb5a1f32876bfb766f785060f501d07ba3a5c346961e742bbf7022121faf3d0d068ec711ee9ed4e67cbdcd72a58a SHA512 41dcd2b974f6bd96867dea15a3839a8d63a3ff600189107ab16a67b5bc77ef421acbedb83f3e3b16ec90ac900d187aa8c44baae6fbdb4988f3bf7caa2d0d19a2
 DIST cpuid2cpuflags-6.tar.bz2 79329 BLAKE2B 3fb1e104a065b020926602e3badcb96c8c3bbcf5ddc708eebdf7754e37bc302b88297471f51a07403eb49b0d688a1c2725b878bcb2a47edb0f491e3608d72b49 SHA512 b7c844667988663ad50430a506055c11263c33bd8821ae8025eea3f719c33101425dcaef3f89afed7f15952d678e4467afe99672eb3135bedc34fe5979f999e0
 DIST cpuid2cpuflags-7.tar.bz2 80582 BLAKE2B f78c94e2c3706a3bffe58631455c91d1742d8e551449b8ec0b3aa7cef4b542dbc7215f6cc6d5d8514aa7f8d90af56ea95ab6d1263f8d7442e0478581728d9511 SHA512 6ddfab6fc44910f8ad1c03ef1f6d6e2a9348a4ae419eeca6f97cf7bea76a88a2ff413421f6fc75df22b6b04d42346dc0f3c958dbd87d672abe007bfacf355d7f
+DIST cpuid2cpuflags-8.tar.bz2 82432 BLAKE2B c4284106a4b1433e266e364b40dd50cf801f6b4afcb6928b13c1ac58ea1c3854b4a952f6ac914ef995aaa8bc9cfd8a4428c84386eb2949f83228a5b9d9781ada SHA512 167ee1620d6d726ef849d265785b568bb72a1aae15f5f0c527a903424c8ce9519033c49e8a143ae093b56e25fd71b4746793fb825233173fe60ac29eeecca20c
 DIST cpuinfo2cpuflags-1.tar.gz 1429 BLAKE2B 5126e643e5e2ea0be2418068fbcfbbae1781a0e3ab7903d909d4a5a291cb2e5db132a7a6a5c6db12a757688efca0557e4331a91f64af4b7e47deca415fd05b34 SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede
 EBUILD cpuid2cpuflags-1.ebuild 1049 BLAKE2B 7d80e64bf6109c0554ecf37f3ddc4042bc8801cbab79235e94647dd1d46bef5de89261640957a3cb0715345855462b81bfcd2d2c3a9b6d2e21fd201c2cf916d4 SHA512 df3f8412a7992d034495dab33395ed892233976ab7ae70e3b8e698867e03cdf0231c2814968bca139c870107e3d96aa90b4473904a4c6aba02b7be098c9617ee
 EBUILD cpuid2cpuflags-5.ebuild 922 BLAKE2B 0c8097b9adda83aaece462f4efd3b0380c2ea743c51a3629a9bb5efc6c0a3ce549d21cae446e457357cc70bc723b859df86d095189f4606cc164e3a8cff65f7c SHA512 e13f6f2561fb4c511ba845c32256319512381657664e5eef38014e6f6e0f1e6a64f5224203022e276fe950f8900cc3933ddbba06a2099d7936689b93e514d4d6
 EBUILD cpuid2cpuflags-6.ebuild 922 BLAKE2B 959d473db50ec00712c719a13a783d436ad2a8c783081d602cc7fccf9950e34bf3edd33d2027052888f492a474758a2ba5f22dd66a4a594c54055a8f0012067a SHA512 5f697d1b305f7d7936bcb85d8e3791fa547a453809ed9f8399fe866b26708b656a3bcd85b983aae3fe3f69b149276eda64cc9b59ac2700c84e10a7511e645c7f
 EBUILD cpuid2cpuflags-7.ebuild 937 BLAKE2B 6b20279269289630cde57817e81b759745e1d9401d8bb1e2d22924100ee66a883474523cf6de595b522503192e300e7629b05ff8c160fb6ce194d99ff4de8f0e SHA512 c4948c5897f5572483176ccf615842126a754a01b952d8e4520459b9a1c0f4c0e1886ff752ec570b053102fbddd060e529e6656fff6a23b32a3f10791872458e
+EBUILD cpuid2cpuflags-8.ebuild 937 BLAKE2B 6b20279269289630cde57817e81b759745e1d9401d8bb1e2d22924100ee66a883474523cf6de595b522503192e300e7629b05ff8c160fb6ce194d99ff4de8f0e SHA512 c4948c5897f5572483176ccf615842126a754a01b952d8e4520459b9a1c0f4c0e1886ff752ec570b053102fbddd060e529e6656fff6a23b32a3f10791872458e
 EBUILD cpuid2cpuflags-9999.ebuild 405 BLAKE2B fff9a10b348e61e1af045a39f10aaf81cb6d635d7c87056ab6665018c037b338a03890e0a1dee89f135b56b6805fdde0b2e547e0ab82832ae042c8c28d8bdd3c SHA512 36da5933134753af27f01b833ecf1e2d55c4c55eb58476c32e2de1c2ac6bb51de218e415c7168f97c574b0b2655825f0d981478ef8c17a147a3f38465eb0919e
 MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
new file mode 100644
index 000000000000..f90b8b68888d
--- /dev/null
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 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 ~amd64-fbsd ~x86-fbsd ~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/esearch/Manifest b/app-portage/esearch/Manifest
index b844b509543a..c483add7816e 100644
--- a/app-portage/esearch/Manifest
+++ b/app-portage/esearch/Manifest
@@ -2,6 +2,6 @@ AUX 1.3-Fix-python-3-compatability.patch 1177 BLAKE2B 1b119e299c6a1ab3a55e6f9319
 AUX 1.3-Fix-setup.py.patch 792 BLAKE2B 1bbaa8f4499d48508c38c48e579849dd8b5cfae587e982b4bae1932d3c8a23d0c4ad43639710576a9b7dcc53a93d47f1965166b271e93c4cee5309be03a05bc9 SHA512 db741e6effca01b8e71810bd455d227c93df2ca86f5b77c69ba227cb1426dfeca548854b626d4d626e311faa6b8bb137c9f22b21322b6fa9f5ac2dec4786a5d2
 AUX eupdatedb.cron 659 BLAKE2B c0e820e59ba42f9caf2997f0042836c564283edc1edbcd8fbae4d1a79c9acfe9df344d945dd2ffb1d13d0aeb36f32dada366332517b728e2e5fedfe725788f0a SHA512 4ebaa0f8f73215aa497dc0adb922eae1ca42047b7069d2d0dd279edca8c4d9e782ccbfbc421ccd4cdbbffcc5cd8cffcf0c56ab66747043c5743c217c1e33df92
 DIST esearch-1.3.tar.gz 19383 BLAKE2B 308cb075eff0a592135e883913bab3709b64a785602250ae06bfcb50eca6f8dacfb047bb4326b4b9476553bc8bd993b69295373cced7a18786a7834378e860e9 SHA512 7fbc1c362a320a76a40c45ddf83a29223eaafd3cfed1d8a9410a380e2025fb515eea26e38ebf0f304d14230c6c5cfc83ef2116b774b1d50ee4f7f4bb0ac046c4
-EBUILD esearch-1.3-r2.ebuild 1524 BLAKE2B 8e0f461a0182bd10eabf786a43e8b38ff04f578b6d7c0c178218336ab3f21ec8a218ca93e1483f22ab1f4cc585c7ec14f07c3b86be758204b8efdc9d806ee22a SHA512 d30107e93ae75fc457bc9713604b0edf98960febeaa8307f70a0e0f741b7f43b7074f1a52eaec97ae04897425361f3355dbd7c4d936bc8e91521c0c24a151fda
+EBUILD esearch-1.3-r2.ebuild 1537 BLAKE2B 48b53e0dfdf732ce623fbf0ff1d02194a25b7acb98bda93925aeb08ae952b5ce50a44f7f38e65e41a915848a3f4870efd7786341122f665dad21d9746c7bb7dc SHA512 14bdc316ac938e5bee4bd243cd523197a035b8038df5662fa3b894c06f30f0596e5e4bc32cf5c132e7cf98ffeb0e5c4e892e1d051e3d8e55f92b12580df8d2de
 EBUILD esearch-9999.ebuild 1104 BLAKE2B db774e9518c66f328979862a21f9d3633e1ea05f651a9949f33afad2215e275e8e6c9e8757457a23fb41d986132e22ffd3548d6ca536066fd92e81986e7077d5 SHA512 3848c543ee3aaa70f9f79594a96bb8c08404ea771db8de69873835785a8329b3faf120e8d5f5be22946b32b67802d045b3d2b52de0bb6b80e85a44fffda110be
 MISC metadata.xml 357 BLAKE2B db12b57347ce8c8f1e41c64bf0a94c80509e27964353113c40d4c49aee85d3ab747d3ac2a05b1a1314b141feef9a014a3b475bad5101a077da803f55cc853098 SHA512 a84ae0adf855d68fc14b01d1583b0c264a27852df31397af387ee7d8948f413cd98d2fad937899a91387f23d70738a540522b393e2fdab21dc0f55014cf6557f
diff --git a/app-portage/esearch/esearch-1.3-r2.ebuild b/app-portage/esearch/esearch-1.3-r2.ebuild
index c1daaf3bc888..23d4292bd7e2 100644
--- a/app-portage/esearch/esearch-1.3-r2.ebuild
+++ b/app-portage/esearch/esearch-1.3-r2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Replacement for 'emerge --search' with search-index"
 HOMEPAGE="https://github.com/fuzzyray/esearch"
-SRC_URI="mirror://github/fuzzyray/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/fuzzyray/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-portage/g-octave/Manifest b/app-portage/g-octave/Manifest
index b95533bdb317..e90284e0bd05 100644
--- a/app-portage/g-octave/Manifest
+++ b/app-portage/g-octave/Manifest
@@ -3,5 +3,5 @@ AUX g-octave-0.4.1-fix-Makefile.patch 491 BLAKE2B c2deff7f9ff544a62ae6877ec229dd
 AUX g-octave-0.4.1-fix-sourceforge-svn-root.patch 1441 BLAKE2B 89ddb026eb2b0f133ba508c3f351bc32fe7968d91034416559b7ec80319473b3a323f72a9fd5cfb7b88603b1176b91ba312580acbb7930b6f07ecde335f05037 SHA512 637a3f0a7be6cacde645768bc2f576ceccb163fa00dae60520ff0de876f8414b75568e33a04bbc225520ef05258e4339930f748577620cb9588cfcbf961fce1b
 DIST g-octave-0.4.1.tar.gz 52285 BLAKE2B d1e39931471c527c5542683c976487c56bca2a4666a437e110fa41b504287c0dd87aad94bf98298544c374c6d3faa0722fb3fab43228c56425be19b450ae0dd4 SHA512 424b95e626981aa5685795ffb3df1a1d608e5293adba074cc67f7dcf08d4a0c94a0174005f97a8da1ba1ae4233299e6a530af96ba3b9fd0d8b224915e947efb3
 DIST g-octave-db-bdf02cb.tar.gz 39836 BLAKE2B fadc374e69bbf785f9e9ecae02eeba6f1c048d11503e5d97db2b4cc65c820ec829615be72ce823ef44ecb0e59e1b68dd40f7310d19d0b7706a2ff47ab95c0851 SHA512 5eae00e18b6d4633ed0feda3a2eea6b36da049c133bcd49e54481443ff435bfcab0f303ab9f0e8c3f48fad707625ee13b4564c510d89fa196e737c7599ea5fa6
-EBUILD g-octave-0.4.1-r6.ebuild 2362 BLAKE2B 0831b3182bc5af8622d3d179720be042081d60aca9381432a556a82af6c8454d50963b5bea722ac9e1aac5bf89b15726e984b966ca82794bb00a018924d7d7b8 SHA512 913bfbb58538d949a06ee99e0a423a49b4747ba93cf948d79ad247e1c02de7d83de6aee9ee27a30b4aa5162e66b9c30c03a658346c4dc49ac7b9d99768f9afd8
+EBUILD g-octave-0.4.1-r6.ebuild 2375 BLAKE2B a1d345fb9f138d61d7078a8f865465607a1cc14f2b280ceca3c72e75508590a09602b27c84e09d6aae19f5eb73d2361ce0ada62e2c62a81c8f05cb21a45dd896 SHA512 b2b805e7904e3165cd3a5c58338007745e5a629500a4a220c0c68e16d6601177c0010cad0104af36f58268d55bc94d4b002c8f147d1e139fe3dde5facf060418
 MISC metadata.xml 953 BLAKE2B c7df56688e694e153043051b897de819f4b43441399ce338d7b65a2bffa689c0c68bd03fed1ce10a5111e422e4e38c796387c8e52758d47b06a369fea10b22fa SHA512 2e9160dc06169653737491b25ac4f1e4ad4416a3a6d9789078021c8a501d67c07294a6360762beea1815608d1d2e92a089bcac4614113bfa8c9d312723bda20f
diff --git a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild b/app-portage/g-octave/g-octave-0.4.1-r6.ebuild
index c994aee322bb..03f69397bf47 100644
--- a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild
+++ b/app-portage/g-octave/g-octave-0.4.1-r6.ebuild
@@ -13,7 +13,7 @@ inherit distutils-r1 eutils
 DESCRIPTION="A tool that generates and installs ebuilds for Octave-Forge"
 HOMEPAGE="https://github.com/rafaelmartins/g-octave"
 
-SRC_URI="mirror://github/rafaelmartins/${PN}/${P}.tar.gz
+SRC_URI="https://github.com/downloads/rafaelmartins/${PN}/${P}.tar.gz
 	https://github.com/rafaelmartins/${PN}-db/tarball/${DB_COMMIT} ->
 		${PN}-db-${DB_COMMIT:0:7}.tar.gz"
 
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 371df65cfed3..c836be5f9127 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -2,7 +2,7 @@ DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c5
 DIST gentoolkit-0.4.5.tar.gz 3218757 BLAKE2B 9ac6e7bdee622ff3069ee0f59a1834f36496f2bd07c53a67677571e0cfc99366ba64d03fca8bd964c3517d7cbcb7d4d5d08e9f3ec721d7adf598b13944fea659 SHA512 6b459684a59c5a72f09da34a2e9491b98f49c861f763bddb52ae002413a2c89d7841d84658577e6fec36a096889265a1207eaf981adfdd5e9db6ad79ca364df3
 DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
 EBUILD gentoolkit-0.4.2-r1.ebuild 2307 BLAKE2B 5c0ac9e4540cdbe88d6fb4bac6166454eb69a9213065f58699d40cf54b102f70b1a776ef801317cf9c46c6eb21093818d89ecdb1b2a304aaa3c3a99a6ca428c1 SHA512 019378d8e227b69a99529e30e640008673c0a2c3ac4039aa6294ea3dd0d2da2dfca0718acd8ec0874b811b32686c8c23a41ea0397936dc5db71b3e870cfd3085
-EBUILD gentoolkit-0.4.5.ebuild 2312 BLAKE2B 3bdeac64d109ddcdc32050861332fc0618a1040a2ea87e572f25bc25e5a3665abec82a5df87a7fe8a3e581cb94c947874b2fe0f80fdc6aac78d46b3dd556788f SHA512 8fd1fbf3a722673e686ffca84d735f0b5c96e924327601a9126b8f64239bc9a3cbd05d05ef78b504935dc7f450d7f2c0a3757f68b839308cc55d63b99ed170e4
+EBUILD gentoolkit-0.4.5.ebuild 2304 BLAKE2B d50112149de083dcd056aca10466f4522ba4d3381b1517762cd9ab8a83042692dc11e4c5004034a4248580af06efd7df3403ee93582d5ce3b78dcb12a77d95d5 SHA512 22a955a17d748190bad0bc39b83ee44d43a9e56394d8473bfe1aaa040e9c8aae0279c54fe6b21c5a1b3647fc86866c27c74940ba33d839eda6f8cf57b00848a4
 EBUILD gentoolkit-0.4.6.ebuild 2313 BLAKE2B 5e535377f50f8042485f62537363dea9bb388ce4f231544a139b6e7b17d5fb76b365e492191103ba710d1db681810d6cdf328638473be667d31fb62204f9842f SHA512 74af9a60874ca0e6ab2fc94f1ebf3017f05df946aa3aa257634be50de88ac9051e78cf5bd9a3dd547369d80c4a29152172c13046896c86b49d641ceecab8dc37
 EBUILD gentoolkit-9999.ebuild 2060 BLAKE2B 8534d42030279b810cafddbb21dd397071bd2f8bbadc74be63caa941fe19d539a427fa7106f18d13d75c9ee99e58b4f6cc6e106a885dc5f7f3cab7c111774096 SHA512 2b44c33b5b55ad3caeb3fa7f069da9cc03d89f27a5303d00549399b39a93bdd3c0cacf28d2f7bee6eeebc2f4cd8a305c3b625e35ac52d80f98894f694a946c60
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
index 5a844904d3f6..a4f2e669ca71 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 1d955f4ceb28..f2d2e1394618 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,3 +1,5 @@
 DIST mgorny-dev-scripts-2.tar.gz 6128 BLAKE2B a4a36c7d3872b70d388bfb2e68e4a8861a1a8ac76dbe27de382c203ed1a6dd7e56744aa7ba606392deefdd19397d078dc5a8b2402a05ba1c125ed218e42dad61 SHA512 bc98c83234c1107f649245b2b868c7fb649b03997497604deeeeb557d1dcd989ae896c8150bd54bd20daff98dee2a4a46f114d024a0a3b63231d26daa9cc4e79
+DIST mgorny-dev-scripts-3.tar.gz 6671 BLAKE2B 6e0cc8edd55fd175e6e2516bad6d0505da813fc905d12563d97b0ee327a019dd264c886884360dfe6235ecfb8d19fe5d982edf623cfa9019ad132f6cb0f4bb49 SHA512 22a8dae123d87461f07d12b7aad58775201de4dd72ffd354116bfde2bfb6d413b3c68fbf848e651b5a4eeb3df2afe9a10f8ae1a28be0ed077d1c0aa19fc91066
 EBUILD mgorny-dev-scripts-2.ebuild 546 BLAKE2B 30c7f15f1f38f80b7361c2ea0ad2364e688936de3eb218d8268f52e7c11c0f3e228cb70e704e3ff65a1a3e3284694af54f16290d88c79affd23f947cedd428ff SHA512 9ece234b6ce9f808079c61a4c409375c937e954746711558662ab5bdcd6b223d2359a6613c5deb5bf31e58eb9d8b0d66face25f36c2e0d899b92b42586092c7a
+EBUILD mgorny-dev-scripts-3.ebuild 546 BLAKE2B 30c7f15f1f38f80b7361c2ea0ad2364e688936de3eb218d8268f52e7c11c0f3e228cb70e704e3ff65a1a3e3284694af54f16290d88c79affd23f947cedd428ff SHA512 9ece234b6ce9f808079c61a4c409375c937e954746711558662ab5bdcd6b223d2359a6613c5deb5bf31e58eb9d8b0d66face25f36c2e0d899b92b42586092c7a
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-3.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-3.ebuild
new file mode 100644
index 000000000000..f3c82965e9c4
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
+SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-portage/gentoolkit
+	dev-vcs/git
+	net-misc/wget
+	sys-apps/portage
+	x11-misc/xdg-utils"
+
+src_install() {
+	dodoc README.rst
+	rm -f COPYING README.rst || die
+	dobin *
+}
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 7162503a3e2a..f7ad90c4dda3 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -7,6 +7,6 @@ DIST portage-utils-0.80.tar.xz 1762692 BLAKE2B 32e4502d517ec088eadf17a4a348b9b9b
 EBUILD portage-utils-0.62.ebuild 2006 BLAKE2B c44402ebef59a344bfb3ed571a46b7a58dda17b3b1d231aee55c77d42a59c62ec5de69b595a67ca2dbadc568022f63385950964f0350303c65cecc5f541b36df SHA512 579f27018139dd0dda0781d7b9483ca4a467d069f6b0a8aa55a9786b8cd3fbfa78919b7fa6b85044f78bac6ad6ec896ec7bd990cb428d0dddf5bfeb1f2175272
 EBUILD portage-utils-0.74-r1.ebuild 1140 BLAKE2B d58ad14ab2c7f786fc36147436e68ba29bdd100c912538cc2f28ff8a54be4c0556a87cafc512cd62c2b3be50c9ba784cf4b5dbe184929f3684b39d5df4e324f4 SHA512 84b221b821b7beedc52d15aefe9646e571c66f4086e89c4ac8cee7cc398b19428eb09000ca033f0eaadeb84222c468d002c76ed84070eb26a5e7200572679445
 EBUILD portage-utils-0.74.ebuild 1073 BLAKE2B 813ec25c4030ad26b1b28294c268c0f3bbbe296488a811ecd2a8d87ea6bb7f1caaa9ecdee34f272e9cf5879cf3454506ad7a62be2d3e74b926cdd012e239be3a SHA512 fa9079a716b50a4caa61fba5225ec28a2fc4d8ea2c95cb8bc283434a7c96392fa9898537c6f98277860fe06a23fe02c255c17e54a2869e371235e094a99a8e4a
-EBUILD portage-utils-0.80.ebuild 2274 BLAKE2B 01e890ea57334addd2a4c111fe9d4474d10e30cb8eb6340a45a97b0469e03abc1936dbd1078e218ca58a094c060b512c82b533a13440020ca8c50bdbf938e840 SHA512 540a7d1f54e628e24e02cec8774d640394965a89a2d6704315f4b7d7ecdef4e53c5832fe149b76160776440b16682327af494c33a8dfedda016cb240ce70e88b
+EBUILD portage-utils-0.80.ebuild 2265 BLAKE2B d8392092181c22beeba7c84c96c8673933daa0e45702bfbf7a59f17915c31bc2944b4c3325076d08d1808d56d2ef3a4865b14fae2045b8c5bcf0a52ef9a438fc SHA512 445d9762af65e0298ea202925233fd06ee8c1befec44523b241699150b661a931ebc3a435196fe839ba73ae0e7a4cc7372e49a6917308fd4e95c395035584682
 EBUILD portage-utils-9999.ebuild 1907 BLAKE2B 93409bc140a20ad03ae376ffe230545f6c8f393c0b18090bb2bee0746d3224f80295bb5a09afa06a1bac4742f6fa8d305cfa88b4dea29d7198016bf9466f672d SHA512 f3279b48dc6fb1071ebc6b062d5c0bfddef898af3fd21970c69e7aeb979207e84b6d9c24926bfa624d1bf8cfb86f467c02f9214e35d493a1649c9113e07c7aa5
 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 408ae5496d55..28d05e1ebaf8 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~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/tatt/Manifest b/app-portage/tatt/Manifest
index ca8dae40f0d6..b673995381a2 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,6 @@
-DIST tatt-0.4.tar.gz 23397 BLAKE2B dc6efaf866b059567d11c2a91929b025e74f73ae5ad81a98a632c3b2393025e2e35320ed223ae84b28a8770c713536afe73289d66f7c1396118a975867a56161 SHA512 57df8cdda9b6711da36e3635182fcfb64a376d7c3a76a29ea0252fc17597defe921d90bf9989f4fc199ab9848fae6fc4f53623140825f79368e90723a5562dd6
 DIST tatt-0.5.tar.gz 23249 BLAKE2B d98456bab4ec4d820bddc2ec614e02582f5b0385d806c876a5155cb09bd1468908ded3f5c879fc38f2cb4211f8415dddd640dd20b6b123c926b02387d49dced1 SHA512 0e2fa0dc12339be2ee2408a9dfa06201857bd2ef570b1c5ab46f0c4f0dc07492fc16d74c8f05cdef9232361b77843703d5f7e6752bff17a1ca2c3aa3cb1c1f29
-EBUILD tatt-0.4.ebuild 832 BLAKE2B 61e7d71589066c610e5b562b17724d25d2a114cd26135fc141935ca2560ef0bea2379ce00873da937190a62508b828fdd7578c4f1320a48f79e72e5ed7f9e43b SHA512 533da9e62820a3ed23790192f8aed5136f01b4dc86db30185e1b73c99cb3c1a9c920138fde7c3c2c0c2c599ae22b8695e0f9272a2b7125535c20bc501fe68b6e
+DIST tatt-0.6.tar.gz 21689 BLAKE2B d11bfb616cd27f1a303d4c95dec875cad42d31d72654be4649dac2c7b3f086b7c5a1886d9c9fbd0a858d9e042c9db0a7b5e2f4167c46b6291509f9d97a654097 SHA512 c12ea273af8b5bb410493f297776d730b7c36748a5f1b735c94dfb0542f9f03d28482060858951ac9fa161fc299c21473f5bdeaa4d89fb88ef61187a809dcac2
 EBUILD tatt-0.5.ebuild 831 BLAKE2B 54a8aff9f4abd913350c8ae038a2c4f6934e213014675e8a35b3c1d45aec5cbc04083ccb9dafc12162e9704440e31705474bf1a26cd6bc8ddc4e46897c697f8b SHA512 45a75cd181dad7e5ede5d295b8609405623a5f9f8e0e2c95dab4819d075e93fa34821c2aae72be29938508fba3ae186a0812961f2c26a6b90de1fd07e4b587c1
+EBUILD tatt-0.6.ebuild 833 BLAKE2B 39599e9da77810e51ed4db431ab299f71bd77c12777c06278ba116ec18e03e373636e2d045a35a2e45fecd56145456d6d78ae171d0798a72632a26194fc0917f SHA512 135d27a2d7f859fa12c8a16bd5170e9dc921ecdca7e5cc0fbad355849ec1f5c64c101589fabf9519c88d915b1b56239cae9784c944b2da6fda7d36928c4bf6e5
 EBUILD tatt-9999.ebuild 745 BLAKE2B fc572ac14a28ae29d696c7367fd1dec97a6c7a86b91e7bcf59339431a6f96908ea62d590740ad26dcca244ed2693788fc30363401bcf77466e287166db0f5470 SHA512 60f4189512d3bd5796927d56322f8aa01fc7f232d6213905456ea3fbf6acd91f202d6fb37416ad51c82b3d8d037b2903061e3b99f0fe82a222fa51a078749ad2
 MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/tatt-0.4.ebuild b/app-portage/tatt/tatt-0.6.ebuild
index a623eb3b75f5..2574422e2124 100644
--- a/app-portage/tatt/tatt-0.4.ebuild
+++ b/app-portage/tatt/tatt-0.6.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="arch testing tool"
-HOMEPAGE="https://github.com/kensington/tatt"
-SRC_URI="https://github.com/kensington/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+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 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+templates"
 
 RDEPEND="