gentoo resync : 02.06.2019

73 files changed, 1190 insertions, 995 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 25f0fe60e9d3..9128bbdb7772 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 8385ece773bd..9ad38af2fdb9 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,11 +1,15 @@
 DIST ansible-2.6.14.tar.gz 10732165 BLAKE2B c753860a521c37357c7a5042391957680865416c036fcaf3920a65e291dc3ed3a52e94ad5b99acdb0d2c919e3be68b8462e462a935497dfe83b406adf4e63dad SHA512 ee532c0d61ab03a0937e89bfa7565f27f1905987784f31895e8ac6e4a8ecf76ca9f30201d278a68a995b8fc27151712dba2e79c13269a472d923355e36072e4e
 DIST ansible-2.6.16.tar.gz 10738431 BLAKE2B b801eb524f631950c385f7a949bdeae288e95d1590ea96f98e955f6ebc4ccfc5970e3926727850e7ef13fbcd7118ad6388e516a8fe62b53f1bf8b4d5b484dbab SHA512 ff67803cf6afd512ab779b7c862d4427591c90bb0ed9391e32fc8ea30c24c70cc31c910c9af51b4dd423885f858f65c1c8d6274565c90296ecd7a00df3374977
+DIST ansible-2.6.17.tar.gz 10742849 BLAKE2B 04667612ab7d149d7a322ce674c2256164c0d958d3e5b34cafeba0b90d4f0f07ee95a31bf0c205c13c90ee4d63c3045ce2fc51de8996a7dcb877d39e2da680f5 SHA512 ba46192549be3e853232d865116c176aebd8ed2b63fcbb45cb633d3809fc534004849a70a2abad80f9fe99deeb55af3883ce1bfe0db4a9afd2f6b8045936e860
 DIST ansible-2.7.10.tar.gz 11844278 BLAKE2B c847b642ebe4cbc2194538a0b194cd5c0bb82e0ba2a6da2e272670c75596b9793e028d067ddb37000c07f2c2427b5b99248b16c544daed4976c0210b601d3c97 SHA512 4d58ef080c8ee02ef36eb3116ec89e4542b5b4042262953b2001081601fe1066237191cce5e647f354efa9e1933cf5010519d049e678a90e8ca08620cd1788a5
+DIST ansible-2.7.11.tar.gz 11855636 BLAKE2B 3de8fa1287655f778b1d9036bf78a91387cf238209eb2bfd17ee79f7d77a2e03ae734901bdc04226d635b3d8543d122aaa251107befab8cc4a4fc63cfcd8deec SHA512 06f805a701f8284ac1a65251b9358cf6f27d420aabb1e29298f9e4d8aa73251bd4a8e8a3981f744b97b2f750fd3b594a9b505e5baa3ff2cb3aa7a37603ba48fa
 DIST ansible-2.7.9.tar.gz 11830476 BLAKE2B 7688ce9f74b0ab1fafd0e31dce90d995a9d8ca90bbe436f2d4ee9d005069b6e1b2c4dd679c2430a6873233da54ae06d3ebf08736681ec2e59e5b3ddafa6bb1e2 SHA512 4d39c7d4eb97264ce8f92812fb986b24af0c663efa6d8cd1d9a4cb25731d55e7518e503c04764e62d0458916b601baaa7acc623f9f83ce8b93e7f22900e29a53
 DIST ansible-2.8.0.tar.gz 14285827 BLAKE2B 090c314e0c707e24ce4c21722bfbb34d18d95e6e8cd63b06af78e41fedb3183adbdf6718da1bb8a2c7037f9ea9ffffb96add17a44cb199d0c000c1d6f88cd53e SHA512 fab8a0ac00e947e47ab606bee0a15e8c031f900b5e6fc68540429db0035ffdf3144e18e1d2265ac07bbea0a78873b85c43e636ee51ecfe14f3d612d2c54eb29c
 EBUILD ansible-2.6.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
 EBUILD ansible-2.6.16.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
+EBUILD ansible-2.6.17.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
 EBUILD ansible-2.7.10.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
+EBUILD ansible-2.7.11.ebuild 1637 BLAKE2B cafff348e72d7970fe6851e36c2cab55e18583dbd4ec2cf018a04ed2f7093e91c341c32458d334996f7779477409d47fce82477ab812e607ba1d9d624e6efc73 SHA512 b3760d5cefead4d7965b1d1dbbcf7fd41f2bbd2b8a4941fb02791832fd60c4b0c289ba34fbf945b8889a4b15b286e051634adb90296ff81e43a15f71cad66f47
 EBUILD ansible-2.7.9.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
 EBUILD ansible-2.8.0-r1.ebuild 1663 BLAKE2B 45885bbb6444622d27827ad2243ce05aa2062bdde7e545aea5617b1c3979c088ea4565e0ce07f9fda2e9bc14bb819aa89954d51bb3eb1a287acbec1da0792d54 SHA512 e679d5e32060071736fd555ef68d44d8ca28e44cdb8229f2c79019f5c05b36fc8d095b33ff5e651d89d9a07007401178024593b3f6e4ac055961a3eecdc36af6
 EBUILD ansible-9999.ebuild 1654 BLAKE2B eb0aa61cfa0eab600a18d26cf8d7060be0f93cc0413a844ac5e6a9938010b52d77a0ef28a2b36b802e7e8deba33caf5c4f6659410c2d74b13a13f92d50c0106a SHA512 040e5403acec6a13ca5042a3840480c4993eff4beef319229bd761c3a46cb673473d9c0297be176a3806f4cc15b30586a8af5e7743778de36d19d16dc5512b79
diff --git a/app-admin/ansible/ansible-2.6.17.ebuild b/app-admin/ansible/ansible-2.6.17.ebuild
new file mode 100644
index 000000000000..4bec3453ac7f
--- /dev/null
+++ b/app-admin/ansible/ansible-2.6.17.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+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 ~x86 ~x64-macos"
+IUSE="doc 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}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${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
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+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
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.7.11.ebuild b/app-admin/ansible/ansible-2.7.11.ebuild
new file mode 100644
index 000000000000..63e11740ae9c
--- /dev/null
+++ b/app-admin/ansible/ansible-2.7.11.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+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}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${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
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+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
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 348e0823d9d6..aa609f0acfd6 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -3,5 +3,5 @@ AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c57
 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
 DIST httpd-2.4.39.tar.bz2 7030539 BLAKE2B 1e378833efb9bbdd6fdc277a779620a08752d064524489f9ad747cf85350fbb6ad65f57b30c81d57273cd6693d8a2c4e988f5a2c42bd5c9c538b305b9b7719e8 SHA512 9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
-EBUILD apache-tools-2.4.39.ebuild 2579 BLAKE2B 999d4b6367146198056cdcc4fc1de9fb733812db81c738d2d47aa420ac70ad677645b81c06f54e215b8bbf90e7fdabd1eccc9d0ad4c10b237d76bd18e28c577f SHA512 b9d8e3c80b143da54071fb3d8b92d7a1996a325b3151021462dd566e4d24656bec7393e0234a6a16c605dd5446b927140ca54824b6b5674c76e7f648bc642601
+EBUILD apache-tools-2.4.39.ebuild 2578 BLAKE2B 3567f7dc0cd337d498cfea3d950d8548fa515c7ae4f4fd03810e8ceec7e821f4673b119eadee5f568ef90a7aa5bb58e58b564ebef115e36bd7881dd2164d74ae SHA512 265e2abc71c36124c977bc79002b88d672e558f17537839d7de6bb158fc476c96fa5a615af2ce6a27b6dee6fbbb36a675840351525ec0f472bc0f87830326b1e
 MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/apache-tools-2.4.39.ebuild b/app-admin/apache-tools/apache-tools-2.4.39.ebuild
index 69417dd72479..6e1a527d5821 100644
--- a/app-admin/apache-tools/apache-tools-2.4.39.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.39.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 9f3f9a7d0e37..c9b95d237550 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -10,7 +10,9 @@ AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b
 DIST conserver-8.1.18.tar.gz 323247 BLAKE2B 48176ba8be648df16ddb18c1a760af8069f7d926d2e0767e3b7ef903276d6104cfa9464a6ebdce009720fe5118862d89cf5371e104d17b967e11fe8e8968e8f9 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f
 DIST conserver-8.2.2.tar.gz 329048 BLAKE2B 0148a5b5b11fcc75a071b9759e129a94f1fe623df35e7549e967d0037ddb378447623070ce43429daf4868308be150f5ba318354e3181d94ccb1199655231373 SHA512 7c59dc59e59e3ee0172b2a52214cd8dd83383168fe0f145870d128b900a012cfa38c2f1ae85769c226d941ca1a764f93ec3bf353da896537ae1be5b6bc17e6c6
 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.1.18-r1.ebuild 2288 BLAKE2B d25a03bd1d6ee27d983c15455bc4f3ae76ca663cba75b353cfef17480f91f49d2d310a038ea9f16334bb75ece843f948a619c0980c1aacd9457bf2a2dfe0f1aa SHA512 4b87330c9eb8c9e731ce56b49afc45ccc04fcbe877d374b51a37b351c582b465946178ac41e50605ef958ffd0c65693b8f21ae0f28a65c462b99332bb6059078
 EBUILD conserver-8.2.2.ebuild 2350 BLAKE2B 6b502331697cffa995ab8e1cdfb03d086b78fa936941051a73dada85eea5de33572a07032d6973a1c7664c5a402345de1e2a06bc31646f987117c85e4d749dd4 SHA512 898c71213ff0b60156bf07ef2541df6d5a17ece9a8145fd080ae1932c59919272d9294e027aea1a051e6aa41acae87cd43c3418fbc5c1653482510a134942684
 EBUILD conserver-8.2.3.ebuild 2254 BLAKE2B 9d814ca1686d8ae19e5061d4a4dab85d35c47392a30233c37ebfa49de4ab8d627e90b9cd1fa8c22ae68ebb5c82f01fcf38a5d592514dbed99ba39df0bd3ff82d SHA512 2517c805ffd48239c2f65d53edda196fc61d7d1439297fe4319a32a2ce769373604657aeed27af17d288c911d0d564a258d7c3e16ffcf68049b7a5c27c754113
+EBUILD conserver-8.2.4.ebuild 2263 BLAKE2B 1aafde63585dce09739d0b06ca2b5c6dc8bfd6c2ea17ca4d7eac178ccc7c69680a29b8382da55ae425d22c5b065969b606ef9933b0c28c67627b3df9d86c533d SHA512 8d302941dc0c687370db246431ea78fa28713730e1d428bd9a5d9e5599383296367f1d4d6dfab5166802af78482c755422e084d8c02f938155e22cdf97683816
 MISC metadata.xml 1378 BLAKE2B 942f6b9d8fd616f089d0651fbdfc41de96033acf65f127cbfded2fb9c390fd9b86c037a62679ea27b18e4e618bf764d09277350e9fdbaadc914c18a6961618e2 SHA512 6b3e06cfa1013f71eb42c9c073df8c97d2b8fa6b935b637ba29096db88d75bab1bb192695ed4a5dad63d88341a366327f419cb357777c0abb09799c8bcc40970
diff --git a/app-admin/conserver/conserver-8.2.4.ebuild b/app-admin/conserver/conserver-8.2.4.ebuild
new file mode 100644
index 000000000000..54eae640841a
--- /dev/null
+++ b/app-admin/conserver/conserver-8.2.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools pam ssl-cert
+
+DESCRIPTION="Serial Console Manager"
+HOMEPAGE="https://www.conserver.com"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
+
+DEPEND="debug? ( dev-libs/dmalloc:= )
+	freeipmi? ( sys-libs/freeipmi:= )
+	kerberos? (
+		virtual/krb5
+		net-libs/libgssglue
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	pam? ( virtual/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}
+	pam? ( sys-auth/pambase )"
+
+DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial contrib/maketestcerts)
+
+src_prepare() {
+	default
+	sed -e '/^INSTALL_PROGRAM/s:-s::' \
+		-i {console,conserver,autologin,contrib/chat}/Makefile.in || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with debug dmalloc)
+		$(use_with ipv6)
+		$(use_with freeipmi)
+		$(use_with kerberos gssapi)
+		$(use_with ssl openssl)
+		$(use_with pam)
+		$(use_with tcpd libwrap)
+		--with-cffile=conserver/conserver.cf
+		--with-logfile=/var/log/conserver.log
+		--with-master=localhost
+		--with-pidfile=/run/conserver.pid
+		--with-port=7782
+		--with-pwdfile=conserver/conserver.passwd
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
+
+	keepdir /var/consoles
+	fowners daemon:daemon /var/consoles
+	fperms 700 /var/consoles
+
+	newinitd "${FILESDIR}"/conserver.initd-r1 conserver
+	newconfd "${FILESDIR}"/conserver.confd-r1 conserver
+
+	dodir /etc/conserver
+	fperms 700 /etc/conserver
+	insinto /etc/conserver
+	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
+	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
+
+	einstalldocs
+	docinto examples
+	dodoc -r conserver.cf/samples/.
+
+	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+}
+
+src_test() {
+	# hangs without -j1
+	emake -j1 test
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then
+			install_cert /etc/ssl/conserver/conserver
+		fi
+	fi
+}
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 10979e6f00f0..eca4ed626002 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.4.4.tar.gz 22736827 BLAKE2B a1b973a303f77d84993e4879aa92072d4f2d36353683cf9a2c6cdeaded8587e8464f066168f190f7347f6038df28b3cba1d8b8a3ca0b700ee085019af5014966 SHA512 d3e5dd536726976b705fe4c78c67eaf345b8f47225919c0ca1609d75e74343d9a16d893ef4cd5140998f23b3149cfa60f5b432ed9a7251bb3b232be9b65e7241
 DIST consul-1.5.0.tar.gz 20830405 BLAKE2B e64fbc22ade0c737db4f2f1b0e3966dbe617456a35d18a7a3cfa1b0f6ce2e335542b3add06c8b8e49995135b5a1576c824840030ac8dd46019bee915689bc5e2 SHA512 8cefb77b56b27995bba38517144bf42585bd1d9ad9a10fc0c9b6bc1a87bfbd042e336ed5e945cfce1fb8eb4b8162dbc8246e2b4109dea5767b8745a7b2159ef8
+DIST consul-1.5.1.tar.gz 21123963 BLAKE2B 4fe6a45f442d849196a7b9961110cdcc6f92931626ab583859efabe62038f6b2c356b27b37ea41b27755cca138c567be5c81854794a1ba0ccae3f9e0dfd10749 SHA512 7486d24bf1fa9fe94175abf9e008dc4fe4277c509381a524a9ee20e17bc4959f621e39be29e33622cb672ef3a04f9161e575009197bcd35c78b45f1d2637a2ea
 EBUILD consul-1.4.4-r1.ebuild 1548 BLAKE2B 65d5c22f412b28abf5c7067b5744ca2fb627f6513eca10d91055276016487f0123e6636c080d4841be9d05f4e26fe332f1867e7d540c7810ae43a187b1485988 SHA512 9ce2e18e5177ed96d005b6967d68e8df138ff18e47b28b52ea4fb971323c5cced167bc26fc08a30d39cb243bcaa275697fe7e10c6cacb87c12d969a00bd154b1
 EBUILD consul-1.5.0-r1.ebuild 1548 BLAKE2B b70a82e758c23c2c34ecd0fa5d45e56d840966135c8d578b09d702bed31b5148bffa2eb68412a0555464018ad04e62922a4e75d5c8a2fdc779b8497a6a539159 SHA512 00c8ddee82cacfaa5092bf45a37bccf7475e8fb6402579ee95188a9334f12309ba9a70771fb49f1b43bebec1e37ae68eb7d260a34c3134009f0b4507447c8504
