gentoo resync : 08.06.2019

37 files changed, 392 insertions, 1001 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9128bbdb7772..eced02ebc53a 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index 0194ab1e8a21..07d78de74638 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 1381 BLAKE2B c6c9333eebbb26f4bba20da56f6fc4187fbe9bdb625e903a4bbb342a775889ffc8d78427b8ed069b27a73a65361e351a661eb679615bd32a1fe124dae0dda1d5 SHA512 d5af543fee7775d3a74fff2b187f74a7c4c095528ad75a583a1a83f63497a1a8d50bb348b6504639340ea0c418cb1e85f7dbb9f8eb9be78ea3ee2f2b9518b586
+EBUILD analog-6.0.13.ebuild 1377 BLAKE2B c575294ab4956c46e9695b4fa773b0d430fa44e2e644e32baec639015a1c776184798af390e1a2cd4470b89d1f1f2b1df1d348043136f8ef4ca134a92b8b2590 SHA512 83110a2afc757604c9f7c15460011e4b3ca6b7b555859fcf86834ce254ab3e0221143ec6d1c247b18565ce5366de4f5b32831f7cb6afaba6f59cf013f8e31e2f
 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 ba814b09ba7f..77fc0943bace 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 9ad38af2fdb9..4817565c6a1f 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -5,6 +5,7 @@ DIST ansible-2.7.10.tar.gz 11844278 BLAKE2B c847b642ebe4cbc2194538a0b194cd5c0bb8
 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
@@ -12,5 +13,6 @@ EBUILD ansible-2.7.10.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773
 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.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.8.1.ebuild b/app-admin/ansible/ansible-2.8.1.ebuild
new file mode 100644
index 000000000000..e6b530db760c
--- /dev/null
+++ b/app-admin/ansible/ansible-2.8.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	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
+	)"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_prepare_all() {
+	rm -fv MANIFEST.in || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	dodoc -r examples
+}
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index c9b95d237550..7f618fba1242 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,18 +1,10 @@
-AUX conserver-8.1.18-dmalloc.patch 2806 BLAKE2B 0ce6a09d90c82a455bb706f755e8485df1d8aec4f7a8cb534ac97d584ccb94715c68568d46496a3a298cd258a5e68219ce3f37cc33a6239d3b533636b53d85bf SHA512 90d3a4bd6fb3a58ece053e4680dab5b24f23c7265e5244f3185b67a143c58ccd2c200c2fccc0a6cec8444ab2895f358138cba05be27119b014187e539dfa78d6
-AUX conserver-8.2.2-ssl-compat.patch 1113 BLAKE2B 93d336f18493b26b77b5855a432071d6a6cd9c32e5029f4fa5135010b8ffa1b4aafb4ab4c7ed38b93318a2682a5300a64ea3ecbfb9fa4f0bd1354899ce4903a0 SHA512 a93dfb89ace14590588ce6c72f5af90a253e98d61d83acf1c38aa43978877d072d6b9e7a7d49d590f010c59a6540e15fa3d70833a0d5499461767e956ad649a0
-AUX conserver-8.2.2-time-argument.patch 754 BLAKE2B 364385cf118601449682dc5c8ac4ac872e9bc2b9d3195164500f70c3fd50f58318eb22b4df8985cfaf58931bc0a84cee7795ab63061cc63969f9a5cde40a76e4 SHA512 06cb6208e3bfb394289f8298e1778fd77882e16c368df137b0bb3593b0326cd1bde5507989e7bf7cddb436a47a16ddfc1bbb64552f767d2a1460411baca55e40
-AUX conserver-prestrip.patch 882 BLAKE2B b5a327827a6a56ead78821e9fa091cabba0b914d94a8cb273b6fc5003e927948483d7a32ad858a7c94f7c7422f1a124fd42b65544b198bea317cd2caf68c96ac SHA512 aeb112f8df0bd97ac3e3b909a42c54d2d16d6d59d39ea10dca9c86d2a6f866ba33c56fca77fb551c706314692469ed668a0158ff04712594192856b363bcb4af
-AUX conserver.confd 170 BLAKE2B f6bc04796726454fec2c24207d3342c72c1789db5aeb39e47928e12d12300a16cec51f82e9447bf4546f732e3f9184724936450a852392671d4725fa3df99985 SHA512 af326d215eb7b6e4bdf68a9fc8b58c42dae9d0b31f653af181097c7cf4ee663bcc7c848f77ef051327e54a18e0202536b524b1b82d36693751f07d2c37f5b071
+AUX 8.2.3-libressl.patch 981 BLAKE2B 98e222e3136c0f4cb252333c5f950e71d201eec76d1d2c200c64079ff5dc811bb69814683baf36c290ae50fd02e51c0b9064a8d250f71c209be3a89a4d0f1d6b SHA512 55b209e80cd000bc0cd23c12f0cfe93784f2470c1836305f569d87d676f586eb516e1793b0940f23b2de0d7fe72814f7db3c87f0e5e9d05f254a4bbe707a2e89
+AUX 8.2.4-libressl.patch 953 BLAKE2B 5c94addace50d827b090403c1e9add383b2bc88892673b4a47fb10c56c5d43dfd78844a8304d78d479ea2398fff8d81c5f2c1a42e5dfad0db978ca3feb04b191 SHA512 5c3a0be93f562971e72e11f4a0f791591668a4f1341910134567f00c38af49b26c9d9e047deac193c36ed81ca1458da92704c68119ecfbbfaee45bf4be0a4e18
 AUX conserver.confd-r1 133 BLAKE2B 6f3029a06b34458f70ef8370c35c09ea69a4d005aad173070e89fd1ce613b34147ad547c621b6aa98165bfb13ef67f0886667ab52973cfe4f45ea13c1f07a7bf SHA512 34fbe44a28a1a56ce51f9f2cebfc0d1bd20e4c4ea153f7605fb96434001b6bc9c52ba7e770617ed36710bfb7f69cebe7d79b31efbccac6c6a8847cf12a1ed774
-AUX conserver.initd 1085 BLAKE2B c3eef5736137d3bf48c8f0b6d135c458fa9e0ebf0dd8254677cc6dc3d313bc2b239229167bec01534aa1f62384f0b3cc7ae7522ddcb0e5651f2a3d660ff4b352 SHA512 22ea8fad24acfd602e135d586880dd3b63c4cfa6da40c20b85b0f9ba591eab7192dbaaf3526b56ef038a95017b7bf810b1e1c4259b4e6cfd8eca4966a8432c12
 AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8babeeb9635f9652d01f06de1fa4309a213b6b2bca77099a17910aa5d6790bccc4e4e8f7f8fc0ba42458 SHA512 f0dcea7fddec5165fb00c452aa0b56c3eaa0919e96e5bf1ff4e80000b01fe80134bc4ee8a584114fcad56c6d5caa467d229b8b54bc8b4145dd2fa76871336c7d
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
-DIST conserver-8.1.18.tar.gz 323247 BLAKE2B 48176ba8be648df16ddb18c1a760af8069f7d926d2e0767e3b7ef903276d6104cfa9464a6ebdce009720fe5118862d89cf5371e104d17b967e11fe8e8968e8f9 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f
-DIST conserver-8.2.2.tar.gz 329048 BLAKE2B 0148a5b5b11fcc75a071b9759e129a94f1fe623df35e7549e967d0037ddb378447623070ce43429daf4868308be150f5ba318354e3181d94ccb1199655231373 SHA512 7c59dc59e59e3ee0172b2a52214cd8dd83383168fe0f145870d128b900a012cfa38c2f1ae85769c226d941ca1a764f93ec3bf353da896537ae1be5b6bc17e6c6
 DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
 DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091 SHA512 c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
-EBUILD conserver-8.1.18-r1.ebuild 2288 BLAKE2B d25a03bd1d6ee27d983c15455bc4f3ae76ca663cba75b353cfef17480f91f49d2d310a038ea9f16334bb75ece843f948a619c0980c1aacd9457bf2a2dfe0f1aa SHA512 4b87330c9eb8c9e731ce56b49afc45ccc04fcbe877d374b51a37b351c582b465946178ac41e50605ef958ffd0c65693b8f21ae0f28a65c462b99332bb6059078
-EBUILD conserver-8.2.2.ebuild 2350 BLAKE2B 6b502331697cffa995ab8e1cdfb03d086b78fa936941051a73dada85eea5de33572a07032d6973a1c7664c5a402345de1e2a06bc31646f987117c85e4d749dd4 SHA512 898c71213ff0b60156bf07ef2541df6d5a17ece9a8145fd080ae1932c59919272d9294e027aea1a051e6aa41acae87cd43c3418fbc5c1653482510a134942684
-EBUILD conserver-8.2.3.ebuild 2254 BLAKE2B 9d814ca1686d8ae19e5061d4a4dab85d35c47392a30233c37ebfa49de4ab8d627e90b9cd1fa8c22ae68ebb5c82f01fcf38a5d592514dbed99ba39df0bd3ff82d SHA512 2517c805ffd48239c2f65d53edda196fc61d7d1439297fe4319a32a2ce769373604657aeed27af17d288c911d0d564a258d7c3e16ffcf68049b7a5c27c754113
-EBUILD conserver-8.2.4.ebuild 2263 BLAKE2B 1aafde63585dce09739d0b06ca2b5c6dc8bfd6c2ea17ca4d7eac178ccc7c69680a29b8382da55ae425d22c5b065969b606ef9933b0c28c67627b3df9d86c533d SHA512 8d302941dc0c687370db246431ea78fa28713730e1d428bd9a5d9e5599383296367f1d4d6dfab5166802af78482c755422e084d8c02f938155e22cdf97683816
+EBUILD conserver-8.2.3.ebuild 2302 BLAKE2B daebfeb728432113b951a44a157456458ffbda3e73b29f577757e31e22e15e40cebf980357a318b854d3aa00f4acdca142a4acd41638841c9c951024aa3333b1 SHA512 1a2e224234208b72961f7675fa9816a2172b3f1ea80dad66e1ffdb62d3deebedacac9bcb98a8ed834266a7bc40cb924b26c303b186dac1fe478599eac5fb99d2
+EBUILD conserver-8.2.4.ebuild 2311 BLAKE2B 30b33e9c0adac2aa6b46bda93703afda74263eedf4c023ddb35bc3e5e155c90c055a72263bbd17c45281d9f72d64bf0af29ad63bbca6448f4c65b42281932d28 SHA512 c08d2a60a879e6f00d0e94a3ebf97427342c06129a17bb4b6ee66b524491cff6fe746d69a80f6dc09a9c9f0bc10e8c3b7d00860af905e87a0a552ab85e6cdb1e
 MISC metadata.xml 1378 BLAKE2B 942f6b9d8fd616f089d0651fbdfc41de96033acf65f127cbfded2fb9c390fd9b86c037a62679ea27b18e4e618bf764d09277350e9fdbaadc914c18a6961618e2 SHA512 6b3e06cfa1013f71eb42c9c073df8c97d2b8fa6b935b637ba29096db88d75bab1bb192695ed4a5dad63d88341a366327f419cb357777c0abb09799c8bcc40970
diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild
deleted file mode 100644
index 53a8cd7fd301..000000000000
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit ssl-cert eutils pam autotools
-
-DESCRIPTION="Serial Console Manager"
-HOMEPAGE="https://www.conserver.com/"
-SRC_URI="https://www.conserver.com/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
-IUSE="kerberos libressl pam ssl tcpd debug"
-
-DEPEND="ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	pam? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	debug? ( dev-libs/dmalloc )
-	kerberos? (
-		virtual/krb5
-		net-libs/libgssglue
-	)"
-RDEPEND="${DEPEND}
-	pam? ( >=sys-auth/pambase-20080219.1 )"
-
-src_prepare() {
-	# Apply patch to prevent package from stripping binaries
-	epatch "${FILESDIR}"/${PN}-prestrip.patch
-
-	# Apply patch to use custom dmalloc macro
-	epatch "${FILESDIR}"/${P}-dmalloc.patch
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with tcpd libwrap) \
-		$(use_with debug dmalloc) \
-		$(use_with kerberos gssapi) \
-		--with-logfile=/var/log/conserver.log \
-		--with-pidfile=/var/run/conserver.pid \
-		--with-cffile=conserver/conserver.cf \
-		--with-pwdfile=conserver/conserver.passwd \
-		--with-master=localhost \
-		--with-port=7782
-}
-
-src_install() {
-	emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
-
-	## create data directory
-	dodir /var/consoles
-	fowners daemon:daemon /var/consoles
-	fperms 700 /var/consoles
-
-	## add startup and sample config
-	newinitd "${FILESDIR}"/conserver.initd conserver
-	newconfd "${FILESDIR}"/conserver.confd conserver
-
-	dodir /etc/conserver
-	fperms 700 /etc/conserver
-	insinto /etc/conserver
-	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
-	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
-
-	## add docs
-	dohtml conserver.html
-	dodoc CHANGES FAQ PROTOCOL README TODO
-	dodoc conserver/Sun-serial contrib/maketestcerts
-	newdoc conserver.cf/conserver.cf conserver.cf.sample
-
-	# Add pam config
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
-}
-
-pkg_postinst() {
-	# Add certs if SSL use flag is enabled
-	if use ssl && [ ! -f "${ROOT}"/etc/ssl/conserver/conserver.key ]; then
-		install_cert /etc/ssl/conserver/conserver
-	fi
-}
diff --git a/app-admin/conserver/conserver-8.2.2.ebuild b/app-admin/conserver/conserver-8.2.2.ebuild
deleted file mode 100644
index ceb5c721f569..000000000000
--- a/app-admin/conserver/conserver-8.2.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools pam ssl-cert
-
-DESCRIPTION="Serial Console Manager"
-HOMEPAGE="https://www.conserver.com"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
-
-DEPEND="debug? ( dev-libs/dmalloc:= )
-	freeipmi? ( sys-libs/freeipmi:= )
-	kerberos? (
-		virtual/krb5
-		net-libs/libgssglue
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	pam? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}
-	pam? ( sys-auth/pambase )"
-
-DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts)
-
-PATCHES=(
-	"${FILESDIR}/${P}-time-argument.patch"
-	"${FILESDIR}/${P}-ssl-compat.patch"
-)
-
-src_prepare() {
-	default
-	sed -e '/^INSTALL_PROGRAM/s:-s::' \
-		-i {console,conserver,autologin,contrib/chat}/Makefile.in || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with debug dmalloc)
-		$(use_with ipv6)
-		$(use_with freeipmi)
-		$(use_with kerberos gssapi)
-		$(use_with ssl openssl)
-		$(use_with pam)
-		$(use_with tcpd libwrap)
-		--with-cffile=conserver/conserver.cf
-		--with-logfile=/var/log/conserver.log
-		--with-master=localhost
-		--with-pidfile=/run/conserver.pid
-		--with-port=7782
-		--with-pwdfile=conserver/conserver.passwd
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
-
-	keepdir /var/consoles
-	fowners daemon:daemon /var/consoles
-	fperms 700 /var/consoles
-
-	newinitd "${FILESDIR}"/conserver.initd-r1 conserver
-	newconfd "${FILESDIR}"/conserver.confd-r1 conserver
-
-	dodir /etc/conserver
-	fperms 700 /etc/conserver
-	insinto /etc/conserver
-	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
-	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
-
-	einstalldocs
-	docinto examples
-	dodoc -r conserver.cf/samples/.
-
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
-}
-
-src_test() {
-	# hangs without -j1
-	emake -j1 test
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then
-			install_cert /etc/ssl/conserver/conserver
-		fi
-	fi
-}
diff --git a/app-admin/conserver/conserver-8.2.3.ebuild b/app-admin/conserver/conserver-8.2.3.ebuild
index 9a067d23f712..d9a7265bfbad 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -32,6 +32,8 @@ RDEPEND="${DEPEND}
 
 DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts)
 
+PATCHES=( "${FILESDIR}/${PV}-libressl.patch" )
+
 src_prepare() {
 	default
 	sed -e '/^INSTALL_PROGRAM/s:-s::' \
diff --git a/app-admin/conserver/conserver-8.2.4.ebuild b/app-admin/conserver/conserver-8.2.4.ebuild
index 54eae640841a..6429ff850b3e 100644
--- a/app-admin/conserver/conserver-8.2.4.ebuild
+++ b/app-admin/conserver/conserver-8.2.4.ebuild
@@ -32,6 +32,8 @@ RDEPEND="${DEPEND}
 
 DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial contrib/maketestcerts)
 
