gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-portage
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
77 files changed, 421 insertions, 697 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ee6f23b14426..95157f793c29 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index d2ff3537ff5c..4ad90f706b17 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,12 +1,8 @@
-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 900 BLAKE2B dfe712934eb1c79785c32d97d00e98df6e080f0de8a42146e2a00f837c7dd79a73208793f13f87d3d9f9713630677f84c89ee2ea364345fdcbaaefb3a9ebbea3 SHA512 7c72b64e45af2172480086f52797266aa456a2d514dedd6badf32fa682c88e11b432774ba645e84ac3ddf719eb9e343a9df12365bb00d03508c062c25723f6be
 EBUILD cpuid2cpuflags-6.ebuild 900 BLAKE2B bbbff47e74e55a6e7f8c70e4d70d8faca5551b7e96cbc891e1995217551bd662753578182a5f8a838cfc913d4b8143f4a4a26063537d9826b393f9a577d67f38 SHA512 1a7396af547599217540df2a925e3caeea27193427937518e1cd6ede3ff6929eca83acf7728368efb9310f377115d7b85ef002604b6110dfad94b4fb10867498
-EBUILD cpuid2cpuflags-7.ebuild 915 BLAKE2B 1bfef4f18ce5f33d18eae85ecebb87aacfb53610d8d9d72539412b0e319ae4e40a29945159853ac6e72b54fe8527aa8ec6a487764dc074635c72a437dfedc75d SHA512 948205dd6106b60f56fcfeed8e6b7bd6315142689b8a8e3f3b362266fa11f7c2bada806994d366c0c4807f0f395e715035f76b5498c5fcf0083385967f17d39a
-EBUILD cpuid2cpuflags-8.ebuild 915 BLAKE2B 1bfef4f18ce5f33d18eae85ecebb87aacfb53610d8d9d72539412b0e319ae4e40a29945159853ac6e72b54fe8527aa8ec6a487764dc074635c72a437dfedc75d SHA512 948205dd6106b60f56fcfeed8e6b7bd6315142689b8a8e3f3b362266fa11f7c2bada806994d366c0c4807f0f395e715035f76b5498c5fcf0083385967f17d39a
+EBUILD cpuid2cpuflags-8.ebuild 913 BLAKE2B b80f65c2ad289f2616b982ea630ee39ed3b6b3af333a14ce8825aa5443a0fbcb20b26f83b3816947ee10ee5919c93fb7021aa98dbdb57e6f0c23ffc9fb38393d SHA512 87452697d3a0a900f96f4103b9208dd6100475800da1c2977e917efb4017244607e8b810064657be2301e81e8cc66833565884ea70d362e7b4a04aadbd5b8f04
 EBUILD cpuid2cpuflags-9999.ebuild 405 BLAKE2B fff9a10b348e61e1af045a39f10aaf81cb6d635d7c87056ab6665018c037b338a03890e0a1dee89f135b56b6805fdde0b2e547e0ab82832ae042c8c28d8bdd3c SHA512 36da5933134753af27f01b833ecf1e2d55c4c55eb58476c32e2de1c2ac6bb51de218e415c7168f97c574b0b2655825f0d981478ef8c17a147a3f38465eb0919e
 MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