+EBUILD consul-1.5.1.ebuild 1548 BLAKE2B d1d499907ec300d216e6884fb3c31d741911a799185f8220e0f4bb1f141105781368f9cb7c98bcd8ccd790e34b667f33b0dddc8eb5f1185318bf6c70917ead33 SHA512 6ab3f29b2416dd52250589d2ccae36f86161edea4a103d16a00e21e78c630fe8a6c7a61e8a50c08e3df546698e91f577e6ed94dcaeaf766b51f97ca93f894837
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.5.1.ebuild b/app-admin/consul/consul-1.5.1.ebuild
new file mode 100644
index 000000000000..23474dcfc441
--- /dev/null
+++ b/app-admin/consul/consul-1.5.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="40cec98"
+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"
+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
+
+	sed -e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-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/cronlocker/Manifest b/app-admin/cronlocker/Manifest
new file mode 100644
index 000000000000..e2e3c25a6192
--- /dev/null
+++ b/app-admin/cronlocker/Manifest
@@ -0,0 +1,3 @@
+DIST cronlocker-0.4.0_p20180710.tar.gz 60256 BLAKE2B 62adf6a935e13d97de9776f40a9349f7b3f1758c9d90c11f66759b87d3d8d9dc20a78ecfe0aa7849319be3c8c557dae3d9cc04c87bc6226af5842c72efac0611 SHA512 fc73b572da4fe485f9ba13340b946db40d7e0224643b5fe0b8f56b24560ce4bc32d0a42e3e0e33b979d3aec2910e96ff847249181e7b69776174e2f28d67797c
+EBUILD cronlocker-0.4.0_p20180710.ebuild 618 BLAKE2B 1c8809df94ec8662690f01d50441564fc39b0ce2d4c889a73cd96c0327eab42d3b6ef29072087aa9d5e69e4ba66e8bbf1694baae191c70aea8bc9dff37769ae8 SHA512 09efed34955f18ca53fe97b67e31a099d66637ef7b9e506cf200e976626d1560f174f869e753c09c8ca6b8ddf00dce12e7e9dccbee56d669ca06824ddcefd4bc
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-admin/cronlocker/cronlocker-0.4.0_p20180710.ebuild b/app-admin/cronlocker/cronlocker-0.4.0_p20180710.ebuild
new file mode 100644
index 000000000000..46e33d17179c
--- /dev/null
+++ b/app-admin/cronlocker/cronlocker-0.4.0_p20180710.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/Barzahlen/cronlocker
+HASH=c0ac605
+inherit golang-vcs-snapshot
+
+DESCRIPTION="synchronize a cron job across multiple hosts using the consul lock feature"
+HOMEPAGE="https://github.com/Barzahlen/cronlocker"
+SRC_URI="https://github.com/Barzahlen/${PN}/archive/${HASH}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" emake cronlocker
+}
+
+src_install() {
+	pushd src/${EGO_PN}
+dobin cronlocker
+dodoc *.md package/changelog
+}
diff --git a/app-admin/cronlocker/metadata.xml b/app-admin/cronlocker/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/app-admin/cronlocker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index e606897f116b..1c7a87f98eea 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -3,6 +3,6 @@ DIST eselect-1.4.13.tar.xz 177848 BLAKE2B 70e5a793759e16119f5233b2c974e0fcc8d213
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
 EBUILD eselect-1.4.12.ebuild 1623 BLAKE2B 6d8d236b4b11ec808ab1f95c0a1c295fc4ffff17f85151dd176354a1a1bb7459eb9d64f59411b7a7e3905a563884865c5dc23973f5d6674f13ebafde00ef3d0b SHA512 398ca70365af9bb0aef6807b8d797fe55c10afabe25b2e7a4657aba39b70748f04a5f94b24569701042399e9c4ffea1c48b824f7b179608d080981ff1159f2da
 EBUILD eselect-1.4.13.ebuild 1623 BLAKE2B f20b2426f4d508aeed32fa92d5c4b6e09024e867f830eb011a0e473d647ec9976d35881d6b39bd6f3c53aa97b03985cfe40ed95f4567afb6de4caf57f13141c7 SHA512 60ba4140a218a85f126790780e5810adf4aba9b7f5a2b58952fffe194dde0e41047f5ff4b481c4e9d491acdfda1b761041506c893a4f06d7dc121e3157a53de9
-EBUILD eselect-1.4.14.ebuild 1640 BLAKE2B a2628b326ad57259ad0dc50fcce13403dda4505f5f83aa9982ad0f230c543ea3937414f5538eb635cfe8dcd9e3d3cb93d6a97cbb541dea582245fceed1fc8e5f SHA512 4437117d84c679538e30e85e77a8707c1639c28619e9161a15cf90b69edc856901fed81a8eab6dfb867d4f4ad294c804d5f19197a627d7d40ffefbf9a2296e19
+EBUILD eselect-1.4.14.ebuild 1637 BLAKE2B 9f0e2e19dc35240c47d3218d96ba6d54ca552f2bef916e92aaa31390e10612b728f933effb2666df926262c1bd8a87e9538e1467c2f489f2a6aa1de923b7bcf0 SHA512 259dc8f16b3aacfd4416472c1d9e1f87a107443688dfb048914613edf791c99b288e7f6b771f0e9d73462ca039640921d40f4a59f624f22a9c1bc1f00aded472
 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.14.ebuild b/app-admin/eselect/eselect-1.4.14.ebuild
index 61a8c2e50a68..8065de2c7004 100644
--- a/app-admin/eselect/eselect-1.4.14.ebuild
+++ b/app-admin/eselect/eselect-1.4.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index 9c98b2f33f5b..db961fa94a94 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 1076 BLAKE2B a21ed61a21f62a06fb3ef9702b7bd82f696646c71a84e49f19a94250cd16701cc1aa18a3e0151a09df973c442957ae8f025294585916f66f82c88a6fa3045ef2 SHA512 877d611303b52feade51b60fcaca3513a20e5173235d78a65fd78988655ff6d76f0a2b51267549473e84374ef331c7231b25486af28951c3f46a616332f78b2f
-EBUILD haskell-updater-1.2.12-r1.ebuild 1093 BLAKE2B 9eaf109b857302eb065310c67e0f93b583a9a4d1d18683f78489a0f1dfe96bf29a2fb87fd10e14cab9abe5ded2277d7e4638e7c3c25186182b337dd748a45bd9 SHA512 274d02b8d3e2430b677c8b942f6028e6bcc6b407856d86a0a924d94c1ebc8af54cde249d77493346aee90000c2a3796cbcf447d9dc222748e43b00192983bf4e
-EBUILD haskell-updater-1.2.9.ebuild 1076 BLAKE2B a21ed61a21f62a06fb3ef9702b7bd82f696646c71a84e49f19a94250cd16701cc1aa18a3e0151a09df973c442957ae8f025294585916f66f82c88a6fa3045ef2 SHA512 877d611303b52feade51b60fcaca3513a20e5173235d78a65fd78988655ff6d76f0a2b51267549473e84374ef331c7231b25486af28951c3f46a616332f78b2f
-EBUILD haskell-updater-1.3.1.ebuild 1093 BLAKE2B 9eaf109b857302eb065310c67e0f93b583a9a4d1d18683f78489a0f1dfe96bf29a2fb87fd10e14cab9abe5ded2277d7e4638e7c3c25186182b337dd748a45bd9 SHA512 274d02b8d3e2430b677c8b942f6028e6bcc6b407856d86a0a924d94c1ebc8af54cde249d77493346aee90000c2a3796cbcf447d9dc222748e43b00192983bf4e
+EBUILD haskell-updater-1.2.10.ebuild 1067 BLAKE2B 13ec8d391f9046db45bd820988e90cc2b3e960a8d09cc245468206ba67da95ddad19056175012ec94a3be60e413a7ac17831ef622927e38b79216515bfd3cbb3 SHA512 73667872eb360dc9796de23306b049a55ab03d617bcbcec9caf8db0a5395522ac9bf8f3ba64a952c177bdf2e502de84fa7bf02699490f4c83979a474f6ff0651
+EBUILD haskell-updater-1.2.12-r1.ebuild 1084 BLAKE2B 134c72af64da1a9cfe55204f33ce8a207e545dd2430939ad81f3d06e4c6391272c633d1427e96376726b1d4cd6ccd516f8f6fb3477e4c18550901695ed340439 SHA512 0255aa8fffa8921f05bc8b083f0496c9a607b6766045554075e59f64912531ad28d61a7e3d46c694b433c8b933a017f17b6b286bdf699135c2a8088069f11a61
+EBUILD haskell-updater-1.2.9.ebuild 1067 BLAKE2B 13ec8d391f9046db45bd820988e90cc2b3e960a8d09cc245468206ba67da95ddad19056175012ec94a3be60e413a7ac17831ef622927e38b79216515bfd3cbb3 SHA512 73667872eb360dc9796de23306b049a55ab03d617bcbcec9caf8db0a5395522ac9bf8f3ba64a952c177bdf2e502de84fa7bf02699490f4c83979a474f6ff0651
+EBUILD haskell-updater-1.3.1.ebuild 1095 BLAKE2B 0bfeebae57f84fe2e8cded18f4884e5d3a2b4b0fe7527791e191e5f42c306a4357d1042a5cd341a74e37a10cc519582e5202ed5e23ce120b7b2103aeac0181bc SHA512 bd2b3b2bde105f209915b3ce091db03dad3041368acb009133d2ffb07fb9465ae56c81d6b940edce94db81a16410b6bce2243803dfa6dd5572a86e7ad07a7536
 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 6a1b5a5f118f..61e60ee2e73b 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ CABAL_FEATURES="bin nocabaldep"
 inherit eutils haskell-cabal
 
 DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
index 7861b7114a80..df22496ce85a 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ CABAL_FEATURES="bin nocabaldep"
 inherit eutils haskell-cabal
 
 DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
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 6a1b5a5f118f..61e60ee2e73b 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ CABAL_FEATURES="bin nocabaldep"
 inherit eutils haskell-cabal
 
 DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
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 7861b7114a80..9bdd7f451d1e 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,12 +7,12 @@ CABAL_FEATURES="bin nocabaldep"
 inherit eutils haskell-cabal
 
 DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/ksonnet/Manifest b/app-admin/ksonnet/Manifest
index 93fb3a1c35be..777b0d078b55 100644
--- a/app-admin/ksonnet/Manifest
+++ b/app-admin/ksonnet/Manifest
@@ -3,9 +3,9 @@ DIST ksonnet-0.11.0.tar.gz 11228264 BLAKE2B 2c5be1124f2976b6f38b23c9f871bc67a1b8
 DIST ksonnet-0.13.1.tar.gz 12336756 BLAKE2B 1952c02a0dbefc0efdcde1728348e62b23e9ef92fedb8444f98dcc0e670090be56aa001ee50f5e6885752e565863b3813556b091dc614a766677ea4d6e0722c4 SHA512 be16e986c27da358df27d632d1191837d3c16a92e702f3bc29d504de80128870dd4d97752db07c06bd5a11b517e69d6690b9608125d702f809c181d4109622f4
 DIST ksonnet-0.8.0.tar.gz 5260937 BLAKE2B 3b14618d9e40e0f71f966a0acd1ac121040ddfbd378b363236f98c4ecc6d2a2b688988816cd56801bc127b41ac56f4a8446bf152b0ffbdc3f64bce879bfa7cc4 SHA512 c80bbb0d6959045c2de0bf3a21b8a869b53a397e2e31b4b273ccd4f16afceb4038c6263a34d8e0934234cea5997949202e58dd7603902b221a140be737924aec
 DIST ksonnet-0.9.2.tar.gz 6552479 BLAKE2B 46aa62fe5c647d87f11b0c35db1e494d7c045d65bd98a0cc81bcb9c5a1890739a6f782dd04735781cb11aff70e4ec6f04ab97ff51b567385fa1e72bd2d835f15 SHA512 fd9c3c966ed27799f5c7e29e031270406e901c16089f354984d5aed62ebc53f1fc3be0f7623c1dff4231e7a5676b3bed879448845e35d6c1db5104ec28669a48
-EBUILD ksonnet-0.10.2.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
-EBUILD ksonnet-0.11.0.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
-EBUILD ksonnet-0.13.1.ebuild 871 BLAKE2B de4a469dac9e43e91ce6eb9fafa38cac4ba7cb30a7aacedfa8ba57df4ef5aa09686a2677e98c5f03195fbe3ec1c8dc4a32abd087036158db1829408c0e2adee2 SHA512 793660b3a34fd44acdd1c11075bfad84f78f7b016c5280248d6706f5a586fb529bc7503003ad73db1fbe3375dd88b23f293633c8e0e7fe385e574b2a25f5231d
-EBUILD ksonnet-0.8.0.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
-EBUILD ksonnet-0.9.2.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
+EBUILD ksonnet-0.10.2.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
+EBUILD ksonnet-0.11.0.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
+EBUILD ksonnet-0.13.1.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
+EBUILD ksonnet-0.8.0.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
+EBUILD ksonnet-0.9.2.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
 MISC metadata.xml 246 BLAKE2B b7d647c23d2215c6d61312a66a7d3521c8c16f69cf801328c67e9017be2809c2d16e29d61f190837c9fabce655dc69a506311a7781f7aa57c320524ed1bcd463 SHA512 bd98d2c774eb61947df8860a6948cda7148264a3bc86b52d317b3d805e2ab17fe81fe94ffc353ecdda86ad56bbfa17a044c9a789a878e15c5cec13c8e6eeeb70
diff --git a/app-admin/ksonnet/ksonnet-0.10.2.ebuild b/app-admin/ksonnet/ksonnet-0.10.2.ebuild
index 48881fd39b62..0c4bbcbd400e 100644
--- a/app-admin/ksonnet/ksonnet-0.10.2.ebuild
+++ b/app-admin/ksonnet/ksonnet-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.ta
 KEYWORDS="~amd64"
 
 DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
 SRC_URI="${ARCHIVE_URI}"
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/ksonnet/ksonnet-0.11.0.ebuild b/app-admin/ksonnet/ksonnet-0.11.0.ebuild
index 48881fd39b62..0c4bbcbd400e 100644
--- a/app-admin/ksonnet/ksonnet-0.11.0.ebuild
+++ b/app-admin/ksonnet/ksonnet-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.ta
 KEYWORDS="~amd64"
 
 DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
 SRC_URI="${ARCHIVE_URI}"
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/ksonnet/ksonnet-0.13.1.ebuild b/app-admin/ksonnet/ksonnet-0.13.1.ebuild
index 47e17f761f7e..0c4bbcbd400e 100644
--- a/app-admin/ksonnet/ksonnet-0.13.1.ebuild
+++ b/app-admin/ksonnet/ksonnet-0.13.1.ebuild
@@ -11,7 +11,7 @@ ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.ta
 KEYWORDS="~amd64"
 
 DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
 SRC_URI="${ARCHIVE_URI}"
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/ksonnet/ksonnet-0.8.0.ebuild b/app-admin/ksonnet/ksonnet-0.8.0.ebuild
index 48881fd39b62..0c4bbcbd400e 100644
--- a/app-admin/ksonnet/ksonnet-0.8.0.ebuild
+++ b/app-admin/ksonnet/ksonnet-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.ta
 KEYWORDS="~amd64"
 
 DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
 SRC_URI="${ARCHIVE_URI}"
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/ksonnet/ksonnet-0.9.2.ebuild b/app-admin/ksonnet/ksonnet-0.9.2.ebuild
index 48881fd39b62..0c4bbcbd400e 100644
--- a/app-admin/ksonnet/ksonnet-0.9.2.ebuild
+++ b/app-admin/ksonnet/ksonnet-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.ta
 KEYWORDS="~amd64"
 
 DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
 SRC_URI="${ARCHIVE_URI}"
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 967dcf14e304..c770be83dfa5 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -17,4 +17,4 @@ EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054ed
 EBUILD logrotate-3.14.0.ebuild 2511 BLAKE2B c824de62f72544448b54948e5025b0bfee7be00b9355be4e5c64d51721efc064dacec319f9de4e93c61a7aec2bd70c4d0515a693be375d35c16c30cb1a2b927b SHA512 e088a56371b59e4d10f4ea5574ba12985b9b7fe81de11624cfb302fee0bc08581334230776aaca74d67d9ca160dad4301f06b14e5c608c26ecffccbf370a252e
 EBUILD logrotate-3.15.0.ebuild 2491 BLAKE2B 54d0c42640b5bc52d8a06515dc93a8fb3882e5bff1307ff83ba61c02022f5a798646e56eb3eac11edad9b1d4a347a792401a155e8782df4bfe78eb782d429043 SHA512 ca4f7eb1af6d0ade04ff4917b254bb63b733daac0bcffc758804c2f15478a8b8c2ea6715fd10ace0f09966557f3d6999fcfeddcd9fd22cae6594838507fa5f08
 EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03
