gentoo resync : 04.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-04 12:02:00 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-04 12:02:00 +0100
commit: eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
tree: ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /app-admin
parent: b7ebc951da8800f711142f69d9d958bde67a112d (diff)
47 files changed, 762 insertions, 258 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index bee06fc2a537..b26b2db354dc 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index fbd3b99ebbaf..b12e614fae78 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,16 +1,12 @@
-DIST ansible-2.5.14.tar.gz 10119785 BLAKE2B 6e771aafc16053185ee6d275d6d41f64aa3f0d6dffbe721a66b548b97e84d78916e03827d592b961f9a4e0bb03fae09320731a4b8fdb814126cecdfb51f9f136 SHA512 9635b1c4bc9a93a24f4bb2894c9fed63803cecb01c5562559e3b808791d1007b26aa0aade4aa05fd4bae0f7d01216588d4e2e0bf4c5fb6cdf677d9b40e9e2de8
 DIST ansible-2.6.14.tar.gz 10732165 BLAKE2B c753860a521c37357c7a5042391957680865416c036fcaf3920a65e291dc3ed3a52e94ad5b99acdb0d2c919e3be68b8462e462a935497dfe83b406adf4e63dad SHA512 ee532c0d61ab03a0937e89bfa7565f27f1905987784f31895e8ac6e4a8ecf76ca9f30201d278a68a995b8fc27151712dba2e79c13269a472d923355e36072e4e
-DIST ansible-2.6.15.tar.gz 10734433 BLAKE2B 9c48d9de348a11a57b364921af26154b5a2106d0bfa2d7d341c06e2408b3f71d30b3cc2f5e4df1bb21eb6eebd39a4d297ce8d697d68826378d4e786a4acb4e25 SHA512 14951db33ed2124b3379adf1114a9c980f63668c18a79d436658d8ddc1bbbd38f26682520319bd0e399d6ced518ece0f01da5a6991003e8b30adf78f20c6d1e8
 DIST ansible-2.6.16.tar.gz 10738431 BLAKE2B b801eb524f631950c385f7a949bdeae288e95d1590ea96f98e955f6ebc4ccfc5970e3926727850e7ef13fbcd7118ad6388e516a8fe62b53f1bf8b4d5b484dbab SHA512 ff67803cf6afd512ab779b7c862d4427591c90bb0ed9391e32fc8ea30c24c70cc31c910c9af51b4dd423885f858f65c1c8d6274565c90296ecd7a00df3374977
 DIST ansible-2.7.10.tar.gz 11844278 BLAKE2B c847b642ebe4cbc2194538a0b194cd5c0bb82e0ba2a6da2e272670c75596b9793e028d067ddb37000c07f2c2427b5b99248b16c544daed4976c0210b601d3c97 SHA512 4d58ef080c8ee02ef36eb3116ec89e4542b5b4042262953b2001081601fe1066237191cce5e647f354efa9e1933cf5010519d049e678a90e8ca08620cd1788a5
 DIST ansible-2.7.9.tar.gz 11830476 BLAKE2B 7688ce9f74b0ab1fafd0e31dce90d995a9d8ca90bbe436f2d4ee9d005069b6e1b2c4dd679c2430a6873233da54ae06d3ebf08736681ec2e59e5b3ddafa6bb1e2 SHA512 4d39c7d4eb97264ce8f92812fb986b24af0c663efa6d8cd1d9a4cb25731d55e7518e503c04764e62d0458916b601baaa7acc623f9f83ce8b93e7f22900e29a53
-DIST ansible-2.8.0rc1.tar.gz 14280595 BLAKE2B 7de03e7c85d20c45724b501e04389c58b8a82db3c0600d41a6b751701c9ba6aaaaca5e135858283a55ad7b2edb4ccfe22377437ff3e58ee3c6c0f28693805f8c SHA512 00e51b5098d1e0b41bf05c200a285cac3ffb80ece72c66440c05af6ed36df104faebbbcc484995753b8a521d3f5f18ae773b0d568cdfe4bd87b2fd8aabb8a512
-EBUILD ansible-2.5.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
+DIST ansible-2.8.0rc2.tar.gz 14281093 BLAKE2B c829ba6b46f5be76151fef442ed6fde23a78390743a9e5381730bbb26780d00d75e6212c2cb424bb58faa77df48683a33c967a55ed10bfa05fcc897bc4494161 SHA512 346542ed1b3f7a9cbc1045e1ba2fa72659c3af2b40797efc24a50e8e23d437ccd7a7f9d984e870c95a53301809e88203c2f9226f3c79cca51b28134fae609a8d
 EBUILD ansible-2.6.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
-EBUILD ansible-2.6.15.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
-EBUILD ansible-2.6.16.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
-EBUILD ansible-2.7.10.ebuild 1637 BLAKE2B cafff348e72d7970fe6851e36c2cab55e18583dbd4ec2cf018a04ed2f7093e91c341c32458d334996f7779477409d47fce82477ab812e607ba1d9d624e6efc73 SHA512 b3760d5cefead4d7965b1d1dbbcf7fd41f2bbd2b8a4941fb02791832fd60c4b0c289ba34fbf945b8889a4b15b286e051634adb90296ff81e43a15f71cad66f47
+EBUILD ansible-2.6.16.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
+EBUILD ansible-2.7.10.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
 EBUILD ansible-2.7.9.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
-EBUILD ansible-2.8.0_rc1.ebuild 1739 BLAKE2B 71b19a0ac7350ee1afd8d6317d1abdc572258830a0c9a5b87cfb1847b367c5ce2caad6994c80306d80bdf1adf61c36d0b14bed1971538c9eb232924fd73d1883 SHA512 2062b6597cbab0071cebca1d85811359e8b60adf87e75f40d4238e1f16f5c78a5e030771d7cd335aed86cc8d8a8b63aaca0e6f66bb191099223d5315a5656501
+EBUILD ansible-2.8.0_rc2.ebuild 1739 BLAKE2B 972d0a257a32daad9dfdea3ca89751c6f8bfbab0a38e7e99602ffb7ebe7eacf7c2e88f4b3f664e22de5d60b23c8341aa6dc4a5d4f174c88996c2ae47c209ee0b SHA512 dee27409ea331e4e303f33a81476545c37c96d3333f82e620eb1ee314e4dd135a09eed6e6b9e3d258230117553c117b13c47785d1a969a049e0d8a7857f94284
 EBUILD ansible-9999.ebuild 1638 BLAKE2B 40aecbf314bb9e743fb7543c696a271842955853fe981bc4dc69293dcc9905e950a743a56398b0815e09107db801ba554b68ad9511ccb9e25dd3dec0f0b156d2 SHA512 814b1430d499d2e6f50879c41b1a51e07b5e5a79355deab730e26b9e9a28f9ac94e2a46b884a5e0e8ed4a12d7a74bbbdffc0a55b8e120b438c91aeb9e7ae718a
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.5.14.ebuild b/app-admin/ansible/ansible-2.5.14.ebuild
deleted file mode 100644
index 90340deaacc1..000000000000
--- a/app-admin/ansible/ansible-2.5.14.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-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.6.15.ebuild b/app-admin/ansible/ansible-2.6.15.ebuild
deleted file mode 100644
index 4bec3453ac7f..000000000000
--- a/app-admin/ansible/ansible-2.6.15.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-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.6.16.ebuild b/app-admin/ansible/ansible-2.6.16.ebuild
index 4bec3453ac7f..90340deaacc1 100644
--- a/app-admin/ansible/ansible-2.6.16.ebuild
+++ b/app-admin/ansible/ansible-2.6.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.7.10.ebuild b/app-admin/ansible/ansible-2.7.10.ebuild
index 63e11740ae9c..028f77e10f7a 100644
--- a/app-admin/ansible/ansible-2.7.10.ebuild
+++ b/app-admin/ansible/ansible-2.7.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.8.0_rc1.ebuild b/app-admin/ansible/ansible-2.8.0_rc2.ebuild
index 43fb54200196..ec25e3a4127d 100644
--- a/app-admin/ansible/ansible-2.8.0_rc1.ebuild
+++ b/app-admin/ansible/ansible-2.8.0_rc2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://ansible.com/"
 # don't forget to fix also ${S} in the next bump