deleted file mode 100644
index 81e0c4eaea60..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 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/cpuid2cpuflags/cpuid2cpuflags-7.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-7.ebuild
deleted file mode 100644
index 9d786e5efb95..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 ~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/cpuid2cpuflags/cpuid2cpuflags-8.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
index 9d786e5efb95..c0e57ed3ad2b 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 pkg_postinst() {
diff --git a/app-portage/demerge/Manifest b/app-portage/demerge/Manifest
index 371fda2a98ba..953b88cefcee 100644
--- a/app-portage/demerge/Manifest
+++ b/app-portage/demerge/Manifest
@@ -1,3 +1,3 @@
 DIST demerge-0.047.tar.gz 11142 BLAKE2B aba6e40d9a47032782bafe0bfc77f0bdda7e9782daac56712025c6a544db5624a824cfb1db8b32d2dc61a3e3c561432159eb8208bc5da6f94745ec603a457420 SHA512 6c2d172694516c030c358c9668ff4a1fe54d910583de6829bec0de6e67d428b1853b23f6ccd18fc9286932cb9a2bc5a37bab4b5ce43ddf2dd031c64c2ee6b1ce
-EBUILD demerge-0.047-r3.ebuild 1325 BLAKE2B 85aaf9a252970dddb01df915cbe0536a33791618a4efedf35b3afe9fe5bccb7b9753da4a1efb7e29318e094d1997d5771d8b1efcbaea8d4c30ca8d30896a3441 SHA512 3c5a48a15d2117680da4d71187f514838cf37d0c693500ec9a4aa079400ba64239be3e1e6354026bcd7ae1d6e2fd5f305b1404433ed24e426a8468c085bb4a0a
+EBUILD demerge-0.047-r3.ebuild 1318 BLAKE2B bfdf846425ed1267174e78a843f19d52618765b9b1391828f5d37c5152933d09a9b1465be5b0e1fc9f9b369801529e529011d1e362d34a51d176e495690bbc32 SHA512 c7ab9fff4e269d7780cceecfaec2dea83da210b4de87303efb79dc293c7f04dd6be229e05fcce46cf2c310ddcdc4fd43f826a9c24bf4ca2ef901875352087082
 MISC metadata.xml 473 BLAKE2B b5851d52694607cb0f67dcf21d9d383b1076795e2f2d815b3597b78e149a7f3394312a8d092bc6a96b9e20b592eff074d7b38cc72d7110d4384a65cf28857388 SHA512 084e5b4c139be745f253a91466ad38846d047bca3e5c742a46c8795a47c32d027daf727d7bda4b26cb5fada3b1d77fb820ab52d1c250d67cfcd6591c50c4a97d
diff --git a/app-portage/demerge/demerge-0.047-r3.ebuild b/app-portage/demerge/demerge-0.047-r3.ebuild
index 852d7901a8f7..91e025ff6079 100644
--- a/app-portage/demerge/demerge-0.047-r3.ebuild
+++ b/app-portage/demerge/demerge-0.047-r3.ebuild
@@ -26,7 +26,7 @@ src_prepare() {
 }
 
 src_install() {
-	dobin demerge || die
+	dobin demerge
 	dodoc Changelog
 	doman demerge.3
 }
diff --git a/app-portage/diffmask/Manifest b/app-portage/diffmask/Manifest
index cbbe397c47c8..afd3de6a8c64 100644
--- a/app-portage/diffmask/Manifest
+++ b/app-portage/diffmask/Manifest
@@ -1,4 +1,4 @@
 DIST diffmask-0.3.3.tar.bz2 8605 BLAKE2B a7699dba6b619ff2e64a8148057e06be8d477605fba100b45f056957eb1b55cc50634b698250f68023137bcf01932635c7de798f42edfa1297cc38097e764f44 SHA512 5f28f68dc1adba2fb7b0db5e2a329e46017298de9c44765d521a0f338223eef2a77573636987e942595db9b89b72db93b68cf5b805091b0ebb1e91a18bfcd48b
-EBUILD diffmask-0.3.3-r4.ebuild 518 BLAKE2B 59b812b006546bacc2a5b7004d6abcce8392c0008df3ee730bb0b89242970c7d08807ee2639d8a4e9fac5b5258f50685e3541794108c4c1f9ebc10d878ea05e9 SHA512 30fbb33c6598fcce2bcd898549394739f849f563e6aa64b913926b6f6cf1bc915237c8c0ad0ea0a170a85ac162659fb36905d92827cf4111978a32b7afb10019
-EBUILD diffmask-9999.ebuild 466 BLAKE2B 63595754fd7b829057b32c01a117ab6c68290276fec22be64ea6887470dfec4c7a1a6986ba3707ece2c7ab30b18e58e84b5b874fc677115d47920a345480efa5 SHA512 420ec305a541d0a2ffd9371dbcc75471d6860d79cb48edede04597a9b7921e1b7e79567376c9fc4b7ac2b98d95eef30783a3648becf7e5a709783233aa97bebb
+EBUILD diffmask-0.3.3-r4.ebuild 522 BLAKE2B 401b6c11a887105698607ae5467b5c5380efeaf07953186314606ea6f65c2e83d75129aed969ef9e0887883685f61427ba0001f0726c8bc37b2b25d2de0d9fd5 SHA512 92c4602edc889e855e27a945e5b67b171f5593b0e456f4390d6c51a7c39e40ba41be56959b68b55d49bd3c017335bae1e354fc95ea38360a4b33c2a751d57cfb
+EBUILD diffmask-9999.ebuild 470 BLAKE2B 327f553e32095ddcc490da4b8f11ca669612591a6c20379e0f847ea24bff9d509fd18d37afcd7050fcd3fe78dc5f5576b44675662cefb75fb3d813d11eca96e2 SHA512 68ec486e11b037cffdf612bc0e6dfdfade2ca6a9dd81705cbfeabfeb88caf8b033fb41062ea975e769a8a500f0ed47b42a95991113f3d99d13de3c2845b29168
 MISC metadata.xml 865 BLAKE2B c9fac77bca18c860782a29fbbd18bcf32013f03d35a4caf12a720b9ccd8cf93becdf5a775e6673717da25d08b11c4b871150dd878241c8fea364e383fe1d1094 SHA512 e5f89a3756c6ad777fac8961bbf74f2a62d2b555ff9d7d5ebcba0533173ef6086d3e364460ae84932099d45f7bd9640acfa831d45e0d8317a47eceb1ddba314b
diff --git a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
index 0f2b49d1e55c..dd881f74bd08 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
index f2c1fc19249a..b8f95825456d 100644
--- a/app-portage/diffmask/diffmask-9999.ebuild
+++ b/app-portage/diffmask/diffmask-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 3980642fde77..b49740cf76cb 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,3 +1,5 @@
 DIST eix-0.33.8.tar.xz 627116 BLAKE2B b301b4218d60c13a8d6c4be484b65e9bc257e6c4d1989054cc844861cd6ec96194e60094e72833f82cfaf1b1d14a249045590dbfc91a39e5c92d5dae13b2c643 SHA512 014ce5b660430e117e8037d8043bdfe5e6e98b7cb889e88d93aeb87e650296a8db64871f3eb736842dbebde7eb1f23936f6df9f5f547f89565734b7874e6e907
+DIST eix-0.33.9.tar.xz 627944 BLAKE2B cb4add12301a4f08b6ca052df92be34c8a448b386aa700e8ac7e1fbe8563cd76047994007ac94d8989747d843f70a5e1731b401510f58badd9811b30c2ce3be8 SHA512 7539a91d5b5343532ceab1f4aeb82a95413c39b1a57b9e7922032acc937cc8b839494fc40f3510218349561c6d50e89e1861d2fce5e60eabed2465316b28a756
 EBUILD eix-0.33.8.ebuild 2750 BLAKE2B fe7def8e8574926f23800f385a01aa37f3980fff42dc8395ad33862bd5e1769708559a420b58cfd1fa180a16ed9ffc2f076d808770b32d3bf19538d9e52c6cb7 SHA512 b0885dfc116c8d5dd382df758c70596904a353097d674570c017ad504946b599bcb4518f2b5c58537c5d2f39bb71fd64bfa38f1088565fe8ff7704c1e0e35505
+EBUILD eix-0.33.9-r1.ebuild 2762 BLAKE2B e9a1de3737d0061baa0fdcedfa16be4ff5e6ed14c0ae724aa978c2b213a82d2fcdb5b2970bf46b67abd1c542e1b3266a34aca7669050e4c05bd9f0a4998c0c44 SHA512 c585a23b2882ca1880f92c5585338fa54cc49bac84fe3b31a6f20c5a294b252f5d9f0a6fcc044e28ab9e863344c67e520dde58ee9e88a2583677d7077faa3be1
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.33.9-r1.ebuild b/app-portage/eix/eix-0.33.9-r1.ebuild
new file mode 100644
index 000000000000..79b4f2b3dc89
--- /dev/null
+++ b/app-portage/eix/eix-0.33.9-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	# https://github.com/vaeth/eix/issues/35
+	append-cxxflags -std=c++14
+
+	# work around https://github.com/vaeth/eix/issues/64, bug#687988
+	local -x mv_fCXXFLAGS_cache='-mindirect-branch=thunk'
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+
+}
+
+pkg_postinst() {
+		tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index 1bd16e214eaf..443e88b3da78 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -1,18 +1,4 @@
-DIST elogv-0.7.6.1.tar.gz 17968 BLAKE2B dd2476932a83bc067d39f052d565e3a8fa0c6fd6e2c996b3706c1669f9da395793b5569676846e6704e32f7d56d42227640139629a97a11c095cb198f4591631 SHA512 c2ddea6189165262fae6968d9bb3b8e76f316d9696f07369552ae00eb48a49323232ea7d3609310cd0e440bd912e474dd396a71922dbf5c9f1ee587899ef859e
-DIST elogv-0.7.6.2.tar.gz 18206 BLAKE2B d32713c02d3cb49b9cee7121cda1dea51cdeb496ec859ca0954d0dc676726f3c7de80226b96e6d234d0a0c28e76b9d742a663c1a339b40c5e63d611f082a0d37 SHA512 5628a409346d6375f10a77a08eaef6a160abff385701232c78f5d02a9493f84c451a53f301940a96e177eb295198d05e9c3e2525ab89ad6565f0eca2f2b0102e
-DIST elogv-0.7.6.3.tar.gz 18424 BLAKE2B 8b62b278347ee25f2e45c87a98d0fcff34efe6aad1ae7927336ab28fd03945af0586f8aff316727f7d7ae4e0753f9c25d380bd24203dfecf8d0f2295b7665f5f SHA512 c9127a4770721bd66cd75cf197af9262f7764f8227c36a7229d597fcd9e8db52aeffb42bdcc7b0c0ff20bdcfc9d18b9a568b0456b71ec764a937b148f9893677
-DIST elogv-0.7.6.4.tar.gz 18481 BLAKE2B b7a81e5d736b589cbee3cffbcd0df64c76ba83b12946283771e3cc91a96902de6b4ba37b950f335df1698945ed873734c9117667b4de0f54f228555f4d27b688 SHA512 e9331438552a63c26afc3f16ed4877298bb976a242639c0aae506507570b68cc677bc6e491f0b293a1986579c9edbab769b8d63924f9b0a18ad1e5a222f4d388
-DIST elogv-0.7.6.5.tar.gz 19021 BLAKE2B 0b9f67357ac8fc617ca922a5de64da8559b98cd929d48ed8ba758f8e9a694c60c1e49c33d78aea8c4b5b5d7fc788595c56ff5903b9bc93f6cde5cd1128c6920b SHA512 4a596653ca1c1dc3c315cdf111ddf12d7af5514582da50bf659c48d063fd971c2466d1bd0e4fa1e92e71afaa9715024269cf7ed3a5969ce986742a2c5f648c4a
-DIST elogv-0.7.6.6.tar.gz 19362 BLAKE2B 79ab57c2e30e077731836a3137889c7093fbddd0c10e1e0f3da3160dbb801e928e93a01d3cceadc6fe21f11a8d1eeecad713e915c4cee3cd3ee8ef8255540960 SHA512 d044feecbbef17d676551e545dcc4e6e27779668371d40d891d53bb7187474f665a422a732a0e95246fbd9d689ddeca509a74b6ce677f3a50871878e12895cba
-DIST elogv-0.7.7.1.tar.gz 19437 BLAKE2B 07f39ce5363541020332d8af72fc9c3145ed1ba435bd37f1c0a8846a7e8831e55898c5a9eb65510e821a0f1067fc461c5b124db88600696cfeacdb74c77189cd SHA512 5a766e7ccf1da07795b111dbe45656203a54a6e9fe2aee12caa3ad4c28f122e4845274a4af45b492a34b93d316b241e1a1c33acfc7c366daa328563da04c165d
 DIST elogv-0.7.8.tar.gz 19554 BLAKE2B 653a1dd8d5cb142c78c27ad4c7110a7dac666eed649213ef62c1548d5248c4add561242290a59178470736cffc9ac15fb7ee796a2954239ba382001f1e6c9c4f SHA512 be90f01b4d2e114608b13aeba78ab368af6ed66ca329de6952d7f422c90356fd1c6988827f0c60ee66636ae92e089689c7cbd725f6eb20545747fb24d0d1daf2
-EBUILD elogv-0.7.6.1-r1.ebuild 1590 BLAKE2B 7b99b939322dc5c5b861a6573340d0f0325560d10b10f1b1351daf3648831634b06dd628d145c0139ceac2a61d4c7bada918578d753eca4937b361eaee9bb8be SHA512 1190c510ee90c6517181f1fb8cc574218317227b475d3d2420b9fd9fcff05f92e8e068b3117c0ce9ec02e1de602830a11f42042787c906b188f96618490597cc
-EBUILD elogv-0.7.6.2.ebuild 1594 BLAKE2B 93da434e3144c09ab44af66d35d2c63982e0bc02ba0795436a915d4bf106dee7d8e7e6e6619236ffc357fe2dc9b6eaa3123088fb86ce263d3148c8c51f086417 SHA512 c430b11ac97db2d36efe9e3722506fb5388bf8b81bc462c3b8fcae2cc438ef97a281d3e87c1a928371c539a2256b4e34ae8af1c9fa64d052deeaaca92787dbee
-EBUILD elogv-0.7.6.3.ebuild 1594 BLAKE2B 93da434e3144c09ab44af66d35d2c63982e0bc02ba0795436a915d4bf106dee7d8e7e6e6619236ffc357fe2dc9b6eaa3123088fb86ce263d3148c8c51f086417 SHA512 c430b11ac97db2d36efe9e3722506fb5388bf8b81bc462c3b8fcae2cc438ef97a281d3e87c1a928371c539a2256b4e34ae8af1c9fa64d052deeaaca92787dbee
-EBUILD elogv-0.7.6.4.ebuild 1594 BLAKE2B 93da434e3144c09ab44af66d35d2c63982e0bc02ba0795436a915d4bf106dee7d8e7e6e6619236ffc357fe2dc9b6eaa3123088fb86ce263d3148c8c51f086417 SHA512 c430b11ac97db2d36efe9e3722506fb5388bf8b81bc462c3b8fcae2cc438ef97a281d3e87c1a928371c539a2256b4e34ae8af1c9fa64d052deeaaca92787dbee
-EBUILD elogv-0.7.6.5.ebuild 1594 BLAKE2B 93da434e3144c09ab44af66d35d2c63982e0bc02ba0795436a915d4bf106dee7d8e7e6e6619236ffc357fe2dc9b6eaa3123088fb86ce263d3148c8c51f086417 SHA512 c430b11ac97db2d36efe9e3722506fb5388bf8b81bc462c3b8fcae2cc438ef97a281d3e87c1a928371c539a2256b4e34ae8af1c9fa64d052deeaaca92787dbee
-EBUILD elogv-0.7.6.6.ebuild 1594 BLAKE2B 93da434e3144c09ab44af66d35d2c63982e0bc02ba0795436a915d4bf106dee7d8e7e6e6619236ffc357fe2dc9b6eaa3123088fb86ce263d3148c8c51f086417 SHA512 c430b11ac97db2d36efe9e3722506fb5388bf8b81bc462c3b8fcae2cc438ef97a281d3e87c1a928371c539a2256b4e34ae8af1c9fa64d052deeaaca92787dbee
-EBUILD elogv-0.7.7.1.ebuild 1595 BLAKE2B 557940e81ef758ceaf4ab88c73e5d5d89323838f874dc23c34e60c43829845a211f9722cba5230232528336741a7f727861cf12ad33363593afb9398d8a2f0b5 SHA512 efd5a99f85f5dff8aa581695dc302c9bb336ac5e2f55ba496ba6938f5a6ec7bc5a39520a73f7ecf5267027272609215292c50e378e018cacda58c44863164d29
-EBUILD elogv-0.7.8-r1.ebuild 1597 BLAKE2B 1d3c3ae27ed25532e19ba653698d3803db4bc47c6cf7e233fd184f215250d43633f4e7f27115596a4537a412ee05fdb74e58e0210db18a25725f5cfa1892eb1e SHA512 bd12597fcdd264cb98a25c4d7c2438c0bb82e8361bbd943b259cb4a749ef7ddccff2d026aabada98c26c963d0e45552c1cec411ea7d3fa526ab5e268f0ce06eb
-EBUILD elogv-0.7.8.ebuild 1597 BLAKE2B b016795ed8d0fc28e30c6bfe1323847d9b22d193de1b58805a30b010d054670489158daa73479189869f0593cc6dd767813971d776f7ab869433e65e3cde7bb0 SHA512 cca7aa9680c491e0a17924f296563a017d30ab787d2e5e15af6b69825de9a7a786738ab97de4fafa63cdfa856514cd39f55cd4346b848868f2e5fdcf3e57f96b
+EBUILD elogv-0.7.8-r1.ebuild 1593 BLAKE2B b92f573aca9954ba46b2e354baffbb73a8d1fcc7a178795f090e2fd79d752d0fa37f5aec5992aff77e95aec9f732667ae3a6dde2b26993c8f21482af2d917eaf SHA512 f08c903901fcd59363212ac1631de6af5d379a8110013fecf4d41afd16f85825083bfc00711854131b621185231fdb885d8c5cc0d8489c55adedd97936371935
+EBUILD elogv-0.7.8-r2.ebuild 1665 BLAKE2B 1f77cc7fe3b345c355a1a652fe3948ba358ee4db4261ad4d05e6ec80f1fa3b31c07513206d6703b05ab0e6596589f1331cfef4f2e66a8b6125834504c58955ae SHA512 00144db92d850ebbbc4b060cd4ef6b67f3d27d066fcb4f40428c3f71d3652b498ad8360b2d36f64c1f12ce86689b2dc062ecd39c56e585a6188baa19f704ab3e
 MISC metadata.xml 470 BLAKE2B b80ae78f2033fbe4623e47b9f24581e2781a374cb9b85ceb9f990b2505666c19cb003050dea8dd532c1641c0c4fc27d84347ec39c5a5624bf79adba1e42ab873 SHA512 ad99227415869525deb25fc3cd2ead8023a03cddd0d546d14a8669cd681e5aa47cc40977a1664d466aa40c6100479e24e1228b3761ff331bc2436443e9c1443c
diff --git a/app-portage/elogv/elogv-0.7.6.1-r1.ebuild b/app-portage/elogv/elogv-0.7.6.1-r1.ebuild
deleted file mode 100644
index 63781f53c463..000000000000
--- a/app-portage/elogv/elogv-0.7.6.1-r1.ebuild
+++ /dev/null
@@ -1,52 +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="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-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"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/elogv-0.7.6.2.ebuild b/app-portage/elogv/elogv-0.7.6.2.ebuild
deleted file mode 100644
index faf1aa0341cd..000000000000
--- a/app-portage/elogv/elogv-0.7.6.2.ebuild
+++ /dev/null
@@ -1,52 +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="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-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"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/elogv-0.7.6.3.ebuild b/app-portage/elogv/elogv-0.7.6.3.ebuild
deleted file mode 100644
index faf1aa0341cd..000000000000
--- a/app-portage/elogv/elogv-0.7.6.3.ebuild
+++ /dev/null
@@ -1,52 +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="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-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"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/elogv-0.7.6.4.ebuild b/app-portage/elogv/elogv-0.7.6.4.ebuild
deleted file mode 100644
index faf1aa0341cd..000000000000
--- a/app-portage/elogv/elogv-0.7.6.4.ebuild
+++ /dev/null
@@ -1,52 +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="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-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"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/elogv-0.7.6.5.ebuild b/app-portage/elogv/elogv-0.7.6.5.ebuild
deleted file mode 100644
index faf1aa0341cd..000000000000
--- a/app-portage/elogv/elogv-0.7.6.5.ebuild
+++ /dev/null
@@ -1,52 +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="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-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"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/elogv-0.7.6.6.ebuild b/app-portage/elogv/elogv-0.7.6.6.ebuild
deleted file mode 100644
index faf1aa0341cd..000000000000
--- a/app-portage/elogv/elogv-0.7.6.6.ebuild
+++ /dev/null
@@ -1,52 +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="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-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"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogv/elogv-0.7.8-r1.ebuild b/app-portage/elogv/elogv-0.7.8-r1.ebuild
index e5004bc33c84..4849f78c55c5 100644
--- a/app-portage/elogv/elogv-0.7.8-r1.ebuild
+++ b/app-portage/elogv/elogv-0.7.8-r1.ebuild
@@ -13,7 +13,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"
 
 DOCS=( README )
 
diff --git a/app-portage/elogv/elogv-0.7.7.1.ebuild b/app-portage/elogv/elogv-0.7.8-r2.ebuild
index f97650aeaf68..04a1a84d43f4 100644
--- a/app-portage/elogv/elogv-0.7.7.1.ebuild
+++ b/app-portage/elogv/elogv-0.7.8-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 
@@ -15,6 +15,9 @@ LICENSE="GPL-2"
 SLOT="0"
 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}"
+
 DOCS=( README )
 
 src_install() {
diff --git a/app-portage/elogv/elogv-0.7.8.ebuild b/app-portage/elogv/elogv-0.7.8.ebuild
deleted file mode 100644
index 9b427a3649c4..000000000000
--- a/app-portage/elogv/elogv-0.7.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://github.com/gentoo/elogv"
-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"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	# unset LINGUAS => install all languages
-	# empty LINGUAS => install none
-	local i
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(ls "${ED}"/usr/share/locale/) ; do
-			if ! has ${i} ${LINGUAS} ; then
-				rm -rf "${ED}"/usr/share/{locale,man}/${i}
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  dev-python/pyliblzma (for xz compressed elog files)"
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index 4307663b742a..61f2c873d209 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 1527 BLAKE2B 704fa5e36604b9aaed6daaf3c8daade0a4b80750742f238602a9ce75a5555f795bf776bd5faf37aaac0de3e8143aeb50dfc7e4f421976cb03ce40cb25d6ad35e SHA512 09a0f31fab19fadfaf64929d2e347f12434f7621cfd49848e8f0684021e9c8bb4ab0aee0b01910c30b46b8b355b1dc5705c8fd0559a2d07665a3cafa8eaaf4ef
-EBUILD esearch-9999.ebuild 1104 BLAKE2B db774e9518c66f328979862a21f9d3633e1ea05f651a9949f33afad2215e275e8e6c9e8757457a23fb41d986132e22ffd3548d6ca536066fd92e81986e7077d5 SHA512 3848c543ee3aaa70f9f79594a96bb8c08404ea771db8de69873835785a8329b3faf120e8d5f5be22946b32b67802d045b3d2b52de0bb6b80e85a44fffda110be
+EBUILD esearch-1.3-r2.ebuild 1456 BLAKE2B 42508f06293f70cb12a04779d2ed245db6989ae722ca73442968c9b95a001d7c2cbb01cab21636d49aa30b0952de6eb9954ff90a8ff9276f94876dd3f0da84b7 SHA512 e0cafe10011e7c616a174fd2542e24a8979d86bcb3c3213a21f836378c645a24117be17128f0875dcc1b24396b94f2908d0570463124f55b79c5019d5d2ac661
+EBUILD esearch-9999.ebuild 1046 BLAKE2B ed68b2bad6ba9d3e9165c1b726cc3cbb1dd918fe00f7d6cc30fee7c631c32c5ef473c68aa6e41be1add83b02c1ecec68ae76d06986b479ce39db6f4fe58e2795 SHA512 ab6e7467ce2edcd454e4e3cef9018fa7890f39f2c5e631f318162fddbd6b4afe735798c6c9f49e008d787c4326df6fa54a20b713c4a5cf7e733d4c5ea126f5e2
 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 c7d538437df6..f2e2ee6be360 100644
--- a/app-portage/esearch/esearch-1.3-r2.ebuild
+++ b/app-portage/esearch/esearch-1.3-r2.ebuild
@@ -29,17 +29,15 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-Fix-python-3-compatability.patch
 )
 
