gentoo resync : 17.02.2020

116 files changed, 584 insertions, 407 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f3baa451b756..a5d3987e15bb 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/amazon-ec2-init/Manifest b/app-admin/amazon-ec2-init/Manifest
index 6438e38a9c47..6d78aca7f5fd 100644
--- a/app-admin/amazon-ec2-init/Manifest
+++ b/app-admin/amazon-ec2-init/Manifest
@@ -1,3 +1,3 @@
 AUX amazon-ec2.init 1073 BLAKE2B f9bfa80b9317965eb603bb414e02b77c8e4045045fd10c29bf1fbe4a216e0f71d71b411b77123ca66a282716b510768773cb47a6ccd717683354f5688a2c85b0 SHA512 6dcbca0fed4e3a4e8c0d0e9da4cb8ea380f6604605402350d8980bad1377376584b644157f88a2babcd605e690f3a52cf89e63e130d679b501327675c90d5836
-EBUILD amazon-ec2-init-20101127-r1.ebuild 783 BLAKE2B 54b0aebde0484a401b8f5c02a62659dba2b71c8c64be54de9b3abe79d67a28981d2f30d7e82ba1cd6cf21d9793ab296189324e6214ee9edcc0dd597fd17cb40e SHA512 81d7e18713fb7dbd4e1f0163f4746f00a4c4b3a1e3357782293ad42ce2fa69b1d6c4e8302e22e6aaac791d07acd3e58209876cd732e48f026e3d4debc39e94d3
+EBUILD amazon-ec2-init-20101127-r1.ebuild 780 BLAKE2B 59df2c31975f7a9adc081522eec1c344ae820d2d84676bd2f90c4033496784071c21a33e95bc9758b51593c54777a5de5f57d5eb4cd3604030892887a79c9bed SHA512 5c56f3122f5e8dc99f384d0558516332038370464dc7efd15e62fa7ba4be3ac0ce91ce02f628d48137fca1c025a927cfdb93ca58ed4175377bcc6c1bf71d3c9c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
index 761bce4eb366..e11168a4ae8b 100644
--- a/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
+++ b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index 7751fc89abe6..92bfe167df56 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -3,5 +3,5 @@ AUX analog-6.0-bzip2.patch 3260 BLAKE2B a9bab8a2a7d070b59690606f393d80407f6ffcb3
 AUX analog-6.0-undefined-macro.patch 997 BLAKE2B 9ae68f90acfa81e861a6fddbd588ed4cbfdf9b4ad26355894bc3aaa0df50e5bbd180096c4baf393f6dcdd7d91d28b4e6a85e5b5c65714ff540e9ae127a08905b SHA512 759d6dfc2a09305a6178d1c147219487f988d432bf6d011e49776cec2de04ccc7ab27568638063f0ca723a92a75abeda82eddd5240a0b42bab3a2de3ae99007f
 AUX analog.cfg 3992 BLAKE2B 8e68cc26a59a5bbed57f84e06ac8f5c9874cf1a36bdbb5c6f9144bc39df17ea380ebd323b2ddb891dd968078fd3d7bae6b29a90cb5ec2051a10722489d0d83d2 SHA512 af6e8eb3013fea513efcce2e57b2680850604552a8def8f3148cfc4b11bf01114778fc112ee562b7ce4cce6b496b37a53251d1061d67fe5748d39c5225f94141
 DIST analog-src-6013ce.zip 4875246 BLAKE2B 6b0663f3367faf84a8c65a778a065165ddfba6cd902e5cc6c9e0e84d94e1600629b9f9f89b87ec293f4b81f4034e21941ad45784ae5f35352f71f7b0917eb731 SHA512 8f8dbf0bd95873132414f558deeff61fbe9ac6cac40936f00515ccaead86642613c3f0a5a88046eb4d1f4e263cb01d638291c9a1596ea36098b455572b7364ed
-EBUILD analog-6.0.13.ebuild 1374 BLAKE2B eaaf922540d535ef56d8c0c68163df0c35b407682c34cf03096e0868edce932a1a064bf10cec65ae817b2132fa84e6740103565d3e18a77dc1a932dbf4b64155 SHA512 f2560c3ecd2fc9f4770f23b9dae127ad9c28bdd5084d69e544510dc4734210008483d61892da0f05e2dca9dbc5f17c32c98d41da5b7c01fbc064a88e90a0e790
+EBUILD analog-6.0.13.ebuild 1374 BLAKE2B 4864309ffe66ad98ba7e8bc3bd5e38d82a922b6e09e52d6f81cc9015b53a8fd00373f9a843838f1cff2ff4cf57408ab8798b78a3061b61ba8bbf5cddda702815 SHA512 585a0a7a303d924994bea69bd4cde323e70f9683ed3d45e3cc0a5b5bea4eb972aa218546fb830b8fb23bb73680baf4b0e226e4bb153c7ee1e6774070826efbf3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/analog/analog-6.0.13.ebuild b/app-admin/analog/analog-6.0.13.ebuild
index 084b72a05144..5d206251a81f 100644
--- a/app-admin/analog/analog-6.0.13.ebuild
+++ b/app-admin/analog/analog-6.0.13.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/ansible-cmdb/Manifest b/app-admin/ansible-cmdb/Manifest
index 073ead285a28..66fe97ab7795 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 544 BLAKE2B d26ff2120c35d8b988ec976fa34acb939f2fd74d3ef154f0c60cafd1de7fade43c1cefff96f77e471781565616344fe35c96915decb04b9543c91071cfcb5ae7 SHA512 145cb349878ebfc7b34356a0e1aff5203d985d309b44d0f9746d0d8ed949c35c662ae3ec92fbc9bf23e039caf1b74a49481dd8bba76fb0066755b66c6dba120e
-MISC metadata.xml 488 BLAKE2B a8a8c5d397c1876289b718d4dc8688d5a001ee63eaad76b0b4eed91d5d89e15235e592f3282b3543382e9d9d26bff129fdb4b7a8cb008414d014084f61ede918 SHA512 fd2903178cc9dddb523ee35a711e5289ab7908b0b749ce96aaeaf924b848e407fb733831124517fed054bfef68420ce2e401bd77afa1966cc978a39f0d146f51
+MISC metadata.xml 387 BLAKE2B f48dd031b3cb184e1cbdd0f0189dbe952754a9364fc6f5c8aeab0c6ebac3d0dff590684f36cad3ff02b458df844d80cec134ba3c649b7e7fe67952e39cc46730 SHA512 ed89950e90b14e21945977859a522157daf477ba1ac94b2aed667549e44492929d753864503227880ac6a88ae61632fc5b75d61f732b71ce0b2dc1407603d7ce
diff --git a/app-admin/ansible-cmdb/metadata.xml b/app-admin/ansible-cmdb/metadata.xml
index 8c687a7584d8..cd461e918826 100644
--- a/app-admin/ansible-cmdb/metadata.xml
+++ b/app-admin/ansible-cmdb/metadata.xml
@@ -1,10 +1,6 @@
 <?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</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 972824c1745f..7bda312ab3dc 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,8 +1,10 @@
 DIST ansible-2.9.2.tar.gz 14157188 BLAKE2B 4c1207bd43f7797d8d9cb1d4612e866eebbf8c19ee060cf1eb7daa68415be5d7718c79d756454648e66a13434eacba6a07c8de31c4ec4b12e0474563d8844e46 SHA512 522dd84af9493ceafd95ff0fc806a671f3d1f10d0ca074ef41875eb966d39e64b834e0b98a35d81d9d9d96efef8069db604c8080ce8cbb1ce2e8b13bf5c30a6a
 DIST ansible-2.9.3.tar.gz 14170666 BLAKE2B bb27d249e2390888ee3c28fdb48c1ceff346d2903089c70b451f793742238498aed7c33be056cce9790f44f5cdb74b5020b6decf4f1242904bd9c8f7b5077ea0 SHA512 02cfa2c7c43506dc602e92aed66c920243222b82bc4852f1a4d786cd3ff26fe17eda18d35ac7301cd9bf26366df9b18776e2a27e8d54fc92c3128f52ec7f58e8
 DIST ansible-2.9.4.tar.gz 14170264 BLAKE2B e230837360d29df460906d118b3c2ebb9a9dc1ac2a4427809a16716e67a79db8e737ed1beca757bd8a75b631c8cb6c26e58b1caeaaeb613731d63031f1e4e34e SHA512 21020548100fc31b59d4ee1b461f2a14359f2f18752d431cd041eb987c8c8b308f1aa1687461a9b3f5a086485b77b3a38c8f006b942cc24cb2157b45e6582822
+DIST ansible-2.9.5.tar.gz 14186885 BLAKE2B c64fb384ab55c5b9cca753319fba911b8a40d634b59998f2e4c65ccafaa536788f3ac8c18a45a4b0d322ecca9b7fa2c580311a35a202ad70c2de2157ab04bfaf SHA512 cd2ce807b3136e2c02856339ea910b0a5cae8ca946da804ed7d3ec5725d3eff0fe5b4bd8527b2a17d6f3109e16859d52045b50f2ffd21169b30768e65b813407
 EBUILD ansible-2.9.2.ebuild 1704 BLAKE2B 5222fcb64c188bb54bfa1a645a45179f9f9e9ba98020e824c2b355a567e0790c0c6bd2c0c149121fadb7dc1ce110cf4837519cb5df8d48fa9cd4cc3366e33cea SHA512 ed56bca21b973e313e8e08d5cc71856becc53ecf6eacb7e6e921c280f89a0a49edb5f0bdfe0354bd0280800ce80a14bdf557acc78de7f39067f338b91e28f24a
 EBUILD ansible-2.9.3.ebuild 1706 BLAKE2B 5587541a8ebb57aff8dbc1f446a4d79aa2e9f1672461384999e7f6958b9eb72d9b031a28a22db9bed74b8dc296b387b1555ede35fd5b43a61b0926b22d33bcce SHA512 a4f3ae33c8044f301bb0057db5ed10698f1f015480e7d20a6836ccefe9784bf1fcf11c802a291420078e60585fd73f8646f307435e1c815a4333171d93947c40
 EBUILD ansible-2.9.4.ebuild 1706 BLAKE2B 5587541a8ebb57aff8dbc1f446a4d79aa2e9f1672461384999e7f6958b9eb72d9b031a28a22db9bed74b8dc296b387b1555ede35fd5b43a61b0926b22d33bcce SHA512 a4f3ae33c8044f301bb0057db5ed10698f1f015480e7d20a6836ccefe9784bf1fcf11c802a291420078e60585fd73f8646f307435e1c815a4333171d93947c40
+EBUILD ansible-2.9.5.ebuild 1706 BLAKE2B 5587541a8ebb57aff8dbc1f446a4d79aa2e9f1672461384999e7f6958b9eb72d9b031a28a22db9bed74b8dc296b387b1555ede35fd5b43a61b0926b22d33bcce SHA512 a4f3ae33c8044f301bb0057db5ed10698f1f015480e7d20a6836ccefe9784bf1fcf11c802a291420078e60585fd73f8646f307435e1c815a4333171d93947c40
 EBUILD ansible-9999.ebuild 1697 BLAKE2B da48c9b97787143e815cc768b5aebbf7bf005ac8a8562a3420f4d4594214e601e90cab78a447017de45b7217952c5c2b0922e37c2e7770b2e786632089230b22 SHA512 0276bdacbfef27725a2714d8cc56d05c2c64d2b37fcbe77d7cbeebaf30828364a7ecf86ea960327d01ae1e3202387777b32d5903152b405036c2541bc38c7f9f
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.9.5.ebuild b/app-admin/ansible/ansible-2.9.5.ebuild
new file mode 100644
index 000000000000..73f6fb55df55
--- /dev/null
+++ b/app-admin/ansible/ansible-2.9.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 7e39818a9207..32842b36486c 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,4 +1,4 @@
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
-EBUILD apache-tools-2.4.41.ebuild 2555 BLAKE2B ce3963fca361f620a35db13262d1c680b4d9d23dd41d49dea903b05545cb37bbdbee9e2b6a546d9a81f5a190f90be8779503f55d02007eebddc9007055d16b35 SHA512 98949ad72f06543e4df0c2b97e8669348fd56af18eba912dfc303657261a206ffe48e5fda4aa37096d5ddf4f7cfbf0b3ef6b5ba0fe049b63383bca931c53ca1d
+EBUILD apache-tools-2.4.41.ebuild 2555 BLAKE2B bb3310527803513fbf6d82821dbf92682f150cf81699690de84272479bc92e9d7fff2fa163a9bbdea6ff94170b5889f3dc68f50ddb91c35031f2468d6b15f841 SHA512 57450aded05a2c42b51b40a4c394eb57c6d0a2986b972b16a400aeeb858b29c9075d294db7e052f16f8e0f389d243bca7a8c5e788f40514d5a0747e89ff12465
 MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/apache-tools-2.4.41.ebuild b/app-admin/apache-tools/apache-tools-2.4.41.ebuild
index aa802bac556e..e93fdc6cd596 100644
--- a/app-admin/apache-tools/apache-tools-2.4.41.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.41.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/augeas/Manifest b/app-admin/augeas/Manifest
index 2b51f05f5509..1bb8b79618c2 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,6 +1,6 @@
 DIST augeas-1.11.0.tar.gz 2393675 BLAKE2B e7c50715fee892b47843f9be4ec9e88937c0ce10544b3e212d9c32a6151bbc36550d711ebec9db2a691e91cc6a2cd93696d807b440ab57a678ca6680426a4b03 SHA512 1b67bb7fcd9b560d3fe4a5c753d5e778db73caaab6e50367afd123eec107b65b73096913ac7d5170e85f5b63ff3522b2a6932b130e207ab22560dfc6e267b8a1
 DIST augeas-1.12.0.tar.gz 2429279 BLAKE2B cd90203fec1a81b114d95bb50e168b852923136f34c83974d3427cbedd4eb0d335d3952057507b38ded5c7011be2b56725565ea106cb32a0ca43b7c81250b29e SHA512 4f61d4abbf338e915dfae212560d39792674bc757f05f500afa80c6170abc214ffb99cab2cf5bbd1c2338d11a6909e5fc3ff7112a2246fca69f7b39ac283da40
-EBUILD augeas-1.11.0-r1.ebuild 956 BLAKE2B f47ceda9e8b6ecc7e45f0b154f5374c7557a611eda349e3185853e5cd6916b72b53a96a71e9ba6f6339ce8899407a1db21dec6f48c1b6aed9f60803a0ed7724f SHA512 73cce0bef4d1494f95260e44de457b867ced0613f3702344516f92a4f7afe676b55561b735efed409da38bdc95d7f8a7a05553fe0685321e652d0729a506fa60
-EBUILD augeas-1.11.0.ebuild 1025 BLAKE2B 511e292683afcc032eaac0ea4be803226cafb08c03698f4260d816a05a089e85110e30ce2f835ac97706fb207d31e8f56a192871afa2d81faab69a3a42e8d998 SHA512 fec11eb11c1e986bb22c2fa4bc51e45229d7624a6c40610b958054b648da432fb785bc243a14532ed1a7215b24c94c80fe0c4f0d3fecab04d0f5f57c39d477d3
+EBUILD augeas-1.11.0-r1.ebuild 956 BLAKE2B cef119e29ee76901c7db4dcc801b56b547d7be56676fef95233cf9a3e3f12f2ca12bb87fd5d5aac3138a5d9790c98f4e23b9616f6f1927ee7dc485740f01c67c SHA512 6bca55cfc2fc3fe349ebeafc38a34b34c53cf88f3234b7918efbba1e02d34ca30f5271ca20d3fb5cc9be35f25c54d3823473a357ebc9e718e3f5f879f691f49a
+EBUILD augeas-1.11.0.ebuild 1025 BLAKE2B 6d319a4dbbfa8dc1c7f6c75b308e936a49f600a78fffe3f0d68058a91d53ed8a688027220331db5982100c6c7d3abb2251c898b42ef95837a939d87209f73109 SHA512 4bace33389ae03df5425343c43271b7f5cad3cf1f31bc3d90e0f7a6ead24776636dab8ebd3e055e3f057d1565735da825ad8706b13c64f2ce952a93e10177f10
 EBUILD augeas-1.12.0.ebuild 960 BLAKE2B b7d119633f2134db78b7e60bc79374c56e351c1631bac41679f826a96f68b658ab36ec8591a0012271fc718724b951345f7eac33a44c359f6ff074d002cfcb7a SHA512 78e3e8efeb6468bc38b22d738e56da08b8a549c2f47310fe23c1fad811505f1221a18a5606a9734aba7d1913be6071db8f682ba82773115ce814ab5e6780df49
 MISC metadata.xml 693 BLAKE2B c47bd36818c81a0fcb3d8f2e18e7a48797038c8a4a93302d592140faaed41d093523b6ad407b58dc7ae8c5f81c999c04e8514511b685e2a9b7d556dea177bde8 SHA512 1fcdcea259ed6cb652d08e763ccc67bee7bd5da9a7d3600dd492beaec7300868a47a7afdd71950ca8631886042428fce36cc17602a0776a9fa489f0fa2d27436
diff --git a/app-admin/augeas/augeas-1.11.0-r1.ebuild b/app-admin/augeas/augeas-1.11.0-r1.ebuild
index b6e51253bc38..e26f87ed1a8a 100644
--- a/app-admin/augeas/augeas-1.11.0-r1.ebuild
+++ b/app-admin/augeas/augeas-1.11.0-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=6
diff --git a/app-admin/augeas/augeas-1.11.0.ebuild b/app-admin/augeas/augeas-1.11.0.ebuild
index 7325e4f01bbc..85b57fb3114b 100644
--- a/app-admin/augeas/augeas-1.11.0.ebuild
+++ b/app-admin/augeas/augeas-1.11.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=6
diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
index f312a3fdc493..eaf730c4092d 100644
--- a/app-admin/cgmanager/Manifest
+++ b/app-admin/cgmanager/Manifest
@@ -2,6 +2,6 @@ AUX cgmanager.initd-r1 331 BLAKE2B 725b5044fa567e7f7146bd62cc63a0674873d6fcb022e
 AUX cgproxy.initd-r1 661 BLAKE2B f84189b5fe16b6327cd1a6a2cd1805f1bbd75791d0f6f75a601ea58fa51d5a490d655371355205c499a51628b4e9cdf21f98431adcb3000397508cdacef2928b SHA512 7f43ea6369428d71d122a191c6a1718987ed09eafe2217ae326606ddf2a50f0500d0de0520fe21e5d2edefb8ddd4c3a85623d2aac1212e821ea922cb8256fffc
 DIST cgmanager-0.41.tar.gz 461805 BLAKE2B 22c779953d637012694c19490da9d3707b9e2a935f910d192fd1e6a44c27e933e93b6ae516399991924175a9e8e05fd650cf3117d3e7bde034a20bc083ebaa09 SHA512 e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd
 DIST cgmanager-0.42.tar.gz 467980 BLAKE2B 70df5ebda230773f3a2a4ed6f784e591126769122533182821b0fe2c157f9bd7b9fd58a3bb104b0ef089320b167d3136c379d760ea6c65dab0c88f46d41596cb SHA512 d92113a6748084f1c0708f75c8bdf5de484d534bf00f664a5288902be887c2a1c7cf3d91afaab3331f0d573a86fbc6edb2fa1d37c070250cf53e0621213d7d74