-SRC_URI="https://releases.ansible.com/${PN}/${PN}-2.8.0rc1.tar.gz"
+SRC_URI="https://releases.ansible.com/${PN}/${PN}-2.8.0rc2.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -43,7 +43,7 @@ DEPEND="
 		dev-vcs/git
 	)"
 
-S="${WORKDIR}/ansible-2.8.0rc1"
+S="${WORKDIR}/ansible-2.8.0rc2"
 
 python_compile_all() {
 	if use doc; then
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index f1a481717481..a44f628e3cbd 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -2,8 +2,6 @@ AUX consul-template.confd 293 BLAKE2B 5c3ef27d72b4c98098b128f29c55f5e674c7d4427d
 AUX consul-template.initd 592 BLAKE2B 21d6ff6bee67a82c4305eba3765f8e9c49ee59357a553677fbf049a37dccad0d7645e681665db36e89263a5a73a1155e9b19446bdab7f58f04bb7173a727c711 SHA512 bbaa059f1b339f7f8c70babe90917fc1bbff36ca446452f6e4a744dd986392227342b865aa47be02ccec2d35c43814b8faadd66f9e5af5dab3abec9805b7e676
 AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed1e57c23fb3bb3df4066cfdc1ff70f2eae6a67c7816d8d38d41106f003fe2a98732a9180838c05d04a710d9bef09 SHA512 642b53e43fd7a4da00907600f26e3814893b61856a62083c804b0077043a4f8f6603f0ae4461e901105f8e1fe52c2f34f3e949e752441f5f510e9cc21890ca75
 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
-DIST consul-template-0.18.5.tar.gz 5285939 BLAKE2B 822df39f77d9aebc55e03d74b43ace9d453135c6270aedd3d41a674b5ae325a588af2a76c9236072d6f6dd274ab75c050df6607aa5bfc98b0caf2cd3065b1b04 SHA512 1709c889cd414d2b3510400e8077aec49006c31958618a38f6bce78dad2ba4aac5405410b030bf968b5cf148f4cfbe963ccf95a015cd1e58f2f6d1f09edc13de
 DIST consul-template-0.19.5.tar.gz 6054881 BLAKE2B 48d691f9d09531248310ec50c6c59d3c74db4c8ca5f0236ac8336df92c75da89677e64cb593518032f48f53b9f5aa914a7b6ac0a2dc6bf6d32ae7c1f6d1dc60d SHA512 bdba4e821e353a71f9f6287b8ff352e85a916201314229b998bfbebb066fec17c5d7f12e224bf2920b018a4f5fec9000f122f6c04cb2e455a195b945e35235a5
-EBUILD consul-template-0.18.5-r1.ebuild 1351 BLAKE2B d48a01aabea1abe073bf834c3167d6c15d5ea169ccb164a7daec1643ed4b9f8d1ac34aadd1df655b73b56442a5761df2f1e8b4e72ef4788876d86c422cedd836 SHA512 0ad472d57b8c815ee88d051d18287b13c7839f147bcef5525a92c15cfe099c71dae7a5acb349239fa4158f2fed5fe6363eceb47b1b0861d8235f2a2510882e6e
-EBUILD consul-template-0.19.5.ebuild 1328 BLAKE2B f19e2a8bc8129da1a7ec87b6e7b58cdba797e7ab52f6b401aac40b8e0126f76569166b054a80d343e05cc5df67c77140c1a46afa9e7502fe368ea0985bf69249 SHA512 500a8fdb1dcfa4456a252167bed358b8e14b04ac23c1889672e34eff22d12b88dd09fc40bf00c56252421ff82d213763f69a4327db12f913fef042e17747d944
+EBUILD consul-template-0.19.5.ebuild 1493 BLAKE2B 97b6e2745eff7a2387e972630c9518b374f81e65766875287e5ef97859421ab02df9224f84a5711013c6b59fc02f1e6e94a33f29255dedae44e7cae088ad3bdd SHA512 b62365114f34c528d591235cfd8fa9f7a9b40f9c6a0030a72588a141d3372e515bccbbcf72c13d434fae399ad20b2f3a03b71e1b61f29af3f5297f88d8eb8e9a
 MISC metadata.xml 316 BLAKE2B 857b3a0a26e35ac2f52f797b85a42f91c74a10b4d8d6a1f5394465e68f6ad57bd732286650966f99cc516ec68d00f31f0f880931e2041cb596d50e521ac3a599 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad
diff --git a/app-admin/consul-template/consul-template-0.18.5-r1.ebuild b/app-admin/consul-template/consul-template-0.18.5-r1.ebuild
deleted file mode 100644
index 47439c5c68f5..000000000000
--- a/app-admin/consul-template/consul-template-0.18.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="Generic template rendering and notifications with Consul"
-EGO_PN="github.com/hashicorp/${PN}"
-HOMEPAGE="https://github.com/hashicorp/consul-template"
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.6:="
-RDEPEND=""
-
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	eapply_user
-	# Avoid the need to have a git checkout
-	sed -e 's:^GIT.*::' \
-		-i src/${EGO_PN}/scripts/compile.sh || die
-}
-
-src_compile() {
-	export GOPATH=${S}
-	cd "${S}"/src/${EGO_PN} || die
-	PATH=${PATH}:${S}/bin \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	emake bin-local
-}
-
-src_test() {
-	cd "${S}"/src/${EGO_PN} || die
-	emake test || die
-}
-
-src_install() {
-	dobin "${S}"/src/${EGO_PN}/pkg/$(go env GOOS)_$(go env GOARCH)/${PN}
-	dodoc "${S}"/src/${EGO_PN}/{CHANGELOG.md,README.md}
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-}
diff --git a/app-admin/consul-template/consul-template-0.19.5.ebuild b/app-admin/consul-template/consul-template-0.19.5.ebuild
index dfa6bf036b0b..ab75ab08e38d 100644
--- a/app-admin/consul-template/consul-template-0.19.5.ebuild
+++ b/app-admin/consul-template/consul-template-0.19.5.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
@@ -31,6 +31,9 @@ src_prepare() {
 	sed -e "s:git rev-parse --short HEAD:echo ${GIT_COMMIT}:" \
 		-e '/-s \\/d' \
 		-i src/${EGO_PN}/Makefile || die
+	# Printf format %q has arg r.config.PidFile of wrong type *string
+	sed -e 's|remove pid at %q: %s|remove pid at %v: %s|' \
+		-i src/${EGO_PN}/manager/runner.go || die
 }
 
 src_compile() {
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 486b0bbfefd0..e606897f116b 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 1633 BLAKE2B 7854f3cbea608df64aad4acebf3291d58a1db25dfc55f8db1a9946e74a75f01ba86194a21009135dc3aaa1f954d92b9a103e08f87b6e80f37441e94bcd15ded0 SHA512 c75df7f1a6252b152be4f148680cdcf8a488f6ce54c7c87db366489bb3c5e6b811d61108e622c4cee4cd8ae04a66f1aa302865595acf90c691faf53a139ec328
+EBUILD eselect-1.4.14.ebuild 1640 BLAKE2B a2628b326ad57259ad0dc50fcce13403dda4505f5f83aa9982ad0f230c543ea3937414f5538eb635cfe8dcd9e3d3cb93d6a97cbb541dea582245fceed1fc8e5f SHA512 4437117d84c679538e30e85e77a8707c1639c28619e9161a15cf90b69edc856901fed81a8eab6dfb867d4f4ad294c804d5f19197a627d7d40ffefbf9a2296e19
 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 d3250a39c014..61a8c2e50a68 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 ~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/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
index ace949388dab..149ffbfd9d58 100644
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@@ -1,6 +1,8 @@
 DIST lastpass-cli-1.3.1.tar.gz 114843 BLAKE2B 7983d4090092ef3443d8c502d157934fa2384426f0be22c796795cdf664be3ba396f64daa81cdf896cb6901d4063f93e54b62cda4349b14fa4d312a21c5bb76d SHA512 092d28dc459719e662fbb2c5e92e8cc75be108aa9d7b62569ee44cb34dd9588e78151fdc5ad114c30e8de21c0b8803edc41db9295548c7cbfe6e537c9a52aad2
 DIST lastpass-cli-1.3.2.tar.gz 116399 BLAKE2B d00ab9443935b90eab7337702a52e0ed2e7f2e67c20ed6764f72e25ae123e0420013aa9220ece8a57b7e3bbe2f243ff56bd054fecdbd064f086536bc5eaf0d88 SHA512 b293e86d70988aa5860a94fdc2bc65341bb253d2423c8f745730419400adc91ff860017d35657d283458c477c2385ff2532b8aefa752f886b207da8d10bf9018
+DIST lastpass-cli-1.3.3.tar.gz 116434 BLAKE2B 341f99a7a5edd157c271a0989a004ace8300f2121230b4c0b7c23152643ebc0e3f60717a057b4e6acc802fe641ccd84c770bfcb3d89c505713aea23692d1542b SHA512 9b9274cae1fe4045b7df4402170c522ab5765929739e76141b35a75ce3c8af824acd881e194face45e8721d6ce778bde97ff1a1ac23515de0c6dba28d61a8c7e
 DIST lastpass-cli-man-1.3.1.tar.xz 5700 BLAKE2B 736ab71ad55cfcb657c727f3dc9dc15775dab1a0232d1ffc51b8794e49911531c96a841b4a5ac0b31f0516cd7aa54027ac7d0eb096816730cdfd192c04d99449 SHA512 e60807683ecd681b3937ef447d3e6a487d25418fe99f51ba99e54bf643c5254dd18427a03e7f035198ef34ff578bbb6116baf04eb554f54d85e7d059b6bfed7e
 EBUILD lastpass-cli-1.3.1-r1.ebuild 1391 BLAKE2B b302f230665e0bb8dc206adac5f968674522531e4dec5042a6a6bb4d014aee1412bfed30c7ff48b788e16c8d1073f018292da1f3b896d6dcb6e6e84949ea97c8 SHA512 6d8d5009c546bcb7b7f2f5578dd5758b50773534246a76494bf3f16172a543392acecc3b825b3a10ba21262269ec46bce60e13d74026167c75704b85811eab9a
 EBUILD lastpass-cli-1.3.2.ebuild 1610 BLAKE2B e679b3ac32c95a9057166480363813d644a9a9d9e6e0b00273fa4f536d6c0c42299277d66e001dec2688456aa271061a0e8ffa243353fb0bbbbc9d6425bbcb7f SHA512 e5b983f52ec7a9c3f0f172bcb4cfbfe611dd57e3d5e9106ad1203315288f0b18e990cf095704581928676ec1e572a84c847a85debcff64e58bbe23b8d0c10fc5
+EBUILD lastpass-cli-1.3.3.ebuild 1610 BLAKE2B e679b3ac32c95a9057166480363813d644a9a9d9e6e0b00273fa4f536d6c0c42299277d66e001dec2688456aa271061a0e8ffa243353fb0bbbbc9d6425bbcb7f SHA512 e5b983f52ec7a9c3f0f172bcb4cfbfe611dd57e3d5e9106ad1203315288f0b18e990cf095704581928676ec1e572a84c847a85debcff64e58bbe23b8d0c10fc5
 MISC metadata.xml 643 BLAKE2B a5a01a1dbcc257692bd14369470d69eef33a00a9910ed5006c62f1f5fec2a9a261dd6ece42bcaa68345a21f6e26958f965f90459501324b0e7a168f3fcc4f7f9 SHA512 6b1a7f6566687384d328260576dad306dd07add06001b3746b4f37f05ff91b6ee72e1e2ecfd35463a5b78b4ba8dd1a7757503bdf992372dbd474967e4bf0e9f3
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
new file mode 100644
index 000000000000..d67ef36f961b
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_WARN_UNUSED_CLI=no
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~gokturk/distfiles/app-admin/lastpass-cli/${PN}-man-1.3.1.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry test"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all $(usex test lpass-test '')
+}
+
+src_install() {
+	cmake-utils_src_install install
+
+	doman "${WORKDIR}"/man/lpass.1
+
+	# Version 1.3.2 uses automagic detection for bashcomp
+	# To preserve backwards compatibility, we unconditionally
+	# install the completion file
+	newbashcomp contrib/lpass_bash_completion lpass
+}
+
+src_test() {
+	local myctestargs=(
+		-j1 # Parallel tests fail
+	)
+
+	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
+	# which is incorrect for our out-of-source build
+	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
+		-i "${S}"/test/include.sh || die
+
+	cmake-utils_src_test
+}
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 5fa7bd199992..f25072cf2e5c 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,5 +1,5 @@
 DIST lib_users-0.11.tar.gz 25660 BLAKE2B 8f5a827840d4074a0e8abd77e43f60eb09f199f58a2bde0c2bce7613d6ba1d9b12dd46adffa528ff351f54933c304f274abef9c35550d7af3519101dcec69d0a SHA512 a54fc8f57cffcd08e77e86eaf50ec6e68e45e1e9458e25e035af90e14be13980a400c4d264f70ef67e141e1d54581b0487b2b70dd084dc5840424221b46f644a
 DIST lib_users-0.13.tar.gz 25704 BLAKE2B 895f8b721216339fe4306158bf6282353d79584573091cc4e7c63c8096a9f9cfe380a8bce7229f168e44fe5d3641ceb8c91bd751316a6c6a467ace4ec0dce723 SHA512 588af7068728810832bcf4d1526f271e255d07c75d152fb41844c66f3598a71e9a96bee3426b31b58cd26af889bc42c0a7248731fdfe3623fd4567d2b6b7275e
 EBUILD lib_users-0.11-r1.ebuild 1114 BLAKE2B ab26338a370609b310c18385e49d9855947268cccbbb48697ff1c7f40cf4a70c262d94bfc604cf6dd6ecb7ebd4bed5b33efb439b3fc9cbc8710e22eee7d62b50 SHA512 c07b09c78a6533fc8a46ccac6faec4f8b0d5d3072e85b43ab4e3699f0f636ece5b8e12b70dcd1e033b7b11df305a68197e1ef9ee3761f304c48b8b932240d40f