-python_prepare_all() {
-	python_export_best
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version \
+python_configure_all() {
+	echo VERSION="${PVR}" "${EPYTHON}" setup.py set_version
+	VERSION="${PVR}" "${EPYTHON}" setup.py set_version \
 		|| die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
-	dodoc eupdatedb.cron || die "dodoc failed"
+	dodoc eupdatedb.cron
 
 	# Remove unused man pages according to the l10n flags
 	if ! use l10n_fr ; then
diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild
index d3487f839a86..10b62a631ed8 100644
--- a/app-portage/esearch/esearch-9999.ebuild
+++ b/app-portage/esearch/esearch-9999.ebuild
@@ -21,16 +21,15 @@ KEYWORDS=""
 DEPEND="sys-apps/portage"
 RDEPEND="${DEPEND}"
 
-python_prepare_all() {
-	python_export_best
-	echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
-	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
+python_configure_all() {
+	echo VERSION="${PVR}" "${EPYTHON}" setup.py set_version
+	VERSION="${PVR}" "${EPYTHON}" setup.py set_version \
+		|| die "setup.py set_version failed"
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
-	dodoc eupdatedb.cron || die "dodoc failed"
+	dodoc eupdatedb.cron
 
 	# Remove unused man pages according to the l10n flags
 	if ! use l10n_fr ; then
diff --git a/app-portage/g-cpan/Manifest b/app-portage/g-cpan/Manifest
index 890bc72e818f..6dbbdc24288a 100644
--- a/app-portage/g-cpan/Manifest
+++ b/app-portage/g-cpan/Manifest
@@ -4,7 +4,7 @@ DIST g-cpan-0.16.7.tar.gz 33621 BLAKE2B 531c2668756b8f31dc038136580dc5fa26b4bb20
 DIST g-cpan-0.16.9.tar.gz 34463 BLAKE2B 7eff6b7da75219712504ac7b9ea1833e9eaa9ba4a49f609baec6407beb16f4764baf2c35e15c779c93ca8c09bba9058e6acb6fda7f3fd2df06296724f2c3c3fc SHA512 f26d81974fedb024808fe3671ae297fd36abc37a5b04783f36f6c9e8c6000a411c675e999e91da48801a7c84fde15a59587df02fa9d7b3833ccc0916993b1783
 EBUILD g-cpan-0.16.5.ebuild 1060 BLAKE2B 3be8d10a59f30f09900fdc04a0b1e9548f9f60e4d0d00edbff8ee104237e73d6e09414bbda59cebf717b9c2e195e17ebec0d6ebd5763f9bcc56bab2e5d5b4c73 SHA512 a2524f42f7df44c7eb2eceabb9fef72173b4d2f9981eba77d77c6728c549bc31e55eff27621ce736c46610d037dd33807d8fafe10efd2315abc6ca2f0295eb5c
 EBUILD g-cpan-0.16.6.ebuild 1152 BLAKE2B 61e9caa00ce569ed6d60ff1f6fcd1bf758dbc4ef4b2eabb2b926c5788416eb068519a6de8aad5fbde96e4a6b3927494dead5e896b134c531f0b998469596a5c0 SHA512 0def8a8ea3c3644fc55dc1a99110213814063e881bf4c5ae49c8bd69fd460c9236b6d95d7a0ffa76bcd42d1175f451eeea4998832f09f780b96d07daedf0650f
-EBUILD g-cpan-0.16.7.ebuild 1444 BLAKE2B 1b080e7778c77fae162e96491b903323d465548587c592b3a6aafac263e9fed6c52dc45fd6fd574ce2ed30a0d674ca01f551649045e124db65ee9e8100cfd02e SHA512 2a89a12a6d0d096a6bbc5ff30655250f63e7c5cf9cbc271e59691972552450eca0945072cb3d485883c4eb203d4ae9ed9c1095dd752d8c197c5826a612eebca3
-EBUILD g-cpan-0.16.9-r1.ebuild 1429 BLAKE2B 41869e6631ace40d7e95a2a6033bacfe4044d23fabe5cbcdaecf67d21b2e62c4e1df994c59d8fc4916f6750fff7f58f1d8d2bac81445a2efbfe4d53efbf9a1aa SHA512 160b2edb24ea1376f8fdd245f6a9a453d8478b8e642f1d61960a402b0241074e672f164b148236fc7a7db6fedc9ac96f3b0aeca9bd7d05f3800fdc3fe1a61a0f
-EBUILD g-cpan-9999.ebuild 1480 BLAKE2B 4537ad33cf062897a461d5631d7cdf706ed88e26cfe4b57e5153b13c876b7b28692c28e7efc08097b7bda5b1339f2511fb349971dcd2d5d9ae725455fb3c43f5 SHA512 eefa233d54840737d5c6de54c44e32a05537a3e68a7046a0afcbbcc11769223f7402e8cad9d5c6753b5fcaadb9a2d92411a126c40fb1ab6812e57b58b76f0b30
+EBUILD g-cpan-0.16.7.ebuild 1468 BLAKE2B f8ba91e84563aac09c7266d1d9d2bf9c30162d5752355af3b63f4b759783eadfd37b5f35d68e49e34a11af25c51deb6edd11a8a1355bc4e2318b075e4d44c615 SHA512 7c0ed9ec7266b95e827265754ea1c81e9fe746769bad46ee9d5a24043e368afe30bcd5b987df07925a97482d6cb8af8c287b2533275426d2b964eb2dc299287f
+EBUILD g-cpan-0.16.9-r1.ebuild 1453 BLAKE2B 4986df0733001dd993c8c6f2dffb2bc8d02bf77fae87fa74215bcdd11b29d4994e3e289164a060e43a465e7d04bd3aba66cc87acb4ebcd7f379ff085f61c4007 SHA512 ed6ec66124bd3f422d55f577cf97621d7fecaa6b19119a1034bb026941b60bcb5a9091c0e5fb7eff4c865b8e5fc54124c3a8c1a5b1d2860e82cb634eb19fb1d6
+EBUILD g-cpan-9999.ebuild 1504 BLAKE2B 7f81cadbbe38dd2b0249d81502a69727d29b20ab1961af4a8ce8ae6cd896408b77db96a9f29b564c456ea654aa6463dc578f2a9013400929bd2ab62b9ea5c43c SHA512 cbfab6a500463cc1c471e81bf5cf941d02ff0d00d07d9233f6bdf94c9cf1d6d4ceeaac3f68dd33496652797b91c1b6d6fd5be82cf06107bff773c79cf62a2cf8
 MISC metadata.xml 565 BLAKE2B 3614246d5827779c1fd4f713fcadc54210893e680d8d10edbd98bad63ac93bb0e642b6a44fa5496f2bdf40eb3accdb79eca0c1fbd8a459655d192fe7af6f99b5 SHA512 057c2d4a401423d789283661cef0a4c42955d10cbf9671f671de279975fde004d0836e5fec8bd1d34c5f0f1f0bf21d6ebded0bb716d7445001c975a22ff2d0c9
diff --git a/app-portage/g-cpan/g-cpan-0.16.7.ebuild b/app-portage/g-cpan/g-cpan-0.16.7.ebuild
index b56c85f37fb1..c8552409d5f7 100644
--- a/app-portage/g-cpan/g-cpan-0.16.7.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 COMMONDEPEND="
 	virtual/perl-File-Path
diff --git a/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild b/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
index 074248d01feb..8a9ddc887c58 100644
--- a/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 COMMONDEPEND="
 	virtual/perl-File-Path
diff --git a/app-portage/g-cpan/g-cpan-9999.ebuild b/app-portage/g-cpan/g-cpan-9999.ebuild
index 8c06625ef240..fdd2d32c2860 100644
--- a/app-portage/g-cpan/g-cpan-9999.ebuild
+++ b/app-portage/g-cpan/g-cpan-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 COMMONDEPEND="
 	dev-perl/Config-Tiny
diff --git a/app-portage/g-octave/Manifest b/app-portage/g-octave/Manifest
index e90284e0bd05..836d8373c290 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 2375 BLAKE2B a1d345fb9f138d61d7078a8f865465607a1cc14f2b280ceca3c72e75508590a09602b27c84e09d6aae19f5eb73d2361ce0ada62e2c62a81c8f05cb21a45dd896 SHA512 b2b805e7904e3165cd3a5c58338007745e5a629500a4a220c0c68e16d6601177c0010cad0104af36f58268d55bc94d4b002c8f147d1e139fe3dde5facf060418
+EBUILD g-octave-0.4.1-r6.ebuild 2330 BLAKE2B 7e51bc73453bd626633e96023c17f4266eadc394bb43325fbca967c8e5e41c91b2e665d876f62e5b51a4244dbed1016beb4eef125d54cf98d355455eff89860c SHA512 e5676924d209ed69b02daed849765ce0ada06ef8678c6f62fbe8bf3685c24c6d27611d6413013b208e2bbbecdf01fe3b43b9d6dd76565b6cce24afd6b6c02652
 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 03f69397bf47..dbf8ea63a922 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0 )"
 RDEPEND="sys-apps/portage"
@@ -38,13 +39,13 @@ python_prepare_all() {
 
 python_compile_all() {
 	if use doc; then
-		emake -C docs html || die 'failed to compile the documentation.'
+		emake -C docs html
 	fi
 }
 
 python_install_all() {
 	local HTML_DOCS=( ${PN}.html )
-	doman ${PN}.1 || die 'doman failed.'
+	doman ${PN}.1
 	if use doc; then
 		mv docs/_build/{html,sphinx} || die 'mv failed.'
 		HTML_DOCS+=( docs/_build/sphinx )
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index e9a758be2a20..f8dd2eed3ad2 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -5,7 +5,7 @@ DIST gemato-14.3.tar.gz 71325 BLAKE2B d42a5182c12bcc0281df47ddb6b933bb332b9b842b
 EBUILD gemato-14.1.ebuild 1391 BLAKE2B 0a130c15a4aa07d3d5da7d5e64e5d318430c298aedf9ebfe67ee91e963ce13dd9e9e8085fe19fcf17d3e0d4db99cb1447b9ce73b909ad24a1072fa9335e37fa6 SHA512 09b33fa833e567bc18135b2a9281736d1d882160c18749951d486681198cd4189c74b79e9e5064086a5e8ba9bcd1910c363faabd790f27abbf551bfabe9aaff5
 EBUILD gemato-14.1m.ebuild 1674 BLAKE2B ee7a98540166272128fc94af0e5f8a7bd45ad0c30e65777f08f0b45576cd287558058d0f0cb6c121939d79cea63b1a1cd4cfb24b69bb66759ecc744ec840f378 SHA512 c1509d319373ca7c35603e1cc14d1beac15e839b97c2648fe2aa9970f9d06b59f6355ec34196a6a0b7c4f3e87e8e99dc61b050be8fd543f6e6580aa9395cefb5
 EBUILD gemato-14.2.ebuild 1392 BLAKE2B f807e0d3bd911d5089913cbe38106b09b7133c4a9049df86ec89503c1c0c2c388712f08b8821f1d33bcc7a4fae79328796b12cb7c06b85f24813d992f5c7fcac SHA512 1ec51b5e2facd52fc0acd8a83abf8e47d8a7868f33afab6c1efe6d7a4d937c5343aa168b3bda41f3f58f2b449870e4e7a36bca7afb1ac10bb691ebac4616c7d0
-EBUILD gemato-14.3.ebuild 1392 BLAKE2B f807e0d3bd911d5089913cbe38106b09b7133c4a9049df86ec89503c1c0c2c388712f08b8821f1d33bcc7a4fae79328796b12cb7c06b85f24813d992f5c7fcac SHA512 1ec51b5e2facd52fc0acd8a83abf8e47d8a7868f33afab6c1efe6d7a4d937c5343aa168b3bda41f3f58f2b449870e4e7a36bca7afb1ac10bb691ebac4616c7d0
-EBUILD gemato-9999.ebuild 1298 BLAKE2B cc2cdc3081a1662d04b4a991a4fec1a6cff50da2faa90536efc34b47b3cfa1831c9e6e69e5fb304c39fd807dbced6e0a67d16830733e5ec2061e88931d6d41cc SHA512 9cc1345c6e9df9112c43cacaf896d46917753873a23ab4282e0fea5aa20dd26d0190eebce0d67bc73fb66b1d4dad5fcb9cc5797236377c2ea4f4c01031ef5ad6
-EBUILD gemato-9999m.ebuild 1493 BLAKE2B 1826c7324f6b383dc4766de75731b93b46f2f13c6b9c4b7b928cda02e2ba9d6882fecbe828cd2e52b235ba0a4395663db13953e6d0d835614e66534fc0e0098d SHA512 b94f5e54cea9aa25dd90133fc127f8f14933d6b102ce5016346a3d73a78205aca21cee413e6de4f55c6c6df0ce2a65f86999e8cc8d0cfc1f85d8bb0a7813957e
+EBUILD gemato-14.3.ebuild 1353 BLAKE2B 7be8b507d589e919c6cb75f60553a06f92af98a131458c8c64b31f84a16ce2ed82a4567d3ad53daacf83840962f875207e109fb48db73894e60ad68f176ed5d8 SHA512 5b648f9461b2f9125cce62f8fc170108ac608f9835bc0b4053302bb59b3c06ff06a7ef408f3778215d6fd421a81c26e78820087af4d7f53772f9a64c7fdafcee
+EBUILD gemato-9999.ebuild 1260 BLAKE2B 68e799494aec328a7f16c80d85823e5022042382fe91fedd36ee19dede50249dd0a04c4392d7b034fb9e5703a2a5c1b997255c53ebbf534140d3ebf05f8ec3eb SHA512 82683aaa9e1862d7d199485c0891c19c404301bb1db2d77e055d38acf17862128d810ca8096701be304d2092be7e747597743d52fe67ac77ce9e2dda45ccd32f
+EBUILD gemato-9999m.ebuild 1455 BLAKE2B 8ac741c16f9ea0d391da5517066861e0c797a6bf3202bc59c3fc65b376b35620ecad44eb944a0a1fb27843543fc3fdc19c27b52e379d87f422a5e8ddc384ef86 SHA512 4299c44d2e034010045f0b0f00f4439c2b2d42291bcc5e7a860614ae09895472d40976703cc4aee0a740c43d41a8d9ded3bab6a99da74cdcf8fda4be33192515
 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 d58a025ed50f..99e10512f1dd 100644
--- a/app-portage/gemato/gemato-14.3.ebuild
+++ b/app-portage/gemato/gemato-14.3.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-# pysha3 is broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy{,3} )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1
 
@@ -14,7 +13,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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index f419059fa647..ec43603da332 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy{,3} )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 git-r3
 
@@ -24,7 +23,7 @@ MODULE_RDEPEND="
 	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
 	gpg? ( app-crypt/gnupg )
 	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )"
+	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy) )"
 
 RDEPEND="${MODULE_RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-portage/gemato/gemato-9999m.ebuild b/app-portage/gemato/gemato-9999m.ebuild
index fe7b3b5ba969..abe4544cbdaa 100644
--- a/app-portage/gemato/gemato-9999m.ebuild
+++ b/app-portage/gemato/gemato-9999m.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy{,3} )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 git-r3
 
