gentoo resync : 16.06.2019

23 files changed, 104 insertions, 164 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index eced02ebc53a..4b2d74c0a462 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index 07d78de74638..794d606de9c0 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -5,5 +5,5 @@ AUX analog.cfg 3992 BLAKE2B 8e68cc26a59a5bbed57f84e06ac8f5c9874cf1a36bdbb5c6f914
 DIST analog-6.0.tar.gz 1553316 BLAKE2B 5363880cf65e8a4e845603a19dd30b79d4fb13b51b68d0cbcf59c2827a2c099d02c662e55b59ef9b4526ade53ca3f7401415a3bc78de3d7cc39b4e4988299241 SHA512 42b766d45f86a32d2e97cc2be35ebb5f4e0ffc2fb72d48196939027ea1ed3398a8cc0a43c47868f542bfb464199ab35bd93fa2ba5e37c4fc83ff15cfe19b9c60
 DIST analog-src-6013ce.zip 4875246 BLAKE2B 6b0663f3367faf84a8c65a778a065165ddfba6cd902e5cc6c9e0e84d94e1600629b9f9f89b87ec293f4b81f4034e21941ad45784ae5f35352f71f7b0917eb731 SHA512 8f8dbf0bd95873132414f558deeff61fbe9ac6cac40936f00515ccaead86642613c3f0a5a88046eb4d1f4e263cb01d638291c9a1596ea36098b455572b7364ed
 EBUILD analog-6.0-r4.ebuild 1324 BLAKE2B 3e8e566b541ce86cac1270c7f65fc0656e63b532777f35e022073edf9cb4123c6233a64cdcb35eaeceb55e07b7848924f54c50c9794e6d39ab22fac93026e7f8 SHA512 3d2d68366229b53000d872261a01eae6e8fe291937b6d614b7e2fb3fc29bd05742e03a0178a30b1ece779e453e3b71ec49c647727eb860bdba826b1d522d797f
-EBUILD analog-6.0.13.ebuild 1377 BLAKE2B c575294ab4956c46e9695b4fa773b0d430fa44e2e644e32baec639015a1c776184798af390e1a2cd4470b89d1f1f2b1df1d348043136f8ef4ca134a92b8b2590 SHA512 83110a2afc757604c9f7c15460011e4b3ca6b7b555859fcf86834ce254ab3e0221143ec6d1c247b18565ce5366de4f5b32831f7cb6afaba6f59cf013f8e31e2f
+EBUILD analog-6.0.13.ebuild 1376 BLAKE2B 2fc261f284e5bff679a5b22a8c16858a4fd6c4add1755df37f85dd4bbfb31d10b2b6a145b5543e1b20bbdc7d38670424da6c743277161ed3652bf05cd7e3803a SHA512 5cf1b8008948ed9c8d4e46751a143b81ad4c526cd6b1fb20567c18fb496162e50d9387dfc5ffc56f31f36250c9310b401631812cb1f062339c44f010bcbfb058
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/analog/analog-6.0.13.ebuild b/app-admin/analog/analog-6.0.13.ebuild
index 77fc0943bace..29ce2146a449 100644
--- a/app-admin/analog/analog-6.0.13.ebuild
+++ b/app-admin/analog/analog-6.0.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.c-amie.co.uk/static/analog/6013/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
 
 DEPEND="
 	app-arch/unzip
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 4817565c6a1f..d10607381783 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,18 +1,14 @@
-DIST ansible-2.6.14.tar.gz 10732165 BLAKE2B c753860a521c37357c7a5042391957680865416c036fcaf3920a65e291dc3ed3a52e94ad5b99acdb0d2c919e3be68b8462e462a935497dfe83b406adf4e63dad SHA512 ee532c0d61ab03a0937e89bfa7565f27f1905987784f31895e8ac6e4a8ecf76ca9f30201d278a68a995b8fc27151712dba2e79c13269a472d923355e36072e4e
 DIST ansible-2.6.16.tar.gz 10738431 BLAKE2B b801eb524f631950c385f7a949bdeae288e95d1590ea96f98e955f6ebc4ccfc5970e3926727850e7ef13fbcd7118ad6388e516a8fe62b53f1bf8b4d5b484dbab SHA512 ff67803cf6afd512ab779b7c862d4427591c90bb0ed9391e32fc8ea30c24c70cc31c910c9af51b4dd423885f858f65c1c8d6274565c90296ecd7a00df3374977
 DIST ansible-2.6.17.tar.gz 10742849 BLAKE2B 04667612ab7d149d7a322ce674c2256164c0d958d3e5b34cafeba0b90d4f0f07ee95a31bf0c205c13c90ee4d63c3045ce2fc51de8996a7dcb877d39e2da680f5 SHA512 ba46192549be3e853232d865116c176aebd8ed2b63fcbb45cb633d3809fc534004849a70a2abad80f9fe99deeb55af3883ce1bfe0db4a9afd2f6b8045936e860
 DIST ansible-2.7.10.tar.gz 11844278 BLAKE2B c847b642ebe4cbc2194538a0b194cd5c0bb82e0ba2a6da2e272670c75596b9793e028d067ddb37000c07f2c2427b5b99248b16c544daed4976c0210b601d3c97 SHA512 4d58ef080c8ee02ef36eb3116ec89e4542b5b4042262953b2001081601fe1066237191cce5e647f354efa9e1933cf5010519d049e678a90e8ca08620cd1788a5
 DIST ansible-2.7.11.tar.gz 11855636 BLAKE2B 3de8fa1287655f778b1d9036bf78a91387cf238209eb2bfd17ee79f7d77a2e03ae734901bdc04226d635b3d8543d122aaa251107befab8cc4a4fc63cfcd8deec SHA512 06f805a701f8284ac1a65251b9358cf6f27d420aabb1e29298f9e4d8aa73251bd4a8e8a3981f744b97b2f750fd3b594a9b505e5baa3ff2cb3aa7a37603ba48fa