-EBUILD cgmanager-0.41.ebuild 1236 BLAKE2B 37152e96e6949db5194d0b8eaea0ac1f67827fe596f69fb395556635e5c9e0466d2c17dced0429cc48b6508cb3423b63b4c616a87018ccc60a3c45b605276c6c SHA512 0a724b3a2bbe21489c1d02e1cbb526e78f1dc09d1eaac034cdbb968e80e615b7a92243e5c2a01e065652e0ac4accde499e2b948b71eb4035da6c69d22f48c6a6
+EBUILD cgmanager-0.41.ebuild 1236 BLAKE2B dfc3201caa1cd5d98f6d2281faf03884d05ea2bde88e91eed498ca62f8a008b31023f29356a5b9e6de0f0794601c1027b87223b441e4d928eacf6659140d414a SHA512 5ca36931d5476ae710dca68f4c0a5a7e0b4037b7c3860b6c0198d9eedf4b615f6d60c57c7d219934b45a07e1721502d63c246bc9b1b53f9198e0189d82c6c10c
 EBUILD cgmanager-0.42.ebuild 1246 BLAKE2B e19151bb91d70f7b3c37d0093a5865d634b8c3075782cd470a7d03c3ee7ec20e64dbe746bf1b9f1f53f2838bfabadf1e082162291cf2034c2b577b81dbb91363 SHA512 1815e5d14be783fddc7c3bed7b52c64e48334f39a2fe57a4ae8ade298493cccbd8a8aad25fec6a08a48c8578d07193c61b7585c64a35d91d39c79f6a8a264ff4
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/app-admin/cgmanager/cgmanager-0.41.ebuild b/app-admin/cgmanager/cgmanager-0.41.ebuild
index 0916f821531d..9f2cbede4729 100644
--- a/app-admin/cgmanager/cgmanager-0.41.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 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/conky/Manifest b/app-admin/conky/Manifest
index 104554eb8ead..e69cb2636d87 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,7 +3,7 @@ AUX conky-1.10.8-portmon.patch 551 BLAKE2B 6b69ebb6c8ec194e51d616f487ab8d7360626
 AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
 DIST conky-1.11.5.tar.gz 2400965 BLAKE2B 06b6817ed3cb4bb638b5fa7f9a5f8544c9d274560dbef2bc8f8c10ed681b83d0ab27988f60bed70cd0c13cd4947a2bd9b70ad66c38dbb6f516f5d57165ef5765 SHA512 71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be
-EBUILD conky-1.10.8-r4.ebuild 4722 BLAKE2B 4b9ec70e27a0f36dadbe13de65abecb55ff710b5ddb1db765f6d32a5365baa795ef8a726077ea70865c0ffd12a94daf235c2f990ed0c4920395b1d6313e727a6 SHA512 2ce8f23fd1b736ff1fb797ba6b71271bba12bb60dc71886d227e9f77bb7d17190581205338477cee8d15210cecc18101360df1f52d3fc69bc8ef5d737d3abe60
+EBUILD conky-1.10.8-r4.ebuild 4722 BLAKE2B 72aecb9bbc2ee9d198af609f1354b92380f809d72c12eddb09b5b2dedb51e15429cf7726720b3690263e31c28e63c303d1a85272ca554208d8594e55dda2ed24 SHA512 d6b28af2625d7efe7ad418eada32ba55e034c49c2a780c8bb7edd75ec0eb1325778924104bb4a232196aea2dfc2332d3c3d47482bb600cad368f4d11d18931fa
 EBUILD conky-1.10.8-r8.ebuild 4772 BLAKE2B b8b7eb6a6dc3e381890663337613fa334d301bbf5192ad4d42b6f6fcdcd80971f6453f444f70e6da354cb745567a78f92d320de5deb87745e1e2b0ed9087d5f7 SHA512 c7771bf49e134d9a50c94df85f136814aa96507117812c99b05effa86d28be800479c04f5f6a4659f73ec03b374de7bae0ed1a12c216b3c5fcf7841153d1b023
 EBUILD conky-1.11.5.ebuild 4648 BLAKE2B d4f51731070dfdb03e7d1ba3772e60140c1c47cb4cdaf5d74e52bfecf6f4a5f00dfd1a9f98696a06f36c5c8053789e3b7f043939374e1b0c15a083cd054aae63 SHA512 05e8520a2545c16291024397600abb550e83407191001aaacfbcec499db585b0cff4f0728e87cd6ae3020211331001ef896a5ed7bdd31042d0bc984c8083a9de
 MISC metadata.xml 2469 BLAKE2B 15947c03593a9d5215a9c1dd142458aeb84f61c77a669bbfa4abe256c94e28650516a0226350323f56bbc225c5edc5e9b9e3310d7957e072b6701e77e40623ce SHA512 75e2d5bd8f4848779c03fd983d995d8216f4bc35ca1d3af47cf004d1d43e36c2924523d286e13ea82c720a51a63d91e03af795e6c31471af71716b4c5ce46c4e
diff --git a/app-admin/conky/conky-1.10.8-r4.ebuild b/app-admin/conky/conky-1.10.8-r4.ebuild
index 311947a422b2..6d33ed544ac9 100644
--- a/app-admin/conky/conky-1.10.8-r4.ebuild
+++ b/app-admin/conky/conky-1.10.8-r4.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/conserver/Manifest b/app-admin/conserver/Manifest
index fcd223e1e97f..1b93ab23e4bb 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -5,6 +5,6 @@ AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
 DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
 DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091 SHA512 c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
-EBUILD conserver-8.2.3.ebuild 2331 BLAKE2B d31563932f05dace64548db512917afd078acd05fb5bb38e34a22f23829813755e0442472826049d6e352878c3f3a7a089418cb0419c6780e494b7b2c6863ae2 SHA512 47382d9c8be7e45d03fa74970d91cb3bc2c926eefce1ebcf9f756d3f04e3cb9d0fc9f1cc9d3675abb737b6084774e5f56aa7496de984dbb8116bfa83e61b1ef7
+EBUILD conserver-8.2.3.ebuild 2331 BLAKE2B 10d5d7519c2b4ce5aaa704ff194fcbff874f129a415d779b0388f4ef1025ec0b12efcfb2d4a0f31ebc72168383a0604dcae35aed25407e7cbbbe7592ca81fa2a SHA512 b40a8bd88aa1ad8db754263640e87faf1f4d7b71afa474846675fb67b2e0761db06ca88d61444c6bdd82199c6f62fa986949ef675b062789f485f08e60b13875
 EBUILD conserver-8.2.4.ebuild 2339 BLAKE2B 36da2173617d2c970a95a8417992dcbfacb4d139c2674a94a75e00292aae7025dabab5a0249fd83867cf5c5ffd1d8dc643fd0f8d650562f7e44ebca408b02d3c SHA512 a9b2ee02b808c42887f5655efa16ddb70d986c528f8a4017a1f833aa0eed5e024a0289fe0ad018d9f09682aca2547749c7fb8571deed41faf4ad072e787b14b4
 MISC metadata.xml 1378 BLAKE2B 942f6b9d8fd616f089d0651fbdfc41de96033acf65f127cbfded2fb9c390fd9b86c037a62679ea27b18e4e618bf764d09277350e9fdbaadc914c18a6961618e2 SHA512 6b3e06cfa1013f71eb42c9c073df8c97d2b8fa6b935b637ba29096db88d75bab1bb192695ed4a5dad63d88341a366327f419cb357777c0abb09799c8bcc40970
diff --git a/app-admin/conserver/conserver-8.2.3.ebuild b/app-admin/conserver/conserver-8.2.3.ebuild
index 8e92f270cfce..56b6f4a01055 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.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/consul/Manifest b/app-admin/consul/Manifest
index 86eeada4e286..b3ad9b0076c4 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -7,6 +7,8 @@ AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
 DIST consul-1.6.2.tar.gz 22041280 BLAKE2B 0b2edcd68fa166c178587a1ed3ca0445847d34510cd4e341f85a370257958a155ef6f976b045fc8e87af39107a3930ccb6d7a798ad142e87362f82d68ece4c3c SHA512 2df67854b85fa27600bf2cd57c913669f784019ee5a25b20a950ab00a403ca0562d74cb73c3402ebcec6cd951d7b9b4eb80c926746bcc27050db85f31192f826
 DIST consul-1.6.3.tar.gz 22065994 BLAKE2B 4d37a8141c097182c66a8ba7ab8f7031125e71b7a1b7dc8c419630504896634d797f4d733ddeb71555a2a988a2418548f40a12f333202833527483cbc8a590f6 SHA512 16a3fb3584d273ca178b213c9f314577d9473c39a5e436108bcae42f8b68803a548a5cc62d0c8426aa82e2b86dd6355f3d86f833ee6ec6fe1a4955589daf039f
+DIST consul-1.7.0.tar.gz 22791558 BLAKE2B 005c6c74d7808183b362286f98a2f5cc301c9aabb9afc4db1cd5f160ac0a0bdf9b868ad96b28bd3f1503e6fc2951720c69b5f9e4f888d0c4fb5f9fa534c322af SHA512 ea368335b34498ea92d80240d71424deceb903eab6fb7a22fca2bf6e7a509526c86899b501ac8045ad69b0fa102be6db0a11fa50917fc15ca17f889f948af4e6
 EBUILD consul-1.6.2.ebuild 1830 BLAKE2B 22f8170ae1aaa139dae769623f382632f1a3b29571691ee7b15d82235a75a5c133d930afcc780bda766a91b93859072a108ea97b9da9a5e469d2a7a0c8f80c99 SHA512 7fa573a22d42f9cac2b8696a3b9fc9e84e59a3e6f489cf6fab7a04b043f1d4702a4bddc52ac9f81c86b24d4df9ca0a5086e4586f9d45a5c65d0c31c9f9d064cc
 EBUILD consul-1.6.3.ebuild 1830 BLAKE2B f6eb505ce206244c39899f14fb1ed24cb791b2290926c97e9069ce60b041dabfb8db72f3a4851dad13db85a4a64782142ad7a365c8061a0803a94d75b1deb812 SHA512 b9b94a1536e035db877670c9568164617be1ce16d7938f0b681bd3c9a1cd3d2bcfaea715265745cb7a44cfb0cd82264d7608e3b34e0f80ad2d7d8828b5989c55