@@ -25,7 +24,7 @@ MODULE_RDEPEND="
 	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
 	gpg? ( app-crypt/gnupg )
 	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )"
+	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy) )"
 
 RDEPEND="${MODULE_RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
index 4d7cbbb467cb..c01c906b8978 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 763 BLAKE2B 6b3449fe92fece540b2e68ebfc56ed24eb4c0247885eb089e93cab2adc75656d511d61e14ffabbebb6547987b2fb66b718e1f0960f8fdeb9c4d82e8289209d75 SHA512 a09435ea347bc23d6f6525aa09adb139df36d031b5e968313797895042e2e181b0a36dd3906db2b604f03c4b741df44d8c4fed2b4feb97f51f4448140fa9b60a
 EBUILD genlop-0.30.10-r2.ebuild 788 BLAKE2B 99b503d589dc15cca65cf790a149212fb9d16d674524eba3b5903a625783a24076364aa418c39c5ed68f8adbbb56789257d67a5517b4005df3288a3df059a2eb SHA512 24d5f6069acf12539bbce611622e6de20db9daf4c4827b47f009b421bafe56dfb866f3bf056bb5d17963b81386814d7502301f718e4294a10a8e582eecb12e52
-EBUILD genlop-0.30.9-r1.ebuild 751 BLAKE2B ddf1257aa27c50d2fcebb8a80e64896f3460752dbc539eab1d41a3980ca2921faa1e1407d508b90617e9ff1c23b43bc8ca15821d5a759ed620c007bf9a3343f5 SHA512 60cc6b8a0382fc579247278ee14bca66ea7b4973f23e871f83eea21b376cb4353b6dc952ac3e19db72c4e099b16ad960e96106f4f9fddd1b5036d2d655a830fa
+EBUILD genlop-0.30.9-r1.ebuild 705 BLAKE2B 3a6c06bc0a0952e04e7a3e1b6901119f295a66519f59ce0c625749fed2d805a2dd0989b763b3b8fe5d0c870173f55db3a5064e00f545a2356cf6911cda2d3d5a SHA512 427172978a2d3763343f19869571eef13cb675e7e52f0721e87a728109ee6b671db401438d737ab818754bf40a8660503898e45381b0e11e06d4d2a6206a0e61
 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 ec2523cc02ca..4a68ff1273be 100644
--- a/app-portage/genlop/genlop-0.30.9-r1.ebuild
+++ b/app-portage/genlop/genlop-0.30.9-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
 PATCHES=( "${FILESDIR}"/${P}-display.patch )
 
 src_install() {
-	dobin genlop || die "failed to install genlop (via dobin)"
+	dobin genlop
 	dodoc README Changelog
 	doman genlop.1
 	newbashcomp genlop.bash-completion genlop
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 495e72dcd590..efa48e0491f5 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,6 +1,6 @@
 DIST gentoopm-0.3.0.tar.gz 37614 BLAKE2B c848c08677c4ac5ab0fdc1499045ae418048ec35d4ef925d1fe09ab4b68ec90e4f6843511efc29184883f3b3582bd3de519212bea1997736378b01bdc13ebd14 SHA512 e2a82f37b9a42688b6dd7023accdbf537780069deb6ca6ec6d9e159baf774af17e2a405c9eb40105b73b165f1c8c2ccde3ed685e04a61c9cd6665d1677da61d3
 DIST gentoopm-0.3.1.tar.gz 37897 BLAKE2B dd5499787bcc5c46ae3b559f3af4a5af5b4ca81a312e926149c587cac0391c51dbe61ac42d2bc19eb83cedc168486e9c30ddd6fbf4ae10ffd9719aefa2f54cd3 SHA512 e1a3a7929ae83d813dd0b03f0548f033e8e51b766aaddb653027398fb618819de6237e2ba1c0542defc9d62e71e8495aa10152cbc47a4e521f7cbaeda3ea4354
 EBUILD gentoopm-0.3.0.ebuild 630 BLAKE2B d16a099adce797f225a7201b84029470425f8b83ad12afe59d7bf7d25d7b67143b4bda66d8fa84f8e73fef0bbaa59557ef7b594a0b8e27f699d0c49cbfce6d17 SHA512 f30f310e02e60588156c1a1bebd00ee85d807877c2a11972c8c8166c1c01377d92d8505cfbfa344d7e18801c5adfd12d0a54381733dd84969605f20040b998ac
-EBUILD gentoopm-0.3.1.ebuild 633 BLAKE2B 921883dd6163057a42d3518082a271b5588f5e1f981716a0437fc08421adb6c16b611b87f5877475073ec7857636f1fe7e8bdc8dab0f1ac26f5cdc66e79e20bd SHA512 3ee2e27340f471d15c31472fa16d592ceff2a8404e6fffdf7bce5cc7b4c2eece3c3782b6c08ff36f018505e71bf6217635048ada737ce80eba9210d668fbdffe
-EBUILD gentoopm-9999.ebuild 602 BLAKE2B 8d94531576db509400309bc61998aaf603ddae1a2bf0bc76799d6f135e13ab582e72d179db641b07a2d3d954c80ae55fa7dd41ed037ac7fcb52eadf8b2649235 SHA512 5b624784ecc38e35d7e5b3babb297f65f23e2745402ef0e8a46799d421d88e2c5efb98b26fc09675f03ffc65bc4db1694b36aa2a3eccfaadbb1a55eb0f175a81
+EBUILD gentoopm-0.3.1.ebuild 637 BLAKE2B 958e791359efffb9809a00e0c47f3c9c45928d8f6490877838acfe8fa143ec5ed713d7c70ddc9f2302a1f90669e5140438994454c73ab73e2300a121ca16a49a SHA512 6a7cc8f6f8732637020d7aa8b56a6743ff22c9cfbd4e9c6da3c79ff1466de79f40e2aaed70e2ca49963d99037d68a738ea1ae9a55e4c538172e2a56946cf48b0
+EBUILD gentoopm-9999.ebuild 606 BLAKE2B 1234d42a5866a5e8bb11ae94a8f5c62f9349ffc67eff131bd6a46be0d959ca59c19d57767ba6b074cc9271ea6c566bc9ab54815e6cedec1fd9c6c2fdd67eb77e SHA512 e5b8c09347a790a9ffde59f350ccf3d17dbf50024daa5bf6862be93a8fb29f44039237b287e811062c06ecedcd51dbfad4a2100ffe92c5d484bb7ec0b3899eb0
 MISC metadata.xml 552 BLAKE2B 5298db30d81cc45ccec8b1320c204be68592246d280969045924d3142eec58cc6d050cfc919e4f30caf427e255ec968ff551e7338c97bb8ab77434a4d4a7aa68 SHA512 dc85516038135bda516f32d321375d814ce7f735d5169365beecc994b4d8936f646a580f1ea88dacff323a54e146423c99a0b6280af41aeb39f08cd9303ce677
diff --git a/app-portage/gentoopm/gentoopm-0.3.1.ebuild b/app-portage/gentoopm/gentoopm-0.3.1.ebuild
index dbdac94b858a..93cd31750f90 100644
--- a/app-portage/gentoopm/gentoopm-0.3.1.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy )
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 293e127b6b84..8609fa346bb5 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy )
 
 EGIT_REPO_URI="https://github.com/mgorny/gentoopm.git"
 inherit distutils-r1 git-r3
diff --git a/app-portage/getdelta/Manifest b/app-portage/getdelta/Manifest
index e1f1b7825b1b..66368bd1fedd 100644
--- a/app-portage/getdelta/Manifest
+++ b/app-portage/getdelta/Manifest
@@ -1,4 +1,4 @@
 AUX getdelta-0.7.9.patch 9393 BLAKE2B 1b105cccd24dc039ea5c14f119b67fb9ea570172d1e0808af905951ef23275ea1843a60cda1156cfa653904ec42ae5c869faaf4133a5c614162956dc064691c8 SHA512 c9c363c8e36245a8cd409d3a43c0d9110c409311f6972893d993f16f2911496c33c50c98e8dd9138b52bb7d7dc5ffb56b0611c28e9682ea5ac189cb27c5755dc
 DIST getdelta-0.7.8.tar.bz2 10335 BLAKE2B ab2093a805649904405d23d7ec7afb2f338e87864c91f8aeb13efa2547f5493080cc1249a28a73da8e17d6b5aaff6fc00f217fe5b8df51db4fbea2420a88a523 SHA512 66374ce1a0ec5492d11478ddcaeb67b497a44357605f3cd1b9176796ca9f69d8c6865f9db188a6d7722c4ab372a5a317dfa6fafe97d9f08f76f332469f1ee2b2