-DIST ansible-2.7.9.tar.gz 11830476 BLAKE2B 7688ce9f74b0ab1fafd0e31dce90d995a9d8ca90bbe436f2d4ee9d005069b6e1b2c4dd679c2430a6873233da54ae06d3ebf08736681ec2e59e5b3ddafa6bb1e2 SHA512 4d39c7d4eb97264ce8f92812fb986b24af0c663efa6d8cd1d9a4cb25731d55e7518e503c04764e62d0458916b601baaa7acc623f9f83ce8b93e7f22900e29a53
 DIST ansible-2.8.0.tar.gz 14285827 BLAKE2B 090c314e0c707e24ce4c21722bfbb34d18d95e6e8cd63b06af78e41fedb3183adbdf6718da1bb8a2c7037f9ea9ffffb96add17a44cb199d0c000c1d6f88cd53e SHA512 fab8a0ac00e947e47ab606bee0a15e8c031f900b5e6fc68540429db0035ffdf3144e18e1d2265ac07bbea0a78873b85c43e636ee51ecfe14f3d612d2c54eb29c
 DIST ansible-2.8.1.tar.gz 14299403 BLAKE2B defbe8fa8db7ab3325cf57df3bdfe901f53544b4c1b6460cefbfa9393acfe2a0e104f99468ad8e907d90d33842563bd7ab666d30f64572fd146c7ce46ff77048 SHA512 08be80584edfe28f11fe750735ade117deaf3a7c98fe15fb2fa0e3a5ed0c3f98cd126b60386e51d15ce275e8f1fc3eda0177bb56e0823b2f2b7702cc0e35be92
-EBUILD ansible-2.6.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
 EBUILD ansible-2.6.16.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
 EBUILD ansible-2.6.17.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
 EBUILD ansible-2.7.10.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
 EBUILD ansible-2.7.11.ebuild 1637 BLAKE2B cafff348e72d7970fe6851e36c2cab55e18583dbd4ec2cf018a04ed2f7093e91c341c32458d334996f7779477409d47fce82477ab812e607ba1d9d624e6efc73 SHA512 b3760d5cefead4d7965b1d1dbbcf7fd41f2bbd2b8a4941fb02791832fd60c4b0c289ba34fbf945b8889a4b15b286e051634adb90296ff81e43a15f71cad66f47
-EBUILD ansible-2.7.9.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
-EBUILD ansible-2.8.0-r1.ebuild 1663 BLAKE2B 45885bbb6444622d27827ad2243ce05aa2062bdde7e545aea5617b1c3979c088ea4565e0ce07f9fda2e9bc14bb819aa89954d51bb3eb1a287acbec1da0792d54 SHA512 e679d5e32060071736fd555ef68d44d8ca28e44cdb8229f2c79019f5c05b36fc8d095b33ff5e651d89d9a07007401178024593b3f6e4ac055961a3eecdc36af6
+EBUILD ansible-2.8.0-r1.ebuild 1661 BLAKE2B a9dfb3a4da7bd2f7519eff255ec9ec465ec68160724fe680426db756aaf5e3ffdffb6947faf200c83a4cab5e0ef5b11b71de530901273f2b382c062520fc9c02 SHA512 c564e5417b1181d49cae05eb7275133c1f5cb76a18b11fb679b6267186d5bd7bba62303481601aab47d4c2bc9cf6133311591a8933584033bb92f837483158c9
 EBUILD ansible-2.8.1.ebuild 1663 BLAKE2B 45885bbb6444622d27827ad2243ce05aa2062bdde7e545aea5617b1c3979c088ea4565e0ce07f9fda2e9bc14bb819aa89954d51bb3eb1a287acbec1da0792d54 SHA512 e679d5e32060071736fd555ef68d44d8ca28e44cdb8229f2c79019f5c05b36fc8d095b33ff5e651d89d9a07007401178024593b3f6e4ac055961a3eecdc36af6
 EBUILD ansible-9999.ebuild 1654 BLAKE2B eb0aa61cfa0eab600a18d26cf8d7060be0f93cc0413a844ac5e6a9938010b52d77a0ef28a2b36b802e7e8deba33caf5c4f6659410c2d74b13a13f92d50c0106a SHA512 040e5403acec6a13ca5042a3840480c4993eff4beef319229bd761c3a46cb673473d9c0297be176a3806f4cc15b30586a8af5e7743778de36d19d16dc5512b79
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.6.14.ebuild b/app-admin/ansible/ansible-2.6.14.ebuild
deleted file mode 100644
index 90340deaacc1..000000000000
--- a/app-admin/ansible/ansible-2.6.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.7.9.ebuild b/app-admin/ansible/ansible-2.7.9.ebuild
deleted file mode 100644
index 028f77e10f7a..000000000000
--- a/app-admin/ansible/ansible-2.7.9.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,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.8.0-r1.ebuild b/app-admin/ansible/ansible-2.8.0-r1.ebuild
index e6b530db760c..7bb6843073cc 100644
--- a/app-admin/ansible/ansible-2.8.0-r1.ebuild
+++ b/app-admin/ansible/ansible-2.8.0-r1.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"
 RESTRICT="test"
 