+EBUILD consul-1.7.0.ebuild 1851 BLAKE2B 215c58c1a48b3ad9f0896099cc8b6880a9b0834190185fa2dfc3a2f8e92b387c3a47ccbfa5bb87cec92095c8041b4f985b3c9cb746e45f566649af9cda711bcd SHA512 3f5f64f4a77bb2ac3a4094175543293542ae100d14e11bf07d9d9be049f0cdf01a7dd51c643bf4f664e4c8d0172dd5991d6a286e7f6873f7253808eec05720ea
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.7.0.ebuild b/app-admin/consul/consul-1.7.0.ebuild
new file mode 100644
index 000000000000..b721d4f0ca37
--- /dev/null
+++ b/app-admin/consul/consul-1.7.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="95fb95b"
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+	>=dev-lang/go-1.11:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+	default
+
+	# avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
+	grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \
+		xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die
+
+	sed -e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-e '/^GIT.*?=/d' \
+		-i "src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GOPATH="${S}" \
+	GOBIN="${S}/bin" \
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake -C "src/${EGO_PN}" dev-build
+}
+
+src_install() {
+	local x
+
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/denyhosts/Manifest b/app-admin/denyhosts/Manifest
index 03074932c31f..a1a2534792e5 100644
--- a/app-admin/denyhosts/Manifest
+++ b/app-admin/denyhosts/Manifest
@@ -5,7 +5,7 @@ AUX denyhosts.logrotate-r2 272 BLAKE2B 9dd9bad7fd6d1b3fac06a331d2b2246697b70ebf7
 AUX denyhosts.service 265 BLAKE2B 4ecccdf6f605936ffb7339c2ec2510f14b0817cf3ed3cf51b540456216b3877e561044973f1eda4a743f717bc4e0f36e9f8492b3fd2b365a243f5f7449ea575c SHA512 601b10e999dd2e16cec57035d025a883df77df272c6a72b4d39f2c118d983f308984aa9edd296f334e0e5062e8ca5ea21ba25ef58b606c9c7e4c09ed7b3ad4be
 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 1861 BLAKE2B 6dc3812d477596a5d6e80fc7c69cfa96548cb479e99f118f1d9ac64801f5bdbf2f0cded7f16482bb1159867a02868442343a0487603efbdd9a07861807768543 SHA512 8c3efddca1ab261fdb05e9b9ccbd8b30eb3108d51f11fa1586f1152f5b54cc32f45a89dd838f824329759a8ba582012ce8d50b34277744a4d7c3794a58e324d6
+EBUILD denyhosts-2.9.ebuild 1858 BLAKE2B cb836ef7bc0d26d96f873d13c3adcd2c6b7f7a86b464ea41bc20ac4165dabc64554fe95e3404c80be89286da66448375450771cfce0415f3ddee873201e411e6 SHA512 bc389dd61b4b0e305284473160bcc16e4f0e4885d83438652280912375a058d3b2e33d1aab65b6a70767bdebe61ff8c6adcab1de8717e89c271fccc72a1d69cf
 EBUILD denyhosts-3.0-r1.ebuild 1772 BLAKE2B 6ff2b05f82fa8994b97b6971113c9b71b009499cc52ab8eb0a3b035cd84ca662a36d4efce59b25462ad25176e1d0a4295a9041af3ee6f84fb8c02cbd87509985 SHA512 604dd60801f9eb800fcba6062fa28ed8086152e30a12426fb4884179d7c06bb486182b6df86f66deaa603281b1ac10961c0e6cf25067d5dd5c2cfee29ac3b3f5
 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-2.9.ebuild b/app-admin/denyhosts/denyhosts-2.9.ebuild
index df9a0981ce24..7711a19aa6d9 100644
--- a/app-admin/denyhosts/denyhosts-2.9.ebuild
+++ b/app-admin/denyhosts/denyhosts-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/app-admin/docker-bench/Manifest b/app-admin/docker-bench/Manifest
index 90707fc82bac..e641e666fced 100644
--- a/app-admin/docker-bench/Manifest
+++ b/app-admin/docker-bench/Manifest
@@ -20,6 +20,6 @@ DIST github.com-spf13-cobra-v0.0.5.tar.gz 111126 BLAKE2B 0f5fe38e3e278603fcc53ed
 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
-EBUILD docker-bench-0.2.2.ebuild 1417 BLAKE2B f181d125194256d758807778f76225452a06ff669f63bf9ebdfb871167419d498f6558e61106b6e73f91b078be132339c372f70be47890db5decfe88ce43e025 SHA512 bf36aa44e90cbe163801d0ace6018704b2fe275ca8ecde701124fce89c4365b3232aa279f78a9c8f7205e08e5d51da22a68e926076c242c24c0b8e344ed39ba7
+EBUILD docker-bench-0.2.2.ebuild 1417 BLAKE2B 467f9509ec683c8bc337a47ede8839e32d0e25ebec8162d746c900d3bb8ac43ad5153dfe86aa7e2ff4d2779281fcd7e666c551ee891724fc17f5e3f6e3be1c5a SHA512 e16fdada2e5d0c4febfb73b48a166f5f2c3677f2c354a17cca553457c91909dd587130f536d01a784686f16bd770678467c13273c5cc0ce99b06f2e91cad10f3
 EBUILD docker-bench-0_p20190822.ebuild 1709 BLAKE2B 9d1a05a4c1682a44b8894f229a13511948ba70f56d96ab0509858eebcfa2066500f19010e149a61d6bb3cb0d2cf3f980bd9688370d3510ada15733e061b8efdf SHA512 3ac38ceb8a515ade30c34aa293b9f2d1b00e104158555ece001acdc5ef0702507bb423b99c51ac93fb3dbe5cc7e70550bd8c643e6004cc229db82b78f8562b48
 MISC metadata.xml 338 BLAKE2B 9effd9d636357f6172d82d54167f07ec69a38dfd77e5d03d9aaf6fef6c1c0d2759897e3611fd8fe84be6b6295c54f7d2b497b12c4adf135f47dcc54c7a97e3c3 SHA512 3326aa9dda4d1b907feaaf10c964db5bb6963c5dbc09dfa07339b7ac8cf4a3140ba03351cecb73a4d367587df03ea2e9d0cd6d7e8ee9fd478f2c2a2c16e93e5b
diff --git a/app-admin/docker-bench/docker-bench-0.2.2.ebuild b/app-admin/docker-bench/docker-bench-0.2.2.ebuild
index 48beec7a9114..1629c99f6a9d 100644
--- a/app-admin/docker-bench/docker-bench-0.2.2.ebuild
+++ b/app-admin/docker-bench/docker-bench-0.2.2.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/eselect/Manifest b/app-admin/eselect/Manifest
index 149e14ebfc59..30872eecaab5 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -2,9 +2,9 @@ DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
 DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
 DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
-EBUILD eselect-1.4.12.ebuild 1602 BLAKE2B 0f74782cf50d0c01f6f1bff53984c53bc97d5f75440f3f08f711c8061f17ea826ba9aad98f2600997e7f126bc975a2fe6f09b52a7c6c89f3f06fd1901e83e3e8 SHA512 c7eb1dc20f6e8a3f45b700c0dafd3cd98c477ef47b82976634df3c62fa4794fcf5c426afde7571df9a91e9b2b9c7f2a2cbb989a02dbc02c2200a7a978cf50074
-EBUILD eselect-1.4.14.ebuild 1606 BLAKE2B 3a8a9ddd37dff695a338ea48251b843602a813d562c8cc06cc973306c3275f770e91967a3abe6fb9cb9be19034ca5c9698b354f801a8deeef3a2acd76bbb98d2 SHA512 124efaffb5bbe455928ca4426e0f91614f54c3e7cc3e29b8162ea07d2ffee45b7892fbaa040eaf41a24fbf87a2ec1af2fc49c79bcea49a6c174100f3868499bf
-EBUILD eselect-1.4.15.ebuild 1608 BLAKE2B 69bfd98a429d010be7ed998ff701c630f99b5173084a8da8207c541a0bca60dea41b3f19696fba14f4ca7b2b12bf616eae2aed6f3d4ae716c00938ddab725e0b SHA512 baa882e4376fb4f5b04614ed4f98d73c05f7e75b775b6f10033f991543a3f1a4d53b0febff7496e2a3126e47f37636e372cd5e881b764b5b4d3ec54282a5a481
+EBUILD eselect-1.4.12.ebuild 1599 BLAKE2B 31e91a44e231f346dff90042cf50c3f47890fbaf0ffce15320f62fc2395389fb960bdb5419709bf702246ea9116fcfd95ba36db38444c774a0edf6e94df8cdb7 SHA512 bbf44ded4575eab718a91343d7fc0a8a149fbba9d4ef82910146958fc61ab45c45c29c3b0f14ac3dd7616209d5402c1684eea5b45f28f2c7ed5d45df4a321b54
+EBUILD eselect-1.4.14.ebuild 1606 BLAKE2B d40f8b8e566e942c8b6ab7783d6122d1b58ec04ad5c80b66102d8f929a8f0c18af2a08a6b85b8aba3add81ac84fc024a138c64226f87b7d970a1ddd7f80de83e SHA512 062fa139ddab287ce953e1ae0c1f77cc7b7a10e9082c221ba83c2b8a55ebc1b03546cfc3a440a0a8f196e4ac1a569d9c18d592350580cf933fa0a0eeda2421bf
+EBUILD eselect-1.4.15.ebuild 1608 BLAKE2B 411a59f420cfd756a881e653cf16c888985ddb6f604d805c827cd85b1ed761714e607df6ed0211b4ed9b143b1b81eea8a47d4389af8f3fa0a8f612f054c33fd4 SHA512 af60a9df0a523ad8baee0d00becf4929408e96874d6116cb20e10e911eb209c3bca6dd458b9497db4f610d6cdaa7865fe5f6e158bcbc865fd8142168110ff544
 EBUILD eselect-1.4.16.ebuild 1618 BLAKE2B 9c401a61aea5b45a7dff6897e39ab31ee33809ce6da77cbfd29f21fae61d3ea28fb0107a844897abf1a1c2a0912f8fe3659d622a1ac6e5829bd6ad6bc83efea8 SHA512 44fdb185726eb0f86555ef8b9d8a0556b3bdeb31705f6d97be0f1c7c8fb1902597b566944b57b520ccab777a1bed7d6ad71b8290e17483139bf50515ba6362e1
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.12.ebuild b/app-admin/eselect/eselect-1.4.12.ebuild
index 867f1f88e577..2f14bca03647 100644
--- a/app-admin/eselect/eselect-1.4.12.ebuild
+++ b/app-admin/eselect/eselect-1.4.12.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=5
diff --git a/app-admin/eselect/eselect-1.4.14.ebuild b/app-admin/eselect/eselect-1.4.14.ebuild
index eee6bb4d1a27..6967514601a0 100644
--- a/app-admin/eselect/eselect-1.4.14.ebuild
+++ b/app-admin/eselect/eselect-1.4.14.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/eselect/eselect-1.4.15.ebuild b/app-admin/eselect/eselect-1.4.15.ebuild
index e59b9695e4fc..baa32886ec53 100644
--- a/app-admin/eselect/eselect-1.4.15.ebuild
+++ b/app-admin/eselect/eselect-1.4.15.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/fam/Manifest b/app-admin/fam/Manifest
index cd60c6fcdab9..409e9ff096e3 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -6,6 +6,6 @@ AUX famd 393 BLAKE2B 5e6fd2f1e7eb9c48fcae90da144a1b6953e2469d0e4f3c7124e5f71440a
 DIST fam-2.7.0.tar.gz 301974 BLAKE2B 9a915e61b2898717cac1b7bbe9b2049aee0701314710906c5c8323aafe0847a9f017d09c4d9345e1fba386ac3c1001ec013325f9841d716e8c91e35bcf1e3962 SHA512 62b6222ee925eb2af1e258097c9bb676191690f38f8504ae16b1883a1019e0ac6dc7116ac2c4c596a956b3b3cfc3ce3ee7b613c319654681afb13e3ad3f284e2
 DIST fam_2.7.0-17.2.diff.gz 28826 BLAKE2B 880f8614304b048a24be03231ec26a02901befd75c8c5d51abf07d5afb42f370f4d3702d0db790f2f651f040372791024d9cbfbea15a1932629fb13a7b6a5ec8 SHA512 295c954fcecb7357a72ecf3c7469bb37c29e8969fc7be3a0e92e40e79911c9578f44c42a0a6f900610c8a9886f1addc62e50f258105aaadb61c718f526608697
 DIST fam_2.7.0-17.diff.gz 28056 BLAKE2B 4db010fdf7a2548f5651e9da876df63d3bd0d1a5f184b26df99f7d4204bbcbadf4c7672d248d9d1af2e7297b0ec17a5ec80e6b57016774877465a957ae3c6ae8 SHA512 76b14e1d17713eb86d52cb804d34012e5369b5f4e8bcbdc73a063d2ad9219e0c4a261cef9e144ee07744a953a2e893bdf2ceeefcf21edc7a2ac5e70a51a8e209
-EBUILD fam-2.7.0-r7.ebuild 1447 BLAKE2B 30d53cb888654dc03830ea4afe34a205d01cfacd773f6f5269bc9b01efd3543b49af6a3eb224d3c258f02903d61eaad3c2e6c92de580f18a3afdfb66460cc0a6 SHA512 bccebae3e04c383f88f78619598b4979440d12f9b57e2279c16ff6d8b0a38428477ee217959ab306d9664978ed0df06f9cd0ef1b8b3543f708d9f119ec74609c
-EBUILD fam-2.7.0_p17_p2.ebuild 1758 BLAKE2B 54dd734abdbbd605d0011a2bf201abf6abec10e0d49a403f8f45aa6b51ed9a6d373e8680193e8256d5efa0aa815a1de131abf3983cf0872f0a99a383eb4f9941 SHA512 d9870d7170bb53c53a3858591aa8e0f3a7ae8f14334afd37303b93c86f5bbaa2831ec6b99a4a45849a101654a8adf284f128f26a8665ed47896b57edc88caa7e
+EBUILD fam-2.7.0-r7.ebuild 1452 BLAKE2B 01235b2ad914f8607f0aaeefd50dd7ce86d6b38736e2d602796199b7a68037988b823a571c5bac3335c1ec270d67859678a10a875eeae1b42229b71ddb04c584 SHA512 b7ce63de3f14b7c051633e4e4b5a163ffe14d721b5b1d2f3d3a849ffd4cfb1d24d22c2c3a768bfb1421b4dfe5268d7be822ba4d9be7f98ba1547cf13e55f84d0
+EBUILD fam-2.7.0_p17_p2.ebuild 1771 BLAKE2B ae10d70f4292fb401b3600cdcbd68d264c78bbe103abae417cd7103730a2faf4801b0ff67710ee1f22a47fb9341ab939729ad7ed5265cd1f37e31c9bd9659d99 SHA512 04ec5bf04b00962ec5a902b34a116a6a250b0f48c650748b1164be9c9c0779fbd9c913adbc7e1c604ce3de2a3e7032585ec35152275c20fd0a0b624aee968415
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/app-admin/fam/fam-2.7.0-r7.ebuild b/app-admin/fam/fam-2.7.0-r7.ebuild
index 8bad974905fb..5abda88a4a1c 100644
--- a/app-admin/fam/fam-2.7.0-r7.ebuild
+++ b/app-admin/fam/fam-2.7.0-r7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils autotools multilib-minimal
+inherit eutils autotools ltprune multilib-minimal
 
 DEBIAN_PATCH="17"
 DESCRIPTION="FAM, the File Alteration Monitor"
diff --git a/app-admin/fam/fam-2.7.0_p17_p2.ebuild b/app-admin/fam/fam-2.7.0_p17_p2.ebuild
index 120f4b03edd8..b6eb27e65c10 100644
--- a/app-admin/fam/fam-2.7.0_p17_p2.ebuild
+++ b/app-admin/fam/fam-2.7.0_p17_p2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils flag-o-matic ltprune multilib-minimal
+inherit autotools eutils flag-o-matic ltprune multilib-minimal toolchain-funcs
 
 FAM_PV="${PV/_p*/}"
 DEBIAN_PATCH="${PV#*_p}"
diff --git a/app-admin/gam-server/Manifest b/app-admin/gam-server/Manifest
index aee14944988b..2e6b326d3106 100644
--- a/app-admin/gam-server/Manifest
+++ b/app-admin/gam-server/Manifest
@@ -6,5 +6,5 @@ AUX gam-server-0.1.10-noinst-lib.patch 2207 BLAKE2B 28ebca731a16fb10c0f186c3eb75
 DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST pkg-config-0.26.tar.gz 396399 BLAKE2B 5a88cf825d6ad99d198418798b28c779cfd4c0bcfaa023e915a818c141a504c49a6281ea0b2d04a7a9ec89f9924c87f8b1ddaa5a088952715397081383b3528a SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
-EBUILD gam-server-0.1.10-r2.ebuild 2623 BLAKE2B a65e91252fb0a095f53e05cb90e0a5a0de6ef3639f3e2adccf07a3a84b5b5692474f279303960c73e2b8182feab55884b43f6025697f7113d2498bb9b1db309b SHA512 acebac6906d9cbad793eef70b8d0cb7e3925926e12e6ef51be0000ced00321d1e893d081e17d7222173cef3b29ca0b15b6e8b5384ebf21550dcbde04e2caf04f
+EBUILD gam-server-0.1.10-r2.ebuild 2620 BLAKE2B 1c56b36b084befbf77fb82ec1f422ce9148fe10a2b62329231237240c916b4c1a932b94c2a648edd48560246cfb276d60c05286a70a1e2a6f0ca54094b81e905 SHA512 7fae01938e688abaf9425fd20318d7b2e63a0d12d84cbaa8222b658eafc51bb9f0aae5590697fad430bdc7e5f545aa2d368dd72cf456a045ac961662090feb8b
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
index 8d3f60336825..ead4d98b153e 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.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="5"
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index f8c7f7bfee3f..c3fe4aa0341f 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -1,2 +1,2 @@
-EBUILD gamin-0.1.10-r1.ebuild 593 BLAKE2B ef8e756939a069fe8ee62b52afba01fd4722534ab3e222d50b797b66f8bff77447358b80f9d87d366423582d9f0827a87f0efe4fceb29216885e27f3d4530357 SHA512 031d4c2237c98c24414b1c76547fedf4cb6cc96a008476674bde35aadc4fdc274bbddf66b2a21e7d1ce06568f05b748cc3a8b0153945092a65f39eb3a2db5a37
+EBUILD gamin-0.1.10-r1.ebuild 590 BLAKE2B 3c63f3cd48c173d092e90d2a0333a1740fbaf59c90d334aafcef25a1201dccdf3d32fc7dad25aa65b176d363e596cbe0010969939cbb504d21354aa6518bc5d9 SHA512 f30d18c10f27172d7c27decfd3505cf40829c9bac1adb74427472f7572bc3bdbaeb3f2cbe4fe635c706daa7b415946bd62ee7162d33a28f9d035e5fbaf81f1f1
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/app-admin/gamin/gamin-0.1.10-r1.ebuild b/app-admin/gamin/gamin-0.1.10-r1.ebuild
index ba39af5d6e81..0313695cbc31 100644
--- a/app-admin/gamin/gamin-0.1.10-r1.ebuild
+++ b/app-admin/gamin/gamin-0.1.10-r1.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=5
diff --git a/app-admin/gentoo-rsync-mirror/Manifest b/app-admin/gentoo-rsync-mirror/Manifest
index 7987c22d01dd..5a6f95d227ce 100644
--- a/app-admin/gentoo-rsync-mirror/Manifest
+++ b/app-admin/gentoo-rsync-mirror/Manifest
@@ -3,5 +3,5 @@ AUX rsync-gentoo-portage.sh 332 BLAKE2B 1f060ffdb7b7a1116875804053e80896d36dad31
 AUX rsyncd.conf 611 BLAKE2B 2842f2fe86d3d84e6385d979337a523db12fa8f39316652d2cc0151431e033d7832d5299ec49e0fedd4d55e9faf67014ca32cf020f13adda5143b340f5f8988b SHA512 11af716d1741d482f11ec9a9a2d5edbf4c3c0bacd7ed357588f2a8398d313d47de880ae5c38f40ce940259cb741cd7695eab42249ca10e05c3f2654581ffc791
 AUX rsyncd.motd 44 BLAKE2B 764e92b05ece7c7c114106e3cb634cce9383b96b7e076b2cc95217aba5eff6a849e32da1acd2d1cb34316b81701ecf4c7b09bc304e43eff992014128048170bf SHA512 812c0e738274222e65e5bc57379ebc6150c232cd8bf98e72b500763828bfcfa45fb8e89c7cccd5e34685f4e5d4787d9cd2ab03ace64bc76f5c5416deb03c17f3
 AUX rsynclogparse-extended.pl 3476 BLAKE2B 230fc0a15cb5341f3bbf1455b86e5bd0a92bd12eaf5d8ece373bfcac0d1b45b310b0a3194d2200676b351e5b5931be51319801b1e5df87cb7d41c799447dca8a SHA512 60656deb0e501c51c4a37d2f9cce2829faea830ae42d1f33db52f37b337b71a125b7d350e893fb6098b405e1439cbde160d9e7ecda3ebd8a8f8c34b84acf80b3
-EBUILD gentoo-rsync-mirror-1.0-r5.ebuild 1981 BLAKE2B 2d1d4990daf5eaefc2ff807d80733f1782667e527234d95871b6178e8045b26c19340fb7b16d37a10cd2946793b2fe2c09ef25d96f9ae8ba8e1dad240eea3504 SHA512 fb6f15aef0b24ed4fa5f93ec0fcfa5e7b678cc4ab57533d0e325f52c17c3a415d649c7ecbb4de58466ddf4decd8f032fe1df30e4f8ec79e54eb584e1e8a97273
+EBUILD gentoo-rsync-mirror-1.0-r5.ebuild 1978 BLAKE2B ecea9be8d187fafe4ef4b82f4d04840c094ba6ae5871afd568dc729dee512657f16d24bab1f19431cbe74a45bb1e9c1efccedcf9c8aa9dced8755cee73254d67 SHA512 f2585fa372d66066d63255cb48bb2d8702c65acb376042c349cba5a064b14aae4dc963c04bed3777525593554b4a86cbbc5a56b9b8fcda6373130983d9722d7e
 MISC metadata.xml 365 BLAKE2B e228fe06455e1d2619852d44b50a114e425c0cd1027877b01a4920186d50a6ee1ca39742f75d33cc3ea6fc7bc45744c9c0667582881534793090c974cfa8be72 SHA512 7fce97c62f40d7472b6fedb12be020aa53037a4049885c1ec6c2735b419b3f40462a848360fb33db65aedf2b829d491f2fa521b82ac158b1d15cec115b524115
diff --git a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
index b6c1eac533db..73a8b13cccfd 100644
--- a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
+++ b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index d99ffd86a4f1..feaae7587518 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -2,8 +2,8 @@ DIST haskell-updater-1.2.10.tar.gz 26586 BLAKE2B adc46f85118fa55e530aa079ef2df06
 DIST haskell-updater-1.2.12.tar.gz 26708 BLAKE2B d0b040cb3b6211b3c5c60f8cfa3dbccbf9cb15d246b21609a21aac746a8a034e284fe0b99891b5035980252a7aa8b376ad943f32882dc29e16226d95583cb053 SHA512 f3a993cb556919bf2e57fdaca7eea9146abc59096e779cbffb69a5c29fc5f6ef889c8ccf4d8331dbd9279919ea91bb05a16d83ad70085d5ef5a44d61120fe7e7
 DIST haskell-updater-1.2.9.tar.gz 26675 BLAKE2B a3d11cdcee886a07d87cd2888a9deea1d963b7234b4a10a6b78e9467fae4e9382c92f14a6ba0593f86bf9422ab2cb4bec823de96f34b463590ae18429c118edb SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da
 DIST haskell-updater-1.3.1.tar.gz 26573 BLAKE2B 68e5357e8f24b9b372dba4feac76595cbf35602d9d9094d616497c9d0040177b5f1def5833770041b693220717f3a4976877e0608858d5d8d4dddd26620c71e5 SHA512 39c36c4a8997806bb4d64625bc9ed72334a68e57f8c32f75d0c3704ab52b3b68605444c89480e5186c04bb275b3608ea9544366ebc5a00e010cc5fb4ae8296df
-EBUILD haskell-updater-1.2.10.ebuild 1053 BLAKE2B bc73a4ce7317c4d74e00ea5b3ce171c97e3ab8e7fff04013a39b30ff00cf5034267a48cde6d6cd4e4b3a83678e9450a3f7b3272c16c6c5da97e60cbb096c5d3a SHA512 5844493f8ab452271f8d22cffcce039e7ce213fd4b9077bca04de11a836262fc4e495dbf420241a1c8f740c08ebfa52222b613b6d2650186beb7c1176f4cd89c
+EBUILD haskell-updater-1.2.10.ebuild 1053 BLAKE2B 11f2697a297d3fff46bf3a87443523459d3e7a535f7bb9c20c8fe0e8ff61d0683303994c3c80013257f966f5ed9a981c9662f640971e560383f15a90558c757c SHA512 f0d225df2d675e0079761e3f84fcd5faeb3173c272fd7bbfd008544e1330a06877d5f4ec6f92a79f6336b982827bd9af8386b2fcc560c131057153ff856701f4
 EBUILD haskell-updater-1.2.12-r1.ebuild 1069 BLAKE2B 1a084cb2da22931189ee06f12dec57a8a6bd1e6f9dbf9000d8b9ce902328bf232047ad42a10e34b2e1d9faf40c010ac03d1772f04475bf94801e5f6bb630bcc2 SHA512 76950c98b944e5f6dd4e99a27a59619c84dceb8385a1ff8d7a2275b5fc4a288b4c21da5482ef1adf36f2f0f9453c72c8319df613c45eb4f30a3b08d2731585e3
-EBUILD haskell-updater-1.2.9.ebuild 1053 BLAKE2B bc73a4ce7317c4d74e00ea5b3ce171c97e3ab8e7fff04013a39b30ff00cf5034267a48cde6d6cd4e4b3a83678e9450a3f7b3272c16c6c5da97e60cbb096c5d3a SHA512 5844493f8ab452271f8d22cffcce039e7ce213fd4b9077bca04de11a836262fc4e495dbf420241a1c8f740c08ebfa52222b613b6d2650186beb7c1176f4cd89c
-EBUILD haskell-updater-1.3.1.ebuild 1077 BLAKE2B 3adbe4ef2363dafddc7079275effd28069229716021d55e8c1b9b9569fff23f1e6605b66c164c23c6dd7ede304e98cda467151304b1ecae9a48f36483b7e68e1 SHA512 d3632026bc48f39498edc52d01217067c8965812fdbb976eef1d78f4cb5f7983022d4f16a297c18161d3ccaa5df2f4eb26c5a2c168edf64de910d346764e5332
+EBUILD haskell-updater-1.2.9.ebuild 1053 BLAKE2B 11f2697a297d3fff46bf3a87443523459d3e7a535f7bb9c20c8fe0e8ff61d0683303994c3c80013257f966f5ed9a981c9662f640971e560383f15a90558c757c SHA512 f0d225df2d675e0079761e3f84fcd5faeb3173c272fd7bbfd008544e1330a06877d5f4ec6f92a79f6336b982827bd9af8386b2fcc560c131057153ff856701f4
+EBUILD haskell-updater-1.3.1.ebuild 1077 BLAKE2B 2595fa995377357d24f267a24edcd3c0d4e7e4541bb8194ded23ab9d9db3788fe31dd37d98b39c6236150f7647446f27af8821ed8d5e045d0b5ba4429de1dde9 SHA512 627322567389bf2fb146bb8bca76e0152ecac093d0062323e0425e38ee633f80e40c573b6a32d5dfe4184d9afd7cc629ada62091c12a801cba3209acc54e1c49
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
index 9455d3308c75..31023312bd91 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.10.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=5
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
index 9455d3308c75..31023312bd91 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.9.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=5
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
index b5f7029657fe..a83fd4a73363 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.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=6
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 34f41be11b06..62a5565c8a7f 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -10,5 +10,5 @@ AUX update-hddtemp.db 819 BLAKE2B 2322abe8bc4c4f49a4c16267783d9d7ee46666e1e11b70
 DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd05007f4b4b8d74eb378ba810ea9aad96951b7a9b3b0f872130677fca1f294d86f855327dcfa5a263c9f3c7d58fbbba502e SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d
 DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
 DIST hddtemp_0.3-beta15-53.diff.gz 52845 BLAKE2B ae4ef1f98ff39a39bdb49b2752f6f442c6ebe8ea6b0e8e743cc3ab9ef39d07abe8970648b841b3974cd814fdef72bc59cfe93c4b4d1cf2a85de1a0d94c4409b9 SHA512 1006ffa92f9973eb1da6444f8e8eed681e641efd17a52954b0e6c5041ecae13108af4ed89534ec4f2799685f96191769d3b168dbbb96085dc801150c7c547511
-EBUILD hddtemp-0.3_beta15-r28.ebuild 2713 BLAKE2B feebde4c9f2e700d7627589c8d9505f2fbd061e1b78100463fc7521562efec4e370e3959c09b3ef6964fbbf7b012f224cbe1514749517cab5615f6621372ef90 SHA512 007a4f08d4c0be187813b39a67c41472722401a720b1fdcc4ceb3de116f1f0c455b252fd39b9f0586b16883183dc28ae92a505a0c1a8a184c0939ba3d233b0eb
+EBUILD hddtemp-0.3_beta15-r28.ebuild 2713 BLAKE2B 294a7918ad2cb91a36ef662ffa38064a218eace8d3f1836652e6edff399410914b9aec70e600e5c4dba7e384ede38b6d6bd579aa3216e8db757babe218dd8c54 SHA512 ae6605d1cbf432791c9637482b761dee2dbfe751b2955e5bdf0b35ee9cd37a0931fa764316fa84a4797a387bf3e9fb5815f0fb5aa4d5a8ac2ffbdd203a467e98
 MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild
index 157d9ba58753..363c40518d8a 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r28.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/helm/Manifest b/app-admin/helm/Manifest
index 8ade15826c3e..4151357baea9 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -238,8 +238,10 @@ DIST helm-2.16.1.tar.gz 1283836 BLAKE2B f0a2cfb05adea2b0a98341962753e777e9329b66
 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
+DIST helm-3.0.3.tar.gz 499874 BLAKE2B eda691d2b02fb5aaee7e09dd846c19650c3fc0e5d46e703a768b3db5a9966c8bb5548beb1699c5c8771e8e39f8fe35558e601a961d900cd6ebd2e813dec1e6b7 SHA512 9dc776f0638350ba09f7a1af383160a56b0badd3c353f57173ea2540625eb36afe2c0cc1a203b6bcef738d32e4d914028a9b0495d2b652a8cbee4317bca47f0b
 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
+EBUILD helm-3.0.2.ebuild 7057 BLAKE2B 35d906b9ff6ffabe35a88d069652c3efba27c4c3598713cb332cdd7b1835ebd47f50c5e6dbf0e62a13079ada2808e5aacce7167fb918d30ccbf0f6f8ac57627f SHA512 c05e5e8a9eee9a6a698af4c8fad82f5f664ec9a549001966f41f674451b4991c3bd3b1c11d0cd67dfb55152a072a1a4ef7e1251ba010e8a2a656b906557ad62b
+EBUILD helm-3.0.3.ebuild 7057 BLAKE2B f9ed7e57a6e35e1c102af2b905fd040c7493641b028ce03574b4dc2dca4917c2a40f9dffac3ed67f5742ffeee2690bc310ecb4a5e63203401c2a7efa588b5f26 SHA512 a5fc4965b25f830bdb078c3fd485f9fcfb96c9d6da79ee8c2e3cbe2b0fb764ffaba972c957bef80ea188e60b93e62033b96eac37f9f6743635ff0ad6cb186ed6
 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
index feee38c5f472..d94e9eb08d80 100644
--- a/app-admin/helm/helm-3.0.2.ebuild
+++ b/app-admin/helm/helm-3.0.2.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/helm/helm-3.0.3.ebuild b/app-admin/helm/helm-3.0.3.ebuild
new file mode 100644
index 000000000000..d1661c568d74
--- /dev/null
+++ b/app-admin/helm/helm-3.0.3.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2020 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=ac925eb7279f4a6955df663a0128044a8a6b7593
+
+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/killproc/Manifest b/app-admin/killproc/Manifest
index c08daf042df4..0c5879e30cf5 100644
--- a/app-admin/killproc/Manifest
+++ b/app-admin/killproc/Manifest
@@ -1,5 +1,5 @@
 AUX killproc-2.13-argz.patch 195 BLAKE2B c4d91eba1d2d2a5638384fff6d103babad55061b833ed980a0d36a7f7ebf52d5334a1e344b6b574a5e2191b9d8eec75e0dea6ab8a7226af6b4b3a27fda2d8922 SHA512 a6f4c0fc6b211af04f6e9137f52c4f911f989dffcb20d3c5069ea3716469ed23f08774f8dfe1aa2ce4f1ac2ef828b440fdcddfd8c77fe2891574145af0a02340
 AUX killproc-2.13-makefile.patch 1212 BLAKE2B 3a7d96e7e96b33b19493c68163119c01bbe104d9328c4aba5663d837d7b5c65b31a87178ccdc6a56c6d47b4b71bba03541e9ce07ed4e5734d3bd8484bcb71190 SHA512 c471361ca0fb4e4cb3d2e74c29115cf441b6129c2cbf54540ee7af40e818f1b6df169344c5f44ae8d9a1769aa0bf26bc00d5c6348546e9e37dff5e505b767e68
 DIST killproc-2.13.tar.gz 37953 BLAKE2B 57ee8eab39810a1cc9a0d7a4e53d4912e6288b7b4c41d05fd3b6a241e90dbb2b220792d7bd07691d11cc4ceb264d682ed3c59dda2eb751f777e9caec6c82fd6f SHA512 2ba8daa10d78c7e6df80f6fc5bff24807571bd8bcecf4674c1dac180da5c462b326c1fd45e31b4974937d47871b48c9e5b215a7b323e65d98fe0a66b171e9d2d
-EBUILD killproc-2.13-r1.ebuild 678 BLAKE2B 0882b9306b0826e762bdf5455f7148c545bf0c29bac5b8aeafb35072c82ae17154eef435810994394c442a226b451c89f30a1ce7603087841d74bf05719d6ecd SHA512 826a1d660be0b14ecc0457ec1137642b7b9a92e4c3033316ce8375f866e559b1eb063a560a5120811d197ab95297a0577ca07a0793182bd888043ca6fae1c513
+EBUILD killproc-2.13-r1.ebuild 675 BLAKE2B e6bb09b3dfd5805f963d2ee949eb0d320dfa0b6161ed5cd0ef5e5c76405804a855e1c6e42241f9e52e6f5b42bcb640191dadb0b4afbe836ad6e698139350d374 SHA512 85b2b84608f478ce8040cd5be9d76ba50968bbc6b57aa49a43eda903b0f6d9966c2627efd37b6359623306741e6722776fabfd445292123e2f6ddfe28619d364
 MISC metadata.xml 237 BLAKE2B 43fdb41b8b9fc4c7870059f296014f77cf77fe08cef7092da23a2a7a2e09c8cc2fb5476e73a0b9781f3b7b108a11aeb1fd88ba22bea203523aa3ea0f769412ee SHA512 ec2a39c9baa1516733bfbe39044a2fb2b9742b0ddb1b1eebab2ce7cd1027f92ef9c2c48a3e0f7362ea897160818f214542f82bdf8ba7b2a5034c0c5090f137e8
diff --git a/app-admin/killproc/killproc-2.13-r1.ebuild b/app-admin/killproc/killproc-2.13-r1.ebuild
index 50b99f7eaf05..611902115ebe 100644
--- a/app-admin/killproc/killproc-2.13-r1.ebuild
+++ b/app-admin/killproc/killproc-2.13-r1.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=5
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index 2cfbab683258..91144996a53d 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -63,5 +63,5 @@ DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1
 DIST kube-bench-0.2.2.tar.gz 262782 BLAKE2B f952bdb545fe220c34e6568c52b8450b66f251ec3b5d059ece92c4eec9d5505f1208366c2b7fbc351513e2bd51b93bb2ab05ddb6179cb0135c658c6f6da6b38c SHA512 7b3814a12b1c0299ebec58e8d41b8fceb61e395890d088fc942aacc72482b3458b874b7d67d5b41b57c378dfc3f7c695474461440bf767ac94dad935963a0962
 DIST kube-bench-0.2.3.tar.gz 264829 BLAKE2B 023c4ed3f4d38b8e571aae4f2f7fe25cd1768b0fc0441c1d0aea63359ebc671f19ce0c30663844c6eeb13464d18429a34b0021ceaacfb26389b6f47a1ac8e07b SHA512 df4681fc02a60947cfcee96f82b8962607432ca9a2d1ed430631a1311a107ade79fc17ce2e58ee6e75473473d22c5915825c3a65f3bf791e0c1dd01c0addea06
 EBUILD kube-bench-0.2.2.ebuild 3684 BLAKE2B aeca87cb41272d8edfe5004b5670e7a55d66a0741b961ee34b22208af63fb08bb68e84fb39ac963f2ab389eacf290b2bbc7d660ad248a598ebae5c051ef5cab5 SHA512 fef02a4817f6e8e937919e365d5dd75de2837187691cbc39a85bb8bd34c5563dfee7dde38e463fe043aad334ee7eb6613e737b52d8efc93af90e8faf6bc443bc
-EBUILD kube-bench-0.2.3.ebuild 3479 BLAKE2B b477c4063c623abb207aee5414b65a906d3b14fc8d57ea0c63a6c66b5eadecd4e84f25f6e3df06d75a92ae0df4dcc4b27ffbcbc3c925494a0e947765ebf0fd6c SHA512 85fa3ae54d5fb298a895735f83a48c2a9bc2a268f9e4132b59f2980c2353ca6baebefbcecad3a7360a6a28e1e326d1e8ee405992b984f4fc7612fb3de2ce609d
+EBUILD kube-bench-0.2.3.ebuild 3479 BLAKE2B 4638c0fe1a30bff450b4b21d64400333c6ab1c2e04f9766fe121675e4da71566c52f068f30fc13c3b86d5159f9520867144f0ac809ea0c31bfee7ee742d384de SHA512 2dc9039c8d93c8be86e17ae10a3d2b25aba8845f6a76197a8de9a85e61d7c33fe5b4a103fab1e486daf20638445dbcbdc921e0c66844d2f58e9723b665dc4c6e
 MISC metadata.xml 336 BLAKE2B 277f263a32b6d7452d2b675e4434e56f44d4d68d2b502bb59d6c54ee29dae0e02af8c17c157850f1792c0d0268701aef7c669f171b1a9b4d629b297593d4d3e3 SHA512 5b0fdd5ea1e4da321fb30b752fadf565cdede02a8a001259569ce28294cde66dabbd42c73a3abe682b3cd223ccd28a31a269432f05acf015e3215a03f693b155
diff --git a/app-admin/kube-bench/kube-bench-0.2.3.ebuild b/app-admin/kube-bench/kube-bench-0.2.3.ebuild
index e2bf247ebc4e..99c7a95a6918 100644
--- a/app-admin/kube-bench/kube-bench-0.2.3.ebuild
+++ b/app-admin/kube-bench/kube-bench-0.2.3.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/lastpass-binary-component/Manifest b/app-admin/lastpass-binary-component/Manifest
index 811d4d50b89e..0b7a6fd988c5 100644
--- a/app-admin/lastpass-binary-component/Manifest
+++ b/app-admin/lastpass-binary-component/Manifest
@@ -1,3 +1,3 @@
 DIST lastpass-binary-component-4.19.0.tar.bz2 1625255 BLAKE2B 714fb34708f9dda8dbacfce8e76adf004f1cc966d685c0efbaac7b25c45068bb5595e954e554092852d575f1fedc5f318d05b121bc2ce1aa4888e4bf374f7b96 SHA512 2535d72c5b545b364dd1e91503590cafa16d3de4f4745c4f1fa236135580e2af47094e364a7f0ebde5fcfd11282ab9329ef333866a985f02a873e092aabb9b22
-EBUILD lastpass-binary-component-4.19.0.ebuild 3650 BLAKE2B 3961eb1a2547df5b362e99421c7a6d38ddb9bd6ca1d6856810b1b6ddabf39dc2826fef22d657d1a58cefc91335dc5022be807f4a62603748ca442c0e35a95fe6 SHA512 60696a2938092e0b3702cf051b256223b8ee68d20bbaad24ef840f89936b2afe35aeadfafcc47733d0756ca48e9e350f74c5572ad4b5235b1b021d8f99831f33
+EBUILD lastpass-binary-component-4.19.0-r1.ebuild 3766 BLAKE2B 90037dc5e17cbe65a5e5ce69f4897cc387edc431f23b33ebedf5ff21a6ab364d59411e93dfffded7bd8a34ebe167732422bcd835440377f8a8e4d4a96f375343 SHA512 bf53793b9ff0855af319e0cf8609a077e17292bfa10f4f8ea1eeeeab8debcf777e7752e64de1fbae90ef8819c44a813b5cd23f70cd1ce7a2858966bda314e00d
 MISC metadata.xml 816 BLAKE2B ea7163f64706263e360241192a07e1e12eabc6fb196e5029cec931c53dacad20a9a4d851402f8942120328aa551159e2ba340257d50a5fcc36f7a72145e13a18 SHA512 71eb5c8aa836f75a5bfed79d7398e30628a274586a019d094a114d582ae2011d148cae325eb79b67e64035822cd18f154b9626142a7b2cc4c57f1e40f2f15b6b
diff --git a/app-admin/lastpass-binary-component/lastpass-binary-component-4.19.0.ebuild b/app-admin/lastpass-binary-component/lastpass-binary-component-4.19.0-r1.ebuild
index ac0969132cf4..0913632e723a 100644
--- a/app-admin/lastpass-binary-component/lastpass-binary-component-4.19.0.ebuild
+++ b/app-admin/lastpass-binary-component/lastpass-binary-component-4.19.0-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
@@ -96,10 +96,12 @@ src_install() {
 		]
 	}
 	EOF