-EBUILD getdelta-0.7.9-r2.ebuild 1391 BLAKE2B e503ede04a9315666d3229f1ca1652294417e3d34d1c1b1908de72de997607442c473254ec17bc0b8db6145a10a808aa336dd70398120aa2eb0ac50b1e66cc1f SHA512 5d50594b215d4901b7378d627d78c51162bc39ec75901ecb00722658704948bc4e8dffc4eba4467fb2c32bf0dc389c7b1d0f7930c3cfb318f16bfb1da81deb1a
+EBUILD getdelta-0.7.9-r2.ebuild 1384 BLAKE2B 56f4a5b03640207b59b63c45c18beab0b01bb0f74c96bb469fe7bac94ea27cecd24a25b35f6e0da215b60f784e0efb83dfef99e0de7985ab8506e1727f1ebd11 SHA512 e2825f4eb44243d67b9962ce4a6aeafc17b1dc71c2ccdde3505642f7fffe24abda3d53defe1c197999cb56ead5c459f4ab5e66fda1cfe68e44e07af1d58bd419
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
index df2523078442..cff0c6a6fe5e 100644
--- a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
+++ b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
@@ -30,7 +30,7 @@ src_install () {
 	sed -i -e "s:source /etc/make.conf:source /etc/make.conf || source /etc/portage/make.conf:" "${WORKDIR}"/getdelta.sh || die "Couldn't fix make.conf path"
 
 	sed -i -e "s:/bin/sh:/bin/bash:" "${WORKDIR}"/getdelta.sh || die
-	dobin "${WORKDIR}"/getdelta.sh || die
+	dobin "${WORKDIR}"/getdelta.sh
 }
 
 pkg_postinst() {
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
index 2cabcc4e3054..409aa028cd4f 100644
--- a/app-portage/gverify/Manifest
+++ b/app-portage/gverify/Manifest
@@ -1,5 +1,3 @@
-DIST gverify-1.tar.gz 4558 BLAKE2B 193fb63dd3816b4577314199e4f8606a20f60d883f22f36636f1dba4c3fe4a701e89fd352b33ee3ce5bfb10b39e351f971aa55c8cd6eef493fc492e2c4c5d17e SHA512 f666306973bf173683edd845499ea1b244ffc9254ed0d816660022f871e7cec480d452fd962db5417b23d3101496b80a49caece29cbddf3058e2a21ec945a268
 DIST gverify-2.tar.gz 4609 BLAKE2B 73f97ba232fe0269ec56649bc5682650d48c001e432f8076c820a58a94c3d1de079dc89873d589a76b91164153e5c5be78870ef34b3b69f3c39ca0c0e388b114 SHA512 1756671d22047edc6ed1121b65af8c163afba854364a50a9089cef733213ccd6c9dd1276e876b9118741bcfa92ad02cde572fe2b6cebb22339664552c67d2957
-EBUILD gverify-1.ebuild 656 BLAKE2B ca6e3bfd5fb6353854229ebd9d4c0cd374197af5030f2f9879c64e6619415ca22f9e4f7c158fce92b8b9d6c24349419c17f19f0f16ec0c70b1a0131bf997571b SHA512 da8ec323226418f4b24f00f9a5457547b144718442cc0579baebdc6f7359c814467167193126ef66f03a6d2a55e1e73aa220fa60ced8e2172072bdb84805fbfd
-EBUILD gverify-2.ebuild 692 BLAKE2B 93bfed177d5f58371f8b32c9ce12674cd0f3c4b56b839599b9ba783af43f04d466aa7fc5263681b6d7a848502a97b150831a8cd611e70743c70307f8c2d82710 SHA512 e0bf2302363292b8de464b982e2a197a5749c5dfc5fd8a59b7a7d9127b02d6df97f1ac190d20d40b97993a4b1de7a3aa4f232b08fbef410e698ee9f199c5bf66
+EBUILD gverify-2.ebuild 694 BLAKE2B b37dd93384a8f7127a09215bf315be6548365e2cb37e9056143b0e524ecacffabd6b4e500eb4061142afa9e4cc69d627d05f74c913d17719f3d9ecc063ecb252 SHA512 a59a203dc0cf1816be048e8b6aa07a9e51b8b14e3062323b81ee34711dc7c8658ccf5d2466fbb5a2db383004b2bfbdd160b6c3d16f58d3d6fe4733125b13b6f8
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/gverify/gverify-1.ebuild b/app-portage/gverify/gverify-1.ebuild
deleted file mode 100644
index 43ea384eac01..000000000000
--- a/app-portage/gverify/gverify-1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit python-single-r1
-
-DESCRIPTION="gentoo.git signature verification tool"
-HOMEPAGE="https://github.com/mgorny/gverify"
-SRC_URI="https://github.com/mgorny/gverify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	app-crypt/gnupg
-	dev-vcs/git"
-DEPEND="${PYTHON_DEPS}"
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr
-}
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX=/usr
-	dodoc README
-}
diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild
index 18068b633e4c..0d9a0cfd660a 100644
--- a/app-portage/gverify/gverify-2.ebuild
+++ b/app-portage/gverify/gverify-2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
 inherit python-single-r1
 
 DESCRIPTION="gentoo.git signature verification tool"
diff --git a/app-portage/install-mask/Manifest b/app-portage/install-mask/Manifest
deleted file mode 100644
index 6c51d93b99f6..000000000000
--- a/app-portage/install-mask/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX install-mask.conf 173 BLAKE2B d47372786719c1774c3dcb1cbb42a102636bbc48e640f3e07d54d334af6b061d8e8dcecc2da14d63b9f2ca964ad469e0e28b19f4d43050e14bdba623e359bfeb SHA512 3a917bf001e417667e0a44be8536b5fda9d64a91df02a95823fce6dfc54c037055393fb1015169f078ad90d9c042984fd604886261480fcb097b3bb0a9b23110
-AUX location-db.conf 282 BLAKE2B 65f447019c1c3b318e0823b7d4e62f29f6568571cfb7a9e411b285e9634a50169c93c3a543c907d3f1a8e2d9f9e8679b1eb256fa53f0f4dd5a604a624caecf2d SHA512 5a20a014a2a58245bcf25cd061f87ad1d34a48d9d2e3e7287ba0544b603e917fe91c2d4b166ca028e44d87898a1633dfe1fe7ef3a35d5cb787c9a53a34239b5b
-AUX location-db.xml 505 BLAKE2B 5dc04da8837878c3560bd8d18a2cbd445e78f250ae8af6d2428a308c53e3215b0d779b3f8e42c2ee53511c7c981839aa1f5b584ab1a6b2bc7192b8944add0caa SHA512 8dd05ed3206dc4b99fc0fd895d7547ee03f0b46f0cfde2009f1c104525c6e7a7d46bcd30ed42c83974082846ece34659180eb51de9ea0d2910e920ecffd42513
-DIST install-mask-0.1.1.tar.bz2 4241 BLAKE2B 3516f6023efc406076bb3f9189af7b4a647689c6289b4c191d7c05eeb296c14343b9b61e025e5f4ef50ad80982c00dcdd5d133df45b559d2ec5e2db6bf5ea538 SHA512 461f58b4e6fc41bfbe60d713a6d02eec8fe0a4e9ed8a19f8e155174b27f8e3d93c739e2ccce8ab34488ba31649ee585d7b23033dc94f19aa2e3b2033f21f5e79
-EBUILD install-mask-0.1.1.ebuild 593 BLAKE2B 49bb949dc33484ed208569efc3a0e3f847379857fc351351c4381ed527b187d6c1f9423066a536e6ee6bf5cdf70a71ebfdd2b50a724db447082545cce9442318 SHA512 b968b1bfa9cbe1a9c01e4ebd106c7107ee59059359a4db6a9e5ece6d92855e0ce6bfdca365b06ebb1604cf82d6dfc4b54791e60e6b855fb0422cf10f76f6b2e1
-EBUILD install-mask-9999.ebuild 716 BLAKE2B df9d790820e600cfca2098c4ef12cf47b39592a0a03e7e39e1fef80a21d9e83a64bfd5a0ad9c40909b354bc18b5eaec7a1d7651545eae8a54085c6e69f3726f4 SHA512 3c426c0f7713f89967f7747bcfcf5cfe9d7987164ce443b891de090c60a1f8c47b4fcc65b373ec520ab9997000e16d187766e65fad841dc6a80ca8016e3a216b
-MISC metadata.xml 541 BLAKE2B a57897cc7d8924c603305bc5bfebc543f240bf20df9745716373d10799fd6a6dc645c3a1ae2861dca6fe8ad9e813a0a9d94a238b7a0a749e389772cb7c45b4b2 SHA512 637298068bdb858d10e754d6911e150ae8d0e38ebde86cb7d57d41654d53c58128e942b3cbb6675c398b9a108a67616d966bbffd6975ea54506163cf1ba49696
diff --git a/app-portage/install-mask/files/install-mask.conf b/app-portage/install-mask/files/install-mask.conf
deleted file mode 100644
index 78b49a473427..000000000000
--- a/app-portage/install-mask/files/install-mask.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Example /etc/portage/sets.conf adding the @install-mask set.
-
-[install-mask]
-class = portage.sets.shell.CommandOutputSet
-command = install-mask -r
-world-candidate = False
diff --git a/app-portage/install-mask/files/location-db.conf b/app-portage/install-mask/files/location-db.conf
deleted file mode 100644
index cb050cab37c4..000000000000
--- a/app-portage/install-mask/files/location-db.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[__install-mask__]
-version=1
-
-[systemd]
-path=/usr/lib/systemd/system
-description=systemd unit and auxiliary files.
-
-[bash-completion]
-path=/usr/share/bash-completion
-
-[locale]
-path=/usr/share/locale
-description=All localizations.
-
-[logrotate]
-path=/etc/logrotate.d
-
-# vim:ft=dosini
diff --git a/app-portage/install-mask/files/location-db.xml b/app-portage/install-mask/files/location-db.xml
deleted file mode 100644
index eea4842e235c..000000000000
--- a/app-portage/install-mask/files/location-db.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<install-mask>
-	<location id="systemd">
-		<path>/usr/lib/systemd/system</path>
-		<description>
-			systemd unit and auxiliary files.
-		</description>
-	</location>
-
-	<location id="bash-completion">
-		<path>/usr/share/bash-completion</path>
-	</location>
-
-	<location id="locale">
-		<path>/usr/share/locale</path>
-		<description>
-			All localizations.
-		</description>
-	</location>
-
-	<location id="logrotate">
-		<path>/etc/logrotate.d</path>
-	</location>
-</install-mask>
diff --git a/app-portage/install-mask/install-mask-0.1.1.ebuild b/app-portage/install-mask/install-mask-0.1.1.ebuild
deleted file mode 100644
index aacd8d8c9dbd..000000000000
--- a/app-portage/install-mask/install-mask-0.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Handle INSTALL_MASK setting in make.conf"
-HOMEPAGE="https://bitbucket.org/mgorny/install-mask/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE=""
-
-RDEPEND="app-portage/flaggie[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/portage/config/sets
-	newins sets.conf ${PN}.conf
-}
diff --git a/app-portage/install-mask/install-mask-9999.ebuild b/app-portage/install-mask/install-mask-9999.ebuild
deleted file mode 100644
index cd4d655ebd30..000000000000
--- a/app-portage/install-mask/install-mask-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-#if LIVE
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-inherit git-r3
-#endif
-
-DESCRIPTION="Handle INSTALL_MASK setting in make.conf"
-HOMEPAGE="https://bitbucket.org/mgorny/install-mask/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE=""
-
-RDEPEND="app-portage/flaggie[${PYTHON_USEDEP}]"
-#if LIVE
-
-KEYWORDS=
-SRC_URI=
-#endif
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/portage/config/sets
-	newins sets.conf ${PN}.conf
-}
diff --git a/app-portage/install-mask/metadata.xml b/app-portage/install-mask/metadata.xml
deleted file mode 100644
index 34455911e2de..000000000000
--- a/app-portage/install-mask/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mgorny@gentoo.org</email>
-      <name>Michał Górny</name>
-    </maintainer>
-    <bugs-to>https://bitbucket.org/mgorny/install-mask/issues/</bugs-to>
-    <remote-id type="bitbucket">mgorny/install-mask</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-portage/java-ebuilder/Manifest b/app-portage/java-ebuilder/Manifest
index fc149fd2d0e8..3aa87ad4f943 100644
--- a/app-portage/java-ebuilder/Manifest
+++ b/app-portage/java-ebuilder/Manifest
@@ -1,4 +1,4 @@
-DIST java-ebuilder-0.4.0.tar.gz 26063 BLAKE2B ae7dfac8695ab1b0c42b1c12f4bb3a4bb088b95f30e9c1563aa39e5bf05f0e3c1ceee17802c1e7b858f875a88b179f64b2cc6075b051b9bdbf8a4c017bf25248 SHA512 690e802cccc96c48ba34076f6fc75ff4c131dc9e633e49d818d8db8a9a8bba3e0281bd5049768b8130eaa212f2d7782f7a4fcb6ae44de0e5e57be363d4936152
-EBUILD java-ebuilder-0.4.0.ebuild 1548 BLAKE2B c3f4966e10bc0304040583e445a1d11d4ee7b66f0f35a5eac52534338d9c72615031f900e75aee6c86d7f1f85a4c2e5f97dad32c56269d0c264810b3990aafe8 SHA512 141b6cc1edf7d901319a18d165fee172aa2c2b1145233c8c7681483a1e4c099435bab4324936c36ae6d810cd98361947d6782f5b52da7b9966041777e7b59c5b
+DIST java-ebuilder-0.4.1.tar.gz 26414 BLAKE2B 9dd418bbb2c9631d36c20649c5b4df916f476561bac28fc729e32001da086207a74e26b2379106c9066b7e4114b3ce35f225e54680990c1fbf9e515b3fe42034 SHA512 7782055991a650526d8da95c0b5b6c55ce68dbfe0a5374f6893320baccbd783d271630d67f0a6e2ab176ab6979f343082a0ae0f72e1d949d07a0f202572d4e7a
+EBUILD java-ebuilder-0.4.1.ebuild 1548 BLAKE2B c3f4966e10bc0304040583e445a1d11d4ee7b66f0f35a5eac52534338d9c72615031f900e75aee6c86d7f1f85a4c2e5f97dad32c56269d0c264810b3990aafe8 SHA512 141b6cc1edf7d901319a18d165fee172aa2c2b1145233c8c7681483a1e4c099435bab4324936c36ae6d810cd98361947d6782f5b52da7b9966041777e7b59c5b
 EBUILD java-ebuilder-9999.ebuild 1555 BLAKE2B 30c9cd2065cac2ac3cf07cd61d8ee566db89df3abcf97b3179a15d816fd84c84e877b3d1412778a0ce183c01e067934ac6d76a106897e1798f7d5dfac4a356c1 SHA512 19880c68dbd405e2c4f39a1a91567f0034f6f991fa082218bdcef85909440afb845516000abb8523a48828b066651335440102e71f898fd73e8428a1effab77f
 MISC metadata.xml 339 BLAKE2B e6068070bc51e0f0a213a76593f11fee385ebe1546b08f23088706ba46469e7352f4f73647980595b9c3aef4fecfd96d9d2d907cfe7e147897e9259c02dfb30f SHA512 b200cb9a9934082d9460c2dcaded12756bbafde1c0df15638979a31974736233f02fe15bffd5698532ebfffdad7f9b3b6df9129c2e7f1383314cf1ac5898595b