+PATCHES=( "${FILESDIR}/${PV}-libressl.patch" )
+
 src_prepare() {
 	default
 	sed -e '/^INSTALL_PROGRAM/s:-s::' \
diff --git a/app-admin/conserver/files/8.2.3-libressl.patch b/app-admin/conserver/files/8.2.3-libressl.patch
new file mode 100644
index 000000000000..8b04acb7b88c
--- /dev/null
+++ b/app-admin/conserver/files/8.2.3-libressl.patch
@@ -0,0 +1,31 @@
+From f4d2a4a30f930c58bf87511f7ed1a982eca66ce3 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Thu, 6 Jun 2019 21:30:16 -0700
+Subject: [PATCH] libressl
+
+backport of https://github.com/conserver/conserver/pull/26
+---
+ conserver/cutil.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/conserver/cutil.h b/conserver/cutil.h
+index 63aef65..07aa6d4 100644
+--- a/conserver/cutil.h
++++ b/conserver/cutil.h
+@@ -12,10 +12,12 @@
+ # include <openssl/err.h>
+ # if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #  define TLS_method SSLv23_method
++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
++# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ #  define CIPHER_SEC0
+ # else
+ #  define CIPHER_SEC0 ":@SECLEVEL=0"
+-# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
+ #endif
+ #if HAVE_GSSAPI
+ # include <gssapi/gssapi.h>
+-- 
+2.21.0
+
diff --git a/app-admin/conserver/files/8.2.4-libressl.patch b/app-admin/conserver/files/8.2.4-libressl.patch
new file mode 100644
index 000000000000..9151d697e756
--- /dev/null
+++ b/app-admin/conserver/files/8.2.4-libressl.patch
@@ -0,0 +1,27 @@
+From d3ffe500c934573115e313ac01b8fab5cb4d2e9f Mon Sep 17 00:00:00 2001
+From: Stuart Henderson <stu@spacehopper.org>
+Date: Wed, 27 Mar 2019 23:29:31 +0000
+Subject: [PATCH] fix TLS with LibreSSL, it doesn't have :@SECLEVEL=0
+
+---
+ conserver/cutil.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/conserver/cutil.h b/conserver/cutil.h
+index d21abc5..db4df7f 100644
+--- a/conserver/cutil.h
++++ b/conserver/cutil.h
+@@ -12,10 +12,12 @@
+ # include <openssl/err.h>
+ # if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #  define TLS_method SSLv23_method
++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
++# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ #  define CIPHER_SEC0
+ # else
+ #  define CIPHER_SEC0 ":@SECLEVEL=0"
+-# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
+ #endif
+ #if HAVE_GSSAPI
+ # include <gssapi/gssapi.h>
diff --git a/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch b/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch
deleted file mode 100644
index ff82f74b261c..000000000000
--- a/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- configure.in	2011-08-19 01:11:06.000000000 -0400
-+++ configure.in	2011-08-19 02:06:50.000000000 -0400
-@@ -320,6 +320,8 @@
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- 
-+AM_WITH_DMALLOC([cons_with_dmalloc="YES"],[cons_with_dmalloc="NO"])
-+
- dnl ### Compiler characteristics. ##################################
- AC_AIX
- AC_C_CONST
-@@ -578,51 +580,6 @@
-     fi]
- )
- 
--cons_with_dmalloc="NO"
--AC_ARG_WITH(dmalloc,
--    AS_HELP_STRING([--with-dmalloc@<:@=PATH@:>@],
--	[Compile in dmalloc support]),
--    [if test "$withval" != "no"; then
--	if test "$withval" != "yes"; then
--	    DMALLOCCPPFLAGS="-I$withval/include"
--	    if test "$use_dash_r" != "yes"; then
--		DMALLOCLDFLAGS="-L$withval/lib"
--	    else
--		DMALLOCLDFLAGS="-L$withval/lib -R$withval/lib"
--	    fi
--	else
--	    DMALLOCCPPFLAGS=""
--	    DMALLOCLDFLAGS=""
--	fi
--
--	oCPPFLAGS="$CPPFLAGS"
--	oLDFLAGS="$LDFLAGS"
--	oLIBS="$LIBS"
--	have_dmalloc=no
--
--	CPPFLAGS="$CPPFLAGS $DMALLOCCPPFLAGS"
--	LDFLAGS="$LDFLAGS $DMALLOCLDFLAGS"
--
--	AC_CHECK_HEADER([dmalloc.h],
--	    [LIBS="$LIBS -ldmalloc"
--	    AC_MSG_CHECKING(for dmalloc libraries -ldmalloc)
--	    AC_TRY_LINK([#include <dmalloc.h>
--		],[dmalloc_debug(0)],
--		[AC_MSG_RESULT(yes)
--		cons_with_dmalloc="YES"
--		AC_DEFINE(HAVE_DMALLOC)
--		have_dmalloc=yes],
--		[AC_MSG_RESULT(no)])],)
--
--	if test $have_dmalloc = no; then
--	    LIBS="$oLIBS"
--	    CPPFLAGS="$oCPPFLAGS"
--	    LDFLAGS="$oLDFLAGS"
--	fi
--    fi]
--)
--
--
- dnl ### Check for needed functions. ################################
- 
- dnl dnl The following basically stollen from the less-358 distribution, but
---- /dev/null		2011-08-07 13:18:05.535976733 -0400
-+++ m4/dmalloc.m4	2011-08-19 03:49:03.755073497 -0400
-@@ -0,0 +1,34 @@
-+## ----------------------------------- ##                   -*- Autoconf -*-
-+## Check if --with-dmalloc was given.  ##
-+## From Franc,ois Pinard               ##
-+## ----------------------------------- ##
-+
-+# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2010,
-+# 2011 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 7
-+
-+dnl AM_WITH_DMALLOC([ACTION-IF-FOUND],[ACTION-IF-NOT])
-+AC_DEFUN([AM_WITH_DMALLOC],
-+[AC_MSG_CHECKING([if malloc debugging is wanted])
-+AC_ARG_WITH([dmalloc],
-+[AS_HELP_STRING([--with-dmalloc],
-+                [use dmalloc, as in http://www.dmalloc.com])],
-+[if test "$withval" = yes; then
-+  AC_MSG_RESULT([yes])
-+  AC_DEFINE([WITH_DMALLOC], [1],
-+	    [Define if using the dmalloc debugging malloc package])
-+  LIBS="$LIBS -ldmalloc"
-+  LDFLAGS="$LDFLAGS -g"
-+  [$1]
-+else
-+  AC_MSG_RESULT([no])
-+  [$2]
-+fi], [AC_MSG_RESULT([no])])
-+])
-+
-+AU_DEFUN([fp_WITH_DMALLOC], [AM_WITH_DMALLOC])
diff --git a/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch b/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch
deleted file mode 100644
index f3054a9a0dac..000000000000
--- a/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/configure.in b/configure.in
-index a060811..00b7f8b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -535,7 +535,7 @@ AC_ARG_WITH(openssl,
- 	    [LIBS="$LIBS -lssl -lcrypto"
- 	    AC_MSG_CHECKING(for openssl libraries -lssl and -lcrypto)
- 	    AC_TRY_LINK([#include <openssl/ssl.h>
--		],[SSL_library_init()],
-+		],[SSL_CTX_new(NULL)],
- 		[AC_MSG_RESULT(yes)
- 		cons_with_openssl="YES"
- 		AC_DEFINE(HAVE_OPENSSL)
-diff --git a/conserver/cutil.c b/conserver/cutil.c
-index af8196c..dcfe333 100644
---- a/conserver/cutil.c
-+++ b/conserver/cutil.c
-@@ -57,7 +57,9 @@ Bye(int status)
- {
-     DestroyDataStructures();
- #if HAVE_OPENSSL
-+# if OPENSSL_VERSION_NUMBER < 0x10100000L
-     ERR_free_strings();
-+# endif
- #endif
-     exit(status);
- }
-diff --git a/conserver/cutil.h b/conserver/cutil.h
-index 899da7a..63aef65 100644
---- a/conserver/cutil.h
-+++ b/conserver/cutil.h
-@@ -7,6 +7,8 @@
- #include <stdarg.h>
- #if HAVE_OPENSSL
- # include <openssl/ssl.h>
-+# include <openssl/bn.h>
-+# include <openssl/dh.h>
- # include <openssl/err.h>
- # if OPENSSL_VERSION_NUMBER < 0x10100000L
- #  define TLS_method SSLv23_method
diff --git a/app-admin/conserver/files/conserver-8.2.2-time-argument.patch b/app-admin/conserver/files/conserver-8.2.2-time-argument.patch
deleted file mode 100644
index 0a42987135b1..000000000000
--- a/app-admin/conserver/files/conserver-8.2.2-time-argument.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3d9d5509c90524256861dd7cf0b7c0c6fdf5424a Mon Sep 17 00:00:00 2001
-From: Ed Maste <emaste@freebsd.org>
-Date: Wed, 10 Oct 2018 12:56:26 -0400
-Subject: [PATCH] Correct argument type passed to time()
-
----
- conserver/readcfg.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/conserver/readcfg.c b/conserver/readcfg.c
-index 949b9bf..d5bb90a 100644
---- a/conserver/readcfg.c
-+++ b/conserver/readcfg.c
-@@ -3116,7 +3116,7 @@ ConsoleAdd(CONSENT *c)
- 	pCEmatch->logfilemax = c->logfilemax;
- 	if (pCEmatch->logfilemax != (off_t) 0 &&
- 	    timers[T_ROLL] == (time_t)0)
--	    timers[T_ROLL] = time((time_t)0);
-+	    timers[T_ROLL] = time((time_t *)0);
- 
- 	SwapStr(&pCEmatch->motd, &c->motd);
- 	SwapStr(&pCEmatch->idlestring, &c->idlestring);
diff --git a/app-admin/conserver/files/conserver-prestrip.patch b/app-admin/conserver/files/conserver-prestrip.patch
deleted file mode 100644
index e67c49da1a66..000000000000
--- a/app-admin/conserver/files/conserver-prestrip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nuar conserver-8.1.14.orig/conserver/Makefile.in conserver-8.1.14/conserver/Makefile.in
---- conserver-8.1.14.orig/conserver/Makefile.in	2006-10-25 17:41:00.398082243 -0600
-+++ conserver-8.1.14/conserver/Makefile.in	2006-10-25 17:41:27.876759095 -0600
-@@ -13,7 +13,7 @@
- 
- ### Installation programs and flags
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
- LN_S = @LN_S@
- MKDIR = @MKDIR@
- 
-diff -Nuar conserver-8.1.14.orig/console/Makefile.in conserver-8.1.14/console/Makefile.in
---- conserver-8.1.14.orig/console/Makefile.in	2006-10-25 17:41:00.401081662 -0600
-+++ conserver-8.1.14/console/Makefile.in	2006-10-25 17:41:18.188635834 -0600
-@@ -9,7 +9,7 @@
- 
- ### Installation programs and flags
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
- LN_S = @LN_S@
- MKDIR = @MKDIR@
- 
diff --git a/app-admin/conserver/files/conserver.confd b/app-admin/conserver/files/conserver.confd
deleted file mode 100644
index 4544fed4ab36..000000000000
--- a/app-admin/conserver/files/conserver.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-## Config file for /etc/init.d/conserver
-
-CONSERVER_OPTS="-d"
diff --git a/app-admin/conserver/files/conserver.initd b/app-admin/conserver/files/conserver.initd
deleted file mode 100644
index 841892672cc2..000000000000
--- a/app-admin/conserver/files/conserver.initd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need clock
-}
-
-checkconfig() {
-	if [ ! -e /etc/conserver/conserver.cf ] ; then
-		eerror "You need to create /etc/conserver/conserver.cf first."
-		eerror "A sample is placed there to be renamed and ajusted."
-		eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
-		return 1
-	fi
-
-	if [ ! -e /etc/conserver/conserver.passwd ] ; then
-		eerror "You need to create /etc/conserver/conserver.passwd first."
-		eerror "A sample is placed there to be renamed and ajusted."
-		eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting conserver"
-	start-stop-daemon --start --quiet --pidfile /var/run/conserver.pid --exec \
-		/usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null
-	eend $? "Failed to start conserver"
-}
-
-stop() {
-	ebegin "Stopping conserver"
-	start-stop-daemon --stop --quiet --pidfile /var/run/conserver.pid
-	eend $? "Failed to stop conserver"
-}
diff --git a/app-admin/dio/Manifest b/app-admin/dio/Manifest
index 9457d647e07e..72613b632b66 100644
--- a/app-admin/dio/Manifest
+++ b/app-admin/dio/Manifest
@@ -1,3 +1,3 @@
 DIST dio-1.5.2.tar.gz 44344 BLAKE2B 8e573cbf2ad1b717ffec09f20f8c7474841bc3e1635af35116d02b37af56ef3b4742e12725134d485f788e7abb595605640e19bd6f84bfd8f14289abf1695089 SHA512 366d2f2d25b8d16439c4a9aaa7cd775ddffb1022980675cdda8e2e4d4de3d3e5dcfa8d0c581b73fcfe4eff66ee8ef682f082c8788f514b7abdf1a2cb2159b9ba
-EBUILD dio-1.5.2-r1.ebuild 867 BLAKE2B e94a664a8e0957f5b0e7159f4a1310c9013be1db20020ed60f99fab0552106cee34aca61897a0482f0cabd5fb13186fa89fae682208a8ee6963b557c460d129f SHA512 3aa8452f4268029058e5c6b0e5646ef9ca097475df55268912e920a34c00ca343dcb93d591d17e911777442c70416b7213ef6b474e01dfa5ab9792e2e6ef8ee8
+EBUILD dio-1.5.2-r1.ebuild 866 BLAKE2B 67446d17c74b52e5e59d62ee1cfde36b8947805e5f8f67bb6376f07ceef57e7bb9410b4781e138efe0740d3be7f36a81ff9531d5aaa4ff010547fe49cc4d27fd SHA512 4f340cf0311191745672dfea523fb2a8b0b721181e60700e026b5d6cffd5a9cb0e31ad35c1e41fb5052def7046abd3084201f4c929d6f25d7d76b1f3402f9daf
 MISC metadata.xml 912 BLAKE2B 5fe57b665757cb19dbe7e6efe2202d5cb4e8311fd21c3974a0c42017841330ce03242e5ac656818781cd39cb3ff62c05ed69ee008b8aa0c1809311819e23c588 SHA512 80995a42eba255a8e79ae0ae2596114b2703a433151b3f33d438a002c220194b14905221b9ab2e59185776c331ba22342c04d3ebf5aa8297b1ef988c45621f62
diff --git a/app-admin/dio/dio-1.5.2-r1.ebuild b/app-admin/dio/dio-1.5.2-r1.ebuild
index c8e8f458e928..23999654ba7b 100644
--- a/app-admin/dio/dio-1.5.2-r1.ebuild
+++ b/app-admin/dio/dio-1.5.2-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A device I/O monitoring tool"
 HOMEPAGE="https://github.com/donaldmcintosh/dio"
 SRC_URI="https://github.com/donaldmcintosh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 1c7a87f98eea..2039460c09c1 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,8 +1,6 @@
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
-DIST eselect-1.4.13.tar.xz 177848 BLAKE2B 70e5a793759e16119f5233b2c974e0fcc8d213b2033e2b3b76e0a047797b1a0f2feb21ad3beda72f644b498725b4d8ff5c221dcd0870adf5197eaf81c6f3c895 SHA512 5ce10bd288268bc5b52031703f8ac8f3cf07bb22039339bb00c92583ed226162ea8865788f5c1ff4e058d38f0bf25e3557273fb1e839e0391c1fafb9f702bc11
 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 1637 BLAKE2B 9f0e2e19dc35240c47d3218d96ba6d54ca552f2bef916e92aaa31390e10612b728f933effb2666df926262c1bd8a87e9538e1467c2f489f2a6aa1de923b7bcf0 SHA512 259dc8f16b3aacfd4416472c1d9e1f87a107443688dfb048914613edf791c99b288e7f6b771f0e9d73462ca039640921d40f4a59f624f22a9c1bc1f00aded472
+EBUILD eselect-1.4.14.ebuild 1627 BLAKE2B 681b9aa31b4e3e7cc0857c9ee13dabeeb78936f3c6a41f8ae43a44526086bf8e52ef047ba9543b0fd14280abf0025164dc6fd5b22da481b1009cdd7a9f65c4fd SHA512 8028a79b110b47c0b75ec0621729cad9be30a103ede0d0e6c3e07220fac775704df733da7b64304db2e882e3aacf310750338f9ee224baef602cf1100f96da06
 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.13.ebuild b/app-admin/eselect/eselect-1.4.13.ebuild
deleted file mode 100644
index e04296846522..000000000000
--- a/app-admin/eselect/eselect-1.4.13.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 bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-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"
-IUSE="doc emacs vim-syntax"
-
-RDEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-misc/realpath
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-RDEPEND="${RDEPEND}
-	sys-apps/file
-	sys-libs/ncurses:0"
-
-PDEPEND="emacs? ( app-emacs/eselect-mode )
-	vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp misc/${PN}.bashcomp ${PN}
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	if use doc; then
-		docinto html
-		dodoc *.html doc/*.html doc/*.css
-	fi
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-	if ! use prefix; then
-		fowners root:portage /var/lib/gentoo/news
-		fperms g+w /var/lib/gentoo/news
-	fi
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	if ! use prefix; then
-		chgrp portage "${EROOT}/var/lib/gentoo/news" \
-			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-	fi
-}
diff --git a/app-admin/eselect/eselect-1.4.14.ebuild b/app-admin/eselect/eselect-1.4.14.ebuild
index 8065de2c7004..e4f23dae6b0d 100644
--- a/app-admin/eselect/eselect-1.4.14.ebuild
+++ b/app-admin/eselect/eselect-1.4.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 1e27b70099d4..9094d8d18b3b 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -121,6 +121,8 @@ DIST github.com-square-go-jose-89060dee6a84df9a4dae49f676f0c755037834f1.tar.gz 2
 DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
 DIST helm-2.13.1.tar.gz 1188128 BLAKE2B 6bd73fcce610a8cc00a1fc9114646f1e924d99056ff09e9e0abb6c389eb7e4290e1331b856ee6ec7180e8efe0cd4e5df27b40886e9346be26f4ede9722f3bd14 SHA512 bc917c5d9a51d4ee7b05e539b07819367edf3cde02a5c8ed19d8578fa9b0a708c37552d46f07b5c1a93e77235b273a3ada786f3ea5a626d1bb391074eb827b47
 DIST helm-2.14.0.tar.gz 1239286 BLAKE2B 6749b3fbbc6f9299f37e0041fb1f0d2120031631434f61c07220f6c9edcff479d7ca821e41b2daf0699b67e5ba5277636b07c7cabc1d0f9e49c9a6d048d6db44 SHA512 04daed048b1892fc896d710f616334d7885a3a04d01a79e4d884acd57d36d86f77cdb13541594ea35f5ba78712b0502515e194e210695b44a2f2f6ce858f70d3
+DIST helm-2.14.1.tar.gz 1239597 BLAKE2B 349f57163c9e1cebc61e5a717c08d5bfc0fc549c98f47e9e942ae4db80e5f5d231e9a47e910dfbe126c3e65f63ac71de18ee9271bbe4ac6398efc4eaf49ad787 SHA512 4dd94c965ff5a28332fe68f397419e586253cd3e74131645566e1f4db0290906e4a49707d7cf53fd05d63953b23b6bc2eae86dc311a2758ebc4e60b54558cff4
 EBUILD helm-2.13.1.ebuild 8867 BLAKE2B b820ca25fffd469d127e02af8752ef284031804e5c06aa152fbcf8c06432d858ac8c2ad01c5cbeb83507cbba23dbc15f303c40240116ca2d4f7a1d4e9e040f24 SHA512 7f03979c65de8ad4cf5e8cbb56532a9ffa820eb9e5a3a21a6838ab1292eae0de74ca09c2465abffa9f3483d476d53341b32411b43f800fe23f0f71c3f6cb6544
 EBUILD helm-2.14.0.ebuild 9532 BLAKE2B 822c91a7830b5c068e4adb5d677b9c5b78811f4fc672d3d603bedae7e3d9297da78d8ca99564e351ad304b2a963b7b4a243be3a2550afa1d56ba864e65c3cb90 SHA512 1d96bc96a68e64048d91c26acf5922946d4ddda881e48ab8253f841984ea627f40dde7958bfb5fdfdfe0c42d06c9f5cb40c5ee38b315321273a0f2f043d56c3d
+EBUILD helm-2.14.1.ebuild 9532 BLAKE2B 50824e3fed45a11ea5a46c99fea7574c81d41aff1b4509784e70abb62c2faa0c4a0dece2a5cd000121f2730543e40f3ce34cd64a92d4d326c5b75c5a1efb1671 SHA512 ec71ebbf82ef887b289c501bf299eb87eb126a319224afbb1e6269f6b353bdfb64b3e705c3048b1331689f7bd90e3083516358f46aa6af33b2180244369efe1d
 MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
diff --git a/app-admin/helm/helm-2.14.1.ebuild b/app-admin/helm/helm-2.14.1.ebuild
new file mode 100644
index 000000000000..026af23e8342
--- /dev/null
+++ b/app-admin/helm/helm-2.14.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+MY_PV=${PV/_rc/-rc.}
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
+"github.com/Azure/go-autorest ea233b6412b0421a65dc6160e16c893364664a95"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
+"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker a9fbbdc8dd8794b20af358382ab780559bca589d"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
+"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
+"github.com/go-openapi/jsonpointer ef5f0afec364d3b9396b7b77b43dbe26bf1f8004"
+"github.com/go-openapi/jsonreference 8483a886a90412cd6858df4ea3483dce9c8e35a3"
+"github.com/go-openapi/spec 5bae59e25b21498baea7f9d46e9c147ec106a42e"
+"github.com/go-openapi/swag 5899d5c5e619fda5fa86e14795a835f473ca284c"
+"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 24818f796faf91cd76ec7bddd72458fbced7a6c1"
+"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud c818fa66e4c88b30db28038fe3f18f2f4a0db9a8"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru 20f1fb78b0740ba8c3cb143a61e86ba5c8669768"
+"github.com/huandu/xstrings f02667b379e2fb5916c3cda2cf31e0eb885d79f8"
+"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/jmoiron/sqlx d161d7a76b5661016ad0b085869f77fd410f3e6a"
+"github.com/json-iterator/go ab8a2e0c74be9d3be70b3184d9acc634935ded82"
+"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
+"github.com/lib/pq 88edab0803230a3898347e77b474f8c1820a1f20"
+"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/goutils 41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"
+"github.com/Masterminds/semver c7af12943936e8c39859482e61f0574c2fd7fc75"
+"github.com/Masterminds/sprig 9f8fceff796fb9f4e992cd2bece016be0121ab74"
+"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
+"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+"github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
+"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
+"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/rubenv/sql-migrate 1007f53448d75fe14190968f5de4d95ed63ebb83"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
+"github.com/spf13/cobra fe5e611709b0c57fa4a89136deaa8e1d4004d053"
+"github.com/spf13/pflag 298182f68c66c05229eb03ac171abe6e309ee79a"
+"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
+"golang.org/x/crypto de0752318171da717af4ce24d0a2e8626afaeb11 github.com/golang/crypto"
+"golang.org/x/net 65e2d4e15006aab9813ff8769e768bbf4bb667a0 github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
+"golang.org/x/sys b90733256f2e882e81d52f9126de08df5615afd9 github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
+"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc a02b0774206b209466313a0b525d2c738fe407eb github.com/grpc/grpc-go"
+"gopkg.in/gorp.v1 6a667da9c028871f98598d85413e3fc4c6daa52e github.com/go-gorp/gorp"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/square/go-jose.v2 89060dee6a84df9a4dae49f676f0c755037834f1 github.com/square/go-jose"
+"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml"
+"k8s.io/api 6e4e0e4f393bf5e8bbff570acd13217aa5a770cd github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 727a075fdec8319bf095330e344b3ccc668abc73 github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery 6a84e37a896db9780c75367af8d2ed2bb944022e github.com/kubernetes/apimachinery"
+"k8s.io/apiserver 1ec86e4da56ce0573788fc12bb3a5530600c0e5d github.com/kubernetes/apiserver"
+"k8s.io/client-go 1a26190bd76a9017e289958b9fba936430aa3704 github.com/kubernetes/client-go"
+"k8s.io/cli-runtime d644b00f3b79346b7627329269bb25f2135f941c github.com/kubernetes/cli-runtime"
+"k8s.io/cloud-provider 9c9d72d1bf90eb62005f5112f3eea019b272c44b github.com/kubernetes/cloud-provider"
+"k8s.io/klog 8e90cee79f823779174776412c13478955131846 github.com/kubernetes/klog"
+"k8s.io/kube-openapi b3a7cee44a305be0a69e1b9ac03018307287e1b0 github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes b7394102d6ef778017f2ca4046abbaa23b88c290 github.com/kubernetes/kubernetes"
+"k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c github.com/kubernetes/utils"
+"sigs.k8s.io/kustomize a6f65144121d1955266b0cd836ce954c04122dc8 github.com/kubernetes-sigs/kustomize"
+"sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 github.com/kubernetes-sigs/yaml"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="5270352a09c7e8b6e8c9593002a73535276507c0"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.12"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN} bin/tiller
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index bd335664dcd7..9dc7e86a19d0 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,12 +1,10 @@
 AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9
-AUX keepassxc-2.4.0-build_fix.patch 1419 BLAKE2B b5661c75008c9031598ee704b21e0581a6e3859addb9b4e642cca415b06f26cb7e6a984fb942f648f7d4082c17e198644230ddf711696971df6754cf4c6eb119 SHA512 3e659b5048089528c2055f9481119e66f655b2531a4347d4ca6e439bcc82566f2e658bdf4442e6c678d19811ca494533e7ce08e14dab3148c841084f2f5ab898
-AUX keepassxc-2.4.0-update_checker_toggle.patch 18616 BLAKE2B 5b13c5ab493b955dc31e7f928c471ec11095f26a2d2f76a5145318e0e35dc751187eae11f9467a78c0455ae8ab0a6a0045c6b4670a701f13e56910ac1b484808 SHA512 138f0de9bd862423a4764fcc61c133ef98d800ce6ab3cde0fe304352866266bbd8d8acd8dabd131e8189e8cbc551f92464f03c199f9f02861534c17b30a94ea2
 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.0-src.tar.xz 3252104 BLAKE2B 7c82822f6fb0eaf6b5d086aebdf4927af215339f92e7f52104e05d5ff301461a1ad816d8a39b377c717e975001c9295ec6d8b2f2003a2215c05931eb9acb5c73 SHA512 b7295f5983237606efd236955dc73d477992d944e547eeb2c3a267d846e70ce6f83e489f58e3bd9b5bb21decabd9052a4ea7b98bd98e8283abbb678ae19e5559
 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
 EBUILD keepassxc-2.3.4-r1.ebuild 1847 BLAKE2B 4de124b498c9d101b56a9c966170d6bfef024ac8853b166c82e42244a209956f062ebe3f1cfa99d6b62fc2ce3569b884ede3cda338bfd6d92ca5575f18a30f33 SHA512 bbcaea1ebd466a585375cb29688761202bdff37fa4ec18f40134e933d8fa7036d8be422b822b3dbc307ca16fbc8a509f04d6f29c2e7b442143fcedd7b662eb6f
-EBUILD keepassxc-2.4.0-r1.ebuild 2163 BLAKE2B 5dd1a135a8c3eb1dbebbf9424f85955449196bd86bfbf9c6fe00a07fc5d166158d9c75c1dab87c611fe4f3420133976d5e5f25517677f74148ac09571906d9c5 SHA512 e77ea5b046d744c59d3d1cb6fa9328697eae8c9a6a0a0acdc13990f6871b74484fe9f69c9b3a62b575d170b0df756c7db631c4804228e29d9445308291817129
 EBUILD keepassxc-2.4.1.ebuild 2024 BLAKE2B f7289b70d43a0ad73f7b63ceed0a9d8317f377ec5a66122150ca8b63dec566d2763454673ed7b76621f18d160096724658b5da55c3296397d51a78cb55d96e97 SHA512 9893aad20535bfd881d0e0fad6b8898edd7f64e0e74ae14388c272a72e27bcfc70c539e4bf0c3938e659c81840e082a3f8dd55efff18a564564e1366af0b5433
-EBUILD keepassxc-9999.ebuild 2113 BLAKE2B 1fab5247efdda6aae6d6e77c27eef8b6ef665c756b57cab71a7ce7d84c0d1cb7df0aa5b68543962b6d3ac965c03724a4be1948702cca255b2718f24c7ebb59ec SHA512 af6da2389520f883fea99ecafa37920371cd461b15e2162c5869d4f726a13713ccebec926faeecae3a0e7d036f1f7b2e3e32559349983935db0cbaee3d2b771e
+EBUILD keepassxc-2.4.2.ebuild 2144 BLAKE2B 74421a42259ffe1e2cab0c07d3e7374cc0629d8c2c3a47f09acfae720ed33fe356afd259df6e5ebace728f1f6359d4c88f9cca2c63cebdbadaad40c082c71dbd SHA512 9fd2a05423d9c49f381efef4af59e92df5403149bf9d742ad4905494a22027f33d42981dd071bd18039c6945f9d051c8a049db09955a4e02fc97616ac934dd61
+EBUILD keepassxc-9999.ebuild 2144 BLAKE2B 74421a42259ffe1e2cab0c07d3e7374cc0629d8c2c3a47f09acfae720ed33fe356afd259df6e5ebace728f1f6359d4c88f9cca2c63cebdbadaad40c082c71dbd SHA512 9fd2a05423d9c49f381efef4af59e92df5403149bf9d742ad4905494a22027f33d42981dd071bd18039c6945f9d051c8a049db09955a4e02fc97616ac934dd61
 MISC metadata.xml 960 BLAKE2B 63a61f81e372efa1d1a4118f8353818eb28f4d9b0e7c87c5cb6e7a4ee8c9856ae3c7ee981e2777d3263725338581834f294022d052397dffbe98db2b5ba36895 SHA512 85ad2302913936ce51a455ae15e2d9ca7a68d26fc16819f46ab494b6aaafecdf32f74596b47c1b5a3cea56bfc49bf7021dbb4b770efb8f362386a67c88ea2404
diff --git a/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch b/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch
deleted file mode 100644
index 486c8e2dd9a3..000000000000
--- a/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ff43f3ff8a8a1630d10e7117c45048623d215616 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 20 Mar 2019 11:53:21 +0100
-Subject: [PATCH] src/gui/DatabaseWidget.cpp: Build fails without
- WITH_XC_KEESHARE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp: In member function ‘void DatabaseWidget::search(const QString&)’:
-/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp:1115:5: error: ‘m_shareLabel’ was not declared in this scope
-     m_shareLabel->setVisible(false);
-     ^~~~~~~~~~~~
-/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp:1115:5: note: suggested alternative: ‘m_searchingLabel’
-     m_shareLabel->setVisible(false);
-     ^~~~~~~~~~~~
-     m_searchingLabel
----
- src/gui/DatabaseWidget.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
-index 8728c331..e4196734 100644
---- a/src/gui/DatabaseWidget.cpp
-+++ b/src/gui/DatabaseWidget.cpp
-@@ -1112,7 +1112,9 @@ void DatabaseWidget::search(const QString& searchtext)
-     }
- 
-     m_searchingLabel->setVisible(true);
-+#ifdef WITH_XC_KEESHARE
-     m_shareLabel->setVisible(false);
-+#endif
- 
-     emit searchModeActivated();
- }
--- 
-2.21.0
-
diff --git a/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch b/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch
deleted file mode 100644
index 64e02066916b..000000000000
--- a/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch
+++ /dev/null
@@ -1,445 +0,0 @@
-From 28994fef0d2c04690490f34b5da87c42e60a6b5e Mon Sep 17 00:00:00 2001
-From: Jonathan White <support@dmapps.us>
-Date: Tue, 9 Apr 2019 21:06:13 -0400
-Subject: [PATCH] Enhance update checker
-
-* Reduce initial update check notification to 500 ms to prevent inappropriately stealing focus from user
-* Add build flag WITH_XC_UPDATECHECK which defaults to ON
-* Update checks are resolved every 7 days instead of every time the application is started
-* Better checks for beta builds; ignore snapshots
-* Increase test cases
----
- CMakeLists.txt                              |  5 ++
- src/CMakeLists.txt                          |  1 +
- src/config-keepassx.h.cmake                 |  1 +
- src/core/Clock.cpp                          |  1 +
- src/gui/ApplicationSettingsWidget.cpp       | 25 ++++++-
- src/gui/ApplicationSettingsWidget.h         |  2 +
- src/gui/ApplicationSettingsWidgetGeneral.ui | 39 +++++++---
- src/gui/MainWindow.cpp                      | 12 ++--
- src/updatecheck/UpdateChecker.cpp           | 79 +++++++++++++--------
- src/updatecheck/UpdateChecker.h             |  2 +-
- tests/TestUpdateCheck.cpp                   | 35 ++++++---
- 11 files changed, 147 insertions(+), 55 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 658548f7..4f8a419c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,6 +49,7 @@ option(WITH_XC_YUBIKEY "Include YubiKey support." OFF)
- option(WITH_XC_SSHAGENT "Include SSH agent support." OFF)
- option(WITH_XC_KEESHARE "Sharing integration with KeeShare" OFF)
- option(WITH_XC_KEESHARE_SECURE "Sharing integration with secured KeeShare containers" OFF)
-+option(WITH_XC_UPDATECHECK "Include automatic update checks; disable for controlled distributions" ON)
- if(APPLE)
-     option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
- endif()
-@@ -76,6 +77,10 @@ else()
-   set(WITH_XC_CRYPTO_SSH OFF)
- endif()
- 
-+if(WITH_XC_UPDATECHECK)
-+    set(WITH_XC_NETWORKING ON)
-+endif()
-+
- set(KEEPASSXC_VERSION_MAJOR "2")
- set(KEEPASSXC_VERSION_MINOR "4")
- set(KEEPASSXC_VERSION_PATCH "0")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 110dc606..31f29033 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -195,6 +195,7 @@ add_feature_info(SSHAgent WITH_XC_SSHAGENT "SSH agent integration compatible wit
- add_feature_info(KeeShare WITH_XC_KEESHARE "Sharing integration with KeeShare")
- add_feature_info(KeeShare-Secure WITH_XC_KEESHARE_SECURE "Sharing integration with KeeShare with secure sources")
- add_feature_info(YubiKey WITH_XC_YUBIKEY "YubiKey HMAC-SHA1 challenge-response")
-+add_feature_info(UpdateCheck WITH_XC_UPDATECHECK "Automatic update checking")
- if(APPLE)
-     add_feature_info(TouchID WITH_XC_TOUCHID "TouchID integration")
- endif()
-diff --git a/src/config-keepassx.h.cmake b/src/config-keepassx.h.cmake
-index 7d701886..2acff446 100644
---- a/src/config-keepassx.h.cmake
-+++ b/src/config-keepassx.h.cmake
-@@ -20,6 +20,7 @@
- #cmakedefine WITH_XC_KEESHARE
- #cmakedefine WITH_XC_KEESHARE_INSECURE
- #cmakedefine WITH_XC_KEESHARE_SECURE
-+#cmakedefine WITH_XC_UPDATECHECK
- #cmakedefine WITH_XC_TOUCHID
- 
- #cmakedefine KEEPASSXC_BUILD_TYPE "@KEEPASSXC_BUILD_TYPE@"
-diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp
-index 88ac4fb7..be9e91dc 100644
---- a/src/core/Clock.cpp
-+++ b/src/core/Clock.cpp
-@@ -30,6 +30,7 @@ QDateTime Clock::currentDateTime()
- 
- uint Clock::currentSecondsSinceEpoch()
- {
-+    // TODO: change to toSecsSinceEpoch() when min Qt >= 5.8
-     return instance().currentDateTimeImpl().toTime_t();
- }
- 
-diff --git a/src/gui/ApplicationSettingsWidget.cpp b/src/gui/ApplicationSettingsWidget.cpp
-index 90b851bd..e6a7068d 100644
---- a/src/gui/ApplicationSettingsWidget.cpp
-+++ b/src/gui/ApplicationSettingsWidget.cpp
-@@ -91,8 +91,15 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent)
-             m_secUi->touchIDResetSpinBox, SLOT(setEnabled(bool)));
-     // clang-format on
- 
--#ifndef WITH_XC_NETWORKING
-+#ifdef WITH_XC_UPDATECHECK
-+    connect(m_generalUi->checkForUpdatesOnStartupCheckBox, SIGNAL(toggled(bool)), SLOT(checkUpdatesToggled(bool)));
-+#else
-     m_generalUi->checkForUpdatesOnStartupCheckBox->setVisible(false);
-+    m_generalUi->checkForUpdatesIncludeBetasCheckBox->setVisible(false);
-+    m_generalUi->checkUpdatesSpacer->changeSize(0,0, QSizePolicy::Fixed, QSizePolicy::Fixed);
-+#endif
-+
-+#ifndef WITH_XC_NETWORKING
-     m_secUi->privacy->setVisible(false);
- #endif
- 
-@@ -336,3 +343,19 @@ void ApplicationSettingsWidget::enableToolbarSettings(bool checked)
-     m_generalUi->toolButtonStyleComboBox->setEnabled(!checked);
-     m_generalUi->toolButtonStyleLabel->setEnabled(!checked);
- }
-+
-+void ApplicationSettingsWidget::rememberDatabasesToggled(bool checked)
-+{
-+    if (!checked) {
-+        m_generalUi->rememberLastKeyFilesCheckBox->setChecked(false);
-+        m_generalUi->openPreviousDatabasesOnStartupCheckBox->setChecked(false);
-+    }
-+
-+    m_generalUi->rememberLastKeyFilesCheckBox->setEnabled(checked);
-+    m_generalUi->openPreviousDatabasesOnStartupCheckBox->setEnabled(checked);
-+}
-+
-+void ApplicationSettingsWidget::checkUpdatesToggled(bool checked)
-+{
-+    m_generalUi->checkForUpdatesIncludeBetasCheckBox->setEnabled(checked);
-+}
-diff --git a/src/gui/ApplicationSettingsWidget.h b/src/gui/ApplicationSettingsWidget.h
-index ffcfea2b..86688b70 100644
---- a/src/gui/ApplicationSettingsWidget.h
-+++ b/src/gui/ApplicationSettingsWidget.h
-@@ -56,6 +56,8 @@ private slots:
-     void autoSaveToggled(bool checked);
-     void systrayToggled(bool checked);
-     void enableToolbarSettings(bool checked);
-+    void rememberDatabasesToggled(bool checked);
-+    void checkUpdatesToggled(bool checked);
- 
- private:
-     QWidget* const m_secWidget;
-diff --git a/src/gui/ApplicationSettingsWidgetGeneral.ui b/src/gui/ApplicationSettingsWidgetGeneral.ui
-index 798971bf..678b55fa 100644
---- a/src/gui/ApplicationSettingsWidgetGeneral.ui
-+++ b/src/gui/ApplicationSettingsWidgetGeneral.ui
-@@ -86,10 +86,40 @@
-           <item>
-            <widget class="QCheckBox" name="checkForUpdatesOnStartupCheckBox">
-             <property name="text">
--             <string>Check for updates at application startup</string>
-+             <string>Check for updates at application startup once per week</string>
-             </property>
-            </widget>
-           </item>
-+          <item>
-+           <layout class="QHBoxLayout" name="checkUpdatesSubLayout">
-+            <property name="spacing">
-+             <number>0</number>
-+            </property>
-+            <item>
-+             <spacer name="checkUpdatesSpacer">
-+              <property name="orientation">
-+               <enum>Qt::Horizontal</enum>
-+              </property>
-+              <property name="sizeType">
-+               <enum>QSizePolicy::Fixed</enum>
-+              </property>
-+              <property name="sizeHint" stdset="0">
-+               <size>
-+                <width>20</width>
-+                <height>20</height>
-+               </size>
-+              </property>
-+             </spacer>
-+            </item>
-+            <item>
-+             <widget class="QCheckBox" name="checkForUpdatesIncludeBetasCheckBox">
-+              <property name="text">
-+               <string>Include beta releases when checking for updates</string>
-+              </property>
-+             </widget>
-+            </item>
-+           </layout>
-+          </item>
-          </layout>
-         </widget>
-        </item>
-@@ -186,13 +216,6 @@
-           <string>General</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_7">
--          <item>
--           <widget class="QCheckBox" name="checkForUpdatesIncludeBetasCheckBox">
--            <property name="text">
--             <string>Include pre-releases when checking for updates</string>
--            </property>
--           </widget>
--          </item>
-           <item>
-            <widget class="QCheckBox" name="toolbarHideCheckBox">
-             <property name="text">
-diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
-index 6e3c96af..6776a59d 100644
---- a/src/gui/MainWindow.cpp
-+++ b/src/gui/MainWindow.cpp
-@@ -41,7 +41,7 @@
- #include "keys/FileKey.h"
- #include "keys/PasswordKey.h"
- 
--#ifdef WITH_XC_NETWORKING
-+#ifdef WITH_XC_UPDATECHECK
- #include "gui/MessageBox.h"
- #include "gui/UpdateCheckDialog.h"
- #include "updatecheck/UpdateChecker.h"
-@@ -372,12 +372,12 @@ MainWindow::MainWindow()
-     setUnifiedTitleAndToolBarOnMac(true);
- #endif
- 
--#ifdef WITH_XC_NETWORKING
-+#ifdef WITH_XC_UPDATECHECK
-     connect(m_ui->actionCheckForUpdates, SIGNAL(triggered()), SLOT(showUpdateCheckDialog()));
-     connect(UpdateChecker::instance(),
-             SIGNAL(updateCheckFinished(bool, QString, bool)),
-             SLOT(hasUpdateAvailable(bool, QString, bool)));
--    QTimer::singleShot(3000, this, SLOT(showUpdateCheckStartup()));
-+    QTimer::singleShot(500, this, SLOT(showUpdateCheckStartup()));
- #else
-     m_ui->actionCheckForUpdates->setVisible(false);
- #endif
-@@ -687,7 +687,7 @@ void MainWindow::showAboutDialog()
- 
- void MainWindow::showUpdateCheckStartup()
- {
--#ifdef WITH_XC_NETWORKING
-+#ifdef WITH_XC_UPDATECHECK
-     if (!config()->get("UpdateCheckMessageShown", false).toBool()) {
-         auto result =
-             MessageBox::question(this,
-@@ -710,7 +710,7 @@ void MainWindow::showUpdateCheckStartup()
- 
- void MainWindow::hasUpdateAvailable(bool hasUpdate, const QString& version, bool isManuallyRequested)
- {
--#ifdef WITH_XC_NETWORKING
-+#ifdef WITH_XC_UPDATECHECK
-     if (hasUpdate && !isManuallyRequested) {
-         auto* updateCheckDialog = new UpdateCheckDialog(this);
-         updateCheckDialog->showUpdateCheckResponse(hasUpdate, version);
-@@ -725,7 +725,7 @@ void MainWindow::hasUpdateAvailable(bool hasUpdate, const QString& version, bool
- 
- void MainWindow::showUpdateCheckDialog()
- {
--#ifdef WITH_XC_NETWORKING
-+#ifdef WITH_XC_UPDATECHECK
-     updateCheck()->checkForUpdates(true);
-     auto* updateCheckDialog = new UpdateCheckDialog(this);
-     updateCheckDialog->show();
-diff --git a/src/updatecheck/UpdateChecker.cpp b/src/updatecheck/UpdateChecker.cpp
-index 4272410b..14531290 100644
---- a/src/updatecheck/UpdateChecker.cpp
-+++ b/src/updatecheck/UpdateChecker.cpp
-@@ -17,6 +17,7 @@
- 
- #include "UpdateChecker.h"
- #include "config-keepassx.h"
-+#include "core/Clock.h"
- #include "core/Config.h"
- #include <QJsonObject>
- #include <QNetworkAccessManager>
-@@ -38,24 +39,28 @@ UpdateChecker::~UpdateChecker()
- 
- void UpdateChecker::checkForUpdates(bool manuallyRequested)
- {
-+    auto nextCheck = config()->get("GUI/CheckForUpdatesNextCheck", 0).toULongLong();
-     m_isManuallyRequested = manuallyRequested;
--    m_bytesReceived.clear();
- 
--    QString apiUrlStr = QString("https://api.github.com/repos/keepassxreboot/keepassxc/releases");
-+    if (m_isManuallyRequested || Clock::currentSecondsSinceEpoch() >= nextCheck) {
-+        m_bytesReceived.clear();
- 
--    if (!config()->get("GUI/CheckForUpdatesIncludeBetas", false).toBool()) {
--        apiUrlStr += "/latest";
--    }
-+        QString apiUrlStr = QString("https://api.github.com/repos/keepassxreboot/keepassxc/releases");
-+
-+        if (!config()->get("GUI/CheckForUpdatesIncludeBetas", false).toBool()) {
-+            apiUrlStr += "/latest";
-+        }
- 
--    QUrl apiUrl = QUrl(apiUrlStr);
-+        QUrl apiUrl = QUrl(apiUrlStr);
- 
--    QNetworkRequest request(apiUrl);
--    request.setRawHeader("Accept", "application/json");
-+        QNetworkRequest request(apiUrl);
-+        request.setRawHeader("Accept", "application/json");
- 
--    m_reply = m_netMgr->get(request);
-+        m_reply = m_netMgr->get(request);
- 
--    connect(m_reply, &QNetworkReply::finished, this, &UpdateChecker::fetchFinished);
--    connect(m_reply, &QIODevice::readyRead, this, &UpdateChecker::fetchReadyRead);
-+        connect(m_reply, &QNetworkReply::finished, this, &UpdateChecker::fetchFinished);
-+        connect(m_reply, &QIODevice::readyRead, this, &UpdateChecker::fetchReadyRead);
-+    }
- }
- 
- void UpdateChecker::fetchReadyRead()
-@@ -84,8 +89,12 @@ void UpdateChecker::fetchFinished()
- 
-         if (!jsonObject.value("tag_name").isUndefined()) {
-             version = jsonObject.value("tag_name").toString();
--            hasNewVersion = compareVersions(version, QString(KEEPASSXC_VERSION));
-+            hasNewVersion = compareVersions(QString(KEEPASSXC_VERSION), version);
-         }
-+
-+        // Check again in 7 days
-+        // TODO: change to toSecsSinceEpoch() when min Qt >= 5.8
-+        config()->set("GUI/CheckForUpdatesNextCheck", Clock::currentDateTime().addDays(7).toTime_t());
-     } else {
-         version = "error";
-     }
-@@ -93,38 +102,46 @@ void UpdateChecker::fetchFinished()
-     emit updateCheckFinished(hasNewVersion, version, m_isManuallyRequested);
- }
- 
--bool UpdateChecker::compareVersions(const QString& remoteVersion, const QString& localVersion)
-+bool UpdateChecker::compareVersions(const QString& localVersion, const QString& remoteVersion)
- {
-+    // Quick full-string equivalence check
-     if (localVersion == remoteVersion) {
--        return false; // Currently using updated version
-+        return false;
-     }
- 
--    QRegularExpression verRegex("^(\\d+(\\.\\d+){0,2})(-\\w+)?$", QRegularExpression::CaseInsensitiveOption);
-+    QRegularExpression verRegex(R"(^((?:\d+\.){2}\d+)(?:-(\w+?)(\d+)?)?$)");
- 
--    QRegularExpressionMatch lmatch = verRegex.match(localVersion);
--    QRegularExpressionMatch rmatch = verRegex.match(remoteVersion);
-+    auto lmatch = verRegex.match(localVersion);
-+    auto rmatch = verRegex.match(remoteVersion);
- 
--    if (!lmatch.captured(1).isNull() && !rmatch.captured(1).isNull()) {
--        if (lmatch.captured(1) == rmatch.captured(1) && !lmatch.captured(3).isNull()) {
--            // Same version, but installed version has snapshot/beta suffix and should be updated to stable
--            return true;
--        }
-+    auto lVersion = lmatch.captured(1).split(".");
-+    auto lSuffix = lmatch.captured(2);
-+    auto lBetaNum = lmatch.captured(3);
- 
--        QStringList lparts = lmatch.captured(1).split(".");
--        QStringList rparts = rmatch.captured(1).split(".");
-+    auto rVersion = rmatch.captured(1).split(".");
-+    auto rSuffix = rmatch.captured(2);
-+    auto rBetaNum = rmatch.captured(3);
- 
--        if (lparts.length() < 3)
--            lparts << "0";
-+    if (!lVersion.isEmpty() && !rVersion.isEmpty()) {
-+        if (lSuffix.compare("snapshot", Qt::CaseInsensitive) == 0) {
-+            // Snapshots are not checked for version updates
-+            return false;
-+        }
- 
--        if (rparts.length() < 3)
--            rparts << "0";
-+        // Check "-beta[X]" versions
-+        if (lVersion == rVersion && !lSuffix.isEmpty()) {
-+            // Check if stable version has been released or new beta is available
-+            // otherwise the version numbers are equal
-+            return rSuffix.isEmpty() || lBetaNum.toInt() < rBetaNum.toInt();
-+        }
- 
-         for (int i = 0; i < 3; i++) {
--            int l = lparts[i].toInt();
--            int r = rparts[i].toInt();
-+            int l = lVersion[i].toInt();
-+            int r = rVersion[i].toInt();
- 
--            if (l == r)
-+            if (l == r) {
-                 continue;
-+            }
- 
-             if (l > r) {
-                 return false; // Installed version is newer than release
-diff --git a/src/updatecheck/UpdateChecker.h b/src/updatecheck/UpdateChecker.h
-index ac6471d6..64430bda 100644
---- a/src/updatecheck/UpdateChecker.h
-+++ b/src/updatecheck/UpdateChecker.h
-@@ -31,7 +31,7 @@ public:
-     ~UpdateChecker() override;
- 
-     void checkForUpdates(bool manuallyRequested);
--    static bool compareVersions(const QString& remoteVersion, const QString& localVersion);
-+    static bool compareVersions(const QString& localVersion, const QString& remoteVersion);
-     static UpdateChecker* instance();
- 
- signals:
-diff --git a/tests/TestUpdateCheck.cpp b/tests/TestUpdateCheck.cpp
-index 8cba43b1..ff709cd5 100644
---- a/tests/TestUpdateCheck.cpp
-+++ b/tests/TestUpdateCheck.cpp
-@@ -29,13 +29,32 @@ void TestUpdateCheck::initTestCase()
- 
- void TestUpdateCheck::testCompareVersion()
- {
--    // Remote Version , Installed Version
--    QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("2.3.4")), true);
--    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.4.0")), false);
-+    // No upgrade
-     QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0")), false);
--    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0-beta1")), true);
--    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta2"), QString("2.3.0-beta1")), true);
--    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4"), QString("2.4.0-snapshot")), false);
--    QCOMPARE(UpdateChecker::compareVersions(QString("invalid"), QString("2.4.0")), false);
--    QCOMPARE(UpdateChecker::compareVersions(QString(""), QString("2.4.0")), false);
-+
-+    // First digit upgrade
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("3.0.0")), true);
-+    QCOMPARE(UpdateChecker::compareVersions(QString("3.0.0"), QString("2.4.0")), false);
-+
-+    // Second digit upgrade
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4"), QString("2.4.0")), true);
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("2.3.4")), false);
-+
-+    // Third digit upgrade
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.1")), true);
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.1"), QString("2.3.0")), false);
-+
-+    // Beta builds
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0-beta1")), false);
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.1-beta1")), true);
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0")), true);
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta"), QString("2.3.0-beta1")), true);
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0-beta")), false);
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0-beta2")), true);
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta2"), QString("2.3.0-beta1")), false);
-+
-+    // Snapshot and invalid data
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4-snapshot"), QString("2.4.0")), false);
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("invalid")), false);
-+    QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("")), false);
- }
--- 
-2.21.0
-
diff --git a/app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild b/app-admin/keepassxc/keepassxc-2.4.2.ebuild
index 1b2e89238032..25ad8b2b55b0 100644
--- a/app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.2.ebuild
@@ -24,11 +24,12 @@ 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/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -36,7 +37,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 +45,7 @@ RDEPEND="
 		x11-libs/libXtst
 	)
 	browser? ( >=dev-libs/libsodium-1.0.12 )
+	keeshare? ( dev-libs/quazip )
 	yubikey? ( sys-auth/ykpers )
 "
 
@@ -59,12 +61,6 @@ PDEPEND="
 	x11-misc/xsel
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-dont_call_mandb.patch"
-	"${FILESDIR}/${P}-build_fix.patch"
-	"${FILESDIR}/${P}-update_checker_toggle.patch"
-)
-
 src_prepare() {
 	 use test || \
 		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
@@ -78,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 933ad9b9a58f..25ad8b2b55b0 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -29,6 +29,7 @@ IUSE="autotype browser debug keeshare +network test yubikey"
 RDEPEND="
 	app-crypt/argon2:=
 	dev-libs/libgcrypt:=
+	>=dev-libs/libsodium-1.0.12:=
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index be7b61a55285..c166d577eef4 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -2,12 +2,14 @@ DIST mongo-tools-3.4.16.tar.gz 4697191 BLAKE2B 2e9a0e7dc8016d3e7d7c7f8d0cf80a97d
 DIST mongo-tools-3.6.11.tar.gz 4731680 BLAKE2B 88558a26d2552848121d984e4b963acafe9e56b37a3d393bacdcd8c0f71a29e2082845ad6d648c3c4800bd47514d339d1f1e984e339a48572ecb5f6f31d9166d SHA512 2291cb963965a59a89bac35a760ce49b4b835d1447065d558c4b254aae5fe38f7ebe4c9d7a67aa475e06be95c45f8529922c6fb0b78d41bc07d1a83f3a564192
 DIST mongo-tools-3.6.12.tar.gz 4990846 BLAKE2B a2b649df03ba17175d95b0fb7be94e446a0cda8dd45111a41f6f74ee5498b853d9fd361f683d4db558197a1951fc79056b516cff6fcd32cc32877744456b67e3 SHA512 948e49719c958e8b7cd1c27b9d413df6d032189801180540ee86b927d5dd53ab4b8906e5cc7880163ecc6abf11daebfc2fb96fcf8fcfd3e0b1f8c8fedaf54558
 DIST mongo-tools-3.6.8.tar.gz 4723878 BLAKE2B a1693024d60f69d25c268eaaa30a478b1e4c0042c5fb7a3fd6252ed00aef2fee3fba94516fe825165a1a57887ed38e4fbce488c48ddd4f45349f0b7a1b244020 SHA512 359e8ce2d847d005d48ff12bc2e8af73213d81cd1521d2b5b5ac94792468218248bebbe808e1bd8fd49234eab8480608f294c1b63f317aed58f456b84ef17dcf
+DIST mongo-tools-4.0.10.tar.gz 11134721 BLAKE2B f25e834622db8a2cea1658d9396b747666dee6a0e6471f5fcf351431f716735227b19f854c228ebb9ace8a7c27b8cdf83f8a5009107191aa6dd27c1a4c037505 SHA512 12764b2e2016ae3ab3f0ed1f5b9be9ce10e466c53b408ad2c01b26bdf39ca41a358acd07aea5847db2b40e3e89293f77efcd2b310e4e2bf3071873abf1b20f49
 DIST mongo-tools-4.0.6.tar.gz 10879606 BLAKE2B 9a7656ba1486df4b36ceb527735ad46864d7a04f2d0451fb4e04bbbdc09c3bb0ec922aa5daa584b93e123e1c3764c0ebef96a3566dd0d6b646a627d769645619 SHA512 d6185d7442a593d29db78889c55aba53e070bedd522d78d8c0bf52bb27f26c5fee6d010457f65774ea36a2e6d5280f38c95433ff76ed53ed9d74b1c811198cb7
 DIST mongo-tools-4.0.9.tar.gz 11134365 BLAKE2B ad27ad868b33a3c0802a0c79b5570a85c20106c71f38229e25a09a4ab8f0e6edbfe4338ce9862b2ba6b7836e4aa71fe5a3704a81a028a95d74168ac5107364d7 SHA512 55720766da5fdb9ee5a93d90be5ebe61ec4a5f5428097e9d6cb022472a2964c39b184531e1f59fb7780e834c3b03986e9edcc66e3f3933b3457b86260a6bbd8f
-EBUILD mongo-tools-3.4.16.ebuild 1195 BLAKE2B 6e650a085da6e60e7f268e074ac45373a3a9948e4b69d88ece630697c48f8e85e856cbc324dc342097c9c5c7cd903c12dbee415c3fd8582b3acf205eb4301ed6 SHA512 fc8709a1d3ab755e61bbd01db2ade678082aca0c97715dd882ebb09a2ad8bfea8ec7f21ec0572863fec70d34346dfcc47ec8ab47725c910d92715ab74cf5cd62
+EBUILD mongo-tools-3.4.16.ebuild 1192 BLAKE2B 8450719129b5555070d0e3f3192b3897a6fa11cc8af2774bfbf10e388c3e1c29fcc6a1ff60342d453f7163491022879826522a370714cf8223c9d2897252ac9c SHA512 71e06ae1e883ac8c7b0b5c569ca25fa35560bdbf24d5faac4c6fb3834b4aaea0b33e84747698a93b0d1fe090d45a13b527a31209cd6b5aa134bab9f3c7018936
 EBUILD mongo-tools-3.6.11.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-3.6.12.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-3.6.8.ebuild 1345 BLAKE2B 1baf6f2c407b2a4d1e81a6a04444b9c43ef74e6abd7e68c08c4ef1e0540b8dcb6c54c83a58b4687d2aa20f3fbbfd88b793e20058adaecb8e53b13e76a328ee54 SHA512 2286b4f40c01231648535b0f050e1ce36f5fdd654acd83389b35604d41e92bd584dec654b5368a7ee4e6ff7d420b19faeadc1c1c7f252093f365e23efb6604eb
+EBUILD mongo-tools-4.0.10.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-4.0.6.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-4.0.9.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-3.4.16.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.16.ebuild
index 5efc22cf1e80..d2a369f77e33 100644
--- a/app-admin/mongo-tools/mongo-tools-3.4.16.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.4.16.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
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.10.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.10.ebuild
new file mode 100644
index 000000000000..092d770686fb
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.0.10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# allow building with go 1.12 #678924
+	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index f3bf752b8741..a6c0594c5a81 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 12571 BLAKE2B 0d892e66f94d73b20c0addb444edd904d6961cd7918adcc024f813776d766775fad7c0a288df2656f1cee14387d33949bf1c85cb86f85158b1a700393aa3396e SHA512 2826e3eeff416a5673f8810673097a524ea34718af98d934a8eac7a3417167d167ea880bc3ec1ff0b984ab6d95bf3344566d557978c0cd04052d177ca55992f0
+EBUILD rsyslog-8.1904.0.ebuild 12570 BLAKE2B 5813e929ca8ef0a6c9ecff1d5a1dc1c0a06e33a4e4ff79398c02186afb3ef333c3cad85faa9ad5d99a326cece3fa5f4ef12da4a7b9a600ed4a047e6c9857269d SHA512 07cbf79f3c9a95a56925b1eb6d79298c60c23a7d53452af8e3966ea04a8aeb2afff4c1c481dd01175695539235e6fd1b87723d4c5fb31714a43ad2c04be0d65c
 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 1161ca1f6d61..0890770de3e5 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/sysstat/Manifest b/app-admin/sysstat/Manifest
index e37b52460855..de23eb61fa31 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 1695 BLAKE2B c62a67fd51aa3094d9ccd9967214740fb44e103f28700c585744c5b92461022626bdff0799f7327057fb173077605cac87b4881d393e0a1afb130ae9a2294886 SHA512 e62834ec2a72ba996f7cc9093538abbc614272508e0ed92a319cc5c3b7df02e8707ef1f222d8d42ee74cf74803fd7655d3f631dfcff831888a1848d1138cd914
+EBUILD sysstat-12.0.5.ebuild 1690 BLAKE2B 0b82330f9db7a1d41cf1f93f38285088305ba66a52e9ac9ee8d2957ccdebbb515bbf22ee0b9a7a73c26e9dff427bd584f0f5ea389b490f6e7ee3ace7b04857ad SHA512 a7c37ed6fe02db92958ccb7441451b2565940103ac80b50536fc27135f6cb110f9b263b9ce389aa4e80cdc53ba48c4b523247cd957d6a759ac0fc4196b794575
 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 0b5b3cac3c98..f01251fb60e7 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="