gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /app-admin
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
59 files changed, 488 insertions, 323 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e13be50ae17d..8c5bf9b6b2d5 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index baaa17b89c69..f86415be6250 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,5 +1,5 @@
 DIST ansible-base-2.10.2.tar.gz 6023200 BLAKE2B 80abfa3fab56d3f997cbe90b557ffd5004b216709d6ba2c6d50ea0fb7a2e5a2ad49ce83bfc7a17054582e786f53ce29814d8b5a3fc2408a1e729b1647619080c SHA512 2ee60303841e88d3451ddbcc4c18473d3a37253873406b0783816b1bbf9d8404599ebed12bac7c7f32693314048668b84f3a1c593621c7b8c37a7b48687c769b
 DIST ansible-base-2.10.3.tar.gz 5836841 BLAKE2B 000ee1e369beb450a9a58680030fc7605f62020a28f0ec4634569be0b12ca54c79d0c36a6022895f93b6f8449b8f8483e07590eeea233383490600bbce600aff SHA512 4da2c79c7d990bbe07e136447643484d947e512693194017623deadd88d6556dac67865069182059ae2daf82a13876600dc5472712d6ab6e0556cb829fce3b5b
-EBUILD ansible-base-2.10.2.ebuild 1943 BLAKE2B 30d354d1f5dbd1d9245552b7a992d88f3184655344f29b13f5dd8f2ccc3c838ff4c715a5cc0c72d9b7932a72075b0f769a7c759b248e60dbd80a0b3f003c9216 SHA512 ebdf8075dbf9abd8006b9a2dcf6f8417a2b9fb596ca3e79fe4a1c60e2f80cff1f8192080b0b492dd43c36366c78b9405759834cb0ce5ed213e10682355d6e050
-EBUILD ansible-base-2.10.3.ebuild 1946 BLAKE2B a6027d8b698968a9096acfac7f206704f9ab46a187e5df8c982469e4afa522d2de9e634ebf3d44de3739bdecef79bb86f053c968bbd244b9e67316cbcd42e731 SHA512 70bfc7aee70fb3dbe70b393fb16bddab0e9d7b809671e3e31b9f9e931f0d6649c069c66f1272392b160274b77adcc29083118f8c202debc98b34f7c2926a0dc2
+EBUILD ansible-base-2.10.2.ebuild 1678 BLAKE2B e2ea250401ab8e5a12ae93e07788844ed90dcbc430137b3298c215d2efb56e1e6156d87d7fbe1c99826d0fd4d4cb087e6c1d11a1509e27fc11c582542d76e76c SHA512 e8da7dd4f6bf332a1138b4ce2f0eab40be05d4a5d5e932692877158c6e579eb4ea8e9daaac147f6dfc27c8ecf3f68604cf0429996b88f8b005294cec29b8c272
+EBUILD ansible-base-2.10.3.ebuild 1679 BLAKE2B 7a0df030842dd19e042b56cb771802b0eff897739456dcbda6fc85749b4806d9277f59fa8815618a6147c11006b574d9466386f8160d466124531ee2303dd6cb SHA512 178689c5fa8db63ea02da55fd552ede89e8b2cadad9ee0d72f9d3bf92cebb383a48f7a38ff1085c140d0c977740df5630b786f6a94c7a4b4737cddba449f23fd
 MISC metadata.xml 1266 BLAKE2B 449ac5109e0fb6b64d32185f0660ce6e8c3828a830f8516d680f47ebc25aef880ab5116103d67cfba02e04b1ad496917fbf67252b7bfc062d828e22f15b961fd SHA512 95d52b68b5b3efad6d8575741430b2d1c18a7c7b41a1374229763fea7c599f3ff2b46dee51845e20388829faa4246e5a05011e61254e91d10709457a4b822f0f
diff --git a/app-admin/ansible-base/ansible-base-2.10.2.ebuild b/app-admin/ansible-base/ansible-base-2.10.2.ebuild
index 6843d55c4702..b24b734cb988 100644
--- a/app-admin/ansible-base/ansible-base-2.10.2.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.2.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-IUSE="doc test"
+IUSE="test"
 RESTRICT="test"
+# doc removed due to https://github.com/ansible/ansible/issues/71395
 
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
@@ -36,11 +37,6 @@ DEPEND="
 	!<app-admin/ansible-2.10
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	)
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
@@ -57,21 +53,11 @@ python_compile() {
 	distutils-r1_python_compile
 }
 
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
 python_test() {
 	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
 	distutils-r1_python_install_all
-
 	dodoc -r examples
 }
diff --git a/app-admin/ansible-base/ansible-base-2.10.3.ebuild b/app-admin/ansible-base/ansible-base-2.10.3.ebuild
index c30b5bcbb879..5dbedc04ecfe 100644
--- a/app-admin/ansible-base/ansible-base-2.10.3.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.3.ebuild
@@ -13,9 +13,10 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-IUSE="doc test"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+IUSE="test"
 RESTRICT="test"
+# doc removed due to https://github.com/ansible/ansible/issues/71395
 
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
@@ -36,11 +37,6 @@ DEPEND="
 	!<app-admin/ansible-2.10
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	)
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
@@ -57,21 +53,11 @@ python_compile() {
 	distutils-r1_python_compile
 }
 
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
 python_test() {
 	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
 	distutils-r1_python_install_all
-
 	dodoc -r examples
 }
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index b2f45b93b0a2..43c69b93b4ba 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -2,5 +2,5 @@ AUX ansible-lint-4.1.0-specifierset-split-setuptools.patch 6509 BLAKE2B a2d9fe19
 DIST ansible-lint-4.0.1.tar.gz 2909257 BLAKE2B c030b6fc58eaeeec42e40dd5bc46e5181916433b905bfc4a82382bf6bba8536d2639172aab0e2928ce1dd5489f322e19ab1c0ea5abb637562616addb9733e81a SHA512 a2f3bd44287a2c72f79c5fbb4c02446484cf764d386d403694325bce172e2b195dd4812e0f89e5f4e1930db124e2b383e4f067bed5d4858c354c0ae0b3fb03e4
 DIST ansible-lint-4.1.0.tar.gz 2911091 BLAKE2B b6e414dbdeebcc1cae900736829abf2db0930e5e05ae7c2bbd6d30a89b6ac28485ddfb63528bdc3baae6ef97ae7536507632d43b16f9a16dd86887d781940aeb SHA512 c1d07093d68bf5f43c20c3a999adf26d23ba587d5008a35069dcbab514b208737f5d0ecaf032e43d313233ea06193db81b349d5fb62f3ac684af9e51d8bc6e08
 EBUILD ansible-lint-4.0.1.ebuild 986 BLAKE2B fe971f6268c3eb0052c1141d76d484956a5b609d33e497514a7930c35617b88b3c9daee9c33d46595eede2a8e3a2081864eaab96c523af57a50d2d9f4b990f11 SHA512 71915f40aaba50616ea001757093f5d1fbaed634512b0194bac4b1b7cd41214aaa9328584744968a1e053ba1470e3a0c88226c87f2856fa8148fe66114c82f64
-EBUILD ansible-lint-4.1.0.ebuild 1079 BLAKE2B f0bb03705adcc23eea2fb539e1ad5d6c6ae3f869eb978b0f1eeddabb1a285db99934e7890cd3925071fc11c3f4d8a0daf35b4afd75ef36e5d252d673f35f7c49 SHA512 96558436ac44b149299c407965b91097998853f46b6844570f51f1d161ce67ac9d94865bdb6bed5cfc92b018f4bb88d4b8041e1fcbb8e10d9010dbe47c696a91
-MISC metadata.xml 468 BLAKE2B 6c6ebea3538b994b0ed427d005d3d46fa5bf115f25ea4de3b00e9fba3eaf44831ef0b54af5ddc352ad292ac4b6bcbb859583fb34b5bb358bc03ff25d43997215 SHA512 4dd15de2b2d9caf6cfe4518e9e4fcb476838c78c20d4edbeab8d78a602969201d7bee7bce8af1406e5a7e171cb481e7a08c58db599618e66d1c681a1537dfcfc
+EBUILD ansible-lint-4.1.0.ebuild 1099 BLAKE2B 2d7fe40884595640da6df42fe15f686ce7b334b7be5ed6f18c0eac9854a402546658986c7b908fba17cbdc6c00114e7b9510c9cef0af4a444c1cbb4e62d53182 SHA512 e905665eb3022d193e6a6ea3c487ce2276da9403fa450784c8a3751320eac5e4759b636d0f771818d23ec15294c0b32a3d2ac5b55f4fd8746e953b1ebd9d655c
+MISC metadata.xml 468 BLAKE2B 9a19ffcfb424cdc3bb4bbe624636b57f2b990c39e8925ebd2b88d3b42087ab0755566a5bea902385873ab7479ae21971345f65d9b30039469757e5382e71da2d SHA512 cfaa5f72f5a621d074859821f6c11b1cc8f0c3be1bfdb09262835a8e2b3be2e55fb0e1e2eff756097e1583d11f63c5771d8c79f51d67e001f3d95f2fb4553a25
diff --git a/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild b/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild
index 46715fcb9b42..39a6d153b5de 100644
--- a/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
-HOMEPAGE="https://github.com/ansible/ansible-lint"
-SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/ansible-community/ansible-lint"
+SRC_URI="https://github.com/ansible-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/app-admin/ansible-lint/metadata.xml b/app-admin/ansible-lint/metadata.xml
index c7b18bf539b8..84931168ac35 100644
--- a/app-admin/ansible-lint/metadata.xml
+++ b/app-admin/ansible-lint/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">ansible-lint</remote-id>
-    <remote-id type="github">willthames/ansible-lint</remote-id>
-    <bugs-to>https://github.com/willthames/ansible-lint/issues</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ansible-lint</remote-id>
+		<remote-id type="github">ansible-community/ansible-lint</remote-id>
+		<bugs-to>https://github.com/ansible-community/ansible-lint/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index b3d3d1a1d5ca..9206e9df00d6 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -2,6 +2,6 @@ AUX ansible-2.10.0-CVE-2020-25635-6.patch 2961 BLAKE2B bd023424bb075a743881056d6
 DIST ansible-2.10.0.tar.gz 25454980 BLAKE2B 91f930518b90b36aa2c21f553092233059fada86fd1674c9c6e881484b1bd4e68a3eaa05d82e15115906e55da99c43394c3de36a898e26bb222f780b82f8a5bd SHA512 878036f06e1705e4392223bda210b2acae0232069d0cec02a47f13f6b3bc6c9538fb515a2d2dc6003695bcf0915fdd3dfc5b8dc59355e37e2ca8fa48bbd79657
 DIST ansible-2.10.1.tar.gz 25851704 BLAKE2B f9f42ab9f7864a48f0d960b4e8149dfba3ece6c4b01c08db59f9ba5fbcd39771c7b315bf7c9853641d15c2bb6319c9b9ebc791440fc8933780895024c9b74c12 SHA512 46bbbfb22e5c3715df0069d420b174877dffd59f91613779e7057648d15751d528a9cb57357709d0c04a507a60e20c87b109ba1904e1f313441cf5832ba93b5e
 EBUILD ansible-2.10.0-r2.ebuild 1985 BLAKE2B 30885a55981450ae698183239f9659e770e5afafb774722dc4dfeb48789c3b4e8985f39e917ff497911f84363dceaf1bdf7c2d45537c8f6e3bf21e57fc88a67e SHA512 e48e28eaf5ee8bfa2e54e3245b448105e6687cca172ba1f3fba5b68b2c165a16045d94f5794b936426658bdc53883342aaf7fc7a4eb4bb7ef7b3bb8bc0e014b9