-EBUILD lib_users-0.13.ebuild 1116 BLAKE2B 1567476c77eed36876279fb869f6c2ac74b932befa4f515383420d3ad05047fac75a673b8dfad271671daa8a077ad5df1e41ead39a9790b4150e683b8e52d0b3 SHA512 3c2ebbf9c5c6870124b60e1818006f382b6b6a8539936d3196ea8a41ce5ade7f4d3dde76220d6af845b0b6a301c08b6e1187661990b7cb56cd706510fc316fef
+EBUILD lib_users-0.13.ebuild 1115 BLAKE2B 5785958203673877662e825a368ba127ea6abf2c86d383a16b6908a8fa5841ef4f87a6c4b137bddb479cdc477df29cc4bd343efd5dbc5d63cc44551bc5ca4bf1 SHA512 8eeaca37c3e23ef3a7af941954334eeb730bb62884c6d4eab473e1fa7c52c46d1fd1736c41a66b515fdb429cafe65f0f608b151e28ed7ba414d53e01f0b91f7c
 MISC metadata.xml 454 BLAKE2B c545fd1db330988ad139de08b1890cfd9d6aac98947b954fb761515d314d8ebb941829e7767fe4fad6beb41caf3409111505d1a6378c852f15907933678ddd48 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd
diff --git a/app-admin/lib_users/lib_users-0.13.ebuild b/app-admin/lib_users/lib_users-0.13.ebuild
index 26a04f43d6c2..992854c19048 100644
--- a/app-admin/lib_users/lib_users-0.13.ebuild
+++ b/app-admin/lib_users/lib_users-0.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 69f3d91c56ff..f66b342b353a 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -6,6 +6,6 @@ AUX metalog.initd-r1 651 BLAKE2B 7b7739ca48acd3ce646478b51639c14f7cf131a698570f7
 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
 DIST metalog-20181125.tar.gz 39472 BLAKE2B 64d90835d50c7cb10ab2bf2708d00189b9f8cb56438c29d5c445c5527cce030f918ba74f83cdcd54017f04fe2a8ab30e5631bcdf6681e56c311f8069981a9b5c SHA512 4b187a29b9e25a0f762f929c6993fa6e49ead470916a43a0dfbf16720a1a633121357d2f152bf4cdcd71c016aa4fc8fd6cffb35249abd430fbbf66651986bc4b
 DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