diff --git a/app-portage/java-ebuilder/java-ebuilder-0.4.0.ebuild b/app-portage/java-ebuilder/java-ebuilder-0.4.1.ebuild
index ecd724819f2a..ecd724819f2a 100644
--- a/app-portage/java-ebuilder/java-ebuilder-0.4.0.ebuild
+++ b/app-portage/java-ebuilder/java-ebuilder-0.4.1.ebuild
diff --git a/app-portage/kuroo/Manifest b/app-portage/kuroo/Manifest
index 5535302e66d2..52a31606ae54 100644
--- a/app-portage/kuroo/Manifest
+++ b/app-portage/kuroo/Manifest
@@ -1,5 +1,5 @@
 AUX kuroo-0.90.5_p20180410-qt-5.11.patch 1178 BLAKE2B 944d08100d9b3a75bddc9fa44127ed4d71c043c96c1ed267ec2ecd4a4ccffad4f7c65f0be539ebc40392834b4217e057c611dd6912b33d2904a7b4ba2484a0ba SHA512 fb7e746ce8354ce71a38d4a850ffa7cb270727b26d08353cb5d8661583e02e7e0b45013f03aac71a0058e2f0a567ab963669336bde8819bc212083eb19be2c1d
 DIST kuroo-0.90.5_p20180410.tar.xz 241920 BLAKE2B d182df57f0c6628b849f6f6e4d7919281117396ea30360e6eb0993b3c61ba67956a8e0648926f77e23d8222a8337108599f657cb7e49091fd51b98febb6593ce SHA512 f1894c90b8b6df06818cab6cc3fb55a3348f8a9df669b515796dabe9a0df3773d69ba89a4aa3569250b2fb379c1169d8789c82fcd3868ddb9f640f010aee811d
 EBUILD kuroo-0.90.5_p20180410.ebuild 1377 BLAKE2B f024e0cc1e5d5e36ef956a930ad5292e0a8bba33b204a7ff95268d03607a9650fdb3101f2a0118b65038a3066b9e79fe52618b8cc924e20688a5cd5917793eec SHA512 9ed7aaf28ab4321c919f60ca1d6e97b5445882829ecd7bc910ab6b022ad90c9569b9b3a4d7b9fe3c97028bda378693db578d0087827c6ad5d18868b87b0b7d31
-EBUILD kuroo-9999.ebuild 1336 BLAKE2B a3e306ee0d5ab8e703f61d1748b873da40cef9406fed3e3ae138be15c2a20ea28078e6c9ef7ad6286dea324640b524c50e6490097230367c5af17ef56e87c239 SHA512 452b884b448558fb15004c312c3e8563588e4fd9384a54c234f066c61e513341a28912da2d71012ed9bc862d8d7a66a8ec7b212ebff81a42991238adb7fe0fd2
+EBUILD kuroo-9999.ebuild 1133 BLAKE2B 5a0366878956d76cbf889aba9f644d7347381c3652ad4c5ea819b0e7c4c6a33a505eee697270a2e8b41a9ca6db6f6fd6f1ab77381f9c643b562a8e42e78b266b SHA512 c984911f4c74eec46a55046dfef46bddb0d42c0374a07185a9b773370fceaab54dbaa5e3b48c0bc8af1100727420b84302beefc3c2f9ebb01473ef7094a082e6
 MISC metadata.xml 757 BLAKE2B 338d2d4cb0c2d198f8d38ccaa33dac9b9b745baaecbd642f6a0cbf4a3471642db421918eb292a1e7ebed9305429decd70c1cb27f98328cea17f3dc87c893fc53 SHA512 86b24f163496aff68fdfe3ad7fb1648100d1f9757dd18194899b512242236b8e3130b70f74576adbdcc7f570ddccea6655714875f39b52fb6bf4c2bc46b55b11
diff --git a/app-portage/kuroo/kuroo-9999.ebuild b/app-portage/kuroo/kuroo-9999.ebuild
index 13bc05bbc7b7..6a24d09cce3a 100644
--- a/app-portage/kuroo/kuroo-9999.ebuild
+++ b/app-portage/kuroo/kuroo-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ESVN_REPO_URI="https://svn.code.sf.net/p/kuroo/code/kuroo4/trunk"
-inherit cmake-utils subversion xdg-utils
+inherit ecm subversion
 
 DESCRIPTION="Graphical Portage frontend based on KDE Frameworks"
 HOMEPAGE="https://sourceforge.net/projects/kuroo/"
@@ -14,12 +14,8 @@ KEYWORDS=""
 SLOT="0"
 IUSE=""
 
-BDEPEND="
-	kde-frameworks/extra-cmake-modules:5
-"
 DEPEND="
 	dev-db/sqlite:3
-	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	kde-frameworks/kauth:5
@@ -48,11 +44,5 @@ pkg_postinst() {
 		elog "portage's summary.log size reasonable to view in the history page."
 	fi
 
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	ecm_pkg_postinst
 }
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 9b69f92b8f01..f0296d38d040 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -8,11 +8,11 @@ DIST layman-2.0.0.tar.gz 81184 BLAKE2B a1d8481f6dba7392c2c857c887284371c53f0bf64
 DIST layman-2.2.0.tar.gz 116210 BLAKE2B 253fc35885e9e0bb804512db50962749a53cd25950102e3e79df48f87e683b6ad24857fcbd7d398a11a152c455a683e22a92dfa2ceaa7b80b6db764d54355514 SHA512 34cac041d7b64274debdbc42cab079fd3bb3aee511ea9e80db726df0f828207d79a5262788483ced5cbf49924e3aa4f19fe21439c98dceea973d8f83473c2e41
 DIST layman-2.4.1.tar.gz 130388 BLAKE2B 0a03e7f67d3c33528bee0c53a1216862d20dbdb1a48a18331b5d936bb48568072ac4c208807baf667b346bbbc1edb6acc385cc379de1d54d96adb62484c5f085 SHA512 bdb713d4c7d3773129b45a385068278958040759bb564e48cfda4dda9da5224ccaa7833fce3d06151ed1fecddbb6f1a059db6e71534d0e887dff12640af6c806
 DIST layman-2.4.2.tar.gz 137893 BLAKE2B ad925b974e280c0c933cb7c7d5131946fbb40d15410a671be3d93fa895e2d92a4f3218bce99abc8f2c1e007e72bd51662a18665579bf2ded7f349eb9ed5c652c SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf
-EBUILD layman-2.0.0-r1.ebuild 1607 BLAKE2B fea8b2343af67a12749e4eaa57594bc84f477950865b0a37ad2a576be562a098f458c8b39a7f3c2b6b0e88b6b98b6de69596c6bd8d06277bfaf5c76881291a1e SHA512 81f4d70ed33d0be1938b4bb39110034b8ecf761aa16576cf9695aca7b20c4c839671b96c90a5ea0ba9e60119c4b9b6224324f7d5de94638c2d16ef65e26036ce
-EBUILD layman-2.0.0-r3.ebuild 1646 BLAKE2B f97ec216b34eb8aefa8bd5ac8d862f84ed94f20450f77a4ac6f01be6807c7cc46e9ad0f046f994fee8c647197e8b85dcbd46621058afbbca5285685d89923a80 SHA512 02303274319f1ffa19b8351599eebee39b83bd2e3e70d803c7e54c06c6fc9ca5d307df4baaf4c3a24ba22597ccddc0bc7c986e77971faabcaf6454e51d5de15a
-EBUILD layman-2.2.0-r7.ebuild 2159 BLAKE2B 5d7a3c7cad42453d634694289c4cfc31b6e11c8813d9b0ac6adea3f17678c568bdd4667dabffb41dfd029a2096da67b9a54b6a603c3dd8d95ba1d9fd91c9392c SHA512 d9ccb66262ffbe47a6a982ce6b50006d29ccd376f7f7e2b213c3489aa1e6b8140886f39e044c7507cbdfa1a342cdd78951fabfc77289dc34b569d9bee5502f42
-EBUILD layman-2.4.1-r1.ebuild 2109 BLAKE2B 2c09406d4bd3679deefc851bba94f909de9563be0131e0a747203b8cff8bbb45fc9f3481103a279a140d39953f8cb863cb2d119f8b31381ba1deeed0d5bc7da9 SHA512 0b1cd552fd2cb6c4d5bddc781c8b0a7125364e8a5967b83e87fbaf914e4f9f6eccea3e3b0534ca2ef7ce9c11abf6847e43f2c7447d039624845cd568b0890a00
-EBUILD layman-2.4.2-r1.ebuild 2162 BLAKE2B 10198d3e8ccb03f1314747a3618c6b372106a9102dd11f39def840a840ac45688e33f495dec626b13acace65c606c56a4932c254c16b314d47954d3ae217c1cd SHA512 0abb38d14c5041aec15ab54aecfb5a28fc548cbf2e20f3fa2f5750703acf086c09d4532f0f423aa1ac3f8758cf2608df7f4ef2311aba0c9930bee9424b88c949
-EBUILD layman-2.4.2-r2.ebuild 2303 BLAKE2B 3e532156c1cb250f3786c46335f125a1ad6099e3f17014cea85d1edf567b9052ee7f7bf8ce2120d6c36cbb5becdb140e721f15db888532c5109031a70a065966 SHA512 36d30fe2d042543ce9ce094ed5bd1b27676c7d826fdedadc7b8bd173a8709de0c446b890d8a3e2e0dc579a7f378adf95b99431810e7633a065ffda4c0a4a18d0
-EBUILD layman-9999.ebuild 2303 BLAKE2B 3e532156c1cb250f3786c46335f125a1ad6099e3f17014cea85d1edf567b9052ee7f7bf8ce2120d6c36cbb5becdb140e721f15db888532c5109031a70a065966 SHA512 36d30fe2d042543ce9ce094ed5bd1b27676c7d826fdedadc7b8bd173a8709de0c446b890d8a3e2e0dc579a7f378adf95b99431810e7633a065ffda4c0a4a18d0
+EBUILD layman-2.0.0-r1.ebuild 1631 BLAKE2B f92dd5f1cda05e10801371b435ddaeaf8bd82b43bfd0295bb70c2bf6020f8f6479b00884869e84d1e5f5df4897c31fc9658a8e26410b022f167b54d303cac7f7 SHA512 97c68d7f9c2b97c5ff4863114be546bd16ceff7a79423dc0a6769c40883a7199a2005f5e42ee125c4bbeeaf3396726505f6b8c9384276a835bdeb42abc57f061
+EBUILD layman-2.0.0-r3.ebuild 1670 BLAKE2B 6bc4a0d6008cf2b15dd887a3526e6cb20a2284e4ef8ea0440fb7376fa5483ac1d1c178c3093a68c7231578bcef97589554efa2ae6f1c2d18fc4fa0ada2144770 SHA512 d8112c10813e247facb85dcb52d19b5efcb2bac50bc2736f6a349e608a16d926bc33e609643999889e463a11c7e5d27b88bad701b84988f8dc2a784316de16d6
+EBUILD layman-2.2.0-r7.ebuild 2186 BLAKE2B 6556ab4446c772bead3046dbd09f611f5e6d2f3092100079f641ef5049e89a93ed79a7691c7e37a0b662cf208f65dcb2fe99172359ff5d49aff70e7ae263d733 SHA512 44c98c5bab21fba6614bda060b049ef585ebdbe9db8bbfbaf8d9004402265d357446d379ea74a4c656f0a72df7e08ee060d4de5f84c33f5a298e3bc20502703e
+EBUILD layman-2.4.1-r1.ebuild 2136 BLAKE2B 0168b1fc69a824395b21de3c30a65f3f143163eb06fc3a99356fa77d90fd790f511fc8b290652a4d403e8a9708b065a0cd031efb7a2855066bbb58e720dcd45c SHA512 16d1136d809db9c7302e8ad853c3e1a85ad151b109f74a9e94c7d21c25bc9e43c2e99eb4dfa169c14a73ef8dbf967a84dd9464c39388e4a2112c52004de2abe7
+EBUILD layman-2.4.2-r1.ebuild 2189 BLAKE2B c5af41e44eaba0593d95c3007470b7605fd37426f20dc3578a380cec3620c5772666ff746914a8430628fa794eca3de98ce1668cbc2d8f7fe037dabfb19e447f SHA512 6b7abcc082035388561f1495fbd3c507ae2c95b002df50b5653f2c6c0e0f3837d49c6c9904d60a201c4c3eee52744126e6304d41ca7dfc06b35b3f6bd3601c94
+EBUILD layman-2.4.2-r2.ebuild 2330 BLAKE2B e2c2055ff2445e4afb47363dbbc258603f4d5c57df656c47419c64c395c39ba4ec3e203288093538301a3dc8da3a295ace8cab8e30a9f2b56c8713b9b7fad645 SHA512 75b9a042f89df4ecb8d16340e5cd8ef3b3d50c3f0972c6b851e98fe83b5ea26c37cff58bc96ba63ab02e2d1e227540a0fea9c5a2a3fddb102c3aeb510c4a998e
+EBUILD layman-9999.ebuild 2330 BLAKE2B e2c2055ff2445e4afb47363dbbc258603f4d5c57df656c47419c64c395c39ba4ec3e203288093538301a3dc8da3a295ace8cab8e30a9f2b56c8713b9b7fad645 SHA512 75b9a042f89df4ecb8d16340e5cd8ef3b3d50c3f0972c6b851e98fe83b5ea26c37cff58bc96ba63ab02e2d1e227540a0fea9c5a2a3fddb102c3aeb510c4a998e
 MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