-EBUILD ansible-2.10.1.ebuild 1923 BLAKE2B 63317a87180642d280eabbb19f5858b3d45a87b6aa503ff2f86bfb0d04accbbf2269ad6ede57b6617d3e7252844f0839e487f06c87abe5062eed2be02cdbe0ae SHA512 57478bab16bb0432ef913f8402ac239b7882d47d7c1e4c0c01c01607c35b0604d1c0f9eabb816f0fd3164373fe7bb3dab020c5876515ea100c135ed2e6de19cb
+EBUILD ansible-2.10.1.ebuild 1908 BLAKE2B 009631ae1683884cc6f0c7ee1de1849944e8ab6d967554fa19904a9d959dd6e63603a40ff2fb6b70b20c22211b03efb5ac65932d4aafb0e39aefff3017c4e8f3 SHA512 a53a5352f6f13e295bf93d27fba404b59ead3dfadd9d51472c22c9a6b2b3638c95961e262d55e8345de41f3ad76c2190c2bc852bbdfc57e4c1d614eaf33f7a2b
 EBUILD ansible-9999.ebuild 1937 BLAKE2B 98ab62b10f1d118b9d491639800cf12c61d89c76d7c825bee3f944baec488d7de3ac699e8e4ee024ce80b97ecc5625fdffa04c32b1a6590c3c2dd73103b9ca60 SHA512 c067bbb92042d932316ee2a26f43f974586eff96b8f5f679a8b51e4a66f2e6a7c532edc0d0bf996bf665a875c7af61e29d6fb5ac1b4ac10896140e77004778c8
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.10.1.ebuild b/app-admin/ansible/ansible-2.10.1.ebuild
index 3bfcb1fab2c6..e14d7dc95522 100644
--- a/app-admin/ansible/ansible-2.10.1.ebuild
+++ b/app-admin/ansible/ansible-2.10.1.ebuild
@@ -15,10 +15,9 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
-	KEYWORDS=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest
index 0c07355752f3..c8ab88f155a6 100644
--- a/app-admin/bitwarden-desktop-bin/Manifest
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@@ -1,5 +1,7 @@
 DIST Bitwarden-1.22.2-amd64.deb 47983282 BLAKE2B f84bdfb44803fc13292b4fdd8653a9217efcfea08ed58407929d3061bce436727f1ec86ff99e6b968de17510ddb0aaeb2781beaae198661d30496050db90cf3f SHA512 131e49ef2dc74b601e31eb6a07da92ae43747c4fdf4729b84fb35f95c4bc38731e6b6f9185b919ede5c7c2cd4813dbddaea172d1287cd60f747b3032e12c09e9
 DIST Bitwarden-1.23.0-amd64.deb 47990216 BLAKE2B 7383c4b2b4b0c60bc78abdbb333846ed12d00025d90a6b2c49c177ffe53046652c4e8e4738a6d25495e087c38835ae03131a2f332cf9afaa0c00a613ea5e1349 SHA512 f23f8ba987308a2753fa8fc9450f01abcc49f2917d9a9f5feb64540ba0640630cd757a88d8aa3caad2a5f5383f8fdaac7845f59b33966dcc8ac6fec3cc3618c7
+DIST Bitwarden-1.23.1-amd64.deb 47997540 BLAKE2B 2022611fa0c2a55acb39205e726e3f72ab6e32af396161a739a116943baad4d2a8762c6bb955d1db6af6ed59411c01d2d7f0ba568fa4a655514caa87947122bc SHA512 fa92023e0177bb31bc2db1fa88b9dac4e1642614191d4328be536c1351855f2ab2bb14798b151c0ec33e0d37d436fbb667bef677f1c22bda117586ef9124c386
 EBUILD bitwarden-desktop-bin-1.22.2.ebuild 1464 BLAKE2B 0521f369c01aca63eb2c1115daba08af89e556ba02fef56eef527be668d980ef12513e755493056a3563ede87393118e8890d13820707d7ca6364a66e1d17c85 SHA512 245c57f1026a8d3e863cf4c61c1f9d1b0b466f82285c964e29d8e4ce37643fd65d14f72c03ecf2c2d21795008d290acf391f35612038b70479e38ba7d8f052b6
 EBUILD bitwarden-desktop-bin-1.23.0.ebuild 1485 BLAKE2B dc6de23e0c4138771e6c17d509b36041f1d780179003dabdd3034981ce869aa84e7bb3137464468a0a26b8619045273a8babbc36034a55978686fe287cb4c752 SHA512 a6fdc2dbefba14548cc9582e7c0848b22ec9bed551457bf4bc2950c498410cbfde31f18e144db975fe78641744a95af5a029f2e945266a8672e79d9caaa374c8