-	# Install the app manifest for Firefox
+	# Install the app manifest for both firefox and firefox-bin
 	# https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Native_manifests#Manifest_location
 	insinto /usr/lib/mozilla/native-messaging-hosts/
 	doins "${T}"/com.lastpass.nplastpass.json
+	insinto /usr/lib64/mozilla/native-messaging-hosts/
+	doins "${T}"/com.lastpass.nplastpass.json
 }
 
 pkg_postinst() {
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 0fc43f1943e3..96b60d5d8d15 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,5 +1,5 @@
 DIST lib_users-0.13.tar.gz 25704 BLAKE2B 895f8b721216339fe4306158bf6282353d79584573091cc4e7c63c8096a9f9cfe380a8bce7229f168e44fe5d3641ceb8c91bd751316a6c6a467ace4ec0dce723 SHA512 588af7068728810832bcf4d1526f271e255d07c75d152fb41844c66f3598a71e9a96bee3426b31b58cd26af889bc42c0a7248731fdfe3623fd4567d2b6b7275e
 DIST lib_users-0.14.tar.gz 25746 BLAKE2B 4aa2dbbd7c53be13f79988a62c7997f0787ea9b773fc57681a021ff75ba9ff0988ac3032b21150c4e4958849a6195df09d388b6341e1ac139f34ce9555786233 SHA512 533c6e8f486e58d0fd22aea9a30adf91c3a8340a8a3719f6374ddfa8120d402c8202ab8ceb0e78aedd46e3e5875795392ed40497a66d51de5c2ca6a275a1a777
-EBUILD lib_users-0.13.ebuild 1138 BLAKE2B fe7f56159d8245231aee974c8397a34af18e3166b3a289d8563b3a3c6d3e871346380f7ce82fcbe6121a51e933a5316a15493136a457d947bdd4c9e628f4d4f1 SHA512 4cf7f342038017a8c6d303d4a8b3d582ff2703488ee8e1670f385b12ef040f80efc60c0094176b5f49fe734bbb92d854e34fd4582918e53354c60111cd6db1fa
+EBUILD lib_users-0.13.ebuild 1134 BLAKE2B 75e0d5b887a13b1607e780a27d02c71f9770fb5c521581f8fb1961a7ca031ed3f19e369a439ab2c08a0b02bd14119a1321b76093875a5b2d26512bbc2e8f4881 SHA512 4fff666e0faabf4d7b88f852a53460a83c8650b1ffd406a0583eaf2d94b02395652af337eae71e84d7afffae5a37cb91a97a198998581af7d7cca8f4001fd417
 EBUILD lib_users-0.14.ebuild 1084 BLAKE2B 408749ee3456ec0d57dd52ed1467c81858e67cee0c85bc56570659e7375d2890608485cd7ddfd9b00b043ac45e4e39a2366c46a8447e84447e0646e6a32b54a9 SHA512 7957c4b6155fbc8f788dad4f51b45c3729e3be87a0a4d331c6a3456c2cfd2be568806ad21ab3eded95176b8e70b321333f25ec06719f9570857c17f581e11f0a
 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 e941182fbb26..ec7c71596f2f 100644
--- a/app-admin/lib_users/lib_users-0.13.ebuild
+++ b/app-admin/lib_users/lib_users-0.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit python-r1
 
diff --git a/app-admin/makepasswd/Manifest b/app-admin/makepasswd/Manifest
index 7690e2812453..7ba18e1bb005 100644
--- a/app-admin/makepasswd/Manifest
+++ b/app-admin/makepasswd/Manifest
@@ -1,3 +1,3 @@
 DIST makepasswd_1.10.orig.tar.gz 12382 BLAKE2B f38e181da077650af760123e86cdbc2f39259db82d06198280ac37f5391a7de00ca7009a69b491a150ec9e542c25b7538141941819ef540714e2a6cd75ddd4c2 SHA512 215b8c3941f395c02be43044aed972425db8fe8472ec9f4f39f7f574d9f36c5a1af5bba495dd10570363e923bfe42c26d7571741ae2ef350e660c9973ac0a5ac
-EBUILD makepasswd-1.10.ebuild 554 BLAKE2B 609025f72827a67c206d89da4a4f8ff82b71ea45e15b1cf6a433ca7a29ea2db547d39ecf6be709c9ad7bfd6457ed8741e468cf0e5b195c590f858ba504fda4af SHA512 a586c6fb6d5075d73572a15df10f82d8b15b33419b1000ac04b52f66172bd148fb6d7fb80b52ff8cd400c9131985ede92885d7781753f98521032f987cd2cb72
+EBUILD makepasswd-1.10.ebuild 551 BLAKE2B f3ce89c09854eaec64104eb8ec880fabf6bde2378e0dfa88534b39969bd928ef5029e03a5b8f271df02dde6f237d99b4246a4603b677e636ecd20cd49bac0bd9 SHA512 d4c6e411a7ac02f3be927ec511b7e6630115e67e8e999572ed3839a9602e2af66f4a5ea5c4d5dd264aa04a4da520c34fc176dc3121c3025cffa7948d2071ce39
 MISC metadata.xml 283 BLAKE2B 49849d3598308d8cb5e389f56e571eae96c5c1e2f161c1e396c0be681e14acde2121463a297024e1b956fa480e6825186c6d98aa22ffe1978917e12a71e04e7f SHA512 00ac43351b446120da24fd23fda3389d29313ed42918ecf508e3bb57bb7d3769e2fe2788b4be33eb2f4a48713355a55e37a7f9c610737aa1e052597221e27c17
diff --git a/app-admin/makepasswd/makepasswd-1.10.ebuild b/app-admin/makepasswd/makepasswd-1.10.ebuild
index e85bd1e9f259..99317769b9ff 100644
--- a/app-admin/makepasswd/makepasswd-1.10.ebuild
+++ b/app-admin/makepasswd/makepasswd-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 577b4e2a5223..8c53b9b74dee 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -1,11 +1,14 @@
 AUX consolelog.sh 269 BLAKE2B 83aefc979d30847eb2d0b588232361cf129dec5a01ff8fafea7dd14daf4e2376c7381ce43e715e1093f13083d0e42cb037fcd65ae83f13b964c946f147e42cb9 SHA512 4cbf2145480d67b46db8a291137f5d953ce07d5d35b7c011e3dec13e4e5ab729f81666884c23db568065cb0b16fddba7178570c04777428861107aeb7c48f332
+AUX consolelog.sh-r1 276 BLAKE2B 0db3c2201f4d628a4e650b39aa17998e0523bc33861375d3bebd2729e649451793ebed46bfbdfee5c56d79902c489152d57d6e3951a19dbb872e5e1f9711e11d SHA512 022bc6510cf744e1beded8999f61e87ae31dbb151d5abbc4acee6f37a46684edcceb5259d6ea25e0ceea5a3056bb50fde869e97371678f302269b31be2cade0b
 AUX metalog-0.9-metalog-conf.patch 269 BLAKE2B ed59aa36a7388b4f91be80731fcfda0c806fc8bb90b86ca6357fea949ff6f231b42b37fdf2f044541c07fbbc4b0a67db4d6dcdcb18c9cd5091e2c3106bb4fc34 SHA512 0c95e8461e89d9469452d2ef66fa52f469b61578b12a6c72adb73e48807f998f8fb58cf0b3f1bc5caa38296fd59c8f8d1fc209beec81790387816d1c497a07df
 AUX metalog.confd 393 BLAKE2B 326653a23ff4e6bc78a4ddebf8af7c517f7b67973063ce1ac642195c7566667c7a330a4113acdd451522c907aa0814195ed5124aa92184bfca08eddc670b2d3f SHA512 4fea6b7f48e55d5f69a9c9a69f54623bb9d515e2fd2eda6829f8b769eec85e3de448eb42feb6bf65645400480169b3d70d56dff090103cfc95a3810515c42b2e
 AUX metalog.initd 701 BLAKE2B 9cb211b887b7294a11649710d45c104603fa9b9c27469f33c20613b58d0eede015cc7faa7d489530150bacc9ae5c4f4ecdee69ac2a9fbd4eb7157296413d0594 SHA512 45eb2f4c5a99723ac24bdb90726a81efef422aab7c991d1502a0bb728a4138cda74b2f8efb4cc70f1375b21b92039639e8bd5ab01af310991a81fce668f6f096
 AUX metalog.initd-r1 651 BLAKE2B 7b7739ca48acd3ce646478b51639c14f7cf131a698570f7f67e6cd347ef3361fe7212ce1441ba4a582cb0e59f8b2c9d2e7832b4e8b4f019c87d268a2833639f0 SHA512 09d8ac585418c6a3dfccc9d0f1a050b5862924712d78dc44fce3cb497bb362afe0a556240b14cf957fcdf64d0d06f5b6a8df4372c69129b43dc3520ecd310344
 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
 DIST metalog-20181125.tar.gz 39472 BLAKE2B 64d90835d50c7cb10ab2bf2708d00189b9f8cb56438c29d5c445c5527cce030f918ba74f83cdcd54017f04fe2a8ab30e5631bcdf6681e56c311f8069981a9b5c SHA512 4b187a29b9e25a0f762f929c6993fa6e49ead470916a43a0dfbf16720a1a633121357d2f152bf4cdcd71c016aa4fc8fd6cffb35249abd430fbbf66651986bc4b
+DIST metalog-20200113.tar.gz 40276 BLAKE2B f2fcaccf610f3b7f1974aa97f2c7b5181f3c625c9e28d72832ba1570cfa369873887c83468bcea6a9f3d3080356bd1dd62849ec34a5d03c1272ada7f476946f6 SHA512 d399d86f988c69c9f74553cd682a5fe04886bca458e6f8bb3132fe1fb9f522510a428cfde8af0857c5ba22531b276b04fa05183e0006c2d28ef0f0aead488f93
 DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
-EBUILD metalog-20181125.ebuild 1577 BLAKE2B caca6cdb6cf9a4c5b7b54cc76600df0e71f5389a66c199dbcabb2b8f8f7c005dbedaf434078cc10523999c16eb72ffea8a9fa915f655ea3727774757dfd3ed82 SHA512 d693a843985b3ef15eccd2862f2384f7f7356a0d50ed464d1cda3fd35471804e109ae2430a575c64d8a9cd83e894f6f112da65bb47f3999418efd0ef815f3ee4
-EBUILD metalog-3-r2.ebuild 1462 BLAKE2B 516a4936f515651da209eb203b4f058b1579bf3f0c01d19312e2efc851ffec76d9164ad41b29c16ac5511aae781217da1efec97f94d9c6d0fec9a4805240d471 SHA512 d0d4850ffa06a99d0583914babd94be44cd2401b6722983673a8bc73771a83b679065ef61a87583d4323b9896d106eacbf14e757d60be785e717780636d33eea
+EBUILD metalog-20181125.ebuild 1577 BLAKE2B 4092c9406f9f7c9ce88407ad4c3a8a54c4792a4600d00341b5822284fa7368551a7ba19f8ecfb9faf6a57e02530bf53a21b714004436d84b47808eb619b1c9a4 SHA512 270ee8c235d6cc261599495c89c092e734b362ded5adff418df8f760fc68fb5e70ba9d23bb995c65bde36679ddd0c4631ccfa4af079d8b1449aae90d6defe262
+EBUILD metalog-20200113-r1.ebuild 1601 BLAKE2B 26a007e015445faad590ab7d0a77e47a8ac0c9ab6fcd45b9a6d6977f98305a2335f223452df7846276adb359672f44c16f84ed479407d733ad1dfda7918a7aea SHA512 47cf889dd8b120d63e6e644099fffdaa29c0eeee77a63e4d0da80569b373a43c6c20930d29008a59937a5f69e7854307da81d5c6ad6c8fee62a44d3ed1bd0bde
+EBUILD metalog-3-r2.ebuild 1459 BLAKE2B bf3e76a596ac544764e1fad89349baeb08b03eb1dc6edfaedd6a72255d6efc26541f832937efbf28d2230ecc15e8831cd77922a1c6dfdd41634c1ce9886a8bfc SHA512 a89ecc63647d5199f0f7803f63a3472ccef7fcbc97eb16a3c8c8cc58d9ab1d5d2e8430f3ca5077dd7bdf72156568a0c56836f7eaa6518c752ac6b0a9585c981c
 MISC metadata.xml 334 BLAKE2B 2d9ae46fcede549cabba6654513afcb6bee8ea22ba48bdc910c7b136e4d27bf6e223db5b13501b275790ecbf4fcbcb4ebf5ac9b6b81c6fa098e2f2c402793b0b SHA512 14ef6878732ffc5d14d1d27cec55ec886e76969e016ce8a009cafffa0b8d4e470c1b0f2480da5aaf0ed885c101b20d5edd7ce333efb9bc6f0bf56462e7260b37
diff --git a/app-admin/metalog/files/consolelog.sh-r1 b/app-admin/metalog/files/consolelog.sh-r1
new file mode 100644
index 000000000000..3a67fe7b2d3f
--- /dev/null
+++ b/app-admin/metalog/files/consolelog.sh-r1
@@ -0,0 +1,19 @@
+#!/bin/sh
+# consolelog.sh
+# For metalog -- log to a console
+
+set -f
+
+. /etc/conf.d/metalog
+
+: "${CONSOLE:=/dev/console}"
+
+# shellcheck disable=SC2016
+: "${FORMAT:='$1 [$2] $3'}"
+
+for d in ${CONSOLE} ; do
+	# shellcheck disable=SC2086
+	eval echo ${FORMAT} > "${d}"
+done
+
+exit 0
diff --git a/app-admin/metalog/metalog-20181125.ebuild b/app-admin/metalog/metalog-20181125.ebuild
index 637038cce91a..5b05f9208809 100644
--- a/app-admin/metalog/metalog-20181125.ebuild
+++ b/app-admin/metalog/metalog-20181125.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/metalog/metalog-20200113-r1.ebuild b/app-admin/metalog/metalog-20200113-r1.ebuild
new file mode 100644
index 000000000000..0810553ec43d
--- /dev/null
+++ b/app-admin/metalog/metalog-20200113-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools systemd
+
+DESCRIPTION="A highly configurable replacement for syslogd/klogd"
+HOMEPAGE="https://github.com/hvisage/metalog"
+SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin"
+IUSE="unicode"
+
+RDEPEND=">=dev-libs/libpcre-3.4"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9-metalog-conf.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with unicode)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README NEWS metalog.conf
+
+	into /
+	newsbin "${FILESDIR}"/consolelog.sh-r1 consolelog.sh
+
+	newinitd "${FILESDIR}"/metalog.initd-r1 metalog
+	newconfd "${FILESDIR}"/metalog.confd metalog
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+}
+
+pkg_preinst() {
+	if [[ -d "${ROOT}"/etc/metalog && ! -e "${ROOT}"/etc/metalog.conf ]] ; then
+		mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf
+		rmdir "${ROOT}"/etc/metalog
+		export MOVED_METALOG_CONF=true
+	else
+		export MOVED_METALOG_CONF=false
+	fi
+}
+
+pkg_postinst() {
+	if ${MOVED_METALOG_CONF} ; then
+		ewarn "The default metalog.conf file has been moved"
+		ewarn "from /etc/metalog/metalog.conf to just"
+		ewarn "/etc/metalog.conf.  If you had a standard"
+		ewarn "setup, the file has been moved for you."
+	fi
+}
diff --git a/app-admin/metalog/metalog-3-r2.ebuild b/app-admin/metalog/metalog-3-r2.ebuild
index 6476fa7febe5..548059b41774 100644
--- a/app-admin/metalog/metalog-3-r2.ebuild
+++ b/app-admin/metalog/metalog-3-r2.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"
diff --git a/app-admin/newsyslog/Manifest b/app-admin/newsyslog/Manifest
index 0c06519a2414..35ae113a3a66 100644
--- a/app-admin/newsyslog/Manifest
+++ b/app-admin/newsyslog/Manifest
@@ -2,6 +2,6 @@ AUX newsyslog-1.1-html.patch 478 BLAKE2B 305c1ab0f22358fe3e60aa75c8978007a30d474
 AUX newsyslog-1.1.0.81-html.patch 500 BLAKE2B 734f264da0de2b612ba489e9ca27519bd775ef1a13f62c3e31dc037a593aa6d9b765d866e4d1726d4207358c6d3cf7c003da25ede55aed9c41f280c35d3508ee SHA512 4d4d3464a4a3892ce65770bcf07bbf25e985f93df9be360703ea3aede7c54860f9d77af93f927c8b479ea0d298b8e4ff65a4fdd7225a1290baee2b19bd00eeb4
 DIST newsyslog-1.1.0.81.tar.gz 174411 BLAKE2B d7916396ecf7dda9928891c3bd1020be45354c9623e53d9a52170567c811b3cad3e82efec8145f51a68ed851c46a6c3fb6e8bf944bedf935f2a6589e4b45d3e1 SHA512 de7ae2f71fb5a2a3fad0eaaa793da1ff2b36bc5757a30c70e8f740da8ea2647aea0422c13c1cc1a5e082e41938cbb590c8bb0ecf46d5d584466069f319db47c2
 DIST newsyslog-1.1.tar.gz 156371 BLAKE2B f9ac2de3059e377e61963af70591ca19bc335ffc96d1aa94770fec96cad7b8200d10edc6ac4ab115b697eb0527a998dd457ea1c0d5a1b529d5cbf5285d5ec138 SHA512 b321ae47ecacf6905858bedfaa5ca8c4230f7b6e5a715f8481331940c0ae53795769524a62d1670b4df27f9e263b407be83527a64ccd54b3ba75d55d3c5149b1