diff --git a/app-portage/layman/layman-2.0.0-r1.ebuild b/app-portage/layman/layman-2.0.0-r1.ebuild
index c01d9a93e3ec..cfba5b52cd7f 100644
--- a/app-portage/layman/layman-2.0.0-r1.ebuild
+++ b/app-portage/layman/layman-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bazaar cvs darcs +git mercurial subversion test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-vcs/subversion )"
 
diff --git a/app-portage/layman/layman-2.0.0-r3.ebuild b/app-portage/layman/layman-2.0.0-r3.ebuild
index a26236066a7c..e2e6e9df396d 100644
--- a/app-portage/layman/layman-2.0.0-r3.ebuild
+++ b/app-portage/layman/layman-2.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bazaar cvs darcs +git mercurial subversion test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-vcs/subversion )"
 
diff --git a/app-portage/layman/layman-2.2.0-r7.ebuild b/app-portage/layman/layman-2.2.0-r7.ebuild
index 6f50f4f8f3f7..00fc4d1dd541 100644
--- a/app-portage/layman/layman-2.2.0-r7.ebuild
+++ b/app-portage/layman/layman-2.2.0-r7.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bazaar cvs darcs +git g-sorcery mercurial squashfs subversion test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-vcs/subversion )"
 
diff --git a/app-portage/layman/layman-2.4.1-r1.ebuild b/app-portage/layman/layman-2.4.1-r1.ebuild
index 77bc20805a86..398b9adf8cd8 100644
--- a/app-portage/layman/layman-2.4.1-r1.ebuild
+++ b/app-portage/layman/layman-2.4.1-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
 IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-vcs/subversion )
 	"
diff --git a/app-portage/layman/layman-2.4.2-r1.ebuild b/app-portage/layman/layman-2.4.2-r1.ebuild
index 46f0b1bd942d..9662dd128474 100644
--- a/app-portage/layman/layman-2.4.2-r1.ebuild
+++ b/app-portage/layman/layman-2.4.2-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-vcs/subversion )
 	"
diff --git a/app-portage/layman/layman-2.4.2-r2.ebuild b/app-portage/layman/layman-2.4.2-r2.ebuild
index 52df5e51656a..1d63b0e05f54 100644
--- a/app-portage/layman/layman-2.4.2-r2.ebuild
+++ b/app-portage/layman/layman-2.4.2-r2.ebuild
@@ -22,6 +22,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-vcs/subversion )
 	"
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 52df5e51656a..1d63b0e05f54 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -22,6 +22,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-vcs/subversion )
 	"
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 02dc1e9f25bf..81d9dcdb72dd 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -4,6 +4,6 @@ DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
 EBUILD mirrorselect-2.2.3.ebuild 978 BLAKE2B 38888e533900bd27b40e5bf67c06fe6466fa4665caed5c1a54a11c88a44eacf36d6a05d70311950bf90b7ddddcad30a75bd4af0cef41e7c402d60beffc2e9f73 SHA512 e73b6f9e4c3d6f14be05937d630bfbbb4edb719136a4c6e1d1ee5734531039fdbb598269c6474bf82596067b9504b52256613b1d0cd6b798ba5699f1c8ea3f4b
 EBUILD mirrorselect-2.2.4-r1.ebuild 959 BLAKE2B 8099445a86cda60203dd60ee2b596c46cca8c3d4e06536fa5ae14f48c09e025030bd9553cf3288061d3acd38a461f4378a8d686f7461ca7dd6f2285624e07ce3 SHA512 3d6865a1decdf07e1d19c0f2e55b69a82323a781cd130f7597d1a130a4bbd8c49b0f708224f5abfe8ff37d582792777f3fdf5da707267484f7598f6026909258
-EBUILD mirrorselect-2.2.6-r1.ebuild 1488 BLAKE2B bc51100a528b64db0452547e2c2c64e970d570607002412b39628447ceae812fdba9d1ce8fd0ef942528ab997c7d7ec80ac3c6d114dd2ec07459f93372c316ce SHA512 d4fdb62edd163aa79a8b54528cf488e5b8fe292fff43a1c450a97f5426f7e7ef4692f08561e80ec5ec970cf271eb146ad8545c1e21c08580087a0cbfb9cc3de9
-EBUILD mirrorselect-9999.ebuild 1125 BLAKE2B 52bd3f705108f52a8cc381fca6b9296264b2152848b88321b5b874fcc9672469fde32f20a27728b2b0fb042ff591f961dcd4a702f77bd73adc9b7ad948b44ada SHA512 eb6bb88fc85b92606f3dcf3fe149e6c41f5bd67bc6a96dd158ff2db1f191909557d82cbf82d3ced101e18de5101a91bb22d53913eee9b719b0e839e78a234b4c
+EBUILD mirrorselect-2.2.6-r1.ebuild 1490 BLAKE2B 53998d852de6e8d55d062862df9efd422484999d7fe83e112baf8372f4a262b5127317d86bf197ef97f8f0c0ad11548956d5aa0083f03df514d1429cc99d51e5 SHA512 749932bd03f5ff45ea479357bd0188b80ac563174edf5138171a5a85924ee121b27804ad3750f16f333c380b955d2814231a6bb7ad849cf4a109a89d8ea471bb
+EBUILD mirrorselect-9999.ebuild 1127 BLAKE2B 56bd17104d5aea092118583c035b8a4c6e8b26ab4cf766bca3a44009f3671a7c5ec25e366f4e2bf5f3acfd7694a3d7209b9f45fa4b04a3969cc2cb4d263eee67 SHA512 f2a22e6a5bdf0ed46c1ce70f00e727d92ade6caaa150707c1084deb87b93335d82d3d40cb3345a71114b72f9e8559b5c6c497433ca8a630c6dead4b524e2d9c8
 MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
index 22fdd516033e..afad92c6beb9 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index de12fd9a5ea9..18cf8ef6a6c1 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 git-r3 prefix
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 109785e081dd..c0d40b74afe3 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -4,9 +4,11 @@ AUX q-reinitialize 68 BLAKE2B f1c2cd5009f30018dfc2d508a627253c08fc6e74859d072b91
 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
 DIST portage-utils-0.80.tar.xz 1762692 BLAKE2B 32e4502d517ec088eadf17a4a348b9b9bc33348380b65f93ac7c043150732ba3ff0d18ee96f8877c697a91000fdc036de392d6e6711d62248bb7c57e25d4433f SHA512 cca86877e87e5bd2e9423822db4b7afa15e8f291717c808ef0455b121db0778b2364552e9f1d5e1a8bad3f1f8880ae2b5dbd586bf1dd74d7c4f4e72fa990c78c
 DIST portage-utils-0.81.tar.xz 1763088 BLAKE2B 1fa40950f9deff721ebfd8f3dc06a1ec99e1f5c1e8bce7cb20120feef4d0789f6ff02dac43fae84d9d554d9b9867423db43a0e7cb7a6070a60cb0619f36547ad SHA512 d9fa971e27aa8a58d4278cea8e9ec238f92d03e51f44b7124f51289613800790dcd5a0c886c3930dd89abd8cd032d0cfd05723e12ba7e2403a85a2d72b359ce1
+DIST portage-utils-0.82.tar.xz 1768888 BLAKE2B 27ef8a3835eab54be3e06e48496c5c3e1f2e89f350b80dc52c1e7615c3b2e0c1a5d771d070071057d6c308981f29e8e9d79739184596d3eb2d38a03b162fddf6 SHA512 dc4b452f7b8b0c81e7dbb1ba02984fb45e6cb3588525a2b464519c80f9287fc270ee9eeb4d097e6a96f2f2f06c73b1fe89cb0b01b0cae82b099aaf2326aca2a0
 EBUILD portage-utils-0.74-r1.ebuild 1118 BLAKE2B f51e775f5fa127ff2d6fd4e75096602f8bab392bb2773a2f6fc5ab20adfd3e99af4e9ee69d9260402fff33419bc762412fc2014b9feb219af11aee6c9ee9d0a9 SHA512 bdb0de9152c30e8064d67abcd65dd569b5549bb8eb21b25d4d57f8f126edb270e091684cf53d62a4e4557871ff1c9f3056dca0a1cdbbda2253cddb0396189744
 EBUILD portage-utils-0.74.ebuild 1051 BLAKE2B c8647973636f57b948978607ab73d4bea3a86eb51f045ecef3ca641a5d68976070cbf5c00520291c8876c6f003510c782252e5c5fc7a99245897a2e3585916b6 SHA512 158a8a3a4892bd99c48c6f0ae75c00b9b3c4df56678b6eb7deec2eb4f4a6974a0a4788f54dd4fc1e3b6d27d95cc989683f19ccf1bae214d376da0726255722fa
 EBUILD portage-utils-0.80.ebuild 2251 BLAKE2B 9c7238b96dc6dc7acc9ca3765f1f545ea2cf8df62c492820ee8e1c8c979a3b5337f01080d6a68b920a9a3fd1458bfc2a2cae9b795a3f7178b83ac6d15838b2e4 SHA512 7ef7e5094c1bb02bc633c410f27db6e77d6cfdbc820adbded8996e889aaa27071ff4a1fba992ba70f32723c4d76d240941caf135afc6d38eb42d708f6078b805
 EBUILD portage-utils-0.81.ebuild 2264 BLAKE2B 467b8bf1ed1795c6e09d9f86f188d727f2992c0717e7215af591be2246e3f0a97a51fb2cb602cb588ca62f7dab2452bd08fa583f79a19e403334f1be720270df SHA512 3569b23821830052a63e010be3835cdc213e37b565eb1898b0c6702e22f7a39ebe50b98cb71c606bec8fb5e35659a77e155ee816be7ae8f4468f2db98ee78ce9
+EBUILD portage-utils-0.82.ebuild 2265 BLAKE2B be63572b8f87c47047c7af7778bbe6c4fca211b1758982b8b60c05c50dd523f1952446f044ca6efd652995d6f386ef8182cb2e53e0b8c2fccddd582bbb781c7e SHA512 7a930db170ec1e6690fa8066a0d78cc71e2f712963656a72aa946470df8032e3ebacdd6f87fdceb9b34ca7bb1c8b28fc5e60a9d15909c4bf1d9cddfa746c29ca
 EBUILD portage-utils-9999.ebuild 1885 BLAKE2B d0cc4e20e992c06091cdadfda6049b6b367fc972aa6b372ebef996e95fa321d96e75a267f9e164123f6083d08dd653037965bebd106155508bfce5d73c21c96f SHA512 c11f51098cc8637d86b9143d715f506574acea6b2e51715b2309f04f4e714ee43bbd8b874815bd6ef1edd7be0a760162c7338962d5ef839966c84c8352a95322
 MISC metadata.xml 490 BLAKE2B 36af527c82aa05f09ef3187a5c93ec34412a625a00016ad87fa1f6e7a00108f87bd3c8af42aad0aec87fa11e1ec25da71f1f4776c0da053e7426b8006d876103 SHA512 eacb9a20b0228c67896f7633619e67ef0e2de38444436ed720f849b8d9fcbed3c2569d2534e38fb7060cd755195bfd74cbcc9d77dbd5da4fb7b1654f87f70a1f
diff --git a/app-portage/portage-utils/portage-utils-0.82.ebuild b/app-portage/portage-utils/portage-utils-0.82.ebuild
new file mode 100644
index 000000000000..489d1d862b19
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.82.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls static openmp +qmanifest +qtegrity libressl"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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="
+	static? ( dev-libs/iniparser:0[static-libs] )
+	!static? ( dev-libs/iniparser:0 )
+	qmanifest? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			app-crypt/libb2:=[static-libs]
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+			sys-libs/zlib:=[static-libs]
+			app-crypt/gpgme:=[static-libs]
+		)
+		!static? (
+			app-crypt/libb2:=
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+			sys-libs/zlib:=
+			app-crypt/gpgme:=
+		)
+	)
+	qtegrity? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+		!static? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable qtegrity) \
+		$(use_enable openmp) \
+		$(use_enable static)
+}
+
+pkg_postinst() {
+	local pvr
+	local doshow=
+	for pvr in ${REPLACING_VERSIONS} ; do
+		[[ ${pvr} != "0.8"[012]* ]] && doshow=true
+	done
+
+	if [[ ${doshow} == true ]] ; then
+		elog "This version of Portage utils has undergone significant changes."
+		elog "Please read the elog manpages for applets like qlop(1) and"
+		elog "qfile(1) where argument options have changed."
+	fi
+}
diff --git a/app-portage/pqlop/Manifest b/app-portage/pqlop/Manifest
index 3f2f9f235215..406266d06c0b 100644
--- a/app-portage/pqlop/Manifest
+++ b/app-portage/pqlop/Manifest
@@ -1,3 +1,3 @@
 DIST pqlop-0.02.py 14920 BLAKE2B 0fb3f11a928ac0997094e95d676bba0df19738006e7475332c9dcd207fea3296b5839fd259cb2240c093fb28c0721f4a73331e1ab6083c2fbf0eee5d425ac50e SHA512 6c2cca73b5280ac8563573a81baff56cf43420c18688fae497ff014ec5668806d589473a2cb8093fdc07675761e8c4124f18eb568a74e1816f573541459d633f