diff --git a/app-admin/consul-replicate/Manifest b/app-admin/consul-replicate/Manifest
index 36cdc46a997c..c94fecfeec1d 100644
--- a/app-admin/consul-replicate/Manifest
+++ b/app-admin/consul-replicate/Manifest
@@ -10,5 +10,5 @@ DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 BLAKE2B 083cc
 DIST mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz 13977 BLAKE2B eb7d4e853621798b63ec9806e2fb0d609d33fc7b370276433f055bea4282ab938488272e5a7334a54cf351f4380bc36cb0a0e991d8856e7ed1dc26de76110055 SHA512 f495fe99c8ce752830b3d36db445cdc32baac6e266a0862d13e7e80e04f412ae7ee85e13ba794f1cfae3effb226007874c8ee819a4ef568ce2884077dfba4f9c
 DIST serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz 579000 BLAKE2B 1ae7805273210e02ed1779c29b24f7ea32233e860d3ea324af670547ae85f9ce66a9a98ad2105e59bec222d74ee385bf0051974a38503bff3fb464d68959e8f4 SHA512 eced133c2ba261e4e39d16f2252f555611e90f23f70a746a6f8d60b24e6747e73e619ec74f10a1c0646ec5edfd731cd79f6700d9bc5fb7b100723aac32203a5f
 DIST structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz 12276 BLAKE2B 1e28027d9dc21fafd181ba772ae79049584f803c19dbd9da01ef488a5c9f3998071bb87df0b0a8982b31823e1b4bead2386860ca5309fd4c32aa36941c784445 SHA512 ae2f0bc1f9e1ddbf1bd32d5e50a2ffbc4841c17d451739aee7cbbe359abac982e98a00caaff2aa433d10aad4dc414ce17e94a1d0893610ff53c52beddb21dd4f
-EBUILD consul-replicate-0.2.0.ebuild 3458 BLAKE2B 2a164f14aaafa91ca28f03637e2b632b45bf035ef6922430b2a4240887b5cc9d469701260c8247ddee8caad7b1c9d4888bae0e328d36944eabd4c5c94e29fc67 SHA512 345f308a1de4bbbf736b7e8b40588dfc1bb8e9799e494ae2d6f0e8c3777fc86b8f869f00e6ee2acd7a3c586adfc03bcf4ce2d1e861156433598f4b31335cc511
+EBUILD consul-replicate-0.2.0.ebuild 3884 BLAKE2B af151a49d1ecf90b684675185088a0709c4ec6a7e8cb50d903dec19085591dce6c7a14604b937ca61b547c0550ffaa3682eeeecc1db689ad3ce9a782f7277da6 SHA512 7f7bad21192dbcc2601401d107b69dafa305af79d9dd3c2ac31878ab4cd61cbc01a58d81104a69fff82df4c5b9c7b7626106c3ec4dcf2179eff9cf8991ab70ff
 MISC metadata.xml 317 BLAKE2B 8e79b0f3b2b9099081cf94886f39e476e0bde6dd5eacffdfe48c70e1c2d2eb1d7902e8543e1bd3ae9427bd67cc699d6531be23d964cd72e993ebec7cb7cfdc0f SHA512 f99b2d57b72e37417fe17dfc9e71aa7be80fa554c6e75500953ad150a761e0f54634fc0c37787b8ac603d3d5e06e6980ffffdae87fe738dab6071620367bee3d