-EBUILD metalog-20181125.ebuild 1582 BLAKE2B 3737e4c6c1788c24efb16a4b777a676a2543a76b6c2af619991f3ccc8c4601f338588af07507c1d5578e9ba787e70f269c0391b94f7fa2c07b980159b4c0e5c9 SHA512 8608af8f286dc58ecfd7d1c786ee450cd76aefad309a054faa87f8c758af91677fd7393ab0f2e60aafed4845a1ca83fbbd88d29af5363b9da775f47f0c916a8e
+EBUILD metalog-20181125.ebuild 1579 BLAKE2B 803ae7c95763b7eaa4159719bd2b2312cd73f127633cacaacedf9756304c68bf22a18cc56ece10be83e8132e388345647e5576f8008b7dcfb03f3cf85fcc0099 SHA512 ea249dff772bc735daca58133cc36f5793305055537b4a8bac615a3d10ee51e0dacf9c7827c5448a086a9c9f1ab28d7936305cc28d4c84f59c7f006aa757ccfa
 EBUILD metalog-3-r2.ebuild 1471 BLAKE2B 5da0f4866c405bd0d7073a1d98a8ad9acef166ff67af57c3330aafd68aacc7bc6ae8c81d28e402554ee637d26f5ce3aa14adfcdcb5a4cad3422a44f849e5bdb9 SHA512 91abf5ae5b73cd63246672d6bffe3ecbef91c271556958f7d1488bece9445109030752d5c932050e0413541aa240b3f09afd881f0a7350b58bfcf8dafe76bf70
 MISC metadata.xml 334 BLAKE2B 2d9ae46fcede549cabba6654513afcb6bee8ea22ba48bdc910c7b136e4d27bf6e223db5b13501b275790ecbf4fcbcb4ebf5ac9b6b81c6fa098e2f2c402793b0b SHA512 14ef6878732ffc5d14d1d27cec55ec886e76969e016ce8a009cafffa0b8d4e470c1b0f2480da5aaf0ed885c101b20d5edd7ce333efb9bc6f0bf56462e7260b37
diff --git a/app-admin/metalog/metalog-20181125.ebuild b/app-admin/metalog/metalog-20181125.ebuild
index 4ef8692892f0..6d04d77b1993 100644
--- a/app-admin/metalog/metalog-20181125.ebuild
+++ b/app-admin/metalog/metalog-20181125.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-fbsd"
 IUSE="unicode"
 
 RDEPEND=">=dev-libs/libpcre-3.4"
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index 7aea063d80c9..940534d852d3 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1,6 +1,6 @@
 DIST perl-cleaner-2.25.tar.bz2 7435 BLAKE2B 348f5429874bf7b1db5c9ba5b1479c3d5fbce68fc9ef91aa44dad3325ab2287d4bfda9221063dd643ec3b6df465443bb9a024705ec46f15c50ccd618ef193ce6 SHA512 5ef5682872ce840c0df98de82a6cf622120435f542206a00bb8fe0f9d5e46fb9898a89ab576b08a74b0d69d57a90a930d9f8d7d0b527fa3a928a6e4ddbad6ee9
 DIST perl-cleaner-2.27.tar.bz2 7493 BLAKE2B 03d8bc336fd0a42bce16c4bf8b2272a7ff24d605b483af777ef7ab3d59accd0082709200705638ab116934f675b17c5cf109c40a3ab739654ff64abebd8c0558 SHA512 097d68dff30da198636f73fc44600f1863c7f69f87110315bb83297c96d826f2f101f56ab546fde94ff60ca00da0aaa569fefea3c2599155f3bd69c66fb42ed6
 EBUILD perl-cleaner-2.25.ebuild 1033 BLAKE2B cb2b0768286815689d8516f06b8fb78436b0fc3746768e25458af4d8843e65c20298496cb808c0b19c55f96d9c2eaeb121afc6aed52704b48ddc18bb6467175c SHA512 5d13694ae65fc83e1429c85a92b30dbc033a30ac31e93809eb63e54c7d22e1ec24479ddffdf01d3fb6fe2164b3373a96a0e0383ba5d2e4afa6d80036eac61e41
-EBUILD perl-cleaner-2.27.ebuild 1086 BLAKE2B 62aa010bae53becdb21d94dc60ad4b3f15639678b2762f204a5928e75fc2de57413df86dfc99644bbf335eb1761fa41491d4fd9f62e53dd9db6453a27061e983 SHA512 5e01fadc4f7887ffb30a04cc1b04605da40dea3ae7755a375aee2fa2eb1d1aeb3a18bdc4c97f6b42e80bd816b352e30cf7ad3ec1b5f77767dac44a5887c557bf
-EBUILD perl-cleaner-9999.ebuild 1102 BLAKE2B 901777e1ab63c96a03df5ed3e2fa8e8466040079353ad8030df316454c55b47c9bdf5b9a03831d393eae61d3273763dc9a8119f1f1c7a0762545598b715296b4 SHA512 5ca9ef465fd36420df8f61fe7381c8e6ca7f81b020420054bf6e94367caf6ba987da27fc3af3bae09ce4cc4b671da314937aeaeae6961bc69e8d9a964705653b
+EBUILD perl-cleaner-2.27.ebuild 1093 BLAKE2B dc0c431f0024fa11db73c08c661f571b6f011e41992fabe8b1018b936cb300cbbc336f767579482343737b80ad1f5b6e38afe101874608c7ad2089154527f4f0 SHA512 664a08e2bf9cd59727e9a4d4f359d4df49177d1c5ae181cc4315d6521161c128a6932de2e080d4416cab1b0cde1f1f70b6d9bcfba4f17a4f51db35238099e30e
+EBUILD perl-cleaner-9999.ebuild 1106 BLAKE2B 4e6fa320ee3bce622156c4bf2550b932915909c9c31a130035fa2e141925dba8189f1b9cea3644c99a1194bb1612b7e42e09d833bbc1231760b742617f018ae6 SHA512 20572bea7bf7c4d4f47ef6ef74c5ccaa02a76bc50a8d4a6b4a3d0237c3546068fd1633839bdbd6fba27e6db3fe85e09799eb26a844f99af7d7c9c3040ed8afb3
 MISC metadata.xml 248 BLAKE2B 7e969e31666e369b4b1826230eb9c103e51962ac23701a7d5e49d211d6da6ee2f6a8372d72b3ba454140d2c1fb7ab6d122f011e9c8144e95a9cc11f01d2e6481 SHA512 53fd9b61e8fd7f18f9493861896a34938e5f6ee4efb3d2c71703dfa81587d0943f0d439fac0e0c106966dabba08d6aeb4b0a2ff85addf30d992c9b7c78ab6314
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
index 66ce92577dbc..8b7df3e35322 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 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"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
index d2a96ef087a2..14733e60594e 100644
--- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index f2471f856306..36b314e6f33d 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -3,16 +3,19 @@ AUX mcollective.service 390 BLAKE2B 3d032bfbcc0499af0beafae05c008b420f3b598c4906
 AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