-EBUILD pqlop-0.02-r1.ebuild 666 BLAKE2B 852470e4fe53df5143c3ef9512f1742fa6b3cf24ba212959154cab99a4f1d9b8ad0b38afd699afe6a6eeb8f2f837a19c488292a55a58c1d5b8ce0e623ea31f5d SHA512 ebdba344a9e6464d3b8e2e040dc8f0ff194638d79b9859b2c6fe8a446643a990700d9a4030b71e9372fb6ddb4d146cde4d9dff404a4ff1f3406d5d793ae295cf
+EBUILD pqlop-0.02-r1.ebuild 643 BLAKE2B 349c3e33e4c10db7529dbe96c4c128b02af33cc6f3981861ada1ea781b8691d83392b4b2305a079be0e1f59b810a5c001a0a9c3d1939852e9821f671650ca3a0 SHA512 ceacfaa03e9dba2dcbf2863e6b421e7018b8e681f8ee1f667bb9002ddc39a4d694ffa13092018653b813da7615e7d8e8d458248f0d985e263a06c0a89a3b9b3e
 MISC metadata.xml 328 BLAKE2B 1d54242b34507f9e056c0948f164b1766fc4f0a89c48ff7be9b9f4872869312f951f2705516bdffd30ae87313c60103a4eeafc7f46cfcf597088f9716b3d768d SHA512 653d8afce656d149a859cc3565346e38de8d5188d4f94464eaed6802aadcca41eb44d8dccabf7040d1d06a483f28f57f41fb54ae8bf4c37726eccecdd60961cd
diff --git a/app-portage/pqlop/pqlop-0.02-r1.ebuild b/app-portage/pqlop/pqlop-0.02-r1.ebuild
index 0985141d34c4..72d9da4d8017 100644
--- a/app-portage/pqlop/pqlop-0.02-r1.ebuild
+++ b/app-portage/pqlop/pqlop-0.02-r1.ebuild
@@ -29,6 +29,6 @@ src_unpack() {
 }
 
 src_install() {
-	newbin "${DISTDIR}"/${P}.py ${PN} || die "newbin failed"
+	newbin "${DISTDIR}"/${P}.py ${PN}
 	python_replicate_script "${ED}"/usr/bin/${PN} || die "python_replicate_script failed"
 }
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 1047e31e4d00..f6e433a489c6 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -2,9 +2,13 @@ DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06
 DIST repoman-2.3.16.tar.bz2 86739 BLAKE2B dc3e3b5e72df751cfacc17e6f5c847160438a4d6f5d86b4dd17ab8a3a69cd0502f2965934c456ea7538f228c40364535e861c489ab2a09a0df14183b111e9a38 SHA512 d0e8bee1e3bd6dd8aecb1278fc7877768552612c4638488b61a9b8856ad9cd7333c7d52f0c334925d90170a1d8af20e9ead6533edbc10cae02baec629dece121
 DIST repoman-2.3.17.tar.bz2 86732 BLAKE2B 95324a3513513349f3127b5c758766d3a05f9aa47ed9cbf1808a49b402b90004c469c2d621e5402358c307f53bfa04ac2873d0b3c5d6bc8548a092f9cde408b2 SHA512 a3c798482d5f91b61c979636876e8f127c5c84627b433c20343f359bc89b65b48f17fbe0d34fb0a8b9cbd3aabbacef71302ad87abc88763f51829e74a9d9f8fd
 DIST repoman-2.3.18.tar.bz2 86765 BLAKE2B 99ba098b17d676a24c03cd37fb8aa81ce34e178af0973083e67196af88acb4473b0992e6c7706aefc20f4540c03544776fe74dcef7e6b1e1789ea95e43e457d4 SHA512 f041acc2f848f02a14cc8b50ad6e9b556db5a3409fb31b6d3e3e1755b44439252a90bee50e004f5921fd6326307c80a140a58e833bb6d902a603d96970cd6ef0
+DIST repoman-2.3.19.tar.bz2 87027 BLAKE2B af2cdab503f886a1c54770874fe21126f1a5465fac358505a3c5d17101046a0a0b1fcaa2575a1c5e52e3f93ef5fc1d0a44e0fc2dd2179b1b7d7583b4cca460fd SHA512 240dded2dcc491e155cf33f701f900f3745fa37e2ce0de9bb9ec7fedf3a25b2002d2737156bc8945c95e8d612bbae5c01642868796026551e172201281d4beb9
+DIST repoman-2.3.20.tar.bz2 87313 BLAKE2B cc0ff9b651e01b12202b32d48979f42ffde6e8a7c72095a3f75228a54892bc11c521f015738443133bec223f9ca0faf5687388680ddfd19e07514f873094b0f9 SHA512 edb5564de920156fd89b4df136d86b73401d4d5cf591abc2fbbf97f0ebb7bb43ed17d076560a76a1f3269d19a64c7c52d48540134a9fb86d9fa952d1702e01e2
 EBUILD repoman-2.3.11.ebuild 1943 BLAKE2B b241eb055f279b28a6629a58b90b9d8f16f2df9dbfce8a816e7640a328aa5e71dbc3dd867d3bda6292315d728e533e76ad5fbef4585ed1d8c161c5c8f171f6da SHA512 c83557586c069c566aeb68d995685cd28e72f15eb274f11ed9439e85aff514666f4d4cc3df59388eba97ccc0b0ab313ae089c4935a07cae03561ae6f4bc32f4a
 EBUILD repoman-2.3.16.ebuild 1950 BLAKE2B 13389c07fd49613296fdd5ce0d0223bf02a2044fb7a60ef37fc73afee0d5b2d39ba87fcdaf36d8cf6a38ad4f49dcadd9c6b8503c6e1aa381ca77863e8bc8f45d SHA512 e84c7582221cb20a3314bef5bbae3e8c2aaa934aa43260204af8e13a61656937def624ff983aa002970e11af6cb985371561dcd07875fe8ebff78becc9a365fd
 EBUILD repoman-2.3.17.ebuild 1963 BLAKE2B 4dc7b5a7e24ae8e9267d424271c4f8a185727ab7dab85667a4339082ce9314520544f096cd8f3c0f90b6d2d1b24bd3607be1191414b36df4184e97c58fb47d98 SHA512 926ca8fbf0a9ee482205c891b913ffae61e4a41455eee82aea0da10e93c9a6dbb9100cbacc0a2f3075e5819db78885b7df19edf95d7e208a092d021950ee670b
 EBUILD repoman-2.3.18.ebuild 1963 BLAKE2B cf57f21c232d9e251d138480309f50ff93792baa48c643f9987ccea6b0fd93b228c02f962e594b1720e15c993f4ce97051548b3ba3d6cca6d2bcb3e23c70b3de SHA512 dde0e97ff661c835b7cd37d1e4389dcb36bebfce5efb44875187f3df4412c68d96a2a68031376843803096c086fb3bda76afb2ad0be5fa8263571c0e92ba1b7c
+EBUILD repoman-2.3.19.ebuild 1965 BLAKE2B 62d52b853ca3314d5dde5c1e577ab4d225d2eb0c154a814d85858dff990d2d325807388fa5723ca63ac4a64945c322aa76030c319a0c13dc0e764fa2413549f0 SHA512 d6c145aab0d7549851a85ae2567015904f001e5b36c5a752a13de6b6dcfb6acfbbbf06a89606a1af58ae2bad46e03b2f838b25a1dd1dd910caaec6d4f6381262
+EBUILD repoman-2.3.20.ebuild 1965 BLAKE2B 62d52b853ca3314d5dde5c1e577ab4d225d2eb0c154a814d85858dff990d2d325807388fa5723ca63ac4a64945c322aa76030c319a0c13dc0e764fa2413549f0 SHA512 d6c145aab0d7549851a85ae2567015904f001e5b36c5a752a13de6b6dcfb6acfbbbf06a89606a1af58ae2bad46e03b2f838b25a1dd1dd910caaec6d4f6381262
 EBUILD repoman-9999.ebuild 1962 BLAKE2B abace55d502ff1d9e60bb6a29dd002b1018398429c521419919bfdcbe67a8c056ef736768466f613d6049f590ee3eaa373b7897778502221583653112fce91f4 SHA512 588ff7191b2212f0961c33adb5fa6bc1ccb8b989b886d01cd5061a78be5f20837695a5d9f6d2f7509848b5242f725d972dd911ef74a1329e64a4c1969a2e1295
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.19.ebuild b/app-portage/repoman/repoman-2.3.19.ebuild
new file mode 100644
index 000000000000..55dce4a172b2
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.19.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+	S="${WORKDIR}/${P}/repoman"
+else
+	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.3.80[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+pkg_postinst() {
+	if [[ -z {REPLACING_VERSIONS} ]]; then
+		elog ""
+		elog "This release of repoman is from the new portage/repoman split"
+		elog "release code base."
+		elog "This new repoman code base is still being developed.  So its API's"
+		elog "are not to be considered stable and are subject to change."
+		elog "The code released has been tested and considered ready for use."
+		elog "This however does not guarantee it to be completely bug free."
+		elog "Please report any bugs you may encounter."
+		elog ""
+	fi
+}
diff --git a/app-portage/repoman/repoman-2.3.20.ebuild b/app-portage/repoman/repoman-2.3.20.ebuild
new file mode 100644
index 000000000000..55dce4a172b2
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.20.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+	S="${WORKDIR}/${P}/repoman"
+else
+	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.3.80[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+pkg_postinst() {
+	if [[ -z {REPLACING_VERSIONS} ]]; then
+		elog ""
+		elog "This release of repoman is from the new portage/repoman split"
+		elog "release code base."
+		elog "This new repoman code base is still being developed.  So its API's"
+		elog "are not to be considered stable and are subject to change."
+		elog "The code released has been tested and considered ready for use."
+		elog "This however does not guarantee it to be completely bug free."
+		elog "Please report any bugs you may encounter."
+		elog ""
+	fi
+}
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index 080a8346dd32..cea33b2373be 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,4 +1,4 @@
 DIST smart-live-rebuild-1.3.6.tar.gz 17194 BLAKE2B a1c4f07e66ce3328ae70f88d086c33875bed68aea645a180e68fbd997051c6d398c1133d8e9c72378741fe41c519e941e76dc25d9c3f9c61c36531fe6fbe8e79 SHA512 f9fe57269654d69c3b21d0b6e378dfa3d2c00e67dae44278b2b81d631e4645346ecaeb5c9f43b77d39312b97edee247ba8b05303be903d6a3573bc226159c40f
-EBUILD smart-live-rebuild-1.3.6.ebuild 814 BLAKE2B 87f8b89d8c09c1b7ba6e1fcb48c564703d73c4fa69f2384aed4745e813cf95a87f2843826c83d66b1e51cf60cdf2b2fe731b82103572f2d69eeb7b1b2407700c SHA512 6c9f1f4dadea74ce37333f036b39e329e7dd34b5d7bccc703cafab635a6b49e4fc8dcfbfceb98680e592b3e196faeaee192d9a04bf18ea8ecd9fb57823538cd8
-EBUILD smart-live-rebuild-9999.ebuild 733 BLAKE2B 425e9a462501ac90850fc64a851b5be0fc68e38285c8eaf490935019d7c9fbed2e3930f9565616304950c4541740afedd256f19263a7e0b9d678637c06daaf1f SHA512 d7112f4ac4f78bcb387bb5d70536ef9735dcb71f4e29b9d34dc256b9ed10b407a4d5364b66d12d42dd54d693be37d7b5338c5b68999a6dd629a96f5105355a73
+EBUILD smart-live-rebuild-1.3.6.ebuild 818 BLAKE2B 2e9a8127cd9ee7e60ac8b42722cc77e988a51b2f1b86248f755cd752fbf0e72d755c9d4ac3c6a69208fc7de16c80fc997ab390475848b6ba38c16976ba00b3ac SHA512 a65d9f040b8f7b795c66c0f0e500bebb078afadbb957670b51ea2e5da6759841ca3ae77d86c872966ccecb3151f79918ff47a20bee16b2014d70306a9fd6fbd6
+EBUILD smart-live-rebuild-9999.ebuild 737 BLAKE2B 917677f468d5dfa3ff6fd63e4d91fc01cf101dc59110b6833469b6b1d3a66b3e7711958ffd4a2ae50c7c98a324ca8386757e225694740ada8e1c2741fd248141 SHA512 56bb536ea5eca0b5d091a12dfb204a673b9ed44f31e135e12092ceb748b99071c0004f7b06d86905a11421237e9c93b82894c5975b90195f4bae5a5faeb6bf94
 MISC metadata.xml 769 BLAKE2B 5aaad83253d55d1096c19aeb6a980e31456ca20a1ecfdb45e93dfd2f72cff7cce61124bf546932266d24d0c9fd0493ae4c61089ab291028360834c2f6d237e5a SHA512 d11c942868f0166c646922088dfecf3047f8ca017b85965382bec8fc794e11d6ffdea27a9156a41faec10a79a13836b13d8b9213a44e57672e1355fbd6bfd0da
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
index bcef4feef671..85ebbd16dc55 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
index 98ecad4c2484..c2775c920f60 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
 
 EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 inherit distutils-r1 git-r3
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-portage
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)