gentoo resync : 16.04.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-04-16 13:07:24 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-04-16 13:07:24 +0100
commit: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch)
tree: 464c922e949c7e4d5d891fb2cdda5daee5612537 /app-admin
parent: e68d405c5d712af4387159df07e226217bdda049 (diff)
45 files changed, 154 insertions, 1280 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 0bc1ea49e6ec..1ae1d1b8cae1 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 791b02782bdf..c06c11318144 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,6 +1,4 @@
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
-DIST httpd-2.4.52.tar.bz2 7439184 BLAKE2B caa3f96226eeaf2f7ab625a73e820e7c6c5661a80983fa1cd2f4ab5366fcad03e1f47ad02ab060662ceb941fc777b1fb8a269ec5f0d9c6f7a3d93756e995d713 SHA512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6
 DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727 SHA512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756
-EBUILD apache-tools-2.4.52.ebuild 2422 BLAKE2B 0214e302367ab16e6ae8d4ae2870fa3337b6b68648a13ca9c93edd7612b3e9c9f7ec21a7b87b7f673f0df906c3a7ec08938f3c06ae1541f164f92c30b6715baf SHA512 bc3bb6c35a9021b9e1c880fe4a3e572d93f042a8fc639f0fa692395a7c71841787c8c796d0d65ba8de4c6f5cbf08225dfd7702cbd1d0061e707de028cdf33cda
 EBUILD apache-tools-2.4.53.ebuild 2422 BLAKE2B 0214e302367ab16e6ae8d4ae2870fa3337b6b68648a13ca9c93edd7612b3e9c9f7ec21a7b87b7f673f0df906c3a7ec08938f3c06ae1541f164f92c30b6715baf SHA512 bc3bb6c35a9021b9e1c880fe4a3e572d93f042a8fc639f0fa692395a7c71841787c8c796d0d65ba8de4c6f5cbf08225dfd7702cbd1d0061e707de028cdf33cda
 MISC metadata.xml 469 BLAKE2B d94d7a27ad1d65eb651c92ff82f5e8f4181737a65ad8dae29843693c4fd639d15b82e419f39ff12273c964b2cd4cbb6eb9850ef358e02b6ebe6a25a2fe2f5877 SHA512 409c831b4c337d40b71fd41a48c5aa9ad4e922baa86d931e3aa2bd556c2312154022fa5297daa03084da08d7f9739e37be87446f25c784c30b3df992b0165189