+DIST puppet-agent_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_5.5.8-1stretch_amd64.deb 17302932 BLAKE2B 4ff925477f74e5ecb7737cd41712bcd8b0b54d244784fd874ad160bc7cd33327af615ec117fc28cd45d59f275c51aa71f80de204f1f395ef89c7162d5acc3cef SHA512 f30cf250855c4f5adfe58f8c3c7dcdcf155ba97a9a805449555134fb9fedcf6c4d4ab54483d4c1530ae09583e6ca78d1af446cc7fc62760c4aa839c1e9d42bc8
 DIST puppet-agent_5.5.8-1stretch_i386.deb 18221644 BLAKE2B fcacbae34bdb6fa18eff344123908880de2e5025ccddd25ee751c5c2b229ff8b63c66d482d4e8139b0d263edeff78771459cd90beff36136a553b039a7c417a9 SHA512 e00c04eacea360619f9fa4e016b8421fbf44127f979ed772e06cef21a15261a7d201abb9bcde30d8bb4e36a4b37d38d67814b2c1077b33ee6e6404c898c53e32
 DIST puppet-agent_6.3.0-1stretch_amd64.deb 18716014 BLAKE2B 914686e0229b40ea2e4f29c31556fdd289e7f556c471ea3e3a8cec887e1e1175ab5e23fc2605e3c156f9f571a8ff47b1a77b4f1173e41b923d7bd59592b575ed SHA512 fd5f39c4cb2fb040e45a0b2316857ad9da311532a9d1659f9df07ad57f85daec2e7674109c63885325c809e839b017b7b3d5ac57f9439e03b569203bf301851d
 DIST puppet-agent_6.3.0-1stretch_i386.deb 19243158 BLAKE2B 52c36e54ecb2e1fcc9ef5add8393533f68a21fde0f449b558d1fe58b066519138092e15c851e33580e9c2b943ef7a58b323cdd7bc1997faa273db4f518292465 SHA512 aba93bb2290879f5512f2429af658b137a3b5ae51ce9817fb701086be7abe4043b54d242fdc1310876b42124819885f8ab97c9fb6cc9113a50115bc071d42736
-DIST puppet-agent_6.4.1-1stretch_amd64.deb 18772178 BLAKE2B 6355578e7254965213bb0bc7df43def6faffeafc7f16aba22eafc0a9abed75d30d7e73f78c8641931526f775037ab6b07a1d3f47367a42545b585c48299550ee SHA512 b1d71c44a2d674529b94619b407cd5386bdfbe334fbe68e666361e8e91275487a2d841e9cb90002c768291b045447fb61d010de7cb0e068cabacbba3c601a960
-DIST puppet-agent_6.4.1-1stretch_i386.deb 19258406 BLAKE2B 8c29b8ac9a9afcc3540ac68488242ab6f6d2d1548c8f8b66adcf1874fa2ca0077b76d6de67ceac5091e1118cdcbff410639b8ea4fd022f396dc663a6851407af SHA512 a5c039581c5d3c52de9e960f7e5d314751e18184028ea6bc98e89af9a141c54f29dc4499db3d9fdf6e2db6ea6b4a8ffa691877d458a31c0d8660e49b28209597
+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.8.ebuild 2480 BLAKE2B 2dc21f5294f4ab42011e2359caadaf207a16e7a2eb235cd33ea4300c41c5ecdd8df771c92eb350d7e5f7334b207b42540271f016c2cf2560f9d38bb41c3e3113 SHA512 b8f39ea59b87fdf1c6b83ec6cda1bdc66650c15287219060f42015928f2739dff8084fb7722462201abe950c8888667796f76bd83cda1bfa48795af8d472f202
 EBUILD puppet-agent-6.3.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
-EBUILD puppet-agent-6.4.1.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
+EBUILD puppet-agent-6.4.2.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
 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
new file mode 100644
index 000000000000..388141a53241
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-5.5.14.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 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-agent/puppet-agent-6.4.1.ebuild b/app-admin/puppet-agent/puppet-agent-6.4.2.ebuild
index a72df734d6b1..a72df734d6b1 100644
--- a/app-admin/puppet-agent/puppet-agent-6.4.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.4.2.ebuild
diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index 29e535237ac3..fd7a169f4fe4 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -1,3 +1,3 @@
 DIST puppet-lint-2.3.6.gem 87552 BLAKE2B 0a2f4b9c2ef76c06bc4fb6eb0f737af406bf3949e7c9001685c6522714b550c0f2c5680d5d39f5d3994496a497664e912eadc44bdb7aa4c27635d23b36a90776 SHA512 d162307e66bb5f1dd923f2f9fab55de7b4c5fad6264d7a1bae8df20bd45c5a786b66d9f5b3bd235230fea959c67242462e711212f65807040048f4c0be7122b9
-EBUILD puppet-lint-2.3.6.ebuild 620 BLAKE2B 399b76cf047bc8fb99c005d1be3835ad189365d72da45d27bd8ebe47ee4022d7aa9b0f2ac31948214dedf1cf608971716bcf0425a593801a2538bc196fc5304b SHA512 57c3880b02b0febe9c94da09e7e7710730e75f4fb4b92e674c86dbcb5bd0b1864d7df79f032b634063b94fdf46a28d79d9b556c2605731cb91f0ca9571c078b2
+EBUILD puppet-lint-2.3.6.ebuild 624 BLAKE2B 4ac251b1b01aca51123969199c9dfe49aabbcc7318e06c78a197299542ce5ed54a2bbdae8831d8349c58342b2bed43580b4b437417891f01e5c53d7559304267 SHA512 af8e5d8e726bc773053a9cfe5a4d0615db3acd67395762344dcc48a88ce5ca9c03124e4ee59ad0270c9d600299f1c812ab8884f43221b092fb8c2e8714f0ce2b
 MISC metadata.xml 453 BLAKE2B 4fb00983f98c8c178fa1dc667f966b0f1fd54861ef71e37211fb46edceb8f91c15d55add637a50eda53ccaff8a1d3a6dcbdd02afe2ae32cf0f69797427897d6a SHA512 bd9238c56ddcdcb124df5d7530343756b865d2f279b719fb0ce7bf4e37565709194cb7f564811be6376fd4d3b61403d76eb9542aac3a267c2eb08f1bade21524
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.6.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.6.ebuild
index c86bd234ccc4..a58ea6319eae 100644
--- a/app-admin/puppet-lint/puppet-lint-2.3.6.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.3.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index dfcc0062cb49..290af598afd0 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -12,10 +12,14 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
 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 5623 BLAKE2B 5653e7a7ff00a41e59acc42da38a47f78c25e2befdf034a7697d6cc37b1b0c7236a7f0fe6a8b0f224b08905d2fd74e20e8fb43e67e7dd1c3afc5ebaf3fe357f3 SHA512 4ea6f32bd809bb4e8ac90b2cb6205cc464dc9ea3cb97fbe3e14deb6890a04e9095f3d9896a99663ecd0d57a80df16b283ad8c55f8d0f11d1bc4eecc477a245be
 EBUILD puppet-5.5.12.ebuild 3824 BLAKE2B de47036b3db77506272ada8f0ec8af05a69a98e75e9d8c78ee767ba82b2762d639bc7ef2d7b51b19622766bc6cbcceef43890c2aaa25a91dc6841b3ab7507bc7 SHA512 2b0069346f7b4891d8158a9c1a3a7d6190d2e4854988bbfab4cec1815cb797be0a70a13748cd974097f56a3073c00eec8e6a1f25dfad987e622634077c15565d
+EBUILD puppet-5.5.14.ebuild 3826 BLAKE2B 5c607670362e772e049e9c4789895145076fe3666abb893d4f5a862ce644c0434146f3bba0e4d84264c6796abc3c534f48ca3d3f7d34bdcb489b7b0a0f8981c4 SHA512 30546929c45f9eb178bdac4eca613ede8bf6ebdd677b1046b785ac540081dc98c8bab9f19782c815066e2daf591a882258f7af7dba4d240087eefda62992cdad
 EBUILD puppet-6.3.0.ebuild 3655 BLAKE2B 6589c4e2d07056f8949e942e54edb401842377263462f7c0bbdc66c907dc038bac06296b6479c22919d0a4740f0f61e443623823ff6517759d4188f576ec01e5 SHA512 221ea214e4222aff478bd3777e468d1cb377b23cd0008d9fc25cba7f5a1114e7d3f475e7161d1d0300d49b472e26a1be4686f5c9a90aaed23ec36d42466aa3f3
 EBUILD puppet-6.4.1.ebuild 3655 BLAKE2B bd1581772558cbb64062d3dd4c3850b783746b74cc4a5eca8b7435a5b12748e1481460e9a4ce580844367e43b272f6c982fdcaaa841c3cc7aa5087d04c2511b3 SHA512 0dd5c0dd5d50c881329263d16843e508152617bc0ec089479b39c4d77f87655e3425aeebee2ed7364cd5b024bb9b93e37e54ebd866234d52839e84d3658d4a52
