gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /app-admin
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
191 files changed, 1199 insertions, 2791 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 3425679dd212..078f496ec561 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index 4999c9c2adea..faa6fc79290a 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -2,6 +2,6 @@ AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f
 AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b90014619aa87614f0a8e1c6e9bb79afa964e5c0324ca090fefa9b90f2705c7388b488709f31619d824850e3e8 SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81
 DIST abrt-2.10.10.tar.gz 6830586 BLAKE2B 5cd45144678e6355cb1362c3ebe5531104bb150ff95c42d10e3056f7619cdc7dc3da57e4025cab05234866a4634f29bc07fd78f574800d6b303385c6befa25bd SHA512 6daeea898c9328d31b952ef12202162e002f91b4115301e5d66a0e6991251f9a8322b87201128f7efd54b42b76cb94abc4cf01e5d5b563f254f6757ec7e2127d
 DIST abrt-2.12.0.tar.gz 6799338 BLAKE2B 57a9b3fac4a4a5f55630be0573b26d4ae2d921d4f09d6566339a77f314c413c1a9e242f882fe20befabf30a58e7df21395edcf1b0d560bfeadf8e854bff6a705 SHA512 3567332399cd9708505a6d05c9388c7da5c14c7432e6fd40e5e76b6bcea8859c17b3b6c52a96ce54740e3682d75d8bf77dbc5fede80bd4fc6f72c60014f9cded
-EBUILD abrt-2.10.10-r2.ebuild 2720 BLAKE2B 06afaa133b4810bfad8a1f26f814621dcee25a4ca9c83ced3d602d63937f41dbba9e98f95291116b5352ff2cb4da87c187cabe304c10bb9695ac64db0f27997f SHA512 a90f5824935948bbb65981709d7cf40341863732837b6c8cb95d0bec2bea6b8ea2f919bdfdb77abb6823d7be320f466e47016c863a7f23bfc98cf4c4e178a9cd
-EBUILD abrt-2.12.0-r1.ebuild 3076 BLAKE2B 97cffb60ab9ad723bdf5c0ce1915598f0d2f2e801f972eeed95bd2d656f3629f805d2d293028f22a76add32441522a8bef92ec050d2325efab7f0efff30c97d2 SHA512 8fb08af66db7592c5c5f6ca133cbd8a0da861dc5df5543d6706197223915cd30fcd03436ec36390fa2fee33752beb57f79b3dcd322f5bf16593d11311b6f28dd
+EBUILD abrt-2.10.10-r2.ebuild 2716 BLAKE2B 0cbddc9699273ce7beff2801102a2262409a5fe349ce7c925669138b85170d40befcf9485e1643b262500de12f78cc539e52b32911de70552af0f83558ad138b SHA512 4e9cee969cdcee0af4270627a3325ee69f2ea318fcb8ce412a4db5733303f85368175c773d14c1923d099e8270144504a6f891d9d1647857519d8d1418cab6e5
+EBUILD abrt-2.12.0-r1.ebuild 3072 BLAKE2B be2123efe2f22506b85c7b0fadbeefa6a81c5211ecd67094a80df0a70f459f1adb0801cae746a551f3d7ae5ac242051a406680158c462850df4ea844aaadd52a SHA512 f10068ef72e7773d5692a1c50a8eec5cec2c84b12c80970daa752c73247197e03c8e545d2d8a0432f1f03806ec570817870cf4ef39c52d063b5898313fd8beaa
 MISC metadata.xml 327 BLAKE2B e5a24f189c128e35fd3b878143c5d99da897af8535258f7eece0153df8a5b2dfc8b4f19000c60a6fcb70bb4f0b9efad98d2deab9e36dd205615e4176a06c0c45 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40
diff --git a/app-admin/abrt/abrt-2.10.10-r2.ebuild b/app-admin/abrt/abrt-2.10.10-r2.ebuild
index b3f15b79f008..17e113f87b5c 100644
--- a/app-admin/abrt/abrt-2.10.10-r2.ebuild
+++ b/app-admin/abrt/abrt-2.10.10-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools gnome2-utils python-single-r1 systemd user
 
diff --git a/app-admin/abrt/abrt-2.12.0-r1.ebuild b/app-admin/abrt/abrt-2.12.0-r1.ebuild
index 4c27e37dc5ff..00be19d10135 100644
--- a/app-admin/abrt/abrt-2.12.0-r1.ebuild
+++ b/app-admin/abrt/abrt-2.12.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools gnome2-utils python-single-r1 systemd user
 
diff --git a/app-admin/ansible-cmdb/Manifest b/app-admin/ansible-cmdb/Manifest
index 50686ee4477a..073ead285a28 100644
--- a/app-admin/ansible-cmdb/Manifest
+++ b/app-admin/ansible-cmdb/Manifest
@@ -1,3 +1,3 @@
 DIST ansible-cmdb-1.28.tar.gz 177437 BLAKE2B d3faa6cccdaa0825318bc9df09ad28b15d1a70ac25281f283e65ed760698c06db582d6954f19efe6cdde8e7ab103a915e663659cc64d72851ed830c817a700b7 SHA512 d8f87b7e2c664aec20585c34a83271ea4ec397c70ff1114e2b3669ba17903ed8f57ddf774b74d3d267a423bb71bf6d9fd6e59aa497f4b17449104db6ac71b38a
-EBUILD ansible-cmdb-1.28.ebuild 553 BLAKE2B fccec4a9b1a068d4e5d1299fc981563488b74d888d044285d3668ead8e2644523fddedae4f1a16fbecc9389146e84aa0dc8acde1a14f3051a47ed191de176fe3 SHA512 54e7c7b0a5cdbe63b3caf5582ae17a372d47a12c87b91f76e84a3cc360bc975e426d937c68d3654c5b38351dd5cb8c02fd55e1feeb5308cf28479012aef4840c
+EBUILD ansible-cmdb-1.28.ebuild 544 BLAKE2B d26ff2120c35d8b988ec976fa34acb939f2fd74d3ef154f0c60cafd1de7fade43c1cefff96f77e471781565616344fe35c96915decb04b9543c91071cfcb5ae7 SHA512 145cb349878ebfc7b34356a0e1aff5203d985d309b44d0f9746d0d8ed949c35c662ae3ec92fbc9bf23e039caf1b74a49481dd8bba76fb0066755b66c6dba120e
 MISC metadata.xml 488 BLAKE2B a8a8c5d397c1876289b718d4dc8688d5a001ee63eaad76b0b4eed91d5d89e15235e592f3282b3543382e9d9d26bff129fdb4b7a8cb008414d014084f61ede918 SHA512 fd2903178cc9dddb523ee35a711e5289ab7908b0b749ce96aaeaf924b848e407fb733831124517fed054bfef68420ce2e401bd77afa1966cc978a39f0d146f51
diff --git a/app-admin/ansible-cmdb/ansible-cmdb-1.28.ebuild b/app-admin/ansible-cmdb/ansible-cmdb-1.28.ebuild
index 2abde982dcb3..82f5a34cdc8e 100644
--- a/app-admin/ansible-cmdb/ansible-cmdb-1.28.ebuild
+++ b/app-admin/ansible-cmdb/ansible-cmdb-1.28.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 38e38a753fe1..b17ae59142a3 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,5 +1,5 @@
 DIST ansible-lint-3.4.23.tar.gz 36922 BLAKE2B a012155d9608ce0517f152837cc7f5f8330848f3e6b6b8b62b1985c9aae5260d3b8c2e9016f945a30b8433387549a9421970d9f56fc32ff9aac25a71dc150285 SHA512 4b2357327319f2cc2c0863ed74af3c799afa97f6e8e1885f9c621a9b0b4ed4b33c731f4a0e8557bf7d03f4e1680a06e60b8602b48fbb55c55325f1dda31a51e7
 DIST ansible-lint-4.0.1.tar.gz 2909257 BLAKE2B c030b6fc58eaeeec42e40dd5bc46e5181916433b905bfc4a82382bf6bba8536d2639172aab0e2928ce1dd5489f322e19ab1c0ea5abb637562616addb9733e81a SHA512 a2f3bd44287a2c72f79c5fbb4c02446484cf764d386d403694325bce172e2b195dd4812e0f89e5f4e1930db124e2b383e4f067bed5d4858c354c0ae0b3fb03e4
 EBUILD ansible-lint-3.4.23.ebuild 846 BLAKE2B 3e8548d0adc4a6b8fe9dd53bde8b31736cd5116c0e3c0645c05adccb0e416ea152bd8f297182e49cb68abbf4764c0f6ae8c1fb9c3aaeb0f7450b862c6d5bd080 SHA512 edbeee87709d1361f96342706b9dccbde48820b147f2014b761d6460c7d0e14880d7f1ca8d55124ad326750be697e39d955a93945ac5a0baf73d2880b5dde089
-EBUILD ansible-lint-4.0.1.ebuild 998 BLAKE2B 4f20169546de7596543448faf412b0fe5a378b44fedaffc62b027d3520e9626784e3458247c47cfe7604a8cd4ec199fb4a7ab531ba4e86561a926ac50ae89060 SHA512 d1fcfdfcf771efa6707d433f96b1015bb493635a0cdb2121e9a6938fddc1ec852c38a250295a92596c63ee56e21b4b6880c48c1cd52f2f676a9e0b6e6c69614d
+EBUILD ansible-lint-4.0.1.ebuild 996 BLAKE2B 71384c4969bb559856e44c0c0d33e6af45e37bdc87e1092d79ada98d80a42101d8241eb36da0f7b8dbe8f412ae2880804300c137194f29c54f679974f11b966b SHA512 8330f00fa95de4109ec64823f6e71931515566b9f6f5eb3dadd5cbdc7081ff5dc685b8a9f7b00aefb60fa3a8070f5fa10925c973161eeb47420e55b3bc97e247
 MISC metadata.xml 468 BLAKE2B 6c6ebea3538b994b0ed427d005d3d46fa5bf115f25ea4de3b00e9fba3eaf44831ef0b54af5ddc352ad292ac4b6bcbb859583fb34b5bb358bc03ff25d43997215 SHA512 4dd15de2b2d9caf6cfe4518e9e4fcb476838c78c20d4edbeab8d78a602969201d7bee7bce8af1406e5a7e171cb481e7a08c58db599618e66d1c681a1537dfcfc
diff --git a/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild b/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
index 7a241ff86f02..1041aa430818 100644
--- a/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 33834a59b131..ed2b64d21d24 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,10 +1,8 @@
 DIST ansible-2.7.15.tar.gz 10205890 BLAKE2B 30b0c83ad646cdcd918472be4512ee8cf00e966b9c7ed0431bcf915e858dae6aeb26cdff4eee5d480b751a4c33f30c2b213d8bc67d17bc8774c5ca2bcf897632 SHA512 7140fdb80456f5dd9f34226a9f38ce567ad13e4cd6b4058ae22012867554c9ed19e3cfa0ae7e745bf56d109fbe8dde8e264efce2f537b5bdae48cf606ee38f52
 DIST ansible-2.8.7.tar.gz 12697144 BLAKE2B f88225b358ff9fad352c04a053100c5aa612f54ba7ad8e3a700d61e030fd0b5850055b83861d3ad76e614d3e786a2ed719f63b7f452ce24d7e27d79d386b8eed SHA512 166009780c8bb5b35beb9604412d4e5e3874e13b04f3ce694d726dc5bfb064f73a17ec3c814c8a67e28d57e7c327276b6cb66a9a0dba7138d702427ec13b4de3
-DIST ansible-2.9.1.tar.gz 14144123 BLAKE2B 20b288aed59221c63cbc345d6f1bb33770b864229ddfdcb3e3d7c5ddde0978b05f1139466945a92145772f1d659a43d406c7486df91f7f16135f66b7282761ab SHA512 fdb25017b96475a6c182bba2f32050f0eaa6f22d17f166b98ce0f0cb40fd12dbbc5ede9912624fa4c5d4a8de472b28c2eb2b569700537c7d4b4c568d7e38f21b
 DIST ansible-2.9.2.tar.gz 14157188 BLAKE2B 4c1207bd43f7797d8d9cb1d4612e866eebbf8c19ee060cf1eb7daa68415be5d7718c79d756454648e66a13434eacba6a07c8de31c4ec4b12e0474563d8844e46 SHA512 522dd84af9493ceafd95ff0fc806a671f3d1f10d0ca074ef41875eb966d39e64b834e0b98a35d81d9d9d96efef8069db604c8080ce8cbb1ce2e8b13bf5c30a6a
-EBUILD ansible-2.7.15.ebuild 1673 BLAKE2B 169728c5deacbe5b36f36dab8fe1f811473861587d6c0a037f1bb27dfcb40641222f51721e9f5b9d32109b0f94e730cbac4d46468ed2a8fac8373c682b568bf3 SHA512 756db7cf9ecfc0ea6f27d58e6b2fff9e691506f4930cd068802fb9cd90354e3fa29bde7b96c5cd00a20ca3f2f80472707e5dceda20b228b550ecc948b262556a
-EBUILD ansible-2.8.7.ebuild 1754 BLAKE2B dba223a203261ebe347e6379e1dc829d44ffc0c59dd0138f0cd843115eaca7b12f774522162f15950899f0b4994bac624ca10f4a582deaa5aba1a908058128a4 SHA512 7a53449ded7610d3a6e5ee0c61bbfedd0c17e7632ab4abcbe79800f2d5ddd92561c2b6f915093d3114ed9a85df8254fe1477b11a6c6947246679dbba8a8ecb93
-EBUILD ansible-2.9.1.ebuild 1716 BLAKE2B ae78ec85088015ca2a763cadeb4d849f003401ac7b216b89b9b76bff54be3e8621c3c1c0b4296a3fb0db2848e7119b4e349485dd14bf022bcc640d7f020019a2 SHA512 246a1dd356a66a100bc7d9b74f1b04f7a5bdd4a3bd970e9177cef193de17eb5bf5dd2a28b1d099253c4ba522165b23eaa54cc792c34a5d0a0726ef7b393bae91
-EBUILD ansible-2.9.2.ebuild 1718 BLAKE2B 836a1251fc9bbfd580dfcf0e8bebefe079025baa95cf45a5867579e16ab3685f8a43d08ad8d10a1ce2a0a1e954a98153a6cf3acce5a55e333e45a36da2db78cd SHA512 15650c77da5295eae131050fbe762361ee08eecc3fc98fd85b9ebee5ccf9afb5a7e1b11ca3651f45bf69ba5dd381fd20ec47ce66627a0e1946667ed9fc4df4d1
-EBUILD ansible-9999.ebuild 1709 BLAKE2B 1369caa197cdf61e86960af4f793d65f2e2842456a6711797b5bbafadec8c622d178ea820e9ab9697b08837e351d379f7aea86cc551ca1c18b048e575159fce1 SHA512 4850bad9088b5bc3366efefca3827519e23af617b35e9f14d275be505248511832e17ad0da69fa28be51d458a8d0820bce081698cf4fa91bcc44b20c72a6ce70
+EBUILD ansible-2.7.15.ebuild 1671 BLAKE2B 5fbb74fe6c33b1e297c19df0618d9a346125870bb57187233603bec3cf616b69807890a5393dd69915cc64eca46fe1dc09780cea804ae59235a9deab2403e43a SHA512 86d1d029bda1b698d87886e4875ba2b91fccc8eb2f79b90e40275b933b6adb0edd8f6f6e8ceef8900530bf56e08f85604f8f41a53d0a2bed10bf30a5bf0a58f9
+EBUILD ansible-2.8.7.ebuild 1752 BLAKE2B 05d56b05388ccb2020705dd23c8a51cb141df460722fc344e3083d91aa22f2cdd8bcb55f52d2ec6b207f7541e8a8a7b0c2ebb1782ab2cf6634c7bf1e700e8e3e SHA512 9840b22517c1eb13baa3b7b52aadd4ab8efbcaf104617a04f60c67fd4c4090b76d291125b2e63e3a3e9f58f5c9cf53b30ebbc4b837b907cc3ac99b322381127f
+EBUILD ansible-2.9.2.ebuild 1714 BLAKE2B 1dd408ae0157d82b85fcd659404dff44cd34ead6a54be9a2e1f454f83e4a37d3e65b176ddac21946514ffedf9de21d9ac41d3bfd7666372bd841b622324e4d24 SHA512 8a9010be11260d51a182719acf81058941e062aceb1d8d80cd696529ec37fbae1b8aa33d247be2ec9b6063fd5c3550c9ef16b9aa233c1975e7ae35239441b733
+EBUILD ansible-9999.ebuild 1707 BLAKE2B d4991ca92a5b102d9f48a08a1be24e1fa4e02d60eaa7535044d5df52bb620c6c88b30440094c80e411a06bd33b296d94adae6172c0ca40d7dd401884a6a47892 SHA512 6a0660f8cc0bb3db7c526764b4fa8761c55b345c4e51f7d12044133690a422b1e8fbb904a5593eb6bac73e3c91ae056e0a656bb72a63bbec53f922fb8863e278
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.7.15.ebuild b/app-admin/ansible/ansible-2.7.15.ebuild
index c7356498cca4..f018a7d3ae6a 100644
--- a/app-admin/ansible/ansible-2.7.15.ebuild
+++ b/app-admin/ansible/ansible-2.7.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils
 
diff --git a/app-admin/ansible/ansible-2.8.7.ebuild b/app-admin/ansible/ansible-2.8.7.ebuild
index b0307b32f958..9ec731c9b53a 100644
--- a/app-admin/ansible/ansible-2.8.7.ebuild
+++ b/app-admin/ansible/ansible-2.8.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils
 
diff --git a/app-admin/ansible/ansible-2.9.1.ebuild b/app-admin/ansible/ansible-2.9.1.ebuild
deleted file mode 100644
index 030cf12fa434..000000000000
--- a/app-admin/ansible/ansible-2.9.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.9.2.ebuild b/app-admin/ansible/ansible-2.9.2.ebuild
index 29be3eba4da6..205e178f21d9 100644
--- a/app-admin/ansible/ansible-2.9.2.ebuild
+++ b/app-admin/ansible/ansible-2.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 eutils
 
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index fbd68a468346..0e604595dbca 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 git-r3 eutils
 
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index e3cb3b59482c..bbd02a57ba94 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -3,10 +3,13 @@ AUX apachetop-0.12.6-configure.patch 2884 BLAKE2B 34310a487b0dc68e184c9facce01d8
 AUX apachetop-0.12.6-gcc41.patch 247 BLAKE2B f193def780fc35322d49af0e13898a5dd95ecb49f8c0f4039260eb6b2aaf6e5a45131682d68d38f474d384b9d6d35c27a5233b57949da8b6ff54d29b9634c86e SHA512 710b8e3b381dcf9aac58544f9afe0f2a3cc598b38e87145caad29404fc19983bc683b160f0f80dd003ffa57d246fbc5b0fa5754aa1012e985b4c2ffc7e01f50f
 AUX apachetop-0.12.6-maxpathlen.patch 1577 BLAKE2B 97c046e1bf9f7cd67aaf95f9ed755bc3f12774756da35b31cd7b38db22b2860400bcbc9626a37ea795dc454c46b90dd2a53f41c42124e9d777a7da7a75da3a4c SHA512 c0e4562b9789168acbea68b4f19eb32238244d8003bd4d0df458582b095d9680f2e20b592990f0bebe5ae17fcbcbfd2154e74169788a8d3a31498f26776f6f36
 AUX apachetop-0.12.6-ncurses.patch 5392 BLAKE2B bfbe54d1a3b32157cda1a22aba83829948233df7d18d6f54c9ec6f9b4e987c9c201d1bc5af43c3ce0edd8af5d83f14b229725f68b44e8e9ab202da961d628542 SHA512 2c4759a1a8c4a54fb10d75779c23bfadfdb789be1a790add29adc2cb9ba1829f57239da568057ddbfaf0cea5468a74a3fdf20b1fd35b0bf51e8c8ab9e6027b6d
+AUX apachetop-0.18.4-tinfo.patch 313 BLAKE2B 389a6d0715b00de166dff543b53abda45a52497497d66c4d0b4b2e4b0c4407a8dee90d7401088f9b99e408738d523211741f579b70ca8f64826e3dbd46619fd1 SHA512 0a9ef0782498e67cca07b642e796b1abaffad3bc3b330ca83b579d75a34fba1225453a52aadd720a830d8b51d342d34ed87c3b10cb8441bcf4c71b375ee03e66
 DIST apachetop-0.12.6.tar.gz 126930 BLAKE2B 06d12cc72791920c959fa4ef8e18aa90f1f29a616389329685abf445f416cde9ce6edd2db5aaadaba51488033148e8109245200086a11422436ffe0aab1b4a40 SHA512 35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a
 DIST apachetop-0.17.4.tar.gz 128153 BLAKE2B 7601ce98618d041f6fc67e528775ce79b63a726b765ff298d1d74a1dd22a4451be6c36669c7ab9bf82fb8c120a6930d2bbf03823de02a216c558c358c53c07be SHA512 b5115048f79c694344fd341631fe7739567ba3ce6e18514d0be250cb6f42e04c54d35cc023dea5258725fcbfbb6debdaa51b91d64ae3120e70f5b78a7989a330
 DIST apachetop-0.18.4.tar.gz 128849 BLAKE2B 912f060984da326b2e005cc0e3eb99c28182bc6a0930e6781d5a0a990dbbe56b5dbfe871baea1c86a5ac2bc02faa1e583ca104d3c8bd00cc3617599601b2d8bd SHA512 e32f94ab6223578aa5b8c11083de762e8f916ba6d057d93f99208333632a8362b421c41fff76bf60a52f0b377a70d69c17ed02abfb95f86474ad3719016e59f7
+DIST apachetop-0.19.7.tar.gz 132665 BLAKE2B 248247c361d1585de68a0a9adae22f98db72991babfb4a75f01fa67ef28443a3c04cf1da9c1ea34ed923599955b58959528cc9e0a881fbb7b463b1d64c0cb7bd SHA512 40d546facee23a9914483c06323940e219602518751d80f729d835c4dbf991c7d1dd9bcebcaa4ca6a2d64799d48c8a00d421bc324afc2959691c962113386969
 EBUILD apachetop-0.12.6-r2.ebuild 896 BLAKE2B d8fa75f505641c95219c94f0fb09bbb8382a4797c08be644ac17958c4c804c2594c3c5809c9b82fc413010230f5a83a70a74f4616fce507a1726bcbed204e231 SHA512 b5368a948c0b4f4e6c2d754335de9dd20cb263985192631703d437f7f1c833758b11e4a17cd18fa6f5d09a2edba8de91966d9d72c453e17c6145012686ad68ca
 EBUILD apachetop-0.17.4.ebuild 726 BLAKE2B 2979fc7c056474d3e6e968eb7f8a9729a9dcd83137020f50f45c14d1dae27a567dc03e189878e7a2edaa5fb9c68a4ddb4b9211c4d2f5089a98f4850bc67185da SHA512 3e7bcd2561a0dcbdf8d494e3e41c4735e1d08b6893d2c1889dc7590edb83ba729d42b73327284eb50f7c313f0c4b7d07a7c2e63cc5cc01544fa593eebdd8a072
-EBUILD apachetop-0.18.4.ebuild 726 BLAKE2B 2979fc7c056474d3e6e968eb7f8a9729a9dcd83137020f50f45c14d1dae27a567dc03e189878e7a2edaa5fb9c68a4ddb4b9211c4d2f5089a98f4850bc67185da SHA512 3e7bcd2561a0dcbdf8d494e3e41c4735e1d08b6893d2c1889dc7590edb83ba729d42b73327284eb50f7c313f0c4b7d07a7c2e63cc5cc01544fa593eebdd8a072
+EBUILD apachetop-0.18.4.ebuild 756 BLAKE2B 5dfdc856a095e583b707fbfeb2afa79f7a7f9486c8792a814bbb2823d8e92cbd3f78b1aa2fff34a2cf236923abe189e7e7ebc00cf2841cc5b100c0e43fd64391 SHA512 07fd2b11883cccc65befd13045f5d4fdf454e6dede3b2a97f46dc3487364daab176777d928aa575118c63806b1a8b7997c55961d895359504f02e97e20df5ba2
+EBUILD apachetop-0.19.7.ebuild 672 BLAKE2B cb03970143eab1da727332a1745a546cff9aef653e048c8702724852dc745b4360ac7370d7684b4d5920cb198cc37acf99610edd47705ce99cd11860d87479e5 SHA512 0336fc0789fcc78d45083ebc6ed85418174782fedcdf0884d8d857aa8bd7b172f9bbf6a43496f546ce9a34811697a9acaec12ce31d2eb7476f5cdd9d6d073bb1
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/app-admin/apachetop/apachetop-0.18.4.ebuild b/app-admin/apachetop/apachetop-0.18.4.ebuild
index 2f5954eb82bf..c0a18315d1da 100644
--- a/app-admin/apachetop/apachetop-0.18.4.ebuild
+++ b/app-admin/apachetop/apachetop-0.18.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,8 +19,10 @@ RDEPEND="
 	sys-libs/readline:0=
 	fam? ( virtual/fam )
 	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.4-tinfo.patch
+)
 
 src_prepare() {
 	default
diff --git a/app-admin/apachetop/apachetop-0.19.7.ebuild b/app-admin/apachetop/apachetop-0.19.7.ebuild
new file mode 100644
index 000000000000..c55508cd46dd
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.19.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A realtime Apache log analyzer"
+HOMEPAGE="https://github.com/tessus/apachetop"
+SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="fam pcre"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	fam? ( virtual/fam )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
+		--without-adns \
+		$(use_with fam) \
+		$(use_with pcre)
+}
diff --git a/app-admin/apachetop/files/apachetop-0.18.4-tinfo.patch b/app-admin/apachetop/files/apachetop-0.18.4-tinfo.patch
new file mode 100644
index 000000000000..d975a430914f
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.18.4-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -133,7 +133,7 @@
+ AC_SEARCH_LIBS([socket], [socket])
+ AC_SEARCH_LIBS([inet_addr], [nsl])
+ AC_SEARCH_LIBS([attron], [ncurses])
+-AC_SEARCH_LIBS([tgetstr], [termcap])
++AC_SEARCH_LIBS([tgetstr], [tinfo termcap])
+ AC_SEARCH_LIBS([mvprintw], [curses ncurses] ,
+     [] ,
+     [
diff --git a/app-admin/ara/Manifest b/app-admin/ara/Manifest
index 00a57a303ad5..4908a5566c75 100644
--- a/app-admin/ara/Manifest
+++ b/app-admin/ara/Manifest
@@ -1,4 +1,3 @@
 DIST ara-0.15.0.tar.gz 1216308 BLAKE2B c1b88891a3859f32e70a3e8dcb383549ea17cf126e3204eb3dd4f8bf28e11f702c3cbb51bde05c03097d2bb2dbf85354027846b8b3d40916d18e855335a5c16c SHA512 848437db36a398c3e4699b4ee500207e7e90bcbe1ede81c6f15e3b6624538beccd76ffcb51af0293f9371f67c27e430e3e23b1e6e0444665103b91f6587d6b9a
-EBUILD ara-0.15.0-r1.ebuild 1648 BLAKE2B c5ddef5434f417c28666909e45fa221a28a017e60c6cb6d8cd0c936ed86800f67f2e18d866b509069c1466c5f270460c6a62a257115a9c32b3dad659ac476419 SHA512 cf8b1f30bff89c1a123e3fe54c06de671d9cc9b312d309628aec9297c8c0bad9d3494cb3a603a14c0ef0126224ab14bd981047ed0a395ba24380b5be606bb01e
-EBUILD ara-0.15.0.ebuild 1260 BLAKE2B 5cdfc9cf34d619de78d6c793fc5bfdddb04c0c7ecda0ababe594138419dc0c50e0b76aaa743643fc057ae17f7b03d780d4df9ec81b269d2f807ee78d9f67e112 SHA512 f965e70ff9a6ae90e3f5b9820ff54d5c0fc95e368f3585dd2ebe57e92b78e0bfcec38790b63094094c3f9d2e9cc80dc065ba579325a8768d823b68ba35863f99
-MISC metadata.xml 324 BLAKE2B 109d17014a3a31a24650f82a296c2b81ccc751b56b54a85d3238f7bd471fe9e034028ffcdb16263d44ac53038bff754dceb9e8059299cab5126760cd50d6be9c SHA512 a7d6e8f532f0aedc330eba7c5b6b378974e0c0f7752ebc5aea7c820aa7d851e15ce07fbb33994e812f523f79686bbc2abccebfcbc095426664e8922d602d2921
+EBUILD ara-0.15.0-r1.ebuild 1631 BLAKE2B cae63bf1e749a4e09c936d00c2807701c3143ae643fd76ede5a6523d26da42e252de102e31eb9224fe5117d4b70d239faf6f881f5f317a8f80a1e08d67dbf5bd SHA512 d997dd18c922e15c806e8c9d6ea1aa74500643ce4150e3b08cf4a7e21375400b6ad69bc4f86f402129dc9deb3a230f2d8577d45ebe27b0882af0d89efc1c893f
+MISC metadata.xml 238 BLAKE2B b612872c7003518c728cd75352cbef6eeadd275b00c3b09afb8b647447e52a87f5b9cb1a056dcab89fadd7c74553ca59369344146d8ea20511110641a49fcecf SHA512 eb1c95e1b280d04bc264649e84e3f078a444fbc60ce1969c48fbecb4b06ca0a4c4be55dc04b3bbc145093727fda0a820d30a147ada546b5082377bb5e913ac42
diff --git a/app-admin/ara/ara-0.15.0-r1.ebuild b/app-admin/ara/ara-0.15.0-r1.ebuild
index b1f1595918b1..a99a9059eaba 100644
--- a/app-admin/ara/ara-0.15.0-r1.ebuild
+++ b/app-admin/ara/ara-0.15.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-admin/ara/ara-0.15.0.ebuild b/app-admin/ara/ara-0.15.0.ebuild
deleted file mode 100644
index a931118f60a0..000000000000
--- a/app-admin/ara/ara-0.15.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="ARA Records Ansible"
-HOMEPAGE="https://github.com/openstack/ara"
-SRC_URI="https://github.com/openstack/ara/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/flask-script[${PYTHON_USEDEP}]
-	dev-python/frozen-flask[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/cliff[${PYTHON_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/debtcollector[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/pyfakefs[${PYTHON_USEDEP}]
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	dev-python/oslo-serialization[${PYTHON_USEDEP}]
-	dev-python/oslo-utils[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-python_compile() {
-	export PBR_VERSION="${PV}"
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	einstalldocs
-	dodoc -r doc
-}
diff --git a/app-admin/ara/metadata.xml b/app-admin/ara/metadata.xml
index 65cbe41f2f35..dd92348f3d07 100644
--- a/app-admin/ara/metadata.xml
+++ b/app-admin/ara/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">ara</remote-id>
   </upstream>
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index f124f7f4390c..bd9d4e9812b0 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,4 +1,6 @@
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
 DIST calamares-3.2.12.tar.gz 3008153 BLAKE2B 32b8a141346da528c2aef40a8fe480445cc8acbccc1190ca5ad1b5b0d03b59c709abd663e5ed33503955e3c0caa71476e7d737d46422992fc22e3acd96260857 SHA512 00dec40eb9c9e95933d3785a7b2ddc606530d8b94fde233d91071afbe11067d4e5b0a81298e66aaa0c65b55b6a86359466d8789f3ed886e76c2102b850f2bbc0
-EBUILD calamares-3.2.12.ebuild 2347 BLAKE2B 2408aa4e84a1e0b6b4d4b5b7ac97d9f59207094e89f1af14455df64c7c5c494519232f7f1d64d9ec4b4e62eb1bf26e7e4d8f44d570fa23bddc3aed5d89b5c55c SHA512 5d29dda4d3d44ec644695f986feb5bc39691ffcc64063c3bac9af4953cffb6e3547be688777d37ea62681b7da6c41242cc88659ca98375048f1c4c2defbbc461
+DIST calamares-3.2.17.1.tar.gz 3128350 BLAKE2B a6926faaf1d521647cc0037b88686f9ceee1cc8167b888fe3c25228cbca8058572c8786a51f6ce0ccb77b31351d21ac41fa6c86a6577569c118729e1263ccafa SHA512 fa8f1906aa7774b0f6bd65d1dc87ea2e08df92018c162f7e7fe01fe6119e65d6391141bc242623f88040bb18eb8b71003cb7417b27c10b39bc30de0f0bf8deb0
+EBUILD calamares-3.2.12.ebuild 2343 BLAKE2B 8cfc99f4b04d1414ccc432b97408d7de9b443c943e56dfe166121748fcc792c3964fb55ef39e66f3a1a908f8ff2590b080eb4e73175f545efc60e88ea012315f SHA512 308bda6ee935926b4d2094fd7f9e53cd8274eadbd9003c70a246bc957891272f98b7b27094f592acf0dcf778cfee521432294bc405dd912a66335f89dfe3e770
+EBUILD calamares-3.2.17.1.ebuild 2129 BLAKE2B 2d2d77e3c04d536c82d106cee838725e29abed70db0e0e81866bea059aae426fca8027c1b3bf18ae91038b796e3ee76eebdc087b2178a87329c72b29ebc0940c SHA512 b89900210c156ff1f8b89ca15cf44a828b46da8e31f1455c03bcb5fb5789c5d07f26236d0c020c6962ef888950075548a1f86d11815d3b7b703bc551e3c8b547
 MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f
diff --git a/app-admin/calamares/calamares-3.2.12.ebuild b/app-admin/calamares/calamares-3.2.12.ebuild
index 2b847131cb13..9fea01c24f62 100644
--- a/app-admin/calamares/calamares-3.2.12.ebuild
+++ b/app-admin/calamares/calamares-3.2.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 KDE_TEST="true"
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit kde5 python-r1
 
 DESCRIPTION="Distribution-independent installer framework"
diff --git a/app-admin/calamares/calamares-3.2.17.1.ebuild b/app-admin/calamares/calamares-3.2.17.1.ebuild
new file mode 100644
index 000000000000..e94dcef7f308
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.17.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_6 )
+inherit ecm python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+KEYWORDS="~amd64"
+SLOT=5
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-cpp/yaml-cpp:=
+	>=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
+	dev-libs/libpwquality[${PYTHON_USEDEP}]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kcrash:5
+	kde-frameworks/kpackage:5
+	kde-frameworks/kparts:5
+	kde-frameworks/kservice:5
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-auth/polkit-qt
+	>=sys-libs/kpmcore-4.0.0:5=
+	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-admin/sudo
+	dev-libs/libatasmart
+	net-misc/rsync
+	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
+	sys-boot/os-prober
+	sys-fs/squashfs-tools
+	sys-libs/timezone-data
+	virtual/udev
+	networkmanager? ( net-misc/networkmanager )
+	upower? ( sys-power/upower )
+"
+
+src_prepare() {
+	ecm_src_prepare
+	python_setup
+	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+			PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+			PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+			PYTHON_LIBS="$(python_get_LIBS)"
+
+	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+		calamares.desktop || die
+	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
+		calamares.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWEBVIEW_FORCE_WEBKIT=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+		-DWITH_PYTHONQT=$(usex pythonqt)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	dobin "${FILESDIR}"/calamares-pkexec
+}
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index c60fb4d1b239..5a091925f8fd 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,5 +1,5 @@
 DIST cdist-5.1.3.tar.gz 915245 BLAKE2B 5fce58f6fcbd48852e1c0c5568b72c360e74fd49b5321e2aedfdc8e48fd090cbdd7bab87a94e76d087f04f5a706bf2c7b1bebdc5a80867e26d8cc6e28afdeab3 SHA512 8330a5af80dfc07da722675ae1d402ebae4ba0aada451a02d782365d68d1d43a643609f3326f5ed793d2902838ee29071c0255c9d8a9d38c1e8a7c92a24cef46
 DIST cdist-6.0.0.tar.gz 934813 BLAKE2B 3cb18ebb3059fc9a37beb1567c691e1d34a9cde5d49081e8798b5ba86ea8da3b6c964d2c8bea7bf2f04f986b0b4a8766c8ea53ce48fb4bc024264e72efec1fcb SHA512 e846060f3020d6281d41e97b9cc33250cd1d4ae0d110a2792fc2447af110fef91199fc0382d5a1e501f487fda42f703957ff5a39cf28061338609a600290d792
-EBUILD cdist-5.1.3.ebuild 594 BLAKE2B b4eacbd2736994e8119709f83dc059ef2f5b14b08916c1f02f715db051ad3511e79bcad5666cb0b80b06eb70c13095e224716429c3c02c6a51bfc49f41ebbb42 SHA512 3b50d7c613d08f3502f055ce6d81338dd97610560375065eb65d8721a3a43bb6f6ee93971059c0920bbb02c82b40036b233fddad643c6ba7efb24d6f649fb27d
-EBUILD cdist-6.0.0.ebuild 600 BLAKE2B 7d60e5a8a18e901fa330ddf7c2366c490388f5a4a3a754b0a6ac99abd299b1c3235f41156c45a2fcbec7250c34370290dc897ed824e13e63d721de3b1388b913 SHA512 5467e9c1ec7f2e2823f35e076607a2d2c0ece0265ee5fb278058f7d497311ca44a2f237d520552bf685d90acf6d54745fae0005586fbdee0fe84b76d601be5f0
+EBUILD cdist-5.1.3.ebuild 590 BLAKE2B c587b9ffe196b672e600f80c521138e46c838ab3c2c93165299fe58037957c93e4a9fed227705583ae877444d76b81d466827e283af24845127de848594b6308 SHA512 64de373a0834108dcdbed4ad81b6747aa14ef5c568b341ca8056c4d7eb369cabb543d02d252b5cd3c89832fc9a5b1192640072e47594ef2d9c5312e1e6d6d60d
+EBUILD cdist-6.0.0.ebuild 596 BLAKE2B fac03ebac640f9a3c0675bf239849276005d9374c144cfd342bff70bec164883dc3b7aa5c820d28abff14f0a48c7d49380cb2940758cac0b49afa0f0853db3b1 SHA512 265a2362ccd5bbbce39d85b975a0a938b15e790394ae3cbabbbe6244a9e7c65db6248205484927627bc13c6e7bbb3e54efe35c9a7c801d00c4469ead0b4547ca
 MISC metadata.xml 443 BLAKE2B 2742628c4f58fc21f1fca78752bce1e6275ec34ca7aa547a39d8a11cf3c7d9c149030078a55383f706053fa3cd70f071d5d5c571f3b009e941cbbc2c29b6c21a SHA512 5d1dbb6742101c7b89662f3edba9d3eb7da595611fbb613a1da1482e76cbf563fdf5fbf227471ca4c90e5a96d62c65433beaf9b90bbc716c7614ea5fe6b5063a
diff --git a/app-admin/cdist/cdist-5.1.3.ebuild b/app-admin/cdist/cdist-5.1.3.ebuild
index 5d7033af2783..bb88eabb6012 100644
--- a/app-admin/cdist/cdist-5.1.3.ebuild
+++ b/app-admin/cdist/cdist-5.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/app-admin/cdist/cdist-6.0.0.ebuild b/app-admin/cdist/cdist-6.0.0.ebuild
index 7a9ce8da65df..d88a8c2d5ebe 100644
--- a/app-admin/cdist/cdist-6.0.0.ebuild
+++ b/app-admin/cdist/cdist-6.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index b42b5e27a5f3..afbe3599cf84 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -2,9 +2,8 @@ AUX consul-template.confd 293 BLAKE2B 5c3ef27d72b4c98098b128f29c55f5e674c7d4427d
 AUX consul-template.initd 592 BLAKE2B 21d6ff6bee67a82c4305eba3765f8e9c49ee59357a553677fbf049a37dccad0d7645e681665db36e89263a5a73a1155e9b19446bdab7f58f04bb7173a727c711 SHA512 bbaa059f1b339f7f8c70babe90917fc1bbff36ca446452f6e4a744dd986392227342b865aa47be02ccec2d35c43814b8faadd66f9e5af5dab3abec9805b7e676
 AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed1e57c23fb3bb3df4066cfdc1ff70f2eae6a67c7816d8d38d41106f003fe2a98732a9180838c05d04a710d9bef09 SHA512 642b53e43fd7a4da00907600f26e3814893b61856a62083c804b0077043a4f8f6603f0ae4461e901105f8e1fe52c2f34f3e949e752441f5f510e9cc21890ca75
 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
-DIST consul-template-0.20.0.tar.gz 46430965 BLAKE2B 025919b928e07cda618e05aab4488214459e6bc443524bbf8fa83331c3ad5708ebbeaf0cf20351ff70a325fb56aed9cede3010b43726fa32b5b1997d6f4f294a SHA512 a09ff31ddd7d11d78e8c2afcc9a63ab4458cc9feacc02fbf95a30c82b9ad58526c6e6575f5b3ddb21d0dd720687b9ee135bacdbe761f1b5f95592a3e3e74c170
-DIST consul-template-0.22.0.tar.gz 186074 BLAKE2B b2c38e2a0e720fb39ce0978ca929b872e1dd898d510a0ab5697a746257f25fc77e172c418c5db9c9865e2e0530b7d38d7373f7c792e37c723950c02dd06b7859 SHA512 0875a4a20ba9e9e078cd26c620cb9edbd22193b6b5fe25bb6006bd7d3272dcf29d7051448d3672f9d9caaa1b871f08b050fa07882933ad6d13b90d1c8f6406af
 DIST consul-template-0.23.0.tar.gz 192356 BLAKE2B 204f0fc7ca6780a60d88ccbd75181897e9c4db5194cd702e2ac3759d456dcb9fcae4a9f8481ccbd2d61609fb9d1330f143a0c039b6278e15d85cc2535cf5b13e SHA512 769992578fb6b9f69e9c41280a46c27e74cabbd7cffddc158dc301ffaa9ad1e5b11e626e5bc2e18532952fecb61f83c107003929e9671d5de4c6f3a82b7120f6
+DIST consul-template-0.24.0.tar.gz 192679 BLAKE2B 85717ad08038c9ec27174220cb5bc7174c8ac8eae9815fd0f403ebf0f5daea39429cfed30939764c53cd1448be94e8a2045e6fdd79af41a4fd913592b4f74600 SHA512 ea5c92b2b30534a2e9e407ebef5057e05f201488f3b46fc9f2b339e1cf56086fac15fff3bc17c5622f852139d1d9b3f872a13b9e6978282f4939c76beeeae28a
 DIST github.com-BurntSushi-toml-v0.3.1.tar.gz 42077 BLAKE2B d846b7961dc3447a43e5c91dee1897a9701c997a407d9ba8737d08b82b493f99823eeab87cc9d4fe6dd4dbdb7b0d2a218d9f9f220ffcda2056188afbf0f2ab87 SHA512 75801d0263a68613233f3b18e35b000e1aeb5322015c0f032598d9447122fc45b1854741ce6ce9fb4d5a064546ad26f3d6384710bd8e6e1229ed2d4551524852
 DIST github.com-armon-go-metrics-ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz 27423 BLAKE2B 48344146241205d76ae35407e4e5131db7277a7bcd2b44c966ed2c8fbfcd7bd628dcedb7538c28b9106643f8c0f2af4bf0985ada6cb58db0bff739583435b306 SHA512 bf28c4df0927296214f4e89263e30a6ab7c2f5fb62c20177e597890bb878f68df4aaf5445ff9af629864b38da8f506fb530f09ff22d5d8509ad7b5f4ca20a395
 DIST github.com-frankban-quicktest-v1.4.0.tar.gz 26586 BLAKE2B 365dbf6520d5e4b936dfa71022437012b45ca8d499998af8b204fa2f4ad00086b8adbd7c871e494c0a45481809253bbdbb10c05e72f3e6247b29148b61f7a7d7 SHA512 5fb98186c0ce5c96858bd9c018a86f5db2d5b04d7d659a9aafef16e6abb6ea9fbe076c84e74d5b8c5cf7e8460f273bce203dedce0e3ce6c024a16f588acac20d
@@ -17,7 +16,6 @@ DIST github.com-golang-sys-1393eb0183657fb29200106b17a5042ec6e48dbe.tar.gz 14570
 DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
 DIST github.com-golang-time-c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz 9392 BLAKE2B 9c06e2cf9a4d51eefa4d687263bd64ffef69d1937754bff1aee0a51c441510a9ce2e3193c361632c45a818b3cdd906349f44c9ee29f1fbf5c405d68bcc4b9f89 SHA512 2e1bdf8a182875315f776c556a1ad8cf2f8e3ceef72d386b8bb7dd5a3de9d5cf2216e2bbec58d2aada149f4a332fbcdef639d6479923f5a0139bb9ed3fe0f952
 DIST github.com-google-btree-v1.0.0.tar.gz 15292 BLAKE2B 663edd55fb375f2b2b1ea377efea8d891baa501161bd5b87a5d10cc84a65d4de0cd4e7b60f421d476f49f26b2ded0fb8633348392c993585790d1af194c147ad SHA512 1bbd6fff467a0f6f6ce074e94a1c13a019e7d37949cbc041d2886bcafa1076426146b46c21a15f55449d525265c04749312792006bd9ea6baeffa6f3d9705a20
-DIST github.com-hashicorp-consul-v1.1.0.tar.gz 11125956 BLAKE2B 61a8c7463f6659368d990626ebefa20bc545f17e66fb0a06a178e8cf7cb83637e64cf7496ed93facab73ef2340d46b08d7f86533378a7e57530ce1a959a9f398 SHA512 80c16a42fc58930234cb277bfdd21c3f1d9f7fe1cf2fea6284056a47f602a40a15ddd447779e83fc5b42502ca8a507a819f5ad7d11689c0bcbb0da739b217721
 DIST github.com-hashicorp-consul-v1.2.0.tar.gz 17187054 BLAKE2B 5e8d1151efe1e8ad5932886367d0012774713081aa2725f10d45af1e05751e328d76471ff3cbd85031c252c65cde0137f96c3ef86eca7e3e7f6b28e2d20ed0d5 SHA512 1c018a5f35164a899a086ccdae94cb5e6e2a490e4c788d65b0026dbf448950d0c1038b2d61cb10f5e8c9ad22a1affad64dd4a7086b59dffd115d40aa7b3d0cce
 DIST github.com-hashicorp-errwrap-v1.0.0.tar.gz 8346 BLAKE2B b407c23ddc2daa5534e38f23d69363d47012fcfcfae4e75f31513ab9fbf3d05f101258afb2bd60009aa4a6277eebe7c2396db5cb713670ecba6589a0d4b9dccc SHA512 f3bb952d98bdaaed055c4d4adac0a727459964645f8c6bf9becb03ad7eff4ec71e8e4047a29c446ee52148a0e201aac3d4b47d05bd750627650ca0e84c91652f
 DIST github.com-hashicorp-go-cleanhttp-v0.5.1.tar.gz 8069 BLAKE2B 36f2411ec94ba71b4360fc625d19fe995606560d92a4b08459b490831a4d4fda5114622cfe1aea2d100e316300a107045b9d5ce217d3748ab142e49c662ad880 SHA512 a94953d10485bbb6b1510036c8b87dac1d3ca41f84b1b397bb987ae7df68964e082ed09d9b57cfb8439735d246e599a7848882810699d26505662da735cfd406
@@ -46,7 +44,6 @@ DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c
 DIST github.com-ryanuber-go-glob-v1.0.0.tar.gz 2969 BLAKE2B 152f01873947fd0e17928b7ef86b826bdb66f1d2e6a4139b6963a5ce2133567816488d7dd240221b15adf56713094bcd11b155ac29faae04590b31f0d566c1df SHA512 fca7548194624dda5d7b5317a29c3a1a6bee44ecb3b62772943dca8afb5e665c9c3c72c740a91a7052fdddc50c60fe23917199cb67d79cdbb8b499f13a34f768
 DIST github.com-square-go-jose-v2.3.1.tar.gz 299480 BLAKE2B 861aa2e72c5e12013aab1e7fb81ef45b1f4be63a854c49dbdb2e537e9dc63f0a0478373e20ab437560fe245bd71172434fe19da42ee571bc0b48fb540fb31e12 SHA512 cc634dc543674016db6b52cba8235885ed3236f360e42992b55471b07dc20762c490edff7276d84109d1d46a9c052fb8fb62cfa002e91b1cbe43f00ff152727e
 DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
-EBUILD consul-template-0.20.0.ebuild 1534 BLAKE2B efb7e210dc8e15979c5a97b2c7578560027d0596c60409a2b1ce7a31da13f5eae8da03e2577177387e50507fb385ade659f78ba362bf6489824a1909c18d8aac SHA512 5554d0d5668989615abc120e1b321f70223ccc3c829428602fe3e5cb977606ef39ae4f6092492221199e3aad289acfa27a92c487e45f6b0b8b30039c987bb2c7
-EBUILD consul-template-0.22.0.ebuild 3306 BLAKE2B b5c6f9977cc1ac9f497b9c543729921c2ac036c1ed75272094e95029ffe2f1bf68aad307574ec55cc1a39ed2f80d8d2535f280ef635a586f359b0cc0e9a519b8 SHA512 bb59f560b81f53a4fa41fbf71fb9af6b728518d6c9769da86332f5f8863f7546bbe6362801bd2b4eb830d926a07bae7a6d8182fe12088b30ac407f4e1d162af4
 EBUILD consul-template-0.23.0.ebuild 3306 BLAKE2B deb62933b47ba59e47d3ef8c329621e84aed26668edb872e2972862caa9f950882b7d1512224457eccd1a92bc11d212eb16511e817ebd1ecf87d80d1f949ee1f SHA512 1fb3133715911a5d41b7b0088b12d5d41c0f7331613c8902a06a0c9c7e02f4d54ded9c1477ffb5ff0e81755cafe2c04c833f58179329be4db5284fbbcc0b6d1b
+EBUILD consul-template-0.24.0.ebuild 3306 BLAKE2B 532da4c3bd7a22d3fbadafb91c983c300602641ed751498e44ea1b21e6e931d9434d0b571128f18c2d636c1ad7265abf429553b8beed68eb8903850032786d03 SHA512 f8ea687c558eb084f834f83d7b3c251468ae92b6a8983b4c540738b265a1edacac26f1eb8389d0afc888853e27e3b1527c11ef0ec95703cddb802fb850028b07
 MISC metadata.xml 316 BLAKE2B 857b3a0a26e35ac2f52f797b85a42f91c74a10b4d8d6a1f5394465e68f6ad57bd732286650966f99cc516ec68d00f31f0f880931e2041cb596d50e521ac3a599 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad
diff --git a/app-admin/consul-template/consul-template-0.20.0.ebuild b/app-admin/consul-template/consul-template-0.20.0.ebuild
deleted file mode 100644
index 0dc27765b37a..000000000000
--- a/app-admin/consul-template/consul-template-0.20.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="Generic template rendering and notifications with Consul"
-GIT_COMMIT="9a0f301"
-EGO_PN="github.com/hashicorp/${PN}"
-HOMEPAGE="https://github.com/hashicorp/consul-template"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
-SLOT="0"
-# TODO: debug test failures
-RESTRICT="test"
-
-DEPEND="dev-lang/go"
-RDEPEND=""
-
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e "s:git rev-parse --short HEAD:echo ${GIT_COMMIT}:" \
-		-e '/-s \\/d' \
-		-i src/${EGO_PN}/Makefile || die
-	# Printf format %q has arg r.config.PidFile of wrong type *string
-	sed -e 's|remove pid at %q: %s|remove pid at %v: %s|' \
-		-i src/${EGO_PN}/manager/runner.go || die
-}
-
-src_compile() {
-	export GOPATH=${S}
-	cd src/${EGO_PN} || die
-	#XC_ARCH=$(go env GOARCH) \
-	#XC_OS=$(go env GOOS) \
-	emake dev
-}
-
-src_test() {
-	cd src/${EGO_PN} || die
-	emake test
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc src/${EGO_PN}/{CHANGELOG.md,README.md}
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-}
diff --git a/app-admin/consul-template/consul-template-0.22.0.ebuild b/app-admin/consul-template/consul-template-0.24.0.ebuild
index b43c4c0bc0ec..bf93081bbff2 100644
--- a/app-admin/consul-template/consul-template-0.22.0.ebuild
+++ b/app-admin/consul-template/consul-template-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ EGO_VENDOR=(
 	"github.com/frankban/quicktest v1.4.0"
 	"github.com/golang/snappy v0.0.1"
 	"github.com/google/btree v1.0.0"
-	"github.com/hashicorp/consul v1.1.0"
+	"github.com/hashicorp/consul v1.2.0"
 	"github.com/hashicorp/errwrap v1.0.0"
 	"github.com/hashicorp/go-cleanhttp v0.5.1"
 	"github.com/hashicorp/go-gatedio v0.5.0"
@@ -50,7 +50,7 @@ inherit golang-vcs-snapshot systemd user
 
 KEYWORDS="~amd64"
 DESCRIPTION="Generic template rendering and notifications with Consul"
-GIT_COMMIT="005b42e"
+GIT_COMMIT="521adf1"
 EGO_PN="github.com/hashicorp/${PN}"
 HOMEPAGE="https://github.com/hashicorp/consul-template"
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
diff --git a/app-admin/cygwin-rebase/Manifest b/app-admin/cygwin-rebase/Manifest
index 927526a438c8..26e28839acc1 100644
--- a/app-admin/cygwin-rebase/Manifest
+++ b/app-admin/cygwin-rebase/Manifest
@@ -1,5 +1,5 @@
 DIST cygwin-rebase-4.4.4.tar.gz 114445 BLAKE2B f0741513fb3b636876ce6e33b882e4075d41606118ec1c663939b2e9a9d8690360011352f27ebfeffc49a644b5de8c5026bcab0fb7fb9b41ff36ee6cd6c031c8 SHA512 d155b05f663fab971c70b6618755ac528d49b96e17017c0fcabf26332e4a50c46ee346705fc59490f741bf37625e94a2bba8cc36d41c23f5643d54d08eb1051b
 DIST cygwin-rebase-4.4.4_merge-files-flag-0.patch 15409 BLAKE2B 6f8061903439c9baa508eb130f43fe5e9fe8b71725ab5efe92d6d8a667b71c467f2f0fddd8b4ca22c68087e24bbafc2db6c288ef87d125b23c8f8d35bb1b5a37 SHA512 b067751218026867681c24003a4f224599b5fd6a29920c3662b7964a3447db8b6b680acfaab637de911ecea08c3196bf268eba3237b92830dcbf531e05842fb2
-EBUILD cygwin-rebase-4.4.4.ebuild 2091 BLAKE2B 8cc11274e52166cc9bd583232af064e958769118ca358667bb616c0099daab1ac7c0ce28bbd741591a63b190735f613d14eacf2f7862f655148fca045a82bfa3 SHA512 729023a30a25665fd8ec929b008ff9b0aeac38e0594ce0301dd415296273019325fb4d0fe961e0ace25246601a094fb660e6ff57fc5a29b78db9063ffa528b12
-EBUILD cygwin-rebase-9999.ebuild 2091 BLAKE2B 8cc11274e52166cc9bd583232af064e958769118ca358667bb616c0099daab1ac7c0ce28bbd741591a63b190735f613d14eacf2f7862f655148fca045a82bfa3 SHA512 729023a30a25665fd8ec929b008ff9b0aeac38e0594ce0301dd415296273019325fb4d0fe961e0ace25246601a094fb660e6ff57fc5a29b78db9063ffa528b12
+EBUILD cygwin-rebase-4.4.4.ebuild 2178 BLAKE2B 40b94933cb27d87d3cd5802536a90f7a417354a5bee6e9996490dc335c03f81b49ab834fccdc219f4e8d4284e4c5fc0d1015f528433e786fb37957f05848ae7a SHA512 3eb82c9213a49f2049bfc5b31f30c5cb25db6328812b76785e4cdcd9c4abea69a2b27cb7779a87867a99b3bb8f4096cd42826b0bc6e8452e8087884cc027a65c
+EBUILD cygwin-rebase-9999.ebuild 2178 BLAKE2B 40b94933cb27d87d3cd5802536a90f7a417354a5bee6e9996490dc335c03f81b49ab834fccdc219f4e8d4284e4c5fc0d1015f528433e786fb37957f05848ae7a SHA512 3eb82c9213a49f2049bfc5b31f30c5cb25db6328812b76785e4cdcd9c4abea69a2b27cb7779a87867a99b3bb8f4096cd42826b0bc6e8452e8087884cc027a65c
 MISC metadata.xml 782 BLAKE2B 4d7688c224e77a1d55ff300ebfeed95f8dc80152a0c99d99beea493c592b10cdc351e113045929fa3a322f782ef978c54d788f9af6807ae38a7793b7183789aa SHA512 09c64f2e195b53bb1c2fdd1b1ea1ff8591458d592f81536e9bf9e3097a7f4dc6347369c74afe9aaad7369aa65075d38c68eb4b803c8c79371945a51e91b10fe5
diff --git a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
index 9575601c7c86..f80b7c07b4d1 100644
--- a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
+++ b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
@@ -31,7 +31,7 @@ else
 		https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch
 	"
 	PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" )
-	KEYWORDS="-* ~x64-cygwin"
+	KEYWORDS="-* ~x64-cygwin ~x86-cygwin"
 fi
 
 DEPEND=""
@@ -60,6 +60,10 @@ pkg_preinst() {
 	local rebasedb
 	local baseaddr
 	case ${CHOST} in
+	i686-*-cygwin*)
+		rebasedb=/etc/rebase.db.i386
+		baseaddr=0x70000000
+		;;
 	x86_64-*-cygwin*)
 		rebasedb=/etc/rebase.db.x86_64
 		baseaddr=0x1000000000
diff --git a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
index 9575601c7c86..f80b7c07b4d1 100644
--- a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
+++ b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
@@ -31,7 +31,7 @@ else
 		https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch
 	"
 	PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" )
-	KEYWORDS="-* ~x64-cygwin"
+	KEYWORDS="-* ~x64-cygwin ~x86-cygwin"
 fi
 
 DEPEND=""
@@ -60,6 +60,10 @@ pkg_preinst() {
 	local rebasedb
 	local baseaddr
 	case ${CHOST} in
+	i686-*-cygwin*)
+		rebasedb=/etc/rebase.db.i386
+		baseaddr=0x70000000
+		;;
 	x86_64-*-cygwin*)
 		rebasedb=/etc/rebase.db.x86_64
 		baseaddr=0x1000000000
diff --git a/app-admin/denyhosts/Manifest b/app-admin/denyhosts/Manifest
index 9dd173d3d656..645b84de52b8 100644
--- a/app-admin/denyhosts/Manifest
+++ b/app-admin/denyhosts/Manifest
@@ -6,6 +6,6 @@ AUX denyhosts.service 265 BLAKE2B 4ecccdf6f605936ffb7339c2ec2510f14b0817cf3ed3cf
 DIST denyhosts-2.9.tar.gz 49472 BLAKE2B 94f18da3db9dd7e0d979d4fb536160114fe1dc95ac43ad1f7bf3f235702698210e62b3872bf7f3360945228b187d97a274797d535a9b12b552bddf649b5d1fdf SHA512 f41e2985e84f0eeaa493def6b8609de934889d02b124962b0bfd02ebe5e41d0670822124eb50ed84eb1c3b8a2a96775fbe09386cef48a3c3e04949fd6b1452c1
 DIST denyhosts-3.0.tar.gz 56283 BLAKE2B 1ecb8a13ec9511cb4ac65579aa8f88117264f231b586c30a61ad9c78abd17aeebc5642e70f162fa7e73fe81a99821d494efca213b1bf864fd0e2043fa4374e6a SHA512 8a1c796c259049ffab2c88cef780b175ec75c94216841421f831dfbf45f4ba0cdbcfbb0e3dab7200aa79eeb2416db5234ad5016d5770d8ab2f28ef4c9754e70d
 EBUILD denyhosts-2.9.ebuild 1860 BLAKE2B d1a3b4b0414fce7fd1eabf226e5fc46abfeae98cf313b2c32bc36a6447625bc3f31f0d0300c5d7b17a328a22aef934f914adf9265ffb15bdcec88fe87fefaf78 SHA512 170d31711fc00f51e6b177cfebcdbeff660a9d2b6cc3eb953d4082e7d3d265cf371da59890ee92b29fea8a2aa740cb25373c0ad6585e9e31db515fd87f512ff4
-EBUILD denyhosts-3.0-r1.ebuild 1775 BLAKE2B 5a9df3434e7aeab917dc264753e53933e1aed159f86c0f88212fd68984be5cdb0b17ab264ee3a4f0ee07d2563430e89a732a44dcda8f8881418bf225753243c1 SHA512 ed61ce1d32e7cac1673b9a45bbd0d8c8fcc8f44ff51c9feeb67c55338ef85a9f1c13475c0749d1f53fc5e8815bc37c2ba407d538f152dddc71d81cb25ca30877
+EBUILD denyhosts-3.0-r1.ebuild 1771 BLAKE2B de1ab92da12f25976c8c63ebcd9ea97ee190966d3e720ddb323e4e7855899e8b6bdd86d60e60df11107b0f5227ea87468fe2a6800be006e953a66205fac7fdaa SHA512 b9b796831a3a733ba57d05fa1dff73df5da1b6bd6d3a9c22d51efd8b092a82decf4666e61c372ae0906447e91c10aef13f26c3c198fc0495217dca1add2988a3
 EBUILD denyhosts-3.0.ebuild 1672 BLAKE2B ffce8305ca9db71a456c8163a7bb1fdfcf7187b4433988c93e01f94407dcc0edf577b8d187ad017ff4e357e56d907aa4d34cd4f4d8b292365d46ea2a079be6aa SHA512 660bca4d0ca9fd4eea074cdfde7629d06cb4c6c48f3b0cf9674d6ad62ac931cf51624b67e52862b6b284157643f634495bbce7c6b927bc1b80274ed497a9aad0
 MISC metadata.xml 402 BLAKE2B df1bce989ad8c249f83b5ef00681d455ca645b9160456b615c5a18c1d564d3dff8f6021ed95b9c7ff0d5e6939fe2a99735b4ed16ea8360f021000377f981503b SHA512 0a232a4ee999ce021244cc19ad62e68c962fcfb1cbfda1aef306e6b3376e3944f233cff133c746aedc3f68c60a61511b0a749b434515b705f63d68a034951ed7
diff --git a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
index dd343435a062..4c2b0faee1ed 100644
--- a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
+++ b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 eutils readme.gentoo-r1 systemd
 
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index 8c8ad33efafb..003fe93fa6f7 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1,5 +1,5 @@
 DIST dxf-7.5.1.tar.gz 308004 BLAKE2B 6f8aaf39fbf3a9ef813d5af502361fac3827db17fa5279c3a53e8b87826cac15ef59cb41b2682c9eea065e0a30d98c2b22f72b4922869a012eab76274b1ff325 SHA512 f1a5082d70c115da9f01385e40ed7d2c1ce82af6fb9e55c8f3173e544a9ff3e98c8c565c9e6a2ca1e9a688665944ec0d9dd873f621914d5b746ef4a145f308a0
 DIST dxf-7.5.2.tar.gz 310576 BLAKE2B 0b9b79b4278c2e4137105952d070bb5ce8b7b905881fb10d38c2504467ccc4e6ac8061651b2e82cae1af3e7d26a58904dc1cafe5099519e0ad14b6760131ab82 SHA512 2fb8d175fbcb13dc9160b28d37e5d74886826764b2f5b2cc9a1aad0cff59f7bd5146c15b130cb760406a9bbd4abd650adb050db72bd81dcca9e9b05beccec769
-EBUILD dxf-7.5.1.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
-EBUILD dxf-7.5.2.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
+EBUILD dxf-7.5.1.ebuild 720 BLAKE2B b01d2a383367854d9feb12e811f610a2be6a40bbb7be14517bfae522aa2effd62d883ff0ff708d7d093fe28693f4d1852afa8479497ab95d37ab7226d899ffe3 SHA512 94bc85970caab54d402c39251ef483b9e743a7a103f361f669ea334cd20c056ba15ddba6c395b385c41f2a91bb51af4d218b7394152c4edcf1bb0b54fc894a3f
+EBUILD dxf-7.5.2.ebuild 720 BLAKE2B b01d2a383367854d9feb12e811f610a2be6a40bbb7be14517bfae522aa2effd62d883ff0ff708d7d093fe28693f4d1852afa8479497ab95d37ab7226d899ffe3 SHA512 94bc85970caab54d402c39251ef483b9e743a7a103f361f669ea334cd20c056ba15ddba6c395b385c41f2a91bb51af4d218b7394152c4edcf1bb0b54fc894a3f
 MISC metadata.xml 295 BLAKE2B b3270ada06f2998a84e5484b6b063cb5e1c397be2bb266ba10352e811f35e25576469488cb42eb49ac718c6e788861b706aba3e1cb673cbbf176c576fc5745a5 SHA512 99b0deb01ac0e00d6f958c41a9ad8a68bf606a178924c0f052a656d0bdc2638b711e4fe10ab49e1a943ce7a8c29fc77b94abd4a91f6f65a3debd892d8a099339
diff --git a/app-admin/dxf/dxf-7.5.1.ebuild b/app-admin/dxf/dxf-7.5.1.ebuild
index 2b55ca80585a..b0026d78ef93 100644
--- a/app-admin/dxf/dxf-7.5.1.ebuild
+++ b/app-admin/dxf/dxf-7.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Docker registry v2 client in Python"
diff --git a/app-admin/dxf/dxf-7.5.2.ebuild b/app-admin/dxf/dxf-7.5.2.ebuild
index 2b55ca80585a..b0026d78ef93 100644
--- a/app-admin/dxf/dxf-7.5.2.ebuild
+++ b/app-admin/dxf/dxf-7.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Docker registry v2 client in Python"
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index 696dbb8bfba5..f52d848bb06b 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,6 +1,6 @@
 DIST eclean-kernel-0.4.3.tar.gz 10650 BLAKE2B 228d17cfc5bed34e892dd6340498b87cbc32f22e83aff70824ef24f88836e3ad2306eda8704e25b7cfbadb33984edee8effd613dad67ada25519c601ec6b6ec7 SHA512 a2ffbfe800672ad0cd105425497dae72c0779ec9da5ba6a6b4efd8846762467acf6b8e70c67744e7c7639d5ba2ba4643ad344aae193e72d12d12f48b1793ff4c
 DIST eclean-kernel-1.99.4.tar.bz2 78909 BLAKE2B 0cac3a001c3180c57bdf9a63366d9950928690328fd560f984c1d35bcf88712e897462a153bc3f0250ebbbb42518798e3407c3533351543ff32bd68ecee2ee5e SHA512 f3263b83b36878104e21fe122eb96a16c5c5a930b062fdd62d6a574db597644222d5a19d7833cbb894a955076b06bcb1a22c94d5f87c2787420dd1de32d0f789
-EBUILD eclean-kernel-0.4.3.ebuild 486 BLAKE2B 61aa62a599230c6ae820f451ffdc097c70135f71c1636e2368bc72e8ee774760b1c550fc1b1165417f2c48654939fe3153e6d33389435e4fa2a335def9151ee3 SHA512 ec24f6ad1ebdd673dc983808850cc96e84a3194c0c1634ce1f49631b9c3537ff0913cb512883e702e53ffccdeb16a284901ac3294c1ee52a3f0cf5a12785b585
+EBUILD eclean-kernel-0.4.3.ebuild 479 BLAKE2B 9cb762afc88d2130111fc1ba073ff25650a05071a558bf04361709aabbd5b67910fd2556be99ee577c14beef0140d6d4f5a56490d039cf2327a5a6ab50033e25 SHA512 41928b24b5875d026524a439a935bed48b1d6d168997559733ea7940cb829491ed3bc49a9d3db50f59846635fd8560129965c419a965dd8c7a4dc622dd8d2e0d
 EBUILD eclean-kernel-1.99.4.ebuild 362 BLAKE2B 20894519cc3270ab4880c0373894638d18ecfeb34fa49a7f801e4889d22f78702c87201c3cba929092b38149f3b14109b058f95f597eea8c1507011af37b14d8 SHA512 61b64ce5d1f0e842de988f1d62bb41af6e16ef73a05ab35b90d97410292c5409c3873fac6dbd9a09e4be033cd19e70a283cfd6be48183409822c29ef26abdc85
 EBUILD eclean-kernel-9999.ebuild 401 BLAKE2B 075d11ebda0764b47d16b0bf36174af6554ea42b1a62450890b7051f33a9fcc2691a6da8a1e73161e38879af2eedefb6b5bd7aceb01c5ed92050f505e805c75c SHA512 efef86fdb8d6d8f65f6be0693967449d6fb36bb45e9346de2ea60ef9ca0178bb61303b2415a0a589482ff0dfdd020812206dc0fdefb6ac97a6c2e6de880a3843
 MISC metadata.xml 539 BLAKE2B 23dbdae146e666b8698181642673dc708027ddac7c33a9f53edc9cbf1d1e1ce62e8d4531a6962098bdd6cd2029369b587823b2f9630e285b43c0db340b29e70f SHA512 2a74b715ba28178d042f907014b02fd181e0e481f4eb9230b15ef542be61b2e1fce17efba4819b6d06de09ed7988b39047b59182b6c4de86a2a05ad0350635dd
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
index e7bbda32ef41..9cfd87c20ad3 100644
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/app-admin/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest
index 00a8c59ea7b1..0aa1c24321b6 100644
--- a/app-admin/emacs-updater/Manifest
+++ b/app-admin/emacs-updater/Manifest
@@ -1,5 +1,5 @@
 DIST emacs-updater-1.15.tar.xz 7020 BLAKE2B bb35103b328a57dcaeb11c258bddbd3a08141d1e245ac4943c7a5a8b815440db0cd06eaac01ad2a00e6e2aa0d23311d774d190fd761be66514856077b3c4e296 SHA512 8cc7dd3e0e28ae71030c7c5f29d54f24e12adcbd0615f3c598ad262bd233f028c2424c277aac7dff7b4201a2ac24bfab0e05d1fdc07edcee2c184a733f699b8a
 DIST emacs-updater-1.16.tar.xz 7112 BLAKE2B 82160ef71b4c22a385a45765c1f60b7d428297cfb3b51f84bd44b176d1bd302165f9ccdde803aae628a2dab9e0520098082232c513b2006ae5facfa283f287ab SHA512 3de3126debc49ea47bd57802c1a3aa82a0769ab392741fb891c93ffb66141f05f58025fa0de746ec78795fc34c135536740e447e1f6a4ae59aa847d21bd6215b
-EBUILD emacs-updater-1.15.ebuild 947 BLAKE2B 0e2bbe9663e9bf7ce6a6c8c53a6749b59d969932866e14a6d0b8313f2b0765019e97041a784639f3db09484204c054233c073c3815b5bfcd5ed4068f1bff1d6c SHA512 5435bacfd84cbc37dbc36ecbcfa88a2c7652c03bd0584182104a2afdabb24b249234c7459cb7a498f5437a9f7b114f30f2f6a17ae83f04526e6845b0169f857d
-EBUILD emacs-updater-1.16.ebuild 944 BLAKE2B ba26ec13d9bb84f684b4569b2b05c22ba927b428e06d9217815ba3255e8d97ea530f70b871e72165baa625e679d4a78b2d6534efeff8421e07f3039d8cbe08a2 SHA512 ce82d545fe6da6f30dfdbb077da016d40041be126f7fc653c547202efc21d72f2907bd90571739b798cd49bdf186e3157864a85d4a660fa6220e874806da4a9e
+EBUILD emacs-updater-1.15.ebuild 957 BLAKE2B bfa173af13e52e7817c484f4bbef4d79aa5a6b7528d0afb5e2b09c288bfd7ce6f6baa531bb15c24887874d51b9fa1970d99fd50e605833dc8837dc597e5ee910 SHA512 2b983f27d51641be316c36be984b7903dd8649c9f0ffb1f2fe7d319e0576804259b99fb76af0acd185b0b856c1b83b406576eb59f8ed193641af016f19ed9f62
+EBUILD emacs-updater-1.16.ebuild 957 BLAKE2B 5bcbfbe1525fe0155c91d86c2655368015460c122357fdb70dd1e416616f25989388e83b06e273bdf8b086fac26ffe20186e4f65d954b94ad50c84a4bccdcb51 SHA512 d5066a2295262465c63e14bd759e07e8c2a132cc0d0ab9c781c026ebd8f8952db8e7d566d362198d801d1f18c2c48064da3c246ccbb223f7a435c3415e94c552
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-admin/emacs-updater/emacs-updater-1.15.ebuild b/app-admin/emacs-updater/emacs-updater-1.15.ebuild
index f95293356b5a..67fb00c7d8d3 100644
--- a/app-admin/emacs-updater/emacs-updater-1.15.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.15.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
@@ -13,8 +13,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-l
 
 DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
 RDEPEND="${DEPEND}
-	>=app-portage/portage-utils-0.3
-	virtual/emacs"
+	>=app-editors/emacs-23.1:*
+	>=app-portage/portage-utils-0.3"
 
 src_prepare() {
 	default
diff --git a/app-admin/emacs-updater/emacs-updater-1.16.ebuild b/app-admin/emacs-updater/emacs-updater-1.16.ebuild
index 37785564b0ee..388842d4d07b 100644
--- a/app-admin/emacs-updater/emacs-updater-1.16.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.16.ebuild
@@ -13,8 +13,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-l
 
 DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
 RDEPEND="${DEPEND}
-	>=app-portage/portage-utils-0.3
-	virtual/emacs"
+	>=app-editors/emacs-23.1:*
+	>=app-portage/portage-utils-0.3"
 
 src_prepare() {
 	default
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 17a43513b262..873650ffd07d 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.6.0.tar.gz 3754205 BLAKE2B 9dc109ec33e9a11199f49adc45b388e1c3c62ebc060b300568fd42c5b6457b1c0373939b325c0b0be462dfacf3d842a7eca66a01efd8685d6f621401423448ed SHA512 8d00dd24ef8098c156e756d082c039e9753fefc11b415435725f536faa5fa8e4eb652ff8c0c82452ab84512f7491aee970d425910bfcb2529568589e5dc9c6d2
-EBUILD exo-1.6.0.ebuild 545 BLAKE2B 1e55be70abe5f2e18f9db5058bbe72eda356212f9f698c7c9f5130d40a3da55e466412bf173952f0255370965f46b9b2af1faf8cea448c52bcef36fddcc57b1f SHA512 72e9a1fed8dc44277c4a29f71837cda8ae9a8e9ba591d78918e860122630fe6c800f4aa49d4dad62f97ee4d216212135ec9de61cc5acc8a2747a3cbf3bd00661
+DIST exo-1.9.0.tar.gz 3805146 BLAKE2B d2626270b6caa31a3c6853a0676a70d05a8165da0d229d44a6245840c76b91dcee0f44361373ff9e36138963cae0bb29245287ed49d155073a957f74049e2d08 SHA512 4c0e909ad86b9c6920e6a7ccd165fe126402399ff751add52720a44def6b43498a3bbaf2c70efaf966dbeb5bf3c41f8b8f73e40b70d3b58b732ec7e701e76871
+EBUILD exo-1.9.0.ebuild 545 BLAKE2B 562b5fe10e3d43760a064802b16534ef5f5ff2805247540040c516ec9529d30732ef62097d786b802bf6f51c5b9a0684db4aabe3d3cb64424d8f8ac4f26fc846 SHA512 83ed8951a35bf081ebfe4f9536f29d341c11482d070a64c17b6899ea8d774c0ca11e3eed77af4f1e7016756b08f525de28544cfd8626154346bdb291d925c833
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/exo/exo-1.6.0.ebuild b/app-admin/exo/exo-1.9.0.ebuild
index ebb329b957ff..0af1e7521f7a 100644
--- a/app-admin/exo/exo-1.6.0.ebuild
+++ b/app-admin/exo/exo-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 7bfb3ba85b70..bcc7143b55c7 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -7,10 +7,12 @@ DIST filebeat-6.8.4.tar.gz 35552503 BLAKE2B 165edceffa71318d77363e4e8e737663eb45
 DIST filebeat-7.2.0.tar.gz 46415588 BLAKE2B a8940e9a4a85e6eac79dca3418d3dcd14c5a1062741dd895c561d1498c287bb974a5ac89d5b353dbb75e78e6c67cba97a08d41528042db4e4d76bb46016fac60 SHA512 67d251cabca10a1f6d392be8e6203e66d4cf5d63ceb2af88185ea4824259995dafd3aa8dd2da326d079cfcfedce5996f173cd6c50972db67cbe25f660683e5d1
 DIST filebeat-7.3.2.tar.gz 49977990 BLAKE2B 6219a382b415572fdea2ff4b0aa3f02b3c1e500d77ed5200b6d5b4334a08b8e91d389ea41b3afe98355f8b20e7f8ecaccf5996f0bb7aad5f10e0f0d69400a0d6 SHA512 75943b251343d28f478f2f19665e4ba31f5bc6e4b26f6e6da8aa062322da4ab8e134c87a9557a97677ba3b22484c44ebaeaeeb87866e0f12e67f1647fe34131a
 DIST filebeat-7.4.1.tar.gz 59665819 BLAKE2B 5af538d317713d42d79d43b58344149980d4bf07b99ea6e6b29562cbce8e221f067881b85a78e4b6dee4973f42aaca1108e4941b1c3041df6162885a7c49d57f SHA512 917942f2434ed09ccc998e75d4272ff03ed1536bfa8c7f09d48f11bccdbe0315d298bc3aeab3c66be3ac3d9fabac506c8b797aa4560dceb7f1978ac420d35696
+DIST filebeat-7.5.1.tar.gz 64347061 BLAKE2B 02187df1cbeb3bb2dace7b69a8d507c613126d213e5521bd637b808f1060463a8065c706e247381905a376fb5b91044760d0a5676bb7016b14b0445bf73e0100 SHA512 b1be054ba97b5bf491bffc3167efe66a698600956e1de358294af0853d36df9dc3612dd232d1e40e745d419426dc5b4c0effcfa8d738f78a2d6064519a5570a6
 EBUILD filebeat-5.6.13.ebuild 1593 BLAKE2B eace0e8d7977b82028436e2c55c4a4bf19a7c0b57714cf6b7cc1e7176e9013edb889065f58740f8db51e38164f6e567cf809d9c4fb82de1d7e064580ef8cafaa SHA512 8eeb1e64ea6d8e06a79ef9b25103d523718f779e351ee5c1f0a00db67d1e28405ccdc371ae5c0177861276db40c848b78ee2d1eff16c14da3efca3c7576ae399
 EBUILD filebeat-6.6.1.ebuild 1477 BLAKE2B e77d50b39c421fcd161d066248e4af864f8c9e414ac36d9c043ee40372ee0c7e84f2e72d45d00a7252877f1910cf5db11dec88a5e0ed7008c7600ce9826c358f SHA512 ba38e1a89475555f7941a566b717ccf26d27694914615fd4c1d3b8916a1b6d20bf395412bd1a25d8a6f62d06a301a36325acbfb32b0b37dc0270b55e31bec284
 EBUILD filebeat-6.8.4.ebuild 1508 BLAKE2B e83622851a3dcdc4bb54c20f8f3e62c682a5bcda3e6fd4165bc6551724c5fae6da3fd1f818fc23b64f3b07b2891c270730ea66da66e53ef35b17942bc872c75b SHA512 3e0d35163aa280ac21092c0f9bfef094fdaa6716e92089add9775c07d37fbaa127766fc60c202222f6e25fea919d2473a80e6f0944219da55a886572ee3bb11e
 EBUILD filebeat-7.2.0.ebuild 1500 BLAKE2B c21cf6b0e97aeb03ed9975ab64e50cafaec0920767d839ddbbfdcd4cfc2751d2f6852d45e95ef8d3d4ed8852e0f3166467b5c8e89cf5e127bf7a03f346c189e0 SHA512 9e2c8832931b23958a18b7acda6edd91672c2f9c9e033196e4d83c57eb54fa73663006844739fa9d628ce81bcbcd307ce78f1ef3d243d5db3af361f7ae95444a
 EBUILD filebeat-7.3.2.ebuild 1497 BLAKE2B b130f2fa0916e4b37b238fb87ef6ab80f4d94bee5df788873537b9031a718c4300d3582d7fd070421f06a8b034b853d3b4a89353d572006160a660cf8882ee8d SHA512 900e496e61e21a2ccbc5eb657161c03021f0b95315d688ace1d4ef1c00b73d20f015aec5e562d7d3d72a139daf3b342501d2515d782635bbd64fd2752641a422
 EBUILD filebeat-7.4.1.ebuild 1508 BLAKE2B e83622851a3dcdc4bb54c20f8f3e62c682a5bcda3e6fd4165bc6551724c5fae6da3fd1f818fc23b64f3b07b2891c270730ea66da66e53ef35b17942bc872c75b SHA512 3e0d35163aa280ac21092c0f9bfef094fdaa6716e92089add9775c07d37fbaa127766fc60c202222f6e25fea919d2473a80e6f0944219da55a886572ee3bb11e
+EBUILD filebeat-7.5.1.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd2521334c42434e30ac0a29b7647930c9265dacafb517d681746e919db3ad67fa07f142bef3a7e302e826137957af5131 SHA512 7a8a32a3e8f1677c496df38b22764340f7ded39500a6dcd9f9c28fd82eaae0131e9d17ad43b4952744e9b486ad868ad779bd696af203bf1663c1d5143dbe5cf9
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-7.5.1.ebuild b/app-admin/filebeat/filebeat-7.5.1.ebuild
new file mode 100644
index 000000000000..8836479b860d
--- /dev/null
+++ b/app-admin/filebeat/filebeat-7.5.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.12.9"
+RDEPEND="!app-admin/filebeat-bin"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+S="${WORKDIR}/src/github.com/elastic/beats"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# avoid Elastic license
+	rm -r x-pack || die
+
+	# use ${PV} instead of git commit id
+	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/gixy/Manifest b/app-admin/gixy/Manifest
index 70c38db7bb0f..3169f3559a26 100644
--- a/app-admin/gixy/Manifest
+++ b/app-admin/gixy/Manifest
@@ -1,3 +1,3 @@
 DIST gixy-0.1.20.tar.gz 710691 BLAKE2B 09043925d950a9a35de4df91ef3c2f9e5ca4458227320555a109e50d0838fb10ae22d086cdfc39c0d76bcd051c1a7e1d5e291354cc457cff398be8d164cbfde6 SHA512 d666e758c2746c201a11b67b4b99cee1bd3406085eb1c0aa9ae520b72d3a1273e09e3475226a6e54fbfbcefe65b3be0fc877e66cbaa81f384f757767852bc08e
-EBUILD gixy-0.1.20.ebuild 994 BLAKE2B cfaf2ebd94a13e53a770ddf5cdf39245f9150854d7a6ad7760b847cd71e9dfff6178c8a89deb850c1d1fd03c055217107e5253c98f5b3a6c101d369a171734aa SHA512 614c10331d06e950a1bb0906d8deb8c7a503b8abd257eed8605eb5a5972859105087ad4837aa390152b0487ed75b7a222e50f57f62eb26b5603d7f12aad51767
+EBUILD gixy-0.1.20.ebuild 990 BLAKE2B 0acef9a90eb2a835c462ba2bab144d7ec5b18172aa3a004244e1d05046d530619ec64968d542b45110b6c4d4a4f4150db56ddfdc661c7fe9ef77419438e8737d SHA512 4aae50c194c7ad7d1a7ca1f26f4bd28b09f6d20aeb0146258db2d992a620e1c09c485e7f069ca060da034c2e013f687db08450d47f67ad4a2921f58daf2870b6
 MISC metadata.xml 248 BLAKE2B f2e59d4d05a017ebeeed31b36a72a279974f8fa64886873d23671f1fa91bcf3152acf9652624f2b1a2f5d9524bb24ec7dab734ce43e8cb6475ccfef67af40697 SHA512 c0d402a47544d8f31d1fc9f23fef5d84bf000f2a9a8a07c8b23899306818152aa71844f1d9310e0c32a354189be1f53ae8c89cde90464176ab9b861e62084822
diff --git a/app-admin/gixy/gixy-0.1.20.ebuild b/app-admin/gixy/gixy-0.1.20.ebuild
index a517bd4fad8e..5bcec4d5aef5 100644
--- a/app-admin/gixy/gixy-0.1.20.ebuild
+++ b/app-admin/gixy/gixy-0.1.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index d0298c3c1696..2565128220f9 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -2,10 +2,10 @@ AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f307
 DIST glance-17.0.0.tar.gz 1961137 BLAKE2B ff649ce366739320bcc5073cb60cc24ab09e098bd6808374007f89808d6caf020a77f711a714b34f8a1ef5b0754220aab7c35c02fbdc0d3d0f44e24185a8cdc4 SHA512 cd10bd2d3e98ab1a80ec4f09b5954dbc334079a36d3dfc0d27c5a4f40e5920e0a6fb91c0fc5430c9e625a375e44a8d886568f2a712190dc0f80df10b4998e9af
 DIST glance-18.0.0.tar.gz 1987182 BLAKE2B 1e30d1897b360a8691e79e5e4eda290148146dd55103ea44c5f2cc96990dde0d2cf6bdf785913b5712dc0dda4a79ff0a2cf9bac1a58f5195fe5f5cc22116cae6 SHA512 79129c6ee1cce0fec0c5e656a97278ae275aa8ba33690ac62959f317c4e6b2f548ab0c97f0905dcda2500594acb3f5c05644064bdd3cccb443c593513522d274
 DIST glance-19.0.0.tar.gz 1942312 BLAKE2B b4b3e6cd86385dfe19d4a3b2e9c900006aed984457da71433ea1608b177702f1f0cc5c5057f475f7c0024d18fd196b48a774514511534cf6d325d5c9ccc1cb2d SHA512 7c72f988f2baebd6af17cd7de8e5daaa0ec889d8f210e3bb5cf45bd4d9296b45f1dd2dbbd1709705d0e2b6203bad60faaa11a56328124d47b95328b6678827a6
-EBUILD glance-17.0.0.ebuild 4933 BLAKE2B c13548031d58d2009e6cd38721ce97c966ac4e26ebba60bee1047115de63978d51ffa154d1b7ca6f929b95c0faf988f10387c025bb3e200b7f356407933d1f5f SHA512 e279c6c8a4c225c3c82c6d4d0e42c445016d18ac30ed7b36402462c6b2d7028eedbd117574191ff383a532dcf9db34a261c9e3df9c3f8a590073df4bdecf4c1a
-EBUILD glance-18.0.0.ebuild 5064 BLAKE2B 9853b05b91e6698cff58658ce9bcaab04fe188d25b3dbac8f52e9054d667482fc0dde4ebdc6d703a4bfcd4d566e928e0d33517cbf9204ea4e03ae4f2137b574a SHA512 994297106d3ed31c1d81c82a6c18eb0aa1ce1838bac168be2007a0c2da5dc71b02dc4f0f2e033b5ae2249c3bbc17246f90e950b4dbdad784a73f69b40b206090
-EBUILD glance-19.0.0.ebuild 5205 BLAKE2B ff6e2aa0a084451b2095975114bdbc344eb76141886f57ea2b801719de189b278a76a3cc2545fd1a9d8019a651bff357bdf7e4b5967205e1ad25ef531f4b05f1 SHA512 c1630713694c6a99792d63c36d3a34d4c5fdc7b4c1c5248216b32cececc2da9f6458775b9b11def48bd29c775422793f8152cd9291ec423ece6ac4dc99ce37f9
-EBUILD glance-2018.2.9999.ebuild 4935 BLAKE2B ee851e3b85ac17acfd1c4bd17872ad5d4fc244b5bd674a679893e2d1cff0c6037e1f8503cb8cbdc24c577ca5f31ebac6164908433c4973f755bd8525672432ea SHA512 12ead5e77d22134e34e3b25408e7ddb2914e5cd027b4ede10a25cf5e258e16bee75ce897ce0abf0f4218525b00b8281e8b60e18926dfcd416186f445bf6ba7b5
-EBUILD glance-2019.1.9999.ebuild 5107 BLAKE2B fca67661ccc03db0279824d6352afd1d20103bbbb1e946eef4114d996f395bdbfbf152e88137c88d12961415d1d8136888037709f47f50cf1ed3f7dfe82d658b SHA512 888b1ca0843323152ffaee1e8a5b71ec2d327f58014559e4d77caed27137ba74ade854b8afab06c8bfeb578c1204d9f8a5a09da5bcfe5873b016aabe8499fcc7
-EBUILD glance-2019.2.9999.ebuild 5207 BLAKE2B 4b03352ba0db6877180ba9fa0de0e53208c59aee13c7a6fc91f838d509c1d8b400af69ce2209a3504f9afa33d6421c188a6a1810b82bbe2ae56b6f5bd52edda0 SHA512 6c1f6ff8b1f173bc936dba53e6fe28876469fca72df61fc7dff43646b13d0cbf2c00554f51efd3261888eac47aa7b865b808b1a3585a878531062b759b440ffb
+EBUILD glance-17.0.0.ebuild 4919 BLAKE2B 810b3e12e6ebdab1c3419875e3af41e20409a29f8618e85f823243aa0121ac943bda822625b7fcb09ddd80ab4a2d6e13b1e6dd5e36ffbcf6b54b0c95b8d40910 SHA512 afb33730008ed5b036238c8d5e3e8b45039c205547378829ad3dd4ec5ee477f03c072ea7b704dc8046bb50a82ebee63c0e0db0ff1611066714a6bd8076a2e14e
+EBUILD glance-18.0.0.ebuild 5052 BLAKE2B c0d4dae947c9028c1f900db7f06b8e426f58c87ffdc8af4cab3eae4f89b9214c57d1f3df5ea07291457aef286cc81287110ac861d419014d31dfd6fda513ca60 SHA512 7ce41af9f7b9e3dcdba945d3383fae32e9214ce827097969a423516f0ecabed98ef192eaf60c558bb5b957d66f2d0f93812cd419b1a638e5ba3b6bf861596e25
+EBUILD glance-19.0.0.ebuild 5193 BLAKE2B c157bd026ca108344b34c165b63be02b4e9e0ff2e73b8848827e1014a0fa528e9508e6066188dd3edbd3a40456c2b725e17d7e495e408578a9e7ceeec8b9dcce SHA512 884ac4dcc7a5f656b42086451a2b9c2ecfc688314fe93c6edb09141a84dc32dd84b9587d6dd105c124d339bc6222ae402c52daa9437d704be06db8e717f2e50f
+EBUILD glance-2018.2.9999.ebuild 4921 BLAKE2B ab5fc9b5ae484beabfe7e12e14cc5da827364a32e1152ec334b3e5b0205c7c0346408fba935cce98d07e50b413406ad757cedb2a08c3cbe92c877cc85a437aed SHA512 e912ea738ef569453a39f442c3474a623111248971d13a8585550d9e9cdce7a325bb0ca27f638cf537cd52df843d0e1f07a4c2ccf0882b47bdcd61a37c3bf7a0
+EBUILD glance-2019.1.9999.ebuild 5095 BLAKE2B 20218bdf5533455bb979c34769980e7506afb6cdb8b32f8bbc7647776b58dd53aac146e10fb0dca7e120874d6f3c3039bfd7726fd0ed557aacb1f2c37ce8b7f3 SHA512 144369cb922825dc9d710e603be92446ae3b30a9e1c63378ed94f9e80b2885acb95cc51dd199524a87b48f3ecd5ed3c512379b44144131cb949b75e66fee4467
+EBUILD glance-2019.2.9999.ebuild 5195 BLAKE2B 8e555be143608b80a9227ac6e59c8b7f69d9ccc2efb786647ba7238f46a4d736d97701f9fb084c59f38e2d1931d2af99218684bebee77c5ab277033f03946dcb SHA512 e3564114de49e9e5a698ffb545d9bdc4898c7994eac9522dd0317bcdbc18667979211878645130c8ba84b89036447605b136c8146872652e4c9b16c770830cbe
 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-17.0.0.ebuild b/app-admin/glance/glance-17.0.0.ebuild
index b215502cb4c6..ac61eca81156 100644
--- a/app-admin/glance/glance-17.0.0.ebuild
+++ b/app-admin/glance/glance-17.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 user
 
 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
diff --git a/app-admin/glance/glance-18.0.0.ebuild b/app-admin/glance/glance-18.0.0.ebuild
index 5c0ab1a0c891..bac7166dec6e 100644
--- a/app-admin/glance/glance-18.0.0.ebuild
+++ b/app-admin/glance/glance-18.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 user
 
 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
diff --git a/app-admin/glance/glance-19.0.0.ebuild b/app-admin/glance/glance-19.0.0.ebuild
index 918202c492b8..92286c644782 100644
--- a/app-admin/glance/glance-19.0.0.ebuild
+++ b/app-admin/glance/glance-19.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 user
 
 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
diff --git a/app-admin/glance/glance-2018.2.9999.ebuild b/app-admin/glance/glance-2018.2.9999.ebuild
index 1f4e7cbf4001..4e0dd7052c69 100644
--- a/app-admin/glance/glance-2018.2.9999.ebuild
+++ b/app-admin/glance/glance-2018.2.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 user
 
 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
diff --git a/app-admin/glance/glance-2019.1.9999.ebuild b/app-admin/glance/glance-2019.1.9999.ebuild
index 3c7b073c2f82..b987a4ef398d 100644
--- a/app-admin/glance/glance-2019.1.9999.ebuild
+++ b/app-admin/glance/glance-2019.1.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 user
 
 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
diff --git a/app-admin/glance/glance-2019.2.9999.ebuild b/app-admin/glance/glance-2019.2.9999.ebuild
index 11dd58856231..cfaab05265b2 100644
--- a/app-admin/glance/glance-2019.2.9999.ebuild
+++ b/app-admin/glance/glance-2019.2.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 user
 
 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
diff --git a/app-admin/gnome-abrt/Manifest b/app-admin/gnome-abrt/Manifest
index e2c34509c130..95ed3478383d 100644
--- a/app-admin/gnome-abrt/Manifest
+++ b/app-admin/gnome-abrt/Manifest
@@ -1,6 +1,6 @@
 AUX 0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch 4329 BLAKE2B 408bd52cd8a7ae8ae60a938da810a2af35556111791f330887d7c6f9af1f27eb50a4efa4f646144fb3e2483398f7e4af21afb4b587f6068a5764004d0efdfca4 SHA512 e7c505da3355a721c38d043fd0dc7397f664d90f1c243203a5055dfeefde7b8aafe02a8bd3acb22ba32941740e4aab38873fa75178ee1d4776a2da182e6b2033
 DIST gnome-abrt-1.2.6.tar.gz 340308 BLAKE2B 5221fe43fd72fe8798f2c11275863e6936e616632641448c53dd24118d3b6b808fc373fe98b8775f1f1c58820c06195a665f6d417c95eaa7cc333cd7660b2d0b SHA512 12bcdeefa481b7caa04da046ee11d6adc9fd582b32f709d79a2d94cf61ca02643edd418cd9257c0f732a30aa5714fe83a282a4c794ff4260ddad038f7721ff2c
 DIST gnome-abrt-1.2.7.tar.gz 339961 BLAKE2B cdacc079c4661c364f13af3102e2231adbeaf4226ba937436f5ce3ae109f28b87c9424c6dfbc016b912599205386f92c32b036ca31adbea79b9a54d7f3a27c4a SHA512 57446b1c1c312f3a47ea3dd2a40ac1d4ec5392df3181eac73086675b65d45cad9a01fba5252d073970878ef97d7d272508bc5b86a56779543ffdc8d083fb5413
-EBUILD gnome-abrt-1.2.6.ebuild 1301 BLAKE2B 3ed2d02057e0e800e8e38c87d23b801ee1410b99bd8dc97e909d3ce9f4daac61c31902cd0fd83fded91efbc2e95ff3560027809245f6f1857cd43892a8bf6c82 SHA512 ff1ddaf79e2e0d6b661b7b6f26b53cdf3c15d73a5f316df10f871dafd0970dc834f475208c80a01aa9f90a8c5a23f612924339ca734108bee710a4d09c0602cb
-EBUILD gnome-abrt-1.2.7.ebuild 1303 BLAKE2B e226eee87127aecca4842107ae258eeb7801b8b4dcd42cbb74b6727c8f645227a4c8adf7813f74bea39d7492cd67ea34df8ed549dc138b557742907555af1151 SHA512 026346f0da5a9583216ca3e36ae5f97c72af16ddbded8de57b1fbbb7c65cffa11cf8379a9167dc69522711ae488a09491d9aba52f8b783c1a36454069ecfc532
+EBUILD gnome-abrt-1.2.6.ebuild 1297 BLAKE2B d6afeb893e9c9733c0ca7f55e80bc24c76195244afe699a9efb662816a6b0667a8697f95f8d5156631f051b4b419fa9da3453871e288bdd1d6ab9dd2818d13d6 SHA512 183486b2d92ace64b16183e7fa35a44424bbb25eebe9a65cd2a94b9f03b305d7742838580bd700317e861a9e2b8b80d96ff25f38f66d33e9b06cb4e7a8d6e50d
+EBUILD gnome-abrt-1.2.7.ebuild 1301 BLAKE2B d98bb45e945c4945b831f5007e6a9b69aa4a03d8bee8e53b38dfef2bed5d95fd5b3c67c317f9fe4a78e71b806e58975b689325a710fcbfcdaf36f9ea95e1874b SHA512 3a0d1333af2f9e2adc55c0f1acba8bf856433c7f97e44dbc304588cba4151473faa10f322f98d29c474fafd5c47b50f7adaebfc89220183c10f6354fa3134703
 MISC metadata.xml 333 BLAKE2B 7dfc442159eac1c4501c5bfaeec34615e2e8dd63b982759f30a0835143a1d5b661cce8e85868be70115c93c26f7ed70389b9f7ad6ae88f93b081f126c42beef3 SHA512 8c2e01101d19e3cd8ade5da1921864d2103eaa2f140c0eccb398e2567254d839311ba1384e25e0bea316345943c0649aee92aabb3ec2092d1a9e0728436fadc4
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild
index 59a8a9135f26..bdd38d68cccd 100644
--- a/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild
+++ b/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools gnome2-utils python-single-r1
 
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild
index 053502994521..e068f001905b 100644
--- a/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild
+++ b/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-r1
 
diff --git a/app-admin/grubconfig/Manifest b/app-admin/grubconfig/Manifest
deleted file mode 100644
index b8efabaf0fcc..000000000000
--- a/app-admin/grubconfig/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST grubconfig-1.28.tar.gz 11715 BLAKE2B e3b40a2f0419e2e2f106328a63a0ea5666665454485c463cf7e36d896df083599556520c832b06a35553e4398958ca0fef34a5057b3435f3cdfc6dad1eb68df2 SHA512 1a2d864dd4d20162c55c2adf728040f1498035f04d544847f7e141bb749ab0ea9e40aaf6888e151dc8a9712d937c7f5b3630b73488f6d495199ea1041b76c2cd
-EBUILD grubconfig-1.28-r2.ebuild 566 BLAKE2B 13a8861761df7baf1e9cbe4a9c4b2c022a6482696cf0205485eacf5d4dbe925bf5da78995d42ae803b1eef692ca08a975089cc1e934a70bc9488cbe8c6e680ae SHA512 65b6f19ad12e32d8f3e3afff4efe7fc8e02ee659504e9f0fd804ddc0009863f627661e060df6067890a3eb3238a119bd221c571c3d24bfedeeae8e2651c692ed
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-admin/grubconfig/grubconfig-1.28-r2.ebuild b/app-admin/grubconfig/grubconfig-1.28-r2.ebuild
deleted file mode 100644
index 62c8d0e125b6..000000000000
--- a/app-admin/grubconfig/grubconfig-1.28-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simple Tool to configure Grub-Bootloader"
-HOMEPAGE="https://web.archive.org/web/20100410042718/http://www.tux.org/pub/people/kent-robotti/looplinux"
-SRC_URI="http://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-util/dialog-0.7"
-
-src_prepare() {
-	sed -i \
-		-e "s:/usr/lib/grub:/$(get_libdir)/grub:g" \
-		grubconfig || die
-	eapply_user
-}
-
-src_install() {
-	dosbin grubconfig
-	dodoc README
-}
diff --git a/app-admin/grubconfig/metadata.xml b/app-admin/grubconfig/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/app-admin/grubconfig/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 7732678fa893..216b51dbab97 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,7 +1,3 @@
-DIST hcloud-1.12.0.tar.xz 436432 BLAKE2B b1263bfa89cb52d197d51c181b1166db84ae10613e448aea16b7b8a5399214a82025f3282d39ac359712b3ddac2decaeda148d9b392fdcb1f5d4d7dc6aa6a598 SHA512 f557ba4515ed158e9c153db4c6de97fba17123c7128b6fcc2bb58472a54f32e342df44f634c42af06a3160b45af4f1f9c28df001a0922bfdca10ade3b1640368
-DIST hcloud-1.13.0.tar.xz 442896 BLAKE2B 8bf43da9a4db336a1a313cc6a3b10897c18af57a36d9d02cc35e0edd22e0d1f711963056edf8e5b2eb2ee32e4c5d7e3f9685963b0d438e61d338ab27a1641b27 SHA512 1352e688c2c96995539a8f2a30b4893d6ccc3e8f092ff94ceca086ff67f2e6bb26ed3bdf6fa3bb3c9d02d93264f48ff0fac2bfff649ddcc0bc94143fea5c4da6
 DIST hcloud-1.14.0.tar.xz 643088 BLAKE2B e360b06796e718df31b1640d78153a843a17a8d70a27a1771fc264b01b5649aa7b6344feba1d2856348070a74df6731d462f178cb23fdd1ada051c5695e237f2 SHA512 1fc9a776d89ee8c4f00ad71994a55151f1758ddff1083b0bdd24e569200ec996b4502ae7f8ba0fe9700a35c082385fafc817abe04aa0a7e9980b225b92ab8c6b
-EBUILD hcloud-1.12.0.ebuild 553 BLAKE2B 83f94fe447972429f478b2f60df1c2cdac0d67a7886c2aaa1ec9beef7bc932182b386c53c7ab928b19b789bfb839c11a8ecc1729bb6c3a473646df3a8058aa42 SHA512 7030b9b8444d564185eb27682c388d8c078ab9994387e93b415d9083f005063df9ae9d5324e2daf77d54256d1a00a0571730de354e744cbd9e219cd562ef83de
-EBUILD hcloud-1.13.0.ebuild 553 BLAKE2B 83f94fe447972429f478b2f60df1c2cdac0d67a7886c2aaa1ec9beef7bc932182b386c53c7ab928b19b789bfb839c11a8ecc1729bb6c3a473646df3a8058aa42 SHA512 7030b9b8444d564185eb27682c388d8c078ab9994387e93b415d9083f005063df9ae9d5324e2daf77d54256d1a00a0571730de354e744cbd9e219cd562ef83de
-EBUILD hcloud-1.14.0.ebuild 554 BLAKE2B d6f92f687c94a7785a57e5ed3e882444e291a24fe70bf984981060be3bafa92c0a843787125daba62d5a619ab00569262c2e5ee2a01905f4e0fc8bd3ab08550f SHA512 7fbab9e1651f78fdcffb4524ced748a3ead31af2dad6b28d4f7459d0efb9405070137d0fb22dd3bdd0ac1655f254cbf5eda301b9f06542bad8d83914e4173913
+EBUILD hcloud-1.14.0.ebuild 553 BLAKE2B 83f94fe447972429f478b2f60df1c2cdac0d67a7886c2aaa1ec9beef7bc932182b386c53c7ab928b19b789bfb839c11a8ecc1729bb6c3a473646df3a8058aa42 SHA512 7030b9b8444d564185eb27682c388d8c078ab9994387e93b415d9083f005063df9ae9d5324e2daf77d54256d1a00a0571730de354e744cbd9e219cd562ef83de
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/hcloud/hcloud-1.12.0.ebuild b/app-admin/hcloud/hcloud-1.12.0.ebuild
deleted file mode 100644
index 8ba6e8b3dd55..000000000000
--- a/app-admin/hcloud/hcloud-1.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A command-line interface for Hetzner Cloud"
-HOMEPAGE="https://github.com/hetznercloud/cli"
-SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-
-src_compile() {
-	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/hcloud/hcloud-1.13.0.ebuild b/app-admin/hcloud/hcloud-1.13.0.ebuild
deleted file mode 100644
index 8ba6e8b3dd55..000000000000
--- a/app-admin/hcloud/hcloud-1.13.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A command-line interface for Hetzner Cloud"
-HOMEPAGE="https://github.com/hetznercloud/cli"
-SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-
-src_compile() {
-	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/hcloud/hcloud-1.14.0.ebuild b/app-admin/hcloud/hcloud-1.14.0.ebuild
index 4367320daaac..8ba6e8b3dd55 100644
--- a/app-admin/hcloud/hcloud-1.14.0.ebuild
+++ b/app-admin/hcloud/hcloud-1.14.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE=""
 DEPEND="dev-lang/go:="
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index e3222215295c..8ade15826c3e 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -12,8 +12,10 @@ DIST github.com-Masterminds-goutils-41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0.tar
 DIST github.com-Masterminds-goutils-v1.1.0.tar.gz 14610 BLAKE2B aa78c7326a97a92121f6d76f21d26eccb0ee2ec04adec2eba928a4a8789bb0e0610444a0b4a4512bf8cc5a19c82a1b61995065a7359245a9f48730bc4bfcf337 SHA512 cdc1dfe47c95275599d048327ce62964df0e14a549cf7787fac024250b1ca7b30fef07af2be15d9d5084f923b04910a9872cb1561393544c29f0eb8023ec84d8
 DIST github.com-Masterminds-semver-805c489aa98f412e79eb308a37996bf9d8b1c91e.tar.gz 21138 BLAKE2B 07cb99b393f48eb0df3fcacf327e2c769791e5353bb717a998ef7acf587cd7e1f211d258cf55768d5b7951059612ddfa39e3404dc908255ef900901d16c33c6c SHA512 a442038c4a222734d0f18a10eccdc450d4c2fddbcb2b1e10bb32c70e956d74ea3a6672ffae2a89a52e92aa6bb4c75fd85337392dc1e2380d27843237f6ebec2a
 DIST github.com-Masterminds-semver-v3.0.1.tar.gz 23977 BLAKE2B bbfa3a3d07c941500a726de392c67ba5e86809d8be6edbdbf884698ad18f8a2b274b32fa42be56ed70efa480aeecd1ae5550fc79f0f9070f0248ec06bec87712 SHA512 c66c509579e24ae46be7cab2397a1ee77fa1fa0cbfd5ba4b089ad17362ef66b1ad35251b6f1e9b86d1498d23c49a64b46a785a8d181c7f5a6ebfa0c4f042aa1a
+DIST github.com-Masterminds-semver-v3.0.3.tar.gz 23824 BLAKE2B 9185141af73f7dce8ca41a5cbfe03d45201217d688f0085cd2deb20efdfd884888061af1520851b5d25ddac609c0e7721154eb30bcc267d81d413dde680f95a4 SHA512 0be0eb9387056e0014ffa90b59f000f5a4075a3445be174c137dc5e48ee3ec1f580db980bf902327f63e9a2b5f498625ab03b64419f7ea848a3b36dab7f05556
 DIST github.com-Masterminds-sprig-e4c0945838d570720d876a6ad9b4568ed32317b4.tar.gz 42053 BLAKE2B dcbbcc8e9d0f3428a5d135529f0e72883263076bf6d69d2a0d543c8ef3b52aeca1d78550b3db03bf1356ecefc4201327b1de65b8d89e67811f9fec7388f3450b SHA512 8732128e531878a4498a38d9445be448bdc77f9a6236e10fb9b20f56d249edb65f76bbc13f6bb916d5a259deb7ae77423f6116f2600c803ebdf443e3cb2d82c0
 DIST github.com-Masterminds-sprig-v3.0.0.tar.gz 47424 BLAKE2B 7c9477ace01acbfac00a17038fe82501e4f4446c48a7f43ee06eb184b86ffa3d0d07cfb7746a1098ab8bbd1d992701f1bc4d0f0f3438b38587abd399a09a2e39 SHA512 72a637eeb75a41e675a531f2753417837e9f98351b802cfd0e851dc02c42bc9e33e207bb62e8d7ccb66f71daba380850196959003de66de74fad81323c743c77
+DIST github.com-Masterminds-sprig-v3.0.2.tar.gz 47799 BLAKE2B 8a7dc7b19f9d8134f74a71ca3d7841f5161a75597fac6628036b333c85fde0b724a0c0c70286f3fdbcb386d3e68e04d66e140de19ec34f168b38da4d068e0540 SHA512 38663dda324178c5b562fd1fa814e5629350e7f04760a27de1a04aba5cdf786717a0cff2be532f3d8ee1b8b278c6a4bdcbc01d0676f294a495da9f8a28426b15
 DIST github.com-Masterminds-vcs-f94282d8632a0620f79f0c6ff0e82604e8c5c85b.tar.gz 27791 BLAKE2B 4d9f7e81c9d66f7302ed45f433a9329319b75d6e1416ded87c74032a7cdcef4a321edee370305f7e6ef16f30efa70b56badbdc81b75fe90a87f890ff0cab2eaa SHA512 2fbaff5ba0cb0a651e93634ba1cff5f34c374f490c7182b904d052b22fabe717f5a478856101e8e8679ae806db0b70462f59abfe445714199fe91a3dc73b975c
 DIST github.com-Masterminds-vcs-v1.13.0.tar.gz 27675 BLAKE2B 77b7748a01113fa0a2715b4cff12a5b82bbbbad062833a6516448c8c3408211ad51816135c773022b436d8305eb370defed883d400f59fdeec5f3ebf57e70cef SHA512 fc4db2d5cf2cbb1098ddbc6c796661bf0be8f040134d31281097785f6729404df2ea1c30627fc78c6e560aa95ecd42f6f41a9748350fab64a03887b59a00a2f4
 DIST github.com-Microsoft-go-winio-v0.4.12.tar.gz 92439 BLAKE2B 7ce1539125742ab5d96586a8cbaddef90f1aeba8124430ee33c23374a3dc1a117fe8bd6d68591c83f0a8e4fb1633c74a19fcc8466567f89450056ea3843dca21 SHA512 3dfeb9f884aff5bb1b667a6558471274161ca7b4cd9402e47250903b74522f0bd6dec13ce32c8312eb8570f94dc061a5bf9ada5e0837d45a510cd4abf38c8211
@@ -235,7 +237,9 @@ DIST github.com-yvasiyarov-newrelic_platform_go-b21fdbd4370f.tar.gz 4637 BLAKE2B
 DIST helm-2.16.1.tar.gz 1283836 BLAKE2B f0a2cfb05adea2b0a98341962753e777e9329b669ca32a84ce0ed9b823df48f7884c6809d1625dd8cdfbf50efea31081c3c0400f0af65a67ab0fbf1afa3deba1 SHA512 eed2da36ba72da61c121d2cc2d4dc4ef2163f926579b2189b8b8113ba70102d0f63e48729e08b260fb3877d0fe1e0d6ed7eb8e9c67605d7d4a3bcdf7b33c2544
 DIST helm-3.0.0.tar.gz 498488 BLAKE2B e55b64d9547744118f35b83ed8ed3f1db168c491dff7d73c9871b7a5af36505b7be2ae861fbe3439463ae8459c71aa30e16fb49858ac9be09516a6e905ed8a51 SHA512 924df23cea78d91062f15156c989a84b223eda5b1e291f8a781c0be2334a6f2436936e88b7c800c3fc7f68b8d3ddb1f8be78573f014d17024b68f35f7e11b153
 DIST helm-3.0.1.tar.gz 498975 BLAKE2B 802b49ecc8888ef988571c9469be2dc039bb58373346a9d75284480b61971435774fcfffa42c1ffbc9d94d6f39fc1bc742c296aed2ba2676872bb50128d6333c SHA512 0fae3334e1c5c5a5e35c25a42d37bfdbbfcb40b6c1dc7a7b13dec4357ee0c538b619a2fd965921126ff8a652e1250fb158a502a99bf7da4ea697dff2e905d32b
+DIST helm-3.0.2.tar.gz 499904 BLAKE2B 0a3fb3912a1cca4c2539922ad5759196de5d4d7e61acb9370017a5053a519ebfd2eaa7bfa3514a05c28e40ba2d0d8bf55b7651fffdc2f32e69d0e0db50bfdb17 SHA512 c45ca39603e14c75812c695ffd1d67b070144c5311de369a53fbe10d2935ae616d5fd8e79fb81bbc8485061f649b63446b4f081152c3de0a3a0b4bafac7104a3
 EBUILD helm-2.16.1.ebuild 10055 BLAKE2B 6a0279e082cd74eafb01b4fc77b97a62ddd2e6ce44969db65d053a507f081583501b05afe6220e86dae5b037700ba410a4c67e3c1fa92472360c774f7fd05ee4 SHA512 78f9aeb398ce93c64fb558be4edd3fb9cb55d42f2658cdf57f0bd8fcccb4269007c1d952494a50a655cd57d4b7a89690df9a48485c77876ddf438600d4153b6a
 EBUILD helm-3.0.0.ebuild 7131 BLAKE2B 50e7fcd49e605386d35ac98266d89da63e0e2f91f8daf31eb80c21d599e1851ff5ab3f0f82ea4ae3f1c31382aa2966eb588150a16c1e7351851b7872d3dd4d2b SHA512 48411846df850bf94f360007e6605341cf41a9de739108b1d944306263d18161dc248ab1247689b128d837c32c840f4102abe585647325f5b3a275031a7df306
 EBUILD helm-3.0.1.ebuild 7057 BLAKE2B ea4a09c1ed7a18e03e258a674b6587d38f915161c8fed17b7c5d92e800cd547f17b633ace759dd3cce5d3f0d584cf373df949dbb1a951d771fa1b0457e62bc12 SHA512 af0fdc6f3fe0bc6f0f12050a6c78f285a88c20ea418a25f44437fe8cf12905f644f54f1210dd2a9b6b316b1f40d62d7018ca9c550c3bee9c569a8cbeef49a390
+EBUILD helm-3.0.2.ebuild 7057 BLAKE2B 3a2345a6ee3249dda0b6617c11cf8eed9ce04fe503f39ddcaf41d6c823fe608f3bdad1a1be7996199e81d74c4262c644ec1ad0f45119fbe2d2444d7ffa8259ec SHA512 ac47ffb28aa28219b0f55c614487fc4cc8534dbbd11f1b6e1c5eabf10713ca96f8aa93eb263689695d2396298deb7dbcc2ea770bc517916f4902f948626c0e98
 MISC metadata.xml 322 BLAKE2B b452dfaecaf6b32e7fc334ddb00444d739a618898f8e0d6905e8b3191acc7f0fc5e3929345405d86f9ab56e8ad80fbcd1dd46a0ea3ff5aaa2bb9f56407d10234 SHA512 ef4bb714213346e60a2a39833d0ab1987e10d2b34460a053b479775163e8778021ef3da63a8f5fede055281298dab88309a796cf3ad650c2d3ddeb17a7b0b4be
diff --git a/app-admin/helm/helm-3.0.2.ebuild b/app-admin/helm/helm-3.0.2.ebuild
new file mode 100644
index 000000000000..feee38c5f472
--- /dev/null
+++ b/app-admin/helm/helm-3.0.2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module bash-completion-r1
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/helm/helm https://helm.sh"
+
+EGO_VENDOR=(
+	"github.com/Nvveen/Gotty a8b993ba6abdb0e0c12b0125c603323a71c7790c github.com/ijc25/Gotty"
+	"cloud.google.com/go v0.38.0 github.com/GoogleCloudPlatform/gcloud-golang"
+	"github.com/Azure/go-ansiterm d6e3b3328b78"
+	"github.com/Azure/go-autorest v13.0.0"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/MakeNowJust/heredoc e9091a26100e"
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/semver/v3 v3.0.3 github.com/Masterminds/semver"
+	"github.com/Masterminds/sprig/v3 v3.0.2 github.com/Masterminds/sprig"
+	"github.com/Masterminds/vcs v1.13.0"
+	"github.com/Microsoft/go-winio v0.4.12"
+	"github.com/Microsoft/hcsshim v0.8.6"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/urlesc de5bf2ad4578"
+	"github.com/Shopify/logrus-bugsnag 577dee27f20d"
+	"github.com/asaskevich/govalidator f61b66f89f4a"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1"
+	"github.com/bugsnag/bugsnag-go v1.5.0"
+	"github.com/bugsnag/panicwrap v1.2.0"
+	"github.com/cespare/xxhash/v2 v2.1.0 github.com/cespare/xxhash"
+	"github.com/containerd/containerd v1.3.0"
+	"github.com/containerd/continuity 004b46473808"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/deislabs/oras v0.7.0"
+	"github.com/dgrijalva/jwt-go v3.2.0"
+	"github.com/docker/cli d88565df0c2d"
+	"github.com/docker/distribution v2.7.1"
+	"github.com/docker/docker 2cb26cfe9cbf"
+	"github.com/docker/docker-credential-helpers v0.6.1"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-metrics b84716841b82"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/libtrust aabc10ec26b7"
+	"github.com/docker/spdystream 6480d4af844c"
+	"github.com/emicklei/go-restful v2.11.1"
+	"github.com/evanphx/json-patch v4.5.0"
+	"github.com/exponent-io/jsonpath d6023ce2651d"
+	"github.com/garyburd/redigo v1.6.0"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/go-openapi/jsonpointer v0.19.3"
+	"github.com/go-openapi/jsonreference v0.19.3"
+	"github.com/go-openapi/spec v0.19.4"
+	"github.com/go-openapi/swag v0.19.5"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gofrs/flock v0.7.1"
+	"github.com/gofrs/uuid v3.2.0"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/go-cmp v0.3.1"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/uuid v1.1.1"
+	"github.com/googleapis/gnostic v0.3.1"
+	"github.com/gophercloud/gophercloud v0.1.0"
+	"github.com/gorilla/handlers v1.4.0"
+	"github.com/gorilla/mux v1.7.0"
+	"github.com/gosuri/uitable v0.0.1"
+	"github.com/gregjones/httpcache c63ab54fda8f"
+	"github.com/hashicorp/golang-lru v0.5.3"
+	"github.com/huandu/xstrings v1.2.0"
+	"github.com/imdario/mergo v0.3.8"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/kardianos/osext ae77be60afb1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/mailru/easyjson v0.7.0"
+	"github.com/mattn/go-runewidth v0.0.4"
+	"github.com/mattn/go-shellwords v1.0.5"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/miekg/dns 0d29b283ac0f"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/modern-go/concurrent bacd9c7ef1dd"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/morikuni/aec 39771216ff4c"
+	"github.com/opencontainers/go-digest v1.0.0-rc1"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/runc v0.1.1"
+	"github.com/peterbourgon/diskv v2.0.1"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/prometheus/client_golang v1.2.1"
+	"github.com/prometheus/client_model 14fe0d1b01d4"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/procfs v0.0.5"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cobra v0.0.5"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/xeipuuv/gojsonpointer 4e3ac2762d5f"
+	"github.com/xeipuuv/gojsonreference bd5ef7bd5415"
+	"github.com/xeipuuv/gojsonschema v1.1.0"
+	"github.com/xenolf/lego a9d8cec0e656"
+	"github.com/yvasiyarov/go-metrics c25f46c4b940"
+	"github.com/yvasiyarov/gorelic v0.0.6"
+	"github.com/yvasiyarov/newrelic_platform_go b21fdbd4370f"
+	"golang.org/x/crypto f83a4685e152 github.com/golang/crypto"
+	"golang.org/x/net fe3aa8a45271 github.com/golang/net"
+	"golang.org/x/oauth2 0f29369cfe45 github.com/golang/oauth2"
+	"golang.org/x/sync 112230192c58 github.com/golang/sync"
+	"golang.org/x/sys 195ce5e7f934 github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/time 555d28b269f0 github.com/golang/time"
+	"google.golang.org/appengine v1.6.5 github.com/golang/appengine"
+	"google.golang.org/genproto 919d9bdd9fe6 github.com/google/go-genproto"
+	"google.golang.org/grpc v1.24.0 github.com/grpc/grpc-go"
+	"gopkg.in/inf.v0 v0.9.1 github.com/go-inf/inf"
+	"gopkg.in/square/go-jose.v1 v1.1.2 github.com/square/go-jose"
+	"gopkg.in/yaml.v2 v2.2.4 github.com/go-yaml/yaml"
+	"k8s.io/api 35e52d86657a github.com/kubernetes/api"
+	"k8s.io/apiextensions-apiserver 5357c4baaf65 github.com/kubernetes/apiextensions-apiserver"
+	"k8s.io/apimachinery a2eda9f80ab8 github.com/kubernetes/apimachinery"
+	"k8s.io/cli-runtime 74ad18325ed5 github.com/kubernetes/cli-runtime"
+	"k8s.io/client-go bec269661e48 github.com/kubernetes/client-go"
+	"k8s.io/klog v1.0.0 github.com/kubernetes/klog"
+	"k8s.io/kube-openapi 0270cf2f1c1d github.com/kubernetes/kube-openapi"
+	"k8s.io/kubectl 2ed914427d51 github.com/kubernetes/kubectl"
+	"k8s.io/utils 8d271d903fe4 github.com/kubernetes/utils"
+	"rsc.io/letsencrypt v0.0.1 github.com/rsc/letsencrypt"
+	"sigs.k8s.io/kustomize v2.0.3 github.com/kubernetes-sigs/kustomize"
+	"sigs.k8s.io/yaml v1.1.0 github.com/kubernetes-sigs/yaml"
+)
+
+MY_PV=${PV/_rc/-rc.}
+SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	$(go-module_vendor_uris)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip test"
+
+GIT_COMMIT=19e47ee3283ae98139d98460de796c1be1e3975f
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" || //' \
+		-e "/GOFLAGS    :=/d" \
+		Makefile || die
+}
+
+src_compile() {
+	emake LDFLAGS= build
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN}
+	dodoc README.md
+}
diff --git a/app-admin/installer/Manifest b/app-admin/installer/Manifest
index 2ad56e5eb0ff..73b070e3e7ab 100644
--- a/app-admin/installer/Manifest
+++ b/app-admin/installer/Manifest
@@ -1,3 +1,3 @@
 DIST installer-0.1.1_beta.tar.gz 49946 BLAKE2B 845df010036446e65479affc3d901fe114248130627ce76583c42adc9ecf9c0e2585600106c1559c8d3dac8c086553fed1d48d00002ede9e9be509fc98632662 SHA512 940272cefed17bd6c370fe26b2941da611cbd0aa8fb1c7f51bfaef483c7f9189f10754fb7e3d84dc099ac687f4644e24ae22e7ec09c41f39efba30d5743c9163
-EBUILD installer-0.1.1_beta.ebuild 505 BLAKE2B d11943b1fc6a5f56d58a34e218a95b969984035c47e30a0c0a9c5d690e2ca22c54cae88c112b2d6f3dbadd41d320c70e0d318dd3a39822b2dd38b40b013cd521 SHA512 89df436c45e13240224c149456e58d1aab14cc34e1be850e6c21059b3f4d5481c835171f1a04792f0cd956ad771f87962b67c34f58775cde8a2753d3276a1f3d
+EBUILD installer-0.1.1_beta.ebuild 499 BLAKE2B 6995ce27eed979f1a09cff03055c975951400088e8f5ace1ae480910442eb195b297402acf88c4dc6aecee3d381773737e43eb9879df89ed5cb847cf852cf5f6 SHA512 2597314b323375d09e1f011f5ca1ee7ae18c5561fd3a646eab26c98346e9901695367c551eec02fdeed7f12c7ed9bf64f2fbd14a5ca190a3b708aa3cc64a240b
 MISC metadata.xml 425 BLAKE2B a32b198aef69dfa01edc6e5e6ec8a19cc71edcd359f95866ab95df3f8cd8c2220c11e81fe7f58c44ecff5e80d89ef70bfda04fd110635674ddf90e957e3e32f8 SHA512 c4d27457c90f3374cb04b0fbb94b0b26da6ce0b88c79b4722f02014225703f37af825aafa221d6b76ad476a9ede7c81b9a9136f6b0fdfd621caaaba3a99e142b
diff --git a/app-admin/installer/installer-0.1.1_beta.ebuild b/app-admin/installer/installer-0.1.1_beta.ebuild
index ba75fd88016a..9cfb8df6b15f 100644
--- a/app-admin/installer/installer-0.1.1_beta.ebuild
+++ b/app-admin/installer/installer-0.1.1_beta.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="ncurses(+)"
 
 inherit distutils-r1
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index dff7dc399ef7..85d0fa1161ed 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,8 +1,9 @@
+AUX keepassxc-2.5.2-ccache_switch.patch 2274 BLAKE2B 640bd0bdbd56aa93a3f7d70b4827b50639bcf6cea1cb0339ec78b91cbd4ab7c364bd36353ccc02e88b438566ecbad6545124bf5fd89c2c8e766c723e278ba1c9 SHA512 5b43fe2e5dea3ff3626ae4b75faa8aa4666a2703d08a30c4a18fd2b1079a73ad033d8788f05e28b860f51ef42e9f1a65253319b9d8fe0c34ec058b9ffb59dfea
 DIST keepassxc-2.4.3-src.tar.xz 3301944 BLAKE2B ba95d5d48049367e7d3c39b5fdc9fc9816dfe2b257530068f229d1b5bd4eb9c137607f63bcce0aac4bc67ed41ee00c0385be800720acfdc3920c44444cade180 SHA512 893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d
-DIST keepassxc-2.5.0-src.tar.xz 6752776 BLAKE2B 90c82d6a3c8144797fc0cd379bbb7e6745cd4512a47bd04eb61b52205b6efe3ad8036a0f2c0012de4e710b6184526916ac4a4453bca90e18ccd9e6db1b86e9e3 SHA512 45f76491892ee5377eb803079ee6db2987d66e569c8c53ebc706cb51a4b8f37675801df484f03d486803de2675a3a46bed5d2b211ff7be0b83daf9c2f8607d00
 DIST keepassxc-2.5.1-src.tar.xz 6798880 BLAKE2B 428b5fb381c4a4c6f3b291ac203530a0ed07224edc10f55caaab243797a6c89cafcd08a9dcfcfad1dda2f73812397a4d7d6e26ef675627f29f7d4d7925a1aeb4 SHA512 5500a0e697758e7616754d1b612ad7a64485d9efa1aeb0c3714060db50ffd39ea0aaa0c42d86d17044b834f32e99172ea94bc2485d396a381c8e9212d8be8b37
-EBUILD keepassxc-2.4.3-r1.ebuild 2162 BLAKE2B 8fccd44699d94b2ec222cfbdf9b3b2c0426002f31310b17d3983269f0f33b6cfd518e2424efc34bd7fc2f743c776f1b4dd3245dd3f6a0c2d040fedd975c5a6c8 SHA512 a7ba232894cd90576cdbfe2e9313d146bae61c58b794fec74dc094621812b43f97d452687bd9e1ddc5f956326d6221b6c1526550ed9e11fc302bdceb7506f6f6
-EBUILD keepassxc-2.5.0.ebuild 2171 BLAKE2B 985380e34ea6f0786a85740a0d1c9cdf6d9cc34cbc25ae62b396d2ed2a6cf3e350182a0392f470a80a449e1d73b608b5b6f33aa0dfb0a2ebb2a5cc04005ba449 SHA512 d8f5a41f6c6535a300c1ec20e1e0c5701d3b2760fc05011b85f1fbd7c376359b2047afe509c3550f3c5898f2f535e45825f6b0337330f98477e3098900fa623e
-EBUILD keepassxc-2.5.1.ebuild 2171 BLAKE2B 985380e34ea6f0786a85740a0d1c9cdf6d9cc34cbc25ae62b396d2ed2a6cf3e350182a0392f470a80a449e1d73b608b5b6f33aa0dfb0a2ebb2a5cc04005ba449 SHA512 d8f5a41f6c6535a300c1ec20e1e0c5701d3b2760fc05011b85f1fbd7c376359b2047afe509c3550f3c5898f2f535e45825f6b0337330f98477e3098900fa623e
-EBUILD keepassxc-9999.ebuild 2171 BLAKE2B 985380e34ea6f0786a85740a0d1c9cdf6d9cc34cbc25ae62b396d2ed2a6cf3e350182a0392f470a80a449e1d73b608b5b6f33aa0dfb0a2ebb2a5cc04005ba449 SHA512 d8f5a41f6c6535a300c1ec20e1e0c5701d3b2760fc05011b85f1fbd7c376359b2047afe509c3550f3c5898f2f535e45825f6b0337330f98477e3098900fa623e
-MISC metadata.xml 960 BLAKE2B 63a61f81e372efa1d1a4118f8353818eb28f4d9b0e7c87c5cb6e7a4ee8c9856ae3c7ee981e2777d3263725338581834f294022d052397dffbe98db2b5ba36895 SHA512 85ad2302913936ce51a455ae15e2d9ca7a68d26fc16819f46ab494b6aaafecdf32f74596b47c1b5a3cea56bfc49bf7021dbb4b770efb8f362386a67c88ea2404
+DIST keepassxc-2.5.2-src.tar.xz 6835848 BLAKE2B 4c536ec062295655c04a360ba3c94ff97078aa03b96e5bb29e246f6ad13cce16ba77bcf5e7232de4df669706bc612f6b157e3050f0d8b9eb4b1f47e4308af0d0 SHA512 f87408362e5fbba10e2e66ff1cead2f8495214197e142c16cd3c95ea47956570b6cfc561d7b593c9a962f476637b8bd6b5e21e2fc3e4f20224506bd97d16bb23
+EBUILD keepassxc-2.4.3-r1.ebuild 2144 BLAKE2B 0c5d29f1403d1cd3a536ecd3beadb42ef085607af6167f7ebe97bb999826d996178226c58febab6c359e743d1eec125fc60492e132f69b74b33d48ac02fcfc2c SHA512 55f227ff8ad47f123b56a70bf0b2569a0fa1b6ed9ec105a0ed0f111144bbd23618777bfdfefad9823dbee3d42e779d723cfae30997c79b17716aabfa63c7fb35
+EBUILD keepassxc-2.5.1.ebuild 2185 BLAKE2B f28738a5ca4db3750a375f40760add93b90f4291b3d58cd9b6efdd025972ce391392a25cf66dc28fa3e45329f01f2b52ef22e3a6a2f14d43b24b78e1c3dc3717 SHA512 5dfc6c8e7cb50e551d94e7f0a5c60cf27f933cf1d0a3cbc7adb05f1c48af18169ecf3444738902cd5b8b32025a024bb9b8107aa3eade93a8fd861b2accf111e6
+EBUILD keepassxc-2.5.2.ebuild 2185 BLAKE2B f28738a5ca4db3750a375f40760add93b90f4291b3d58cd9b6efdd025972ce391392a25cf66dc28fa3e45329f01f2b52ef22e3a6a2f14d43b24b78e1c3dc3717 SHA512 5dfc6c8e7cb50e551d94e7f0a5c60cf27f933cf1d0a3cbc7adb05f1c48af18169ecf3444738902cd5b8b32025a024bb9b8107aa3eade93a8fd861b2accf111e6
+EBUILD keepassxc-9999.ebuild 2125 BLAKE2B de716370e41031cc3e9f373273a9360ad91ececa2272a0bc569edb771b54b6fedae04f25cdaa49c0441ee791b6d12c8c0b8e48a9d3a0c57e33c856381e9bcf8d SHA512 58882ac9cad8670f2f95ef0a41d238899eae9a17c0e145912e89f82799570f8be9b55bbcbd14efd3befe22317f3a27162c751c3ba37e360396fa329fb017dd70
+MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e
diff --git a/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch b/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch
new file mode 100644
index 000000000000..57d8b3d714ca
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch
@@ -0,0 +1,59 @@
+From ae471bea14c8e05bcf368168649399b116a69992 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 7 Jan 2020 17:44:08 -0500
+Subject: [PATCH] CMakeLists.txt: Do not unconditionally use ccache
+
+This causes build failures in Gentoo because we don't allow access to ccache files if ccache is not enabled for build.
+
+Fix this by adding a WITH_CCACHE cmake option and change behavior so that cmake fails if WITH_CCACHE is enabled but ccache program cannot be found.
+
+Gentoo-bug: https://bugs.gentoo.org/704560
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ CMakeLists.txt | 19 ++++++++++++-------
+ 1 file changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c2f9b5bfe..1c5746c59 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,13 +27,6 @@ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ 
+-# Use the Compiler Cache (ccache) if it is installed
+-# (install with: sudo apt get ccache)
+-find_program (CCACHE_FOUND ccache)
+-if (CCACHE_FOUND)
+-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+-endif (CCACHE_FOUND)
+-
+ # Support Visual Studio Code
+ include(CMakeToolsHelpers OPTIONAL)
+ include(FeatureSummary)
+@@ -48,6 +41,7 @@ option(WITH_DEV_BUILD "Use only for development. Disables/warns about deprecated
+ option(WITH_ASAN "Enable address sanitizer checks (Linux / macOS only)" OFF)
+ option(WITH_COVERAGE "Use to build with coverage tests (GCC only)." OFF)
+ option(WITH_APP_BUNDLE "Enable Application Bundle for macOS" ON)
++option(WITH_CCACHE "Use ccache for build" OFF)
+ 
+ set(WITH_XC_ALL OFF CACHE BOOL "Build in all available plugins")
+ 
+@@ -65,6 +59,17 @@ if(APPLE)
+     option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
+ endif()
+ 
++if(WITH_CCACHE)
++    # Use the Compiler Cache (ccache) program
++    # (install with: sudo apt get ccache)
++    find_program (CCACHE_FOUND ccache)
++    if(CCACHE_FOUND)
++        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
++    else()
++        message(FATAL_ERROR "ccache requested but cannot be found.")
++    endif()
++endif()
++
+ if(WITH_XC_ALL)
+     # Enable all options (except update check)
+     set(WITH_XC_AUTOTYPE ON)
diff --git a/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild b/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
index 914683fba0df..83eb419c1194 100644
--- a/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@@ -66,7 +66,7 @@ src_prepare() {
 	 use test || \
 		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
 
-	 cmake-utils_src_prepare
+	 cmake_src_prepare
 }
 
 src_configure() {
@@ -84,7 +84,7 @@ src_configure() {
 	if [[ "${PV}" == *_beta* ]] ; then
 		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_preinst() {
diff --git a/app-admin/keepassxc/keepassxc-2.5.1.ebuild b/app-admin/keepassxc/keepassxc-2.5.1.ebuild
index 75059bb064ab..c3a08042f8f1 100644
--- a/app-admin/keepassxc/keepassxc-2.5.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser debug keeshare +network test yubikey"
+IUSE="autotype browser ccache debug keeshare +network test yubikey"
 
 RDEPEND="
 	app-crypt/argon2:=
@@ -55,7 +55,9 @@ DEPEND="
 	dev-qt/linguist-tools:5
 	dev-qt/qttest:5
 "
-
+BDEPEND="
+	ccache? ( dev-util/ccache )
+"
 # Not a runtime dependency but still needed (see bug #667092)
 PDEPEND="
 	x11-misc/xsel
@@ -63,15 +65,20 @@ PDEPEND="
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.2-ccache_switch.patch"
+)
+
 src_prepare() {
 	 use test || \
 		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
 
-	 cmake-utils_src_prepare
+	 cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DWITH_CCACHE="$(usex ccache)"
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
@@ -86,17 +93,5 @@ src_configure() {
 	if [[ "${PV}" == *_beta* ]] ; then
 		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
 	fi
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
+	cmake_src_configure
 }
diff --git a/app-admin/keepassxc/keepassxc-2.5.0.ebuild b/app-admin/keepassxc/keepassxc-2.5.2.ebuild
index 75059bb064ab..c3a08042f8f1 100644
--- a/app-admin/keepassxc/keepassxc-2.5.0.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser debug keeshare +network test yubikey"
+IUSE="autotype browser ccache debug keeshare +network test yubikey"
 
 RDEPEND="
 	app-crypt/argon2:=
@@ -55,7 +55,9 @@ DEPEND="
 	dev-qt/linguist-tools:5
 	dev-qt/qttest:5
 "
-
+BDEPEND="
+	ccache? ( dev-util/ccache )
+"
 # Not a runtime dependency but still needed (see bug #667092)
 PDEPEND="
 	x11-misc/xsel
@@ -63,15 +65,20 @@ PDEPEND="
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.2-ccache_switch.patch"
+)
+
 src_prepare() {
 	 use test || \
 		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
 
-	 cmake-utils_src_prepare
+	 cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DWITH_CCACHE="$(usex ccache)"
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
@@ -86,17 +93,5 @@ src_configure() {
 	if [[ "${PV}" == *_beta* ]] ; then
 		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
 	fi
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
+	cmake_src_configure
 }
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 75059bb064ab..949cb61dc8aa 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser debug keeshare +network test yubikey"
+IUSE="autotype browser ccache debug keeshare +network test yubikey"
 
 RDEPEND="
 	app-crypt/argon2:=
@@ -55,7 +55,9 @@ DEPEND="
 	dev-qt/linguist-tools:5
 	dev-qt/qttest:5
 "
-
+BDEPEND="
+	ccache? ( dev-util/ccache )
+"
 # Not a runtime dependency but still needed (see bug #667092)
 PDEPEND="
 	x11-misc/xsel
@@ -67,11 +69,12 @@ src_prepare() {
 	 use test || \
 		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
 
-	 cmake-utils_src_prepare
+	 cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DWITH_CCACHE="$(usex ccache)"
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
@@ -86,17 +89,5 @@ src_configure() {
 	if [[ "${PV}" == *_beta* ]] ; then
 		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
 	fi
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
+	cmake_src_configure
 }
diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml
index d9b95402e41b..0445305ebe59 100644
--- a/app-admin/keepassxc/metadata.xml
+++ b/app-admin/keepassxc/metadata.xml
@@ -8,6 +8,7 @@
   <use>
     <flag name="autotype">Add support to autotype the passwords into other applications</flag>
     <flag name="browser">Enables browser plugin support</flag>
+    <flag name="ccache">Use <pkg>dev-util/ccache</pkg> to build keepassxc</flag>
     <flag name="keeshare">Enable KeeShare sharing integration</flag>
     <flag name="network">Enable network support</flag>
     <flag name="yubikey">Enable database unlocking via YubiKey.</flag>
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index d60f650c07ad..cb3405d960bb 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -10,7 +10,6 @@ DIST github.com-go-openapi-jsonpointer-v0.19.2.tar.gz 15303 BLAKE2B 6e6e9846cc2c
 DIST github.com-go-openapi-jsonreference-v0.19.2.tar.gz 13662 BLAKE2B 1f8434dff032f2bc79162f90eac5ff6052d2200fa8343de468e352dca02fd12f2bd51de06bcdab745434783d8591cf4770c625775a8ef12a54e95013552442b1 SHA512 7cf42ee6090b6e9429b6ab5eb77eeacfb3a71959856e013079a22acbf008aee350e9edba2c3f4582760b91fa5d5dd87f160e7b03f23c1df7ddc9882607c8bc80
 DIST github.com-go-openapi-spec-v0.19.2.tar.gz 217440 BLAKE2B f03836ae5ad8bd6ef9f3d954d320e2e917ca1ee02c7421c84e336f82183be82f526a47d89279559116cfbfd5ee0fbc45557d327f1a62831493fd68a0d2d70c1c SHA512 72d11b6207fc1569469ffd1c4b37bda26786ae7e5284e73d42181c0ee64b1980cd8659da3678f0be9263525656ab75a24861d20455cd4d752cbafb2e8e87c26f
 DIST github.com-go-openapi-swag-v0.19.2.tar.gz 32195 BLAKE2B ad3b6d7f222f8d36e2368b6b355c132aad48b7a1d3f883366bcfba37e290ba98293b43527fe113ed2c8a3429efffd45d2ff239d4173322275647956972b35db9 SHA512 9614b50d660bd2de7c031a0e15258cbd1406698203c31c7232786238c6cd6f23f2e30d755f607fba5954e3734fdb0950048be847bdc1be21e6ee7d71ffbecf22
-DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
 DIST github.com-go-yaml-yaml-v2.2.4.tar.gz 72209 BLAKE2B df823cd5f6f734c11b9b19cd3cc205aa4bfc15bc90359a508220691867841698d0b9caa35b2aaa40b7c4c6c804bfaf9c7fb8d64f125726dc3728cd6833618c11 SHA512 2fd417b57a5adcd75ef34adbaccc0199fadcea42274fc77efeff601a0f12e376fb3d7ad62a65e1ba6f0b9eebc217b4c3540f6fbc6accfcb136e839a585b3e900
 DIST github.com-gogo-protobuf-v1.2.1.tar.gz 2017393 BLAKE2B d55fc545759add352512c2ef81d948c598f71131fdb1649ee526b59989457a324b03144e989a3c651b5614a2eee9e7b1652d3d259733cd3752c97fc2f6720705 SHA512 7cb48dc85e76cf6b116015441e29e86a25514667b409c0a1d335ce1c844a080fc9b37f48911959531aac8ece009b6d8401b1fb7bc463fc8e6fb5e133c9846e64
 DIST github.com-golang-appengine-v1.5.0.tar.gz 325873 BLAKE2B b8f1e8b70cb8259264fd424ffd84852cb8d2a35b85c6f44513f542a403360607bd883e20a6cb405b6001f3b86775a8e3087e9f59df22aebfdcda3aa31f558785 SHA512 10d0d4d55030335d91da6d5a29606da94b11382df27d3f7363ec4d260241c9ecb7763da16393dbbc154622ce35bd544d5b47d318d96780b38edd8c1723ee1993
@@ -19,9 +18,7 @@ DIST github.com-golang-glog-23def4e6c14b.tar.gz 19688 BLAKE2B f9ff73060c3b106034
 DIST github.com-golang-net-3b0461eec859.tar.gz 1099680 BLAKE2B 989a8d6c9166696bef1aff398acc8cd1e41e1240c5c113be030c80355cdf96eaa6d5f231c99f2c44d8eacf199579804c59fc45f999862bc4bf057b694841c8dc SHA512 5e42e26ac17f52d6408b63eebd740bedc5a78b8023b675688d7b39b20afa53b34ffde764b693828143483c8f5450180f6a00e9eb28b8f3f6e14303cc4cd7c62b
 DIST github.com-golang-oauth2-9f3314589c9a.tar.gz 45022 BLAKE2B 0b14e367f087601624a84ef25641b1f3338cc689ee92136ef51abbbdcf1b3b3dc1cad47b17868a39c1a9ecb2f792cdb1d5bb8f8ede300a5d9dc8445319c05132 SHA512 8a9ea21c4e7f9dd1ceeb069dee1987f5e5e5ba4f973572ab6f0ccf00ae6246a142dc517ef15ff83de5f3c16c267181ac3812d3c6bc0180d12b98d7540e1fc91d
 DIST github.com-golang-protobuf-v1.3.1.tar.gz 310884 BLAKE2B 704efef653d39b4954798537e7451d15dd1d913c67d1332ffc016b396b028a0dd03487765a89b0bc5f920b75cf4f51be79a8da9d3291e0f02873c47601360080 SHA512 7dfc6d7851c7181e1a73effe9e8a97752bb428bf207a44b065412a8e87e0e3e200b5eef3d8c68af33a0721d12a8b98bfa88b22add074b19b6e1759e9268abf25
-DIST github.com-golang-sys-d0b11bdaac8a.tar.gz 1244852 BLAKE2B 86e5871d166f45fec1180eadd8bc79ed77f2f254091f65bca2cebab90625470a81f9ba192c7f352b9e779e6487512c120cc0be42b45134fec6173d80edd3941e SHA512 62871cffa10554475b86be5f34c3b8067799ed81f85a37ee2e616dc24d4df39a73eae66dd20ab016095cd4fbfbb76bc877c61d284a648eab81e619fee0a3cd5c
 DIST github.com-golang-sys-d432491b9138.tar.gz 1448871 BLAKE2B 08763852d5fe0af14a48f00044398dae153392750a1fdfeb6238143e76debc15de6e54ab14984677f199a6875320d037a3124aaea0d0a7f2e4f19963daf50c19 SHA512 f337b115e8975a3ba0ca12c68d203a5223734bc204d617d90ea124e348a26f97a81ae493f537cf3f87b3a732fa5cfba6fcfad2225ee8b4129667eedf86dc1507
-DIST github.com-golang-text-17ff2d5776d2.tar.gz 6580833 BLAKE2B 85a9a26c6c5427cec821ce39fe3d01726271e2fedd24c280d63d57e426d8eff9aa355215cded6d2e8d754169f0ff5c8781b4a0cda481c6289b2016d9d1857bc5 SHA512 62318598606aab26b95cd62f8e30fd6519c2f2dfc2b5d6fc906ec70c0749745539ff983a6e084c3624d108231797d320b77b53a27aa18d9e83bf2af947dfdcd6
 DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
 DIST github.com-golang-time-9d24e82272b4.tar.gz 9318 BLAKE2B f2d50340655d21b1bcded6cb76ae16026c1d43a40a45a45dcfdda8171722c64bde3fcdddde9eca4e1f9ceb994a58750687ebd439464f962652cfb004329b6310 SHA512 d4f6336675a491f5de855c33a506baa99c33c02f59fa9c5284e29ab4638eb55ff5f7d24dd5a1c480211f41cbd3bffa6366594828c333f5f039a7f3009515beb6
 DIST github.com-google-gofuzz-v1.0.0.tar.gz 13201 BLAKE2B 3884b6e9a6f910986f6ff5705b505e9107200a034d0c99de426af38938a71adb3ed443bf45da70fe68133c528db69aacebf4be74fe47d5f8bbff0bb88a4d8bd3 SHA512 826cd0d22d8cfa724e4b16e052fe732f52c81ded6168b22eed1839fed2b12d020b98ff3518f8620bba3659cb404fae342875c16386f4ecdf48286e5b99b46a95
@@ -35,7 +32,6 @@ DIST github.com-json-iterator-go-v1.1.6.tar.gz 76814 BLAKE2B 7424a5e4fb178e511e4
 DIST github.com-konsorten-go-windows-terminal-sequences-v1.0.1.tar.gz 1909 BLAKE2B edc8dc8f9a9c27d724b98614c2d937f5fed94977c1590f542cb1c8724478a63bba61cd6569fc7daed1e870bc59fc5ca0f5acd501f58e7c93e5c69517c9ca80ac SHA512 8c781a4c17df20623b8ab5af9757fedf6fae9362c10f195eaaeb821a0520ab9407de30607fb085a38a04915eb180bb8d5c4940f91db4fca7ce1cf69a8276bbe7
 DIST github.com-kubernetes-api-6e4e0e4f393b.tar.gz 775958 BLAKE2B 0c30e606694c8457e0ce36aab860b93d6807020891be9a923ec3990b83d9f4a5d7323d9d283b7d5f1e0d122fde9f4d80b7860c2c2db19ff06ed93ab93a723199 SHA512 29a70fa69173d06ba84bd313d433cdeeee9a0326a5f2f4a7e859d6e5cc4fc4e6e7dde7d13b8002e0441dd42f84c170770b9855d3b4b5412e6cdf19bcba650599
 DIST github.com-kubernetes-apimachinery-6a84e37a896d.tar.gz 474085 BLAKE2B 6f14c64b7d4092350f5cb70c2648f5285cadeee4ffc70331fd7135f7dbbed82e4109a433e04d5e6691576cbdfc15e31d1b673eec94bd79fdf7c65e3d5d3626a9 SHA512 8c3acc2935ef84c516607bf93419e0fccc09e56e4101e1d8330a975a3e6171d21397cb2f98ccab6a3e7a9597bb1f9b1e936fa53746442f2cc5de1fed75a95c69
-DIST github.com-kubernetes-client-go-v10.0.0.tar.gz 514946 BLAKE2B 16e6c6532770a142c267e9fdba2b447e3a3c4ec58ab064bec4368e7747e6d80e97c81fa1108d4155285fb3d2089345277a6fd39341c447f9feed61340b9688e3 SHA512 a6b9b976cd156a6d0aafaf2eae92cf03c543face13f332637dc50533d4ff3da338213f9b2cf55d1a9a36dce5eda76dd27819ab3d391f27b1f5785d2e68890715
 DIST github.com-kubernetes-client-go-v11.0.0.tar.gz 543528 BLAKE2B 085805fd993e2d0f3a0e1df98cd2115c34a2b06910998c8674f78c0c2321eeabbbc61391eb1945b1ea921db723ddd8391d7230c5d0d119fe91b9183e4ef6cbfd SHA512 ea72cc9a17c7b3740fb77348da9d23843182ed464d9dfe1a5b6ffb6ed333456626fa6f0c21ceb597210bfd915f7b798187db255a217e3ddb02e54a816d02d2de
 DIST github.com-kubernetes-klog-v0.3.3.tar.gz 28852 BLAKE2B 9cd3b94702711ae581906102499450aaa59daba2e81529c3d7a79dde8769292754558506e2a8915538e529ba0625abfb95cd995d3cdffbb958a472c17774e3ea SHA512 470ba798fa9c4f938fd9d35560697d79e208bcdda1acb3f716341bf492026c6ba5be644315fa1550f8c2d50a9085f67038740b303530bc0102a714d749a7e3e8
 DIST github.com-kubernetes-kube-openapi-db7b694dc208.tar.gz 735897 BLAKE2B 81b6a341c77e82537e7d6dc36b4f39932417101e5c877584d00bc20b3d7521305960a8a1475869466734bb2ec96b35f704381c922ed11b5b65ab2215d63106c9 SHA512 f903794d2a4c42e482ee13c76421c9454601ae13303dafc0ecf5da9098e4961ee2144513b27ec1a57f8dc616a29d40cf99fa59f74055db2d02617dfb9bf917d0
@@ -56,19 +52,14 @@ DIST github.com-pelletier-go-toml-v1.2.0.tar.gz 57496 BLAKE2B 48ffbd6b1b06df31b8
 DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
 DIST github.com-pmezard-go-difflib-v1.0.0.tar.gz 11398 BLAKE2B 8f317c172d615e07c92337dd814c07c772347de3fe81b952bbc4fd1a643d495cfb6ec5b694a531f2745e1601eca2d4977ea2c1202ac7fb1e3cdba31e90c4ea34 SHA512 283927de73a3d0405bbca8b5b0c24137dde2f1063539c6ce4437331ed99e732175b2a384e5a70cb9a87cc74da94f5347e2a9785fbf3e46ec2431dc5071c3f045
 DIST github.com-sirupsen-logrus-v1.4.1.tar.gz 40811 BLAKE2B cde067ff74800153f555e3f9f00021d4cd9d11adadfa6df6b3da0cf86cc7a8cf7137e5d8e12adc7fdfd45022e9dc0c309a6e23ec4b50d9b9cfc37d73038e21b9 SHA512 7e8e215abb0a7909602378caf8ad746b73f3097b56d2ffd81fc7fb4c9a6b68dd8be25ad452cb19b02d7129e0abbb1e29aca51d91a9421ecdec711abcb97da268
-DIST github.com-spf13-afero-v1.1.2.tar.gz 45309 BLAKE2B 0de6a204590f40cda8e80495bf57f55827aec4fb0fff58e0ae7d03b25d297edf530af4c8da94f11ad9bd25eb148fb72b083c75d513b8c4802e8d1a557386f101 SHA512 2ea3773346086d7f0e499653649ef9cbe71b5c0ea488b7650630f4262c13fa426522c9f9556ab127c7b8aa2aa97ff0b34cf3a9eba8b7c753ed200292a50a314e
 DIST github.com-spf13-afero-v1.2.2.tar.gz 46157 BLAKE2B c9cfe5ce721a9992b775f82521f769fb79c67743db499540bfc5ca371f2f927c715d3ca11a1231180f56c3dd6a844a69ceb3b84b33a37ee348f3e39fafd29df4 SHA512 6b4b39ed3f8c537069cdf26840f21ad15807621ad494c78ba6c376de3994842730282a7517a3c5f7919402a3ee06a5cc6988a34207a531b16933b403c1635ee7
 DIST github.com-spf13-cast-v1.3.0.tar.gz 11085 BLAKE2B f46ad23efac14d599ef7268c033c5f244ea7976982fee02b4d83ae65f91a72150bef359eb24b8c868f8a42ea8a0aeae839dcf82a7646648bf482f2a520704e09 SHA512 4cd15f59860fddbb67055beb15dfb8114ecaad5999a8fb46fbbbdea1cf78eaa094a4893c10b97efc7d2f95509920688659d609623135bf9871e6229043452194
-DIST github.com-spf13-cobra-v0.0.1.tar.gz 101512 BLAKE2B 1f61e9a6ce820742d5a575901cfea6188d8bed5d3034930649c73ffcdc3e3fccd5e6c55cf017197566b21a8e141e82f9363d4531f3ca3ba08ae3f34cefdfbf1b SHA512 e2d3865f90f20c144694a70b4b7b74baf636c31d9a1efedaa90135b01ee7673a17cfc51d4fbf11f220f9035ca52294b7ae4a61c42101da059911e4bba5b1918d
 DIST github.com-spf13-cobra-v0.0.3.tar.gz 101526 BLAKE2B 8613eccdd5bbd31429b7aa8260ee9367e34a5cc78075b394b09db91a97445ed1dadfb53a86105b55cb6ea3b4c2f9d50553e9198d64dfb6033dd1db2805984a2c SHA512 c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb
 DIST github.com-spf13-jwalterweatherman-v1.0.0.tar.gz 6392 BLAKE2B 15ed225aa9eb6afca552a19a7ba22216454a27a29aa9f7ee39758100ff123afe8b10e06fce63bf2f4710fbdcbc5c680d3b4eef1cc3c8d363ce0a9f31ce8a34ca SHA512 13cc90c6f4a9fcdd29610773ada79fa2072223459c824b0f732ed3a6f4c61cb7a65c169f70007d3a08354f0a2e06b67e5257c4b0a0e1989fbc2309e69f7200cf
 DIST github.com-spf13-pflag-v1.0.3.tar.gz 46002 BLAKE2B b7caa90be69c7bb6a36b0da68af309debee6edd6e2596d39e286ebdb10f9f90246736f3af3a35c89ac704e2764d2ac40e76dad09c3147a942200592e3d234916 SHA512 d7121dade4fc06568cfb650a529dda350c60171e97ca405d29b9654a9fd06e453d20f8efc2fd8c51f530cfb0708648b2b2ba06ab40897b262ef2f3baf04d65a7
 DIST github.com-spf13-viper-v1.4.0.tar.gz 44183 BLAKE2B 4294bc3c5076f1305618f4caf5abdfdec200dbd140d48264495319a33c850a99b5bfa406f4987e58ae5b96321044e12235b60ffee018adfc6612daf04870074e SHA512 59d1ac2d84c4e72687df631fcdad723a5ad96e362a851a56fcf2f2dc57b5a9ac03f01f47fd24f5d3b027ffbd011b3981ce3abc21f3b98fcbe04c7f34752d4b01
-DIST github.com-stretchr-objx-v0.1.1.tar.gz 75768 BLAKE2B a394114d3d4d7d1a7fabd3f4b4e0a1722df8f1332685d1fdfff9662a7077ac43f5d6e5cd5f360fc47a9ca0852a81574f050e41a089ef40052c14311dc4fc3e90 SHA512 1db9240a7f4c1f34788418abe60bf566823d4881f5224eae9ba6cbf31e65177ef9f5f94b42fca2151bd0111a69b42f1fa6d5ec317955a32463199d4bd6d86b75
 DIST github.com-stretchr-objx-v0.2.0.tar.gz 79981 BLAKE2B 142269aa50602af8a00dd5f9acb0c85d3287c3d1fbfd953675c6023e597dad88462560ad02d3d20671fa1f3c89fdf66e46a94015e5c492287fb4973beb84d2c8 SHA512 d2b9b907c33b52e6ae5ef58280b3e8b2aa03bb7fe055275850cbe95ed4c62663867abe6ad7a5790ee10ecfab9c0cc7cbcefea1d3971454c02fb198c792402b36
 DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
-DIST kube-bench-0.1.0.tar.gz 233675 BLAKE2B 1c4de681dd6239f79b552ad3cf165f0909fcf3c1b78c1b9092b6f2a254434ae755915db58ad78ee3c154dc5d19fe27619d2b7f3555673bed9b1f57911ed93617 SHA512 01f0bce866a828465848ace30c95bbec47b70e6475cebfe999966eb3ca8fcf16204e292b5b4005a6281ce03ea2ab61b9a6f98272255535ced1778556dd8b8fbf
-DIST kube-bench-0.2.0.tar.gz 251104 BLAKE2B 0ab76d6c25c46c16a592661715adac1b759799140162c844fd819fee018003e759b55d6d9d3aa96ce7cfe7649b33b3ab419c2e9e868d3c34155d509f1e1827f1 SHA512 bcb11305d9f7cc279f8fbdb0909210e22b699931a4bd26c9c5574b017b07c4a7dc6cc6f42397f35c744dd72c9227b656fa622318ab7af7704d748dfdf06dd6e4
-EBUILD kube-bench-0.1.0.ebuild 1995 BLAKE2B 3a8be59930b294fa55a27d4a8421f078b11a9444a1509f469b881b9a58fe160f6887004a5963fb6e083e8dbc00dcae0ced12735d8a43cc8cf4cefe78299bab7a SHA512 11f0564ce0a6bb22e6955dff286679bcfac6a102cbba70127c04030c77cfa608096bae1430ffc554d0adf1ca069ecb3ec63bdf8265d2f8db01ca711a774b1b1a
-EBUILD kube-bench-0.2.0.ebuild 3684 BLAKE2B aeca87cb41272d8edfe5004b5670e7a55d66a0741b961ee34b22208af63fb08bb68e84fb39ac963f2ab389eacf290b2bbc7d660ad248a598ebae5c051ef5cab5 SHA512 fef02a4817f6e8e937919e365d5dd75de2837187691cbc39a85bb8bd34c5563dfee7dde38e463fe043aad334ee7eb6613e737b52d8efc93af90e8faf6bc443bc
-MISC metadata.xml 255 BLAKE2B 628f9eaa8ba463b7c6c89c54ab2e4c349f67a9c9d6218761000be93c7c631ebb104c82980973b627e43ebfded8bf75b3f97045d904dcdc0b65ba7f1885de5040 SHA512 5f63f4f3ff0ee921947063d53f5c57f8888ae434eabda7042bd721677651ce801a89da67b4a3e125b5ef0f678f1d71a117ec1b768c4a469ade349d1d075e7843
+DIST kube-bench-0.2.2.tar.gz 262782 BLAKE2B f952bdb545fe220c34e6568c52b8450b66f251ec3b5d059ece92c4eec9d5505f1208366c2b7fbc351513e2bd51b93bb2ab05ddb6179cb0135c658c6f6da6b38c SHA512 7b3814a12b1c0299ebec58e8d41b8fceb61e395890d088fc942aacc72482b3458b874b7d67d5b41b57c378dfc3f7c695474461440bf767ac94dad935963a0962
+EBUILD kube-bench-0.2.2.ebuild 3684 BLAKE2B aeca87cb41272d8edfe5004b5670e7a55d66a0741b961ee34b22208af63fb08bb68e84fb39ac963f2ab389eacf290b2bbc7d660ad248a598ebae5c051ef5cab5 SHA512 fef02a4817f6e8e937919e365d5dd75de2837187691cbc39a85bb8bd34c5563dfee7dde38e463fe043aad334ee7eb6613e737b52d8efc93af90e8faf6bc443bc
+MISC metadata.xml 336 BLAKE2B 277f263a32b6d7452d2b675e4434e56f44d4d68d2b502bb59d6c54ee29dae0e02af8c17c157850f1792c0d0268701aef7c669f171b1a9b4d629b297593d4d3e3 SHA512 5b0fdd5ea1e4da321fb30b752fadf565cdede02a8a001259569ce28294cde66dabbd42c73a3abe682b3cd223ccd28a31a269432f05acf015e3215a03f693b155
diff --git a/app-admin/kube-bench/kube-bench-0.1.0.ebuild b/app-admin/kube-bench/kube-bench-0.1.0.ebuild
deleted file mode 100644
index c1b95c51d3b6..000000000000
--- a/app-admin/kube-bench/kube-bench-0.1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/kube-bench"
-
-EGO_VENDOR=(
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/fatih/color v1.5.0"
-	"github.com/fsnotify/fsnotify v1.4.7"
-	"github.com/golang/glog 23def4e6c14b"
-	"github.com/hashicorp/hcl v1.0.0"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/jinzhu/gorm 5174cc5c242a"
-	"github.com/jinzhu/inflection 1c35d901db3d"
-	"github.com/lib/pq 83612a56d3dd"
-	"github.com/magiconair/properties v1.8.0"
-	"github.com/mattn/go-colorable 5411d3eea597"
-	"github.com/mattn/go-isatty 57fdcb988a5c"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/pelletier/go-toml v1.2.0"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/spf13/afero v1.1.2"
-	"github.com/spf13/cast v1.3.0"
-	"github.com/spf13/cobra v0.0.1"
-	"github.com/spf13/jwalterweatherman v1.0.0"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/viper v1.4.0"
-	"github.com/stretchr/objx v0.1.1"
-	"github.com/stretchr/testify v1.3.0"
-	"golang.org/x/sys d0b11bdaac8a github.com/golang/sys"
-	"golang.org/x/text 17ff2d5776d2 github.com/golang/text"
-	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
-	"k8s.io/client-go v10.0.0 github.com/kubernetes/client-go"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/kube-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GO111MODULE=on GOPATH="${S}" go build -mod vendor -v -ldflags "-X github.com/aquasecurity/kube-bench/cmd.KubeBenchVersion=${PV}" -o ${PN} . || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/${PN}
-	insinto /etc/kube-bench
-	doins -r src/${EGO_PN}/cfg
-}
diff --git a/app-admin/kube-bench/kube-bench-0.2.0.ebuild b/app-admin/kube-bench/kube-bench-0.2.2.ebuild
index dafcaff2b9c0..dafcaff2b9c0 100644
--- a/app-admin/kube-bench/kube-bench-0.2.0.ebuild
+++ b/app-admin/kube-bench/kube-bench-0.2.2.ebuild
diff --git a/app-admin/kube-bench/metadata.xml b/app-admin/kube-bench/metadata.xml
index 4ffadfda2ceb..3072bbf793ba 100644
--- a/app-admin/kube-bench/metadata.xml
+++ b/app-admin/kube-bench/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">aquasecurity/kube-bench</remote-id>
 	</upstream>
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index c361d5567a15..a7e3b69f61d0 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,3 +1,3 @@
 DIST lib_users-0.13.tar.gz 25704 BLAKE2B 895f8b721216339fe4306158bf6282353d79584573091cc4e7c63c8096a9f9cfe380a8bce7229f168e44fe5d3641ceb8c91bd751316a6c6a467ace4ec0dce723 SHA512 588af7068728810832bcf4d1526f271e255d07c75d152fb41844c66f3598a71e9a96bee3426b31b58cd26af889bc42c0a7248731fdfe3623fd4567d2b6b7275e
-EBUILD lib_users-0.13.ebuild 1141 BLAKE2B 8207a3a3ecdc77712bab4d902a777027daa5c8966fa87a0e59de366f5ad575a8f27319e1a829ee80850eb11ce701060e91fee954444b0ae6f65aaa9669ff982c SHA512 6c55d47620927133b930320cec61418e2931d76e2283006de86d639fedf557978a8434fe0878263716ac2c667584c09c29545ca752b46764aac97334f28b75e5
+EBUILD lib_users-0.13.ebuild 1137 BLAKE2B 760bc729222a5f2c68d30cb69ca215df45869cb6164106953adae2094e2b28ad0ec4fc6dfd9b5c1e117ff34a59b12e7a5469ffb610c73aae63da67ef09a41830 SHA512 63a375b89febe88792e6b44010278c74d159b1f8dad8f336fbe8164d4709412e2770d4298c6889dd4e80633a9ea1e5d5f46ec82360c688a874e7b4ed8c593df7
 MISC metadata.xml 454 BLAKE2B c545fd1db330988ad139de08b1890cfd9d6aac98947b954fb761515d314d8ebb941829e7767fe4fad6beb41caf3409111505d1a6378c852f15907933678ddd48 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd
diff --git a/app-admin/lib_users/lib_users-0.13.ebuild b/app-admin/lib_users/lib_users-0.13.ebuild
index 3338ba112722..7f5ab51e0e54 100644
--- a/app-admin/lib_users/lib_users-0.13.ebuild
+++ b/app-admin/lib_users/lib_users-0.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # 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_6,3_7} )
 
 inherit python-r1
 
diff --git a/app-admin/linux-bench/Manifest b/app-admin/linux-bench/Manifest
deleted file mode 100644
index 10c4eb5062c6..000000000000
--- a/app-admin/linux-bench/Manifest
+++ /dev/null
@@ -1,23 +0,0 @@
-DIST github.com-aquasecurity-bench-common-81f08528fa03.tar.gz 18981 BLAKE2B 6579a12622870e537a16f467bcfed71ed1c791641e1948caee10a69f8ff7fc28a3f73e48beb8d3b1d274428e498720f528237d07b28fe1319164ab1339852d0e SHA512 b01f88ddb7c119dc9d7e4f7f3e2d9c80b4046dcd65c6d5f2640d28c235c04fbe03b348032584350485f6323920f692cd96ff73e4140faaeb26d7d5b6eb24671f
-DIST github.com-fatih-color-v1.7.0.tar.gz 816449 BLAKE2B f006f51cbd1a0288380b339d7d2b493e447aa1e6bd783f11de5670d4db6ff8c1463cbe957a04127c1f24186a9362be8c40ecdf4394cbbc0e2c6c2cb598c012ac SHA512 ee5668ce828ad3e5461c54d971aee4b10a578f697717010d60fdda641948430816e74580563dfea6a4c66a9840175ff5b63c2ca9cf1af213cfac5be7b8ddac36
-DIST github.com-fsnotify-fsnotify-v1.4.7.tar.gz 31139 BLAKE2B f2d0aaabfad525fb640beba78991a858ad23203a557a69fc15d2f017b2a693c64c244de435682b1cd9d59e89a97e4ba60c7f95fa99a6145a9dea73b0f334936e SHA512 840943043c49c837641f04b976f2ba610fc03bd31030ca6442744d51fa9241da1905730ea11466e249a5bd37437f1e2a433a012a64ce872a1562c941bd5bfcbf
-DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
-DIST github.com-golang-glog-23def4e6c14b.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
-DIST github.com-golang-sys-a9d3bda3a223.tar.gz 1245170 BLAKE2B 62fd7fea3ab8426f9092e6758573c1fcd8915c776b7f44521d7d82ee42bbe5d4323a8813f1d39c336da6bce3525b4eff1b60e024cbf037738268dc7151024f4d SHA512 79e81f5fc94fe47ce3e794a80e888d09e3d9a192a65fd234a177e1665fde5a9029d1197160edfb5df7e479313665536a1e6445428d41d0c33f5319aa5d79cf51
-DIST github.com-golang-text-v0.3.0.tar.gz 6102619 BLAKE2B c92e68014a8c157d76741c02acd708771d66bd3dda5b19285f5aa3e073e0fe3fccb9054744d35ea62b681ae4421bb7489238d6868f9314fb26f88e002287abe8 SHA512 bd60dfaa7d9dbfca171a3ba40b51f5663c01257cf3b12b618d35689a97ab2212d316d5716ff09681bf40b099f7e20a0e0df8cfc065699cb6a07ad1dc2e2bc189
-DIST github.com-hashicorp-hcl-v1.0.0.tar.gz 70658 BLAKE2B f28dbe8171ce4fa94f57e8bfa8ffe7e16e57147a6a4525a8b5d31d3a47e817e056a85bdb8b91d56be202db27a29f37496f73014d1d97c5d55ce07b89f7ff6848 SHA512 044e3ba2a44a1abd9c851d4ec1f5c541663f8cd7f705c46c6ae2c377fae6df6315a6596c42f391e8239b61f0f0f6caed8d4156f8875cbddfbc7bcb78eaeb466f
-DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
-DIST github.com-magiconair-properties-v1.8.0.tar.gz 29504 BLAKE2B 667b8e60ed2ff538a84f199e43c75d37998d6fcb2e9c3cd6b3e069ba9950d45b4cd775797879467ef86b701391078582be2100fe32fbfc4c794f728fb7f38527 SHA512 9790debc8def1a7eae5a1e530ca68e53e562e622b374752f69e40aa508a88b58b95e15a503a8314e7d4f71a42411d1ba462687184c2b251eb41b5ee3f12ce95d
-DIST github.com-mattn-go-colorable-v0.1.2.tar.gz 8518 BLAKE2B 176ecf55b90c106f4801aeee6d03a53eac495d23ccdf70e8276fb9f909ba144e2b59643bf4dd708131abb0ee3d1ca08c334f2accf0c4ad31729d46b8a7509a09 SHA512 fec4d5e9c5d4a259e81fa62d5188bfa6c5309e9113c0d77803f04702c482d4dc4b7ca4ae079a0aa1d8f789b48ad6dd2dc4f86074e8fa51e0fce3214fe88149c8
-DIST github.com-mattn-go-isatty-v0.0.8.tar.gz 3564 BLAKE2B da50a8739bd33249bca2231509948da94d5ac61787e5ac84af17b04a5b76cc751d2d3ab00d1967e1bc71365060835c6d668a8cea607eccd5a4f95bef8cafb240 SHA512 e9dc9181dfa9780bffd5b1aefbee9028d8a38c2c8feef6a0ca28952b57948a41582dc4c372394bdc76f8081490283d055f89cb7a8792418b3ee55a85c32a5b69
-DIST github.com-mitchellh-mapstructure-v1.1.2.tar.gz 20980 BLAKE2B 6792e875503b852773e8f062808f7bfa5a7e77ab4ec9012865750a5e15a13a6338490e7dd865545b8055c043a9f016cdabe6fc71c031a1210eb3a5e0c28a3394 SHA512 86c9fb9494652dd391b67185aae44b9cb14fcf96ba9ff62ed95c8952b01f6485154102e5883d16c6007d18a02bbf34e5937e2842df72c0244d48b22ee6aa9fe3
-DIST github.com-pelletier-go-toml-v1.2.0.tar.gz 57496 BLAKE2B 48ffbd6b1b06df31b89ccda4d5aa7f8b23215a2532aab102612231dcdda3fcad4c277f15a56894e10bb94cb3c891f50e87ef9c0e6c7e1f3f840d14bd85634b25 SHA512 07791bbc0e578ab383776d715942cd4fa723e5fa6f9879676b6820166ca9b776651fd62a0584cbcc52d2ba87cecf18184734ce9b06fb5b490013eb8dff6fbb4d
-DIST github.com-spf13-afero-v1.1.2.tar.gz 45309 BLAKE2B 0de6a204590f40cda8e80495bf57f55827aec4fb0fff58e0ae7d03b25d297edf530af4c8da94f11ad9bd25eb148fb72b083c75d513b8c4802e8d1a557386f101 SHA512 2ea3773346086d7f0e499653649ef9cbe71b5c0ea488b7650630f4262c13fa426522c9f9556ab127c7b8aa2aa97ff0b34cf3a9eba8b7c753ed200292a50a314e
-DIST github.com-spf13-cast-v1.3.0.tar.gz 11085 BLAKE2B f46ad23efac14d599ef7268c033c5f244ea7976982fee02b4d83ae65f91a72150bef359eb24b8c868f8a42ea8a0aeae839dcf82a7646648bf482f2a520704e09 SHA512 4cd15f59860fddbb67055beb15dfb8114ecaad5999a8fb46fbbbdea1cf78eaa094a4893c10b97efc7d2f95509920688659d609623135bf9871e6229043452194
-DIST github.com-spf13-cobra-v0.0.5.tar.gz 111126 BLAKE2B 0f5fe38e3e278603fcc53edfdd72206d7b6850aa3ac4054b4242091949fe327bf80ddc46c20c3df1e644807e5b8882c528ca5d3bc184b9f039038cbe9043835a SHA512 c21a2c935365c74772152e37adea553dc89fd31dae794bd7e8f56d7c9eaafe717e2d0d6f56e1c8d2fe442df445dee9f03bbd30e802e2ac6911babf309b901c04
-DIST github.com-spf13-jwalterweatherman-v1.0.0.tar.gz 6392 BLAKE2B 15ed225aa9eb6afca552a19a7ba22216454a27a29aa9f7ee39758100ff123afe8b10e06fce63bf2f4710fbdcbc5c680d3b4eef1cc3c8d363ce0a9f31ce8a34ca SHA512 13cc90c6f4a9fcdd29610773ada79fa2072223459c824b0f732ed3a6f4c61cb7a65c169f70007d3a08354f0a2e06b67e5257c4b0a0e1989fbc2309e69f7200cf
-DIST github.com-spf13-pflag-v1.0.3.tar.gz 46002 BLAKE2B b7caa90be69c7bb6a36b0da68af309debee6edd6e2596d39e286ebdb10f9f90246736f3af3a35c89ac704e2764d2ac40e76dad09c3147a942200592e3d234916 SHA512 d7121dade4fc06568cfb650a529dda350c60171e97ca405d29b9654a9fd06e453d20f8efc2fd8c51f530cfb0708648b2b2ba06ab40897b262ef2f3baf04d65a7
-DIST github.com-spf13-viper-v1.4.0.tar.gz 44183 BLAKE2B 4294bc3c5076f1305618f4caf5abdfdec200dbd140d48264495319a33c850a99b5bfa406f4987e58ae5b96321044e12235b60ffee018adfc6612daf04870074e SHA512 59d1ac2d84c4e72687df631fcdad723a5ad96e362a851a56fcf2f2dc57b5a9ac03f01f47fd24f5d3b027ffbd011b3981ce3abc21f3b98fcbe04c7f34752d4b01
-DIST linux-bench-0.0.2.tar.gz 73095 BLAKE2B c90b0185886a56a2afe2110c167dd2f7783f2bcdf50670d632ddd4c30f34a8186cb82fc477e6ddd9b9d8fbb22ce19438418dd3db62f8da851a20c04b23f61474 SHA512 acbabcebd5bd79d32863941e501b8e787ff89f92564ce7a0827fe1cde4f6c210bc4a5ff9d9a9e1f5db33b019f215eff3f27869e58ccd23e1eafcb8931dc3f0c9
-EBUILD linux-bench-0.0.2.ebuild 1639 BLAKE2B 8ce45b18d73324c1e377ace972227624a170de7c5ef32eb9f32e665ed5e1ee6ed075f562ef9de4d48a481fd518ece1d6437520fec1004d26092f568b1526541b SHA512 9ebd8c951d589f32a0ba7f42b8380c6d27aa8257efc2d109d9db0e230ee8232cef6be58434aff79fbee40a89cbc141829dec5a3c77ae4f5157dc0b813d6dc8d9
-MISC metadata.xml 256 BLAKE2B 9c5d2003cd3eb6f4350366e0dfe187ec49639222e551b578a34c050faf6b2c968b483fae3a866e7940ad7398dae958886b373c30e7342b2c8256e0585bd61390 SHA512 02dc13507c7b2ea5001527e53576619236af3f224e694f33b3457db4fca4f33229b2cf31ea99400833fab20c1555afc4d0816aa3f13bcec1b047be9ad16ff475
diff --git a/app-admin/linux-bench/linux-bench-0.0.2.ebuild b/app-admin/linux-bench/linux-bench-0.0.2.ebuild
deleted file mode 100644
index b9f23fdaa036..000000000000
--- a/app-admin/linux-bench/linux-bench-0.0.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/linux-bench"
-
-EGO_VENDOR=(
-	"github.com/aquasecurity/bench-common 81f08528fa03"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fsnotify/fsnotify v1.4.7"
-	"github.com/golang/glog 23def4e6c14b"
-	"github.com/hashicorp/hcl v1.0.0"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/magiconair/properties v1.8.0"
-	"github.com/mattn/go-colorable v0.1.2"
-	"github.com/mattn/go-isatty v0.0.8"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/pelletier/go-toml v1.2.0"
-	"github.com/spf13/afero v1.1.2"
-	"github.com/spf13/cast v1.3.0"
-	"github.com/spf13/cobra v0.0.5"
-	"github.com/spf13/jwalterweatherman v1.0.0"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/viper v1.4.0"
-	"golang.org/x/sys a9d3bda3a223 github.com/golang/sys"
-	"golang.org/x/text v0.3.0 github.com/golang/text"
-	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/aquasecurity/linux-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Bench for Security runs the CIS Distribution-Independent Linux Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/linux-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GO111MODULE=on GOPATH="${S}" go build -mod vendor -v -o ${PN} . || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/${PN}
-	insinto /etc/linux-bench
-	doins -r src/${EGO_PN}/cfg
-}
diff --git a/app-admin/linux-bench/metadata.xml b/app-admin/linux-bench/metadata.xml
deleted file mode 100644
index 9ef050e329a6..000000000000
--- a/app-admin/linux-bench/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">aquasecurity/linux-bench</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 60d6751fc12b..5aafbb074c66 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -12,13 +12,16 @@ DIST logstash-6.8.4.tar.gz 172186036 BLAKE2B b1219dab8dd1f88d01def54306ae09b3e9c
 DIST logstash-7.2.0.tar.gz 171299740 BLAKE2B cfdbabc11d6e0d182ea7bdff1d30ca3a5bfbfe036f952c0d944c105f563dfa1b444c8dd1e9f023301abfbf9a86708d6bde2689b462b28f00a34d09f78fe3898c SHA512 955358d504b6626ba9ac88a2d65b161044180c3085f8dbaedfb8b85b092ecc65721bbda73b750f7d8b78a052828a54f7ed7ad16ee7ec72f3ed5e428ba291a173
 DIST logstash-7.3.2.tar.gz 171783584 BLAKE2B 0a936edaa57ae5552b79bead754b75c8a8c7a920461b720c58dc8e32c2aae342f3639955b63264e8704093c0d30d5d801f468d1b391e9efb2c5d605dcb2ebf5e SHA512 311b849cb8e1f336908aefa1cb2f0e2d76b696410346dd3fa0560313f9cbd3f098c93aee68c9fead736a3edb39ca543161eb7de115597e034eb0a015904c7417
 DIST logstash-7.4.1.tar.gz 173284835 BLAKE2B d1d3fe199175d57e4b47fe50f26d6d54486182d6e69b6e50cccceecf1cf02484c6d9f1a8cd0ef72ea82b1da9550787cb5ac37bbf93a91b4d0518dde415479a1a SHA512 c89d530f16e5c6953d97708b6ff2f46bbb518a93652f11cad988841a73bf5862beb4a5326de1e63d0ffb65a498fc33235ab4fc950e8087aed5815b3a65e81ef6
+DIST logstash-7.5.1.tar.gz 165760774 BLAKE2B 803b8d90d637f57a4fbece491f0ea4f749c00d674ab12782cd5b7a588f967121a7f48ca2e594862999957aa9239b40876816c2971b5590b6fd3ef47d6faeaa90 SHA512 a7841423db3e66680227b3ae41622c531d47baad9b01830fe6e6823e8cdb78b98987ecd8cc2d0a3ffc3ea822bf69f8df000d4ffac708788ddb9279e15b38b9b4
 DIST logstash-oss-6.8.4.tar.gz 172055711 BLAKE2B 696769dbb94ed9a6c9a84fb54ba35fedff360bff39c61ba7ef6a9a5f00e59dbc3c8d15f6b9080e39ce87f17553f04b831f029e8f779c75f0f28b673a2aa2e697 SHA512 6f7fe35f6e84417332093d089dc737f89737f30718d5ce843dfe6d3ba85d098e2a01da6c191729b68a7a326d4d65f6bcbdfeb656d5120401478dacb96b1f0671
 DIST logstash-oss-7.2.0.tar.gz 171128040 BLAKE2B f0f3d4f0d5228918d8435c521d10ff5070e23561c25ce28e8d58997d499a7c7697354c1fb1cb70bf2bd832ad50c04afb00cbde4b3053f9f24d2619f3fbfffbdf SHA512 24120740bc727b6da50b865bb85bf61f013a38b6679d679ecc75a73c69766a5133fd47ad99fa0220d5dc6cceb506fbde206787adcee31483288c68c228edd1fd
 DIST logstash-oss-7.3.2.tar.gz 171613705 BLAKE2B e1a0c512cadd5855e1a1524e1c44214aeb792361493406c5cacde1bd72243178d03113c08a1fe0d1c2212cec5a2947074911bf19eaaedc636db754081c3fe32c SHA512 3aac74966b27d0d551f49c78c457b18a1a76d0e5a7b2fa1dc9a7776927145b28a6c02f51e4dd7e9ca49dabe5f63effd4227fc6980e522ab7da4ef847da6bda12
 DIST logstash-oss-7.4.1.tar.gz 173114578 BLAKE2B 5530e3275be095168d845381ac2ef92c3fa2e3783b7d9749d88465239751bc74d0483a51fd61ac75f46a569201c5fd34bd1553db32ca84e911dbf34ddd5e6b14 SHA512 26defcb5777c044030081e98cc47a040c72c7a8261f8f2cb9349181ec6a375b4969e1fbd00c8046da2c3fae5a6dea45e53c41d1c84325cd75af766f6a1d4b3c3
+DIST logstash-oss-7.5.1.tar.gz 165585724 BLAKE2B dd6ae7cc6bf69e780773b8f382da23abe1642984073c2eeee8cf2527d2b5d13b071c69b74bd0001abd2cb2a8d5ffac9d396c96f731043e208f93770579236870 SHA512 db1ff3a13df9c5873fd08aadbe2c6cb23e9697653a18d054da774ba8448d6654cf0b41cc05db0a0788d75e325569965c8478fa91864694827daa82fc30c1a279
 EBUILD logstash-bin-5.6.15.ebuild 2195 BLAKE2B 1ef9e7d8a825109a85e850c2e9b971c3b16d435f1a0e3dce40e18b48f64c5b83a3cedd0d85a15d422a3accccb0ffcbe79b2a0812fda24c04fd0f07a0e37b9436 SHA512 6026cb3d76dbab56a4a495b1bc3abea2d0c4c731261047e76acf792840f3deb1fdd0fd181b5b6a599f2056f22b76920e7844f1e76516919c7404c1d10e1b7259
 EBUILD logstash-bin-6.8.4.ebuild 2099 BLAKE2B e7cd6249e76d9e3629cc640542aef942ad893d4643c803a10c789a1070775996364aa0caff337bf2eb18cdd2bdd534941a5637f23e44d370a87bc017bc931fde SHA512 aadfd4248e27c0c0134a7c7705dc3c8cfb9b031a963214174664c8c2438ba8e1e466025337fc9a9a531ff5f6bc16b7e1f25d3362205b0ca2793bdb8482a9e202
 EBUILD logstash-bin-7.2.0.ebuild 2102 BLAKE2B 4859b52ecbe2d3cb0fa31768cbfcfe59ff4ab1ccfb70ed1b0b30edf33415a7107a246ab902fc3c42897804482dd91a25bd8da6af29374c424bc53e700ed1b797 SHA512 3e346deb2bccc47fa55d2de9afbc6bea15f28d235e93fae323620a24a70aa6671072ab90f778d3157ba74c860056a1f76d5ad0ac678b6d658bd49ffbb8fdc3dc
 EBUILD logstash-bin-7.3.2.ebuild 2095 BLAKE2B 80aa953c2657cc0218b18df01e67279384fcc57f8fb3931121c787caf0c198e9d87c138bc2c6d809d0766fd67e8e5046d10ca0d4826047f845d89931bf63e5b5 SHA512 4db211818a819557d904ced91163c2bdfeb3ed9a1ae5ecc9873c1973b5137aca526164fe04c35984b9f97a56564c3e2627d4b952775dd3b0ca220c2cca37fe54
 EBUILD logstash-bin-7.4.1.ebuild 2095 BLAKE2B 80aa953c2657cc0218b18df01e67279384fcc57f8fb3931121c787caf0c198e9d87c138bc2c6d809d0766fd67e8e5046d10ca0d4826047f845d89931bf63e5b5 SHA512 4db211818a819557d904ced91163c2bdfeb3ed9a1ae5ecc9873c1973b5137aca526164fe04c35984b9f97a56564c3e2627d4b952775dd3b0ca220c2cca37fe54
+EBUILD logstash-bin-7.5.1.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-7.5.1.ebuild b/app-admin/logstash-bin/logstash-bin-7.5.1.ebuild
new file mode 100644
index 000000000000..9e7d19873de3
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.5.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+	acct-user/logstash
+	virtual/jre"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/{pipelines.yml,startup.options} || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	doins "${FILESDIR}/pipelines.yml"
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT}/usr/share/${MY_PN}"
+	elog
+	elog "The default pipeline configuration expects the configuration(s) to be found in:"
+	elog "${EROOT}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index f19cd0233857..1b9fd9eba564 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -3,13 +3,9 @@ AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de412158
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
 AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
 DIST mcelog-162.tar.gz 308347 BLAKE2B bd438e85ea793c6c5ce4d561f0400e91b101a010cce7f937751a11a0a974fec49db7e9d768fc50db68a91c973c90c8ab1b4ffa80964cb6fde860b9f2ac217435 SHA512 d61a0b7ad3974098963edde1e9e9acdf4dbd1a025577b7044bafc17302abd19080c8145a2700c691400af0768ff4b6833d47697e1478c5bef8831f7f8b61ae48
-DIST mcelog-164.tar.gz 308393 BLAKE2B da1f425faa88eb8377eb11c3e13aa6fd4c0b4f4d3b02afc2fba8e4137979bb5619b075b0d0ecd80ec6059c9eb912376291e56e667bf7b838bd2f641c4a6c175f SHA512 10c8c580b10caa6d40c2a4887cb9e9ec07eb81a353d24a4d1a89ad8ec5cc29f7976c26335f077393794b060e62b5cbbe348c64567a3cf3fabc3ec5c3fe59da5a
-DIST mcelog-165.tar.gz 308405 BLAKE2B 8e6cf59bfa3a5c667c1b709f9c0c5c82f8710ff1aa7c5758c1573a2c832030bb31735f8dd5a53fab26745739cdfac3001cb7a752df579cf452874d19e9e7da65 SHA512 466a07a90679380783524854934d6d66cbc53474616de9141cd36dd2a3b757cacccf1db50c8d4cd54763cea63ac9c09daf6e27ccf3bcf17d62da7fc3396281eb
-DIST mcelog-166.tar.gz 312451 BLAKE2B 430630f6f693ae22961bae2381117dbb6d3bca228d6bdcbbe007d2a2681cda53f8c29cf18b98a47a88d36fd059e3e08aff5b9ad22243d7ce5083f5643768b0e6 SHA512 35514188cf4932b4ecffb8d8149534367a424adb76f03833d53d3c2a0dae2ca89de90d071e48ed67a17a8a70a67efc14aa186280e9145b7572887dccdf9a01af
 DIST mcelog-167.tar.gz 312512 BLAKE2B 5642a421149847bddc46e776932c0fcaab1e281904a6be4ff8a3254d9e292d5fb77e6fbd5097c7afe0b39eca2f2db1752cdf67714a8a3d2f836785ebde3c0c90 SHA512 0229df9a4772e916af79aa35cdbc644feff76870d87a8c3c6ce5d132cf8c98bc48ec48ba564496071cb803537d3504c84963639370d9aed11d23833b65b3b306
+DIST mcelog-168.tar.gz 312580 BLAKE2B 1a97869cc183c4263bf9868ccdc24b15658de0e863bd03ecdf61b0c6a03f5737dceec1b5237a8dfdf2f889cab9d55d3b5274bde5533841fc1aa56ed2189f5ffc SHA512 81f4ccb2632e5c34c52aea430a682e44d6b9850fbee2e9180a493025bbea660a7a4eaff3ee1e2f6e3d3700d3c951c09c4534b733cca5c809ad9c5a1ff8b07295
 EBUILD mcelog-162.ebuild 1367 BLAKE2B 7fb646e842316273c540c327b2bbdc1c7c7f77f8e4150406f56bf207b581f1e9c05eb19c93a00ca924707f4af4b263665e81ca0f771e635340dd6ebfb6e1c9e6 SHA512 8d1e0e8caa4a685c1323a52c02a81f8de194c69fda836a3f70bba95b7c95fc18914c01cd2c0b76a25c849df4011c422216944684d1c9dc09774590ae788a3707
-EBUILD mcelog-164.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
-EBUILD mcelog-165.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
-EBUILD mcelog-166.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
 EBUILD mcelog-167.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
+EBUILD mcelog-168.ebuild 1369 BLAKE2B 28898352135feee6b52597bc287a9662dedcda130127b27d504641117f102422da9c41cc6dbdc70bebbe50f8c43f63ef997199406c4618e9ac1a58a985d74e33 SHA512 ed1b2bc475a69db7772e5ee18b56766ca7cb4776f09fa14ff7baefd369127be5167ccf56e038d6e793277a0928b1f8b25437ab7b6aa103ef1608acc15450dc21
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-165.ebuild b/app-admin/mcelog/mcelog-165.ebuild
deleted file mode 100644
index 557b542b3a9f..000000000000
--- a/app-admin/mcelog/mcelog-165.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	insinto /etc/cron.daily
-	newins ${PN}.cron ${PN}
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodoc *.pdf
-}
-
-pkg_postinst() {
-	einfo "The default configuration set is now installed in /etc/${PN}"
-	einfo "you might want to edit those files."
-	einfo
-	einfo "A sample cronjob is installed into /etc/cron.daily"
-	einfo "without executable bit (system service is the preferred method now)"
-}
diff --git a/app-admin/mcelog/mcelog-166.ebuild b/app-admin/mcelog/mcelog-166.ebuild
deleted file mode 100644
index 557b542b3a9f..000000000000
--- a/app-admin/mcelog/mcelog-166.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	insinto /etc/cron.daily
-	newins ${PN}.cron ${PN}
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodoc *.pdf
-}
-
-pkg_postinst() {
-	einfo "The default configuration set is now installed in /etc/${PN}"
-	einfo "you might want to edit those files."
-	einfo
-	einfo "A sample cronjob is installed into /etc/cron.daily"
-	einfo "without executable bit (system service is the preferred method now)"
-}
diff --git a/app-admin/mcelog/mcelog-164.ebuild b/app-admin/mcelog/mcelog-168.ebuild
index 557b542b3a9f..e0b67a2d755e 100644
--- a/app-admin/mcelog/mcelog-164.ebuild
+++ b/app-admin/mcelog/mcelog-168.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index eb4e829d79f0..4e33c79462e9 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,17 +1,17 @@
 DIST mongo-tools-3.6.13.tar.gz 4990848 BLAKE2B 022ddf214869c3a3e545aa9572f77f0adc21c0dbd6ea6ad9e083633c2e972b7ef77c0bda4354dbde9fd0e23c6dd02a7de8873d4b2c2a3e4423ea6f8e1c23ed52 SHA512 fac21c4841bfecba11a7765bb6c36d1fa19d4dd94f6f4168fa767fc11dc8b3caf04a5029becd09eba01dd694274e9cc22da8566ce878769e5c3c97016c162432
 DIST mongo-tools-3.6.14.tar.gz 4990861 BLAKE2B 13394a7222e73c0912e7d9d04205b25e5d73d6c72b53521b0749e0998dc52bbe4c7733d460b189aff2401790f537d9aa369b969ed273ea0858520ecd75782b66 SHA512 3e7caaa1d568023d478c77d5e88127796b25d27c71e30af692983f4fd2160887662253ffc67e6e87aa3a7e1fd4ae231de9401b1628412a4561b9595b71df8834
-DIST mongo-tools-3.6.8.tar.gz 4723878 BLAKE2B a1693024d60f69d25c268eaaa30a478b1e4c0042c5fb7a3fd6252ed00aef2fee3fba94516fe825165a1a57887ed38e4fbce488c48ddd4f45349f0b7a1b244020 SHA512 359e8ce2d847d005d48ff12bc2e8af73213d81cd1521d2b5b5ac94792468218248bebbe808e1bd8fd49234eab8480608f294c1b63f317aed58f456b84ef17dcf
-DIST mongo-tools-4.0.10.tar.gz 11134721 BLAKE2B f25e834622db8a2cea1658d9396b747666dee6a0e6471f5fcf351431f716735227b19f854c228ebb9ace8a7c27b8cdf83f8a5009107191aa6dd27c1a4c037505 SHA512 12764b2e2016ae3ab3f0ed1f5b9be9ce10e466c53b408ad2c01b26bdf39ca41a358acd07aea5847db2b40e3e89293f77efcd2b310e4e2bf3071873abf1b20f49
+DIST mongo-tools-3.6.16.tar.gz 4990806 BLAKE2B 743c24fe55a0353e3ce31a82a53c94560408725f9fa35d93d5bc136d2b6e465e081c8ad4b00d63826ea45db4431124cdf2b66341eba9be24db890fd80941b728 SHA512 ebb356690c2aeb7d47435ea05f977e9319c915e1af48b89fc9941f72871baabb5faac238b59281330fb46e7340ee354f56f438ea3d0abd97b859e2321b719038
 DIST mongo-tools-4.0.12.tar.gz 11134652 BLAKE2B d3c9703046dc577b85cefe1185678e0029411ddd44d0648f9b09fc3ab41e3661891d18afd83bf1a148dc4c9208895f444c115948e515e09dfa3062e89d98fc24 SHA512 068d8c456386caddcce23fa8917ffecdc9b5c39fb6794c5cd1d9099be1f127ecf680b006055581dc3d90507072a87788b46be7410f0dbede42da64c664b77ced
 DIST mongo-tools-4.0.13.tar.gz 11134653 BLAKE2B b963f2a4ee598f6716c6c678df029040f57e2ad17b0e025139d3ac5049aacefbf5342a455ac58161c11df734da4fe4f62f021c1544eee3542af3aed77a65e6d2 SHA512 0694c7ac5743b04d927e27eb913df1b9b55c6c7a26d2a4dc52af8d2e0a6934416f416da91c57e1e61804ae855ec4bd8facabacf0754f9f924f21602737f29e3c
-DIST mongo-tools-4.2.0.tar.gz 14402906 BLAKE2B 535a9a0e49f4288e63c905f7bd98c1f1b8e38eef562cb5c40a0c09500a18eb7fd401f05df2261c92db3e8a126cc03902fa3c61177b50a3e18f2d33bee7590f52 SHA512 f937a9f2b4ccfe262ca1a09e7bd103ffbdd45eae7c6deed8c1453f4499935f526f513749422e3215071ef465291c3f0544bf1e9510bbaf8dd9fa1edcf22f887a
+DIST mongo-tools-4.0.14.tar.gz 11134659 BLAKE2B 9caf119901d528079bb9aefce78d702dc3196cb105ac623137f8ffceffef4f8f6e61c8134470abe11f0bd422df9a6bef0e15331ee71065450b97220431458fc1 SHA512 6a0c39cbca0d51cd42518bb68a36fb7f0ed1e7b1ecf4dcd41256c8ab5c23505ca189b81a88c2a783ad81788bcab81d7e3c69f4788366e10dea744a03a2f3cf1e
 DIST mongo-tools-4.2.1.tar.gz 14435826 BLAKE2B 8d068cb39957f6773fb6ca186a1eb324e03c21b8472fede407daf7bce091f3d401f0debe6412d70bb8e338101d7ada870e7347782ffb582b58fcafc236ad4932 SHA512 bba754acd9e21f8f832fc2e434720347c2222897b2af08d66f9491110d5491f5475ae2118ff25b263606677da10b0c96b76cc507a01287180096c25c1eab5ced
+DIST mongo-tools-4.2.2.tar.gz 14433618 BLAKE2B 7610bd6b386684836e91b6bb7f73e24267fac56ce975263ac2aaeebe51d37123baa8eb2009cf4478af89e6dcc596c9c07126224ad4bd80aee47d03fde9413eca SHA512 661813c70bf891f0a834ac9970cbe390a8616f9e89e4f33918e479ba3f3ce3851edecd63c1e35e65a4dee47419e3ce0fa3186c7ee2326bef11fce3bac8bed0c7
 EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-3.6.14.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
-EBUILD mongo-tools-3.6.8.ebuild 1345 BLAKE2B 1baf6f2c407b2a4d1e81a6a04444b9c43ef74e6abd7e68c08c4ef1e0540b8dcb6c54c83a58b4687d2aa20f3fbbfd88b793e20058adaecb8e53b13e76a328ee54 SHA512 2286b4f40c01231648535b0f050e1ce36f5fdd654acd83389b35604d41e92bd584dec654b5368a7ee4e6ff7d420b19faeadc1c1c7f252093f365e23efb6604eb
-EBUILD mongo-tools-4.0.10.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
+EBUILD mongo-tools-3.6.16.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-4.0.12.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-4.0.13.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
-EBUILD mongo-tools-4.2.0.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
+EBUILD mongo-tools-4.0.14.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-4.2.1.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
+EBUILD mongo-tools-4.2.2.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-4.2.0.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.16.ebuild
index 092d770686fb..092d770686fb 100644
--- a/app-admin/mongo-tools/mongo-tools-4.2.0.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.6.16.ebuild
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.10.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.14.ebuild
index 11f797e129c7..092d770686fb 100644
--- a/app-admin/mongo-tools/mongo-tools-4.0.10.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.0.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.8.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.2.ebuild
index 81268b0dd2fa..092d770686fb 100644
--- a/app-admin/mongo-tools/mongo-tools-3.6.8.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.2.2.ebuild
@@ -12,37 +12,31 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="sasl ssl"
 
-RDEPEND="!<dev-db/mongodb-3.0.0"
-DEPEND="${RDEPEND}
-	dev-lang/go:=
+DEPEND="dev-lang/go:=
 	net-libs/libpcap
 	sasl? ( dev-libs/cyrus-sasl )
 	ssl? ( dev-libs/openssl:0= )"
 
-S=${WORKDIR}/${MY_P}
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
 
-src_prepare() {
-	default
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
 
-	# 1) ensure we use bash wrt #582906
-	# 2) do not substitute version because it uses git
-	sed -e 's@/bin/sh@/bin/bash@g' \
-		-e '/^sed/,+3d' \
-		-e '/^stty/d' \
-		-e '/^mv/d' \
-		-i build.sh || die
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
 
-	# build pie to avoid text relocations wrt #582854
-	# skip on ppc64 wrt #610984
-	if ! use ppc64; then
-		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
-	fi
+src_prepare() {
+	default
 
 	# allow building with go 1.12 #678924
-	sed -i 's/_Ctype_struct_/C.struct_/' vendor/src/github.com/google/gopacket/pcap/pcap.go || die
+	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
 }
 
 src_compile() {
@@ -56,7 +50,20 @@ src_compile() {
 		myconf+=(ssl)
 	fi
 
-	./build.sh "${myconf[@]}" || die "build failed"
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
 }
 
 src_install() {
diff --git a/app-admin/ngxtop/Manifest b/app-admin/ngxtop/Manifest
index e19f8d5d8dac..5561ba9b4ef9 100644
--- a/app-admin/ngxtop/Manifest
+++ b/app-admin/ngxtop/Manifest
@@ -2,5 +2,5 @@ AUX ngxtop-0.0.2-py3.patch 1816 BLAKE2B 1f19b6143bc5eab4786043d1641f17a370cc07b7
 DIST ngxtop-0.0.2.tar.gz 9668 BLAKE2B becd0ba58490ad26dce2166ddf39d2064e797bc26da64b70e38e137078130f5c21a95fffccf656fcaa35ca595fe769bd4b59036e9e0993afa75d062b49714f10 SHA512 49cd0f43bb7dae79253a13c4011a5bb92a33c137d0ce7a8de7d57ba18624ec1e10bf462a32fe96d1045ed85ba9c273260a846fb1983e189884e65c1621a39d43
 DIST ngxtop-0.0.3_pre141201.tar.xz 9012 BLAKE2B 9e8a7d2c3aadb302e0923fc7cb5b0219a56489993fdcf83fb7b38ba67036f2b5cae7e5bba2c9efc81d858c58b0f1e25f17fa8cc600e77f76b45aafd9d5a3354e SHA512 ce0c6d027eacfe553752a4a66b7d5823de45ef847d4db1a50d9677126a1d574c22e17b5a60f073bf74eb93d56d15d88d6201353324b201b77c1dd5bede6d7cde
 EBUILD ngxtop-0.0.2-r1.ebuild 642 BLAKE2B d2bbf0125bb2d13ddf424974863a8e2dff45f8d6c4404cbcfe890cd464d9ca86e38c86d36a701bb1beb90a6bb94a77c50f78d96ee805e01a1c8e00a9efd18510 SHA512 a1f667d09672711e14defbb07f26231785dc89baaa0f34be1de9d0aa161a690ecb045558dfe5ae69ed5a230de6238785a02cc140aa2bfa99189a6db37d8e2e27
-EBUILD ngxtop-0.0.3_pre141201.ebuild 721 BLAKE2B 1a192bc543ab4ed158746a9391aefa63082388759302ebd5115106147419942a863f3efdafd89e3c54709c3d5376f1f26561b6f0e31915d355b5640c771aa375 SHA512 b38d20205e937d5133789e3f4ad757e3516da59ec28a149024f35c7e83c1318b112de7be9f0626b1d09702b3c6a9fe89d03c7c83c2242f12e33fc79d6849e23e
+EBUILD ngxtop-0.0.3_pre141201.ebuild 717 BLAKE2B c0e5485420a0254990ff013f59fa0fb3d68aba56f59369731e956186ad94a4d1b7963fa7f170157f6e1ac387e59460dbddb9e2a11cae197e19b9c20b07d8485c SHA512 7ea03bc82d00e3ff532dc134504c0eeb177e820c3eda7d111fe666b0c6756944701df9e979bdc1b4a6114b7700d82f1b02049c896cafa0de71f69b61049771a1
 MISC metadata.xml 250 BLAKE2B 7e40c73e3d292e399ced1a5e3ec95b9750283c1c78c78752f663890540158eb852cdbad513885f3f6a682d75b4569df0513db1d4271f3901dcb2b0e787c32b6b SHA512 3b834414c779d9155f38a0bddf7949a53b43da55fdffc52b32e1dcd1a666d3262187571cad366b89fc5985471e8ecccc7e241c497cf6104a31e83d4b0d555d11
diff --git a/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
index 08101cceff9b..6b3bb5393128 100644
--- a/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
+++ b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/app-admin/packagekit-qt/Manifest b/app-admin/packagekit-qt/Manifest
index 50aa27d08d1c..c75b5dabe255 100644
--- a/app-admin/packagekit-qt/Manifest
+++ b/app-admin/packagekit-qt/Manifest
@@ -1,3 +1,4 @@
 DIST packagekit-qt-1.0.1.tar.gz 53503 BLAKE2B af96899e520f4139d6025746c2a2e7a65c67c2900cdf4fbdb410c12e33f494343d078ec24e7dcdb33749b1d5206b0bf622809827ed64beae162888e48d0aaec0 SHA512 e1291545b496571c00a6a24586c45b7173e85e3704d419af6a0ec47ea5ce256c8ec7e887721b1bf8038cb967ceb82726925800ab06aa784b2bdd560e49be724a
+EBUILD packagekit-qt-1.0.1-r1.ebuild 596 BLAKE2B 8a308e05a14b7aa254f943b2cf64bdf8e799f62169fb9c869dc79b2fe329e4751a072eb16146f102d188010d6b3d8adf0c50650ca5ca3148a0dd705606975aad SHA512 2b170252944ad3e097f4c761dae89edf8226b2d42746ae88f47e95379a15f0845fd39e12e9eb870aad6887cad044dcfd3c7fdeedd5de894451adf38c84afcb28
 EBUILD packagekit-qt-1.0.1.ebuild 593 BLAKE2B da4d9255ac6569cae36ba9527248fcef33970d0bbc4e210835aaff48fe65262dfd9da204d80ca9faf2833d3130fe5281eeea67d19e4dffa00a71f80239f9ca17 SHA512 b536a04eefaea32a7931851527c296220934718edb1788fe97df4bbe03179d87ba8a92c4808a658de1a1c92621fce670b9b189bc47aa53c4f2a0781091016688
 MISC metadata.xml 443 BLAKE2B 83c6d5495baf3a9909dbb0ea06f912b92f6faf6f48e6f1da7610a16cca3770c097516a748b44fc0aef99985929e16b7dc20de131bf5404bfd72895acca56f04b SHA512 f63f424329b0ffeac0dcfb50841e94644bd3a44852bebd0834fc36bedbbe4bbbb13bfdfd46e065ca3ddd9cffac1ba86590310267939c486f108913db84e1d093
diff --git a/app-admin/packagekit-qt/packagekit-qt-1.0.1-r1.ebuild b/app-admin/packagekit-qt/packagekit-qt-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..c6d6da99c4d4
--- /dev/null
+++ b/app-admin/packagekit-qt/packagekit-qt-1.0.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="PackageKit-Qt"
+MY_P=${MY_PN}-${PV}
+inherit cmake
+
+DESCRIPTION="Qt PackageKit backend library"
+HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
+SRC_URI="https://github.com/hughsie/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+DEPEND="
+	>=app-admin/packagekit-base-0.9
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index f3ff4dbb4fb5..e8ce03d57963 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,5 +1,5 @@
 AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
 DIST password-store-1.7.3.tar.xz 63416 BLAKE2B 5931608e0208dfe6965b79f586c153a4930d1c3d3b74433d026ee0bc5889fcc29334c637ca4fb68308d0169bad7c8235b6632e9f80eda1e24f0f5721353f88e3 SHA512 89755a7b02f05d75055a9fc14fd3f456c0a49ec31bdffd097a027f91228c64a98b18c1e80017aeda811773ae3287ff1b9737532da8ded06799d8fe3979ca06f7
-EBUILD pass-1.7.3.ebuild 2187 BLAKE2B 242d9cc7f7111f2586f410a60900a422797c0cff67b7b6289e5246106e6126fa649abeacc0e4324fb4f74ba9ab02c33416592bd00a740cb4978ea9e77dba9edc SHA512 c1e75fad1f7d66121603e0bb04452d598bf8f2de564bdb04f333626c0dd33b9e89471739218a4a6ee87ffc694b430f0e1533e8d419145107dd422de50c92a508
-EBUILD pass-9999.ebuild 1960 BLAKE2B e06b86833158fb55e9656a1bbc2168bbdfb0cc1fa48924437e2a05b81dc79c0f110cc2edf664610b43b29cb67c4563db568bbbf3cb6edd7f135b5db0d027751f SHA512 b170aaa7a41a628684735cd24994f40a95abd8e7c1ffa9bd52d381f4d94be246c7465cb617404eb61bc6221fede56f43dc76f18517329b83d00c0ebff02e4580
+EBUILD pass-1.7.3.ebuild 2200 BLAKE2B 6b45b32c973aac94606a6df46a7e36601c80c35cf83c760772c8c12f987e7dccdddb80d47297cd7cc6592427f506650d76508f8fed3316a15b8bdf3c592d0c58 SHA512 8983cc90db7a0db00fa63b090e5ccaf43ecc1f20a0ee3256f94ec7a0cda501c1495148d2f333c2f68578780c5f18af4dc5beb0284e358a15ab7c4a9f625e8a8f
+EBUILD pass-9999.ebuild 1970 BLAKE2B f2b42a0e2373581160439a6d1e89af0b873aa4140035d6f918572fafc1b9b8b8d7b31722edc61a8e771bf6912f73f5d8f358bc660c15bbdb12d23d4569d5c4dd SHA512 532a628a7d0192763af3237106e737af3a2d26fe3db2f68134569df2450cef59f1f789301020fb0930ff6c0e2e10fca8161f2b29bb288ad2af0f5f18e7ca3a96
 MISC metadata.xml 881 BLAKE2B 59fee6aeadb16d050eeaedc6d5081963e3ffa8316ddd00afb67661d721fa60b80483c16348e0c3d6c20fdb6513fd5840552c3a95724b619e07122d8755c4e7c1 SHA512 49df1e24751818d46a0c23fcdc9e41d965dca29f9964f7d142e4dba9b076b472c860d9b3eafc15b04a983f49d2cd78eb6b529742469549209c7e4160a15f1323
diff --git a/app-admin/pass/pass-1.7.3.ebuild b/app-admin/pass/pass-1.7.3.ebuild
index 40951a9abdb7..a940c2575091 100644
--- a/app-admin/pass/pass-1.7.3.ebuild
+++ b/app-admin/pass/pass-1.7.3.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	zsh-completion? ( app-shells/gentoo-zsh-completions )
 	fish-completion? ( app-shells/fish )
 	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
-	emacs? ( virtual/emacs >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
+	emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 "
 
 S="${WORKDIR}/password-store-${PV}"
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild
index ee7cbd58172d..9f6082612879 100644
--- a/app-admin/pass/pass-9999.ebuild
+++ b/app-admin/pass/pass-9999.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
@@ -24,7 +24,7 @@ RDEPEND="
 	zsh-completion? ( app-shells/gentoo-zsh-completions )
 	fish-completion? ( app-shells/fish )
 	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 
 src_prepare() {
diff --git a/app-admin/prelude-manager/Manifest b/app-admin/prelude-manager/Manifest
index 8f0acc669b26..820ab2f12160 100644
--- a/app-admin/prelude-manager/Manifest
+++ b/app-admin/prelude-manager/Manifest
@@ -6,11 +6,11 @@ AUX prelude-manager.initd 591 BLAKE2B 495b56179aedd0ec3c925d6e269c9d114d9fc5ef96
 AUX prelude-manager.run 133 BLAKE2B b91c630c269ff09327da88cbcaaca6108121a5ae16d499a889a2cdb7e6dd7b844b3c89799fa60cb71deb9609210abbb08b059f9fbef2def7d06c7ce506225c19 SHA512 f129cc45efb710d336dd177ba465f542aaac767579dafbbacbdc88b56fcf3b95eb219a9dff7863ca47475748b93d001218ff28a7e49b3060c62278a72666986e
 AUX prelude-manager.service 398 BLAKE2B b409fd283baa3d85c0b25149e2912483e29f090338cc659c3444e2f51ca228b50cf2d5172ecf85b16a40c50f515def2ed178c6a2d85caeaa8b7b75b5ac5ddf45 SHA512 b3700ef920e739f521c87477a8752f787345971cd7077a4a0722b3d4069ca2ba55df3db87da4b544f559cd2e4faf2ef3b068e1c5dead6003f580dc04b4590495
 DIST prelude-manager-3.0.0.tar.gz 1286459 BLAKE2B 0909b0d7501909de51cd580b6ce22a66b1900a3b5b7376d3aeb4136bf41128ab766a025d69d33c414a9623dabb0de144e2f21190c3c3cccb9c067db359aab1bd SHA512 4c16a353495179265375686ce9592c8cd044b4255060b78286466bd25f9b38634233c95af058e1c0b81e1b574ec9ada5b2db92d6d1f5594dfcddce572fd0fd67
-DIST prelude-manager-3.1.0.tar.gz 1301799 BLAKE2B 938937d2752ad47630b36c3a546f2493a964fde01e3df694e4a9fbddfa1efc3ddc9d864f8c1169e8ae8f3b414c4cd1983bbbd015f192ee065e2531489a23ba8b SHA512 75df43f9db81d2b6bd87c649eda7bb30ee10510576473bea83cb5cce44f576e9d69d775b5d76dcea8841eee61730a97cdae51e6c8b3a426d2442c5183d0e0d10
 DIST prelude-manager-4.0.0.tar.gz 1353116 BLAKE2B 20aaa28797a67fd310807735bb08f0c21c3bd95950598a86c45144ee2474785aef0c7d569732c817509ae8ae52ffce5f43f3c071931f2960578681f91a8c9504 SHA512 793ed37c71eb4884cbbb49b11c7388ee291a35252255458ceadb4ce10d1392e8bad423f95e31bff4550a9cf1d04139e43729352554fd847048b6c8d14f813a8a
 DIST prelude-manager-4.1.1.tar.gz 1415847 BLAKE2B 7cea7209a680a38cf597a9678f3ac9a31b00187e4597e1aeed91bbe57a55981279e8399ee8c90a044e40873e595ca648736fa79090420d9bcd72b82588f7bb5e SHA512 4e9d09b56eb7ec55144caa06a04e458bf0462d8c0064a34aac5aa0fb96a30fbefe5a4956185b606ec58fc410e4cbcac8721e521b3396303b3bff88808042a966
+DIST prelude-manager-5.1.0.tar.gz 1510054 BLAKE2B 88ef666a76c58af1a8164c033b7e9c1ea869a18a66cb489d8c7fdbf1fa331006e7844aea4386ea3185902afd108af5eb1b46ee17686032de460d8c5b336fd658 SHA512 1f0e993f9bf684ec65a741db3cdaf537dc47bc2f77652a37c194db422dd5da2aa33b78d3ee454c78b28b44c022eacc7246ee99187b0b8779c12f3a67320d89a3
 EBUILD prelude-manager-3.0.0.ebuild 1349 BLAKE2B 1e57326c02b41d39ed7cf9ef7372dffd8ed0357e1d390b73e2f143460c2d7dc907bd4d9086c351b5b69f4a9f5a7d18890a3de8774a427691e56d660bd5a21dac SHA512 404cd27a552a6eb9bc8ae005ddacd9734f26f52897f7d9a21568b7cb2ba1cfe82a5a9cda32f591043c65124faf5322d0dcff95b1b0cca5cb60c75331c3e8b322
-EBUILD prelude-manager-3.1.0.ebuild 1235 BLAKE2B 131b01c6315a1bf7fc411dde32dede5278a7d8da4e1dc62f9df106b94669df5d0e7ddcc1d367be3a5979e89c2aa71b2bc1b01eef9f9512a6b7d5654b3d965ea0 SHA512 280a181934c56049823297b749b4b0de5f1f819e1c057f910bd208cbb5ebb8928a17d70969e32768ac7e6be624e314607f1b11fdba8daa375a12df443dc1a28a
 EBUILD prelude-manager-4.0.0.ebuild 1253 BLAKE2B 8d9e17b92b16090bb437fe53389598128f249e2b4f16c8da6724f370df5bab1aea34c1824b024839bc0f3a573a56d19bc54c31cdf0744b54c581fcdefeb76d97 SHA512 3a0d79d24de4d97ba73be7cdf62f4d2d158225cdf35945e51de3854b7465a23eddc9315204a303c833e73a8965826ea18cf09951aa79697bfdc9523f0149025f
 EBUILD prelude-manager-4.1.1.ebuild 1278 BLAKE2B 3538573a5a36d1431f4c9c593422dcc9e9a594505021b8a1188c91a23a5de92e22185447b12aa7bdb33f55697ed2badc959837e5f6298ee9c0e51db8a49d16f7 SHA512 2bbe1ea323fde66ca5aee4ced72631cef58b345c852c09c5e9e21bda7d1cd8b71b460006ebc15b93e69c4128a7577b0abc4434248235ec4fff3e3b7f148ee8c8
+EBUILD prelude-manager-5.1.0.ebuild 1339 BLAKE2B 57be54a7db85f50c9e861d3efd14a865e0d3c3d9f4883cd9e7b25fbc8a3dbbf442f9b42a89e92c3c733897c76842a2b0133d51360ea60a3733d3824a16e32264 SHA512 e0929694e95f1dc710ed7954adfaef1235d37d36889b13c223776f820416c3f0fb61b71084959bc5405a581f093e2c92649efbec88ecb065af9788e587c88656
 MISC metadata.xml 1037 BLAKE2B 2e4a2d969eac348834aa8f78859b7b4456585ab11985c6083640a6cc0d32269952a78063b5aa11c6228d9c67e04b50b58247b5c2787f7d484390721af0de4ef5 SHA512 d18f203c6feadc632fee701cc7563c60d10febf11873fd9a6498cdaa47c2fa44b1a7ca50d5f6af99f3cc678fb88442c8e71d7eb0185b9972585c2d52371d9c34
diff --git a/app-admin/prelude-manager/prelude-manager-3.1.0.ebuild b/app-admin/prelude-manager/prelude-manager-5.1.0.ebuild
index 45047c38dbc8..771d3079f4bb 100644
--- a/app-admin/prelude-manager/prelude-manager-3.1.0.ebuild
+++ b/app-admin/prelude-manager/prelude-manager-5.1.0.ebuild
@@ -1,31 +1,36 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools systemd
 
 DESCRIPTION="Bus communication for all Prelude modules"
 HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+SRC_URI="https://www.prelude-siem.org/pkg/src/5.1.0/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="tcpwrapper xml geoip dbx"
+IUSE="dbx geoip tcpwrapper xml"
 
 RDEPEND="net-libs/gnutls:=
-	~dev-libs/libprelude-${PV}
-	dbx? ( ~dev-libs/libpreludedb-${PV} )
+	>=dev-libs/libprelude-5.1.0
+	<dev-libs/libprelude-6
+	dbx? (
+		>=dev-libs/libpreludedb-5.1.0
+		<dev-libs/libpreludedb-6
+	)
+	geoip? ( dev-libs/libmaxminddb )
 	tcpwrapper? ( sys-apps/tcp-wrappers )
-	xml? ( dev-libs/libxml2 )
-	geoip? ( dev-libs/libmaxminddb )"
+	xml? ( dev-libs/libxml2 )"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-run.patch"
+	"${FILESDIR}/${PN}-3.1.0-run.patch"
 )
 
 src_prepare() {
@@ -35,18 +40,21 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_with dbx libpreludedb-prefix) \
-		$(use_with tcpwrapper libwrap) \
-		$(use_with xml xml-prefix) \
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		$(use_with dbx libpreludedb-prefix)
 		$(use_enable geoip libmaxminddb)
+		$(use_with tcpwrapper libwrap)
+		$(usex xml '' '--without-xml-prefix')
+	)
+
+	econf "${myconf[@]}"
 }
 
 src_install() {
 	default
 
-	rm -rv "${ED%/}/run" || die "rm failed"
+	rm -rv "${ED}/run" || die "rm failed"
 	keepdir /var/spool/prelude-manager{,/failover,/scheduler}
 
 	find "${D}" -name '*.la' -delete || die
diff --git a/app-admin/ps_mem/Manifest b/app-admin/ps_mem/Manifest
index 66230cc4173b..3c4b66744594 100644
--- a/app-admin/ps_mem/Manifest
+++ b/app-admin/ps_mem/Manifest
@@ -1,3 +1,3 @@
 DIST ps_mem-3.13.tar.gz 18331 BLAKE2B a0689a98597e02a63cc83188e717421bf873b9202c0f524165ffc838fd438c539209c2f4e6561226bda8c6f85364707d29d13519d6d3e53a6d34cb39378d2de1 SHA512 bf5affaede5f052cc878d46ef81186511a1e8f5939cd7e8560ab2df9faf4dc31566cb4172d956cdcf1e6fc5586ba3458ba1011aee3720f6b7eeb3cf40b4f90dc
-EBUILD ps_mem-3.13.ebuild 733 BLAKE2B b4aeeead9afd7c68297d08ff20e5cf69fe5d7c93bb244ecda5599523be2e17922bd7a266250cccec98acbec6525d8859c26c4b6e41201689e90282edaede35f0 SHA512 98711b4da2a72bbdb229c9e638c3e83b2babd1395c6da0b1c7c176c0a9f4239cf020a5d2abb3b1fad7c7ad21955410ae4c7ae10752fb9fce8707f08045bc2ad1
+EBUILD ps_mem-3.13.ebuild 726 BLAKE2B ddb0c1ebce89a2ae8a7bd243ba7f77885586e54c89ec2f87f31a9ea6925805ae66a9e792af59ff2a429603b4e96ed7e4629c4f10ed99996313917c56f28bd291 SHA512 9c1b556d6e0e616b1a16c3d4201e7fa20f1438b093c7a93329f7ecd86d4d536d25884b3a3b18b9eeb82e18e526e0bb79bde4d86ce81874c0aef412b38b31b0d2
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-admin/ps_mem/ps_mem-3.13.ebuild b/app-admin/ps_mem/ps_mem-3.13.ebuild
index b70d81dedb8c..2152bc741c1b 100644
--- a/app-admin/ps_mem/ps_mem-3.13.ebuild
+++ b/app-admin/ps_mem/ps_mem-3.13.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # 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=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 vcs-snapshot
 
 COMMIT="9f54e1aa3a87ec176ce8b71f02673e0d8293b344"
 
 DESCRIPTION="A utility to report core memory usage per program"
-HOMEPAGE="https://github.com/pixelb/${PN}"
+HOMEPAGE="https://github.com/pixelb/ps_mem"
 SRC_URI="https://github.com/pixelb/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 4ccef73d0896..2b8750d1b34b 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,13 +1,8 @@
 AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
-DIST puppet-agent_6.10.1-1stretch_amd64.deb 19712026 BLAKE2B 82f5d9d18a3171b230d0e6027b9b8409b51096e12c5fd88844643320a0f5f654bc79880b35565571a6367a2d95f7a8f90ac811c2df1f1ec6c1866508c7e112e0 SHA512 8b289f8690fb67d353bc004a281e3e32a118048523bb6c743fa8ff46f2583c155ddffc22a7898662b598128f5ef75d77fd9a99b43c4afb72a23a2bfa3959f0c6
-DIST puppet-agent_6.10.1-1stretch_i386.deb 20055310 BLAKE2B 31bb9bd40f5098b666d911545b565654d84a422625536eff954256851089d211ea2660dbdab7b73df370efc0bbc41875617df3012ee734ec586af87967e8bc02 SHA512 33348839a245bcda4c76feae214d72bb36c1959c1b6f5f9c2db084ad1bb0018393ab6bd94e16ed987a23b2f253baf31f1df0453ead1cc6860941954ff31930c2
 DIST puppet-agent_6.11.1-1stretch_amd64.deb 19948710 BLAKE2B 256588922cfacb1d8146cd1142c43d893a55dfb67d7f70ca311df6178e7f9a82a0702d8306e0575d3f817e53c091fd3010027512cb4ce95956bdfa968372cc21 SHA512 90c39d55a8761185f82c9ac106d696ae48a170679e6043b6b3db32254e918b1b9c1b32c4e9721e5751189f84f002415f21a627daa22738a8c1ae3cb5df514eb3
 DIST puppet-agent_6.11.1-1stretch_i386.deb 20327410 BLAKE2B c2a105139df97395f54bb54d7ac971d914dcd3b69614dca55fe443d9fe5360118b899610a6d2d85b96b8b45715864df608d0783a3aabad3a2ae5555a0d510a2e SHA512 5d1173534beb53325d3c7c2fd500a7bd82a389fa8cbc9e867f6acbb6c2647190339d3b096e8a054aff268f27c5bd7de65c371a474b9c8263e8fa36bab75452bd
-DIST puppet-agent_6.9.0-1stretch_amd64.deb 19846122 BLAKE2B 7f9133d1f5cb85f45c96490c230ee0cfda707db390a3a39be218fcd730e2298099e6d70c4f44bb5c6af46736c2c8aa7906a16375088c0119045dc77b53343b91 SHA512 f96cb1a6108a21192493b7b9958243e537ab41ce3ab6a7dde4d12bcd5da25ec6a5b29632acb87c4e156256578e8348c6fdfe26043539292f98203cce69b04fff
-DIST puppet-agent_6.9.0-1stretch_i386.deb 20170516 BLAKE2B 391a61a847bc05f9f03885f2e2140ea42b4eeca247f3223f17a82d3ede2e1bbc88226f9794777f4b20e81943d94b11612f8d4ffd9f74c2f494bdc242fb05e1a1 SHA512 595dbe1591a8ee9d703a3efdf103a3095966b22cafd0fd63fb2a7b9274ea858b55d0b915ecc32e93c49bcbeba453654fc9126efe3855924fb5c5b6732e0af83d
-EBUILD puppet-agent-6.10.1.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
-EBUILD puppet-agent-6.11.1.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
-EBUILD puppet-agent-6.9.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
+EBUILD puppet-agent-6.11.1-r1.ebuild 2046 BLAKE2B 25710cb43fa1df4e83a2e3fc6d54305685303bfbb8de9eb30a9d98789479a31139eaebad70e1ee85ca2a84f4a4fbe67d8101c83522b1d362d10e64bf2233f309 SHA512 1a7efcbef24345ba3ef59c0621e9efdc9ef898b8976a0efdd4525f2201f3e297be4f9f6d73456029cb560bdc0569635f0af7b6d8ef117337cb3b0eaea3b706d3
+EBUILD puppet-agent-6.11.1.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-6.10.1.ebuild b/app-admin/puppet-agent/puppet-agent-6.11.1-r1.ebuild
index c648209a4a7e..36e4354f6f34 100644
--- a/app-admin/puppet-agent/puppet-agent-6.10.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.11.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,18 +13,18 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
-CDEPEND="!app-admin/augeas
-	!app-admin/puppet
+CDEPEND="!app-admin/puppet
 	!dev-ruby/hiera
 	!dev-ruby/facter
 	!app-emulation/virt-what"
 
 DEPEND="
-	${CDEPEND}"
+	${CDEPEND}
+	app-admin/augeas"
 RDEPEND="${CDEPEND}
 	app-portage/eix
 	sys-apps/dmidecode
@@ -74,6 +74,4 @@ src_install() {
 	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
 	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
 	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
 }
diff --git a/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild b/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild
index a72df734d6b1..c648209a4a7e 100644
--- a/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet-agent/puppet-agent-6.9.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.9.0.ebuild
deleted file mode 100644
index c648209a4a7e..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.9.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/glibc
-	sys-libs/readline:0/7
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index a92248993898..72af5749bd1d 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,9 +1,6 @@
 AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13618 BLAKE2B 91727c30b968b41dc8f6bb2ca217d5b9ccc2b5d08872be5a65a45b7f8bc37130255df139a17b7ca09b39b5b1a0b9ddcd6c54d2448148495cf493e7a085d2f0f5 SHA512 65b303c957a29bb5782a2b849944fba029dea3a533c25d4c17830391b5e4963fef304c0be876f5e7892b1a0eb4da16390d4ab1e39f459c05ecbb7100c9c0a9ca
-AUX 50puppet-mode-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
 AUX puppet-fix-tests-4.7.0.patch 1102 BLAKE2B e5c98627620f9f76f1421a13969dba3b1d279a63cdb65fc28713a9a2849c8e8cd0e42a30c9058e341d5bbabd3d24ae17c050fa551566e6c61301b83396a0b80a SHA512 81485af1a218b5616195ed80b3fc963c42d56265477be9a636c0e915a18771ff93e12cdbded45ce90da17ce72be4ea4881b5ad8e9d5a997be271df3cd2e8a2c8
-AUX puppet-fix-tests-5.5.14.patch 1005 BLAKE2B ebe103e8408c2015e431966a637521b673ed79b97c318699d34efffadfe311143382eb5e961d626574072c346c984206dc3f93863b2484d3fa838c2dbf51d18e SHA512 d07598d6ef8631e718e5c4b4d61db87b2651cd1f246791778def5561f0262b23b0b8f2244e326dcef33dcc083fa96438ac138b21d5fdc246642e35b81829d2ef
 AUX puppet-fix-tests-6.10.1.patch 1163 BLAKE2B c2b0dd51aca250b06bdcefcf59fe0e33244aaaca90ead498fc7254a148ee4f4a5b89e8fd99259fce380517827f75720728610ffb79b90c3416f86de2988126db SHA512 2c97b9929c8a66ffb1ae4a16600e1ffea40b04e13f8cfc320a1d681317b3b348918d8e6c66c9be746db19cfb65b615afe94a4e30a8f6a350cb64cf437415e4ae
-AUX puppet-fix-tests-6.4.1.patch 1178 BLAKE2B 6767555c3f43519238b2e539267a40977cc460800644f2807fd1fe27fa49f805e62d5aa0a74e4c1a58160bad1fe1f1628873195a60b5b2e0a83d484e26b72bce SHA512 88a25ad9bb809f06d4af618b1da2711d84e18a63d2368c7191c6cc3170e0d85930fc235057babc92e26315312636d61d69f54cd8a3a2c8acac13ccebd187c258
 AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
 AUX puppet.init 917 BLAKE2B 0ebbcdd8c9d4154984130ba3f597969f5f070f65f246770583663df4f192052a0ed666d09d4d417864457814d6a680ac4f327dc2a83b774da3a3c0d4efea1c8d SHA512 6bd2e1c21abaa5149b853f1732a6bb84335a8b4ae4129db52da463597691fd983d347bc04aad69724034d37f953f50c6aa5316d517b9efed2414db8e3d94d7bf
 AUX puppet.init-4.x 764 BLAKE2B 997fef3e95718f3e0f46fa2ab5994ac994a585bcfe728a9dcdfb3ccd5b76e6fd879a4160dce1402803713344fc2082b43e3116b468e9b49fd1b17a043040f860 SHA512 170100981c7e24284a12a208cede1a73afbaeab73315fd15a7337d416825c6d26a29ee272244d39764ad4086bc6a6f99cdc56ed6a600282d6ff9ed74794bfaf8
@@ -12,17 +9,11 @@ AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
-DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
-DIST puppet-5.5.16.tar.gz 3084466 BLAKE2B f3e2f12331b4794b90a81a4f80e626fcd3d5252b7cbdacc1d6243faa557540d3a68e5e23b7b5c3e4f4286774e9a9198e59fb15d7d7c41d7193754ed5c80dd624 SHA512 7d9e533e352a22e347ac6467094c4bdbde893c2503f47b4a2d175fd6e759e6662991efdd1a0a83d9495d22f28da4ae7a30cc771c5d90b8252c4618bd8837833a
 DIST puppet-5.5.17.tar.gz 3090402 BLAKE2B 7722ec4196ee766c29eddd7dc73539a4a5a0e4cc781a84af25210488328b5ae01178ca64e8eef14152cbeca06dc8fe145b5e39ce6a120d7689fc32cbbbe16f9f SHA512 95c6cd836a9f732ccfe2d8b83096e79c32428c43390c0826663f896ca1388e1fe3b55d93a5a7548831e95de85247db717866c36786d591e207341c734d70168b
 DIST puppet-6.10.1.tar.gz 2809383 BLAKE2B 1589dcfa7d73b81ab7fbc3fca4b2fe956f5d240d11583c484262d5243e4713bb4aa9cd5c655e9566468050ab2e5c0ec0cc720e3ff9088add0744e02147b4e3bb SHA512 211c9837eb4a77a54bf09811a1a84709eef06f17e0c5c9c598d01bce2e183e69974709ad4dfb8f5fecd7433c1ff52757aa699c623155d1a0742f2e07eaf2ec56
 DIST puppet-6.11.1.tar.gz 2816525 BLAKE2B c4b188d5bf76b70a2748b86df78f1ca6ab99951cbc3a16377d3f2d38e165bc78ef8e5648cb09264a25ae81ac4d379b9323b1f2bbdea6679292c2cf38cabee662 SHA512 f44196206331448651e0ff0e865b09c6ccbb19115edeba4c58c8a29aa35e7d76676d5a3cb35c51cd511a44115c9c9434f1f90d5cbb0a5551a4004741d305c879
-DIST puppet-6.9.0.tar.gz 2911311 BLAKE2B 1d58d0e976430031732de4f63c3ec100088f1d93894cf52caff252befeabe1ea3cf51939063143bd7c9011bb56f2a6420ba38ae230edea19ac8f1f135ed6f56f SHA512 4d1bc1a398c1e75bf8e832d477a0fff4fa3613510f8d59d73594e6fc2f2bbbedf050b1e7729b71bb1428c230f42fcf7b98f7a7683fc3c52cb36a596e20e6540b
-EBUILD puppet-4.10.12.ebuild 5620 BLAKE2B 75fed43f7044fef014b1c9297066e07a5ef624fd187d141475e5fbaf69aab50494e783a16b212f3063cfaa059bec310b9771ccfa88d3f8ddcfc5458a75d2ba22 SHA512 8649b6811f330733ba25602e35e13bbd5be094c8f395d5f6c7a859662d831a579b9b3ad2a44b1ed9ea60882c32eb89a261f5e36977d79a2e9a88d5f12959a3cd
-EBUILD puppet-5.5.14.ebuild 3822 BLAKE2B b639a7bd6b1a2a0229271a2c00ae246e5cd219b91510f1fb1b5bcc4668d2f81c631233329628b78240354ae884ca9e4de02287896b326eef1220c81eb3d4e173 SHA512 1043b71e29082c1020a4c67814394dc70707c3f299afadb035bb2e15e4425a38dfa76b2323f4ad31b7142c1494cb05616ed28f0cf8f46b88760fcc53c3e734a5
-EBUILD puppet-5.5.16.ebuild 3824 BLAKE2B 0501c0a04cea8cd762732a7b6728833c99c828d79c39c18dc738e2c7cb063a8f14f997108a4d3863fc0abfbedf9546dd1541f01cbbb4ea3fdcb723a49fe6ec39 SHA512 baaadc5c82ea91dab0dbcf93a5b836248183777db978e0ec0621183b695191a19b6c7fdad892d0cec05c4426c64c949eadc4dce89f08cdea8b7b6f6913d01917
-EBUILD puppet-5.5.17.ebuild 3739 BLAKE2B 2f2e21bf61b695a74ccd42c19cd0138249f14141b8461a28a9ba26d473fe2b9635d7b2e2dcb36f2e2aba8e0fc1d1b5e9af93f363f903e2e3c845a5df68339e92 SHA512 e8a73db5ba89b73c3e92c1d5a9277ad0d7872a7d14898a52a7309393285479434b5609ef04e48615a76d17cff9388143600f3d06c55831c7f94ff31c2a311174
+EBUILD puppet-4.10.12.ebuild 5091 BLAKE2B 4a556264af256eaa8a13a33048fd0a2d372381da9f63b63e148848a1094a85e948eb0f99728f8b3fe037aec57fcb9693dd96961f24fc8042d7fa25ab9e4d30f7 SHA512 ae33aae116ab8477644bf84d438ad7e301ba168a92e857b79a35dd33b6f2d853b1074f1122b180d4f6cff9cad0d802d58936f7162a30ce6f1ea341032ff1fcc0
+EBUILD puppet-5.5.17.ebuild 3737 BLAKE2B fdef57a527cacfe399a1acc5cf6a098c0de6a6676d51e2da0c11c37036f7d3e55d98140f5c7cbf52c610edcd6cc9e35b2a0bb1ccf92d52aef7d0de08e4b3c805 SHA512 b83747415c59389373f07ddb32f70fa22d8baf89f1d229dbea3931e1a41e03592e66ddeab2be2a21810d17097e205f1db035007376e692c68ba1682d6ee36a2c
 EBUILD puppet-6.10.1.ebuild 3679 BLAKE2B be2b173b16da1eeed659baa79c9ae3ee953d17113ced882c5606dbcd397cfe2f41c0c78c9f6434d0dba97e332b87f00319d15d36ad924da83ce895cf5e650b81 SHA512 64a74e8402a9ae79cf1400f206ca5a0cf133d069d311b2f6bfd3b456974d8dbb134674fe0f53e51255cf27770b95a2b10fa11d1df181b3da05c89db3d8616495
-EBUILD puppet-6.11.1.ebuild 3681 BLAKE2B 8d64d23902331971a17c5868ff5a24b629c139fb9c03701f742ecab8f3c53f95cc12f919870300b98d96eca436799a0eb4e955cffa7faa808a77c6d11d2301bd SHA512 09fc378dddbd1d29abcf138dc13f4e08ada22de0f099790dc7136d82e80130f5d2b58467a1b96aabaeea8e7918884b527d016522c45fa1f1cc069b1b2162ea23
-EBUILD puppet-6.9.0-r1.ebuild 3678 BLAKE2B 2d18ebc4de1114501fc3bccfa0e91bc97e3c3616376154583da2040864234144fd66f7b7bb9caf2b979dca9d2feadc184fefc329b79c75c96ce82177b90dc01e SHA512 f861d29b8e6b2f6ddc86be8cfe2231847f5210b9bef1c1a4f75a7ef7bb13d11bd993a2e4292eb4b3880a90f3e188c9c9eb8ed95cb6b67c64a242d75fea92d532
+EBUILD puppet-6.11.1.ebuild 3679 BLAKE2B be2b173b16da1eeed659baa79c9ae3ee953d17113ced882c5606dbcd397cfe2f41c0c78c9f6434d0dba97e332b87f00319d15d36ad924da83ce895cf5e650b81 SHA512 64a74e8402a9ae79cf1400f206ca5a0cf133d069d311b2f6bfd3b456974d8dbb134674fe0f53e51255cf27770b95a2b10fa11d1df181b3da05c89db3d8616495
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/files/50puppet-mode-gentoo.el b/app-admin/puppet/files/50puppet-mode-gentoo.el
deleted file mode 100644
index 64c38ae5a31d..000000000000
--- a/app-admin/puppet/files/50puppet-mode-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; puppet-mode site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
-(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
diff --git a/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch b/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch
deleted file mode 100644
index 09ffe07da1ae..000000000000
--- a/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- puppet/spec/unit/network/http/api/indirected_routes_spec.rb
-+++ puppet/spec/unit/network/http/api/indirected_routes_spec.rb
-@@ -142,15 +142,6 @@
-       handler.uri2indirection("GET", uri_escaped, params)
-     end
- 
--    it "should not pass through an environment to check_authorization and fail if the environment is unknown" do
--      expect(handler).to receive(:check_authorization) do |_, _, arg|
--        expect(arg).not_to include(:environment)
--      end
--      expect(lambda { handler.uri2indirection("GET",
--                                              "#{master_url_prefix}/node/bar",
--                                              {:environment => 'bogus'}) }).to raise_error(not_found_error)
--    end
--
-     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
-       expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
- 
diff --git a/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch b/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch
deleted file mode 100644
index 6b7b5b484792..000000000000
--- a/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-17 19:36:56.000000000 -0500
-+++ spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-19 10:52:35.841614932 -0500
-@@ -144,15 +144,6 @@
-       handler.uri2indirection("GET", uri_escaped, params)
-     end
- 
--    it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do
--      expect(handler).to receive(:check_authorization).with(anything,
--                                                            anything,
--                                                            excluding(:environment))
--      expect(lambda { handler.uri2indirection("GET",
--                                              "#{master_url_prefix}/node/bar",
--                                              {:environment => 'bogus'}) }).to raise_error(not_found_error)
--    end
--
-     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
-       expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
- 
diff --git a/app-admin/puppet/puppet-4.10.12.ebuild b/app-admin/puppet/puppet-4.10.12.ebuild
index 77c0ff21fd5d..7e3b54d90ab3 100644
--- a/app-admin/puppet/puppet-4.10.12.ebuild
+++ b/app-admin/puppet/puppet-4.10.12.ebuild
@@ -9,7 +9,7 @@ USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRAINSTALL="locales"
 
-inherit xemacs-elisp-common eutils user ruby-fakegem versionator
+inherit eutils user ruby-fakegem versionator
 
 DESCRIPTION="A system automation and configuration management software."
 HOMEPAGE="https://puppet.com/"
@@ -46,8 +46,6 @@ ruby_add_rdepend "
 # 		>=dev-ruby/webmock-1.24:0
 # 	)"
 
-DEPEND+=" ${DEPEND}
-	xemacs? ( app-editors/xemacs )"
 RDEPEND+=" ${RDEPEND}
 	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
 	selinux? (
@@ -106,13 +104,7 @@ all_ruby_prepare() {
 }
 
 all_ruby_compile() {
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs
-		cp ext/emacs/* ext/xemacs/
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el
-	fi
+	:
 }
 
 each_ruby_install() {
@@ -150,11 +142,6 @@ all_ruby_install() {
 	fowners -R :puppet /etc/puppetlabs
 	fowners -R :puppet /var/lib/puppet
 
-	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
 	if use ldap ; then
 		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
 	fi
@@ -187,10 +174,4 @@ pkg_postinst() {
 			elog
 		fi
 	done
-
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use xemacs && xemacs-elisp-site-regen
 }
diff --git a/app-admin/puppet/puppet-5.5.14.ebuild b/app-admin/puppet/puppet-5.5.14.ebuild
deleted file mode 100644
index 75759e0d00b6..000000000000
--- a/app-admin/puppet/puppet-5.5.14.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-5.5.14.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-5.5.16.ebuild b/app-admin/puppet/puppet-5.5.16.ebuild
deleted file mode 100644
index b28efbe22bd9..000000000000
--- a/app-admin/puppet/puppet-5.5.16.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-5.5.14.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-5.5.17.ebuild b/app-admin/puppet/puppet-5.5.17.ebuild
index 83d26aad2806..846443f07d45 100644
--- a/app-admin/puppet/puppet-5.5.17.ebuild
+++ b/app-admin/puppet/puppet-5.5.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-6.11.1.ebuild b/app-admin/puppet/puppet-6.11.1.ebuild
index 2fac345af4a8..477c81270a05 100644
--- a/app-admin/puppet/puppet-6.11.1.ebuild
+++ b/app-admin/puppet/puppet-6.11.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-6.9.0-r1.ebuild b/app-admin/puppet/puppet-6.9.0-r1.ebuild
deleted file mode 100644
index 3b0aed940aba..000000000000
--- a/app-admin/puppet/puppet-6.9.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-6.4.1.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 3891063ba3f2..3adf49d130ea 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,9 +1,5 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-6.6.0.tar.gz 43366185 BLAKE2B 224c13ff2583a7c8124f03845eca4756be6446e7470565c44d3fe1fcb756d5564ae2ded69d0bef1dda939efe082756c0e44afd3c6b0fc4268a744946860b5a02 SHA512 5076f52af51b7a3b43a0deb9cf1f10d77da98a5e531983d3661cda522c8d46f70882457934be6f70e77587b930077c0a4d2eaf7ed41eff9c6bcf4bc5ecbf2205
-DIST puppetdb-6.7.1.tar.gz 43563417 BLAKE2B 902397b2bedb64f4ccb2d6932d6dbfb7d67c479640fb8429aecf3de558ce31ab0017175f183ee3e66268d802fc9901f5473271b6598414a7b57182bc1788f1e3 SHA512 58c6f3db268885e603bb1219f89c2aeb237c042fe7eccc95ce5622cfc739f971d9d37e0cc37cae335552d0d9845fccfd9425381faf6ec3534b20991bd9f7db0e
 DIST puppetdb-6.7.2.tar.gz 43566885 BLAKE2B b90376330cb084c2c14154d647ce334673c526e6f9b9d4430e0be4b420132a0c4c518a0c8ed98b15cfacc6716044f78c384123f3ff87ea1463736a352744b840 SHA512 2e32f7a5a3daf37d74082aa3a66c26fa23643e456dbf80cd16815687f289093c96defc9bfa10c3502f9a9f9a7674cef83b838163f11339c13d4b12c82f8e0664
-EBUILD puppetdb-6.6.0.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
-EBUILD puppetdb-6.7.1.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
-EBUILD puppetdb-6.7.2.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
+EBUILD puppetdb-6.7.2.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.6.0.ebuild b/app-admin/puppetdb/puppetdb-6.6.0.ebuild
deleted file mode 100644
index 77d1c1ca9cc4..000000000000
--- a/app-admin/puppetdb/puppetdb-6.6.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppetdb
-	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-6.7.1.ebuild b/app-admin/puppetdb/puppetdb-6.7.1.ebuild
deleted file mode 100644
index 77d1c1ca9cc4..000000000000
--- a/app-admin/puppetdb/puppetdb-6.7.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppetdb
-	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-6.7.2.ebuild b/app-admin/puppetdb/puppetdb-6.7.2.ebuild
index 616793cb4123..77d1c1ca9cc4 100644
--- a/app-admin/puppetdb/puppetdb-6.7.2.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.7.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+=""
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 5b07ce9fa5a2..ec2bdf31fc53 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,9 +1,5 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
-DIST puppetserver-6.6.0.tar.gz 59095750 BLAKE2B adbc08a68a1382106c43d27604c2cef52bd1d9875c5f555320d97d31dcf9d248c88baa2d6dfd37a855010fda76ad4d273a7bd5eca77bb216aabf6a120e41cee0 SHA512 2b43092752e246027a437398d6d23a4085caa2956a1453cec2e62f1001fca1c98bddca0a9d90c178ce9c89a06c26edcaee49416c1b8a4941e2bc4b6b5bb1fe0e
-DIST puppetserver-6.7.1.tar.gz 59202711 BLAKE2B 9f88617811d05dc09ee568b40ff332f88e44998916df6d2c88a268fe443d35b62e4d94816acc49a87dd355925bb13e99f8694596831423013b96119a4e1a0727 SHA512 80af1266d122f131f8d5385acbcf712d3042e7665eb739491d1d3d06adec8c0d78009aaec86161ed4fdb180bf529a48b2964c784ec728d40319f63c6d2f8f0df
 DIST puppetserver-6.7.2.tar.gz 59340246 BLAKE2B 635312cb2ea2f638617c10e05b9e1e8efa58caf3da8786155f44081f040a7b167d923e2266c57b43d855feb4bfd5280da85b5100a188e7f0f7dfde847f5abc45 SHA512 e2015554648dc861d513b5778c274e2b09c4ea2ebd53141d152a5bba1046ac6ef163083296c176008a7606581b8368df99aa72907e0edd59e687aa9991209fb5
-EBUILD puppetserver-6.6.0-r1.ebuild 5391 BLAKE2B a67b5f2f3d53fafe7922c96e579a6ff274b4246869987c97e4aa4f7e7f5d250e525f11a723de66266f440bf894c921c246edc8a45cbc78e80b80b6ed155f2bc5 SHA512 3490f2cfa072716aa24fb07d8ff24952bf0e1df60f6c5b33b84b5259b044c1875a9baff326e75c4d76afa8a0b4ff930aa4adee833be500be3a1fcc10ea3455db
-EBUILD puppetserver-6.7.1.ebuild 5391 BLAKE2B a67b5f2f3d53fafe7922c96e579a6ff274b4246869987c97e4aa4f7e7f5d250e525f11a723de66266f440bf894c921c246edc8a45cbc78e80b80b6ed155f2bc5 SHA512 3490f2cfa072716aa24fb07d8ff24952bf0e1df60f6c5b33b84b5259b044c1875a9baff326e75c4d76afa8a0b4ff930aa4adee833be500be3a1fcc10ea3455db
-EBUILD puppetserver-6.7.2.ebuild 5393 BLAKE2B 72168876f0d5ce90d779ddf60ed2069e284c3ef98a9e62a594e1b8614a3ac2f2681d25f7c3222ef0084d1d816d991d818d471f874bc8675d2a39fdaab260b288 SHA512 640a1e81775befe3a5a19ed8c8a19c53d11a30cbd9bf9613a5c19ee487bcc1d2e0948d91779a4c9bd7ccc1fb8e86f4c77fb0eaf1ddd5a13ad0158093729afed5
+EBUILD puppetserver-6.7.2.ebuild 5391 BLAKE2B a67b5f2f3d53fafe7922c96e579a6ff274b4246869987c97e4aa4f7e7f5d250e525f11a723de66266f440bf894c921c246edc8a45cbc78e80b80b6ed155f2bc5 SHA512 3490f2cfa072716aa24fb07d8ff24952bf0e1df60f6c5b33b84b5259b044c1875a9baff326e75c4d76afa8a0b4ff930aa4adee833be500be3a1fcc10ea3455db
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild b/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild
deleted file mode 100644
index 19d3602bfcbc..000000000000
--- a/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd user
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	dodir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	insopts -m 0644
-	insinto /usr/lib/tmpfiles.d
-	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-6.7.1.ebuild b/app-admin/puppetserver/puppetserver-6.7.1.ebuild
deleted file mode 100644
index 19d3602bfcbc..000000000000
--- a/app-admin/puppetserver/puppetserver-6.7.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd user
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	dodir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	insopts -m 0644
-	insinto /usr/lib/tmpfiles.d
-	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-6.7.2.ebuild b/app-admin/puppetserver/puppetserver-6.7.2.ebuild
index 45ac7ad8e73d..19d3602bfcbc 100644
--- a/app-admin/puppetserver/puppetserver-6.7.2.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.7.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
index 6a30677d4b88..4cda17ee594f 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -1,5 +1,5 @@
 DIST pwman3-0.10.0.tar.gz 75726 BLAKE2B ba7331bd3d36ac23d9151a5ebd4a343e2d8c523ba8b324850139a9ba4af8404ddf23380b3eaef523251e8f4137c5c56b6ab509c3927690fc612962ff872ea820 SHA512 a6dc24b2e1405a91f35a9a9155dde5409e35ce733bacee8858930d82443c09b8017e2701bc8c45688483b6c40554e4d6266f6cd21dc6f205b13f96e7de4f57c2
 DIST pwman3-0.9.11.tar.gz 74364 BLAKE2B 9544b692e8853b7fb8e1b4d51093e72e04f8d82888a9278c94aaa27716026b348bb16f0fa9c52af2144395a4ffb242c8a48fc34252890e68477d2e3a70ea4a88 SHA512 2aa5a7b4d810d1bbc6aea34b728f89190570cbfbedc33f45cc1aa4d737ebbb9e993d2d372b44f956d5cdbc07f911f289fd77d7df167100e820455650f5b3e46a
-EBUILD pwman3-0.10.0.ebuild 901 BLAKE2B eb17100fba148198526f5ab2066e831cf1dff88c21bf5f293b233b4f6400152de8870802eeaa3f7a493c360cc052c6691a3a5fc68ec241a0f27e2a6b7c2e1ba2 SHA512 b9b7436d1232a252a4984b7e3d72320bda92427a8162089fdb0eee4a20409e97ee381a26f142f50acc0a572e123541308032c84118b0d1f06bb99e5e3cf3770c
-EBUILD pwman3-0.9.11.ebuild 906 BLAKE2B ae156763dcf860943b0beb597376a842aa36f4b95305571f221716e11d34582a6e918210a9e7a855e6821d8ab7ef98a7851ce600c9d773b516dc0f055ec79f74 SHA512 e8b1875246c3cdc1d5b14e00440d87dfde51d4cdc05d58cb008ed5c1e8600d32d036067d05612726a51e9d2b4841a41532b75398c6c0e5c64ea792a892ee3daa
+EBUILD pwman3-0.10.0.ebuild 891 BLAKE2B 8073a53d6ddd6056962bea04f3480a77fe36e1316c67006d2c468964dcaa841619cd43074842834e61e1f69533415cc673575c8d6ffd14821bc60828da1fb123 SHA512 5ee83ba6b9feb9622efc9abb3aa61c80864cbff2a95bbb9bd282e1fc464cf1436fb6f1529e8306215f2c3c7619d491878cb9cc3c0e382b6e3b81a4312b55ece9
+EBUILD pwman3-0.9.11.ebuild 896 BLAKE2B 2a0669a32e3e700f6dcb8290d5dea66acb37c9582c9a6a545c43da930206fff0ea8018b8a0b00c9badeb1ca616e7f6497069b333baef715e1d6c1b6d2032366d SHA512 f2ec6bf95e389c3e627d328a0a7b4ce7d604a7a7304dd49a2fe3e73b97c5200fe90dc9b211f8ce39308ef521fc80ae44f00fa1810fa5336f4851319dfde6c80b
 MISC metadata.xml 966 BLAKE2B a024e2324e8a57f790d36a0091050510babb8241de2112546f9d760e3d5495a910d6baf91caf447acdacb4d464934248db3dc3e4ac1188e56ab82635a3246679 SHA512 f82ac9dd866b16f6583266bb2b748f713389e517eb51229481e902d2a232e4715146c5d8aeb7d572fea10f13f15cf700910f7c04231cf662859f1aa258c7bdcc
diff --git a/app-admin/pwman3/pwman3-0.10.0.ebuild b/app-admin/pwman3/pwman3-0.10.0.ebuild
index 48418976fb21..0e62fdd40eff 100644
--- a/app-admin/pwman3/pwman3-0.10.0.ebuild
+++ b/app-admin/pwman3/pwman3-0.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite?"
 inherit distutils-r1
 
diff --git a/app-admin/pwman3/pwman3-0.9.11.ebuild b/app-admin/pwman3/pwman3-0.9.11.ebuild
index f83697e20877..bbacc08b8c4c 100644
--- a/app-admin/pwman3/pwman3-0.9.11.ebuild
+++ b/app-admin/pwman3/pwman3-0.9.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite?"
 inherit distutils-r1
 
diff --git a/app-admin/pydf/Manifest b/app-admin/pydf/Manifest
index fd0f480460aa..eec96b9d6d6c 100644
--- a/app-admin/pydf/Manifest
+++ b/app-admin/pydf/Manifest
@@ -1,3 +1,3 @@
 DIST pydf_12.tar.gz 14207 BLAKE2B 9bd972529c38380b474fbbd82069e880d950cb5b9ef659f82cfb19417447abd16ecb049e0f6df3354e39c404b06dd7546296289633a4d77b61c41a5378a301f5 SHA512 5a5819b83fe2425cb951a139b38b1b639d17e1d17c4e3e4a80fc4eb6d5632c42b03a2767e1864c8bee13dbd72ebb91ec79fefde1ba448e2af9fc4a314821a3d0
-EBUILD pydf-12-r1.ebuild 763 BLAKE2B 4be7767f30f33000e28ac0d9ddd2507c06d5e3676f7f7eeb592ff3a5e617f255adf12433008ddeb53653df7a4a3e4bfab528f15edf331b3bf7df814ee3800d64 SHA512 088fc20be5934db1da7e4ba1541a2cf97dfa2d1bcfad1691af6ba0dec4043cc4f4bab218fb052e66b3402e96d19cfe814ea2cec108790aeead7eadbdb8357894
+EBUILD pydf-12-r1.ebuild 759 BLAKE2B 1562a4ccff88e4f1bd9752446cc80001e52271f12de30c680a12afa7e47ad03a564ba97ab5e121932b5fd560c574d73f00cfaa0354e60a0500c8e1042ee77234 SHA512 463800145e4a56275aae2caa8f5d0462b28ee7da0acfc43d2a3bc5fc960c20d406423683c9345eb9e73a555a0f938052c06174fd7e57787c7702f57b2c3e3895
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/app-admin/pydf/pydf-12-r1.ebuild b/app-admin/pydf/pydf-12-r1.ebuild
index 1c8441931abe..e137491e79cb 100644
--- a/app-admin/pydf/pydf-12-r1.ebuild
+++ b/app-admin/pydf/pydf-12-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-r1
 
diff --git a/app-admin/ranpwd/Manifest b/app-admin/ranpwd/Manifest
index d1cdb74af610..e9e6434fc62d 100644
--- a/app-admin/ranpwd/Manifest
+++ b/app-admin/ranpwd/Manifest
@@ -1,3 +1,3 @@
 DIST ranpwd-1.2.tar.gz 41018 BLAKE2B 787907c5ed7541f24846e4574c4e40005b85d33667d4ac2a85633085976d047271de797c2f1de3bb0e34cdd56b8b2b60ea8ae80b478c3f1d1124a413a01e351b SHA512 7ae8ff593623a2102e50fbb3356889291408263100a358de14bd44b13c1d2931bf0e1e8ec972a620b8328a179a38a0d614099ffea2473079f9ed2425809a922f
 EBUILD ranpwd-1.2.ebuild 568 BLAKE2B ef3bbf8547cbaec63d1d607b8f415c37a560949e90e019f88e1e8965d3d0e49a677a58e6964e8810f37d19090e86b96e37e84e3bfe1f063f37741ecfad1c7721 SHA512 6ffdac5f5bfc837219c89fe2ad41a8c9787939bb67bdc0c46b3c5a1eee3d69ab4e8cb563d3cce377a5b19bd3118da53ee6c6af407a189015cb7e5de6ee20e4a6
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/ranpwd/metadata.xml b/app-admin/ranpwd/metadata.xml
index f1c3d59fb213..7a38bb900964 100644
--- a/app-admin/ranpwd/metadata.xml
+++ b/app-admin/ranpwd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 086eb60494ef..bccb4efbeb8a 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -8,6 +8,6 @@ DIST rsyslog-8.1910.0.tar.gz 2957635 BLAKE2B ea350d3fb923c2f7d2799942fec6a77ef89
 DIST rsyslog-8.1911.0.tar.gz 2967162 BLAKE2B 6c15436cf6751267de38662b2c5d524dc7f90add4ed1aa7102811d197c2d86847316b58ed626fe0ab2b731c445fbcfb328464a2b1b7c4c3afedccb103267f772 SHA512 8414901a5072cb2cc28d35802c9e22d0f9c88f2ae15985a087a86b0e4053471b02d43bcc95d0c466719105e0a5ee683927af3842b9487f27ddddc1ca00ed713a
 DIST rsyslog-doc-8.1910.0.tar.gz 8158007 BLAKE2B 7a05cf7070ba350d0fb939350868ff0dd9d03be46ebd1b1261e54add70ab680afe0b356f563ea9e10148aed17667fc0b729e2fa8f7ff7cff3e4cec9d0da209a8 SHA512 e46f14e40ae690efbe3114a859c1c94c8f9573ca5ebdb533ad4b5ed76c3a930c887cc205e7279fcc546fda3ce624eae507ce08d5d10ee1eb167a957edd742bf2
 DIST rsyslog-doc-8.1911.0.tar.gz 8183360 BLAKE2B f5681945fb30ddf9c21a60ebafaf99698f10ef4790e76c9f6f329763215d5a1d47918008ade3e8ff8b7d4fb3ce1220cfc6f307ebc1dbf85697c3d92f7b855023 SHA512 2326550a0db108db407b701ff0b7b8545f94d06c1979bfbea3496a9a652de2a22bf49e9b95d4b2e6256bbf1f9db6a1c9822557c6ebd6a56bc00f096a642b19df
-EBUILD rsyslog-8.1910.0-r1.ebuild 12536 BLAKE2B 2147c994faeb43c6e0acb5f82d487b6aa8ccb2403c30302908c73a411902b06847e3a443b15f21d23e9f08b1ae31e39691be21e677fa2cee3f6587c3f8889769 SHA512 1af0bfa5d77472c08b28fc0205e204120c5155d032f6408d8254d648faa296d71a38e88abb9c13be9e1589f69fae151bf22a932a69954eae2ffbee1f07003774
-EBUILD rsyslog-8.1911.0-r1.ebuild 12540 BLAKE2B 392ce256f3d6f812bee477e90fa7d1bdf8aa04175c28c5dd81ad5e8d82f1ff112fe7a4386c4ee0f11c59cee550c47bba6d7ce4d68343e409ec690c7f51ea97e8 SHA512 b0448b8cb4e0ea7736a65c26aa4bc23d3e879c953af68e5e6b23db8f7d8c4f860068c399c89fefc08d05660f1563937d3b28e32414016ccc4ff6375d3d71b51d
+EBUILD rsyslog-8.1910.0-r1.ebuild 12532 BLAKE2B 35561dced23452e9bea4b1eb159f426577936c8562e442a41b33efd7255ef90fdc46f9878ada2f1a4df376c52f4792030140fa9f875efd0c18944e55b09a4189 SHA512 04107c14684d6910f61805bbaf945a60f818c513396f6743318d1f1fbbef4a0d5652947ae3e347ea598bc5b44a3df981dd9f63e228e72f187883bbc818588aec
+EBUILD rsyslog-8.1911.0-r1.ebuild 12533 BLAKE2B 31539687bed21bc288ffb0b41755a4357072c1fed79dbced5d0f14075a7b0c34735d864476d221eb387cdda58a20f7fc748321c10a043bb0dcfbdcf0e6152bc8 SHA512 39778620a7643ad2405c06021602ec5b4faa5b1f52779e960b885775d9533107f55303915528327b83ec046117f7662e0d7210ce20cb708afc42ef40ab74ce7d
 MISC metadata.xml 3874 BLAKE2B c09a57dcbd88bda6c510ca741e1ee8c5207e5906843fe3ae21c8dd6575c7b104dae74e79e5a27c8bf9f0348673f5c33eb6c4b12fafbb1ba64f1a9f81bd374eaa SHA512 2f7a72017376018aa5d864deb33675d51ab50cd8481dffb7f1421b83d4e07f19a86a90705dbb6191686fc650284e2bcbe30ed0af07082b57eef46dd615778868
diff --git a/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
index 85601a397b5f..bf05fbd00c99 100644
--- a/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # 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_6,3_7} )
 
 inherit autotools eutils linux-info python-any-r1 systemd
 
diff --git a/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
index b1ce46d2e2f2..393420579d6c 100644
--- a/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # 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_6,3_7} )
 
 inherit autotools eutils linux-info python-any-r1 systemd
 
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 hppa x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 89cd34f6746e..27f535b04b82 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -4,13 +4,7 @@ AUX master-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac
 AUX master-initd-4 311 BLAKE2B 302e71b0328d47addd1508e1992ee56c719463d4b99af37b626835fefd28f9c3184e8441035f055992489b1084f1fdd45542466b359c206305e8174fef853478 SHA512 d44ea9fdf962ded6d0c6ac5a1f89ec8729a9a70517ba0f132c54696d32bc96030c64af09f48037867006bd3acdf4b6db759ca873717cd5a88701e42d06885bcc
 AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX minion-initd-4 317 BLAKE2B 4c207bd26a72d5dded38e40f7869f46263272a841b978f138248d016a06e837c3aebebabd15314e3896b404058c3f5dd5e6a1cca48450b07b88b6edef6a8d7d2 SHA512 80790ed1b5f86b713ca6384d60253676b16b10c122810ed07b7119c3860bedfe40102f6b7de86d832f084d84f87bf9405ec282629f981767a534d2a53144845f
-AUX salt-2016.11.0-broken-tests.patch 1092 BLAKE2B 5ab3cccc024b5cdc4e6eecd5f164c9f931aa25b23264151ef15645e63e1586f2a093f29a9835685482d831b98e131a385799d39b9158c865af83724a994bbdb1 SHA512 d23c16a5ed8c0fbd4287d73e45b700d465224c5f3b32c47bb2994703a4b4c261053b9c79444973cfaf86afa2850b8499a6b7923317fde3de43840a575ada74b4
-AUX salt-2016.11.0-remove-file-tree-test.patch 1480 BLAKE2B ad2285dd37d5a727feac291c5598b4dc56c98674566c3816fb17577ce44da4d20ddb60c1f0b8a8c8f7d2fe6f33918d00e5010c47c4441728f6a1a9ca94cf4015 SHA512 0503b4ecd16c2f67b53f1ce52b5f77cacf8de420024c5c7751d3caa06de2d1e685eef8d4021dfe86a5850ac23f58705a375e87922b3c5fbeb8c11290690624bc
-AUX salt-2016.11.0-tmpdir.patch 1480 BLAKE2B c5501459ba32a5ef08317f4e1a247a7ac2ad563be100f80bfb97a14821af43134dce76d46d9c9431f8b2866eec0272e6de62e281c9a469f8177f214e7c5f6a7e SHA512 ef654d871178618dab68ad9b4062560cfa57fa421834b142639a11d12679ebc97afc27fa572dd77b74d86ba722bb8575b64045bbf3cab9f2d0e2cefeca38c4bd
-AUX salt-2016.3.1-dont-realpath-tmpdir.patch 853 BLAKE2B e78c50d1050adad0d21523229034a24f1fd2c977172f3135dbf09440ed6d7e292f0dd9c267c3277edfe8528bf38d269939d068b4af8671da08c64f5712c0d7e1 SHA512 a6bc22959975ac25df84c54437a1638e95d78c057920ced38b0accddca11eb33ad39f2a43dd05648584cd10b140f7ee509a8c6739c4d89d30500452c91795b79
-AUX salt-2016.3.4-test-nonexist-dirs.patch 1655 BLAKE2B 5e7907e0a10c4ee78b599ec98d38088c97889ae2002602db0c207fb210e2960e7b4b92c08f027854e6dd9205b000bb09e7b243346af755e6824561752e3ef2e9 SHA512 ee81b8104f066e1d161207fe82d8349eb8c40701544784a2b6e66842fe9e07d7edffa24cad8c5d2037e2e7fa0368c614ed177fdf7359c89255d068767968e8fd
 AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17
-AUX salt-2017.7.8-tests.patch 3303 BLAKE2B 4bce0b82f939a997aca6da94977a261b636e410678c40a50a446813a1704608350ab6e330d3dd7dbf541b373320adcca035d3e2a70e9c626f3bd7f8216bbff6e SHA512 b5ccf399bb62325bb1cf252c9d72296138fded7dc4890695e44c2fb43c5f4f4eec852057ad427ffdfb80124be21d7b5cbe2f7497ff7d9746e09f5ed3a652aba6
 AUX salt-2018.3.2-skip-zeromq-test-that-hangs.patch 2820 BLAKE2B e531bddf576322f8417e7e362bfed7aa21ce8f1edc1702074f250efc9118c755664bd2976282399b725c1f56362e37fa07064b9e4ac2a72c413a56b13d325cdd SHA512 72cbc1e7c8d59883bcbe8130fdbae6e1ccecfabe74069a7389e63f797609930036c593204ab441cff92933d3d35a24feb7db0dc76804d76608190e93a8bc6ed4
 AUX salt-2018.3.4-tests.patch 2944 BLAKE2B f41c1e53297e1828c840d0ff22a49e2d47b40932615006f1fcebf6732faf0fb79a3149cc0c1be1d6daae60ce6f93e338e7eddd7cb80e076c1fdb68d560928050 SHA512 6ab26d0ae06adeb590b0b4a77fc3d0273f3624a1e8adacbaffe1ec3ae7d1066e7be5116dcde3c4118f7008a940995665777eedf15dd17c42825d08f22a33a741
 AUX salt-2019.2.0-newer-deps.patch 9260 BLAKE2B 02234367c4de7586b72502126fec7392dca96a284058b6c21733d21e5a61e12e81da054454aae20b290b9179fc7790e74ac111c7b1b638b36a935806e367902f SHA512 1e999b302323c4880103f8e68aa4c471c280484c91af0c4ac8ae85270553d178bb79a4a7d33fcc4b3a0ba2a6d95a8199d411b15e35b87f33004821dea4a07360
@@ -24,14 +18,10 @@ AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f405
 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
 AUX syndic-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef
-DIST salt-2016.11.10.tar.gz 10058200 BLAKE2B 4b6a42f6bf56421bc19458686ec23a1f945ceeb68b4ce7059fde036ba98d677fc8b61cb0f0c6ab249304b2f07d1b0250f6b91e7c443e12868649bf88f4d44d43 SHA512 e767e2c4c20e3a49a748b2699e4c640610280c0ba1c5955d94daffc7c36991ee632f02a50e338c65b35da146e234c36cc732214174b9bc5cbd62316b9ee40c28
-DIST salt-2017.7.8.tar.gz 12060430 BLAKE2B b2dde1b6f43bbb9b9db29b70dfd57591ae0e490e35ec7f4895b68b444ff77f9e997321d73697f791d345756abf451f11891b5f78a97c537c35dfe8bd24c43bbc SHA512 1e5123ee3dc194a33cf5da1e68a0419230b2b4eea26e7f66bf2d64754f0dbef9012abfbd498015f6b675725e580d72abf13c151b106639597337498b1fd42238
 DIST salt-2018.3.4.tar.gz 14404085 BLAKE2B 932b30b1ba60aefd3a6874a8ebe4cb6c469d82e31f6acdbe8a5641d09e3316796b5403ef803a355cec6255c1aede8bac3b66af179bd1bbaa5418c7076229cef9 SHA512 f17e06fdbf4741f231d9e769be57de4f6079e9283881b4bafa0d23928d7626a1f9c02b9f49c654b29c3e6ee8ed3d3ddf42c21baecef158ad63a97dc87895b21b
 DIST salt-2019.2.0.tar.gz 14952746 BLAKE2B aa3bba4b7d9548a8d333c242fc0265a743f56ff1a259da7c8618d37b3b022e12f09ac594a09f0ceec80fd9d3a6b6b9ec35b33e879b7a124e6612f2ec2a63a01c SHA512 de5a976213d011c230e423a172952effddb87168367958b8657eaaaf8fd2a8bec8471f547b6ff9e896a17064a13d387dbc12e12c605c8a241062e3238bd19eca
 DIST salt-2019.2.2.tar.gz 14420887 BLAKE2B 84e8a0aa72b88a66a1020b695849926669728ee02f8cb51a14853b5e9c2ab692fe65810367e5d53268f7b234c10911f16d063ce665b3761432ab1d9c0aa52d16 SHA512 2bbf9765384f1f6c2336a3f421298c8900cf459e6d1ebc7fb89284014ef8db9f5215a68de2bb06dfa3404983160a0c4c589ffa3dc046611dd5409bd502938677
-EBUILD salt-2016.11.10.ebuild 4871 BLAKE2B d10c0c7a6a3b865fa84a365fc3d97cc65e376867ed0229c6a3ecc79d721e1fccee9bdf5a8bf88f681d999bef06942dc9629d921aa334811655deebc4165509e3 SHA512 9370f1ea7abc8296181300b2d353789363f5a3f14a8c9e2af23a5cefd09b06e3d611c775479df266ba027fb36acc177fd6c9564396728784d80fe2e5beac6ff9
-EBUILD salt-2017.7.8.ebuild 4630 BLAKE2B a30efccb0845f435b351f40e64213ba1e751ac25a0400e27a5f8d238ecd0a30168c5ad58bfdc970dad7a3d24f8b4d89540928e7b15db0845bb58147a13f42880 SHA512 cbe73c8a757168efd558a8436efecdd0db0eab88c53c451bbf698a1290dab706347b86f9692782861c26cf501bffc44471a4f5811796c50a41e3926a9c9841c0
-EBUILD salt-2018.3.4.ebuild 4921 BLAKE2B 57f90f9404580c561f8b10f231e85b7f28f78669731e0c2e4842e7f3461eb4cef0cffb8de51f23b9a5e898d9c54f9203c38c1cfaceb8eb54286502a9d268d46e SHA512 ae5a10b97ae5625e274e1dcb31ace51978dbc4761dbbfb74ed450c2a9a2383b01519b2c7a2dbbb8f2051636b143768816ad887abe957a2ff16548572a437cf62
-EBUILD salt-2019.2.0-r1.ebuild 5095 BLAKE2B e4cba282b03284175714c2d77773d081c49b81d2f2d70af599d08f783293b17c61dab462b611084797bd6cb2b87ab9d81df7fc5e99efa2ea2481018a058fd2f7 SHA512 b1310b977b2308f5077e6c61d234b7e5d279c96a6400dd211266ec7f252f6f7e84751f6174ed57006942367893ca4b2b9be75f63dc81232ab5926bb18b50b678
-EBUILD salt-2019.2.2.ebuild 5086 BLAKE2B 54c95bf98ec8e562b031093233c3d35f147d2d1a9ca586ad67bdb0a7f7993b9e7ff0a4ab763afc281d2e03a2e132fbfca9408ccbe88d5216a03bf2948ce4ac96 SHA512 1090e3eec0c1efadd1f198be4301a10d113dfcdd51e2380081cacfab406c00f1472a6c5b73401209999d88453db3767fb648a1150bcd267a75b3413c584c040f
-MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
+EBUILD salt-2018.3.4.ebuild 4708 BLAKE2B 193967d3263078aee613fcad9abf83886626ac0be0e1c6fcb7d03179e46dbd5b3b295daaaf40f17c23aace278a46af57e5a0e9b9e654689c809e8b17bf7becff SHA512 9136942930148c66b6b56146d22919f491dec0fc7e802ff61e370045f9888480d13f837e8ad2f35f47c1c7ad1d952674077e833d0fe13ba28e1e9c1a9d6ae00f
+EBUILD salt-2019.2.0-r1.ebuild 4882 BLAKE2B 651efee5ec29df2734d616e0215ad37e86523ddc4ee64bd0cf802a3733fe0a6b6c5b2b3e64cafa82ce6f0d0194ee6b2af053c750dcd225374981f6ab366f46ff SHA512 1c2931a2ac30d7d27ee1de3b99cc8e07754f009105b673bdc2d9d07c956ced559c12ebbbbc8c3bebadb8ad6fb91f9f5514d2d176d046ead6c90ff85f05213502
+EBUILD salt-2019.2.2.ebuild 4873 BLAKE2B 82bb78057187e67bcc6083af6cd74809868bf07cf52915f326eebb50800ebe5013f0f05904fa9cd10259fd2b03b2604187ca662b76147882c6680d333162dfca SHA512 97d48110e0f425ce8bf1a8c7f4c9e149be0ef59ba5de17ae25c3f6bb006f607342682d3f0926cf9da7366ea4145b72493a48703a6654e5c10ee90804d4995a19
+MISC metadata.xml 2200 BLAKE2B eab8763ef66f507d2c22280d0539ac86b6aacc150936d8f79acf9618ce377b16c5fa50217937ed64bc4e54911e59ad00e56c28e3d7d1bd14e60e6e2b1e9a80a5 SHA512 f2e9292a4e554ccf37205171629a001e740731b2929d20fa68c4e9736939684f072e01526cec30d201aab8d211d45444415acb3268ea5763dbc3fcc933c737cc
diff --git a/app-admin/salt/files/salt-2016.11.0-broken-tests.patch b/app-admin/salt/files/salt-2016.11.0-broken-tests.patch
deleted file mode 100644
index 5bb7a8e4c46b..000000000000
--- a/app-admin/salt/files/salt-2016.11.0-broken-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/tests/unit/utils/extend_test.py b/tests/unit/utils/extend_test.py
-index f63a4896f7..54bf443d9a 100644
---- a/tests/unit/utils/extend_test.py
-+++ b/tests/unit/utils/extend_test.py
-@@ -38,18 +38,6 @@ class ExtendTestCase(TestCase):
-                 shutil.rmtree(self.out, True)
-         os.chdir(self.starting_dir)
- 
--    @patch('sys.exit', MagicMock)
--    def test_run(self):
--        out = salt.utils.extend.run('test', 'test', 'this description', integration.CODE_DIR, False)
--        self.out = out
--        year = date.today().strftime('%Y')
--        self.assertTrue(os.path.exists(out))
--        self.assertFalse(os.path.exists(os.path.join(out, 'template.yml')))
--        self.assertTrue(os.path.exists(os.path.join(out, 'directory')))
--        self.assertTrue(os.path.exists(os.path.join(out, 'directory', 'test.py')))
--        with salt.utils.fopen(os.path.join(out, 'directory', 'test.py'), 'r') as test_f:
--            self.assertEqual(test_f.read(), year)
--
- if __name__ == '__main__':
-     from unit import run_tests
-     run_tests(ExtendTestCase, needs_daemon=False)
diff --git a/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch b/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch
deleted file mode 100644
index 47d3257df671..000000000000
--- a/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/tests/unit/modules/inspect_collector_test.py b/tests/unit/modules/inspect_collector_test.py
-index 9105670526..e077bc3f44 100644
---- a/tests/unit/modules/inspect_collector_test.py
-+++ b/tests/unit/modules/inspect_collector_test.py
-@@ -52,29 +52,6 @@ class InspectorCollectorTestCase(TestCase):
-         self.assertEqual(inspector.pidfile, '/foo/pid/bar.pid')
- 
-     @patch("os.mkdir", MagicMock())
--    def test_file_tree(self):
--        '''
--        Test file tree.
--
--        :return:
--        '''
--
--        inspector = Inspector(cachedir='/test', piddir='/test', pidfilename='bar.pid')
--        tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test')
--        expected_tree = (['/a/a/dummy.a', '/a/b/dummy.b', '/b/b.1', '/b/b.2', '/b/b.3'],
--                         ['/a', '/a/a', '/a/b', '/a/c', '/b', '/c'],
--                         ['/a/a/dummy.ln.a', '/a/b/dummy.ln.b', '/a/c/b.1', '/b/b.4',
--                          '/b/b.5', '/c/b.1', '/c/b.2', '/c/b.3'])
--        tree_result = []
--        for chunk in inspector._get_all_files(tree_root):
--            buff = []
--            for pth in chunk:
--                buff.append(pth.replace(tree_root, ''))
--            tree_result.append(buff)
--        tree_result = tuple(tree_result)
--        self.assertEqual(expected_tree, tree_result)
--
--    @patch("os.mkdir", MagicMock())
-     def test_get_unmanaged_files(self):
-         '''
-         Test get_unmanaged_files.
diff --git a/app-admin/salt/files/salt-2016.11.0-tmpdir.patch b/app-admin/salt/files/salt-2016.11.0-tmpdir.patch
deleted file mode 100644
index 1cccb158aff0..000000000000
--- a/app-admin/salt/files/salt-2016.11.0-tmpdir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py
-index 615e6b5670..fbd24aab86 100644
---- a/tests/unit/modules/qemu_nbd_test.py
-+++ b/tests/unit/modules/qemu_nbd_test.py
-@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase):
-         Test if it mount the named image via qemu-nbd
-         and return the mounted roots
-         '''
-+        tmpdir = os.environ.get('TMPDIR', '/tmp')
-         mock = MagicMock(return_value=True)
-         with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}):
-             self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '')
-@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase):
-                                  'mount.mount': mock,
-                                  'cmd.retcode': MagicMock(side_effect=[1, 0])}):
-                     self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'),
--                                         {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'})
-+                                         {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'})
- 
-     # 'clear' function tests: 1
- 
-diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py
-index 5249d56747..a27ee9ab61 100644
---- a/tests/unit/utils/context_test.py
-+++ b/tests/unit/utils/context_test.py
-@@ -18,7 +18,7 @@ import salt.payload
- import salt.utils
- 
- __context__ = {'a': 'b'}
--__opts__ = {'cachedir': '/tmp'}
-+__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')}
- 
- 
- @skipIf(NO_MOCK, NO_MOCK_REASON)
diff --git a/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch b/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch
deleted file mode 100644
index 3e4fa31c9042..000000000000
--- a/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
-index fc13bb6..6316fb5 100644
---- a/tests/integration/__init__.py
-+++ b/tests/integration/__init__.py
-@@ -77,12 +77,7 @@ if salt.utils.is_windows():
-     import win32api
- 
- 
--SYS_TMP_DIR = os.path.realpath(
--    # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
--    # for unix sockets: ``error: AF_UNIX path too long``
--    # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
--    os.environ.get('TMPDIR', tempfile.gettempdir()) if not salt.utils.is_darwin() else '/tmp'
--)
-+SYS_TMP_DIR = os.environ.get('TMPDIR', tempfile.gettempdir()) if not salt.utils.is_darwin() else '/tmp'
- TMP = os.path.join(SYS_TMP_DIR, 'salt-tests-tmpdir')
- FILES = os.path.join(INTEGRATION_TEST_DIR, 'files')
- PYEXEC = 'python{0}.{1}'.format(*sys.version_info)
diff --git a/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch b/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch
deleted file mode 100644
index dd542d630adf..000000000000
--- a/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/tests/unit/conf_test.py b/tests/unit/conf_test.py
-index cce0023423..c1324f4a61 100644
---- a/tests/unit/conf_test.py
-+++ b/tests/unit/conf_test.py
-@@ -140,6 +140,8 @@ class ConfTest(TestCase):
-         commented out. This test loops through all of the files in that directory to check
-         for any lines that are not commented or blank.
-         '''
-+        if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.profiles.d/'):
-+            return
-         cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.profiles.d/')
-         for conf_file in cloud_sample_files:
-             profile_conf = SAMPLE_CONF_DIR + 'cloud.profiles.d/' + conf_file
-@@ -158,6 +160,8 @@ class ConfTest(TestCase):
-         commented out. This test loops through all of the files in that directory to check
-         for any lines that are not commented or blank.
-         '''
-+        if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.providers.d/'):
-+            return
-         cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.providers.d/')
-         for conf_file in cloud_sample_files:
-             provider_conf = SAMPLE_CONF_DIR + 'cloud.providers.d/' + conf_file
-@@ -176,6 +180,9 @@ class ConfTest(TestCase):
-         commented out. This test loops through all of the files in that directory to check
-         for any lines that are not commented or blank.
-         '''
-+        if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.maps.d/'):
-+            return
-+
-         cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.maps.d/')
-         for conf_file in cloud_sample_files:
-             map_conf = SAMPLE_CONF_DIR + 'cloud.maps.d/' + conf_file
diff --git a/app-admin/salt/files/salt-2017.7.8-tests.patch b/app-admin/salt/files/salt-2017.7.8-tests.patch
deleted file mode 100644
index e428108c4614..000000000000
--- a/app-admin/salt/files/salt-2017.7.8-tests.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py
-index 23f3b26874..bf0b55c385 100644
---- a/tests/unit/fileserver/test_roots.py
-+++ b/tests/unit/fileserver/test_roots.py
-@@ -173,16 +173,6 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix
-         ret = roots.dir_list({'saltenv': 'base'})
-         self.assertIn('empty_dir', ret)
- 
--    def test_symlink_list(self):
--        orig_file_roots = self.opts['file_roots']
--        try:
--            if self.test_symlink_list_file_roots:
--                self.opts['file_roots'] = self.test_symlink_list_file_roots
--            ret = roots.symlink_list({'saltenv': 'base'})
--            self.assertDictEqual(ret, {'dest_sym': 'source_sym'})
--        finally:
--            if self.test_symlink_list_file_roots:
--                self.opts['file_roots'] = orig_file_roots
- 
- 
- class RootsLimitTraversalTest(TestCase, AdaptedConfigurationTestCaseMixin):
-diff --git a/tests/unit/modules/test_inspect_collector.py b/tests/unit/modules/test_inspect_collector.py
-index c2a86d9e5e..421cab9b52 100644
---- a/tests/unit/modules/test_inspect_collector.py
-+++ b/tests/unit/modules/test_inspect_collector.py
-@@ -61,44 +61,6 @@ class InspectorCollectorTestCase(TestCase):
-             inspector.pidfile,
-             os.sep + os.sep.join(['foo', 'pid', 'bar.pid']))
- 
--    def test_file_tree(self):
--        '''
--        Test file tree.
--
--        :return:
--        '''
--
--        inspector = Inspector(cachedir=os.sep + 'test',
--                              piddir=os.sep + 'test',
--                              pidfilename='bar.pid')
--        tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test')
--        expected_tree = ([os.sep + os.sep.join(['a', 'a', 'dummy.a']),
--                          os.sep + os.sep.join(['a', 'b', 'dummy.b']),
--                          os.sep + os.sep.join(['b', 'b.1']),
--                          os.sep + os.sep.join(['b', 'b.2']),
--                          os.sep + os.sep.join(['b', 'b.3'])],
--                         [os.sep + 'a',
--                          os.sep + os.sep.join(['a', 'a']),
--                          os.sep + os.sep.join(['a', 'b']),
--                          os.sep + os.sep.join(['a', 'c']),
--                          os.sep + 'b',
--                          os.sep + 'c'],
--                         [os.sep + os.sep.join(['a', 'a', 'dummy.ln.a']),
--                          os.sep + os.sep.join(['a', 'b', 'dummy.ln.b']),
--                          os.sep + os.sep.join(['a', 'c', 'b.1']),
--                          os.sep + os.sep.join(['b', 'b.4']),
--                          os.sep + os.sep.join(['b', 'b.5']),
--                          os.sep + os.sep.join(['c', 'b.1']),
--                          os.sep + os.sep.join(['c', 'b.2']),
--                          os.sep + os.sep.join(['c', 'b.3'])])
--        tree_result = []
--        for chunk in inspector._get_all_files(tree_root):
--            buff = []
--            for pth in chunk:
--                buff.append(pth.replace(tree_root, ''))
--            tree_result.append(buff)
--        tree_result = tuple(tree_result)
--        self.assertEqual(expected_tree, tree_result)
- 
-     def test_get_unmanaged_files(self):
-         '''
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
index 00b55f2c20e0..e27805465b7e 100644
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@@ -34,7 +34,6 @@ backbone of cloud and data center management.
     <flag name="portage">Add support for package state enforcement using sys-apps/portage</flag>
     <flag name="raet">Add support for the new RAET transport.</flag>
     <flag name="redis">Support returning data to a redis database.</flag>
-    <flag name="timelib">Use timelib to parse english textual date descriptions.</flag>
     <flag name="zeromq">Add support for the zeromq transport.</flag>
   </use>
   <upstream>
diff --git a/app-admin/salt/salt-2016.11.10.ebuild b/app-admin/salt/salt-2016.11.10.ebuild
deleted file mode 100644
index 7ad0ca40863f..000000000000
--- a/app-admin/salt/salt-2016.11.10.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	openssl? (
-		dev-libs/openssl:0=[-bindist]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		|| (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-		)
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		!x86? ( dev-python/boto3[${PYTHON_USEDEP}] )
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2016.11.0-tmpdir.patch"
-	"${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch"
-	"${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch"
-	"${FILESDIR}/${PN}-2016.11.0-broken-tests.patch"
-)
-
-python_prepare() {
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py \
-		tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die
-	rm tests/unit/states/pip_test.py || die
-
-	# https://github.com/saltstack/salt/issues/39095
-	rm tests/unit/utils/parsers_test.py
-
-	# apparently libcloud does not know about this?
-	rm tests/unit/cloud/clouds/dimensiondata_test.py || die
-
-	# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
-	rm tests/unit/cloud/clouds/gce_test.py || die
-
-	# allow the use of the renamed msgpack
-	sed -i '/^msgpack/d' requirements/base.txt || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072 || die
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -dup /tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-
-	(
-		cleanup() { rm -f "${tempdir}"; }
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
-
-		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
-			TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose
-
-	) || die "testing failed"
-}
diff --git a/app-admin/salt/salt-2017.7.8.ebuild b/app-admin/salt/salt-2017.7.8.ebuild
deleted file mode 100644
index de0fba5cc5ae..000000000000
--- a/app-admin/salt/salt-2017.7.8.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	openssl? (
-		dev-libs/openssl:0=[-bindist]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-salt[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/${PN}-2017.7.8-tests.patch"
-)
-
-python_prepare() {
-	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
-	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
-	rm tests/unit/states/test_boto_vpc.py || die
-	rm tests/unit/modules/test_kubernetes.py || die
-	# allow the use of the renamed msgpack
-	sed -i '/^msgpack/d' requirements/base.txt || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072 || die
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-
-	(
-		cleanup() {
-			rm -f "${tempdir}"
-			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-		}
-
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
-
-		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
-			TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose
-
-	) || die "testing failed"
-}
diff --git a/app-admin/salt/salt-2018.3.4.ebuild b/app-admin/salt/salt-2018.3.4.ebuild
index e3e8f3743f3e..53dc802d2e11 100644
--- a/app-admin/salt/salt-2018.3.4.ebuild
+++ b/app-admin/salt/salt-2018.3.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils systemd distutils-r1
 
@@ -23,8 +23,8 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova"
+IUSE+=" openssl portage profile redis selinux test raet +zeromq vim-syntax"
 
 RDEPEND="sys-apps/pciutils
 	dev-python/jinja[${PYTHON_USEDEP}]
@@ -58,10 +58,8 @@ RDEPEND="sys-apps/pciutils
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
 	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
 	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[$(python_gen_usedep 'python2*')] )
 	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
 	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
 	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
@@ -76,7 +74,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/timelib[$(python_gen_usedep 'python2*')]
 		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
 		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
 		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
diff --git a/app-admin/salt/salt-2019.2.0-r1.ebuild b/app-admin/salt/salt-2019.2.0-r1.ebuild
index e1f7d05b2dfb..b20f9a0c39cf 100644
--- a/app-admin/salt/salt-2019.2.0-r1.ebuild
+++ b/app-admin/salt/salt-2019.2.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils systemd distutils-r1
 
@@ -23,8 +23,8 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova"
+IUSE+=" openssl portage profile redis selinux test raet +zeromq vim-syntax"
 
 RDEPEND="sys-apps/pciutils
 	dev-python/jinja[${PYTHON_USEDEP}]
@@ -58,10 +58,8 @@ RDEPEND="sys-apps/pciutils
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
 	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
 	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[$(python_gen_usedep 'python2*')] )
 	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
 	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
 	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
@@ -77,7 +75,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/timelib[$(python_gen_usedep 'python2*')]
 		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
 		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
 		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
diff --git a/app-admin/salt/salt-2019.2.2.ebuild b/app-admin/salt/salt-2019.2.2.ebuild
index ab00a4d5d798..909935cd7f6b 100644
--- a/app-admin/salt/salt-2019.2.2.ebuild
+++ b/app-admin/salt/salt-2019.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils systemd distutils-r1
 
@@ -23,8 +23,8 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova"
+IUSE+=" openssl portage profile redis selinux test raet +zeromq vim-syntax"
 
 RDEPEND="sys-apps/pciutils
 	dev-python/jinja[${PYTHON_USEDEP}]
@@ -58,10 +58,8 @@ RDEPEND="sys-apps/pciutils
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
 	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
 	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[$(python_gen_usedep 'python2*')] )
 	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
 	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
 	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
@@ -78,7 +76,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/timelib[$(python_gen_usedep 'python2*')]
 		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
 		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
 		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 935a6fba175c..7962e6f30553 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,8 +1,7 @@
-AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff848000c3181e590e557413011ebd5db650f79dfad270f6506128ef9971975ec2b26323b18f793bb914759449679bc34f388c SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6
 AUX setools-4.2.2-remove-gui.patch 970 BLAKE2B b3d701d0e9b4de0a3f66ca8696700e70becfa5de068e385d12ca61f76ca59f495a69fac65ee986fa548bfec2487f21b5b948da2d729cef8a3008d906c9f7e73d SHA512 088be5d53e4402fa91bec20b3d85b8c1a77b41ebde1bbb44909e740b140bd6f79b641b68f56d258ad5a4af40df3023745663acb305a810ee19f126a0e99f1e6b
 DIST setools-4.2.1.tar.gz 365096 BLAKE2B f415ec15ce7caade2a511896c6027720ecd8b4fae938d9dee1e0b677388966557b9615503df58dd6057f5c0ef81690f753f3e1af773ef5fd8095b29aca0ab249 SHA512 7d00295fe7ff16e96e15266807f8e0a67cc2978f9051cd85afb9ee71ca7fad16ccf7421a4a163bb793950bc20a44f3cbb8409b4e0642d0f96cf7a3df7bc59c31
 DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
-EBUILD setools-4.2.1.ebuild 1226 BLAKE2B c0b2e79c21e619c34e2191e3361641455380a897c5b889cb42d56c6a627b03661b0fe5c5f3d209bb55b80735626b949382c2bc639f1b155192c9852e07f1d5fe SHA512 b3c40a5f65fd2167eb4b8241ad69acc4bc38c677be3e57ba636b515a0a943a1b9bc0b27511bb878cdff719f48c4023d5e0abaca6523c34cd0df36da94dca7f01
-EBUILD setools-4.2.2.ebuild 1250 BLAKE2B 8e24854945a7cf9f535a45bc847e6d32b2328ce535d24f2b1e4d07d9571eb3f4aa9891f68f261c931ea9ff20b51e5040107800463f3c7ca440403607d1d17bb0 SHA512 f3c29e465a3e92ff1e4c17ca67d592c0d3f6f7b6b923357e4eac3acf7a7b4ac3c79ede85acea421ddf3706bf61a7be837066e1826769418a5d2ec32f308b7df8
-EBUILD setools-9999.ebuild 1228 BLAKE2B c0866df58ed5dc0f3a92b4abf0b20c3207b35c20b9dd0e64cf00b26fbc342e5404271de14639a788725a816a3dc9519887dc248cbfc0c7301ea88a073db15576 SHA512 21bad0e03734b09bbb659b92ad180cf390c40a0b29a1591aae819a97c721668b7c8e7b215a5dd30765f33322fd7cefdc4755dd20f6b9bfe2cf3d5d0b731b036f
+EBUILD setools-4.2.1.ebuild 1216 BLAKE2B 65c9e9268f32bca6b7a1bda27d375e4503c847ca634724e34a68b549b3f96453d1484cd6b11ac9bed4aa41bc76ac6afc19fc7aad7e56d084c0db8cd4ca966215 SHA512 206f08ac8c1b74c07cbcd125248b05098cbedc3dfc502afc1e856ea6a9679601af84382a23e304319ca4dfe65b16836fc5c81691660d56d9d4fb1afba54ee3ef
+EBUILD setools-4.2.2.ebuild 1246 BLAKE2B 96a9668a3c3da8e18bb5c07a14914024776737cdb485963536e8686851538b661fe2deb1032fc8af57101117534cceaeafe7e11d1df4eefb82ab5203d0bd3749 SHA512 8b5f81c50005b285bf67af722f0bef81fac45692764669363241c9fbdc65822c7f0bf40f2be6ba01742ab2b78b41ce4965dd0e5f63aedac0a641209979bf9e1f
+EBUILD setools-9999.ebuild 1224 BLAKE2B de6f8ab854b9da7ca34ec65c6ef8e650ae691676d862ed9ac6381af398bdafbd9a3d08f6744c77da979f1f5e35291048c52bfd1743bea6d8d237154abf59b46b SHA512 644668a658eff44a6d32e82d0b75571bd2273ebb21e0423c7dcf02b09d43d674be0bbcfba8da74d75e581ae9bea6746b054671f33c0411014dabda3679586093
 MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
diff --git a/app-admin/setools/files/setools-4.1.1-remove-gui.patch b/app-admin/setools/files/setools-4.1.1-remove-gui.patch
deleted file mode 100644
index 1bb78f5fd964..000000000000
--- a/app-admin/setools/files/setools-4.1.1-remove-gui.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2ca44c9..0c8a0d9 100644
---- a/setup.py
-+++ b/setup.py
-@@ -180,10 +180,10 @@ setup(name='setools',
-                 'build_lex': LexCommand,
-                 'build_ext': BuildExtCommand,
-                 'build_qhc': QtHelpCommand},
--      packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'],
--      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-+      packages=['setools', 'setools.diff', 'setools.policyrep'],
-+      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-       data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
--      package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
-+      package_data={'setools': ['perm_map']},
-       ext_modules=ext_py_mods,
-       test_suite='tests',
-       license='GPLv2+, LGPLv2.1+',
diff --git a/app-admin/setools/setools-4.2.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild
index ee786fe4b51a..80de4a986b63 100644
--- a/app-admin/setools/setools-4.2.1.ebuild
+++ b/app-admin/setools/setools-4.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-admin/setools/setools-4.2.2.ebuild b/app-admin/setools/setools-4.2.2.ebuild
index 20bb81b9fcd1..88bea3902042 100644
--- a/app-admin/setools/setools-4.2.2.ebuild
+++ b/app-admin/setools/setools-4.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 96ff5057cd8e..f10da5f6d10a 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/app-admin/spectre-meltdown-checker/Manifest b/app-admin/spectre-meltdown-checker/Manifest
index ac1112c8d52b..1e586f424dbb 100644
--- a/app-admin/spectre-meltdown-checker/Manifest
+++ b/app-admin/spectre-meltdown-checker/Manifest
@@ -7,6 +7,6 @@ EBUILD spectre-meltdown-checker-0.39.ebuild 609 BLAKE2B 36d1843107f84dd5e36b3f35
 EBUILD spectre-meltdown-checker-0.40.ebuild 611 BLAKE2B be71069f07922e8bfe1ee4627a6483c22ad886807cfd95cd67151d45e38456c0e132ef2572ab0b2b4220c21ba76a5e2aeb7dcf1db4e745f5a7d24a9b9442e0be SHA512 9e9852fb0268f890061528c0e550f63b023aa966025b1d8dcde83e24f3de768eefd806aa90ec97c5e36b69e614b03c0218c2443d9d2af1b54da3d95b83536b13
 EBUILD spectre-meltdown-checker-0.41.ebuild 611 BLAKE2B 205796938c2b38c3dd99c7799cbf564be38be6ed377250e4f3e72da525ae80ce1966f53d6e4ea283496854923be899e9b01376f7ea952b6ec498b9f52ecec2cc SHA512 8f9b0362c498942079455927ac26dbefcdec549f216e1c250e0fd9531ff81ba1274f9142eb325bb0e0d3a5b6b8b006ced06714b9a0724f8be3904c137226fba7
 EBUILD spectre-meltdown-checker-0.42.ebuild 613 BLAKE2B 845c9882ebe3ea93f8658fe713845e4cab942fdd59a7d1888e4cc6a424defcaf4eee2a347169dce54b7ecd0f485c8310ddd6aa5b9ac260de3f213d9fb7347294 SHA512 af555d0e399c9cc9e100cb06e91821e74779286460262f87cf5bd0cd5832562fa6cad0a2f8bf80e01cfddd59a0722a4b2c5e3ed55d6bcc4207deb26e1e1577f2
-EBUILD spectre-meltdown-checker-0.43.ebuild 611 BLAKE2B 205796938c2b38c3dd99c7799cbf564be38be6ed377250e4f3e72da525ae80ce1966f53d6e4ea283496854923be899e9b01376f7ea952b6ec498b9f52ecec2cc SHA512 8f9b0362c498942079455927ac26dbefcdec549f216e1c250e0fd9531ff81ba1274f9142eb325bb0e0d3a5b6b8b006ced06714b9a0724f8be3904c137226fba7
+EBUILD spectre-meltdown-checker-0.43.ebuild 609 BLAKE2B 39958953adb67698958b6ad7334ff6e37576594e59f64d41ef287966d038015c5d4e7a2ff10be4d62babf968529492c09c214d1e848c43eaf83082d43c246194 SHA512 1dd5edea334b02a82be54de5ba33f24cf3634729dacc43044c8a69f61a72621b838a86a5e70a8dc552ea8e12b24bda12d14cc037353d19bbcd1c08e99402f791
 EBUILD spectre-meltdown-checker-9999.ebuild 616 BLAKE2B 1a0cd1b4cf550568a77bb037cd600cd9a54f4ff0eccd267a98b6849c1bfbee97ba967c78f6566a1b6349d50d4936b243714cec8b2e2d87509d3da9dee1048f18 SHA512 2c09e4d7b49095e2e1bd2a19fb26745898409295338167f5e8a77164b207984234b18c08916add448b7f31e6a2ae789ebc9bf955cf623e4678038d58fcaf572f
 MISC metadata.xml 345 BLAKE2B 07f3a6efa5ff3dd3f5dad5ae3b4dffa1286648795a31075bf64ad2bdf25e8b712d6aef5de0aa48a31cc059d528fe4b8165b71725e6e3b6a40e5b2aae9242f5d2 SHA512 7229e00a28686eb602be0a9d0bfa4124acd1dfa73edb5e7975d5ead0bfa5e7d64888a0eb6e1c3c3828f48d2081d29b7bacb48375d75ebb780f2e94915f858661
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild
index 3d7f2444be11..e66122d3d838 100644
--- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
 else
 	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 2399d6f81cbc..8319bc1282ee 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,9 +1,9 @@
 AUX sudo-1.8.28-no_pam_error_message_fix.patch 1405 BLAKE2B 924c8be80bbbe75e1f3fbd9c598d91a02bd4a2c26efd8936c018d54f99977f0c64351f07a9fa5c6bffd52374accb143360da68c9a70eda0b16cf4019b419cb47 SHA512 9afcfc841635d5bcf67da292a205633fd7b4202d007dd3992e6e69ce98feb0cd5c8ebcd646ea8b46cdafad59779ae41dc3593b13ad35f9017e6c0c2cdc20ed2d
 DIST sudo-1.8.28p1.tar.gz 3310254 BLAKE2B a1810af7a42d05cce49bb9d0acf6f3731a5193e9e9c3b458691379131eb86d36995854d11c09525e8d999ed1da7e99cf170634667c5a444aa522b8f23db7d1aa SHA512 bda3de34c15fbb68fc29759542295560ccc1562b419d03709cea51613937e9b92ba689c79c3ef4858aeea90d3d1a4dc0148225b11b22cf82395ae1bad8cb1734
 DIST sudo-1.8.29.tar.gz 3338260 BLAKE2B 7ba29d155bfb1d7ba20e32ade2e8ee3919e70400b6c235e313052b247b48406b9a051e71daa7e47fdb0a9fd0889f4c05b8a1a170c027503b90081e8cec81660e SHA512 ea780922b2afb47df4df4b533fb355fd916cb18a6bfd13c7ca36a25b03ef585d805648c6fa85692bea363b1f83664ac3bc622f99bcd149b3a86f70522eb4d340
-DIST sudo-1.8.30b1.tar.gz 3341783 BLAKE2B fb950277ed66bd83516505cd2eb49b43412d5e95d4afcacf9cde34d685d5d80530deb248c3d421e1fc55343871d80eefdd492489f9bca6c952f81145f4a29746 SHA512 26525d2376fd80796fac146970ca5bbabe170900aca81f7ad71f80828920d27f323fbbf0191b1ba6ef027a53a156c5849aaee21e495b16f2b5188dfedf9746ba
+DIST sudo-1.8.30.tar.gz 3349455 BLAKE2B 5e0aaa41f42c18cd0de473add3665adf797cd37eacfb4abfc9472814ea679c1e88e28e95e13a73eb7d9648174609d80a2d4eccf3bdf87a44186df07aeba60eee SHA512 d44831feabd92d736614239e0e0f086829d84b213c98524fffb4b926a96715b1156538a7ab5e0b6e0db8be67a6e24a1642b3648105b076d23b58c39d0dd947af
 EBUILD sudo-1.8.28_p1-r2.ebuild 6943 BLAKE2B c4baa7977a7c46094d586fadfdf767c8b19a907f8431bf24ff7ed386bd4dfaaf270f3e9fb2b75d82a863a04ee69930b379b8a13515d25482cb24897bf11b0321 SHA512 aa59c884faa68e2905fdb84e9147fd2ccf1983649552dbaea456f0c529ae1dfe4b6b6aa1775d3c5124b82ebcb93086310ce76c884f2c210d67869a034a4f0bb3
 EBUILD sudo-1.8.29-r2.ebuild 6956 BLAKE2B 4065346eafcaf93f22182bb168b5ed753e65a59f2d5469c48883d19c962bd4754cff648d10bdd404d0ba846f74944670c194ad5740edcaafb605a596d214f664 SHA512 c034ce70c59e5d1bd51b1f9514aa410e372ad987776ec4447b368448770a677b548fd8aec27477f2e0c64ba050617714489f7406977e4cb762b9a14c815affb6
-EBUILD sudo-1.8.30_beta1.ebuild 6876 BLAKE2B 3fa9af915033ac10e6cf54880b64df0dadf7fa30ccf85d34fafa1c9fbc57cc187f7820086f242d90733583c79e82a50f336b9bdb9b21b98e72b2c377f6e550af SHA512 5efb6786e9d56e0b6b6f48fd4d25b24327772ce2b2ee0af366d73d67387f959159a83b66c2421e6a919b088d8143e3396f64423200bdfbb28a38e69043de0c7c
+EBUILD sudo-1.8.30.ebuild 6876 BLAKE2B 8115b04d517ffce1527c8d5672702623ce7d22345617a0bdacd8b67219040f651563e3cd973497a0383a65045757e7a4c3d3d483bf024e52edc0dbcb75030286 SHA512 2b894667bf8fb198561c3c7a02ce9b9501aabd142f1da2563b84ea512a63d39a6a014d7a2d46dca2d87a55721f687d24aa28dcf67ca2db9f643f65fd0dc57da8
 EBUILD sudo-9999.ebuild 6876 BLAKE2B 3fa9af915033ac10e6cf54880b64df0dadf7fa30ccf85d34fafa1c9fbc57cc187f7820086f242d90733583c79e82a50f336b9bdb9b21b98e72b2c377f6e550af SHA512 5efb6786e9d56e0b6b6f48fd4d25b24327772ce2b2ee0af366d73d67387f959159a83b66c2421e6a919b088d8143e3396f64423200bdfbb28a38e69043de0c7c
 MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
diff --git a/app-admin/sudo/sudo-1.8.30_beta1.ebuild b/app-admin/sudo/sudo-1.8.30.ebuild
index fc4f44f8e4fc..944dd7d03535 100644
--- a/app-admin/sudo/sudo-1.8.30_beta1.ebuild
+++ b/app-admin/sudo/sudo-1.8.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index 906bfdacfac6..13e4bef6603d 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -11,6 +11,6 @@ DIST supervisor-4.0.3.tar.gz 435960 BLAKE2B 001f556b955311e2453fe1091e46696f3712
 DIST supervisor-4.0.4.tar.gz 437708 BLAKE2B 211726da07ce31c00da0d6edba57942d78ee5d2757927b22afe569364c29aaf55375d4895b381f06071bc6b6c39a926ca2073e8fcb8e0ea9673a89aafd08b346 SHA512 22a38f759b0584310f5e16acbfc7b0c4cc59f3206fbfaf6295bd40a826d50ad02c8b0093821362c5038dd987a6599879d82dcefe948a2eda702b89e9f92e471e
 EBUILD supervisor-3.1.4.ebuild 1214 BLAKE2B 1587b1975317464ae5803c79200269478ed991ca9e1615285e542cd816f62688b1f1012cec61045dd7a08ae4bb08c8470cdbe45cb081a4683f122e6ab3cc2e78 SHA512 77b7311ee159ccac840736c4fefb0e1db357ad5a7a23f2afd8f23636d41e69ec9654a6ce1967ee1ca147938a6bcd6aca21cc660edbe7d94963c28ef9b2f866ec
 EBUILD supervisor-3.3.5.ebuild 1982 BLAKE2B 40204a17f5a3ca850d86ea555733b12a3945f716ae889a6d215eb8cee4eaef123a471bd8cb83927392a9eb66068b7e9dbdd0f1e938f50db31649520cb9b1380b SHA512 35bc9633f8470dcb17e414e7051d6a45eb59169136b3f05252e525fcffd75907e62a38bb9b77aab997ab86c14826d91909c3a9a58364a788164f21497886df7b
-EBUILD supervisor-4.0.3.ebuild 1821 BLAKE2B 3bc84c2060d3069683f7f6e841fe2f2eb62442b4e0b3c11281f83caabd1a75821d91a16952b716ab8c5f1875378949408253b434ebe9414bc99a525128a5de16 SHA512 988b6334775f754dbbd74d02dfb0e037fbb43ad67aa6160f3d31fc1a0406f357fc2b70074fe4644389df87effc636f29e4821c436319a573cc1f707e4b585cb5
-EBUILD supervisor-4.0.4.ebuild 1893 BLAKE2B a10927078cdf5d8547885a1747cd6180db2e47fc4b58f3696803c3243942548bd8f60b6d21aa43eba80b9d8b7ddf28720877260d20f336c4b79f93ca7412a470 SHA512 61f6af0946cc283b7bb64aa2244e9e28b87af602c014f41d3f4432b13009db781b973733fcd573bc9187079e5eea6189eb55d48fc4df0eedfd7d8ad58eac8074
+EBUILD supervisor-4.0.3.ebuild 1819 BLAKE2B c37974d752014e711ffdb7211b86778c115bf3a3ae2eaa81cfb168e4488e5dd156e75b4f706e3f2725c9542a6fc22b22feaa046907fa30c3d1d7245fa144d48f SHA512 12c9e9f509a358cd93b881de5c05880884dcbd5cd13549d4bdb7403a96916cb1146ecefe03b512b1fd94d65ba78a4bd0fa14cf3ecce6183fc17085e7c9202fde
+EBUILD supervisor-4.0.4.ebuild 1891 BLAKE2B 90eca7262c7b9b976af13fb09830e3c8d2e179a08e28fcbc7f8b7b021343d534b01c11b8ae793279261f4855439abc31df86cf240d3e89d21f320cd06ac8963d SHA512 53ee966185043740f01e5f9180f228f228085b5054c2ee0c7593f63acda22c6c97bde21feecf28a6949232b07c531fffae2407f25d821a39793f743fb7afc741
 MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/supervisor-4.0.3.ebuild b/app-admin/supervisor/supervisor-4.0.3.ebuild
index 3490eb975f45..f71315bfc37b 100644
--- a/app-admin/supervisor/supervisor-4.0.3.ebuild
+++ b/app-admin/supervisor/supervisor-4.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 # xml.etree.ElementTree module required.
 PYTHON_REQ_USE="xml(+)"
 
diff --git a/app-admin/supervisor/supervisor-4.0.4.ebuild b/app-admin/supervisor/supervisor-4.0.4.ebuild
index 4f4436c3ec1a..a30ea0a05f89 100644
--- a/app-admin/supervisor/supervisor-4.0.4.ebuild
+++ b/app-admin/supervisor/supervisor-4.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 # xml.etree.ElementTree module required.
 PYTHON_REQ_USE="xml(+)"
 
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 3c0b91fc66ae..dd6b05588720 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -8,15 +8,16 @@ AUX sysklogd-1.5-syslog-func-collision.patch 2273 BLAKE2B 7aa2ccaf4bb1663c7c71f0
 AUX sysklogd-2.0.3-no_parallel_build.patch 1525 BLAKE2B c428f26bd96afed63b4df50f1cf99954fce78c45f33efff91ad03c22176c1b647669f94de9b0276b2f5460ddab96fdeca7a0925c11f78ee219a45634b716083b SHA512 e1386135e46b28fb9207a36dcd45a3b3dbc5abeedd814a57082ffd03604d70c03bf5ec14ff90698dc085ce55d1cbb2682f11aca652c64bbb755bbff1f55c2c70
 AUX sysklogd.confd 113 BLAKE2B 392d4c0ac09d5dd85d01e4d57cb541271e3c09ce90671d6bfcbecfde64184c94603929bee0fe3ae2d65af2b6283919b8a6517c1e551f870d4c0e25bf1ffad051 SHA512 4553d85e93fb07e7d4a6ed0b47a3ea2044a5605adaac05223724c32a60bb8ae96d99ca95965c3931640beef234e976c1141b83f603aa8c6e8aca1dec20ca807c
 AUX sysklogd.confd2 129 BLAKE2B 1b58336456d16fc93b3141adbe1730901e87ee991cba61b1ebc83542b521c2131afe0005a1a5629f884758ff70dc798279ecb3b456e895e879df4c08fa102043 SHA512 d106937527abc14921b973dbd4a90c90b1ae640f10e6d286c16d5f6ef91205cd3a2f2bf7323afb463e59d00995379123a88d22adf4458c58eb9b2cf4a221f5c4
+AUX sysklogd.confd3 71 BLAKE2B 26e34fc5bd8fe936cb5cbe1ad7b3dc9ae47e153d731ecde62a354470448f91950a5ffe76104e80307543922bbb5777b9e3d096af8740d66a4dd637f4aa3adac5 SHA512 80a2159d24b343a5b14da054bd073015ffc8f81c6e5b47114429b6c069b81a3331392c88baafd9a5ac1e0d778119fa7ca10def17eeb9b88c7f5cca1c0d31c6b2
 AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659427f24a286661c500e6ff92b387f184bba84d0f10669ff9c917d7c8ee613c7fdb3a472434485b5f8c78 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7
+AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6ebc087963f7667dc3dcef6d2d90c0602da753fb77fdd063a1bae5907798c47e7c0e92feb9a884c SHA512 274642e7555badc2395e4a08684b07e4b5be91cfe92f5f2e47903263dde1ccb67c9a5932864eb623d11d97a3ad429b28a8ab7a8d93177e949a2f8dec9a1aaea4
 AUX sysklogd.rc7 1447 BLAKE2B 352be79eca7a99213557f29110a53eca85dfbc11e134eac48801b5d61ebca9e77beadbee10c7f86267fe3509e17352468f9f777d25a875d583292a409d5db071 SHA512 f3c8f00fbf65833735d57927fe25c6299103bbc0b8fa548103b4f2f06f0dc2aa2276f12326ff7477f4ba491a96ccd30fe01cc53e841b0ccee83c4dacabb5a94e
-AUX sysklogd.rc8 1666 BLAKE2B 2646e706933318d03471b18f69123c845d125dfcd98eb118a2d5ca8e0bc174edccac63950f56ff4e076dc158b93d0b9bdacedc7419535dbbcce4574fadb381ac SHA512 e2da064c9525bb755dcd31861016bd61b99fc8fdd845c8246fe64792f118c5c2f21656b7a69c9ab459e627b5e443505cfad0449a9b378cc999e53018f221655d
 AUX sysklogd.rc9 1550 BLAKE2B 8bfa8e31e42c4d06b630a79b80031c6e8ad5334bf8353b2217e23dfa69d3a7a11dfed8b614aec6bc22d374e97878bc0339af6094ce3aa9ad4021c35d9261b6fa SHA512 58aafffa09fc5eee28478d86a3a6b568c6c38106b796409b1f4a41edc10389875a4750fe0f34fb165af27cc85143963d51a873603a90fbee5ae7da923ac6c8c9
 DIST sysklogd-1.5.1.tar.gz 90011 BLAKE2B c40bd8d5769f7d3d4141d602c74ac41e05a140743d18c4923d9368da7ba193ccb89a6837173994f0b7a9c290cc23f64513040434d7ab8df81b5d09b73b0263ad SHA512 a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7
-DIST sysklogd-2.0.2.tar.gz 465933 BLAKE2B bc0181e43ca5996cfbf8a8a35d083f332e15f5c83215ec60b406cefc7817bb742d0ce094d6c0d9fe708d345db630a73ce408992d9aade18e5b69414ca4e2b2a6 SHA512 1e5e30162b1091c37801542ae44df3e5d1da09ead02dd74f81e1e35ebb2fea99bab372f00eca621340ca306a41629ccdfb3caa0d46db0fecf46e3030da932473
 DIST sysklogd-2.0.3.tar.gz 466919 BLAKE2B d9ada06dadb5a43ca7102cb24eaffa0494af2743f4714bab7d362cf480835ea9c3fc51ee171e4eb3b90380d63abe78c759bdfc5d946ec4d5bf8fce748cd916b9 SHA512 95ed0465e37b438d624b0a78d74c1194c57d117890492b5773c9ccefa7aa2c1f54ed510e54a29019fb2d7274200370031fe822a9316c154e64a2a01cb912d7a8
+DIST sysklogd-2.1.tar.gz 560611 BLAKE2B 727f78a639d88fd67b5fe6106534a10f9b37717b0675772346b07691481d7d5297963d54d3e36eae7cf14431e8429eaf0da1c551970c7a916f4e6c891c7ad70c SHA512 48fa0eed0013a9ff0a8bae0fe35bb82f46e012d3754da424bce0bcd339b4e016a1cbc93b134c02342f8da6e42721cdcdb3d28c3c71c571748d77a234460cb0c7
 DIST sysklogd_1.5-6.diff.gz 25677 BLAKE2B 3cb1f596490998b6002d4656a2321a500ce9941a37737c0b9d4702bbb87d7bc9ba21b68e06d175e3c1714a701adc6b3312e18a556ebc9ef395d8968762830cb5 SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e
 EBUILD sysklogd-1.5.1-r1.ebuild 1703 BLAKE2B 1b5f75d79a86e05f3b7f71523f794a1bcf4cce6b0242dd8564204edcb886c1c9e7a450f25e00e3899f159643dc9d65da38d8c40fbe25becda0522359485b4347 SHA512 f7355db8d66f1b73b09381aa43f9d7112646229bf2a68facc9cf2a5fdf290f95adbc7bd48203473f7d2a21ba608c23aba267d0a5875c5f6b464bff5d1b2752de
-EBUILD sysklogd-2.0.2.ebuild 1704 BLAKE2B 80878e7f9b5b3f4b83bc4cc81140592dee743d5224fe39e5a5801726b5b8a78885b29deabdb2db73ecf4c88525aa6f9c1a4f7d4a4e1c34d16a3ad25fc24cf327 SHA512 0a35aee84334b06d152601c3fdeb7ac175686a37be4475d88b5cfbea38d6f299569d2004dbf4ee8f67156b7b31414964214364a3ee524e497aafa48d632f6c07
 EBUILD sysklogd-2.0.3.ebuild 1820 BLAKE2B af54756110e0528f3c5f59e1e9fd7ab890f305903649a22a4d3c37bd6b90e0a9eb93c5f4319c232bcf2726891a38b800478dcb8d3a585f55ec0308b72dc14c35 SHA512 c1c8f47062fcf0adfbde35a7d711744f5fcec56d922b057cc56dd6ec404e327643db70df3d4d1d7fc3ca630ecf27ba96a0d2fc08f6766429b7b05eefe3f63bce
+EBUILD sysklogd-2.1.ebuild 1885 BLAKE2B 766fc16c3ddbb0bcbe7eb260878988254b308a3f3bd0cb67949786a470ef2ecb2f03baa9235730dff4aab25a1414715b4f43cbe23af6b13c0100a1187be4a0ab SHA512 13721c80d8c9e2f8b7f07abd4e2f1868c7f0915b27bbc4cfb54e0ec9d88d4bfed8b64ebbef83a3d58361bd40132ceddeebb028cb1d18059b3e68ddbfcf3cfb7c
 MISC metadata.xml 513 BLAKE2B dbb65f1982fba7751a6c64809adcbe4d44ee4313693b9999dbd8d4e6596325fcbea9d8eef294821967f5ccef4f3f5da32510474dbfcc0d29743d42237e1efa85 SHA512 76e47e89a7eef4aa7156145447003085cea5670881e2228c2b8baad238a4bb1b0efe95c3829656119d9f6d291fd49ca0b424f66d17e8989ec71f39355c504218
diff --git a/app-admin/sysklogd/files/sysklogd.confd3 b/app-admin/sysklogd/files/sysklogd.confd3
new file mode 100644
index 000000000000..d897c9e25282
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.confd3
@@ -0,0 +1,3 @@
+# Config file for /etc/init.d/sysklogd
+
+SYSLOGD="-m 0 -s -s -r 10M:10"
diff --git a/app-admin/sysklogd/files/sysklogd.rc10 b/app-admin/sysklogd/files/sysklogd.rc10
new file mode 100644
index 000000000000..749f87f08be6
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.rc10
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_started_commands="reload"
+pidfile="/run/${RC_SVCNAME}.pid"
+command="/usr/sbin/syslogd"
+command_background="true"
+command_args="-F ${SYSLOGD}"
+
+depend() {
+	need clock hostname
+	provide logger
+}
+
+reload() {
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile ${pidfile}
+	eend $?
+}
diff --git a/app-admin/sysklogd/files/sysklogd.rc8 b/app-admin/sysklogd/files/sysklogd.rc8
deleted file mode 100644
index 920ab9633264..000000000000
--- a/app-admin/sysklogd/files/sysklogd.rc8
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-depend() {
-	need clock hostname
-	provide logger
-}
-
-has_klogd() {
-	[ -x "/usr/sbin/klogd" ]
-}
-
-start_daemon() {
-	local retval=0
-	local daemon="$1"
-	local options="$2"
-	local fg_opt=""
-
-	case "${daemon}" in
-		syslogd)
-			fg_opt="-F"
-		;;
-		klogd)
-			fgopt="-n"
-		;;
-		*)
-			return 1
-		;;
-	esac
-
-	ebegin "sysklogd -> start: ${daemon}"
-	start-stop-daemon --start --exec /usr/sbin/"${daemon}" \
-		-b -m --pidfile /var/run/"${daemon}".pid \
-		-- ${options} ${fg_opt}
-	retval=$?
-	eend ${retval} "Failed to start ${daemon}"
-
-	return ${retval}
-}
-
-stop_daemon() {
-	local retval=0
-	local daemon="$1"
-
-	[ -z "${daemon}" ] && return 1
-	
-	ebegin "sysklogd -> stop: ${daemon}"
-	# syslogd can be stubborn some times (--retry 15)...
-	start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid
-	retval=$?
-	eend ${retval} "Failed to stop ${daemon}"
-
-	return ${retval}
-}
-
-start() {
-	start_daemon "syslogd" "${SYSLOGD}" || return 1
-
-	# klogd do not always start proper if started too early
-	sleep 1
-
-	if has_klogd && ! start_daemon "klogd" "${KLOGD}" ; then
-		stop_daemon "syslogd"
-		return 1
-	fi
-
-	return 0
-}
-
-stop() {
-	if has_klogd ; then
-		stop_daemon "klogd" || return 1
-	fi
-	stop_daemon "syslogd" || return 1 
-	return 0
-}
-
-reload() {
-	local ret=0
-
-	ebegin "Reloading configuration"
-
-	start-stop-daemon --signal HUP --pidfile /var/run/syslogd.pid
-	ret=$((${ret} + $?))
-	if has_klogd ; then
-		start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid
-		ret=$((${ret} + $?))
-	fi
-
-	eend ${ret}
-}
diff --git a/app-admin/sysklogd/sysklogd-2.0.2.ebuild b/app-admin/sysklogd/sysklogd-2.1.ebuild
index e9298b83532c..fba04a0bc315 100644
--- a/app-admin/sysklogd/sysklogd-2.0.2.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="klogd logger logrotate systemd"
+IUSE="logger logrotate systemd"
 RESTRICT="test"
 
 DEPEND="
@@ -33,7 +33,6 @@ pkg_setup() {
 src_configure() {
 	local myeconfargs=(
 		--runstatedir="${EPREFIX}"/run
-		$(use_with klogd)
 		$(use_with logger)
 		$(use_with systemd systemd $(systemd_get_systemunitdir))
 	)
@@ -47,8 +46,8 @@ src_install() {
 	doins syslog.conf
 	keepdir /etc/syslog.d
 
-	newinitd "${FILESDIR}"/sysklogd.rc8 sysklogd
-	newconfd "${FILESDIR}"/sysklogd.confd2 sysklogd
+	newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
+	newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
 
 	if use logrotate ; then
 		insinto /etc/logrotate.d
@@ -65,4 +64,8 @@ pkg_postinst() {
 		elog "functionality that does no longer require a running cron daemon."
 		elog "So we no longer install any log rotation cron files for sysklogd."
 	fi
+	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
+		elog "Starting with version 2.1 sysklogd no longer provides klogd."
+		elog "syslogd now also logs kernel messages."
+	fi
 }
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 382c7e53e49a..89587bf41444 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -2,13 +2,13 @@ AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f4
 AUX syslog-ng.conf.gentoo.hardened.in 4509 BLAKE2B 39f130c008df8d5e31c121246997f8f31d2d8e2a78f1a881f4ca07ade0b3a5386c6e8c3fd8518e2ae471751564263886b8e3b78e8651efe0eeccd1d06c23c2a5 SHA512 0670952e6f5d0405e90bb5cb1ea168832bb2293095250c01a9baaf9e4fcdf8578ecf5b60809bd9e5089096a4d97fa966fcc47324fbe70cfd14266a10eb0001c6
 AUX syslog-ng.conf.gentoo.in 1198 BLAKE2B a95b1fb9f46655502a41b0381c7388c9b54cfe9b8c3fd68dc68bd473175688e8ae72145a0ef718ef65220ecced7ecab00b39755cf41d4e21a6d375059cf6f309 SHA512 2830d1c5071a50c4aea6288b35c2880988111f29a11a641ee89f001a4ca4319943f87fdb1fd7079988888efa55401e2ed62f7a507c452de137f2e97a445d60e1
 AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530903659828565018dff71d62e56bfba28afa6c5e9fcb55aee2a41bcfff53c9ad006ee319124adbd66a SHA512 c945d27560afa310ac7f15e0cde3a564d5296892c747827d68df1b49c728998b056b596f93ac2564a5cb349f88db6585de58ec64cdaa13b92f20f5aac213ef44
-AUX syslog-ng.logrotate 231 BLAKE2B ede8c2e3bd6fa67b2740bca74fa45e799a88dcb9aac456df4fbad5db919f0ac8671b7e073efa1d7fdf1f2c119521d6fe8d5e6d4209b0fb09062e8499bd3377be SHA512 f8dfdbc4ea59c4cbb500b9ac0d4f8c7e33d0510049c7945ee1ae50039dc011b1ca2835c18ee145bf3d9ca306aca0d0de879735c3298b8a0f944db6ba4747ab1b
-AUX syslog-ng.logrotate.hardened 1614 BLAKE2B c9845bb43bd09a210f06912131dd2ba88164f0dc58f9d81455c13bba0ee923d1b9a6025f6b8e5fd066254bf6d0c81588b8d515aa055da157c29aaa0aa63fd700 SHA512 141b0ce95ca8ea6a9faf1f94ae1feffceffae19dbd4337c55d7dd4e554d41b7b8846680fab77f361ff4bf6093e3fe239fd3cec32dbb56ddc7b5e0f40bc054760
-AUX syslog-ng.logrotate.hardened.in 1518 BLAKE2B c13fd2707266edef0e74476aaf8446c8f77d2ffa8508cd7b8c32d13a22ff63bc883ac7a79f21287681b906430ecb05bae7665c064adbe161e4e1647e3ace9c29 SHA512 43ab59f037d6955844ba9a12675b745351fd3144dc1db8b81fe1c6ef48798452ac9a6d94caa68978dae396eceaa1a6d476fc99221989cb40265d6bb9dbbbf620
-AUX syslog-ng.logrotate.in 219 BLAKE2B acfde709749d11790b451e3f9a0d9bc33f129e86e3f68bdd36cf2d2c9c5561c5308805aea36378e8d79995e1bf173e4471845805681be2c409b52479333c35d8 SHA512 7a838006ce61c9702d6ea77672affa8cb1dc2ec2c6a1a268a4ae4f5a59dcac1ccfe835d25144ef8376a60a11227fa64e38dc16f8d0eaff182f14a6644a3a5ceb
+AUX syslog-ng.logrotate.hardened.in 1662 BLAKE2B 488ab7e26b081267bdeecd91013ce5118e79dca89567789be9b85f8712a0f8f11005c2459eb334ab5bdfab08c780063e7025a242330367f710717a79352e0d96 SHA512 1c19837570da6c77d49252303abe0ac91280c500bd82c1eab45c4c1534b83d758782dd576b12006bdd738508892d4b898ba29c0969aba536b333ab9b99e6bd83
+AUX syslog-ng.logrotate.in 237 BLAKE2B dd2851749f3f56b2099442610fcd85cbfd50a52a8c1ae60726b312ea845f3f0b20e436a4e11a377b9faecb1fa3f0febc008ae262e56018775b82d923ba5f2340 SHA512 4e59f8537579caa249ebe12c53946266633972ac6805b7ccd684a5749deeb897783a4e74570ceec15311edb3531aa4278bba468058227ab4c664a697cc604376
 AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a007d8f4978e1bbd4ce1f1e8f9daefb60c586aa58756d7d98ca59a869ae8e3f4addac732b6086ba5 SHA512 9e21637b684a48093d00ad9b5d4dbb79178ea8cc280cb03dbce235193e916bf3bd10b091a901cf13842f1c080b707a36efe8833bbde9d2721245598a3fe038df
 DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223 SHA512 4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f
 DIST syslog-ng-3.24.1.tar.gz 4909513 BLAKE2B 4b8d05899f9767784b6d24008d55808bee0af4a29883b2cb67031d23f4937632ba00f2ed7a9e969984ebec2785243a9e60811c4c2ccb3c6188c66a71af004f36 SHA512 b5326193e20db16763d3e187292bf683ebb77032b800a6e54a4ce2dd3864dda48b3d0ffc4d442eff0261117ac7a76d7927f4c8d0d96fc59ce29b46da6bd052d5
-EBUILD syslog-ng-3.22.1.ebuild 4950 BLAKE2B 8f357d97832fa2b34281ca0db58afbd648d33d9cb9de955edfe6f22fa442bd0a1a9661ea398ed2d7d964de416d73d338ca8237d881348f9e5a6438454a11c504 SHA512 8c91d2a427f451eb6fead571a9101615faf2f8aa29c0938fe491662ddda4e073efd2efb029fb1b56abb56985e2defb2e56b9ef16c46f77a38c06197668c90890
-EBUILD syslog-ng-3.24.1.ebuild 4899 BLAKE2B 00de8e10a135a8daab3870d741e7265668eb954145e8cd36d5aba37e6e8d92e4ad6fded9e960ace454c6da781ca110511dbf4d4fb4cc6f0a8fa5e3ca7c5cd8e4 SHA512 e2ff6e772e1a37184193b4ff9f2ec432bcd5b3780f505f7fc482d876f4e726206694daf30cbb1414d4ee93f443c490adc5b9748b8a1dfdd761e8f43ca6e52bac
+DIST syslog-ng-3.25.1.tar.gz 4938596 BLAKE2B bfcbd19b5a06c7ea15899bb919564661043bc7ab87bed147f77ab1aed153d70522aba9a42ab7dfa66d3b52a5f8432954b8a00594f428ddeb202979c5b9260da3 SHA512 79e09f1ba11080179c572016ce27328a28d479e68e663d39fb16624c03dc37d8439020ede922f78680e31e21629a6c13a4671464a31213c1dcf6acd2c5cd4b13
+EBUILD syslog-ng-3.22.1.ebuild 4948 BLAKE2B 73ed9129ca5f036a46854065234a198790731a0565164943bb2c56bf66e3ea149692d88dc3ab19a2ef3b2a5a9d6cce74f763f469896cac96cf3903015f79e15e SHA512 2cf803f5da3251246fd00e34b6aed817c03027e99cbf9e3f9d732601cd6bbbf63e8cb318a75cba477f3de2337a74db3cf0891994f3d34b271977dd2a60405019
+EBUILD syslog-ng-3.24.1.ebuild 4897 BLAKE2B 37093dafc1181f9d41d32f11bb2589452a1d9b5412a2ea94f9f7b963e69a3ceedc519566f8935a07d50ee2bd60155c77f750f628b8344d20bfc373797fb698e7 SHA512 e241c143214ff8b1f2d4de70b1767100fbc2cb574baea5e0ca1ac3fb687b2114e842ad180aa992bba935b5c0741ce9ad16a4f63f16d35af4f0b616e4341f3549
+EBUILD syslog-ng-3.25.1.ebuild 4855 BLAKE2B 25a40382fc792fabe62e33fd44ba08fb86ff733cd110d3df5295411a95d2fecb7f41e9d2362cc9cc8b96b377a363d90741e4b9ffbe2f5474e06ad6ac1954fdae SHA512 e388af0421d156fbcea5b6d9f3696e19a052b09c23246a56cae01ec972cf28d0701789ef5f7dfebf2b98fb5525145ed2404c1ab8a1604525be6f3d17d042ac26
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate b/app-admin/syslog-ng/files/syslog-ng.logrotate
deleted file mode 100644
index ba4730e084f4..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.logrotate
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Syslog-ng logrotate snippet for Gentoo Linux
-# contributed by Michael Sterrett
-#
-
-/var/log/messages {
-    missingok
-    sharedscripts
-    postrotate
-        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
-    endscript
-}
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
deleted file mode 100644
index 678814a623fb..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Syslog-ng logrotate snippet for Hardened Gentoo Linux
-# contributed by Maciej Grela
-#
-# Updated bug #284669
-
-# Generic
-/var/log/debug /var/log/syslog /var/log/kern.log {
-    sharedscripts
-    missingok
-    postrotate
-        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
-    endscript
-}
-
-# System services
-/var/log/cron.log /var/log/daemon.log /var/log/lpr.log /var/log/uucp.log {
-    sharedscripts
-    missingok
-    postrotate
-        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
-    endscript
-}
-
-# User log
-/var/log/user.log {
-    sharedscripts
-    missingok
-    postrotate
-        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
-    endscript
-}
-
-# News system
-/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice {
-    sharedscripts
-    missingok
-    postrotate
-        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
-    endscript
-}
-
-# Mail system
-/var/log/mail.log /var/log/mail.info /var/log/mail.err /var/log/mail.warn {
-    sharedscripts
-    missingok
-    postrotate
-        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
-    endscript
-}
-
-# Hardened logs
-/var/log/avc.log /var/log/audit.log /var/log/pax.log /var/log/grsec.log {
-    sharedscripts
-    missingok
-    postrotate
-        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
-    endscript
-}
-
-# Authentication
-/var/log/auth.log {
-    sharedscripts
-    postrotate
-        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
-    endscript
-}
-
-# the rest
-/var/log/messages {
-    sharedscripts
-    postrotate
-        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
-    endscript
-}
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
index 21ec5eba69c3..5ff03c5d6a5b 100644
--- a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
@@ -6,6 +6,7 @@
 
 # Generic
 /var/log/debug /var/log/syslog /var/log/kern.log {
+    delaycompress
     sharedscripts
     missingok
     postrotate
@@ -15,6 +16,7 @@
 
 # System services
 /var/log/cron.log /var/log/daemon.log /var/log/lpr.log /var/log/uucp.log {
+    delaycompress
     sharedscripts
     missingok
     postrotate
@@ -24,6 +26,7 @@
 
 # User log
 /var/log/user.log {
+    delaycompress
     sharedscripts
     missingok
     postrotate
@@ -33,6 +36,7 @@
 
 # News system
 /var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice {
+    delaycompress
     sharedscripts
     missingok
     postrotate
@@ -42,6 +46,7 @@
 
 # Mail system
 /var/log/mail.log /var/log/mail.info /var/log/mail.err /var/log/mail.warn {
+    delaycompress
     sharedscripts
     missingok
     postrotate
@@ -51,6 +56,7 @@
 
 # Hardened logs
 /var/log/avc.log /var/log/audit.log /var/log/pax.log /var/log/grsec.log {
+    delaycompress
     sharedscripts
     missingok
     postrotate
@@ -60,6 +66,7 @@
 
 # Authentication
 /var/log/auth.log {
+    delaycompress
     sharedscripts
     postrotate
         @GENTOO_RESTART@ > /dev/null 2>&1 || true
@@ -68,6 +75,7 @@
 
 # the rest
 /var/log/messages {
+    delaycompress
     sharedscripts
     postrotate
         @GENTOO_RESTART@ > /dev/null 2>&1 || true
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.in
index 2e368bd1099a..ab79747fa3c3 100644
--- a/app-admin/syslog-ng/files/syslog-ng.logrotate.in
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.in
@@ -4,6 +4,7 @@
 #
 
 /var/log/messages {
+    delaycompress
     missingok
     sharedscripts
     postrotate
diff --git a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
index 8be775f7d03c..388154e6c9a6 100644
--- a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
diff --git a/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
index 80737a7e69b0..52957788a78b 100644
--- a/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
diff --git a/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild
new file mode 100644
index 000000000000..5566d7e43e41
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit autotools python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.10.1:2
+	>=dev-libs/ivykis-0.42.4
+	>=dev-libs/libpcre-6.1:=
+	!dev-libs/eventlog
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.9.0 )
+	geoip2? ( dev-libs/libmaxminddb:= )
+	http? ( net-misc/curl )
+	json? ( >=dev-libs/json-c-0.9:= )
+	kafka? ( >=dev-libs/librdkafka-1.0.0:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	smtp? ( net-libs/libesmtp )
+	snmp? ( net-analyzer/net-snmp )
+	spoof-source? ( net-libs/libnet:1.1= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/criterion )"
+BDEPEND="
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -r lib/ivykis || die
+
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
+	fi
+
+	# drop scl modules requiring http
+	if use !http; then
+		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
+	fi
+
+	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+		sed \
+			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+				"/etc/init.d/syslog-ng reload")#g" \
+			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	for f in syslog-ng.conf.gentoo.hardened.in \
+			syslog-ng.conf.gentoo.in; do
+		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-docs
+		--disable-java
+		--disable-java-modules
+		--disable-riemann
+		--enable-manpages
+		--localstatedir=/var/lib/syslog-ng
+		--sysconfdir=/etc/syslog-ng
+		--with-embedded-crypto
+		--with-ivykis=system
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng
+		--with-pidfile-dir=/var/run
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable amqp)
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+		$(use_enable caps linux-caps)
+		$(use_enable dbi sql)
+		$(use_enable geoip2)
+		$(use_enable http)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_enable kafka)
+		$(use_enable mongodb)
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+		$(use_enable pacct)
+		$(use_enable python)
+		$(use_enable redis)
+		$(use_enable smtp)
+		$(use_enable snmp snmp-dest)
+		$(use_enable spoof-source)
+		$(use_enable systemd)
+		$(use_enable tcpd tcp-wrapper)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
+	insinto /etc/syslog-ng
+	newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	find "${D}" -name '*.la' -delete || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+	fi
+
+	if use systemd; then
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+	fi
+}
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index ec6925371f27..be5412bc8bad 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -2,10 +2,12 @@ AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d8
 AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 DIST sysstat-12.0.5.tar.gz 711967 BLAKE2B 96aa49d82e71407dbd99d840ca5f71af83f54ba6315c858fae71f97290e8cf9c4f5358ad6389c7489366a62667c35835151e3187382a56c98153d3a04bcc2b8d SHA512 c1061f1af35430e81e488e4b2f18b8588ec4f3c419ade004c49ca24baf60b5b76a6a59eb25f3b17b51a9f60c5833a914a514872d0235b2ca405341a2f4a32cb3
-DIST sysstat-12.0.6.tar.gz 712148 BLAKE2B 1118ce071e06c2853ffdec2be1b8b3bf060571caf988e17e04ff62cbf43e7111c5951a131d176b49ad35e1da75d2b8936e23f1a385e1c83a013b802a0fc36003 SHA512 e8f542b26c2b0b7b3aadbf34dce640879d27f8f1659447f15ffb5a210987c74840418046409403da85a9eb4c01484615d230ddc700611b7c0088d72165bffe86
 DIST sysstat-12.2.0.tar.gz 1227684 BLAKE2B 1ca5cc3f0fd5dca6655d7b483fa853bf9f0256ae5e8dabf56f698d736faadd38f64af699158f4d637d7c8564f12b0992d866e503d01c647be274fc87ee04a9b4 SHA512 2398be1d5181616c337ead8f62b6bfb1144b89c747800140503c6a94793976f7909c81b656290577d51ebdee2f380418902846271b48ed79c6d7f02306f0a8a1
+DIST sysstat-12.2.1.tar.gz 1227707 BLAKE2B 566382d83a0230517d22e2630a9cb1aa631d761c914188a4e7fb15eddaedbd25b8a3dffa9893b1b2bbcc31d87a37cbe11b2b50ab0ec94a28f84018685d1b35c8 SHA512 a19d0978eb11071c228462cda496a59721541e57a1d15cb2d0964f287ac2d50b5587fa5bc2b8fe6be2a1f00cbf2e7c3bc59db6494e3e8c1906aa81437b30d073
+DIST sysstat-12.3.1.tar.gz 1245248 BLAKE2B 69848c452642be992c7b4af33268c0d6b30f16e5ea44ec13b00ab57e6ec3b498d92b707a53757de9066138a9ee92b995765f44f75f692e1b3c68d829519d53ca SHA512 f67a2dac22748217687bd7f58521c0719754f13298fb5faed8a6d58c2bb1f8620428191d0415e816eea07bb3ca81453e057d03c7db0096430ad7d6ba6b7b611e
 EBUILD sysstat-12.0.5.ebuild 1693 BLAKE2B a70bf736b6ab9884abcea8a31b01494b4880fa6c3cbf2911f00660e704ad6ede2059debe19c858f58106543651bae91ad6c9d339a45f109cb126e371b848d2ed SHA512 7b94c3b44265af2e49d79b2738343f60dec9b31f315be518507e0245995840b3a84d5ca5ee3cfbe286c4c22815adbb6b1a8ece9f3452ef8e3f201e8f3a28e330
-EBUILD sysstat-12.0.6-r1.ebuild 1700 BLAKE2B 36b596f7d9e6814d9ef6db764873be587effe492d8cec9177b11cf563c0e4ebe852e849725109d3ed80d294f7574d15dd4e9a67fa675be3621b658329a84280f SHA512 17dbaa3f0e4b47a0bcfa70638f9c0b3439dea41b55335e24e0dfcb74aaa09cc1e354aa08fb0ff2c72c16be1938905ca6e4a8691b72c3afed156b382eafff55bd
 EBUILD sysstat-12.2.0-r1.ebuild 1707 BLAKE2B a859050b87eed7b87090b236656a307ae87e3df1a297891800fb161632605b370b05c177ad080e5504bb4f3eb4fcda1a0d82076fbf10779a61dd03e754b11449 SHA512 312f999a2cd27a09f06970a141da3b0c70f271526dd97c2c228f241ec37d233153ffc728cf070da20d5db8eaa93981648a593668f982af295a08088ee4061227
+EBUILD sysstat-12.2.1.ebuild 1707 BLAKE2B a859050b87eed7b87090b236656a307ae87e3df1a297891800fb161632605b370b05c177ad080e5504bb4f3eb4fcda1a0d82076fbf10779a61dd03e754b11449 SHA512 312f999a2cd27a09f06970a141da3b0c70f271526dd97c2c228f241ec37d233153ffc728cf070da20d5db8eaa93981648a593668f982af295a08088ee4061227
+EBUILD sysstat-12.3.1.ebuild 1707 BLAKE2B a859050b87eed7b87090b236656a307ae87e3df1a297891800fb161632605b370b05c177ad080e5504bb4f3eb4fcda1a0d82076fbf10779a61dd03e754b11449 SHA512 312f999a2cd27a09f06970a141da3b0c70f271526dd97c2c228f241ec37d233153ffc728cf070da20d5db8eaa93981648a593668f982af295a08088ee4061227
 EBUILD sysstat-999999.ebuild 1603 BLAKE2B 3346b2979dd44d34cfc9450dd4d81e6d0269464a0e59ccb6692d5a65a46e93ca58637a8500978e644ef5ca3262f60775b8771a38bb217dd498b37eded65c8280 SHA512 45f259cd23638e4c5621f782c61d933fb11d927ef7fa2da2e7ffc6e061fa1701499cba841aba2c77c182f653b24b2b86f37ce487c7b0905707daac0aa2a1be3e
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/app-admin/sysstat/sysstat-12.0.6-r1.ebuild b/app-admin/sysstat/sysstat-12.2.1.ebuild
index 0566f5270e51..cbea517ec677 100644
--- a/app-admin/sysstat/sysstat-12.0.6-r1.ebuild
+++ b/app-admin/sysstat/sysstat-12.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="debug nls lm-sensors selinux static"
 
 CDEPEND="
diff --git a/app-admin/sysstat/sysstat-12.3.1.ebuild b/app-admin/sysstat/sysstat-12.3.1.ebuild
new file mode 100644
index 000000000000..cbea517ec677
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.3.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm-sensors selinux static"
+
+CDEPEND="
+	nls? ( virtual/libintl )
+	lm-sensors? ( sys-apps/lm-sensors:= )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.4-cron.patch
+	"${FILESDIR}"/${PN}-11.7.3-flags.patch
+)
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/lib/sa \
+		conf_dir=/etc \
+		econf \
+			$(use_enable lm-sensors sensors) \
+			$(use_enable nls) \
+			$(usex debug --enable-debuginfo '') \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm "${D}"/usr/share/doc/${PF}/COPYING || die
+}
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 53a5ed316e4b..550bae4c2f7b 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -3,6 +3,6 @@ AUX system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch 2206 B
 DIST system-config-printer-1.5.11-patchset-01.tar.xz 6948 BLAKE2B effe29c51cbe74fc72566df65f10ab845c9dc1f40ca2966c40be87e19f98046f34311c24b7bc77f471b840e35b0c8eb7754a7c5464d50335c8ab2e2ed0e79afd SHA512 2501bda0e75ea51cc8e14df6b3746a0ea51618919ef35ace849efeded0cddc49e6e3793142d1cd128ce3ce62c21661d5fdb85b19718df07b87a20f5fc641885b
 DIST system-config-printer-1.5.11.tar.xz 949816 BLAKE2B 96b41d64e0aa3494b7fc7ed15ac926d833a046ba2880b36b6f5dd4e7508e2bc1fac4cb52c9940c13cec6e34cb8972fbc11fcd5a7df510296444ca08a23f4cb2b SHA512 cc0a6faec0022092e64de3d7ab28669039c93853c6931d26c264f0035486e09ad0af784833e88ee8e3dc1b6f5be9dcf84144a2a6464dfa9711172966fa6a22b4
 DIST system-config-printer-1.5.12.tar.xz 955756 BLAKE2B 766cc7307382a7b0ab65387650f1568fd5108dae2693dfc93684c6593e28837d513e4c823bf4e07c3ba2123eea8aba0649135020318f06f38633b9837683d7f7 SHA512 c8b0702dcdf99c4e8a19274dd4a3f82d9263bd5f51d0c19edf7d71fb13095f57a35e643ddbe161ffb5805e72bf7da0cb6a3de44a554854390ac05d8e56644c32
-EBUILD system-config-printer-1.5.11-r2.ebuild 2386 BLAKE2B 0795c7ffe9cfa37c599066d487c83c93ad87e9ec57c7abb46adaad777867a5551cb49187ec301bae117c84bc1e2daa9e6b675e3968fb1575c4258db21205e6b0 SHA512 f9c6d857b69223f39f49d6004950237e12f08aa471330150333b0fbd053ed9ae0d2d9ae4c8b2ef702521ca524df04eddae69c59e5a6905559d78ee8757546e61
-EBUILD system-config-printer-1.5.12.ebuild 2099 BLAKE2B 240ef800834f33113bce3762decaf4bd78914f8ea22fe966c75e2bef987156266cf547e450899042f69dbfc6fcf11e563ce4bdb2bd1b3047453da6a9cb9e4df3 SHA512 6665bd581070d6ec88e137d38afe2ad342d7fe312627e99f5fbb1cd4a8ef9fabda003edc7c500793a0df76935e0a812f77c9d6a9bfc7283eecf7aa8c729b210a
+EBUILD system-config-printer-1.5.11-r2.ebuild 2384 BLAKE2B 5cdec84c625a01dd2b25695a2fbfe6f6ea741869af2eab383736e2b2bb39c985decb8395ea6f4b953f8283eb5a2174584035d7633852be5b9ec3467e6ba9d78f SHA512 b45bca0208f2c26c7bda93cc575c354e19b410dd010f319d2d32923a11fdd7b8698fa7e335767dd52da80bff5436d01596a1662660b0992ab5d849139331296a
+EBUILD system-config-printer-1.5.12.ebuild 2113 BLAKE2B bbabece307e6d35ea1bb506b76252caa964cbb0626cc38b147d26456712bd6f360ffb087267b064f9b035b16a9a2de7f80d42f6d69825cfa38e299a2803120c1 SHA512 c62a08121d2792a70099425f4d53c6002937d11de760c88c30356e6358dcc2203617571376956fb381945a4a3d2717c45d0335e52da23759c46c6b64f765c89e
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
index 506b95217fad..c3ccfa108f05 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="xml"
 inherit gnome2 python-single-r1 systemd
 
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild
index f4c8f7a381cf..ddfedb5f26de 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="xml"
 inherit gnome2 python-single-r1 systemd
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
 SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86"
 SLOT="0"
 IUSE="doc gnome-keyring policykit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -36,6 +36,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=app-text/xmlto-0.0.22
+	dev-perl/XML-Parser
 	dev-util/desktop-file-utils
 	dev-util/intltool
 	sys-devel/gettext
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index a73b94397e0f..9c98ad975eba 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,5 +1,3 @@
-DIST testdisk-6837474129968d7de13d91e5454bd824c9136e73.tar.gz 637265 BLAKE2B 7d7a2c875db9d34ad5be687ef0ccc8122759c645b30faf6eed7967747e69ac988078ab6c1909007c32c6bf5a879a5bfd00dff3d2d268e5b50e3b60a8b660c636 SHA512 b494e23ccd8f913a9b22f4b803b02af66e94f6971f45e6aea8a0e1dd8549996e7bdd3fafcf70078ebc242f262d064cdc5674d99cb7a367b810c45c0b1c40336d
 DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5
 EBUILD testdisk-7.1.ebuild 2331 BLAKE2B ef6479f36a829488f5238199d556517e3c667323d64753752fb55e2b4906d770ca564ebe9c1a8fb4d4174c6e3dfa7fa9a2172200f5d0317b0f7c59edc3771979 SHA512 b8d75536122cfd62ec5ad82ecc2bba9fc84fd665ee16d4869cb8fc37411d73e19b6cac5f3311dc403885ad9b7651ceb30e1a1c70415822d0ecf1541a3dc24ed3
-EBUILD testdisk-7.1_pre20180922.ebuild 2517 BLAKE2B 2335b1e92f1b9d90e0d3e0f4e0a4088fbd4e60b1a39c6eea0cb248a8f2c51e4b083a36404904ef24357002d2dafff914ee3014e1388db0154492f7be7ed9df85 SHA512 9b9f99e977056372bb89d49e35b44f06edbc6f18edff5e555b99cbc91183422ec965e8e0f396d4e03387c15c719a74c1774b8ef3a8ff2543664ed02349b92601
 MISC metadata.xml 555 BLAKE2B 4b56bad0ebd1af77d90c4fa650adba5ae59d06940dff5aa346cb0e9dc9ebfad5324f774cb1afa646e15731b41cb09d7020ee3b6a5a0d941452099b6b7884da75 SHA512 3c47ad35d151d92e4be40cd91c7f0ced271f7b61a00280f536cc70a700d25ae36426593fcb8aec76e9cf1c24ae76dc8290b00bbcb73fa4d95182210fa680562e
diff --git a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
deleted file mode 100644
index 91b33ce97ffd..000000000000
--- a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_COMMIT=6837474129968d7de13d91e5454bd824c9136e73
-inherit autotools flag-o-matic gnome2-utils
-
-DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
-HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
-SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${EGIT_COMMIT}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
-
-REQUIRED_USE="static? ( !qt5 )"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-COMMON_DEPEND="
-	static? (
-		sys-apps/util-linux[static-libs]
-		sys-fs/e2fsprogs[static-libs]
-		sys-libs/ncurses:0[static-libs]
-		jpeg? ( virtual/jpeg:0[static-libs] )
-		ntfs? ( sys-fs/ntfs3g:=[static-libs] )
-		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
-		zlib? ( sys-libs/zlib[static-libs] )
-		!arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) )
-	)
-	!static? (
-		sys-apps/util-linux
-		sys-fs/e2fsprogs
-		sys-libs/ncurses:0=
-		jpeg? ( virtual/jpeg:0 )
-		ntfs? ( sys-fs/ntfs3g )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
-		zlib? ( sys-libs/zlib )
-		!arm? ( ewf? ( app-forensics/libewf:= ) )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="!static? ( ${COMMON_DEPEND} )"
-
-DOCS=( )
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sudo
-		--without-ntfs
-		$(use_with ewf)
-		$(use_with jpeg)
-		$(use_with ntfs ntfs3g)
-		$(use_enable qt5 qt)
-		$(use_with reiserfs)
-		$(use_with zlib)
-	)
-
-	# this static method is the same used by upstream for their 'static' make
-	# target, but better, as it doesn't break.
-	use static && append-ldflags -static
-
-	econf "${myeconfargs[@]}"
-
-	# perform safety checks for NTFS, REISERFS and JPEG
-	if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
-		die "Failed to find either NTFS or NTFS-3G library."
-	fi
-	if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
-		die "Failed to find reiserfs library."
-	fi
-	if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
-		die "Failed to find jpeg library."
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 8b43a098ea3d..e4e23e7f090c 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -7,8 +7,8 @@ DIST webapp-config-1.53.tar.bz2 63429 BLAKE2B bb13d52a4c19859ff4730df2f7db75452e
 DIST webapp-config-1.54.tar.bz2 58954 BLAKE2B 42a4305c51ccb8bb9db455c6ae2663b5d17c9d477eee3e504569c802e5f0d10183f3e6cd1e747462dcc0559d6ed7ba53a8b5607ed422f34813a33e0e8148bb90 SHA512 fa61e88696eaed130575e5ae9a17ec827aa14aece359e5ba43fa723ad00083def22e44fb02d99fc5ba6000a5949c5ce7aecea9307d2bfae333e202ef111dcd31
 DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3f23d52971f6013165ce59a8f4b32ac6262c9719956d1bcdbe60797f07d77910b44a749ae545c4dc15f765525144709 SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438
 EBUILD webapp-config-1.52-r1.ebuild 1596 BLAKE2B 3ba116d9692192197ebba784ca7b73c58a25c6328befe0e66a53a449fda37cfb6b11786f04134c05d2a95ed3ecd092c96c6899e7f56ad37dc185a11ed51e3fc4 SHA512 25fb6dc7ee8b33622cf5a61eaec398ac676e450cf56f7992df4e86d0f44b4598db816d755a9ff5d6cbbd74910ae5540deeb73fd9b422b7643a9493a187fc7637
-EBUILD webapp-config-1.53-r2.ebuild 1671 BLAKE2B aad9fa78c132094f38ea65f07cb7548016c476b097420fc489449ebd26f45f5ede981c8e0f724b2c3dbada1d8a22f0cfacf644080f267082a73f62dd661e07cf SHA512 ab433bfeccd5f43327b0594afa46ee3c214d8ab78c1532e3da60df26138e219e61c3b056910fe64e4aaede05dfe28ac29463821cd2a4f1fc9ec3f8fa6c934243
-EBUILD webapp-config-1.54-r2.ebuild 1726 BLAKE2B 5944a4cad768a90466c9f3a6ae8cbe8c3d4550e3e8c4ac9393946f1415827e9cfc34377902e4303ac6185a32995563c0b4629464f6bb252024f56b8d3f077d2c SHA512 e0879b0f1535032bd14aaed9b3aeeb34d5585442e4d895a3dc4dffeea637e90a13b1b28042e8d68118e85284d814d22fb8f0c227970139fe958929873b113fdc
-EBUILD webapp-config-1.55-r1.ebuild 1676 BLAKE2B cec2149db20f36f805aeb2c21c8c8c65e40dd4450a203e87838ed75df0a04209bbdf7420bb22f865c2ad0e45a723f2c0a3554cc29d9f493229e32d77b0e97824 SHA512 d019e56d9a0b688ecc767bbe63086086888c0e4b111ca9c53ddc5144fae63461b49a6abf91a3914ee4240929d3580ba4ed1f4c5116f75b28d1cfd7355ff7f282
-EBUILD webapp-config-9999.ebuild 1802 BLAKE2B d55668d18c432771173b3de65f37f4aa86a39d95747bdefaea04c8ef7a17d49add8f1774120e85545cbfc12e1d4a3e40f734c076f1d4c5386c75fdedb8011246 SHA512 0d830a004c3fac2584ef4b41076e703a50d7aa4a0e13c56bdaf8a6276e212aec29e4fbb22191c4329fa432ed5d12870ed25923501d7bd452af80dd029970ccc4
+EBUILD webapp-config-1.53-r2.ebuild 1666 BLAKE2B 6108f74425b899e607badc51017ab29621309f3977057dc70132160ac6dc4abd5e53d8236f1900d901a99bf75cae33baa49b0986ff26513fa2b347833bd5b3a7 SHA512 f3072be764bcc408c9245e48043c5107a1fe743867f6d85e9f5b98eac654baba6897ee5db713a573367cf436c6013c5d7528196dc6ceee9e98e552c1d3779544
+EBUILD webapp-config-1.54-r2.ebuild 1717 BLAKE2B 75c8e4b0668370f2f13f0c6238ecb87a00d6675850bdf65995c9b9ca9110776de28ec07bc0cfa819f54cdf1c07cbf42e0fd675384b198353ed701cdd4ed78166 SHA512 b2bbae96aa700f0f5872e7a14d615901054daec84843b27c3f0ef62b2cdd1faea344ea3b5e9fb65c8418656528e7b70142767b28fbe9f6b20d855954fa3d9e52
+EBUILD webapp-config-1.55-r1.ebuild 1667 BLAKE2B 2915891c45fc9028a9f64f234d283e9f304101d53501f6d4e05417cf5fd63aac0052f7895c26766a22a556acf94a3e567be205b500d4500edcad2d7407b20de1 SHA512 56ca5f20175f09462e8334a80f89eb7ae1adb7b84d567067b0620822c862d855d648ffc4f779b4c44ef51a780fcb5a0e5049281951d0a44d4500a127630ec81a
+EBUILD webapp-config-9999.ebuild 1793 BLAKE2B 1080ff6a736113a5dc3aeb14f0c48954bcb457ce7c9970ebf2b35ada232583e11c62637c676784de6717b50ba1136b2b09a7af6563ca31cfe089c09d201fa56c SHA512 77c3f5776097f2f800d5e7d3a84782c399639f386cc899da3e5d67d07431bec2e1468a038f05941bda66a9ac3439aae72776014892f291360d31131b1ec270b1
 MISC metadata.xml 549 BLAKE2B 44f2ec07f40387bd51440d500cacc4ff24cbb3d1ec2e1c9bec29119a589e4c4bb005723d861be2ab9c1929d74d209c10771de5500eedb56e44265969129201be SHA512 1c99c9b52ab10378a3716d3f6dd1d6f70f61ac6bcf0c8a934254b71376a429f601358ad1108292e03ab780bc6c53810fd8a484e42a4ad6f959fb1903ed591b7b
diff --git a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
index de1d206427eb..aa88cc8c1ae0 100644
--- a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 RESTRICT="test"
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
index 6bb05c35e9cd..8e74ce226438 100644
--- a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
index 85f0927eb623..5f1777a7af17 100644
--- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 prefix
 
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 6324eda26679..9e17168b7675 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 prefix
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /app-admin
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)