-EBUILD newsyslog-1.1-r1.ebuild 933 BLAKE2B 3cb04cfd09697d0757160da63aa64e7cddd2684639fa18076145fd76822a45bf9a9713a2c9fab139b954ef700cbd4c6776376f93cfa9200f225e13aeab1cbaf0 SHA512 9eaff9b697019f32e86b5d2ae438b9a0de6853570be94112c38eb6a33ad6546344c4a2b93b9f4d4d454a8986cac84a68b57fef4f09069374746a0c5dd209fb63
+EBUILD newsyslog-1.1-r1.ebuild 930 BLAKE2B a035398305e43483c26ff35d370af99912250025a1f3ae09df75c899848d68cea57f177168dbc33e20fe274177f7cb4c87267c8a41013d7b80f5609372978c48 SHA512 8e65ee7d43c066b03ef678cfa6e05fc5466c2a4d5d810066175edacc01b0a1b6121d702836378027025a14b47856d36e4f7f84401e7fbb2c25fd1c831cbdcb49
 EBUILD newsyslog-1.1.0.81.ebuild 959 BLAKE2B 635d50774f8f53b1ea98946e0d0ad337e8ce706b8910770073e14bdf37735880b68dbb03827c5af4a286cd0f5342600252df0e14289e33e9ce581b23996c9669 SHA512 5eceaed73affe0a824e74c12ffae5f914689a9c8d598490f3ea19feb072a94c1337d9ecfd50d9cddebfabcfb1bf1e5b795e8fd0841bc21498d5b71a5a13eba7d
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/app-admin/newsyslog/newsyslog-1.1-r1.ebuild b/app-admin/newsyslog/newsyslog-1.1-r1.ebuild
index 157887cf20a2..90185b30c6e1 100644
--- a/app-admin/newsyslog/newsyslog-1.1-r1.ebuild
+++ b/app-admin/newsyslog/newsyslog-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index cf35312bc5f1..540567ad46d7 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1,6 +1,6 @@
 DIST perl-cleaner-2.27.tar.bz2 7493 BLAKE2B 03d8bc336fd0a42bce16c4bf8b2272a7ff24d605b483af777ef7ab3d59accd0082709200705638ab116934f675b17c5cf109c40a3ab739654ff64abebd8c0558 SHA512 097d68dff30da198636f73fc44600f1863c7f69f87110315bb83297c96d826f2f101f56ab546fde94ff60ca00da0aaa569fefea3c2599155f3bd69c66fb42ed6
 DIST perl-cleaner-2.28.tar.bz2 7222 BLAKE2B 8b90b6d7be8b21de3de2d946baba2ea96e145072c1d6cb4fc9a45bd2181941155791e022f59139fbd440fd1dbc16a76e635e5d4bb420e9051efd87aa08a3aa0d SHA512 c53f2a48002ab45ec0e43cbdc6153792a540efb9ce9a272388707987a76a292a1f90ece85e2f5dfa94f75a1afae13a5768d3712f183ca9d10fa0c559bba132d5
-EBUILD perl-cleaner-2.27.ebuild 1016 BLAKE2B 7dd190a100803c8be42c88cc374c949b57800ca83076fa5f931af5031825bc214f584d41a087604c178fe845f12b5dbaacf9ca40bd4c16cb36b1ab4165624dc5 SHA512 4ff741be965c3b46f79e0f7302634273ab12541f12512c64ab9f6b6f97125ba07e874f4b15dcd330863a6db8738bce85723e70f4aead1203056241d699ab0f7d
+EBUILD perl-cleaner-2.27.ebuild 1016 BLAKE2B e5bfbff39c72e01a20230e8f3380a0e90cbb4696283f3e3d192be8871863aca6f071a682106d10c84302aed89f67b857f1879b885fd83719f62bfd1e3e582574 SHA512 d7f54e2a6852b2c84d330b6c3ff3aa55a8d367bff4ae40af1a11834339a5341c6305fde69202fe0dbd98bdb880aa22beb914f377b7fe4afb208f727d60890fec
 EBUILD perl-cleaner-2.28.ebuild 1028 BLAKE2B 48e53facb01a5cbf42079e8e2ee552383671722b001022129ed2e686edafd0ebf37c7a791e1c0f8e9646f03de07a981f4af903cde878c5a7be66e7efbb0337b4 SHA512 727449b10dea92b4a777aed760b57f052aeb5981216402f3443507833276c188c08d9cdd4f97e3cbf06367569fbc0e3b6fe2448b1eefb077e03dd5e30e1157a4
 EBUILD perl-cleaner-9999.ebuild 1028 BLAKE2B 48e53facb01a5cbf42079e8e2ee552383671722b001022129ed2e686edafd0ebf37c7a791e1c0f8e9646f03de07a981f4af903cde878c5a7be66e7efbb0337b4 SHA512 727449b10dea92b4a777aed760b57f052aeb5981216402f3443507833276c188c08d9cdd4f97e3cbf06367569fbc0e3b6fe2448b1eefb077e03dd5e30e1157a4
 MISC metadata.xml 248 BLAKE2B 7e969e31666e369b4b1826230eb9c103e51962ac23701a7d5e49d211d6da6ee2f6a8372d72b3ba454140d2c1fb7ab6d122f011e9c8144e95a9cc11f01d2e6481 SHA512 53fd9b61e8fd7f18f9493861896a34938e5f6ee4efb3d2c71703dfa81587d0943f0d439fac0e0c106966dabba08d6aeb4b0a2ff85addf30d992c9b7c78ab6314
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
index 8edb5db5af3c..89ba31112a1d 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.27.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/prelude-manager/Manifest b/app-admin/prelude-manager/Manifest
index 820ab2f12160..598465460fa9 100644
--- a/app-admin/prelude-manager/Manifest
+++ b/app-admin/prelude-manager/Manifest
@@ -9,7 +9,7 @@ DIST prelude-manager-3.0.0.tar.gz 1286459 BLAKE2B 0909b0d7501909de51cd580b6ce22a
 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.0.0.ebuild 1354 BLAKE2B 6ddb8d34247ffa5054ab97fe051c3af6ca8b800bc304174262b09cdfdff8a16d356465442dd660f09d7afe0854a16cd441e1be5abd0eeaf77366ec11738ed328 SHA512 e3e2da070356f2fe020d1319e0319fbdc5ba09ff5cdac56c82d21766a11be9e97ee625879f4869fc91064a067a622391a9e61867e4e87fe256205a87b48bedbb
 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
diff --git a/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild b/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild
index c9aec56bed73..50497ad005f8 100644
--- a/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild
+++ b/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils systemd
+inherit autotools eutils ltprune systemd
 
 DESCRIPTION="Bus communication for all Prelude modules"
 HOMEPAGE="https://www.prelude-siem.org"
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index d2afc512f192..a94673ee99b7 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -20,4 +20,4 @@ EBUILD puppet-5.5.18.ebuild 3739 BLAKE2B 180f08d4120e872353af7efec593fe400552a64
 EBUILD puppet-6.10.1.ebuild 3679 BLAKE2B be2b173b16da1eeed659baa79c9ae3ee953d17113ced882c5606dbcd397cfe2f41c0c78c9f6434d0dba97e332b87f00319d15d36ad924da83ce895cf5e650b81 SHA512 64a74e8402a9ae79cf1400f206ca5a0cf133d069d311b2f6bfd3b456974d8dbb134674fe0f53e51255cf27770b95a2b10fa11d1df181b3da05c89db3d8616495
 EBUILD puppet-6.11.1.ebuild 3679 BLAKE2B be2b173b16da1eeed659baa79c9ae3ee953d17113ced882c5606dbcd397cfe2f41c0c78c9f6434d0dba97e332b87f00319d15d36ad924da83ce895cf5e650b81 SHA512 64a74e8402a9ae79cf1400f206ca5a0cf133d069d311b2f6bfd3b456974d8dbb134674fe0f53e51255cf27770b95a2b10fa11d1df181b3da05c89db3d8616495
 EBUILD puppet-6.12.0.ebuild 3681 BLAKE2B c5252e97bbd5db75358f4a22dd9a01a89b69a44e9deef3f024bc13b65077ca838fc6aa529e37d57efc575a57508a8e3ceaab12beac80f5d469edecdff0a1e08f SHA512 d61b57c3203e71e5b086a0d1fafe3796cd2235ef4a1772ecc8e9641193e098702a993a0aa39d10384871de4908c075f5176648d78df9be66bc6969711e8ed5e2
-MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
+MISC metadata.xml 1638 BLAKE2B 627235302890d6ef2d65d2dd0cc1a8ccf9f37a19a33e4fce7b3912c80f799250d7d0dd098af816491b9d17e4e1215c1d088236f45cad8bba4f6b7f381b3c7190 SHA512 90b95b925e4ac88c9133505e5da85372b3ca23dcefed9baaee030337d0319fec60cde843fcdf3f38d85d1956fa90a1d2d908758289c3deb1acc13164b0e8eb6c
diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml
index fcc0764c44d5..e6af7c47ff3b 100644
--- a/app-admin/puppet/metadata.xml
+++ b/app-admin/puppet/metadata.xml
@@ -2,7 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-	<email>prometheanfire@gentoo.org</email>
+		<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>graaff@gentoo.org</email>
+		<description>Puppet 5.x only</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>sysadmin@gentoo.org</email>
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index 331e940f84a5..3a0f26259395 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,4 +1,4 @@
 AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