+EBUILD puppet-6.4.2.ebuild 3657 BLAKE2B 97914979b624da5989e35d89a6d365facc72910912a3d02dcb4daa5749ed1e6d14525ff0f94a2c4dd33e0430a4e13dcbd93bf096ac1fc392254d54b83fc3a630 SHA512 fc30fcfb266c206c11d726e2ee07d7554a083bfe9e90c2e65c13bd6c34bcc70e9c581fa579f7ed1d1bad003cae02d15b50a8ac4d34b34be3f989530ef5434282
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-5.5.14.ebuild b/app-admin/puppet/puppet-5.5.14.ebuild
new file mode 100644
index 000000000000..7f380bcc3fac
--- /dev/null
+++ b/app-admin/puppet/puppet-5.5.14.ebuild
@@ -0,0 +1,144 @@
+# 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="http://puppetlabs.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-6.4.2.ebuild b/app-admin/puppet/puppet-6.4.2.ebuild
new file mode 100644
index 000000000000..0fa5d7101201
--- /dev/null
+++ b/app-admin/puppet/puppet-6.4.2.ebuild
@@ -0,0 +1,138 @@
+# 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="http://puppetlabs.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.4.1.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+	elog "not already done so."
+	elog
+}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 36a917c97b60..c6bbade5609c 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -4,8 +4,10 @@ DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e1708
 DIST puppetdb-5.2.7.tar.gz 24353701 BLAKE2B 196b336a92031a25f7f28ca070a831857f3e0dde3ecc02e12e6884f3628c12dcc27b347c39147636addc975841f340fbf89196e86b3c10efc2ad1f16cf6f882a SHA512 989fa232d0fbd90c975fe110caca9b9c92a90167eb7b8d0384282dd8cf85111a56174c6785d7c73800e19185e879e258b8e6cefb210c1c44a229ce994336ef1d
 DIST puppetdb-6.2.0.tar.gz 39922402 BLAKE2B 5d3c36bdeb902c7292d8da728ce225e3378bcb1283dbb2558f7aaa488e53351da41551606723d6c504118f5a653d92831cb55e0570dd7827c1be06f78592e0ef SHA512 33da6a7db688561d01302918cc0e85ff88f5490ac4007e4f20df6b0483aa1a7f65b2226f98966936333c7fa28060adca47f10ba7419a05d70c9c72bd8a40e8e5
 DIST puppetdb-6.3.1.tar.gz 41706703 BLAKE2B 74c1fc8a4702cdd94dab88d3e3bbf9e078d9c6e574454f49f2659bf8a9882ab51fd65392726834c032cb8e14881a349148a43ff05d6b186a1ece868be2fee2d4 SHA512 96ab60f0b0f531b1831ab3707b4c8496cea8fc921cd42fd828a1c86ed0e1d1324f1bec3df5345d0b5a0f737bfa638459941f1f6a9c41f95b745035249ebb01d3
+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-6.2.0.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
 EBUILD puppetdb-6.3.1.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
+EBUILD puppetdb-6.3.2.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.3.2.ebuild b/app-admin/puppetdb/puppetdb-6.3.2.ebuild
new file mode 100644
index 000000000000..616793cb4123
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-6.3.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppetdb
+	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 0efc668eea5a..637789f7ad0b 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,10 +1,12 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c
 DIST puppetserver-5.3.7.tar.gz 53517572 BLAKE2B e423169b92a1638b0fef1ee5adbd10899917d89eeaa9b3bea689ce9d6f4d3e3b9d5c6cfdddea897014493373429ebba375c1a9d7b77284de46f5a0a5d6555dbd SHA512 8a58d89dc44aa8ebf82f06bdfc4f52c7a25ae3f1a48ca516425a57180c73618a1e850a595aa0e46d6e3a0b360ea38d3f050790304689bfa3b47bb0c1a4fad17b
+DIST puppetserver-5.3.8.tar.gz 53615153 BLAKE2B 82de090126c18a607089c2d260c38c4dcf28c9dd55dedde43952493ac0dd0553b718f1e96c36737514527e72fbd04a4b54eb5667123dd46d21ff7e7e6688dd08 SHA512 ac2b28bd506a92606f5458a079fe9ffcd8a7d3b091ccbfcd649f0a818d0459b57bc3f40fa599f2f6e7012ffbd4b7e95af8ac9787cda74928bd29bb59b7633ba3
 DIST puppetserver-6.2.1.tar.gz 75683557 BLAKE2B 7320d7abdc9d5c59953f41773c7f52946fe7944c5f0f4a816b599d75a324d0a49a7b59dc990df5875ed849a2e6d1aca9258b65947446f7780f700fe48ec06e74 SHA512 ad8cd8441ac76c0443f0fca14999a014c5511d930b96e9721ff9c236ffb48cb3273e0abb2e615fa3210c539173d472c4080466bc391a863c2c4fadb32d26868c
 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.7.ebuild 4893 BLAKE2B 802069d0b2e2f414ed43eade2f993c708c9769ea25bbfeb7a49ed40e6690039a10f3014f07292b3a95eb42b05597aaea385e386d986fefac2b42eb3de6b7f4c5 SHA512 77a1f8e429a109e1347e47ba13198b7bcea17ec6564e84d1bbd4bafe1652b74507b3086d0ccd47da4fa04dbbaa177c67d2a8a0fc1043938948a4b50598c74339
+EBUILD puppetserver-5.3.8.ebuild 4893 BLAKE2B 802069d0b2e2f414ed43eade2f993c708c9769ea25bbfeb7a49ed40e6690039a10f3014f07292b3a95eb42b05597aaea385e386d986fefac2b42eb3de6b7f4c5 SHA512 77a1f8e429a109e1347e47ba13198b7bcea17ec6564e84d1bbd4bafe1652b74507b3086d0ccd47da4fa04dbbaa177c67d2a8a0fc1043938948a4b50598c74339
 EBUILD puppetserver-6.2.1.ebuild 5354 BLAKE2B c75b4c97ebd41fadf589e7ef752291425935af7d1f1528401f7dd1b2b670cc865570b8a610f1901eba1037bdaebb2d8dd2998380e001c046bcf54fe35b02153a SHA512 613533ffbcc1925f2ff040880d82f2a20c231d66697a49d6fc5fbf5a17528d3b3d1285918b83bf8ef4b4ee729656be610bb30f0bbefa827376f57da1fbd34950
 EBUILD puppetserver-6.3.0.ebuild 5356 BLAKE2B 4ef4f776eaebfc8e127a2233321fd5377e103be0454cab7752be03c69f835f4dc80c87c9a51cfb6c2f229ddfbd034ab284bf8b362c0fe5ee4e1cdc7038ca512c SHA512 0c5c622cebbea427f97b8feb82b615c17d730747de09448aae1d083e078e428f3a97723664bda0c1abcc0b83a43f3270903ce028ffa85327042c7949bea31c6f
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-5.3.8.ebuild b/app-admin/puppetserver/puppetserver-5.3.8.ebuild
new file mode 100644
index 000000000000..954d16fdc3b6
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-5.3.8.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/r10k/Manifest b/app-admin/r10k/Manifest
index 2c654045b329..052d103eb44a 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,5 +1,7 @@
 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-3.2.0.ebuild b/app-admin/r10k/r10k-3.2.0.ebuild