diff --git a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
index 0b1176db1d8e..6696574acddb 100644
--- a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
+++ b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -73,6 +73,11 @@ src_prepare() {
 	done < <(find "${WORKDIR}/src" -maxdepth 3 -mindepth 3 -type d -print0)
 
 	sed -e 's:TestParseConfig_parseFileError(:_\0:' -i config_test.go || die
+
+	sed -e 's|t.Errorf("expected %q to be %q", config.Prefixes, expected)|t.Errorf("expected %v to be %v", config.Prefixes, expected)|' \
+		-e 's|t.Errorf("expected %q to be %q", config.Prefixes\[0\], expected)|t.Errorf("expected %v to be %v", config.Prefixes[0], expected)|' \
+		-e 's|t.Errorf("expected %q to be %q", value.Data, data)|t.Errorf("expected %v to be %v", value.Data, data)|' \
+		-i cli_test.go runner_test.go || die
 }
 
 src_compile() {
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 9dc7e86a19d0..8184528e4909 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,10 +1,10 @@
 AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9
 AUX keepassxc-dont_call_mandb.patch 792 BLAKE2B 3154b6624a2e5923a3b3ad9edfbaedd5c0bba77f47108913d8eece63cbc4df571f516a41d72db0287a7a4d8741ab309cc7e09c8fcddaec0bf39ed09479607329 SHA512 21bd27e713357f5aa522a2263a1d03b8a595fb0d51ea10c034358169cb2f72c70585b04dde8f0d8e9af30c9ecf055b528b975a9701372d4f726a8f50b347d8f4
 DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8
-DIST keepassxc-2.4.1-src.tar.xz 3277856 BLAKE2B 64ed15987f26fd884db8fec9dc8e5d9ecd1ab9c298c2c35ee41f5aacd51bf3cd512c8ca0370ccc294d4f1ac6214678d2a3a4d8c47441c01ae8e858252018ec97 SHA512 4369043700d3de4fece0a1dd0f8aab3f621df379bc9d0214b4c70ab72d081f978104aa09fd39c4b4bf8b8df8f78266835dc206c31e7174bdf872a977c0d79502
 DIST keepassxc-2.4.2-src.tar.xz 3290468 BLAKE2B bcb4974729c771073b6ccf4f5af5ac94a237c349dacc10be5db698630e4fc8fc226a6911957c1ea4723dfce9aa348c11588aa1e5927487cdd36d9c8bae0d7758 SHA512 4ad7e559a36831ad715672d3cddcd3becd4f39847b7ad4451d920c76671e607f8ec9d65ed6f5450dd95e037d129cafe8faff8c1ecd9d20a22fed2c72b2dde9f2
+DIST keepassxc-2.4.3-src.tar.xz 3301944 BLAKE2B ba95d5d48049367e7d3c39b5fdc9fc9816dfe2b257530068f229d1b5bd4eb9c137607f63bcce0aac4bc67ed41ee00c0385be800720acfdc3920c44444cade180 SHA512 893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d
 EBUILD keepassxc-2.3.4-r1.ebuild 1847 BLAKE2B 4de124b498c9d101b56a9c966170d6bfef024ac8853b166c82e42244a209956f062ebe3f1cfa99d6b62fc2ce3569b884ede3cda338bfd6d92ca5575f18a30f33 SHA512 bbcaea1ebd466a585375cb29688761202bdff37fa4ec18f40134e933d8fa7036d8be422b822b3dbc307ca16fbc8a509f04d6f29c2e7b442143fcedd7b662eb6f
-EBUILD keepassxc-2.4.1.ebuild 2024 BLAKE2B f7289b70d43a0ad73f7b63ceed0a9d8317f377ec5a66122150ca8b63dec566d2763454673ed7b76621f18d160096724658b5da55c3296397d51a78cb55d96e97 SHA512 9893aad20535bfd881d0e0fad6b8898edd7f64e0e74ae14388c272a72e27bcfc70c539e4bf0c3938e659c81840e082a3f8dd55efff18a564564e1366af0b5433
-EBUILD keepassxc-2.4.2.ebuild 2144 BLAKE2B 74421a42259ffe1e2cab0c07d3e7374cc0629d8c2c3a47f09acfae720ed33fe356afd259df6e5ebace728f1f6359d4c88f9cca2c63cebdbadaad40c082c71dbd SHA512 9fd2a05423d9c49f381efef4af59e92df5403149bf9d742ad4905494a22027f33d42981dd071bd18039c6945f9d051c8a049db09955a4e02fc97616ac934dd61
-EBUILD keepassxc-9999.ebuild 2144 BLAKE2B 74421a42259ffe1e2cab0c07d3e7374cc0629d8c2c3a47f09acfae720ed33fe356afd259df6e5ebace728f1f6359d4c88f9cca2c63cebdbadaad40c082c71dbd SHA512 9fd2a05423d9c49f381efef4af59e92df5403149bf9d742ad4905494a22027f33d42981dd071bd18039c6945f9d051c8a049db09955a4e02fc97616ac934dd61
+EBUILD keepassxc-2.4.2.ebuild 2144 BLAKE2B 1669822ef162de7ff649979e8880fa8f3a47cf0f5a57d74b707b3fb22e1fe913e4fc738f60a651dd7c0bf9e6cb58c90a59b13489d98cc42b1bc0162b01659470 SHA512 689c7670923dd4c0257ddac1670b49afeb44fedfe8f2bd806cca0cb53bfc6a88dbb0f1e8e8c58fde800fc7a5063c89216eb18b24134b4d5021b4e52921727518
+EBUILD keepassxc-2.4.3.ebuild 2144 BLAKE2B 1669822ef162de7ff649979e8880fa8f3a47cf0f5a57d74b707b3fb22e1fe913e4fc738f60a651dd7c0bf9e6cb58c90a59b13489d98cc42b1bc0162b01659470 SHA512 689c7670923dd4c0257ddac1670b49afeb44fedfe8f2bd806cca0cb53bfc6a88dbb0f1e8e8c58fde800fc7a5063c89216eb18b24134b4d5021b4e52921727518
+EBUILD keepassxc-9999.ebuild 2144 BLAKE2B 1669822ef162de7ff649979e8880fa8f3a47cf0f5a57d74b707b3fb22e1fe913e4fc738f60a651dd7c0bf9e6cb58c90a59b13489d98cc42b1bc0162b01659470 SHA512 689c7670923dd4c0257ddac1670b49afeb44fedfe8f2bd806cca0cb53bfc6a88dbb0f1e8e8c58fde800fc7a5063c89216eb18b24134b4d5021b4e52921727518
 MISC metadata.xml 960 BLAKE2B 63a61f81e372efa1d1a4118f8353818eb28f4d9b0e7c87c5cb6e7a4ee8c9856ae3c7ee981e2777d3263725338581834f294022d052397dffbe98db2b5ba36895 SHA512 85ad2302913936ce51a455ae15e2d9ca7a68d26fc16819f46ab494b6aaafecdf32f74596b47c1b5a3cea56bfc49bf7021dbb4b770efb8f362386a67c88ea2404
diff --git a/app-admin/keepassxc/keepassxc-2.4.2.ebuild b/app-admin/keepassxc/keepassxc-2.4.2.ebuild
index 25ad8b2b55b0..fa1b4e6b2168 100644
--- a/app-admin/keepassxc/keepassxc-2.4.2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.2.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
 	app-crypt/argon2:=
 	dev-libs/libgcrypt:=
 	>=dev-libs/libsodium-1.0.12:=
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -53,7 +54,6 @@ DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qttest:5
-	dev-qt/qtconcurrent:5
 "
 
 # Not a runtime dependency but still needed (see bug #667092)
diff --git a/app-admin/keepassxc/keepassxc-2.4.1.ebuild b/app-admin/keepassxc/keepassxc-2.4.3.ebuild
index 5b33ef6ebd16..fa1b4e6b2168 100644
--- a/app-admin/keepassxc/keepassxc-2.4.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.3.ebuild
@@ -24,11 +24,13 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser debug +network test yubikey"
+IUSE="autotype browser debug keeshare +network test yubikey"
 
 RDEPEND="
 	app-crypt/argon2:=
 	dev-libs/libgcrypt:=
+	>=dev-libs/libsodium-1.0.12:=
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -36,7 +38,7 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	media-gfx/qrencode:=
-	sys-libs/zlib
+	sys-libs/zlib:=
 	autotype? (
 		dev-qt/qtx11extras:5
 		x11-libs/libX11
@@ -44,6 +46,7 @@ RDEPEND="
 		x11-libs/libXtst
 	)
 	browser? ( >=dev-libs/libsodium-1.0.12 )
+	keeshare? ( dev-libs/quazip )
 	yubikey? ( sys-auth/ykpers )
 "
 
@@ -51,7 +54,6 @@ DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qttest:5
-	dev-qt/qtconcurrent:5
 "
 
 # Not a runtime dependency but still needed (see bug #667092)
@@ -72,6 +74,7 @@ src_configure() {
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
 		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_KEESHARE_SECURE="$(usex keeshare)"
 		-DWITH_XC_NETWORKING="$(usex network)"
 		-DWITH_XC_SSHAGENT=ON
 		-DWITH_XC_UPDATECHECK=OFF
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 25ad8b2b55b0..fa1b4e6b2168 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
 	app-crypt/argon2:=
 	dev-libs/libgcrypt:=
 	>=dev-libs/libsodium-1.0.12:=
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -53,7 +54,6 @@ DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qttest:5
-	dev-qt/qtconcurrent:5
 "
 
 # Not a runtime dependency but still needed (see bug #667092)
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index a6c0594c5a81..3f7bcb85ff32 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -26,7 +26,7 @@ DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd1
 DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f
 EBUILD rsyslog-8.1901.0.ebuild 12354 BLAKE2B a5907ced4f42a503ce63d19bdb2fdcca4db442cd64e053f9858d3809e7a40ccb879bc00ae2021daedf6463cb16767413c9b530476ae5f4c326779a808657f390 SHA512 961b98101d517510c3de600e1e2e74cc5d7533de2d6317b53cce49a8a6d704729cf4b10b6f502d65c0ae876257ce8d42a46319b718763b4cb59eef03ebbccff3
 EBUILD rsyslog-8.1903.0.ebuild 12531 BLAKE2B e8ad30c6ca996894be5a84be8a8b19ec2354aaf44aaf915c8471c0cc51156080a45fd2c422d2dbef50904f8a820693ef5e1f93267ce9fa12b37cb863028dd91b SHA512 5918af3232e7d2bd9b6e8511a9f29f276b081ffe2a4f6b3c0773b737b97d104b0722a64a3506360ae8794c2b1aa7c8c6327d63a3fcf9385db6324a409b940060
-EBUILD rsyslog-8.1904.0.ebuild 12570 BLAKE2B 5813e929ca8ef0a6c9ecff1d5a1dc1c0a06e33a4e4ff79398c02186afb3ef333c3cad85faa9ad5d99a326cece3fa5f4ef12da4a7b9a600ed4a047e6c9857269d SHA512 07cbf79f3c9a95a56925b1eb6d79298c60c23a7d53452af8e3966ea04a8aeb2afff4c1c481dd01175695539235e6fd1b87723d4c5fb31714a43ad2c04be0d65c
+EBUILD rsyslog-8.1904.0.ebuild 12569 BLAKE2B 2af7993a9f05ccd373eab922d157d959182cc94af02867c6b086805a98903591c3a88af11aab7d079a3db5c390a42e984598c95c7b3d12087509682a583d710a SHA512 73583e689b2ac033ddde998241a5e9c115b596112ae546b85cf2906879fd2c45b1586cff5ada0aeea8c06b932cad9f41130986b6a1420906efb2983c1639982b
 EBUILD rsyslog-8.1905.0.ebuild 12571 BLAKE2B 0d892e66f94d73b20c0addb444edd904d6961cd7918adcc024f813776d766775fad7c0a288df2656f1cee14387d33949bf1c85cb86f85158b1a700393aa3396e SHA512 2826e3eeff416a5673f8810673097a524ea34718af98d934a8eac7a3417167d167ea880bc3ec1ff0b984ab6d95bf3344566d557978c0cd04052d177ca55992f0
 EBUILD rsyslog-8.38.0-r2.ebuild 12281 BLAKE2B 8debd0ba1551ece2c24fbfb8893204e592ed40682eeab26ea2b32febfbf1442aeabf3f7215bd5371fc9c6abfe6923da887f71d12be1e7e57193b03d6b65c4a21 SHA512 7c95fc07a96854386a611878a53b625b0d95615058c9c2c97dd2ad2e563bca1cb14e81be747dab108e7304734d2c2f86a8d626626ee52178dd769fefd8339260
 EBUILD rsyslog-8.39.0-r1.ebuild 12357 BLAKE2B 0baadf35229801863b6f2dcbafed210d8d9503595bd9410969e52006cfc0d34c52b9c6dece38285d6674ae757b9c1d223405d02813fea4d0c2e0c15e50915c5d SHA512 b7568c5217593aa764645793a8d92c6c116f8108c0b7e55fe625c463cadb2ca0a2e71060686fb100cea87e870911862fb5770dea07e866b98763596be56ed3dd
diff --git a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild b/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
index 0890770de3e5..c66d13e69de4 100644
--- a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1904.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
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index ab977cf4b460..ec19cf4bdfbc 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -3,10 +3,10 @@ AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee6
 AUX sshguard.initd 572 BLAKE2B d92f03b4da940a47ae27281c1075914e7e4157d459096a19615a05815f3507a11a41ec5290830f299e96fee8c7203831f6e91b11faa6a6f07eaec68f98e9bf0f SHA512 0a38cdc6121c6f981bccfd75648843f16b724d412648773f1838e8c67a6c7231df756da8ac1c3651a18b5a271337c07ab97a3314d3a81904bf3c2c68dd00f9f7
 AUX sshguard.initd-r1 400 BLAKE2B 4d97e26fdacc5477936c899b69a8ac5d6507b8336228f425823bfaab1119d5862654babdce2e33ab530d41943f4e62f983e0d48ff38d319a85382e3c680e5e22 SHA512 1d73ee8e244f8318a4488aa9cf404d619da893828201215de741cea20cbb99dbce44caaefae6ab407146ca05d1ced61a03228fe60b9fa0beb152bcd8098ea86b
 DIST sshguard-2.1.0.tar.gz 1117466 BLAKE2B 1a105f346aa9b774fb0314161d779eadaab299d3b74181a449ab86534e11375e4c017c142bc621733593369bcebada9511dd40c64cb4a49cd124eb7537ae0717 SHA512 0a75e9d1a8c9c010c767a49e96e88db4a92aae8d428deebcff1ce8befa36b77cb1937f2fcb2a4e2a3e86d47896a8405265eb30ee7a603fc18a3ee117d646b119
-DIST sshguard-2.3.0.tar.gz 755702 BLAKE2B 3b2e9bea3cf65c4e9a3ab82b6f5013c167033310d6f9ffe27d1d7dc9380be2214fdfdab4892ab9f6dfaa51b1131698d729257695ddef9debbc0ad06a9f49acfd SHA512 b3df479a752e0263fc444c582dd6c89dfdd4154ab011d23d0973f16f3b3e60f21f01b53e6ed0c4b138f134cd7e3dea5e67b44901f812f3da0d1aac760eeee279
 DIST sshguard-2.3.1.tar.gz 765330 BLAKE2B d86fe596c788209cb35c699601ccb698365e0c6b497ef8184c64d879ebb821a57e5f366c3b518e6f0c6bf65952b2c675f87f029b7b8184466c7f90d6dfebaca3 SHA512 b24f5dba34bed9246665c432b379afa4f1edacb56fd41e0b254a698ded1280c33fd51fb36466ae70d44ef4a31a0a75b59fa4df97d0e8ed8d194bf8046a3ac84d
+DIST sshguard-2.4.0.tar.gz 771506 BLAKE2B 82e9caf70dc9a1ba9ef6ba1c0916424a74891c84069a4a879c9057f3baea32af68f35d8b31cacdd60d323f5ec7b02a6e12aff1ec72fc0291b74c4882cd441d93 SHA512 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6
 EBUILD sshguard-2.1.0-r1.ebuild 763 BLAKE2B 2af47f5332bb6ab2cc39e8da7b4b61d91f663f93958c56474d4f813d0e32a9e6ff895bd15b3f740153b0643d2bbde8f2d1588d2636cdf89daff5826d63d395ba SHA512 281964bf882b40da1d5de715d93c12df1910c550304871c4ba5cf7570ac86821547299fd831025290182f8207027de8c053aa814a615b25656b982027fa457bd
-EBUILD sshguard-2.3.0.ebuild 758 BLAKE2B dfd1fa524cd39050914e515e324540a78b90e2cd430af7df36c272b0a600410cabb763572d766857b3271f7812697f8f16b1f16b00cb5af4ce5ecff7b164e1d3 SHA512 6009a78a97a2252ed3ba06f276e10b70c9fe99e3acf343081aef63bbd021a9406c2dba6961178f05889f8dc72767bc09eb9c499b59959b15a0f40239bca3fbf4
 EBUILD sshguard-2.3.1.ebuild 758 BLAKE2B 9b5da614fa2e81cf10ed8a4d079c1283db3504262e42734f41fe990fdb633b84ea475d51adff2a4e0191387abc5708e92a88e57d8ac3f035a651123f443a1196 SHA512 0046cf0eef08cd0b75bfadc2608116c07291e20068419e3cb25832927405148f14c989bb3bb85ac6e9cf77edaef3df3206955e989ef9132a4f7a645f40ebf566
+EBUILD sshguard-2.4.0.ebuild 758 BLAKE2B 9b5da614fa2e81cf10ed8a4d079c1283db3504262e42734f41fe990fdb633b84ea475d51adff2a4e0191387abc5708e92a88e57d8ac3f035a651123f443a1196 SHA512 0046cf0eef08cd0b75bfadc2608116c07291e20068419e3cb25832927405148f14c989bb3bb85ac6e9cf77edaef3df3206955e989ef9132a4f7a645f40ebf566
 EBUILD sshguard-99999.ebuild 799 BLAKE2B c163d68663958a738d828b1c0da1c931036673dd2da7884312fa9152005e4349ef4004f2b272503ce9e27abdbd6de09b251e9fc4ea130d341ebc0db252af41ad SHA512 272c3c1cffa45a8b0ac24f303ccd69629f26c42de3ac3c064174ae5307bd33d72c775d0f8512a8de47eff59d1f4c0cdb46c60634f2a40ea2fb5875787bc9d114
 MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec
diff --git a/app-admin/sshguard/sshguard-2.3.0.ebuild b/app-admin/sshguard/sshguard-2.4.0.ebuild
index 578e515dab02..3fac136a82f9 100644
--- a/app-admin/sshguard/sshguard-2.3.0.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="protects hosts from brute force attacks against ssh"
 HOMEPAGE="https://www.sshguard.net/"
diff --git a/app-admin/sysrqd/Manifest b/app-admin/sysrqd/Manifest
index 690a0c0970e8..8c83f281ecca 100644
--- a/app-admin/sysrqd/Manifest
+++ b/app-admin/sysrqd/Manifest
@@ -1,6 +1,9 @@
 AUX sysrqd-14-fix-build-system.patch 615 BLAKE2B 25de1ca0a421ab37737613533fb68819a6f611271b44c7381963476e01ab62a204bf61a1bf5a61100d1199601d7db8f7010cdd1207eeb50dff9768f34b7028fe SHA512 2ecb26c68a4a7382af1c09d81b71544e9621c0425fcd7577be1e4b929b808989d223d128affb0107724423624f3bf550327c92cb9c56676d45f49707ee7d1321
+AUX sysrqd-17-fix-build-system.patch 570 BLAKE2B 06007cdc8783abea99060437db96f9493b9a2c410b44169c5960aa43d7f15231021dbbfdf5140d25c918de7cfcce09dd9e8106fda02c5ecdf8b76c9554d9c91b SHA512 2db00903e2325c4b5da296ceca11b71f61775122371b542a1c0f3d6bc70022ade4337fe237b1c9fe03b8aebc3dc349320e04db006c6fbf601d1dbae676101afa
 AUX sysrqd-config.patch 421 BLAKE2B 9cc04c7c31c39f1015b95aaf5c695a2221b65d2c471506b9f3e836fec43585e7e21d7fa7a01c4cdd7815f9c1ebb10800ca1cfccabd397223eb6b3f700f8cd54d SHA512 5dd351220cbb10a09d6c6f0bae07a37fc678988467a8a1cff2075217a82eb4bbfc6f2155b47b71159e3442f8d25bbff539a3e2a61f91829d6dae7820e647fca8
 AUX sysrqd.init 700 BLAKE2B 2570aeb1b01d098bd8330a9e78c85708013d3ee09318f84a1e5f088ffc2a32077cf6e18bc3413106724d7fe024bea9720f6f20c5a28a5fb5a775a219ed7c95e4 SHA512 9845a09cfa20ee9cd09e61e142cf53aaf482909ce3ec1401743864823a7bd45ced812fb235eef2adb914c3c624e227fa5936b73e1b83d8a3888fb25498980918
 DIST sysrqd-14.tar.gz 4759 BLAKE2B 3ef8b2f5092a899753da487d0a82a71d2d93d0c6a70689b5923fa900f2766de15fa2e416cb667d800dac19499218a0246941b8c52bfe4421af774ccecc62222e SHA512 efad48be3974923ec14d0958e788115c9273bc29b4f03853e6e087f6af872299ea57d42f885be19ff4eeaffa577ecf1c53ea2adb2f84e1487bb2511597b89cb2
-EBUILD sysrqd-14.ebuild 1395 BLAKE2B 4368fe901f94f14e010dfa5e8f4648f13dd93727a521e9db49398cc2704482a1d62e633a8acf5a4633b1903224d5c99357a08cfe25118aea695fc9297d06c1ab SHA512 11080e964bfa37504a653432ea99910ac469c969859f5301ee86b7f80db4a5bd147af3da5b8cf6119473959de2110195978d9d00c3589f8f61d12f4845cc32ae
+DIST sysrqd-17.tar.gz 5232 BLAKE2B 4fd3baf7bce45b43577db7cd4a383161a8d69bd88e041afe20c33d3812235829729c57b748321195c2bccea819827655080199c0167bafad7252ca29b2a3a27c SHA512 fd0e42d2edd5e8548510aa823b2fef6339b2dc1dde1fe387585b9f2611e7d944fa6d73447e3f58a0aa00d45a88459c6e9cbb619428282abf367f62a8270e5d54
+EBUILD sysrqd-14.ebuild 1324 BLAKE2B 4c99879dbe55a6008298f24a3e4adbb2815a16c5c41e7faf2bf0c687bd7674d034862d768f832e5593ef7899f15e50ea97cc302d1b7fa99d5c2edd532b34d204 SHA512 5ff816e851be1fc7f91cbe57c944c0dfbdf41539ff37a229ea5b57f3697a30b7936f3afad1d11590d852a0982f0ef4e9d2e6260521a5183e558451b32d23d674
+EBUILD sysrqd-17.ebuild 1316 BLAKE2B e0f1b6a31fb3418058a6e576b4f9f25855ec55e191dbccc9e49486d4ab52af129f9d71931dbd04566f33876131bd05b85cfbdf9a69c1f8c03dec4c40eee155f0 SHA512 213b573ebeb6e9cadb08e0641fa4c68a0513cc2e0bec9e77124c9972be3edc16745f4133442ec4641cbc527ad16e1d7c8fc703727f669b0aab88458d3bc9f8c3
 MISC metadata.xml 414 BLAKE2B eb2c97371677b4c978e210a3069e30cd453ebaf2249d01e80e52c116bb9dd4243f692cb4e4f384412191e691a67054a390f35143fb8fc403b595f11c3e09dd68 SHA512 e0c64a75f859353dd258c074a2353882ddba2955144297672ada48f29ebd742d4acd7193816aae859f7f7df1d4b23e9bd1176856aa801ee7a0035f8ce2224859
diff --git a/app-admin/sysrqd/files/sysrqd-17-fix-build-system.patch b/app-admin/sysrqd/files/sysrqd-17-fix-build-system.patch
new file mode 100644
index 000000000000..2118b8e682e3
--- /dev/null
+++ b/app-admin/sysrqd/files/sysrqd-17-fix-build-system.patch
@@ -0,0 +1,13 @@
+--- sysrqd-17/Makefile	2019-04-08 15:37:16.000000000 +0200
++++ sysrqd-17-ng/Makefile	2019-05-20 19:55:15.842841704 +0200
+@@ -5,8 +5,9 @@
+         -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wsign-compare \
+         -Wunused -Winit-self -Wpointer-arith -Wredundant-decls \
+         -Wmissing-prototypes -Wmissing-format-attribute -Wmissing-noreturn \
+-        -std=gnu99 -pipe -DSYSRQD_VERSION="\"$(VERSION)\"" -O3
++        -std=gnu99
+ LDFLAGS+=-lcrypt
++CPPFLAGS+=-DSYSRQD_VERSION="\"$(VERSION)\""
+ 
+ SBINDIR=$(DESTDIR)/usr/sbin
+ #MANDIR=$(DESTDIR)/usr/share/man/man1
diff --git a/app-admin/sysrqd/sysrqd-14.ebuild b/app-admin/sysrqd/sysrqd-14.ebuild
index 249bbce77e12..c53bc209cd1d 100644
--- a/app-admin/sysrqd/sysrqd-14.ebuild
+++ b/app-admin/sysrqd/sysrqd-14.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit toolchain-funcs
 
-DESCRIPTION="daemon providing access to the kernel sysrq functions via network"
-HOMEPAGE="http://julien.danjou.info/projects/sysrqd"
-#SRC_URI="http://julien.danjou.info/${PN}/${P}.tar.gz"
+DESCRIPTION="Daemon providing access to the kernel sysrq functions via network"
+HOMEPAGE="https://github.com/jd/sysrqd"
 SRC_URI="https://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-admin/sysrqd/sysrqd-17.ebuild b/app-admin/sysrqd/sysrqd-17.ebuild
new file mode 100644
index 000000000000..541c67095fc1
--- /dev/null
+++ b/app-admin/sysrqd/sysrqd-17.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Daemon providing access to the kernel sysrq functions via network"
+HOMEPAGE="https://github.com/jd/sysrqd"
+SRC_URI="https://github.com/jd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-config.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dosbin sysrqd
+	newinitd "${FILESDIR}/sysrqd.init" sysrqd
+
+	local bindip='127.0.0.1' secret
+	declare -i secret
+	let secret="${RANDOM}*${RANDOM}*${RANDOM}*${RANDOM}"
+	echo "${bindip}" > sysrqd.bind || die
+	echo "${secret}" > sysrqd.secret || die
+
+	diropts -m 0700 -o root -g root
+	dodir /etc/sysrqd
+	insinto /etc/sysrqd
+	insopts -m 0600 -o root -g root
+	doins sysrqd.bind
+	doins sysrqd.secret
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog
+	elog "Be sure to change the initial secret in /etc/sysrqd/sysrqd.secret !"
+	elog "As a security precaution, sysrqd is configured to only listen on"
+	elog "127.0.0.1 by default. Change the content of /etc/sysrqd/sysrqd.bind"
+	elog "to an IPv4 address you want it to listen on or remove the file"
+	elog "to make it listen on any IP address (0.0.0.0)."
+	elog
+}
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index de23eb61fa31..309b589215de 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -9,7 +9,7 @@ DIST sysstat-12.1.4.tar.gz 738031 BLAKE2B 6803a727bb67e5027400f684d9d93efa6ca225
 DIST sysstat-12.1.5.tar.gz 1032031 BLAKE2B 9fbc0c0d132983daa334345f1f83ac8a46092cf52f35bafd443febd8ce40e4ab11b5b9b05b92e4074ecf9feab682035b2e08094ce10f3287036821be57db0800 SHA512 9dbc44b0226efc2f219ff71d2f0b83c930263fe8d6d0b451ae8404b3056558de04c76c16f2e8ba62083cde3a37cabbcd466d9247bd61ba5921dbc2ab6a1f686b
 EBUILD sysstat-11.4.0.ebuild 1943 BLAKE2B 18bfa393fccb957e8ff519b5e6182f5a3b9155997e9d8acf256d0ab3ead8bf92e0b12a7fb1aa64fea9be7712c8432e049c20d49f41abdb4f233bfa57db20217b SHA512 5186353168b53a613ee0e8d5eeae38e315056b00a71140e3f347c4c8af5e963dada702618e8f3c84f2c25ef483d3270cc50135b28294d32fa5c14ad1cb00a5c9
 EBUILD sysstat-12.0.4.ebuild 1838 BLAKE2B caa28ea7a3eff2d9eb22a805485b31923ea3071757cc37af64ab55e412047eef1f4062d0df9f5c6cea958262190f466d2bd290187faae021fe44f06fdda1c1ed SHA512 a21db0825e71acba0c9ff658b9530f8ef00593a6d95dd5ce0c4ef8212af5f54bccda5f9a6ff2fee444245521c4eb50120f80dec434fdbfcf74696bf82e6661cf
-EBUILD sysstat-12.0.5.ebuild 1690 BLAKE2B 0b82330f9db7a1d41cf1f93f38285088305ba66a52e9ac9ee8d2957ccdebbb515bbf22ee0b9a7a73c26e9dff427bd584f0f5ea389b490f6e7ee3ace7b04857ad SHA512 a7c37ed6fe02db92958ccb7441451b2565940103ac80b50536fc27135f6cb110f9b263b9ce389aa4e80cdc53ba48c4b523247cd957d6a759ac0fc4196b794575
+EBUILD sysstat-12.0.5.ebuild 1689 BLAKE2B a37f9953c43500112e59d06369a1236b495165ef7f4232c37c45263c966a3a8517f232ecd137633086d28799771601276eb266a9ab0f8e6ed955a726dcea9976 SHA512 e7e7a723e18a21470b18f3e3aab4d9a7b43ea86239e1c29be5d21effd531ec79e6e32a012855026125b2f88bbb798a00a9ce8942fd4ea160b2d72e24159112d3
 EBUILD sysstat-12.1.4.ebuild 1838 BLAKE2B caa28ea7a3eff2d9eb22a805485b31923ea3071757cc37af64ab55e412047eef1f4062d0df9f5c6cea958262190f466d2bd290187faae021fe44f06fdda1c1ed SHA512 a21db0825e71acba0c9ff658b9530f8ef00593a6d95dd5ce0c4ef8212af5f54bccda5f9a6ff2fee444245521c4eb50120f80dec434fdbfcf74696bf82e6661cf
 EBUILD sysstat-12.1.5.ebuild 1696 BLAKE2B 30c8162d768496f006711471b03b3ebeb57e27f9a5f91ac435c7bfd548f438abad283a8c9ded69394daf1e91fafede6ca774e73e4446ad2e216e5b12a88e9e5b SHA512 316de216ae7704dfc0c44ebeeb45d136b758da0f97957dab815e25c8c68eae024a6afcf0efe82ca1b8a6513f6c4e8f93a3f4b9273a28b8c4f31234ad3095c3f8
 EBUILD sysstat-999999.ebuild 1741 BLAKE2B 17d47e7c1a6f90d9930b1291d54f684889e7f617cd29030cdfecd4909c50c4008e5a35a860a2b1b165c432d7b444debf2fbd2f8aecafe51532ee3b35740f126e SHA512 450f00d7fdd18fff61eac06f2c4cb02aff1a540593812965aa8f29f3338da6c0950e89314eab5fe870a8d024e58126b7015f1b1c920b5a9012099c54a3394260
diff --git a/app-admin/sysstat/sysstat-12.0.5.ebuild b/app-admin/sysstat/sysstat-12.0.5.ebuild
index f01251fb60e7..6c2d9dd9d9d2 100644
--- a/app-admin/sysstat/sysstat-12.0.5.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="debug nls lm_sensors selinux static"
 
 CDEPEND="