-EBUILD pwgen-2.08.ebuild 595 BLAKE2B d4970961dee03510d9c71c225242807751c5ea7f1173f9f97795f53eb3dcd6b5dae748b1f80a8c5710a62664b5613e55079d6fc5573833d4c45a46cee25b6380 SHA512 1bd638220e2afddd367e35b4d7c570e859925f2a10fcfea920c85c77a38663ad24f383dc622cc19a682fd1c891fa0974c8ba9ef109f323c874b7ec6b4f0840ca
+EBUILD pwgen-2.08.ebuild 595 BLAKE2B 95644bc175f1e70afb0602907b3f41ea8eab089dbf22e3e18fc8f4f7a2eff47cfb91342429a18ab9045d31be88c98fc25d205c2aede7405841989672c26f7f3d SHA512 dc046a3e5486e8abbe26bdf48ae556f72ddf43aacb83a9bf7c0ffb91f459d0e2054abbe47ae5f082a9c4cee49bc61c1fdf39c6a0ebf595c378c0c13e9e2ca6b4
 MISC metadata.xml 765 BLAKE2B 133e60da10e57e53ea3013d7615aae83d8d38bf18b8e92c1a081d43524551180e2654233e0a2b2207dd11f31114cd221f33fa5eb4c1486c87ea0bd031c613f2f SHA512 5a6e7e1b7e8fc44e9f39e5d0f349a27360d94778522131c749748690fd6db5278a5a9354242b2030bdfc8db7890e340621a1d939364bd40d3d96b018cc6e443f
diff --git a/app-admin/pwgen/pwgen-2.08.ebuild b/app-admin/pwgen/pwgen-2.08.ebuild
index 4a99c8175917..ce90b125c6e5 100644
--- a/app-admin/pwgen/pwgen-2.08.ebuild
+++ b/app-admin/pwgen/pwgen-2.08.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/pydf/Manifest b/app-admin/pydf/Manifest
index 04de1a6f5296..1c3a90f46186 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 769 BLAKE2B 99766614f0fb41f7bf26cf95b862ba6fe4031d76ffd8e32f8a2a42aac296a9c4dcea95b36ee54c83b0c8aa16c6bd29f07ed7d01dd42fca1025bc7e65e6e4f9a1 SHA512 4fce42745071d5f93e2ba771c0ce5026217fe96ad436a9d81a4801c943922e83290ddcc8b6aae0d6dfbc6aecd3a124b2429c1fa78637c89ac3667e71131dce72
+EBUILD pydf-12-r1.ebuild 759 BLAKE2B 7abac9d024036eb1c8008d056c36c8688a20e825fc616f62c46aeeaca7c8b1ed414b2ce2da308c3356189528f62ebd608ebde6d3c40c105e10bd6750e5d24e82 SHA512 bae5a90bfff634e1f29148855c444bb539cc553ec5b49467c5e767432c7ef338a4467360c70ae701a1ed422f3f766e9af3aeb5e056bed99cd8ef5d180bd21234
 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 d4f5a7911765..1c5f81190819 100644
--- a/app-admin/pydf/pydf-12-r1.ebuild
+++ b/app-admin/pydf/pydf-12-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-r1
 
diff --git a/app-admin/qpage/Manifest b/app-admin/qpage/Manifest
index ed6213000b29..1cab6dd2038e 100644
--- a/app-admin/qpage/Manifest
+++ b/app-admin/qpage/Manifest
@@ -3,5 +3,5 @@ AUX qpage-3.3-fix-build-system.patch 603 BLAKE2B e6bde35536561397c6aba4cc7e5f252
 AUX qpage-3.3-fix-warning.patch 450 BLAKE2B 4947c7b7aa7bcb05f63f371a1a06211fd63582af4d492b8541828bd124ac71a458266e49fad21da34efc854d34ca5a3395d4b76bbac6a17f1678f43f9afd3b00 SHA512 c2b0ad552ff60471171693eca90e51470072c73961bf30406e59c7929f02f093d754d5f1e278a43e0aac8d1031dafcbd085b0b59a1d9634f6f631c2a84e7a7c1
 AUX qpage-3.3-gentoo.patch 1472 BLAKE2B 804be08ec654aab34d338cf1d3d1f69d7d2984b8b931e06d5117e449e19a6ee80cb1bedc71dffe070e2e44326881702b0aea2fd4fc2f67130c315a2fe3101294 SHA512 a9e0a1793a8af41340c5593420eecf54fdc405600f71704efd3cdb9f70d9bdfacdff636cea5839c5ca024be27f90c84a7a2c1c95e078af2fffdd7cbc6ae7e5f4
 DIST qpage-3.3.tar.Z 225689 BLAKE2B 25ac50bbe1e5a623a95f0ca8ad53255693647ca49763d80bb571ce36cf941618b6cbecc1681035d5d56d559a30e2da2a8d3621588925b00b9cac7ad278ec4a44 SHA512 d6062fb9e9cd6cfd60cadb923d29d36fd649c27adff2a36fd4e768798b90780153b78e7d0d1a13dcad94971ac98b32c1c5a3b415d5a1b4aa1cfbac564514a3e9
-EBUILD qpage-3.3.ebuild 1582 BLAKE2B 941f5c6c3c33d81ad4f1215c30b845c8a35d5d872d98d0f7361b2c2046339f5ecb8a5ad563991cc9aba0b9faa3c05215b10e2185eb097f343b72656594de34c3 SHA512 8e7b104743e3eafa9d0e0a6661f9400f6def6b15c0aab946549d2c65d87f0c9ddb07f07d8ced52bedb0627c44b925fe6bc187f8129ffa215b19bb91ddc3e57d8
+EBUILD qpage-3.3.ebuild 1579 BLAKE2B 13093b5839b88d51a0c84d3ac799dfb46a3e231a94e6d5a8a3ac594601489773ef12b51f06bf7bdbd0e123a000c40aae68e73218355fe230018feebca14d76d0 SHA512 dddeec833047213c0af59663d6be74aea36a7e0a8306eb0186e6993d1b1f6c04c7b746ecc4b02408b9e154136b5dae0a9fe8e86f2f40b87b66572d81bee4b18f
 MISC metadata.xml 636 BLAKE2B 35f51043f98eb59d371ec414588cc51f056522bcf8fd02a516c7f523cff009f55fb162a964516a35e7cccd8c942ea3545b42d623764d467d5465913a8b047859 SHA512 9d45fd5a3361b6ffc1548df05595df91726d0037043c0443601b7bd1588218adccfecb38de8ae961a6e1ff5e618b14dc1e249f94657ec98fab914f1a70f13dad
diff --git a/app-admin/qpage/qpage-3.3.ebuild b/app-admin/qpage/qpage-3.3.ebuild
index 270ae82845e8..6438da0b64eb 100644
--- a/app-admin/qpage/qpage-3.3.ebuild
+++ b/app-admin/qpage/qpage-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 2d10011f6ed8..720626c04a49 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,5 +1,7 @@
 DIST r10k-3.2.0.gem 206336 BLAKE2B badc840ec7e6793daf205f1352899fa909e9a922a353a52841809dc80fd03758a865e0cb8210e58bb5c25968207d537b3f19c1903fbb519c50b6af2dd27eb5fb SHA512 7ea00ec28ba631877d33fa8b00b25e1c69346b787499ec7b26118c16acecf6bd39fcdc4618af016ebf5b62850b6d984510f7e9153dd4e99771def299b7d0703d
 DIST r10k-3.3.3.gem 208384 BLAKE2B 8c20a516c721970e4edb57160972dfa992d79a90794d7428f7083dee48f68ea87fdd6b182acd3df1ec9c8b50a2a72543d2ffb4b5361d6960fb46d021e3c2d592 SHA512 b1a407cd0bcafc9d7d15ff0d40f54d93d19be48032858aeb42955cdf14799fa75445f4ec462dd05a19cda972d155a0fc0be641d1998fd5e02c0ea5f1d971ea08
+DIST r10k-3.4.0.gem 211968 BLAKE2B 3077e47c71ec90f2b4d781cc4d26dcdb368e83bf7429e667df380f599dea59fbfacf8bd01f84d0a401391ae85d0f1c33afd771a20bac8c853d9c8bce273dd4b9 SHA512 df90839539e5e06f9e7ff7594bbef0450d63fa49dd00b990c2e86032e6d353d2dcb740e31d43f10cb4a4c7c159f8eb171b08543d12da8d22f12ef56084f2b8d6
 EBUILD r10k-3.2.0.ebuild 933 BLAKE2B 6e7df53cab2a25bb5bf6fa4218cd670b742a68aeeb5402dd09d1f34861d0596250b915965a06b4cc8c157009d671046c00758cb576223d108e6b8d40067a23a6 SHA512 66c0c7e12e9f934c9e5f3024021e31ef4dce674f3eb27763bdc60413c9ef79dd101ed5cdcbdeec6cab9332fcbb60454754aea7c05f251b23327fef6f227eb7c8
 EBUILD r10k-3.3.3.ebuild 916 BLAKE2B db2bdfab6af08c85fafdc36a9cf45e340ca0a65a0d8917c793d020e23d5773d77e71b40926be7e03a7161e4b0c8cbf80452ed928bd198594cc26fa55616d5158 SHA512 18d544b67913d9f0cb8f5cd0ac906b7ca482cb9bfa926b8feb98bef68447ba7450bc52ad00a2ca60289ef93a45340e8d8f96771e5647004b816fbd871e69ad4d
+EBUILD r10k-3.4.0.ebuild 916 BLAKE2B 976d3259ddf49bfe56dac5904c0bc6dbf956c59f6d05648dad4711c5b2e1f696f6cffbe58cd0f3556f857a8136491505fccf951b927851063daf4da69b6be2f9 SHA512 6c131d9a3572990b08fbe606616708bd92e9849d6de2bde7bb09897b0a5153cbcbf00afbfff8822998ff40c954cf764cbfebfd19599f7d3c35e43dba03e2ae1e
 MISC metadata.xml 582 BLAKE2B e3b514385b7b851b3ce037de51024108005224c75fba470db28fe6e4d6b3632ace21a8e829198e0b22d1ba0e76b1a5c01df10426ea497ec3b00e20e578608d2d SHA512 fb8913a9f806ac0b2035dc788ee78536fff96ffb635454f668d7836d8ba849fea158e628da12743c1844b658961866b3d64e8faf700c7e373065045175785536
diff --git a/app-admin/r10k/r10k-3.4.0.ebuild b/app-admin/r10k/r10k-3.4.0.ebuild
new file mode 100644
index 000000000000..b8cab218aa30
--- /dev/null
+++ b/app-admin/r10k/r10k-3.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+	~dev-ruby/colored-1.2
+	~dev-ruby/cri-2.15.6
+	>=dev-ruby/gettext-setup-0.24:0
+	~dev-ruby/log4r-1.1.10
+	>=dev-ruby/multi_json-1.10:0
+	=dev-ruby/puppet_forge-2.3*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/archive-tar-minitar
+)"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs for unpackaged rugget git provider
+	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 0be4660acc17..cae56a26ee9c 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -10,7 +10,7 @@ DIST rsyslog-8.2001.0.tar.gz 2999701 BLAKE2B 8b0b0af6a9f8ea53540cd4869ad9ccc6f1a
 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
 DIST rsyslog-doc-8.2001.0.tar.gz 8200594 BLAKE2B ad0fda200749083a56fd4d731b03982e25ff32a7c6b4ff10f996ee42a46c6985f11fc8265e6992d1d5c86973541d0b0cf15c014460792a4658f45a1a310aee4f SHA512 6d58a67914f65d75eb77411e760b9e49be3723fb6e4ab8951ce28bf83372e3ec7805fac5aef49158fa47c6c4a9109e887bcc46ed3ca0cdc53de4e9b66472be14
-EBUILD rsyslog-8.1910.0-r1.ebuild 12528 BLAKE2B 59284d0ef52aeffc8eca382f46fcbbca931fc679401b98b8cf3f8f5e7985abd9400be1a8926afbd9bfc5af6c635752f0b00b20f5952108dd8e700090fe78608b SHA512 1b9378bad84f1a010aa0e6442a1827d9bf7e906e3c578409fc52d86dcdda015224ce751d5bffea462c58b4bec53e276c3c8386147e9cc863b9a07bdd6e4f95f6
-EBUILD rsyslog-8.1911.0-r1.ebuild 12529 BLAKE2B 35e0e7d6b8852a7d1808461dab7928cfd657dddf8cb6b70e0c78e2ea357ae640a4e50b0a42a0def9879903867f616b1703b4cac517cfe4c21d88a6a7fe0f6434 SHA512 1720ea0d6098a8353bd3b4d6e38968f2ed92e551e2186c85d15abcb5c8b6a923262ab5f0c5084d716bc6b1d3ea46e7571d80c815b9e912fc6cd23ff74de3b663
-EBUILD rsyslog-8.2001.0.ebuild 12536 BLAKE2B 1deec19a6ee3bfb77c93e3385651e2a3b07430c5bcc9d1fb4977626c75ea2fe663d4644986cf4ae5e7ca4cb8a02fca0eb47fb0f092f6027a8e94c650423f90da SHA512 4429134057644a7aa31a9b3b4481eb09af659ace7023145b291faced19b602f5b18cf8d0f1f8c34c225e56206abaf90286b4f7c6aceaeaa7246a669ea554cc83
+EBUILD rsyslog-8.1910.0-r1.ebuild 12536 BLAKE2B aefb55649f1aaf7b98b5a9f85e87188dcd1546c149023190dcde3f292d7065bd4249f39e19459fbf1b0d34ceb28204ec5b201f4e3cc6b0946f70b46017554a84 SHA512 0bec3b0bdeb0f36b88569f74af758d43c8816955c53dffd74d991fff2f6c211c55a16c2ed09ad38cb34720439a9afa31198ebf4b585b3577576346018e88c931
+EBUILD rsyslog-8.1911.0-r1.ebuild 12536 BLAKE2B aefb55649f1aaf7b98b5a9f85e87188dcd1546c149023190dcde3f292d7065bd4249f39e19459fbf1b0d34ceb28204ec5b201f4e3cc6b0946f70b46017554a84 SHA512 0bec3b0bdeb0f36b88569f74af758d43c8816955c53dffd74d991fff2f6c211c55a16c2ed09ad38cb34720439a9afa31198ebf4b585b3577576346018e88c931
+EBUILD rsyslog-8.2001.0.ebuild 12544 BLAKE2B 52720822eb3f460e33cfeff6a880f975c5c5ee9fbb9f537e7a549078f8433568c333d08c46ed149e452848b635f9371752ceec13e1e9d80d72274d89a03523a6 SHA512 1e65de1df79c2d3643a26c7642889e44647b7d1b5d95ca2083f554d272d8e0ba1a279e72b7dd3d5d002eee6158d90dff0d701f3f3bc54ee488cb1c23314289cd
 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 bac61488e1e2..496ad7402056 100644
--- a/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 PYTHON_COMPAT=( python{3_6,3_7} )
 
-inherit autotools eutils linux-info python-any-r1 systemd
+inherit autotools eutils linux-info ltprune python-any-r1 systemd
 
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="https://www.rsyslog.com/"
diff --git a/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
index 922df12327fe..496ad7402056 100644
--- a/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 PYTHON_COMPAT=( python{3_6,3_7} )
 
-inherit autotools eutils linux-info python-any-r1 systemd
+inherit autotools eutils linux-info ltprune python-any-r1 systemd
 
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="https://www.rsyslog.com/"
@@ -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/rsyslog/rsyslog-8.2001.0.ebuild b/app-admin/rsyslog/rsyslog-8.2001.0.ebuild
index 537a3206cc36..e3157ed0808d 100644
--- a/app-admin/rsyslog/rsyslog-8.2001.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2001.0.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit autotools eutils linux-info python-any-r1 systemd
+inherit autotools eutils linux-info ltprune python-any-r1 systemd
 
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="https://www.rsyslog.com/"
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 27f535b04b82..0a4ee5cc2ceb 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -21,7 +21,7 @@ AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4
 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-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
+EBUILD salt-2018.3.4.ebuild 4708 BLAKE2B 162a115f026d2ad3ae9848e01480a8ae58038f56265ab54897d423cba3047bcaed8416df40a2ec4fd2dcdefc7d10358d3db09c4cdeb62e1ace79b71e84b37488 SHA512 a7c164af686586f7f936ddf19a6c7e0566438563c957c1f0687d3c9503cb52d2645ad776ca136f96c184bdcd1f6a81549e153da4616e8584da6286117a8d34f6
+EBUILD salt-2019.2.0-r1.ebuild 4882 BLAKE2B ea68671fa7e238daf2de3a6e20cec466fb6b90a6a847c7337a7d8f57ce9461fcfa7f2504bd474e1fe7e645ca4fcdd0fd4cf28a4ee71eaee36baaeda4642ecc97 SHA512 96c42a2afbb96cfab8601b19898a5d45c32bca07098da5e17cba3be6705d15d9d00fb8ccea27a421403979eca84e6a620d6355b538a9baf97c8a17f18bc9bb50
+EBUILD salt-2019.2.2.ebuild 4873 BLAKE2B 201471aa42f821ced444eb88ccecf80b9115913c8de3978018a5cd3435affacb32b61308edf71e2458272b6fc4575c2ade092c6b63ac8703f301b269b13126e0 SHA512 7c142f4afb28219b0d9bbc606b895e04e0306153e8ae5d44c80cf4e58110f1e441f0c94bad11784064150b0561d928492bb01fe0097d170696c44dfeca854763
 MISC metadata.xml 2200 BLAKE2B eab8763ef66f507d2c22280d0539ac86b6aacc150936d8f79acf9618ce377b16c5fa50217937ed64bc4e54911e59ad00e56c28e3d7d1bd14e60e6e2b1e9a80a5 SHA512 f2e9292a4e554ccf37205171629a001e740731b2929d20fa68c4e9736939684f072e01526cec30d201aab8d211d45444415acb3268ea5763dbc3fcc933c737cc
diff --git a/app-admin/salt/salt-2018.3.4.ebuild b/app-admin/salt/salt-2018.3.4.ebuild
index 53dc802d2e11..1ca868771c5b 100644
--- a/app-admin/salt/salt-2018.3.4.ebuild
+++ b/app-admin/salt/salt-2018.3.4.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/salt/salt-2019.2.0-r1.ebuild b/app-admin/salt/salt-2019.2.0-r1.ebuild
index b20f9a0c39cf..54e491a945ad 100644
--- a/app-admin/salt/salt-2019.2.0-r1.ebuild
+++ b/app-admin/salt/salt-2019.2.0-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
diff --git a/app-admin/salt/salt-2019.2.2.ebuild b/app-admin/salt/salt-2019.2.2.ebuild
index 909935cd7f6b..4d23bf4acba1 100644
--- a/app-admin/salt/salt-2019.2.2.ebuild
+++ b/app-admin/salt/salt-2019.2.2.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/setools/Manifest b/app-admin/setools/Manifest
index 7962e6f30553..42a04fc98308 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -2,6 +2,6 @@ AUX setools-4.2.2-remove-gui.patch 970 BLAKE2B b3d701d0e9b4de0a3f66ca8696700e70b
 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 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
+EBUILD setools-4.2.2.ebuild 1244 BLAKE2B 12679432d583a6d7cf3bc5b4934afe807baa10beb06cd65554eff037041e4b920ca969cd74e7af575bc14987dd56e5490b54c8b99f31fe93309e30ebebd79800 SHA512 15d41d5cabd0cc8c5f0996379d371342701c42cfbf25e73c72d753bc798fc294ec0e6074b4d04074bc4965bc015acf1d16a083eeef1600b3f57e0eab54a136f6
+EBUILD setools-9999.ebuild 1246 BLAKE2B 96a9668a3c3da8e18bb5c07a14914024776737cdb485963536e8686851538b661fe2deb1032fc8af57101117534cceaeafe7e11d1df4eefb82ab5203d0bd3749 SHA512 8b5f81c50005b285bf67af722f0bef81fac45692764669363241c9fbdc65822c7f0bf40f2be6ba01742ab2b78b41ce4965dd0e5f63aedac0a641209979bf9e1f
 MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