new file mode 100644
index 000000000000..6d843ea53de1
--- /dev/null
+++ b/app-admin/r10k/r10k-3.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="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.15*
+	>=dev-ruby/gettext-setup-0.24:0
+	~dev-ruby/log4r-1.1.10
+	>=dev-ruby/multi_json-1.10:0
+	>=dev-ruby/puppet_forge-2.2.8
+	=dev-ruby/puppet_forge-2.2*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/archive-tar-minitar
+)"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs for unpackaged rugget git provider
+	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 201a849b4eeb..2c9f3f4b984f 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -22,10 +22,10 @@ DIST rsyslog-doc-8.1904.0.tar.gz 8042650 BLAKE2B 585fe5c63eee1fb46f94dcd3d529045
 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 12421 BLAKE2B 6471892b10047479030a9847b12913e1d221dd101a715073ced6e174dd6068802bdd43f9ac8591e2329497fc9b2161f47b73599fd26ed1f2e68bc05ce07051f1 SHA512 d50d564268dfc5da2b6cd2d9470263809fe7a24fcea5c267e1874cd9aec1face83a2ea74e5d3fb2db84b9a9f9dd78b7a9f3f5caf2acc1f34f53b3858139bdfcf
-EBUILD rsyslog-8.1903.0.ebuild 12597 BLAKE2B e6364510c324afbb669d3d18bc66c424df2f76f5130d57dccfe908d89d5964656c9442a80fd8e3e1f478f3e9ffe528e29b7a89a44997757f12d104b652a24217 SHA512 ff16046287166c33452930a187c700f43f3fccdd626d017b14f8abf2da0204b2a3948c8d66b13ddaf47d314ac00aceb58cccde036634d19c4872f5624536fcae
-EBUILD rsyslog-8.1904.0.ebuild 12637 BLAKE2B 1d672fdaf283a4e1075c8f808e66e5de7f1683b75b56b1a69d62c3612432ad70d3f0eabd5b8dfd2eee3ec039c2e9343c16da28cc0d01019398ce05ebc6534637 SHA512 8e178e705cccdfcaad23633c74f4cc096516f12b8c128e4f85a16568b2254b69d38b7fa13ecd110d4d8cb8b83c5c1b27cb6c460592f9315f351a16f2e353156e
-EBUILD rsyslog-8.38.0-r2.ebuild 12347 BLAKE2B 9bc6a630bc12aa5f845b9d670262da7294fc7ac63ec29f4103a8b6fff0381a1d5f6f6dcf5e9c8a507941b11319b237a305698959f0a4f3d9411751352b443d51 SHA512 6f8c55fdb321a645528ca20e4a73fae9c4bb4593c10a45a115a8d2cc4f2e0ab295d5e596b6a4533571d3bca56f82cc278dacfb3e1a491c7a7ff6243dcd869a63
-EBUILD rsyslog-8.39.0-r1.ebuild 12423 BLAKE2B 11ee03f97ee8d3645be49cad381f441e2b57341a8d27e6af59d5c3233acedc1835b9ddfe2d1879e20e0565951ff5aeb60b8f52848a5de422f58e37219c0aa5f2 SHA512 beeb8b579c68c2f2684bc9d0d004998ea056868a280b6921dce969001b8cb48ea4aaa8945e13972605ae30ec7a9051c931441580190a569f83be8e63aec305de
-EBUILD rsyslog-8.40.0-r1.ebuild 12403 BLAKE2B d8e8b83bf59dcd2c6c23fd13cef0487def056c703d84b845eeb17ed2016a474a570c647b4dc4d5295c56228ae2e02279e0c7b062708a3e409d1cf9790f09be57 SHA512 f3d1d9107d5c756034ab70294404dbddb0534b5168471bb9401085c05582cd5d58c933a053c875318a3d54fa9ab8cd9e8a52c42bfbc3ac845c6f29d423b5f4da
-MISC metadata.xml 3967 BLAKE2B 1d88f39cd9c9f88b19d2b029afd3b3f80aa40b76661936f8981d2929136d918fc3f89c91d58b5aee4bdb97e648d7b2d24852f899badc576a5f5fa01b4246f79b SHA512 8a4a1e46d5aa71ef24a7dcece46d0902ba69abbd616a1c55d5a8709f64beea1fc1b0a2d12ebe5292f6f0a0b0199925ae64b321fae291c83cec43f346f90a019d
+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.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
+MISC metadata.xml 3875 BLAKE2B 4281901c6e209ace8f89bf7ec7f036cbabff009da2f080c5b5d77a0639099c8d87ed9925d70e7e3edb6cad8204ebee3a4b74a688b6a22810473a22d90c441347 SHA512 039cd323565bc8e96762bef5b7b34747fffc6d70176397d4be8fd83d1f9dd094e77c21f7005f0d3dc47813ddd97bdbad1ce47ef71a2742ffdbd4145142d2d0b5
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index f888ecdbd35c..7334da40b164 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
 		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
 		<flag name="gnutls">Build the GnuTLS network stream driver (requires <pkg>net-libs/gnutls</pkg>)</flag>
-		<flag name="grok">Build the grok modify module (requires <pkg>dev-libs/grok</pkg>)</flag>
 		<flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
 		<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
 		<flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag>