diff --git a/app-admin/apache-tools/apache-tools-2.4.52.ebuild b/app-admin/apache-tools/apache-tools-2.4.52.ebuild
deleted file mode 100644
index 5cf22201f1c9..000000000000
--- a/app-admin/apache-tools/apache-tools-2.4.52.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-	dev-libs/apr-util:1=
-	dev-libs/expat
-	dev-libs/libpcre
-	virtual/libcrypt:=
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
-	default
-
-	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF >"${T}"/pcre-config
-	#!/bin/bash
-	flags=()
-	for flag; do
-		if [[ ${flag} == "--version" ]]; then
-			flags+=( --modversion )
-		else
-			flags+=( "${flag}" )
-		fi
-	done
-	exec ${PKG_CONFIG} libpcre "${flags[@]}"
-	EOF
-	chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	tc-export PKG_CONFIG
-
-	local myeconfargs=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-		--sbindir="${EPREFIX}"/usr/sbin
-		--with-z="${EPREFIX}"/usr
-		--with-apr="${SYSROOT}${EPREFIX}"/usr
-		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
-		--with-pcre="${T}"/pcre-config
-		$(use_enable ssl)
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-	)
-	# econf overwrites the stuff from config.layout.
-	ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
-	econf "${myeconfargs[@]}"
-	sed -i \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-	emake -C support
-}
-
-src_install() {
-	emake -C support DESTDIR="${D}" install
-	dodoc CHANGES
-	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		docs/man/{htcacheclean,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${ED}"/usr/sbin >/dev/null || die
-	local i
-	for i in *; do
-		dosym ${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl ; then
-		dosym ab /usr/bin/ab-ssl
-		dosym ab /usr/bin/ab2-ssl
-	fi
-}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 12c99aeda3bf..548b2bd055e6 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,27 +1,19 @@
-DIST awscli-1.22.63.tar.gz 2167746 BLAKE2B e72126578c9bac30c6d66bdd178961a7a36a045788d8079e8f0ab4c85d18c29454255a13f089c03ef53bdce0949d168c858d03b59cf5d5326fb3de9925a3f487 SHA512 4d8a6ee8b81445fbb51dbb31e899bebb5610b0a1291654eb9b6555685dcb85528c2b928f587d9ff98507f60d2b199ac71c48f6e204e7eb2ce2ba5d7abdd31ec0
-DIST awscli-1.22.70.tar.gz 2177284 BLAKE2B 1ba770ba1b1404d6ff31d95ee198cba41321fe79d618d8b2ab8258da75f9cc56d5af95851dbed837b65e4fdbd82193639da5614551fe2d7f0ebc20df44531615 SHA512 0f246e82cee70b8d16e1fc7e30aae67554f5186eb2a0251295b25eafe23d7b29293059be7ebffbe7a45c665d0bae210699093b86bf7b3e188017018d8329af84
 DIST awscli-1.22.77.tar.gz 2179996 BLAKE2B fec49002841fa634bd2b7ae72f534bda875d69169179bbeb85eac18f2d9e9102121b6c0d73d8c7132ac0a6b8e5a8a39cea258d90c15f90b29b44d12ed509cfd1 SHA512 0fa89b6a2dd9dfc7e7be713c10b7470ad8fe8877a7fa9712510254cfbef36771f9e2541adfef9366e13e2273a373c2b88730572f7f1ad79c19f67e57c17e6631
-DIST awscli-1.22.80.tar.gz 2182289 BLAKE2B 632aa3806ffc6924b9d359f437b89f4c494065ee57f352c4ea83c1c6a012090ae3bf050eb633708fca9e50dd53205bfa3c838ee5c64088a253b7d2ad9fcb4427 SHA512 a35214dc4dc6280c2774f0423af1a933260bc9ef718ec1779b50d52c5b47d05034f8a8ff327c01af59b3490acd5dad3921535ec848c00885136fdb7909bbeb75
-DIST awscli-1.22.81.tar.gz 2182494 BLAKE2B 57f62fc372f065f7b7c3a7b7b4fe32fed1bdb439d2abb8070d0383bede89ece50016b92ecd48c0b6b9b258a56843a0989bca63c49f41923b702b38c5d5a09daf SHA512 ef2b452ac579730eb37796b55e3214df10df54307c826773f4c8334270eb08d1d72a5de468c1e058ce72cc92c93e913c8d9e764b74af0fc35ba078b190af5364
 DIST awscli-1.22.82.tar.gz 2182473 BLAKE2B 0d73e62f7c394c1ac77f6b011e2303d9b48b8fd6d874360aef6b2fc4378feb8f9fa04b88e9c1ee8cf0cb5fb7d1884d4a08eee64093c151de274c1aa50777ebf3 SHA512 195061199fa3ed24b5be2a22a5d0ee2891bfb616239aaf54e5aa8715b3374e68edad613ea6e6b71a165e501b5a009856993259de3ac57f14ff3cd2a39453ec38
-DIST awscli-1.22.83.tar.gz 2182511 BLAKE2B 45e4868e83d130bee6c5a7cb59792d4d66e76d3c1ac14a5c99f49f3f93461970ba881a515b4816374baea81250733d061a8618ca8244b9fb4bbd289b67b0c7fd SHA512 dc24134650aceb45e035d6009cafd353aef9cf08a8db00d7bdfa4e7a0056bcf3ded50b94086fae8ca70ff349cf880ad75ef756748f8f70d84b2bb5397d6685bd
-DIST awscli-1.22.84.tar.gz 2182437 BLAKE2B 0b61b6d96da302c95c83bdeedfa14abbcacb1cb3f1a320faa8ca2ee275e43407c0c109c73b7e39879002a920a100a9808fd74582b0620b97534a8eb0deef54a2 SHA512 14054f90c0d4e000869bd6313f61241a736474faf79b8e5768f5e0aadf7230fc6c8441f5c332a1ee4dc22e0023416713d89cde96a4fff4d83ab6826748aaff53
-DIST awscli-1.22.85.tar.gz 2183008 BLAKE2B c1fe5dd82331a3b1618d34d739803058c7422087b64959bbccdc0408852ae2f0d5b9a423925176468131befeba25cb035b73e6264e3fb17e5237c407b7e7b342 SHA512 fe767ecddf2979af0d817bd4276737c5372293c27ccec1844e54c2a0f46fc061fceb6cccafc5ef47f17f65d5b77d9ac4189e17e077736c4ad5dd72ecef4b556c
-DIST awscli-1.22.86.tar.gz 2184477 BLAKE2B fee34978cef17a0b4f51a9a110836882e11641914f7b2569dc2ce35be705abab16eda68a5706fa8c2bf24ee1c018c97d785296cec31c52aeb5bdf40511475fb9 SHA512 640de79a71459f3532c1d03ce6708a279e3a56e6f13dc3f72d73ced6888d8e30abe02806f6bee1ed04d7d909a667805daeeffaea9829e97b0f1447330d2d0a56
 DIST awscli-1.22.87.tar.gz 2185493 BLAKE2B 5d274e0c9483b22e664ad6de8710c04cc99f854b7c1efdac6dd4164deab47dc55d35520b34b276f8b4de1ee8b1ed10205b1806a31fc776d17b289a5e29277016 SHA512 c117fb8f89680836206f678637fb480ffd06db2225533bff75686eb8c1bd6e450297adb11863247441eeed67744b13930c0f62afce1dd12527d06d4e2eb58a4b
-DIST awscli-1.22.88.tar.gz 2185767 BLAKE2B cf7d161ae781f9a66053a0b0b65c9fdfe9048c924c46b3052ac6c1156bfaa67adba46f36dfa5a7b12686106af1c928450acc10fe03e9c442286a9a5662d992db SHA512 d5d8fcf05322413ba817f9d5f86d8c7e3863d769f9e9ec298ebb686729273ca82a90bf78eb09ac15ba65bc0b68435394d141210ffdcf55bbe7468a62b49a4113
-DIST awscli-1.22.89.tar.gz 2186269 BLAKE2B 8b3019cfc585f53145bdbd4342182747cb34dfb3ec75c3cdf7f01e6d4482ac115cdbcf9f077c07fbe0e7e3b312824b6c635165cfafd6b5e19d87b51350e6fcc7 SHA512 90580cdb7a82a14af5d0abc4b67f6ca3e1cd4a2ab68240e54d23a83b52af512b3452498c3baf2e54f9c24dc1243be66cf3f418dcfa4712e312f6bb41624478ad
-EBUILD awscli-1.22.63.ebuild 1839 BLAKE2B f7e466a4f36db6c84df8c93c9d8ad959a1eb4595325656607eccf73464c93bf49a7d2dae2568bcfe966444117fb9ae68239be0b76a2c83c004a063c483f02862 SHA512 c5c5d8b04c5097135c4ec0bacf1a7a0c9d801af900bd549d76e3da33ab7b8b65d470af5c7420c14e93f867398c7f3ae2ef4e9d8a55328573b2167ce255893697
-EBUILD awscli-1.22.70.ebuild 1841 BLAKE2B 17bc1585f68744ac39fbadcfb106022e2d6c274fcc7c28151bd069c19aa4f9263af9f8ceb834113b8263228a2a5addfa14c58e65bffe22a2d8743734fe0a50a8 SHA512 1c98e9021e1c4ab175e67c06cf13f83b267f29723d6b651c0277a28701c1ad53edb6aa2833d0cf65e88d30deb35becffe286b9dc1e0093fb298760f890cbc773
-EBUILD awscli-1.22.77.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
-EBUILD awscli-1.22.80.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
-EBUILD awscli-1.22.81.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
+DIST awscli-1.22.90.tar.gz 2186538 BLAKE2B 16b1942ee9fa65240a1b8b045b8e3e8659cc299a4cf52a876dae5cdc28088e7d6380c7961934fec590481aab5e71f60d08b21aac620a4485aa5872402c696549 SHA512 ef45718ebc2460e431f5177919a9d2e3de12dd68c9043b27f83ffb589672594fe7116ceed3b5e2fd62d502557a965cd0a3baf4af4de58c4a3176e39ba96e7076
+DIST awscli-1.22.91.tar.gz 2186925 BLAKE2B e7f6b4a5dce1b0f2752621628a28c7af75ce175b268c1b87a6516ad4bbc83738afdbef52d23e050febd3c351006aad2ecec9ce6d3052454b4f9352d3d5cde143 SHA512 b14e1d2da753ded2e90d72619ab205d9af6ec561cf01a8cbb09931a70338e50a8efe4555633f695ab4a486670e31e48ee1eba13e3943a728502e3aa0783f4c51
+DIST awscli-1.22.92.tar.gz 2187466 BLAKE2B 570e2fbb3efa0cf1664acbe6cd995799b98142ccea4fb36a967e3b3a77da4947295b4c0c9376a6c8780c0c9109ebe2e1a5e24dfd6cfb758960a6df24b8296f0c SHA512 022b9c12a71eaf62a6bea30df33d9f30ee309c77690cb6b08b770e987adf3e5cf8581b0a097c0f4466c73e82d1daacc42cd73eff48390ef3c5ca3cc49bc37a23
+DIST awscli-1.22.93.tar.gz 2187925 BLAKE2B c4b13aada04aea6b320c9b93c83cce11a4081e6b13cb7e3a83f2ee2ba651de4dbf636cfaefeee049a5ab91519bbfa6bbea37bd5a0a06a84979684bbf7c90c65c SHA512 c13d363ffff11fe30d3b78966caebb9026bcdbb4a6b9eb6e641de4955f9f360b6a4ecae25e1315d3e4943ea341f0f4c3be2aacf5849be3906d1fb0b0a9102490
+DIST awscli-1.22.94.tar.gz 2194607 BLAKE2B 985ce46ac8c3a12abc983fda4d424dbfa5c5da26c5552af9895079bc1aaa925e7f0c35f469f6b7f917007e162ce340adc68e4ae1c79f72c673bdf965ee550cfa SHA512 d34ad97d50de64591f0239de94b81d2ab77f8f4e284a356abe684bcd4c4d8f4a2d5e47d67e7b59322898d4f5b3503991eb550a424f894001aec547fe07e58923
+DIST awscli-1.22.96.tar.gz 2195648 BLAKE2B 57793e65d63151b150015ef90784140a9d473618849500d81bcb94582c5bc7a66b52337148b3f5c4c6b7196d2ab302fa0592dda3d83f2ff3d4fe845d687d18cf SHA512 71fb2bbc3586868566996cb807d01e582d181d96e52754c7052fc93040124ac7a73813f10fb1b660458772155aaa4f0a4294a583d429717e0bf1f6b785f5b963
+EBUILD awscli-1.22.77.ebuild 1840 BLAKE2B c971ef2962a96c2bee44c5c4f6ad48334b80075026d5a15c9195e41622b36d96aae1280575a0617bbce48ab850f86ca66411e65ca0e835a077894f75337c8800 SHA512 f052b538083477f4d29d9e5f0b03add868170bddda3a4a86eeefe4dd92308b08826b85c0f3300b06c2da7977b0fcfe5f21f5d75a58db38b93a842a3fef47a773
 EBUILD awscli-1.22.82.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
-EBUILD awscli-1.22.83.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
-EBUILD awscli-1.22.84.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
-EBUILD awscli-1.22.85.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
-EBUILD awscli-1.22.86.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
 EBUILD awscli-1.22.87.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
-EBUILD awscli-1.22.88.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
-EBUILD awscli-1.22.89.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
+EBUILD awscli-1.22.90.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
+EBUILD awscli-1.22.91.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
+EBUILD awscli-1.22.92.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
+EBUILD awscli-1.22.93.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
+EBUILD awscli-1.22.94.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
+EBUILD awscli-1.22.96.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.22.63.ebuild b/app-admin/awscli/awscli-1.22.63.ebuild
deleted file mode 100644
index e522a0ce8661..000000000000
--- a/app-admin/awscli/awscli-1.22.63.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.70.ebuild b/app-admin/awscli/awscli-1.22.70.ebuild
deleted file mode 100644
index 21a285d18863..000000000000
--- a/app-admin/awscli/awscli-1.22.70.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.77.ebuild b/app-admin/awscli/awscli-1.22.77.ebuild
index 2040c8cb81d2..78fdd937eb64 100644
--- a/app-admin/awscli/awscli-1.22.77.ebuild
+++ b/app-admin/awscli/awscli-1.22.77.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/aws-cli-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # awscli 1.22.55 → botocore 1.24.0
 # so botocore is x.(y+2).(z-55)
diff --git a/app-admin/awscli/awscli-1.22.88.ebuild b/app-admin/awscli/awscli-1.22.88.ebuild
deleted file mode 100644
index 2040c8cb81d2..000000000000
--- a/app-admin/awscli/awscli-1.22.88.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.89.ebuild b/app-admin/awscli/awscli-1.22.89.ebuild
deleted file mode 100644
index 2040c8cb81d2..000000000000
--- a/app-admin/awscli/awscli-1.22.89.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# awscli 1.22.55 → botocore 1.24.0
-# so botocore is x.(y+2).(z-55)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.22.80.ebuild b/app-admin/awscli/awscli-1.22.90.ebuild
index 2040c8cb81d2..2040c8cb81d2 100644
--- a/app-admin/awscli/awscli-1.22.80.ebuild
+++ b/app-admin/awscli/awscli-1.22.90.ebuild
diff --git a/app-admin/awscli/awscli-1.22.81.ebuild b/app-admin/awscli/awscli-1.22.91.ebuild
index 2040c8cb81d2..2040c8cb81d2 100644
--- a/app-admin/awscli/awscli-1.22.81.ebuild
+++ b/app-admin/awscli/awscli-1.22.91.ebuild
diff --git a/app-admin/awscli/awscli-1.22.83.ebuild b/app-admin/awscli/awscli-1.22.92.ebuild
index 2040c8cb81d2..2040c8cb81d2 100644
--- a/app-admin/awscli/awscli-1.22.83.ebuild
+++ b/app-admin/awscli/awscli-1.22.92.ebuild
diff --git a/app-admin/awscli/awscli-1.22.84.ebuild b/app-admin/awscli/awscli-1.22.93.ebuild
index 2040c8cb81d2..2040c8cb81d2 100644
--- a/app-admin/awscli/awscli-1.22.84.ebuild
+++ b/app-admin/awscli/awscli-1.22.93.ebuild
diff --git a/app-admin/awscli/awscli-1.22.85.ebuild b/app-admin/awscli/awscli-1.22.94.ebuild
index 2040c8cb81d2..2040c8cb81d2 100644
--- a/app-admin/awscli/awscli-1.22.85.ebuild
+++ b/app-admin/awscli/awscli-1.22.94.ebuild
diff --git a/app-admin/awscli/awscli-1.22.86.ebuild b/app-admin/awscli/awscli-1.22.96.ebuild
index 2040c8cb81d2..2040c8cb81d2 100644
--- a/app-admin/awscli/awscli-1.22.86.ebuild
+++ b/app-admin/awscli/awscli-1.22.96.ebuild
diff --git a/app-admin/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest
index 20027210744d..dc574024ffb3 100644
--- a/app-admin/bitwarden-desktop-bin/Manifest
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@@ -1,5 +1,5 @@
-DIST Bitwarden-1.28.3-amd64.deb 58747514 BLAKE2B 5d62084e89df9ac1b2f3b487d8594f5cd5e9fd411b46d95bc0310f27e772d4f7185507610c204f345f24defd5f87c954381c14427d4a7b69d51737b71cc61474 SHA512 7d061ae18a11c733a72fbb0e657c5f14d04054ae97720c3920d9641c880aea2de5638b908719a1fb4d8c23f32b49697cfa7994732441135007cdf2572bf41cfb
 DIST Bitwarden-1.30.0-amd64.deb 60998388 BLAKE2B 72731519bdf14153e0c7db85c200d8c67a07113f68078a22c29b2160ba49da0e3813676a2813a4fa62e8e927d375ed2c2eb43252a12435483fd998f22b720c60 SHA512 d44dea61c618bed9ddebbd7cf5cb76ea260e119486944ed9a8e252dc96b571a61216fcb0d7f570dd7eb0b6f50a5c6aac3148375145dd5cf6678993e7ff83f24b
-EBUILD bitwarden-desktop-bin-1.28.3.ebuild 1616 BLAKE2B 4f96e3465c021629dc2ac80b0675e3fa45ecd91eccd0c0b8f96be54b34f0fa6ceec92ce65f4615dc51d07c7d7d9246af6aaf2184edc7d96cb91fbb3f0ae11bbd SHA512 f45dbdc0caf5ab08b425c2b9f209c9564cc6a24218d8ed7f28734b4beedc03b60499fd7e4f7c7a4890c9ed9117de14536a8ee0578c05a357df60327182c18f6e
+DIST Bitwarden-1.32.1-amd64.deb 72752286 BLAKE2B f7ea64bacb85820872c026d4f4bc6e7b70533bc64af85cea71beac4cf5da559a2178775a2eb31c805837ec5b7fc853c5c097fe3fa71bebf796ea165f62723a4b SHA512 514e9da98a4987d7a65e4b8a5f00fe9154a5e7558edc8d14360a1e7e21a24d4ad2ee82c38b029976d6671af991a82d54207cbfc73c7e246b7c18e5ddceb9394f
 EBUILD bitwarden-desktop-bin-1.30.0.ebuild 1661 BLAKE2B 9199f0a289c649f8e24d909ad4fdb820d7ebb27d41401159ed33f57a49e28bf2ccd8654f2b465a1e06a6afa5b1568282d2c779002bbfb250763981bc7540eb4d SHA512 94971cfb181947c11b58bcdcb06f48df502b974ad7b0d8bb24e34bb2c8630a8045197df642a85ccbafbd0473a61395d7cd0e77b6566c065e5166d09ff841892b
+EBUILD bitwarden-desktop-bin-1.32.1.ebuild 1661 BLAKE2B 9199f0a289c649f8e24d909ad4fdb820d7ebb27d41401159ed33f57a49e28bf2ccd8654f2b465a1e06a6afa5b1568282d2c779002bbfb250763981bc7540eb4d SHA512 94971cfb181947c11b58bcdcb06f48df502b974ad7b0d8bb24e34bb2c8630a8045197df642a85ccbafbd0473a61395d7cd0e77b6566c065e5166d09ff841892b
 MISC metadata.xml 336 BLAKE2B f78a5036df5cc4dc407d59fbfb0900eceecb4532926d24e0b1c32371214742bbf7a5596c24c473bb4e85a864cac453128e52097024814aed9104753cf1061e20 SHA512 457031ca1a915ab598497cc84944a4c1379ab74df3c7cae62051258bbb0ffe64203dd71b19e698df9b0afc931d56d8bb910a9dcd40c29f8a00eb2abd759c41cd
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.28.3.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.32.1.ebuild
index d8293f57fe67..f20778c037c9 100644
--- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.28.3.ebuild
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.32.1.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 	dev-libs/atk
 	dev-libs/expat
 	dev-libs/glib
+	sys-libs/glibc
 	dev-libs/nspr
 	dev-libs/nss
 	media-libs/alsa-lib
@@ -46,6 +47,7 @@ RDEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/libXScrnSaver
+	x11-libs/libxshmfence
 	x11-libs/libXtst
 	x11-libs/pango
 "
@@ -55,7 +57,7 @@ IDEPEND="
 "
 
 QA_PREBUILT="
-	opt/Bitwarden/*.so
+	opt/Bitwarden/*.so*
 	opt/Bitwarden/bitwarden
 	opt/Bitwarden/chrome-sandbox
 "
@@ -70,7 +72,7 @@ src_install() {
 
 	local x
 	for x in 16 32 48 64 256 512; do
-		doicon -s ${x} data/icons/hicolor/${x}*/*
+		doicon -s ${x} usr/share/icons/hicolor/${x}*/*
 	done
 }
 
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index deb969321140..4aa173d62f05 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -9,10 +9,9 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa62
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip 2721920 BLAKE2B f3fde8f5cc53496dc314bcae822a415cf00950da0a03b968de00685371e7a2e84ffa304fb176e791c85c930728859687e768ff785829f0751ae919546bd3326d SHA512 8981a08b1ba0226854567b0977d8a349abe2b58420421ab1dccdaf9c98e7657cb2140ad1a38767d25cb54249b61f162ecd51d401374a29f7368a550b19196595
-DIST consul-1.10.9.tar.gz 32031057 BLAKE2B f23c954e01cb285f0217578b3ea36b37ca027f495ebf570d8d882de4247ca63b6e951f508c7282f0d841d1564abfccd3ae0181c674e320f2792ff0924f410ec5 SHA512 cd5f55bf67d05769f12157d8fe4eeb59bdde0e197044ad589a1baed661732ec22e2edb0baf375c7aa5b6be39edff4539561f1af8175a072aac5bd5e710a7bf08
-DIST consul-1.11.4.tar.gz 23685165 BLAKE2B 242ae0e24ea4c9713e9208f57c1ff9b71b35a2ee3678c689067932cd4b5233463da14edf7ec6aab1b8818df836f0f8f4ee9d52258ca58bc055248d390367e666 SHA512 1928c91cfb316228f77472e488fc697a3d798d270b57dec36c13734045eb87fc57ee3c6eeb8be0cab3a4af6f5f733512cd972420a175e6d33df053f7679bddab
-DIST consul-1.9.15.tar.gz 29464711 BLAKE2B 56136b86e4893c20e4e81d6f3bad9e2cda69ec60ae80c430d6f5ec633351da8c0d7da39df04b4138885f8a688af07a88098e96e91d1147af49d1642052670f45 SHA512 e8050bbc9d819ef26952a66adfd78efad2db4e1776bf02db041481cd74365d180da4ab07d63f4465ea7bf6dfcc5ea25770f2d12f68c010f810b7c2f1ae408c6b
-DIST consul-1.9.16.tar.gz 29470906 BLAKE2B ee0bb878511cd01dc59850d13382a6a29f7a99b6760bbe3961de6e79e2c7154667f73fe4f74ab36d449fbbeb6eeb59f44310362f1b0070256a54b8ded6f3fd8a SHA512 295ed82379604c0b33a0832795180f23f6f93bdbe451ba72ce539c5477eddf1f36da69cf81c7e8b01d98dc223eddaac6e77f99a24e3178710e69243972947377
+DIST consul-1.10.10.tar.gz 32035309 BLAKE2B 475f14df7679ebb758eaeabfa1c646b28d3435e8d80d39e088d50e89f598eed19ccab111cfacc5d1754aef20767dbdf5a08cd8bde463ae72b72dd6f383b74070 SHA512 d5fc7c3d5a27e12494277e0cbfd5e804b545d3e50b4f2e3bee93927b721c30b0ada8523e0cec3d049872b41ddbf8a5d275c5419a1da7edd5cccd41de2305d45e
+DIST consul-1.11.5.tar.gz 23701880 BLAKE2B 349a58600788ee6db37cc882019975890cdb58a56a6c89017e8e1a135a7209d3a801f0ed543b921f089613e8cb398f251f81f9a852cc5f31cc4040cff0b5149e SHA512 da940d4db6742f3f275f1dd2e8af39a5780b7be619b98995f87fc439d220633b37f43f1123a969425bae24545ec7204af3c0c92cd7debdd30a8a0cf938d03f51
+DIST consul-1.9.17.tar.gz 29480703 BLAKE2B c233eab63ea515f886234395100e47910c1acdefa0b29af5bbc96d6c078dae41e0cd4150e1f6f17daac972b3e66d3abe43b594a0c37bff790e43f0f3c0a20da2 SHA512 c859fbede7294884befd0c70469febed5a4269b21cb351f8619d13e3b29f9b8bdd8d18e9611ef34908fc54bd38f2fd0bbc6e96d4e08ab23da952c3db537fb92c
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip 34780090 BLAKE2B 7a465854f74837c79c1b2166116d89b2156645f9ae80b13f0cd860eafddd17caf1a34f7876f54c5ede094fe808eb39f4a1bec54e02efc53fd0bd897c80bde21f SHA512 88a7e1ba6ac2bd373d82f0a6381565c24014b0cd339efcd815ce93dc9f223354f561cbe7bd021fd5635599331a23b7e9ca084754325c68edeecd6f5e1cc47227
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv44.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
@@ -333,7 +332,6 @@ DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.mod 138 BLAKE2B d85f4eef3c91522fbdc57eb29bb343cbe7b478c1b7980160daa93c9171bacd92be319ea0bf49981d0ee77868ed4be6a78020768fd61aa5e24332d8eadff15c1f SHA512 501d255124e6f43485d797cabcd3943993165d31e7fa2058667bac5c2a3c6492d9bc5881573b68d6da0dad4329eeea02141430a6c24e81045c7636bedc1d161f
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.zip 14742 BLAKE2B e124179ca8fd3e17b471858642cb22b841d2c370cd17758bb8725b2a54641a916190f98a2e355b7233317efe1bfec474c7ccf23d853e44fbf683fc2cebc6608d SHA512 6cf9bc0a7851e19ef082b25c377e9b20791bb6a7f2091bc49eff12fd2fff5a698a1cdcda8a9f5b02bf536a372f00119bf6aa3c42f07370927a41b6fc4a42c401
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
-DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541b55472ef94a8d2606e9cccc82fc52d189e48bd94aef69871455088915595bcc21224ef7728750ac1ba8e3caef7c303446671416f71b74d03de647a3f23 SHA512 13275b8246248b1c3001acba9ea6178a10263fb8ff3cc205d2cccb86682eccad96695bac455a32f2407f7fbd9a4bc3b68cacab722bcc242c606248753efba3d1
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.3.0.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.3.1.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.3.1.zip 121178 BLAKE2B e90ab84a65c5d189b2284a7762693e6796fe71c544b84374209e610e736c7b783e95de28e64b8f8305f4c018610ec6172c23d2ded0ef3d3e3bb3ab00ebf84544 SHA512 ec1bc2e0c193fde6bf976064b466959ea5ff88c9e0a48a94119013a8fca332224ef9d58838195314873d894369c236f0a3f20fa847ab22cf3962a5b594037d6b
@@ -343,8 +341,8 @@ DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.0.mod 233 BLAKE2B 5a1324854b1f65c
 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.zip 157790 BLAKE2B 29623bc436d2a1f1057532b98858f3e3309a0ae1cb209ca9e242d56eba97b84ac2b2f3533a542df9cbc8dd5521c5a09747adee1e38d3f3ec2b6a5517a0713684 SHA512 c689267a27346d83ac054c5202746c69bf79e5accc69a07c833ab00fe4f2a780ccbf41ed62d50e411322e62ba6603031134662c9e0dca18cd1ec3a52179a062b
-DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.5.mod 233 BLAKE2B 5a1324854b1f65cb37077cee6097e04e24f099eb48355d84f8df7b82f5bc8b0ecf01021c63591cb83363c1b8156455ce86a0a2599f9ba6ec2a94fafd107df1ad SHA512 a687048d5ba12f826081a5c4c39501e0dfe949b98e7c8b4b4bfa2b9be27fb650d6fe8ec31ca379ab0c13b79909a1edbe1f410500651f7226206bd4e0d21eb296
-DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.5.zip 148889 BLAKE2B cf28852e75ec1c351b09f14713a4de4c9919efc8c348a49b460a54d13d8a7aaa4a4b9f5aeadbf10435c7f270377f63ba667710bdfefd513ef81d70f9abe107ce SHA512 b3f8f206bb93595938e62a16871cef2e3b66b7505693ee706f861aa32113e5d3017c15c6162c536aa49887d551e7ca454e3c298c268a2922fd2205ecdc1e1f31
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.6.mod 233 BLAKE2B 5a1324854b1f65cb37077cee6097e04e24f099eb48355d84f8df7b82f5bc8b0ecf01021c63591cb83363c1b8156455ce86a0a2599f9ba6ec2a94fafd107df1ad SHA512 a687048d5ba12f826081a5c4c39501e0dfe949b98e7c8b4b4bfa2b9be27fb650d6fe8ec31ca379ab0c13b79909a1edbe1f410500651f7226206bd4e0d21eb296
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.6.zip 152218 BLAKE2B 37d0241a458b32464368a56aee210b77b02649f1aa0bd240a04ff73538ee1b7ff63f878e1c2d5fd4756b9f6c9254f88da7b5998bfa986d953e0abfa8e6ac72cf SHA512 afcfc5a11aa56119379d8f2781de23899550eb2a1c9210efc55cf31ea900d76478938b2f4d85a87f83be12b36206f82ef14f084223e24c80eb8c6b8401a4ecd0
 DIST github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.mod 256 BLAKE2B 3011050c4c07a10c30d083c928a167fa6c7bcdad04d4591d23dd7f0e8e91d6c108e023da39c64664fa1c9edfd1cde9ee381fc136256e727cdb367e42b63d284c SHA512 5446adc8997410fdc10c3f8dbd8562a0d36e9033165e54b71fcd2cf844324e69f8c324a8e1016656224a552699e01054cb2a70d439578067d8fd64d7366dedc9
 DIST github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.zip 56923 BLAKE2B a3098f6fc5c3762d91392f6e106136a14759e63d60eaec20fdeaba8a7b741bac621b56146ccb2e86613c74c579bde762b5d91b53f474bb8d855919c4665c0c63 SHA512 38f275d7e3646b28a5a66ca8b118cf75d92340b7cd388db20ace9d8f6ceef44f08fb09693a9e16a63ed901a6a5f66d45303e708cdd2e028fe436c664269c3e84
 DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod 40 BLAKE2B 77f35128903a84139dfc23055bf87c4fd8b4843953c764f0ec004a8a2b10599de19bd767a569080422179bd8ad66218d3639025cf1d83eb5cab22599b5da2c3a SHA512 76ce93f04caa8045ed49fccbbbfe76fc278bb7d94c973e408d0695e8c9c5e569b3dc9d4af8722f13c4718753aa72fea76a238dc8243aff34bbfd10d4b684e38a
@@ -716,7 +714,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.zip 1691282 BLAKE2B 78c7b409246ba3b661bf900ec0bcc33a36c7dae1e8e9ec13c8fbfde43c7770364bd1b781e3b19b8e05ee520ee058b6b2d1b0b58a286d141a6ff5ac2b9cb94a1c SHA512 688cea2be2bf0c765846365d52f47ea7204d84c4ed65638005942132d9512df9a3fd66d179af8c01c86d317c628422591d9536be800b299f1bdf9d1e5f5aca28
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210816074244-15123e1e1f71.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211013075003-97ac67df715c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211013075003-97ac67df715c.zip 1667141 BLAKE2B fecd14c022856ab42ca581d5e292f4afbad9b7103079e3c8d9dd4a41446b9216fc2346c5d86ea3b34165df6caaff77bc73262c2e32dd4468045d38d6cdb3c36f SHA512 b64788260e4b7fc907d95f14f98f3101bd0763bbbe6ddc5d70a6b48dcab8e7d643543de81d326080523c5affb28f0d4b8a676aaad625ff90253834128940148c
@@ -842,8 +839,7 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
-EBUILD consul-1.10.9.ebuild 40604 BLAKE2B c9409c9d9256d6abdd9b75cc746554fae3c320b363ead486e857a7c49d4bdd924f92b304a2995c873de5246b69c5e6b1da6c19986888e32074350953b6297a34 SHA512 6da246c934ebe7b289a22af9613b9f9de4409ea68f720cb0cf0c74ba1d5a77864c12d1d68fac07d0967621e7abed68bc050b23fc9a2a3c8ac28be92a718aaf39
-EBUILD consul-1.11.4.ebuild 41048 BLAKE2B d4cb28e831e69cbd9ddeb6c630d53a8bd9f1002461a0b88d3a38932815ead04c0d9b17f010f6842cbe015f3043cdf8d30f7daf41d4aa900a715c42b777688de9 SHA512 5ddbd4ee471c24fc27f64710fea4c9370ce0ce43bbf981c3f585922624c3178082478011ab65135cf99d09251f05124427455f88083247379eefb7810e3bc662
-EBUILD consul-1.9.15.ebuild 40330 BLAKE2B d0054c731f2a04ec2463345e570b7b4a870b4ae5369f33f902d5855dad0eed5f8b149d75798655a0660cc924afe41938678a35ece9fa98b4d0dea02ab70c88d4 SHA512 517816f39cf6b804a8289901bf6dc3cfc1ea6fc6f49ea62facd8e3adb517251cbb6bdb0aedb8ad839969481de57d07bc12f854e5ce16e4a0d76892b07913f3ab
-EBUILD consul-1.9.16.ebuild 40331 BLAKE2B d68015cabdf71fc38ac05ce160ccac6589d66136463c145200851c4f763ba6295c6a371d48fd5482f8b57d840b5ee0f48a5fd7defd7a3fa97e1e11d67ed19b5d SHA512 abcc783c8adba239a93f6e29257f514fb7c92340152a0df4bccc253e813477ba048b4cdf3859157d4df90ddc605f7a90288afba377102842501c64cd7112b4e5
+EBUILD consul-1.10.10.ebuild 40604 BLAKE2B c6c3c28c7c7d697399359b2a0fab9fbce0f4e0aa3c8c7cf5fa0fb8f349fcdf06a109127ee0657894531d9ee5fe749847e55c43b7dcfa3b88256365af06f299e4 SHA512 b9b689fb329720c0628e107e2bc181b3358858e4f14b5c0b33d36b942e98ce79deb1a5cc4120114cd7df083b4545d48a48c36834b718ef2c28d69d8edb575f5f
+EBUILD consul-1.11.5.ebuild 41048 BLAKE2B ffb011f7ef080d447f5b4a8d6ac8e4a79670eaa3f3004864b52969099c514b683fb5332351336a533422cc516f2a3dd46a22f8e65c6198fedac9f37178fe63b9 SHA512 9c8b6f351b4f7f793a427995a4866c6993d280949a8c1ca377386f23bcda708daed6b0d169650ddb5d7a6775c46d2c248fa243b7554b03c38a12d61e086089ac
+EBUILD consul-1.9.17.ebuild 40439 BLAKE2B 2519e4a61a716616e2365d7dd0fac7ddc7c356dd24ed24227e4ff1944b4e740f7f175454cea15d9d76cf16c695f58926bcf920a31a9f0a331330aefd3c8c8aaf SHA512 d20e7704b2f3b67c8f94de249a231a6d4fdb53953e89f7d71af452546a03223ef96a9400345a4b2ce2f7d9af41f501cec7b68e631aadc9ca50bda99179e1168e
 MISC metadata.xml 392 BLAKE2B 4995d973307987bb70802d4328dbb1d5e052683a2e1900912b40be5e345969740b1df9e8e1b3bcbf76fb90066ed43ac5ce91e8e11a0ad19c9d587c7204f45419 SHA512 92d4589b5294df0ddcee6fbafa5db5288b3e892dbec6d84bf0e53beb2b0a30e385f9166c536462e51aeaa9ee8799dd1ae3634b7b13e452e3059ba2853c5b77f1
diff --git a/app-admin/consul/consul-1.10.9.ebuild b/app-admin/consul/consul-1.10.10.ebuild
index 526892347e11..fddc6677b03f 100644
--- a/app-admin/consul/consul-1.10.9.ebuild
+++ b/app-admin/consul/consul-1.10.10.ebuild
@@ -298,8 +298,8 @@ EGO_SUM=(
 "github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
 "github.com/hashicorp/raft v1.1.1/go.mod"
 "github.com/hashicorp/raft v1.2.0/go.mod"
-"github.com/hashicorp/raft v1.3.5"
-"github.com/hashicorp/raft v1.3.5/go.mod"
+"github.com/hashicorp/raft v1.3.6"
+"github.com/hashicorp/raft v1.3.6/go.mod"
 "github.com/hashicorp/raft-autopilot v0.1.5"
 "github.com/hashicorp/raft-autopilot v0.1.5/go.mod"
 "github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
diff --git a/app-admin/consul/consul-1.11.4.ebuild b/app-admin/consul/consul-1.11.5.ebuild
index 0ec8c90a849a..cf934d82ccaf 100644
--- a/app-admin/consul/consul-1.11.4.ebuild
+++ b/app-admin/consul/consul-1.11.5.ebuild
@@ -6,7 +6,7 @@ inherit go-module systemd
 
 DESCRIPTION="A tool for service discovery, monitoring and configuration"
 HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="944e8ce64201ab2bbe923b207883d08a4dcff73a"
+GIT_COMMIT="d8983fc97f1878368692e5c41601aed8ab8dc3dd"
 
 # Upstream doesn't use "-mod=vendor" in their build system, and the
 # vendor directory is incomplete.
@@ -303,8 +303,8 @@ EGO_SUM=(
 "github.com/hashicorp/raft v1.1.0/go.mod"
 "github.com/hashicorp/raft v1.1.1/go.mod"
 "github.com/hashicorp/raft v1.2.0/go.mod"
-"github.com/hashicorp/raft v1.3.5"
-"github.com/hashicorp/raft v1.3.5/go.mod"
+"github.com/hashicorp/raft v1.3.6"
+"github.com/hashicorp/raft v1.3.6/go.mod"
 "github.com/hashicorp/raft-autopilot v0.1.5"
 "github.com/hashicorp/raft-autopilot v0.1.5/go.mod"
 "github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
diff --git a/app-admin/consul/consul-1.9.16.ebuild b/app-admin/consul/consul-1.9.16.ebuild
deleted file mode 100644
index a73fdaf1dff4..000000000000
--- a/app-admin/consul/consul-1.9.16.ebuild
+++ /dev/null
@@ -1,793 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-
-# Upstream doesn't use "-mod=vendor" in their build system, and the
-# vendor directory is incomplete.
-# On the next bump, remove this if they have added "-mod=vendor"
-EGO_SUM=(
-"cloud.google.com/go v0.26.0/go.mod"
-"cloud.google.com/go v0.34.0/go.mod"
-"cloud.google.com/go v0.38.0"
-"cloud.google.com/go v0.38.0/go.mod"
-"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
-"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
-"github.com/Azure/go-autorest/autorest v0.10.0"
-"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.2"
-"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.2.0"
-"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
-"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/to v0.3.0"
-"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/validation v0.2.0"
-"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-"github.com/Azure/go-autorest/logger v0.1.0"
-"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-"github.com/Azure/go-autorest/tracing v0.5.0"
-"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-"github.com/BurntSushi/toml v0.3.1/go.mod"
-"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
-"github.com/DataDog/datadog-go v3.2.0+incompatible"
-"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
-"github.com/Microsoft/go-winio v0.4.3"
-"github.com/Microsoft/go-winio v0.4.3/go.mod"
-"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-"github.com/NYTimes/gziphandler v1.0.1"
-"github.com/NYTimes/gziphandler v1.0.1/go.mod"
-"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
-"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
-"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-"github.com/armon/go-metrics v0.3.0/go.mod"
-"github.com/armon/go-metrics v0.3.6"
-"github.com/armon/go-metrics v0.3.6/go.mod"
-"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-"github.com/armon/go-radix v1.0.0"
-"github.com/armon/go-radix v1.0.0/go.mod"
-"github.com/aws/aws-sdk-go v1.25.37/go.mod"
-"github.com/aws/aws-sdk-go v1.25.41"
-"github.com/aws/aws-sdk-go v1.25.41/go.mod"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-"github.com/beorn7/perks v1.0.0/go.mod"
-"github.com/beorn7/perks v1.0.1"
-"github.com/beorn7/perks v1.0.1/go.mod"
-"github.com/bgentry/speakeasy v0.1.0"
-"github.com/bgentry/speakeasy v0.1.0/go.mod"
-"github.com/boltdb/bolt v1.3.1"
-"github.com/boltdb/bolt v1.3.1/go.mod"
-"github.com/census-instrumentation/opencensus-proto v0.2.1"
-"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-"github.com/cespare/xxhash v1.1.0"
-"github.com/cespare/xxhash v1.1.0/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
-"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-"github.com/chzyer/logex v1.1.10/go.mod"
-"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-"github.com/circonus-labs/circonusllhist v0.1.3"
-"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-"github.com/client9/misspell v0.3.4/go.mod"
-"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
-"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
-"github.com/cockroachdb/apd v1.1.0/go.mod"
-"github.com/coredns/coredns v1.1.2"
-"github.com/coredns/coredns v1.1.2/go.mod"
-"github.com/coreos/bbolt v1.3.2/go.mod"
-"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
-"github.com/coreos/go-oidc v2.1.0+incompatible"
-"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
-"github.com/coreos/go-semver v0.2.0/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
-"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-"github.com/davecgh/go-spew v1.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.1"
-"github.com/davecgh/go-spew v1.1.1/go.mod"
-"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
-"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-"github.com/digitalocean/godo v1.1.1/go.mod"
-"github.com/digitalocean/godo v1.10.0"
-"github.com/digitalocean/godo v1.10.0/go.mod"
-"github.com/dimchansky/utfbom v1.1.0"
-"github.com/dimchansky/utfbom v1.1.0/go.mod"
-"github.com/dnaeon/go-vcr v1.0.1"
-"github.com/dnaeon/go-vcr v1.0.1/go.mod"
-"github.com/docker/go-connections v0.3.0"
-"github.com/docker/go-connections v0.3.0/go.mod"
-"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-"github.com/dustin/go-humanize v1.0.0/go.mod"
-"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
-"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
-"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.5"
-"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-"github.com/fatih/color v1.7.0/go.mod"
-"github.com/fatih/color v1.9.0"
-"github.com/fatih/color v1.9.0/go.mod"
-"github.com/fatih/structs v1.1.0/go.mod"
-"github.com/frankban/quicktest v1.11.0"
-"github.com/frankban/quicktest v1.11.0/go.mod"
-"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-"github.com/ghodss/yaml v1.0.0/go.mod"
-"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
-"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
-"github.com/go-kit/kit v0.8.0/go.mod"
-"github.com/go-kit/kit v0.9.0/go.mod"
-"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
-"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-"github.com/go-logr/logr v0.1.0/go.mod"
-"github.com/go-ole/go-ole v1.2.4"
-"github.com/go-ole/go-ole v1.2.4/go.mod"
-"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-"github.com/go-stack/stack v1.8.0/go.mod"
-"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
-"github.com/go-test/deep v1.0.2"
-"github.com/go-test/deep v1.0.2/go.mod"
-"github.com/gogo/protobuf v1.1.1/go.mod"
-"github.com/gogo/protobuf v1.2.1/go.mod"
-"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
-"github.com/gogo/protobuf v1.3.2"
-"github.com/gogo/protobuf v1.3.2/go.mod"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
-"github.com/golang/mock v1.1.1/go.mod"
-"github.com/golang/mock v1.2.0/go.mod"
-"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/protobuf v1.3.5"
-"github.com/golang/protobuf v1.3.5/go.mod"
-"github.com/golang/snappy v0.0.1"
-"github.com/golang/snappy v0.0.1/go.mod"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-"github.com/google/btree v1.0.0"
-"github.com/google/btree v1.0.0/go.mod"
-"github.com/google/go-cmp v0.2.0/go.mod"
-"github.com/google/go-cmp v0.3.0/go.mod"
-"github.com/google/go-cmp v0.3.1/go.mod"
-"github.com/google/go-cmp v0.4.0/go.mod"
-"github.com/google/go-cmp v0.5.2"
-"github.com/google/go-cmp v0.5.2/go.mod"
-"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
-"github.com/google/go-querystring v1.0.0"
-"github.com/google/go-querystring v1.0.0/go.mod"
-"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/google/gofuzz v1.2.0"
-"github.com/google/gofuzz v1.2.0/go.mod"
-"github.com/google/martian v2.1.0+incompatible/go.mod"
-"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22"
-"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod"
-"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
-"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
-"github.com/google/uuid v1.1.1/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.5"
-"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-"github.com/googleapis/gnostic v0.2.0"
-"github.com/googleapis/gnostic v0.2.0/go.mod"
-"github.com/gophercloud/gophercloud v0.1.0"
-"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-"github.com/gorilla/websocket v1.4.0/go.mod"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-"github.com/hashicorp/errwrap v1.0.0"
-"github.com/hashicorp/errwrap v1.0.0/go.mod"
-"github.com/hashicorp/go-bexpr v0.1.2"
-"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
-"github.com/hashicorp/go-checkpoint v0.5.0"
-"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.1"
-"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-"github.com/hashicorp/go-connlimit v0.3.0"
-"github.com/hashicorp/go-connlimit v0.3.0/go.mod"
-"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
-"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
-"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-"github.com/hashicorp/go-hclog v0.9.1/go.mod"
-"github.com/hashicorp/go-hclog v0.9.2/go.mod"
-"github.com/hashicorp/go-hclog v0.12.0/go.mod"
-"github.com/hashicorp/go-hclog v0.14.1"
-"github.com/hashicorp/go-hclog v0.14.1/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.3.0"
-"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod"
-"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
-"github.com/hashicorp/go-memdb v1.3.0"
-"github.com/hashicorp/go-memdb v1.3.0/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.5"
-"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
-"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-"github.com/hashicorp/go-multierror v1.1.0"
-"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-"github.com/hashicorp/go-raftchunking v0.6.1"
-"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.6.7"
-"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.2"
-"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.2"
-"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
-"github.com/hashicorp/go-syslog v1.0.0"
-"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-"github.com/hashicorp/go-uuid v1.0.2"
-"github.com/hashicorp/go-uuid v1.0.2/go.mod"
-"github.com/hashicorp/go-version v1.1.0/go.mod"
-"github.com/hashicorp/go-version v1.2.1"
-"github.com/hashicorp/go-version v1.2.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.4"
-"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-"github.com/hashicorp/hcl v1.0.0"
-"github.com/hashicorp/hcl v1.0.0/go.mod"
-"github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038"
-"github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038/go.mod"
-"github.com/hashicorp/logutils v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.1/go.mod"
-"github.com/hashicorp/mdns v1.0.4"
-"github.com/hashicorp/mdns v1.0.4/go.mod"
-"github.com/hashicorp/memberlist v0.2.2"
-"github.com/hashicorp/memberlist v0.2.2/go.mod"
-"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
-"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
-"github.com/hashicorp/raft v1.1.1/go.mod"
-"github.com/hashicorp/raft v1.2.0"
-"github.com/hashicorp/raft v1.2.0/go.mod"
-"github.com/hashicorp/raft-autopilot v0.1.5"
-"github.com/hashicorp/raft-autopilot v0.1.5/go.mod"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
-"github.com/hashicorp/serf v0.9.5"
-"github.com/hashicorp/serf v0.9.5/go.mod"
-"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086"
-"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod"
-"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267"
-"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493"
-"github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493/go.mod"
-"github.com/hpcloud/tail v1.0.0/go.mod"
-"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
-"github.com/imdario/mergo v0.3.5/go.mod"
-"github.com/imdario/mergo v0.3.6"
-"github.com/imdario/mergo v0.3.6/go.mod"
-"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
-"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
-"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
-"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-"github.com/jonboulle/clockwork v0.1.0/go.mod"
-"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
-"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
-"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
-"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-"github.com/json-iterator/go v1.1.6/go.mod"
-"github.com/json-iterator/go v1.1.7/go.mod"
-"github.com/json-iterator/go v1.1.9"
-"github.com/json-iterator/go v1.1.9/go.mod"
-"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-"github.com/kisielk/errcheck v1.1.0/go.mod"
-"github.com/kisielk/errcheck v1.2.0/go.mod"
-"github.com/kisielk/errcheck v1.5.0/go.mod"
-"github.com/kisielk/gotool v1.0.0/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
-"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pretty v0.2.0/go.mod"
-"github.com/kr/pretty v0.2.1"
-"github.com/kr/pretty v0.2.1/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/text v0.1.0"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/lib/pq v1.1.1/go.mod"
-"github.com/linode/linodego v0.7.1"
-"github.com/linode/linodego v0.7.1/go.mod"
-"github.com/magiconair/properties v1.8.0/go.mod"
-"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-"github.com/mattn/go-colorable v0.0.9/go.mod"
-"github.com/mattn/go-colorable v0.1.4/go.mod"
-"github.com/mattn/go-colorable v0.1.6"
-"github.com/mattn/go-colorable v0.1.6/go.mod"
-"github.com/mattn/go-isatty v0.0.3/go.mod"
-"github.com/mattn/go-isatty v0.0.8/go.mod"
-"github.com/mattn/go-isatty v0.0.10/go.mod"
-"github.com/mattn/go-isatty v0.0.11/go.mod"
-"github.com/mattn/go-isatty v0.0.12"
-"github.com/mattn/go-isatty v0.0.12/go.mod"
-"github.com/mattn/go-runewidth v0.0.3/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-"github.com/miekg/dns v1.0.14/go.mod"
-"github.com/miekg/dns v1.1.26/go.mod"
-"github.com/miekg/dns v1.1.41"
-"github.com/miekg/dns v1.1.41/go.mod"
-"github.com/mitchellh/cli v1.0.0/go.mod"
-"github.com/mitchellh/cli v1.1.0"
-"github.com/mitchellh/cli v1.1.0/go.mod"
-"github.com/mitchellh/copystructure v1.0.0"
-"github.com/mitchellh/copystructure v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.1.0"
-"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-"github.com/mitchellh/go-testing-interface v1.14.0"
-"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
-"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
-"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
-"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-"github.com/mitchellh/mapstructure v1.3.2/go.mod"
-"github.com/mitchellh/mapstructure v1.3.3"
-"github.com/mitchellh/mapstructure v1.3.3/go.mod"
-"github.com/mitchellh/pointerstructure v1.0.0"
-"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.1"
-"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-"github.com/modern-go/reflect2 v1.0.1"
-"github.com/modern-go/reflect2 v1.0.1/go.mod"
-"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
-"github.com/oklog/run v1.0.0/go.mod"
-"github.com/oklog/ulid v1.3.1/go.mod"
-"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
-"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-"github.com/onsi/ginkgo v1.6.0/go.mod"
-"github.com/onsi/ginkgo v1.8.0/go.mod"
-"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-"github.com/onsi/gomega v1.5.0/go.mod"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
-"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-"github.com/pascaldekloe/goe v0.1.0"
-"github.com/pascaldekloe/goe v0.1.0/go.mod"
-"github.com/patrickmn/go-cache v2.1.0+incompatible"
-"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
-"github.com/pelletier/go-toml v1.2.0/go.mod"
-"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.5.2+incompatible"
-"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
-"github.com/pkg/errors v0.8.0/go.mod"
-"github.com/pkg/errors v0.8.1"
-"github.com/pkg/errors v0.8.1/go.mod"
-"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-"github.com/pmezard/go-difflib v1.0.0"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/posener/complete v1.1.1/go.mod"
-"github.com/posener/complete v1.2.3"
-"github.com/posener/complete v1.2.3/go.mod"
-"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
-"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
-"github.com/prometheus/client_golang v0.9.1/go.mod"
-"github.com/prometheus/client_golang v0.9.2/go.mod"
-"github.com/prometheus/client_golang v0.9.3/go.mod"
-"github.com/prometheus/client_golang v1.0.0/go.mod"
-"github.com/prometheus/client_golang v1.4.0"
-"github.com/prometheus/client_golang v1.4.0/go.mod"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-"github.com/prometheus/client_model v0.2.0"
-"github.com/prometheus/client_model v0.2.0/go.mod"
-"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
-"github.com/prometheus/common v0.4.0/go.mod"
-"github.com/prometheus/common v0.4.1/go.mod"
-"github.com/prometheus/common v0.9.1"
-"github.com/prometheus/common v0.9.1/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
-"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-"github.com/prometheus/procfs v0.0.2/go.mod"
-"github.com/prometheus/procfs v0.0.8"
-"github.com/prometheus/procfs v0.0.8/go.mod"
-"github.com/prometheus/tsdb v0.7.1/go.mod"
-"github.com/rboyer/safeio v0.2.1"
-"github.com/rboyer/safeio v0.2.1/go.mod"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
-"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-"github.com/rs/zerolog v1.4.0/go.mod"
-"github.com/russross/blackfriday v1.5.2/go.mod"
-"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-"github.com/ryanuber/columnize v2.1.0+incompatible"
-"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
-"github.com/ryanuber/go-glob v1.0.0"
-"github.com/ryanuber/go-glob v1.0.0/go.mod"
-"github.com/satori/go.uuid v1.2.0/go.mod"
-"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
-"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-"github.com/shirou/gopsutil/v3 v3.20.10"
-"github.com/shirou/gopsutil/v3 v3.20.10/go.mod"
-"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
-"github.com/sirupsen/logrus v1.0.6/go.mod"
-"github.com/sirupsen/logrus v1.2.0/go.mod"
-"github.com/sirupsen/logrus v1.4.2"
-"github.com/sirupsen/logrus v1.4.2/go.mod"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
-"github.com/soheilhy/cmux v0.1.4/go.mod"
-"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-"github.com/spf13/afero v1.1.2/go.mod"
-"github.com/spf13/afero v1.2.1/go.mod"
-"github.com/spf13/afero v1.2.2/go.mod"
-"github.com/spf13/cast v1.3.0/go.mod"
-"github.com/spf13/cobra v0.0.5/go.mod"
-"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-"github.com/spf13/pflag v1.0.3/go.mod"
-"github.com/spf13/pflag v1.0.5"
-"github.com/spf13/pflag v1.0.5/go.mod"
-"github.com/spf13/viper v1.3.2/go.mod"
-"github.com/spf13/viper v1.4.0/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/objx v0.1.1"
-"github.com/stretchr/objx v0.1.1/go.mod"
-"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.3.0/go.mod"
-"github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/stretchr/testify v1.6.1"
-"github.com/stretchr/testify v1.6.1/go.mod"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
-"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-"github.com/ugorji/go v1.1.4/go.mod"
-"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
-"github.com/vmware/govmomi v0.18.0"
-"github.com/vmware/govmomi v0.18.0/go.mod"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
-"github.com/yuin/goldmark v1.1.27/go.mod"
-"github.com/yuin/goldmark v1.2.1/go.mod"
-"go.etcd.io/bbolt v1.3.2/go.mod"
-"go.opencensus.io v0.21.0/go.mod"
-"go.opencensus.io v0.22.0"
-"go.opencensus.io v0.22.0/go.mod"
-"go.uber.org/atomic v1.4.0/go.mod"
-"go.uber.org/goleak v1.1.10"
-"go.uber.org/goleak v1.1.10/go.mod"
-"go.uber.org/multierr v1.1.0/go.mod"
-"go.uber.org/zap v1.10.0/go.mod"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
-"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
-"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
-"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
-"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
-"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a"
-"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod"
-"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
-"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-"golang.org/x/mod v0.2.0/go.mod"
-"golang.org/x/mod v0.3.0"
-"golang.org/x/mod v0.3.0/go.mod"
-"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
-"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
-"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-"golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod"
-"golang.org/x/net v0.0.0-20211209124913-491a49abca63"
-"golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod"
-"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
-"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
-"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
-"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
-"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
-"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
-"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
-"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
-"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
-"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
-"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
-"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod"
-"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
-"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
-"golang.org/x/sys v0.0.0-20210423082822-04245dca01da"
-"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
-"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
-"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-"golang.org/x/text v0.3.2/go.mod"
-"golang.org/x/text v0.3.3/go.mod"
-"golang.org/x/text v0.3.6"
-"golang.org/x/text v0.3.6/go.mod"
-"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
-"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
-"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
-"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
-"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
-"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
-"golang.org/x/tools v0.0.0-20210106214847-113979e3529a"
-"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
-"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-"google.golang.org/api v0.4.0/go.mod"
-"google.golang.org/api v0.9.0"
-"google.golang.org/api v0.9.0/go.mod"
-"google.golang.org/appengine v1.1.0/go.mod"
-"google.golang.org/appengine v1.4.0/go.mod"
-"google.golang.org/appengine v1.5.0/go.mod"
-"google.golang.org/appengine v1.6.0"
-"google.golang.org/appengine v1.6.0/go.mod"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-"google.golang.org/grpc v1.14.0/go.mod"
-"google.golang.org/grpc v1.19.0/go.mod"
-"google.golang.org/grpc v1.20.1/go.mod"
-"google.golang.org/grpc v1.21.0/go.mod"
-"google.golang.org/grpc v1.22.0/go.mod"
-"google.golang.org/grpc v1.23.0/go.mod"
-"google.golang.org/grpc v1.25.1"
-"google.golang.org/grpc v1.25.1/go.mod"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-"gopkg.in/inf.v0 v0.9.1"
-"gopkg.in/inf.v0 v0.9.1/go.mod"
-"gopkg.in/resty.v1 v1.12.0"
-"gopkg.in/resty.v1 v1.12.0/go.mod"
-"gopkg.in/square/go-jose.v2 v2.5.1"
-"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-"gopkg.in/yaml.v2 v2.2.1/go.mod"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"gopkg.in/yaml.v2 v2.2.4/go.mod"
-"gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.2.8"
-"gopkg.in/yaml.v2 v2.2.8/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-"k8s.io/api v0.16.9"
-"k8s.io/api v0.16.9/go.mod"
-"k8s.io/apimachinery v0.16.9"
-"k8s.io/apimachinery v0.16.9/go.mod"
-"k8s.io/client-go v0.16.9"
-"k8s.io/client-go v0.16.9/go.mod"
-"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-"k8s.io/klog v0.3.0/go.mod"
-"k8s.io/klog v1.0.0"
-"k8s.io/klog v1.0.0/go.mod"
-"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
-"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
-"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
-"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-"sigs.k8s.io/yaml v1.1.0"
-"sigs.k8s.io/yaml v1.1.0/go.mod"
-)
-go-module_set_globals
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
-	local git_commit
-	git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go)
-	git_commit=${git_commit#*\"}
-	git_commit=${git_commit%\"*}
-	[[ ${git_commit} ]] || die "failed to determine gitCommit"
-
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${git_commit}" \
-	emake dev-build
-}
-
-src_install() {
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/consul
-	fowners consul:consul /var/log/consul
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.9.15.ebuild b/app-admin/consul/consul-1.9.17.ebuild
index 7d29936afde8..787aa2ec7c38 100644
--- a/app-admin/consul/consul-1.9.15.ebuild
+++ b/app-admin/consul/consul-1.9.17.ebuild
@@ -292,8 +292,9 @@ EGO_SUM=(
 "github.com/hashicorp/mdns v1.0.1/go.mod"
 "github.com/hashicorp/mdns v1.0.4"
 "github.com/hashicorp/mdns v1.0.4/go.mod"
-"github.com/hashicorp/memberlist v0.2.2"
 "github.com/hashicorp/memberlist v0.2.2/go.mod"
+"github.com/hashicorp/memberlist v0.3.1"
+"github.com/hashicorp/memberlist v0.3.1/go.mod"
 "github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
 "github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
 "github.com/hashicorp/raft v1.1.1/go.mod"
@@ -637,8 +638,9 @@ EGO_SUM=(
 "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
 "golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
 "golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
-"golang.org/x/sys v0.0.0-20210423082822-04245dca01da"
 "golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+"golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7"
+"golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7/go.mod"
 "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
 "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
 "golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index 94120076bd0b..81edebebb3d1 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -1,3 +1,5 @@
 DIST OpenDoas-6.8.1.tar.gz 32398 BLAKE2B cdaa01efaf3d164bcf6993693c86039fa4866dc1ce619731b455985ca1ebb5ebec889b540f4720c590318202de8a4b2fdf5d715f2170346818e706857b5adfa3 SHA512 d96fe1cdd70e9211de9996ad05bcf7a127facd02af48f7ab2561869d9d16708f1b61722c6e6b9fe15a62e9ef501e09b1ba444b7b43a066f1895e543ebc9402e7
+DIST OpenDoas-6.8.2.tar.gz 32430 BLAKE2B 14c418537b17cb82ceb1d789acc74d17364390c04d0a8d81b65de2ce3feca800e48158c6a8ea066176edeea44252f4baa99d1abde0dfbdc548c06f96e6409984 SHA512 4a93ff477413c859ba2702e688fa4f83248fff85e61e12336838a1e9aa1a8d9963a9782e4bc5e58e8d04b86c2c8ceb6b235ae9d3b32b3e548a2514a43653137d
 EBUILD doas-6.8.1-r1.ebuild 1362 BLAKE2B 4896ec32b6b00850d7452a765b0ac1644ac42995dd7b60857a57e1d2d73388b49c4b70330bdff918f521dbd4cc3ef64249861765a5f6baf0b4f073466b838b11 SHA512 8bd3e23ebb8f24c1ac71a7d4d624d32be42fd92bd4c0a617e6e0761bb3f9a0a48d5f088eac03d4caa4cecfd42a098412a3bd06fd2800624fe51d95e6bf6b8ea7
+EBUILD doas-6.8.2.ebuild 1295 BLAKE2B a47edc243fa9043f59a298cde987721eb9e3028c5345fc0681a2f40b6e28c94416c3a08d8e99dd473571c6e6ceda8d863f2291514445ca7a0e1059065f01f9d6 SHA512 6d0f496e451337ab0b0850fdc81a8bbc9a349d04ce026baca7a89e8b37cf2b0e8c987c9cabd6f03f05ab55867abe74981313e4a4231bb0e4fa96cb51e8d7524e
 MISC metadata.xml 558 BLAKE2B 2f308d787a7b1f5d51fa36c63c4e0fe79171d6967a34f00c5b5e47035d4176a83403ca1ab6e74c44e7e32a8988ae363fac045c4771a9f2f3975e87593f53aa94 SHA512 3a69c68de5619d4377931c9331e00a5fd5c478930b1fff95ee308ad110c6b7607a491ec9f16b2e59491f9c8634eb22d0c703f62246f79e3bb1684a47b17f8ea5
diff --git a/app-admin/doas/doas-6.8.2.ebuild b/app-admin/doas/doas-6.8.2.ebuild
new file mode 100644
index 000000000000..8e916bc9d889
--- /dev/null
+++ b/app-admin/doas/doas-6.8.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=OpenDoas
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)"
+HOMEPAGE="https://github.com/Duncaen/OpenDoas"
+SRC_URI="https://github.com/Duncaen/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="pam persist"
+
+BDEPEND="virtual/yacc"
+RDEPEND="pam? ( sys-libs/pam )
+	!pam? ( virtual/libcrypt:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	tc-export CC AR
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		$(use_with pam) \
+		$(use_with persist timestamp) \
+	|| die "Configure failed"
+}
+
+pkg_postinst() {
+	if use persist ; then
+		ewarn "The persist/timestamp feature is disabled by default upstream."
+		ewarn "It may not be as secure as on OpenBSD where proper kernel support exists."
+	fi
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "By default, doas will deny all actions."
+		elog "You need to create your own custom configuration at ${EROOT}/etc/doas.conf."
+		elog "See https://wiki.gentoo.org/wiki/Doas for guidance."
+	fi
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 05b9d11934d4..fe51009b9f05 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -3,7 +3,7 @@ DIST keepassxc-2.7.0-src.tar.xz 8846780 BLAKE2B 74c4e9c6d06239950f1b8a64c5bce894
 DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
 EBUILD keepassxc-2.6.6.ebuild 2310 BLAKE2B befacb8a5edf657b7dc182b4c1b5580a30e037342d590df9ba4450d2344c0a208ba09b59047880638cbc8c68f4bdd5653cfba873e6682949f967c40d545952fd SHA512 6f5d85aa92508284a335374c4b4c190104e4e70c4c4c228f7015e0c15efdb28931f2d97748ed30edd7fc09d65a0017cef2cb5bd28731cc3cace80dfc2b01db4f
 EBUILD keepassxc-2.6.9999.ebuild 2414 BLAKE2B d25231ddef6df71cf2574b46b8c902ba89ad046144a26d011dd3c26ba5061b5e474f80e00d0370fc04bc86e448a377c4dfd1f99535b6e29894b7d951e4a8ed53 SHA512 f3accbf2750712fb4302e7fbd792680b3d3a7094975a56e10bdc205089e8d90520cbc9b29b1cab82196abff1ccd94101d7f49f7ba49ea6ab7cef1fb74b091a33
-EBUILD keepassxc-2.7.0-r2.ebuild 2293 BLAKE2B 9b3113b9b01b59fe34924092539d07db46dbe709b626ed3d3e180810c5e8ed3773fd1fc0c58e51566e1f08f766db97050d4a72423f56fff903351a8456b97142 SHA512 ccb17de9ddfe5b08fb968720c862c915b4edd594aedb8c4e1a8de1f5e9faf00583e643dd0d9e90706931d76e821c7a2c889188d3a08263940cee91e5a1060d0d
-EBUILD keepassxc-2.7.1.ebuild 2293 BLAKE2B 7943b14df4b39ef9fce69f0f7a3f750bfa08f9528cb211efa02c627d04a82188d50c41954d1a67bd4b7a1b2807498860dc7ecf63192c6ba58e099de711bdbfa3 SHA512 254486509b30c1e3ac4926ac4d14986b846131d623c55cbf49ec819f4c5f24f349a718d5c779491aac71a196b2a208dfd4376f7d96a7ecce5a43f8355b2f9edc
-EBUILD keepassxc-9999.ebuild 2293 BLAKE2B 9b3113b9b01b59fe34924092539d07db46dbe709b626ed3d3e180810c5e8ed3773fd1fc0c58e51566e1f08f766db97050d4a72423f56fff903351a8456b97142 SHA512 ccb17de9ddfe5b08fb968720c862c915b4edd594aedb8c4e1a8de1f5e9faf00583e643dd0d9e90706931d76e821c7a2c889188d3a08263940cee91e5a1060d0d
+EBUILD keepassxc-2.7.0-r2.ebuild 2373 BLAKE2B 809a51c4a615d96f25022b0d277fc40501566734abf7cd8c73e24a9a573a73d7cb958deff3de8182c0c3b5e224afc4ed1e4d0b77f2e64059c7553fa49ab70110 SHA512 5509b00aa287d9704f82b72e4e5a8734096bbc33b7893134223fac52c6b7e4ea787ab1791bcdf86edf0f061cd8bbe1b75129b3446721dd655464677902c718c2
+EBUILD keepassxc-2.7.1-r1.ebuild 2373 BLAKE2B f864e4da175f6c3498fe7353359f95c119f59bba95506185a74ded1e747ca8678ea9c3053087474a19853bd67f965d748741cf9429f0b11be9f161e535610501 SHA512 d1243f9a04b99291c6627e6084512d0b3f3d8f587b26b6bf333087c231b5fadc42cbb1ac0100fb0aec0f05073dcfbb1ffc71f9aa1232ee218772b24b7bb1b94d
+EBUILD keepassxc-9999.ebuild 2373 BLAKE2B 809a51c4a615d96f25022b0d277fc40501566734abf7cd8c73e24a9a573a73d7cb958deff3de8182c0c3b5e224afc4ed1e4d0b77f2e64059c7553fa49ab70110 SHA512 5509b00aa287d9704f82b72e4e5a8734096bbc33b7893134223fac52c6b7e4ea787ab1791bcdf86edf0f061cd8bbe1b75129b3446721dd655464677902c718c2
 MISC metadata.xml 1042 BLAKE2B 2fd425f8c61e45707a1f1c18a3ee5db9b902eaeb347ced5302495d92e82495fa5f87d73400ee849e5b97302d02faeeeb91f403646132c5e8b0206af04385af56 SHA512 d59770092ee152198e217f12207a257a58cfc5dd794170bbd8fb7f3ad6ed644714285874ecd70c77389bba95f4587e70dbb2a120067631d33acebb75f3f2f352
diff --git a/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild b/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
index fb5899e8a65b..d148084c50be 100644
--- a/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
@@ -25,13 +25,13 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
+IUSE="autotype browser doc keeshare +network test yubikey"
 
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/argon2:=
-	dev-libs/botan:2
+	dev-libs/botan:2=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -60,7 +60,6 @@ DEPEND="
 	dev-qt/qttest:5
 "
 BDEPEND="
-	ccache? ( dev-util/ccache )
 	doc? ( dev-ruby/asciidoctor )
 "
 
@@ -77,7 +76,9 @@ src_configure() {
 	filter-flags -flto*
 
 	local mycmakeargs=(
-		-DWITH_CCACHE="$(usex ccache)"
+		# Gentoo users enable ccache via e.g. FEATURES=ccache or
+		# other means. We don't want the build system to enable it for us.
+		-DWITH_CCACHE=OFF
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
diff --git a/app-admin/keepassxc/keepassxc-2.7.1.ebuild b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
index f2f002f7a9e2..0793091a0b25 100644
--- a/app-admin/keepassxc/keepassxc-2.7.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
@@ -25,13 +25,13 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
+IUSE="autotype browser doc keeshare +network test yubikey"
 
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/argon2:=
-	dev-libs/botan:2
+	dev-libs/botan:2=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -60,7 +60,6 @@ DEPEND="
 	dev-qt/qttest:5
 "
 BDEPEND="
-	ccache? ( dev-util/ccache )
 	doc? ( dev-ruby/asciidoctor )
 "
 
@@ -77,7 +76,9 @@ src_configure() {
 	filter-flags -flto*
 
 	local mycmakeargs=(
-		-DWITH_CCACHE="$(usex ccache)"
+		# Gentoo users enable ccache via e.g. FEATURES=ccache or
+		# other means. We don't want the build system to enable it for us.
+		-DWITH_CCACHE=OFF
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index fb5899e8a65b..d148084c50be 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -25,13 +25,13 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
+IUSE="autotype browser doc keeshare +network test yubikey"
 
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/argon2:=
-	dev-libs/botan:2
+	dev-libs/botan:2=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -60,7 +60,6 @@ DEPEND="
 	dev-qt/qttest:5
 "
 BDEPEND="
-	ccache? ( dev-util/ccache )
 	doc? ( dev-ruby/asciidoctor )
 "
 
@@ -77,7 +76,9 @@ src_configure() {
 	filter-flags -flto*
 
 	local mycmakeargs=(
-		-DWITH_CCACHE="$(usex ccache)"
+		# Gentoo users enable ccache via e.g. FEATURES=ccache or
+		# other means. We don't want the build system to enable it for us.
+		-DWITH_CCACHE=OFF
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 70d2b016b78a..34501ab112a1 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -2,7 +2,7 @@ AUX logrotate-3.15.0-ignore-hidden.patch 566 BLAKE2B 1739e0d175311eb2a3692826830
 AUX logrotate.conf 740 BLAKE2B ade43681e1929aa8b7e167a2be0c8569f3842680687381c202ac04b5cf97cd85481f6ca7fbf6f0dffa64caa3b1d9cb0f1e2154af8882a3ce7008337f2a5ede6f SHA512 6411acd842fac1a8af72142cddfa76b567f6ba859bed91dab56f1d26b48f3dcaa3ffee6c8094860fe9c43f9b6bc398199c8f4047856b91d6d12333d0fc7aef96
 AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36
 DIST logrotate-3.18.1.tar.gz 225226 BLAKE2B 6f40dfe89f9c6202263f16204a9cff07b921abc9a298b58649bb4968c9f498626741be334c47d4092da564ed75642b687ff6ef8781f69f5e25364f8635646d9d SHA512 c40f920686aee014c652f087c64f2a85e9e866a8717d1bd3f32a9dd7959a02962e6174de28ae685428b442e12079d0c8d91485611ca34a873ffae872a54ec9fe
-DIST logrotate-3.19.0.tar.gz 228089 BLAKE2B aa5e932fe2056d150cc632134d80e160883b62e9f92a010bd5f5cded40a0362e28b966d006305b07030a8b07eb35a8e0c5b65b8d4bc87c278286b326cced1c46 SHA512 68bca961608565687a9ccb18e72f0627b405aff95286e508fdc78926d2cc172c56e1523a24ca81a161f683c2d568312984e2757edd291d144e0e4b982433e119
+DIST logrotate-3.19.0.tar.xz 166276 BLAKE2B bb19690ca092905e527f6a0a7915373a65b29d3b50d97456ed31aa9b5b5698b3ae266c8e247a167198dcd8891a7e330f4913dfefa3563e5b2de7a6e0d067a6c3 SHA512 7838e14a5b147f6e5edf6efdf743deeca39fdb563fc6f14aa010ac5b7bdef9c2bb8005415481d1b042b31975052d5ed6e75c4bcd7e378003427ebe5ec02a1f2c
 EBUILD logrotate-3.18.1-r1.ebuild 2258 BLAKE2B d877e8896d4611dab50826df614b40ae001f1993a0f457546cc887a99be8f2133daa68cb9998c34451d39c7b216ccdbd1e0b57f1a6c09157eeb2b9ded0ea6653 SHA512 4ab613cc46ed7c360236d3daa4ad96930e29b6d5251ff39ef77f4469fdb0dbdaf8dfb1e78fe0ea77d21a5b2cd9592cc11798fee46fd4c37804b5091b35b1b507
-EBUILD logrotate-3.19.0.ebuild 2257 BLAKE2B 436c815fc9f2abef07dc4c3c3f37245adb9d0bad95b09e1b6e5c3f5ba7497d8178d1eb8a5f45d0fb822b29a7f40e802978626d9a4361c8032afc93421e60f962 SHA512 b716b3b5a902e569d1e38c5f5e74c3b6731a98ccb81c42296ef766ec48a47a6dfec6b69222fb8afa3f37fe0ecc7538b1c863c00a83c96bb560c9c97a9b4ccfaf
+EBUILD logrotate-3.19.0.ebuild 2257 BLAKE2B 0a66afed01ac2efcefccbb3abc5309ae27fcde5429368e13a17dc4672d06c6c67bd5546cf5e80da69eaa3f1cf36149409db004682e27d4e9995056deb0fe06df SHA512 f3d7b346b50e086bb50fa7d1b5d854d4c5fdf9a9700d9212eeb992da8a0dbf6c4a8b21ee0bf5a26d917ed2a581980952121d2c0c88f6fe1d3ca474db30a96d3f
 MISC metadata.xml 1207 BLAKE2B 0d2ebf29e5ab5a01b2a8ac76ce1699e175d8fdba393ad97abad9cd3fbf9162042f253ab3551cde9273053c35b703e098d0501b67203da519b12258437d898f50 SHA512 3ac710f21ade3bb31767ea3e26b120a19a8ebfbfbcf5c66d30c888093428b0df026417e69d3823a2feaa27408b6015231f624b354df87ff50313edea39a0287b
diff --git a/app-admin/logrotate/logrotate-3.19.0.ebuild b/app-admin/logrotate/logrotate-3.19.0.ebuild
index 7cb3f042a6ea..461e26ab35da 100644
--- a/app-admin/logrotate/logrotate-3.19.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.19.0.ebuild
@@ -7,7 +7,7 @@ inherit systemd tmpfiles
 
 DESCRIPTION="Rotates, compresses, and mails system logs"
 HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 2b023d5d13e6..c14a1897a9ec 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -7,7 +7,7 @@ DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d5
 DIST puppet-7.14.0.tar.gz 2816077 BLAKE2B c4aacf7179208e801fad2aa384691e38ca4bd1329819d4ca15b7a3cf25c5787e8adef12c91d233c5adbc301ab77cdf9748f094a1904c78c62d6ac73dafb4a634 SHA512 36aaa9c8cce9d1c40e77eee1e3544c0b0c665bbfa3b8184401905d6f15c142be8490421af0dac57856849de343b288f67153c551db68f8cea9e0ed3ad251feb3
 DIST puppet-7.15.0.tar.gz 2817137 BLAKE2B ce76ad71251a9202d31e858706eb994c6210cbe97f31e56d95b8c36d541d0ce8d1e65ab33d399e7dca1c5ea8e7f4dfccb3a2a4d36baaed6ca31516b7e449bf2a SHA512 0d68bda85a5f61fdb74c3e70304d414afef238dff4f7a4cd60c17f5cc26fcb18ba7f81065d6295adde33bc181031b458d259daa84a41156c9589f5c0e3cb8951
 EBUILD puppet-5.5.22-r1.ebuild 3750 BLAKE2B 4cfe9e58f764927a378ccb706ea14ed3ac8e981356c2000d16b8a33b924c7d08fd8cc6f27c70cf66f859d5649c13a33d4982ea69573ba73d4b19375c8da95cdb SHA512 87fff4d2c68e882894b3a24f28db1d0b68b081530eeaaf3149314aa1968094fe3f0b37b57c5240e2e4dfe19828084b82b07e0bc3105a1dee0b52f9e28f034cb4
-EBUILD puppet-5.5.22-r2.ebuild 3760 BLAKE2B d7a45bd19ea23aada8be2ed59abcfca5cf4321519e61409774f63d41366dba1f7610e308c03394a06283bf37f17dfc258e548658d37ee20f4d5f995b8b873b2b SHA512 3c06804354b84e92cfc439adf7a0d8333887096c7d4cc17fc8d9c3fbfcaf60e4d0ed5da81bc763c0355e6337f0f038edcff201d6445c42113b09ab46562ab8ec
+EBUILD puppet-5.5.22-r2.ebuild 3758 BLAKE2B e9e5ed85c6606cc4ed8e29c1c3f4601be291ed9da1074404cbc0870bb7ad0485a440778d50c8c1753d5bb80627bae35d107c1a2f697b63d1bfb35f86a8474b5a SHA512 b4c19d02f28f6337a0e468374b6547f388208ebab6ca4bce65b6f957b6f28329f65360d2554887b10e2727fac8b206d80fb56938fde4bd416c9b532f8fd7dc04
 EBUILD puppet-7.14.0.ebuild 3457 BLAKE2B 67bf80033dbe3bec0117118b158f4d177695dee5d6956322e156efea99cc2ba75eb830912f019e495e903706a36b623e62492b62b1f66463946a048a223104bc SHA512 0e870b484df92c17ff5af92f883ad8d8da911e0cc48e4dc9ead0505e1dd9c2e3681b683f6f4b92176dcc83a76b5b03939dd326f182d3eb72590c62adc9116b2c
 EBUILD puppet-7.15.0.ebuild 3459 BLAKE2B 3afedefaf365433acf67a6696c7d6919aecf8850d84733f2f25679ddbff2611f484d192cf558c7b01ed36a323006fc8932f9c491bdb79776e2219ac031fb0b5a SHA512 09059194222f23c8d7183409cc2534d272615e2154bdd25c4bf83c85ef80f48188e0ca420cdfbbc1e91aae0cdc1b7483daa21d1f5714ff6c52a11fd425170c07
 MISC metadata.xml 1570 BLAKE2B 5ea0d1f9d7e83fc99130bc7375de7638fd509d18ea5728d14d370338089c33c788156f20b976e6b909502e94e356428e4a1ce95e10bf307d81bd2fbbb1166941 SHA512 4ec568674227749e9644c4eb09d39c25f2458a7eb89f7d36d2be035845e8ffefc6bffbdbc09be9950bb424f2c940ff9bf43ea60e22cd4816bf12d3593e41e7b1
diff --git a/app-admin/puppet/puppet-5.5.22-r2.ebuild b/app-admin/puppet/puppet-5.5.22-r2.ebuild
index b248c3ddff78..7f79dde74e75 100644
--- a/app-admin/puppet/puppet-5.5.22-r2.ebuild
+++ b/app-admin/puppet/puppet-5.5.22-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 49c93faa0cbd..c33c18f9d9ec 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -57,5 +57,5 @@ EBUILD salt-3003-r1.ebuild 6580 BLAKE2B ba2d5c5a2461694213918dc4d7cb88600235b1b1
 EBUILD salt-3003.3-r1.ebuild 6842 BLAKE2B d273b5b3a717022a75cc83563f9d0f8412c5250f062312be30c36560faf1250ca64382b4cc4f4e180196217b97158090dd7593a4f4e450904840f5a7d4c88104 SHA512 46aa981c49279c984d622bd38782099919845fa47597eb343a8a40bdcbf76ac29e1377c09ee4c33b6d6930e789c34bafeef308094adc873646be5805b7710f6f
 EBUILD salt-3003.3.ebuild 6801 BLAKE2B 5146a9a20ca1de9ef167f896df8cafea100a1b5245d747aea685a6811151c3909040c3cf53d80ed5eb7359e76914a5fdf94ad8af8d643995d46c727d9163cc66 SHA512 95a055ce3a69a358bfdd221f139b86964a7ce5ea18d3f12b9270bcb03f4873cdab55b738338165b785d039f869096928758a8ccb1c0c6a87c3e1897da0a89ae6
 EBUILD salt-3003.4-r1.ebuild 6933 BLAKE2B c99f429003c7992c9b9271413ce4929c2e4a3fb49d3dae818a37a7e9253165cce99625a4c298cd6065781564eb1b838edc5cfca437dbc7103878131bc5de1671 SHA512 52719d14b8bbdd55c4f4aff007733cf5a889339d6187caeb5c57a5a2bd53b999b910dda0213db50fc5224f0e01f9380ada63c1e8f344530ea60d6f6cbb9498d0
-EBUILD salt-3004.1-r2.ebuild 6974 BLAKE2B e8492cd3197672bb74750c6b6e3af207353d7d91edfa7cd338be35786a3bca10fef9d162ca39f4faf0a7a3bf958daefdfda9dc259bd3c1c6a533c6e3ed820e65 SHA512 306ea7f3774e54457b74dc30ccf7e10e86db549c1a8e2c7a5454851c3281d265a2ccba7ffb424ef0adc358275cf79fb07f50243140bc079b47a3819647850167
+EBUILD salt-3004.1-r2.ebuild 6979 BLAKE2B 08ba611b65f5a5d1ae39591412b032a8733b1fa21f9678dcc36b81bdfb23a1faddec337c6684f903d1d1305dd31ba9af0d977ec16ccd0b6f475fb93b2822467c SHA512 6990cbfd7c3b497ad7f599465f3dc5fcc6979b320c1e9b635cfb0901e6b18e7ffdd08f4e9468479f57080bd370fdca9a3f1606861ed130fe5c218db3b20fb7c4
 MISC metadata.xml 2362 BLAKE2B 60fd7a02823e610b4d12b1d4c6a066cf16f8ef4094397553381d62bc027715164f02ccad4c86e431a30822d5c4c25e4eebd814f99e43b7a45bc08a3fd885cfee SHA512 4aa7549a76e69233949c68841bfcdba6630eeb78a507f20119469f7835a6532b737f41d117c09b1e4c7574f95dec759deacf5d5482be961755d63a19b9eee9a7
diff --git a/app-admin/salt/salt-3004.1-r2.ebuild b/app-admin/salt/salt-3004.1-r2.ebuild
index 483a8730bda1..38244a2fee60 100644
--- a/app-admin/salt/salt-3004.1-r2.ebuild
+++ b/app-admin/salt/salt-3004.1-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 7ed24b42d95e..d818ac5ae6df 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,9 +1,7 @@
 AUX 0001-__init__.py-Make-NetworkX-dep-optional.patch 2242 BLAKE2B 63815b66a6b5051ca084fcb265a6eb573f4738288376dada16c86c04ae3dbf4d58ff33583ff323d1096b321f0d410ae3b956b9e82caf710f78baf82db1a769fb SHA512 eac87e9335643b5e2f0de05b6e03c03d250c799e994edd52368b3a50e201beeebfbf40b7bf016200648fadf9c3d5c3708ac94ff158ea327cf2ea73f773ac8653
-AUX setools-4.3.0-remove-gui.patch 879 BLAKE2B d8c61405d96466fbd2f1704477dfbe64477b7cb26f2a8aae66c6d7ca0ac73c4a6372ce02917ef2ef424bb8faa2175bcad7c2eeca1c84d292005d5426eb3db004 SHA512 de125a4bd4fa8aa1aca98b33449d9b11746b2aa6ccfa202ed9711b253a9da98c1200b075e7b31a27b00fe3277557d29c1be8971a5fc079be572d61c25b64bec6
 AUX setools-4.4.0-remove-gui.patch 1015 BLAKE2B f81872b140107337466e1d57bfd3c1935adca838756a0c1a2c4f2d0f42b7ae0ecb60d5c6db0889998bca96d46c08979d03e989a79461bb6ceb3c7bd4ee6fa56f SHA512 6e2b3d0dafbb4b0966f04cd592fc14800755ea4f585ab4d1bf0516cd25f16185b0923045762ce88df47f7264481fb9dd6588efc38d7280e14b5f015192f12924
-DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
 DIST setools-4.4.0.tar.bz2 275218 BLAKE2B f716a78dd628e0309d3802f2155ef3a045dd8ebee7dec42be9f8b5fc0069b0df4e3d827b0a0cc03f7f02f5a3dff1d7ab7e4eee0d83d6cf4c87af82fe756a9321 SHA512 2ec92d7a6e30261549b6a8d2f17175d4a7d8313ef0cd81f4a19a91c53fe0107bac9a89c19dd67a4c534ee51ec520590795b4312f9e03e69fdf1763b0c35291f8
-EBUILD setools-4.3.0.ebuild 1261 BLAKE2B 2bab4af1c52f47255c6b54fb533084022005c875c7c7dd73738d60c4a8510d3e37467a11a19e5d3380ec2e677e8e2d65b4ba9c12ed51a8502cb2709be48ff308 SHA512 8ef6976367724748118cd44c4c1c8ee1de6d2f993e78193a45163ec7647c6949bf1226eea600d5a9e4f0fb12ac17ec4e6a33feaf5e10f5bd14662823d22f1d09
-EBUILD setools-4.4.0-r2.ebuild 1485 BLAKE2B d99d920a6705bfc0e46cd58408094babf01a53d66af417b7a140fb50d5ffb3569d86b62bde306fe9d7fdb1e5274f906e618bf593ce3b9d93eecb4db38a2b0053 SHA512 e83dcfe365e175fa20525dea24280080fa95bde3af59402db3bcd0337729bd796728b29407afbf2e6d7ae08f06659e2ff5f3665404b347a9a56b83355c93c88b
-EBUILD setools-9999.ebuild 1411 BLAKE2B 74ccfaecb1e994f341e6990ba0914d05b7c1be845a66e1d21fb86b2e17a405ca125930e188553badb42eb9ae4e065c2c1ebf9e50114abfe8d02e9791ad4f1e99 SHA512 fa0405bf8e52c3a461c50505da52991e3d48f03ade22eddd29a14005f00f5c201a2aff5a54b82637d3d4ae973cdc5f710c4a95a5f8bc45d884f9a9397b7765e5
+EBUILD setools-4.4.0-r2.ebuild 1481 BLAKE2B 00e7179edd022254b0db466dc67218cce6d6e7bf288e946a090eb0817cd2f8a44a2190e851800f69a685a6c4bc35e12f799902f72458f3fbc8c5f2e0a5a6f139 SHA512 15b04afeae27ff80307ea8de1380578d3c52eca4d2a134c00a5fa7151b070fe5477c90e907f8aaf3093ad65b8e28cab730342172ccb00acb65988de02846777e
+EBUILD setools-4.4.0-r3.ebuild 1535 BLAKE2B b0b92b114dd071d8ae1a2a7a4e38b1ff7945e4d5a5939c1a003d7fb35d167c4f34f64c66b2a89f558636fe8ee17cd7dd623bf83144a6d43dd6ced844492862e3 SHA512 aed40ea3f5d5f61e109e066e3c994c7166db4c19484010520b6280d1f839d42bc7bd35b79b327fe34abcd2037d23bee7901d135f3c44ea5941e47e3f93000108
+EBUILD setools-9999.ebuild 1483 BLAKE2B 60d268a146ebbc48f8565e36ec76ae69fb903b545d42be27b7012bc1e68017cffab1d76b04687e30cf953314232ad8864cdabdbd85772c0ed66d7d09ce798355 SHA512 7b7d1da8dc8f422cd4ce5e1fb83562a64ccbb7d835aff070b862455503c50d7d58e453108b907433b573fba6a82db8bd336278ab2a93290cba6317094f5a167d
 MISC metadata.xml 440 BLAKE2B 5ff05dac3cb6a27d99c7ebb2e4425afaef2275aaff5e109feff6870e2e51c55c27dd8baa3d6ad3a2a9a292a20ece18dfb2f0ad61e30cd1dc7b74afaf20d0104c SHA512 f61bdc193e411a635c35e7244fad44b68061c56fa26a1b995f79fb46784d09f52bd85bcbc8caec5043390a72d8548fb4ac0dd84cd4a613dbbdb5fd49e3efa71f
diff --git a/app-admin/setools/files/setools-4.3.0-remove-gui.patch b/app-admin/setools/files/setools-4.3.0-remove-gui.patch
deleted file mode 100644
index 85abbf5a7aa3..000000000000
--- a/app-admin/setools/files/setools-4.3.0-remove-gui.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -146,10 +146,10 @@ setup(name='setools',
-       author_email='pebenito@ieee.org',
-       url='https://github.com/SELinuxProject/setools',
-       cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
--      packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
--      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-+      packages=['setools', 'setools.diff'],
-+      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-       data_files=installed_data,
--      package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
-+      package_data={'setools': ['perm_map']},
-       ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
-                             annotate=cython_annotate,
-                             compiler_directives={"language_level": 3,
diff --git a/app-admin/setools/setools-4.4.0-r2.ebuild b/app-admin/setools/setools-4.4.0-r2.ebuild
index 0d3f876fd18f..ebb4b7598795 100644
--- a/app-admin/setools/setools-4.4.0-r2.ebuild
+++ b/app-admin/setools/setools-4.4.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -26,8 +26,8 @@ S="${WORKDIR}/${PN}"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/setuptools
-	>=sys-libs/libsepol-2.8:=
-	>=sys-libs/libselinux-2.8:=
+	>=sys-libs/libsepol-3.2:=
+	>=sys-libs/libselinux-3.2:=
 	infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] )
 	X? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
diff --git a/app-admin/setools/setools-4.3.0.ebuild b/app-admin/setools/setools-4.4.0-r3.ebuild
index 19992dacb4a2..82ee339e0806 100644
--- a/app-admin/setools/setools-4.3.0.ebuild
+++ b/app-admin/setools/setools-4.4.0-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -14,25 +15,28 @@ 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 ~arm ~arm64 x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="X test"
+IUSE="test infoflow X"
 RESTRICT="!test? ( test )"
 S="${WORKDIR}/${PN}"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
-	>=sys-libs/libsepol-2.8:=
-	>=sys-libs/libselinux-2.8:=
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-3.2:=
+	>=sys-libs/libselinux-3.2:=
+	infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] )
 	X? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-python/cython-0.27
+BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
+		>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
 		sys-apps/checkpolicy
 	)"
 
@@ -41,7 +45,8 @@ python_prepare_all() {
 	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
 		die "failed to set lib_dirs"
 
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.3.0-remove-gui.patch )
+	local PATCHES=( "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch )
+	use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 3737750ca8eb..965896ee5a44 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -13,28 +13,29 @@ HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
+	S="${WORKDIR}/${P}"
 else
 	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${PN}"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="test infoflow X"
 RESTRICT="!test? ( test )"
-S="${WORKDIR}/${PN}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/setuptools
-	>=sys-libs/libsepol-2.8:=
-	>=sys-libs/libselinux-2.8:=
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-3.2:=
+	>=sys-libs/libselinux-3.2:=
 	infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] )
 	X? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-python/cython-0.27
-	dev-python/setuptools
+BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
 		sys-apps/checkpolicy
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index f57c14ad1d65..ef34ad5c3703 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,4 +1,4 @@
-DIST stow-2.3.1.tar.gz 654191 BLAKE2B 9fd54fd3ff76aa7b72ed973cd6d70b8dc747fa3bb1ecc6bedd221b308d7d141a21a2f077c67efb432f2c7c4fb6bd126639038b196946206bf4a7f95040477ab2 SHA512 e9a7de1a6f10eaf7cdbe6737e0a8be1498e2eac46b6c57e65b83759b061efd1c0db45f7cba123e35428307e3aebe5baef9ea8bd4b5eb6ec5e1b159117a760441
-DIST stow-2.3.1.tar.gz.sig 833 BLAKE2B 9c4e3d5f59f793b629e27fccda6dd6c8934b3055b4104a6452dda866908c89c11845f9da68b1cfa78662421f1642c27c2d5957042d861be26951ca78203b1c2a SHA512 87cf2cb3a5be9b80edb2a4f6ec97e193d67b1301edb87664fec6d3b51a1bedd2635fcddd92825a1efeb383cad3c06662f436d3c9b301e73862775f44b324fff5
-EBUILD stow-2.3.1.ebuild 906 BLAKE2B cedf45d0c5bb0f7bae81175b1e362d829aca9badb0a6f181c6950b51f3ce8dd9a22633930bd5d0f3367061336b1450579adce2590782843862d4ffbb5a8b07ef SHA512 0082283af220a41b80b157a416d3888015709377e062638175794867b72859040ef9e9e463483753ac6aec7f6e260842808db64e00152598543aa1c2eb1ac74d
+DIST stow-2.3.1.tar.bz2 556921 BLAKE2B cd946dd1537bec063e21c91cc60c0c8f3a8a5609960536020e7e4b970ff2daa628151258487492b1b44fb5539e1d75a8955152fdfbe91384b7e174ab420a9cf6 SHA512 3d6cec3d50e2dc0ffa92646c45015ced3fca32cef9dd24418fada3fc2e4472a1f335877debb3a1284812aef281a432925c3a3e7afa112d92f127facd3150079c
+DIST stow-2.3.1.tar.bz2.sig 833 BLAKE2B a236d67fca2dabb965021b7ef23ec680ffd48c1b23d3637cf4bd2c31da58b55ad9d190ee88c7f9bb8ce676f85a0bb133b963bc8252fea7c8d5bd5c0042c65681 SHA512 0a0ad10781c29ee6cd69dc8cb05592e779e5cb53412b8bc6c7bce12846c1e1480e2763eaaab329f2cf945a263d15217adb102387247bc2bec313856b3d7535c4
+EBUILD stow-2.3.1.ebuild 908 BLAKE2B 322e05f403bbb3302902c4a12eb8b6682da86c8c2b153394d366179d9cea3479821b415ab0f08d1e5821fb86cb4a0c3fb39634a71f357062c60b548e005866b1 SHA512 1f9c59a71606c4a800b5be15b4bd5a1f99f557b624789ef7fd39fb18b581acae06a6e0dc953c0fc6a45a311d31552045e2a157ddf3ef6dfbe990de90f97d4499
 MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/app-admin/stow/stow-2.3.1.ebuild b/app-admin/stow/stow-2.3.1.ebuild
index 36fd18f5084a..885c958580cc 100644
--- a/app-admin/stow/stow-2.3.1.ebuild
+++ b/app-admin/stow/stow-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,8 @@ inherit perl-functions verify-sig
 
 DESCRIPTION="GNU Stow is a symlink farm manager"
 HOMEPAGE="https://www.gnu.org/software/stow/ https://git.savannah.gnu.org/cgit/stow.git"
-SRC_URI="mirror://gnu/stow/${P}.tar.gz"
-SRC_URI+=" verify-sig? ( mirror://gnu/stow/${P}.tar.gz.sig )"
+SRC_URI="mirror://gnu/stow/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnu/stow/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/app-admin/tenshi/Manifest b/app-admin/tenshi/Manifest
index 52b78426f999..3cda222729d1 100644
--- a/app-admin/tenshi/Manifest
+++ b/app-admin/tenshi/Manifest
@@ -1,3 +1,3 @@
 DIST tenshi-0.17.tar.gz 24597 BLAKE2B 846128e65b1a2d2a3bc5edecc9356069f44d9c13757771ec7fc5c31063d8aeb9403d447dbb088d2aa7d05d3b086ac6c569cd24a05c336225540b3baa10e79bb7 SHA512 2ca93ceaab0843c321fa69d8ba1c7b31eaf809cac4348c98327ddd9ab72df4d5ff00d6b4edeb19a9f02e154161988e0c2284248fd0e84d2b42dd82fdbaac1a78
-EBUILD tenshi-0.17-r1.ebuild 1054 BLAKE2B c2fc4ebf814f70d39d6f2fa9d1b3bb07f56d1596824b7ff013acd61e693c31b9e8c154ff222076497f6bc5bbfe2977e62e56a4637f8b1e07ba3fd8fbb81e3eb5 SHA512 01fbff9b24ebd94ad5be1c43cd782a35474e69a6e4099a05ebeabc841d65f4ca4b0c239114a93c0f24fc59787a6f11890bdeaf49900d449c68cb20315d7b1542
+EBUILD tenshi-0.17-r1.ebuild 1064 BLAKE2B 750bc9a70e15d2b99686706222cf48197cf26bda5980b24bc6af9cd3d27feba01bbbb3efe1e53ddf700b67c743e8bd040bd64f05b67f91e7ce89a5d268cf6599 SHA512 3240e54667f6f9a662ce101533b0dc20ec4512ee70a441882a0013269909bd4897e39509de3ccb9e8cd44b46aa8f075d16da036f5c0331223dfa69039fe49a86
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-admin/tenshi/tenshi-0.17-r1.ebuild b/app-admin/tenshi/tenshi-0.17-r1.ebuild
index c510936bca7a..64a71e29075e 100644
--- a/app-admin/tenshi/tenshi-0.17-r1.ebuild
+++ b/app-admin/tenshi/tenshi-0.17-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Log parsing and notification program"
-HOMEPAGE="https://inversepath.com/tenshi.html https://github.com/inversepath/tenshi"
-SRC_URI="https://github.com/inversepath/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://inversepath.com/tenshi.html https://github.com/f-secure-foundry/tenshi"
+SRC_URI="https://github.com/f-secure-foundry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 5d88c0861ed5..2ec7dcaa70fe 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,3 +1,3 @@
 DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5
-EBUILD testdisk-7.1-r1.ebuild 2373 BLAKE2B 9a3c07fbb096b32b5ad008eb9bbf13f2248063c78fd8e9e713db6af0d7825cd22a9c10cce8073ae30867cdd1d5239bc41db2fa5d08e556725c90355b14996669 SHA512 7ea91addd5686b6f2de559ebbfcfb1c9765db5463032d0d2b437099629cbeb953bb72cf425e8f183a874adad42bf5766375d886b0cd5cfa3a61bfffc35d5f0d8
+EBUILD testdisk-7.1-r1.ebuild 2380 BLAKE2B e8463f3ec645f5da11b52cb9df7b7c50a745d62016e6162f44f922a635b9d6d559591546efe67c2379f3ecb955e494e1be0a2bae3c919f51407915298c1834a8 SHA512 733e9cf992b1c4146174f863c8dd0eab4fd7f2cec166762ece258382c8a1e4530baf789b318e2e4aa7272d7afef34135ed19e7c47971ed4f527edc070d4e51a6
 MISC metadata.xml 556 BLAKE2B db8777e1d66155225e309d519520fdbfbd47067879183478078571aae5efa75a5ad374af3c5791f306324f02143cb1ce437b9d819bc8665166fc0f0e1dd56a18 SHA512 f0d3184b6e36d4d829b75c44693895a28c216fc83db57d2deaa3a87175738f954e25b0d57fd89ebbc946a40ea2f6b627ca47e8ff09cb996679eda842018af929
diff --git a/app-admin/testdisk/testdisk-7.1-r1.ebuild b/app-admin/testdisk/testdisk-7.1-r1.ebuild
index 49c3412c0a54..2532bfd25503 100644
--- a/app-admin/testdisk/testdisk-7.1-r1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
 
 REQUIRED_USE="static? ( !qt5 )"
author	V3n3RiX <venerix@koprulu.sector>	2022-04-16 13:07:24 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-04-16 13:07:24 +0100
commit	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch)
tree	464c922e949c7e4d5d891fb2cdda5daee5612537 /app-admin
parent	e68d405c5d712af4387159df07e226217bdda049 (diff)