+EBUILD bitwarden-desktop-bin-1.23.1.ebuild 1485 BLAKE2B dc6de23e0c4138771e6c17d509b36041f1d780179003dabdd3034981ce869aa84e7bb3137464468a0a26b8619045273a8babbc36034a55978686fe287cb4c752 SHA512 a6fdc2dbefba14548cc9582e7c0848b22ec9bed551457bf4bc2950c498410cbfde31f18e144db975fe78641744a95af5a029f2e945266a8672e79d9caaa374c8
 MISC metadata.xml 303 BLAKE2B d92d9a59d759d67d5c87577ad1b8255f016f1228044100ba18d6ec73a7ca054ca0403399d677f2470a782721e7179d693860eb2c52a35cace59e58348d38df93 SHA512 81073a2078b481982c3beffcb76a84e19521e4bc6255095848e5479fc13c5a60b8a0d861156b02ff26c80529111dade666758e22a341ba8a31f9a89304a215c1
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.23.1.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.23.1.ebuild
new file mode 100644
index 000000000000..c7f2fc77d073
--- /dev/null
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.23.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker xdg-utils
+
+MY_PN="Bitwarden"
+DESCRIPTION="Bitwarden password manager desktop client"
+HOMEPAGE="https://bitwarden.com/"
+SRC_URI="https://github.com/bitwarden/desktop/releases/download/v${PV}/Bitwarden-${PV}-amd64.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-crypt/libsecret
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/Bitwarden/*.so
+	opt/Bitwarden/bitwarden
+	opt/Bitwarden/chrome-sandbox
+"
+
+src_install() {
+	insinto /opt
+	doins -r opt/${MY_PN}
+	fperms 755 /opt/Bitwarden/bitwarden
+	fperms 4755 /opt/Bitwarden/chrome-sandbox
+
+	insinto /usr/share/applications
+	doins usr/share/applications/bitwarden.desktop
+
+	insinto /usr/share/icons
+	doins -r usr/share/icons/hicolor
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 635360cc03bb..6ec2bfff3cb7 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,9 +1,4 @@
-DIST cdist-5.1.3.tar.gz 915245 BLAKE2B 5fce58f6fcbd48852e1c0c5568b72c360e74fd49b5321e2aedfdc8e48fd090cbdd7bab87a94e76d087f04f5a706bf2c7b1bebdc5a80867e26d8cc6e28afdeab3 SHA512 8330a5af80dfc07da722675ae1d402ebae4ba0aada451a02d782365d68d1d43a643609f3326f5ed793d2902838ee29071c0255c9d8a9d38c1e8a7c92a24cef46
-DIST cdist-6.0.0.tar.gz 934813 BLAKE2B 3cb18ebb3059fc9a37beb1567c691e1d34a9cde5d49081e8798b5ba86ea8da3b6c964d2c8bea7bf2f04f986b0b4a8766c8ea53ce48fb4bc024264e72efec1fcb SHA512 e846060f3020d6281d41e97b9cc33250cd1d4ae0d110a2792fc2447af110fef91199fc0382d5a1e501f487fda42f703957ff5a39cf28061338609a600290d792
-DIST cdist-6.5.4.tar.gz 898002 BLAKE2B b4565cd8112ce1bff6ac74625a5920886a708fec827f70c3a3a2df156408761badebff4e161900cd09685bfbbb4954927c9771f6516c54a510b582ebec075e76 SHA512 3f1405e1b28d7568ef3ae543d59e760b2dc1fc8004be031550ba52d3aa2d8911cef4325865fb9ed5df053ec1609a076bb31a520b100bad5811f0de9cd73f416e
-DIST cdist-6.5.6.tar.gz 950790 BLAKE2B f13927009eb8c0172ecc0d59c1eb90fccd17542beed21033f17cec0746f6a41d5f9b39103942ffadf5a45251f49d97bc10ac82ff94bd5cd05d86c48f5d4f839f SHA512 b62a62feca742be233af9602b9216408c68cc66f114d9e581619f564359ccddc23a54257f16d70105476b76f6ba19ecd8937253f01dc479f806609e11fde8741
-EBUILD cdist-5.1.3.ebuild 590 BLAKE2B c587b9ffe196b672e600f80c521138e46c838ab3c2c93165299fe58037957c93e4a9fed227705583ae877444d76b81d466827e283af24845127de848594b6308 SHA512 64de373a0834108dcdbed4ad81b6747aa14ef5c568b341ca8056c4d7eb369cabb543d02d252b5cd3c89832fc9a5b1192640072e47594ef2d9c5312e1e6d6d60d
-EBUILD cdist-6.0.0.ebuild 596 BLAKE2B fac03ebac640f9a3c0675bf239849276005d9374c144cfd342bff70bec164883dc3b7aa5c820d28abff14f0a48c7d49380cb2940758cac0b49afa0f0853db3b1 SHA512 265a2362ccd5bbbce39d85b975a0a938b15e790394ae3cbabbbe6244a9e7c65db6248205484927627bc13c6e7bbb3e54efe35c9a7c801d00c4469ead0b4547ca
-EBUILD cdist-6.5.4.ebuild 646 BLAKE2B b590d8fd0f7794c433908ded86c9b1e53007c8bdab64610d94b2d086554ccfd066e83b9b282ef7d29d6c754c8296e6d07666c7e03378aee9edc7f6c3a560e3a8 SHA512 653898d859c35fa4551d95f5d4f84431784d4e48430f4c0ff00e40e92934efa08532ffae6bb74157af19bfdbe78948de1eac4a4fb44af49c312db5fd4f62be56
-EBUILD cdist-6.5.6.ebuild 646 BLAKE2B b590d8fd0f7794c433908ded86c9b1e53007c8bdab64610d94b2d086554ccfd066e83b9b282ef7d29d6c754c8296e6d07666c7e03378aee9edc7f6c3a560e3a8 SHA512 653898d859c35fa4551d95f5d4f84431784d4e48430f4c0ff00e40e92934efa08532ffae6bb74157af19bfdbe78948de1eac4a4fb44af49c312db5fd4f62be56
+AUX cdist-6.9.2-tests.patch 993 BLAKE2B 94ee65198bce01b0aee00c7a561a85a8d72f6fc768cee44bda91a2ffb7072862c459d735e6e9e3efecef3fe214f5f737effbef039172e1319a867dcd6981bc08 SHA512 e95906c1fcd43caee028a431340600e4ae53149974549cdc0e6de6d9a6b20780478271b9e2414c315eafe3e6afb6d20ae35da24beefe22bd90f6b30e51cc6f7a
+DIST cdist-6.9.2.tar.gz 1358442 BLAKE2B c734e25e4ce32fcc1f8aef105d56e12a11906a9a031ce399d48a5f3c62ef05153e8fad231e8e2316fc860b66a10bc29a9ee42077947b00acc8ea7010ff41a0fe SHA512 7ff8274b1ac5fd4abac691991ab89613e39fd4170bd7580c1519b9a5ea7dac9ab933fd00a5b72306cc5c2307f4d24745cdd77ec9c21c02b3595796b8639019b1
+EBUILD cdist-6.9.2.ebuild 760 BLAKE2B afa9cafc2ebd481849b8191f259c4182ac4d66f807ebf310db83cfb601405ca757810dc3e4027d03d14cb855b973035d4101515c074d2dcf4de90b9f756440b6 SHA512 0a78d3b1d17e572e857f8b08731ff2fe7c40a89c185ceeb240cbe4e5848f46c4fa97a6dfcb169b3944c83aa943e2ace6edbf64adb23a834beea7d80babfc475a
 MISC metadata.xml 240 BLAKE2B 1dc43622dbc22a70ccbdccd82d2fa3c54b7bb985e0ab124812aac7a453546a46ffa6bf205b4b8e72e014cad9ee017dfec3c4430881277b3463367418bf4f76db SHA512 bedaadadb9b7d70f72dde98c058a74300749effe632f00af0f693a9bf826076d02773cc39bb5b3b813fd2ed24cedfaf3cecfb8cac81ea561d288286840cf1f1c
diff --git a/app-admin/cdist/cdist-5.1.3.ebuild b/app-admin/cdist/cdist-5.1.3.ebuild
deleted file mode 100644
index bb88eabb6012..000000000000
--- a/app-admin/cdist/cdist-5.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A usable configuration management system"
-HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
-	distutils-r1_python_install_all
-
-	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
-}
diff --git a/app-admin/cdist/cdist-6.0.0.ebuild b/app-admin/cdist/cdist-6.0.0.ebuild
deleted file mode 100644
index d88a8c2d5ebe..000000000000
--- a/app-admin/cdist/cdist-6.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A usable configuration management system"
-HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
-	distutils-r1_python_install_all
-
-	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
-}
diff --git a/app-admin/cdist/cdist-6.5.4.ebuild b/app-admin/cdist/cdist-6.5.4.ebuild
deleted file mode 100644
index ed4bd09b8c98..000000000000
--- a/app-admin/cdist/cdist-6.5.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="A usable configuration management system"
-HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
-	distutils-r1_python_install_all
-
-	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
-}
diff --git a/app-admin/cdist/cdist-6.5.6.ebuild b/app-admin/cdist/cdist-6.5.6.ebuild
deleted file mode 100644
index ed4bd09b8c98..000000000000
--- a/app-admin/cdist/cdist-6.5.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="A usable configuration management system"
-HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
-	distutils-r1_python_install_all
-
-	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
-}
diff --git a/app-admin/cdist/cdist-6.9.2.ebuild b/app-admin/cdist/cdist-6.9.2.ebuild
new file mode 100644
index 000000000000..7b119c0cb7b3
--- /dev/null
+++ b/app-admin/cdist/cdist-6.9.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="A usable configuration management system"
+HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist"
+SRC_URI="https://code.ungleich.ch/ungleich-public/cdist/-/archive/${PV}/cdist-${PV}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_sphinx docs/src dev-python/sphinx_rtd_theme
+distutils_enable_tests unittest
+
+# only required for py3.6 compatibility
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+python_prepare_all() {
+	echo "VERSION='${PV}'" > cdist/version.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/app-admin/cdist/files/cdist-6.9.2-tests.patch b/app-admin/cdist/files/cdist-6.9.2-tests.patch
new file mode 100644
index 000000000000..df99b74d9b81
--- /dev/null
+++ b/app-admin/cdist/files/cdist-6.9.2-tests.patch
@@ -0,0 +1,44 @@
+--- a/cdist/preos.py
++++ b/cdist/preos.py
+@@ -7,7 +7,7 @@ import cdist
+ import logging
+ import cdist.argparse
+ import cdist.configuration
+-import cdist.exec.util as util
++from cdist.exec import util
+ 
+
+ _PREOS_CALL = "commandline"
+--- a/cdist/exec/local.py
++++ b/cdist/exec/local.py
+@@ -34,7 +34,7 @@ import datetime
+ import cdist
+ import cdist.message
+ from cdist import core
+-import cdist.exec.util as util
++from cdist.exec import util
+ 
+ CONF_SUBDIRS_LINKED = ["explorer", "files", "manifest", "type", ]
+ 
+--- a/cdist/exec/remote.py
++++ b/cdist/exec/remote.py
+@@ -27,7 +27,7 @@ import logging
+ import multiprocessing
+ 
+ import cdist
+-import cdist.exec.util as util
++from cdist.exec import util
+ import cdist.util.ipaddr as ipaddr
+ from cdist.mputil import mp_pool_run
+ 
+--- a/cdist/info.py
++++ b/cdist/info.py
+@@ -22,7 +22,7 @@
+ import cdist
+ import cdist.configuration
+ import cdist.core
+-import cdist.exec.util as util
++from cdist.exec import util
+ import os
+ import glob
+ import fnmatch
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index 295e78838889..2316fdd0f838 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -4,6 +4,6 @@ AUX clsync.initd 555 BLAKE2B 18b3f0e1e8e079eb306709d2b55b99100ce3efa852f285d7ac9
 DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322 SHA512 cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd
 DIST clsync-0.4.5.tar.gz 276096 BLAKE2B 4fa534b342a806ca691f8a65455cb800800f7a943fa3f0913a26c37d2cd0f9d762630ad01eeb80bdd0d90a0731bed5f2aa60444a654972da9479c116e0e937aa SHA512 6568f3c49ac4fe11e54593ba23eed392d0b7d9b5bf052983c4a5a2befbb807dbd3f9d13412264f8909998702f869d1cd6db77d89bd9491414b1f3213437c5212
 EBUILD clsync-0.4.4.ebuild 2832 BLAKE2B b741cb0c391ae3bf8599d7013cd1a9f0a3680e61474312701775c2a3ef9c998cf547c83311d2d47ea377279aefdec794def5fcdb0d29aac04442da772871fe97 SHA512 239f53bda723da6e72852ef46fba96a30d6c1bf71623df6248ec113ce202b981bd9980deadcc2833c9a3796d16dce2d3f02947d1f07b16d6386d453f2e5b6f34
-EBUILD clsync-0.4.5.ebuild 3787 BLAKE2B bdbe927f14f77f9ce3a456543226dd60ec5ee77fe995b215453f45efeec59a51a69632466c3fe2150884d1a1a13d4bd31ed3f28c77ae92a4c3c70d5297a29322 SHA512 4c8be692a96362156fbb863cb27ca8ea932bfd8a9a46db27c186b8cf5f178d11171718559d0e8719f1f300a87db11a62602db54652fbb4c6995d047e5d985ee3
+EBUILD clsync-0.4.5.ebuild 3789 BLAKE2B 1970640b5658cd7d04bdb158d72b048cd1d14270fbae0b3c9352e317d782c928bd3f75ed70cbcbad5caebe32e51e42b41a6828a206b92ba6141a0f0fcea9b32a SHA512 cc2a15f91a09e2c40a53ee84d4ea818132dfa3f16ff0329284d4bd5150fe738853803fa7da3af72c99ff8501760f26447aee0fced10b9a34496add02667e0ea9
 EBUILD clsync-9999.ebuild 3787 BLAKE2B bdbe927f14f77f9ce3a456543226dd60ec5ee77fe995b215453f45efeec59a51a69632466c3fe2150884d1a1a13d4bd31ed3f28c77ae92a4c3c70d5297a29322 SHA512 4c8be692a96362156fbb863cb27ca8ea932bfd8a9a46db27c186b8cf5f178d11171718559d0e8719f1f300a87db11a62602db54652fbb4c6995d047e5d985ee3
 MISC metadata.xml 2138 BLAKE2B 95be20be2bd87c771de6f49269bfa7e54b2a10f6c0166648130198647fcc37b86dab3501c1df8f5ef211dd0ef04f60244fec80907c95e78efd9f7c6b148023bb SHA512 0a70059c2f24248056a5aade206eafb457b39f37ab559d61284941cfcd6b01ff40328049e2edacd9a8f1a8dbbb313aed4add7092629c6bdfca0c1151ab8d69ca
diff --git a/app-admin/clsync/clsync-0.4.5.ebuild b/app-admin/clsync/clsync-0.4.5.ebuild
index c17448327bb2..ba4c91c7f45d 100644
--- a/app-admin/clsync/clsync-0.4.5.ebuild
+++ b/app-admin/clsync/clsync-0.4.5.ebuild
@@ -6,10 +6,10 @@ EAPI=7
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/clsync/clsync.git"
 	inherit git-r3
-	KEYWORDS=""
+	KEYWORDS="x86"
 else
 	SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 inherit autotools linux-info systemd
diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index 1461074ab927..0db1d53b9e47 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -1,7 +1,7 @@
 AUX diamond.confd 57 BLAKE2B 8a5e3f478d3eb948e262239a9a83026e067ed67f2a4878075c8ddb7d8d356a2482da0642e673b8b3f658de6c6f30a30c830bc68af3fe2d750b998dc896525942 SHA512 51b037902394b22f957a15ad1479ebdae5ac29384f2b7a5053ea8200bad05dc9c9060cc5c6c1a931e341e99b95327e55b06aaa9a828950533265f9c96a8dff55
-AUX diamond.initd 598 BLAKE2B fc754ce2a756dfe65222f4484e8c1e49c5c8392590809e3bd3384522dc83715a95b8d76d8ec28738cae050553af636f49cf54acb180485e4fad1a7484a5da000 SHA512 cb06aeb1bf0374e9e79b46b4ace6213978c8e49939aa989dbaa50069bab7c5069eb5c1d2f663515b9904f9465ad4ddbca43d3f29e762691d666c6cca70161e50
+AUX diamond.initd 659 BLAKE2B 945ab65f07091de300082518d57f7c479a2c29800c8813494f2e45babf030bec9dc11b640378bbfa1bd2445be498f03b14e1f30f6a814401db34e0733fcc44bd SHA512 c6a9e120ab4012335d75610dac60b2ea0c9bc3f3d8244f14caa0ee7b5c50f623e330dee580285de0ce4319c554d9f9996fbe07b9e35d1a3c30a14f57ef97ecc7
 DIST python-diamond-4.0.515.20170311.tar.gz 671963 BLAKE2B 9449f2d27b48c0e24727eb2c415a5095b20199d9315ef69df92a4aa6f8f3397743f3dc6cf2d8d91f79eca309926731b6b42da170a02987a20aeccd1e0980f4ac SHA512 d18a80540018975455b839a78fd55d13d167726b92914e3dc2de1c6f27f47319962361e05961c55047ba185e11ebf57831f3ab5cff9158a50d30a2ca635d53bd
 DIST python-diamond-4.0.515.20200620.tar.gz 674623 BLAKE2B eaf290a18a79115fdc013addff5b9d5a5c5b5ce06989c7e3cb8ac5dd988f47878a893ae37a96d1f020dac1aff00ebe191bf27c3d19ac5625afd56cf79451a141 SHA512 5e43aa1bb7acbeaa80db2bbc8e956042104fa9364893b5149bcfa7bff3e00b3667a112243e7a1fad85c1fb1b0c2e2727d0f73fb6851c1959ac95c1854b0c0f76
-EBUILD diamond-4.0.515.20170311.ebuild 2930 BLAKE2B 367260bba34e5ce64c5b1070ad2daa3c9a21fa76286a4d62b7452475f7f899f3b41efd101187439767ee9782c9b679a3263141a07681ed4c857b589204623a8e SHA512 07e79c270f6c987dda3d2bb4e98ad848b46b43964118fdb6878a278f0ca6bf43a21b965ad59f2032004a16bfcca1da7f23ebf91354f552915d4565e6f4989e3b
-EBUILD diamond-4.0.515.20200620.ebuild 2395 BLAKE2B a6424ab9ac1ff2f1cd8a4c69beabbb8534d0a3ccdbc44fb9f822cb36b7af12bb6406af382d7e4eea6fae794785674dc39cfe6a12e8578f1562b7c035b5e0c20c SHA512 576d410ed4475bda3ae2dbeaa529283e08780124d5e040856418bbba8d202f23d38a1691bb22a0c5b208720e30d1736dc669459a58eb483f926b19182889232e
+EBUILD diamond-4.0.515.20170311-r1.ebuild 2930 BLAKE2B 367260bba34e5ce64c5b1070ad2daa3c9a21fa76286a4d62b7452475f7f899f3b41efd101187439767ee9782c9b679a3263141a07681ed4c857b589204623a8e SHA512 07e79c270f6c987dda3d2bb4e98ad848b46b43964118fdb6878a278f0ca6bf43a21b965ad59f2032004a16bfcca1da7f23ebf91354f552915d4565e6f4989e3b
+EBUILD diamond-4.0.515.20200620-r1.ebuild 2395 BLAKE2B a6424ab9ac1ff2f1cd8a4c69beabbb8534d0a3ccdbc44fb9f822cb36b7af12bb6406af382d7e4eea6fae794785674dc39cfe6a12e8578f1562b7c035b5e0c20c SHA512 576d410ed4475bda3ae2dbeaa529283e08780124d5e040856418bbba8d202f23d38a1691bb22a0c5b208720e30d1736dc669459a58eb483f926b19182889232e
 MISC metadata.xml 802 BLAKE2B d013e1b87c2f1d5f0f628766ed754a4ac50e9c9e710b7b2542081cd06988f7f577513a53165c54ff4d1d1de3bba92ec2089eaa15d16cbe946f7489d0345aeaaa SHA512 c455baa068661000d395e15f6952b3106cb3633f1a95395745c6a0d7cc5dbfb193d018af1341f27b250226bdc109e961bda4a612115d5805958f8e500108239a
diff --git a/app-admin/diamond/diamond-4.0.515.20170311.ebuild b/app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild
index 80dbc4734ecc..80dbc4734ecc 100644
--- a/app-admin/diamond/diamond-4.0.515.20170311.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild
diff --git a/app-admin/diamond/diamond-4.0.515.20200620.ebuild b/app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild
index 938b0d14ce90..938b0d14ce90 100644
--- a/app-admin/diamond/diamond-4.0.515.20200620.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild
diff --git a/app-admin/diamond/files/diamond.initd b/app-admin/diamond/files/diamond.initd
index a2383fd31875..f9b829488c79 100644
--- a/app-admin/diamond/files/diamond.initd
+++ b/app-admin/diamond/files/diamond.initd
@@ -16,6 +16,9 @@ stop() {
 	ebegin "Stopping ${SVCNAME}"
 	#start-stop-daemon --stop -R 80 --pidfile /run/${SVCNAME}.pid
 	# diamond doesn't kill its children, so work around that for now
-	pstree -Tp `cat /run/${SVCNAME}.pid` | grep -o '([0-9]\+)' | tr '()' ' ' | xargs kill
+	pid=$(< /run/${SVCNAME}.pid)
+	if [ -n ${pid} ] && [ ${pid} -gt 1 ] ; then
+		pstree -Tp ${pid} | grep -o '([0-9]\+)' | tr '()' ' ' | xargs kill
+	fi
 	eend $?
 }
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index 9549a0d3ff50..4db523783e7c 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -1,5 +1,5 @@
 DIST OpenDoas-6.0.tar.gz 28482 BLAKE2B 8d35a12f18609c9dd7746ff8ce7c39d16d7c5e595a05c0f1b91211d757029ae78311573228178f95ef92624f7a49d6ca1d1d0efd264104d66e1d20a8aa623241 SHA512 2bf5e00895a45d87785e7a494a1506844afd843ef5375e0b0e3795ebc24712bb941c6feeb87e426e41a240d40aca9b4c099f77220745bb7142a7a4b303441f60
 DIST OpenDoas-6.6.1.tar.gz 30783 BLAKE2B cf6dabddb9a0ef837355516f7344efca33a639ede126e54466644521b5b1a7073b6cfa96cc8573ef16221a748ae6395f7e4fef4ff912ca7889742fb46d1a4da5 SHA512 390e0e139a2641be22c4493c3ed755d9cb4091f4ab8d590123b7c8c4f2f116cea3b3500926ff191fb98d92192ca9e92118cbcbeb463a7833763e00c65603e678
 EBUILD doas-6.0.ebuild 757 BLAKE2B 5cc07f49c5d2d6cc265b64cec423210db1a9b7a23420452495a8872821dba52205222e6437abf23e57f948a95a8d3baccc66bc77b88866739d075a3f4275c6bd SHA512 e4ac22ef41bdc89438d4165a1552e4883b5eaa02a484a978f15ceeb07a9775bdbda6a1669feb7fdac5d5ac39396bdd1789c88af2189369cbe339617f9795c2cc
-EBUILD doas-6.6.1.ebuild 805 BLAKE2B 75a6f6d0d0113530e958a5c489f41397a73724b579e1f49b79762db0333d81c526ff383315b4952f8d03ff3a72b320965d8981ab6252bea1066813ee34e8901e SHA512 117905bdc83d7f55fbf32694d63c213ddfded77d3c743de7d4e1281f850ab061ad41cb5cb208d84439b44bbfec097733f7a19e00c4d750e4ee1e4464150871a1
+EBUILD doas-6.6.1.ebuild 810 BLAKE2B 822909eff667a7cdd114699207c8060a4a78d1ec5b4b5c0848b3fb8dab7b3c68c014bcac7025de77cf23e8fdbd3b1e9b9a702050c9766db2ad5de300aead70ba SHA512 a9750e216c02ea8fce289265921bda02492571902e91b90d9b1ce88472b6b4b08c15dff399de6ba9b38e32face6037639b84901001cf8646025600115de7f942
 MISC metadata.xml 527 BLAKE2B ec5f403c54f18989467cc64c023cc86f0ccdf3f4d974db83a0a0ed660b1f32caac090b43317e5e2b4de46fd7c92a38d622735f9718b0680020557d378a290630 SHA512 1cc9427b113968557fc9764a552138e5a17ed44ef1ed20cb087a8fb60865b8d3e9331baf1d172180409ff636143ad23e1a6d3e5de6af4a8e7b8a7b9bbdfac718
diff --git a/app-admin/doas/doas-6.6.1.ebuild b/app-admin/doas/doas-6.6.1.ebuild
index a873bffa4231..04fca0a26c79 100644
--- a/app-admin/doas/doas-6.6.1.ebuild
+++ b/app-admin/doas/doas-6.6.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 arm arm64"
+KEYWORDS="amd64 arm arm64 ~ppc"
 IUSE="pam persist"
 
 RDEPEND="pam? ( sys-libs/pam )"
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 96d73c201e60..c943fcfc3800 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,5 @@
 DIST exo-1.21.0.tar.gz 4625218 BLAKE2B f73c18f1de5a8e8063e66ec11352d9221268289d298bb6ecaa9cb625c00685b68d0f7760614df8cf783bb123bbdb52d3fd9d8c482933445bb089d6e9d493882c SHA512 0a2279ef368e13286082813ebbae38cd5c2e185e43e5d2b2fb851382be8b8a5c08512124638d987401d0e821042bafba50f955a672eec6ce0951f0149d2ec34a
+DIST exo-1.22.0.tar.gz 4684873 BLAKE2B a143517a99fde17c237c25dcdd4b54570d6ce9760157d24c8f09c26851b5fb65c6ac56506179a008f32cc657cf40fb781eb304375e3f3422a5166e6b1c194164 SHA512 f68d1524c8a1dc44aca4ab1999ebbc93a980a58344c1b39c68eb54b4651d9471b310541c2d34a43e67ad956ed93e2d3ce89c3ebeb450b620c641907684572799
 EBUILD exo-1.21.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
+EBUILD exo-1.22.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.22.0.ebuild b/app-admin/exo/exo-1.22.0.ebuild
new file mode 100644
index 000000000000..0c2c8d861fe4
--- /dev/null
+++ b/app-admin/exo/exo-1.22.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tool for everything at Exoscale: compute, storage, dns."
+HOMEPAGE="https://github.com/exoscale/cli"
+SRC_URI="https://github.com/exoscale/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+QA_FLAGS_IGNORED=".*"
+
+S="${WORKDIR}/cli-${PV}"
+
+src_compile() {
+	go build -mod vendor -o ${PN} || die "build failed"
+}
+
+src_test() {
+	# run at least 'exo version' for test
+	./exo version > /dev/null 2>&1
+	if [[ $? -ne 0 ]]
+	then
+		die "Test failed"
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-admin/gentoo-perl-helpers/Manifest b/app-admin/gentoo-perl-helpers/Manifest
index 3dd34c16fe04..8cf90ca79291 100644
--- a/app-admin/gentoo-perl-helpers/Manifest
+++ b/app-admin/gentoo-perl-helpers/Manifest
@@ -1,5 +1,5 @@
 DIST gentoo-perl-helpers-0.3.1.tar.xz 9420 BLAKE2B dea001473832f4412ae090afbc458720ec1d40d19ac3db3a6a57b26115603f224f2f1c4155ecd3190866dfa0ab648fdd3a98a90e9ed576e7bd3ad8bdaf9a73c6 SHA512 dce6addfebbdfd16da3b580776c34346eb60b2eaef9cc7bed03d5ae0bf028de7a0175fbf7f68113d44b645c3d5ca7f5175389478655b08c115a5342ff930e096
 DIST gentoo-perl-helpers-0.4.0.tar.xz 9580 BLAKE2B daea9e3f43bcd24ea34c9448294fb730595e8a021dffcbbf7f123ff5439455aa362c623affee29341266a0494f4744df0bf195d2db422d6276eb54fdca07149c SHA512 fbbd33122028ad12cbec7adbc97faaa32aa485ef21ca38dc2e1906610fdea7709e5da7e8164f5f86afa3607928837f3b35468274b6c626e3bd843432d780701b
 EBUILD gentoo-perl-helpers-0.3.1-r1.ebuild 1255 BLAKE2B 59495c331a5363515ee725ca8ed048454023aa5b68db0d28e11d3d10df091a06b8790e5af778da55525bd04266e8107060f0a626c318582bfee92dcfe4f3aca5 SHA512 2dad7ad8fb595480d533a31e6c4b2c79b0975aec0e1782e17e3ead8e10ea3298217f66f2665977f511d9feb5aae536e74979a9d5cddca8250008a157c8aa937c
-EBUILD gentoo-perl-helpers-0.4.0.ebuild 1283 BLAKE2B a988fc2e412b33d6be7f170d74371e731f490cf4c6e0a8962829e0b35318a08ea812ca35f528095dbdff3c0caba8ba489ada39dc54139b26501cbb985055fcca SHA512 7a1853c7c75edc000e1edf34dc56ef4a5cb516bfd9e5c3b745f42455e6efff8df4b0f1ccfb17a8d5b8c0ec25c93c52cd558daeff7b2ea47831a04a25a7928086
+EBUILD gentoo-perl-helpers-0.4.0.ebuild 1282 BLAKE2B 3ea08b23c7e605a60b4a8492fda7eb065aa1e8d1dcdff2dc823af1e308f378dadb501d8f1808a5788defb41b7a045a4f427132d5a04411c319d0d6437b51c4fb SHA512 2acaa107856071b49e7c389c64c0cb5328eee72080d3efe7453bab8ee5f0a66e1111c5b62e00641f5841d586e1feae89a620364dc3b086f554d5440e10e4077f
 MISC metadata.xml 453 BLAKE2B 0a9ea49a54e1b0ac4c4d98615b15251770556bfe672eea650b8b52ac7dc9a0492d3456b894b8724c033aa272567bb0c7ad4847451ed3f29fd5aa365ea2e2d315 SHA512 a32d375d6aa0ac38a20cdec805c887be0d6493be5d47572a0e950e1f4a8b28018ab364cd06668ff59c52fe89487853c9c4bffdf05b79913c691d99fdc848b201
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
index af74800de564..4304f8dd6662 100644
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 "
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE=""
 
 # Assumed System:
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 71bd136662f2..3687d7dbc851 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -6,5 +6,5 @@ EBUILD glance-20.0.0.ebuild 5110 BLAKE2B 1aaadeba8df184d7a23f179ac02064f06e28b02
 EBUILD glance-20.0.1.ebuild 4944 BLAKE2B ad7aa3abddb652e1303ca822cc9a381c100c9dc88437c2d382643998fa93763c66bff0406b6af945e8557758923a672de21d3ce33c5781c878e8a3f43bd87864 SHA512 2170628269f01c90bd55ea59eba866faf1b1ab88a88ae8808e72f67813e9121a0a82610db1e29ae4f6a32575fd4daf8090c79b0228a7f3f72894118a8d4b2ade
 EBUILD glance-2020.1.9999.ebuild 5112 BLAKE2B f78acaba51de4c25635bc563cb287f28ed10d96a5726f2b749359c60c2a34232e5a1f1854c6593e0a48599e6255c2a718c55b790fef2f1789203fa60ed8a1cb3 SHA512 ddeac42331eed87d97247dd4714d3720930673706d5fd268fd0a38e4c581423e32ffebc460b2b6b2a3aa34fdb63dbdcf8ffce14daa5394c84aae16204dd721c3
 EBUILD glance-2020.2.9999.ebuild 4980 BLAKE2B ab065aba9f5bd64913a68ca382533f2224416fc60aaa8469299c502a8fbe0b762168a9a1d17d068c6138ec088c596e2a706b2bea77cc12f4a7167aab029c1f4b SHA512 8f0515e8fb4ec8991e3503ad599f6e4a8065f33c29e0e87c7f96ce793757f7290c021b1f2d4c421958eb416042bbd00acc85dfd3dec8561d9edfe4f2390c4632
-EBUILD glance-21.0.0.ebuild 4980 BLAKE2B ab065aba9f5bd64913a68ca382533f2224416fc60aaa8469299c502a8fbe0b762168a9a1d17d068c6138ec088c596e2a706b2bea77cc12f4a7167aab029c1f4b SHA512 8f0515e8fb4ec8991e3503ad599f6e4a8065f33c29e0e87c7f96ce793757f7290c021b1f2d4c421958eb416042bbd00acc85dfd3dec8561d9edfe4f2390c4632
+EBUILD glance-21.0.0.ebuild 4978 BLAKE2B bba0baf883fda2a3a8da27ff05d4d8c97a03f6c923f5b7fd7a40baea1bc7029eb3f74e581d8df454c0a370d41428f1bf530b8f4b481a4f788f99e29eded331d2 SHA512 d2e448aa9fec6cb2ce657e5465225b4162adff2556ba17f945e849b658b0c0d0280be63d973f83657ad5a77c4aab0676e8ec7a7a6351b9dc73c46a058a1953fb
 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-21.0.0.ebuild b/app-admin/glance/glance-21.0.0.ebuild
index dd4a939849af..dc947889962d 100644
--- a/app-admin/glance/glance-21.0.0.ebuild
+++ b/app-admin/glance/glance-21.0.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="stable/victoria"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index bb724c28ad78..c6429c2a0661 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,3 @@
-DIST hcloud-1.19.1.tar.xz 781068 BLAKE2B 74362fae9255121771a9e03f187ea6f101e71ed4ab226c218d33a335b740dc72d0df78e76d4c28e1b4760e1c76fe4dcba40f6a41db99cd0955ecb221d5314767 SHA512 24434de9396b30843698feff549163a23443f8536f3e2298edf23620f107dcf5287701c10aba10c4f6ecd61fa4b6a1a80661d9a330c3a4a11d1c986f750550ec
 DIST hcloud-1.20.0.tar.xz 790040 BLAKE2B ba0d62c8e817daadaa9eb891adb3f655a9ae33b05617449e26b09a3ba6b99a6b6f61df1cf29138a008a7ee58e45efdfe07c408af89efb1c2bd870d7340976bb8 SHA512 5dbb9060595e836ccde99984783954e894f74c098f911ae8c4cc1944d444fd28b6f722bb711d9b1ae245ddf3af8cca1939585ed778c8026fbf8c4201c2d15469
-EBUILD hcloud-1.19.1.ebuild 712 BLAKE2B 989221cd61ab4500042665da2679e7f611c9a7db8ce4f38ce81ee40be0d292c4be438846cf643bc056f3785889adba86765a6ee7845ec66cac15481933d9b8ce SHA512 761fa5b38c983a29cd12c069d1c79b141f88b077071351935b670c87e5534a96c9436c8dbd4479ef8401811539c2ab5124b62fc0eccb07a53a85980f9b6622a5
-EBUILD hcloud-1.20.0.ebuild 713 BLAKE2B 64b198fe517c5b6d22fb6024249e86236336cdb4cd7dda78f252cb3bad4af5e7f279358f8370d00fc4013b03331515ff8439aa82cf42f12cc05cafb532d07247 SHA512 dfdddb5e8356d7bfa8a641ea6f2e75747f0e0812a924f9b0e2517c5b6cf7f1e59769d336a37de8eba4eb03230746cc0bb15cab76e47957795a69ae465a96d978
+EBUILD hcloud-1.20.0.ebuild 712 BLAKE2B 989221cd61ab4500042665da2679e7f611c9a7db8ce4f38ce81ee40be0d292c4be438846cf643bc056f3785889adba86765a6ee7845ec66cac15481933d9b8ce SHA512 761fa5b38c983a29cd12c069d1c79b141f88b077071351935b670c87e5534a96c9436c8dbd4479ef8401811539c2ab5124b62fc0eccb07a53a85980f9b6622a5
 MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a
diff --git a/app-admin/hcloud/hcloud-1.19.1.ebuild b/app-admin/hcloud/hcloud-1.19.1.ebuild
deleted file mode 100644
index 8d044f742d31..000000000000
--- a/app-admin/hcloud/hcloud-1.19.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A command-line interface for Hetzner Cloud"
-HOMEPAGE="https://github.com/hetznercloud/cli"
-SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-QA_FLAGS_IGNORED=".*"
-
-src_compile() {
-	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
-}
-
-src_test() {
-	# For upstream a simple test is run 'hcloud version'
-	./hcloud version
-	if [[ $? -ne 0 ]]
-	then
-		die "Test failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/hcloud/hcloud-1.20.0.ebuild b/app-admin/hcloud/hcloud-1.20.0.ebuild
index bdb4bb4366ef..8d044f742d31 100644
--- a/app-admin/hcloud/hcloud-1.20.0.ebuild
+++ b/app-admin/hcloud/hcloud-1.20.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE=""
 DEPEND="dev-lang/go:="
diff --git a/app-admin/lsyncd/Manifest b/app-admin/lsyncd/Manifest
index 7693b05efda0..60a9d0ac4e73 100644
--- a/app-admin/lsyncd/Manifest
+++ b/app-admin/lsyncd/Manifest
@@ -1,11 +1,12 @@
 AUX lsyncd-2.2.0-mandir.patch 284 BLAKE2B b133a436c6c1b3186fc1c4c8f01ec87423cd63620e54589913d35bbe1ff2867c807fb7ce3eabade31936c70c54e7b1c115e1ee20591c82073396f029068e36b9 SHA512 c46043b4938b42bc4bd8d0f9387dff4561ee103e9a7847825a57415aa2c91b7902059f3f103834958bcf1c0132785c44e729cfb0af82d63cf94d3782f1b6f501
+AUX lsyncd-2.2.3-cmake_lua_version.patch 553 BLAKE2B a99c302a70c71b877fa9169138ff3789db21e3313b20c90ac8036bc07e33dd4a049481a27a10438754256d4c2be1981697e14967ba795fdce4c1769548d2cc56 SHA512 0ce7336f99224384a86bb3123a73cd79229d98049c117dd93a40501d10b86f4bb5656b31b495abf589990a709bb033febf05c1df7cb81b5e22b8bc182614c099
 AUX lsyncd-2.3.3-mandir.patch 327 BLAKE2B a201734f5e93f33b39c175a98bba22c847761f667d0ffcf96c14c52e8fafe14718fb33ddf30f50bd5fb46af388283f23274e7ab6106885ffc0cec5cb5b9f8626 SHA512 a66a8d5469378917b9f6fce55ceb9b041d8973cb581a21c985eb39a682af5e04cfae30b8b1104a7664a3b918641eafbba38a4b323ecef7e6ca0e23a9506c8370
 DIST lsyncd-2.2.0.tar.gz 81034 BLAKE2B 26666d04729e31d60ec340c207d5c22b2f53571a146d3f548bf7a33061bcec59aabafae40242f79a971297780fb7de56b5ff1fbccdb4c2152878f1b318a058b9 SHA512 75a138c2e85c4c5a3d6b215cb8df1668e5ffb6c8099f79caf555369d12348e2bdff29c1b01d62613bddd5b5a67f2a44e2fe86412048bc622088912e3fa783e81
 DIST lsyncd-2.2.1.tar.gz 81005 BLAKE2B 797c225b484139df53d3d1173d0cc3b4ba632a076e937902799247e422643f0bcefe22570d311afb4c8fb98151467a1ab624a97f728c851c02bc0dbc601f2238 SHA512 c07c322fb802911a2bb78221ff20ac1c0658cea27a23d34a95de45902211784d3bdc79c246ce0809e6167ddd20a3573c1ca6a81cabc46a29622a200c8d3ddfa5
 DIST lsyncd-2.2.2.tar.gz 82231 BLAKE2B 44cb269e1b726595b4332471335dc2a600efa2ebd39d7857d9c0c4adebefed923f60b177511e9e06113a4ff3400e45a979315bcd61169a7a2b9945b1aa944a86 SHA512 489d4fc91787a53f1480749fce6a281406aedb7e3617cd5f383b30c47870b2a8a912317a3faee5ad5f6358c10a136a69e07ee854f753846be1e11023cea5fed0
 DIST lsyncd-2.2.3.tar.gz 85165 BLAKE2B 9b3ce9ad882f12a0cf800ca0418092807c5c30451fe273eae18486b2ab245fbdc77dee937983bf78f678e20448dda39771c4bca96d8efe010cc45d470a30eba3 SHA512 2193a342f8aa7d8cfb55378c9c59ca61d2d8e4026263fd6e6560c730c712cef1f189305a3f9bca58f5b9c9ffae5af12e1d75e5355d5bdae86a47ad9595b8169a
-EBUILD lsyncd-2.2.0.ebuild 638 BLAKE2B f6f8dd5cdc9ca629695b65d5a91ab31209b87595875566cfc77d0d344a4d9186a26ca14346eedef21c4a1fa35290a2e66ad86aaf69f1f6f4085056cb82c99798 SHA512 5eecd4fcc4dd9baed5b609e46be61a5ad0b6aa022d2da5d2522036bba712b97fa5ec3600ba96d21966d1354bac3d36e6ce2bf4fb71c12f82498c914074557067
-EBUILD lsyncd-2.2.1.ebuild 647 BLAKE2B f54878a524e42e948f4356be0d36e636ac26fad18bf0705f8df062d75c4b1c83178031566848a1b1be2847a76e55e4cef298a740f17e628f41b50ad1742485ed SHA512 2c415734bd2a6f6861217a23788708efa0c3e4fb7fc11243ff3a64041d48b09716488ac28a13d279e7513433cb50840fa261784c375648ad232921481c70a330
-EBUILD lsyncd-2.2.2.ebuild 647 BLAKE2B f54878a524e42e948f4356be0d36e636ac26fad18bf0705f8df062d75c4b1c83178031566848a1b1be2847a76e55e4cef298a740f17e628f41b50ad1742485ed SHA512 2c415734bd2a6f6861217a23788708efa0c3e4fb7fc11243ff3a64041d48b09716488ac28a13d279e7513433cb50840fa261784c375648ad232921481c70a330
-EBUILD lsyncd-2.2.3.ebuild 646 BLAKE2B 91484f129466a25b597c4c82019adae4a4f5a2c57bcd6a6306cc4c102f7cd0cc35995af90abd8260469e9c20e330a77d1ceb41ed86f6d10d6f1e020df7e78431 SHA512 6be302edb2b64c73527f8c6e19a07117fee8d652943250ea86c67fd453d78fea13ec62233d755eafae9039cb9766b7213b012291930f52c7686740416bfd7b8a
+EBUILD lsyncd-2.2.0.ebuild 638 BLAKE2B 1f579e5958bd7c6d1c6b5900db6fee21a81eeb5f9a48de015165755c94414a6c46ba13a153545540392309832a69f1d0746cd7b5d9b40921ce0c28b40ab74f43 SHA512 1b66a5556a68575f45cdea2ffc2c430d5e433ebb409ab8c39d88882d7f40ce500248d442edd7fddad4d344174ad475d6497732736f1723e93b3a732310073b79
+EBUILD lsyncd-2.2.1.ebuild 647 BLAKE2B e022fd924cf8cb5ecf53f7438adf16eb7babb765a67b5860a88ed345c328509b3e522e514a6aa0f0aafc7aa94392d61e32e7ff81dfb8c3dfd12c7599e1a6dfff SHA512 a415f81f33aee8adc4faa459290836768414705558066b47392e0da7b35583f9f9f9fa09a13d04b482dff4d6d1bc116c6f2b25d40f7e1a6152996209db9e093a
+EBUILD lsyncd-2.2.2.ebuild 647 BLAKE2B e022fd924cf8cb5ecf53f7438adf16eb7babb765a67b5860a88ed345c328509b3e522e514a6aa0f0aafc7aa94392d61e32e7ff81dfb8c3dfd12c7599e1a6dfff SHA512 a415f81f33aee8adc4faa459290836768414705558066b47392e0da7b35583f9f9f9fa09a13d04b482dff4d6d1bc116c6f2b25d40f7e1a6152996209db9e093a
+EBUILD lsyncd-2.2.3.ebuild 956 BLAKE2B 66d4ba92e963f908a45e5a98d09d9251f998478d558be497b4d982d97f58e9c38ee410464ea800f64a8977aa7a4129d3e4a69d748ef5476e398188dccf5c6fec SHA512 3ce4261fa4b053aad943a06ec7bd499fb5787b42aa7b177642c0eb31a8534641a1f333fe00b69151389f0f8a51f13d56cc30f311d45479113d192473993e1d29
 MISC metadata.xml 376 BLAKE2B 17c9b5e1f29ac7b0ced5031f797ed2d85bdb25df6af44a1d257b75256325371a8290e0e1c20cb535c58326fcd67372a727cf170ca200803ca693670f2c729511 SHA512 1d7d76eea9ec7bb6d1e453675d56610abdcd78801b3d12eee37f082698cdb03aa7775d160b473ec4f67d8e95c6dded3319b74449f4aad97fbb6c91fab5bcd641
diff --git a/app-admin/lsyncd/files/lsyncd-2.2.3-cmake_lua_version.patch b/app-admin/lsyncd/files/lsyncd-2.2.3-cmake_lua_version.patch
new file mode 100644
index 000000000000..7a6cccb1445d
--- /dev/null
+++ b/app-admin/lsyncd/files/lsyncd-2.2.3-cmake_lua_version.patch
@@ -0,0 +1,20 @@
+--- a/cmake/FindLua.cmake
++++ b/cmake/FindLua.cmake
+@@ -36,7 +36,7 @@
+ #SET(_POSSIBLE_LUA_LIBRARY lua)
+ 
+ # Determine possible naming suffixes (there is no standard for this)
+-SET(_POSSIBLE_SUFFIXES "52" "5.2" "-5.2" "53" "5.3" "-5.3" "")
++SET(_POSSIBLE_SUFFIXES "${LUA_ABI_VERSION}")
+ 
+ # Set up possible search names and locations
+ FOREACH(_SUFFIX ${_POSSIBLE_SUFFIXES})
+@@ -53,7 +53,7 @@
+ 
+ # Find the lua executable
+ FIND_PROGRAM(LUA_COMPILER
+-  NAMES luac5.3 ${_POSSIBLE_LUA_COMPILER}
++  NAMES ${_POSSIBLE_LUA_COMPILER}
+ )
+ 
+ # Find the lua header
diff --git a/app-admin/lsyncd/lsyncd-2.2.0.ebuild b/app-admin/lsyncd/lsyncd-2.2.0.ebuild
index 3819d4699463..6fcf0da3b934 100644
--- a/app-admin/lsyncd/lsyncd-2.2.0.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+CDEPEND=">=dev-lang/lua-5.1:0=[deprecated]"
 DEPEND="${CDEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig"
diff --git a/app-admin/lsyncd/lsyncd-2.2.1.ebuild b/app-admin/lsyncd/lsyncd-2.2.1.ebuild
index fe75a2d6c540..13a978ad2fdb 100644
--- a/app-admin/lsyncd/lsyncd-2.2.1.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+CDEPEND=">=dev-lang/lua-5.1:0=[deprecated]"
 DEPEND="${CDEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig"
diff --git a/app-admin/lsyncd/lsyncd-2.2.2.ebuild b/app-admin/lsyncd/lsyncd-2.2.2.ebuild
index fe75a2d6c540..13a978ad2fdb 100644
--- a/app-admin/lsyncd/lsyncd-2.2.2.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+CDEPEND=">=dev-lang/lua-5.1:0=[deprecated]"
 DEPEND="${CDEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig"
diff --git a/app-admin/lsyncd/lsyncd-2.2.3.ebuild b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
index 67ccfb4ab94d..705a0e4067e6 100644
--- a/app-admin/lsyncd/lsyncd-2.2.3.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
-inherit cmake-utils
+LUA_COMPAT=( lua5-{2,3} )
+LUA_REQ_USE="deprecated"
+
+inherit cmake lua-single
 
 DESCRIPTION="Live Syncing (Mirror) Daemon"
 HOMEPAGE="https://github.com/axkibe/lsyncd"
@@ -14,15 +17,27 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-CDEPEND=">=dev-lang/lua-5.2[deprecated]"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+CDEPEND="${LUA_DEPS}"
 DEPEND="${CDEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
 	net-misc/rsync"
+# Both lua and luac are invoked at build time
+BDEPEND="${CDEPEND}"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.3-cmake_lua_version.patch
 	"${FILESDIR}"/${PN}-2.3.3-mandir.patch
 )
 
 S=${WORKDIR}/${PN}-release-${PV}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLUA_ABI_VERSION=$(ver_cut 1-2 $(lua_get_version))
+	)
+	cmake_src_configure
+}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 9be336735c05..9e005e810f22 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,4 +1,5 @@
 DIST mongo-tools-100.2.0.tar.gz 27401773 BLAKE2B 359747ffe9e53e9ac62fa70517bd5e64c6b082076b9d54e325200cabbd9e3f7ab3aa9f96f7a84c60b044082e505e2ca4d6bdeac6f0b1ca0bfaa03583603a7962 SHA512 1b093482d3abfbd354ff6010f270836a13842fc6ff33126effb4e843beefeabc233bb610b423cac8ce8718366e7aa7411679e4cd5125d44a235f244f5ea49da5
+DIST mongo-tools-100.2.1.tar.gz 27447213 BLAKE2B 9db242b632cf9d15960e216c238ad13d2680b1aa6c0731bf0dc163055fd8488f36b6b9cc56d597f5b7d98a6798ed1cb9f8815aa2b4dce6b5977a591376177409 SHA512 ed913c42935e240b8b13b292a7dc12c12b6f6ee7538c6dd589a5e0998c333ebbf3822337c9d8368964fcdb7c8b1b5b1b86fbe654695e3bbb09463a5cddf42e38
 DIST mongo-tools-3.6.13.tar.gz 4990848 BLAKE2B 022ddf214869c3a3e545aa9572f77f0adc21c0dbd6ea6ad9e083633c2e972b7ef77c0bda4354dbde9fd0e23c6dd02a7de8873d4b2c2a3e4423ea6f8e1c23ed52 SHA512 fac21c4841bfecba11a7765bb6c36d1fa19d4dd94f6f4168fa767fc11dc8b3caf04a5029becd09eba01dd694274e9cc22da8566ce878769e5c3c97016c162432
 DIST mongo-tools-3.6.17.tar.gz 4991196 BLAKE2B 53e86b3513aa74ad174801cea987d574c5248f438cb0a9419c2352c04333eae2f92214b11c59ee8688ad7235dc7a4586c39cc27450c654b1fc0e2eec2e4e22e2 SHA512 ea7a010097fdfe7807daf9352519b808b4a7b614b793ee2ac27495207bcf1cf8b4151fecd525946a0d6b8aa9332c205f437d5141b16efb613810963f502061be
 DIST mongo-tools-4.0.12.tar.gz 11134652 BLAKE2B d3c9703046dc577b85cefe1185678e0029411ddd44d0648f9b09fc3ab41e3661891d18afd83bf1a148dc4c9208895f444c115948e515e09dfa3062e89d98fc24 SHA512 068d8c456386caddcce23fa8917ffecdc9b5c39fb6794c5cd1d9099be1f127ecf680b006055581dc3d90507072a87788b46be7410f0dbede42da64c664b77ced
@@ -6,10 +7,12 @@ DIST mongo-tools-4.0.16.tar.gz 11139827 BLAKE2B 550acfd7e4434b178170dfd94c65668c
 DIST mongo-tools-4.0.19.tar.gz 11139649 BLAKE2B 7e730138fce671e18a0ebe929b98eff1c0ce2c364ceef7d6868c380242689411c545ac321aebd609dcfe9f8d5b7d35cf37973a978f35a50cc44902b2dbad7134 SHA512 2639cb27a5a27e405bddf9817f409af244d643a9091f7e5ddff4876966af55b6710b0fe158c351df9aea10f3da0b87d224bfb2c962f4ca2cfe41f804cb16749c
 DIST mongo-tools-4.0.20.tar.gz 11139655 BLAKE2B e3ea8ad500af3a023674bbdb9084fea854338fc3791f833acb77bfdd3e3a15fbe361162021e8ec85917a8b3e1992fb4fd6a109ad40489c01788835bce359d2a0 SHA512 a9413d79a3c3219e6f48c5dcd927f2cd24d138e5215b5e7fca92276b072b17c3c7a3528b9112450e1346405345f426ce0fb4324bed5167ed817750b3955e4262
 DIST mongo-tools-4.2.10.tar.gz 15026566 BLAKE2B 28dfef83ca4f3e16b4adbfeb26499cdfda64fe66de2906f56e7cdb56a9be01dd896c858c581aa4347235ca83a6e3a2836e6184ae6587b9d707934c699b561fe6 SHA512 5e937811d9c1146a7b5f2fd743e5d05f4f2a571972c34760e7911d240cc3ea1a0a5ccd451874b7cf635bc603e6bc1e7e8d4aa4b20c17abc77fde78cb4aa25934
+DIST mongo-tools-4.2.11.tar.gz 15028877 BLAKE2B 8397ddfa553880680dabb3ca41801117431c75e9cf19c6145373b73c6da15b2be61e8673cec851872a0c481b221ac40e222754f9155c45f8a3e681e59272de6c SHA512 b1e9812890447f2ad1ed96ea5a70e8bb16efdaea37224249c531a3adda559b789a392b9818711147d28df412d7a2e2a992bc13fdcd595e50e66eb7fbd8c32bd5
 DIST mongo-tools-4.2.3.tar.gz 15020325 BLAKE2B 8501a3ec6e947112ec561ce62f2ea568984f8ac911a7aff3cb8c08c1f29d2cfc64cf7f4b6a24ba73ae0f9b2b5853480f4fbed51c98fdc8c83cd433ea65e21dba SHA512 772719b450f8b656c22ac0126fee1e0fa58b5320c94ac6414b1d9af13e6437393c2482f2e386f4a73c84a2d1bfe0ea88df117a6a7ae87f4884477505cf662585
 DIST mongo-tools-4.2.6.tar.gz 15016596 BLAKE2B 5ee37bf21ea05ec5ba2764c935c1dd3632753e772a01f854dc8a9949620e9a41fe95ba658a0efae0332ed2c059561e39e681f672cf5f4302a7f92c364cfab4b6 SHA512 e91bfba4b015f80d35b6c2ca766c599c5eedea113d6415ec0aef433d46b5e5fe06956481a063e26908a45fdcee4002125ea01a29fa3ea9a541a9210d25625f8e
 DIST mongo-tools-4.2.8.tar.gz 15021497 BLAKE2B e066c299462167754e0752079f35fef25b387eb1df0631ff0e0b783a8a14c4b68c6ed126ec3429f63de87b87b9fdde6a2645badd53ac1386befc7175a61a999e SHA512 c0fca14c60e5f399934f4dfad5be832684d2c1a1145967a4c395b246774f73f71e506bff902a634b7f08f7133304c09f14eb56a1a6fc8585608f537e59d9c899
-EBUILD mongo-tools-100.2.0.ebuild 1383 BLAKE2B 8ecf9efa840b8e6242a36f34aff6f0ebb3cba25905fd488f34477c26133b7a33ef1d4bb0e10734d4faaa856980226533c5c4d0a58a56908b603ee18a4986048d SHA512 17960c5882da9cee65ba4338d9466e94fac20b61b01be65b5cb8bc2318f23a1f9e758ebf300e68809e7095ff12eedc185677ceded5173bd46a726d2e29440e28
+EBUILD mongo-tools-100.2.0.ebuild 1382 BLAKE2B ed2961f956d4dfb2da06270908ac3a5e36d2550e999a88266f30d12c13c6093bd642a4a0d334fe837e6c7b29fce5d54b74d374d3d30c5b8070d047ca04f7b1b4 SHA512 029a86ebf9d7deeddc74270c6ab86ec87e7a539cdae2d07c0a6e8ed0c55261380a7ab78488ce3d10b744bf720f11564df01b403c08701500c2a968169b5797fe
+EBUILD mongo-tools-100.2.1.ebuild 1383 BLAKE2B 8ecf9efa840b8e6242a36f34aff6f0ebb3cba25905fd488f34477c26133b7a33ef1d4bb0e10734d4faaa856980226533c5c4d0a58a56908b603ee18a4986048d SHA512 17960c5882da9cee65ba4338d9466e94fac20b61b01be65b5cb8bc2318f23a1f9e758ebf300e68809e7095ff12eedc185677ceded5173bd46a726d2e29440e28
 EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-3.6.17.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
 EBUILD mongo-tools-4.0.12.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
@@ -17,6 +20,7 @@ EBUILD mongo-tools-4.0.16.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe7
 EBUILD mongo-tools-4.0.19.ebuild 1612 BLAKE2B 388fce2721c6febaf554a4eaf68d3ec2def017e01b0a88ff7acb039b06dfd90081776dd1628ea4c51612b55e5fd113176c1b87fd9dd8d14991bcb8e6b21e462d SHA512 123c899168d48b40b75cabf913ad76eea8bad3f0537101a312988191d4cf6cb07b3f5b14232d92bac2785d92d1229ae2209c1f96843c845cde6967dcf9ef4c95
 EBUILD mongo-tools-4.0.20.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
 EBUILD mongo-tools-4.2.10.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
+EBUILD mongo-tools-4.2.11.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
 EBUILD mongo-tools-4.2.3.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
 EBUILD mongo-tools-4.2.6.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
 EBUILD mongo-tools-4.2.8.ebuild 1619 BLAKE2B 1faf21c01243af30bbc274c99995ea875579473f53485d8100b487d1934880c495d9cb276e346646ecdad476a56284e90646cc83ac1dc47a1ce0cba7bf670f98 SHA512 91811cd08ce9d3e3577ccd0ba845ba9880e6bf681dc14925fb5a43a750914b4e1732d578ff64335ad935665548ddacfa59bc0fc22abed2d053cec0e6da1af939
diff --git a/app-admin/mongo-tools/mongo-tools-100.2.0.ebuild b/app-admin/mongo-tools/mongo-tools-100.2.0.ebuild
index a60bc8a3e1af..1a7e7c94b876 100644
--- a/app-admin/mongo-tools/mongo-tools-100.2.0.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-100.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/mongo-tools/mongo-tools-100.2.1.ebuild b/app-admin/mongo-tools/mongo-tools-100.2.1.ebuild
new file mode 100644
index 000000000000..a60bc8a3e1af
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-100.2.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+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 ${P} "${S}" || 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; 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/mongo-tools/mongo-tools-4.2.11.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.11.ebuild
new file mode 100644
index 000000000000..7d8cc9a0ebc2
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.2.11.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 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 ~arm64"
+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/ps_mem/Manifest b/app-admin/ps_mem/Manifest
index aa62cdfba854..f25dd29144c3 100644
--- a/app-admin/ps_mem/Manifest
+++ b/app-admin/ps_mem/Manifest
@@ -1,5 +1,5 @@
 DIST ps_mem-3.13.tar.gz 18331 BLAKE2B a0689a98597e02a63cc83188e717421bf873b9202c0f524165ffc838fd438c539209c2f4e6561226bda8c6f85364707d29d13519d6d3e53a6d34cb39378d2de1 SHA512 bf5affaede5f052cc878d46ef81186511a1e8f5939cd7e8560ab2df9faf4dc31566cb4172d956cdcf1e6fc5586ba3458ba1011aee3720f6b7eeb3cf40b4f90dc
 DIST ps_mem-3.13_p20200417.tar.gz 18472 BLAKE2B 43e04d0357458107fb25600024243baaec703124fc58a819c011c847a52ad6fb7384ef38a5aa965e3ae88288cca6c76a15819466839eb729a63c4492eaa4ec0d SHA512 9694cec5d696a42dfe2f60dd024f541283e2f52aafb499ee2e551574133262bb0fc4bf6eb0e7075fb1b129aff6cd8fe6968f411f56ee1d31eb6f9aebff2d9852
 EBUILD ps_mem-3.13-r1.ebuild 676 BLAKE2B 2921f9ecbcec6bf8e3251362eefebdf0a3c9a36d150463a3104c1637adf876dd451e3aa742aa002955aeedc3536836fb963a78f0066d43362aae4cbbb62abd14 SHA512 95dbdfbd232d6a0415f8f825cb750ba6cf40facce0ead984de057063f045215746f3cc7f7d1f5ac0cfed1e01a0930d9d711c5f0639de7cc4244e1a2a98319ff4
-EBUILD ps_mem-3.13_p20200417.ebuild 710 BLAKE2B e8edf41454c83751c272b1ea69c0606c8aef4e20da522dfa83733c4f90735ea9f94ed785b8d0e863578356ae99c58e2c0d428fc6b0d9224b0ebbd51941152e66 SHA512 9458978de046dc70ec8a3f6e44ada401b1a079fcea5afaee5247f0a6ff2919d50dfabd74a5c4284a2902e5e4f43f466e6e112b728cfe163b50a7147b79168fc6
+EBUILD ps_mem-3.13_p20200417.ebuild 710 BLAKE2B c01955fdb268c5dee0b489532033c7a3f9a831feb019d67f088a6bdd0beb327116347d9fd6be1171bab7c0e0d4ea851c65cb3f8fb81c32ad7af84bfb758a5861 SHA512 a10823a34bead2a0299cd5e27fa6b75034f6e1b7fa554261c1d33dd6e9753907e905da024f6f35144b8a2b6a3a31813e6b6fbf6045a5bfa2b3f110b0dd8c71da
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild b/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild
index 91108a61195a..30703b47880c 100644
--- a/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild
+++ b/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest
index 6e32177ffd32..ff0ca18e7405 100644
--- a/app-admin/qtpass/Manifest
+++ b/app-admin/qtpass/Manifest
@@ -1,3 +1,3 @@
 DIST qtpass-1.3.2.tar.gz 310316 BLAKE2B ac0f562fd263e9d46980a69183cfd556596750e1050dbc50748cd9be45bc4bf39e4de14cb59f778cfc54f5c32050d567d88d65ec039cba1e9c2e8ef24d7ae99a SHA512 9026f74f6ff75fcef2f6a0862484a2a1eaed1370edd0659e8b4d20039affe846e0da3a0a26a804563813bc678638ab67fa516441208e70c7e9de9b2eda876a10
-EBUILD qtpass-1.3.2-r1.ebuild 1254 BLAKE2B d9d6e4b6d8782764494a695894ae6ee7d78baafbf873085dfaa61a3e386d3575b8894e2837c922dbb9e85af441414c5cb8fd06d6e7c99d9167cc642f167df31f SHA512 d3a6e76f3c7fe8df7d34a66b5181a95d3ff76e2f8df119b0c743ee574a9d9aae5df498724285ab440c7b674fd21e70c5990c7594c53d66fa6ad6fdf4011c46ff
+EBUILD qtpass-1.3.2-r2.ebuild 1247 BLAKE2B 705b02148b5f4bdbc47612f522ee7b7fbf085059c536033f5830d095aec52dd7a61d8c1bc7b70e8d9cde5bb5f6e887086db9e9129ef58459041546aeaced56b8 SHA512 b88bc2391bc8b6d4f656dddd28e2b56dc32170113e13b7f6eafe2d0bf84623b6075905343cee34c293c16d6562b0b91feb41a53dee48581903d687f3d2c7b375
 MISC metadata.xml 454 BLAKE2B 0b9a8efdf75a49e472b9601c99efe53b4d4e8e91bab9182f6df896b514d7c72b15d49cf593d4cbe317ba227ce8bd01f64b98bbaf1ab1213b7c1d886df7feac7c SHA512 3e62cd6dec1e391f571deeca59ca712dba9bc015265ed40bb4e87a141a4b0e31516340705d0ad7d52e4ddf2e4bb004544228862f27b01ff867ad88c92ef2d9a5
diff --git a/app-admin/qtpass/qtpass-1.3.2-r1.ebuild b/app-admin/qtpass/qtpass-1.3.2-r2.ebuild
index a5ccf55db1fe..4d457f60204b 100644
--- a/app-admin/qtpass/qtpass-1.3.2-r1.ebuild
+++ b/app-admin/qtpass/qtpass-1.3.2-r2.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 inherit desktop qmake-utils virtualx
 
-DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
-HOMEPAGE="https://qtpass.org/"
-SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Multi-platform GUI for pass, the standard unix password manager"
+HOMEPAGE="https://qtpass.org https://github.com/IJHack/qtpass"
+SRC_URI="https://github.com/IJHack/qtpass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -16,10 +16,7 @@ IUSE="test"
 
 RDEPEND="|| ( app-admin/pass app-admin/gopass )
 	dev-qt/qtcore:5
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
+	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	net-misc/x11-ssh-askpass"
@@ -60,6 +57,6 @@ src_install() {
 	doman qtpass.1
 	domenu qtpass.desktop
 	newicon artwork/icon.png qtpass-icon.png
-	insinto /usr/share/appdata
+	insinto /usr/share/metainfo
 	doins qtpass.appdata.xml
 }
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index cccbb81081e3..c6d4f952ebc0 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -3,6 +3,6 @@ AUX setools-4.3.0-remove-gui.patch 879 BLAKE2B d8c61405d96466fbd2f1704477dfbe644
 DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
 DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
 EBUILD setools-4.2.2.ebuild 1244 BLAKE2B 12679432d583a6d7cf3bc5b4934afe807baa10beb06cd65554eff037041e4b920ca969cd74e7af575bc14987dd56e5490b54c8b99f31fe93309e30ebebd79800 SHA512 15d41d5cabd0cc8c5f0996379d371342701c42cfbf25e73c72d753bc798fc294ec0e6074b4d04074bc4965bc015acf1d16a083eeef1600b3f57e0eab54a136f6
-EBUILD setools-4.3.0.ebuild 1254 BLAKE2B 1779f71bac2945eca0ffc5fd077b82da117d414412f77d313ab722dff14b2de83728a8da316197798fb8bc7c8466980eb66fa622169c6128e780fcccd53b760f SHA512 2740c48f1b9bcd2faa1390dae29734ff96fb0c4a7fe76e9721bcb6a61562ba72d07530e6ee1860bbb271637adc3e0537d7163cdc0b1e576bfb301502196dd6c2
+EBUILD setools-4.3.0.ebuild 1252 BLAKE2B 26a50f11e28e24367ba07642fdf771a2459d03e524b31b8b970a91fc4e3fe8239e755d8e52067fc2f8bb3f09426b3134a30e520c0bf9b02d237b6fdf54845bb3 SHA512 285f3b7c30a96b8886892231de19a5f2fcaae03661116bb687665a10cbd9f59d4b13d693e1aeb3c06023453be34774c6d3560904b4b95a1a84cee5e3e0b88712
 EBUILD setools-9999.ebuild 1254 BLAKE2B 1779f71bac2945eca0ffc5fd077b82da117d414412f77d313ab722dff14b2de83728a8da316197798fb8bc7c8466980eb66fa622169c6128e780fcccd53b760f SHA512 2740c48f1b9bcd2faa1390dae29734ff96fb0c4a7fe76e9721bcb6a61562ba72d07530e6ee1860bbb271637adc3e0537d7163cdc0b1e576bfb301502196dd6c2
 MISC metadata.xml 334 BLAKE2B 7fa85c132495c221d8618934cfe5481df604ac8c4bf36878f36d8c35b31e923515634124b0e3b9abda16b748a7684463851574a23428dfdc54bd8a7bd3625ad5 SHA512 52b24eea951558dca0db5c046f0a803c94ebd9d9b42b4a317ecd2d60f0dff885872fc3813d94f4c5c5b9ec2696f609f59cb34f406348f3a75c7ce270218d4513
diff --git a/app-admin/setools/setools-4.3.0.ebuild b/app-admin/setools/setools-4.3.0.ebuild
index fd1fb1b07fac..22ab1263f7f0 100644
--- a/app-admin/setools/setools-4.3.0.ebuild
+++ b/app-admin/setools/setools-4.3.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
 else
 	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index e511ed383d83..fdf855ff693b 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -4,6 +4,6 @@ AUX sshguard.initd-r2 389 BLAKE2B b4098e0baf82e1c1f1978d6b3916fe9f2e67891d02b7b8
 DIST sshguard-2.4.0.tar.gz 771506 BLAKE2B 82e9caf70dc9a1ba9ef6ba1c0916424a74891c84069a4a879c9057f3baea32af68f35d8b31cacdd60d323f5ec7b02a6e12aff1ec72fc0291b74c4882cd441d93 SHA512 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6
 DIST sshguard-2.4.1.tar.gz 723940 BLAKE2B 04e72b9959ef3ead418d2a6fe8029b0806a4d91c91f7cd36c236c7203cca1afc67305b21de0b1dee1594b188564f201ff2770d54d4c57c54b4d23db15e0298a0 SHA512 bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8
 EBUILD sshguard-2.4.0.ebuild 746 BLAKE2B 0284fa3b1f9204fbca96a816efbe9c547556fd3b0cc18c5cf8b35d1e90bed01f4e0db7d0cf1705a575486ef11cbfd609deb8b06eb5c3a841415b853e62d96530 SHA512 8e6a32839fee40b4870ddd1b4308b44c8b3d3a0e9136f269bb935178e9f8551b8194a4a8e6f20f778c4a77ec261009928fa7267f357986ca27617d532360fddb
-EBUILD sshguard-2.4.1.ebuild 748 BLAKE2B ca2ca57e1e8701e864e85ac94eac7f1379376df940719c2248a6eb0ddb96512f0ff26f4c6ca962a9c68534ac15262f0f83c3dc436707ea733516ab4a1e08fbf6 SHA512 5c72d111c83de5dba984cd1bd9d45cc38c069f50382d4429b92f2bcb6cfd324dfd5ae2f335e3563ab24a227d54a9661dda4859b9ee63add76340874d727b7e3e
+EBUILD sshguard-2.4.1.ebuild 755 BLAKE2B 7604917bd565cf777a017f0385fd72e7cdcc3064b4c35d4884f9a6e3d1579a79fc1a7395a5a303bf6532d5c770ad194420e8b47f28b7af7e5edc3bfe4d6bf176 SHA512 92e4232be6d26e533e26265294cdb3da3b76a78e5d1b0559360a60e0fbff70dea032b9c6474ef65181908eca003132d4e7fef462d1902278408033bd050e6f31
 EBUILD sshguard-99999.ebuild 799 BLAKE2B 38b307936f73e2926466241496fdf59a6cf7def5e60405674a1a07666cdbf0042310977e79078352e623244670e22a8cd41b2ff7969b2ca6577441beca55ca69 SHA512 a33dbdc779c7021aecfa9927eb7e41313ce8b82f3509f1a33e8beacae5597db7e8f5b1a1484edee7e03956fe07d9a39717673985bc8988dba0e20835cd722aea
 MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec
diff --git a/app-admin/sshguard/sshguard-2.4.1.ebuild b/app-admin/sshguard/sshguard-2.4.1.ebuild
index 99d5bbe8f103..fc6a2cf36767 100644
--- a/app-admin/sshguard/sshguard-2.4.1.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="
 	sys-devel/flex
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index deaef1ca5e94..e720713c4cae 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,6 +1,7 @@
+AUX sudo-1.9.4-without-sendmail_build_fix.patch 1470 BLAKE2B fbffefb687a42cfac19cc1ede970729e17c1771421ff93a9d9c4df96046688b92e838cf48891e67e0ee8ce40b84a19c707a844c83bba2af5eae52caeca334573 SHA512 18d8ef507ce7c4c2ee8d5aed08199d527675a7757e9b1aff819380d156e4427a8c632b8a5cc1eee0698e6d20f2ec569e14d6ba957bb8dec788e75a82b706063a
 DIST sudo-1.9.3p1.tar.gz 3958071 BLAKE2B b681c120faa5dc7f25e27c1be423d68cea70f63dcdfea2183fd386a34dec0376555453399d3f8886c66c6507343648d40b59a058710432154061b210df2a704c SHA512 3ad13fd03e5b371fd6bf7909731ffc11431d2182a744b654f7e5d4b810e47955d49bc78f551afe13ec56acbce694139c33a15bc022cea41b17af5496b8b7f89f
-DIST sudo-1.9.4rc2.tar.gz 3990607 BLAKE2B 46318341a7b14dda0f3765343fa4c0fd026ed6f127da8dc205adc1f2103ce444854114ca6c571801d267a31aa92802bdd2351d09f847949765b55df84cbe8b1b SHA512 0f16a73139c9a80352f8be3ed696116f05c0e36930998b4dbe9a452933b2b784cf49d6a5486a49f25d4244ae6a71d49880d200c5c7f3fce2a8ff857b9ee96cf7
+DIST sudo-1.9.4.tar.gz 3992062 BLAKE2B 65eb8f78eb34ca7009ea0752a1acbfcb4e06ddd7083301736ac1bac7019c1a45cf2c34f69ac5b86fa4ac01310e209f236840712ad4998b692ddf774b9d1bf60d SHA512 682b4d303147193149509b734b64f8541e00ccc1c41468928dff307f9d52f2b1aae005deee1ef5ac389cd3dc506368dba8a78c0392ea1434dd78cf7ef8a08408
 EBUILD sudo-1.9.3_p1.ebuild 6892 BLAKE2B 3ad32318e45533045e40e7d4ad282b5a218c9531d98dda7a6d92bc0568ee874e020f4497811e7e2dad677d8d14962d2e5aadb014d5d1e01a4559fda16867e39f SHA512 34803aae1dd4a8aaa696b7b4c72d69d9dbe08a25072aac9b8a2a3f9e47eed84a9273c2cc6f1c496477a88b8df74e5587cf8761906970d574ea140fd0a41ca639
-EBUILD sudo-1.9.4_rc2.ebuild 6901 BLAKE2B 57b94080303df4d32651aab3cd4be8601f59ff13138eb6b8941854255942422d338e47047ff98b1ec9c86863e77f2e1b36901ed001daf715f23b15ae65264709 SHA512 ecb146a12fe3ea3d32ef237e0e67a99d3eadd6ad99997c327eb31027b0f45aa6dbed9dec03ed5c39c62ddd1131762fdc708899e76b2a867416dc0997c1f0727e
+EBUILD sudo-1.9.4.ebuild 6975 BLAKE2B 9d5c62ddbf6011a9fa7578f7b57762f1aa94c275759a087e57f366add38c9385f7acc38d343c6e148c0c11ec0790a7ee3b080ff83ce75e35cf72ea50bdf257d6 SHA512 12737ac1922535b9ff0cf2aa0b4a67af191bb2baaa9f993cc26fb1ced11cf7aa67da76423703d6b8c92dbffe1c629e61cd1f4284cf2e72f241f376ea01f73919
 EBUILD sudo-9999.ebuild 6901 BLAKE2B 57b94080303df4d32651aab3cd4be8601f59ff13138eb6b8941854255942422d338e47047ff98b1ec9c86863e77f2e1b36901ed001daf715f23b15ae65264709 SHA512 ecb146a12fe3ea3d32ef237e0e67a99d3eadd6ad99997c327eb31027b0f45aa6dbed9dec03ed5c39c62ddd1131762fdc708899e76b2a867416dc0997c1f0727e
 MISC metadata.xml 1161 BLAKE2B 0c501bf06edca82993ece857f9f7565f99da15df36c916bc9dc57e78bccf2b247c382e97dd6c97cc7f5375e1a0513c1a30ecbf097516e96319fd1797257fb117 SHA512 d6bc9cf11ea1bd28c19bfe167580556af517d92c958d63cd7872ab5076840eca39a7ab3d1f56e84fc0fcfb675d7a89c23ccdd3629f665c45232be1140eb950ac
diff --git a/app-admin/sudo/files/sudo-1.9.4-without-sendmail_build_fix.patch b/app-admin/sudo/files/sudo-1.9.4-without-sendmail_build_fix.patch
new file mode 100644
index 000000000000..f40bfe445e04
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.9.4-without-sendmail_build_fix.patch
@@ -0,0 +1,45 @@
+
+# HG changeset patch
+# User Todd C. Miller <Todd.Miller@sudo.ws>
+# Date 1606767492 25200
+# Node ID 41db1aad85bbce444b511bcb28b9628a0a22fcd9
+# Parent  96a5cfe3c66b6ee84d7f7b6fb26d932f45a44b76
+Fix build when configured using --without-sendmail
+Bug #947
+
+diff -r 96a5cfe3c66b -r 41db1aad85bb lib/eventlog/eventlog.c
+--- a/lib/eventlog/eventlog.c	Sun Nov 29 15:11:34 2020 -0700
++++ b/lib/eventlog/eventlog.c	Mon Nov 30 13:18:12 2020 -0700
+@@ -78,7 +78,7 @@
+ static FILE *eventlog_stub_open_log(int type, const char *logfile);
+ static void eventlog_stub_close_log(int type, FILE *fp);
+ 
+-/* Eventlog config settings */
++/* Eventlog config settings (default values). */
+ static struct eventlog_config evl_conf = {
+     EVLOG_NONE,			/* type */
+     EVLOG_SUDO,			/* format */
+@@ -91,7 +91,11 @@
+     false,			/* omit_hostname */
+     _PATH_SUDO_LOGFILE,		/* logpath */
+     "%h %e %T",			/* time_fmt */
++#ifdef _PATH_SUDO_SENDMAIL
+     _PATH_SUDO_SENDMAIL,	/* mailerpath */
++#else
++    NULL,			/* mailerpath (disabled) */
++#endif
+     "-t",			/* mailerflags */
+     NULL,			/* mailfrom */
+     MAILTO,			/* mailto */
+@@ -1436,8 +1440,10 @@
+ 	evl_conf.logpath = _PATH_SUDO_LOGFILE;
+     if (evl_conf.time_fmt == NULL)
+ 	evl_conf.time_fmt = "%h %e %T";
++#ifdef _PATH_SUDO_SENDMAIL
+     if (evl_conf.mailerpath == NULL)
+ 	evl_conf.mailerpath = _PATH_SUDO_SENDMAIL;
++#endif
+     if (evl_conf.mailerflags == NULL)
+ 	evl_conf.mailerflags = "-t";
+     if (evl_conf.mailto == NULL)
+
diff --git a/app-admin/sudo/sudo-1.9.4_rc2.ebuild b/app-admin/sudo/sudo-1.9.4.ebuild
index 84770ae1b432..74f99d722acf 100644
--- a/app-admin/sudo/sudo-1.9.4_rc2.ebuild
+++ b/app-admin/sudo/sudo-1.9.4.ebuild
@@ -74,6 +74,10 @@ REQUIRED_USE="
 
 MAKEOPTS+=" SAMPLES="
 
+PATCHES=(
+	"${FILESDIR}/${P}-without-sendmail_build_fix.patch" #757819
+)
+
 src_prepare() {
 	default
 	elibtoolize
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 2a6c4fd23535..b5ef8d10fc80 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,16 +3,13 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 573 BLAKE2B 444541b8912910cf6b5d038e466e18baebb7dfd2905d802217baf9e861bb7f2a3e032716545c74e269782aa420fbd052745322576b4bcb8c4cf53ba07471b261 SHA512 11124e6fc656977c20b55b578e30fd76b8f6905760c2f17f93b960a317975f1914c6bd8d4ffd3741ba405bfe5aa0cecb68067f8ce52b2df9015863d31f9a7aad
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
-DIST vault-1.4.5-webui.tar.xz 1239532 BLAKE2B fe861cdf9ea833010f6b8b2ffa403fb8095456cc9038f19edefe44fbbdd418bf4c3ec129b1436296c78914d75964dbb6dcaf3077cad45a3cf905a54a42e7e82d SHA512 d0fe0878b6f30a63e7156644c7a53bd8bf0008355e6bf9b79b8a4acd4a094ab43914e2b7ca63f48f3b31433dd36b1091ebbfb9afe8002e51c18dcf217292b521
-DIST vault-1.4.5.tar.gz 33272136 BLAKE2B 3e0f3b11b975b1e563883d43f392dc998dc21ad057859c4aaad3dc67133e3a2dd9e3d1ab5b46f07d981738bdccaa5ced477ace6e057579815c13557cd74f30eb SHA512 5b709ef857d6c64a1332b1c01b13f525491e21e958a7e1441fa817067a8016e8d78d7f71043c2b24d75141becea18063d97cfb5dd7a337130d6d8ef58a76d062
 DIST vault-1.4.7-webui.tar.xz 1236924 BLAKE2B 83ab6f4494708f0738aed4f7226d5e634d01268da6b672c6ef1340559eccfdbb2a74baaa9a67cb3287290bd1ef332e325ba365280999f7db86e1694ec1731788 SHA512 634128a0a46c01d671c3c766eb4f84a58802f0cf0ade297f34e9d84eedb8d8dfbbbd4ad0eae6a28e33acb0b161f123a692b8b98a25918da8337cbce380c5f94b
 DIST vault-1.4.7.tar.gz 33265037 BLAKE2B 11cd3d1bd2321a6240a31f326666e0725b1bd3104a4cb050ecc78c9fc6bac1db1a79799e3a4b212468556a54e1f431e61f18115d2c86ddd0b229ae0f5ad06726 SHA512 a7af7780756df02a465a60989e3aba382116e0846cc48ab81d7b272133c31b7c47f60eed4ec5ad47ad0a80247baee7087a1554fcaf189a60a1edb807a268c3a4
 DIST vault-1.5.5-webui.tar.xz 1239480 BLAKE2B d1f9d98c2a6ece03f994c08c1e842343f713bdcde981c55ea75049f3cc51f4989a9187786190ff138a9c8ef264a7a9a26428f8a7d916b4b2c0554da85e48ae4d SHA512 a9516605ec262ad44cb8ae61308a70a5cfa0458b8bb2e80d49c4e28711db5a7ad18ef2bcf0e9756b9da6534f1d47ed8bcfc6c7c734042aa8d9b0e9851059fa9d
 DIST vault-1.5.5.tar.gz 35123385 BLAKE2B 428d509378cd912d2ef13630a0fd4ff4df89a7144b30291cecd3c62e91b10a67210c7ae79e5459d7da5d9c635ae2634d3edd99614c40cce744d93713804c407b SHA512 de19be6b9fdaf06ce2debc7784ef1a6dff00ced7811a110b58348d61b304ed2c850d957605a47abfa0cc7568488b3b0920437ace7891a69d470e98b44c0f9fae
 DIST vault-1.6.0-webui.tar.xz 1272792 BLAKE2B cef45043b7ca26de774e17a994f35a3c52b796c94b75b9377300f8755bb4c0d8814147d740e07be8d5dd5f909051adf7fb05be29b1ca1e1db349a0c3977ec034 SHA512 3b13687f7f0f475513152544ae423914520d0bcd9c0ea4295277f326002048707adfdf5ac405561ddb415affb842952409d6586ef19c7faca37d87aee973337a
 DIST vault-1.6.0.tar.gz 38888893 BLAKE2B e6da6ba813625a2a00553181e5d16bb52510856d9ad4e1538b824b5f87b2beb6c8d19f60b274e68d9521210c72dbd93cb63ba73175d079b43b03b48fefd1e1be SHA512 f9a99c29de585031c00b7f0a2125f61df1cb0a15ab0aa04e3cca950bdd23a4055dd3764561594730e62a1b3ae4d13e66df30032bf2b1000063edc4f772a8146d
-EBUILD vault-1.4.5.ebuild 1857 BLAKE2B 3bfa96148412f6c7e2979f8e86baeb100e4e0e42fa2ddc9251c4a4017c18b639583fd51cc360b4c31db25d8641a82058a11572c47a2eeca3d92068e44cd00d1a SHA512 29726e334b3abc150235ba6bc72770bd82e8a0f9225f018ded55fbf08366b90d989d1457ac57e882321ae5209d82a102526924db0e44c9598534587772dcd338
-EBUILD vault-1.4.7.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
+EBUILD vault-1.4.7.ebuild 1857 BLAKE2B 3bfa96148412f6c7e2979f8e86baeb100e4e0e42fa2ddc9251c4a4017c18b639583fd51cc360b4c31db25d8641a82058a11572c47a2eeca3d92068e44cd00d1a SHA512 29726e334b3abc150235ba6bc72770bd82e8a0f9225f018ded55fbf08366b90d989d1457ac57e882321ae5209d82a102526924db0e44c9598534587772dcd338
 EBUILD vault-1.5.5.ebuild 1880 BLAKE2B 723b98ca4b9f724ef36ce105b516830feafd49d642b06498d69701f1f9b322e98d663ce80192d86f6229933e0928c6d7d825adae89b21c5bc074a207da85ceef SHA512 f044c61a12b406443b977ddf79a7ef005f406755d344e62c9cd8b9de9f7382ab630be6f4c54cd8dbcba650572fe18d01fe0a6a14134c76cb7cb50cf7491141b4
 EBUILD vault-1.6.0.ebuild 1880 BLAKE2B 5d28f6333392f64f9ca59e3208f48e535164608cf3af0b46472a94f986989e9461b784e21506f7c14c9ec7563eb08e9fca4b7933e0e9886b5d6f74a2a6e99317 SHA512 238539a783c20b69f3c3b8f160ca9e9f48c69ff3bad4b175784544b505125d25f8947f28825eddbd30722b8a732f970b4c10d353373f061c4da1c80184e06bcd
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.4.5.ebuild b/app-admin/vault/vault-1.4.5.ebuild
deleted file mode 100644
index 671178b25133..000000000000
--- a/app-admin/vault/vault-1.4.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+webui"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-i Makefile || die
-	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
-		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
-			die "mv failed"
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOFLAGS="-mod=vendor" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-	go-module_pkg_postinst
-}
diff --git a/app-admin/vault/vault-1.4.7.ebuild b/app-admin/vault/vault-1.4.7.ebuild
index d7f0e36a12fb..671178b25133 100644
--- a/app-admin/vault/vault-1.4.7.ebuild
+++ b/app-admin/vault/vault-1.4.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+webui"
 
 BDEPEND="dev-go/gox"
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /app-admin
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)