diff --git a/app-admin/rsyslog/rsyslog-8.1901.0.ebuild b/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
index 9a3428ea917a..e9efd66166d0 100644
--- a/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="amd64 arm ~arm64 ~hppa x86"
+	KEYWORDS="amd64 arm ~arm64 hppa x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
@@ -26,7 +26,7 @@ fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+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 )"
@@ -39,7 +39,6 @@ RDEPEND="
 	dbi? ( >=dev-db/libdbi-0.8.3 )
 	elasticsearch? ( >=net-misc/curl-7.35.0 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
 	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
 	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
 	kerberos? ( virtual/krb5 )
@@ -224,7 +223,6 @@ src_configure() {
 		$(use_enable kubernetes mmkubernetes)
 		$(use_enable normalize mmnormalize)
 		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
 		$(use_enable omhttp)
 		$(use_enable omhttpfs)
 		$(use_enable omudpspoof)
diff --git a/app-admin/rsyslog/rsyslog-8.1903.0.ebuild b/app-admin/rsyslog/rsyslog-8.1903.0.ebuild
index c2d6e8145cbf..d1b23d297f7c 100644
--- a/app-admin/rsyslog/rsyslog-8.1903.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1903.0.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+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 )"
@@ -39,7 +39,6 @@ RDEPEND="
 	dbi? ( >=dev-db/libdbi-0.8.3 )
 	elasticsearch? ( >=net-misc/curl-7.35.0 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
 	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
 	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
 	kerberos? ( virtual/krb5 )
@@ -230,7 +229,6 @@ src_configure() {
 		$(use_enable kubernetes mmkubernetes)
 		$(use_enable normalize mmnormalize)
 		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
 		$(use_enable omhttp)
 		$(use_enable omhttpfs)
 		$(use_enable omudpspoof)
diff --git a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild b/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
index c745aa8c5169..1161ca1f6d61 100644
--- a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+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 )"
@@ -39,7 +39,6 @@ RDEPEND="
 	dbi? ( >=dev-db/libdbi-0.8.3 )
 	elasticsearch? ( >=net-misc/curl-7.35.0 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
 	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
 	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
 	kerberos? ( virtual/krb5 )
@@ -230,7 +229,6 @@ src_configure() {
 		$(use_enable kubernetes mmkubernetes)
 		$(use_enable normalize mmnormalize)
 		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
 		$(use_enable omhttp)
 		$(use_enable omhttpfs)
 		$(use_enable omudpspoof)
diff --git a/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild
index a14e94d609f6..320c0365205a 100644
--- a/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild
@@ -31,7 +31,7 @@ fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
 IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
 IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
 RESTRICT="!test? ( test )"
@@ -45,7 +45,6 @@ RDEPEND="
 	dbi? ( >=dev-db/libdbi-0.8.3 )
 	elasticsearch? ( >=net-misc/curl-7.35.0 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
 	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
 	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
 	kerberos? ( virtual/krb5 )
@@ -223,7 +222,6 @@ src_configure() {
 		$(use_enable kubernetes mmkubernetes)
 		$(use_enable normalize mmnormalize)
 		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
 		$(use_enable omhttp)
 		$(use_enable omhttpfs)
 		$(use_enable omudpspoof)
diff --git a/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild
index 50df01153629..822a2a4279c4 100644
--- a/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild
@@ -31,7 +31,7 @@ fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
 IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
 IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
 RESTRICT="!test? ( test )"
@@ -44,7 +44,6 @@ RDEPEND="
 	dbi? ( >=dev-db/libdbi-0.8.3 )
 	elasticsearch? ( >=net-misc/curl-7.35.0 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
 	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
 	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
 	kerberos? ( virtual/krb5 )
@@ -226,7 +225,6 @@ src_configure() {
 		$(use_enable kubernetes mmkubernetes)
 		$(use_enable normalize mmnormalize)
 		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
 		$(use_enable omhttp)
 		$(use_enable omhttpfs)
 		$(use_enable omudpspoof)
diff --git a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
index 80b404d34555..1176e533e0f5 100644
--- a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
@@ -28,7 +28,7 @@ fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
 IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
 IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
 RESTRICT="!test? ( test )"
@@ -41,7 +41,6 @@ RDEPEND="
 	dbi? ( >=dev-db/libdbi-0.8.3 )
 	elasticsearch? ( >=net-misc/curl-7.35.0 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
 	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
 	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
 	kerberos? ( virtual/krb5 )
@@ -224,7 +223,6 @@ src_configure() {
 		$(use_enable kubernetes mmkubernetes)
 		$(use_enable normalize mmnormalize)
 		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
 		$(use_enable omhttp)
 		$(use_enable omhttpfs)
 		$(use_enable omudpspoof)
diff --git a/app-admin/supernova/Manifest b/app-admin/supernova/Manifest
index 9bebbb0df614..14dcbe8ba9b6 100644
--- a/app-admin/supernova/Manifest
+++ b/app-admin/supernova/Manifest
@@ -1,3 +1,3 @@
 DIST supernova-2.2.0.tar.gz 24068 BLAKE2B 129c077baf9b415851f3c17eb5a9870ff2d8109a54c424d9039204620b6dd68d8f17183b5c52d863882bd2586ed03b7d1c397f70f337bfba9e9c8255b6feb578 SHA512 436ec13dfaf5ff7cadacc1dedc3545a579784cfce3b0c7925cc0d877ba76a4c865ad3687ae8ae22fdb11d880282dd555f9a9d709c005ad024299a34607fd8063
-EBUILD supernova-2.2.0.ebuild 1246 BLAKE2B 0b6da2ad5949e34a4671c2d31249005f37502b9ea8fc6fd03324064b4005b397ef1a8c8b94957d6874e79406c932c813bd16c98046b36da2774a7a29a11d73d9 SHA512 a0a7cf3bc5f829c04d4f06762a87239bf153e2f76d395f8b353cd30f661b8070208c8e5213d53d69af3da8fb7709a8abfa3bd2ba428625244c500b9b4892240d
+EBUILD supernova-2.2.0.ebuild 1250 BLAKE2B d11584d3ce23824667282c76544d25b041142409c01b28145da5f8e71c2e5dda5b7152747654dd459ef5def68359e66f632816cdbb0b756bba5c3f07a32e345d SHA512 dea7ee0c403649b78a1ea4a2a203d9eea60f45203ba33bcb17cec1061ebce50df9f82f4324a8ee7ed1b2dd264960e53a21e00c9cdc7b2a5b83494bedd2d29b38
 MISC metadata.xml 513 BLAKE2B 902b49ed2456d8b8742d17a03370e66a3299b540cf5d6c84b39333d3de8fd849fbae680378b79397bb00faeed0e1e54c9fc160fd710f11888ca442f0dff6a074 SHA512 8253bfed9a47098f43a96906fbd72144005ca7bae46aa3f4e2f3bdc00b95a7dfc5d8b7106a1127cb3a6b3d3ab34748f6560bb38917047074674ed4955f389834
diff --git a/app-admin/supernova/supernova-2.2.0.ebuild b/app-admin/supernova/supernova-2.2.0.ebuild
index 148043720999..b4c0f23b7752 100644
--- a/app-admin/supernova/supernova-2.2.0.ebuild
+++ b/app-admin/supernova/supernova-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="
 	${CDEPEND}
 	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	test? ( <dev-python/pytest-4.0.0[${PYTHON_USEDEP}] )
 "
 RDEPEND="
 	${CDEPEND}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 20aad6233b8d..dcba31518551 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -36,6 +36,6 @@ EBUILD syslog-ng-3.13.2.ebuild 4701 BLAKE2B 4bc557a7545796a5c0c883ac3cee06739663
 EBUILD syslog-ng-3.17.2.ebuild 4920 BLAKE2B 2ee995d29e470961d08a0ed8dfeba52eb3a091b2fe17be737e504ec114566db57ac2b933fb1c3b851421e729990ab55c62d56dde80d923f2af67797ec1f53eeb SHA512 ba6e29ea457743897c950ba44785975134aeec9780b064bd1a935d398593a96618688f6b8a13cfabfc61bd5b38cc9640e0422bbc299dc7e190a2348877bdbc07
 EBUILD syslog-ng-3.18.1.ebuild 4897 BLAKE2B e6159007fb47bbe44110bfdda23250761901deb7a071430bd7a37df197375d5f079f8d038b064961eb07cfb6e6bbd044e5bc96c94809af2078652418b07f6da7 SHA512 c1b00c4cc864f145097533d0a6708e1daf3d840c1aea660c149e970fff099b0d3fc83eb5cc4b480c37e5a0325c97a3cca14d1a869f3a14a3eb2055f9127b9421
 EBUILD syslog-ng-3.19.1.ebuild 4920 BLAKE2B ad9cb81bc112bdbb4ae9cf36e53cd11eaa7380e180d2f44f025f46291a8c41c11071ad275d77a063e03ce0472c88c2341d3400a312988ebecbbfa173ad6b76bd SHA512 c937db23ab18b175b5f622a95701531ee43d42b9ca480778608e05fa57bf91635a8517b4f1b86a967d93815b7d77e7f45bb800a6cdb04db9e734a1cf3b0700c2
-EBUILD syslog-ng-3.20.1.ebuild 4944 BLAKE2B 96fd2ab3a27c120aee858ff2d1513023b579b33904735a7cfc109fc20bdd8bf8219a13d753c9ffed50c741b56ee7485d54bf0aebaca1400277cf4b46b10f7e65 SHA512 a89f273c0365cb27bf21de0cc42edc001a4cbdf401d26e524c03c938303d4f4c27452179cee754fe3988713169f5a1fd9654e21412f5d4ffd69b23a9398098a6
+EBUILD syslog-ng-3.20.1.ebuild 4951 BLAKE2B 45ad3ab6ebacbc0b0d2da1ce090d53e1ffc97d2c18648bf6763e6b7e4c0c9f8fa7bf6e746f85553aeeee144e3bf8997d6e0534357ee900fa26408b94ff815a7e SHA512 1164b8784d1061af518017698e71ce7ff48ecbc1a964eba9babe8436af141a2be119a9bd3553d1d3b90026df27f051c3a70dff23a1c7614752627f8583d1b028
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1186 BLAKE2B 8fc7edd7e310b01dc6080332a62ed4ffc5d690d4082f800d8306232c138fac46f07ab7cebcbd40e91c2c41467880bbf61b4bbec0907e84f26cde51d24277f47c SHA512 5d8a62c83706e3bcb01b67e6873f7052c941518d566667e5b50aacdc8fcaf07a02c76ca3705369181795c2c62b5ea990cdb93501e1719d0693d597b5e6f8bee2
diff --git a/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild
index d3f2e2cea1b8..b36361d82793 100644
--- a/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-04 12:02:00 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-04 12:02:00 +0100
commit	eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
tree	ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /app-admin
parent	b7ebc951da8800f711142f69d9d958bde67a112d (diff)