-MISC metadata.xml 1041 BLAKE2B da5759183dd7920f1b9eeaba5f210be086908a445239af3fd519dc7eab50caec35192a41987034c322a2e7decd6351444c551e552cdb99e1ec6a3371b0d5a14c SHA512 ac85df0dd82c18935ebd554d78993e9f57ba0c5684cbf5e85041b3f8ccc5e23f5c95e0d207255cc61bc1355f66f79b9802429ae581de66c50f9fd0cde5aa199d
+MISC metadata.xml 1126 BLAKE2B 1655e4bbc549896f4faef7cab3c539a5dc2a9910c80eacc6ee5626d97f1b6a5df448a502f3899833afb1723ee42f0be01e025a5d23ea3af1bab2a0311f43760e SHA512 f895d0c5ed7b02c4b92af5596a160199b6d765564050dda45171ff6e81137c508da5a8ae5fece89f04b2355d0f1b41f839aac667e4a8d8119ff64f44f34c6084
diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index 7ace94cc2ebe..4d03c4b664a2 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
+	<pkgmetadata>
+		<maintainer type="person">
+			<email>zlogene@gentoo.org</email>
+			<name>Mikle Kolyada</name>
+		</maintainer>
 	<longdescription lang="en">
 		Logrotate allows for the automatic rotation compression, removal
 		and mailing of log files. Logrotate can be set to handle a log