diff --git a/app-admin/setools/setools-4.2.2.ebuild b/app-admin/setools/setools-4.2.2.ebuild
index 88bea3902042..74dd28424fea 100644
--- a/app-admin/setools/setools-4.2.2.ebuild
+++ b/app-admin/setools/setools-4.2.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
 else
 	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index f10da5f6d10a..88bea3902042 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
 else
-	SRC_URI="https://github.com/SELinuxProject/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
@@ -21,6 +21,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="X test"
 RESTRICT="!test? ( test )"
+S="${WORKDIR}/${PN}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
@@ -41,7 +42,7 @@ python_prepare_all() {
 	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
 		die "failed to set lib_dirs"
 
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 1777ea7bdd77..dc044dcdec79 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -3,7 +3,7 @@ DIST sudo-1.8.28p1.tar.gz 3310254 BLAKE2B a1810af7a42d05cce49bb9d0acf6f3731a5193
 DIST sudo-1.8.29.tar.gz 3338260 BLAKE2B 7ba29d155bfb1d7ba20e32ade2e8ee3919e70400b6c235e313052b247b48406b9a051e71daa7e47fdb0a9fd0889f4c05b8a1a170c027503b90081e8cec81660e SHA512 ea780922b2afb47df4df4b533fb355fd916cb18a6bfd13c7ca36a25b03ef585d805648c6fa85692bea363b1f83664ac3bc622f99bcd149b3a86f70522eb4d340
 DIST sudo-1.8.30.tar.gz 3349455 BLAKE2B 5e0aaa41f42c18cd0de473add3665adf797cd37eacfb4abfc9472814ea679c1e88e28e95e13a73eb7d9648174609d80a2d4eccf3bdf87a44186df07aeba60eee SHA512 d44831feabd92d736614239e0e0f086829d84b213c98524fffb4b926a96715b1156538a7ab5e0b6e0db8be67a6e24a1642b3648105b076d23b58c39d0dd947af
 DIST sudo-1.8.31.tar.gz 3350674 BLAKE2B de5a968732fdd58933b4c513d13c43a08cb50075a00c3e0d338c9892570a416a2b3a8f19940c0893715f4eeab991e804831a87ef656ffd91e7f1ba047c119261 SHA512 b9e408a322938c7a712458e9012d8a5f648fba5b23a5057cf5d8372c7f931262595f1575c32c32b9cb1a04af670ff4611e7df48d197e5c4cc038d6b65439a28a
-EBUILD sudo-1.8.28_p1-r2.ebuild 6944 BLAKE2B 2195847735c77e9b6e9f15fb396ee2f34f6e14dc711a2d5bfe6a613f67e8bc18f1833caab559231eed32bc8a0de63a1c9a578902a96a5ffa28b88d790779614e SHA512 d0165002c886bb40d120eb54d95d2ed5870c61a9e650fb8a7ba362e7b5943494cccb6c4e4534b9c2829b96ae4f8ffcb5f2003dc1a6e76270bf66793010b8e728
+EBUILD sudo-1.8.28_p1-r2.ebuild 6944 BLAKE2B 483a62064d6ace45693a5178b5f580f600549732293e0dd46ad8b33a4a58019cad15fe6fc250778ede05b771a2f691fc2215c9495eb135b5d73874b009a964b6 SHA512 23b58e7763f9ecc952bbd95666b8b8feb59625d7ac9de40315d165682b56a5670cd47b3a2be9cd235492a4e1ed558a935b1c1cd1979d7261d11d676ebecd1104
 EBUILD sudo-1.8.29-r2.ebuild 6956 BLAKE2B 4065346eafcaf93f22182bb168b5ed753e65a59f2d5469c48883d19c962bd4754cff648d10bdd404d0ba846f74944670c194ad5740edcaafb605a596d214f664 SHA512 c034ce70c59e5d1bd51b1f9514aa410e372ad987776ec4447b368448770a677b548fd8aec27477f2e0c64ba050617714489f7406977e4cb762b9a14c815affb6
 EBUILD sudo-1.8.30.ebuild 6876 BLAKE2B 8115b04d517ffce1527c8d5672702623ce7d22345617a0bdacd8b67219040f651563e3cd973497a0383a65045757e7a4c3d3d483bf024e52edc0dbcb75030286 SHA512 2b894667bf8fb198561c3c7a02ce9b9501aabd142f1da2563b84ea512a63d39a6a014d7a2d46dca2d87a55721f687d24aa28dcf67ca2db9f643f65fd0dc57da8
 EBUILD sudo-1.8.31.ebuild 6876 BLAKE2B 8115b04d517ffce1527c8d5672702623ce7d22345617a0bdacd8b67219040f651563e3cd973497a0383a65045757e7a4c3d3d483bf024e52edc0dbcb75030286 SHA512 2b894667bf8fb198561c3c7a02ce9b9501aabd142f1da2563b84ea512a63d39a6a014d7a2d46dca2d87a55721f687d24aa28dcf67ca2db9f643f65fd0dc57da8
diff --git a/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild b/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild
index 7fe882a7f279..e43a49df1202 100644
--- a/app-admin/sudo/sudo-1.8.28_p1-r2.ebuild
+++ b/app-admin/sudo/sudo-1.8.28_p1-r2.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/superadduser/Manifest b/app-admin/superadduser/Manifest
index b2e81044dfc5..4b018113b8a5 100644
--- a/app-admin/superadduser/Manifest
+++ b/app-admin/superadduser/Manifest
@@ -1,6 +1,6 @@
 AUX 1.0.9/superadduser 13973 BLAKE2B 4458ad50a2699293ef2e5ff9cc63051d91d0892f39437f97dd6d7dd12c35e06ef2e2d327814c391790b471d596c64b4060def0abd5d05def2457fd21e736fa2a SHA512 3eac518597abf1ce6b5562137003c875df41f30df3394a2afdb3458833736c73ad47e94edcda06f71c207c203a43449b8f740e3345f853976e550657b372bdba
 AUX 1.15/superadduser 15878 BLAKE2B c55c30e217e5df3f6802f80dba9350fc114004fce3e228f1da95954947839f8a2ef164914e3a320f201f2c9fa3c8f4747eada8c58edc7cedac068ae15ea9bdf8 SHA512 0187b3d85f6f8ff956c3612ad937c9645d8d6423382def5ae00a9528bad1c9d06a1c0ef01e12da010de2c2eac527eac26282d1ff5c71492671c14ebd5923827b
 AUX superadduser.8 517 BLAKE2B 25817073bfd4effb62fb18a8a7721cffe9dd376d88734a3dea337ba9c6cfc3ad4663c56e44bf44ce70ddf23113d3691e6ffdaf6bd5a6eb67add357fc47d46d06 SHA512 f07bc575a8ee89b2fcc27714eac4ad5c7129dedc2fa927d5490735109594f81dbe0fd7057f5c1317f3aa1905a1ac5a51e589d5eb9484b528b0174380e6c3297f
-EBUILD superadduser-1.0.9.ebuild 490 BLAKE2B 9b7623f5fdda45ec69a9a7d6930ce21e312350db69aad74bc28e771f220eb3c84661a0ff96250fa7376e45e54990a10010604569084ec5d9f549e3907795ff02 SHA512 76e8d6dbeeb97ee8b3823923214ba39f00a167ea6b27a19f922c2ff56dea8d0b77678c604eda6a0c84a9869660fa4cc0a6afb40664628e06bd4e75abafb59bfd
+EBUILD superadduser-1.0.9.ebuild 487 BLAKE2B 1c5a56d6e86cd28d52207f087b1450f253b76e4231442ccd35a43710c68864648d0dab62a2cd87947d3329ef224cbccf9b74f572447c4925270ad9dc7eef30eb SHA512 de3602bb8bd5674382fd011972cf9abd3fd992b4e00bbc17e7e57bd552db100f345793fbb7b5a91f66135280b29b16c1da74e2de9f07b24451cdef29e788400c
 EBUILD superadduser-1.15.ebuild 504 BLAKE2B 94fc8279a588b82fb493d9641481fd2cad94f89840ce6ba9b4557b20e267f470b40bec914c6d3f2cb724db57a5b704f703199eea89bd84081d1049c994a6599e SHA512 0ce3679851c56da2e0e56bc2a4fdb3b0aaa146b719ff213b797234cf2a2d7b2181b5c1d3e72463843c2edf38a9d00499001c5daa0003b84641c91909ba30aee7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-admin/superadduser/superadduser-1.0.9.ebuild b/app-admin/superadduser/superadduser-1.0.9.ebuild
index 0a82e55be05d..ba48155eaaf2 100644
--- a/app-admin/superadduser/superadduser-1.0.9.ebuild
+++ b/app-admin/superadduser/superadduser-1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/supernova/Manifest b/app-admin/supernova/Manifest
deleted file mode 100644
index de867d28f6be..000000000000
--- a/app-admin/supernova/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST supernova-2.2.0.tar.gz 24068 BLAKE2B 129c077baf9b415851f3c17eb5a9870ff2d8109a54c424d9039204620b6dd68d8f17183b5c52d863882bd2586ed03b7d1c397f70f337bfba9e9c8255b6feb578 SHA512 436ec13dfaf5ff7cadacc1dedc3545a579784cfce3b0c7925cc0d877ba76a4c865ad3687ae8ae22fdb11d880282dd555f9a9d709c005ad024299a34607fd8063
-EBUILD supernova-2.2.0.ebuild 1277 BLAKE2B 99548d16e291593ae9bf224c691180a5cd48625a0d1f21ab2debd1d076ed43b828c1816cdd7cf78241b646078c7d33a50614f52028fbe0ba2e139334d2720b62 SHA512 3efd410bed4a6bfe85108e4036787a311ad0e912e67d07acc9efeb98b714aae795758d9a39b855cd2c3ae5a9aa704ed807096002fcfd33954d813e16db7c7c57
-MISC metadata.xml 513 BLAKE2B 902b49ed2456d8b8742d17a03370e66a3299b540cf5d6c84b39333d3de8fd849fbae680378b79397bb00faeed0e1e54c9fc160fd710f11888ca442f0dff6a074 SHA512 8253bfed9a47098f43a96906fbd72144005ca7bae46aa3f4e2f3bdc00b95a7dfc5d8b7106a1127cb3a6b3d3ab34748f6560bb38917047074674ed4955f389834
diff --git a/app-admin/supernova/metadata.xml b/app-admin/supernova/metadata.xml
deleted file mode 100644
index a227b41365cc..000000000000
--- a/app-admin/supernova/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rackerhacker/supernova</remote-id>
-    <remote-id type="pypi">supernova</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-admin/supernova/supernova-2.2.0.ebuild b/app-admin/supernova/supernova-2.2.0.ebuild
deleted file mode 100644
index 098c36756865..000000000000
--- a/app-admin/supernova/supernova-2.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="novaclient wrapper for multiple nova environments"
-HOMEPAGE="https://github.com/rackerhacker/supernova"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
-	test? ( <dev-python/pytest-4.0.0[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	${CDEPEND}
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/keyring-0.9.2[${PYTHON_USEDEP}]
-	dev-python/python-novaclient[${PYTHON_USEDEP}]
-	dev-python/rackspace-novaclient[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	if use doc; then
-		mkdocs build || die "docs failed to build"
-	fi
-}
-
-python_test() {
-	py.test || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( site/. )
-	use examples && local EXAMPLES=( example_configs/. )
-
-	distutils-r1_python_install_all
-
-	newbashcomp contrib/${PN}-completion.bash ${PN}
-}
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index f4b4355738d0..13f60c53a39c 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -5,12 +5,6 @@ AUX init.d-r1 452 BLAKE2B 5d1b15d6d4a39ebb586ffdccd138bd1f2f3681798c3ff3e1465654
 AUX init.d-r2 553 BLAKE2B 270ff81ca5bac99f22b49bf47ec64d73b4328804ea264e99301de3d563d2479a3640a0f5e35b2553d679e97a85480d273db170b741638b0a90929fccb490deb2 SHA512 d8d7d6165445fb4bef75454dd2b03c866fb4942c19d6ae4a8b36a900bdd9ee3a55cade02304d49d6e0095df885a1a4fa52694012a7d85d67cc1b181aaf69d8cc
 AUX supervisord.conf 2525 BLAKE2B d36d6ef6b952a99ccfd61976c21eb54922555db4802288d9364f02331da5e693bce3862869248f7c0b81285576ca633e679a26acf75f03b2e620e16eea963909 SHA512 1ce55ef1f9a4cd7592645007af5e0f18147e8dca1c324ac2e48bf58aa2191ec657cfa68d7e6bdc9ba8e0747b32f4e6a44009e8c55a7bd77b265ac8593f51eeb7
 AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c45da2bb7017631bf4af4b858bc4d7964f1d64937e331728884bc21e62e9d01b11cca46aaea389372c6bad SHA512 0fe777d1f0bf70dc9b49132102ac90083261321850f80e9e323459c894c55f722ab8470eba3ba7bb35a9d69ad411a3247546066d6cba5801c9b289350ea4bed5
-DIST supervisor-3.1.4.tar.gz 392321 BLAKE2B 316789fae200f02242a90d3a22a3c6486576f74dbab81b95efc72768a89c54999a370625f9589afe1edff08351840fbe27a7ef8674e6f1e3bbdd4237f3227df6 SHA512 7182db4169d37aa8f7a2a4e1d57ce40f6dea21759ed73fb49286dd5ffb2bdede0fccdc71344e93c8f8c067a2cbc4e3cb0a9a50b22bacdb1b8bc1378581ed5f07
-DIST supervisor-3.3.5.tar.gz 421220 BLAKE2B 63e9db005596921c4a4426de361fc20992a27b67b67ee1256cd64fe6d385909682a5055e4797512410f36f6855592f53c9c5720c54a2dae967578691d05ff3fc SHA512 66c43d40c216e5c3120e083407c848295fa1e59d6d9da916a4bae5c37d4d13208c3bf7c0c8b8a5d570270eb44fac0b1bbcceddb2e84e4f3fc1b6241b43116af7
-DIST supervisor-4.0.3.tar.gz 435960 BLAKE2B 001f556b955311e2453fe1091e46696f3712751e20fad54437fd86c6020e844047ac6cd8983d46a07dd1830e6324d198c84c9d0c8fe301bb5ca568e4c7345d72 SHA512 09de52dca9f71409954fb4782d42099d19892bd82797d2b3dc7100b2693da292fe9822b5144eaf4dcbe295f4e227d62601c8791016e1bcd5c253d99c89f59368
 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 1819 BLAKE2B c37974d752014e711ffdb7211b86778c115bf3a3ae2eaa81cfb168e4488e5dd156e75b4f706e3f2725c9542a6fc22b22feaa046907fa30c3d1d7245fa144d48f SHA512 12c9e9f509a358cd93b881de5c05880884dcbd5cd13549d4bdb7403a96916cb1146ecefe03b512b1fd94d65ba78a4bd0fa14cf3ecce6183fc17085e7c9202fde
-EBUILD supervisor-4.0.4.ebuild 1891 BLAKE2B 013235d4789022c01d84b14b11d9fb51e597cfe78ec8318b3c22146f2dc287e1aea5a1f8000659a766d011b588593a537dd38a97495b01a21c3aa1ab7a509748 SHA512 89653aaccba1ee1eb561e645e082892a2ecf7f4973ef5b2a64e143829b1a19b648643626cd880aee2ef5d7b85ab88ba7485ea76a1627d7bbc45ade67747ee73b
+EBUILD supervisor-4.0.4.ebuild 1889 BLAKE2B 742a09c3881070eb8bb8356521a8064689341055dd23b449bfe150449c4fba4d0e60800c329fc3b2c1ad2f84f34ddac293d698183999b3ccd7814108a60d0916 SHA512 dd02e46bf2d19adc95da5ff836851e900a636d8f9b41317a5fbe3d39485391d8a597d4af1522884a5c6cedf8986f0e8338f46a7e160c6c66d702df26550b1849
 MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/supervisor-3.1.4.ebuild b/app-admin/supervisor/supervisor-3.1.4.ebuild
deleted file mode 100644
index 7eb4c5a33259..000000000000
--- a/app-admin/supervisor/supervisor-3.1.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )	# py2 only
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# ALL versions of meld3 match to >=meld3-0.6.5
-RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-python_compile_all() {
-	# Somehow the test phase is called and run on invoking a doc build; harmless
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	newinitd "${FILESDIR}/init.d-r1" supervisord
-	newconfd "${FILESDIR}/conf.d" supervisord
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-admin/supervisor/supervisor-3.3.5.ebuild b/app-admin/supervisor/supervisor-3.3.5.ebuild
deleted file mode 100644
index 3abc9b5b4158..000000000000
--- a/app-admin/supervisor/supervisor-3.3.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )	# py2 only
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1 systemd user
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/meld3[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-python_prepare_all() {
-	# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
-	sed -i '/namespace_packages=/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/.build/html/. )
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newinitd "${FILESDIR}/init.d-r2" supervisord
-	newconfd "${FILESDIR}/conf.d-r1" supervisord
-	dodoc supervisor/skel/sample.conf
-	keepdir /etc/supervisord.d
-	insinto /etc
-	doins "${FILESDIR}/supervisord.conf"
-	keepdir /var/log/supervisor
-	systemd_dounit "${FILESDIR}/supervisord.service"
-}
-
-pkg_preinst() {
-	enewgroup supervisor
-	fowners :supervisor /var/log/supervisor
-	fperms 750 /var/log/supervisor
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
-		elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
-		elog ""
-		elog "By default, only members of the supervisor group can run supervisorctl."
-	fi
-}
diff --git a/app-admin/supervisor/supervisor-4.0.3.ebuild b/app-admin/supervisor/supervisor-4.0.3.ebuild
deleted file mode 100644
index f71315bfc37b..000000000000
--- a/app-admin/supervisor/supervisor-4.0.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 systemd user
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/meld3-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/.build/html/. )
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newinitd "${FILESDIR}/init.d-r2" supervisord
-	newconfd "${FILESDIR}/conf.d-r1" supervisord
-	dodoc supervisor/skel/sample.conf
-	keepdir /etc/supervisord.d
-	insinto /etc
-	doins "${FILESDIR}/supervisord.conf"
-	keepdir /var/log/supervisor
-	systemd_dounit "${FILESDIR}/supervisord.service"
-}
-
-pkg_preinst() {
-	enewgroup supervisor
-	fowners :supervisor /var/log/supervisor
-	fperms 750 /var/log/supervisor
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
-		elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
-		elog ""
-		elog "By default, only members of the supervisor group can run supervisorctl."
-	fi
-}
diff --git a/app-admin/supervisor/supervisor-4.0.4.ebuild b/app-admin/supervisor/supervisor-4.0.4.ebuild
index a9475bf5083d..adec89632ec0 100644
--- a/app-admin/supervisor/supervisor-4.0.4.ebuild
+++ b/app-admin/supervisor/supervisor-4.0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index ab8caf35408a..2f21530bb22a 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -18,7 +18,7 @@ DIST sysklogd-2.0.3.tar.gz 466919 BLAKE2B d9ada06dadb5a43ca7102cb24eaffa0494af27
 DIST sysklogd-2.1.1.tar.gz 560806 BLAKE2B 576da4c75a5f75f9df438764083d5f4a26a29edce7d8d2ce8e27e35b1b3460289aa366ac5e7e3dd887f0c2bc08fdea8fcca5dedcf5e7c34aaf677ddb5745a0be SHA512 7b486a123b651e9393a4f4d0340e6356e9cf73f344c4a51f84b732134a6d61bf7ee09125d723dda3a2137c3b93c4df156b79193a8111d1ae5c339a668debada3
 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 1704 BLAKE2B a531c7caed977c993ca9ad1d9a9304472e1d7a46f5d56744e9b9811c7bf5d603697af319534e0e73c978941400f54a8f5b9be731db753577f6f7f8163309c5d5 SHA512 721d59f83eb2c65a79315dc843744c8902e28325dcc601a4786551efea6baedd13b7db80172e814c94db731859acf292bf2361bfa546c757faf197229b0e9029
+EBUILD sysklogd-1.5.1-r1.ebuild 1701 BLAKE2B a1344b56825a4f7560ba644740429129e95ccbbd4c2b5106cf53c47aea4255ad0cb65fdae4a6334e644e48d1477718b0cf90da8eb63fe2b6e7e362af415f44c0 SHA512 b944d4ad99d071c6aba6e16a2b4ec38253130a4a788d3aa917db61734778e43a99f377fc9d297d7821151b28b4918686b0caf4e3a1c463721bad999ef487e8d2
 EBUILD sysklogd-2.0.3.ebuild 1820 BLAKE2B af54756110e0528f3c5f59e1e9fd7ab890f305903649a22a4d3c37bd6b90e0a9eb93c5f4319c232bcf2726891a38b800478dcb8d3a585f55ec0308b72dc14c35 SHA512 c1c8f47062fcf0adfbde35a7d711744f5fcec56d922b057cc56dd6ec404e327643db70df3d4d1d7fc3ca630ecf27ba96a0d2fc08f6766429b7b05eefe3f63bce
 EBUILD sysklogd-2.1.1.ebuild 2081 BLAKE2B 319de960e0b50c64d623d5f787dee51cc01e35a5c9ab9847710bc1765e3493c4805ca4afa13cfaa997f43e93b1ef3eb43cad9aa9e06dfff180d96e402bd16454 SHA512 f49ab7183a8779dc1015e12ee52b8128a610f3a34af9af2650060884592fd9508432f1bec623987ed6d9ac21038a5b5a4a3ed9f2775c79a982699c8cc4df3dba
 EBUILD sysklogd-2.1.ebuild 1885 BLAKE2B 766fc16c3ddbb0bcbe7eb260878988254b308a3f3bd0cb67949786a470ef2ecb2f03baa9235730dff4aab25a1414715b4f43cbe23af6b13c0100a1187be4a0ab SHA512 13721c80d8c9e2f8b7f07abd4e2f1868c7f0915b27bbc4cfb54e0ec9d88d4bfed8b64ebbef83a3d58361bd40132ceddeebb028cb1d18059b3e68ddbfcf3cfb7c
diff --git a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
index c3e186230e89..574518ceb8d8 100644
--- a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.5.1-r1.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=5
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 1ca1db3e683a..e27f38741244 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -3,7 +3,7 @@ AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f497
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 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.2.1.ebuild 1700 BLAKE2B 007abf39bcb8411796c0f3e90f6091f00fd667d2002b9d7587beeabc9dd69d245511910f083d8de72e3f3a818398902e92355c78ae79977567e7015665519d68 SHA512 ef5c77bb929525a22949cada8310967cf8a465044c699f5154e284e4cfe54e00ba150b240412e9caa0f3f13e69a15be83c740287680dee175b135c8932722912
-EBUILD sysstat-12.3.1.ebuild 1707 BLAKE2B a859050b87eed7b87090b236656a307ae87e3df1a297891800fb161632605b370b05c177ad080e5504bb4f3eb4fcda1a0d82076fbf10779a61dd03e754b11449 SHA512 312f999a2cd27a09f06970a141da3b0c70f271526dd97c2c228f241ec37d233153ffc728cf070da20d5db8eaa93981648a593668f982af295a08088ee4061227
-EBUILD sysstat-999999.ebuild 1603 BLAKE2B 3346b2979dd44d34cfc9450dd4d81e6d0269464a0e59ccb6692d5a65a46e93ca58637a8500978e644ef5ca3262f60775b8771a38bb217dd498b37eded65c8280 SHA512 45f259cd23638e4c5621f782c61d933fb11d927ef7fa2da2e7ffc6e061fa1701499cba841aba2c77c182f653b24b2b86f37ce487c7b0905707daac0aa2a1be3e
+EBUILD sysstat-12.2.1.ebuild 1707 BLAKE2B e70e4b7ed0cfa50709dc1e228bddc1edd6de8eea39a1a40e3a6f4ba36b612f94f63101e6d62d0d8130b7bfdd94823377fe8f89f2bd7d09db1db4696dfaae19ed SHA512 d9c3b6920f8ab49db4da3b941c06a341bde6dff59e476531bb92d94edfc6f4aae5ba15cf8bb3c0926d6a0133da4360afb02a99a6730fbb27677bd2d42d8e9f49
+EBUILD sysstat-12.3.1.ebuild 1714 BLAKE2B e9f5bca67c14436f831ba4c3c33fc029d2377eadb7cf961f3a1a33f185be721edf3e3eae6b360c968c75402444ff4f3b2211b87955afac1fb49d74ab222e611e SHA512 fd6a9e6f46bc89bb0f2b435a29012ebd18c3b9015f3967a54502bd12f386249abd1d8e8cb7d96aa797847b99036dcaa586b8853ac460b7b29a5e0af21a4b4359
+EBUILD sysstat-999999.ebuild 1610 BLAKE2B beb0eb130dc39e72ddefb7016fb81a5ce0629baed38c1ccf23ff9ea97f8995097be44eb00635d21455bb0b1e6c9933f40ad7c17c2a6199d031520c638377aa4c SHA512 8212abdf2a37f4b0a92b09485c4a197d9673a8f524fbb07bc4dc5c4f32e754fbf697dc0219c707b3f4cc5a5472792296c7a31aac58ec11b044f9eabcf6676f70
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/app-admin/sysstat/sysstat-12.2.1.ebuild b/app-admin/sysstat/sysstat-12.2.1.ebuild
index 4b18a4f4786b..c3e396c66372 100644
--- a/app-admin/sysstat/sysstat-12.2.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic systemd toolchain-funcs
+inherit eutils flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
diff --git a/app-admin/sysstat/sysstat-12.3.1.ebuild b/app-admin/sysstat/sysstat-12.3.1.ebuild
index cbea517ec677..5c114d68304e 100644
--- a/app-admin/sysstat/sysstat-12.3.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.3.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=7
-inherit flag-o-matic systemd toolchain-funcs
+inherit eutils flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
diff --git a/app-admin/sysstat/sysstat-999999.ebuild b/app-admin/sysstat/sysstat-999999.ebuild
index cb4326bb2054..c59bf0c9f963 100644
--- a/app-admin/sysstat/sysstat-999999.ebuild
+++ b/app-admin/sysstat/sysstat-999999.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
-inherit flag-o-matic git-r3 systemd toolchain-funcs
+inherit eutils flag-o-matic git-r3 systemd toolchain-funcs
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
diff --git a/app-admin/system-tools-backends/Manifest b/app-admin/system-tools-backends/Manifest
index cc592b2574b9..bdb447b12203 100644
--- a/app-admin/system-tools-backends/Manifest
+++ b/app-admin/system-tools-backends/Manifest
@@ -1,5 +1,5 @@
 AUX system-tools-backends-2.8.2-cve-2008-4311.patch 1984 BLAKE2B fdceba11d1f10d200709a7b0a391da459d7d59c69900243cacaeb9f372eb74033d2d7e3be32ba10fbccdf15c8acc04b7a2e2cb524f5c540c06113140a33a6171 SHA512 ec8d2f526ad16f286aeef6d521ae3f2909676b846ad2a715d23c5a30b02f0608e42d550691e0e07493d70d1141093dc59c36a55afa82032c6d28e128ab1fd49b
 AUX system-tools-backends-2.8.2-default-permissions.patch 945 BLAKE2B a825942ddf3bb8cf00d9c355f7864fc2aa48c0e2a89cc7098914204a4724e581623cfc798b9e39eb543ec5245b3ef4973798c1a8b3b46233975bd040bdc10102 SHA512 0225f2825928c123cde5781d8d34c64e71ac6c4349e7440bc4e37cbbaaa99b55ca86f14459477a0a4ab3bd60625f95427d3779bd167d10f721a2b2c4ca9a20ae
 DIST system-tools-backends-2.10.2.tar.bz2 448939 BLAKE2B 2a9a957b1f5438dd40997eaa2efba634fc21a9b7c3d26c3a48ac714e62d80b0a782582325ef92a3309024f278d73ac93c7611e51eca62a210ab44436e6bf9129 SHA512 9ee3e0643122740493265e532350fed9056334de0ea3d6656daa1d42b97f76f0f85024ac87e732fe5122a1e31ad009a1d2f119720081673a06696b81452fb990
-EBUILD system-tools-backends-2.10.2.ebuild 1461 BLAKE2B 6359a94e9e516092c1d4e1ebffd85e0bf8e0893c56325fc6c1bd98a6babc7fc0235af1c300018355d705be6f58c2a8338d236268906b46395585945115c7ac2d SHA512 267fa5f17b9c6bc20415f1b6dccf1ff163878421c7234798def2c9438d57d7c52df40fcb3d62600175dfd69352a47f4223bd4523eec1461b6fb2f78df47c525a
+EBUILD system-tools-backends-2.10.2.ebuild 1458 BLAKE2B fd83e464fed9b21b50f7e8de59e3a69e1a4f95d21a0223aa870f38ae83ddcde42e04133fb0dbee684721b70d29c99ff64ae95987a9fdbfa9987264b385b39f0c SHA512 b94452e2247be1b064f37be001a1352144e9cf62e53e14625e99a5ab525ccb7b7d929bc6c24993ce8cf2b0cb1e1ed718ac0f449633a4cfcc2e01c5be4f3d347a
 MISC metadata.xml 505 BLAKE2B d649c3edba16b67de8e85125083cf3588e4635640533457bbd3d3e64485947e5e568627df60a27f8bc6154c7d50de53bd285abda4744028b3a181816a965ea55 SHA512 e3d52afec42d48a68f30802c50b3e7cb033100acd041706b1bbba6b6168c7dc1b2720a20a346a974acd2b82c530e41868d3bc49f89c1a469ba38e372e459e397
diff --git a/app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild
index dfc2dbbf7dfc..e580eb737187 100644
--- a/app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild
+++ b/app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/app-admin/tmpwatch/Manifest b/app-admin/tmpwatch/Manifest
index 28a7b60e9e55..e752f322eefa 100644
--- a/app-admin/tmpwatch/Manifest
+++ b/app-admin/tmpwatch/Manifest
@@ -1,5 +1,5 @@
 AUX tmpwatch-2.11-boottime.patch 1034 BLAKE2B 37d257d39c8b7734e08f2498d07ac1d30e029a22c6ba70f2127f5a6a2d443555794022590e31445479ff145b9440695682aeb5be0102929ee9630c8a6527ce44 SHA512 6ad3cfe0dcd1a14d071ac64ca09279aae853c3b5a47604d99c2ff24319145d5c599ed6e780ac7eb9a2e2d185495e9d7e2133c905490b647f6b639a4bcd0def92
 AUX tmpwatch.cron 1533 BLAKE2B fd6e4ed53bb72e881a0dc92301ec04cf376dba40c2294973daaf8a353972664fb56da6e0f17b3ac161e189f9b7e5b9e883a7d2b5f64e4f909206432fb1163a90 SHA512 9c96eaccc70d6eadac1233b6cd6772c61dbe8fed348fbe45d729bba8d8434f32bb4ba800cf92f151d7576763f7fde7c5c25b55293ecdac5f5254ce387da8b016
 DIST tmpwatch-2.11.tar.bz2 145609 BLAKE2B ee66c77138e6f35030de817528ece1b3fa19622804e179fbc5c70c27281a52b8e8f7c7f631c9de73eb05085363852e91ee5a619de7db9a597a9f88afd95e164b SHA512 9242c5e1812c2ffc756cfc4cdc3023d0c0515e7c180e58ca3a838aa075d09fe4dc08dbc9afbc87ce3382e8aa8cb80a70e406deeab4ce10b39b6845d667989d97
-EBUILD tmpwatch-2.11-r2.ebuild 705 BLAKE2B 214cbd3477ecc7e74eae1ac175abdcf2f00f402df8ff636b546b0ebf696aa1c8dcad47be7f9ba6e10390f4a217f251fcc2612a6779a831af6dfb68bf32fd3b91 SHA512 4eb287da4b4f90b94fdcc480259eba7a43dbce859b6e2c76b7049b9611083d4c9af9948a9e6d286eef518a59225927e3da0f5df6dd07797f2dc2ec0387bfb416
+EBUILD tmpwatch-2.11-r2.ebuild 702 BLAKE2B 16500bce61c55d14afa735f52fb4f000b026e3516fa1302b807f661dc10e27d8424bfc3315217111776641bbf15e9aa070016e8428ef52b148536cf02051adc8 SHA512 9b4de7db232b077e75619a94f5a910bb0ce1c3749d58bf5bfcafdf6831807fcc247883cfa83bb48a65c36f802679eb1df494492993e5a35e27e6f24ea9107629
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild b/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
index a51a0f499862..90a685b79b48 100644
--- a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 3860538039a2..8b1438740405 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -4,5 +4,5 @@ DIST webalizer-2.23-08-RB30-patch.tar.gz 45723 BLAKE2B 510e984121cc5109e44218401
 DIST webalizer-2.23-08-src.tar.bz2 308090 BLAKE2B 84f56b8b6a7e2b382040649ca8c6b6b7b57de92a09922253473f6cf920a4dd10a2c268b926c0cdd4fcf029dbbe39d629eecbd74cc42f62c018a00c3cc86c4f7d SHA512 23fe6e3ef1c85aa527ffafef16c31c13ad8e1f9feb774557c07a5c8fd6c67986b98180ef16d6cebe62d59c5f7ca214b8292e94ce8f195fa0541de9c5438fb9bd
 DIST webalizer-geodb-20140201.tgz 733070 BLAKE2B fd97dfd14e2fcbc6c97d6cb423c922d6bf7504f156fb61fb11319094a4d2e25fd8fa2623f419b57d06ef0762a507799cfd750a5e3a86a143aa1afcc790942cae SHA512 c31bbf39ab2a27712f83e7c1cf4297bc26850ed72e68bb4b47233b062055cf26931e859cdbc70dfa7737e17a3c05d4858b4e9c9c3a0492b0b285f92c0f992223
 DIST webalizer.conf.gz 8986 BLAKE2B 6cee5f96c31a189bf7ce75ec845081d9a2f0e547362d415c84f78f1ddaa8e3ffd327517968037ac1606a485d9cba740054bb9851065d0ea03739b5558c7ef6f9 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b
-EBUILD webalizer-2.23.08.ebuild 4197 BLAKE2B 8a89f1e8a440d81fbf7afbfd9ff6a5ddd0064163415fc16a3380e9c66d689ec21c5f92cdbdd18648d20c04b01b8f46aeb882c0403f5bf16a91a99d736937b4cb SHA512 c63cca4525f7f67f5cea92f91c498916d85db409f5c04473200fd62b0de2078de39e7bcde08d30c5703d0562484fffe874b12e753cfcaa897fe54713b0b9490f
+EBUILD webalizer-2.23.08.ebuild 4194 BLAKE2B 115fbf6306de313ff489ca58923c85e3f5de3bf8dd1c4cf645af5345d80011281b5f4210f3ce2d5cc1f2a6a622010fa4c843763272eefffef190b615a310fe20 SHA512 b7c84e5dd62006b895f2a6ad77aaf590f2cba058e26af544f59340c582422a620606eb72f88c7184f86e2bee7c68deaeb78d71c21a68280ffbd66371345ae02c
 MISC metadata.xml 434 BLAKE2B 72cde450aa4735601e14978c5bfc3be91f257907988e6017dc27f7aca8dad9b8586dc78943d69a10344d25d2435fb8394b5fe1239a0ea7ff2ae3ae2b26ba0eec SHA512 9d006c56a0019b4ea29e8f9f845ca9006ecdccf64b9e50c343420af4b3852b5c08f09a23d792c3d1454454f8a0696a0dbc4b36b4da2c6f0d4967f533ad3a3149
diff --git a/app-admin/webalizer/webalizer-2.23.08.ebuild b/app-admin/webalizer/webalizer-2.23.08.ebuild
index 1d4cc3516728..d7e8d1edf7a7 100644
--- a/app-admin/webalizer/webalizer-2.23.08.ebuild
+++ b/app-admin/webalizer/webalizer-2.23.08.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
 
 # uses webapp.eclass to create directories with right permissions
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index b0732bc7d6ea..bc60e7494c37 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -6,7 +6,7 @@ DIST webapp-config-1.52.tar.bz2 62951 BLAKE2B 8abc9f5503c9204fdb2d860f819e06a9f7
 DIST webapp-config-1.53.tar.bz2 63429 BLAKE2B bb13d52a4c19859ff4730df2f7db75452effa23d1864d97aada38137f00ada8eec530f728f1c3ae06ecbed713a2d489b7225db3fc02aeabbf6241d0956761609 SHA512 7d2fc7197d537f2264c26b68b61e69273d2fcd3eec93657db54ba685c8383e7b8245cf05ed2ddd8b72453bf3fbf8f4bc4867e53d608331799df2e6162be14820
 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 1597 BLAKE2B 3783933db1096c90c62e028d54ed9e77052a2628c563b6c6c611bcb7fb827fbfa5c9c04bd8c4e1d0fdfe1f4ed2dd04d757a9cc4fda7e719935b0c982cd038c52 SHA512 61170176307bf70909932f471221cbb5343de4691d3d51d07d008cfef0ccecd22b7fd85ad9aa08ba918314ee5795b6d9f922834e19bc743c4861ff5824d340d9
+EBUILD webapp-config-1.52-r1.ebuild 1594 BLAKE2B 0e4b1dcd1ef61e83fa9b615ee50544f6f5a777ff127efd36071f736654d7f083c07d58190c1b973d5883768d5cdb20fec96056d4ada2401a5b16dcdcb16a491e SHA512 ded27be78013cf4e53f7510a262b3b860b1d4ec8734c9324bbadecd7341b7e6a9ff7504611cba0640499d36d57c73accbc9eab72e9364fd6578f37d9875c88a2
 EBUILD webapp-config-1.53-r2.ebuild 1667 BLAKE2B df0f9d31f228a7fdd97fbbe24f665e0dfd8c9ec7787f2f8ce8438a6d40b3508160581301cecdd288f42ea92bb73e3a3ae0608fbcd4267ac983b67605c33a49af SHA512 6dfd93c03f45edd231fb1d778c10ede42c632795f1bdfd69682dd87a7186586bb6511903d5620b5019abd65011c2eca5bf5d404881da0401b34ee371e6441e81
 EBUILD webapp-config-1.54-r2.ebuild 1717 BLAKE2B 75c8e4b0668370f2f13f0c6238ecb87a00d6675850bdf65995c9b9ca9110776de28ec07bc0cfa819f54cdf1c07cbf42e0fd675384b198353ed701cdd4ed78166 SHA512 b2bbae96aa700f0f5872e7a14d615901054daec84843b27c3f0ef62b2cdd1faea344ea3b5e9fb65c8418656528e7b70142767b28fbe9f6b20d855954fa3d9e52
 EBUILD webapp-config-1.55-r1.ebuild 1668 BLAKE2B b4c770b65588404efa58a8c388e26331cfae198f0e52332855e335b778fcb22c487b5e5769030be47b3bdcb59bce6ebb82bfbe70cf14b39db2518108fb2466c5 SHA512 3542abd0510688809145c21482d7df118158b92aa216602c615a4cf15e6e02cc587699d5afd005ad3da3ac655e21f30cef7c7e61cd05a1b7457ac3718efaebc7
diff --git a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
index 2c769179271d..09cd5701172a 100644
--- a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"