diff --git a/app-admin/lsat/Manifest b/app-admin/lsat/Manifest
deleted file mode 100644
index 78628970c9c3..000000000000
--- a/app-admin/lsat/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX lsat-0.9.7.1-gentoo.patch 1484 BLAKE2B 98182a2732d424ec1069c53f5cc247492704099148f3fa8e0e4d8fb5da01ba8840a17a9b3fad08ffcb7bba196934474d9d9d9c87b60915c7c60d9724061d1393 SHA512 55d0806addabf5b431ac18016f1f1737a30994b3558dc511a850d747f7b11f344c2070c0ea239c24a11511bccdb0693f54701586561d4b018934fa7ffd63ef69
-AUX lsat-0.9.7.1-segfault-fix.patch 1695 BLAKE2B ecebddf3535a45c09fc379c76ac81fb06c2fedd19159f0adea52b1ca73efd7fad64f2cf09b9b61e731b9ddee2d45ca1be562b650f6b324e6c3de0f141f7b871b SHA512 8be007761729ed7b0162cdba3d90a86ccb4caa10064f64a0fe3c10434227b3a5e185c9ca4509ea877a605161bd0482d8ce8758c1cb853756fe81ac37d41832b2
-DIST lsat-0.9.7.1.tgz 86077 BLAKE2B 609eb2a3345d147f03d03eea31fc34834ab2c0f95cf8b348ae0289020e092a991ab215160dcb1bee06ec07186fc2b9ee61af59dcff140dbda0fa91ebc7f8574e SHA512 fa67b5ebb03d11e3ee023c921977ddb64ea1fafca1d4cdb4b0fc5dbfa6edf46d57e488e9702175afbbde360a63d02ee5839fdf6576d974354a3b1d57f8860ffb
-EBUILD lsat-0.9.7.1-r2.ebuild 1002 BLAKE2B d3efec21d4cb30580f0a3d91f9e21b16793045c940dfb3d46de46e966865ee5809eddac8699297a558811b5b6d540b4c942e596e361b9f1b4294464b67c0dcc7 SHA512 da7eb95c87693dc617a272714eb99dc8b7562c1543ec75b81e7643f2f6a65b2df7a95fe0cf9303c10a73e8752a17c6450bb1b27d22880063c32c7348840d29fa
-MISC metadata.xml 608 BLAKE2B 7492ab0cc9545ce95a721aff6d1f9c5fd56cd94f4627d4bf70dd82349d8c3dff917e9d9e078d075d9c370a13314c865960fcf42b1603b76e5caf40fefe828b1d SHA512 05e9c4d8f92ce5ffabefe6ecab78023c2b0df2c6cc83e7e9c6db837b94b5c3c0f8248d5a3179641eec3513cd646557d2a1028283a03059c722be42c2f230481a
diff --git a/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch b/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch
deleted file mode 100644
index 631dcd7322f7..000000000000
--- a/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur lsat-0.9.6.orig/Makefile.in lsat-0.9.6/Makefile.in
---- lsat-0.9.6.orig/Makefile.in	2007-05-22 11:38:28.000000000 +0900
-+++ lsat-0.9.6/Makefile.in	2007-05-25 18:55:25.000000000 +0900
-@@ -12,6 +12,7 @@
- PROGRAM= lsat
- INSTALL = /usr/bin/install -c
- prefix = @prefix@
-+exec_prefix = @exec_prefix@
- BINDIR = @bindir@
- DATADIR = @datadir@
- MANDIR = @mandir@
-@@ -38,9 +39,7 @@
- 	rm -f $(PROGRAM) $(OBJECTS) Makefile config.*  lsat.old lsatmd5.out lsatmd5.old
- 
- manpage:
--	pod2man $(PROGRAM).pod > $(PROGRAM).tmp
--	sed 's/perl v5.6.1/LSAT/g' $(PROGRAM).tmp| \
--sed 's/Perl/LSAT/g'\
-+	pod2man $(PROGRAM).pod -r LSAT -c 'User Contributed LSAT Documentation' \
- > $(PROGRAM).1
- 	rm -f  $(PROGRAM).tmp
- #	cp -vf $(PROGRAM).1 debian/manpage.1.ex	
-diff -Naur lsat-0.9.6.orig/checkpkgs.c lsat-0.9.6/checkpkgs.c
---- lsat-0.9.6.orig/checkpkgs.c	2007-04-27 00:48:31.000000000 +0900
-+++ lsat-0.9.6/checkpkgs.c	2007-05-25 18:46:00.000000000 +0900
-@@ -113,14 +113,14 @@
-     }
- 
- 
--    /* if distro = gentoo, use pkglist */
-+    /* if distro = gentoo, use qpkg */
-     if (distribution == 4)
-     {
-         if (verbose > 0)
-         {
-             printf(" Generating list of pkgs on system.\n");
-         }
--        shellcode = "/usr/lib/portage/bin/pkglist 2>/dev/null >>/tmp/lsat1.lsat";
-+        shellcode = "/usr/bin/qpkg -I -nc 2>/dev/null >>/tmp/lsat1.lsat";
-         if ((dostuff(tempfile, 0, shellcode, 0, html)) < 0)
-         {
-             /* rhut-rho...something bad happened */
diff --git a/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch b/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch
deleted file mode 100644
index 558c8de60321..000000000000
--- a/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- lsat-0.9.7.1/lsatmain.c.orig	2008-12-29 11:09:04.000000000 -0500
-+++ lsat-0.9.7.1/lsatmain.c	2008-12-29 13:31:00.000000000 -0500
-@@ -232,7 +232,7 @@ int versions(char release[], char kernel
-     } /* end while (fgets...) */
-     close(fileval);
-     /* clean up even though we will rm it */
--    close(infile);
-+    close((int)infile);
- 
-     if ( (system("rm -f /tmp/lsat1.lsat")) < 0)
-     {
-@@ -308,9 +308,9 @@ int main(int argc, char *argv[])
-     */ 
-     char release[50]; /* array for release level		*/
-     char kernel[50];  /* what kernel user is running	*/
--    static char *man_distro; /* if the user specifies a distribution */
-+    static char man_distro[10]; /* if the user specifies a distribution */
-     const char * header   =NULL;   /* to print out the header */
--    static char *out_file = "lsat.out";  /* output filename var  */
-+    static char out_file[255] = "lsat.out";  /* output filename var  */
-     char xlist[100]; /* modules to exclude */
-     int xarray[33] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; 
-     int  somethinginxlist = 0;
-@@ -350,10 +350,10 @@ int main(int argc, char *argv[])
- 			  diff = 1; 
- 			  break;
- 		case 'm': 
--			  strcpy(man_distro, argv[i]+3);
-+			  strncpy(man_distro, argv[i]+3,sizeof(man_distro));
- 			  break;
- 		case 'o': 
--			  strcpy(out_file, argv[i]+3);
-+			  strncpy(out_file, argv[i]+3,sizeof(out_file));
- 			  break;
- 		case 'r': 
- 			  rpmmodule = 1; 
-@@ -366,7 +366,7 @@ int main(int argc, char *argv[])
- 			  break;
- 		case 'w': 
- 			  html = 1; 
--			  out_file="lsat.html"; 
-+			  strcpy(out_file,"lsat.html");
- 			  break;
- 		case 'x': strcpy(xlist,argv[i]+3);
- 			  somethinginxlist = 1;
diff --git a/app-admin/lsat/lsat-0.9.7.1-r2.ebuild b/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
deleted file mode 100644
index c1285e7e6de2..000000000000
--- a/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="The Linux Security Auditing Tool"
-HOMEPAGE="http://usat.sourceforge.net/"
-SRC_URI="http://usat.sourceforge.net/code/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="minimal"
-
-DEPEND="dev-lang/perl" # pod2man
-RDEPEND="
-	${DEPEND}
-	!minimal? (
-		app-portage/portage-utils
-		net-analyzer/nmap
-		sys-apps/iproute2
-		sys-apps/which
-		sys-process/lsof
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gentoo.patch"
-	"${FILESDIR}/${P}-segfault-fix.patch"
-)
-
-HTML_DOCS=( modules.html changelog/changelog.html )
-
-src_prepare() {
-	default
-
-	# patch for segmentation fault see bug #184488
-	sed -i Makefile.in \
-		-e '/^LDFLAGS=/d' \
-		-e '/^CFLAGS=/d' \
-		|| die "sed Makefile.in"
-}
-
-src_compile() {
-	tc-export CC
-	emake CFLAGS="${CFLAGS}" all manpage
-}
-
-src_install() {
-	emake DESTDIR="${D}" install installman
-	dodoc README* *.txt
-	einstalldocs
-}
diff --git a/app-admin/lsat/metadata.xml b/app-admin/lsat/metadata.xml
deleted file mode 100644
index 301bfd358039..000000000000
--- a/app-admin/lsat/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Linux Security Auditing Tool (LSAT) is a post install security auditing
-		tool. It is modular in design, so new features can be added quickly. It
-		checks inetd entries and scans for unneeded RPM packages. It is being
-		expanded to work with Linux distributions other than Red Hat, and checks
-		for kernel versions.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">usat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/mms-agent/Manifest b/app-admin/mms-agent/Manifest
index b89723703026..1d1adf853b91 100644
--- a/app-admin/mms-agent/Manifest
+++ b/app-admin/mms-agent/Manifest
@@ -2,6 +2,6 @@ AUX mms-monitoring-agent.initd 577 BLAKE2B 2a2df2f4179a8be766897fa97b543eb2e1166
 DIST mongodb-mms-monitoring-agent-3.7.0.212-1.linux_i386.tar.gz 2554037 BLAKE2B be5f8d64da4aade086d6487067b5ca3961752ad832d4a5ca63fcaf8db38d92eb7ff40d8704622c68e9ee6ee14d3973911c594a7d8829a407cd2d8fdc2ca23ed5 SHA512 532d1c2dee00ee2b64654f43ded1cd8b40da8401ea0edb24c81cee80a46289ebde47697c43cb3ffbf6ce3ef88e8d6b78c6ba1e0a615a7488efe1c42f1d827897
 DIST mongodb-mms-monitoring-agent-3.7.0.212-1.linux_x86_64.tar.gz 2643320 BLAKE2B 8f532f9a3ffc17a7cf9109660cde232babf8256dbeb9a0c0034e5231bd84a2ce9e5cc679306d2800baf9b642e2299a4fcd5eef3c6bdeb79ea6c2ad862a6daf7c SHA512 c4c0d10bca91485680760d25b0cd9dde2081af60fe7bd5528fea13b12676cb10bb069dab5acfac645cf56001a4579df32d34b268b99f449a59d314c6e3ffaa21
 DIST mongodb-mms-monitoring-agent-6.0.0.381-1.linux_x86_64.tar.gz 3618281 BLAKE2B 9c036707aacad3cdbaeb72817a010df5dd91c1c4160dd95dc026c77471c5a7eff7047a93c5b9097a7fc89db96c88eb2c1c83489fde7f132cb4d14ac446333634 SHA512 79366c8ec0aaa3209d7e54942a375185312c491ffc825d9bf70d1fca36b93ab819dccf12e8f1a54c8dbd24ff501a3e3547a5a453e80308d6d638e7c3cf866f9c
-EBUILD mms-agent-3.7.0.212_p1.ebuild 1505 BLAKE2B 8339ce11955f18b83215d992c8d6ac9d963f49ae000dd9661b57c3c1195a6dc243a26769d97fae80baa6c2172899f6f098b5948dca8f573446047682581b9fec SHA512 04098333aa796f7c7de91ba4f9707bb00bf54c902562dde7dfcea34b3d0534c93cc2c314aa08fea8b346c3db899511f708ff3dcb0bca82731e477a9e559767b1
-EBUILD mms-agent-6.0.0.381_p1.ebuild 1282 BLAKE2B 685f9f590f4445af2cd262f8758345d1775d691733247bc1f99c61c6e9c11b9a2c554b22f88fc9a5cd3312f1029ad15915845869c6b3ff1279c309e290fcdea6 SHA512 90cfeb0f2f965a2a2814a28024cd4ccd91d0172dce9679335f195584259dd052b24e83feda90193b4d6237e2fb2be73e15d1fa5199dc2fbc359fd907433fddc8
+EBUILD mms-agent-3.7.0.212_p1.ebuild 1509 BLAKE2B 6a6d1eee65df8bd608f31340f98f9ee0582c0b99d1615ab4ea65a08247dd4fd27789445fe046980cbecf8ae92460990672ee2761d71e59d869e0706afde808f0 SHA512 fdd4170c672a2432505db2bded015a6ea7941bd72e30eca689bc8135c07c0e9d90876b9768b969b18dd985660e30d6602769f1919adf00c7a381bed4b5a67c36
+EBUILD mms-agent-6.0.0.381_p1.ebuild 1284 BLAKE2B bc793eb7fc238c1f4ba2af5ce0a36aa51dd516025e8d8d5311886c5f5d35299d2a1baaab6262dd303770e38561c46444c2797fc847455722a7007b1c295b5892 SHA512 1f589480aa646f3a148b49cb504fc66f711e78f45c5359a84461bfb079cf5ee22c0caa5ac3555805da6d60f1c95075910f74e6705c004bac311d3f207999b194
 MISC metadata.xml 405 BLAKE2B ede71b3fd6b42c475b1f03b3fee1a715ef25c016645231b863fc3c6bdb7cb9b6a0c9d0ccedcd940198666ac6124f5037e918df2c9a315a588015b7ccd68b74b6 SHA512 1f2c0cf7a01e344fb2cf327b9a6619ca6e9d67e6a6e7e1a191b86a788f11826e72e0f2b96333e1270c91e2692d0733ad0fb64671d8d778b236f9c1b00d7a55b2
diff --git a/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild b/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild
index af3f9b652cfb..160ecf3ef623 100644
--- a/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild
+++ b/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils user
 MY_PV=${PV/_p/-}
 
 DESCRIPTION="MongoDB MMS agents"
-HOMEPAGE="http://mms.mongodb.com"
+HOMEPAGE="https://www.mongodb.com/cloud"
 SRC_URI="
 	monitoring? (
 		amd64? ( https://mms.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-${MY_PV}.linux_x86_64.tar.gz )
diff --git a/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild b/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild
index e597d7f41fee..4f3872a06722 100644
--- a/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild
+++ b/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit eutils user
 MY_PV=${PV/_p/-}
 
 DESCRIPTION="MongoDB MMS agents"
-HOMEPAGE="http://cloud.mongodb.com"
+HOMEPAGE="https://www.mongodb.com/cloud"
 SRC_URI="
 	monitoring? (
 		https://cloud.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-${MY_PV}.linux_x86_64.tar.gz
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 99b37074235b..b620ef68c841 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -5,11 +5,8 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_5.5.14-1stretch_amd64.deb 17369338 BLAKE2B bc0544d49f704b07fe058164eb9e1f3f9dc8613337942043a1f4d1359105c986b3b170fda076e8bb4fb74a4d0a423c434d27669410edefe7834ab633217e1ff6 SHA512 410f3e76a571f48456ce6e6b83a957fe33391db72c428d2518001ccce23d29e4911d740cb9c70903050f9a69c815fce8988caa1ba469742b334b1f61229f1a31
 DIST puppet-agent_5.5.14-1stretch_i386.deb 18294894 BLAKE2B 928ea0c7113dc6789a37b83f4499485d17f09cf7ac1ace5c3aad87f0a93e4143cd4763f61e42d35a7561d5438d7b5d70d6181ab7233f72eaccb67cc4d5388d18 SHA512 8ae02257cf729ce41e6437d9ee2f221884b0e49dda7b3fc04ef200487c937f258075f563817bb064a19c30ec19b790f4d9d03e240d8a363f2942cd613c579c1b
-DIST puppet-agent_5.5.7-1stretch_amd64.deb 17300432 BLAKE2B 4c3b13361b9a97734a7b63ad94d1e96d9bcad284372d0b63a085c4415fa7c0433e66546bd43c99a82839837ed5a8683c6d2739d47b629f5580b8007219f06010 SHA512 fa17413afc2f2872963e241b38c2d7abe06ed37b0f01f2ace3cc6c31e53451291fe98905957377940b16d1b6926991ef39b556a4697e9ba06f10f62583f72c9e
-DIST puppet-agent_5.5.7-1stretch_i386.deb 18222282 BLAKE2B b9ce9269cc59d79450cb66c9c3e545ad4267ad1a43905df4ca57b45ad1213dd11c9ddcffb77719a151f52eb60d6792a486823ea4a29b2f4e83a2d62960c9691a SHA512 b65ecaf27c2bcc6556d7d43a0b78e282a64c72eed3b672af5d2e23c34eefe8134b6d4c60505f9d7c6e5b40ed4a1ad391128933c27710819f5078ec7d8680b6d4
 DIST puppet-agent_6.4.2-1stretch_amd64.deb 18776024 BLAKE2B d8fd52357abb9649d74c9b7e54eb0f599cc2b6b1cbe8a4bdd3bd21c69904379dcda2fdea4e642d3f86bef846d1bdfb14eb8c3daed50958ad3add46bde96fe5d2 SHA512 b1bdbcb1cb87bbf4391073b0596d759e1386bd5b93046d25be112f1ddad6a0d4da162116dc9f85908de67bfd3d956a1c418faf39a85c3ed0d02f9891d4d9906c
 DIST puppet-agent_6.4.2-1stretch_i386.deb 19250972 BLAKE2B 8424047586f7747daf24901f7ba134bfcd1fc4db094fd458f4298251880b0446221575cc463c511a32a6f7cf4c635c95b6132631640b5091e48b1e7cec67b844 SHA512 0041b1e3ff1401b21f7d9ab3b3aee66d76e30acd4748571ff3ff595d7006008e0d9d3f4c28db85cccece0cf08595cf4a3342353f5b18ea3e02ae02a094e42e41
-EBUILD puppet-agent-5.5.14.ebuild 2480 BLAKE2B 2dc21f5294f4ab42011e2359caadaf207a16e7a2eb235cd33ea4300c41c5ecdd8df771c92eb350d7e5f7334b207b42540271f016c2cf2560f9d38bb41c3e3113 SHA512 b8f39ea59b87fdf1c6b83ec6cda1bdc66650c15287219060f42015928f2739dff8084fb7722462201abe950c8888667796f76bd83cda1bfa48795af8d472f202
-EBUILD puppet-agent-5.5.7.ebuild 2478 BLAKE2B bc197abccc5e3ee2bf58c799e56437a818e56994309963561497e8eb70dce277e13d14c441b1cf4da0fc8f688af3163e87fa9044e4a3f48b71953666f65d7e40 SHA512 742a16a57da4578a0d4db4ebcf60487b6278070e3210c775d7c6b3bb0670d7cfae63c7cb661b327d3373f87bb8f348b81baefc872282e3a26717ba18485fee85
+EBUILD puppet-agent-5.5.14.ebuild 2478 BLAKE2B cf031524bec5e192c4601d0078db68fdf87f11dc589d7116e67cbb3a11467712a04fd2244bb45970e891f953a168631d15628b1214e4ceed76971577a9f5043a SHA512 c7c5641b67cbfa72f726f420447567b3b89d676a1ffaf07b4672e86874a876b34909659ca32035ec4398c4dcd9f44f1ce0dff336fbc3b13a9bf81c4112e7f8ba
 EBUILD puppet-agent-6.4.2.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.14.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.14.ebuild
index 388141a53241..e56b95fe5bbe 100644
--- a/app-admin/puppet-agent/puppet-agent-5.5.14.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.5.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.7.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.7.ebuild
deleted file mode 100644
index 0eb9bfb5321b..000000000000
--- a/app-admin/puppet-agent/puppet-agent-5.5.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/glibc
-	sys-libs/readline:0/7
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/mcollective.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 00e736bc1e00..f43a9eb38cb9 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,7 +1,7 @@
 AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13618 BLAKE2B 91727c30b968b41dc8f6bb2ca217d5b9ccc2b5d08872be5a65a45b7f8bc37130255df139a17b7ca09b39b5b1a0b9ddcd6c54d2448148495cf493e7a085d2f0f5 SHA512 65b303c957a29bb5782a2b849944fba029dea3a533c25d4c17830391b5e4963fef304c0be876f5e7892b1a0eb4da16390d4ab1e39f459c05ecbb7100c9c0a9ca
 AUX 50puppet-mode-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
 AUX puppet-fix-tests-4.7.0.patch 1102 BLAKE2B e5c98627620f9f76f1421a13969dba3b1d279a63cdb65fc28713a9a2849c8e8cd0e42a30c9058e341d5bbabd3d24ae17c050fa551566e6c61301b83396a0b80a SHA512 81485af1a218b5616195ed80b3fc963c42d56265477be9a636c0e915a18771ff93e12cdbded45ce90da17ce72be4ea4881b5ad8e9d5a997be271df3cd2e8a2c8
-AUX puppet-fix-tests-6.0.0.patch 1103 BLAKE2B 622364a21ca637a64e5462c800535e9973159e9f988d5c0056c685c9ef587ce3a9158bd5cf6228c2487dbdf8ba4bb9df43200f1e74cfc4c6129bd19fbf173b5b SHA512 d39fdc5b0ae7828268e8f322d38c9aa8d1dc54a09681e957fc263b40e98eade342811573e3a8045ed51ecd5570dc86e0b97b8e3e12980cec238268e9964da38a
+AUX puppet-fix-tests-5.5.14.patch 1005 BLAKE2B ebe103e8408c2015e431966a637521b673ed79b97c318699d34efffadfe311143382eb5e961d626574072c346c984206dc3f93863b2484d3fa838c2dbf51d18e SHA512 d07598d6ef8631e718e5c4b4d61db87b2651cd1f246791778def5561f0262b23b0b8f2244e326dcef33dcc083fa96438ac138b21d5fdc246642e35b81829d2ef
 AUX puppet-fix-tests-6.4.1.patch 1178 BLAKE2B 6767555c3f43519238b2e539267a40977cc460800644f2807fd1fe27fa49f805e62d5aa0a74e4c1a58160bad1fe1f1628873195a60b5b2e0a83d484e26b72bce SHA512 88a25ad9bb809f06d4af618b1da2711d84e18a63d2368c7191c6cc3170e0d85930fc235057babc92e26315312636d61d69f54cd8a3a2c8acac13ccebd187c258
 AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
 AUX puppet.init 917 BLAKE2B 0ebbcdd8c9d4154984130ba3f597969f5f070f65f246770583663df4f192052a0ed666d09d4d417864457814d6a680ac4f327dc2a83b774da3a3c0d4efea1c8d SHA512 6bd2e1c21abaa5149b853f1732a6bb84335a8b4ae4129db52da463597691fd983d347bc04aad69724034d37f953f50c6aa5316d517b9efed2414db8e3d94d7bf
@@ -11,15 +11,11 @@ AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
-DIST puppet-5.5.12.tar.gz 3073481 BLAKE2B 8044af48e7d86e754f767b42199814ff9b2dcda04f1e13920cea332ae79b23997cc1a17fe761bb5216d174bc5d77c244a9eba7752c004bf1558a648c334f698a SHA512 33d844d671710adae1dbe184981143883bf4f3ac1516f8aedd1cd8d30157bc947a3a66df30c10a2357a8cb42dafe02a80a24007312b2107c68350ed0871a3249
 DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
-DIST puppet-6.3.0.tar.gz 2831909 BLAKE2B ccf6353c0fc1fcdd4ac06e79bd8d91980162b8f1b2012fc2bfc1cdea3d2d6b22bf55216cea9b94a4024273ca9f76eedcc92a861de9db348408a361596033b51c SHA512 1d30706049fe378facddb923a9ecb521d37faa84740251602ac340ea1299c247252fbdaca17f1ea450ff716ab26ac4e9524f1137080318e6d9237a9e2699f6b8
 DIST puppet-6.4.1.tar.gz 2893151 BLAKE2B 5c48b30083f93ce3625551020cc3b386cbc4ca8ab249099249099dc7aa8866186c197732ad603366d5fa54c3fc1664d7b457d323a2e6d9266faa754f7d4fa4ca SHA512 260f933dac3a3033e807c5b7c63d5562d9d8d29d11550efd38b0a94eac811f27444156cc11db38da170dc2369981072288df471fd05738a0f0e951bbdffe2a52
 DIST puppet-6.4.2.tar.gz 2891159 BLAKE2B dfd8e5d9935d54272096fac66a037b8eab75dedc42caf18bafe29738e749a66869ad2e741753e8b38d872e21b1a261f2b4017c54faa57043754d619cf27652ed SHA512 7ec2746ef2a021d1cc3e3076840a9f1195fe51ba591cf2907e542b3f450cb1f4002fa3c958aee966c5976245073ba3cfacc9fd2a653d1d823720b33984aff911
 EBUILD puppet-4.10.12.ebuild 5620 BLAKE2B 75fed43f7044fef014b1c9297066e07a5ef624fd187d141475e5fbaf69aab50494e783a16b212f3063cfaa059bec310b9771ccfa88d3f8ddcfc5458a75d2ba22 SHA512 8649b6811f330733ba25602e35e13bbd5be094c8f395d5f6c7a859662d831a579b9b3ad2a44b1ed9ea60882c32eb89a261f5e36977d79a2e9a88d5f12959a3cd
-EBUILD puppet-5.5.12.ebuild 3821 BLAKE2B 2915cab6c5c2e04edc45b5720b4293bb7924e24709a012809c5c99691406bd35d15fd51a88aea268cc241b2db48137375f3ffc16a41e58bb9c640de876a584fe SHA512 0e4ce9f7b04eb4b48e1ed6e2cbb88d58a29c3c28c351220c9edd287039fb118b0b0c262dca25de7eb17d8f6ba895b93d3eb3648cbdf8d743fc3adf891ba3f2d8
-EBUILD puppet-5.5.14.ebuild 3823 BLAKE2B ae14e84e6114d043c6b6ed310defa964c8ccd4b43d1bc7d6388c1a1f4a24590e0f7cb5263887c16509d796d54855f287f221d044993be30a293d0853c7af1d59 SHA512 5645dc61fbb8d3703727cd966735ac222353ec12ee68dc03a8cca49d81df1618aa39f281bb4ddea3819f24d5bfd4e13ed97a9f5a1722901a22a4a995db81780f
-EBUILD puppet-6.3.0.ebuild 3652 BLAKE2B f9221b1c41d6afdf96e5c0ffe047b4d5eee16319618dcd4de5033d60aae7890564052e2098fb3f12b900bd41982a78831a16de144e451f0d405ea35ba22b823b SHA512 d4ae4744c0931fe56a07ababebdf8624b5df16fb22194a30de3dd78cd5de90c9cfb726230f2b1c0c3bc90d1df3b14897cc0c7ce8f3e4ef5a74d9a24144204806
+EBUILD puppet-5.5.14.ebuild 3822 BLAKE2B b639a7bd6b1a2a0229271a2c00ae246e5cd219b91510f1fb1b5bcc4668d2f81c631233329628b78240354ae884ca9e4de02287896b326eef1220c81eb3d4e173 SHA512 1043b71e29082c1020a4c67814394dc70707c3f299afadb035bb2e15e4425a38dfa76b2323f4ad31b7142c1494cb05616ed28f0cf8f46b88760fcc53c3e734a5
 EBUILD puppet-6.4.1.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
-EBUILD puppet-6.4.2.ebuild 3654 BLAKE2B f29afbb842ad182df92104a03d02770c607f54ba228a694659b09d83c512bf9d7f269da42257e3ff92e68cd77e98da9f1b1ab317e791b97d338a3e30cdb3998d SHA512 4a197ad3b8114a4e7c685ff7b0ca21411645f542f1f3a948382f2755db126b6ad0cb61dc37f938a5c38a0c1ef27c5df4c91ea043ff2a3813f61406e63da4a84d
+EBUILD puppet-6.4.2.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch b/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch
new file mode 100644
index 000000000000..09ffe07da1ae
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch
@@ -0,0 +1,18 @@
+--- puppet/spec/unit/network/http/api/indirected_routes_spec.rb
++++ puppet/spec/unit/network/http/api/indirected_routes_spec.rb
+@@ -142,15 +142,6 @@
+       handler.uri2indirection("GET", uri_escaped, params)
+     end
+ 
+-    it "should not pass through an environment to check_authorization and fail if the environment is unknown" do
+-      expect(handler).to receive(:check_authorization) do |_, _, arg|
+-        expect(arg).not_to include(:environment)
+-      end
+-      expect(lambda { handler.uri2indirection("GET",
+-                                              "#{master_url_prefix}/node/bar",
+-                                              {:environment => 'bogus'}) }).to raise_error(not_found_error)
+-    end
+-
+     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
+       expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
+ 
diff --git a/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch b/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch
deleted file mode 100644
index 3e51218034cc..000000000000
--- a/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-17 19:36:56.000000000 -0500
-+++ spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-19 10:52:35.841614932 -0500
-@@ -143,15 +143,6 @@
-       _, _, _, _ = handler.uri2indirection("GET", uri_escaped, params)
-     end
- 
--    it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do
--      handler.expects(:check_authorization).with(anything,
--                                                 anything,
--                                                 Not(has_key(:environment)))
--      expect(lambda { handler.uri2indirection("GET",
--                                              "#{master_url_prefix}/node/bar",
--                                              {:environment => 'bogus'}) }).to raise_error(not_found_error)
--    end
--
-     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
-       handler.expects(:check_authorization).with(anything,
-                                                  anything,
diff --git a/app-admin/puppet/puppet-5.5.12.ebuild b/app-admin/puppet/puppet-5.5.12.ebuild
deleted file mode 100644
index 12914f0e266d..000000000000
--- a/app-admin/puppet/puppet-5.5.12.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-5.5.14.ebuild b/app-admin/puppet/puppet-5.5.14.ebuild
index 3f494c1f6871..75759e0d00b6 100644
--- a/app-admin/puppet/puppet-5.5.14.ebuild
+++ b/app-admin/puppet/puppet-5.5.14.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
@@ -66,7 +66,7 @@ all_ruby_prepare() {
 	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
 
 	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+	epatch "${FILESDIR}/puppet-fix-tests-5.5.14.patch"
 
 	# fix systemd path
 	epatch "${FILESDIR}/puppet-systemd.patch"
diff --git a/app-admin/puppet/puppet-6.3.0.ebuild b/app-admin/puppet/puppet-6.3.0.ebuild
deleted file mode 100644
index 3a0606a6edf6..000000000000
--- a/app-admin/puppet/puppet-6.3.0.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-6.0.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppet/puppet-6.4.2.ebuild b/app-admin/puppet/puppet-6.4.2.ebuild
index 0038f1ebf433..eeefd4e8c63d 100644
--- a/app-admin/puppet/puppet-6.4.2.ebuild
+++ b/app-admin/puppet/puppet-6.4.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 3ffe9ebfebc3..6d0647c0927d 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,9 +1,7 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e17086985733d56030802577ab5fb8106c7c47c603aa3da65ede3e5780c89df8b2dbece12c29aa1b171ceda1de7228f56 SHA512 6979ebccaa1136d19ffd0d67bdbff9c608c649d75b56b4b041d8795fdcedf24c831553c5361f8e144fa01bbac92af88e6548f917ca00eec707d8740a99689059
 DIST puppetdb-5.2.7.tar.gz 24353701 BLAKE2B 196b336a92031a25f7f28ca070a831857f3e0dde3ecc02e12e6884f3628c12dcc27b347c39147636addc975841f340fbf89196e86b3c10efc2ad1f16cf6f882a SHA512 989fa232d0fbd90c975fe110caca9b9c92a90167eb7b8d0384282dd8cf85111a56174c6785d7c73800e19185e879e258b8e6cefb210c1c44a229ce994336ef1d
 DIST puppetdb-6.3.2.tar.gz 41707817 BLAKE2B 480737af3abc862e90a7075011327ce3821a5d9460c785602c105ec7accc82f2ea712ae488c585226126e88f817cbb1acda7fa09793b7508aa38cc47e1c76ab0 SHA512 e2a3ce73c976cbbfa6acc62612187478cf5ecc9d514ff4866a74e2c6364979f17c3daeba0f03a01e7fc3eeb1ca84a3c886fd5eed07d2a9fbaa5fd9f7c9d577af
-EBUILD puppetdb-5.2.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
-EBUILD puppetdb-5.2.7.ebuild 2762 BLAKE2B a0a831a2d5fc57e047d2e02f3b186e07b16b4a2397c91f2d5420ff7664eeb7be1d3ad8dc68bf5577b1c43555c1e52bee45a3ec5179cd41f8475ed2d08856054d SHA512 3b7560b937e8888412fbbc44d891e587af7aaf27e2802534788dd248697aeac422e0be1348ef6896a09c8c60de9d48dc61ef067a61ec561f41ee9f8e6274e3ab
+EBUILD puppetdb-5.2.7.ebuild 2760 BLAKE2B e5c86d79191a026de2ffd9e322669c07258ef6fe4ddef436be534c580fb14e7ba5fb13c91d1cae61e7addd3571a938e2ec23c0fb61d6a4318f7807f08f1bdff9 SHA512 e60d80aa5c60d54b904e8402bb9e729e2216c2b038b34aff64ad5234cdeda32418da10b3f79029a879f20bfddcfd6923647aade0e3c566672316f72c9dd78761
 EBUILD puppetdb-6.3.2.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-5.2.4.ebuild b/app-admin/puppetdb/puppetdb-5.2.4.ebuild
deleted file mode 100644
index e2e9e4db500f..000000000000
--- a/app-admin/puppetdb/puppetdb-5.2.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.7.0"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppetdb
-	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-5.2.7.ebuild b/app-admin/puppetdb/puppetdb-5.2.7.ebuild
index 40efa2d8d9ca..5a1f774d271d 100644
--- a/app-admin/puppetdb/puppetdb-5.2.7.ebuild
+++ b/app-admin/puppetdb/puppetdb-5.2.7.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.7.0"
 DEPEND+=""
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 9373b9294ddd..1adf389de507 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,8 +1,6 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
-DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c
 DIST puppetserver-5.3.8.tar.gz 53615153 BLAKE2B 82de090126c18a607089c2d260c38c4dcf28c9dd55dedde43952493ac0dd0553b718f1e96c36737514527e72fbd04a4b54eb5667123dd46d21ff7e7e6688dd08 SHA512 ac2b28bd506a92606f5458a079fe9ffcd8a7d3b091ccbfcd649f0a818d0459b57bc3f40fa599f2f6e7012ffbd4b7e95af8ac9787cda74928bd29bb59b7633ba3
 DIST puppetserver-6.3.0.tar.gz 75698674 BLAKE2B 4eb88b15c936f8a66c5447e5761cc35772632420ca74de17f06453c9645f6f4d6483ec6a850810401efddf07f40710bd9563e78f5f870faaa85c0c6b2e450fa1 SHA512 a3c3e9c00e3dae274a2139a166c121d1d9b1dde8ad640e70d68433eee53a9bcf7ad8ba53d6e355ee1de93a522f8e0169eb80f52fc438ce6a76ebcd007398108b
-EBUILD puppetserver-5.3.5-r1.ebuild 4894 BLAKE2B 23e8e5a9b5d544c5107e8c56b5fffe727a06883dfcd13cf55f519e70a77798424a217970c4c38c1c703466a2ac16fe0032b9ccb7e377db5c40bdebba238caa53 SHA512 f43549918d1bfe8a9ffd444bd9816e91cde25b4939432949f28e4be5bf7081175bf524cbb66e9c9aa177b9da1844cb58155b1340b301c282a721db036cb83443
-EBUILD puppetserver-5.3.8.ebuild 4893 BLAKE2B 802069d0b2e2f414ed43eade2f993c708c9769ea25bbfeb7a49ed40e6690039a10f3014f07292b3a95eb42b05597aaea385e386d986fefac2b42eb3de6b7f4c5 SHA512 77a1f8e429a109e1347e47ba13198b7bcea17ec6564e84d1bbd4bafe1652b74507b3086d0ccd47da4fa04dbbaa177c67d2a8a0fc1043938948a4b50598c74339
+EBUILD puppetserver-5.3.8.ebuild 4891 BLAKE2B 98328c3b80442b6d2d2900f1fb9064074a04687ba4bfad2c34745a448c05a4a021c50aa53646139006a457b09249d951628be4ea340b8ab0d8dc9450b7529c71 SHA512 2e94ec40dd0b3dff133bb702fb002862373901fc84350c093b98970c567d2946902b0eda72770cdaa12e6d952b840c99b02159ec09157a84a22775e5197923e1
 EBUILD puppetserver-6.3.0.ebuild 5354 BLAKE2B c75b4c97ebd41fadf589e7ef752291425935af7d1f1528401f7dd1b2b670cc865570b8a610f1901eba1037bdaebb2d8dd2998380e001c046bcf54fe35b02153a SHA512 613533ffbcc1925f2ff040880d82f2a20c231d66697a49d6fc5fbf5a17528d3b3d1285918b83bf8ef4b4ee729656be610bb30f0bbefa827376f57da1fbd34950
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-5.3.5-r1.ebuild b/app-admin/puppetserver/puppetserver-5.3.5-r1.ebuild
deleted file mode 100644
index abb2d3c69b4c..000000000000
--- a/app-admin/puppetserver/puppetserver-5.3.5-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib systemd tmpfiles user
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	doins jruby-9k.jar
-	doins jruby-1_7.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	dodir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	newins ext/build-scripts/jruby-gem-list.txt puppetserver-gem-list.txt
-	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
-	elog "while read LINE"
-	elog "do"
-	elog "	java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-5.3.8.ebuild b/app-admin/puppetserver/puppetserver-5.3.8.ebuild
index 954d16fdc3b6..b2fc283c15d0 100644
--- a/app-admin/puppetserver/puppetserver-5.3.8.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.3.8.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 052d103eb44a..3b94f52a7020 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,7 +1,5 @@
-DIST r10k-1.5.1.gem 164864 BLAKE2B 398f656913b9c0b3835d782dec3aa0d7a475dc49ac6fba7734239a795e209048969c1e66575029eae5ac19513ac57e24adbfc839c9f5c0537c82fe0fe65def30 SHA512 4440a893aaa6ec0337f9347b620f92afd93099465c148bfe90cd44c2c6fe29cc8411b8c225044a9547d24a8857b580dcf2ea190bf64fe9ba180d1c5c3832d1dd
 DIST r10k-3.1.0.gem 202240 BLAKE2B 46b7b03d7d57aa856f31ee1a8fe804b1e5ed2272f2543955c46fd194a956c4074fab7a0ca59ce828e1d0841cd7beabdcaa7a167329a8ac707e96be9e71f2cd2f SHA512 7ec80be0e09d0693f33eaca4420a47a6fa7c2216ab8a06a45611b7150f97be00eaca7dd674962f14b169f9b0b315c3b47c76612baee0724c7d928541e535a960
 DIST r10k-3.2.0.gem 206336 BLAKE2B badc840ec7e6793daf205f1352899fa909e9a922a353a52841809dc80fd03758a865e0cb8210e58bb5c25968207d537b3f19c1903fbb519c50b6af2dd27eb5fb SHA512 7ea00ec28ba631877d33fa8b00b25e1c69346b787499ec7b26118c16acecf6bd39fcdc4618af016ebf5b62850b6d984510f7e9153dd4e99771def299b7d0703d
-EBUILD r10k-1.5.1-r2.ebuild 2131 BLAKE2B de5a13b71bb521c86393bca53da848ffc973efb2f199d28ee541b9869cb874b701f86084ef74754eb8543e8c9622f07b9cb2f7ccc09f0c4fa0a37186fea07312 SHA512 006378f1882b424be37282753543b1c562cf4fbfd298368c37c3944aca1ec611bb6a2058e7cb6c59278ba9488dded3b6b83a90e00a3c72b5c2b221bb5e06ca5a
 EBUILD r10k-3.1.0.ebuild 1096 BLAKE2B dc9c736609bad40702eea4b23c93c1979d448ab1d5906ace81b855ae19f8087e245e1238bd3635827c4af2128d7d2f44819f864d0e4bd9a66ce13e2c7669083a SHA512 d193f72c3ebd4b0d809f93dd521900c638731f3d01993bc82639e1a5a067cd3b8a6a7710c7eb07188df898a17525fd67c493c515168cb9f53c508fe4b86cb922
 EBUILD r10k-3.2.0.ebuild 933 BLAKE2B 6e7df53cab2a25bb5bf6fa4218cd670b742a68aeeb5402dd09d1f34861d0596250b915965a06b4cc8c157009d671046c00758cb576223d108e6b8d40067a23a6 SHA512 66c0c7e12e9f934c9e5f3024021e31ef4dce674f3eb27763bdc60413c9ef79dd101ed5cdcbdeec6cab9332fcbb60454754aea7c05f251b23327fef6f227eb7c8
 MISC metadata.xml 582 BLAKE2B e3b514385b7b851b3ce037de51024108005224c75fba470db28fe6e4d6b3632ace21a8e829198e0b22d1ba0e76b1a5c01df10426ea497ec3b00e20e578608d2d SHA512 fb8913a9f806ac0b2035dc788ee78536fff96ffb635454f668d7836d8ba849fea158e628da12743c1844b658961866b3d64e8faf700c7e373065045175785536
diff --git a/app-admin/r10k/r10k-1.5.1-r2.ebuild b/app-admin/r10k/r10k-1.5.1-r2.ebuild
deleted file mode 100644
index ff43d400d34e..000000000000
--- a/app-admin/r10k/r10k-1.5.1-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-
-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.7*
-	>=dev-ruby/systemu-2.5.2
-	>=dev-ruby/log4r-1.1.10
-	>=dev-ruby/faraday-0.9.0
-	>=dev-ruby/faraday_middleware-0.9.0
-	>=dev-ruby/faraday_middleware-multi_json-0.0.6
-	>=dev-ruby/multi_json-1.10
-	>=dev-ruby/semantic_puppet-0.1.1
-	>=dev-ruby/json-1.8:0"
-
-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/json_pure/json/' \
-		-e '/cri/ s/2\.6\../2.7/' \
-		-e '/systemu/ s/2.5.2/2.5/' \
-		-e '/faraday/ s/0.9.0/0.9/' \
-		-e '/semantic_puppet/ s/~>/>/' \
-		-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
-	ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
-	ewarn
-	ewarn "GH-48 (https://github.com/puppetlabs/r10k/issues/48) introduced the ability"
-	ewarn "for environments to be prefixed with the source name so that multiple sources"
-	ewarn "installed into the same directory would not overwrite each other. However"
-	ewarn "prefixing was automatically enabled and would break existing setups where"
-	ewarn "multiple sources were cloned into different directories."
-	ewarn
-	ewarn "Because this introduced a breaking change, SemVer dictates that the automatic"
-	ewarn "prefixing has to be rolled back. Prefixing can be enabled but always defaults"
-	ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
-	ewarn "to enable prefixing on a per-source basis."
-	ewarn
-	ewarn "Please see the issue (https://github.com/puppetlabs/r10k/issues/48) for more"
-	ewarn "information."
-}
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index adf7ff308813..f6976f815bb5 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1,10 +1,13 @@
 AUX ras-mc-ctl.openrc 295 BLAKE2B 8f6da9d6d4e392e4255ac70a57ece6e665771fc0f91c64506af6fd2157a5a4c159921ac341e66d18176434c523b6060c0cb2cabee6f7ca003e1896c0b6b6a266 SHA512 be635afaf5182907b4ae085d8c15b7aa6ae07e19a277423fe180a5e0524fa33747ceba8fe991cc263341b6c15443d3aff8f6c6c0311a87194687e25fa8387f32
 AUX ras-mc-ctl.openrc-r1 419 BLAKE2B 50239d64b95c1759a2fb88107b78875b9f6227c256c2a59628b33dfaf720c649e714afe24424f34e865d1fc46145daa8deda4e8612ef6c0d11ef1bf67b2c2e88 SHA512 f12c82432086bfdd0ee24a767b2c6dae9a50cb65038189bfdc2aff9447e5e734e1277d809ed3c7a55ac31034773983e1f46f466adabdd4e727b491c260c5c53e
+AUX rasdaemon.confd 107 BLAKE2B a3c0b7c09b1f3f76be0186208702858ca6ddcc9a9e912a88357e79e7f3aabe92b5a99f95c7bbe5ea1443e2ba2f8fcb83834b32a68774439165c7da0fff1d27ff SHA512 bc89a1fb03289bed3a34e84f593f5bc3506553ac64810ae360393cd33f6109e0a469990a79f2c56fc07905671c3e2fe9a70a65ba180df3855fdc4113ae5d4da3
 AUX rasdaemon.openrc 369 BLAKE2B 81768b9a6cdf4696d8598dc61675b86f617ae543cdfda8166f961d9ab470ba107165b72be32370f71f52b07503f3ea948cf9d7ad10c2899e2e9b79f1e06e96de SHA512 eb91a3c54033a136e5b35aa769b5c01a0810970e77efa3f9efbcda5cf088e5268fd7bd9fff953bc47b9233a41e5321094b4d2ef85500dc0175f5be6a64c03105
 AUX rasdaemon.openrc-r1 484 BLAKE2B dd64b1b6164f74e887ebff43116bd23311b86a7bbdf7830beb4ba27ad3e2db33e2107c7083c23f14e50e781a339e49be8a69ee902cfbc98713de034daa5a82a1 SHA512 e27c08bc118edd95468dd466aea52764df5b400ce9acf2043bd035d2fadbaa3b953794869c1fdaa23320e9529960e97c9e47dd31e8d8f3f48a324090f784907d
+AUX rasdaemon.openrc-r2 424 BLAKE2B d3be2b06631ec3dc60e464b5fb38a4778e92a93fc284455f53f6b7c43a05d182b79f478362ed93a706b421ca99f6a21afdd2cbd53d125711bbf1d0f267304ace SHA512 2e30602222443e519cefc1f138dc537f5e22109fde2f8ebb0f8962abd926721389defc46cfa8db667db8618d4dc4257d36e9855367c3c8f2b7d28cb8684a4adf
 DIST rasdaemon-0.6.1.tar.bz2 363201 BLAKE2B bdc7ec3c2e7e4b2fee02dddc55b5afd82df64717f45da15dbfd5fee87721b80ac425af5806ee7462cad29c6ab2953a2e649c4b1e455983d8821a1f633d76c85d SHA512 a221a7ea0e4555befbf8acb9d4ce22d5cc7861a0da458111a24905fa06be0e8f3b18d8de5334310a423657febc0532d2705236de89cb1788302bf487ede29f60
 DIST rasdaemon-0.6.2.tar.bz2 375140 BLAKE2B fd22185172777865120fbd13b7bfb5db9b9b0348fe8575ca6b5f16fd662c1e847729e239342b1c9ece70a4e79ad00352bb69d9f80cfbc8da2c961e68874dd03b SHA512 d8c1ee2cc801124837b3a0739f3016a206165306e300ce51e6aac2cef56bb65479f96cdb019ba3a5cffeba94e7b67ca22686d4ac94bfa8a8a1145db6ba51096b
 EBUILD rasdaemon-0.6.1-r1.ebuild 931 BLAKE2B fe6abb4a500f9890dbdcb06a457d7a33ab8b138fa22af2d4046ff133a9205a8f75c6e07273e4fb7eeadf3bf8a974e8fcea39e29c4b6d080a627d6619a4c2e5fa SHA512 02871f282b1b7a4f4601293974d7fbccc41ee7c90a590e6d349db20040bd1cbebb562c56acf8c0cbad37dd6e4e04ac0140f2d34e70f208b611b1cb73873a0f67
 EBUILD rasdaemon-0.6.2-r1.ebuild 1033 BLAKE2B f3a939268a9b34f730424f8d7af85c96e0240fb8ed3d6dd8b181bdc720b84622e41f2b2bb541a055dff70bda6f2e5c4952bf53bf68a328a7907b91ea47292892 SHA512 5837d47d13166bed48f89cbd10682550f4c3abd9e4c00d1757d432e9ece382c323e8cdc44b938770517f93a801b1eb2bf91ae93e034a9113f1d123e1f74bc338
 EBUILD rasdaemon-0.6.2-r3.ebuild 1137 BLAKE2B a2402b26a92a0b9e6e6383c27d82e558bfe3f2737702ac3f0b2f57096f2eee6a6ca3ee9e8ab1fadab8366eca762a76d82ee02b783b39c35325b3a5af73f9f881 SHA512 490ed88bed969b3ab6a634bf3b04086b187a58deb39279911339f953f32da0618cb055b488b15996c011b4e681b338e640c162d2cf9a90c96fec47f409455e87
+EBUILD rasdaemon-0.6.2-r4.ebuild 1151 BLAKE2B 15161840fc5b98646cf3fbf08657a5492c054876fae43905f55285f3ae0434a88c238479f7a3c02bbda476f43316b559bb4805df49468f66e206c14d3bec78a0 SHA512 2e7ea61b7294ac22d809f32ed6fef34d73444a7a6f6a6bfa93bc004c7cb1e14c75832aeeda335c5c9e4b82b348fe5520b71a381d713a5ba8e093aa2eff6de6d4
 MISC metadata.xml 871 BLAKE2B c9b484c2fd3019681f9c335fc046c7718c35bcafd9fa46f59328c68fb4404571818b861cb938bcb00fa08a164688a58735d7db27e73120597cd114a3a39acaba SHA512 1815bc3a92340071b40de8129441bbf55fee7edbec94f5337d6a9b42311cc3c1d898598d0756b60b56d804629700a2c0109362933acf5442a74097e752b24935
diff --git a/app-admin/rasdaemon/files/rasdaemon.confd b/app-admin/rasdaemon/files/rasdaemon.confd
new file mode 100644
index 000000000000..2b89db191cd7
--- /dev/null
+++ b/app-admin/rasdaemon/files/rasdaemon.confd
@@ -0,0 +1,2 @@
+# pass the -record option if sqlite is enabled and you wish store events in sqlite
+#RASDAEMON_ARGS=-record
diff --git a/app-admin/rasdaemon/files/rasdaemon.openrc-r2 b/app-admin/rasdaemon/files/rasdaemon.openrc-r2
new file mode 100644
index 000000000000..c8a2bc4b0e65
--- /dev/null
+++ b/app-admin/rasdaemon/files/rasdaemon.openrc-r2
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts Reliablity, Availability and Serviceability (RAS) service"
+
+depend() {
+	need localmount
+	use logger
+}
+
+command="/usr/sbin/rasdaemon"
+command_args="${RASDAEMON_ARGS}"
+
+start_post() {
+	"${command}" --enable >/dev/null 2>&1
+}
+
+stop_post() {
+	"${command}" --disable >/dev/null 2>&1
+}
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.2-r4.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.2-r4.ebuild
new file mode 100644
index 000000000000..19491e340401
--- /dev/null
+++ b/app-admin/rasdaemon/rasdaemon-0.6.2-r4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd
+
+DESCRIPTION="Reliability, Availability and Serviceability logging tool"
+HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
+SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sqlite"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	sys-devel/gettext
+	sys-apps/dmidecode
+	sqlite? (
+		dev-db/sqlite
+		dev-perl/DBD-SQLite
+	)
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	local CONFIG_CHECK="~ACPI_EXTLOG"
+	check_extra_config
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable sqlite sqlite3)
+		--enable-abrt-report
+		--enable-aer
+		--enable-arm
+		--enable-extlog
+		--enable-hisi-ns-decode
+		--enable-mce
+		--enable-non-standard
+		--includedir="/usr/include/${PN}"
+		--localstatedir=/var
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir "/var/lib/${PN}"
+
+	systemd_dounit misc/*.service
+
+	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
+	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
+	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 2c9f3f4b984f..f3bf752b8741 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -13,18 +13,21 @@ AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b
 DIST rsyslog-8.1901.0.tar.gz 2750872 BLAKE2B 8bc07bd0c73cf309b5fb853e3bc66e555dee4284d0c8ede5b73420db7b42758f5fcfbc7ca90b618cc27e7067795f2725f5ed96f59170f3d2690a0653f2b69847 SHA512 2b8b2d40d3df4c47dba765d70fc716dc127ce776b31f217f78a3e1c2bf820e41799a5069d7f41f04ce39baead286ecd42fb353492873e3795aff704d686d67cb
 DIST rsyslog-8.1903.0.tar.gz 2786605 BLAKE2B 2c60450b5f5a54f3d4fe4f9f51c81145cdebb1b0e1dd4b76f2ad23803c8bb417affbdcc9b4a0d8ccb65b0e98f5cb5cf187ce219be3e44e44c5bd253cae5f95dc SHA512 0f698c264a4afba56467b341c094be7357fba08a6ee7a24bb1b053c06da04e83eb1832ee46b68ea21f8f4de841cd97aaadc46e78bb4adfe23604c9fe95103fa9
 DIST rsyslog-8.1904.0.tar.gz 2902708 BLAKE2B 515d5e32c2dc6cdd8dd51fc595ad775503438603f28828e9f1a427b184a5a61de32af2ee90334b7d56a9404106d74da47386a18a370278d5a16422a6bb09f556 SHA512 cccb48f06508d7e7c2dd788903f4d7ddb3020cdf6079aea1d52387c56b920f10b08957a79b5d420ccdb54cae50d1da6e5eb80cde9498bceaeda4f6ce37f694fd
+DIST rsyslog-8.1905.0.tar.gz 2911703 BLAKE2B 5767ff2e5f1104522bde2178ecadfacac3d0754fd746754b7b29509aea45c40b17cb37d0323e6b1116fc95f2e7b1f43277ef9c96695bdf89805f9ba90944f608 SHA512 e014d48c213723317b8d07e3083e32a480e2b896eccc0dc7a491798cf56fcc1e341acba64ab44c1d935e964082c405f2f1135bd420d821e163c148e736332d0b
 DIST rsyslog-8.38.0.tar.gz 2721798 BLAKE2B 578bc9eefce4893a9c1eb54ee7360cd9fa51b3c87ffe07a0fd5b122987f991835f603417243084de0b59286e993ad1c84237e61c44bc18457b3660668421101b SHA512 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254
 DIST rsyslog-8.39.0.tar.gz 2721560 BLAKE2B 0680cb31d0a07e5676a5c5626e46fa174b8df08ceec49b514624ff8ffeb750bbf199f73af1d89b9dfad121a292084d75b0a1218fb33138f1d7a149fd730cb3d9 SHA512 f46ead433f703df4af6ddc4bbb178ea145d7d2a35ee7749c32b9889f299ba20c83ed76c246530608198e84fef1f2bf10097344c31d5df38b9e0ae47cf4bee479
 DIST rsyslog-8.40.0.tar.gz 2726022 BLAKE2B 33f7f2018200a20b01dbfabeeab592aa09d530edd313bb13f16c47cf3f67aebd9c465af3f1e468ca3d352cd83e4f4eee567c6fd54bbaee1723bee56f4631b440 SHA512 3d5d4f92e37ad9bf3767d5d7fc87fcb7956656f676a9495c78abd12fe9072ec8763b50543b198308a71d5d919721fb9b84b6725dd83a9d9b8a1639d81382c0dd
 DIST rsyslog-doc-8.1901.0.tar.gz 7768575 BLAKE2B 40bc8b038fd0210d0cac01704624d87c2a73701a7494e5970423adf14948e46d1cff6df5894a82e6664d891d0c2760a5a0154bc42fb410ecf6dd25f3166e17b8 SHA512 afcc592ce4bf0dbe048786627d87b783f1c99e7711c44ffcc41cde67b2b2fef55c944b5c90e7272a84bbec95b78c0174df634b02baad2ac5819b3611efc1cb98
 DIST rsyslog-doc-8.1903.0.tar.gz 7816457 BLAKE2B 0628a5e7f0a2c8229470f6b05c22fa0d01de12eace4f895e17a47e7003bf078be5f3b2df15cd13a4cf53384d285b558b0936308cb58e7c7e71796ca99447da3e SHA512 b42f950499798fd2bbf9e2ac2da074781955cc552628edcd928f25943b6b80d5f2e1a2eab3b8fb0fa2f6278f2b4366f096c3e976a91223e545b4306479ca4f5d
 DIST rsyslog-doc-8.1904.0.tar.gz 8042650 BLAKE2B 585fe5c63eee1fb46f94dcd3d529045b3900e08c291e0e71ed9bf32a6200e6c7283820b262bd56e9aeb74cc227ecd518caafec5a8f87c1d8523d5d7fd95030aa SHA512 da0ff00fbe71756b3c27fd8b94e88611452c3ba611e583862556393faaaa596ca8f32f694ad40a3e1df67385d9f9ca80db6a58f5d2e336fe95639dd7cd0de828
+DIST rsyslog-doc-8.1905.0.tar.gz 8054440 BLAKE2B 76f832fcbb41d405240f7bce4796edf4a56da5ff809ed846edbbb1b780a35837a8d061519dbec2e7afbe46a71f617d5f92f431f45f6723c055bab2fdf0df28fb SHA512 7b468aaa79a2098746bc5592f2c03270aaacb07dd06fd3be7a8c62bfe531b266e27265d873290f9a6bfb26135a4a6c49be96177a3449ff7dba54f1193c452ad3
 DIST rsyslog-doc-8.38.0.tar.gz 7662314 BLAKE2B 57a121950a3f6630e4736a1ff998e93b543389107d146ddb148ecd2702bb208d21a7f4d77f2fd958f2a56e092341fc6a24ed1cc80a910cb1adb54c65b5b2da04 SHA512 e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5
 DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd17aa517c2fc875c46ac190428db6aa2a0f81f8aaed6e5b0b6991a5c13f45bc818be76c0fe4444c0eb45628ebf48b4956 SHA512 a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de
 DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f
 EBUILD rsyslog-8.1901.0.ebuild 12354 BLAKE2B a5907ced4f42a503ce63d19bdb2fdcca4db442cd64e053f9858d3809e7a40ccb879bc00ae2021daedf6463cb16767413c9b530476ae5f4c326779a808657f390 SHA512 961b98101d517510c3de600e1e2e74cc5d7533de2d6317b53cce49a8a6d704729cf4b10b6f502d65c0ae876257ce8d42a46319b718763b4cb59eef03ebbccff3
 EBUILD rsyslog-8.1903.0.ebuild 12531 BLAKE2B e8ad30c6ca996894be5a84be8a8b19ec2354aaf44aaf915c8471c0cc51156080a45fd2c422d2dbef50904f8a820693ef5e1f93267ce9fa12b37cb863028dd91b SHA512 5918af3232e7d2bd9b6e8511a9f29f276b081ffe2a4f6b3c0773b737b97d104b0722a64a3506360ae8794c2b1aa7c8c6327d63a3fcf9385db6324a409b940060
 EBUILD rsyslog-8.1904.0.ebuild 12571 BLAKE2B 0d892e66f94d73b20c0addb444edd904d6961cd7918adcc024f813776d766775fad7c0a288df2656f1cee14387d33949bf1c85cb86f85158b1a700393aa3396e SHA512 2826e3eeff416a5673f8810673097a524ea34718af98d934a8eac7a3417167d167ea880bc3ec1ff0b984ab6d95bf3344566d557978c0cd04052d177ca55992f0
+EBUILD rsyslog-8.1905.0.ebuild 12571 BLAKE2B 0d892e66f94d73b20c0addb444edd904d6961cd7918adcc024f813776d766775fad7c0a288df2656f1cee14387d33949bf1c85cb86f85158b1a700393aa3396e SHA512 2826e3eeff416a5673f8810673097a524ea34718af98d934a8eac7a3417167d167ea880bc3ec1ff0b984ab6d95bf3344566d557978c0cd04052d177ca55992f0
 EBUILD rsyslog-8.38.0-r2.ebuild 12281 BLAKE2B 8debd0ba1551ece2c24fbfb8893204e592ed40682eeab26ea2b32febfbf1442aeabf3f7215bd5371fc9c6abfe6923da887f71d12be1e7e57193b03d6b65c4a21 SHA512 7c95fc07a96854386a611878a53b625b0d95615058c9c2c97dd2ad2e563bca1cb14e81be747dab108e7304734d2c2f86a8d626626ee52178dd769fefd8339260
 EBUILD rsyslog-8.39.0-r1.ebuild 12357 BLAKE2B 0baadf35229801863b6f2dcbafed210d8d9503595bd9410969e52006cfc0d34c52b9c6dece38285d6674ae757b9c1d223405d02813fea4d0c2e0c15e50915c5d SHA512 b7568c5217593aa764645793a8d92c6c116f8108c0b7e55fe625c463cadb2ca0a2e71060686fb100cea87e870911862fb5770dea07e866b98763596be56ed3dd
 EBUILD rsyslog-8.40.0-r1.ebuild 12337 BLAKE2B f2c9a511505a4656c5d39fb81ff65687d062bd78338865d702248ce77cbc9e55fe9edb0139d8aade2d793b6ad725a2f3060249959eab8e7278ca56dfc936df76 SHA512 f26f3f622e2242e70185ef62ff995394fd6fff830d6c21392fa0ce4bb49986c1417e14f1befb5923e08f5a2a15396af417f0a1f63acd7256d3f577d31da814f0
diff --git a/app-admin/rsyslog/rsyslog-8.1905.0.ebuild b/app-admin/rsyslog/rsyslog-8.1905.0.ebuild
new file mode 100644
index 000000000000..1161ca1f6d61
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.1905.0.ebuild
@@ -0,0 +1,463 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
+IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( virtual/libmysqlclient:= )
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		>=dev-libs/liblogging-1.0.1[stdlog]
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/spectre-meltdown-checker/Manifest b/app-admin/spectre-meltdown-checker/Manifest
index cbc17f2b1c4b..a5765b9133a5 100644
--- a/app-admin/spectre-meltdown-checker/Manifest
+++ b/app-admin/spectre-meltdown-checker/Manifest
@@ -1,8 +1,10 @@
 DIST spectre-meltdown-checker-0.39.tar.gz 43785 BLAKE2B c8688b28eac8951b3cf813cd591adc9cb01756a1da149129d2045274bf3d01c56a9145c4dd9154f6229d53a993dd8803e6c0cca866710ba09973f13421be4e6f SHA512 175bc147356e9730fb13f71c66e8826e85e3ad4e0d7f1fbb075f8310e1763f442b3da85fae70f107dcd77172d498fb24857c9e8343cb6813857039d55e9eab6f
 DIST spectre-meltdown-checker-0.40.tar.gz 52463 BLAKE2B d0cbaf695bea41bf918900d1356b8dd26cd7ab7b66ce8a82b2e82a0554dcfe5435bb20262490dcab312e2be4962a2fabb1defba0295a84ee62b5fa876f20f5b8 SHA512 da2d63d9aa513a529537dc58f9370c811577f70ecd856ee001888108a871351484f47697cdefb1b0711be3fb342ba733e78b75fd154eec98c4c9a8504e6adcf9
 DIST spectre-meltdown-checker-0.41.tar.gz 56170 BLAKE2B 07ec1a56dd13c15463696d136652f67d771d71be5ff39ed0024ab69b5dc84b1bef0c695771b0966c89e7311a9c894e2f7b9ddb8ad2c4120da183948b63044c2c SHA512 4391098cd969a211ed77e386e79df3ea2c2482bc1817e9b037720922cbd845457c4192e1de7b0a62ec971c3b6c551240cf2ef29191fadce1698256af43737b26
+DIST spectre-meltdown-checker-0.42.tar.gz 57491 BLAKE2B b13fdf74e0b63db1dd1aaa6bc154ab2717ee4a3ca601d7c6fb18578e42d03545010fe74cb72fe17ccc8c2ff949d47af49704cd8bd7431b5ec3cf1d7fbd288d49 SHA512 721e9287ce367648e367850b94866a6465b92561a0c2f1699599ef333921fda988979db02004b2c83ec9c808f625f793d43eacdd84d44a9d1eba59b2b300174c
 EBUILD spectre-meltdown-checker-0.39.ebuild 609 BLAKE2B 36d1843107f84dd5e36b3f3548f64a6d34675ff83709430b7209ce817c362c7608a538439cec26d20c6507b556e822ea6e57ca9cc1260641092c55ed4b1c8005 SHA512 f1464c0b9ea01606833459688a90621b573c40ec598c39ec1bc4e41e48f8a5264345b82212d9332f09792a6cba1314f8bff2e519f982dbaf0a7b59e3b355dbef
 EBUILD spectre-meltdown-checker-0.40.ebuild 611 BLAKE2B be71069f07922e8bfe1ee4627a6483c22ad886807cfd95cd67151d45e38456c0e132ef2572ab0b2b4220c21ba76a5e2aeb7dcf1db4e745f5a7d24a9b9442e0be SHA512 9e9852fb0268f890061528c0e550f63b023aa966025b1d8dcde83e24f3de768eefd806aa90ec97c5e36b69e614b03c0218c2443d9d2af1b54da3d95b83536b13
 EBUILD spectre-meltdown-checker-0.41.ebuild 611 BLAKE2B 205796938c2b38c3dd99c7799cbf564be38be6ed377250e4f3e72da525ae80ce1966f53d6e4ea283496854923be899e9b01376f7ea952b6ec498b9f52ecec2cc SHA512 8f9b0362c498942079455927ac26dbefcdec549f216e1c250e0fd9531ff81ba1274f9142eb325bb0e0d3a5b6b8b006ced06714b9a0724f8be3904c137226fba7
+EBUILD spectre-meltdown-checker-0.42.ebuild 613 BLAKE2B 845c9882ebe3ea93f8658fe713845e4cab942fdd59a7d1888e4cc6a424defcaf4eee2a347169dce54b7ecd0f485c8310ddd6aa5b9ac260de3f213d9fb7347294 SHA512 af555d0e399c9cc9e100cb06e91821e74779286460262f87cf5bd0cd5832562fa6cad0a2f8bf80e01cfddd59a0722a4b2c5e3ed55d6bcc4207deb26e1e1577f2
 EBUILD spectre-meltdown-checker-9999.ebuild 616 BLAKE2B 1a0cd1b4cf550568a77bb037cd600cd9a54f4ff0eccd267a98b6849c1bfbee97ba967c78f6566a1b6349d50d4936b243714cec8b2e2d87509d3da9dee1048f18 SHA512 2c09e4d7b49095e2e1bd2a19fb26745898409295338167f5e8a77164b207984234b18c08916add448b7f31e6a2ae789ebc9bf955cf623e4678038d58fcaf572f
 MISC metadata.xml 461 BLAKE2B ffd3a0e87b161c95e73d98acfb9ce11068ff5698ad095703e48ff7a95bd9c65379bdfa87ed19f6a1c5e10458cb10042f33e986d58741f8667b49409c1d7083ad SHA512 9e59c70f06c412ef1a742d2edbf62ef5e69e3997e8ba713e61a91dfcdb4a399035e60d9ce6fad43a1568cec658f05d33bc3aaa5fd2efc1cf70eb0f5fd98e1dbc
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.42.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.42.ebuild
new file mode 100644
index 000000000000..6b4c5b8281fa
--- /dev/null
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.42.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
+else
+	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
+HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_install() {
+	default
+	newbin spectre-meltdown-checker.sh spectre-meltdown-checker
+}
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index cb65ab498d78..52d72678cf09 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -7,10 +7,10 @@ AUX supervisord.conf 2525 BLAKE2B d36d6ef6b952a99ccfd61976c21eb54922555db4802288
 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.1.tar.gz 433742 BLAKE2B dc0683566c9b052c6a832e09eb6eba76890f07f5b67a1c129343ed3de31e5dc88777cfcb1b3c06a6a687160c172c3d83227765678c9c54239fbe57eb9b5ebd0a SHA512 e2e0e92ef1dba74ea4e3e70c2bd56b8a497d22db8123411f4f2019b45626606e90030577ae79aa8b81103c2f337c76d7516f94bb01e97172e2e541ec44d0f1b9
 DIST supervisor-4.0.2.tar.gz 434408 BLAKE2B 567e680c4b350e94c10be28ab25a16392a10f904fbc453c4d59132bb9e284b47e723834d5a34d803f4e54d5d17ce84b3e7e275d7f884c4d0e3ee05d50470008a SHA512 662bc1052276c2f54e0eeae820f9ae53e7f37150db21f0547be74b90455e213c9ca2b21e07079f1bd1740fae6e3d664edd3d27d57a0128828fc1a9c3627b3189
+DIST supervisor-4.0.3.tar.gz 435960 BLAKE2B 001f556b955311e2453fe1091e46696f3712751e20fad54437fd86c6020e844047ac6cd8983d46a07dd1830e6324d198c84c9d0c8fe301bb5ca568e4c7345d72 SHA512 09de52dca9f71409954fb4782d42099d19892bd82797d2b3dc7100b2693da292fe9822b5144eaf4dcbe295f4e227d62601c8791016e1bcd5c253d99c89f59368
 EBUILD supervisor-3.1.4.ebuild 1190 BLAKE2B 914c69c7e7d8146273fa3b2dc9445a5fee5f7d52692884a208d1b4cd3b3ac11d902823ebf1f33e2d82aaa0bdf316de85b12d04917cd115d800516733b20fc445 SHA512 be9e9ece37f97cc515679f06ca358e3af4b06039ee9009be02e28c6acecbd157fde107622201e6cea2a5c00221a6ffb078a98611662ab002edc08e3ade26c983
 EBUILD supervisor-3.3.5.ebuild 1959 BLAKE2B 168867deedc11199bff5b9d25d44056219809f35c3627a720469d755b3312f704d6568ef9331d46b4b177154707b10721c7058ead18af690b57c98f5ce912262 SHA512 9a35ea4c5381762644e00c2de4ae3272537e12357fdf17f2daa7b8c9a9187075f4625c38c555a3d6f32c4690fd8940deebaf3a27d4de9ca08fc8aa1797ebc30e
-EBUILD supervisor-4.0.1.ebuild 1798 BLAKE2B 0101fb3f69ba6750541015c4fad57bc9d195ba46d9ae0c09d4de30ef6d9acf950023fdb2ca8f201cd010391163a076ce436a0b2cf5a7ed8c62ba3417bb3ccc7f SHA512 ac93e1a1845809f3e9cb03c413bd42025e1f5c2105c7f4c4e9d07a1d371e373d0e93c006029aa7ba60a06c23f9ae10bf9da2c247623c6ddbeb8b97ec7b68ce80
 EBUILD supervisor-4.0.2.ebuild 1798 BLAKE2B 0101fb3f69ba6750541015c4fad57bc9d195ba46d9ae0c09d4de30ef6d9acf950023fdb2ca8f201cd010391163a076ce436a0b2cf5a7ed8c62ba3417bb3ccc7f SHA512 ac93e1a1845809f3e9cb03c413bd42025e1f5c2105c7f4c4e9d07a1d371e373d0e93c006029aa7ba60a06c23f9ae10bf9da2c247623c6ddbeb8b97ec7b68ce80
+EBUILD supervisor-4.0.3.ebuild 1798 BLAKE2B 0101fb3f69ba6750541015c4fad57bc9d195ba46d9ae0c09d4de30ef6d9acf950023fdb2ca8f201cd010391163a076ce436a0b2cf5a7ed8c62ba3417bb3ccc7f SHA512 ac93e1a1845809f3e9cb03c413bd42025e1f5c2105c7f4c4e9d07a1d371e373d0e93c006029aa7ba60a06c23f9ae10bf9da2c247623c6ddbeb8b97ec7b68ce80
 MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/supervisor-4.0.1.ebuild b/app-admin/supervisor/supervisor-4.0.3.ebuild
index 2741d256322a..2741d256322a 100644
--- a/app-admin/supervisor/supervisor-4.0.1.ebuild
+++ b/app-admin/supervisor/supervisor-4.0.3.ebuild
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index f9a29defabdc..e37b52460855 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -3,14 +3,14 @@ AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d8
 AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B e34da8cf0216f66fad3ade0ed40e8ec3b7641f7568ebcce5bc3122f888c90885ece346bf7f4f8e71e92435257ee5c6c0e5a89913c0e22a0ad28fa1018a73ea71 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604
-DIST sysstat-12.0.3.tar.xz 603064 BLAKE2B 79666c16d7a18aa058f2b8c5e81a16e11a01ba94c809a924d4be6a37cdd67f8755a0112e7f227ceb35b1a4847348de0e6ec34ef3da62c2ea81fceb1590e292ea SHA512 b6f7d27981898faabf4349eb889a767e655ed797aa3f7fac3bdc99968bdb15ed2a7aa04acda610a014022bdc2aa7e603b1c413e0eb8d734db04675fcaa4561ca
 DIST sysstat-12.0.4.tar.gz 711554 BLAKE2B b671e185d70787f5773d6824a9838ddd5d5f537c66ac37895f88b6bbddbb78b4d81efa6f962e3b812d025b361ce388583811d4f199e1ffcfe1ba0f2119b6eb88 SHA512 0a47e2b692ac3317cfd72784f21cc03970d7673727c579d403895df0377d09836a1dc76ee5d99076f2c9347f033059d000d982f33ef915130c3a89afdd6dad96
-DIST sysstat-12.1.3.tar.xz 553880 BLAKE2B cc520d294fbd38385b2f248721a33b0dd7d7beca422dcd3cc00a2a010b98850d65ceb03e8949b12426c5dc3726cb06f0d63ae30d2792808814b5c5e6912d1a14 SHA512 f264efe377b61d5f62b1ad2c14115bd22ada3a25f726bb362c3cb1a6d45f370642783d547339dc118bf34c6f3d015bba19e88043b0753f8ec6c314778456b726
+DIST sysstat-12.0.5.tar.gz 711967 BLAKE2B 96aa49d82e71407dbd99d840ca5f71af83f54ba6315c858fae71f97290e8cf9c4f5358ad6389c7489366a62667c35835151e3187382a56c98153d3a04bcc2b8d SHA512 c1061f1af35430e81e488e4b2f18b8588ec4f3c419ade004c49ca24baf60b5b76a6a59eb25f3b17b51a9f60c5833a914a514872d0235b2ca405341a2f4a32cb3
 DIST sysstat-12.1.4.tar.gz 738031 BLAKE2B 6803a727bb67e5027400f684d9d93efa6ca22526a1363e04f8bce06a6cd300d4ebf7e02c8f9048fc25794974efa38117dacdf12831bee4bfd43fe40d0b34dbb6 SHA512 e60721408861045bcb1a52b170682df54631926bf4eef5a2709e25b1469c13377026bac3e51f5eeed11c7149b916c00bf5c06a2ff65d9c28063de1ae108b61c2
+DIST sysstat-12.1.5.tar.gz 1032031 BLAKE2B 9fbc0c0d132983daa334345f1f83ac8a46092cf52f35bafd443febd8ce40e4ab11b5b9b05b92e4074ecf9feab682035b2e08094ce10f3287036821be57db0800 SHA512 9dbc44b0226efc2f219ff71d2f0b83c930263fe8d6d0b451ae8404b3056558de04c76c16f2e8ba62083cde3a37cabbcd466d9247bd61ba5921dbc2ab6a1f686b
 EBUILD sysstat-11.4.0.ebuild 1943 BLAKE2B 18bfa393fccb957e8ff519b5e6182f5a3b9155997e9d8acf256d0ab3ead8bf92e0b12a7fb1aa64fea9be7712c8432e049c20d49f41abdb4f233bfa57db20217b SHA512 5186353168b53a613ee0e8d5eeae38e315056b00a71140e3f347c4c8af5e963dada702618e8f3c84f2c25ef483d3270cc50135b28294d32fa5c14ad1cb00a5c9
-EBUILD sysstat-12.0.3.ebuild 1793 BLAKE2B 330c74093228846f82d0ea709f649508b01a1618d7493b60c6be5f34b0583fc7eb7798fc5b386c14bd21a2ee7698ce8b8c098bf00761eda8e55ca6df7d2c0b9d SHA512 7a2a46ecd3be1db6de32abdfcd0e13330b8c7e8a69a986246b0382197d847d36234d084fbbf6b00cec591bebf0741578c8c7b1385a76ef6322b4ee4272702803
 EBUILD sysstat-12.0.4.ebuild 1838 BLAKE2B caa28ea7a3eff2d9eb22a805485b31923ea3071757cc37af64ab55e412047eef1f4062d0df9f5c6cea958262190f466d2bd290187faae021fe44f06fdda1c1ed SHA512 a21db0825e71acba0c9ff658b9530f8ef00593a6d95dd5ce0c4ef8212af5f54bccda5f9a6ff2fee444245521c4eb50120f80dec434fdbfcf74696bf82e6661cf
-EBUILD sysstat-12.1.3.ebuild 1793 BLAKE2B 330c74093228846f82d0ea709f649508b01a1618d7493b60c6be5f34b0583fc7eb7798fc5b386c14bd21a2ee7698ce8b8c098bf00761eda8e55ca6df7d2c0b9d SHA512 7a2a46ecd3be1db6de32abdfcd0e13330b8c7e8a69a986246b0382197d847d36234d084fbbf6b00cec591bebf0741578c8c7b1385a76ef6322b4ee4272702803
+EBUILD sysstat-12.0.5.ebuild 1695 BLAKE2B c62a67fd51aa3094d9ccd9967214740fb44e103f28700c585744c5b92461022626bdff0799f7327057fb173077605cac87b4881d393e0a1afb130ae9a2294886 SHA512 e62834ec2a72ba996f7cc9093538abbc614272508e0ed92a319cc5c3b7df02e8707ef1f222d8d42ee74cf74803fd7655d3f631dfcff831888a1848d1138cd914
 EBUILD sysstat-12.1.4.ebuild 1838 BLAKE2B caa28ea7a3eff2d9eb22a805485b31923ea3071757cc37af64ab55e412047eef1f4062d0df9f5c6cea958262190f466d2bd290187faae021fe44f06fdda1c1ed SHA512 a21db0825e71acba0c9ff658b9530f8ef00593a6d95dd5ce0c4ef8212af5f54bccda5f9a6ff2fee444245521c4eb50120f80dec434fdbfcf74696bf82e6661cf
+EBUILD sysstat-12.1.5.ebuild 1696 BLAKE2B 30c8162d768496f006711471b03b3ebeb57e27f9a5f91ac435c7bfd548f438abad283a8c9ded69394daf1e91fafede6ca774e73e4446ad2e216e5b12a88e9e5b SHA512 316de216ae7704dfc0c44ebeeb45d136b758da0f97957dab815e25c8c68eae024a6afcf0efe82ca1b8a6513f6c4e8f93a3f4b9273a28b8c4f31234ad3095c3f8
 EBUILD sysstat-999999.ebuild 1741 BLAKE2B 17d47e7c1a6f90d9930b1291d54f684889e7f617cd29030cdfecd4909c50c4008e5a35a860a2b1b165c432d7b444debf2fbd2f8aecafe51532ee3b35740f126e SHA512 450f00d7fdd18fff61eac06f2c4cb02aff1a540593812965aa8f29f3338da6c0950e89314eab5fe870a8d024e58126b7015f1b1c920b5a9012099c54a3394260
 MISC metadata.xml 336 BLAKE2B ba4225003301f291de8d348fcec269a2f7dc8f729a93e3c974a3eb9712f7fe08f59d799e4bf2e936a1224bfa5fa59d4b4b333aeacde9864313c20e1d3a7f4580 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6
diff --git a/app-admin/sysstat/sysstat-12.1.3.ebuild b/app-admin/sysstat/sysstat-12.0.5.ebuild
index 45e90330a0f9..0b5b3cac3c98 100644
--- a/app-admin/sysstat/sysstat-12.1.3.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.5.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic multilib systemd toolchain-funcs
+EAPI=7
+inherit eutils flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
 IUSE="debug nls lm_sensors selinux static"
 
 CDEPEND="
@@ -30,8 +30,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-11.7.3-flags.patch
 )
 
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
 src_prepare() {
 	if use nls; then
 		strip-linguas -i nls/
@@ -52,9 +50,8 @@ src_configure() {
 	tc-export AR
 	use static && append-ldflags -static
 
-	sa_lib_dir=/usr/$(get_libdir)/sa \
+	sa_lib_dir=/usr/lib/sa \
 		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
 		econf \
 			$(use_enable debug debuginfo) \
 			$(use_enable lm_sensors sensors) \
@@ -77,7 +74,6 @@ src_install() {
 
 	dodoc -r contrib/
 
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
 	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
 	systemd_dounit ${PN}.service
 
diff --git a/app-admin/sysstat/sysstat-12.0.3.ebuild b/app-admin/sysstat/sysstat-12.1.5.ebuild
index 45e90330a0f9..a5698a451e73 100644
--- a/app-admin/sysstat/sysstat-12.0.3.ebuild
+++ b/app-admin/sysstat/sysstat-12.1.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic multilib systemd toolchain-funcs
+EAPI=7
+inherit eutils flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -30,8 +30,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-11.7.3-flags.patch
 )
 
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
 src_prepare() {
 	if use nls; then
 		strip-linguas -i nls/
@@ -52,9 +50,8 @@ src_configure() {
 	tc-export AR
 	use static && append-ldflags -static
 
-	sa_lib_dir=/usr/$(get_libdir)/sa \
+	sa_lib_dir=/usr/lib/sa \
 		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
 		econf \
 			$(use_enable debug debuginfo) \
 			$(use_enable lm_sensors sensors) \
@@ -77,7 +74,6 @@ src_install() {
 
 	dodoc -r contrib/
 
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
 	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
 	systemd_dounit ${PN}.service
 
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 0a80c18c4dee..54c30f9f177a 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,4 +1,5 @@
 DIST system-config-printer-1.5.11-patchset-01.tar.xz 6948 BLAKE2B effe29c51cbe74fc72566df65f10ab845c9dc1f40ca2966c40be87e19f98046f34311c24b7bc77f471b840e35b0c8eb7754a7c5464d50335c8ab2e2ed0e79afd SHA512 2501bda0e75ea51cc8e14df6b3746a0ea51618919ef35ace849efeded0cddc49e6e3793142d1cd128ce3ce62c21661d5fdb85b19718df07b87a20f5fc641885b
 DIST system-config-printer-1.5.11.tar.xz 949816 BLAKE2B 96b41d64e0aa3494b7fc7ed15ac926d833a046ba2880b36b6f5dd4e7508e2bc1fac4cb52c9940c13cec6e34cb8972fbc11fcd5a7df510296444ca08a23f4cb2b SHA512 cc0a6faec0022092e64de3d7ab28669039c93853c6931d26c264f0035486e09ad0af784833e88ee8e3dc1b6f5be9dcf84144a2a6464dfa9711172966fa6a22b4
 EBUILD system-config-printer-1.5.11-r1.ebuild 2385 BLAKE2B 662c0baddb0b4118b4a54aff12dce7403f2a8a11856759fc322cbbe1be0869be81767a7791fbc6c12838b57bb0cb77b2f820b4dc57c546fbb9181f4fcf383844 SHA512 e2d9732510cd65a0814540ee1729ebd1bc876c94f30a16a08b4b2e9596e492a0228f8dc1b01cdb01758345206e03c61d3f7ac95b630d2fff2075592f8e530123
+EBUILD system-config-printer-1.5.11-r2.ebuild 2391 BLAKE2B a9ae83182a784c3ad131ab3445a75a5a334a68d95ef78caac0a52be8bd548ef5772adba59161e2c9df1c770c6293f0f58e0474b18e5c51480cecea4d2b5a88e9 SHA512 ce543d1b878d214133efb5452fbd74c53471b562647834e33b108fb81f899022ceb44aa63809c7bc6e9073ce313818173a7c635ff3a5176441f3a3c864231824
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
new file mode 100644
index 000000000000..3138fdc7de8c
--- /dev/null
+++ b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="xml"
+inherit gnome2 python-single-r1 systemd
+
+DESCRIPTION="Graphical user interface for CUPS administration"
+HOMEPAGE="https://github.com/zdohnal/system-config-printer"
+SRC_URI="https://github.com/zdohnal/${PN}/releases/download/${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-01.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+SLOT="0"
+
+IUSE="doc gnome-keyring policykit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# Additional unhandled dependencies
+# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
+# python samba client: smbc
+# selinux: needed for troubleshooting
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2
+	net-print/cups[dbus]
+	virtual/libusb:1
+	>=virtual/udev-172
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/xmlto-0.0.22
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-python/epydoc )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycups[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	gnome-keyring? ( app-crypt/libsecret[introspection] )
+	policykit? ( net-print/cups-pk-helper )
+"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-auth-dialog.patch
+	"${WORKDIR}"/${P}-libsecret-optional-{1,2}.patch
+	"${WORKDIR}"/${P}-scp-dbus-service-{1,2}.patch
+	"${WORKDIR}"/${P}-typo.patch
+	"${WORKDIR}"/${P}-appdata.patch
+	"${WORKDIR}"/${P}-empty-LC_MESSAGES.patch
+	"${WORKDIR}"/${P}-fdopen-utf8.patch
+	"${WORKDIR}"/${P}-typeerror.patch
+	"${WORKDIR}"/${P}-debugprint-typo.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-nls \
+		--with-desktop-vendor=Gentoo \
+		--with-udev-rules \
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_compile() {
+	gnome2_src_compile
+	use doc && emake html
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( html/. )
+	gnome2_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index 2de1fe46bc9c..8cb367c771b1 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -1,7 +1,5 @@
-DIST systemrescuecd-6.0.0.iso 931135488 BLAKE2B 82879883780ff11a35f2fe635a5ee1a268de590bac79326ac2c49c960cd18755b3c10548d65eb5fb7ce5749c00f5040bb10c5ad5b196e48033fb70e3ff466026 SHA512 9bd8c06338357882fd8e3f17ddfb918e1f69e25fff6460957f9c50d496ccc3d4501e39b4596e3f387e4f7a481c9b33d18ba18fb49d74f6d916a7c5997b24c03a
 DIST systemrescuecd-6.0.3.iso 881852416 BLAKE2B ab1064237902542845e11869f7076a829e9593d29b8d106f0309c61a1371173cd5b3ef3fa3b84910cc81bcec485d27c8e297f269820aa96b0043df7c441121a2 SHA512 21b77e38999f56457a4c0a096eb58b2e74a8b376af33290b2e75995762e12a977435e8a9ed2ad9448799c3246d85f3bddfcafea020a1336b14f4f81644e06bb9
 DIST systemrescuecd-x86-5.3.2.iso 585920512 BLAKE2B e68bb4e765359ac0e8124c9cb6090ed2ec9340a09e3ebafbcaa4acc175f8afe3985a57f193cd4be4192dfb23a6042a68328a29bbfb962f73fbe010c32d66e020 SHA512 c9da6a63556836bd38f7072b49a5408f2f9e5fa310dbae3f229c9b7af4fe6e073cdfc95b942bc1a6d9c42d41527fc54e8c6c15379082bc3ee0f025da80b01e5a
 EBUILD systemrescuecd-x86-5.3.2.ebuild 2491 BLAKE2B dcfda1a902812b84d00d5386caafdc522a84c75b03852b786441f029f2fb23766bbcf0622f005755c62e192cd2eab2fa782d6db774b55bef9f7b4d6525952b0e SHA512 0286a3c2edc3a7d4a2fa3a96476e2179936e9e024464bcd155c9fe759fb346d3df6b1c371c2b4d422f745bc6af3f307f95cbea3e607b9d76c6e08a17a474754e
-EBUILD systemrescuecd-x86-6.0.0.ebuild 2147 BLAKE2B ed068ad0a612eb7ff49b93e0a9653c888e66ea7938a70e7475b973aeffad42127d0077a8850ab0c0f8b4a76f8da5f6394dc715b3decc6d4411d978bfd82c8e7d SHA512 15a2db37a09a2082dda70cc9e7b785f6dc0838e77f15b58f87820fe0c42d9856ca1f69d7f1bd8abac22f954f30dfc52978e4b0c50c6535474d8b1a33f24851d9
 EBUILD systemrescuecd-x86-6.0.3.ebuild 2105 BLAKE2B 805cd8fb4d2b896220c3ca624c1b7d647e5a0636b50fac93b6a1defc3e4b4cb02ce5df6608d41c24efae5cca7605f602690c27c5d9cb678b446f7dc9845655ae SHA512 338edfaa329f3df1fbc5c6aa6ee1d1ca17113065ed6fb5432b999b63085417b96d52ad722edfada05e036cdf28cd209b6af1e7d9d3e3958332c593615283f4e5
 MISC metadata.xml 610 BLAKE2B 400c26cbce80747fe88b60d34ea0f018b7119ad6ef333e8de931424aaa929db90ba0836a4520fbe62baa0c7aa9992745c4c082e495f318066acf5285e56dcd10 SHA512 5092c69f83df351b3697ab0c83e165eba5c7ceffd197707047bdd4d2e809ff7267e436e91e3035223beb088c48835ae28fd4032a8122687af116fa1405b30b15
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.0.ebuild
deleted file mode 100644
index f35372ef646e..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${P/-x86/}
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, amd64 variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${MY_P}.iso"
-
-LICENSE="Apache-1.0 Apache-2.0 Artistic Artistic-2 BEER-WARE BSD BSD-2 BSD-4 CC0-1.0 CC-BY-SA-3.0 FDL-1.3+ GPL-2 GPL-2+ GPL-3+ icu ISC JasPer2.0 LGPL-2+ LGPL-2.1+ LGPL-3+ linux-firmware MaxMind2 MIT MPL-1.1 MPL-2.0 no-source-code OFL Old-MIT OPENLDAP openssl PSF-2 public-domain Sleepycat unRAR UoI-NCSA vim ZLIB"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-RESTRICT="bindist mirror"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	ewarn "Please note that starting with version 6.0.0, upstream has switched"
-	ewarn "to Arch Linux as base of their distribution, and running on 32-bit"
-	ewarn "systems is no longer supported."
-}
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${MY_P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED%/}/usr/share/${PN%-*}/${MY_P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${MY_P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 2402965bf810..bffaccd965fd 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -8,7 +8,10 @@ DIST vault-1.0.2-webui.tar.xz 1252768 BLAKE2B d4af46bae84eb2e0e76633e5af061b351d
 DIST vault-1.0.2.tar.gz 25834864 BLAKE2B 88f3252547e05a70a377d7711c7df279619455ce26003868465df1030da9ffe95bddd094b40b99f7f4698bbacfd883cdee31d14ee47e815299eb41a18ef99b3d SHA512 e90a1db0401778650f16fa01827b274dc8e38e5f6fb420814bdc3f89507d3507a94d6bd3eacabf1ae782e72286dda598106918030b674f9b7d3f8e69cddbd3ec
 DIST vault-1.1.0-webui.tar.xz 1278712 BLAKE2B f0a61d644f613e14e1e8d2adcb894a9cc4ff7580afc2150757c8786dd6aa1c3641eae013289cf4cc696e6e16d67f9ff967413ee75dedeaaed007f1621d972499 SHA512 2a318a5b1ada29856bbb3411fa6f42666531acbe4f2dbdde012a7ae60defcfe1f71d4fb18e4640c5c1f66be29de5c2c1de8f841098458991b3f4e11c94ad48e8
 DIST vault-1.1.0.tar.gz 25943119 BLAKE2B 44a7e339a7ab5e5ecfa33b70f28424b45305714df9eccee1286bdc063e3b1036f7ef830138df54482257a112b03c8e7289f921ad4f353aa37aff8ad06cb405c0 SHA512 b0bc32f438e8432d849aa896f610c9532fa923384d40749efe49985d64a91f4768a3309af449efd8c8ab4604ecdb2474c39999bfe196f0f876894f788618ae61
+DIST vault-1.1.2-webui.tar.xz 1281868 BLAKE2B 9c3662dabfd9403fda4a8acd8f9a86ff867b1cdafb5e7fb01c426e1f83fa33fc7a9bce27f70991fbed4a1e0b5cacd05b20d24644521487bd1746cb83fe1d9eaa SHA512 a33ee124592faa9e7aa02093d4219f1706a34c97159d9e32c71923ddc377f7dd26f3705bc31f968b4036bf354b226f8d2dc2fac7a9fec49a7b73558f1e3e3062
+DIST vault-1.1.2.tar.gz 26026601 BLAKE2B df208b15076007ab87c3c6683698dc4348f56d5a73ff2a52ce17c5a9858acf4d597f7c53f709a1415247cd4cdc65454cc1aa6c18504cbb10368d39df2974175d SHA512 bc645bc5efeaf5a185479ab2ea78589762d09a40e889845d8cceac94568fcfcfeac94ae602c548648aea800b791121fbb2b75c3af9a9651d08dd9e38c1219826
 EBUILD vault-0.11.5.ebuild 1620 BLAKE2B 7130a0a55407c092d96c3e22b216bdfab9d2e0168176539745afda5563808efbec06051adaa66fbf644a530ae91ac6f21fa7d58f78f57aab3f8b19dc65812399 SHA512 5d22bb29b0a7bffe7410af9b9cb07ab6957ca78aa0d82016341327eb739011799f330bc1f2eacc8d3509eb52f445ccb1f04ecb5332fd8d2601bfb2ba8d36486c
 EBUILD vault-1.0.2.ebuild 2177 BLAKE2B b0eca28eea305d1959990faa564907ba489d896e11be44c31a70a56b70e66666d7006d00ce5e652d028d15157178c16e7c8fab0b1962dfbefcecee3c9e494e60 SHA512 54b48f145821acc8dff09e5ed22070fdf7c3303e186de1c1721ee654e76a51025d041a1f45c3b3fde3f55a23b2f91cdf4b8d2ac94024fe266860faf4f04162a4
 EBUILD vault-1.1.0.ebuild 2177 BLAKE2B 089d6b0dc8be55d3abbabab1193fdb5debac444d39e52fa2ccae2e695d746b93b05705ab6f743f37eea505eabed5cb774c78df4a39caa46d926653a409f755b5 SHA512 98a453127a49429823e79544cdec581707623106002e2c0d402a9af64d585e57735c10d083699d3911f2e4f1794e99b48dd666d026f7abaad55b61015321fdde
+EBUILD vault-1.1.2.ebuild 2177 BLAKE2B 089d6b0dc8be55d3abbabab1193fdb5debac444d39e52fa2ccae2e695d746b93b05705ab6f743f37eea505eabed5cb774c78df4a39caa46d926653a409f755b5 SHA512 98a453127a49429823e79544cdec581707623106002e2c0d402a9af64d585e57735c10d083699d3911f2e4f1794e99b48dd666d026f7abaad55b61015321fdde
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.1.2.ebuild b/app-admin/vault/vault-1.1.2.ebuild
new file mode 100644
index 000000000000..a8b0cbdb9a1d
--- /dev/null
+++ b/app-admin/vault/vault-1.1.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	webui? (
+		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.11:=
+	dev-go/gox"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+	if use webui; then
+		# The webui assets build has numerous nodejs dependencies,
+		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
+		pushd "${S}/src/${EGO_PN}" >/dev/null || die
+		unpack "${VAULT_WEBUI_ARCHIVE}"
+		popd >/dev/null
+	fi
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i src/${EGO_PN}/scripts/build.sh || die
+	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	mkdir bin || die
+	export -n GOCACHE XDG_CACHE_HOME #678970
+	export GOBIN=${S}/bin GOPATH=${S}
+	cd src/${EGO_PN} || die
+	# The fmt target may need to be executed if it was previously
+	# executed by an older version of go (bug 665438).
+	emake fmt
+	BUILD_TAGS="$(usex webui ui '')" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	dobin bin/${PN}
+}